886d66abcd
Refresh patches. Compile-tested for ar71xx - Archer C7 v2 Runtime-tested on ar71xx - Archer C7 v2 Fixes the following CVEs: - CVE-2017-7518 - CVE-2017-0786 - CVE-2017-1000255 - CVE-2017-12188 - CVE-2017-15265 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
80 lines
1.2 KiB
Diff
80 lines
1.2 KiB
Diff
From e036def69972b9db9d2695f45cbf4e84c707b3c5 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Fri, 23 Dec 2016 07:28:51 +0100
|
|
Subject: [PATCH] ARM: dts: sun8i: nanopi-neo: enable UART, USB and I2C pins
|
|
|
|
---
|
|
arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 43 ++++++++++++++++++++++++++++---
|
|
1 file changed, 40 insertions(+), 3 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
|
|
@@ -78,10 +78,30 @@
|
|
};
|
|
};
|
|
|
|
+&ehci1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&ohci1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&ehci2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&ohci2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&ehci3 {
|
|
status = "okay";
|
|
};
|
|
|
|
+&ohci3 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&emac {
|
|
phy-handle = <&int_mii_phy>;
|
|
phy-mode = "mii";
|
|
@@ -99,9 +119,6 @@
|
|
status = "okay";
|
|
};
|
|
|
|
-&ohci3 {
|
|
- status = "okay";
|
|
-};
|
|
|
|
&pio {
|
|
leds_opc: led-pins {
|
|
@@ -127,7 +144,27 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&uart1 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&uart1_pins>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&uart2 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&uart2_pins>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&usbphy {
|
|
/* USB VBUS is always on */
|
|
status = "okay";
|
|
};
|
|
+
|
|
+&i2c0 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&i2c1 {
|
|
+ status = "okay";
|
|
+};
|