Skip to contentSkip to conversation

arm64: qcom: fix dtbs_check warning

PATCH In review Vinod Koul 2 participants 24 messages Mar 8, 2021 – Mar 10, 2021

Subsystems (3)
lore
Share & tools
lore

Vinod Koul

author
#0 lore raw

cover arm64: qcom: fix dtbs_check warning

qcom dts folder shows a bunch of dtbs_check warning, this is an attempt to fix some of them.

Many are due to txt binding which should be fixed when we have the yaml binding documents. Few of them are fixed as below with missing nodes names, not properly using nodes.

Vinod Koul (18):
arm64: qcom: apq8016-sbc: drop qcom,sbc
arm64: qcom: msm8916: don't use empty memory node
dt-bindings: arm: qcom: Document ipq6018-cp01 board
arm64: qcom: msm8994: don't use empty memory node
dt-bindings: arm: qcom: Document sony boards for apq8094
dt-bindings: arm: qcom: Document alcatel,idol347 board
dt-bindings: arm: qcom: Drop qcom,mtp
arm64: qcom: msm8994: don't use underscore in node name
arm64: qcom: msm8996: don't use underscore in node name
arm64: qcom: sdm630: don't use underscore in node name
arm64: qcom: sdm660: don't use underscore in node name
arm64: qcom: msm8996: don't use empty memory node
arm64: qcom: msm8998: don't use empty memory node
arm64: qcom: sdm630: don't use empty memory node
arm64: qcom: sdm660: don't use empty memory node
arm64: qcom: ipq8074: fix pci node reg property
arm64: qcom: sdm660: use reg value for memory node
arm64: qcom: ipq6018: drop '0x' from unit address

 Documentation/devicetree/bindings/arm/qcom.yaml | 13 +++++++++++++
 arch/arm64/boot/dts/qcom/apq8016-sbc.dts        |  2 +-
 arch/arm64/boot/dts/qcom/ipq6018.dtsi           |  2 +-
 arch/arm64/boot/dts/qcom/ipq8074-hk01.dts       |  2 +-
 arch/arm64/boot/dts/qcom/ipq8074.dtsi           | 16 ++++++++--------
 arch/arm64/boot/dts/qcom/msm8916-mtp.dts        |  3 +--
 arch/arm64/boot/dts/qcom/msm8916.dtsi           |  4 ++--
 arch/arm64/boot/dts/qcom/msm8994.dtsi           |  8 ++++----
 arch/arm64/boot/dts/qcom/msm8996.dtsi           |  8 ++++----
 arch/arm64/boot/dts/qcom/msm8998.dtsi           |  4 ++--
 arch/arm64/boot/dts/qcom/sdm630.dtsi            |  8 ++++----
 arch/arm64/boot/dts/qcom/sdm660.dtsi            |  8 ++++----
 12 files changed, 45 insertions(+), 33 deletions(-)
Signature · 1 line
2.26.2
author
#1 lore raw

PATCH 1/18 arm64: qcom: apq8016-sbc: drop qcom,sbc

apq8016-sbc is one of the compaitibles for this board, but is not documented, so drop it. This fixes these two warns:

arch/arm64/boot/dts/qcom/apq8016-sbc.dt.yaml: /: compatible: ['qcom,apq8016-sbc', 'qcom,apq8016', 'qcom,sbc'] is not valid under any of the given schemas (Possible causes of the failure):

arch/arm64/boot/dts/qcom/apq8016-sbc.dt.yaml: /: compatible: ['qcom,apq8016-sbc', 'qcom,apq8016', 'qcom,sbc'] is too long arch/arm64/boot/dts/qcom/apq8016-sbc.dt.yaml: /: compatible:0: 'qcom,apq8016-sbc'
is not one of ['qcom,apq8064-cm-qs600', 'qcom,apq8064-ifc6410'] arch/arm64/boot/dts/qcom/apq8016-sbc.dt.yaml: /: compatible:0: 'qcom,apq8016-sbc'
is not one of ['qcom,apq8074-dragonboard']

