d9bb8326fa
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
66 lines
2.1 KiB
Diff
66 lines
2.1 KiB
Diff
From 414f0ad9b3a8e8ee6eaf09c6d79d5f448ac28630 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Sat, 25 Jan 2014 17:03:07 +0100
|
|
Subject: [PATCH 07/17] ARM: BCM5301X: register bcma bus
|
|
|
|
---
|
|
arch/arm/boot/dts/bcm4708.dtsi | 58 ++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 58 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
|
@@ -95,12 +95,23 @@
|
|
};
|
|
};
|
|
|
|
+ nvram0: nvram@1c000000 {
|
|
+ compatible = "brcm,bcm47xx-nvram";
|
|
+ reg = <0x1c000000 0x01000000>;
|
|
+ };
|
|
+
|
|
+ sprom0: sprom@0 {
|
|
+ compatible = "brcm,bcm47xx-sprom";
|
|
+ nvram = <&nvram0>;
|
|
+ };
|
|
+
|
|
axi@18000000 {
|
|
compatible = "brcm,bus-axi";
|
|
reg = <0x18000000 0x1000>;
|
|
ranges = <0x00000000 0x18000000 0x00100000>;
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
+ sprom = <&sprom0>;
|
|
|
|
#interrupt-cells = <1>;
|
|
interrupt-map-mask = <0x000fffff 0xffff>;
|
|
@@ -108,6 +119,30 @@
|
|
/* ChipCommon */
|
|
<0x00000000 0 &gic GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
|
|
|
|
+ /* PCIe Controller 0 */
|
|
+ <0x00012000 0 &gic GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00012000 1 &gic GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00012000 2 &gic GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00012000 3 &gic GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00012000 4 &gic GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00012000 5 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
|
|
+
|
|
+ /* PCIe Controller 1 */
|
|
+ <0x00013000 0 &gic GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00013000 1 &gic GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00013000 2 &gic GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00013000 3 &gic GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00013000 4 &gic GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00013000 5 &gic GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>,
|
|
+
|
|
+ /* PCIe Controller 2 */
|
|
+ <0x00014000 0 &gic GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00014000 1 &gic GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00014000 2 &gic GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00014000 3 &gic GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00014000 4 &gic GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <0x00014000 5 &gic GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>,
|
|
+
|
|
/* USB 2.0 Controller */
|
|
<0x00021000 0 &gic GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>,
|
|
|