[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Russell King - ARM Linux]

Now that the Cubox-i has been released, and I have one, I've been able to
update things a little.  Out of the following two patches, the first one
I think is critical to be merged before the microsom support hits
mainline, since it drops the flexcan support from the microsom level,
moving it to the Hummingboard level.

That doesn't have _too_ much visible effect, but it's something which
should not be there (since as far as the microsom is concerned, there's
nothing special about these pads.)

The second adds basic support for the Cubox-i - as I have only the i4,
this is the platform which this has been tested against, but I've
generated the solo/dual-lite version as well since the only difference
at this basic level is the eSATA.

 arch/arm/boot/dts/Makefile                |  2 +
 arch/arm/boot/dts/imx6dl-cubox-i.dts      | 12 +++++
 arch/arm/boot/dts/imx6dl-hummingboard.dts | 13 ++++++
 arch/arm/boot/dts/imx6q-cubox-i.dts       | 16 +++++++
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi    | 78 +++++++++++++++++++++++++++++++
 arch/arm/boot/dts/imx6qdl-microsom.dtsi   | 13 ------
 6 files changed, 121 insertions(+), 13 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6dl-cubox-i.dts
 create mode 100644 arch/arm/boot/dts/imx6q-cubox-i.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Russell King - ARM Linux]

Now that the Cubox-i has been released, and I have one, I've been able to
update things a little.  Out of the following two patches, the first one
I think is critical to be merged before the microsom support hits
mainline, since it drops the flexcan support from the microsom level,
moving it to the Hummingboard level.

That doesn't have _too_ much visible effect, but it's something which
should not be there (since as far as the microsom is concerned, there's
nothing special about these pads.)

The second adds basic support for the Cubox-i - as I have only the i4,
this is the platform which this has been tested against, but I've
generated the solo/dual-lite version as well since the only difference
at this basic level is the eSATA.

 arch/arm/boot/dts/Makefile                |  2 +
 arch/arm/boot/dts/imx6dl-cubox-i.dts      | 12 +++++
 arch/arm/boot/dts/imx6dl-hummingboard.dts | 13 ++++++
 arch/arm/boot/dts/imx6q-cubox-i.dts       | 16 +++++++
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi    | 78 +++++++++++++++++++++++++++++++
 arch/arm/boot/dts/imx6qdl-microsom.dtsi   | 13 ------
 6 files changed, 121 insertions(+), 13 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6dl-cubox-i.dts
 create mode 100644 arch/arm/boot/dts/imx6q-cubox-i.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".

[PATCH 1/2] ARM: move flexcan1 configuration to hummingboard

[Russell King]

Flexcan1 is not used on the cubox-i, so move it out of the microsom.

Signed-off-by: Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
---
 arch/arm/boot/dts/imx6dl-hummingboard.dts | 13 +++++++++++++
 arch/arm/boot/dts/imx6qdl-microsom.dtsi   | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts
index 6184b0366926..e22f3d855c02 100644
--- a/arch/arm/boot/dts/imx6dl-hummingboard.dts
+++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts
@@ -36,6 +36,12 @@
 	};
 };
 
