arm64: dts: qcom: msm8916/39: Disable unneeded firmware reservations

Now that we no longer have fixed addresses for the firmware memory
regions, disable them by default and only enable them together with
the actual user in the board DT.

This frees up unnecessary reserved memory for boards that do not use
some of the remoteprocs and allows moving selected device-specific
properties (such as firmware size) to the board-specific DT part in
the next step.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20230911-msm8916-rmem-v1-7-b7089ec3e3a1@gerhold.net
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 336287c5da9e51182a1c5160b655bf7c722fb0ff..0fcf341f735bfa11df4764a263e3d2dc44a80bef 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -242,6 +242,10 @@
        status = "okay";
 };
 
+&mba_mem {
+       status = "okay";
+};
+
 &mdss {
        status = "okay";
 };
@@ -257,6 +261,10 @@
        firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn";
 };
 
+&mpss_mem {
+       status = "okay";
+};
+
 &pm8916_codec {
        status = "okay";
        qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
@@ -370,6 +378,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
        firmware-name = "qcom/apq8016/wcnss.mbn";
@@ -383,6 +395,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 /* Enable CoreSight */
 &cti0 { status = "okay"; };
 &cti1 { status = "okay"; };

diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
index f591d6e78d6e83433d159a60346a1b2296cb96ef..4f82bb668616f942d65f59a6f418cf38f404df32 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts
+++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
@@ -395,3 +395,7 @@
 &wcnss_iris {
        compatible = "qcom,wcn3680";
 };
+
+&wcnss_mem {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
index 1d1af1260938dc7796ee580d7029e8b10538cc98..57a74eea1005a317356e9f79528d20e8a8ad6214 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
@@ -159,6 +159,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -167,6 +171,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio115";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index e130f19fdccfee1f130bd9f783439ffc072a2ff3..aa4c1ab1e6737f81cc7590dddaf4b57705e2f01d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -196,6 +196,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -204,6 +208,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio31";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index 6f38e765ed3c6953cf0dd97f8585789478250d9a..a8be6ff66893f3afd41424b82fe34c6daf1b69c4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -164,6 +164,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -172,6 +176,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        gpio_keys_default: gpio-keys-default-state {
                pins = "gpio107", "gpio117";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
index 1d11139586256c4ba891a7f63dbd77594615bde2..b748d140b52e9578b7c66dd7f9518145d5739af4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
@@ -154,6 +154,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -162,6 +166,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        camera_flash_default: camera-flash-default-state {
                pins = "gpio31", "gpio32";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index c46df67b4d106edacabe0a50cd691c71bb986c55..bf7fc89dd106f670e7cda270c7284a6a3d7d052d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -332,6 +332,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -340,6 +344,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        accel_irq_default: accel-irq-default-state {
                pins = "gpio115";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index 503155aefa55dcd62c5ffcb78d039d194e5cbaac..47d1c5cb13f4ee3d8a13f92cd9cc64641aebd176 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -268,6 +268,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -276,6 +280,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio116";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index 919677969b3eed578808010eac6180b9fe8dc351..41cadb906b98cc5193b4a21b19f3824be0f1da05 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -150,6 +150,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -158,6 +162,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        button_backlight_default: button-backlight-default-state {
                pins = "gpio17";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 15d2486cdb4538f74d004eb11fce4acd4f816bd1..0b29132b74e1da1cec11efb9cd2e90df168790c9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -292,6 +292,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio115";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
index e5a569698c4f222209802767968471067d70034b..f5a8083695182a12dc3de23edd7e52a9b6d9920b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
@@ -120,6 +120,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        panel_vdd3_default: panel-vdd3-default-state {
                pins = "gpio9";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
index 388482a1e3d9fa7d8c5f1c61b160774efcc3334f..391befa22bb42757bbb5982ff03dc437c6c6139c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
@@ -71,6 +71,10 @@
        compatible = "qcom,wcn3660b";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        tkey_en_default: tkey-en-default-state {
                pins = "gpio97";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
index 6f65fd4b3ed3be2a8d37486f92f8e2917d754042..0824ab041d805d80ead62addaedbfc6ff5802eef 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
@@ -83,6 +83,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        tkey_en_default: tkey-en-default-state {
                pins = "gpio97";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index 06602db25e5f494b90c6e9bf721c29f3f1157767..c19cf20d74272c38f58e497cb15ac8b02a635933 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -162,6 +162,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -170,6 +174,10 @@
        compatible = "qcom,wcn3660b";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio115";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
index c18d234fb9fe26dde992e90613905f358917a045..fe59be3505fe1b4c69751ebb056eaeb3de77d217 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
@@ -167,6 +167,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -175,6 +179,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio115";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index 286ba7bb2b5a08bb001ae6d068a246d1863dbe45..68da2a2d30774d2b5fd81cd55f57e33818a55e9e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -363,6 +363,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -371,6 +375,10 @@
        compatible = "qcom,wcn3660b";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        fg_alert_default: fg-alert-default-state {
                pins = "gpio121";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
index 1d92c2e57216a237c32b3bb72be85718bab931d1..c77ed04bb6c36dbc0cb7c0b09f50d1f18aafa4c9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
@@ -80,12 +80,17 @@
        clocks = <&xo_board>, <&sleep_clk>, <0>, <0>, <0>, <0>, <0>;
 };
 
+&mba_mem {
+       status = "okay";
+};
+
 &mpss {
        status = "okay";
 };
 
 &mpss_mem {
        reg = <0x0 0x86800000 0x0 0x5500000>;
+       status = "okay";
 };
 
 &pm8916_usbin {
@@ -111,6 +116,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -119,6 +128,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        /* pins are board-specific */
        button_default: button-default-state {

diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index 82ed50610b24bf15886c4a0332cf2c5dcab93065..419f35c1fc92ed4a3a39e80aca75381cfced7087 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -193,6 +193,10 @@
        status = "okay";
 };
 
+&venus_mem {
+       status = "okay";
+};
+
 &wcnss {
        status = "okay";
 };
@@ -201,6 +205,10 @@
        compatible = "qcom,wcn3620";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        camera_flash_default: camera-flash-default-state {
                pins = "gpio31", "gpio32";

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 018e662aebe6d0300ab186f5d3389d12b9662f6e..563709d95c0d1e4b48731c09a3e2e539693464c4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -86,6 +86,7 @@
                         */
                        reg = <0x0 0x86800000 0x0 0x2b00000>;
                        no-map;
+                       status = "disabled";
                };
 
                wcnss_mem: wcnss {
@@ -93,6 +94,7 @@
                        alignment = <0x0 0x100000>;
                        alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
                        no-map;
+                       status = "disabled";
                };
 
                venus_mem: venus {
@@ -100,6 +102,7 @@
                        alignment = <0x0 0x100000>;
                        alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
                        no-map;
+                       status = "disabled";
                };
 
                mba_mem: mba {
@@ -107,6 +110,7 @@
                        alignment = <0x0 0x100000>;
                        alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
                        no-map;
+                       status = "disabled";
                };
        };
 

diff --git a/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts b/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts
index ba652909d162cdd5305d09a2da53579c010212c6..fccd8fec8b8f7cd43574ad52ea4dec0fd4a250cb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts
@@ -352,6 +352,10 @@
        compatible = "qcom,wcn3660b";
 };
 
+&wcnss_mem {
+       status = "okay";
+};
+
 &tlmm {
        accel_int_default: accel-int-default-state {
                pins = "gpio115";

diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
index cb893345c44b32539034b4e21e653d1d7a2d945f..eeb4d578c6fabe68c9d4e44b96be36ea67ff460c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
+++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
@@ -91,3 +91,7 @@
 &wcnss_iris {
        compatible = "qcom,wcn3660";
 };
+
+&wcnss_mem {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi
index ebea6de1177b7f0badc36d924d3ba3af998a7634..c50f6d828fedc8d9352cc1dd7386995e494f0339 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8939.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi
@@ -358,6 +358,7 @@
                         */
                        reg = <0x0 0x86800000 0x0 0x5500000>;
                        no-map;
+                       status = "disabled";
                };
 
                wcnss_mem: wcnss {
@@ -365,6 +366,7 @@
                        alignment = <0x0 0x100000>;
                        alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
                        no-map;
+                       status = "disabled";
                };
 
                venus_mem: venus {
@@ -372,6 +374,7 @@
                        alignment = <0x0 0x100000>;
                        alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
                        no-map;
+                       status = "disabled";
                };
 
                mba_mem: mba {
@@ -379,6 +382,7 @@
                        alignment = <0x0 0x100000>;
                        alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
                        no-map;
+                       status = "disabled";
                };
        };