diff options
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0161-Revert-bcm2708-fix-gpio_to_irq-name-clash.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-3.10/0161-Revert-bcm2708-fix-gpio_to_irq-name-clash.patch | 108 |
1 files changed, 108 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0161-Revert-bcm2708-fix-gpio_to_irq-name-clash.patch b/target/linux/brcm2708/patches-3.10/0161-Revert-bcm2708-fix-gpio_to_irq-name-clash.patch new file mode 100644 index 0000000000..7d1ba93fac --- /dev/null +++ b/target/linux/brcm2708/patches-3.10/0161-Revert-bcm2708-fix-gpio_to_irq-name-clash.patch @@ -0,0 +1,108 @@ +From b279f5b69e5ce5f25bfc85f0b469aa023e27920a Mon Sep 17 00:00:00 2001 +From: Joerg Faschingbauer <jf@faschingbauer.co.at> +Date: Sat, 18 Jan 2014 22:58:00 +0100 +Subject: [PATCH 161/174] Revert "bcm2708: fix gpio_to_irq() name clash" + +This reverts commit dee3db1c55e9a1c2efce858f44d9810cc2392b18. + +Conflicts: + arch/arm/mach-bcm2708/bcm2708_gpio.c +--- + arch/arm/mach-bcm2708/bcm2708_gpio.c | 28 ++++++++++++++-------------- + arch/arm/mach-bcm2708/include/mach/gpio.h | 4 ++-- + 2 files changed, 16 insertions(+), 16 deletions(-) + +--- a/arch/arm/mach-bcm2708/bcm2708_gpio.c ++++ b/arch/arm/mach-bcm2708/bcm2708_gpio.c +@@ -137,9 +137,9 @@ static void bcm2708_gpio_set(struct gpio + + #if BCM_GPIO_USE_IRQ + +-static int bcm2708___bcm2708_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) ++static int bcm2708_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) + { +- return __bcm2708_gpio_to_irq(gpio); ++ return gpio_to_irq(gpio); + } + + static int bcm2708_gpio_irq_set_type(struct irq_data *d, unsigned type) +@@ -147,22 +147,22 @@ static int bcm2708_gpio_irq_set_type(str + unsigned irq = d->irq; + struct bcm2708_gpio *gpio = irq_get_chip_data(irq); + +- gpio->rising &= ~(1 << __bcm2708_irq_to_gpio(irq)); +- gpio->falling &= ~(1 << __bcm2708_irq_to_gpio(irq)); +- gpio->high &= ~(1 << __bcm2708_irq_to_gpio(irq)); +- gpio->low &= ~(1 << __bcm2708_irq_to_gpio(irq)); ++ gpio->rising &= ~(1 << irq_to_gpio(irq)); ++ gpio->falling &= ~(1 << irq_to_gpio(irq)); ++ gpio->high &= ~(1 << irq_to_gpio(irq)); ++ gpio->low &= ~(1 << irq_to_gpio(irq)); + + if (type & ~(IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING | IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH)) + return -EINVAL; + + if (type & IRQ_TYPE_EDGE_RISING) +- gpio->rising |= (1 << __bcm2708_irq_to_gpio(irq)); ++ gpio->rising |= (1 << irq_to_gpio(irq)); + if (type & IRQ_TYPE_EDGE_FALLING) +- gpio->falling |= (1 << __bcm2708_irq_to_gpio(irq)); ++ gpio->falling |= (1 << irq_to_gpio(irq)); + if (type & IRQ_TYPE_LEVEL_HIGH) +- gpio->high |= (1 << __bcm2708_irq_to_gpio(irq)); ++ gpio->high |= (1 << irq_to_gpio(irq)); + if (type & IRQ_TYPE_LEVEL_LOW) +- gpio->low |= (1 << __bcm2708_irq_to_gpio(irq)); ++ gpio->low |= (1 << irq_to_gpio(irq)); + return 0; + } + +@@ -170,7 +170,7 @@ static void bcm2708_gpio_irq_mask(struct + { + unsigned irq = d->irq; + struct bcm2708_gpio *gpio = irq_get_chip_data(irq); +- unsigned gn = __bcm2708_irq_to_gpio(irq); ++ unsigned gn = irq_to_gpio(irq); + unsigned gb = gn / 32; + unsigned long rising = readl(gpio->base + GPIOREN(gb)); + unsigned long falling = readl(gpio->base + GPIOFEN(gb)); +@@ -189,7 +189,7 @@ static void bcm2708_gpio_irq_unmask(stru + { + unsigned irq = d->irq; + struct bcm2708_gpio *gpio = irq_get_chip_data(irq); +- unsigned gn = __bcm2708_irq_to_gpio(irq); ++ unsigned gn = irq_to_gpio(irq); + unsigned gb = gn / 32; + unsigned long rising = readl(gpio->base + GPIOREN(gb)); + unsigned long falling = readl(gpio->base + GPIOFEN(gb)); +@@ -244,7 +244,7 @@ static irqreturn_t bcm2708_gpio_interrup + edsr = readl(__io_address(GPIO_BASE) + GPIOEDS(bank)); + for_each_set_bit(i, &edsr, 32) { + gpio = i + bank * 32; +- generic_handle_irq(__bcm2708_gpio_to_irq(gpio)); ++ generic_handle_irq(gpio_to_irq(gpio)); + } + writel(0xffffffff, __io_address(GPIO_BASE) + GPIOEDS(bank)); + } +@@ -261,7 +261,7 @@ static void bcm2708_gpio_irq_init(struct + { + unsigned irq; + +- ucb->gc.to_irq = bcm2708___bcm2708_gpio_to_irq; ++ ucb->gc.to_irq = bcm2708_gpio_to_irq; + + for (irq = GPIO_IRQ_START; irq < (GPIO_IRQ_START + GPIO_IRQS); irq++) { + irq_set_chip_data(irq, ucb); +--- a/arch/arm/mach-bcm2708/include/mach/gpio.h ++++ b/arch/arm/mach-bcm2708/include/mach/gpio.h +@@ -11,8 +11,8 @@ + + #define ARCH_NR_GPIOS 54 // number of gpio lines + +-#define __bcm2708_gpio_to_irq(x) ((x) + GPIO_IRQ_START) +-#define __bcm2708_irq_to_gpio(x) ((x) - GPIO_IRQ_START) ++#define gpio_to_irq(x) ((x) + GPIO_IRQ_START) ++#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) + + #endif + |