2024-03-18 09:26:01

by Luca Weiss

[permalink] [raw]
Subject: [PATCH 0/2] Small fixes for MSM8974 SoC dtsi

One fix for dt schema validation, one for the /chosen node.

Signed-off-by: Luca Weiss <[email protected]>
---
Luca Weiss (2):
ARM: dts: qcom: msm8974: Add @0 to memory node name
ARM: dts: qcom: msm8974: Add empty chosen node

arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
base-commit: f6cef5f8c37f58a3bc95b3754c3ae98e086631ca
change-id: 20240318-msm8974-misc2-1fb92ae6bdf3

Best regards,
--
Luca Weiss <[email protected]>



2024-03-18 09:26:11

by Luca Weiss

[permalink] [raw]
Subject: [PATCH 2/2] ARM: dts: qcom: msm8974: Add empty chosen node

Add an empty /chosen node to the dtsi like is common on most other
Qualcomm SoC files, so that various pieces of software expecting this
node to exist don't complain.

Signed-off-by: Luca Weiss <[email protected]>
---
arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
index 00c6526a525d..2ec4ec4e5d2a 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
@@ -14,6 +14,8 @@ / {
#size-cells = <1>;
interrupt-parent = <&intc>;

+ chosen { };
+
clocks {
xo_board: xo_board {
compatible = "fixed-clock";

--
2.44.0


2024-03-18 09:26:27

by Luca Weiss

[permalink] [raw]
Subject: [PATCH 1/2] ARM: dts: qcom: msm8974: Add @0 to memory node name

Add the @0 from reg to the node name, so that both dtc warning and dt
validation failure get resolved.

arch/arm/boot/dts/qcom/qcom-msm8974.dtsi:106.9-109.4: Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name

[..]/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dtb: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 0]]}
from schema $id: http://devicetree.org/schemas/root-node.yaml#

Signed-off-by: Luca Weiss <[email protected]>
---
arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
index 5efc38d712cc..00c6526a525d 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
@@ -103,7 +103,7 @@ scm {
};
};

- memory {
+ memory@0 {
device_type = "memory";
reg = <0x0 0x0>;
};

--
2.44.0


2024-03-18 09:40:25

by Konrad Dybcio

[permalink] [raw]
Subject: Re: [PATCH 1/2] ARM: dts: qcom: msm8974: Add @0 to memory node name

On 18.03.2024 10:24, Luca Weiss wrote:
> Add the @0 from reg to the node name, so that both dtc warning and dt
> validation failure get resolved.
>
> arch/arm/boot/dts/qcom/qcom-msm8974.dtsi:106.9-109.4: Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name
>
> [..]/arch/arm/boot/dts/qcom/qcom-msm8974pro-fairphone-fp2.dtb: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 0]]}
> from schema $id: http://devicetree.org/schemas/root-node.yaml#
>
> Signed-off-by: Luca Weiss <[email protected]>
> ---

Looks like it's indeed the start of RAM

Reviewed-by: Konrad Dybcio <[email protected]>

Konrad

2024-03-18 09:41:18

by Konrad Dybcio

[permalink] [raw]
Subject: Re: [PATCH 2/2] ARM: dts: qcom: msm8974: Add empty chosen node

On 18.03.2024 10:24, Luca Weiss wrote:
> Add an empty /chosen node to the dtsi like is common on most other
> Qualcomm SoC files, so that various pieces of software expecting this
> node to exist don't complain.
>
> Signed-off-by: Luca Weiss <[email protected]>
> ---

Kinda weird dtc doesn't add it automatically or complain about its
absence at this point.. perhaps it could be taught about the latter

Reviewed-by: Konrad Dybcio <[email protected]>

Konrad

2024-04-08 01:38:07

by Bjorn Andersson

[permalink] [raw]
Subject: Re: [PATCH 0/2] Small fixes for MSM8974 SoC dtsi


On Mon, 18 Mar 2024 10:24:40 +0100, Luca Weiss wrote:
> One fix for dt schema validation, one for the /chosen node.
>
>

Applied, thanks!

[1/2] ARM: dts: qcom: msm8974: Add @0 to memory node name
commit: cad23ffd46e2205582f5a9e9014b3d78ec0256db
[2/2] ARM: dts: qcom: msm8974: Add empty chosen node
commit: 7018981366d496db4b7d5f6a5c2673683d2b1639

Best regards,
--
Bjorn Andersson <[email protected]>