diff --git a/config/boards/rockpi-s.conf b/config/boards/rockpi-s.conf index d73a5a262a..6586ec01d5 100644 --- a/config/boards/rockpi-s.conf +++ b/config/boards/rockpi-s.conf @@ -3,7 +3,6 @@ BOARD_NAME="ROCK Pi S" BOARDFAMILY="rockpis" BOOTCONFIG="rockpi-s-rk3308_defconfig" DEFAULT_CONSOLE="serial" -DEFAULT_OVERLAYS="uart0" MODULES_LEGACY="g_serial" SERIALCON="ttyS0,ttyGS0" KERNEL_TARGET="legacy,dev" diff --git a/patch/kernel/rockpis-legacy/board-rockpi-s-enable-uart0.patch b/patch/kernel/rockpis-legacy/board-rockpi-s-enable-uart0.patch new file mode 100644 index 0000000000..e46f3b4563 --- /dev/null +++ b/patch/kernel/rockpis-legacy/board-rockpi-s-enable-uart0.patch @@ -0,0 +1,17 @@ +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 0eb7cc628..d3a8a3c79 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +@@ -342,6 +342,12 @@ + }; + }; + ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_xfer>; ++ status = "okay"; ++}; ++ + &uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&uart4_xfer &uart4_cts>;