Change "int gp" to "unsigned gpio"
Update the 2 existing arm implementations to match the new API
Remove the gpio_toggle() implementation (never used)

Signed-off-by: Joe Hershberger <joe.hershber...@ni.com>
Cc: Joe Hershberger <joe.hershber...@gmail.com>
Cc: Kim Phillips <kim.phill...@freescale.com>
---
Changes for v6:
 - Linuxize gpio API
Changes for v7:
 - checkpatch compliance

 drivers/gpio/da8xx_gpio.c  |   62 +++++++++---------
 drivers/gpio/tegra2_gpio.c |  157 +++++++++++++++++++++----------------------
 include/asm-generic/gpio.h |   13 ++--
 3 files changed, 114 insertions(+), 118 deletions(-)

diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index 7a15614..31a213b 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -181,26 +181,26 @@ static const struct pinmux_config gpio_pinmux[] = {
        { pinmux(18), 8, 2 },
 };
 
-int gpio_request(int gp, const char *label)
+int gpio_request(unsigned gpio, const char *label)
 {
-       if (gp >= MAX_NUM_GPIOS)
+       if (gpio >= MAX_NUM_GPIOS)
                return -1;
 
-       if (gpio_registry[gp].is_registered)
+       if (gpio_registry[gpio].is_registered)
                return -1;
 
-       gpio_registry[gp].is_registered = 1;
-       strncpy(gpio_registry[gp].name, label, GPIO_NAME_SIZE);
-       gpio_registry[gp].name[GPIO_NAME_SIZE - 1] = 0;
+       gpio_registry[gpio].is_registered = 1;
+       strncpy(gpio_registry[gpio].name, label, GPIO_NAME_SIZE);
+       gpio_registry[gpio].name[GPIO_NAME_SIZE - 1] = 0;
 
-       davinci_configure_pin_mux(&gpio_pinmux[gp], 1);
+       davinci_configure_pin_mux(&gpio_pinmux[gpio], 1);
 
        return 0;
 }
 
-void gpio_free(int gp)
+void gpio_free(unsigned gpio)
 {
-       gpio_registry[gp].is_registered = 0;
+       gpio_registry[gpio].is_registered = 0;
 }
 
 void gpio_toggle_value(int gp)
@@ -211,60 +211,60 @@ void gpio_toggle_value(int gp)
        gpio_set_value(gp, !gpio_get_value(gp));
 }
 
-int gpio_direction_input(int gp)
+int gpio_direction_input(unsigned gpio)
 {
        struct davinci_gpio *bank;
 
-       bank = GPIO_BANK(gp);
-       setbits_le32(&bank->dir, 1U << GPIO_BIT(gp));
+       bank = GPIO_BANK(gpio);
+       setbits_le32(&bank->dir, 1U << GPIO_BIT(gpio));
        return 0;
 }
 
-int gpio_direction_output(int gp, int value)
+int gpio_direction_output(unsigned gpio, int value)
 {
        struct davinci_gpio *bank;
 
-       bank = GPIO_BANK(gp);
-       clrbits_le32(&bank->dir, 1U << GPIO_BIT(gp));
-       gpio_set_value(gp, value);
+       bank = GPIO_BANK(gpio);
+       clrbits_le32(&bank->dir, 1U << GPIO_BIT(gpio));
+       gpio_set_value(gpio, value);
        return 0;
 }
 
-int gpio_get_value(int gp)
+int gpio_get_value(unsigned gpio)
 {
        struct davinci_gpio *bank;
        unsigned int ip;
 
-       bank = GPIO_BANK(gp);
-       ip = in_le32(&bank->in_data) & (1U << GPIO_BIT(gp));
+       bank = GPIO_BANK(gpio);
+       ip = in_le32(&bank->in_data) & (1U << GPIO_BIT(gpio));
        return ip ? 1 : 0;
 }
 
-void gpio_set_value(int gp, int value)
+void gpio_set_value(unsigned gpio, int value)
 {
        struct davinci_gpio *bank;
 
-       bank = GPIO_BANK(gp);
+       bank = GPIO_BANK(gpio);
 
        if (value)
-               bank->set_data = 1U << GPIO_BIT(gp);
+               bank->set_data = 1U << GPIO_BIT(gpio);
        else
-               bank->clr_data = 1U << GPIO_BIT(gp);
+               bank->clr_data = 1U << GPIO_BIT(gpio);
 }
 
 void gpio_info(void)
 {
-       int gp, dir, val;
+       unsigned gpio, dir, val;
        struct davinci_gpio *bank;
 
-       for (gp = 0; gp < MAX_NUM_GPIOS; ++gp) {
-               bank = GPIO_BANK(gp);
-               dir = in_le32(&bank->dir) & (1U << GPIO_BIT(gp));
-               val = gpio_get_value(gp);
+       for (gpio = 0; gpio < MAX_NUM_GPIOS; ++gpio) {
+               bank = GPIO_BANK(gpio);
+               dir = in_le32(&bank->dir) & (1U << GPIO_BIT(gpio));
+               val = gpio_get_value(gpio);
 
                printf("% 4d: %s: %d [%c] %s\n",
-                       gp, dir ? " in" : "out", val,
-                       gpio_registry[gp].is_registered ? 'x' : ' ',
-                       gpio_registry[gp].name);
+                       gpio, dir ? " in" : "out", val,
+                       gpio_registry[gpio].is_registered ? 'x' : ' ',
+                       gpio_registry[gpio].name);
        }
 }
