s5p: gpio: change gpio coding method for s5p gpio.

[karo-tx-uboot.git] / drivers / gpio / s5p_gpio.c

diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index 7eeb96d19ff0daad96bfd4ff546bd090048ff73a..11a0472c695eeb4c9aeae1e663a7a62e186ff411 100644 (file)
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -9,6 +9,11 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 
+#define S5P_GPIO_GET_BANK(x)   ((x >> S5P_GPIO_BANK_SHIFT) \
+                               & S5P_GPIO_BANK_MASK)
+
+#define S5P_GPIO_GET_PIN(x)    (x & S5P_GPIO_PIN_MASK)
+
 #define CON_MASK(x)            (0xf << ((x) << 2))
 #define CON_SFR(x, v)          ((v) << ((x) << 2))
 
@@ -124,17 +129,15 @@ void s5p_gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode)
 
 struct s5p_gpio_bank *s5p_gpio_get_bank(unsigned gpio)
 {
-       int bank;
-       unsigned g = gpio - s5p_gpio_part_max(gpio);
+       unsigned bank = S5P_GPIO_GET_BANK(gpio);
+       unsigned base = s5p_gpio_base(gpio);
 
-       bank = g / GPIO_PER_BANK;
-       bank *= sizeof(struct s5p_gpio_bank);
-       return (struct s5p_gpio_bank *) (s5p_gpio_base(gpio) + bank);
+       return (struct s5p_gpio_bank *)(base + bank);
 }
 
 int s5p_gpio_get_pin(unsigned gpio)
 {
-       return gpio % GPIO_PER_BANK;
+       return S5P_GPIO_GET_PIN(gpio);
 }
 
 /* Common GPIO API */