Add support for Ixora V1.1 and Apalis Evaluation Board

PATCH New Sanchayan Maity 2 participants 12 messages Aug 7, 2017 – Aug 14, 2017

Subsystems (3)

Device tree bindings Arm i.MX and Layerscape Arm and arm64 SoC sub-architectures (common parts)

lore

Share & tools

lore

Sanchayan Maity

author

2017-08-07 07:22 UTC #0 lore raw

cover Add support for Ixora V1.1 and Apalis Evaluation Board

Hello,

This patch series adds support for Toradex Ixora V1.1 and Apalis Evaluation Board along with some cleanups.

Patch series has been generated on top of shawn's for-next branch.

Regards,
Sanchayan.

Marcel Ziswiler (6):
ARM: dts: imx6q-apalis-ixora: combine aliases
ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: get rid of tegra legacy gen1_i2c comment
ARM: dts: imx6qdl-apalis: reword cam i2c comment
ARM: dts: imx6q-apalis-ixora: get rid of obsolete fusion comment
ARM: dts: imx6q-apalis-ixora: add camera i2c bus definition
ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: use i2c from dwc hdmi

Sanchayan Maity (4):
ARM: dts: imx6q-apalis-ixora: fix usdhc2 pinctrl property
ARM: dts: imx6qdl-apalis: split usdhc1 pinctrl to support 4- and 8-bit
ARM: dts: imx6: add support for Toradex Ixora V1.1 carrier board
ARM: dts: imx6q-apalis-eval: add support for Apalis Evaluation Board

 arch/arm/boot/dts/Makefile                    |   2 +
 arch/arm/boot/dts/imx6q-apalis-eval.dts       | 278 ++++++++++++++++++++++++
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 291 ++++++++++++++++++++++++++
 arch/arm/boot/dts/imx6q-apalis-ixora.dts      |  32 ++-
 arch/arm/boot/dts/imx6qdl-apalis.dtsi         |  44 ++--
 5 files changed, 605 insertions(+), 42 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6q-apalis-eval.dts
 create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts

Signature · 1 line

2.13.3

Sanchayan Maity

author

2017-08-07 07:22 UTC #1 lore raw

PATCH 1/10 ARM: dts: imx6q-apalis-ixora: fix usdhc2 pinctrl property

The SD1 pinctrl-0 property is overridden but only the card detect pin is muxed, the control and data signals are not referenced at all. It worked because the bootloader muxed them to a sensible state though. Fix this.

Signed-off-by Sanchayan Maity <[email protected]>

---
 arch/arm/boot/dts/imx6q-apalis-ixora.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/imx6q-apalis-ixora.dts +2 -2

index 88cc7f51a4e9..89d99b4c6eed 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Toradex AG
+ * Copyright 2014-2017 Toradex AG
  * Copyright 2012 Freescale Semiconductor, Inc.
  * Copyright 2011 Linaro Ltd.
  *

@@ -268,7 +268,7 @@
 /* SD1 */
 &usdhc2 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_sd_cd>;
+	pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
 	cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };

Signature · 1 line

2.13.3

Sanchayan Maity

author

2017-08-07 07:22 UTC #2 lore raw

PATCH 2/10 ARM: dts: imx6qdl-apalis: split usdhc1 pinctrl to support 4- and 8-bit

In reply to Sanchayan Maity

Split the pinctrl property for usdhc1 into a 4-bit SD interface and an extension to 8-bit. This is required to support both 8-bit and 4-bit interface on usdhc1 as per the carrier board.

Signed-off-by Sanchayan Maity <[email protected]>

---
 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

arch/arm/boot/dts/imx6qdl-apalis.dtsi +8 -3

index ba01dd76d887..117dee65f3f7 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Toradex AG
+ * Copyright 2014-2017 Toradex AG
  * Copyright 2012 Freescale Semiconductor, Inc.
  * Copyright 2011 Linaro Ltd.
  *

@@ -460,7 +460,7 @@
 /* MMC1 */
 &usdhc1 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usdhc1>;
