Commit 3e1bf29f authored by Florian Fainelli's avatar Florian Fainelli Committed by Ralf Baechle

MIPS: BCM63xx: Avoid namespace clash on GPIO_DIR_{IN,OUT}

This is too generic a name, so prefix it with BCM63XX_ to avoid potential
namespace clashes when including <asm/gpio.h>.
Signed-off-by: default avatarFlorian Fainelli <ffainelli@freebox.fr>
To:     linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1171/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 32130ec2
...@@ -91,7 +91,7 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip, ...@@ -91,7 +91,7 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
spin_lock_irqsave(&bcm63xx_gpio_lock, flags); spin_lock_irqsave(&bcm63xx_gpio_lock, flags);
tmp = bcm_gpio_readl(reg); tmp = bcm_gpio_readl(reg);
if (dir == GPIO_DIR_IN) if (dir == BCM63XX_GPIO_DIR_IN)
tmp &= ~mask; tmp &= ~mask;
else else
tmp |= mask; tmp |= mask;
...@@ -103,14 +103,14 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip, ...@@ -103,14 +103,14 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
static int bcm63xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) static int bcm63xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
{ {
return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_IN); return bcm63xx_gpio_set_direction(chip, gpio, BCM63XX_GPIO_DIR_IN);
} }
static int bcm63xx_gpio_direction_output(struct gpio_chip *chip, static int bcm63xx_gpio_direction_output(struct gpio_chip *chip,
unsigned gpio, int value) unsigned gpio, int value)
{ {
bcm63xx_gpio_set(chip, gpio, value); bcm63xx_gpio_set(chip, gpio, value);
return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_OUT); return bcm63xx_gpio_set_direction(chip, gpio, BCM63XX_GPIO_DIR_OUT);
} }
......
...@@ -20,7 +20,7 @@ static inline unsigned long bcm63xx_gpio_count(void) ...@@ -20,7 +20,7 @@ static inline unsigned long bcm63xx_gpio_count(void)
} }
} }
#define GPIO_DIR_OUT 0x0 #define BCM63XX_GPIO_DIR_OUT 0x0
#define GPIO_DIR_IN 0x1 #define BCM63XX_GPIO_DIR_IN 0x1
#endif /* !BCM63XX_GPIO_H */ #endif /* !BCM63XX_GPIO_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment