From b16928aa96e0cd340924d3c3013f973f0a253f8e Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 18 Dec 2023 11:12:38 +0800 Subject: [PATCH] sunxi: mark upstreamed patches as such Also sort them to start from 001. Signed-off-by: Tianling Shen --- ...2-dt-bindings-usb-Add-H616-compatible-string.patch} | 8 +++++--- ...phy-Add-special-clock-for-Allwinner-H616-PHY.patch} | 10 ++++++---- ...-v6.2-arm64-dts-allwinner-h616-Add-USB-nodes.patch} | 9 ++++++--- ...allwinner-h616-OrangePi-Zero-2-Add-USB-nodes.patch} | 10 ++++++---- 4 files changed, 23 insertions(+), 14 deletions(-) rename target/linux/sunxi/patches-6.1/{460-dt-bindings-usb-Add-H616-compatible-string.patch => 001-v6.2-dt-bindings-usb-Add-H616-compatible-string.patch} (82%) rename target/linux/sunxi/patches-6.1/{461-dt-bindings-phy-Add-special-clock-for-Allwinner-H616.patch => 002-v6.2-dt-bindings-phy-Add-special-clock-for-Allwinner-H616-PHY.patch} (85%) rename target/linux/sunxi/patches-6.1/{462-arm64-dts-allwinner-h616-Add-USB-nodes.patch => 003-v6.2-arm64-dts-allwinner-h616-Add-USB-nodes.patch} (93%) rename target/linux/sunxi/patches-6.1/{463-arm64-dts-allwinner-h616-OrangePi-Zero-2-Add-USB-nod.patch => 004-v6.2-arm64-dts-allwinner-h616-OrangePi-Zero-2-Add-USB-nodes.patch} (84%) diff --git a/target/linux/sunxi/patches-6.1/460-dt-bindings-usb-Add-H616-compatible-string.patch b/target/linux/sunxi/patches-6.1/001-v6.2-dt-bindings-usb-Add-H616-compatible-string.patch similarity index 82% rename from target/linux/sunxi/patches-6.1/460-dt-bindings-usb-Add-H616-compatible-string.patch rename to target/linux/sunxi/patches-6.1/001-v6.2-dt-bindings-usb-Add-H616-compatible-string.patch index bab535705c..c24d479534 100644 --- a/target/linux/sunxi/patches-6.1/460-dt-bindings-usb-Add-H616-compatible-string.patch +++ b/target/linux/sunxi/patches-6.1/001-v6.2-dt-bindings-usb-Add-H616-compatible-string.patch @@ -1,7 +1,7 @@ -From e4045c8125d88a9eb8b4f8f74b5c7955d5d9adc0 Mon Sep 17 00:00:00 2001 +From 28a1a6474c5053bae01bd29946b4d5ede539176b Mon Sep 17 00:00:00 2001 From: Andre Przywara -Date: Thu, 17 Jun 2021 10:54:22 +0100 -Subject: [PATCH 5000/5006] dt-bindings: usb: Add H616 compatible string +Date: Mon, 31 Oct 2022 11:13:52 +0000 +Subject: [PATCH] dt-bindings: usb: Add H616 compatible string The Allwinner H616 contains four fully OHCI/EHCI compatible USB host controllers, so just add their compatible strings to the list of @@ -9,6 +9,8 @@ generic OHCI/EHCI controllers. Signed-off-by: Andre Przywara Acked-by: Krzysztof Kozlowski +Link: https://lore.kernel.org/r/20221031111358.3387297-2-andre.przywara@arm.com +Signed-off-by: Jernej Skrabec --- Documentation/devicetree/bindings/usb/generic-ehci.yaml | 1 + Documentation/devicetree/bindings/usb/generic-ohci.yaml | 1 + diff --git a/target/linux/sunxi/patches-6.1/461-dt-bindings-phy-Add-special-clock-for-Allwinner-H616.patch b/target/linux/sunxi/patches-6.1/002-v6.2-dt-bindings-phy-Add-special-clock-for-Allwinner-H616-PHY.patch similarity index 85% rename from target/linux/sunxi/patches-6.1/461-dt-bindings-phy-Add-special-clock-for-Allwinner-H616.patch rename to target/linux/sunxi/patches-6.1/002-v6.2-dt-bindings-phy-Add-special-clock-for-Allwinner-H616-PHY.patch index 238683b3c5..5739172ceb 100644 --- a/target/linux/sunxi/patches-6.1/461-dt-bindings-phy-Add-special-clock-for-Allwinner-H616.patch +++ b/target/linux/sunxi/patches-6.1/002-v6.2-dt-bindings-phy-Add-special-clock-for-Allwinner-H616-PHY.patch @@ -1,8 +1,7 @@ -From e2078ae0c559b6ac91db19262b56d8cf334354cb Mon Sep 17 00:00:00 2001 +From 6964affe65066651eca21e97247d3b7cac5153dc Mon Sep 17 00:00:00 2001 From: Andre Przywara -Date: Mon, 12 Sep 2022 00:03:22 +0100 -Subject: [PATCH 5001/5006] dt-bindings: phy: Add special clock for Allwinner - H616 PHY +Date: Mon, 31 Oct 2022 11:13:53 +0000 +Subject: [PATCH] dt-bindings: phy: Add special clock for Allwinner H616 PHY The USB PHY IP in the Allwinner H616 SoC requires a quirk that involves some resources from port 2's PHY and HCI IP. In particular the PMU clock @@ -17,6 +16,9 @@ PHY driver can apply the quirk in isolation, without requiring help from port 2's HCI driver. Signed-off-by: Andre Przywara +Reviewed-by: Rob Herring +Link: https://lore.kernel.org/r/20221031111358.3387297-3-andre.przywara@arm.com +Signed-off-by: Vinod Koul --- .../phy/allwinner,sun8i-h3-usb-phy.yaml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/target/linux/sunxi/patches-6.1/462-arm64-dts-allwinner-h616-Add-USB-nodes.patch b/target/linux/sunxi/patches-6.1/003-v6.2-arm64-dts-allwinner-h616-Add-USB-nodes.patch similarity index 93% rename from target/linux/sunxi/patches-6.1/462-arm64-dts-allwinner-h616-Add-USB-nodes.patch rename to target/linux/sunxi/patches-6.1/003-v6.2-arm64-dts-allwinner-h616-Add-USB-nodes.patch index 9a31bea8bf..6dc1cf2f36 100644 --- a/target/linux/sunxi/patches-6.1/462-arm64-dts-allwinner-h616-Add-USB-nodes.patch +++ b/target/linux/sunxi/patches-6.1/003-v6.2-arm64-dts-allwinner-h616-Add-USB-nodes.patch @@ -1,7 +1,7 @@ -From 4cfd9d9350a57fc3ced240dbf61ca2f444283c50 Mon Sep 17 00:00:00 2001 +From f40cf244c3feb4e1a442f8029b691add2c65b3ab Mon Sep 17 00:00:00 2001 From: Andre Przywara -Date: Wed, 16 Jun 2021 18:20:47 +0100 -Subject: [PATCH 5004/5006] arm64: dts: allwinner: h616: Add USB nodes +Date: Mon, 31 Oct 2022 11:13:56 +0000 +Subject: [PATCH] arm64: dts: allwinner: h616: Add USB nodes Add the nodes for the MUSB and the four USB host controllers to the SoC .dtsi, along with the PHY node needed to bind all of them together. @@ -10,6 +10,9 @@ EHCI/OHCI and MUSB are compatible to previous SoCs, but the PHY requires some quirks (handled in the driver). Signed-off-by: Andre Przywara +Reviewed-by: Jernej Skrabec +Link: https://lore.kernel.org/r/20221031111358.3387297-6-andre.przywara@arm.com +Signed-off-by: Jernej Skrabec --- .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 160 ++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/target/linux/sunxi/patches-6.1/463-arm64-dts-allwinner-h616-OrangePi-Zero-2-Add-USB-nod.patch b/target/linux/sunxi/patches-6.1/004-v6.2-arm64-dts-allwinner-h616-OrangePi-Zero-2-Add-USB-nodes.patch similarity index 84% rename from target/linux/sunxi/patches-6.1/463-arm64-dts-allwinner-h616-OrangePi-Zero-2-Add-USB-nod.patch rename to target/linux/sunxi/patches-6.1/004-v6.2-arm64-dts-allwinner-h616-OrangePi-Zero-2-Add-USB-nodes.patch index 9ae5591cca..a544e482f3 100644 --- a/target/linux/sunxi/patches-6.1/463-arm64-dts-allwinner-h616-OrangePi-Zero-2-Add-USB-nod.patch +++ b/target/linux/sunxi/patches-6.1/004-v6.2-arm64-dts-allwinner-h616-OrangePi-Zero-2-Add-USB-nodes.patch @@ -1,8 +1,7 @@ -From 1bc12a9ae690a22a525f9b71778022bb4533fec1 Mon Sep 17 00:00:00 2001 +From db5f028309ede13767e2ba356c1975ac37a4fd6c Mon Sep 17 00:00:00 2001 From: Andre Przywara -Date: Wed, 16 Jun 2021 18:32:36 +0100 -Subject: [PATCH 5005/5006] arm64: dts: allwinner: h616: OrangePi Zero 2: Add - USB nodes +Date: Mon, 31 Oct 2022 11:13:57 +0000 +Subject: [PATCH] arm64: dts: allwinner: h616: OrangePi Zero 2: Add USB nodes The OrangePi Zero 2 has one USB-A host port, VBUS is provided by a GPIO controlled regulator. @@ -10,6 +9,9 @@ The USB-C port is meant to power the board, but is also connected to the USB 0 port, which we configure as an MUSB peripheral. Signed-off-by: Andre Przywara +Reviewed-by: Jernej Skrabec +Link: https://lore.kernel.org/r/20221031111358.3387297-7-andre.przywara@arm.com +Signed-off-by: Jernej Skrabec --- .../allwinner/sun50i-h616-orangepi-zero2.dts | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) -- 2.30.2