diff --git a/package/boot/uboot-mediatek/patches/450-add-cmcc_rax3000m.patch b/package/boot/uboot-mediatek/patches/450-add-cmcc_rax3000m.patch index e4f3f0585a..d141513272 100644 --- a/package/boot/uboot-mediatek/patches/450-add-cmcc_rax3000m.patch +++ b/package/boot/uboot-mediatek/patches/450-add-cmcc_rax3000m.patch @@ -444,22 +444,13 @@ +}; --- /dev/null +++ b/arch/arm/dts/mt7981-cmcc-rax3000m-emmc.dts -@@ -0,0 +1,63 @@ +@@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/dts-v1/; +#include "mt7981-cmcc-rax3000m.dtsi" + +/ { -+ reg_1p8v: regulator-1p8v { -+ compatible = "regulator-fixed"; -+ regulator-name = "fixed-1.8V"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; @@ -477,7 +468,6 @@ + bus-width = <8>; + cap-mmc-hw-reset; + vmmc-supply = <®_3p3v>; -+ vqmmc-supply = <®_1p8v>; + non-removable; + status = "okay"; +}; diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc-ubootmod.dts index 4d92cff6ae..8f5f9a601d 100644 --- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc-ubootmod.dts @@ -10,15 +10,6 @@ chosen { bootargs = "root=PARTLABEL=rootfs rootwait rootfstype=squashfs,f2fs"; }; - - reg_1p8v: regulator-1p8v { - compatible = "regulator-fixed"; - regulator-name = "fixed-1.8V"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-boot-on; - regulator-always-on; - }; }; &mmc0 { @@ -31,7 +22,6 @@ pinctrl-0 = <&mmc0_pins_default>; pinctrl-1 = <&mmc0_pins_uhs>; vmmc-supply = <®_3p3v>; - vqmmc-supply = <®_1p8v>; status = "okay"; }; diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso index 971ed30643..c1c9c75c27 100644 --- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso +++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso @@ -7,20 +7,6 @@ compatible = "cmcc,rax3000m", "mediatek,mt7981"; fragment@0 { - target-path = "/"; - __overlay__ { - reg_1p8v: regulator-1p8v { - compatible = "regulator-fixed"; - regulator-name = "fixed-1.8V"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-boot-on; - regulator-always-on; - }; - }; - }; - - fragment@1 { target = <&mmc0>; __overlay__ { bus-width = <8>; @@ -32,12 +18,11 @@ pinctrl-0 = <&mmc0_pins_default>; pinctrl-1 = <&mmc0_pins_uhs>; vmmc-supply = <®_3p3v>; - vqmmc-supply = <®_1p8v>; status = "okay"; }; }; - fragment@2 { + fragment@1 { target = <&pio>; __overlay__ { mmc0_pins_default: mmc0-pins {