ipq40xx: 5.10: replace patches with upstreamed versions
authorRobert Marko <robert.marko@sartura.hr>
Sun, 12 Sep 2021 20:34:43 +0000 (22:34 +0200)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Sat, 25 Sep 2021 17:28:54 +0000 (19:28 +0200)
USB and SDHCI LDO DTS patches have been upstreamed into 5.12, so
replace the local versions with upstreamed ones.

Reorder, and clearly mark the kernel version.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>
target/linux/ipq40xx/patches-5.10/0001-v5.12-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch [new file with mode: 0644]
target/linux/ipq40xx/patches-5.10/0002-v5.12-ARM-dts-qcom-ipq4019-add-more-labels.patch [new file with mode: 0644]
target/linux/ipq40xx/patches-5.10/0003-v5.12-ARM-dts-qcom-ipq4019-add-SDHCI-VQMMC-LDO-node.patch [new file with mode: 0644]
target/linux/ipq40xx/patches-5.10/101-arm-dts-IPQ4019-add-SDHCI-VQMMC-LDO-node.patch [deleted file]
target/linux/ipq40xx/patches-5.10/102-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch [deleted file]
target/linux/ipq40xx/patches-5.10/103-arm-dts-qcom-ipq4019-add-more-labels.patch [deleted file]