---
 arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dts +1 -1
index 48bd1c2874de..f3c0dbfd0a23 100644
@@ -9,5 +9,5 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. APQ 8016 SBC";
-	compatible = "qcom,apq8016-sbc", "qcom,apq8016", "qcom,sbc";
+	compatible = "qcom,apq8016-sbc", "qcom,apq8016";
 };
Signature · 1 line
2.26.2
author
#2 lore raw

PATCH 2/18 arm64: qcom: msm8916: don't use empty memory node

In reply to Vinod Koul

We expect bootloader to full memory details but passing empty values gives warning, so add a default value

arch/arm64/boot/dts/qcom/apq8016-sbc.dt.yaml: /: memory:

	False schema does not allow {'device_type': ['memory'], 'reg': [[0, 0, 0, 0]]}
---
 arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +2 -2
index 5353da521974..4c155735fbc9 100644
@@ -25,10 +25,10 @@ aliases {
 
 	chosen { };
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		/* We expect the bootloader to fill in the reg */
-		reg = <0 0 0 0>;
+		reg = <0 0x80000000 0 0>;
 	};
 
 	reserved-memory {
Signature · 1 line
2.26.2
author
#3 lore raw

PATCH 3/18 dt-bindings: arm: qcom: Document ipq6018-cp01 board

In reply to Vinod Koul

Document the ipq6018-cp01 board. It was missing leading to warning:

arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dt.yaml: /: compatible: 'oneOf' conditional failed, one must be fixed:

        ['qcom,ipq6018-cp01', 'qcom,ipq6018'] is too short
        ['qcom,ipq6018-cp01', 'qcom,ipq6018'] is too long
        Additional items are not allowed ('qcom,ipq6018' was unexpected)
---
 Documentation/devicetree/bindings/arm/qcom.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/qcom.yaml +1 -0
index 174134f920e1..74610f1d1407 100644
@@ -176,6 +176,7 @@ properties:
 
       - items:
           - enum:
+              - qcom,ipq6018-cp01
               - qcom,ipq6018-cp01-c1
           - const: qcom,ipq6018
 
Signature · 1 line
2.26.2
author
#4 lore raw

PATCH 4/18 arm64: qcom: msm8994: don't use empty memory node

In reply to Vinod Koul

We expect bootloader to full memory details but passing empty values gives warning, so add a default value

arch/arm64/boot/dts/qcom/apq8094-sony-xperia-kitakami-karin_windy.dt.yaml: /: memory:

	False schema does not allow {'device_type': ['memory'], 'reg': [[0, 0, 0, 0]]}
---
 arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8994.dtsi +2 -2
index f49d442d2edf..f9f0b5aa6a26 100644
@@ -149,10 +149,10 @@ scm {
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		/* We expect the bootloader to fill in the reg */
-		reg = <0 0 0 0>;
+		reg = <0 0x80000000 0 0>;
 	};
 
 	tcsr_mutex: hwlock {
Signature · 1 line
2.26.2
author
#5 lore raw

PATCH 5/18 dt-bindings: arm: qcom: Document sony boards for apq8094

In reply to Vinod Koul

Document the various sony boards for apq8094. These are used in various sony dts files but not documented

---
 Documentation/devicetree/bindings/arm/qcom.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)
Documentation/devicetree/bindings/arm/qcom.yaml +10 -0
index 74610f1d1407..dc87238d411b 100644
@@ -136,6 +136,16 @@ properties:
               - samsung,a5u-eur
           - const: qcom,msm8916
 
+      - items:
+          - enum:
+              - sony,karin_windy
+              - sony,karin-row
+              - sony,satsuki-row
+              - sony,sumire-row
+              - sony,suzuran-row
+              - qcom,msm8994
+          - const: qcom,apq8094
+
       - items:
           - const: qcom,msm8996-mtp
 
Signature · 1 line
2.26.2
#6 lore raw

Re: [PATCH 05/18] dt-bindings: arm: qcom: Document sony boards for apq8094

Hi!

Quoted 4 lines
Documentation/devicetree/bindings/arm/qcom.yaml +2 -0
+      - items:
+          - enum:

Documentation/devicetree/bindings/arm/qcom.yaml properties: · line 150

Quoted 10 lines
Documentation/devicetree/bindings/arm/qcom.yaml +8 -0
+              - sony,karin_windy
+              - sony,karin-row
+              - sony,satsuki-row
+              - sony,sumire-row
+              - sony,suzuran-row
+              - qcom,msm8994
+          - const: qcom,apq8094
+
       - items:
           - const: qcom,msm8996-mtp

APQ8094 and MSM8994 are separate (though still very similar) SoCs, so they should probably have their own const:'s.

karin_windy is based on APQ and all the rest are based on MSM. Sorry for not having documented these when first adding support for them.

Konrad

author
#7 lore raw

PATCH 6/18 dt-bindings: arm: qcom: Document alcatel,idol347 board

In reply to Vinod Koul

Document the alcatel,idol347 board. It was missing leading to warning:

arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dt.yaml: /: compatible: 'oneOf' conditional failed, one must be fixed:
Additional items are not allowed ('qcom,msm8916' was unexpected)

---
 Documentation/devicetree/bindings/arm/qcom.yaml | 2 ++
 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/arm/qcom.yaml +2 -0
index dc87238d411b..7d97246dc379 100644
@@ -125,6 +125,8 @@ properties:
           - const: qcom,msm8974
 
       - items:
+          - enum:
+              - alcatel,idol347
           - const: qcom,msm8916-mtp/1
           - const: qcom,msm8916-mtp
           - const: qcom,msm8916
Signature · 1 line
2.26.2
#8 lore raw

Re: [PATCH 06/18] dt-bindings: arm: qcom: Document alcatel,idol347 board

Documentation/devicetree/bindings/arm/qcom.yaml properties: · line 132

Quoted 11 lines
Documentation/devicetree/bindings/arm/qcom.yaml +2 -0
@@ -125,6 +125,8 @@ properties:
           - const: qcom,msm8974
 
       - items:
+          - enum:
+              - alcatel,idol347
           - const: qcom,msm8916-mtp/1
           - const: qcom,msm8916-mtp
           - const: qcom,msm8916

qcom,msm8916-mtp/1 and -mtp are separate boards and therefore should probably also go into the enum.

Konrad

author
#9 lore raw

PATCH 7/18 dt-bindings: arm: qcom: Drop qcom,mtp

In reply to Vinod Koul

qcom,mtp is used msm8916-mtp.dts but not documented, it is a generic mtp compatible and we have specfifc ones for each mtp so drop this

arch/arm64/boot/dts/qcom/msm8916-mtp.dt.yaml: /: compatible: 'oneOf' conditional failed, one must be fixed:
['qcom,msm8916-mtp', 'qcom,msm8916-mtp/1', 'qcom,msm8916', 'qcom,mtp'] is too long Additional items are not allowed ('qcom,msm8916', 'qcom,mtp' were unexpected) Additional items are not allowed ('qcom,mtp' was unexpected)

---
 arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8916-mtp.dts +1 -2
index c3f885923127..d66c15538785 100644
@@ -9,6 +9,5 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. MSM 8916 MTP";
-	compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp/1",
-			"qcom,msm8916", "qcom,mtp";
+	compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp/1", "qcom,msm8916";
 };
