diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts index c33a2cf1b..1df47f7e7 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /dts-v1/; -#include +#include #include "rk3399.dtsi" #include "rk3399-opp.dtsi" diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-mpc1903.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-mpc1903.dts index d163acaf4..cb5d87fa4 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-mpc1903.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-mpc1903.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /dts-v1/; -#include +#include #include "rk3399.dtsi" #include "rk3399-opp.dtsi" @@ -10,10 +10,6 @@ compatible = "rocktech,mpc1903", "rockchip,rk3399"; aliases { - led-boot = &status_led; - led-failsafe = &status_led; - led-running = &status_led; - led-upgrade = &status_led; mmc0 = &sdmmc; mmc1 = &sdhci; }; @@ -67,7 +63,7 @@ vin-supply = <&vcc5v0_sys>; }; - vcc5v0_host: vcc5v0-host-regulator { + vcc5v0_host: vcc5v0-host { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>; @@ -78,7 +74,18 @@ vin-supply = <&vcc5v0_sys>; }; - vcc_lan: vcc-phy-regulator { + vcc5v0_hub: vcc5v0-hub { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_hub_en>; + regulator-name = "vcc5v0_hub"; + regulator-always-on; + vin-supply = <&vcc5v0_sys>; + }; + + vcc_lan: vcc-phy { compatible = "regulator-fixed"; regulator-name = "vcc_lan"; regulator-always-on; @@ -103,20 +110,12 @@ pinctrl-names = "default"; pinctrl-0 = <&status_led_pin>; - status_led: led-status-led { + status_led: status-led { label = "status_led"; linux,default-trigger = "heartbeat"; gpios = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; }; }; - - hub_control { - compatible = "rocktech,hub-control"; - pinctrl-names = "default"; - pinctrl-0 = <&hub_pwr>; - hub-pwr-gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; }; &cpu_l0 { @@ -442,7 +441,6 @@ status = "okay"; }; - &i2c6 { status = "okay"; }; @@ -500,7 +498,7 @@ rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; }; - hub_pwr: hub-pwr { + vcc5v0_hub_en: vcc5v0-hub-en { rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up>; }; }; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts index 8687288e3..1629efe05 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts @@ -13,7 +13,7 @@ }; chosen { - stdout-path = "serial2:115200n8"; + stdout-path = "serial2:1500000n8"; }; adc-keys {