diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-07 21:53:20 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-07 21:53:20 +0000 |
commit | d9bb8326fa2cb6f964a6dcdf841e2e9551ee7899 (patch) | |
tree | ded871d0ae0a461cb985370b267b456ab6851c82 /target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch | |
parent | 7a65768ddca031ec9d450366881c5958a687a996 (diff) | |
download | upstream-d9bb8326fa2cb6f964a6dcdf841e2e9551ee7899.tar.gz upstream-d9bb8326fa2cb6f964a6dcdf841e2e9551ee7899.tar.bz2 upstream-d9bb8326fa2cb6f964a6dcdf841e2e9551ee7899.zip |
kernel: update bcma and ssb to wireless-testing master-2014-12-05
This brings ssb and bcma to wireless-testing tag master-2014-12-05
In addition it also adds the ARM-BCM5301X-Add-IRQs-to-Broadcom-s-bus-
axi-in-DTS-f.patch which adds the irq number in a way it is done in the
mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 43544
Diffstat (limited to 'target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch b/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch deleted file mode 100644 index e38b5bc1c6..0000000000 --- a/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6611afa6c49434780096cdf2c1028f0ac277f9bc Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens <hauke@hauke-m.de> -Date: Thu, 9 Jan 2014 19:40:14 +0100 -Subject: [PATCH v3 2/2] bcma: get IRQ numbers from dt - -It is not possible to auto detect the irq numbers used by the cores on -an arm SoC. If bcma was registered with device tree it will search for -some device tree nodes with the irq number and add it to the core -configuration. - -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> ---- - drivers/bcma/main.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 48 insertions(+), 1 deletion(-) - ---- a/drivers/bcma/main.c -+++ b/drivers/bcma/main.c -@@ -10,6 +10,7 @@ - #include <linux/platform_device.h> - #include <linux/bcma/bcma.h> - #include <linux/slab.h> -+#include <linux/of_irq.h> - #include <linux/of_address.h> - - MODULE_DESCRIPTION("Broadcom's specific AMBA driver"); -@@ -159,8 +160,10 @@ static void bcma_of_fill_device(struct p - struct device_node *node; - - node = bcma_of_find_child_device(parent, core); -- if (node) -- core->dev.of_node = node; -+ if (!node) -+ return; -+ core->dev.of_node = node; -+ core->irq = irq_of_parse_and_map(node, 0); - } - #else - static void bcma_of_fill_device(struct platform_device *parent, |