diff --git a/target/linux/ipq40xx/patches-5.10/0001-v5.12-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch b/target/linux/ipq40xx/patches-5.10/0001-v5.12-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch
new file mode 100644 (file)
index 0000000..8906113
--- /dev/null
@@ -0,0 +1,99 @@
+From b8afc254b40167fd37b4d4263e750dab1f9ef157 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Wed, 9 Sep 2020 18:38:31 +0200
+Subject: [PATCH] ARM: dts: qcom: ipq4019: add USB devicetree nodes
+
+Since we now have driver for the USB PHY, and USB controller is already supported by the DWC3 driver lets add the necessary nodes to DTSI.
+
+Signed-off-by: John Crispin <john@phrozen.org>
+Signed-off-by: Robert Marko <robert.marko@sartura.hr>
+Cc: Luka Perkov <luka.perkov@sartura.hr>
+Reviewed-by: Vinod Koul <vkoul@kernel.org>
+Link: https://lore.kernel.org/r/20200909163831.1894142-1-robert.marko@sartura.hr
+Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+---
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 74 +++++++++++++++++++++++++++++
+ 1 file changed, 74 insertions(+)
+
+--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+@@ -605,5 +605,79 @@
+                               reg = <4>;
+                       };
+               };
++
++              usb3_ss_phy: ssphy@9a000 {
++                      compatible = "qcom,usb-ss-ipq4019-phy";
++                      #phy-cells = <0>;
++                      reg = <0x9a000 0x800>;
++                      reg-names = "phy_base";
++                      resets = <&gcc USB3_UNIPHY_PHY_ARES>;
++                      reset-names = "por_rst";
++                      status = "disabled";
++              };
++
++              usb3_hs_phy: hsphy@a6000 {
++                      compatible = "qcom,usb-hs-ipq4019-phy";
++                      #phy-cells = <0>;
++                      reg = <0xa6000 0x40>;
++                      reg-names = "phy_base";
++                      resets = <&gcc USB3_HSPHY_POR_ARES>, <&gcc USB3_HSPHY_S_ARES>;
++                      reset-names = "por_rst", "srif_rst";
++                      status = "disabled";
++              };
++
++              usb3: usb3@8af8800 {
++                      compatible = "qcom,dwc3";
++                      reg = <0x8af8800 0x100>;
++                      #address-cells = <1>;
++                      #size-cells = <1>;
++                      clocks = <&gcc GCC_USB3_MASTER_CLK>,
++                               <&gcc GCC_USB3_SLEEP_CLK>,
++                               <&gcc GCC_USB3_MOCK_UTMI_CLK>;
++                      clock-names = "master", "sleep", "mock_utmi";
++                      ranges;
++                      status = "disabled";
++
++                      dwc3@8a00000 {
++                              compatible = "snps,dwc3";
++                              reg = <0x8a00000 0xf8000>;
++                              interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
++                              phys = <&usb3_hs_phy>, <&usb3_ss_phy>;
++                              phy-names = "usb2-phy", "usb3-phy";
++                              dr_mode = "host";
++                      };
++              };
++
++              usb2_hs_phy: hsphy@a8000 {
++                      compatible = "qcom,usb-hs-ipq4019-phy";
++                      #phy-cells = <0>;
++                      reg = <0xa8000 0x40>;
++                      reg-names = "phy_base";
++                      resets = <&gcc USB2_HSPHY_POR_ARES>, <&gcc USB2_HSPHY_S_ARES>;
++                      reset-names = "por_rst", "srif_rst";
++                      status = "disabled";
++              };
++
++              usb2: usb2@60f8800 {
++                      compatible = "qcom,dwc3";
++                      reg = <0x60f8800 0x100>;
++                      #address-cells = <1>;
++                      #size-cells = <1>;
++                      clocks = <&gcc GCC_USB2_MASTER_CLK>,
++                               <&gcc GCC_USB2_SLEEP_CLK>,
++                               <&gcc GCC_USB2_MOCK_UTMI_CLK>;
++                      clock-names = "master", "sleep", "mock_utmi";
++                      ranges;
++                      status = "disabled";
++
++                      dwc3@6000000 {
++                              compatible = "snps,dwc3";
++                              reg = <0x6000000 0xf8000>;
++                              interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
++                              phys = <&usb2_hs_phy>;
++                              phy-names = "usb2-phy";
++                              dr_mode = "host";
++                      };
++              };
+       };
+ };
diff --git a/target/linux/ipq40xx/patches-5.10/0002-v5.12-ARM-dts-qcom-ipq4019-add-more-labels.patch b/target/linux/ipq40xx/patches-5.10/0002-v5.12-ARM-dts-qcom-ipq4019-add-more-labels.patch
new file mode 100644 (file)
index 0000000..d623a9c
--- /dev/null
@@ -0,0 +1,44 @@
+From d1ae4c808e7802008225078d93fbadd4aeea1e2d Mon Sep 17 00:00:00 2001
+From: Robert Marko <robert.marko@sartura.hr>
+Date: Wed, 9 Sep 2020 21:56:37 +0200
+Subject: [PATCH] ARM: dts: qcom: ipq4019: add more labels
+
+Lets add labels to more commonly used nodes for easier modification in board DTS files.
+
+Signed-off-by: Robert Marko <robert.marko@sartura.hr>
+Cc: Luka Perkov <luka.perkov@sartura.hr>
+Link: https://lore.kernel.org/r/20200909195640.3127341-2-robert.marko@sartura.hr
+Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+---
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+@@ -190,7 +190,7 @@
+                       reg = <0x1800000 0x60000>;
+               };
+-              rng@22000 {
++              prng: rng@22000 {
+                       compatible = "qcom,prng";
+                       reg = <0x22000 0x140>;
+                       clocks = <&gcc GCC_PRNG_AHB_CLK>;
+@@ -300,7 +300,7 @@
+                       status = "disabled";
+               };
+-              crypto@8e3a000 {
++              crypto: crypto@8e3a000 {
+                       compatible = "qcom,crypto-v5.1";
+                       reg = <0x08e3a000 0x6000>;
+                       clocks = <&gcc GCC_CRYPTO_AHB_CLK>,
+@@ -386,7 +386,7 @@
+                       dma-names = "rx", "tx";
+               };
+-              watchdog@b017000 {
++              watchdog: watchdog@b017000 {
+                       compatible = "qcom,kpss-wdt", "qcom,kpss-wdt-ipq4019";
+                       reg = <0xb017000 0x40>;
+                       clocks = <&sleep_clk>;
diff --git a/target/linux/ipq40xx/patches-5.10/0003-v5.12-ARM-dts-qcom-ipq4019-add-SDHCI-VQMMC-LDO-node.patch b/target/linux/ipq40xx/patches-5.10/0003-v5.12-ARM-dts-qcom-ipq4019-add-SDHCI-VQMMC-LDO-node.patch
new file mode 100644 (file)
index 0000000..1d93fb8
--- /dev/null
@@ -0,0 +1,35 @@
+From e14775aa2feac18e7378cb8009b55c13d4236b50 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robert.marko@sartura.hr>
+Date: Mon, 7 Sep 2020 12:19:37 +0200
+Subject: [PATCH] ARM: dts: qcom: ipq4019: add SDHCI VQMMC LDO node
+
+Since we now have driver for the SDHCI VQMMC LDO needed
+for I/0 voltage levels lets introduce the necessary node for it.
+
+Signed-off-by: Robert Marko <robert.marko@sartura.hr>
+Cc: Luka Perkov <luka.perkov@sartura.hr>
+Link: https://lore.kernel.org/r/20200907101937.10155-1-robert.marko@sartura.hr
+Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+---
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+@@ -209,6 +209,16 @@
+                       interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
+               };
++              vqmmc: regulator@1948000 {
++                      compatible = "qcom,vqmmc-ipq4019-regulator";
++                      reg = <0x01948000 0x4>;
++                      regulator-name = "vqmmc";
++                      regulator-min-microvolt = <1500000>;
++                      regulator-max-microvolt = <3000000>;
++                      regulator-always-on;
++                      status = "disabled";
++              };
++
+               sdhci: sdhci@7824900 {
+                       compatible = "qcom,sdhci-msm-v4";
+                       reg = <0x7824900 0x11c>, <0x7824000 0x800>;
diff --git a/target/linux/ipq40xx/patches-5.10/101-arm-dts-IPQ4019-add-SDHCI-VQMMC-LDO-node.patch b/target/linux/ipq40xx/patches-5.10/101-arm-dts-IPQ4019-add-SDHCI-VQMMC-LDO-node.patch
deleted file mode 100644 (file)
index 14affc2..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 77d9b11ae7269dcf376c3b9493209f712524e986 Mon Sep 17 00:00:00 2001
-From: Robert Marko <robert.marko@sartura.hr>
-Date: Wed, 22 Jan 2020 12:56:35 +0100
-Subject: [PATCH] arm: dts: IPQ4019: add SDHCI VQMMC LDO node
-
-Since we now have driver for the SDHCI VQMMC LDO needed
-for I/0 voltage levels lets introduce the necessary node for it.
-
-Signed-off-by: Robert Marko <robert.marko@sartura.hr>
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -209,6 +209,16 @@
-                       interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
-               };
-+              vqmmc: regulator@1948000 {
-+                      compatible = "qcom,vqmmc-ipq4019-regulator";
-+                      reg = <0x01948000 0x4>;
-+                      regulator-name = "vqmmc";
-+                      regulator-min-microvolt = <1500000>;
-+                      regulator-max-microvolt = <3000000>;
-+                      regulator-always-on;
-+                      status = "disabled";
-+              };
-+
-               sdhci: sdhci@7824900 {
-                       compatible = "qcom,sdhci-msm-v4";
-                       reg = <0x7824900 0x11c>, <0x7824000 0x800>;
diff --git a/target/linux/ipq40xx/patches-5.10/102-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch b/target/linux/ipq40xx/patches-5.10/102-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch
deleted file mode 100644 (file)
index b033a1b..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-From 193856b5fe11c50a0b6ff22457dd674c1a45fec6 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Wed, 9 Sep 2020 18:31:03 +0200
-Subject: [PATCH] ARM: dts: qcom: ipq4019: add USB devicetree nodes
-
-Since we now have driver for the USB PHY, and USB controller is already supported by the DWC3 driver lets add the necessary nodes to DTSI.
-
-Signed-off-by: John Crispin <john@phrozen.org>
-Signed-off-by: Robert Marko <robert.marko@sartura.hr>
-Cc: Luka Perkov <luka.perkov@sartura.hr>
-Reviewed-by: Vinod Koul <vkoul@kernel.org>
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 74 +++++++++++++++++++++++++++++
- 1 file changed, 74 insertions(+)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -615,5 +615,79 @@
-                               reg = <4>;
-                       };
-               };
-+
-+              usb3_ss_phy: ssphy@9a000 {
-+                      compatible = "qcom,usb-ss-ipq4019-phy";
-+                      #phy-cells = <0>;
-+                      reg = <0x9a000 0x800>;
-+                      reg-names = "phy_base";
-+                      resets = <&gcc USB3_UNIPHY_PHY_ARES>;
-+                      reset-names = "por_rst";
-+                      status = "disabled";
-+              };
-+
-+              usb3_hs_phy: hsphy@a6000 {
-+                      compatible = "qcom,usb-hs-ipq4019-phy";
-+                      #phy-cells = <0>;
-+                      reg = <0xa6000 0x40>;
-+                      reg-names = "phy_base";
-+                      resets = <&gcc USB3_HSPHY_POR_ARES>, <&gcc USB3_HSPHY_S_ARES>;
-+                      reset-names = "por_rst", "srif_rst";
-+                      status = "disabled";
-+              };
-+
-+              usb3: usb3@8af8800 {
-+                      compatible = "qcom,dwc3";
-+                      reg = <0x8af8800 0x100>;
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+                      clocks = <&gcc GCC_USB3_MASTER_CLK>,
-+                               <&gcc GCC_USB3_SLEEP_CLK>,
-+                               <&gcc GCC_USB3_MOCK_UTMI_CLK>;
-+                      clock-names = "master", "sleep", "mock_utmi";
-+                      ranges;
-+                      status = "disabled";
-+
-+                      dwc3@8a00000 {
-+                              compatible = "snps,dwc3";
-+                              reg = <0x8a00000 0xf8000>;
-+                              interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
-+                              phys = <&usb3_hs_phy>, <&usb3_ss_phy>;
-+                              phy-names = "usb2-phy", "usb3-phy";
-+                              dr_mode = "host";
-+                      };
-+              };
-+
-+              usb2_hs_phy: hsphy@a8000 {
-+                      compatible = "qcom,usb-hs-ipq4019-phy";
-+                      #phy-cells = <0>;
-+                      reg = <0xa8000 0x40>;
-+                      reg-names = "phy_base";
-+                      resets = <&gcc USB2_HSPHY_POR_ARES>, <&gcc USB2_HSPHY_S_ARES>;
-+                      reset-names = "por_rst", "srif_rst";
-+                      status = "disabled";
-+              };
-+
-+              usb2: usb2@60f8800 {
-+                      compatible = "qcom,dwc3";
-+                      reg = <0x60f8800 0x100>;
-+                      #address-cells = <1>;
-+                      #size-cells = <1>;
-+                      clocks = <&gcc GCC_USB2_MASTER_CLK>,
-+                               <&gcc GCC_USB2_SLEEP_CLK>,
-+                               <&gcc GCC_USB2_MOCK_UTMI_CLK>;
-+                      clock-names = "master", "sleep", "mock_utmi";
-+                      ranges;
-+                      status = "disabled";
-+
-+                      dwc3@6000000 {
-+                              compatible = "snps,dwc3";
-+                              reg = <0x6000000 0xf8000>;
-+                              interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
-+                              phys = <&usb2_hs_phy>;
-+                              phy-names = "usb2-phy";
-+                              dr_mode = "host";
-+                      };
-+              };
-       };
- };
diff --git a/target/linux/ipq40xx/patches-5.10/103-arm-dts-qcom-ipq4019-add-more-labels.patch b/target/linux/ipq40xx/patches-5.10/103-arm-dts-qcom-ipq4019-add-more-labels.patch
deleted file mode 100644 (file)
index 0e215ee..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From caa3ee6b094ee18021943504c938919fcac325ec Mon Sep 17 00:00:00 2001
-From: Robert Marko <robert.marko@sartura.hr>
-Date: Wed, 9 Sep 2020 20:40:33 +0200
-Subject: [PATCH] arm: dts: qcom: ipq4019: add more labels
-
-Lets add labels to more commonly used nodes for easier modification in board DTS files.
-
-Signed-off-by: Robert Marko <robert.marko@sartura.hr>
-Cc: Luka Perkov <luka.perkov@sartura.hr>
----
- arch/arm/boot/dts/qcom-ipq4019.dtsi | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
-+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
-@@ -190,7 +190,7 @@
-                       reg = <0x1800000 0x60000>;
-               };
--              rng@22000 {
-+              prng: rng@22000 {
-                       compatible = "qcom,prng";
-                       reg = <0x22000 0x140>;
-                       clocks = <&gcc GCC_PRNG_AHB_CLK>;
-@@ -310,7 +310,7 @@
-                       status = "disabled";
-               };
--              crypto@8e3a000 {
-+              crypto: crypto@8e3a000 {
-                       compatible = "qcom,crypto-v5.1";
-                       reg = <0x08e3a000 0x6000>;
-                       clocks = <&gcc GCC_CRYPTO_AHB_CLK>,
-@@ -396,7 +396,7 @@
-                       dma-names = "rx", "tx";
-               };
--              watchdog@b017000 {
-+              watchdog: watchdog@b017000 {
-                       compatible = "qcom,kpss-wdt", "qcom,kpss-wdt-ipq4019";
-                       reg = <0xb017000 0x40>;
-                       clocks = <&sleep_clk>;