diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-10-01 13:38:50 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-10-01 13:38:50 +0000 |
| commit | 1421516e6510e779a758589922e44f562393400c (patch) | |
| tree | 65fa03437e0bd8f6c193db7d404d917d3b149bd0 /target/linux | |
| parent | 59b965194d600dd0b5b02c03a514727274bb051c (diff) | |
| download | master-31e0f0ae-1421516e6510e779a758589922e44f562393400c.tar.gz master-31e0f0ae-1421516e6510e779a758589922e44f562393400c.tar.bz2 master-31e0f0ae-1421516e6510e779a758589922e44f562393400c.zip | |
bcm53xx: add BCM5301X patches sent upstream (bus and R6250 LEDs)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 42711
Diffstat (limited to 'target/linux')
3 files changed, 123 insertions, 14 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/046-ARM-BCM5301X-Add-Broadcom-s-bus-axi-to-the-DTS-file.patch b/target/linux/bcm53xx/patches-3.14/046-ARM-BCM5301X-Add-Broadcom-s-bus-axi-to-the-DTS-file.patch new file mode 100644 index 0000000000..1051b58d45 --- /dev/null +++ b/target/linux/bcm53xx/patches-3.14/046-ARM-BCM5301X-Add-Broadcom-s-bus-axi-to-the-DTS-file.patch @@ -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 + diff --git a/target/linux/bcm53xx/patches-3.14/047-ARM-BCM5301X-Add-LEDs-for-Netgear-R6250-V1.patch b/target/linux/bcm53xx/patches-3.14/047-ARM-BCM5301X-Add-LEDs-for-Netgear-R6250-V1.patch new file mode 100644 index 0000000000..5a18b643df --- /dev/null +++ b/target/linux/bcm53xx/patches-3.14/047-ARM-BCM5301X-Add-LEDs-for-Netgear-R6250-V1.patch @@ -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 + diff --git a/target/linux/bcm53xx/patches-3.14/130-ARM-BCM5301X-register-bcma-bus.patch b/target/linux/bcm53xx/patches-3.14/130-ARM-BCM5301X-register-bcma-bus.patch index 0e576c68f2..024123f9d3 100644 --- a/target/linux/bcm53xx/patches-3.14/130-ARM-BCM5301X-register-bcma-bus.patch +++ b/target/linux/bcm53xx/patches-3.14/130-ARM-BCM5301X-register-bcma-bus.patch @@ -9,11 +9,10 @@ Subject: [PATCH 07/17] ARM: BCM5301X: register bcma bus --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi -@@ -92,4 +92,100 @@ - clock-frequency = <400000000>; +@@ -94,18 +94,102 @@ }; }; -+ + + nvram0: nvram@1c000000 { + compatible = "brcm,bcm47xx-nvram"; + reg = <0x1c000000 0x01000000>; @@ -24,18 +23,21 @@ Subject: [PATCH 07/17] ARM: BCM5301X: register bcma bus + nvram = <&nvram0>; + }; + -+ axi@18000000 { -+ compatible = "brcm,bus-axi"; -+ reg = <0x18000000 0x1000>; -+ ranges = <0x00000000 0x18000000 0x00100000>; -+ #address-cells = <1>; -+ #size-cells = <1>; + axi@18000000 { + compatible = "brcm,bus-axi"; + reg = <0x18000000 0x1000>; + ranges = <0x00000000 0x18000000 0x00100000>; + #address-cells = <1>; + #size-cells = <1>; + sprom = <&sprom0>; -+ -+ chipcommon@0 { -+ reg = <0x00000000 0x1000>; + + chipcommon: chipcommon@0 { + reg = <0x00000000 0x1000>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; -+ }; + + gpio-controller; + #gpio-cells = <2>; + }; + + pcie@12000 { + reg = <0x00012000 0x1000>; @@ -108,5 +110,5 @@ Subject: [PATCH 07/17] ARM: BCM5301X: register bcma bus + <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; + }; -+ }; + }; }; |