diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-armsom-sige1.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-armsom-sige1.dts index ca4f2a8e0..25cdff1cc 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-armsom-sige1.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-armsom-sige1.dts @@ -79,14 +79,14 @@ vin-supply = <&vcc5v0_sys>; }; - vcc3v3_sd: vcc-sd { + vcc3v3_sd: vcc3v3-sd { compatible = "regulator-fixed"; gpio = <&gpio4 RK_PA1 GPIO_ACTIVE_LOW>; regulator-name = "vcc3v3_sd"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; regulator-always-on; regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; vin-supply = <&vcc_3v3>; }; @@ -144,7 +144,7 @@ regulator-name = "vccio_sd"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - states = <1800000 0x0 3300000 0x1>; + states = <1800000 0x0>, <3300000 0x1>; vin-supply = <&vcc5v0_sys>; }; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k-pro.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k-pro.dts index 301b8ff61..4ca58a8eb 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k-pro.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k-pro.dts @@ -7,6 +7,12 @@ / { model = "MangoPi M28K Pro"; compatible = "widora,mangopi-m28k-pro", "rockchip,rk3528"; + + i2c { + compatible = "i2c-gpio"; + scl-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; + }; }; &i2c6 { @@ -26,7 +32,7 @@ ethernet@0,0 { compatible = "pci10ec,8125"; reg = <0x000000 0 0 0 0>; - led-data = <0 0 0x3f 0x23f>; + led-data = <0 0 0x23f 0x3f>; }; }; }; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k.dts index 817997647..ed90675f9 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k.dts @@ -82,14 +82,14 @@ vin-supply = <&vcc_sys>; }; - vcc3v3_sd: vcc-sd { + vcc3v3_sd: vcc3v3-sd { compatible = "regulator-fixed"; gpio = <&gpio4 RK_PA1 GPIO_ACTIVE_LOW>; regulator-name = "vcc3v3_sd"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; regulator-always-on; regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; vin-supply = <&vcc_3v3>; }; @@ -99,7 +99,7 @@ regulator-name = "vccio_sd"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - states = <1800000 0x0 3300000 0x1>; + states = <1800000 0x0>, <3300000 0x1>; vin-supply = <&vcc_sys>; }; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-opc-h28k.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-opc-h28k.dts index f7a3c12e1..a76913dfa 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-opc-h28k.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-opc-h28k.dts @@ -75,14 +75,14 @@ vin-supply = <&vcc_3v3>; }; - vcc3v3_sd: vcc-sd { + vcc3v3_sd: vcc3v3-sd { compatible = "regulator-fixed"; gpio = <&gpio4 RK_PA1 GPIO_ACTIVE_LOW>; regulator-name = "vcc3v3_sd"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; regulator-always-on; regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; vin-supply = <&vcc_3v3>; }; @@ -92,7 +92,7 @@ regulator-name = "vccio_sd"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - states = <1800000 0x0 3300000 0x1>; + states = <1800000 0x0>, <3300000 0x1>; vin-supply = <&vcc5v0_sys>; }; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-opc-ht2.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-opc-ht2.dts index 4983e7d0c..3aa48b566 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-opc-ht2.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-opc-ht2.dts @@ -85,14 +85,14 @@ vin-supply = <&vcc_3v3>; }; - vcc3v3_sd: vcc-sd { + vcc3v3_sd: vcc3v3-sd { compatible = "regulator-fixed"; gpio = <&gpio4 RK_PA1 GPIO_ACTIVE_LOW>; regulator-name = "vcc3v3_sd"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; regulator-always-on; regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; vin-supply = <&vcc_3v3>; }; @@ -102,7 +102,7 @@ regulator-name = "vccio_sd"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - states = <1800000 0x0 3300000 0x1>; + states = <1800000 0x0>, <3300000 0x1>; vin-supply = <&vcc5v0_sys>; }; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-radxa-e20c.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-radxa-e20c.dts index 71d0e1f44..cee72e653 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-radxa-e20c.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3528-radxa-e20c.dts @@ -105,9 +105,11 @@ compatible = "regulator-gpio"; gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; regulator-name = "vccio_sd"; + regulator-always-on; + regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; - states = <1800000 0x0 3300000 0x1>; + states = <1800000 0x0>, <3300000 0x1>; vin-supply = <&vcc5v0_sys>; }; diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 9f0abf49b..bf60d2b2e 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -395,6 +395,6 @@ TARGET_DEVICES += widora_mangopi-m28k define Device/widora_mangopi-m28k-pro $(call Device/widora_mangopi-m28k) DEVICE_MODEL := MangoPi M28K Pro - DEVICE_PACKAGES := kmod-aic8800 kmod-r8125 wpad-openssl -urngd + DEVICE_PACKAGES := kmod-aic8800 kmod-i2c-gpio kmod-r8125 wpad-openssl -urngd endef TARGET_DEVICES += widora_mangopi-m28k-pro