+&can1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard_flexcan1>;
+	status = "okay";
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c1_1>;
@@ -53,6 +59,13 @@
 
 &iomuxc {
 	hummingboard {
+		pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 {
+			fsl,pins = <
+				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000
+				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000
+			>;
+		};
+
 		pinctrl_hummingboard_gpio1_2: hummingboard-gpio1_2 {
 			fsl,pins = <
 				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
index 8aa31a842236..965ac4c1f509 100644
--- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
@@ -36,21 +36,8 @@
 	};
 };
 
-&can1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_microsom_flexcan1>;
-	status = "okay";
-};
-
 &iomuxc {
 	microsom {
-		pinctrl_microsom_flexcan1: microsom-flexcan1 {
-			fsl,pins = <
-				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000
-				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000
-			>;
-		};
-
 		pinctrl_microsom_usbotg: microsom-usbotg {
 			/*
 			 * Similar to pinctrl_usbotg_2, but we want it
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] ARM: move flexcan1 configuration to hummingboard

[Russell King]

Flexcan1 is not used on the cubox-i, so move it out of the microsom.

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

diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts
index 6184b0366926..e22f3d855c02 100644
--- a/arch/arm/boot/dts/imx6dl-hummingboard.dts
+++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts
@@ -36,6 +36,12 @@
 	};
 };
 
+&can1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hummingboard_flexcan1>;
+	status = "okay";
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c1_1>;
@@ -53,6 +59,13 @@
 
 &iomuxc {
 	hummingboard {
+		pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 {
+			fsl,pins = <
+				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000
+				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000
+			>;
+		};
+
 		pinctrl_hummingboard_gpio1_2: hummingboard-gpio1_2 {
 			fsl,pins = <
 				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
index 8aa31a842236..965ac4c1f509 100644
--- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
@@ -36,21 +36,8 @@
 	};
 };
 
-&can1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_microsom_flexcan1>;
-	status = "okay";
-};
-
 &iomuxc {
 	microsom {
-		pinctrl_microsom_flexcan1: microsom-flexcan1 {
-			fsl,pins = <
-				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000
-				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000
-			>;
-		};
-
 		pinctrl_microsom_usbotg: microsom-usbotg {
 			/*
 			 * Similar to pinctrl_usbotg_2, but we want it
-- 
1.8.3.1

[PATCH 2/2] ARM: add DT support for cubox-i platforms

[Russell King]

Signed-off-by: Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
---
 arch/arm/boot/dts/Makefile             |  2 +
 arch/arm/boot/dts/imx6dl-cubox-i.dts   | 12 ++++++
 arch/arm/boot/dts/imx6q-cubox-i.dts    | 16 +++++++
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 78 ++++++++++++++++++++++++++++++++++
 4 files changed, 108 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6dl-cubox-i.dts
 create mode 100644 arch/arm/boot/dts/imx6q-cubox-i.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 875af333c6dc..1eeae00d9d09 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -136,11 +136,13 @@ dtb-$(CONFIG_ARCH_MXC) += \
 	imx53-mba53.dtb \
 	imx53-qsb.dtb \
 	imx53-smd.dtb \
+	imx6dl-cubox-i.dtb \
 	imx6dl-hummingboard.dtb \
 	imx6dl-sabreauto.dtb \
 	imx6dl-sabresd.dtb \
 	imx6dl-wandboard.dtb \
 	imx6q-arm2.dtb \
+	imx6q-cubox-i.dtb \
 	imx6q-phytec-pbab01.dtb \
 	imx6q-sabreauto.dtb \
 	imx6q-sabrelite.dtb \
diff --git a/arch/arm/boot/dts/imx6dl-cubox-i.dts b/arch/arm/boot/dts/imx6dl-cubox-i.dts
new file mode 100644
index 000000000000..58aa8f2b0f26
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-cubox-i.dts
@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2014 Russell King
+ */
+/dts-v1/;
+
+#include "imx6dl.dtsi"
+#include "imx6qdl-cubox-i.dtsi"
+
+/ {
+	model = "SolidRun Cubox-i Solo/DualLite";
+	compatible = "solidrun,cubox-i/dl", "fsl,imx6dl";
+};
diff --git a/arch/arm/boot/dts/imx6q-cubox-i.dts b/arch/arm/boot/dts/imx6q-cubox-i.dts
new file mode 100644
index 000000000000..bc5f31e3e892
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-cubox-i.dts
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2014 Russell King
+ */
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-cubox-i.dtsi"
+
+/ {
+	model = "SolidRun Cubox-i Dual/Quad";
+	compatible = "solidrun,cubox-i/q", "fsl,imx6q";
+};
+
+&sata {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
new file mode 100644
index 000000000000..6fbca9063b10
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2014 Russell King
+ */
+#include "imx6qdl-microsom.dtsi"
+#include "imx6qdl-microsom-ar8035.dtsi"
+
+/ {
+	ir_recv: ir-receiver {
+		compatible = "gpio-ir-receiver";
+		gpios = <&gpio3 9 1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_cubox_i_ir>;
+	};
+
+	codec: spdif-transmitter {
+		compatible = "linux,spdif-dit";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_cubox_i_spdif>;
+	};
+
+	sound-spdif {
+		compatible = "fsl,imx-audio-spdif";
+		model = "imx-spdif";
+		/* IMX6 doesn't implement this yet */
+		spdif-controller = <&spdif>;
+		spdif-out;
+	};
+};
+
+&i2c3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c3_1>;
+
+	status = "okay";
+
+	rtc: pcf8523@68 {
+		compatible = "nxp,pcf8523";
+		reg = <0x68>;
+	};
+};
+
+&iomuxc {
+	cubox_i {
+		pinctrl_cubox_i_ir: cubox_i-ir {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000
+			>;
+		};
+
+		pinctrl_cubox_i_spdif: cubox_i-spdif {
+			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0>;
+		};
+
+		pinctrl_cubox_i_usdhc2: cubox_i-usdhc2 {
+			fsl,pins = <
+				MX6QDL_PAD_SD2_CMD__SD2_CMD    0x17059
+				MX6QDL_PAD_SD2_CLK__SD2_CLK    0x10059
+				MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
+				MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
+				MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
+				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
+				MX6QDL_PAD_GPIO_4__SD2_CD_B    0x1f071
+			>;
+		};
+	};
+};
+
+&spdif {
+	status = "okay";
+};
+
+&usdhc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_cubox_i_usdhc2>;
+	vmmc-supply = <&reg_3p3v>;
+	fsl,cd-controller;
+	status = "okay";
+};
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] ARM: add DT support for cubox-i platforms

[Russell King]

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/boot/dts/Makefile             |  2 +
 arch/arm/boot/dts/imx6dl-cubox-i.dts   | 12 ++++++
 arch/arm/boot/dts/imx6q-cubox-i.dts    | 16 +++++++
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 78 ++++++++++++++++++++++++++++++++++
 4 files changed, 108 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6dl-cubox-i.dts
 create mode 100644 arch/arm/boot/dts/imx6q-cubox-i.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 875af333c6dc..1eeae00d9d09 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -136,11 +136,13 @@ dtb-$(CONFIG_ARCH_MXC) += \
 	imx53-mba53.dtb \
 	imx53-qsb.dtb \
 	imx53-smd.dtb \
+	imx6dl-cubox-i.dtb \
 	imx6dl-hummingboard.dtb \
 	imx6dl-sabreauto.dtb \
 	imx6dl-sabresd.dtb \
 	imx6dl-wandboard.dtb \
 	imx6q-arm2.dtb \
+	imx6q-cubox-i.dtb \
 	imx6q-phytec-pbab01.dtb \
 	imx6q-sabreauto.dtb \
 	imx6q-sabrelite.dtb \
diff --git a/arch/arm/boot/dts/imx6dl-cubox-i.dts b/arch/arm/boot/dts/imx6dl-cubox-i.dts
new file mode 100644
index 000000000000..58aa8f2b0f26
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-cubox-i.dts
@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2014 Russell King
+ */
+/dts-v1/;
+
+#include "imx6dl.dtsi"
+#include "imx6qdl-cubox-i.dtsi"
+
+/ {
+	model = "SolidRun Cubox-i Solo/DualLite";
+	compatible = "solidrun,cubox-i/dl", "fsl,imx6dl";
+};
diff --git a/arch/arm/boot/dts/imx6q-cubox-i.dts b/arch/arm/boot/dts/imx6q-cubox-i.dts
new file mode 100644
index 000000000000..bc5f31e3e892
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-cubox-i.dts
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2014 Russell King
+ */
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include "imx6qdl-cubox-i.dtsi"
+
+/ {
+	model = "SolidRun Cubox-i Dual/Quad";
+	compatible = "solidrun,cubox-i/q", "fsl,imx6q";
+};
+
+&sata {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
new file mode 100644
index 000000000000..6fbca9063b10
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2014 Russell King
+ */
+#include "imx6qdl-microsom.dtsi"
+#include "imx6qdl-microsom-ar8035.dtsi"
+
+/ {
+	ir_recv: ir-receiver {
+		compatible = "gpio-ir-receiver";
+		gpios = <&gpio3 9 1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_cubox_i_ir>;
+	};
+
+	codec: spdif-transmitter {
+		compatible = "linux,spdif-dit";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_cubox_i_spdif>;
+	};
+
+	sound-spdif {
+		compatible = "fsl,imx-audio-spdif";
+		model = "imx-spdif";
+		/* IMX6 doesn't implement this yet */
+		spdif-controller = <&spdif>;
+		spdif-out;
+	};
+};
+
+&i2c3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c3_1>;
+
+	status = "okay";
+
+	rtc: pcf8523 at 68 {
+		compatible = "nxp,pcf8523";
+		reg = <0x68>;
+	};
+};
+
+&iomuxc {
+	cubox_i {
+		pinctrl_cubox_i_ir: cubox_i-ir {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000
+			>;
+		};
+
+		pinctrl_cubox_i_spdif: cubox_i-spdif {
+			fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0>;
+		};
+
+		pinctrl_cubox_i_usdhc2: cubox_i-usdhc2 {
+			fsl,pins = <
+				MX6QDL_PAD_SD2_CMD__SD2_CMD    0x17059
+				MX6QDL_PAD_SD2_CLK__SD2_CLK    0x10059
+				MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
+				MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
+				MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
+				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x13059
+				MX6QDL_PAD_GPIO_4__SD2_CD_B    0x1f071
+			>;
+		};
+	};
+};
+
+&spdif {
+	status = "okay";
+};
+
+&usdhc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_cubox_i_usdhc2>;
+	vmmc-supply = <&reg_3p3v>;
+	fsl,cd-controller;
+	status = "okay";
+};
-- 
1.8.3.1

