Fix some small things in the qcom/msm8953.dtsi file to make dtbs_check
happier than before.
Signed-off-by: Luca Weiss <[email protected]>
---
Luca Weiss (2):
arm64: dts: qcom: msm8953: Set initial address for memory
arm64: dts: qcom: msm8953: Use non-deprecated qcom,domain in LPASS
arch/arm64/boot/dts/qcom/msm8953.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
base-commit: 2933a1156742d8c47550493a77af8e2d81cf3c84
change-id: 20231015-msm8953-misc-fixes-87f373203f98
Best regards,
--
Luca Weiss <[email protected]>
Use the qcom,domain property instead of the deprecated qcom,apr-domain,
which in turn also fixes a bunch of dtbs_checks warnings.
Signed-off-by: Luca Weiss <[email protected]>
---
arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
index a3ba24ca599b..8374f9af8273 100644
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -1645,7 +1645,7 @@ smd-edge {
apr {
compatible = "qcom,apr-v2";
qcom,smd-channels = "apr_audio_svc";
- qcom,apr-domain = <APR_DOMAIN_ADSP>;
+ qcom,domain = <APR_DOMAIN_ADSP>;
#address-cells = <1>;
#size-cells = <0>;
--
2.42.0
The dtbs_check really doesn't like having memory without reg set.
Address this by setting it to 0x10000000 which seems to be the value
filled in by the bootloader.
Signed-off-by: Luca Weiss <[email protected]>
---
arch/arm64/boot/dts/qcom/msm8953.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
index e7de7632669a..a3ba24ca599b 100644
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -174,10 +174,10 @@ scm: scm {
};
};
- memory {
+ memory@10000000 {
device_type = "memory";
/* We expect the bootloader to fill in the reg */
- reg = <0 0 0 0>;
+ reg = <0 0x10000000 0 0>;
};
pmu {
--
2.42.0
On 15/10/2023 22:26, Luca Weiss wrote:
> Use the qcom,domain property instead of the deprecated qcom,apr-domain,
> which in turn also fixes a bunch of dtbs_checks warnings.
>
> Signed-off-by: Luca Weiss <[email protected]>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
Best regards,
Krzysztof
On Sun, Oct 15, 2023 at 10:26:01PM +0200, Luca Weiss wrote:
> The dtbs_check really doesn't like having memory without reg set.
> Address this by setting it to 0x10000000 which seems to be the value
> filled in by the bootloader.
>
Looks like MSM8953 has the same RAM setup as MSM8916, where the base
address depends on the amount of RAM you have:
<= 2.00 GiB RAM: 0x80000000
= 3.00 GiB RAM: 0x40000000
= 3.75 GiB RAM: 0x10000000
(more does not fit into the 32-bit physical address space)
So, 0x10000000 will only end up being used on devices with 3.75 GiB RAM.
Can you add a note about this in the commit message maybe? We don't know
in advance which base address a device will use, so I think it's fine to
hardcode one of the choices by default. msm8916.dtsi does the same.
Thanks,
Stephan
> Signed-off-by: Luca Weiss <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/msm8953.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
> index e7de7632669a..a3ba24ca599b 100644
> --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
> @@ -174,10 +174,10 @@ scm: scm {
> };
> };
>
> - memory {
> + memory@10000000 {
> device_type = "memory";
> /* We expect the bootloader to fill in the reg */
> - reg = <0 0 0 0>;
> + reg = <0 0x10000000 0 0>;
> };
>
> pmu {
>
> --
> 2.42.0
>
On 10/16/23 09:37, Stephan Gerhold wrote:
> On Sun, Oct 15, 2023 at 10:26:01PM +0200, Luca Weiss wrote:
>> The dtbs_check really doesn't like having memory without reg set.
>> Address this by setting it to 0x10000000 which seems to be the value
>> filled in by the bootloader.
>>
>
> Looks like MSM8953 has the same RAM setup as MSM8916, where the base
> address depends on the amount of RAM you have:
>
> <= 2.00 GiB RAM: 0x80000000
> = 3.00 GiB RAM: 0x40000000
> = 3.75 GiB RAM: 0x10000000
What a royal mess
Konrad