diff --git a/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch b/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch index 59be3208a4..6d46c5473c 100644 --- a/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch +++ b/package/boot/uboot-sunxi/patches/252-sunxi-h5-add-support-for-nanopi-r1s-h5.patch @@ -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 @@ -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_pins_a>; diff --git a/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch b/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch index d624240d9a..694f6adc83 100644 --- a/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch +++ b/target/linux/sunxi/patches-4.19/103-sunxi-h5-add-support-for-nanopi-r1s-h5.patch @@ -10,7 +10,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 @@ -32,7 +32,7 @@ + + aliases { + ethernet0 = &emac; -+ i2c0 = &i2c0; ++ ethernet1 = &rtl8189etv; + serial0 = &uart0; + + led-boot = &led_sys; @@ -126,10 +126,6 @@ + cpu-supply = <&vdd_cpux>; +}; + -+&ehci0 { -+ status = "okay"; -+}; -+ +&ehci1 { + status = "okay"; + @@ -137,7 +133,7 @@ + compatible = "realtek,rtl8153"; + reg = <1>; + -+ realtek,led-data = <0x87>; ++ realtek,led-data = <0x78>; + }; +}; + @@ -145,10 +141,6 @@ + status = "okay"; +}; + -+&ehci3 { -+ status = "okay"; -+}; -+ +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; @@ -195,10 +187,6 @@ + }; +}; + -+&ohci0 { -+ status = "okay"; -+}; -+ +&ohci1 { + status = "okay"; +}; @@ -207,10 +195,6 @@ + status = "okay"; +}; + -+&ohci3 { -+ status = "okay"; -+}; -+ +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>;