Skip to contentSkip to conversation

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

PATCH Superseded Dan Murphy 3 participants 5 messages May 17, 2013 – May 29, 2013 Device tree bindings

v6 of 10 Superseded Latest is v10 →

lore
Share & tools
lore

Dan Murphy

author
#0 lore raw

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

---
Changes in this version:
- review comments incorporated.
Previous version of this patch was discussed in:

	https://patchwork.kernel.org/patch/2582771/
 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 03bd60d..5fd59b3 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 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
index f1d8c21..c968a3b 100644
@@ -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
#1 lore raw
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_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.

Quoted 6 lines

---
Changes in this version:
- review comments incorporated.
Previous version of this patch was discussed in:

	https://patchwork.kernel.org/patch/2582771/

one minor nit,
$subject could do with space after the ':'
otherwise, it looks fine to me. Will suggest waiting for further reviewers if they have an opinion prior to a new rev.

Quoted 76 lines
 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 03bd60d..5fd59b3 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 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
index f1d8c21..c968a3b 100644
@@ -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 · 2 lines
Regards,
Nishanth Menon
author
#2 lore raw
Quoted 18 lines · Nishanth Menon
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_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.

Quoted 6 lines

---
Changes in this version:
- review comments incorporated.
Previous version of this patch was discussed in:

	https://patchwork.kernel.org/patch/2582771/
Quoted 4 lines

one minor nit,
$subject could do with space after the ':'
otherwise, it looks fine to me. Will suggest waiting for further reviewers if they have an opinion prior to a new rev.

Thanks NM I will queue up this change locally and await further review prior to sending v7.

Quoted 75 lines
Quoted 75 lines
 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 03bd60d..5fd59b3 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 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
index f1d8c21..c968a3b 100644
@@ -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 · 2 lines
------------------
Dan Murphy
author
#3 lore raw
Quoted 92 lines · Dan Murphy
Quoted 18 lines · Nishanth Menon
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_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.

Quoted 6 lines

---
Changes in this version:
- review comments incorporated.
Previous version of this patch was discussed in:

	https://patchwork.kernel.org/patch/2582771/
Quoted 4 lines

one minor nit,
$subject could do with space after the ':'
otherwise, it looks fine to me. Will suggest waiting for further reviewers if they have an opinion prior to a new rev.

Thanks NM I will queue up this change locally and await further review prior to sending v7.

Quoted 67 lines
Quoted 67 lines
 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 03bd60d..5fd59b3 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 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 +20 -0
index f1d8c21..c968a3b 100644
@@ -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
+	>;
Quoted 9 lines
Quoted 8 lines

arch/arm/boot/dts/omap4-panda-es.dts line 64

Quoted 8 lines
arch/arm/boot/dts/omap4-panda-es.dts +8 -0
+
+	heartbeat {
+		gpios = <&gpio4 14 0>;
+	};
+	mmc {
+		gpios = <&gpio1 8 0>;
+	};
+};

Any additional comments besides the headline?

If not I will post v7

Signature · 2 lines
------------------
Dan Murphy
#4 lore raw

Hi Dan,

Quoted 102 lines · Dan Murphy
Quoted 92 lines · Dan Murphy
Quoted 18 lines · Nishanth Menon
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_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.

Quoted 6 lines

---
Changes in this version:
- review comments incorporated.
Previous version of this patch was discussed in:

	https://patchwork.kernel.org/patch/2582771/
Quoted 4 lines

one minor nit,
$subject could do with space after the ':'
otherwise, it looks fine to me. Will suggest waiting for further reviewers if they have an opinion prior to a new rev.

Thanks NM I will queue up this change locally and await further review prior to sending v7.

Quoted 67 lines
Quoted 67 lines
  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 03bd60d..5fd59b3 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 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 +20 -0
index f1d8c21..c968a3b 100644
@@ -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
+	>;
Quoted 9 lines
Quoted 8 lines

arch/arm/boot/dts/omap4-panda-es.dts line 64

Quoted 8 lines
arch/arm/boot/dts/omap4-panda-es.dts +8 -0
+
+	heartbeat {
+		gpios = <&gpio4 14 0>;
+	};
+	mmc {
+		gpios = <&gpio1 8 0>;
+	};
+};
Quoted 3 lines

Any additional comments besides the headline?

If not I will post v7

Sorry for the delay.

Go ahead and I'll take it in my dts branch for 3.11.

Thanks,
Benoit