From b36aaedd1cda07bc7204e39001bce619ca5e7c06 Mon Sep 17 00:00:00 2001
From: Luan Yuan <luan.yuan@amlogic.com>
Date: Sat, 26 Oct 2019 17:13:31 +0800
Subject: [PATCH] galilei: update g12b_w200 config for compile error.[1/1]

PD#SWPL-15005

Problem:
update g12b_w200 dts config for compile error

Solution:
update g12b_w200 dts config for compile error.

Verify:
verify by galilei.

Change-Id: Id0cffc41a9bf633dba3d1d052d28bb7a0a2e9d69
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
---
 arch/arm/boot/dts/amlogic/g12b_a311d_w200.dts     | 7 ++++++-
 arch/arm/boot/dts/amlogic/g12b_a311d_w200_a.dts   | 4 ++++
 arch/arm64/boot/dts/amlogic/g12b_a311d_w200.dts   | 7 ++++++-
 arch/arm64/boot/dts/amlogic/g12b_a311d_w200_a.dts | 4 ++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w200.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w200.dts
index 9219213fcd54..3dbeeefaa335 100644
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w200.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w200.dts
@@ -1343,7 +1343,8 @@
 			 "MMC_CAP_ERASE",
 			 "MMC_CAP_CMD23",
 			 "MMC_CAP_DRIVER_TYPE_A";
-		caps2 = "MMC_CAP2_HS200", "MMC_CAP2_HS400";
+		caps2 = "MMC_CAP2_HS200";
+		/*MMC_CAP2_HS400"*/
 		f_min = <400000>;
 		f_max = <200000000>;
 	};
@@ -1468,6 +1469,10 @@
 };
 &ethmac {
 	status = "okay";
+/*	//conflict with isp i2c
+	pinctrl-names = "internal_eth_pins";
+	pinctrl-0 = <&internal_eth_pins>;
+*/
 	mc_val = <0x4be04>;
 
 	internal_phy=<1>;
diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w200_a.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w200_a.dts
index 4af1bed3aa9d..14af24156fc0 100644
--- a/arch/arm/boot/dts/amlogic/g12b_a311d_w200_a.dts
+++ b/arch/arm/boot/dts/amlogic/g12b_a311d_w200_a.dts
@@ -1445,6 +1445,10 @@
 };
 &ethmac {
 	status = "okay";
+/*	//conflict with isp i2c
+	pinctrl-names = "internal_eth_pins";
+	pinctrl-0 = <&internal_eth_pins>;
+*/
 	mc_val = <0x4be04>;
 
 	internal_phy=<1>;
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w200.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w200.dts
index 04681d5c3520..b6a271722d65 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w200.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w200.dts
@@ -1344,7 +1344,8 @@
 			 "MMC_CAP_ERASE",
 			 "MMC_CAP_CMD23",
 			 "MMC_CAP_DRIVER_TYPE_A";
-		caps2 = "MMC_CAP2_HS200", "MMC_CAP2_HS400";
+		caps2 = "MMC_CAP2_HS200";
+		/*MMC_CAP2_HS400"*/
 		f_min = <400000>;
 		f_max = <200000000>;
 	};
@@ -1469,6 +1470,10 @@
 };
 &ethmac {
 	status = "okay";
+/*	//conflict with isp i2c
+	pinctrl-names = "internal_eth_pins";
+	pinctrl-0 = <&internal_eth_pins>;
+*/
 	mc_val = <0x4be04>;
 
 	internal_phy=<1>;
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w200_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w200_a.dts
index 2aefb00dfb53..2bfc6f914928 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w200_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w200_a.dts
@@ -1446,6 +1446,10 @@
 };
 &ethmac {
 	status = "okay";
+/*	//conflict with isp i2c
+	pinctrl-names = "internal_eth_pins";
+	pinctrl-0 = <&internal_eth_pins>;
+*/
 	mc_val = <0x4be04>;
 
 	internal_phy=<1>;