arm64: dts: qcom: sdm850-yoga: Enable IPA

Shuffle memory regions to make firmware loading succeed and then enable
the ipa device.

Tested-by: Steev Klimaszewski <steev@kali.org>
Link: https://lore.kernel.org/r/20210615232816.835325-1-bjorn.andersson@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 1796ae8372be24c269dc94ff34cf749b1416be62..49624eadce8409e229bbe6ddcd92aa47326f91f7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -128,28 +128,23 @@
                        no-map;
                };
 
-               ipa_fw_mem: memory@8c400000 {
-                       reg = <0 0x8c400000 0 0x10000>;
+               wlan_msa_mem: memory@8c400000 {
+                       reg = <0 0x8c400000 0 0x100000>;
                        no-map;
                };
 
-               ipa_gsi_mem: memory@8c410000 {
-                       reg = <0 0x8c410000 0 0x5000>;
+               gpu_mem: memory@8c515000 {
+                       reg = <0 0x8c515000 0 0x2000>;
                        no-map;
                };
 
-               gpu_mem: memory@8c415000 {
-                       reg = <0 0x8c415000 0 0x2000>;
+               ipa_fw_mem: memory@8c517000 {
+                       reg = <0 0x8c517000 0 0x5a000>;
                        no-map;
                };
 
-               adsp_mem: memory@8c500000 {
-                       reg = <0 0x8c500000 0 0x1a00000>;
-                       no-map;
-               };
-
-               wlan_msa_mem: memory@8df00000 {
-                       reg = <0 0x8df00000 0 0x100000>;
+               adsp_mem: memory@8c600000 {
+                       reg = <0 0x8c600000 0 0x1a00000>;
                        no-map;
                };
 

diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
index c2a709a384e9ee833627bc1c34e69a65958e61d4..3eaa42dc3794ab27592bdb4a72a4771d33054402 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -415,6 +415,11 @@
        };
 };
 
+&ipa {
+       status = "okay";
+       memory-region = <&ipa_fw_mem>;
+};
+
 &mdss {
        status = "okay";
 };