Skip to contentSkip to conversation

arm: kirkwood: sheevaplug: move pinmux configs to the right devices

PATCH New Simon Baatz 3 participants 3 messages Jun 4, 2013 – Jun 5, 2013 Device tree bindings

lore
Share & tools
lore

Simon Baatz

author
#0 lore raw

PATCH 1/1 arm: kirkwood: sheevaplug: move pinmux configs to the right devices

When the pinmux mechanism was added in Kirkwood, the device driver core was not yet providing the possibility of attaching pinmux configurations to all devices, drivers had to do it explicitly, and not all drivers were doing this.

Now that the driver core does that in a generic way, it makes sense to attach the pinmux configuration to their corresponding devices.

Signed-off-by Simon Baatz <[email protected]>

---

Hi,

the patch series by Thomas to move the pinmux configs was prepared in parallel to the dts files for Sheevaplug. Here is the corresponding patch in order to adapt these files as well.

- Simon

 arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi |   16 ++++++----------
 arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts   |   21 ++++++++++++---------
 arch/arm/boot/dts/kirkwood-sheevaplug.dts         |   18 ++++++++----------
 3 files changed, 26 insertions(+), 29 deletions(-)
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi +6 -10
index 9d59475..f7143f1 100644
@@ -44,10 +44,14 @@
 			};
 		};
 		serial at 12000 {
+			pinctrl-0 = <&pmx_uart0>;
+			pinctrl-names = "default";
 			status = "okay";
 		};
 
 		nand at 3000000 {
+			pinctrl-0 = <&pmx_nand>;
+			pinctrl-names = "default";
 			status = "okay";
 
 			partition at 0 {

@@ -71,6 +75,8 @@
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <0>;
+		pinctrl-0 = <&pmx_usb_power_enable>;
+		pinctrl-names = "default";
 
 		usb_power: regulator at 1 {
 			compatible = "regulator-fixed";

@@ -84,14 +90,4 @@
 			gpio = <&gpio0 29 0>;
 		};
 	};
-
-	gpio-leds {
-		compatible = "gpio-leds";
-
-		health {
-			label = "sheevaplug:blue:health";
-			gpios = <&gpio1 17 1>;
-			linux,default-trigger = "default-on";
-		};
-	};
 };
arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts +12 -9
index 1c6946a..f620ce4 100644
@@ -15,15 +15,6 @@
 	compatible = "globalscale,sheevaplug-esata-rev13", "globalscale,sheevaplug-esata", "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
 	ocp at f1000000 {
-		pinctrl: pinctrl at 10000 {
-
-			pinctrl-0 = < &pmx_nand &pmx_uart0
-				      &pmx_usb_power_enable
-				      &pmx_led_blue>;
-			pinctrl-names = "default";
-
-		};
-
 		sata at 80000 {
 			status = "okay";
 			nr-ports = <2>;

@@ -37,4 +28,16 @@
 			wp-gpios = <&gpio1 15 0>;
 		};
 	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+		pinctrl-0 = <&pmx_led_blue>;
+		pinctrl-names = "default";
+
+		health {
+			label = "sheevaplug:blue:health";
+			gpios = <&gpio1 17 1>;
+			linux,default-trigger = "default-on";
+		};
+	};
 };
arch/arm/boot/dts/kirkwood-sheevaplug.dts +8 -10
index f7684066..bf1dff2 100644
@@ -15,16 +15,6 @@
 	compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
 	ocp at f1000000 {
-		pinctrl: pinctrl at 10000 {
-
-			pinctrl-0 = < &pmx_nand &pmx_uart0
-				      &pmx_usb_power_enable
-				      &pmx_led_red
-				      &pmx_led_blue>;
-			pinctrl-names = "default";
-
-		};
-
 		mvsdio at 90000 {
 			pinctrl-0 = <&pmx_sdio>;
 			pinctrl-names = "default";

@@ -36,6 +26,14 @@
 
 	gpio-leds {
 		compatible = "gpio-leds";
+		pinctrl-0 = <&pmx_led_blue &pmx_led_red>;
+		pinctrl-names = "default";
+
+		health {
+			label = "sheevaplug:blue:health";
+			gpios = <&gpio1 17 1>;
+			linux,default-trigger = "default-on";
+		};
 
 		misc {
 			label = "sheevaplug:red:misc";
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 arm: kirkwood: sheevaplug: move pinmux configs to the right devices

Dear Simon Baatz,

Quoted 9 lines · Simon Baatz

When the pinmux mechanism was added in Kirkwood, the device driver core was not yet providing the possibility of attaching pinmux configurations to all devices, drivers had to do it explicitly, and not all drivers were doing this.

Now that the driver core does that in a generic way, it makes sense to attach the pinmux configuration to their corresponding devices.

Signed-off-by Simon Baatz <[email protected]>
Reviewed-by Thomas Petazzoni <[email protected]>
Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Applied
#2 lore raw

PATCH 1/1 arm: kirkwood: sheevaplug: move pinmux configs to the right devices

In reply to Simon Baatz
Quoted 17 lines · Simon Baatz

When the pinmux mechanism was added in Kirkwood, the device driver core was not yet providing the possibility of attaching pinmux configurations to all devices, drivers had to do it explicitly, and not all drivers were doing this.

Now that the driver core does that in a generic way, it makes sense to attach the pinmux configuration to their corresponding devices.

Signed-off-by Simon Baatz <[email protected]>

---

Hi,

the patch series by Thomas to move the pinmux configs was prepared in parallel to the dts files for Sheevaplug. Here is the corresponding patch in order to adapt these files as well.

Quoted 6 lines

- Simon

 arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi |   16 ++++++----------
 arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts   |   21 ++++++++++++---------
 arch/arm/boot/dts/kirkwood-sheevaplug.dts         |   18 ++++++++----------
 3 files changed, 26 insertions(+), 29 deletions(-)

Applied to mvebu/dt with Thomas' Reviewed-by.

thx,

Jason.