Commit 0ece6438 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Bjorn Andersson

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: default avatarStephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20230911-msm8916-rmem-v1-7-b7089ec3e3a1@gerhold.netSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent b22bef3d
...@@ -242,6 +242,10 @@ &lpass_codec { ...@@ -242,6 +242,10 @@ &lpass_codec {
status = "okay"; status = "okay";
}; };
&mba_mem {
status = "okay";
};
&mdss { &mdss {
status = "okay"; status = "okay";
}; };
...@@ -257,6 +261,10 @@ &mpss { ...@@ -257,6 +261,10 @@ &mpss {
firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn"; firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn";
}; };
&mpss_mem {
status = "okay";
};
&pm8916_codec { &pm8916_codec {
status = "okay"; status = "okay";
qcom,mbhc-vthreshold-low = <75 150 237 450 500>; qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
...@@ -370,6 +378,10 @@ &venus { ...@@ -370,6 +378,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
firmware-name = "qcom/apq8016/wcnss.mbn"; firmware-name = "qcom/apq8016/wcnss.mbn";
...@@ -383,6 +395,10 @@ &wcnss_iris { ...@@ -383,6 +395,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
/* Enable CoreSight */ /* Enable CoreSight */
&cti0 { status = "okay"; }; &cti0 { status = "okay"; };
&cti1 { status = "okay"; }; &cti1 { status = "okay"; };
......
...@@ -395,3 +395,7 @@ &wcnss { ...@@ -395,3 +395,7 @@ &wcnss {
&wcnss_iris { &wcnss_iris {
compatible = "qcom,wcn3680"; compatible = "qcom,wcn3680";
}; };
&wcnss_mem {
status = "okay";
};
...@@ -159,6 +159,10 @@ &venus { ...@@ -159,6 +159,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -167,6 +171,10 @@ &wcnss_iris { ...@@ -167,6 +171,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
accel_int_default: accel-int-default-state { accel_int_default: accel-int-default-state {
pins = "gpio115"; pins = "gpio115";
......
...@@ -196,6 +196,10 @@ &venus { ...@@ -196,6 +196,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -204,6 +208,10 @@ &wcnss_iris { ...@@ -204,6 +208,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
accel_int_default: accel-int-default-state { accel_int_default: accel-int-default-state {
pins = "gpio31"; pins = "gpio31";
......
...@@ -164,6 +164,10 @@ &venus { ...@@ -164,6 +164,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -172,6 +176,10 @@ &wcnss_iris { ...@@ -172,6 +176,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
gpio_keys_default: gpio-keys-default-state { gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio117"; pins = "gpio107", "gpio117";
......
...@@ -154,6 +154,10 @@ &venus { ...@@ -154,6 +154,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -162,6 +166,10 @@ &wcnss_iris { ...@@ -162,6 +166,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
camera_flash_default: camera-flash-default-state { camera_flash_default: camera-flash-default-state {
pins = "gpio31", "gpio32"; pins = "gpio31", "gpio32";
......
...@@ -332,6 +332,10 @@ &venus { ...@@ -332,6 +332,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -340,6 +344,10 @@ &wcnss_iris { ...@@ -340,6 +344,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
accel_irq_default: accel-irq-default-state { accel_irq_default: accel-irq-default-state {
pins = "gpio115"; pins = "gpio115";
......
...@@ -268,6 +268,10 @@ &venus { ...@@ -268,6 +268,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -276,6 +280,10 @@ &wcnss_iris { ...@@ -276,6 +280,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
accel_int_default: accel-int-default-state { accel_int_default: accel-int-default-state {
pins = "gpio116"; pins = "gpio116";
......
...@@ -150,6 +150,10 @@ &venus { ...@@ -150,6 +150,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -158,6 +162,10 @@ &wcnss_iris { ...@@ -158,6 +162,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
button_backlight_default: button-backlight-default-state { button_backlight_default: button-backlight-default-state {
pins = "gpio17"; pins = "gpio17";
......
...@@ -292,6 +292,10 @@ &venus { ...@@ -292,6 +292,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&tlmm { &tlmm {
accel_int_default: accel-int-default-state { accel_int_default: accel-int-default-state {
pins = "gpio115"; pins = "gpio115";
......
...@@ -120,6 +120,10 @@ &wcnss_iris { ...@@ -120,6 +120,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
panel_vdd3_default: panel-vdd3-default-state { panel_vdd3_default: panel-vdd3-default-state {
pins = "gpio9"; pins = "gpio9";
......
...@@ -71,6 +71,10 @@ &wcnss_iris { ...@@ -71,6 +71,10 @@ &wcnss_iris {
compatible = "qcom,wcn3660b"; compatible = "qcom,wcn3660b";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
tkey_en_default: tkey-en-default-state { tkey_en_default: tkey-en-default-state {
pins = "gpio97"; pins = "gpio97";
......
...@@ -83,6 +83,10 @@ &wcnss_iris { ...@@ -83,6 +83,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
tkey_en_default: tkey-en-default-state { tkey_en_default: tkey-en-default-state {
pins = "gpio97"; pins = "gpio97";
......
...@@ -162,6 +162,10 @@ &venus { ...@@ -162,6 +162,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -170,6 +174,10 @@ &wcnss_iris { ...@@ -170,6 +174,10 @@ &wcnss_iris {
compatible = "qcom,wcn3660b"; compatible = "qcom,wcn3660b";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
accel_int_default: accel-int-default-state { accel_int_default: accel-int-default-state {
pins = "gpio115"; pins = "gpio115";
......
...@@ -167,6 +167,10 @@ &venus { ...@@ -167,6 +167,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -175,6 +179,10 @@ &wcnss_iris { ...@@ -175,6 +179,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
accel_int_default: accel-int-default-state { accel_int_default: accel-int-default-state {
pins = "gpio115"; pins = "gpio115";
......
...@@ -363,6 +363,10 @@ &venus { ...@@ -363,6 +363,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -371,6 +375,10 @@ &wcnss_iris { ...@@ -371,6 +375,10 @@ &wcnss_iris {
compatible = "qcom,wcn3660b"; compatible = "qcom,wcn3660b";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
fg_alert_default: fg-alert-default-state { fg_alert_default: fg-alert-default-state {
pins = "gpio121"; pins = "gpio121";
......
...@@ -80,12 +80,17 @@ &gcc { ...@@ -80,12 +80,17 @@ &gcc {
clocks = <&xo_board>, <&sleep_clk>, <0>, <0>, <0>, <0>, <0>; clocks = <&xo_board>, <&sleep_clk>, <0>, <0>, <0>, <0>, <0>;
}; };
&mba_mem {
status = "okay";
};
&mpss { &mpss {
status = "okay"; status = "okay";
}; };
&mpss_mem { &mpss_mem {
reg = <0x0 0x86800000 0x0 0x5500000>; reg = <0x0 0x86800000 0x0 0x5500000>;
status = "okay";
}; };
&pm8916_usbin { &pm8916_usbin {
...@@ -111,6 +116,10 @@ &venus { ...@@ -111,6 +116,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -119,6 +128,10 @@ &wcnss_iris { ...@@ -119,6 +128,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
/* pins are board-specific */ /* pins are board-specific */
button_default: button-default-state { button_default: button-default-state {
......
...@@ -193,6 +193,10 @@ &venus { ...@@ -193,6 +193,10 @@ &venus {
status = "okay"; status = "okay";
}; };
&venus_mem {
status = "okay";
};
&wcnss { &wcnss {
status = "okay"; status = "okay";
}; };
...@@ -201,6 +205,10 @@ &wcnss_iris { ...@@ -201,6 +205,10 @@ &wcnss_iris {
compatible = "qcom,wcn3620"; compatible = "qcom,wcn3620";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
camera_flash_default: camera-flash-default-state { camera_flash_default: camera-flash-default-state {
pins = "gpio31", "gpio32"; pins = "gpio31", "gpio32";
......
...@@ -86,6 +86,7 @@ mpss_mem: mpss@86800000 { ...@@ -86,6 +86,7 @@ mpss_mem: mpss@86800000 {
*/ */
reg = <0x0 0x86800000 0x0 0x2b00000>; reg = <0x0 0x86800000 0x0 0x2b00000>;
no-map; no-map;
status = "disabled";
}; };
wcnss_mem: wcnss { wcnss_mem: wcnss {
...@@ -93,6 +94,7 @@ wcnss_mem: wcnss { ...@@ -93,6 +94,7 @@ wcnss_mem: wcnss {
alignment = <0x0 0x100000>; alignment = <0x0 0x100000>;
alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
no-map; no-map;
status = "disabled";
}; };
venus_mem: venus { venus_mem: venus {
...@@ -100,6 +102,7 @@ venus_mem: venus { ...@@ -100,6 +102,7 @@ venus_mem: venus {
alignment = <0x0 0x100000>; alignment = <0x0 0x100000>;
alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
no-map; no-map;
status = "disabled";
}; };
mba_mem: mba { mba_mem: mba {
...@@ -107,6 +110,7 @@ mba_mem: mba { ...@@ -107,6 +110,7 @@ mba_mem: mba {
alignment = <0x0 0x100000>; alignment = <0x0 0x100000>;
alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
no-map; no-map;
status = "disabled";
}; };
}; };
......
...@@ -352,6 +352,10 @@ &wcnss_iris { ...@@ -352,6 +352,10 @@ &wcnss_iris {
compatible = "qcom,wcn3660b"; compatible = "qcom,wcn3660b";
}; };
&wcnss_mem {
status = "okay";
};
&tlmm { &tlmm {
accel_int_default: accel-int-default-state { accel_int_default: accel-int-default-state {
pins = "gpio115"; pins = "gpio115";
......
...@@ -91,3 +91,7 @@ &wcnss { ...@@ -91,3 +91,7 @@ &wcnss {
&wcnss_iris { &wcnss_iris {
compatible = "qcom,wcn3660"; compatible = "qcom,wcn3660";
}; };
&wcnss_mem {
status = "okay";
};
...@@ -358,6 +358,7 @@ mpss_mem: mpss@86800000 { ...@@ -358,6 +358,7 @@ mpss_mem: mpss@86800000 {
*/ */
reg = <0x0 0x86800000 0x0 0x5500000>; reg = <0x0 0x86800000 0x0 0x5500000>;
no-map; no-map;
status = "disabled";
}; };
wcnss_mem: wcnss { wcnss_mem: wcnss {
...@@ -365,6 +366,7 @@ wcnss_mem: wcnss { ...@@ -365,6 +366,7 @@ wcnss_mem: wcnss {
alignment = <0x0 0x100000>; alignment = <0x0 0x100000>;
alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
no-map; no-map;
status = "disabled";
}; };
venus_mem: venus { venus_mem: venus {
...@@ -372,6 +374,7 @@ venus_mem: venus { ...@@ -372,6 +374,7 @@ venus_mem: venus {
alignment = <0x0 0x100000>; alignment = <0x0 0x100000>;
alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
no-map; no-map;
status = "disabled";
}; };
mba_mem: mba { mba_mem: mba {
...@@ -379,6 +382,7 @@ mba_mem: mba { ...@@ -379,6 +382,7 @@ mba_mem: mba {
alignment = <0x0 0x100000>; alignment = <0x0 0x100000>;
alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; alloc-ranges = <0x0 0x86800000 0x0 0x8000000>;
no-map; no-map;
status = "disabled";
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment