From e074919e5bc7a3c71c06715c868f985a829ee2c0 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Thu, 9 May 2019 14:44:34 -0400 Subject: [PATCH] add R_UART to OPI3 --- .../sunxi-dev/general-add-H6-UARTs.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/patch/kernel/sunxi-dev/general-add-H6-UARTs.patch b/patch/kernel/sunxi-dev/general-add-H6-UARTs.patch index 3c6eff7cd8..57e1767930 100644 --- a/patch/kernel/sunxi-dev/general-add-H6-UARTs.patch +++ b/patch/kernel/sunxi-dev/general-add-H6-UARTs.patch @@ -19,6 +19,37 @@ index c72da8c..41a057e 100644 }; uart0: serial@5000000 { +@@ -768,6 +893,11 @@ + pins = "PL0", "PL1"; + function = "s_i2c"; + }; ++ ++ r_uart_pins: r-uart { ++ pins = "PL2", "PL3"; ++ function = "s_uart"; ++ }; + }; + + r_i2c: i2c@7081400 { +@@ -782,6 +912,18 @@ + #address-cells = <1>; + #size-cells = <0>; + }; ++ ++ r_uart: serial@7080000 { ++ compatible = "snps,dw-apb-uart"; ++ reg = <0x07080000 0x400>; ++ interrupts = ; ++ reg-shift = <2>; ++ reg-io-width = <4>; ++ clocks = <&r_ccu CLK_R_APB2_UART>; ++ resets = <&r_ccu RST_R_APB2_UART>; ++ status = "disabled"; ++ }; ++ + }; + + thermal-zones { diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi index b2526da..f31e14d 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi @@ -42,3 +73,22 @@ index b2526da..f31e14d 100644 &usb2otg { dr_mode = "otg"; status = "okay"; +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts +index afee79f..c66f4dd 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts +@@ -323,8 +348,14 @@ + }; + }; + ++&r_uart { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&r_uart_pins>; ++ status = "disabled"; ++}; ++ + /delete-node/ &spi0; + + &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_ph_pins>;