From b8ec04670118870f6e8cc5e46ca0158fd29c5f51 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sun, 2 May 2021 21:10:06 +0800
Subject: [PATCH] sunxi: nanopi-r1s-h5: remove non-existent usb node

Signed-off-by: AmadeusGhost <amadeus@jmu.edu.cn>
---
 ...nxi-h5-add-support-for-nanopi-r1s-h5.patch | 22 +++----------------
 ...nxi-h5-add-support-for-nanopi-r1s-h5.patch | 22 +++----------------
 2 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/package/boot/uboot-sunxi/patches/253-sunxi-h5-add-support-for-nanopi-r1s-h5.patch b/package/boot/uboot-sunxi/patches/253-sunxi-h5-add-support-for-nanopi-r1s-h5.patch
index 818abac697..27bf5e66cd 100644
--- a/package/boot/uboot-sunxi/patches/253-sunxi-h5-add-support-for-nanopi-r1s-h5.patch
+++ b/package/boot/uboot-sunxi/patches/253-sunxi-h5-add-support-for-nanopi-r1s-h5.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -552,6 +552,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
+@@ -555,6 +555,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
  	sun50i-h5-libretech-all-h5-cc.dtb \
  	sun50i-h5-nanopi-neo2.dtb \
  	sun50i-h5-nanopi-neo-plus2.dtb \
@@ -10,7 +10,7 @@
  	sun50i-h5-orangepi-prime.dtb \
 --- /dev/null
 +++ b/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts
-@@ -0,0 +1,204 @@
+@@ -0,0 +1,188 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (C) 2021 AmadeusGhost <amadeus@jmu.edu.cn>
@@ -31,7 +31,7 @@
 +
 +	aliases {
 +		ethernet0 = &emac;
-+		i2c0 = &i2c0;
++		ethernet1 = &rtl8189etv;
 +		serial0 = &uart0;
 +	};
 +
@@ -120,10 +120,6 @@
 +	cpu-supply = <&vdd_cpux>;
 +};
 +
-+&ehci0 {
-+	status = "okay";
-+};
-+
 +&ehci1 {
 +	status = "okay";
 +};
@@ -132,10 +128,6 @@
 +	status = "okay";
 +};
 +
-+&ehci3 {
-+	status = "okay";
-+};
-+
 +&emac {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&emac_rgmii_pins>;
@@ -182,10 +174,6 @@
 +	};
 +};
 +
-+&ohci0 {
-+	status = "okay";
-+};
-+
 +&ohci1 {
 +	status = "okay";
 +};
@@ -194,10 +182,6 @@
 +	status = "okay";
 +};
 +
-+&ohci3 {
-+	status = "okay";
-+};
-+
 +&uart0 {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&uart0_pa_pins>;
diff --git a/target/linux/sunxi/patches-5.4/101-sunxi-h5-add-support-for-nanopi-r1s-h5.patch b/target/linux/sunxi/patches-5.4/101-sunxi-h5-add-support-for-nanopi-r1s-h5.patch
index dc392b77d9..71a6447249 100644
--- a/target/linux/sunxi/patches-5.4/101-sunxi-h5-add-support-for-nanopi-r1s-h5.patch
+++ b/target/linux/sunxi/patches-5.4/101-sunxi-h5-add-support-for-nanopi-r1s-h5.patch
@@ -24,7 +24,7 @@
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts
-@@ -0,0 +1,217 @@
+@@ -0,0 +1,201 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (C) 2021 AmadeusGhost <amadeus@jmu.edu.cn>
@@ -46,7 +46,7 @@
 +
 +	aliases {
 +		ethernet0 = &emac;
-+		i2c0 = &i2c0;
++		ethernet1 = &rtl8189etv;
 +		serial0 = &uart0;
 +
 +		led-boot = &led_sys;
@@ -140,10 +140,6 @@
 +	cpu-supply = <&vdd_cpux>;
 +};
 +
-+&ehci0 {
-+	status = "okay";
-+};
-+
 +&ehci1 {
 +	status = "okay";
 +
@@ -151,7 +147,7 @@
 +		compatible = "realtek,rtl8153";
 +		reg = <1>;
 +
-+		realtek,led-data = <0x87>;
++		realtek,led-data = <0x78>;
 +	};
 +};
 +
@@ -159,10 +155,6 @@
 +	status = "okay";
 +};
 +
-+&ehci3 {
-+	status = "okay";
-+};
-+
 +&emac {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&emac_rgmii_pins>;
@@ -209,10 +201,6 @@
 +	};
 +};
 +
-+&ohci0 {
-+	status = "okay";
-+};
-+
 +&ohci1 {
 +	status = "okay";
 +};
@@ -221,10 +209,6 @@
 +	status = "okay";
 +};
 +
-+&ohci3 {
-+	status = "okay";
-+};
-+
 +&uart0 {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&uart0_pa_pins>;