From 390a5a2e90c99bcb643ea975b0f7d66695c38d53 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Mon, 22 Apr 2019 13:33:15 +0200
Subject: [PATCH] [ nanopi boards ] adjust default settings like they are in
 stock FA kernel

---
 ...rd-h3-nanopi-fix-random-ethernet-mac.patch | 12 ---
 .../board-nanopi-adjust-defaults.patch        | 97 +++++++++++++++++++
 ...rd-h3-nanopi-fix-random-ethernet-mac.patch | 12 ---
 .../board-nanopi-adjust-defaults.patch        | 97 +++++++++++++++++++
 4 files changed, 194 insertions(+), 24 deletions(-)
 delete mode 100644 patch/kernel/sunxi-dev/board-h3-nanopi-fix-random-ethernet-mac.patch
 create mode 100644 patch/kernel/sunxi-dev/board-nanopi-adjust-defaults.patch
 delete mode 100644 patch/kernel/sunxi-next/board-h3-nanopi-fix-random-ethernet-mac.patch
 create mode 100644 patch/kernel/sunxi-next/board-nanopi-adjust-defaults.patch

diff --git a/patch/kernel/sunxi-dev/board-h3-nanopi-fix-random-ethernet-mac.patch b/patch/kernel/sunxi-dev/board-h3-nanopi-fix-random-ethernet-mac.patch
deleted file mode 100644
index 2a1f7517e..000000000
--- a/patch/kernel/sunxi-dev/board-h3-nanopi-fix-random-ethernet-mac.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
-index c6decee..642a43b 100644
---- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
-+++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
-@@ -51,6 +51,7 @@
- / {
- 	aliases {
- 		serial0 = &uart0;
-+		ethernet0 = &emac;
- 	};
- 
- 	chosen {
diff --git a/patch/kernel/sunxi-dev/board-nanopi-adjust-defaults.patch b/patch/kernel/sunxi-dev/board-nanopi-adjust-defaults.patch
new file mode 100644
index 000000000..41cf6e99a
--- /dev/null
+++ b/patch/kernel/sunxi-dev/board-nanopi-adjust-defaults.patch
@@ -0,0 +1,97 @@
+diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+index f110ee382..c25c08bae 100644
+--- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
++++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+@@ -51,6 +51,10 @@
+ / {
+ 	aliases {
+ 		serial0 = &uart0;
++		serial1 = &uart1;
++		serial2 = &uart2;
++		serial3 = &uart3;
++		ethernet0 = &emac;
+ 	};
+ 
+ 	chosen {
+@@ -89,10 +93,38 @@
+ 	};
+ };
+ 
++&ehci0 {
++	status = "okay";
++};
++
++&ohci0 {
++	status = "okay";
++};
++
++&ehci1 {
++	status = "okay";
++};
++
++&ohci1 {
++	status = "okay";
++};
++
++&ehci2 {
++	status = "okay";
++};
++
++&ohci2 {
++	status = "okay";
++};
++
+ &ehci3 {
+ 	status = "okay";
+ };
+ 
++&ohci3 {
++	status = "okay";
++};
++
+ &mmc0 {
+ 	bus-width = <4>;
+ 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+@@ -100,10 +132,6 @@
+ 	vmmc-supply = <&reg_vcc3v3>;
+ };
+ 
+-&ohci3 {
+-	status = "okay";
+-};
+-
+ &pio {
+ 	leds_npi: led_pins {
+ 		pins = "PA10";
+@@ -129,6 +157,31 @@
+ 	status = "okay";
+ };
+ 
++&uart3 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart3_pins>, <&uart3_rts_cts_pins>;
++	status = "okay";
++};
++
++&i2c0 {
++	status = "okay";
++	rtc@68 {
++		compatible = "dallas,ds1307";
++		reg = <0x68>;
++		};
++};
++
++&usb_otg {
++	// OTG is not stable.
++	// most nanopi-h3's MicroUSB support OTG, except:
++	// 1. nanopi-neo-V1.4 support OTG, nanopi-neo-V1.3/1.2... support USB device.
++	// 2. nanopi-k1 only use as power.
++	dr_mode = "otg";
++	status = "okay";
++};
++
+ &usbphy {
++	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
++	usb0_vbus-supply = <&reg_usb0_vbus>;
+ 	status = "okay";
+ };
diff --git a/patch/kernel/sunxi-next/board-h3-nanopi-fix-random-ethernet-mac.patch b/patch/kernel/sunxi-next/board-h3-nanopi-fix-random-ethernet-mac.patch
deleted file mode 100644
index 2a1f7517e..000000000
--- a/patch/kernel/sunxi-next/board-h3-nanopi-fix-random-ethernet-mac.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
-index c6decee..642a43b 100644
---- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
-+++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
-@@ -51,6 +51,7 @@
- / {
- 	aliases {
- 		serial0 = &uart0;
-+		ethernet0 = &emac;
- 	};
- 
- 	chosen {
diff --git a/patch/kernel/sunxi-next/board-nanopi-adjust-defaults.patch b/patch/kernel/sunxi-next/board-nanopi-adjust-defaults.patch
new file mode 100644
index 000000000..41cf6e99a
--- /dev/null
+++ b/patch/kernel/sunxi-next/board-nanopi-adjust-defaults.patch
@@ -0,0 +1,97 @@
+diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+index f110ee382..c25c08bae 100644
+--- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
++++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
+@@ -51,6 +51,10 @@
+ / {
+ 	aliases {
+ 		serial0 = &uart0;
++		serial1 = &uart1;
++		serial2 = &uart2;
++		serial3 = &uart3;
++		ethernet0 = &emac;
+ 	};
+ 
+ 	chosen {
+@@ -89,10 +93,38 @@
+ 	};
+ };
+ 
++&ehci0 {
++	status = "okay";
++};
++
++&ohci0 {
++	status = "okay";
++};
++
++&ehci1 {
++	status = "okay";
++};
++
++&ohci1 {
++	status = "okay";
++};
++
++&ehci2 {
++	status = "okay";
++};
++
++&ohci2 {
++	status = "okay";
++};
++
+ &ehci3 {
+ 	status = "okay";
+ };
+ 
++&ohci3 {
++	status = "okay";
++};
++
+ &mmc0 {
+ 	bus-width = <4>;
+ 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+@@ -100,10 +132,6 @@
+ 	vmmc-supply = <&reg_vcc3v3>;
+ };
+ 
+-&ohci3 {
+-	status = "okay";
+-};
+-
+ &pio {
+ 	leds_npi: led_pins {
+ 		pins = "PA10";
+@@ -129,6 +157,31 @@
+ 	status = "okay";
+ };
+ 
++&uart3 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart3_pins>, <&uart3_rts_cts_pins>;
++	status = "okay";
++};
++
++&i2c0 {
++	status = "okay";
++	rtc@68 {
++		compatible = "dallas,ds1307";
++		reg = <0x68>;
++		};
++};
++
++&usb_otg {
++	// OTG is not stable.
++	// most nanopi-h3's MicroUSB support OTG, except:
++	// 1. nanopi-neo-V1.4 support OTG, nanopi-neo-V1.3/1.2... support USB device.
++	// 2. nanopi-k1 only use as power.
++	dr_mode = "otg";
++	status = "okay";
++};
++
+ &usbphy {
++	usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
++	usb0_vbus-supply = <&reg_usb0_vbus>;
+ 	status = "okay";
+ };