diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2014-09-27 07:49:48 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2014-09-27 07:49:48 +0000 |
commit | 8e525a43b45f4bd4f88a438880f416285e23b0be (patch) | |
tree | 3d59bf9bee80675b7e888789cb828dcdb7d622ec /target/linux/bcm53xx/patches-3.14 | |
parent | 16b3eae0400e4390f187edcf4b0be324cad03e96 (diff) | |
download | upstream-8e525a43b45f4bd4f88a438880f416285e23b0be.tar.gz upstream-8e525a43b45f4bd4f88a438880f416285e23b0be.tar.bz2 upstream-8e525a43b45f4bd4f88a438880f416285e23b0be.zip |
kernel: update bcma to the tag master-2014-09-26 (wireless-next)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 42672
Diffstat (limited to 'target/linux/bcm53xx/patches-3.14')
-rw-r--r-- | target/linux/bcm53xx/patches-3.14/122-bcma-gpio-use-ChipCommon-GPIO-IRQ-on-BCM47XX-arch-on.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/122-bcma-gpio-use-ChipCommon-GPIO-IRQ-on-BCM47XX-arch-on.patch b/target/linux/bcm53xx/patches-3.14/122-bcma-gpio-use-ChipCommon-GPIO-IRQ-on-BCM47XX-arch-on.patch deleted file mode 100644 index 4ea4b5ae64..0000000000 --- a/target/linux/bcm53xx/patches-3.14/122-bcma-gpio-use-ChipCommon-GPIO-IRQ-on-BCM47XX-arch-on.patch +++ /dev/null @@ -1,37 +0,0 @@ -From dfe45880e4ac50ebaa57e5f8a52b69e7e74cb7ca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> -Date: Sun, 21 Sep 2014 20:40:32 +0200 -Subject: [PATCH] bcma: gpio: use ChipCommon GPIO IRQ on BCM47XX arch only -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GPIOs can be also used on bcm53xx, however this arch requires different -implementation of IRQ support. It uses different IRQ number (117) and -different masks & acking. - -Signed-off-by: Rafał Miłecki <zajec5@gmail.com> ---- - drivers/bcma/driver_gpio.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/bcma/driver_gpio.c -+++ b/drivers/bcma/driver_gpio.c -@@ -76,7 +76,7 @@ static void bcma_gpio_free(struct gpio_c - bcma_chipco_gpio_pullup(cc, 1 << gpio, 0); - } - --#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC) -+#if IS_BUILTIN(CONFIG_BCM47XX) - static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) - { - struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip); -@@ -215,7 +215,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c - chip->set = bcma_gpio_set_value; - chip->direction_input = bcma_gpio_direction_input; - chip->direction_output = bcma_gpio_direction_output; --#if IS_BUILTIN(CONFIG_BCMA_HOST_SOC) -+#if IS_BUILTIN(CONFIG_BCM47XX) - chip->to_irq = bcma_gpio_to_irq; - #endif - switch (cc->core->bus->chipinfo.id) { |