arm64: dts: imx8-apalis: sync upstream changes

Sync the following upstream changes:
- remove spurious pwm bindings include
- add more comments describing Apalis interface in question
- fix touch node name
- fix atmel_mxt_ts aka atmel,maxtouch, reset-gpios polarity being active-low
- fix long lines
- alphabetically re-order lsio_gpio5
- alphabetically re-order fec1
- fix reserved-memory node names
- fix comment concerning Apalis ETH1
- remove spurious Apalis BKL_ON comment
- alphabetically re-order hdmi and i2c0

Upstream-Status: Submitted [https://lore.kernel.org/all/20221226062824.53113-1-marcel@ziswiler.com/]
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

1 files changed, 22 insertions, 19 deletions

diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi
index dfe5ca6a6acf..49c800189e74 100644
--- a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi
@@ -196,6 +196,7 @@
 	status = "okay";
 };
 
+/* Apalis ETH1 */
 &fec1 {
 	status = "okay";
 };
@@ -222,14 +223,14 @@
 &i2c2 {
 	status = "okay";
 
-	atmel_mxt_ts: atmel_mxt_ts@4a {
+	atmel_mxt_ts: touch@4a {
 		compatible = "atmel,maxtouch";
 		interrupt-parent = <&lsio_gpio4>;
 		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;		/* Apalis GPIO5 */
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpio5>, <&pinctrl_gpio6>;
 		reg = <0x4a>;
-		reset-gpios = <&lsio_gpio4 2 GPIO_ACTIVE_HIGH>;	/* Apalis GPIO6 */
+		reset-gpios = <&lsio_gpio4 2 GPIO_ACTIVE_LOW>;	/* Apalis GPIO6 */
 		status = "disabled";
 	};
 
@@ -262,10 +263,10 @@
 
 	pinctrl_leds_ixora: ledsixoragrp {
 		fsl,pins =
-			<IMX8QM_USDHC2_DATA1_LSIO_GPIO5_IO27		0x06000061>, /* LED_4_GREEN */
-			<IMX8QM_USDHC2_DATA3_LSIO_GPIO5_IO29		0x06000061>, /* LED_4_RED */
-			<IMX8QM_USDHC1_DATA5_LSIO_GPIO5_IO20		0x06000061>, /* LED_5_GREEN */
-			<IMX8QM_USDHC1_DATA6_LSIO_GPIO5_IO21		0x06000061>; /* LED_5_RED */
+			<IMX8QM_USDHC2_DATA1_LSIO_GPIO5_IO27	0x06000061>, /* LED_4_GREEN */
+			<IMX8QM_USDHC2_DATA3_LSIO_GPIO5_IO29	0x06000061>, /* LED_4_RED */
+			<IMX8QM_USDHC1_DATA5_LSIO_GPIO5_IO20	0x06000061>, /* LED_5_GREEN */
+			<IMX8QM_USDHC1_DATA6_LSIO_GPIO5_IO21	0x06000061>; /* LED_5_RED */
 	};
 
 	pinctrl_uart24_forceoff: uart24forceoffgrp {
@@ -282,19 +283,6 @@
 	status = "okay";
 };
 
-&lsio_gpio5 {
-	ngpios = <32>;
-	gpio-line-names = "gpio5-00", "gpio5-01", "gpio5-02", "gpio5-03",
-			  "gpio5-04", "gpio5-05", "gpio5-06", "gpio5-07",
-			  "gpio5-08", "gpio5-09", "gpio5-10", "gpio5-11",
-			  "gpio5-12", "gpio5-13", "gpio5-14", "gpio5-15",
-			  "gpio5-16", "gpio5-17", "gpio5-18", "gpio5-19",
-			  "LED-5-GREEN", "LED-5-RED", "gpio5-22", "gpio5-23",
-			  "gpio5-24", "UART24-FORCEOFF", "gpio5-26",
-			  "LED-4-GREEN", "gpio5-28", "LED-4-RED", "gpio5-30",
-			  "gpio5-31";
-};
-
 /* Apalis SPI1 */
 &lpspi0 {
 	status = "okay";
@@ -325,6 +313,19 @@
 	status = "okay";
 };
 
+&lsio_gpio5 {
+	ngpios = <32>;
+	gpio-line-names = "gpio5-00", "gpio5-01", "gpio5-02", "gpio5-03",
+			  "gpio5-04", "gpio5-05", "gpio5-06", "gpio5-07",
+			  "gpio5-08", "gpio5-09", "gpio5-10", "gpio5-11",
+			  "gpio5-12", "gpio5-13", "gpio5-14", "gpio5-15",
+			  "gpio5-16", "gpio5-17", "gpio5-18", "gpio5-19",
+			  "LED-5-GREEN", "LED-5-RED", "gpio5-22", "gpio5-23",
+			  "gpio5-24", "UART24-FORCEOFF", "gpio5-26",
+			  "LED-4-GREEN", "gpio5-28", "LED-4-RED", "gpio5-30",
+			  "gpio5-31";
+};
+
 /* Apalis PWM3, MXM3 pin 6 */
 &lsio_pwm0 {
 	status = "okay";
@@ -350,12 +351,14 @@
 	status = "okay";
 };
 
+/* Apalis BKL1_PWM */
 &pwm_lvds1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm_bkl>;
 	status = "okay";
 };
 
+/* Apalis DAP1 */
 &sai1 {
 	status = "okay";
 };