[PATCH RESEND v9 1/2] gpio: Adjust of_xlate API to support multiple GPIO chips

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

This patch changes the of_xlate API to make it possible to manipulate the
actual used gc. This way, multiple GPIO banks can be supported with the same DT
registered GPIO controller.

The issue was discussed upon the integration of LPC32xx's DT support for its
GPIO (see separate patch).

Signed-off-by: Roland Stigge <stigge@xxxxxxxxx>

---
Applies to v3.4-rc7

Changes since last version:
* Added this patch to the series

Thanks to Grant Likely for reviewing and advice!

 drivers/gpio/gpio-samsung.c |   10 +++++-----
 drivers/of/gpio.c           |   14 ++++++++------
 include/asm-generic/gpio.h  |    2 +-
 include/linux/of_gpio.h     |    2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

--- linux-2.6.orig/drivers/gpio/gpio-samsung.c
+++ linux-2.6/drivers/gpio/gpio-samsung.c
@@ -2657,21 +2657,21 @@ static struct samsung_gpio_chip exynos5_
 
 
 #if defined(CONFIG_ARCH_EXYNOS) && defined(CONFIG_OF)
-static int exynos_gpio_xlate(struct gpio_chip *gc,
+static int exynos_gpio_xlate(struct gpio_chip **gc,
 			const struct of_phandle_args *gpiospec, u32 *flags)
 {
 	unsigned int pin;
 
-	if (WARN_ON(gc->of_gpio_n_cells < 4))
+	if (WARN_ON((*gc)->of_gpio_n_cells < 4))
 		return -EINVAL;
 
-	if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))
+	if (WARN_ON(gpiospec->args_count < (*gc)->of_gpio_n_cells))
 		return -EINVAL;
 
-	if (gpiospec->args[0] > gc->ngpio)
+	if (gpiospec->args[0] > (*gc)->ngpio)
 		return -EINVAL;
 
-	pin = gc->base + gpiospec->args[0];
+	pin = (*gc)->base + gpiospec->args[0];
 
 	if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(gpiospec->args[1])))
 		pr_warn("gpio_xlate: failed to set pin function\n");
--- linux-2.6.orig/drivers/of/gpio.c
+++ linux-2.6/drivers/of/gpio.c
@@ -64,7 +64,7 @@ int of_get_named_gpio_flags(struct devic
 	if (flags)
 		*flags = 0;
 
-	ret = gc->of_xlate(gc, &gpiospec, flags);
+	ret = gc->of_xlate(&gc, &gpiospec, flags);
 	if (ret < 0)
 		goto err1;
 
@@ -114,7 +114,9 @@ EXPORT_SYMBOL(of_gpio_named_count);
 
 /**
  * of_gpio_simple_xlate - translate gpio_spec to the GPIO number and flags
- * @gc:		pointer to the gpio_chip structure
+ * @gc:		pointer to pointer to the gpio_chip structure: the xlate
+ *              function can alter *gc itself to make GPIO distribution to
+ *              multiple gpio_chips possible
  * @np:		device node of the GPIO chip
  * @gpio_spec:	gpio specifier as found in the device tree
  * @flags:	a flags pointer to fill in
@@ -123,7 +125,7 @@ EXPORT_SYMBOL(of_gpio_named_count);
  * gpio chips. This function performs only one sanity check: whether gpio
  * is less than ngpios (that is specified in the gpio_chip).
  */
-int of_gpio_simple_xlate(struct gpio_chip *gc,
+int of_gpio_simple_xlate(struct gpio_chip **gc,
 			 const struct of_phandle_args *gpiospec, u32 *flags)
 {
 	/*
@@ -132,15 +134,15 @@ int of_gpio_simple_xlate(struct gpio_chi
 	 * number and the flags from a single gpio cell -- this is possible,
 	 * but not recommended).
 	 */
-	if (gc->of_gpio_n_cells < 2) {
+	if ((*gc)->of_gpio_n_cells < 2) {
 		WARN_ON(1);
 		return -EINVAL;
 	}
 
-	if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))
+	if (WARN_ON(gpiospec->args_count < (*gc)->of_gpio_n_cells))
 		return -EINVAL;
 
-	if (gpiospec->args[0] >= gc->ngpio)
+	if (gpiospec->args[0] >= (*gc)->ngpio)
 		return -EINVAL;
 
 	if (flags)
--- linux-2.6.orig/include/asm-generic/gpio.h
+++ linux-2.6/include/asm-generic/gpio.h
@@ -129,7 +129,7 @@ struct gpio_chip {
 	 */
 	struct device_node *of_node;
 	int of_gpio_n_cells;
-	int (*of_xlate)(struct gpio_chip *gc,
+	int (*of_xlate)(struct gpio_chip **gc,
 		        const struct of_phandle_args *gpiospec, u32 *flags);
 #endif
 };
--- linux-2.6.orig/include/linux/of_gpio.h
+++ linux-2.6/include/linux/of_gpio.h
@@ -59,7 +59,7 @@ extern int of_mm_gpiochip_add(struct dev
 extern void of_gpiochip_add(struct gpio_chip *gc);
 extern void of_gpiochip_remove(struct gpio_chip *gc);
 extern struct gpio_chip *of_node_to_gpiochip(struct device_node *np);
-extern int of_gpio_simple_xlate(struct gpio_chip *gc,
+extern int of_gpio_simple_xlate(struct gpio_chip **gc,
 				const struct of_phandle_args *gpiospec,
 				u32 *flags);
 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel


[Linux ARM (vger)]     [Linux ARM MSM]     [Linux Omap]     [Linux Arm]     [Linux Tegra]     [Fedora ARM]     [eCos]     [Linux Fastboot]     [Gcc Help]     [Git]     [DCCP]     [IETF Announce]     [Security]     [PDAs]     [Linux]     [Linux MIPS]     [Yosemite Campsites]     [Photos]

Add to Google Follow linuxarm on Twitter