ARM:dts:omap4-panda: Update the LED support for the panda DTS
PATCH v5 1/1 ARM:dts:omap4-panda: Update the LED support for the panda DTS
The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es are different.
A1-A3 = gpio_wk7
ES = gpio_110
There is no change to LED D2
Abstract away the pinmux and the LED definitions for the two boards into the respective DTS files.
---
v5 - Provide pincrtl phandle to the gpio-led driver
arch/arm/boot/dts/omap4-panda-common.dtsi | 16 ++++++++++++- arch/arm/boot/dts/omap4-panda-es.dts | 34 +++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletions(-)
arch/arm/boot/dts/omap4-panda-common.dtsi +15 -1
@@ -16,8 +16,13 @@ reg = <0x80000000 0x40000000>; /* 1 GB */ }; - leds { + leds: leds { compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = < + &led_wkgpio_pins + >; + heartbeat { label = "pandaboard::status1"; gpios = <&gpio1 7 0>;
@@ -137,6 +142,15 @@ }; }; +&omap4_pmx_wkup { + led_wkgpio_pins: pinmux_leds_wkpins { + pinctrl-single,pins = < + 0x1a 0x3 /* gpio_wk7 OUTPUT | MODE 3 */ + 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */ + >; + }; +}; + &i2c1 { pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>;
arch/arm/boot/dts/omap4-panda-es.dts +34 -0
@@ -34,3 +34,37 @@ 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ >; }; + +&omap4_pmx_core { + led_gpio_pins: gpio_led_pmx { + pinctrl-single,pins = < + 0xb6 0x3 /* gpio_110 OUTPUT | MODE 3 */ + >; + }; +}; + +&led_wkgpio_pins { + pinctrl-single,pins = < + 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */ + >; +}; + +&leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = < + &led_gpio_pins + &led_wkgpio_pins + >; + + heartbeat { + label = "pandaboard::status1"; + gpios = <&gpio4 14 0>; + linux,default-trigger = "heartbeat"; + }; + mmc { + label = "pandaboard::status2"; + gpios = <&gpio1 8 0>; + linux,default-trigger = "mmc0"; + }; +};
Signature · 1 line
1.7.5.4
On 08:21-20130517, Dan Murphy wrote:
[...]
May be others with better DT experience can help here.. but here is a trick to reduce dts file changes:
Quoted 16 lines
arch/arm/boot/dts/omap4-panda-es.dts +8
-0@@ -34,3 +34,37 @@ 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ >; }; + +&omap4_pmx_core { + led_gpio_pins: gpio_led_pmx { + pinctrl-single,pins = < + 0xb6 0x3 /* gpio_110 OUTPUT | MODE 3 */ + >; + }; +};
arch/arm/boot/dts/omap4-panda-es.dts line 54
Quoted 10 lines
arch/arm/boot/dts/omap4-panda-es.dts +10
-0+ +&led_wkgpio_pins { + pinctrl-single,pins = < + 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */ + >; +}; + +&leds { + compatible = "gpio-leds"; + pinctrl-names = "default";
Normally, override will either add (if new param) OR replace (if same param)
So the above two are superfluous.
arch/arm/boot/dts/omap4-panda-es.dts line 58
Quoted 4 lines
arch/arm/boot/dts/omap4-panda-es.dts +4
-0+ pinctrl-0 = < + &led_gpio_pins + &led_wkgpio_pins + >;
These are needed
arch/arm/boot/dts/omap4-panda-es.dts line 61
Quoted 3 lines
arch/arm/boot/dts/omap4-panda-es.dts +3
-0+ + heartbeat { + label = "pandaboard::status1";
can drop this
arch/arm/boot/dts/omap4-panda-es.dts line 62
Quoted 1 line
arch/arm/boot/dts/omap4-panda-es.dts +1
-0+ gpios = <&gpio4 14 0>;
needed
arch/arm/boot/dts/omap4-panda-es.dts line 63
Quoted 1 line
arch/arm/boot/dts/omap4-panda-es.dts +1
-0+ linux,default-trigger = "heartbeat";
can be dropped
arch/arm/boot/dts/omap4-panda-es.dts line 66
Quoted 3 lines
arch/arm/boot/dts/omap4-panda-es.dts +3
-0+ }; + mmc { + label = "pandaboard::status2";
could be dropped
arch/arm/boot/dts/omap4-panda-es.dts line 67
Quoted 1 line
arch/arm/boot/dts/omap4-panda-es.dts +1
-0+ gpios = <&gpio1 8 0>;
needed
arch/arm/boot/dts/omap4-panda-es.dts line 68
Quoted 1 line
arch/arm/boot/dts/omap4-panda-es.dts +1
-0+ linux,default-trigger = "mmc0";
could be dropped.
Signature · 2 lines
Regards, Nishanth Menon