+	pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>;
 	vqmmc-supply = <&reg_3p3v>;
 	bus-width = <8>;
 	voltage-ranges = <3300 3300>;

@@ -912,7 +912,7 @@
 		>;
 	};
 
-	pinctrl_usdhc1: usdhc1grp {
+	pinctrl_usdhc1_4bit: usdhc1grp_4bit {
 		fsl,pins = <
 			MX6QDL_PAD_SD1_CMD__SD1_CMD    0x17071
 			MX6QDL_PAD_SD1_CLK__SD1_CLK    0x10071

@@ -920,6 +920,11 @@
 			MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17071
 			MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17071
 			MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17071
+		>;
+	};
+
+	pinctrl_usdhc1_8bit: usdhc1grp_8bit {
+		fsl,pins = <
 			MX6QDL_PAD_NANDF_D0__SD1_DATA4 0x17071
 			MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17071
 			MX6QDL_PAD_NANDF_D2__SD1_DATA6 0x17071

Signature · 1 line

2.13.3

Sanchayan Maity

author

2017-08-07 07:22 UTC #3 lore raw

PATCH 3/10 ARM: dts: imx6q-apalis-ixora: combine aliases

In reply to Sanchayan Maity

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>

---
 arch/arm/boot/dts/imx6q-apalis-ixora.dts | 3 ---
 1 file changed, 3 deletions(-)

arch/arm/boot/dts/imx6q-apalis-ixora.dts +0 -3

index 89d99b4c6eed..a5c5bf82e45e 100644
@@ -59,9 +59,6 @@
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;
 		i2c3 = &i2c3;
-	};
-
-	aliases {
 		rtc0 = &rtc_i2c;
 		rtc1 = &snvs_rtc;
 	};

Signature · 1 line

2.13.3

Sanchayan Maity

author

2017-08-07 07:22 UTC #4 lore raw

PATCH 4/10 ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: get rid of tegra legacy gen1_i2c comment

In reply to Sanchayan Maity

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>

---
 arch/arm/boot/dts/imx6q-apalis-ixora.dts | 2 +-
 arch/arm/boot/dts/imx6qdl-apalis.dtsi    | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

arch/arm/boot/dts/imx6q-apalis-ixora.dts +1 -1

index a5c5bf82e45e..a91043d5ac20 100644
@@ -169,7 +169,7 @@
 	status = "okay";
 };
 
-/* GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
+/* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
 &i2c1 {
 	status = "okay";

arch/arm/boot/dts/imx6qdl-apalis.dtsi +1 -4

index 117dee65f3f7..bad86a0ebd82 100644
@@ -210,10 +210,7 @@
 	};
 };
 
-/*
- * GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
- * board)
- */
+/* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
 &i2c1 {
 	clock-frequency = <100000>;
 	pinctrl-names = "default";

Signature · 1 line

2.13.3

Sanchayan Maity

author

2017-08-07 07:22 UTC #5 lore raw

PATCH 5/10 ARM: dts: imx6qdl-apalis: reword cam i2c comment

In reply to Sanchayan Maity

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>

---
 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

arch/arm/boot/dts/imx6qdl-apalis.dtsi +2 -1

index bad86a0ebd82..6658c659b7d7 100644
@@ -371,7 +371,8 @@
 };
 
 /*
- * GEN2_I2C, CAM: I2C3_SDA/SCL on MXM3 201/203 (unused)
+ * I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor on carrier
+ * board)
  */
 &i2c3 {
 	clock-frequency = <100000>;

Signature · 1 line

2.13.3

Sanchayan Maity

author

2017-08-07 07:22 UTC #6 lore raw

PATCH 6/10 ARM: dts: imx6q-apalis-ixora: get rid of obsolete fusion comment

In reply to Sanchayan Maity

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>

---
 arch/arm/boot/dts/imx6q-apalis-ixora.dts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

arch/arm/boot/dts/imx6q-apalis-ixora.dts +1 -4

index a91043d5ac20..ebe5b909c6f9 100644
@@ -271,10 +271,7 @@
 };
 
 &iomuxc {
-	/*
-	 * Mux the Apalis GPIOs
-	 * GPIO5, 6 used by optional fusion_F0710A kernel module
-	 */
+	/* Mux the Apalis GPIOs */
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
 		     &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4

Signature · 1 line

2.13.3

Sanchayan Maity

author

2017-08-07 07:22 UTC #7 lore raw

PATCH 7/10 ARM: dts: imx6q-apalis-ixora: add camera i2c bus definition

In reply to Sanchayan Maity

From: Marcel Ziswiler <[email protected]>

Signed-off-by Marcel Ziswiler <[email protected]>

---
 arch/arm/boot/dts/imx6q-apalis-ixora.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

arch/arm/boot/dts/imx6q-apalis-ixora.dts +8 -0

index ebe5b909c6f9..73c1ec883ff5 100644
@@ -185,6 +185,14 @@
 	};
 };
 
