diff options
-rw-r--r-- | arch/arm/plat-mxc/include/mach/gpio.h | 5 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/hardware.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h index 72c3ed1cddd5..44af0064ba1a 100644 --- a/arch/arm/plat-mxc/include/mach/gpio.h +++ b/arch/arm/plat-mxc/include/mach/gpio.h | |||
@@ -23,11 +23,6 @@ | |||
23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
24 | #include <asm-generic/gpio.h> | 24 | #include <asm-generic/gpio.h> |
25 | 25 | ||
26 | |||
27 | /* There's a off-by-one betweem the gpio bank number and the gpiochip */ | ||
28 | /* range e.g. GPIO_1_5 is gpio 5 under linux */ | ||
29 | #define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr)) | ||
30 | |||
31 | /* use gpiolib dispatchers */ | 26 | /* use gpiolib dispatchers */ |
32 | #define gpio_get_value __gpio_get_value | 27 | #define gpio_get_value __gpio_get_value |
33 | #define gpio_set_value __gpio_set_value | 28 | #define gpio_set_value __gpio_set_value |
diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h index 77f6556f59a7..f57ec47d6fd5 100644 --- a/arch/arm/plat-mxc/include/mach/hardware.h +++ b/arch/arm/plat-mxc/include/mach/hardware.h | |||
@@ -116,6 +116,10 @@ | |||
116 | .type = _type, \ | 116 | .type = _type, \ |
117 | } | 117 | } |
118 | 118 | ||
119 | /* There's a off-by-one betweem the gpio bank number and the gpiochip */ | ||
120 | /* range e.g. GPIO_1_5 is gpio 5 under linux */ | ||
121 | #define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr)) | ||
122 | |||
119 | #define IMX_GPIO_TO_IRQ(gpio) (MXC_GPIO_IRQ_START + (gpio)) | 123 | #define IMX_GPIO_TO_IRQ(gpio) (MXC_GPIO_IRQ_START + (gpio)) |
120 | 124 | ||
121 | #endif /* __ASM_ARCH_MXC_HARDWARE_H__ */ | 125 | #endif /* __ASM_ARCH_MXC_HARDWARE_H__ */ |