diff options
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0153-bcm2708-fix-gpio_to_irq-name-clash.patch')
-rw-r--r-- | target/linux/brcm2708/patches-3.10/0153-bcm2708-fix-gpio_to_irq-name-clash.patch | 110 |
1 files changed, 0 insertions, 110 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0153-bcm2708-fix-gpio_to_irq-name-clash.patch b/target/linux/brcm2708/patches-3.10/0153-bcm2708-fix-gpio_to_irq-name-clash.patch deleted file mode 100644 index ab7c4f05db..0000000000 --- a/target/linux/brcm2708/patches-3.10/0153-bcm2708-fix-gpio_to_irq-name-clash.patch +++ /dev/null @@ -1,110 +0,0 @@ -From ca0e3a11c5cb7a46a98fbad909250ce81a19f1f8 Mon Sep 17 00:00:00 2001 -From: Joerg Faschingbauer <jf@faschingbauer.co.at> -Date: Tue, 7 Jan 2014 13:55:15 +0000 -Subject: [PATCH 153/196] bcm2708: fix gpio_to_irq() name clash - -<mach/gpio.h> has gpio_to_irq() defined as a macro. the macro is -obviously intended as the direct implementation of that -functionality. unfortunately the gpio subsystem offers a public -function of the same name through <linux/gpio.h>. one has to be very -careful to include <mach/gpio.h> before <linux/gpio.h> - otherwise the -code will compile but only work by chance. board code will certainly -not work - the gpio driver is simply not loaded at that time. - -fix the clash by renaming the offending macros from <mach/gpio.h>, -together with their uses. ---- - arch/arm/mach-bcm2708/bcm2708_gpio.c | 20 ++++++++++---------- - arch/arm/mach-bcm2708/include/mach/gpio.h | 4 ++-- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/arch/arm/mach-bcm2708/bcm2708_gpio.c b/arch/arm/mach-bcm2708/bcm2708_gpio.c -index d0339eb..96fae74 100644 ---- a/arch/arm/mach-bcm2708/bcm2708_gpio.c -+++ b/arch/arm/mach-bcm2708/bcm2708_gpio.c -@@ -135,9 +135,9 @@ static void bcm2708_gpio_set(struct gpio_chip *gc, unsigned offset, int value) - - #if BCM_GPIO_USE_IRQ - --static int bcm2708_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) -+static int bcm2708___bcm2708_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) - { -- return gpio_to_irq(gpio); -+ return __bcm2708_gpio_to_irq(gpio); - } - - static int bcm2708_gpio_irq_set_type(struct irq_data *d, unsigned type) -@@ -149,15 +149,15 @@ static int bcm2708_gpio_irq_set_type(struct irq_data *d, unsigned type) - return -EINVAL; - - if (type & IRQ_TYPE_EDGE_RISING) { -- gpio->rising |= (1 << irq_to_gpio(irq)); -+ gpio->rising |= (1 << __bcm2708_irq_to_gpio(irq)); - } else { -- gpio->rising &= ~(1 << irq_to_gpio(irq)); -+ gpio->rising &= ~(1 << __bcm2708_irq_to_gpio(irq)); - } - - if (type & IRQ_TYPE_EDGE_FALLING) { -- gpio->falling |= (1 << irq_to_gpio(irq)); -+ gpio->falling |= (1 << __bcm2708_irq_to_gpio(irq)); - } else { -- gpio->falling &= ~(1 << irq_to_gpio(irq)); -+ gpio->falling &= ~(1 << __bcm2708_irq_to_gpio(irq)); - } - return 0; - } -@@ -166,7 +166,7 @@ static void bcm2708_gpio_irq_mask(struct irq_data *d) - { - unsigned irq = d->irq; - struct bcm2708_gpio *gpio = irq_get_chip_data(irq); -- unsigned gn = irq_to_gpio(irq); -+ unsigned gn = __bcm2708_irq_to_gpio(irq); - unsigned gb = gn / 32; - unsigned long rising = readl(gpio->base + GPIOREN(gb)); - unsigned long falling = readl(gpio->base + GPIOFEN(gb)); -@@ -181,7 +181,7 @@ static void bcm2708_gpio_irq_unmask(struct irq_data *d) - { - unsigned irq = d->irq; - struct bcm2708_gpio *gpio = irq_get_chip_data(irq); -- unsigned gn = irq_to_gpio(irq); -+ unsigned gn = __bcm2708_irq_to_gpio(irq); - unsigned gb = gn / 32; - unsigned long rising = readl(gpio->base + GPIOREN(gb)); - unsigned long falling = readl(gpio->base + GPIOFEN(gb)); -@@ -222,7 +222,7 @@ static irqreturn_t bcm2708_gpio_interrupt(int irq, void *dev_id) - edsr = readl(__io_address(GPIO_BASE) + GPIOEDS(bank)); - for_each_set_bit(i, &edsr, 32) { - gpio = i + bank * 32; -- generic_handle_irq(gpio_to_irq(gpio)); -+ generic_handle_irq(__bcm2708_gpio_to_irq(gpio)); - } - writel(0xffffffff, __io_address(GPIO_BASE) + GPIOEDS(bank)); - } -@@ -239,7 +239,7 @@ static void bcm2708_gpio_irq_init(struct bcm2708_gpio *ucb) - { - unsigned irq; - -- ucb->gc.to_irq = bcm2708_gpio_to_irq; -+ ucb->gc.to_irq = bcm2708___bcm2708_gpio_to_irq; - - for (irq = GPIO_IRQ_START; irq < (GPIO_IRQ_START + GPIO_IRQS); irq++) { - irq_set_chip_data(irq, ucb); -diff --git a/arch/arm/mach-bcm2708/include/mach/gpio.h b/arch/arm/mach-bcm2708/include/mach/gpio.h -index f600bc7..f09639a 100644 ---- 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 gpio_to_irq(x) ((x) + GPIO_IRQ_START) --#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) -+#define __bcm2708_gpio_to_irq(x) ((x) + GPIO_IRQ_START) -+#define __bcm2708_irq_to_gpio(x) ((x) - GPIO_IRQ_START) - - #endif - --- -1.9.1 - |