diff --git a/drivers/gpio/tegra2_gpio.c b/drivers/gpio/tegra2_gpio.c
index f686e80..187714e 100644
--- a/drivers/gpio/tegra2_gpio.c
+++ b/drivers/gpio/tegra2_gpio.c
@@ -49,186 +49,182 @@ static char *get_name(int i)
        return *gpio_names[i].name ? gpio_names[i].name : "UNKNOWN";
 }
 
-/* Return config of pin 'gp' as GPIO (1) or SFPIO (0) */
-static int get_config(int gp)
+/* Return config of pin 'gpio' as GPIO (1) or SFPIO (0) */
+static int get_config(unsigned gpio)
 {
-       struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
-       struct gpio_ctlr_bank *bank = &gpio->gpio_bank[GPIO_BANK(gp)];
+       struct gpio_ctlr *ctlr = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
+       struct gpio_ctlr_bank *bank = &ctlr->gpio_bank[GPIO_BANK(gpio)];
        u32 u;
        int type;
 
-       u = readl(&bank->gpio_config[GPIO_PORT(gp)]);
-       type =  (u >> GPIO_BIT(gp)) & 1;
+       u = readl(&bank->gpio_config[GPIO_PORT(gpio)]);
+       type =  (u >> GPIO_BIT(gpio)) & 1;
 
        debug("get_config: port = %d, bit = %d is %s\n",
-               GPIO_FULLPORT(gp), GPIO_BIT(gp), type ? "GPIO" : "SFPIO");
+               GPIO_FULLPORT(gpio), GPIO_BIT(gpio), type ? "GPIO" : "SFPIO");
 
        return type;
 }
 
-/* Config pin 'gp' as GPIO or SFPIO, based on 'type' */
-static void set_config(int gp, int type)
+/* Config pin 'gpio' as GPIO or SFPIO, based on 'type' */
+static void set_config(unsigned gpio, int type)
 {
-       struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
-       struct gpio_ctlr_bank *bank = &gpio->gpio_bank[GPIO_BANK(gp)];
+       struct gpio_ctlr *ctlr = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
+       struct gpio_ctlr_bank *bank = &ctlr->gpio_bank[GPIO_BANK(gpio)];
        u32 u;
 
        debug("set_config: port = %d, bit = %d, %s\n",
-               GPIO_FULLPORT(gp), GPIO_BIT(gp), type ? "GPIO" : "SFPIO");
+               GPIO_FULLPORT(gpio), GPIO_BIT(gpio), type ? "GPIO" : "SFPIO");
 
-       u = readl(&bank->gpio_config[GPIO_PORT(gp)]);
+       u = readl(&bank->gpio_config[GPIO_PORT(gpio)]);
        if (type)                               /* GPIO */
-               u |= 1 << GPIO_BIT(gp);
+               u |= 1 << GPIO_BIT(gpio);
        else
-               u &= ~(1 << GPIO_BIT(gp));
-       writel(u, &bank->gpio_config[GPIO_PORT(gp)]);
+               u &= ~(1 << GPIO_BIT(gpio));
+       writel(u, &bank->gpio_config[GPIO_PORT(gpio)]);
 }
 
-/* Return GPIO pin 'gp' direction - 0 = input or 1 = output */
-static int get_direction(int gp)
+/* Return GPIO pin 'gpio' direction - 0 = input or 1 = output */
+static int get_direction(unsigned gpio)
 {
-       struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
-       struct gpio_ctlr_bank *bank = &gpio->gpio_bank[GPIO_BANK(gp)];
+       struct gpio_ctlr *ctlr = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
+       struct gpio_ctlr_bank *bank = &ctlr->gpio_bank[GPIO_BANK(gpio)];
        u32 u;
        int dir;
 
-       u = readl(&bank->gpio_dir_out[GPIO_PORT(gp)]);
-       dir =  (u >> GPIO_BIT(gp)) & 1;
+       u = readl(&bank->gpio_dir_out[GPIO_PORT(gpio)]);
+       dir =  (u >> GPIO_BIT(gpio)) & 1;
 
        debug("get_direction: port = %d, bit = %d, %s\n",
-               GPIO_FULLPORT(gp), GPIO_BIT(gp), dir ? "OUT" : "IN");
+               GPIO_FULLPORT(gpio), GPIO_BIT(gpio), dir ? "OUT" : "IN");
 
        return dir;
 }
 
