Skip to contentSkip to conversation

ARM: dts: imx6q-apalis: Misc improvements and newly added carrier

PATCH Applied Max Krummenacher 2 participants 20 messages Jun 15, 2022 – Jun 20, 2022

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

v2 cover ARM: dts: imx6q-apalis: Misc improvements and newly added carrier

From: Max Krummenacher <[email protected]>

This is a general update of the Apalis iMX6 device tree files.

The Toradex Apalis family is composed of a SoM that can be plugged on various carrier boards, with carrier boards allowing multiple optional accessories (e.g. display, camera, ...).

The device tree sources are structured into a SoM dtsi and a carrier dts which then includes the SoM dtsi. The SoM dtsi defines and enables the functionality self contained on the SoM and prepares for functionality provided by the carrier HW or accessories, so that the carrier dts then can enable or amend nodes provided. Accessories are enabled in overlays depending on HW configuration.

The series improves the existing Apalis carrier board device trees and adds a new device trees for the Ixora V1.2 carrier board.

Improvements:
- Specifies GPIO line names for use with libgpiod.
- Disables optional accessories. They would be enabled in overlays depending on HW configuration.
- Lower power consumption after poweroff.
- Move more functionality into the SoM dtsi file to reduce code duplication.
- General cleanup to adhere to dtbs bindings and missed alphabetically ordering.
- PWM backlight for backlights with inverted logic on its PWM input.

Fixes:
- STMPE ADC not functional due to wrong node name in dts.

Adds:
- imx6q-apalis-ixora-v1.2.dtb: used for a Apalis iMX6 mated in an Ixora V1.2 carrier board.
- Adds disable support for a OV5640 MIPI-CSI2 Camera and a ADV7280 Video ADC on a parallel video input.

Changes in v2:
- Moved cleanup for things added in earlier commits of the series to the those commit rather than cleaning up later.
- Added reviewed-by tags
- Fixed '-' vs. '_' in node name as pointed out by Fabio
- Added "adv,force-bt656-4" property as suggested by Fabio.
- Added commit "ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi" and followed that in the commit adding the Ixora V1.2.
- Rebased on top of imx/dt, 5.19-rc1

Denys Drozdov (1):
ARM: dts: imx6q-apalis: Clean-up sd card support

Max Krummenacher (11):
dt-bindings: arm: fsl: Add carrier for toradex,apalis-imx6q Revert "ARM: dts: imx6qdl-apalis: Avoid underscore in node name"
ARM: dts: imx6q-apalis: Add gpio-line-names
ARM: dts: imx6q-apalis: Command pmic to standby for poweroff
ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl to SoM dtsi
ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi
ARM: dts: imx6q-apalis: Disable HDMI
ARM: dts: imx6q-apalis: Add support for Toradex Ixora V1.2 carrier
boards
ARM: dts: imx6q-apalis: backlight pwm: Simplify inverted backlight
ARM: dts: imx6q-apalis: backlight pwm: Adapt brightness steps
ARM: dts: imx6q-apalis: Cleanup

Oleksandr Suvorov (6):
ARM: dts: imx6q-apalis: Move parallel rgb interface to SoM dtsi
ARM: dts: imx6q-apalis: Move pinmux groups to SoM dtsi
ARM: dts: imx6q-apalis: Add LVDS panel support
ARM: dts: imx6q-apalis: Disable stmpe touchscreen
ARM: dts: imx6q-apalis: Add ov5640 mipi csi camera
ARM: dts: imx6q-apalis: Add adv7280 video input

 .../devicetree/bindings/arm/fsl.yaml          |   1 +
 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/imx6q-apalis-eval.dts       | 127 +---
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 263 +-------
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 276 ++++++++
 arch/arm/boot/dts/imx6q-apalis-ixora.dts      | 113 +---
 arch/arm/boot/dts/imx6qdl-apalis.dtsi         | 638 ++++++++++++++----
 7 files changed, 837 insertions(+), 582 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/18 dt-bindings: arm: fsl: Add carrier for toradex,apalis-imx6q

From: Max Krummenacher <[email protected]>

Add binding for the Ixora V1.2 carrier board our Apalis iMX6D/Q may be mated with.

---

Changes in v2:
- add Rob's reviewed-by tag

 Documentation/devicetree/bindings/arm/fsl.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/fsl.yaml +1 -0
index ef524378d449..b964eba212f7 100644
@@ -321,6 +321,7 @@ properties:
           - enum:
               - toradex,apalis_imx6q-ixora      # Apalis iMX6Q/D Module on Ixora Carrier Board
               - toradex,apalis_imx6q-ixora-v1.1 # Apalis iMX6Q/D Module on Ixora V1.1 Carrier Board
+              - toradex,apalis_imx6q-ixora-v1.2 # Apalis iMX6Q/D Module on Ixora V1.2 Carrier Board
               - toradex,apalis_imx6q-eval       # Apalis iMX6Q/D Module on Apalis Evaluation Board
           - const: toradex,apalis_imx6q
           - const: fsl,imx6q
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 2/18 Revert "ARM: dts: imx6qdl-apalis: Avoid underscore in node name"

In reply to Max Krummenacher

From: Max Krummenacher <[email protected]>

The STMPE MFD device binding requires the child node to have a fixed name, i.e. with '_', not '-'. Otherwise the stmpe_adc, stmpe_touchscreen drivers will not be probed.

Fixes 56086b5e804f ("ARM: dts: imx6qdl-apalis: Avoid underscore in node name")

---

Changes in v2:
- add Ahmad's reviewed-by tag

 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6qdl-apalis.dtsi +2 -2
index bd763bae596b..da919d0544a8 100644
@@ -315,7 +315,7 @@
 		/* ADC conversion time: 80 clocks */
 		st,sample-time = <4>;
 
