diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 4cdadc24..45263aa6 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -100,7 +100,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 ifeq ($(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE),y)
 KBUILD_IMAGE	:= $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME))
 else
-KBUILD_IMAGE	:= Image.gz
+KBUILD_IMAGE	:= Image
 endif
 
 KBUILD_DTBS	:= dtbs
@@ -121,6 +121,12 @@ zinstall install: vmlinux
 %.dtb: scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 
+%.dtbo: | scripts
+	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
+
+%.scr: | scripts
+	$(Q)$(MAKE) $(build)=$(boot)/dts ARCH=$(ARCH) $(boot)/dts/$@
+
 PHONY += dtbs dtbs_install
 
 dtbs: prepare scripts
diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
index dfa1ae79..2a0d76b4 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -180,7 +180,6 @@
 			opp-microvolt-L4 = <1150000 1150000 1340000>;
 			opp-microvolt-L5 = <1125000 1125000 1340000>;
 			clock-latency-ns = <40000>;
-			status = "disabled";
 		};
 		opp-1296000000 {
 			opp-hz = /bits/ 64 <1296000000>;
@@ -192,7 +191,6 @@
 			opp-microvolt-L4 = <1200000 1200000 1340000>;
 			opp-microvolt-L5 = <1175000 1175000 1340000>;
 			clock-latency-ns = <40000>;
-			status = "disabled";
 		};
 	};
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
index c64afc6a..e039eaa9 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
@@ -7,7 +7,7 @@
 
 #include <dt-bindings/input/input.h>
 /* #include "rk3308.dtsi" */
-#include "rk3308k.dtsi"
+#include "rk3308.dtsi"
 
 / {
 	model = "Radxa ROCK Pi S";
@@ -151,7 +151,7 @@
 		pinctrl-1 = <&uart4_rts_gpio>;
 		BT,power_gpio    = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
 		BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
-		status = "okay";
+		status = "disabled";
 	};
 
 	wireless-wlan {