diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-09-08 19:50:53 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-09-08 19:50:53 +0000 |
| commit | 347649a7ee3c358821e84b825292d6198fdc2b12 (patch) | |
| tree | efbd0a4b3cafa6c87a13c660ba85c9149efbf36f /target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch | |
| parent | 6ed55cedbdd519bc568fa202193557d6ea496c0d (diff) | |
| download | master-187ad058-347649a7ee3c358821e84b825292d6198fdc2b12.tar.gz master-187ad058-347649a7ee3c358821e84b825292d6198fdc2b12.tar.bz2 master-187ad058-347649a7ee3c358821e84b825292d6198fdc2b12.zip | |
kernel: add bcma patches sent upstream but not pushed yet
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42448 3c298f89-4303-0410-b956-a3cf2f4a3e73
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, 19 insertions, 19 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 index d9a831c923..02cf1ea9b5 100644 --- 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 @@ -24,8 +24,8 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> MODULE_DESCRIPTION("Broadcom's specific AMBA driver"); MODULE_LICENSE("GPL"); -@@ -120,6 +122,38 @@ static void bcma_release_core_dev(struct - kfree(core); +@@ -131,6 +133,38 @@ static bool bcma_is_core_needed_early(u1 + return false; } +static struct device_node *bcma_of_find_child_device(struct platform_device *parent, @@ -60,21 +60,21 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> + core->irq = irq_of_parse_and_map(node, 0); +} + - static int bcma_register_cores(struct bcma_bus *bus) + static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core) { - struct bcma_device *core; -@@ -155,7 +189,13 @@ static int bcma_register_cores(struct bc - break; - case BCMA_HOSTTYPE_SOC: - core->dev.dma_mask = &core->dev.coherent_dma_mask; -- core->dma_dev = &core->dev; -+ if (bus->host_pdev) { -+ core->dma_dev = &bus->host_pdev->dev; -+ core->dev.parent = &bus->host_pdev->dev; -+ bcma_of_fill_device(bus->host_pdev, core); -+ } else { -+ core->dma_dev = &core->dev; -+ } - break; - case BCMA_HOSTTYPE_SDIO: - break; + int err; +@@ -147,7 +181,13 @@ static void bcma_register_core(struct bc + break; + case BCMA_HOSTTYPE_SOC: + core->dev.dma_mask = &core->dev.coherent_dma_mask; +- core->dma_dev = &core->dev; ++ if (bus->host_pdev) { ++ core->dma_dev = &bus->host_pdev->dev; ++ core->dev.parent = &bus->host_pdev->dev; ++ bcma_of_fill_device(bus->host_pdev, core); ++ } else { ++ core->dma_dev = &core->dev; ++ } + break; + case BCMA_HOSTTYPE_SDIO: + break; |