bcm53xx: add BCM5301X patches sent upstream (bus and R6250 LEDs)

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 42711
This commit is contained in:
Rafał Miłecki 2014-10-01 13:38:50 +00:00
parent 59b965194d
commit 1421516e65
3 changed files with 123 additions and 14 deletions

View file

@ -0,0 +1,48 @@
From a2533caee935fff97e3e8dbfad5cc159e6bf6034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Wed, 1 Oct 2014 09:21:07 +0200
Subject: [PATCH 1/2] ARM: BCM5301X: Add Broadcom's bus-axi to the DTS file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
arch/arm/boot/dts/bcm5301x.dtsi | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 53c624f..6d80922 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -8,6 +8,7 @@
* Licensed under the GNU/GPL. See COPYING for details.
*/
+#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
@@ -92,4 +93,19 @@
clock-frequency = <400000000>;
};
};
+
+ axi@18000000 {
+ compatible = "brcm,bus-axi";
+ reg = <0x18000000 0x1000>;
+ ranges = <0x00000000 0x18000000 0x00100000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ chipcommon: chipcommon@0 {
+ reg = <0x00000000 0x1000>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+ };
};
--
1.8.4.5

View file

@ -0,0 +1,59 @@
From b7e4d148906685882a081e7e50692313c5a8724e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Wed, 1 Oct 2014 09:23:09 +0200
Subject: [PATCH 2/2] ARM: BCM5301X: Add LEDs for Netgear R6250 V1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 34 +++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
index 3b5259d..58d999d 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
@@ -32,4 +32,38 @@
status = "okay";
};
};
+
+ leds {
+ compatible = "gpio-leds";
+
+ logo {
+ label = "bcm53xx:white:logo";
+ gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "default-on";
+ };
+
+ power0 {
+ label = "bcm53xx:green:power";
+ gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "default-off";
+ };
+
+ power1 {
+ label = "bcm53xx:amber:power";
+ gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "default-on";
+ };
+
+ usb {
+ label = "bcm53xx:blue:usb";
+ gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "default-off";
+ };
+
+ wireless {
+ label = "bcm53xx:blue:wireless";
+ gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "default-off";
+ };
+ };
};
--
1.8.4.5

View file

@ -9,11 +9,10 @@ Subject: [PATCH 07/17] ARM: BCM5301X: register bcma bus
--- a/arch/arm/boot/dts/bcm5301x.dtsi --- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -92,4 +92,100 @@ @@ -94,18 +94,102 @@
clock-frequency = <400000000>;
}; };
}; };
+
+ nvram0: nvram@1c000000 { + nvram0: nvram@1c000000 {
+ compatible = "brcm,bcm47xx-nvram"; + compatible = "brcm,bcm47xx-nvram";
+ reg = <0x1c000000 0x01000000>; + reg = <0x1c000000 0x01000000>;
@ -24,18 +23,21 @@ Subject: [PATCH 07/17] ARM: BCM5301X: register bcma bus
+ nvram = <&nvram0>; + nvram = <&nvram0>;
+ }; + };
+ +
+ axi@18000000 { axi@18000000 {
+ compatible = "brcm,bus-axi"; compatible = "brcm,bus-axi";
+ reg = <0x18000000 0x1000>; reg = <0x18000000 0x1000>;
+ ranges = <0x00000000 0x18000000 0x00100000>; ranges = <0x00000000 0x18000000 0x00100000>;
+ #address-cells = <1>; #address-cells = <1>;
+ #size-cells = <1>; #size-cells = <1>;
+ sprom = <&sprom0>; + sprom = <&sprom0>;
+
+ chipcommon@0 { chipcommon: chipcommon@0 {
+ reg = <0x00000000 0x1000>; reg = <0x00000000 0x1000>;
+ interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+ };
gpio-controller;
#gpio-cells = <2>;
};
+ +
+ pcie@12000 { + pcie@12000 {
+ reg = <0x00012000 0x1000>; + reg = <0x00012000 0x1000>;
@ -107,6 +109,6 @@ Subject: [PATCH 07/17] ARM: BCM5301X: register bcma bus
+ <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; + <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+ };
+ }; + };
}; };
};