Skip to contentSkip to conversation

ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards

PATCH In review Krzysztof Kozlowski 1 participant 6 messages Apr 24, 2018 – Apr 29, 2018

Subsystems (2)
Device tree bindings Arm Samsung Exynos
lore
Share & tools
lore

Krzysztof Kozlowski

author maintainer
#0 lore raw

PATCH 1/5 ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards

The children of regulators node do not have reg/ranges properties. Move the children up one level, get rid of regulators node and remove address-cells and size-cells properties. This fixes warnings for Exynos4412 Midas family boards:

arch/arm/boot/dts/exynos4412-i9300.dtb: Warning (avoid_unnecessary_addr_size):
/regulators: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
arch/arm/boot/dts/exynos4412-i9305.dtb: Warning (avoid_unnecessary_addr_size):
/regulators: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
arch/arm/boot/dts/exynos4412-n710x.dtb: Warning (avoid_unnecessary_addr_size):
/regulators: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 32 +++++------
 arch/arm/boot/dts/exynos4412-midas.dtsi     | 86 ++++++++++++++---------------
 2 files changed, 55 insertions(+), 63 deletions(-)
arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi +15 -17
index ee8e1f445370..31cd5f6fd83c 100644
@@ -15,24 +15,22 @@
 		i2c10 = &i2c_cm36651;
 	};
 
