From fec22cfa59b34efeb2dc00eda15262a2982aa6b4 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Sun, 12 Sep 2021 22:34:43 +0200 Subject: [PATCH] ipq40xx: 5.10: replace patches with upstreamed versions 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 --- ...-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch} | 8 +++++--- ...v5.12-ARM-dts-qcom-ipq4019-add-more-labels.patch} | 12 +++++++----- ...-dts-qcom-ipq4019-add-SDHCI-VQMMC-LDO-node.patch} | 9 ++++++--- 3 files changed, 18 insertions(+), 11 deletions(-) rename target/linux/ipq40xx/patches-5.10/{102-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch => 0001-v5.12-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch} (91%) rename target/linux/ipq40xx/patches-5.10/{103-arm-dts-qcom-ipq4019-add-more-labels.patch => 0002-v5.12-ARM-dts-qcom-ipq4019-add-more-labels.patch} (74%) rename target/linux/ipq40xx/patches-5.10/{101-arm-dts-IPQ4019-add-SDHCI-VQMMC-LDO-node.patch => 0003-v5.12-ARM-dts-qcom-ipq4019-add-SDHCI-VQMMC-LDO-node.patch} (71%) 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/0001-v5.12-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch similarity index 91% rename from target/linux/ipq40xx/patches-5.10/102-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch rename to target/linux/ipq40xx/patches-5.10/0001-v5.12-ARM-dts-qcom-ipq4019-add-USB-devicetree-nodes.patch index b033a1baee5..890611387c2 100644 --- a/target/linux/ipq40xx/patches-5.10/102-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 @@ -1,6 +1,6 @@ -From 193856b5fe11c50a0b6ff22457dd674c1a45fec6 Mon Sep 17 00:00:00 2001 +From b8afc254b40167fd37b4d4263e750dab1f9ef157 Mon Sep 17 00:00:00 2001 From: John Crispin -Date: Wed, 9 Sep 2020 18:31:03 +0200 +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. @@ -9,13 +9,15 @@ Signed-off-by: John Crispin Signed-off-by: Robert Marko Cc: Luka Perkov Reviewed-by: Vinod Koul +Link: https://lore.kernel.org/r/20200909163831.1894142-1-robert.marko@sartura.hr +Signed-off-by: Bjorn Andersson --- 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 @@ +@@ -605,5 +605,79 @@ reg = <4>; }; }; 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/0002-v5.12-ARM-dts-qcom-ipq4019-add-more-labels.patch similarity index 74% rename from target/linux/ipq40xx/patches-5.10/103-arm-dts-qcom-ipq4019-add-more-labels.patch rename to target/linux/ipq40xx/patches-5.10/0002-v5.12-ARM-dts-qcom-ipq4019-add-more-labels.patch index 0e215ee7cf6..d623a9c7b30 100644 --- a/target/linux/ipq40xx/patches-5.10/103-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 @@ -1,12 +1,14 @@ -From caa3ee6b094ee18021943504c938919fcac325ec Mon Sep 17 00:00:00 2001 +From d1ae4c808e7802008225078d93fbadd4aeea1e2d Mon Sep 17 00:00:00 2001 From: Robert Marko -Date: Wed, 9 Sep 2020 20:40:33 +0200 -Subject: [PATCH] arm: dts: qcom: ipq4019: add more labels +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 Cc: Luka Perkov +Link: https://lore.kernel.org/r/20200909195640.3127341-2-robert.marko@sartura.hr +Signed-off-by: Bjorn Andersson --- arch/arm/boot/dts/qcom-ipq4019.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) @@ -22,7 +24,7 @@ Cc: Luka Perkov compatible = "qcom,prng"; reg = <0x22000 0x140>; clocks = <&gcc GCC_PRNG_AHB_CLK>; -@@ -310,7 +310,7 @@ +@@ -300,7 +300,7 @@ status = "disabled"; }; @@ -31,7 +33,7 @@ Cc: Luka Perkov compatible = "qcom,crypto-v5.1"; reg = <0x08e3a000 0x6000>; clocks = <&gcc GCC_CRYPTO_AHB_CLK>, -@@ -396,7 +396,7 @@ +@@ -386,7 +386,7 @@ dma-names = "rx", "tx"; }; 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/0003-v5.12-ARM-dts-qcom-ipq4019-add-SDHCI-VQMMC-LDO-node.patch similarity index 71% rename from target/linux/ipq40xx/patches-5.10/101-arm-dts-IPQ4019-add-SDHCI-VQMMC-LDO-node.patch rename to target/linux/ipq40xx/patches-5.10/0003-v5.12-ARM-dts-qcom-ipq4019-add-SDHCI-VQMMC-LDO-node.patch index 14affc28c1b..1d93fb800a5 100644 --- a/target/linux/ipq40xx/patches-5.10/101-arm-dts-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 @@ -1,12 +1,15 @@ -From 77d9b11ae7269dcf376c3b9493209f712524e986 Mon Sep 17 00:00:00 2001 +From e14775aa2feac18e7378cb8009b55c13d4236b50 Mon Sep 17 00:00:00 2001 From: Robert Marko -Date: Wed, 22 Jan 2020 12:56:35 +0100 -Subject: [PATCH] arm: dts: IPQ4019: add SDHCI VQMMC LDO node +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 +Cc: Luka Perkov +Link: https://lore.kernel.org/r/20200907101937.10155-1-robert.marko@sartura.hr +Signed-off-by: Bjorn Andersson --- arch/arm/boot/dts/qcom-ipq4019.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.30.2