LibreELEC · HiassofT · Jan 11, 2020 · Jan 6, 2020
diff --git a/...ts/Allwinner/devices/H3/patches/linux/02-ARM-dts-sun8i-h3-Add-rc-map-for-Beelink-X2.patch b/...ts/Allwinner/devices/H3/patches/linux/02-ARM-dts-sun8i-h3-Add-rc-map-for-Beelink-X2.patch
diff --git a/projects/Allwinner/devices/H6/patches/linux/07-opi3.patch b/projects/Allwinner/devices/H6/patches/linux/07-opi3.patch
@@ -30,106 +30,6 @@ index 17d496990108..93bdd33694fb 100644
 -- 
 2.22.0
 
-From 5141fbafc9bf5f1a7cbb6923bc719f595ce54dae Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <icenowy@aosc.io>
-Date: Mon, 25 Dec 2017 12:10:06 +0800
-Subject: [PATCH 26/34] arm64: dts: allwinner: h6: add USB3 device nodes
-
-Allwinner H6 SoC features USB3 functionality, with a DWC3 controller and
-a custom PHY.
-
-Add device tree nodes for them.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
-Reviewed-by: Chen-Yu Tsai <wens@csie.org>
----
- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 32 ++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-index c5c0608e67403..38784589558ca 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
-@@ -420,6 +420,38 @@
- 			status = "disabled";
- 		};
-
-+		dwc3: dwc3@5200000 {
-+			compatible = "snps,dwc3";
-+			reg = <0x05200000 0x10000>;
-+			interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&ccu CLK_BUS_XHCI>,
-+				 <&ccu CLK_BUS_XHCI>,
-+				 <&rtc 0>;
-+			clock-names = "ref", "bus_early", "suspend";
-+			resets = <&ccu RST_BUS_XHCI>;
-+			/*
-+			 * The datasheet of the chip doesn't declare the
-+			 * peripheral function, and there's no boards known
-+			 * to have a USB Type-B port routed to the port.
-+			 * In addition, no one has tested the peripheral
-+			 * function yet.
-+			 * So set the dr_mode to "host" in the DTSI file.
-+			 */
-+			dr_mode = "host";
-+			phys = <&usb3phy>;
-+			phy-names = "usb3-phy";
-+			status = "disabled";
-+		};
-+
-+		usb3phy: phy@5210000 {
-+			compatible = "allwinner,sun50i-h6-usb3-phy";
-+			reg = <0x5210000 0x10000>;
-+			clocks = <&ccu CLK_USB_PHY1>;
-+			resets = <&ccu RST_USB_PHY1>;
-+			#phy-cells = <0>;
-+			status = "disabled";
-+		};
-+
- 		ehci3: usb@5311000 {
- 			compatible = "allwinner,sun50i-h6-ehci", "generic-ehci";
- 			reg = <0x05311000 0x100>;
-
-From c74e4ba1e28d5808cda02b34eee59dc1a5f15a6d Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Wed, 27 Mar 2019 13:43:25 +0100
-Subject: [PATCH 34/34] arm64: dts: allwinner: orange-pi-3: Enable USB 3.0 host
- support
-
-Enable Allwinner's USB 3.0 phy and the host controller. Orange Pi 3
-board has GL3510 USB 3.0 4-port hub connected to the SoC's USB 3.0
-port. All four ports are exposed via USB3-A connectors. The hub is
-powered directly from DCIN/VCC-5V.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-index d9e8610b5f83f..afee79fb88f18 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-@@ -126,6 +126,10 @@
- 	status = "okay";
- };
-
-+&dwc3 {
-+	status = "okay";
-+};
-+
- &ehci0 {
- 	status = "okay";
- };
-@@ -359,3 +363,8 @@
- 	usb3_vbus-supply = <&reg_vcc5v>;
- 	status = "okay";
- };
-+
-+&usb3phy {
-+        phy-supply = <&reg_vcc5v>;
-+        status = "okay";
-+};
 From 0b2bbc6708ef986e2f8d281f65e0c1ca3ff14562 Mon Sep 17 00:00:00 2001
 From: Ondrej Jirman <megous@megous.com>
 Date: Wed, 27 Mar 2019 13:21:06 +0100
@@ -572,89 +472,3 @@ index a7ffee494488..f7c7d89da7f8 100644
 -- 
 2.24.0
 
-From: Andre Heider <a.heider@gmail.com>
-Subject: [PATCH] arm64: dts: allwinner: orange-pi-3: Enable IR receiver
-Date: Sat,  9 Nov 2019 12:34:36 +0100
-
-Orange Pi 3 has an on-board IR receiver, enable it.
-
-Signed-off-by: Andre Heider <a.heider@gmail.com>
-Acked-by: Jernej Skrabec <jernej.skrabec@siol.net>
----
- arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-index eb379cd402ac..d3e30a67587c 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-@@ -263,6 +263,10 @@
- 	};
- };
-
-+&r_ir {
-+	status = "okay";
-+};
-+
- &uart0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart0_ph_pins>;
-
-
-From: Andre Heider <a.heider@gmail.com>
-Date: Tue, 19 Nov 2019 09:35:10 +0100
-Subject: [PATCH 2/2] WIP: Bluetooth: Accept
- HCI_QUIRK_INVALID_BDADDR|HCI_QUIRK_USE_BDADDR_PROPERTY
-
-Don't bail out if the former is set (in case of bcm: default controller
-address), but an address was supplied because of the latter.
----
- net/bluetooth/hci_core.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
-index 04bc79359a17..7bc384be89f8 100644
---- a/net/bluetooth/hci_core.c
-+++ b/net/bluetooth/hci_core.c
-@@ -1470,7 +1470,8 @@ static int hci_dev_do_open(struct hci_dev *hdev)
- 		 * start up as unconfigured.
- 		 */
- 		if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &hdev->quirks) ||
--		    test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks))
-+		    (test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks) &&
-+		     !test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)))
- 			hci_dev_set_flag(hdev, HCI_UNCONFIGURED);
-
- 		/* For an unconfigured controller it is required to
--- 
-2.24.0
-
-
-From: Andre Heider <a.heider@gmail.com>
-Date: Sun, 17 Nov 2019 20:31:17 +0100
-Subject: [PATCH 1/2] bluetooth: bcm: Use HCI_QUIRK_USE_BDADDR_PROPERTY
-
-Some devices ship with the controller default address, like the
-Orange Pi 3 (BCM4345C5).
-
-Allow the bootloader to set a valid address through the device tree.
-
-Signed-off-by: Andre Heider <a.heider@gmail.com>
----
- drivers/bluetooth/btbcm.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
-index 2d2e6d862068..9d16162d01ea 100644
---- a/drivers/bluetooth/btbcm.c
-+++ b/drivers/bluetooth/btbcm.c
-@@ -439,6 +439,7 @@ int btbcm_finalize(struct hci_dev *hdev)
- 	btbcm_check_bdaddr(hdev);
-
- 	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
-+	set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
-
- 	return 0;
- }
--- 
-2.24.0