Re: [PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Shawn Guo]

On Thu, Jan 16, 2014 at 06:22:12PM +0000, Russell King - ARM Linux wrote:
> Now that the Cubox-i has been released, and I have one, I've been able to
> update things a little.  Out of the following two patches, the first one
> I think is critical to be merged before the microsom support hits
> mainline, since it drops the flexcan support from the microsom level,
> moving it to the Hummingboard level.

I will be out of town for a few days, and won't be online until next
weekend.  So please send the patch directly to arm-soc folks, so that
they can send it together with imx-dt-3.14 stuff.

arm-soc folks, please take this as another ping for my imx-dt-3.14 pull
request :)

Shawn

> 
> That doesn't have _too_ much visible effect, but it's something which
> should not be there (since as far as the microsom is concerned, there's
> nothing special about these pads.)

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Shawn Guo]

On Thu, Jan 16, 2014 at 06:22:12PM +0000, Russell King - ARM Linux wrote:
> Now that the Cubox-i has been released, and I have one, I've been able to
> update things a little.  Out of the following two patches, the first one
> I think is critical to be merged before the microsom support hits
> mainline, since it drops the flexcan support from the microsom level,
> moving it to the Hummingboard level.

I will be out of town for a few days, and won't be online until next
weekend.  So please send the patch directly to arm-soc folks, so that
they can send it together with imx-dt-3.14 stuff.

arm-soc folks, please take this as another ping for my imx-dt-3.14 pull
request :)

Shawn

> 
> That doesn't have _too_ much visible effect, but it's something which
> should not be there (since as far as the microsom is concerned, there's
> nothing special about these pads.)

Re: [PATCH 1/2] ARM: move flexcan1 configuration to hummingboard

[Shawn Guo]

On Thu, Jan 16, 2014 at 06:22:49PM +0000, Russell King wrote:
> Flexcan1 is not used on the cubox-i, so move it out of the microsom.
> 
> Signed-off-by: Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>

The patch will not apply against the branch/tag - imx-dt-3.14 I'm
sending to arm-soc.  Please re-generate it against the tag.

Acked-by: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