Signature · 1 line
2.26.2
author
#10 lore raw

PATCH 8/18 arm64: qcom: msm8994: don't use underscore in node name

In reply to Vinod Koul

We have underscore (_) in node name leading to warning:
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon-cityman.dt.yaml: clocks: xo_board: {'type': 'object'} is not allowed for {'compatible': ['fixed-clock'], '#clock-cells': [[0]], 'clock-frequency': [[19200000]], 'phandle': [[26]]} arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon-cityman.dt.yaml: clocks: sleep_clk: {'type': 'object'} is not allowed for {'compatible': ['fixed-clock'], '#clock-cells': [[0]], 'clock-frequency': [[32768]]}

Fix this by changing node name to use dash (-)

---
 arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8994.dtsi +2 -2
index f9f0b5aa6a26..6596559a82b7 100644
@@ -15,13 +15,13 @@ / {
 	chosen { };
 
 	clocks {
-		xo_board: xo_board {
+		xo_board: xo-board {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <19200000>;
 		};
 
-		sleep_clk: sleep_clk {
+		sleep_clk: sleep-clk {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <32768>;
Signature · 1 line
2.26.2
author
#11 lore raw

PATCH 9/18 arm64: qcom: msm8996: don't use underscore in node name

In reply to Vinod Koul

We have underscore (_) in node name leading to warning:

arch/arm64/boot/dts/qcom/apq8096-db820c.dt.yaml: clocks: $nodename:0: 'clocks' does not match '^([a-z][a-z0-9\\-]+-bus|bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$'
arch/arm64/boot/dts/qcom/apq8096-db820c.dt.yaml: clocks: xo_board: {'type': 'object'} is not allowed for {'compatible': ['fixed-clock'], '#clock-cells': [[0]], 'clock-frequency': [[19200000]], 'clock-output-names': ['xo_board'], 'phandle': [[115]]}

Fix this by changing node name to use dash (-)

---
 arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +2 -2
index ce430ba9c118..957487f84ead 100644
@@ -17,14 +17,14 @@ / {
 	chosen { };
 
 	clocks {
-		xo_board: xo_board {
+		xo_board: xo-board {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <19200000>;
 			clock-output-names = "xo_board";
 		};
 
-		sleep_clk: sleep_clk {
+		sleep_clk: sleep-clk {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <32764>;
Signature · 1 line
2.26.2
author
#12 lore raw

PATCH 10/18 arm64: qcom: sdm630: don't use underscore in node name

In reply to Vinod Koul

We have underscore (_) in node name so fix that up as well.

Fix this by changing node name to use dash (-)

---
 arch/arm64/boot/dts/qcom/sdm630.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sdm630.dtsi +2 -2
index f91a928466c3..5a7cf85d0cf1 100644
@@ -17,14 +17,14 @@ / {
 	chosen { };
 
 	clocks {
-		xo_board: xo_board {
+		xo_board: xo-board {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <19200000>;
 			clock-output-names = "xo_board";
 		};
 
-		sleep_clk: sleep_clk {
+		sleep_clk: sleep-clk {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <32764>;
Signature · 1 line
2.26.2
author
#13 lore raw

PATCH 11/18 arm64: qcom: sdm660: don't use underscore in node name

In reply to Vinod Koul

We have underscore (_) in node name so fix that up as well.

Fix this by changing node name to use dash (-)

---
 arch/arm64/boot/dts/qcom/sdm660.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sdm660.dtsi +2 -2
index 4abbdd03d1e7..a1133f23593a 100644
@@ -16,14 +16,14 @@ / {
 	chosen { };
 
 	clocks {
-		xo_board: xo_board {
+		xo_board: xo-board {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <19200000>;
 			clock-output-names = "xo_board";
 		};
 
-		sleep_clk: sleep_clk {
+		sleep_clk: sleep-clk {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <32764>;
Signature · 1 line
2.26.2
#14 lore raw

Re: [PATCH 11/18] arm64: qcom: sdm660: don't use underscore in node name

Quoted 9 lines · Vinod Koul

We have underscore (_) in node name so fix that up as well.

Fix this by changing node name to use dash (-)

---
 arch/arm64/boot/dts/qcom/sdm660.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

We might want to omit

this one,

arm64: qcom: sdm660: don't use empty memory node,

and

arm64: qcom: sdm660: use reg value for memory node

as our huge-630/660-feature-drop patchset removes all of the nodes in question from sdm660.dtsi and will hopefully be merged in this window

Konrad

author
#15 lore raw

PATCH 12/18 arm64: qcom: msm8996: don't use empty memory node

In reply to Vinod Koul

We expect bootloader to full memory details but passing empty values can give warning, so add a default value

---
 arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +2 -2
index 957487f84ead..0e2df537fb69 100644
@@ -133,10 +133,10 @@ tcsr_mutex: hwlock {
 		#hwlock-cells = <1>;
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		/* We expect the bootloader to fill in the reg */
-		reg = <0 0 0 0>;
+		reg = <0x0 0x80000000 0x0 0x0>;
 	};
 
 	psci {
Signature · 1 line
2.26.2
Tested-by on v1 12/18
#16 lore raw

Re: [PATCH 12/18] arm64: qcom: msm8996: don't use empty memory node

Quoted 8 lines · Vinod Koul

We expect bootloader to full memory details but passing empty values can give warning, so add a default value

---
 arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

MSM8996 SONY Kagura boots.

author
#17 lore raw

PATCH 13/18 arm64: qcom: msm8998: don't use empty memory node

In reply to Vinod Koul

We expect bootloader to full memory details but passing empty values can give warning, so add a default value

---
 arch/arm64/boot/dts/qcom/msm8998.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8998.dtsi +2 -2
index 1f2e93aa6553..2949be4740f1 100644
@@ -18,10 +18,10 @@ / {
 
 	chosen { };
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		/* We expect the bootloader to fill in the reg */
-		reg = <0 0 0 0>;
+		reg = <0x0 0x80000000 0x0 0x0>;
 	};
 
 	reserved-memory {
Signature · 1 line
2.26.2
author
#18 lore raw

PATCH 14/18 arm64: qcom: sdm630: don't use empty memory node

In reply to Vinod Koul

We expect bootloader to full memory details but passing empty values can give warning, so add a default value

---
 arch/arm64/boot/dts/qcom/sdm630.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sdm630.dtsi +2 -2
index 5a7cf85d0cf1..23679b9e5e60 100644
@@ -311,10 +311,10 @@ scm {
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		/* We expect the bootloader to fill in the reg */
-		reg = <0 0 0 0>;
+		reg = <0x0 0x80000000 0x0 0x0>;
 	};
 
 	pmu {
Signature · 1 line
2.26.2
author
#20 lore raw

PATCH 15/18 arm64: qcom: sdm660: don't use empty memory node

In reply to Vinod Koul

We expect bootloader to full memory details but passing empty values can give warning, so add a default value

---
 arch/arm64/boot/dts/qcom/sdm660.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sdm660.dtsi +2 -2
index a1133f23593a..077abcb195ce 100644
@@ -208,10 +208,10 @@ scm {
 		};
 	};
 
-	memory {
+	memory@80000000 {
 		device_type = "memory";
 		/* We expect the bootloader to fill in the reg */
-		reg = <0 0 0 0>;
+		reg = <0x0 0x80000000 0x0 0x0>;
 	};
 
 	psci {
Signature · 1 line
2.26.2
author
#21 lore raw

PATCH 16/18 arm64: qcom: ipq8074: fix pci node reg property

In reply to Vinod Koul

reg property should be array of values, here it is a single array, leading to below warning:

arch/arm64/boot/dts/qcom/ipq8074-hk01.dt.yaml: soc: pci@10000000:reg:0: [268435456, 3869, 268439328, 168, 557056, 8192, 269484032, 4096] is too long arch/arm64/boot/dts/qcom/ipq8074-hk01.dt.yaml: soc: pci@10000000:ranges: 'oneOf' conditional failed, one must be fixed:
arch/arm64/boot/dts/qcom/ipq8074-hk01.dt.yaml: soc: pci@10000000:ranges: 'oneOf' conditional failed, one must be fixed:
[[2164260864, 0, 270532608, 270532608, 0, 1048576, 2181038080, 0, 271581184, 271581184, 0, 13631488]] is not of type 'null' [2164260864, 0, 270532608, 270532608, 0, 1048576, 2181038080, 0, 271581184, 271581184, 0, 13631488] is too long arch/arm64/boot/dts/qcom/ipq8074-hk01.dt.yaml: soc: pci@20000000:reg:0: [536870912, 3869, 536874784, 168, 524288, 8192, 537919488, 4096] is too long arch/arm64/boot/dts/qcom/ipq8074-hk01.dt.yaml: soc: pci@20000000:ranges: 'oneOf' conditional failed, one must be fixed:
arch/arm64/boot/dts/qcom/ipq8074-hk01.dt.yaml: soc: pci@20000000:ranges: 'oneOf' conditional failed, one must be fixed:
[[2164260864, 0, 538968064, 538968064, 0, 1048576, 2181038080, 0, 540016640, 540016640, 0, 13631488]] is not of type 'null' [2164260864, 0, 538968064, 538968064, 0, 1048576, 2181038080, 0, 540016640, 540016640, 0, 13631488] is too long

---
 arch/arm64/boot/dts/qcom/ipq8074.dtsi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/qcom/ipq8074.dtsi +8 -8
index a32e5e79ab0b..e8db62470b23 100644
@@ -567,10 +567,10 @@ frame@b128000 {
 
 		pcie1: pci@10000000 {
 			compatible = "qcom,pcie-ipq8074";
-			reg =  <0x10000000 0xf1d
-				0x10000f20 0xa8
-				0x00088000 0x2000
-				0x10100000 0x1000>;
+			reg =  <0x10000000 0xf1d>,
+			       <0x10000f20 0xa8>,
+			       <0x00088000 0x2000>,
+			       <0x10100000 0x1000>;
 			reg-names = "dbi", "elbi", "parf", "config";
 			device_type = "pci";
 			linux,pci-domain = <1>;
@@ -629,10 +629,10 @@ IRQ_TYPE_LEVEL_HIGH>, /* int_c */
 
 		pcie0: pci@20000000 {
 			compatible = "qcom,pcie-ipq8074";
-			reg =  <0x20000000 0xf1d
-				0x20000f20 0xa8
-				0x00080000 0x2000
-				0x20100000 0x1000>;
+			reg = <0x20000000 0xf1d>,
+			      <0x20000f20 0xa8>,
+			      <0x00080000 0x2000>,
+			      <0x20100000 0x1000>;
 			reg-names = "dbi", "elbi", "parf", "config";
 			device_type = "pci";
 			linux,pci-domain = <0>;
Signature · 1 line
2.26.2
author
#22 lore raw

PATCH 17/18 arm64: qcom: sdm660: use reg value for memory node

In reply to Vinod Koul

memory node like other node should be node@reg, which is missing in this case, so fix it up

arch/arm64/boot/dts/qcom/ipq8074-hk01.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 1073741824, 0, 536870912]]}

---
 arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/ipq8074-hk01.dts +1 -1
index e8c37a1693d3..cc08dc4eb56a 100644
@@ -20,7 +20,7 @@ chosen {
 		stdout-path = "serial0";
 	};
 
-	memory {
+	memory@40000000 {
 		device_type = "memory";
 		reg = <0x0 0x40000000 0x0 0x20000000>;
 	};
Signature · 1 line
2.26.2
author
#23 lore raw

PATCH 18/18 arm64: qcom: ipq6018: drop '0x' from unit address

In reply to Vinod Koul

Nodes need not contain '0x' for the unit address. Drop it to fix the below warning:

arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dt.yaml: reserved-memory:
'memory@0x60000' does not match any of the regexes

---
 arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +1 -1
index 9fa5b028e4f3..23ee1bfa4318 100644
@@ -151,7 +151,7 @@ reserved-memory {
 		#size-cells = <2>;
 		ranges;
 
-		rpm_msg_ram: memory@0x60000 {
+		rpm_msg_ram: memory@60000 {
 			reg = <0x0 0x60000 0x0 0x6000>;
 			no-map;
 		};
Signature · 1 line
2.26.2