+/*
+ * I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor on carrier
+ * board)
+ */
+&i2c3 {
+	status = "okay";
+};
+
 &ipu1_di1_disp1 {
 	remote-endpoint = <&lcd_display_in>;
 };

Signature · 1 line

2.13.3

Sanchayan Maity

author

2017-08-07 07:22 UTC #8 lore raw

PATCH 8/10 ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: use i2c from dwc hdmi

In reply to Sanchayan Maity

From: Marcel Ziswiler <[email protected]>

Migrate to using functionally-reduced I2C master contained in the DWC HDMI. Therefore drop the GPIO bitbanging based i2cddc definition and modify resp. pinctrl.

While at it re-order the I2C aliases to start with the generic, followed by the camera and concluded by the power I2C one.

Signed-off-by Marcel Ziswiler <[email protected]>

---
 arch/arm/boot/dts/imx6q-apalis-ixora.dts | 10 ++--------
 arch/arm/boot/dts/imx6qdl-apalis.dtsi    | 25 +++++++++----------------
 2 files changed, 11 insertions(+), 24 deletions(-)

arch/arm/boot/dts/imx6q-apalis-ixora.dts +2 -8

index 73c1ec883ff5..60d33e99de76 100644
@@ -55,10 +55,9 @@
 		     "fsl,imx6q";
 
 	aliases {
-		i2c0 = &i2cddc;
-		i2c1 = &i2c1;
+		i2c0 = &i2c1;
+		i2c1 = &i2c3;
 		i2c2 = &i2c2;
-		i2c3 = &i2c3;
 		rtc0 = &rtc_i2c;
 		rtc1 = &snvs_rtc;
 	};

@@ -161,11 +160,6 @@
 };
 
 &hdmi {
-	ddc-i2c-bus = <&i2cddc>;
-	status = "okay";
-};
-
-&i2cddc {
 	status = "okay";
 };

arch/arm/boot/dts/imx6qdl-apalis.dtsi +9 ~~-16~~

index 6658c659b7d7..ea339fa58f4a 100644
@@ -56,18 +56,6 @@
 		status = "disabled";
 	};
 
-	/* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */
-	i2cddc: i2c at 0 {
-		compatible = "i2c-gpio";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_i2c_ddc>;
-		gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
-			 &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
-			>;
-		i2c-gpio,delay-us = <2>;	/* ~100 kHz */
-		status = "disabled";
-	};
-
 	reg_1p8v: regulator-1p8v {
 		compatible = "regulator-fixed";
 		regulator-name = "1P8V";

@@ -210,6 +198,12 @@
 	};
 };
 
+&hdmi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hdmi_ddc>;
+	status = "disabled";
+};
+
 /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
 &i2c1 {
 	clock-frequency = <100000>;

@@ -638,11 +632,10 @@
 		>;
 	};
 
