ARM: dts: omap4-panda: Update the LED support for the panda DTS
PATCH v7 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.
---
v7 - Update headline to add spaces - https://patchwork.kernel.org/patch/2583661/
v6 - Review comments updated - https://patchwork.kernel.org/patch/2582771/
v5 - Provide pincrtl phandle to the gpio-led driver - https://patchwork.kernel.org/patch/2573981/
arch/arm/boot/dts/omap4-panda-common.dtsi | 16 +++++++++++++++- arch/arm/boot/dts/omap4-panda-es.dts | 28 ++++++++++++++++++++++++++++ 2 files changed, 43 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 +28 -0
@@ -34,3 +34,31 @@ 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 { + pinctrl-0 = < + &led_gpio_pins + &led_wkgpio_pins + >; + + heartbeat { + gpios = <&gpio4 14 0>; + }; + mmc { + gpios = <&gpio1 8 0>; + }; +};
Signature · 1 line
1.7.5.4
Hi Dan,
Quoted 6 lines · Dan Murphy
The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es are different.
A1-A3 =
gpio_wk7clean
ES =gpio_110
Quoted 6 lines
There is no change to LED D2
Abstract away the pinmux and the LED definitions for the two boards into the respective DTS files.
Signed-off-by Dan Murphy <[email protected]>
That patch was good... until Florian introduces some new constant to improve the readability of the DTS [1].
Could you rebase on the lastest for_3.11/dts and use the macros for the GPIO and pinctrl nodes?
Thanks,
Benoit
[1] http://www.mail-archive.com/linux-omap at vger.kernel.org/msg89684.html
Quoted 81 lines
---
v7 - Update headline to add spaces - https://patchwork.kernel.org/patch/2583661/
v6 - Review comments updated - https://patchwork.kernel.org/patch/2582771/
v5 - Provide pincrtl phandle to the gpio-led driver - https://patchwork.kernel.org/patch/2573981/arch/arm/boot/dts/omap4-panda-common.dtsi | 16 +++++++++++++++- arch/arm/boot/dts/omap4-panda-es.dts | 28 ++++++++++++++++++++++++++++ 2 files changed, 43 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 +28
-0@@ -34,3 +34,31 @@ 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 { + pinctrl-0 = < + &led_gpio_pins + &led_wkgpio_pins + >; + + heartbeat { + gpios = <&gpio4 14 0>; + }; + mmc { + gpios = <&gpio1 8 0>; + }; +};
Hi
Quoted 14 lines · Benoit Cousson
Hi Dan,
Quoted 11 lines · Dan Murphy
The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es are different.
A1-A3 =
gpio_wk7clean
ES =gpio_110There is no change to LED D2
Abstract away the pinmux and the LED definitions for the two boards into the respective DTS files.
Quoted 6 lines
Quoted 1 line
Signed-off-by Dan Murphy <[email protected]>That patch was good... until Florian introduces some new constant to improve the readability of the DTS [1].
Could you rebase on the lastest for_3.11/dts and use the macros for the GPIO and pinctrl nodes?
N/P working on it now
Thanks
Quoted 5 lines
Thanks,
Benoit[1] http://www.mail-archive.com/linux-omap at vger.kernel.org/msg89684.html
Signature · 2 lines
------------------ Dan Murphy