Fix some small things in the qcom/msm8953.dtsi file to make dtbs_check
happier than before.
Signed-off-by: Luca Weiss <[email protected]>
---
Changes in v2:
- Expand on RAM address commit message (Stephan)
- Pick up tags
- Link to v1: https://lore.kernel.org/r/[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: 8c9660f6515396aba78d1168d2e17951d653ebf2
change-id: 20231015-msm8953-misc-fixes-87f373203f98
Best regards,
--
Luca Weiss <[email protected]>
The dtbs_check really doesn't like having memory without reg set.
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, let's pick one of the values, 0x10000000 which is used on devices
with 3.75 GiB RAM. Since the bootloader will update it to what's present
on the device it doesn't matter too much.
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.43.0
Use the qcom,domain property instead of the deprecated qcom,apr-domain,
which in turn also fixes a bunch of dtbs_checks warnings.
Reviewed-by: Krzysztof Kozlowski <[email protected]>
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.43.0
On Sat, Nov 25, 2023 at 01:19:27PM +0100, Luca Weiss wrote:
> The dtbs_check really doesn't like having memory without reg set.
>
> 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, let's pick one of the values, 0x10000000 which is used on devices
> with 3.75 GiB RAM. Since the bootloader will update it to what's present
> on the device it doesn't matter too much.
>
> 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 {
Wouldn't it be sufficient to add @0 here, to please dtbs_check?
Regards,
Bjorn
> + 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.43.0
>
On Sat, 25 Nov 2023 13:19:26 +0100, Luca Weiss wrote:
> Fix some small things in the qcom/msm8953.dtsi file to make dtbs_check
> happier than before.
>
>
Applied, thanks!
[2/2] arm64: dts: qcom: msm8953: Use non-deprecated qcom,domain in LPASS
commit: 2e0dcbf164fb02d2558bd08b9609a30ef5935912
Best regards,
--
Bjorn Andersson <[email protected]>
On Sonntag, 3. Dezember 2023 05:20:23 CET Bjorn Andersson wrote:
> On Sat, Nov 25, 2023 at 01:19:27PM +0100, Luca Weiss wrote:
> > The dtbs_check really doesn't like having memory without reg set.
> >
> > 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, let's pick one of the values, 0x10000000 which is used on devices
> > with 3.75 GiB RAM. Since the bootloader will update it to what's present
> > on the device it doesn't matter too much.
> >
> > 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 {
>
> Wouldn't it be sufficient to add @0 here, to please dtbs_check?
The checker itself also seems to be okay with memory@0 and no other change,
but there's this warning with W=1
arch/arm64/boot/dts/qcom/msm8953.dtsi:177.11-181.4: Warning (unique_unit_address_if_enabled): /memory@0: duplicate unit-address (also used in node /soc@0)
So probably we should still try to put it at a reasonable address like
0x10000000?
Regards
Luca
>
> Regards,
> Bjorn
>
> > + 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 {
On Sat, 25 Nov 2023 13:19:26 +0100, Luca Weiss wrote:
> Fix some small things in the qcom/msm8953.dtsi file to make dtbs_check
> happier than before.
>
>
Applied, thanks!
[1/2] arm64: dts: qcom: msm8953: Set initial address for memory
commit: 24187868e195202c67c38bcc3ae28f9c6a663fb4
Best regards,
--
Bjorn Andersson <[email protected]>