diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28.dtsi b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28.dtsi index 30cce07c3..23cd258a3 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28.dtsi +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28.dtsi @@ -52,8 +52,6 @@ compatible = "regulator-fixed"; gpio = <&gpio4 RK_PA1 GPIO_ACTIVE_LOW>; regulator-name = "vcc3v3_sd"; - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; vin-supply = <&vcc_3v3>; @@ -262,9 +260,6 @@ pinctrl-names = "default"; pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_det>; rockchip,default-sample-phase = <90>; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; sd-uhs-sdr104; vmmc-supply = <&vcc3v3_sd>; vqmmc-supply = <&vccio_sd>; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28c.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28c.dts index 9ee3d51e8..533896b17 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28c.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28c.dts @@ -16,17 +16,6 @@ led-upgrade = &led_work; }; - keys { - compatible = "gpio-keys"; - - rfkill { - label = "rfkill"; - linux,code = ; - debounce-interval = <100>; - gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_LOW>; - }; - }; - leds { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -38,7 +27,7 @@ }; led_work: work { - label = "red:work"; + label = "blue:work"; gpios = <&gpio4 RK_PB7 GPIO_ACTIVE_LOW>; }; @@ -64,3 +53,15 @@ &sdhci { status = "disabled"; }; + +/* New version also changes vmmc-supply to vcc_3v3, + * but needs to be compatible with old hardware. */ +&sdmmc { + max-frequency = <50000000>; + /delete-property/ sd-uhs-sdr104; + vqmmc-supply = <&vcc_3v3>; +}; + +&vccio_sd { + status = "disabled"; +}; diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 85528df58..f1ef047ef 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -576,13 +576,13 @@ define Device/widora_mangopi-m28 SOC := rk3528 UBOOT_DEVICE_NAME := generic-rk3528 IMAGE/sysupgrade.img.gz := boot-common | boot-script rk3528 | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-aic8800s kmod-r8168 wpad-openssl -urngd + DEVICE_PACKAGES := kmod-aic8800s wpad-openssl -urngd endef define Device/widora_mangopi-m28c $(call Device/widora_mangopi-m28) DEVICE_MODEL := MangoPi M28C - DEVICE_PACKAGES += kmod-gpio-button-hotplug kmod-usb-serial-option + DEVICE_PACKAGES += kmod-usb-serial-option endef TARGET_DEVICES += widora_mangopi-m28c