Skip to contentSkip to conversation

REVERT: arm64: dts: qcom: DTS updates

PATCH Applied Alex Elder 2 participants 3 messages Aug 2, 2021 – Aug 3, 2021

Subsystems (6)
lore
Share & tools
lore

Alex Elder

author
#0 lore raw

cover REVERT: arm64: dts: qcom: DTS updates

David, Jakub, I'd like for three patches merged into net-next to be reverted. Bjorn Andersson requested this without success a while back (and I followed up on his message).
https://lore.kernel.org/netdev/YPby3eJmDmNlESC8@yoga/
I'm now trying it this way, hoping this is the easiest way to get it done.

If you prefer doing this differently, please let me know how.

Thank you.

-Alex

Alex Elder (1):
Revert "Merge branch 'qcom-dts-updates'"

 .../devicetree/bindings/net/qcom,ipa.yaml     | 18 ++++----
 arch/arm64/boot/dts/qcom/sc7180.dtsi          |  5 ---
 arch/arm64/boot/dts/qcom/sc7280.dtsi          | 43 -------------------
 3 files changed, 8 insertions(+), 58 deletions(-)
Signature · 1 line
2.27.0
author
#1 lore raw

PATCH 1/1 Revert "Merge branch 'qcom-dts-updates'"

This reverts commit b79c6fba6cd7c49a7dbea9999e182f74cca63e19, reversing these changes made to 0ac26271344478ff718329fa9d4ef81d4bcbc43b:

commit 6a0eb6c9d934 ("dt-bindings: net: qcom,ipa: make imem interconnect
optional")
commit f8bd3c82bf7d ("arm64: dts: qcom: sc7280: add IPA information") commit fd0f72c34bd9 ("arm64: dts: qcom: sc7180: define ipa_fw_mem node")

I intend for these commits to go through the Qualcomm repository, to avoid conflicting with other activity being merged there.

---
 .../devicetree/bindings/net/qcom,ipa.yaml     | 18 ++++----
 arch/arm64/boot/dts/qcom/sc7180.dtsi          |  5 ---
 arch/arm64/boot/dts/qcom/sc7280.dtsi          | 43 -------------------
 3 files changed, 8 insertions(+), 58 deletions(-)
Documentation/devicetree/bindings/net/qcom,ipa.yaml +8 -10
index 4853ab7017bd9..ed88ba4b94df5 100644
@@ -87,18 +87,16 @@ properties:
       - const: ipa-setup-ready
 
   interconnects:
-    minItems: 2
     items:
-      - description: Path leading to system memory
-      - description: Path between the AP and IPA config space
-      - description: Path leading to internal memory
+      - description: Interconnect path between IPA and main memory
+      - description: Interconnect path between IPA and internal memory
+      - description: Interconnect path between IPA and the AP subsystem
 
   interconnect-names:
-    minItems: 2
     items:
       - const: memory
-      - const: config
       - const: imem
+      - const: config
 
   qcom,smem-states:
     $ref: /schemas/types.yaml#/definitions/phandle-array
@@ -209,11 +207,11 @@ examples:
 
                 interconnects =
                         <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_EBI1>,
-                        <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>,
-                        <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>;
+                        <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>,
+                        <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>;
                 interconnect-names = "memory",
-                                     "config",
-                                     "imem";
+                                     "imem",
+                                     "config";
 
                 qcom,smem-states = <&ipa_smp2p_out 0>,
                                    <&ipa_smp2p_out 1>;
arch/arm64/boot/dts/qcom/sc7180.dtsi +0 -5
index 7e0ff917e548c..a9a052f8c63c8 100644
@@ -110,11 +110,6 @@ tz_mem: memory@80b00000 {
 			no-map;
 		};
 
-		ipa_fw_mem: memory@8b700000 {
-			reg = <0 0x8b700000 0 0x10000>;
-			no-map;
-		};
-
 		rmtfs_mem: memory@94600000 {
 			compatible = "qcom,rmtfs-mem";
 			reg = <0x0 0x94600000 0x0 0x200000>;
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -43

61 lines not on this page · raw message

Signature · 1 line
2.27.0
#2 lore raw
In reply to Alex Elder
This patch was applied to netdev/net-next.git (refs/heads/master):

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

Quoted 8 lines · On Mon, 2 Aug 2021 18:30:18 -0500 you wrote:

David, Jakub, I'd like for three patches merged into net-next to be reverted. Bjorn Andersson requested this without success a while back (and I followed up on his message).
https://lore.kernel.org/netdev/YPby3eJmDmNlESC8@yoga/
I'm now trying it this way, hoping this is the easiest way to get it done.

[...]

Here is the summary with links:
- [net-next,1/1] Revert "Merge branch 'qcom-dts-updates'"

    https://git.kernel.org/netdev/net-next/c/a0221a0f9ba5

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html