Skip to contentSkip to conversation

ARM: dts: imx6: edmqmx6: Fix usbotg id pin

PATCH New Lucas Stach 2 participants 5 messages Apr 7, 2014 – Apr 8, 2014

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Lucas Stach

author
#0 lore raw

PATCH 1/4 ARM: dts: imx6: edmqmx6: Fix usbotg id pin

Signed-off-by Lucas Stach <[email protected]>
---
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts +1 -1
index a63bbb3d46bb..39ffa766384f 100644
@@ -293,7 +293,7 @@
 
 		pinctrl_usbotg: usbotggrp {
 			fsl,pins = <
-				MX6QDL_PAD_GPIO_1__USB_OTG_ID		0x17059
+				MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID	0x17059
 			>;
 		};
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/4 ARM: dts: imx6: edmqmx6: Do not use the OTG switch as VBUS regulator

From: Sascha Hauer <[email protected]>

GPIO7_12 switches the D+/D- USB lines on and off. When we use this as VBUS regulator it means that USB device mode can never work as VBUS is never turned on in Device mode.

Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts +4 -3
index 39ffa766384f..af32944cf9ae 100644
@@ -40,13 +40,15 @@
 			regulator-always-on;
 		};
 
-		reg_usb_otg_vbus: regulator at 1 {
+		reg_usb_otg_switch: regulator at 1 {
 			compatible = "regulator-fixed";
 			reg = <1>;
-			regulator-name = "usb_otg_vbus";
+			regulator-name = "usb_otg_switch";
 			regulator-min-microvolt = <5000000>;
 			regulator-max-microvolt = <5000000>;
 			gpio = <&gpio7 12 0>;
+			regulator-boot-on;
+			regulator-always-on;
 		};
 
 		reg_usb_host1: regulator at 2 {

@@ -348,7 +350,6 @@
 };
 
 &usbotg {
-	vbus-supply = <&reg_usb_otg_vbus>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usbotg>;
 	disable-over-current;
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 3/4 ARM: dts: imx6: edmqmx6: USB H1 only supports host mode

In reply to Lucas Stach
Signed-off-by Lucas Stach <[email protected]>
---
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts +1 -0
index af32944cf9ae..e7762e456cbe 100644
@@ -346,6 +346,7 @@
 &usbh1 {
 	vbus-supply = <&reg_usb_host1>;
 	disable-over-current;
+	dr_mode = "host";
 	status = "okay";
 };
Signature · 1 line
1.9.1
author
#3 lore raw

PATCH 4/4 ARM: dts: imx6: edmqmx6: add second STMPE

In reply to Lucas Stach
Signed-off-by Lucas Stach <[email protected]>
---
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 38 +++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 9 deletions(-)
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts +29 -9
index e7762e456cbe..e4ae38fd0269 100644
@@ -19,7 +19,10 @@
 	compatible = "dmo,imx6q-edmqmx6", "fsl,imx6q";
 
 	aliases {
-		gpio7 = &stmpe_gpio;
+		gpio7 = &stmpe_gpio1;
+		gpio8 = &stmpe_gpio2;
+		stmpe-i2c0 = &stmpe1;
+		stmpe-i2c1 = &stmpe2;
 	};
 
 	memory {

@@ -67,23 +70,23 @@
 
 		led-blue {
 			label = "blue";
-			gpios = <&stmpe_gpio 8 GPIO_ACTIVE_HIGH>;
+			gpios = <&stmpe_gpio1 8 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "heartbeat";
 		};
 
 		led-green {
 			label = "green";
-			gpios = <&stmpe_gpio 9 GPIO_ACTIVE_HIGH>;
+			gpios = <&stmpe_gpio1 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		led-pink {
 			label = "pink";
-			gpios = <&stmpe_gpio 10 GPIO_ACTIVE_HIGH>;
+			gpios = <&stmpe_gpio1 10 GPIO_ACTIVE_HIGH>;
 		};
 
 		led-red {
 			label = "red";
-			gpios = <&stmpe_gpio 11 GPIO_ACTIVE_HIGH>;
+			gpios = <&stmpe_gpio1 11 GPIO_ACTIVE_HIGH>;
 		};
 	};
 };

@@ -101,7 +104,8 @@
 	clock-frequency = <100000>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c2
-		     &pinctrl_stmpe>;
+		     &pinctrl_stmpe1
+		     &pinctrl_stmpe2>;
 	status = "okay";
 
 	pmic: pfuze100 at 08 {

@@ -207,13 +211,25 @@
 		};
 	};
 
-	stmpe: stmpe1601 at 40 {
+	stmpe1: stmpe1601 at 40 {
 		compatible = "st,stmpe1601";
 		reg = <0x40>;
 		interrupts = <30 0>;
 		interrupt-parent = <&gpio3>;
 
-		stmpe_gpio: stmpe_gpio {
+		stmpe_gpio1: stmpe_gpio {
+			#gpio-cells = <2>;
+			compatible = "st,stmpe-gpio";
+		};
+	};
+
+	stmpe2: stmpe1601 at 44 {
+		compatible = "st,stmpe1601";
+		reg = <0x44>;
+		interrupts = <2 0>;
+		interrupt-parent = <&gpio5>;
+
+		stmpe_gpio2: stmpe_gpio {
 			#gpio-cells = <2>;
 			compatible = "st,stmpe-gpio";
 		};

@@ -275,10 +291,14 @@
 			>;
 		};
 
-		pinctrl_stmpe: stmpegrp {
+		pinctrl_stmpe1: stmpe1grp {
 			fsl,pins = <MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000>;
 		};
 
+		pinctrl_stmpe2: stmpe2grp {
+			fsl,pins = <MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x80000000>;
+		};
+
 		pinctrl_uart1: uart1grp {
 			fsl,pins = <
 				MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA	0x1b0b1
Signature · 1 line
1.9.1