diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-10-04 03:54:56 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-04 03:54:56 +0900 |
commit | b72421d8aa39724474ec2bfb91e182001f1f25a7 (patch) | |
tree | d9f13d2e5641d9379c796898782756c50996bbf3 | |
parent | 3bccf534f98ddc4962665b68d99f752ea010aacc (diff) | |
download | op-kernel-dev-b72421d8aa39724474ec2bfb91e182001f1f25a7.zip op-kernel-dev-b72421d8aa39724474ec2bfb91e182001f1f25a7.tar.gz |
sh: pfc: support pinmux deregistration.
Presently the pinmux code is a one-way thing, but there's nothing
preventing an unregistration if no one has grabbed any of the pins.
This will permit us to save a bit of memory on systems that require pin
demux for certain peripherals in the case where registration of those
peripherals fails, or they are otherwise not attached to the system.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | drivers/sh/pfc.c | 11 | ||||
-rw-r--r-- | include/linux/sh_pfc.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/sh/pfc.c b/drivers/sh/pfc.c index cf0303ac..dee581f 100644 --- a/drivers/sh/pfc.c +++ b/drivers/sh/pfc.c @@ -7,6 +7,8 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/errno.h> #include <linux/kernel.h> #include <linux/list.h> @@ -581,7 +583,7 @@ int register_pinmux(struct pinmux_info *pip) { struct gpio_chip *chip = &pip->chip; - pr_info("sh pinmux: %s handling gpio %d -> %d\n", + pr_info("%s handling gpio %d -> %d\n", pip->name, pip->first_gpio, pip->last_gpio); setup_data_regs(pip); @@ -602,3 +604,10 @@ int register_pinmux(struct pinmux_info *pip) return gpiochip_add(chip); } + +int unregister_pinmux(struct pinmux_info *pip) +{ + pr_info("%s deregistering\n", pip->name); + + return gpiochip_remove(&pip->chip); +} diff --git a/include/linux/sh_pfc.h b/include/linux/sh_pfc.h index 07c08af..30cae70 100644 --- a/include/linux/sh_pfc.h +++ b/include/linux/sh_pfc.h @@ -92,5 +92,6 @@ struct pinmux_info { }; int register_pinmux(struct pinmux_info *pip); +int unregister_pinmux(struct pinmux_info *pip); #endif /* __SH_PFC_H */ |