[PATCH 1/2] ARM: dts: imx6qdl-hummingboard: fix USBOTG-ID pin

[PATCH 1/2] ARM: dts: imx6qdl-hummingboard: fix USBOTG-ID pin

[Baruch Siach]

From: Jon Nettleton <jon@solid-run.com>

Fix the USBOTG-ID pin to the correct definition.  The top
USB port stays in device-mode without this change.

Signed-off-by: Jon Nettleton <jon@solid-run.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index 92583238ca4a..e59b1aeba1d7 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -242,7 +242,7 @@
 			 * Similar to pinctrl_usbotg_2, but we want it
 			 * pulled down for a fixed host connection.
 			 */
-			fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
+			fsl,pins = <MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x13059>;
 		};
 
 		pinctrl_hummingboard_usbotg_vbus: hummingboard-usbotg-vbus {
-- 
2.16.1

[PATCH 2/2] ARM: dts: hummingboard: Remove mention of nonexistent node

[Baruch Siach]

There is no pinctrl_usbotg_2 node in current Hummingboard dts files.
Drop reference to that.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi  | 3 +--
 arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
index e59b1aeba1d7..d1f8fd708e13 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -239,8 +239,7 @@
 
 		pinctrl_hummingboard_usbotg_id: hummingboard-usbotg-id {
 			/*
-			 * Similar to pinctrl_usbotg_2, but we want it
-			 * pulled down for a fixed host connection.
+			 * We want it pulled down for a fixed host connection.
 			 */
 			fsl,pins = <MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x13059>;
 		};
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
index dffbc92e0023..194d152d8f4b 100644
--- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
@@ -409,8 +409,7 @@
 
 		pinctrl_hummingboard2_usbotg_id: hummingboard2-usbotg-id {
 			/*
-			 * Similar to pinctrl_usbotg_2, but we want it
-			 * pulled down for a fixed host connection.
+			 * We want it pulled down for a fixed host connection.
 			 */
 			fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
 		};
-- 
2.16.1

[PATCH 2/2] ARM: dts: hummingboard: Remove mention of nonexistent node

[Fabio Estevam]

On Mon, Feb 19, 2018 at 4:56 AM, Baruch Siach <baruch@tkos.co.il> wrote:
> There is no pinctrl_usbotg_2 node in current Hummingboard dts files.
> Drop reference to that.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

[PATCH 1/2] ARM: dts: imx6qdl-hummingboard: fix USBOTG-ID pin

[Shawn Guo]

On Mon, Feb 19, 2018 at 09:56:44AM +0200, Baruch Siach wrote:
> From: Jon Nettleton <jon@solid-run.com>
> 
> Fix the USBOTG-ID pin to the correct definition.  The top
> USB port stays in device-mode without this change.
> 
> Signed-off-by: Jon Nettleton <jon@solid-run.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Applied both, thanks.