public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
* [PATCH 2/2] ARM: dts: hummingboard/cubox-i: move usb otg configuration to platform level
@ 2014-06-11  9:58 Russell King
  0 siblings, 0 replies; 2+ messages in thread
From: Russell King @ 2014-06-11  9:58 UTC (permalink / raw)
  To: linux-arm-kernel

The configuration of the USB OTG is a platform configuration decision,
not a microsom decision.  Move this configuration out to the platform
level files.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/boot/dts/imx6dl-hummingboard.dts | 10 ++++++++++
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi    | 10 ++++++++++
 arch/arm/boot/dts/imx6qdl-microsom.dtsi   | 13 -------------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts
index cb9691bac161..bcae32fdc4c1 100644
--- a/arch/arm/boot/dts/imx6dl-hummingboard.dts
+++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts
@@ -143,6 +143,14 @@
 			fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>;
 		};
 
+		pinctrl_hummingboard_usbotg_id: hummingboard-usbotg-id {
+			/*
+			 * 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>;
+		};
+
 		pinctrl_hummingboard_usbotg_vbus: hummingboard-usbotg-vbus {
 			fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>;
 		};
@@ -182,6 +190,8 @@
 };
 
 &usbotg {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;
 	vbus-supply = <&reg_usbotg_vbus>;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index f45380073973..b53cd8c6c44d 100644
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -134,6 +134,14 @@
 			fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x4001b0b0>;
 		};
 
+		pinctrl_cubox_i_usbotg_id: cubox-i-usbotg-id {
+			/*
+			 * The Cubox-i pulls this low, but as it's pointless
+			 * leaving it as a pull-up, even if it is just 10uA.
+			 */
+			fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
+		};
+
 		pinctrl_cubox_i_usbotg_vbus: cubox-i-usbotg-vbus {
 			fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x4001b0b0>;
 		};
@@ -192,6 +200,8 @@
 };
 
 &usbotg {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_cubox_i_usbotg_id>;
 	vbus-supply = <&reg_usbotg_vbus>;
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
index a5d72895d9ce..bf5a45b0a61f 100644
--- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
@@ -80,14 +80,6 @@
 			>;
 		};
 
-		pinctrl_microsom_usbotg: microsom-usbotg {
-			/*
-			 * 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>;
-		};
-
 		pinctrl_microsom_usdhc1: microsom-usdhc1 {
 			fsl,pins = <
 				MX6QDL_PAD_SD1_CMD__SD1_CMD    0x17059
@@ -114,11 +106,6 @@
 	fsl,uart-has-rtscts;
 };
 
-&usbotg {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_microsom_usbotg>;
-};
-
 /* USDHC1 - Connected to optional BRCM Wifi/BT/FM */
 &usdhc1 {
 	card-external-vcc-supply = <&reg_brcm>;
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [PATCH 0/2] DT updates for Cubox-i
@ 2014-06-17 13:40 Russell King - ARM Linux
  2014-06-17 13:41 ` [PATCH 2/2] ARM: dts: hummingboard/cubox-i: move usb otg configuration to platform level Russell King
  0 siblings, 1 reply; 2+ messages in thread
From: Russell King - ARM Linux @ 2014-06-17 13:40 UTC (permalink / raw)
  To: linux-arm-kernel

Shawn,

These are two updates to the Cubox-i which I'd prefer to get into -rc.
They were omitted from the merge window because their dependent changes
were not merged, but have now been merged.

The only real functional change for the Cubox-i in this set is that it
is now possible to control the front panel LED.  The other patch is
solely about moving some DT configuration to where it belongs.

Can we please get these in?

Thanks.

 arch/arm/boot/dts/imx6dl-hummingboard.dts | 10 ++++++++++
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi    | 27 +++++++++++++++++++++++++++
 arch/arm/boot/dts/imx6qdl-microsom.dtsi   | 13 -------------
 3 files changed, 37 insertions(+), 13 deletions(-)

-- 
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-17 13:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-11  9:58 [PATCH 2/2] ARM: dts: hummingboard/cubox-i: move usb otg configuration to platform level Russell King
  -- strict thread matches above, loose matches on Subject: below --
2014-06-17 13:40 [PATCH 0/2] DT updates for Cubox-i Russell King - ARM Linux
2014-06-17 13:41 ` [PATCH 2/2] ARM: dts: hummingboard/cubox-i: move usb otg configuration to platform level Russell King

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox