diff options
| author | John Crispin <john@openwrt.org> | 2015-02-11 10:17:55 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-02-11 10:17:55 +0000 |
| commit | 408c9696264f8e25e4e4f6410e93d2edd06e59dd (patch) | |
| tree | 1c9e8fbacb1508e8561c43f87389edf02cfb0955 /target/linux/brcm2708/patches-3.18/0069-Fix-the-activity-LED-in-DT-mode.patch | |
| parent | f90d9d486a8842077e68e90bba2b276ac1336bab (diff) | |
| download | upstream-408c9696264f8e25e4e4f6410e93d2edd06e59dd.tar.gz upstream-408c9696264f8e25e4e4f6410e93d2edd06e59dd.tar.bz2 upstream-408c9696264f8e25e4e4f6410e93d2edd06e59dd.zip | |
brcm2708: update to v3.18
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 44392
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0069-Fix-the-activity-LED-in-DT-mode.patch')
| -rwxr-xr-x | target/linux/brcm2708/patches-3.18/0069-Fix-the-activity-LED-in-DT-mode.patch | 137 |
1 files changed, 137 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0069-Fix-the-activity-LED-in-DT-mode.patch b/target/linux/brcm2708/patches-3.18/0069-Fix-the-activity-LED-in-DT-mode.patch new file mode 100755 index 0000000000..9972321998 --- /dev/null +++ b/target/linux/brcm2708/patches-3.18/0069-Fix-the-activity-LED-in-DT-mode.patch @@ -0,0 +1,137 @@ +From 31b85ba13aa394c98f2d6955b55f3f9a0623c14d Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.org> +Date: Tue, 6 Jan 2015 12:06:55 +0000 +Subject: [PATCH 069/114] Fix the activity LED in DT mode + +Add a "leds" node to the base DTBs, and a subnode for the activity +LED. You can change the LED function like this: + + dtparam=act_led_trigger=heartbeat + +Add aliases for the other main nodes (soc, intc). + +Issue: linux #757 +--- + arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 18 ++++++++++++++---- + arch/arm/boot/dts/bcm2708-rpi-b.dts | 18 ++++++++++++++---- + arch/arm/boot/dts/bcm2708.dtsi | 11 ++++++++++- + 3 files changed, 38 insertions(+), 9 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +index d9886c3..95f03ba 100644 +--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +@@ -7,11 +7,14 @@ + model = "Raspberry Pi Model B+"; + + aliases { ++ soc = &soc; + spi0 = &spi0; + i2c0 = &i2c0; + i2c1 = &i2c1; + i2s = &i2s; + gpio = &gpio; ++ intc = &intc; ++ leds = &leds; + sound = &sound; + }; + +@@ -80,12 +83,19 @@ + pinctrl-0 = <&i2s_pins>; + }; + ++&act_led { ++ gpios = <&gpio 47 0>; ++}; + + / { + __overrides__ { +- i2s = <&i2s>,"status"; +- spi = <&spi0>,"status"; +- i2c0 = <&i2c0>,"status"; +- i2c1 = <&i2c1>,"status"; ++ i2s = <&i2s>,"status"; ++ spi = <&spi0>,"status"; ++ i2c0 = <&i2c0>,"status"; ++ i2c1 = <&i2c1>,"status"; ++ ++ act_led_gpio = <&act_led>,"gpios:4"; ++ act_led_activelow = <&act_led>,"gpios:8"; ++ act_led_trigger = <&act_led>,"linux,default-trigger"; + }; + }; +diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts +index 167b22b..0631f45 100644 +--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts ++++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts +@@ -7,11 +7,14 @@ + model = "Raspberry Pi Model B"; + + aliases { ++ soc = &soc; + spi0 = &spi0; + i2c0 = &i2c0; + i2c1 = &i2c1; + i2s = &i2s; + gpio = &gpio; ++ intc = &intc; ++ leds = &leds; + sound = &sound; + }; + +@@ -80,12 +83,19 @@ + pinctrl-0 = <&i2s_pins>; + }; + ++&act_led { ++ gpios = <&gpio 16 1>; ++}; + + / { + __overrides__ { +- i2s = <&i2s>,"status"; +- spi = <&spi0>,"status"; +- i2c0 = <&i2c0>,"status"; +- i2c1 = <&i2c1>,"status"; ++ i2s = <&i2s>,"status"; ++ spi = <&spi0>,"status"; ++ i2c0 = <&i2c0>,"status"; ++ i2c1 = <&i2c1>,"status"; ++ ++ act_led_gpio = <&act_led>,"gpios:4"; ++ act_led_activelow = <&act_led>,"gpios:8"; ++ act_led_trigger = <&act_led>,"linux,default-trigger"; + }; + }; +diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi +index 6b36128..1b56cb5 100644 +--- a/arch/arm/boot/dts/bcm2708.dtsi ++++ b/arch/arm/boot/dts/bcm2708.dtsi +@@ -11,7 +11,7 @@ + bootargs = ""; + }; + +- soc { ++ soc: soc { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; +@@ -76,6 +76,15 @@ + #size-cells = <0>; + status = "disabled"; + }; ++ ++ leds: leds { ++ compatible = "gpio-leds"; ++ ++ act_led: act { ++ label = "ACT"; ++ linux,default-trigger = "mmc0"; ++ }; ++ }; + }; + + clocks { +-- +1.8.3.2 + |