-		stmpe_touchscreen: stmpe-touchscreen {
+		stmpe_touchscreen: stmpe_touchscreen {
 			compatible = "st,stmpe-ts";
 			/* 8 sample average control */
 			st,ave-ctrl = <3>;
@@ -332,7 +332,7 @@
 			st,touch-det-delay = <5>;
 		};
 
-		stmpe_adc: stmpe-adc {
+		stmpe_adc: stmpe_adc {
 			compatible = "st,stmpe-adc";
 			/* forbid to use ADC channels 3-0 (touch) */
 			st,norequest-mask = <0x0F>;
Signature · 1 line
2.20.1
#3 lore raw

PATCH v2 3/18 ARM: dts: imx6q-apalis: Add gpio-line-names

In reply to Max Krummenacher

From: Max Krummenacher <[email protected]>

Add GPIO line names on module level. Those are all GPIOs which a user might use on his custom carrier board. If more meaningful names are available on the carrier board, the user can overwrite the line names in the carrier board level device tree.

---

(no changes since v1)

 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 193 ++++++++++++++++++++++++++
 1 file changed, 193 insertions(+)
arch/arm/boot/dts/imx6qdl-apalis.dtsi +193 -0
index da919d0544a8..e56451651a6d 100644
@@ -141,6 +141,199 @@
 	status = "disabled";
 };
 
+&gpio1 {
+	gpio-line-names = "MXM3_84",
+			  "MXM3_4",
+			  "MXM3_15/GPIO7",
+			  "MXM3_96",
+			  "MXM3_37",
+			  "",
+			  "MXM3_17/GPIO8",
+			  "MXM3_14",
+			  "MXM3_12",
+			  "MXM3_2",
+			  "MXM3_184",
+			  "MXM3_180",
+			  "MXM3_178",
+			  "MXM3_176",
+			  "MXM3_188",
+			  "MXM3_186",
+			  "MXM3_160",
+			  "MXM3_162",
+			  "MXM3_150",
+			  "MXM3_144",
+			  "MXM3_154",
+			  "MXM3_146",
+			  "",
+			  "",
+			  "MXM3_72";
+};
+
+&gpio2 {
+	gpio-line-names = "MXM3_148",
+			  "MXM3_152",
+			  "MXM3_156",
+			  "MXM3_158",
+			  "MXM3_1/GPIO1",
+			  "MXM3_3/GPIO2",
+			  "MXM3_5/GPIO3",
+			  "MXM3_7/GPIO4",
+			  "MXM3_95",
+			  "MXM3_6",
+			  "MXM3_8",
+			  "MXM3_123",
+			  "MXM3_126",
+			  "MXM3_128",
+			  "MXM3_130",
+			  "MXM3_132",
+			  "MXM3_253",
+			  "MXM3_251",
+			  "MXM3_283",
+			  "MXM3_281",
+			  "MXM3_279",
+			  "MXM3_277",
+			  "MXM3_243",
+			  "MXM3_235",
+			  "MXM3_231",
+			  "MXM3_229",
+			  "MXM3_233",
+			  "MXM3_198",
+			  "MXM3_275",
+			  "MXM3_273",
+			  "MXM3_207",
+			  "MXM3_122";
+};
+
+&gpio3 {
+	gpio-line-names = "MXM3_271",
+			  "MXM3_269",
+			  "MXM3_301",
+			  "MXM3_299",
+			  "MXM3_297",
+			  "MXM3_295",
+			  "MXM3_293",
+			  "MXM3_291",
+			  "MXM3_289",
+			  "MXM3_287",
+			  "MXM3_249",
+			  "MXM3_247",
+			  "MXM3_245",
+			  "MXM3_286",
+			  "MXM3_239",
+			  "MXM3_35",
+			  "MXM3_205",
+			  "MXM3_203",
+			  "MXM3_201",
+			  "MXM3_116",
+			  "MXM3_114",
+			  "MXM3_262",
+			  "MXM3_274",
+			  "MXM3_124",
+			  "MXM3_110",
+			  "MXM3_120",
+			  "MXM3_263",
+			  "MXM3_265",
+			  "",
+			  "MXM3_135",
+			  "MXM3_261",
+			  "MXM3_259";
+};
+
+&gpio4 {
+	gpio-line-names = "",
+			  "",
+			  "",
+			  "",
+			  "",
+			  "MXM3_194",
+			  "MXM3_136",
+			  "MXM3_134",
+			  "MXM3_140",
+			  "MXM3_138",
+			  "",
+			  "MXM3_220",
+			  "",
+			  "",
+			  "MXM3_18",
+			  "MXM3_16",
+			  "",
+			  "",
+			  "MXM3_214",
+			  "MXM3_216",
+			  "MXM3_164";
+};
+
+&gpio5 {
+	gpio-line-names = "MXM3_159",
+			  "",
+			  "",
+			  "",
+			  "MXM3_257",
+			  "",
+			  "",
+			  "",
+			  "",
+			  "",
+			  "MXM3_200",
+			  "MXM3_196",
+			  "MXM3_204",
+			  "MXM3_202",
+			  "",
+			  "",
+			  "",
+			  "",
+			  "MXM3_191",
+			  "MXM3_197",
+			  "MXM3_77",
+			  "MXM3_195",
+			  "MXM3_221",
+			  "MXM3_225",
+			  "MXM3_223",
+			  "MXM3_227",
+			  "MXM3_209",
+			  "MXM3_211",
+			  "MXM3_118",
+			  "MXM3_112",
+			  "MXM3_187",
+			  "MXM3_185";
+};
+
+&gpio6 {
+	gpio-line-names = "MXM3_183",
+			  "MXM3_181",
+			  "MXM3_179",
+			  "MXM3_177",
+			  "MXM3_175",
+			  "MXM3_173",
+			  "MXM3_255",
+			  "MXM3_83",
+			  "MXM3_91",
+			  "MXM3_13/GPIO6",
+			  "MXM3_11/GPIO5",
+			  "MXM3_79",
+			  "",
+			  "",
+			  "MXM3_190",
+			  "MXM3_193",
+			  "MXM3_89";
+};
+
+&gpio7 {
+	gpio-line-names = "",
+			  "",
+			  "",
+			  "",
+			  "",
+			  "",
+			  "",
+			  "",
+			  "",
+			  "MXM3_99",
+			  "MXM3_85",
+			  "MXM3_217",
+			  "MXM3_215";
+};
+
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
Signature · 1 line
2.20.1
#4 lore raw

PATCH v2 4/18 ARM: dts: imx6q-apalis: Command pmic to standby for poweroff

In reply to Max Krummenacher

From: Max Krummenacher <[email protected]>

The Apalis iMX6 HW doesn't allow to use the PWR_ON_REQ signal for poweroff. Use the fsl,pmic-stby-poweroff property to command the PMIC into a low power mode in poweroff.

---

(no changes since v1)

 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/imx6qdl-apalis.dtsi +5 -0
index e56451651a6d..668793356b46 100644
@@ -125,6 +125,10 @@
 	status = "disabled";
 };
 
+&clks {
+	fsl,pmic-stby-poweroff;
+};
+
 /* Apalis SPI1 */
 &ecspi1 {
 	cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>;
@@ -387,6 +391,7 @@
 
 	pmic: pfuze100@8 {
 		compatible = "fsl,pfuze100";
+		fsl,pmic-stby-poweroff;
 		reg = <0x08>;
 
 		regulators {
Signature · 1 line
2.20.1
#5 lore raw

PATCH v2 5/18 ARM: dts: imx6q-apalis: Move parallel rgb interface to SoM dtsi

In reply to Max Krummenacher

From: Oleksandr Suvorov <[email protected]>

Move all Parallel RGB-related nodes to the module level and disable it by default. This allows to enable it in an overlay per the current system configuration.

Update SPDX-License spelling to latest convention. Update Copyright year.

---

(no changes since v1)

 arch/arm/boot/dts/imx6q-apalis-eval.dts       | 57 +------------------
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 55 +-----------------
 arch/arm/boot/dts/imx6q-apalis-ixora.dts      | 55 +-----------------
 arch/arm/boot/dts/imx6qdl-apalis.dtsi         | 52 ++++++++++++++++-
 4 files changed, 55 insertions(+), 164 deletions(-)
arch/arm/boot/dts/imx6q-apalis-eval.dts +2 -55
index a0683b4aeca1..1e6b5482a777 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2014-2020 Toradex
+ * Copyright 2014-2022 Toradex
  * Copyright 2012 Freescale Semiconductor, Inc.
  * Copyright 2011 Linaro Ltd.
  */
@@ -44,48 +44,6 @@
 		};
 	};
 
-	lcd_display: disp0 {
-		compatible = "fsl,imx-parallel-display";
-		#address-cells = <1>;
-		#size-cells = <0>;
-		interface-pix-fmt = "rgb24";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_ipu1_lcdif>;
-		status = "okay";
-
-		port@0 {
-			reg = <0>;
-
-			lcd_display_in: endpoint {
-				remote-endpoint = <&ipu1_di1_disp1>;
-			};
-		};
-
-		port@1 {
-			reg = <1>;
-
-			lcd_display_out: endpoint {
-				remote-endpoint = <&lcd_panel_in>;
-			};
-		};
-	};
-
-	panel: panel {
-		/*
-		 * edt,et057090dhu: EDT 5.7" LCD TFT
-		 * edt,et070080dh6: EDT 7.0" LCD TFT
-		 */
-		compatible = "edt,et057090dhu";
-		backlight = <&backlight>;
-		power-supply = <&reg_3v3_sw>;
-
-		port {
-			lcd_panel_in: endpoint {
-				remote-endpoint = <&lcd_display_out>;
-			};
-		};
-	};
-
 	reg_pcie_switch: regulator-pcie-switch {
 		compatible = "regulator-fixed";
 		regulator-name = "pcie_switch";
@@ -106,13 +64,6 @@
 	};
 };
 
-&backlight {
-	brightness-levels = <0 127 191 223 239 247 251 255>;
-	default-brightness-level = <1>;
-	power-supply = <&reg_3v3_sw>;
-	status = "okay";
-};
-
 &can1 {
 	xceiver-supply = <&reg_3v3_sw>;
 	status = "okay";
@@ -164,10 +115,6 @@
 	status = "okay";
 };
 
-&ipu1_di1_disp1 {
-	remote-endpoint = <&lcd_display_in>;
-};
-
 &ldb {
 	status = "okay";
 };
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +2 -53

77 lines not on this page · raw message

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

77 lines not on this page · raw message

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

72 lines not on this page · raw message

Signature · 1 line
2.20.1
#6 lore raw

PATCH v2 6/18 ARM: dts: imx6q-apalis: Move pinmux groups to SoM dtsi

In reply to Max Krummenacher

From: Oleksandr Suvorov <[email protected]>

GPIO pinmux groups are declared on the module level. Move muxing them to the same level. It also reduces code duplication.

---

(no changes since v1)

 arch/arm/boot/dts/imx6q-apalis-eval.dts       | 12 ------------
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 10 ----------
 arch/arm/boot/dts/imx6q-apalis-ixora.dts      |  8 --------
 arch/arm/boot/dts/imx6qdl-apalis.dtsi         |  8 ++++++++
 4 files changed, 8 insertions(+), 30 deletions(-)
arch/arm/boot/dts/imx6q-apalis-eval.dts +0 -12
index 1e6b5482a777..fe5d491e1399 100644
@@ -206,15 +206,3 @@
 	cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
-
-&iomuxc {
-	/*
-	 * Mux the Apalis GPIOs
-	 */
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
-		     &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
-		     &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
-		     &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8
-		    >;
-};
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +0 -10
index 527585d26e51..8febfc0aea93 100644
@@ -202,16 +202,6 @@
 };
 
 &iomuxc {
-	/*
-	 * Mux the Apalis GPIOs
-	 */
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
-		     &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
-		     &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
-		     &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8
-		    >;
-
 	pinctrl_leds_ixora: ledsixoragrp {
 		fsl,pins = <
 			MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x1b0b0
arch/arm/boot/dts/imx6q-apalis-ixora.dts +0 -8
index 9900ab04fb28..78cf1d9583c1 100644
@@ -205,14 +205,6 @@
 };
 
 &iomuxc {
-	/* Mux the Apalis GPIOs */
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
-		     &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
-		     &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
-		     &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8
-		    >;
-
 	pinctrl_leds_ixora: ledsixoragrp {
 		fsl,pins = <
 			MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x1b0b0
arch/arm/boot/dts/imx6qdl-apalis.dtsi +8 -0
index c0ae08780d86..9413c14ce5f6 100644
@@ -709,6 +709,14 @@
 };
 
 &iomuxc {
+	/* Mux the Apalis GPIOs */
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
+		     &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
+		     &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
+		     &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8
+		    >;
+
 	pinctrl_apalis_gpio1: gpio2io04grp {
 		fsl,pins = <
 			MX6QDL_PAD_NANDF_D4__GPIO2_IO04 0x130b0
Signature · 1 line
2.20.1
#15 lore raw

PATCH v2 15/18 ARM: dts: imx6q-apalis: Add support for Toradex Ixora V1.2 carrier boards

In reply to Max Krummenacher

From: Max Krummenacher <[email protected]>

The Ixora V1.2 carrier board adds SW relevant new features compared to the V1.1 version.

- An I2C EEPROM is added.
- The SD card slot got a switchable 3.3V supply.
- Pull ups on the SD card signals are not assembled to faciliate 1.8V speed modes.
- The CAN transceivers got a switchable 3.3V supply.

Add a new device tree and, as the differences are so small rework the device tree for V1.1 to include the V1.2 device tree and adjust as needed.
Drop adding the toradex,apalis_imx6q-ixora to the dtb compatible to adhere to the binding yaml document.

---

Changes in v2:
- removed gpio-keys node. This has been moved to the SoM dtsi in v2

 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 178 +----------
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 276 ++++++++++++++++++
 3 files changed, 289 insertions(+), 166 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
arch/arm/boot/dts/Makefile +1 -0
index d3f1e3075178..428d758fc411 100644
@@ -550,6 +550,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
 	imx6q-apalis-eval.dtb \
 	imx6q-apalis-ixora.dtb \
 	imx6q-apalis-ixora-v1.1.dtb \
+	imx6q-apalis-ixora-v1.2.dtb \
 	imx6q-apf6dev.dtb \
 	imx6q-arm2.dtb \
 	imx6q-b450v3.dtb \
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +12 -166

199 lines not on this page · raw message

arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts new file +276 -0

276 lines not on this page · raw message

Signature · 1 line
2.20.1
#7 lore raw

PATCH v2 7/18 ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl to SoM dtsi

In reply to Max Krummenacher

From: Max Krummenacher <[email protected]>

Reduces code duplication. While at it drop the comments which do not apply on Apalis iMX6 but add the correct SoM pin names.

---

(no changes since v1)

 arch/arm/boot/dts/imx6q-apalis-eval.dts       | 13 -------------
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 13 -------------
 arch/arm/boot/dts/imx6q-apalis-ixora.dts      | 13 -------------
 arch/arm/boot/dts/imx6qdl-apalis.dtsi         | 11 +++++++++++
 4 files changed, 11 insertions(+), 39 deletions(-)
arch/arm/boot/dts/imx6q-apalis-eval.dts +0 -13
index fe5d491e1399..5985d1169be1 100644
@@ -82,19 +82,6 @@
 &i2c1 {
 	status = "okay";
 
-	/*
-	 * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
-	 * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
-	 */
-	touchscreen@4a {
-		compatible = "atmel,maxtouch";
-		reg = <0x4a>;
-		interrupt-parent = <&gpio6>;
-		interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
-		reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */
-		status = "disabled";
-	};
-
 	pcie-switch@58 {
 		compatible = "plx,pex8605";
 		reg = <0x58>;
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +0 -13
index 8febfc0aea93..21f88e19e87d 100644
@@ -89,19 +89,6 @@
 &i2c1 {
 	status = "okay";
 
-	/*
-	 * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
-	 * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
-	 */
-	touchscreen@4a {
-		compatible = "atmel,maxtouch";
-		reg = <0x4a>;
-		interrupt-parent = <&gpio6>;
-		interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
-		reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */
-		status = "disabled";
-	};
-
 	/* M41T0M6 real time clock on carrier board */
 	rtc_i2c: rtc@68 {
 		compatible = "st,m41t0";
arch/arm/boot/dts/imx6q-apalis-ixora.dts +0 -13
index 78cf1d9583c1..6743617ad1c1 100644
@@ -88,19 +88,6 @@
 &i2c1 {
 	status = "okay";
 
-	/*
-	 * Touchscreen is using SODIMM 28/30, also used for PWM<B>, PWM<C>,
-	 * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms
-	 */
-	touchscreen@4a {
-		compatible = "atmel,maxtouch";
-		reg = <0x4a>;
-		interrupt-parent = <&gpio6>;
-		interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
-		reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; /* SODIMM 13 */
-		status = "disabled";
-	};
-
 	eeprom@50 {
 		compatible = "atmel,24c02";
 		reg = <0x50>;
arch/arm/boot/dts/imx6qdl-apalis.dtsi +11 -0
index 9413c14ce5f6..3aa66b6d0c88 100644
@@ -416,6 +416,17 @@
 	scl-gpios = <&gpio5 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	sda-gpios = <&gpio5 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	status = "disabled";
+
+	atmel_mxt_ts: touchscreen@4a {
+		compatible = "atmel,maxtouch";
+		/* These GPIOs are muxed with the iomuxc node */
+		interrupt-parent = <&gpio6>;
+		interrupts = <10 IRQ_TYPE_EDGE_FALLING>;	/* MXM3_11 */
+		reg = <0x4a>;
+		reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>;	/* MXM3_13 */
+		status = "disabled";
+	};
+
 };
 
 /*
Signature · 1 line
2.20.1
#8 lore raw

PATCH v2 8/18 ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi

In reply to Max Krummenacher

From: Max Krummenacher <[email protected]>

Move gpio-keys to module-level device tree given it is standard Apalis functionality.
Sort properties alphabetical.

---

(no changes since v1)

 arch/arm/boot/dts/imx6q-apalis-eval.dts  | 14 --------------
 arch/arm/boot/dts/imx6q-apalis-ixora.dts | 14 --------------
 arch/arm/boot/dts/imx6qdl-apalis.dtsi    | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 28 deletions(-)
arch/arm/boot/dts/imx6q-apalis-eval.dts +0 -14
index 5985d1169be1..fdcb740a7a54 100644
@@ -30,20 +30,6 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	gpio-keys {
-		compatible = "gpio-keys";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpio_keys>;
-
-		wakeup {
-			label = "Wake-Up";
-			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WAKEUP>;
-			debounce-interval = <10>;
-			wakeup-source;
-		};
-	};
-
 	reg_pcie_switch: regulator-pcie-switch {
 		compatible = "regulator-fixed";
 		regulator-name = "pcie_switch";
arch/arm/boot/dts/imx6q-apalis-ixora.dts +0 -14
index 6743617ad1c1..e6fc76776b2e 100644
@@ -30,20 +30,6 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	gpio-keys {
-		compatible = "gpio-keys";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpio_keys>;
-
-		wakeup {
-			label = "Wake-Up";
-			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WAKEUP>;
-			debounce-interval = <10>;
-			wakeup-source;
-		};
-	};
-
 	leds {
 		compatible = "gpio-leds";
 
arch/arm/boot/dts/imx6qdl-apalis.dtsi +14 -0
index 3aa66b6d0c88..240783d0901c 100644
@@ -29,6 +29,20 @@
 		status = "disabled";
 	};
 
+	gpio-keys {
+		compatible = "gpio-keys";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_keys>;
+
+		wakeup {
+			debounce-interval = <10>;
+			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+			label = "Wake-Up";
+			linux,code = <KEY_WAKEUP>;
+			wakeup-source;
+		};
+	};
+
 	lcd_display: disp0 {
 		compatible = "fsl,imx-parallel-display";
 		#address-cells = <1>;
Signature · 1 line
2.20.1
#9 lore raw

PATCH v2 9/18 ARM: dts: imx6q-apalis: Add LVDS panel support

In reply to Max Krummenacher

From: Oleksandr Suvorov <[email protected]>

Add LVDS panel and endpoint linkage support but keep the inherited disabled state. This allows to enable it in an overlay per the current system configuration.

---

(no changes since v1)

 arch/arm/boot/dts/imx6q-apalis-eval.dts       |  4 ---
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts |  4 ---
 arch/arm/boot/dts/imx6q-apalis-ixora.dts      |  4 ---
 arch/arm/boot/dts/imx6qdl-apalis.dtsi         | 36 +++++++++++++++++++
 4 files changed, 36 insertions(+), 12 deletions(-)
arch/arm/boot/dts/imx6q-apalis-eval.dts +0 -4
index fdcb740a7a54..51efa7c57879 100644
@@ -88,10 +88,6 @@
 	status = "okay";
 };
 
-&ldb {
-	status = "okay";
-};
-
 &pcie {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_reset_moci>;
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +0 -4
index 21f88e19e87d..beb1981fc775 100644
@@ -104,10 +104,6 @@
 	status = "okay";
 };
 
-&ldb {
-	status = "okay";
-};
-
 &pcie {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_reset_moci>;
arch/arm/boot/dts/imx6q-apalis-ixora.dts +0 -4
index e6fc76776b2e..3d42f8ffeb34 100644
@@ -94,10 +94,6 @@
 	status = "okay";
 };
 
-&ldb {
-	status = "okay";
-};
-
 &pcie {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_reset_moci>;
arch/arm/boot/dts/imx6qdl-apalis.dtsi +36 -0
index 240783d0901c..636b04139a5b 100644
@@ -82,6 +82,18 @@
 		};
 	};
 
+	panel_lvds: panel-lvds {
+		compatible = "panel-lvds";
+		backlight = <&backlight>;
+		status = "disabled";
+
+		port {
+			lvds_panel_in: endpoint {
+				remote-endpoint = <&lvds0_out>;
+			};
+		};
+	};
+
 	reg_module_3v3: regulator-module-3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "+V3.3";
@@ -624,6 +636,30 @@
 	remote-endpoint = <&lcd_display_in>;
 };
 
+&ldb {
+	lvds-channel@0 {
+		port@4 {
+			reg = <4>;
+
+			lvds0_out: endpoint {
+				remote-endpoint = <&lvds_panel_in>;
+			};
+		};
+	};
+
+	lvds-channel@1 {
+		fsl,data-mapping = "spwg";
+		fsl,data-width = <18>;
+
+		port@4 {
+			reg = <4>;
+
+			lvds1_out: endpoint {
+			};
+		};
+	};
+};
+
 &pwm1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm1>;
Signature · 1 line
2.20.1
#10 lore raw

PATCH v2 10/18 ARM: dts: imx6q-apalis: Disable HDMI

In reply to Max Krummenacher

From: Max Krummenacher <[email protected]>

This allows to enable it in an overlay per the current system configuration.

---

(no changes since v1)

 arch/arm/boot/dts/imx6q-apalis-eval.dts       | 4 ----
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 4 ----
 arch/arm/boot/dts/imx6q-apalis-ixora.dts      | 4 ----
 3 files changed, 12 deletions(-)
arch/arm/boot/dts/imx6q-apalis-eval.dts +0 -4
index 51efa7c57879..eeb20d7a637d 100644
@@ -60,10 +60,6 @@
 	status = "okay";
 };
 
-&hdmi {
-	status = "okay";
-};
-
 /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
 &i2c1 {
 	status = "okay";
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +0 -4
index beb1981fc775..b254e96d194a 100644
@@ -81,10 +81,6 @@
 	status = "okay";
 };
 
-&hdmi {
-	status = "okay";
-};
-
 /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
 &i2c1 {
 	status = "okay";
arch/arm/boot/dts/imx6q-apalis-ixora.dts +0 -4
index 3d42f8ffeb34..a9daf1bb970f 100644
@@ -66,10 +66,6 @@
 	status = "okay";
 };
 
-&hdmi {
-	status = "okay";
-};
-
 /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
 &i2c1 {
 	status = "okay";
Signature · 1 line
2.20.1
#13 lore raw

PATCH v2 13/18 ARM: dts: imx6q-apalis: Add adv7280 video input

In reply to Max Krummenacher

From: Oleksandr Suvorov <[email protected]>

The Apalis iMX6 modules allow connecting a parallel video input. Add support for our ADV7280 video input module but have it disabled. This allows to enable it in an overlay per the current system configuration.

---

Changes in v2:
- Added "adv,force-bt656-4" property as suggested by Fabio.
Note: in my PAL setup I didn't see any noticable change.

 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
arch/arm/boot/dts/imx6qdl-apalis.dtsi +31 -0
index bbd838acb8d6..6d072aa87952 100644
@@ -432,6 +432,21 @@
 			  "MXM3_215";
 };
 
+&gpr {
+	ipu1_csi0_mux {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+
+		port@1 {
+			reg = <1>;
+			ipu1_csi0_mux_from_parallel_sensor: endpoint {
+				remote-endpoint = <&adv7280_to_ipu1_csi0_mux>;
+			};
+		};
+	};
+};
+
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_enet>;
@@ -657,6 +672,22 @@
 	sda-gpios = <&gpio3 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	status = "disabled";
 
+	adv_7280: adv7280@21 {
+		compatible = "adi,adv7280";
+		adv,force-bt656-4;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_ipu1_csi0>;
+		reg = <0x21>;
+		status = "disabled";
+
+		port {
+			adv7280_to_ipu1_csi0_mux: endpoint {
+				bus-width = <8>;
+				remote-endpoint = <&ipu1_csi0_mux_from_parallel_sensor>;
+			};
+		};
+	};
+
 	ov5640_csi_cam: ov5640_mipi@3c {
 		compatible = "ovti,ov5640";
 		AVDD-supply = <&reg_ov5640_2v8_a_vdd>;
Signature · 1 line
2.20.1
#12 lore raw

PATCH v2 12/18 ARM: dts: imx6q-apalis: Add ov5640 mipi csi camera

In reply to Max Krummenacher

From: Oleksandr Suvorov <[email protected]>

The Apalis iMX6 modules allow connecting a mipi-csi video input. Add support for our OV5640 camera module but have it disabled. This allows to enable it in an overlay per the current system configuration.

---

Changes in v2:
- Fixed '-' vs. '_' in node name as pointed out by Fabio
- Sorted properties alphabetical in the newly added node

 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 67 ++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx6qdl-apalis.dtsi +66 -1
index b4742ad85f56..bbd838acb8d6 100644
@@ -29,6 +29,12 @@
 		status = "disabled";
 	};
 
+	clk_ov5640_osc: clk-ov5640-osc {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <24000000>;
+	};
+
 	gpio-keys {
 		compatible = "gpio-keys";
 		pinctrl-names = "default";
@@ -110,6 +116,26 @@
 		regulator-always-on;
 	};
 
+	reg_ov5640_1v8_d_o_vdd: regulator-ov5640-1v8-d-o-vdd {
+		compatible = "regulator-fixed";
+		regulator-always-on;
+		regulator-max-microvolt = <1800000>;
+		regulator-min-microvolt = <1800000>;
+		regulator-name = "DOVDD/DVDD_1.8V";
+		/* Note: The CSI module uses on-board 3.3V_SW supply */
+		vin-supply = <&reg_module_3v3>;
+	};
+
+	reg_ov5640_2v8_a_vdd: regulator-ov5640-2v8-a-vdd {
+		compatible = "regulator-fixed";
+		regulator-always-on;
+		regulator-max-microvolt = <2800000>;
+		regulator-min-microvolt = <2800000>;
+		regulator-name = "AVDD/AFVDD_2.8V";
+		/* Note: The CSI module uses on-board 3.3V_SW supply */
+		vin-supply = <&reg_module_3v3>;
+	};
+
 	reg_usb_otg_vbus: regulator-usb-otg-vbus {
 		compatible = "regulator-fixed";
 		pinctrl-names = "default";
@@ -452,7 +478,6 @@
 		reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>;	/* MXM3_13 */
 		status = "disabled";
 	};
-
 };
 
 /*
@@ -631,6 +656,30 @@
 	scl-gpios = <&gpio3 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	sda-gpios = <&gpio3 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	status = "disabled";
+
+	ov5640_csi_cam: ov5640_mipi@3c {
+		compatible = "ovti,ov5640";
+		AVDD-supply = <&reg_ov5640_2v8_a_vdd>;
+		DOVDD-supply = <&reg_ov5640_1v8_d_o_vdd>;
+		DVDD-supply = <&reg_ov5640_1v8_d_o_vdd>;
+		clock-names = "xclk";
+		clocks = <&clks IMX6QDL_CLK_CKO2>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_cam_mclk>;
+		/* These GPIOs are muxed with the iomuxc node */
+		powerdown-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
+		reg = <0x3c>;
+		reset-gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
+		status = "disabled";
+
+		port {
+			ov5640_to_mipi_csi2: endpoint {
+				clock-lanes = <0>;
+				data-lanes = <1 2>;
+				remote-endpoint = <&mipi_csi_from_ov5640>;
+			};
+		};
+	};
 };
 
 &ipu1_di1_disp1 {
@@ -661,6 +710,22 @@
 	};
 };
 
+&mipi_csi {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "disabled";
+
+	port@0 {
+		reg = <0>;
+
+		mipi_csi_from_ov5640: endpoint {
+			clock-lanes = <0>;
+			data-lanes = <1 2>;
+			remote-endpoint = <&ov5640_to_mipi_csi2>;
+		};
+	};
+};
+
 &pwm1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm1>;
Signature · 1 line
2.20.1
#11 lore raw

PATCH v2 11/18 ARM: dts: imx6q-apalis: Disable stmpe touchscreen

In reply to Max Krummenacher

From: Oleksandr Suvorov <[email protected]>

Unify its label with other toradex SoM dtbs. This allows to enable it in an overlay per the current system configuration.

---

(no changes since v1)

 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 636b04139a5b..b4742ad85f56 100644
@@ -592,7 +592,7 @@
 		/* ADC conversion time: 80 clocks */
 		st,sample-time = <4>;
 
-		stmpe_touchscreen: stmpe_touchscreen {
+		stmpe_ts: stmpe_touchscreen {
 			compatible = "st,stmpe-ts";
 			/* 8 sample average control */
 			st,ave-ctrl = <3>;
@@ -607,6 +607,7 @@
 			st,settling = <3>;
 			/* 5 ms touch detect interrupt delay */
 			st,touch-det-delay = <5>;
+			status = "disabled";
 		};
 
 		stmpe_adc: stmpe_adc {
Signature · 1 line
2.20.1
#17 lore raw

PATCH v2 17/18 ARM: dts: imx6q-apalis: backlight pwm: Adapt brightness steps

In reply to Max Krummenacher

From: Max Krummenacher <[email protected]>

Adapt the brightness steps as the backlight doesn't light up for very low duty cycles.

---

(no changes since v1)

 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6qdl-apalis.dtsi +2 -2
index c134e71f2a09..1144e4d106f0 100644
@@ -20,8 +20,8 @@
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
-		brightness-levels = <0 4 8 16 32 64 128 255>;
-		default-brightness-level = <6>;
+		brightness-levels = <0 45 63 88 119 158 203 255>;
+		default-brightness-level = <4>;
 		enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpio_bl_on>;
Signature · 1 line
2.20.1
#16 lore raw

PATCH v2 16/18 ARM: dts: imx6q-apalis: backlight pwm: Simplify inverted backlight

In reply to Max Krummenacher

From: Max Krummenacher <[email protected]>

Set #pwm-cells to the default 3 to gain access to the parameter which allows inverting the PWM signal. This is useful to specify a backlight which has its highest brightness at 0.

With the change to use the PWM with inverted polarity the PWM signal is inverted to how it was before this patch.
This changes the meaning of the values in the brightness-levels property. I.e. the duty-cycle changes from x/255 to (255-x)/255. Keeping the brightness-levels will then have a big brightness jump from 0 to 127 duty cycle, the other 6 steps will then be barely noticeable.

Change the brightness-levels to provide the same brightness-levels as before.

---

(no changes since v1)

 arch/arm/boot/dts/imx6qdl-apalis.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/imx6qdl-apalis.dtsi +5 -5
index 4ff46ffd2300..c134e71f2a09 100644
@@ -6,6 +6,7 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pwm/pwm.h>
 
 / {
 	model = "Toradex Apalis iMX6Q/D Module";
@@ -19,13 +20,13 @@
 
 	backlight: backlight {
 		compatible = "pwm-backlight";
+		brightness-levels = <0 4 8 16 32 64 128 255>;
+		default-brightness-level = <6>;
+		enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpio_bl_on>;
-		brightness-levels = <0 127 191 223 239 247 251 255>;
-		default-brightness-level = <1>;
-		enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
 		power-supply = <&reg_module_3v3>;
-		pwms = <&pwm4 0 5000000>;
+		pwms = <&pwm4 0 5000000 PWM_POLARITY_INVERTED>;
 		status = "disabled";
 	};
 
@@ -776,7 +777,6 @@
 };
 
 &pwm4 {
-	#pwm-cells = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm4>;
 	status = "disabled";
Signature · 1 line
2.20.1
#18 lore raw

PATCH v2 18/18 ARM: dts: imx6q-apalis: Cleanup

In reply to Max Krummenacher

From: Max Krummenacher <[email protected]>

- Sort nodes and properties alphabetical
- End all pinctrl node names in grp and avoid using dashes
- Change the pmic's node name to pmic@8 per binding requirement
- Add sound-dai-cells to the codec node per binding requirement

---

Changes in v2:
- Moved cleanup for things added in earlier commits of the series to the those commit rather than cleaning up later.
- Added reviewed-by tags
- Fixed '-' vs. '_' in node name as pointed out by Fabio
- Added "adv,force-bt656-4" property as suggested by Fabio.
- Added commit "ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi" and followed that in the commit adding the Ixora V1.2.
- Rebased on top of imx/dt, 5.19-rc1

 arch/arm/boot/dts/imx6q-apalis-eval.dts  |  20 +--
 arch/arm/boot/dts/imx6q-apalis-ixora.dts |  15 +-
 arch/arm/boot/dts/imx6qdl-apalis.dtsi    | 217 ++++++++++++-----------
 3 files changed, 126 insertions(+), 126 deletions(-)
arch/arm/boot/dts/imx6q-apalis-eval.dts +10 -10
index 19aaffd71f3d..fa160a389870 100644
@@ -32,21 +32,21 @@
 
 	reg_pcie_switch: regulator-pcie-switch {
 		compatible = "regulator-fixed";
-		regulator-name = "pcie_switch";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
+		enable-active-high;
 		gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+		regulator-max-microvolt = <1800000>;
+		regulator-min-microvolt = <1800000>;
+		regulator-name = "pcie_switch";
 		startup-delay-us = <100000>;
-		enable-active-high;
 		status = "okay";
 	};
 
 	reg_3v3_sw: regulator-3v3-sw {
 		compatible = "regulator-fixed";
-		regulator-name = "3.3V_SW";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
 		regulator-always-on;
+		regulator-max-microvolt = <3300000>;
+		regulator-min-microvolt = <3300000>;
+		regulator-name = "3.3V_SW";
 	};
 };
 
@@ -110,11 +110,11 @@
 	status = "okay";
 };
 
-&reg_usb_otg_vbus {
+&reg_usb_host_vbus {
 	status = "okay";
 };
 
-&reg_usb_host_vbus {
+&reg_usb_otg_vbus {
 	status = "okay";
 };
 
@@ -163,8 +163,8 @@
 
 /* SD1 */
 &usdhc2 {
+	cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
-	cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
arch/arm/boot/dts/imx6q-apalis-ixora.dts +7 -8
index a9daf1bb970f..ce39c6a3f640 100644
@@ -32,28 +32,27 @@
 
 	leds {
 		compatible = "gpio-leds";
-
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_leds_ixora>;
 
 		led4-green {
-			label = "LED_4_GREEN";
 			gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
+			label = "LED_4_GREEN";
 		};
 
 		led4-red {
-			label = "LED_4_RED";
 			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+			label = "LED_4_RED";
 		};
 
 		led5-green {
-			label = "LED_5_GREEN";
 			gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+			label = "LED_5_GREEN";
 		};
 
 		led5-red {
-			label = "LED_5_RED";
 			gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+			label = "LED_5_RED";
 		};
 	};
 };
@@ -115,11 +114,11 @@
 	status = "okay";
 };
 
-&reg_usb_otg_vbus {
+&reg_usb_host_vbus {
 	status = "okay";
 };
 
-&reg_usb_host_vbus {
+&reg_usb_otg_vbus {
 	status = "okay";
 };
 
@@ -163,9 +162,9 @@
 
 /* SD1 */
 &usdhc2 {
+	cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
-	cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
 
arch/arm/boot/dts/imx6qdl-apalis.dtsi +109 -108

531 lines not on this page · raw message

Signature · 1 line
2.20.1
#14 lore raw

PATCH v2 14/18 ARM: dts: imx6q-apalis: Clean-up sd card support

In reply to Max Krummenacher

From: Denys Drozdov <[email protected]>

Configure SOM DTSI to 8-bit, card detect in the SoM dtsi as this is the Apalis family default functionality.
Limit the interface to 4-bit only on the Ixora V1.1 carrier boards.

---

(no changes since v1)

 arch/arm/boot/dts/imx6q-apalis-eval.dts       | 3 ---
 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 1 -
 arch/arm/boot/dts/imx6qdl-apalis.dtsi         | 3 ++-
 3 files changed, 2 insertions(+), 5 deletions(-)
arch/arm/boot/dts/imx6q-apalis-eval.dts +0 -3
index eeb20d7a637d..19aaffd71f3d 100644
@@ -158,9 +158,6 @@
 
 /* MMC1 */
 &usdhc1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>;
-	cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
 
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +0 -1
index b254e96d194a..2d0324103804 100644
@@ -175,7 +175,6 @@
 &usdhc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>;
-	cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
 	bus-width = <4>;
 	status = "okay";
 };
arch/arm/boot/dts/imx6qdl-apalis.dtsi +2 -1
index 6d072aa87952..4ff46ffd2300 100644
@@ -832,7 +832,8 @@
 /* MMC1 */
 &usdhc1 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>;
+	pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>;
+	cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
 	vqmmc-supply = <&reg_module_3v3>;
 	bus-width = <8>;
 	disable-wp;
Signature · 1 line
2.20.1
Applied
#19 lore raw
In reply to Max Krummenacher
Quoted 67 lines · Max Krummenacher

From: Max Krummenacher <[email protected]>

This is a general update of the Apalis iMX6 device tree files.

The Toradex Apalis family is composed of a SoM that can be plugged on various carrier boards, with carrier boards allowing multiple optional accessories (e.g. display, camera, ...).

The device tree sources are structured into a SoM dtsi and a carrier dts which then includes the SoM dtsi. The SoM dtsi defines and enables the functionality self contained on the SoM and prepares for functionality provided by the carrier HW or accessories, so that the carrier dts then can enable or amend nodes provided. Accessories are enabled in overlays depending on HW configuration.

The series improves the existing Apalis carrier board device trees and adds a new device trees for the Ixora V1.2 carrier board.

Improvements:
- Specifies GPIO line names for use with libgpiod.
- Disables optional accessories. They would be enabled in overlays depending on HW configuration.
- Lower power consumption after poweroff.
- Move more functionality into the SoM dtsi file to reduce code duplication.
- General cleanup to adhere to dtbs bindings and missed alphabetically ordering.
- PWM backlight for backlights with inverted logic on its PWM input.

Fixes:
- STMPE ADC not functional due to wrong node name in dts.

Adds:
- imx6q-apalis-ixora-v1.2.dtb: used for a Apalis iMX6 mated in an Ixora V1.2 carrier board.
- Adds disable support for a OV5640 MIPI-CSI2 Camera and a ADV7280 Video ADC on a parallel video input.

Changes in v2:
- Moved cleanup for things added in earlier commits of the series to the those commit rather than cleaning up later.
- Added reviewed-by tags
- Fixed '-' vs. '_' in node name as pointed out by Fabio
- Added "adv,force-bt656-4" property as suggested by Fabio.
- Added commit "ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi" and followed that in the commit adding the Ixora V1.2.
- Rebased on top of imx/dt, 5.19-rc1

Denys Drozdov (1):
ARM: dts: imx6q-apalis: Clean-up sd card support

Max Krummenacher (11):
dt-bindings: arm: fsl: Add carrier for toradex,apalis-imx6q Revert "ARM: dts: imx6qdl-apalis: Avoid underscore in node name"
ARM: dts: imx6q-apalis: Add gpio-line-names
ARM: dts: imx6q-apalis: Command pmic to standby for poweroff
ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl to SoM dtsi
ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi
ARM: dts: imx6q-apalis: Disable HDMI
ARM: dts: imx6q-apalis: Add support for Toradex Ixora V1.2 carrier
boards
ARM: dts: imx6q-apalis: backlight pwm: Simplify inverted backlight
ARM: dts: imx6q-apalis: backlight pwm: Adapt brightness steps
ARM: dts: imx6q-apalis: Cleanup

Quoted 7 lines

Oleksandr Suvorov (6):
ARM: dts: imx6q-apalis: Move parallel rgb interface to SoM dtsi
ARM: dts: imx6q-apalis: Move pinmux groups to SoM dtsi
ARM: dts: imx6q-apalis: Add LVDS panel support
ARM: dts: imx6q-apalis: Disable stmpe touchscreen
ARM: dts: imx6q-apalis: Add ov5640 mipi csi camera
ARM: dts: imx6q-apalis: Add adv7280 video input

Applied all, thanks!