> ---
>  arch/arm/boot/dts/imx6dl-hummingboard.dts | 13 +++++++++++++
>  arch/arm/boot/dts/imx6qdl-microsom.dtsi   | 13 -------------
>  2 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts
> index 6184b0366926..e22f3d855c02 100644
> --- a/arch/arm/boot/dts/imx6dl-hummingboard.dts
> +++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts
> @@ -36,6 +36,12 @@
>  	};
>  };
>  
> +&can1 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_hummingboard_flexcan1>;
> +	status = "okay";
> +};
> +
>  &i2c1 {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&pinctrl_i2c1_1>;
> @@ -53,6 +59,13 @@
>  
>  &iomuxc {
>  	hummingboard {
> +		pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 {
> +			fsl,pins = <
> +				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000
> +				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000
> +			>;
> +		};
> +
>  		pinctrl_hummingboard_gpio1_2: hummingboard-gpio1_2 {
>  			fsl,pins = <
>  				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
> diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> index 8aa31a842236..965ac4c1f509 100644
> --- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> @@ -36,21 +36,8 @@
>  	};
>  };
>  
> -&can1 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&pinctrl_microsom_flexcan1>;
> -	status = "okay";
> -};
> -
>  &iomuxc {
>  	microsom {
> -		pinctrl_microsom_flexcan1: microsom-flexcan1 {
> -			fsl,pins = <
> -				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000
> -				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000
> -			>;
> -		};
> -
>  		pinctrl_microsom_usbotg: microsom-usbotg {
>  			/*
>  			 * Similar to pinctrl_usbotg_2, but we want it
> -- 
> 1.8.3.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] ARM: move flexcan1 configuration to hummingboard

[Shawn Guo]

On Thu, Jan 16, 2014 at 06:22:49PM +0000, Russell King wrote:
> Flexcan1 is not used on the cubox-i, so move it out of the microsom.
> 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

The patch will not apply against the branch/tag - imx-dt-3.14 I'm
sending to arm-soc.  Please re-generate it against the tag.

Acked-by: Shawn Guo <shawn.guo@linaro.org>

> ---
>  arch/arm/boot/dts/imx6dl-hummingboard.dts | 13 +++++++++++++
>  arch/arm/boot/dts/imx6qdl-microsom.dtsi   | 13 -------------
>  2 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6dl-hummingboard.dts b/arch/arm/boot/dts/imx6dl-hummingboard.dts
> index 6184b0366926..e22f3d855c02 100644
> --- a/arch/arm/boot/dts/imx6dl-hummingboard.dts
> +++ b/arch/arm/boot/dts/imx6dl-hummingboard.dts
> @@ -36,6 +36,12 @@
>  	};
>  };
>  
> +&can1 {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pinctrl_hummingboard_flexcan1>;
> +	status = "okay";
> +};
> +
>  &i2c1 {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&pinctrl_i2c1_1>;
> @@ -53,6 +59,13 @@
>  
>  &iomuxc {
>  	hummingboard {
> +		pinctrl_hummingboard_flexcan1: hummingboard-flexcan1 {
> +			fsl,pins = <
> +				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000
> +				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000
> +			>;
> +		};
> +
>  		pinctrl_hummingboard_gpio1_2: hummingboard-gpio1_2 {
>  			fsl,pins = <
>  				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
> diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> index 8aa31a842236..965ac4c1f509 100644
> --- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
> @@ -36,21 +36,8 @@
>  	};
>  };
>  
> -&can1 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&pinctrl_microsom_flexcan1>;
> -	status = "okay";
> -};
> -
>  &iomuxc {
>  	microsom {
> -		pinctrl_microsom_flexcan1: microsom-flexcan1 {
> -			fsl,pins = <
> -				MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX 0x80000000
> -				MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX 0x80000000
> -			>;
> -		};
> -
>  		pinctrl_microsom_usbotg: microsom-usbotg {
>  			/*
>  			 * Similar to pinctrl_usbotg_2, but we want it
> -- 
> 1.8.3.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Olof Johansson]

On Sun, Jan 19, 2014 at 11:18:18AM +0800, Shawn Guo wrote:
> On Thu, Jan 16, 2014 at 06:22:12PM +0000, Russell King - ARM Linux wrote:
> > Now that the Cubox-i has been released, and I have one, I've been able to
> > update things a little.  Out of the following two patches, the first one
> > I think is critical to be merged before the microsom support hits
> > mainline, since it drops the flexcan support from the microsom level,
> > moving it to the Hummingboard level.
> 
> I will be out of town for a few days, and won't be online until next
> weekend.  So please send the patch directly to arm-soc folks, so that
> they can send it together with imx-dt-3.14 stuff.
> 
> arm-soc folks, please take this as another ping for my imx-dt-3.14 pull
> request :)

I'm well aware that the DT branch has not been merged, and that's because
there has been no consensus from DT maintainers on the massive rework
you did as the base of the branch.

Given the timing, it's not looking like it will be resolved in time for
the 3.14 merge window (which might open today).



-Olof
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Olof Johansson]

On Sun, Jan 19, 2014 at 11:18:18AM +0800, Shawn Guo wrote:
> On Thu, Jan 16, 2014 at 06:22:12PM +0000, Russell King - ARM Linux wrote:
> > Now that the Cubox-i has been released, and I have one, I've been able to
> > update things a little.  Out of the following two patches, the first one
> > I think is critical to be merged before the microsom support hits
> > mainline, since it drops the flexcan support from the microsom level,
> > moving it to the Hummingboard level.
> 
> I will be out of town for a few days, and won't be online until next
> weekend.  So please send the patch directly to arm-soc folks, so that
> they can send it together with imx-dt-3.14 stuff.
> 
> arm-soc folks, please take this as another ping for my imx-dt-3.14 pull
> request :)

I'm well aware that the DT branch has not been merged, and that's because
there has been no consensus from DT maintainers on the massive rework
you did as the base of the branch.

Given the timing, it's not looking like it will be resolved in time for
the 3.14 merge window (which might open today).



-Olof

Re: [PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Russell King - ARM Linux]

On Sun, Jan 19, 2014 at 10:52:46AM -0800, Olof Johansson wrote:
> On Sun, Jan 19, 2014 at 11:18:18AM +0800, Shawn Guo wrote:
> > On Thu, Jan 16, 2014 at 06:22:12PM +0000, Russell King - ARM Linux wrote:
> > > Now that the Cubox-i has been released, and I have one, I've been able to
> > > update things a little.  Out of the following two patches, the first one
> > > I think is critical to be merged before the microsom support hits
> > > mainline, since it drops the flexcan support from the microsom level,
> > > moving it to the Hummingboard level.
> > 
> > I will be out of town for a few days, and won't be online until next
> > weekend.  So please send the patch directly to arm-soc folks, so that
> > they can send it together with imx-dt-3.14 stuff.
> > 
> > arm-soc folks, please take this as another ping for my imx-dt-3.14 pull
> > request :)
> 
> I'm well aware that the DT branch has not been merged, and that's because
> there has been no consensus from DT maintainers on the massive rework
> you did as the base of the branch.
> 
> Given the timing, it's not looking like it will be resolved in time for
> the 3.14 merge window (which might open today).

Okay, that presumably means that the Hummingboard stuff won't be going in
through this route, and it sounds like the imx DT stuff will need rework.

Is there any objection if I pushed just the Hummingboard files upstream
myself?

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Russell King - ARM Linux]

On Sun, Jan 19, 2014 at 10:52:46AM -0800, Olof Johansson wrote:
> On Sun, Jan 19, 2014 at 11:18:18AM +0800, Shawn Guo wrote:
> > On Thu, Jan 16, 2014 at 06:22:12PM +0000, Russell King - ARM Linux wrote:
> > > Now that the Cubox-i has been released, and I have one, I've been able to
> > > update things a little.  Out of the following two patches, the first one
> > > I think is critical to be merged before the microsom support hits
> > > mainline, since it drops the flexcan support from the microsom level,
> > > moving it to the Hummingboard level.
> > 
> > I will be out of town for a few days, and won't be online until next
> > weekend.  So please send the patch directly to arm-soc folks, so that
> > they can send it together with imx-dt-3.14 stuff.
> > 
> > arm-soc folks, please take this as another ping for my imx-dt-3.14 pull
> > request :)
> 
> I'm well aware that the DT branch has not been merged, and that's because
> there has been no consensus from DT maintainers on the massive rework
> you did as the base of the branch.
> 
> Given the timing, it's not looking like it will be resolved in time for
> the 3.14 merge window (which might open today).

Okay, that presumably means that the Hummingboard stuff won't be going in
through this route, and it sounds like the imx DT stuff will need rework.

Is there any objection if I pushed just the Hummingboard files upstream
myself?

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".

Re: [PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Olof Johansson]

On Sun, Jan 19, 2014 at 4:44 PM, Russell King - ARM Linux
<linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> wrote:
> On Sun, Jan 19, 2014 at 10:52:46AM -0800, Olof Johansson wrote:
>> On Sun, Jan 19, 2014 at 11:18:18AM +0800, Shawn Guo wrote:
>> > On Thu, Jan 16, 2014 at 06:22:12PM +0000, Russell King - ARM Linux wrote:
>> > > Now that the Cubox-i has been released, and I have one, I've been able to
>> > > update things a little.  Out of the following two patches, the first one
>> > > I think is critical to be merged before the microsom support hits
>> > > mainline, since it drops the flexcan support from the microsom level,
>> > > moving it to the Hummingboard level.
>> >
>> > I will be out of town for a few days, and won't be online until next
>> > weekend.  So please send the patch directly to arm-soc folks, so that
>> > they can send it together with imx-dt-3.14 stuff.
>> >
>> > arm-soc folks, please take this as another ping for my imx-dt-3.14 pull
>> > request :)
>>
>> I'm well aware that the DT branch has not been merged, and that's because
>> there has been no consensus from DT maintainers on the massive rework
>> you did as the base of the branch.
>>
>> Given the timing, it's not looking like it will be resolved in time for
>> the 3.14 merge window (which might open today).
>
> Okay, that presumably means that the Hummingboard stuff won't be going in
> through this route, and it sounds like the imx DT stuff will need rework.
>
> Is there any objection if I pushed just the Hummingboard files upstream
> myself?

I'm guessing this is going to mess up Shawn's cleanup patches, but
time has ran out for 3.14 for those so they will need to be respun
anyway, most likely.

We can apply them to arm-soc's dt branch. I think it's better if we
merge them since dts files tend to be one of the conflict-ridden areas
(even if this particular instance isn't). Send the series our way if
you want, or send a branch pull request, your choice.

We're generally somewhat liberal w.r.t. applying brand new dts files
-- just like Greg is liberal with applying new PCI ids in -stable: as
long as they don't break dtbs target compilation there's little reason
to sit on them a whole release if they come in early during the cycle
(pre-rc2 or so).


-Olof
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Olof Johansson]

On Sun, Jan 19, 2014 at 4:44 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Sun, Jan 19, 2014 at 10:52:46AM -0800, Olof Johansson wrote:
>> On Sun, Jan 19, 2014 at 11:18:18AM +0800, Shawn Guo wrote:
>> > On Thu, Jan 16, 2014 at 06:22:12PM +0000, Russell King - ARM Linux wrote:
>> > > Now that the Cubox-i has been released, and I have one, I've been able to
>> > > update things a little.  Out of the following two patches, the first one
>> > > I think is critical to be merged before the microsom support hits
>> > > mainline, since it drops the flexcan support from the microsom level,
>> > > moving it to the Hummingboard level.
>> >
>> > I will be out of town for a few days, and won't be online until next
>> > weekend.  So please send the patch directly to arm-soc folks, so that
>> > they can send it together with imx-dt-3.14 stuff.
>> >
>> > arm-soc folks, please take this as another ping for my imx-dt-3.14 pull
>> > request :)
>>
>> I'm well aware that the DT branch has not been merged, and that's because
>> there has been no consensus from DT maintainers on the massive rework
>> you did as the base of the branch.
>>
>> Given the timing, it's not looking like it will be resolved in time for
>> the 3.14 merge window (which might open today).
>
> Okay, that presumably means that the Hummingboard stuff won't be going in
> through this route, and it sounds like the imx DT stuff will need rework.
>
> Is there any objection if I pushed just the Hummingboard files upstream
> myself?

I'm guessing this is going to mess up Shawn's cleanup patches, but
time has ran out for 3.14 for those so they will need to be respun
anyway, most likely.

We can apply them to arm-soc's dt branch. I think it's better if we
merge them since dts files tend to be one of the conflict-ridden areas
(even if this particular instance isn't). Send the series our way if
you want, or send a branch pull request, your choice.

We're generally somewhat liberal w.r.t. applying brand new dts files
-- just like Greg is liberal with applying new PCI ids in -stable: as
long as they don't break dtbs target compilation there's little reason
to sit on them a whole release if they come in early during the cycle
(pre-rc2 or so).


-Olof

Re: [PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Russell King - ARM Linux]

On Sun, Jan 19, 2014 at 07:34:22PM -0800, Olof Johansson wrote:
> I'm guessing this is going to mess up Shawn's cleanup patches, but
> time has ran out for 3.14 for those so they will need to be respun
> anyway, most likely.
> 
> We can apply them to arm-soc's dt branch. I think it's better if we
> merge them since dts files tend to be one of the conflict-ridden areas
> (even if this particular instance isn't). Send the series our way if
> you want, or send a branch pull request, your choice.

There's no conflict, and they build fine according to my autobuilder
which includes arm-soc for-next.

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Russell King - ARM Linux]

On Sun, Jan 19, 2014 at 07:34:22PM -0800, Olof Johansson wrote:
> I'm guessing this is going to mess up Shawn's cleanup patches, but
> time has ran out for 3.14 for those so they will need to be respun
> anyway, most likely.
> 
> We can apply them to arm-soc's dt branch. I think it's better if we
> merge them since dts files tend to be one of the conflict-ridden areas
> (even if this particular instance isn't). Send the series our way if
> you want, or send a branch pull request, your choice.

There's no conflict, and they build fine according to my autobuilder
which includes arm-soc for-next.

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".

Re: [PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Olof Johansson]

On Mon, Jan 20, 2014 at 1:55 AM, Russell King - ARM Linux
<linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> wrote:
> On Sun, Jan 19, 2014 at 07:34:22PM -0800, Olof Johansson wrote:
>> I'm guessing this is going to mess up Shawn's cleanup patches, but
>> time has ran out for 3.14 for those so they will need to be respun
>> anyway, most likely.
>>
>> We can apply them to arm-soc's dt branch. I think it's better if we
>> merge them since dts files tend to be one of the conflict-ridden areas
>> (even if this particular instance isn't). Send the series our way if
>> you want, or send a branch pull request, your choice.
>
> There's no conflict, and they build fine according to my autobuilder
> which includes arm-soc for-next.

Great, I didn't see any patches sent from you though. Should I
cherry-pick them from -next instead?


-Olof
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Olof Johansson]

On Mon, Jan 20, 2014 at 1:55 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Sun, Jan 19, 2014 at 07:34:22PM -0800, Olof Johansson wrote:
>> I'm guessing this is going to mess up Shawn's cleanup patches, but
>> time has ran out for 3.14 for those so they will need to be respun
>> anyway, most likely.
>>
>> We can apply them to arm-soc's dt branch. I think it's better if we
>> merge them since dts files tend to be one of the conflict-ridden areas
>> (even if this particular instance isn't). Send the series our way if
>> you want, or send a branch pull request, your choice.
>
> There's no conflict, and they build fine according to my autobuilder
> which includes arm-soc for-next.

Great, I didn't see any patches sent from you though. Should I
cherry-pick them from -next instead?


-Olof

Re: [PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Russell King - ARM Linux]

On Mon, Jan 20, 2014 at 12:47:07PM -0800, Olof Johansson wrote:
> On Mon, Jan 20, 2014 at 1:55 AM, Russell King - ARM Linux
> <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> wrote:
> > On Sun, Jan 19, 2014 at 07:34:22PM -0800, Olof Johansson wrote:
> >> I'm guessing this is going to mess up Shawn's cleanup patches, but
> >> time has ran out for 3.14 for those so they will need to be respun
> >> anyway, most likely.
> >>
> >> We can apply them to arm-soc's dt branch. I think it's better if we
> >> merge them since dts files tend to be one of the conflict-ridden areas
> >> (even if this particular instance isn't). Send the series our way if
> >> you want, or send a branch pull request, your choice.
> >
> > There's no conflict, and they build fine according to my autobuilder
> > which includes arm-soc for-next.
> 
> Great, I didn't see any patches sent from you though. Should I
> cherry-pick them from -next instead?

If there's no conflicts, and if there other imx DT changes aren't going
to be submitted, then why is there any need to cherry-pick them into
arm-soc?

Are you suggesting that DT changes happen spontaneously all the time?
If that's true, why couldn't the new board support be put in during
-rc kernels?

What you're saying doesn't really make _that_ much sense to me at the
moment.

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Russell King - ARM Linux]

On Mon, Jan 20, 2014 at 12:47:07PM -0800, Olof Johansson wrote:
> On Mon, Jan 20, 2014 at 1:55 AM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
> > On Sun, Jan 19, 2014 at 07:34:22PM -0800, Olof Johansson wrote:
> >> I'm guessing this is going to mess up Shawn's cleanup patches, but
> >> time has ran out for 3.14 for those so they will need to be respun
> >> anyway, most likely.
> >>
> >> We can apply them to arm-soc's dt branch. I think it's better if we
> >> merge them since dts files tend to be one of the conflict-ridden areas
> >> (even if this particular instance isn't). Send the series our way if
> >> you want, or send a branch pull request, your choice.
> >
> > There's no conflict, and they build fine according to my autobuilder
> > which includes arm-soc for-next.
> 
> Great, I didn't see any patches sent from you though. Should I
> cherry-pick them from -next instead?

If there's no conflicts, and if there other imx DT changes aren't going
to be submitted, then why is there any need to cherry-pick them into
arm-soc?

Are you suggesting that DT changes happen spontaneously all the time?
If that's true, why couldn't the new board support be put in during
-rc kernels?

What you're saying doesn't really make _that_ much sense to me at the
moment.

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".

Re: [PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Shawn Guo]

On Sun, Jan 19, 2014 at 10:52:46AM -0800, Olof Johansson wrote:
> I'm well aware that the DT branch has not been merged, and that's because
> there has been no consensus from DT maintainers on the massive rework
> you did as the base of the branch.

I guess the 'massive rework' you're talking about is the patch series
that begins with 'ARM: dts: imx6qdl: make pinctrl nodes board specific'?
If so, I hope you would agree that we're trying to solve a real
problem [1], even though the solution does not look like the best to
you.

So which specific part of the solution are you objecting to?  Those
MX6QDL_*_PINGRP macros defined in imx6qdl-pingrp.h?  If that's the
case, I can send a follow-up patch to kill the macros by filling in the
pin group definitions directly.  The pros is that the pin group
definitions for given board will be more intuitive, and the cons is that
the change set will be even more massive, because the same multi-lines
pin group definitions will be duplicated in multiple board dts files,
which use the same group of pins for given device.

Or any other better idea?

> 
> Given the timing, it's not looking like it will be resolved in time for
> the 3.14 merge window (which might open today).

That's frustrating and will be surprising a lot of people who expect to
see their board support in 3.14 release.

Shawn


[1] http://thread.gmane.org/gmane.linux.ports.arm.kernel/275912/

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Shawn Guo]

On Sun, Jan 19, 2014 at 10:52:46AM -0800, Olof Johansson wrote:
> I'm well aware that the DT branch has not been merged, and that's because
> there has been no consensus from DT maintainers on the massive rework
> you did as the base of the branch.

I guess the 'massive rework' you're talking about is the patch series
that begins with 'ARM: dts: imx6qdl: make pinctrl nodes board specific'?
If so, I hope you would agree that we're trying to solve a real
problem [1], even though the solution does not look like the best to
you.

So which specific part of the solution are you objecting to?  Those
MX6QDL_*_PINGRP macros defined in imx6qdl-pingrp.h?  If that's the
case, I can send a follow-up patch to kill the macros by filling in the
pin group definitions directly.  The pros is that the pin group
definitions for given board will be more intuitive, and the cons is that
the change set will be even more massive, because the same multi-lines
pin group definitions will be duplicated in multiple board dts files,
which use the same group of pins for given device.

Or any other better idea?

> 
> Given the timing, it's not looking like it will be resolved in time for
> the 3.14 merge window (which might open today).

That's frustrating and will be surprising a lot of people who expect to
see their board support in 3.14 release.

Shawn


[1] http://thread.gmane.org/gmane.linux.ports.arm.kernel/275912/

Re: [PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Olof Johansson]

Hi,

On Fri, Jan 24, 2014 at 7:09 AM, Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote:
> On Sun, Jan 19, 2014 at 10:52:46AM -0800, Olof Johansson wrote:
>> I'm well aware that the DT branch has not been merged, and that's because
>> there has been no consensus from DT maintainers on the massive rework
>> you did as the base of the branch.
>
> I guess the 'massive rework' you're talking about is the patch series
> that begins with 'ARM: dts: imx6qdl: make pinctrl nodes board specific'?
> If so, I hope you would agree that we're trying to solve a real
> problem [1], even though the solution does not look like the best to
> you.
>
> So which specific part of the solution are you objecting to?  Those
> MX6QDL_*_PINGRP macros defined in imx6qdl-pingrp.h?  If that's the
> case, I can send a follow-up patch to kill the macros by filling in the
> pin group definitions directly.  The pros is that the pin group
> definitions for given board will be more intuitive, and the cons is that
> the change set will be even more massive, because the same multi-lines
> pin group definitions will be duplicated in multiple board dts files,
> which use the same group of pins for given device.
>
> Or any other better idea?

I haven't heard any other maintainers being positive to this change.
Not Linus W, as the pinctrl maintainer, and none of the DT
maintainers. I asked for their review, which should mean acks or
general approval from them, and I haven't seen any come in. Or did I
miss it?

>> Given the timing, it's not looking like it will be resolved in time for
>> the 3.14 merge window (which might open today).
>
> That's frustrating and will be surprising a lot of people who expect to
> see their board support in 3.14 release.

Yes, it is very unfortunate.

See this as a chance to adjust your process. Next time you send a
large pull request that gets questions like these, please consider
splitting off the controversial part in a separate branch so that the
bulk of the changes can go in. That's what other maintainers tend to
do. Right now you have chosen to let your pinctrl header file changes
hold up everything for everyone that merges code through you.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Olof Johansson]

Hi,

On Fri, Jan 24, 2014 at 7:09 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Sun, Jan 19, 2014 at 10:52:46AM -0800, Olof Johansson wrote:
>> I'm well aware that the DT branch has not been merged, and that's because
>> there has been no consensus from DT maintainers on the massive rework
>> you did as the base of the branch.
>
> I guess the 'massive rework' you're talking about is the patch series
> that begins with 'ARM: dts: imx6qdl: make pinctrl nodes board specific'?
> If so, I hope you would agree that we're trying to solve a real
> problem [1], even though the solution does not look like the best to
> you.
>
> So which specific part of the solution are you objecting to?  Those
> MX6QDL_*_PINGRP macros defined in imx6qdl-pingrp.h?  If that's the
> case, I can send a follow-up patch to kill the macros by filling in the
> pin group definitions directly.  The pros is that the pin group
> definitions for given board will be more intuitive, and the cons is that
> the change set will be even more massive, because the same multi-lines
> pin group definitions will be duplicated in multiple board dts files,
> which use the same group of pins for given device.
>
> Or any other better idea?

I haven't heard any other maintainers being positive to this change.
Not Linus W, as the pinctrl maintainer, and none of the DT
maintainers. I asked for their review, which should mean acks or
general approval from them, and I haven't seen any come in. Or did I
miss it?

>> Given the timing, it's not looking like it will be resolved in time for
>> the 3.14 merge window (which might open today).
>
> That's frustrating and will be surprising a lot of people who expect to
> see their board support in 3.14 release.

Yes, it is very unfortunate.

See this as a chance to adjust your process. Next time you send a
large pull request that gets questions like these, please consider
splitting off the controversial part in a separate branch so that the
bulk of the changes can go in. That's what other maintainers tend to
do. Right now you have chosen to let your pinctrl header file changes
hold up everything for everyone that merges code through you.


-Olof

Re: [PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Lucas Stach]

Am Freitag, den 24.01.2014, 19:44 -0800 schrieb Olof Johansson:
> Hi,
> 
> On Fri, Jan 24, 2014 at 7:09 AM, Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote:
> > On Sun, Jan 19, 2014 at 10:52:46AM -0800, Olof Johansson wrote:
> >> I'm well aware that the DT branch has not been merged, and that's because
> >> there has been no consensus from DT maintainers on the massive rework
> >> you did as the base of the branch.
> >
> > I guess the 'massive rework' you're talking about is the patch series
> > that begins with 'ARM: dts: imx6qdl: make pinctrl nodes board specific'?
> > If so, I hope you would agree that we're trying to solve a real
> > problem [1], even though the solution does not look like the best to
> > you.
> >
> > So which specific part of the solution are you objecting to?  Those
> > MX6QDL_*_PINGRP macros defined in imx6qdl-pingrp.h?  If that's the
> > case, I can send a follow-up patch to kill the macros by filling in the
> > pin group definitions directly.  The pros is that the pin group
> > definitions for given board will be more intuitive, and the cons is that
> > the change set will be even more massive, because the same multi-lines
> > pin group definitions will be duplicated in multiple board dts files,
> > which use the same group of pins for given device.
> >
> > Or any other better idea?
> 
> I haven't heard any other maintainers being positive to this change.
> Not Linus W, as the pinctrl maintainer, and none of the DT
> maintainers. I asked for their review, which should mean acks or
> general approval from them, and I haven't seen any come in. Or did I
> miss it?
> 

Just to throw in some opinion: we at Pengutronix use the new macros for
some time now and we pretty much like them. We are even in the process
of pushing them to our bootloader. They do not obfuscate things beyond
the status quo, as we always needed some form of grouping. Now it's just
a macro, before it was a phandle.

Also those are not changing ABI, so if people really hate them (which I
seriously doubt) we can always revert or change them to something other
later. So IMHO I would really like the change to go in as is.

Regards,
Lucas
-- 
Pengutronix e.K.                           | Lucas Stach                 |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 0/2] DT updates for Hummingboard and new Cubox-i

[Lucas Stach]

Am Freitag, den 24.01.2014, 19:44 -0800 schrieb Olof Johansson:
> Hi,
> 
> On Fri, Jan 24, 2014 at 7:09 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > On Sun, Jan 19, 2014 at 10:52:46AM -0800, Olof Johansson wrote:
> >> I'm well aware that the DT branch has not been merged, and that's because
> >> there has been no consensus from DT maintainers on the massive rework
> >> you did as the base of the branch.
> >
> > I guess the 'massive rework' you're talking about is the patch series
> > that begins with 'ARM: dts: imx6qdl: make pinctrl nodes board specific'?
> > If so, I hope you would agree that we're trying to solve a real
> > problem [1], even though the solution does not look like the best to
> > you.
> >
> > So which specific part of the solution are you objecting to?  Those
> > MX6QDL_*_PINGRP macros defined in imx6qdl-pingrp.h?  If that's the
> > case, I can send a follow-up patch to kill the macros by filling in the
> > pin group definitions directly.  The pros is that the pin group
> > definitions for given board will be more intuitive, and the cons is that
> > the change set will be even more massive, because the same multi-lines
> > pin group definitions will be duplicated in multiple board dts files,
> > which use the same group of pins for given device.
> >
> > Or any other better idea?
> 
> I haven't heard any other maintainers being positive to this change.
> Not Linus W, as the pinctrl maintainer, and none of the DT
> maintainers. I asked for their review, which should mean acks or
> general approval from them, and I haven't seen any come in. Or did I
> miss it?
> 

Just to throw in some opinion: we at Pengutronix use the new macros for
some time now and we pretty much like them. We are even in the process
of pushing them to our bootloader. They do not obfuscate things beyond
the status quo, as we always needed some form of grouping. Now it's just
a macro, before it was a phandle.

Also those are not changing ABI, so if people really hate them (which I
seriously doubt) we can always revert or change them to something other
later. So IMHO I would really like the change to go in as is.

Regards,
Lucas
-- 
Pengutronix e.K.                           | Lucas Stach                 |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |