diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts index ef657a361f5e..798264d38c20 100644 --- a/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts @@ -12,18 +12,43 @@ compatible = "rockchip,rk1808-evb-x4", "rockchip,rk1808"; chosen { - bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootwait swiotlb=1 kpti=0"; + bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 dump_initrd init=/init swiotlb=1 kpti=0"; }; }; +&adc_key { + power-key { + linux,code = ; + label = "power key"; + press-threshold-microvolt = <18000>; + }; +}; + +/delete-node/ &backlight; +/delete-node/ &vcc1v8_dvp; +/delete-node/ &vdd1v5_dvp; +/delete-node/ &vcc2v8_dvp; + &emmc { status = "disabled"; }; -&npu { +&gmac { status = "disabled"; }; +&i2c1 { + status = "disabled"; +}; + +&i2c4 { + status = "disabled"; +}; + +&mipi_dphy { + status = "okay"; +}; + &rk809_codec { status = "disabled"; }; @@ -44,6 +69,18 @@ status = "okay"; }; +&uart4 { + status = "disabled"; +}; + +&wireless_bluetooth { + status = "disabled"; +}; + +&wireless_wlan { + status = "disabled"; +}; + &tsadc { rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */ rockchip,hw-tshut-polarity = <0>; /* tshut polarity 0:LOW 1:HIGH */ @@ -52,3 +89,15 @@ pinctrl-1 = <&tsadc_otp_out>; status = "okay"; }; + +&vop_lite { + status = "okay"; +}; + +&vopl_mmu { + status = "okay"; +}; + +&vpu_mmu { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi index 910a185d6b57..ecd1ae0c8213 100644 --- a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi @@ -194,7 +194,7 @@ regulator-boot-on; }; - wireless-bluetooth { + wireless_bluetooth: wireless-bluetooth { compatible = "bluetooth-platdata"; uart_rts_gpios = <&gpio4 RK_PB7 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; @@ -205,7 +205,7 @@ status = "okay"; }; - wireless-wlan { + wireless_wlan: wireless-wlan { compatible = "wlan-platdata"; rockchip,grf = <&grf>; pinctrl-names = "default";