Enable uart0 for ROCK Pi S in device tree

2020-03-25 23:28:25 +01:00 · 2020-03-25 23:28:25 +01:00 · f59399d811
commit f59399d811
parent 9ceb01efd6
2 changed files with 17 additions and 1 deletions
--- 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"
--- a/patch/kernel/rockpis-legacy/board-rockpi-s-enable-uart0.patch
+++ 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>;