linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: dts: mx5: Split M53EVK into SoM and EVK parts
@ 2014-06-25 18:48 Marek Vasut
  2014-06-25 18:48 ` [PATCH 2/2] ARM: dts: mxs: Split M28EVK " Marek Vasut
  2014-06-28 15:15 ` [PATCH 1/2] ARM: dts: mx5: Split M53EVK " Shawn Guo
  0 siblings, 2 replies; 8+ messages in thread
From: Marek Vasut @ 2014-06-25 18:48 UTC (permalink / raw)
  To: linux-arm-kernel

This patch splits the M53EVK device tree file into a common SoM
part and an EVK part. This is needed to make it easier for users
of the SoM to put it into different, non-reference baseboard.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx53-m53.dtsi   | 140 +++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/imx53-m53evk.dts | 112 +----------------------------
 2 files changed, 143 insertions(+), 109 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx53-m53.dtsi

diff --git a/arch/arm/boot/dts/imx53-m53.dtsi b/arch/arm/boot/dts/imx53-m53.dtsi
new file mode 100644
index 0000000..87a7fc7
--- /dev/null
+++ b/arch/arm/boot/dts/imx53-m53.dtsi
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2014 Marek Vasut <marex@denx.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include "imx53.dtsi"
+
+/ {
+	model = "DENX M53";
+	compatible = "denx,imx53-m53", "fsl,imx53";
+
+	memory {
+		reg = <0x70000000 0x20000000>,
+		      <0xb0000000 0x20000000>;
+	};
+
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		reg_3p2v: regulator at 0 {
+			compatible = "regulator-fixed";
+			reg = <0>;
+			regulator-name = "3P2V";
+			regulator-min-microvolt = <3200000>;
+			regulator-max-microvolt = <3200000>;
+			regulator-always-on;
+		};
+
+		reg_backlight: regulator at 1 {
+			compatible = "regulator-fixed";
+			reg = <1>;
+			regulator-name = "lcd-supply";
+			regulator-min-microvolt = <3200000>;
+			regulator-max-microvolt = <3200000>;
+			regulator-always-on;
+		};
+	};
+};
+
+&i2c2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c2>;
+	clock-frequency = <400000>;
+	status = "okay";
+
+	stmpe610 at 41 {
+		compatible = "st,stmpe610";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x41>;
+		id = <0>;
+		blocks = <0x5>;
+		interrupts = <6 0x0>;
+		interrupt-parent = <&gpio7>;
+		irq-trigger = <0x1>;
+
+		stmpe_touchscreen {
+			compatible = "st,stmpe-ts";
+			reg = <0>;
+			st,sample-time = <4>;
+			st,mod-12b = <1>;
+			st,ref-sel = <0>;
+			st,adc-freq = <1>;
+			st,ave-ctrl = <3>;
+			st,touch-det-delay = <3>;
+			st,settling = <4>;
+			st,fraction-z = <7>;
+			st,i-drive = <1>;
+		};
+	};
+
+	eeprom: eeprom at 50 {
+		compatible = "atmel,24c128";
+		reg = <0x50>;
+		pagesize = <32>;
+	};
+
+	rtc: rtc at 68 {
+		compatible = "stm,m41t62";
+		reg = <0x68>;
+	};
+};
+
+&iomuxc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
+	imx53-m53evk {
+		pinctrl_hog: hoggrp {
+			fsl,pins = <
+				MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK	0x80000000
+				MX53_PAD_EIM_EB3__GPIO2_31		0x80000000
+				MX53_PAD_PATA_DA_0__GPIO7_6		0x80000000
+			>;
+		};
+
+		pinctrl_i2c2: i2c2grp {
+			fsl,pins = <
+				MX53_PAD_EIM_D16__I2C2_SDA		0xc0000000
+				MX53_PAD_EIM_EB2__I2C2_SCL		0xc0000000
+			>;
+		};
+
+		pinctrl_nand: nandgrp {
+			fsl,pins = <
+				MX53_PAD_NANDF_WE_B__EMI_NANDF_WE_B	0x4
+				MX53_PAD_NANDF_RE_B__EMI_NANDF_RE_B	0x4
+				MX53_PAD_NANDF_CLE__EMI_NANDF_CLE	0x4
+				MX53_PAD_NANDF_ALE__EMI_NANDF_ALE	0x4
+				MX53_PAD_NANDF_WP_B__EMI_NANDF_WP_B	0xe0
+				MX53_PAD_NANDF_RB0__EMI_NANDF_RB_0	0xe0
+				MX53_PAD_NANDF_CS0__EMI_NANDF_CS_0	0x4
+				MX53_PAD_PATA_DATA0__EMI_NANDF_D_0	0xa4
+				MX53_PAD_PATA_DATA1__EMI_NANDF_D_1	0xa4
+				MX53_PAD_PATA_DATA2__EMI_NANDF_D_2	0xa4
+				MX53_PAD_PATA_DATA3__EMI_NANDF_D_3	0xa4
+				MX53_PAD_PATA_DATA4__EMI_NANDF_D_4	0xa4
+				MX53_PAD_PATA_DATA5__EMI_NANDF_D_5	0xa4
+				MX53_PAD_PATA_DATA6__EMI_NANDF_D_6	0xa4
+				MX53_PAD_PATA_DATA7__EMI_NANDF_D_7	0xa4
+			>;
+		};
+	};
+};
+
+&nfc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_nand>;
+	nand-bus-width = <8>;
+	nand-ecc-mode = "hw";
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index 0689c1e..1883d0d 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -10,17 +10,12 @@
  */
 
 /dts-v1/;