-	regulators {
-		lcd_vdd3_reg: voltage-regulator-2 {
-			compatible = "regulator-fixed";
-			regulator-name = "LCD_VDD_2.2V";
-			regulator-min-microvolt = <2200000>;
-			regulator-max-microvolt = <2200000>;
-			gpio = <&gpc0 1 GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-		};
+	lcd_vdd3_reg: voltage-regulator-2 {
+		compatible = "regulator-fixed";
+		regulator-name = "LCD_VDD_2.2V";
+		regulator-min-microvolt = <2200000>;
+		regulator-max-microvolt = <2200000>;
+		gpio = <&gpc0 1 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
 
-		ps_als_reg: voltage-regulator-5 {
-			compatible = "regulator-fixed";
-			regulator-name = "LED_A_3.0V";
-			regulator-min-microvolt = <3000000>;
-			regulator-max-microvolt = <3000000>;
-			gpio = <&gpj0 5 GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-		};
+	ps_als_reg: voltage-regulator-5 {
+		compatible = "regulator-fixed";
+		regulator-name = "LED_A_3.0V";
+		regulator-min-microvolt = <3000000>;
+		regulator-max-microvolt = <3000000>;
+		gpio = <&gpj0 5 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
 	};
 
 	i2c_ak8975: i2c-gpio-0 {
arch/arm/boot/dts/exynos4412-midas.dtsi +40 -46

96 lines not on this page · raw message

Signature · 1 line
2.14.1
author maintainer
#1 lore raw

PATCH 2/5 ARM: dts: exynos: Remove unnecessary address/size properties in Origen

The children of gpio_keys node do not have reg/ranges properties so remove address-cells and size-cells properties. This fixes warnings for Exynos4210 Origen:

arch/arm/boot/dts/exynos4210-origen.dtb: Warning (avoid_unnecessary_addr_size):
/gpio_keys: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 arch/arm/boot/dts/exynos4210-origen.dts | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/exynos4210-origen.dts +0 -2
index aa7a96cecee1..a81714745820 100644
@@ -52,8 +52,6 @@
 
 	gpio_keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		up {
 			label = "Up";
Signature · 1 line
2.14.1
author maintainer
#2 lore raw

PATCH 3/5 ARM: dts: exynos: Remove regulators node container in Origen and N710x

In reply to Krzysztof Kozlowski

Consistently put fixed regulators directly below root node, instead of artificial "regulators" node in Exynos4210 Origen and Exynos4412 N710x.

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 arch/arm/boot/dts/exynos4210-origen.dts | 21 +++++++--------------
 arch/arm/boot/dts/exynos4412-n710x.dts  | 16 +++++++---------
 2 files changed, 14 insertions(+), 23 deletions(-)
arch/arm/boot/dts/exynos4210-origen.dts +7 -14
index a81714745820..2ab99f9f3d0a 100644
@@ -34,20 +34,13 @@
 		stdout-path = &serial_2;
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		mmc_reg: regulator at 0 {
-			compatible = "regulator-fixed";
-			reg = <0>;
-			regulator-name = "VMEM_VDD_2.8V";
-			regulator-min-microvolt = <2800000>;
-			regulator-max-microvolt = <2800000>;
-			gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-		};
+	mmc_reg: voltage-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "VMEM_VDD_2.8V";
+		regulator-min-microvolt = <2800000>;
+		regulator-max-microvolt = <2800000>;
+		gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
 	};
 
 	gpio_keys {
arch/arm/boot/dts/exynos4412-n710x.dts +7 -9
index eb402a0d6651..36818b1697a4 100644
@@ -13,15 +13,13 @@
 
 	/* bootargs are passed in by bootloader */
 
-	regulators {
-		cam_vdda_reg: voltage-regulator-9 {
-			compatible = "regulator-fixed";
-			regulator-name = "CAM_SENSOR_CORE_1.2V";
-			regulator-min-microvolt = <1200000>;
-			regulator-max-microvolt = <1200000>;
-			gpio = <&gpm4 1 GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-		};
+	cam_vdda_reg: voltage-regulator-9 {
+		compatible = "regulator-fixed";
+		regulator-name = "CAM_SENSOR_CORE_1.2V";
+		regulator-min-microvolt = <1200000>;
+		regulator-max-microvolt = <1200000>;
+		gpio = <&gpm4 1 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
 	};
 };
Signature · 1 line
2.14.1
author maintainer
#3 lore raw

PATCH 4/5 ARM: dts: exynos: Bring order in fixed-regulators naming in Midas boards

In reply to Krzysztof Kozlowski

exynos4412-midas.dtsi is base for galaxy-s3.dtsi and n710x.dts. All of them contain fixed regulators named "voltage-regulator-X". Their indexes got mixed up while splitting common code in commit c769eaf7a85d ("ARM: dts: exynos: Split Trats2 DTS in preparation for Midas boards").

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 4 ++--
 arch/arm/boot/dts/exynos4412-midas.dtsi     | 8 ++++----
 arch/arm/boot/dts/exynos4412-n710x.dts      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi +2 -2
index 31cd5f6fd83c..606946a264da 100644
@@ -15,7 +15,7 @@
 		i2c10 = &i2c_cm36651;
 	};
 
-	lcd_vdd3_reg: voltage-regulator-2 {
+	lcd_vdd3_reg: voltage-regulator-6 {
 		compatible = "regulator-fixed";
 		regulator-name = "LCD_VDD_2.2V";
 		regulator-min-microvolt = <2200000>;

@@ -24,7 +24,7 @@
 		enable-active-high;
 	};
 
-	ps_als_reg: voltage-regulator-5 {
+	ps_als_reg: voltage-regulator-7 {
 		compatible = "regulator-fixed";
 		regulator-name = "LED_A_3.0V";
 		regulator-min-microvolt = <3000000>;
arch/arm/boot/dts/exynos4412-midas.dtsi +4 -4
index 4b182e26cfc8..dc11ca1673e8 100644
@@ -55,7 +55,7 @@
 		status = "disabled";
 	};
 
-	cam_af_reg: voltage-regulator-3 {
+	cam_af_reg: voltage-regulator-2 {
 		compatible = "regulator-fixed";
 		regulator-name = "CAM_AF";
 		regulator-min-microvolt = <2800000>;

@@ -64,7 +64,7 @@
 		status = "disabled";
 	};
 
-	vsil12: voltage-regulator-6 {
+	vsil12: voltage-regulator-3 {
 		compatible = "regulator-fixed";
 		regulator-name = "VSIL_1.2V";
 		regulator-min-microvolt = <1200000>;

@@ -74,7 +74,7 @@
 		vin-supply = <&buck7_reg>;
 	};
 
-	vcc33mhl: voltage-regulator-7 {
+	vcc33mhl: voltage-regulator-4 {
 		compatible = "regulator-fixed";
 		regulator-name = "VCC_3.3_MHL";
 		regulator-min-microvolt = <3300000>;

@@ -83,7 +83,7 @@
 		enable-active-high;
 	};
 
-	vcc18mhl: voltage-regulator-8 {
+	vcc18mhl: voltage-regulator-5 {
 		compatible = "regulator-fixed";
 		regulator-name = "VCC_1.8_MHL";
 		regulator-min-microvolt = <1800000>;
arch/arm/boot/dts/exynos4412-n710x.dts +1 -1
index 36818b1697a4..fe2bfd76cc4e 100644
@@ -13,7 +13,7 @@
 
 	/* bootargs are passed in by bootloader */
 
-	cam_vdda_reg: voltage-regulator-9 {
+	cam_vdda_reg: voltage-regulator-6 {
 		compatible = "regulator-fixed";
 		regulator-name = "CAM_SENSOR_CORE_1.2V";
 		regulator-min-microvolt = <1200000>;
Signature · 1 line
2.14.1
author maintainer
#4 lore raw

PATCH 5/5 ARM: dts: exynos: Remove unnecessary address/size properties in dp-controller of Exynos5

In reply to Krzysztof Kozlowski

The "dp-controller" node is not a bus and it does not have children with reg/ranges properties so remove address-cells and size-cells properties. This fixes warnings for all Exynos5 boards:

arch/arm/boot/dts/exynos5250-arndale.dtb: Warning (avoid_unnecessary_addr_size):
/soc/dp-controller at 145b0000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property

Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 arch/arm/boot/dts/exynos5.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/exynos5.dtsi +0 -2
index 359f49bdd4e2..5d2f0a06fbef 100644
@@ -196,8 +196,6 @@
 			reg = <0x145B0000 0x1000>;
 			interrupts = <10 3>;
 			interrupt-parent = <&combiner>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			status = "disabled";
 		};
Signature · 1 line
2.14.1
author maintainer
#5 lore raw
In reply to Krzysztof Kozlowski
Quoted 12 lines · Krzysztof Kozlowski

The children of regulators node do not have reg/ranges properties. Move the children up one level, get rid of regulators node and remove address-cells and size-cells properties. This fixes warnings for Exynos4412 Midas family boards:

arch/arm/boot/dts/exynos4412-i9300.dtb: Warning (avoid_unnecessary_addr_size):
/regulators: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
arch/arm/boot/dts/exynos4412-i9305.dtb: Warning (avoid_unnecessary_addr_size):
/regulators: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
arch/arm/boot/dts/exynos4412-n710x.dtb: Warning (avoid_unnecessary_addr_size):
/regulators: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property

Quoted 5 lines
Signed-off-by Krzysztof Kozlowski <[email protected]>
---
 arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 32 +++++------
 arch/arm/boot/dts/exynos4412-midas.dtsi     | 86 ++++++++++++++---------------
 2 files changed, 55 insertions(+), 63 deletions(-)

Applied entire series.

Best regards,
Krzysztof