Skip to contentSkip to conversation

ARM: dts: omap4-panda: Update the LED support for the panda DTS

PATCH Superseded Dan Murphy 2 participants 3 messages May 31, 2013 Device tree bindings

v8 of 10 Superseded Latest is v10 →

lore
Share & tools
lore

Dan Murphy

author
#0 lore raw

PATCH v8 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.

---
v8 - Rebase to latest and use pinctrl macros - https://patchwork.kernel.org/patch/2629351/
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
index d5d144a..523a800 100644
@@ -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 GPIO_ACTIVE_HIGH>;
@@ -157,6 +162,15 @@
 	};
 };
 
+&omap4_pmx_wkup {
+	led_wkgpio_pins: pinmux_leds_wkpins {
+		pinctrl-single,pins = <
+			0x1a (PIN_OUTPUT | MUX_MODE3)	/* gpio_wk7 OUTPUT | MODE 3 */
+			0x1c (PIN_OUTPUT | MUX_MODE3)	/* gpio_wk8 OUTPUT | MODE 3 */
+		>;
+	};
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;
arch/arm/boot/dts/omap4-panda-es.dts +28 -0
index 5cfdf19..5551ec6 100644
@@ -34,3 +34,31 @@
 		0x5e (PIN_INPUT | MUX_MODE0)		/* hdmi_sda.hdmi_sda */
 		>;
 };
+
+&omap4_pmx_core {
+	led_gpio_pins: gpio_led_pmx {
+		pinctrl-single,pins = <
+			0xb6 (PIN_OUTPUT | MUX_MODE3)	/* gpio_110 OUTPUT | MODE 3 */
+		>;
+	};
+};
+
+&led_wkgpio_pins {
+	pinctrl-single,pins = <
+		0x1c (PIN_OUTPUT | MUX_MODE3)	/* 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
#1 lore raw
Quoted 42 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_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.

---
v8 - Rebase to latest and use pinctrl macros - https://patchwork.kernel.org/patch/2629351/
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 +6 -1
index d5d144a..523a800 100644
@@ -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 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/omap4-panda-common.dtsi line 169

Quoted 8 lines
arch/arm/boot/dts/omap4-panda-common.dtsi +5 -0
@@ -157,6 +162,15 @@
        };
 };
 
+&omap4_pmx_wkup {
+       led_wkgpio_pins: pinmux_leds_wkpins {
+               pinctrl-single,pins = <
+                       0x1a (PIN_OUTPUT | MUX_MODE3)   /* gpio_wk7 OUTPUT | MODE 3 */
+                       0x1c (PIN_OUTPUT | MUX_MODE3)   /* gpio_wk8 OUTPUT | MODE 3 */

Hello Dan,

The OUTPUT | MODE 3 in the comments were added so people shouldn't have to look at the TRM to find what each constant number meant. But now using the macros this is not needed anymore, so I don't think is necessary to keep that on the comments.

Best regards,
Javier

author
#2 lore raw
Quoted 53 lines · Javier Martinez Canillas
Quoted 42 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_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.

---
v8 - Rebase to latest and use pinctrl macros - https://patchwork.kernel.org/patch/2629351/
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 +6 -1
index d5d144a..523a800 100644
@@ -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 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/omap4-panda-common.dtsi line 169

Quoted 8 lines
arch/arm/boot/dts/omap4-panda-common.dtsi +5 -0
@@ -157,6 +162,15 @@
        };
 };
 
+&omap4_pmx_wkup {
+       led_wkgpio_pins: pinmux_leds_wkpins {
+               pinctrl-single,pins = <
+                       0x1a (PIN_OUTPUT | MUX_MODE3)   /* gpio_wk7 OUTPUT | MODE 3 */
+                       0x1c (PIN_OUTPUT | MUX_MODE3)   /* gpio_wk8 OUTPUT | MODE 3 */

Hello Dan,

Quoted 7 lines

The OUTPUT | MODE 3 in the comments were added so people shouldn't have to look at the TRM to find what each constant number meant. But now using the macros this is not needed anymore, so I don't think is necessary to keep that on the comments.

Best regards,
Javier

Yes you are correct sending update to remove the comments

Signature · 2 lines
------------------
Dan Murphy