[PATCH 1/3] arm64: dts: juno: Fix "debounce-interval" property misspelling

[PATCH 1/3] arm64: dts: juno: Fix "debounce-interval" property misspelling

[Sudeep Holla]

"debounce_interval" was never supported in the bindings. It should be
"debounce-interval". Moreover, latest DTC complains the following:

Warning (property_name_chars_strict): debounce_interval: Character '_' not recommended in property name

This patch fixes the above warning by using the correct property as
per the bindings.

Cc: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 69804c5f1197..4b38195a8bea 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -58,42 +58,42 @@
 				compatible = "gpio-keys";
 
 				power-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <116>;
 					label = "POWER";
 					gpios = <&iofpga_gpio0 0 0x4>;
 				};
 				home-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <102>;
 					label = "HOME";
 					gpios = <&iofpga_gpio0 1 0x4>;
 				};
 				rlock-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <152>;
 					label = "RLOCK";
 					gpios = <&iofpga_gpio0 2 0x4>;
 				};
 				vol-up-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <115>;
 					label = "VOL+";
 					gpios = <&iofpga_gpio0 3 0x4>;
 				};
 				vol-down-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <114>;
 					label = "VOL-";
 					gpios = <&iofpga_gpio0 4 0x4>;
 				};
 				nmi-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <99>;
 					label = "NMI";
-- 
2.7.4

[PATCH 1/3] arm64: dts: juno: Fix "debounce-interval" property misspelling

[Sudeep Holla]

"debounce_interval" was never supported in the bindings. It should be
"debounce-interval". Moreover, latest DTC complains the following:

Warning (property_name_chars_strict): debounce_interval: Character '_' not recommended in property name

This patch fixes the above warning by using the correct property as
per the bindings.

Cc: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 69804c5f1197..4b38195a8bea 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -58,42 +58,42 @@
 				compatible = "gpio-keys";
 
 				power-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <116>;
 					label = "POWER";
 					gpios = <&iofpga_gpio0 0 0x4>;
 				};
 				home-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <102>;
 					label = "HOME";
 					gpios = <&iofpga_gpio0 1 0x4>;
 				};
 				rlock-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <152>;
 					label = "RLOCK";
 					gpios = <&iofpga_gpio0 2 0x4>;
 				};
 				vol-up-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <115>;
 					label = "VOL+";
 					gpios = <&iofpga_gpio0 3 0x4>;
 				};
 				vol-down-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <114>;
 					label = "VOL-";
 					gpios = <&iofpga_gpio0 4 0x4>;
 				};
 				nmi-button {
-					debounce_interval = <50>;
+					debounce-interval = <50>;
 					wakeup-source;
 					linux,code = <99>;
 					label = "NMI";
-- 
2.7.4

[PATCH 2/3] arm64: dts: juno: replace '_' with '-' in node names

[Sudeep Holla]

The latest DTC throws warnings for character '_' in the node names.

Warning (node_name_chars_strict): /thermal-zones/big_cluster: Character '_' not recommended in node name
Warning (node_name_chars_strict): /thermal-zones/little_cluster: Character '_' not recommended in node name
Warning (node_name_chars_strict): /smb@8000000/motherboard/gpio_keys: Character '_' not recommended in node name
Warning (node_name_chars_strict): /pmu_a57: Character '_' not recommended in node name
Warning (node_name_chars_strict): /pmu_a53: Character '_' not recommended in node name

The general recommendation is to use character '-' for all the node names.
This patch fixes the warnings following the recommendation.

Cc: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm64/boot/dts/arm/juno-base.dtsi        | 4 ++--
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 +-
 arch/arm64/boot/dts/arm/juno-r1.dts           | 4 ++--
 arch/arm64/boot/dts/arm/juno-r2.dts           | 4 ++--
 arch/arm64/boot/dts/arm/juno.dts              | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index b2fedaab3fcc..b74e462c6658 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -572,14 +572,14 @@
 			thermal-sensors = <&scpi_sensors0 3>;
 		};
 