-/* Config GPIO pin 'gp' as input or output (OE) as per 'output' */
-static void set_direction(int gp, int output)
+/* Config GPIO pin 'gpio' as input or output (OE) as per 'output' */
+static void set_direction(unsigned gpio, int output)
 {
-       struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
-       struct gpio_ctlr_bank *bank = &gpio->gpio_bank[GPIO_BANK(gp)];
+       struct gpio_ctlr *ctlr = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
+       struct gpio_ctlr_bank *bank = &ctlr->gpio_bank[GPIO_BANK(gpio)];
        u32 u;
 
        debug("set_direction: port = %d, bit = %d, %s\n",
-               GPIO_FULLPORT(gp), GPIO_BIT(gp), output ? "OUT" : "IN");
+               GPIO_FULLPORT(gpio), GPIO_BIT(gpio), output ? "OUT" : "IN");
 
-       u = readl(&bank->gpio_dir_out[GPIO_PORT(gp)]);
+       u = readl(&bank->gpio_dir_out[GPIO_PORT(gpio)]);
        if (output)
-               u |= 1 << GPIO_BIT(gp);
+               u |= 1 << GPIO_BIT(gpio);
        else
-               u &= ~(1 << GPIO_BIT(gp));
-       writel(u, &bank->gpio_dir_out[GPIO_PORT(gp)]);
+               u &= ~(1 << GPIO_BIT(gpio));
+       writel(u, &bank->gpio_dir_out[GPIO_PORT(gpio)]);
 }
 
-/* set GPIO pin 'gp' output bit as 0 or 1 as per 'high' */
-static void set_level(int gp, int high)
+/* set GPIO pin 'gpio' output bit as 0 or 1 as per 'high' */
+static void set_level(unsigned gpio, int high)
 {
-       struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
-       struct gpio_ctlr_bank *bank = &gpio->gpio_bank[GPIO_BANK(gp)];
+       struct gpio_ctlr *ctlr = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
+       struct gpio_ctlr_bank *bank = &ctlr->gpio_bank[GPIO_BANK(gpio)];
        u32 u;
 
        debug("set_level: port = %d, bit %d == %d\n",
-               GPIO_FULLPORT(gp), GPIO_BIT(gp), high);
+               GPIO_FULLPORT(gpio), GPIO_BIT(gpio), high);
 
-       u = readl(&bank->gpio_out[GPIO_PORT(gp)]);
+       u = readl(&bank->gpio_out[GPIO_PORT(gpio)]);
        if (high)
-               u |= 1 << GPIO_BIT(gp);
+               u |= 1 << GPIO_BIT(gpio);
        else
-               u &= ~(1 << GPIO_BIT(gp));
-       writel(u, &bank->gpio_out[GPIO_PORT(gp)]);
+               u &= ~(1 << GPIO_BIT(gpio));
+       writel(u, &bank->gpio_out[GPIO_PORT(gpio)]);
 }
 
 /*
  * Generic_GPIO primitives.
  */
 
-int gpio_request(int gp, const char *label)
+int gpio_request(unsigned gpio, const char *label)
 {
-       if (gp >= MAX_NUM_GPIOS)
+       if (gpio >= MAX_NUM_GPIOS)
                return -1;
 
-       strncpy(gpio_names[gp].name, label, GPIO_NAME_SIZE);
-       gpio_names[gp].name[GPIO_NAME_SIZE - 1] = '\0';
+       strncpy(gpio_names[gpio].name, label, GPIO_NAME_SIZE);
+       gpio_names[gpio].name[GPIO_NAME_SIZE - 1] = '\0';
 
        /* Configure as a GPIO */
-       set_config(gp, 1);
+       set_config(gpio, 1);
 
        return 0;
 }
 
-void gpio_free(int gp)
+void gpio_free(unsigned gpio)
 {
 }
 
-/* read GPIO OUT value of pin 'gp' */
-static int gpio_get_output_value(int gp)
+/* read GPIO OUT value of pin 'gpio' */
+static int gpio_get_output_value(unsigned gpio)
 {
-       struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
-       struct gpio_ctlr_bank *bank = &gpio->gpio_bank[GPIO_BANK(gp)];
+       struct gpio_ctlr *ctlr = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
+       struct gpio_ctlr_bank *bank = &ctlr->gpio_bank[GPIO_BANK(gpio)];
        int val;
 
        debug("gpio_get_output_value: pin = %d (port %d:bit %d)\n",
-               gp, GPIO_FULLPORT(gp), GPIO_BIT(gp));
+               gpio, GPIO_FULLPORT(gpio), GPIO_BIT(gpio));
 
