Allwinner: Sort upstreamed patches

projects/Allwinner/devices/H6/patches/linux/07-opi3.patch

@@ -1,38 +1,3 @@
-From beada897870d77ccbd4a14981d7f9a7f94d44ef4 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@siol.net>
-Date: Wed, 15 Jan 2020 18:51:54 +0100
-Subject: [PATCH] arm64: dts: allwinner: h6: orangepi-3: Add eMMC node
-
-OrangePi 3 can optionally have 8 GiB eMMC (soldered on board). Add a
-node for it.
-
-Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
----
- arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 8 ++++++++
- 1 file changed, 8 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 c311eee52a35..eda591be661e 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-@@ -144,6 +144,14 @@ brcm: sdio-wifi@1 {
- 	};
- };
- 
-+&mmc2 {
-+	vmmc-supply = <&reg_cldo1>;
-+	vqmmc-supply = <&reg_bldo2>;
-+	cap-mmc-hw-reset;
-+	bus-width = <8>;
-+	status = "okay";
-+};
-+
- &ohci0 {
- 	status = "okay";
- };
--- 
-2.24.1
-
 From 0b2bbc6708ef986e2f8d281f65e0c1ca3ff14562 Mon Sep 17 00:00:00 2001
 From: Ondrej Jirman <megous@megous.com>
 Date: Wed, 27 Mar 2019 13:21:06 +0100

projects/Allwinner/devices/H6/patches/linux/08-arm64-dts-allwinner-OrangePiOnePlus-updates.patch

@@ -1,78 +0,0 @@
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
-index 12e17567ab56..fd9dcefcd223 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
-@@ -9,4 +9,73 @@
- / {
- 	model = "OrangePi One Plus";
- 	compatible = "xunlong,orangepi-one-plus", "allwinner,sun50i-h6";
-+
-+	aliases {
-+		ethernet0 = &emac;
-+	};
-+
-+	connector {
-+		compatible = "hdmi-connector";
-+		type = "a";
-+		ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
-+
-+		port {
-+			hdmi_con_in: endpoint {
-+				remote-endpoint = <&hdmi_out_con>;
-+			};
-+		};
-+	};
-+
-+	reg_gmac_3v3: gmac-3v3 {
-+                compatible = "regulator-fixed";
-+                regulator-name = "vcc-gmac-3v3";
-+                regulator-min-microvolt = <3300000>;
-+                regulator-max-microvolt = <3300000>;
-+                startup-delay-us = <100000>;
-+                enable-active-high;
-+                gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
-+                vin-supply = <&reg_aldo2>;
-+	};
-+
-+	reg_usb_vbus: vbus {
-+		compatible = "regulator-fixed";
-+		regulator-name = "usb-vbus";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		startup-delay-us = <100000>;
-+		gpio = <&r_pio 0 5 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+	};
-+};
-+
-+&de {
-+	status = "okay";
-+};
-+
-+&emac {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&ext_rgmii_pins>;
-+	phy-mode = "rgmii";
-+	phy-handle = <&ext_rgmii_phy>;
-+	phy-supply = <&reg_gmac_3v3>;
-+	allwinner,rx-delay-ps = <200>;
-+	allwinner,tx-delay-ps = <200>;
-+	status = "okay";
-+};
-+
-+&hdmi {
-+	status = "okay";
-+};
-+
-+&hdmi_out {
-+	hdmi_out_con: endpoint {
-+		remote-endpoint = <&hdmi_con_in>;
-+	};
-+};
-+
-+&mdio {
-+	ext_rgmii_phy: ethernet-phy@1 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <1>;
-+	};
- };

projects/Allwinner/devices/H6/patches/linux/15-RTC-workaround.patch

@@ -1,41 +0,0 @@
-From 7c8b4644df51ba7ecd68a6898bcb041ab669ddf9 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@siol.net>
-Date: Sun, 25 Aug 2019 00:02:06 +0200
-Subject: [PATCH] RTC workaround
-
-Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
----
- drivers/rtc/rtc-sun6i.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
-index 4603a91c11be..d8a0817b96f4 100644
---- a/drivers/rtc/rtc-sun6i.c
-+++ b/drivers/rtc/rtc-sun6i.c
-@@ -33,6 +33,7 @@
- #define SUN6I_LOSC_CTRL				0x0000
- #define SUN6I_LOSC_CTRL_KEY			(0x16aa << 16)
- #define SUN6I_LOSC_CTRL_AUTO_SWT_BYPASS		BIT(15)
-+#define SUN6I_LOSC_CTRL_AUTO_SWT_EN		BIT(14)
- #define SUN6I_LOSC_CTRL_ALM_DHMS_ACC		BIT(9)
- #define SUN6I_LOSC_CTRL_RTC_HMS_ACC		BIT(8)
- #define SUN6I_LOSC_CTRL_RTC_YMD_ACC		BIT(7)
-@@ -253,6 +254,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
- 
- 	/* Switch to the external, more precise, oscillator */
- 	reg |= SUN6I_LOSC_CTRL_EXT_OSC;
-+	reg |= SUN6I_LOSC_CTRL_AUTO_SWT_EN;
- 	if (rtc->data->has_losc_en)
- 		reg |= SUN6I_LOSC_CTRL_EXT_LOSC_EN;
- 	writel(reg, rtc->base + SUN6I_LOSC_CTRL);
-@@ -370,7 +372,6 @@ static const struct sun6i_rtc_clk_data sun50i_h6_rtc_data = {
- 	.has_out_clk = 1,
- 	.export_iosc = 1,
- 	.has_losc_en = 1,
--	.has_auto_swt = 1,
- };
- 
- static void __init sun50i_h6_rtc_clk_init(struct device_node *node)
--- 
-2.23.0
-