From: Dong Aisheng <aisheng.dong@nxp.com>
Date: Tue, 14 Jul 2020 11:17:17 +0000 (+0800)
Subject: LF-1762-23 arm64: dts: imx: imx8qxp-mek-rpmsg: fix i2c1 alias id conflict
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~577^2~2^2~390
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=155f8537df539a4113847bcba9554c4ea8302346;p=linux.git

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 a77174816734..3e3ba0ab5b7b 100755
--- 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 5fc77e17dcaf..05cda4bc2f2d 100644
--- 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;