-#include "imx53.dtsi"
+#include "imx53-m53.dtsi"
 
 / {
 	model = "DENX M53EVK";
 	compatible = "denx,imx53-m53evk", "fsl,imx53";
 
-	memory {
-		reg = <0x70000000 0x20000000>,
-		      <0xb0000000 0x20000000>;
-	};
-
 	display1: display at di1 {
 		compatible = "fsl,imx-parallel-display";
 		interface-pix-fmt = "bgr666";
@@ -81,25 +76,6 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		reg_3p2v: regulator at 0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "3P2V";
-			regulator-min-microvolt = <3200000>;
-			regulator-max-microvolt = <3200000>;
-			regulator-always-on;
-		};
-
-
-		reg_backlight: regulator at 1 {
-			compatible = "regulator-fixed";
-			reg = <1>;
-			regulator-name = "lcd-supply";
-			regulator-min-microvolt = <3200000>;
-			regulator-max-microvolt = <3200000>;
-			regulator-always-on;
-		};
-
 		reg_usbh1_vbus: regulator at 3 {
 			compatible = "regulator-fixed";
 			reg = <3>;
@@ -174,50 +150,6 @@
 	};
 };
 
-&i2c2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c2>;
-	clock-frequency = <400000>;
-	status = "okay";
-
-	stmpe610 at 41 {
-		compatible = "st,stmpe610";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		reg = <0x41>;
-		id = <0>;
-		blocks = <0x5>;
-		interrupts = <6 0x0>;
-		interrupt-parent = <&gpio7>;
-		irq-trigger = <0x1>;
-
-		stmpe_touchscreen {
-			compatible = "st,stmpe-ts";
-			reg = <0>;
-			st,sample-time = <4>;
-			st,mod-12b = <1>;
-			st,ref-sel = <0>;
-			st,adc-freq = <1>;
-			st,ave-ctrl = <3>;
-			st,touch-det-delay = <3>;
-			st,settling = <4>;
-			st,fraction-z = <7>;
-			st,i-drive = <1>;
-		};
-	};
-
-	eeprom: eeprom at 50 {
-		compatible = "atmel,24c128";
-		reg = <0x50>;
-		pagesize = <32>;
-	};
-
-	rtc: rtc at 68 {
-		compatible = "stm,m41t62";
-		reg = <0x68>;
-	};
-};
-
 &i2c3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c3>;