-	pinctrl_i2c_ddc: gpioi2cddcgrp {
+	pinctrl_hdmi_ddc: hdmiddcgrp {
 		fsl,pins = <
-			/* DDC bitbang */
-			MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x1b0b0
-			MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x1b0b0
+			MX6QDL_PAD_EIM_EB2__HDMI_TX_DDC_SCL 0x4001b8b1
+			MX6QDL_PAD_EIM_D16__HDMI_TX_DDC_SDA 0x4001b8b1
 		>;
 	};

Signature · 1 line

2.13.3

Sanchayan Maity

author

2017-08-07 07:22 UTC #9 lore raw

PATCH 9/10 ARM: dts: imx6: add support for Toradex Ixora V1.1 carrier board

In reply to Sanchayan Maity

Add support for the Toradex Ixora V1.1 carrier board.

Signed-off-by Sanchayan Maity <[email protected]>

---
 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 291 ++++++++++++++++++++++++++
 2 files changed, 292 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts

arch/arm/boot/dts/Makefile +1 -0

index ccfaf8e9e397..1c16e891a76a 100644
@@ -393,6 +393,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
 	imx6dl-wandboard.dtb \
 	imx6dl-wandboard-revb1.dtb \
 	imx6q-apalis-ixora.dtb \
+	imx6q-apalis-ixora-v1.1.dtb \
 	imx6q-apf6dev.dtb \
 	imx6q-arm2.dtb \
 	imx6q-b450v3.dtb \

arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts new file +291 -0

291 lines not on this page · raw message

Signature · 1 line

2.13.3

Sanchayan Maity

author

2017-08-07 07:22 UTC #10 lore raw

PATCH 10/10 ARM: dts: imx6q-apalis-eval: add support for Apalis Evaluation Board

In reply to Sanchayan Maity

Add support for the Toradex Apalis Evaluation Board.

Signed-off-by Sanchayan Maity <[email protected]>

---
 arch/arm/boot/dts/Makefile              |   1 +
 arch/arm/boot/dts/imx6q-apalis-eval.dts | 278 ++++++++++++++++++++++++++++++++
 2 files changed, 279 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-apalis-eval.dts

arch/arm/boot/dts/Makefile +1 -0

index 1c16e891a76a..2c5aca56a29f 100644
@@ -392,6 +392,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
 	imx6dl-udoo.dtb \
 	imx6dl-wandboard.dtb \
 	imx6dl-wandboard-revb1.dtb \
+	imx6q-apalis-eval.dtb \
 	imx6q-apalis-ixora.dtb \
 	imx6q-apalis-ixora-v1.1.dtb \
 	imx6q-apf6dev.dtb \

arch/arm/boot/dts/imx6q-apalis-eval.dts new file +278 -0

278 lines not on this page · raw message

Signature · 1 line

2.13.3

Shawn Guo

Applied

2017-08-14 01:30 UTC #11 lore raw

cover Add support for Ixora V1.1 and Apalis Evaluation Board

In reply to Sanchayan Maity

Quoted 18 lines · Sanchayan Maity

Hello,
This patch series adds support for Toradex Ixora V1.1 and Apalis Evaluation Board along with some cleanups.
Patch series has been generated on top of shawn's for-next branch.
Regards,
Sanchayan.
Marcel Ziswiler (6):
ARM: dts: imx6q-apalis-ixora: combine aliases
ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: get rid of tegra legacy gen1_i2c comment
ARM: dts: imx6qdl-apalis: reword cam i2c comment
ARM: dts: imx6q-apalis-ixora: get rid of obsolete fusion comment
ARM: dts: imx6q-apalis-ixora: add camera i2c bus definition
ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: use i2c from dwc hdmi

Quoted 5 lines

Sanchayan Maity (4):
ARM: dts: imx6q-apalis-ixora: fix usdhc2 pinctrl property
ARM: dts: imx6qdl-apalis: split usdhc1 pinctrl to support 4- and 8-bit
ARM: dts: imx6: add support for Toradex Ixora V1.1 carrier board
ARM: dts: imx6q-apalis-eval: add support for Apalis Evaluation Board

Applied all, thanks.