diff --git a/arch/arm/boot/dts/amlogic/g12b_a311d_w200.dts b/arch/arm/boot/dts/amlogic/g12b_a311d_w200.dts index bd70a2a4a55d..d11cf5aa626f 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 @@ }; ðmac { 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 88620e1fb07c..0c19df145abc 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 @@ }; ðmac { 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 f86f932207a5..c067bf6b738f 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 @@ }; ðmac { 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 0360b723914d..3331273280d4 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 @@ }; ðmac { status = "okay"; +/* //conflict with isp i2c + pinctrl-names = "internal_eth_pins"; + pinctrl-0 = <&internal_eth_pins>; +*/ mc_val = <0x4be04>; internal_phy=<1>;