@@ -226,14 +158,11 @@
 
 &iomuxc {
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_hog>;
+	pinctrl-0 = <&pinctrl_hog &pinctrl_usb>;
 
 	imx53-m53evk {
-		pinctrl_hog: hoggrp {
+		pinctrl_usb: usbgrp {
 			fsl,pins = <
-				MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK	0x80000000
-				MX53_PAD_EIM_EB3__GPIO2_31		0x80000000
-				MX53_PAD_PATA_DA_0__GPIO7_6		0x80000000
 				MX53_PAD_GPIO_2__GPIO1_2		0x80000000
 				MX53_PAD_GPIO_3__USBOH3_USBH1_OC	0x80000000
 			>;
@@ -302,13 +231,6 @@
 			>;
 		};
 
-		pinctrl_i2c2: i2c2grp {
-			fsl,pins = <
-				MX53_PAD_EIM_D16__I2C2_SDA		0xc0000000
-				MX53_PAD_EIM_EB2__I2C2_SCL		0xc0000000
-			>;
-		};
-
 		pinctrl_i2c3: i2c3grp {
 			fsl,pins = <
 				MX53_PAD_GPIO_6__I2C3_SDA		0xc0000000
@@ -353,26 +275,6 @@
 			>;
 		};
 
-		pinctrl_nand: nandgrp {
-			fsl,pins = <
-				MX53_PAD_NANDF_WE_B__EMI_NANDF_WE_B	0x4
-				MX53_PAD_NANDF_RE_B__EMI_NANDF_RE_B	0x4
-				MX53_PAD_NANDF_CLE__EMI_NANDF_CLE	0x4
-				MX53_PAD_NANDF_ALE__EMI_NANDF_ALE	0x4
-				MX53_PAD_NANDF_WP_B__EMI_NANDF_WP_B	0xe0
-				MX53_PAD_NANDF_RB0__EMI_NANDF_RB_0	0xe0
-				MX53_PAD_NANDF_CS0__EMI_NANDF_CS_0	0x4
-				MX53_PAD_PATA_DATA0__EMI_NANDF_D_0	0xa4
-				MX53_PAD_PATA_DATA1__EMI_NANDF_D_1	0xa4
-				MX53_PAD_PATA_DATA2__EMI_NANDF_D_2	0xa4
-				MX53_PAD_PATA_DATA3__EMI_NANDF_D_3	0xa4
-				MX53_PAD_PATA_DATA4__EMI_NANDF_D_4	0xa4
-				MX53_PAD_PATA_DATA5__EMI_NANDF_D_5	0xa4
-				MX53_PAD_PATA_DATA6__EMI_NANDF_D_6	0xa4
-				MX53_PAD_PATA_DATA7__EMI_NANDF_D_7	0xa4
-			>;
-		};
-
 		pinctrl_pwm1: pwm1grp {
 			fsl,pins = <
 				MX53_PAD_DISP0_DAT8__PWM1_PWMO		0x5
@@ -408,14 +310,6 @@
 	remote-endpoint = <&display1_in>;
 };
 
-&nfc {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_nand>;
-	nand-bus-width = <8>;
-	nand-ecc-mode = "hw";
-	status = "okay";
-};
-
 &pwm1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm1>;
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/2] ARM: dts: mxs: Split M28EVK into SoM and EVK parts
  2014-06-25 18:48 [PATCH 1/2] ARM: dts: mx5: Split M53EVK into SoM and EVK parts Marek Vasut
@ 2014-06-25 18:48 ` Marek Vasut
  2014-06-28 15:17   ` Shawn Guo
  2014-06-28 15:15 ` [PATCH 1/2] ARM: dts: mx5: Split M53EVK " Shawn Guo
  1 sibling, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2014-06-25 18:48 UTC (permalink / raw)
  To: linux-arm-kernel

This patch splits the M28EVK device tree file into a common SoM
part and an EVK part. This is needed to make it easier for users
of the SoM to put it into different, non-reference baseboard.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx28-m28.dtsi   | 87 ++++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/imx28-m28evk.dts | 62 +--------------------------
 2 files changed, 88 insertions(+), 61 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx28-m28.dtsi

diff --git a/arch/arm/boot/dts/imx28-m28.dtsi b/arch/arm/boot/dts/imx28-m28.dtsi
new file mode 100644
index 0000000..759cc56
--- /dev/null
+++ b/arch/arm/boot/dts/imx28-m28.dtsi
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2014 Marek Vasut <marex@denx.de>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include "imx28.dtsi"
+
+/ {
+	model = "DENX M28";
+	compatible = "denx,m28", "fsl,imx28";
+
+	memory {
+		reg = <0x40000000 0x08000000>;
+	};
+
+	apb at 80000000 {
+		apbh at 80000000 {
+			gpmi-nand at 8000c000 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+				status = "okay";
+
+				partition at 0 {
+					label = "bootloader";
+					reg = <0x00000000 0x00300000>;
+					read-only;
+				};
+
+				partition at 1 {
+					label = "environment";
+					reg = <0x00300000 0x00080000>;
+				};
+
+				partition at 2 {
+					label = "redundant-environment";
+					reg = <0x00380000 0x00080000>;
+				};
+
+				partition at 3 {
+					label = "kernel";
+					reg = <0x00400000 0x00400000>;
+				};
+
+				partition at 4 {
+					label = "filesystem";
+					reg = <0x00800000 0x0f800000>;
+				};
+			};
+		};
+
+		apbx at 80040000 {
+			i2c0: i2c at 80058000 {
+				pinctrl-names = "default";
+				pinctrl-0 = <&i2c0_pins_a>;
+				status = "okay";
+
+				rtc: rtc at 68 {
+					compatible = "stm,m41t62";
+					reg = <0x68>;
+				};
+			};
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		reg_3p3v: regulator at 0 {
+			compatible = "regulator-fixed";
+			reg = <0>;
+			regulator-name = "3P3V";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-always-on;
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index f0ad7b9..b3c09ae 100644
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -10,52 +10,14 @@
  */
 
 /dts-v1/;
-#include "imx28.dtsi"
+#include "imx28-m28.dtsi"
 
 / {
 	model = "DENX M28EVK";
 	compatible = "denx,m28evk", "fsl,imx28";
 
-	memory {
-		reg = <0x40000000 0x08000000>;
-	};
-
 	apb at 80000000 {
 		apbh at 80000000 {
-			gpmi-nand at 8000c000 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				pinctrl-names = "default";
-				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
-				status = "okay";
-
-				partition at 0 {
-					label = "bootloader";
-					reg = <0x00000000 0x00300000>;
-					read-only;
-				};
-
-				partition at 1 {
-					label = "environment";
-					reg = <0x00300000 0x00080000>;
-				};
-
-				partition at 2 {
-					label = "redundant-environment";
-					reg = <0x00380000 0x00080000>;
-				};
-
-				partition at 3 {
-					label = "kernel";
-					reg = <0x00400000 0x00400000>;
-				};
-
-				partition at 4 {
-					label = "filesystem";
-					reg = <0x00800000 0x0f800000>;
-				};
-			};
-
 			ssp0: ssp at 80010000 {
 				compatible = "fsl,imx28-mmc";
 				pinctrl-names = "default";
@@ -175,10 +137,6 @@
 			};
 
 			i2c0: i2c at 80058000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&i2c0_pins_a>;
-				status = "okay";
-
 				sgtl5000: codec at 0a {
 					compatible = "fsl,sgtl5000";
 					reg = <0x0a>;
@@ -192,11 +150,6 @@
 					reg = <0x51>;
 					pagesize = <32>;
 				};
-
-				rtc: rtc at 68 {
-					compatible = "stm,m41t62";
-					reg = <0x68>;
-				};
 			};
 
 			lradc at 80050000 {
@@ -284,19 +237,6 @@
 	};
 
 	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		reg_3p3v: regulator at 0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "3P3V";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			regulator-always-on;
-		};
-
 		reg_vddio_sd0: regulator at 1 {
 			compatible = "regulator-fixed";
 			reg = <1>;
-- 
2.0.0.rc2

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 1/2] ARM: dts: mx5: Split M53EVK into SoM and EVK parts
  2014-06-25 18:48 [PATCH 1/2] ARM: dts: mx5: Split M53EVK into SoM and EVK parts Marek Vasut
  2014-06-25 18:48 ` [PATCH 2/2] ARM: dts: mxs: Split M28EVK " Marek Vasut
@ 2014-06-28 15:15 ` Shawn Guo
  2014-07-09 11:55   ` Marek Vasut
  2014-07-09 11:56   ` [PATCH] ARM: dts: mx5: Move the USB pinmux to USB node on M53EVK Marek Vasut
  1 sibling, 2 replies; 8+ messages in thread
From: Shawn Guo @ 2014-06-28 15:15 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jun 25, 2014 at 08:48:32PM +0200, Marek Vasut wrote:
> @@ -226,14 +158,11 @@
>  
>  &iomuxc {
>  	pinctrl-names = "default";
> -	pinctrl-0 = <&pinctrl_hog>;
> +	pinctrl-0 = <&pinctrl_hog &pinctrl_usb>;

Hmm, shouldn't pinctrl_usb be put into some USB related node?

Shawn

>  
>  	imx53-m53evk {
> -		pinctrl_hog: hoggrp {
> +		pinctrl_usb: usbgrp {
>  			fsl,pins = <
> -				MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK	0x80000000
> -				MX53_PAD_EIM_EB3__GPIO2_31		0x80000000
> -				MX53_PAD_PATA_DA_0__GPIO7_6		0x80000000
>  				MX53_PAD_GPIO_2__GPIO1_2		0x80000000
>  				MX53_PAD_GPIO_3__USBOH3_USBH1_OC	0x80000000
>  			>;

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2/2] ARM: dts: mxs: Split M28EVK into SoM and EVK parts
  2014-06-25 18:48 ` [PATCH 2/2] ARM: dts: mxs: Split M28EVK " Marek Vasut
@ 2014-06-28 15:17   ` Shawn Guo
  0 siblings, 0 replies; 8+ messages in thread
From: Shawn Guo @ 2014-06-28 15:17 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jun 25, 2014 at 08:48:33PM +0200, Marek Vasut wrote:
> This patch splits the M28EVK device tree file into a common SoM
> part and an EVK part. This is needed to make it easier for users
> of the SoM to put it into different, non-reference baseboard.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>

Applied, thanks.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/2] ARM: dts: mx5: Split M53EVK into SoM and EVK parts
  2014-06-28 15:15 ` [PATCH 1/2] ARM: dts: mx5: Split M53EVK " Shawn Guo
@ 2014-07-09 11:55   ` Marek Vasut
  2014-07-14 14:49     ` Shawn Guo
  2014-07-09 11:56   ` [PATCH] ARM: dts: mx5: Move the USB pinmux to USB node on M53EVK Marek Vasut
  1 sibling, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2014-07-09 11:55 UTC (permalink / raw)
  To: linux-arm-kernel

On Saturday, June 28, 2014 at 05:15:53 PM, Shawn Guo wrote:
> On Wed, Jun 25, 2014 at 08:48:32PM +0200, Marek Vasut wrote:
> > @@ -226,14 +158,11 @@
> > 
> >  &iomuxc {
> >  
> >  	pinctrl-names = "default";
> > 
> > -	pinctrl-0 = <&pinctrl_hog>;
> > +	pinctrl-0 = <&pinctrl_hog &pinctrl_usb>;
> 
> Hmm, shouldn't pinctrl_usb be put into some USB related node?

Sorry for the late reply. It should. I am sending a small patch in-reply-to this 
one. Please either squash them together or apply in sequence, as seen fit. 
Hopefully this will clarify the change. I will send a full v2 if needed be.

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] ARM: dts: mx5: Move the USB pinmux to USB node on M53EVK
  2014-06-28 15:15 ` [PATCH 1/2] ARM: dts: mx5: Split M53EVK " Shawn Guo
  2014-07-09 11:55   ` Marek Vasut
@ 2014-07-09 11:56   ` Marek Vasut
  1 sibling, 0 replies; 8+ messages in thread
From: Marek Vasut @ 2014-07-09 11:56 UTC (permalink / raw)
  To: linux-arm-kernel

The USB pinmux should be in the USB Host1 node, not in the Hog node
of the pinmux controller.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx53-m53evk.dts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index 1883d0d..d0e0f57 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -158,7 +158,7 @@
 
 &iomuxc {
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_hog &pinctrl_usb>;
+	pinctrl-0 = <&pinctrl_hog>;
 
 	imx53-m53evk {
 		pinctrl_usb: usbgrp {
@@ -343,6 +343,8 @@
 };
 
 &usbh1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usb>;
 	vbus-supply = <&reg_usbh1_vbus>;
 	phy_type = "utmi";
 	status = "okay";
-- 
2.0.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 1/2] ARM: dts: mx5: Split M53EVK into SoM and EVK parts
  2014-07-09 11:55   ` Marek Vasut
@ 2014-07-14 14:49     ` Shawn Guo
  2014-07-14 18:57       ` Marek Vasut
  0 siblings, 1 reply; 8+ messages in thread
From: Shawn Guo @ 2014-07-14 14:49 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jul 09, 2014 at 01:55:34PM +0200, Marek Vasut wrote:
> On Saturday, June 28, 2014 at 05:15:53 PM, Shawn Guo wrote:
> > On Wed, Jun 25, 2014 at 08:48:32PM +0200, Marek Vasut wrote:
> > > @@ -226,14 +158,11 @@
> > > 
> > >  &iomuxc {
> > >  
> > >  	pinctrl-names = "default";
> > > 
> > > -	pinctrl-0 = <&pinctrl_hog>;
> > > +	pinctrl-0 = <&pinctrl_hog &pinctrl_usb>;
> > 
> > Hmm, shouldn't pinctrl_usb be put into some USB related node?
> 
> Sorry for the late reply. It should. I am sending a small patch in-reply-to this 
> one. Please either squash them together or apply in sequence, as seen fit. 
> Hopefully this will clarify the change. I will send a full v2 if needed be.

Squashed and applied, thanks.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/2] ARM: dts: mx5: Split M53EVK into SoM and EVK parts
  2014-07-14 14:49     ` Shawn Guo
@ 2014-07-14 18:57       ` Marek Vasut
  0 siblings, 0 replies; 8+ messages in thread
From: Marek Vasut @ 2014-07-14 18:57 UTC (permalink / raw)
  To: linux-arm-kernel

On Monday, July 14, 2014 at 04:49:15 PM, Shawn Guo wrote:
> On Wed, Jul 09, 2014 at 01:55:34PM +0200, Marek Vasut wrote:
> > On Saturday, June 28, 2014 at 05:15:53 PM, Shawn Guo wrote:
> > > On Wed, Jun 25, 2014 at 08:48:32PM +0200, Marek Vasut wrote:
> > > > @@ -226,14 +158,11 @@
> > > > 
> > > >  &iomuxc {
> > > >  
> > > >  	pinctrl-names = "default";
> > > > 
> > > > -	pinctrl-0 = <&pinctrl_hog>;
> > > > +	pinctrl-0 = <&pinctrl_hog &pinctrl_usb>;
> > > 
> > > Hmm, shouldn't pinctrl_usb be put into some USB related node?
> > 
> > Sorry for the late reply. It should. I am sending a small patch
> > in-reply-to this one. Please either squash them together or apply in
> > sequence, as seen fit. Hopefully this will clarify the change. I will
> > send a full v2 if needed be.
> 
> Squashed and applied, thanks.

Thanks!

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2014-07-14 18:57 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-25 18:48 [PATCH 1/2] ARM: dts: mx5: Split M53EVK into SoM and EVK parts Marek Vasut
2014-06-25 18:48 ` [PATCH 2/2] ARM: dts: mxs: Split M28EVK " Marek Vasut
2014-06-28 15:17   ` Shawn Guo
2014-06-28 15:15 ` [PATCH 1/2] ARM: dts: mx5: Split M53EVK " Shawn Guo
2014-07-09 11:55   ` Marek Vasut
2014-07-14 14:49     ` Shawn Guo
2014-07-14 18:57       ` Marek Vasut
2014-07-09 11:56   ` [PATCH] ARM: dts: mx5: Move the USB pinmux to USB node on M53EVK Marek Vasut

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).