LF-1762-23 arm64: dts: imx: imx8qxp-mek-rpmsg: fix i2c1 alias id conflict

Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-rpmsg.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-rpmsg.dts
index a771748..3e3ba0a 100755 (executable)
--- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-rpmsg.dts
+++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-rpmsg.dts
@@ -6,6 +6,11 @@
 /delete-node/ &cm40_i2c;
 /delete-node/ &i2c1;
 
+/ {
+       aliases {
+               i2c1 = &i2c_rpbus_1;
+       };
+};
 
 &i2c_rpbus_1 {
        #address-cells = <1>;

diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
index 5fc77e1..05cda4b 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
@@ -31,10 +31,10 @@
                gpio5 = &lsio_gpio5;
                gpio6 = &lsio_gpio6;
                gpio7 = &lsio_gpio7;
-               i2c0 = &adma_i2c0;
-               i2c1 = &adma_i2c1;
-               i2c2 = &adma_i2c2;
-               i2c3 = &adma_i2c3;
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
+               i2c2 = &i2c2;
+               i2c3 = &i2c3;
                ldb0 = &ldb1;
                ldb1 = &ldb2;
                mmc0 = &usdhc1;
@@ -61,7 +61,6 @@
                can0 = &flexcan1;
                can1 = &flexcan2;
                can2 = &flexcan3;
-               i2c1 = &i2c_rpbus_1;
                i2c5 = &i2c_rpbus_5;
                i2c12 = &i2c_rpbus_12;
                i2c13 = &i2c_rpbus_13;