arm64: dts: imx8mp-var-som: Move PCA9534 GPIO expander to Symphony carrier

The VAR-SOM-MX8MP module does not include the PCA9534 GPIO expander nor
the LED connected to it. These components are present only on the
Symphony carrier board and may vary across custom carrier designs.

Move the PCA9534 GPIO expander node and the associated LED definition
from the SOM device tree to the Symphony carrier DTS, ensuring the SOM
dtsi describes only hardware present on the module.

Signed-off-by: Stefano Radaelli <stefano.r@variscite.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts b/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts
index ea3c193bb684125de72fdcba257bff4d2a1d1892..361e6122bdc355cc7cddf69452a6e86636251417 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts
@@ -9,6 +9,16 @@
        model = "Variscite VAR-SOM-MX8M-PLUS on Symphony-Board";
        compatible = "variscite,var-som-mx8mp-symphony", "variscite,var-som-mx8mp", "fsl,imx8mp";
 
+       gpio-leds {
+               compatible = "gpio-leds";
+
+               led-0 {
+                       function = LED_FUNCTION_POWER;
+                       gpios = <&pca9534 0 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "heartbeat";
+               };
+       };
+
        reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
                compatible = "regulator-fixed";
                regulator-name = "VSD_3V3";
@@ -31,6 +41,33 @@
        };
 };
 
+&i2c3 {
+       clock-frequency = <400000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3>;
+       status = "okay";
+
+       /* GPIO expander */
+       pca9534: gpio@20 {
+               compatible = "nxp,pca9534";
+               reg = <0x20>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_pca9534>;
+               gpio-controller;
+               #gpio-cells = <2>;
+               interrupt-parent = <&gpio1>;
+               interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
+               wakeup-source;
+
+               usb3-sata-sel-hog {
+                       gpio-hog;
+                       gpios = <4 0>;
+                       output-low;
+                       line-name = "usb3_sata_sel";
+               };
+       };
+};
+
 /* SD-card */
 &usdhc2 {
        pinctrl-names = "default", "state_100mhz", "state_200mhz";
@@ -45,6 +82,19 @@
 };
 
 &iomuxc {
+       pinctrl_i2c3: i2c3grp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_I2C3_SCL__I2C3_SCL                                 0x400001c2
+                       MX8MP_IOMUXC_I2C3_SDA__I2C3_SDA                                 0x400001c2
+               >;
+       };
+
+       pinctrl_pca9534: pca9534grp {
+               fsl,pins = <
+                       MX8MP_IOMUXC_GPIO1_IO15__GPIO1_IO15                             0xc0
+               >;
+       };
+
        pinctrl_usdhc2_gpio: usdhc2-gpiogrp {
                fsl,pins = <
                        MX8MP_IOMUXC_GPIO1_IO14__GPIO1_IO14                             0x1c4

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi
index 949d9878f395d5efc0c7988abdbf8d5d4cf475e6..158a78ec9656ac18c940dcc0e7ee2651a754a156 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi
@@ -19,16 +19,6 @@
                stdout-path = &uart2;
        };
 
-       gpio-leds {
-               compatible = "gpio-leds";
-
-               led-0 {
-                       function = LED_FUNCTION_POWER;
-                       gpios = <&pca9534 0 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "heartbeat";
-               };
-       };
-
        memory@40000000 {
                device_type = "memory";
                reg = <0x0 0x40000000 0 0xc0000000>,
@@ -216,33 +206,6 @@
        };
 };
 
-&i2c3 {
-        clock-frequency = <400000>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_i2c3>;
-        status = "okay";
-
-       /* GPIO expander */
-       pca9534: gpio@20 {
-               compatible = "nxp,pca9534";
-               reg = <0x20>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_pca9534>;
-               gpio-controller;
-               #gpio-cells = <2>;
-               interrupt-parent = <&gpio1>;
-               interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
-               wakeup-source;
-
-               usb3-sata-sel-hog {
-                       gpio-hog;
-                       gpios = <4 0>;
-                       output-low;
-                       line-name = "usb3_sata_sel";
-               };
-       };
-};
-
 /* Console */
 &uart2 {
         pinctrl-names = "default";
@@ -298,19 +261,6 @@
                >;
        };
 
-       pinctrl_i2c3: i2c3grp {
-               fsl,pins = <
-                       MX8MP_IOMUXC_I2C3_SCL__I2C3_SCL                                 0x400001c2
-                       MX8MP_IOMUXC_I2C3_SDA__I2C3_SDA                                 0x400001c2
-               >;
-       };
-
-       pinctrl_pca9534: pca9534grp {
-               fsl,pins = <
-                       MX8MP_IOMUXC_GPIO1_IO15__GPIO1_IO15                             0xc0
-               >;
-       };
-
        pinctrl_pmic: pmicgrp {
                fsl,pins = <
                        MX8MP_IOMUXC_SPDIF_RX__GPIO5_IO04                               0x1c0