-       val = readl(&bank->gpio_out[GPIO_PORT(gp)]);
+       val = readl(&bank->gpio_out[GPIO_PORT(gpio)]);
 
-       return (val >> GPIO_BIT(gp)) & 1;
+       return (val >> GPIO_BIT(gpio)) & 1;
 }
 
-void gpio_toggle_value(int gp)
-{
-       gpio_set_value(gp, !gpio_get_output_value(gp));
-}
-
-/* set GPIO pin 'gp' as an input */
-int gpio_direction_input(int gp)
+/* set GPIO pin 'gpio' as an input */
+int gpio_direction_input(unsigned gpio)
 {
        debug("gpio_direction_input: pin = %d (port %d:bit %d)\n",
-               gp, GPIO_FULLPORT(gp), GPIO_BIT(gp));
+               gpio, GPIO_FULLPORT(gpio), GPIO_BIT(gpio));
 
        /* Configure GPIO direction as input. */
-       set_direction(gp, 0);
+       set_direction(gpio, 0);
 
        return 0;
 }
 
-/* set GPIO pin 'gp' as an output, with polarity 'value' */
-int gpio_direction_output(int gp, int value)
+/* set GPIO pin 'gpio' as an output, with polarity 'value' */
+int gpio_direction_output(unsigned gpio, int value)
 {
        debug("gpio_direction_output: pin = %d (port %d:bit %d) = %s\n",
-               gp, GPIO_FULLPORT(gp), GPIO_BIT(gp), value ? "HIGH" : "LOW");
+               gpio, GPIO_FULLPORT(gpio), GPIO_BIT(gpio),
+               value ? "HIGH" : "LOW");
 
        /* Configure GPIO output value. */
-       set_level(gp, value);
+       set_level(gpio, value);
 
        /* Configure GPIO direction as output. */
-       set_direction(gp, 1);
+       set_direction(gpio, 1);
 
        return 0;
 }
 
-/* read GPIO IN value of pin 'gp' */
-int gpio_get_value(int gp)
+/* read GPIO IN value of pin 'gpio' */
+int gpio_get_value(unsigned gpio)
 {
-       struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
-       struct gpio_ctlr_bank *bank = &gpio->gpio_bank[GPIO_BANK(gp)];
+       struct gpio_ctlr *ctlr = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
+       struct gpio_ctlr_bank *bank = &ctlr->gpio_bank[GPIO_BANK(gpio)];
        int val;
 
        debug("gpio_get_value: pin = %d (port %d:bit %d)\n",
-               gp, GPIO_FULLPORT(gp), GPIO_BIT(gp));
+               gpio, GPIO_FULLPORT(gpio), GPIO_BIT(gpio));
 
-       val = readl(&bank->gpio_in[GPIO_PORT(gp)]);
+       val = readl(&bank->gpio_in[GPIO_PORT(gpio)]);
 
-       return (val >> GPIO_BIT(gp)) & 1;
+       return (val >> GPIO_BIT(gpio)) & 1;
 }
 
-/* write GPIO OUT value to pin 'gp' */
-void gpio_set_value(int gp, int value)
+/* write GPIO OUT value to pin 'gpio' */
+void gpio_set_value(unsigned gpio, int value)
 {
        debug("gpio_set_value: pin = %d (port %d:bit %d), value = %d\n",
-               gp, GPIO_FULLPORT(gp), GPIO_BIT(gp), value);
+               gpio, GPIO_FULLPORT(gpio), GPIO_BIT(gpio), value);
 
        /* Configure GPIO output value. */
-       set_level(gp, value);
+       set_level(gpio, value);
 }
 
 /*
@@ -236,7 +232,8 @@ void gpio_set_value(int gp, int value)
  */
 void gpio_info(void)
 {
-       int c, type;
+       unsigned c;
+       int type;
 
        for (c = 0; c < MAX_NUM_GPIOS; c++) {
                type = get_config(c);           /* GPIO, not SFPIO */
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 57542ad..55a030d 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -26,12 +26,11 @@
  * Generic GPIO API
  */
 
-int gpio_request(int gp, const char *label);
-void gpio_free(int gp);
-void gpio_toggle_value(int gp);
-int gpio_direction_input(int gp);
-int gpio_direction_output(int gp, int value);
-int gpio_get_value(int gp);
-void gpio_set_value(int gp, int value);
+int gpio_request(unsigned gpio, const char *label);
+void gpio_free(unsigned gpio);
+int gpio_direction_input(unsigned gpio);
+int gpio_get_value(unsigned gpio);
+int gpio_direction_output(unsigned gpio, int value);
+void gpio_set_value(unsigned gpio, int value);
 
 #endif /* _GPIO_H_ */
-- 
1.6.0.2

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to