enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable UART3 for NanoPi Neo/Air for the AP6212 BT

Browse Source 
https://github.com/Fourdee/DietPi/issues/738
This commit is contained in:
zador-blood-stained 2017-01-31 12:46:15 +03:00
parent 1f963acfc8
commit 01a34e94e2
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
patch/kernel/sun8i-dev/nanopi-neo-air-wireless-and-dvfs.patch
View File

@ -1,5 +1,5 @@
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
index 3d64cafc..dab0bfe0 100644
index 3d64cafc..277a2cc4 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
@@ -45,7 +45,9 @@
@ -12,7 +12,15 @@ index 3d64cafc..dab0bfe0 100644
/ {
model = "FriendlyARM NanoPi NEO";
@@ -75,6 +77,89 @@
@@ -53,6 +55,7 @@
aliases {
serial0 = &uart0;
+ serial3 = &uart3;
};
chosen {
@@ -75,6 +78,89 @@
gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
};
};
@ -102,7 +110,7 @@ index 3d64cafc..dab0bfe0 100644
};
&ehci3 {
@@ -91,12 +176,41 @@
@@ -91,12 +177,41 @@
status = "okay";
};
@ -145,7 +153,7 @@ index 3d64cafc..dab0bfe0 100644
allwinner,pins = "PA10";
allwinner,function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
@@ -105,12 +219,25 @@
@@ -105,12 +220,25 @@
};
&r_pio {
@ -172,3 +180,29 @@ index 3d64cafc..dab0bfe0 100644
};
&uart0 {
@@ -119,6 +247,12 @@
status = "okay";
};
+&uart3 { /* Connected to AP6212 on Neo Air */
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart3_pins>;
+ status = "okay";
+};
+
&usbphy {
/* USB VBUS is always on */
status = "okay";
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index 12dc849a..d1b4cd79 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -509,7 +523,7 @@
};
uart3_pins: uart3 {
- allwinner,pins = "PA13", "PA14";
+ allwinner,pins = "PA13", "PA14", "PA15", "PA16";
allwinner,function = "uart3";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;