aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/bcm63xx/gpio.c6
-rw-r--r--arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
index 315bc7f79ce1..f560fe7d38dd 100644
--- a/arch/mips/bcm63xx/gpio.c
+++ b/arch/mips/bcm63xx/gpio.c
@@ -91,7 +91,7 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
91 91
92 spin_lock_irqsave(&bcm63xx_gpio_lock, flags); 92 spin_lock_irqsave(&bcm63xx_gpio_lock, flags);
93 tmp = bcm_gpio_readl(reg); 93 tmp = bcm_gpio_readl(reg);
94 if (dir == GPIO_DIR_IN) 94 if (dir == BCM63XX_GPIO_DIR_IN)
95 tmp &= ~mask; 95 tmp &= ~mask;
96 else 96 else
97 tmp |= mask; 97 tmp |= mask;
@@ -103,14 +103,14 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
103 103
104static int bcm63xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) 104static int bcm63xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
105{ 105{
106 return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_IN); 106 return bcm63xx_gpio_set_direction(chip, gpio, BCM63XX_GPIO_DIR_IN);
107} 107}
108 108
109static int bcm63xx_gpio_direction_output(struct gpio_chip *chip, 109static int bcm63xx_gpio_direction_output(struct gpio_chip *chip,
110 unsigned gpio, int value) 110 unsigned gpio, int value)
111{ 111{
112 bcm63xx_gpio_set(chip, gpio, value); 112 bcm63xx_gpio_set(chip, gpio, value);
113 return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_OUT); 113 return bcm63xx_gpio_set_direction(chip, gpio, BCM63XX_GPIO_DIR_OUT);
114} 114}
115 115
116 116
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
index 43d4da0b1e9f..3999ec0aa7f5 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
@@ -20,7 +20,7 @@ static inline unsigned long bcm63xx_gpio_count(void)
20 } 20 }
21} 21}
22 22
23#define GPIO_DIR_OUT 0x0 23#define BCM63XX_GPIO_DIR_OUT 0x0
24#define GPIO_DIR_IN 0x1 24#define BCM63XX_GPIO_DIR_IN 0x1
25 25
26#endif /* !BCM63XX_GPIO_H */ 26#endif /* !BCM63XX_GPIO_H */