diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpis/Makefile b/arch/arm64/boot/dts/rockchip/overlays-rockpis/Makefile
index 01c8334e8da1c..e541a9f314413 100644
--- a/arch/arm64/boot/dts/rockchip/overlays-rockpis/Makefile
+++ b/arch/arm64/boot/dts/rockchip/overlays-rockpis/Makefile
@@ -1,6 +1,7 @@
 # Overlays for the ROCK PI S platform
 
 dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
+	console-on-ttyS0.dtbo \
 	console-on-ttyS2.dtbo
 
 targets += dtbs dtbs_install
diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpis/console-on-ttyS0-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpis/console-on-ttyS0-overlay.dts
new file mode 100644
index 0000000000000..32f65ee0a0ac4
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlays-rockpis/console-on-ttyS0-overlay.dts
@@ -0,0 +1,17 @@
+// Definitions for setting uart4 pins as ttyFIQ0 console pins
+/dts-v1/;
+/plugin/;
+
+/ {
+	model = "ROCK PI S";
+	compatible = "rockchip,rockpis-rk3308", "rockchip,rk3308";
+
+	fragment@0 {
+		target = <&fiq_debugger>;
+
+		__overlay__ {
+			rockchip,serial-id = <0>;
+			status = "okay";
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlays-rockpis/hw_intfc.conf b/arch/arm64/boot/dts/rockchip/overlays-rockpis/hw_intfc.conf
index d3466128f1166..9927e679dc676 100644
--- a/arch/arm64/boot/dts/rockchip/overlays-rockpis/hw_intfc.conf
+++ b/arch/arm64/boot/dts/rockchip/overlays-rockpis/hw_intfc.conf
@@ -22,4 +22,5 @@ intfc:uart2=off
 # Devicetree Overlay Enable, uncomment to enable .dtbo under /boot/overlays/.
 
 # Disable ttyFIQ0 console
-intfc:dtoverlay=console-on-ttyS2
+#intfc:dtoverlay=console-on-ttyS2
+intfc:dtoverlay=console-on-ttyS0