diff options
| -rw-r--r-- | arch/arm/mach-ep93xx/core.c | 9 | ||||
| -rw-r--r-- | include/asm-arm/arch-ep93xx/gpio.h | 19 |
2 files changed, 3 insertions, 25 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 2788da06417c..4cb3f742a6a1 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
| @@ -189,6 +189,9 @@ static const u8 data_direction_register_offset[8] = { | |||
| 189 | 0x10, 0x14, 0x34, 0x1c, 0x24, 0x18, 0x3c, 0x44, | 189 | 0x10, 0x14, 0x34, 0x1c, 0x24, 0x18, 0x3c, 0x44, |
| 190 | }; | 190 | }; |
| 191 | 191 | ||
| 192 | #define GPIO_IN 0 | ||
| 193 | #define GPIO_OUT 1 | ||
| 194 | |||
| 192 | static void ep93xx_gpio_set_direction(unsigned line, int direction) | 195 | static void ep93xx_gpio_set_direction(unsigned line, int direction) |
| 193 | { | 196 | { |
| 194 | unsigned int data_direction_register; | 197 | unsigned int data_direction_register; |
| @@ -217,12 +220,6 @@ static void ep93xx_gpio_set_direction(unsigned line, int direction) | |||
| 217 | local_irq_restore(flags); | 220 | local_irq_restore(flags); |
| 218 | } | 221 | } |
| 219 | 222 | ||
| 220 | void __deprecated gpio_line_config(int line, int direction) | ||
| 221 | { | ||
| 222 | ep93xx_gpio_set_direction(line, direction); | ||
| 223 | } | ||
| 224 | EXPORT_SYMBOL(gpio_line_config); | ||
| 225 | |||
| 226 | int gpio_direction_input(unsigned gpio) | 223 | int gpio_direction_input(unsigned gpio) |
| 227 | { | 224 | { |
| 228 | if (gpio > EP93XX_GPIO_LINE_MAX) | 225 | if (gpio > EP93XX_GPIO_LINE_MAX) |
diff --git a/include/asm-arm/arch-ep93xx/gpio.h b/include/asm-arm/arch-ep93xx/gpio.h index cebb64be7e4b..9b1864bbd9a8 100644 --- a/include/asm-arm/arch-ep93xx/gpio.h +++ b/include/asm-arm/arch-ep93xx/gpio.h | |||
| @@ -138,23 +138,4 @@ static inline int irq_to_gpio(unsigned irq) | |||
| 138 | return irq - gpio_to_irq(0); | 138 | return irq - gpio_to_irq(0); |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | /* obsolete specific GPIO API */ | ||
| 142 | #define GPIO_IN 0 | ||
| 143 | #define GPIO_OUT 1 | ||
| 144 | |||
| 145 | #define EP93XX_GPIO_LOW 0 | ||
| 146 | #define EP93XX_GPIO_HIGH 1 | ||
| 147 | |||
| 148 | void __deprecated gpio_line_config(int line, int direction); | ||
| 149 | |||
| 150 | static inline int __deprecated gpio_line_get(int line) | ||
| 151 | { | ||
| 152 | return gpio_get_value(line); | ||
| 153 | } | ||
| 154 | |||
| 155 | static inline void __deprecated gpio_line_set(int line, int value) | ||
| 156 | { | ||
| 157 | gpio_set_value(line, value); | ||
| 158 | } | ||
| 159 | |||
| 160 | #endif | 141 | #endif |
