Skip to contentSkip to conversation

DT updates for Cubox-i

PATCH New Russell King - ARM Linux 3 participants 5 messages Jun 17, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover DT updates for Cubox-i

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(-)
Signature · 2 lines
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.
#1 lore raw

PATCH 1/2 ARM: dts: cubox-i: add support for PWM-driven front panel LED

The front panel LED on the Cubox-i is driven by one of the iMX6 PWM channels, and is wired between the PWM output and supply.

---
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +17 -0
index 25da82a03110..9202c8d18a30 100644
@@ -12,6 +12,19 @@
 		pinctrl-0 = <&pinctrl_cubox_i_ir>;
 	};
 
+	pwmleds {
+		compatible = "pwm-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_cubox_i_pwm1>;
+
+		front {
+			active-low;
+			label = "imx6:red:front";
+			max-brightness = <248>;
+			pwms = <&pwm1 0 50000>;
+		};
+	};
+
 	regulators {
 		compatible = "simple-bus";
 
@@ -109,6 +122,10 @@
 			>;
 		};
 
+		pinctrl_cubox_i_pwm1: cubox-i-pwm1-front-led {
+			fsl,pins = <MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0>;
+		};
+
 		pinctrl_cubox_i_spdif: cubox-i-spdif {
 			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;
 		};
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/2 ARM: dts: hummingboard/cubox-i: move usb otg configuration to platform level

In reply to Russell King - ARM Linux

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

---
 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(-)
arch/arm/boot/dts/imx6dl-hummingboard.dts +10 -0
index 5373a5f2782b..c8e51dd41b8f 100644
@@ -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>;
 		};
@@ -178,6 +186,8 @@
 };
 
 &usbotg {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;
 	vbus-supply = <&reg_usbotg_vbus>;
 	status = "okay";
 };
arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +10 -0
index 9202c8d18a30..e8e781656b3f 100644
@@ -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>;
 		};
@@ -170,6 +178,8 @@
 };
 
 &usbotg {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_cubox_i_usbotg_id>;
 	vbus-supply = <&reg_usbotg_vbus>;
 	status = "okay";
 };
arch/arm/boot/dts/imx6qdl-microsom.dtsi +0 -13
index d729d0b15f25..79eac6849d4c 100644
@@ -10,14 +10,6 @@
 				MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA	0x1b0b1
 			>;
 		};
-
-		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>;
-		};
 	};
 };
 
@@ -26,8 +18,3 @@
 	pinctrl-0 = <&pinctrl_microsom_uart1>;
 	status = "okay";
 };
-
-&usbotg {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_microsom_usbotg>;
-};
Signature · 1 line
1.8.3.1
#3 lore raw

cover DT updates for Cubox-i

In reply to Russell King - ARM Linux
Quoted 11 lines · Russell King - ARM Linux

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?

Okay, I will send them together with the fixes I queued for -rc.

Shawn

#4 lore raw

cover DT updates for Cubox-i

Quoted 7 lines · Shawn Guo
Quoted 6 lines · Russell King - ARM Linux

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.

Quoted 7 lines
Quoted 5 lines

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?

Okay, I will send them together with the fixes I queued for -rc.

Thanks.

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