brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

[openwrt/svn-archive/archive.git] / target / linux / brcm2708 / patches-3.10 / 0161-Revert-bcm2708-fix-gpio_to_irq-name-clash.patch

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
index 7d1ba93facb4cf2c610a84bf51c0a29bd3e01d14..177a3948afd3798d4b738e34b3da978e1b2bda47 100644 (file)
--- 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
@@ -1,7 +1,7 @@
-From b279f5b69e5ce5f25bfc85f0b469aa023e27920a Mon Sep 17 00:00:00 2001
+From ff068b36af8d2ee9634b0b50922656c350211ec5 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"
+Subject: [PATCH 161/196] Revert "bcm2708: fix gpio_to_irq() name clash"
 
 This reverts commit dee3db1c55e9a1c2efce858f44d9810cc2392b18.
 
@@ -12,9 +12,11 @@ Conflicts:
  arch/arm/mach-bcm2708/include/mach/gpio.h |  4 ++--
  2 files changed, 16 insertions(+), 16 deletions(-)
 
+diff --git a/arch/arm/mach-bcm2708/bcm2708_gpio.c b/arch/arm/mach-bcm2708/bcm2708_gpio.c
+index 1d93ad8..bab8a49 100644
 --- 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
+@@ -137,9 +137,9 @@ static void bcm2708_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
  
  #if BCM_GPIO_USE_IRQ
  
@@ -26,7 +28,7 @@ Conflicts:
  }
  
  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
+@@ -147,22 +147,22 @@ static int bcm2708_gpio_irq_set_type(struct irq_data *d, unsigned type)
        unsigned irq = d->irq;
        struct bcm2708_gpio *gpio = irq_get_chip_data(irq);
  
@@ -57,7 +59,7 @@ Conflicts:
        return 0;
  }
  
-@@ -170,7 +170,7 @@ static void bcm2708_gpio_irq_mask(struct
+@@ -170,7 +170,7 @@ static void bcm2708_gpio_irq_mask(struct irq_data *d)
  {
        unsigned irq = d->irq;
        struct bcm2708_gpio *gpio = irq_get_chip_data(irq);
@@ -66,7 +68,7 @@ Conflicts:
        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
+@@ -189,7 +189,7 @@ static void bcm2708_gpio_irq_unmask(struct irq_data *d)
  {
        unsigned irq = d->irq;
        struct bcm2708_gpio *gpio = irq_get_chip_data(irq);
@@ -75,7 +77,7 @@ Conflicts:
        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
+@@ -244,7 +244,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;
@@ -84,7 +86,7 @@ Conflicts:
                }
                writel(0xffffffff, __io_address(GPIO_BASE) + GPIOEDS(bank));
        }
-@@ -261,7 +261,7 @@ static void bcm2708_gpio_irq_init(struct
+@@ -261,7 +261,7 @@ static void bcm2708_gpio_irq_init(struct bcm2708_gpio *ucb)
  {
        unsigned irq;
  
@@ -93,6 +95,8 @@ Conflicts:
  
        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 f09639a..f600bc7 100644
 --- a/arch/arm/mach-bcm2708/include/mach/gpio.h
 +++ b/arch/arm/mach-bcm2708/include/mach/gpio.h
 @@ -11,8 +11,8 @@
@@ -106,3 +110,6 @@ Conflicts:
  
  #endif
  
+-- 
+1.9.1
+