-		big_cluster_thermal_zone: big_cluster {
+		big_cluster_thermal_zone: big-cluster {
 			polling-delay = <1000>;
 			polling-delay-passive = <100>;
 			thermal-sensors = <&scpi_sensors0 21>;
 			status = "disabled";
 		};
 
-		little_cluster_thermal_zone: little_cluster {
+		little_cluster_thermal_zone: little-cluster {
 			polling-delay = <1000>;
 			polling-delay-passive = <100>;
 			thermal-sensors = <&scpi_sensors0 22>;
diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 4b38195a8bea..70e3409d86a3 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -54,7 +54,7 @@
 				regulator-always-on;
 			};
 
-			gpio_keys {
+			gpio-keys {
 				compatible = "gpio-keys";
 
 				power-button {
diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
index c52c5c40dede..2c5db03f226c 100644
--- a/arch/arm64/boot/dts/arm/juno-r1.dts
+++ b/arch/arm64/boot/dts/arm/juno-r1.dts
@@ -201,7 +201,7 @@
 		};
 	};
 
-	pmu_a57 {
+	pmu-a57 {
 		compatible = "arm,cortex-a57-pmu";
 		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
@@ -209,7 +209,7 @@
 				     <&A57_1>;
 	};
 
-	pmu_a53 {
+	pmu-a53 {
 		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
index a90982ceda35..c51950f4a1b6 100644
--- a/arch/arm64/boot/dts/arm/juno-r2.dts
+++ b/arch/arm64/boot/dts/arm/juno-r2.dts
@@ -201,7 +201,7 @@
 		};
 	};
 
-	pmu_a72 {
+	pmu-a72 {
 		compatible = "arm,cortex-a72-pmu";
 		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
@@ -209,7 +209,7 @@
 				     <&A72_1>;
 	};
 
-	pmu_a53 {
+	pmu-a53 {
 		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index c9236c4b967d..2b2bf39c30ef 100644
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -200,7 +200,7 @@
 		};
 	};
 
-	pmu_a57 {
+	pmu-a57 {
 		compatible = "arm,cortex-a57-pmu";
 		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
@@ -208,7 +208,7 @@
 				     <&A57_1>;
 	};
 
-	pmu_a53 {
+	pmu-a53 {
 		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
-- 
2.7.4

[PATCH 2/3] arm64: dts: juno: replace '_' with '-' in node names

[Sudeep Holla]

The latest DTC throws warnings for character '_' in the node names.

Warning (node_name_chars_strict): /thermal-zones/big_cluster: Character '_' not recommended in node name
Warning (node_name_chars_strict): /thermal-zones/little_cluster: Character '_' not recommended in node name
Warning (node_name_chars_strict): /smb at 8000000/motherboard/gpio_keys: Character '_' not recommended in node name
Warning (node_name_chars_strict): /pmu_a57: Character '_' not recommended in node name
Warning (node_name_chars_strict): /pmu_a53: Character '_' not recommended in node name

The general recommendation is to use character '-' for all the node names.
This patch fixes the warnings following the recommendation.

Cc: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm64/boot/dts/arm/juno-base.dtsi        | 4 ++--
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 +-
 arch/arm64/boot/dts/arm/juno-r1.dts           | 4 ++--
 arch/arm64/boot/dts/arm/juno-r2.dts           | 4 ++--
 arch/arm64/boot/dts/arm/juno.dts              | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index b2fedaab3fcc..b74e462c6658 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -572,14 +572,14 @@
 			thermal-sensors = <&scpi_sensors0 3>;
 		};
 
-		big_cluster_thermal_zone: big_cluster {
+		big_cluster_thermal_zone: big-cluster {
 			polling-delay = <1000>;
 			polling-delay-passive = <100>;
 			thermal-sensors = <&scpi_sensors0 21>;
 			status = "disabled";
 		};
 
-		little_cluster_thermal_zone: little_cluster {
+		little_cluster_thermal_zone: little-cluster {
 			polling-delay = <1000>;
 			polling-delay-passive = <100>;
 			thermal-sensors = <&scpi_sensors0 22>;
diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 4b38195a8bea..70e3409d86a3 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -54,7 +54,7 @@
 				regulator-always-on;
 			};
 
-			gpio_keys {
+			gpio-keys {
 				compatible = "gpio-keys";
 
 				power-button {
diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
index c52c5c40dede..2c5db03f226c 100644
--- a/arch/arm64/boot/dts/arm/juno-r1.dts
+++ b/arch/arm64/boot/dts/arm/juno-r1.dts
@@ -201,7 +201,7 @@
 		};
 	};
 
-	pmu_a57 {
+	pmu-a57 {
 		compatible = "arm,cortex-a57-pmu";
 		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
@@ -209,7 +209,7 @@
 				     <&A57_1>;
 	};
 
-	pmu_a53 {
+	pmu-a53 {
 		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
index a90982ceda35..c51950f4a1b6 100644
--- a/arch/arm64/boot/dts/arm/juno-r2.dts
+++ b/arch/arm64/boot/dts/arm/juno-r2.dts
@@ -201,7 +201,7 @@
 		};
 	};
 
-	pmu_a72 {
+	pmu-a72 {
 		compatible = "arm,cortex-a72-pmu";
 		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
@@ -209,7 +209,7 @@
 				     <&A72_1>;
 	};
 
-	pmu_a53 {
+	pmu-a53 {
 		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index c9236c4b967d..2b2bf39c30ef 100644
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -200,7 +200,7 @@
 		};
 	};
 
-	pmu_a57 {
+	pmu-a57 {
 		compatible = "arm,cortex-a57-pmu";
 		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
@@ -208,7 +208,7 @@
 				     <&A57_1>;
 	};
 
-	pmu_a53 {
+	pmu-a53 {
 		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
-- 
2.7.4

[PATCH 3/3] arm64: dts: juno/rtsm: re-structure motherboard includes

[Sudeep Holla]

It is a bit unorthodox to just include a file in the middle of a another
DTS file, it breaks the pattern from other device trees and also makes
it really hard to reference things across the files with phandles.

Restructure the include for the Juno/RTSM motherboards to happen at the
top of the file, reference the target nodes directly, and indent the
motherboard .dtsi files to reflect their actual depth in the hierarchy.

This is a purely syntactic change that result in the same DTB files from
the DTS/DTSI files. This is based on similar patch from Linus Walleij
for ARM Vexpress platforms.

Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm64/boot/dts/arm/juno-base.dtsi           | 3 +--
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi    | 4 ++++
 arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts       | 4 ++--
 arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 5 ++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

Hi,

Posting this patch with -b(aka ignore-spaces option for review purpose.

Regards,
Sudeep

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index b74e462c6658..ce56a4acda4f 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "juno-clocks.dtsi"
+#include "juno-motherboard.dtsi"
 
 / {
 	/*
@@ -795,8 +796,6 @@
 				<0 0 10 &gic 0 0 0 167 IRQ_TYPE_LEVEL_HIGH>,
 				<0 0 11 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>,
 				<0 0 12 &gic 0 0 0 169 IRQ_TYPE_LEVEL_HIGH>;
-
-		/include/ "juno-motherboard.dtsi"
 	};
 
 	site2: tlx@60000000 {
diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 70e3409d86a3..1792b074e9a3 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -7,6 +7,8 @@
  *
  */
 
+/ {
+	smb@8000000 {
 		mb_clk24mhz: clk24mhz {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
@@ -287,3 +289,5 @@
 				};
 			};
 		};
+	};
+};
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
index 06c8117e812a..602f63f72c37 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -12,6 +12,8 @@
 
 /memreserve/ 0x80000000 0x00010000;
 
+#include "rtsm_ve-motherboard.dtsi"
+
 / {
 	model = "RTSM_VE_AEMv8A";
 	compatible = "arm,rtsm_ve,aemv8a", "arm,vexpress";
@@ -162,7 +164,5 @@
 				<0 0 40 &gic 0 40 4>,
 				<0 0 41 &gic 0 41 4>,
 				<0 0 42 &gic 0 42 4>;
-
-		/include/ "rtsm_ve-motherboard.dtsi"
 	};
 };
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index 1134e5d8df18..d2dbc3f39263 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -7,7 +7,8 @@
  *
  * VEMotherBoard.lisa
  */
-
+/ {
+	smb@8000000 {
 		motherboard {
 			arm,v2m-memory-map = "rs1";
 			compatible = "arm,vexpress,v2m-p1", "simple-bus";
@@ -274,3 +275,5 @@
 				};
 			};
 		};
+	};
+};
-- 
2.7.4

[PATCH 3/3] arm64: dts: juno/rtsm: re-structure motherboard includes

[Sudeep Holla]

It is a bit unorthodox to just include a file in the middle of a another
DTS file, it breaks the pattern from other device trees and also makes
it really hard to reference things across the files with phandles.

Restructure the include for the Juno/RTSM motherboards to happen at the
top of the file, reference the target nodes directly, and indent the
motherboard .dtsi files to reflect their actual depth in the hierarchy.

This is a purely syntactic change that result in the same DTB files from
the DTS/DTSI files. This is based on similar patch from Linus Walleij
for ARM Vexpress platforms.

Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 arch/arm64/boot/dts/arm/juno-base.dtsi           | 3 +--
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi    | 4 ++++
 arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts       | 4 ++--
 arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 5 ++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

Hi,

Posting this patch with -b(aka ignore-spaces option for review purpose.

Regards,
Sudeep

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index b74e462c6658..ce56a4acda4f 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "juno-clocks.dtsi"
+#include "juno-motherboard.dtsi"
 
 / {
 	/*
@@ -795,8 +796,6 @@
 				<0 0 10 &gic 0 0 0 167 IRQ_TYPE_LEVEL_HIGH>,
 				<0 0 11 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>,
 				<0 0 12 &gic 0 0 0 169 IRQ_TYPE_LEVEL_HIGH>;
-
-		/include/ "juno-motherboard.dtsi"
 	};
 
 	site2: tlx at 60000000 {
diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 70e3409d86a3..1792b074e9a3 100644
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -7,6 +7,8 @@
  *
  */
 
+/ {
+	smb at 8000000 {
 		mb_clk24mhz: clk24mhz {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
@@ -287,3 +289,5 @@
 				};
 			};
 		};
+	};
+};
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
index 06c8117e812a..602f63f72c37 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -12,6 +12,8 @@
 
 /memreserve/ 0x80000000 0x00010000;
 
+#include "rtsm_ve-motherboard.dtsi"
+
 / {
 	model = "RTSM_VE_AEMv8A";
 	compatible = "arm,rtsm_ve,aemv8a", "arm,vexpress";
@@ -162,7 +164,5 @@
 				<0 0 40 &gic 0 40 4>,
 				<0 0 41 &gic 0 41 4>,
 				<0 0 42 &gic 0 42 4>;
-
-		/include/ "rtsm_ve-motherboard.dtsi"
 	};
 };
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index 1134e5d8df18..d2dbc3f39263 100644
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -7,7 +7,8 @@
  *
  * VEMotherBoard.lisa
  */
-
+/ {
+	smb at 8000000 {
 		motherboard {
 			arm,v2m-memory-map = "rs1";
 			compatible = "arm,vexpress,v2m-p1", "simple-bus";
@@ -274,3 +275,5 @@
 				};
 			};
 		};
+	};
+};
-- 
2.7.4

Re: [PATCH 2/3] arm64: dts: juno: replace '_' with '-' in node names

[Rob Herring]

On Wed, May 9, 2018 at 11:44 AM, Sudeep Holla <sudeep.holla@arm.com> wrote:
> The latest DTC throws warnings for character '_' in the node names.
>
> Warning (node_name_chars_strict): /thermal-zones/big_cluster: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /thermal-zones/little_cluster: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /smb@8000000/motherboard/gpio_keys: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /pmu_a57: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /pmu_a53: Character '_' not recommended in node name
>
> The general recommendation is to use character '-' for all the node names.
> This patch fixes the warnings following the recommendation.
>
> Cc: Liviu Dudau <liviu.dudau@arm.com>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  arch/arm64/boot/dts/arm/juno-base.dtsi        | 4 ++--
>  arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 +-
>  arch/arm64/boot/dts/arm/juno-r1.dts           | 4 ++--
>  arch/arm64/boot/dts/arm/juno-r2.dts           | 4 ++--
>  arch/arm64/boot/dts/arm/juno.dts              | 4 ++--
>  5 files changed, 9 insertions(+), 9 deletions(-)

Reviewed-by: Rob Herring <robh@kernel.org>

[PATCH 2/3] arm64: dts: juno: replace '_' with '-' in node names

[Rob Herring]

On Wed, May 9, 2018 at 11:44 AM, Sudeep Holla <sudeep.holla@arm.com> wrote:
> The latest DTC throws warnings for character '_' in the node names.
>
> Warning (node_name_chars_strict): /thermal-zones/big_cluster: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /thermal-zones/little_cluster: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /smb at 8000000/motherboard/gpio_keys: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /pmu_a57: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /pmu_a53: Character '_' not recommended in node name
>
> The general recommendation is to use character '-' for all the node names.
> This patch fixes the warnings following the recommendation.
>
> Cc: Liviu Dudau <liviu.dudau@arm.com>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  arch/arm64/boot/dts/arm/juno-base.dtsi        | 4 ++--
>  arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 +-
>  arch/arm64/boot/dts/arm/juno-r1.dts           | 4 ++--
>  arch/arm64/boot/dts/arm/juno-r2.dts           | 4 ++--
>  arch/arm64/boot/dts/arm/juno.dts              | 4 ++--
>  5 files changed, 9 insertions(+), 9 deletions(-)

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH 1/3] arm64: dts: juno: Fix "debounce-interval" property misspelling

[Liviu Dudau]

On Wed, May 09, 2018 at 05:44:49PM +0100, Sudeep Holla wrote:
> "debounce_interval" was never supported in the bindings. It should be
> "debounce-interval". Moreover, latest DTC complains the following:
> 
> Warning (property_name_chars_strict): debounce_interval: Character '_' not recommended in property name
> 
> This patch fixes the above warning by using the correct property as
> per the bindings.
> 
> Cc: Liviu Dudau <liviu.dudau@arm.com>

Acked-by: Liviu Dudau <liviu.dudau@arm.com>

> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> index 69804c5f1197..4b38195a8bea 100644
> --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> @@ -58,42 +58,42 @@
>  				compatible = "gpio-keys";
>  
>  				power-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <116>;
>  					label = "POWER";
>  					gpios = <&iofpga_gpio0 0 0x4>;
>  				};
>  				home-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <102>;
>  					label = "HOME";
>  					gpios = <&iofpga_gpio0 1 0x4>;
>  				};
>  				rlock-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <152>;
>  					label = "RLOCK";
>  					gpios = <&iofpga_gpio0 2 0x4>;
>  				};
>  				vol-up-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <115>;
>  					label = "VOL+";
>  					gpios = <&iofpga_gpio0 3 0x4>;
>  				};
>  				vol-down-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <114>;
>  					label = "VOL-";
>  					gpios = <&iofpga_gpio0 4 0x4>;
>  				};
>  				nmi-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <99>;
>  					label = "NMI";
> -- 
> 2.7.4
> 

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 1/3] arm64: dts: juno: Fix "debounce-interval" property misspelling

[Liviu Dudau]

On Wed, May 09, 2018 at 05:44:49PM +0100, Sudeep Holla wrote:
> "debounce_interval" was never supported in the bindings. It should be
> "debounce-interval". Moreover, latest DTC complains the following:
> 
> Warning (property_name_chars_strict): debounce_interval: Character '_' not recommended in property name
> 
> This patch fixes the above warning by using the correct property as
> per the bindings.
> 
> Cc: Liviu Dudau <liviu.dudau@arm.com>

Acked-by: Liviu Dudau <liviu.dudau@arm.com>

> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> index 69804c5f1197..4b38195a8bea 100644
> --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> @@ -58,42 +58,42 @@
>  				compatible = "gpio-keys";
>  
>  				power-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <116>;
>  					label = "POWER";
>  					gpios = <&iofpga_gpio0 0 0x4>;
>  				};
>  				home-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <102>;
>  					label = "HOME";
>  					gpios = <&iofpga_gpio0 1 0x4>;
>  				};
>  				rlock-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <152>;
>  					label = "RLOCK";
>  					gpios = <&iofpga_gpio0 2 0x4>;
>  				};
>  				vol-up-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <115>;
>  					label = "VOL+";
>  					gpios = <&iofpga_gpio0 3 0x4>;
>  				};
>  				vol-down-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <114>;
>  					label = "VOL-";
>  					gpios = <&iofpga_gpio0 4 0x4>;
>  				};
>  				nmi-button {
> -					debounce_interval = <50>;
> +					debounce-interval = <50>;
>  					wakeup-source;
>  					linux,code = <99>;
>  					label = "NMI";
> -- 
> 2.7.4
> 

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ?\_(?)_/?

Re: [PATCH 2/3] arm64: dts: juno: replace '_' with '-' in node names

[Liviu Dudau]

On Wed, May 09, 2018 at 05:44:50PM +0100, Sudeep Holla wrote:
> The latest DTC throws warnings for character '_' in the node names.
> 
> Warning (node_name_chars_strict): /thermal-zones/big_cluster: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /thermal-zones/little_cluster: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /smb@8000000/motherboard/gpio_keys: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /pmu_a57: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /pmu_a53: Character '_' not recommended in node name
> 
> The general recommendation is to use character '-' for all the node names.
> This patch fixes the warnings following the recommendation.
> 
> Cc: Liviu Dudau <liviu.dudau@arm.com>

Acked-by: Liviu Dudau <liviu.dudau@arm.com>

> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  arch/arm64/boot/dts/arm/juno-base.dtsi        | 4 ++--
>  arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 +-
>  arch/arm64/boot/dts/arm/juno-r1.dts           | 4 ++--
>  arch/arm64/boot/dts/arm/juno-r2.dts           | 4 ++--
>  arch/arm64/boot/dts/arm/juno.dts              | 4 ++--
>  5 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
> index b2fedaab3fcc..b74e462c6658 100644
> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
> @@ -572,14 +572,14 @@
>  			thermal-sensors = <&scpi_sensors0 3>;
>  		};
>  
> -		big_cluster_thermal_zone: big_cluster {
> +		big_cluster_thermal_zone: big-cluster {
>  			polling-delay = <1000>;
>  			polling-delay-passive = <100>;
>  			thermal-sensors = <&scpi_sensors0 21>;
>  			status = "disabled";
>  		};
>  
> -		little_cluster_thermal_zone: little_cluster {
> +		little_cluster_thermal_zone: little-cluster {
>  			polling-delay = <1000>;
>  			polling-delay-passive = <100>;
>  			thermal-sensors = <&scpi_sensors0 22>;
> diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> index 4b38195a8bea..70e3409d86a3 100644
> --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> @@ -54,7 +54,7 @@
>  				regulator-always-on;
>  			};
>  
> -			gpio_keys {
> +			gpio-keys {
>  				compatible = "gpio-keys";
>  
>  				power-button {
> diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
> index c52c5c40dede..2c5db03f226c 100644
> --- a/arch/arm64/boot/dts/arm/juno-r1.dts
> +++ b/arch/arm64/boot/dts/arm/juno-r1.dts
> @@ -201,7 +201,7 @@
>  		};
>  	};
>  
> -	pmu_a57 {
> +	pmu-a57 {
>  		compatible = "arm,cortex-a57-pmu";
>  		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
> @@ -209,7 +209,7 @@
>  				     <&A57_1>;
>  	};
>  
> -	pmu_a53 {
> +	pmu-a53 {
>  		compatible = "arm,cortex-a53-pmu";
>  		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
> diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
> index a90982ceda35..c51950f4a1b6 100644
> --- a/arch/arm64/boot/dts/arm/juno-r2.dts
> +++ b/arch/arm64/boot/dts/arm/juno-r2.dts
> @@ -201,7 +201,7 @@
>  		};
>  	};
>  
> -	pmu_a72 {
> +	pmu-a72 {
>  		compatible = "arm,cortex-a72-pmu";
>  		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
> @@ -209,7 +209,7 @@
>  				     <&A72_1>;
>  	};
>  
> -	pmu_a53 {
> +	pmu-a53 {
>  		compatible = "arm,cortex-a53-pmu";
>  		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
> diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
> index c9236c4b967d..2b2bf39c30ef 100644
> --- a/arch/arm64/boot/dts/arm/juno.dts
> +++ b/arch/arm64/boot/dts/arm/juno.dts
> @@ -200,7 +200,7 @@
>  		};
>  	};
>  
> -	pmu_a57 {
> +	pmu-a57 {
>  		compatible = "arm,cortex-a57-pmu";
>  		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
> @@ -208,7 +208,7 @@
>  				     <&A57_1>;
>  	};
>  
> -	pmu_a53 {
> +	pmu-a53 {
>  		compatible = "arm,cortex-a53-pmu";
>  		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
> -- 
> 2.7.4
> 

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/3] arm64: dts: juno: replace '_' with '-' in node names

[Liviu Dudau]

On Wed, May 09, 2018 at 05:44:50PM +0100, Sudeep Holla wrote:
> The latest DTC throws warnings for character '_' in the node names.
> 
> Warning (node_name_chars_strict): /thermal-zones/big_cluster: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /thermal-zones/little_cluster: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /smb at 8000000/motherboard/gpio_keys: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /pmu_a57: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /pmu_a53: Character '_' not recommended in node name
> 
> The general recommendation is to use character '-' for all the node names.
> This patch fixes the warnings following the recommendation.
> 
> Cc: Liviu Dudau <liviu.dudau@arm.com>

Acked-by: Liviu Dudau <liviu.dudau@arm.com>

> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  arch/arm64/boot/dts/arm/juno-base.dtsi        | 4 ++--
>  arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 2 +-
>  arch/arm64/boot/dts/arm/juno-r1.dts           | 4 ++--
>  arch/arm64/boot/dts/arm/juno-r2.dts           | 4 ++--
>  arch/arm64/boot/dts/arm/juno.dts              | 4 ++--
>  5 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
> index b2fedaab3fcc..b74e462c6658 100644
> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
> @@ -572,14 +572,14 @@
>  			thermal-sensors = <&scpi_sensors0 3>;
>  		};
>  
> -		big_cluster_thermal_zone: big_cluster {
> +		big_cluster_thermal_zone: big-cluster {
>  			polling-delay = <1000>;
>  			polling-delay-passive = <100>;
>  			thermal-sensors = <&scpi_sensors0 21>;
>  			status = "disabled";
>  		};
>  
> -		little_cluster_thermal_zone: little_cluster {
> +		little_cluster_thermal_zone: little-cluster {
>  			polling-delay = <1000>;
>  			polling-delay-passive = <100>;
>  			thermal-sensors = <&scpi_sensors0 22>;
> diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> index 4b38195a8bea..70e3409d86a3 100644
> --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> @@ -54,7 +54,7 @@
>  				regulator-always-on;
>  			};
>  
> -			gpio_keys {
> +			gpio-keys {
>  				compatible = "gpio-keys";
>  
>  				power-button {
> diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
> index c52c5c40dede..2c5db03f226c 100644
> --- a/arch/arm64/boot/dts/arm/juno-r1.dts
> +++ b/arch/arm64/boot/dts/arm/juno-r1.dts
> @@ -201,7 +201,7 @@
>  		};
>  	};
>  
> -	pmu_a57 {
> +	pmu-a57 {
>  		compatible = "arm,cortex-a57-pmu";
>  		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
> @@ -209,7 +209,7 @@
>  				     <&A57_1>;
>  	};
>  
> -	pmu_a53 {
> +	pmu-a53 {
>  		compatible = "arm,cortex-a53-pmu";
>  		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
> diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
> index a90982ceda35..c51950f4a1b6 100644
> --- a/arch/arm64/boot/dts/arm/juno-r2.dts
> +++ b/arch/arm64/boot/dts/arm/juno-r2.dts
> @@ -201,7 +201,7 @@
>  		};
>  	};
>  
> -	pmu_a72 {
> +	pmu-a72 {
>  		compatible = "arm,cortex-a72-pmu";
>  		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
> @@ -209,7 +209,7 @@
>  				     <&A72_1>;
>  	};
>  
> -	pmu_a53 {
> +	pmu-a53 {
>  		compatible = "arm,cortex-a53-pmu";
>  		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
> diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
> index c9236c4b967d..2b2bf39c30ef 100644
> --- a/arch/arm64/boot/dts/arm/juno.dts
> +++ b/arch/arm64/boot/dts/arm/juno.dts
> @@ -200,7 +200,7 @@
>  		};
>  	};
>  
> -	pmu_a57 {
> +	pmu-a57 {
>  		compatible = "arm,cortex-a57-pmu";
>  		interrupts = <GIC_SPI 02 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 06 IRQ_TYPE_LEVEL_HIGH>;
> @@ -208,7 +208,7 @@
>  				     <&A57_1>;
>  	};
>  
> -	pmu_a53 {
> +	pmu-a53 {
>  		compatible = "arm,cortex-a53-pmu";
>  		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
>  			     <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
> -- 
> 2.7.4
> 

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ?\_(?)_/?

Re: [PATCH 3/3] arm64: dts: juno/rtsm: re-structure motherboard includes

[Liviu Dudau]

On Wed, May 09, 2018 at 05:44:51PM +0100, Sudeep Holla wrote:
> It is a bit unorthodox to just include a file in the middle of a another
> DTS file, it breaks the pattern from other device trees and also makes
> it really hard to reference things across the files with phandles.
> 
> Restructure the include for the Juno/RTSM motherboards to happen at the
> top of the file, reference the target nodes directly, and indent the
> motherboard .dtsi files to reflect their actual depth in the hierarchy.
> 
> This is a purely syntactic change that result in the same DTB files from
> the DTS/DTSI files. This is based on similar patch from Linus Walleij
> for ARM Vexpress platforms.

A bit of bikeshedding here: the reason I've used the DT /include/
here was that on decompilation of the DTB the nodes would have been in
the natural order and easier to look for issues. Those were the early
days and I can accept that the general practice has changed and we're
using now the C preprocessor more. I don't have any strong feelings on
how the DT looks nowadays, so:

> 
> Cc: Liviu Dudau <liviu.dudau@arm.com>

Acked-by: Liviu Dudau <liviu.dudau@arm.com>

> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  arch/arm64/boot/dts/arm/juno-base.dtsi           | 3 +--
>  arch/arm64/boot/dts/arm/juno-motherboard.dtsi    | 4 ++++
>  arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts       | 4 ++--
>  arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 5 ++++-
>  4 files changed, 11 insertions(+), 5 deletions(-)
> 
> Hi,
> 
> Posting this patch with -b(aka ignore-spaces option for review purpose.
> 
> Regards,
> Sudeep
> 
> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
> index b74e462c6658..ce56a4acda4f 100644
> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
> @@ -1,5 +1,6 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include "juno-clocks.dtsi"
> +#include "juno-motherboard.dtsi"
>  
>  / {
>  	/*
> @@ -795,8 +796,6 @@
>  				<0 0 10 &gic 0 0 0 167 IRQ_TYPE_LEVEL_HIGH>,
>  				<0 0 11 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>,
>  				<0 0 12 &gic 0 0 0 169 IRQ_TYPE_LEVEL_HIGH>;
> -
> -		/include/ "juno-motherboard.dtsi"
>  	};
>  
>  	site2: tlx@60000000 {
> diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> index 70e3409d86a3..1792b074e9a3 100644
> --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> @@ -7,6 +7,8 @@
>   *
>   */
>  
> +/ {
> +	smb@8000000 {
>  		mb_clk24mhz: clk24mhz {
>  			compatible = "fixed-clock";
>  			#clock-cells = <0>;
> @@ -287,3 +289,5 @@
>  				};
>  			};
>  		};
> +	};
> +};
> diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
> index 06c8117e812a..602f63f72c37 100644
> --- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
> +++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
> @@ -12,6 +12,8 @@
>  
>  /memreserve/ 0x80000000 0x00010000;
>  
> +#include "rtsm_ve-motherboard.dtsi"
> +
>  / {
>  	model = "RTSM_VE_AEMv8A";
>  	compatible = "arm,rtsm_ve,aemv8a", "arm,vexpress";
> @@ -162,7 +164,5 @@
>  				<0 0 40 &gic 0 40 4>,
>  				<0 0 41 &gic 0 41 4>,
>  				<0 0 42 &gic 0 42 4>;
> -
> -		/include/ "rtsm_ve-motherboard.dtsi"
>  	};
>  };
> diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
> index 1134e5d8df18..d2dbc3f39263 100644
> --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
> @@ -7,7 +7,8 @@
>   *
>   * VEMotherBoard.lisa
>   */
> -
> +/ {
> +	smb@8000000 {
>  		motherboard {
>  			arm,v2m-memory-map = "rs1";
>  			compatible = "arm,vexpress,v2m-p1", "simple-bus";
> @@ -274,3 +275,5 @@
>  				};
>  			};
>  		};
> +	};
> +};
> -- 
> 2.7.4
> 

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 3/3] arm64: dts: juno/rtsm: re-structure motherboard includes

[Liviu Dudau]

On Wed, May 09, 2018 at 05:44:51PM +0100, Sudeep Holla wrote:
> It is a bit unorthodox to just include a file in the middle of a another
> DTS file, it breaks the pattern from other device trees and also makes
> it really hard to reference things across the files with phandles.
> 
> Restructure the include for the Juno/RTSM motherboards to happen at the
> top of the file, reference the target nodes directly, and indent the
> motherboard .dtsi files to reflect their actual depth in the hierarchy.
> 
> This is a purely syntactic change that result in the same DTB files from
> the DTS/DTSI files. This is based on similar patch from Linus Walleij
> for ARM Vexpress platforms.

A bit of bikeshedding here: the reason I've used the DT /include/
here was that on decompilation of the DTB the nodes would have been in
the natural order and easier to look for issues. Those were the early
days and I can accept that the general practice has changed and we're
using now the C preprocessor more. I don't have any strong feelings on
how the DT looks nowadays, so:

> 
> Cc: Liviu Dudau <liviu.dudau@arm.com>

Acked-by: Liviu Dudau <liviu.dudau@arm.com>

> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  arch/arm64/boot/dts/arm/juno-base.dtsi           | 3 +--
>  arch/arm64/boot/dts/arm/juno-motherboard.dtsi    | 4 ++++
>  arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts       | 4 ++--
>  arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 5 ++++-
>  4 files changed, 11 insertions(+), 5 deletions(-)
> 
> Hi,
> 
> Posting this patch with -b(aka ignore-spaces option for review purpose.
> 
> Regards,
> Sudeep
> 
> diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
> index b74e462c6658..ce56a4acda4f 100644
> --- a/arch/arm64/boot/dts/arm/juno-base.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
> @@ -1,5 +1,6 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include "juno-clocks.dtsi"
> +#include "juno-motherboard.dtsi"
>  
>  / {
>  	/*
> @@ -795,8 +796,6 @@
>  				<0 0 10 &gic 0 0 0 167 IRQ_TYPE_LEVEL_HIGH>,
>  				<0 0 11 &gic 0 0 0 168 IRQ_TYPE_LEVEL_HIGH>,
>  				<0 0 12 &gic 0 0 0 169 IRQ_TYPE_LEVEL_HIGH>;
> -
> -		/include/ "juno-motherboard.dtsi"
>  	};
>  
>  	site2: tlx at 60000000 {
> diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> index 70e3409d86a3..1792b074e9a3 100644
> --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
> @@ -7,6 +7,8 @@
>   *
>   */
>  
> +/ {
> +	smb at 8000000 {
>  		mb_clk24mhz: clk24mhz {
>  			compatible = "fixed-clock";
>  			#clock-cells = <0>;
> @@ -287,3 +289,5 @@
>  				};
>  			};
>  		};
> +	};
> +};
> diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
> index 06c8117e812a..602f63f72c37 100644
> --- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
> +++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
> @@ -12,6 +12,8 @@
>  
>  /memreserve/ 0x80000000 0x00010000;
>  
> +#include "rtsm_ve-motherboard.dtsi"
> +
>  / {
>  	model = "RTSM_VE_AEMv8A";
>  	compatible = "arm,rtsm_ve,aemv8a", "arm,vexpress";
> @@ -162,7 +164,5 @@
>  				<0 0 40 &gic 0 40 4>,
>  				<0 0 41 &gic 0 41 4>,
>  				<0 0 42 &gic 0 42 4>;
> -
> -		/include/ "rtsm_ve-motherboard.dtsi"
>  	};
>  };
> diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
> index 1134e5d8df18..d2dbc3f39263 100644
> --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
> @@ -7,7 +7,8 @@
>   *
>   * VEMotherBoard.lisa
>   */
> -
> +/ {
> +	smb at 8000000 {
>  		motherboard {
>  			arm,v2m-memory-map = "rs1";
>  			compatible = "arm,vexpress,v2m-p1", "simple-bus";
> @@ -274,3 +275,5 @@
>  				};
>  			};
>  		};
> +	};
> +};
> -- 
> 2.7.4
> 

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ?\_(?)_/?

Re: [PATCH 3/3] arm64: dts: juno/rtsm: re-structure motherboard includes

[Sudeep Holla]

On 10/05/18 10:49, Liviu Dudau wrote:
> On Wed, May 09, 2018 at 05:44:51PM +0100, Sudeep Holla wrote:
>> It is a bit unorthodox to just include a file in the middle of a another
>> DTS file, it breaks the pattern from other device trees and also makes
>> it really hard to reference things across the files with phandles.
>>
>> Restructure the include for the Juno/RTSM motherboards to happen at the
>> top of the file, reference the target nodes directly, and indent the
>> motherboard .dtsi files to reflect their actual depth in the hierarchy.
>>
>> This is a purely syntactic change that result in the same DTB files from
>> the DTS/DTSI files. This is based on similar patch from Linus Walleij
>> for ARM Vexpress platforms.
> 
> A bit of bikeshedding here: the reason I've used the DT /include/
> here was that on decompilation of the DTB the nodes would have been in
> the natural order and easier to look for issues. Those were the early
> days and I can accept that the general practice has changed and we're
> using now the C preprocessor more. I don't have any strong feelings on
> how the DT looks nowadays, so:
>

I can understand. After this patch applied, I did hit an issue with
timer registration. I just posted a patch [1]

>>
>> Cc: Liviu Dudau <liviu.dudau@arm.com>
> 
> Acked-by: Liviu Dudau <liviu.dudau@arm.com>
> 

Thanks for all the acks.

-- 
Regards,
Sudeep

[1]
https://lkml.kernel.org/r/1525881728-4858-1-git-send-email-sudeep.holla@arm.com

[PATCH 3/3] arm64: dts: juno/rtsm: re-structure motherboard includes

[Sudeep Holla]

On 10/05/18 10:49, Liviu Dudau wrote:
> On Wed, May 09, 2018 at 05:44:51PM +0100, Sudeep Holla wrote:
>> It is a bit unorthodox to just include a file in the middle of a another
>> DTS file, it breaks the pattern from other device trees and also makes
>> it really hard to reference things across the files with phandles.
>>
>> Restructure the include for the Juno/RTSM motherboards to happen at the
>> top of the file, reference the target nodes directly, and indent the
>> motherboard .dtsi files to reflect their actual depth in the hierarchy.
>>
>> This is a purely syntactic change that result in the same DTB files from
>> the DTS/DTSI files. This is based on similar patch from Linus Walleij
>> for ARM Vexpress platforms.
> 
> A bit of bikeshedding here: the reason I've used the DT /include/
> here was that on decompilation of the DTB the nodes would have been in
> the natural order and easier to look for issues. Those were the early
> days and I can accept that the general practice has changed and we're
> using now the C preprocessor more. I don't have any strong feelings on
> how the DT looks nowadays, so:
>

I can understand. After this patch applied, I did hit an issue with
timer registration. I just posted a patch [1]

>>
>> Cc: Liviu Dudau <liviu.dudau@arm.com>
> 
> Acked-by: Liviu Dudau <liviu.dudau@arm.com>
> 

Thanks for all the acks.

-- 
Regards,
Sudeep

[1]
https://lkml.kernel.org/r/1525881728-4858-1-git-send-email-sudeep.holla at arm.com

Re: [PATCH 3/3] arm64: dts: juno/rtsm: re-structure motherboard includes

[Linus Walleij]

On Wed, May 9, 2018 at 6:44 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:

> It is a bit unorthodox to just include a file in the middle of a another
> DTS file, it breaks the pattern from other device trees and also makes
> it really hard to reference things across the files with phandles.
>
> Restructure the include for the Juno/RTSM motherboards to happen at the
> top of the file, reference the target nodes directly, and indent the
> motherboard .dtsi files to reflect their actual depth in the hierarchy.
>
> This is a purely syntactic change that result in the same DTB files from
> the DTS/DTSI files. This is based on similar patch from Linus Walleij
> for ARM Vexpress platforms.
>
> Cc: Liviu Dudau <liviu.dudau@arm.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Thanks for doing this, it is much more readable for me now.

Sorry for slow review :/

Yours,
Linus Walleij

[PATCH 3/3] arm64: dts: juno/rtsm: re-structure motherboard includes

[Linus Walleij]

On Wed, May 9, 2018 at 6:44 PM, Sudeep Holla <sudeep.holla@arm.com> wrote:

> It is a bit unorthodox to just include a file in the middle of a another
> DTS file, it breaks the pattern from other device trees and also makes
> it really hard to reference things across the files with phandles.
>
> Restructure the include for the Juno/RTSM motherboards to happen at the
> top of the file, reference the target nodes directly, and indent the
> motherboard .dtsi files to reflect their actual depth in the hierarchy.
>
> This is a purely syntactic change that result in the same DTB files from
> the DTS/DTSI files. This is based on similar patch from Linus Walleij
> for ARM Vexpress platforms.
>
> Cc: Liviu Dudau <liviu.dudau@arm.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Thanks for doing this, it is much more readable for me now.

Sorry for slow review :/

Yours,
Linus Walleij