* [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards
@ 2018-04-24 17:45 Krzysztof Kozlowski
2018-04-24 17:45 ` [PATCH 2/5] ARM: dts: exynos: Remove unnecessary address/size properties in Origen Krzysztof Kozlowski
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2018-04-24 17:45 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
Marek Szyprowski, devicetree, linux-arm-kernel,
linux-samsung-soc, linux-kernel
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 <krzk@kernel.org>
---
arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 32 +++++------
arch/arm/boot/dts/exynos4412-midas.dtsi | 86 ++++++++++++++---------------
2 files changed, 55 insertions(+), 63 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
index ee8e1f445370..31cd5f6fd83c 100644
--- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
+++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
@@ -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 {
diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
index 76f2b30f1731..4b182e26cfc8 100644
--- a/arch/arm/boot/dts/exynos4412-midas.dtsi
+++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -46,56 +46,50 @@
};
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- cam_io_reg: voltage-regulator-1 {
- compatible = "regulator-fixed";
- regulator-name = "CAM_SENSOR_A";
- regulator-min-microvolt = <2800000>;
- regulator-max-microvolt = <2800000>;
- enable-active-high;
- status = "disabled";
- };
+ cam_io_reg: voltage-regulator-1 {
+ compatible = "regulator-fixed";
+ regulator-name = "CAM_SENSOR_A";
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+ enable-active-high;
+ status = "disabled";
+ };
- cam_af_reg: voltage-regulator-3 {
- compatible = "regulator-fixed";
- regulator-name = "CAM_AF";
- regulator-min-microvolt = <2800000>;
- regulator-max-microvolt = <2800000>;
- enable-active-high;
- status = "disabled";
- };
+ cam_af_reg: voltage-regulator-3 {
+ compatible = "regulator-fixed";
+ regulator-name = "CAM_AF";
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+ enable-active-high;
+ status = "disabled";
+ };
- vsil12: voltage-regulator-6 {
- compatible = "regulator-fixed";
- regulator-name = "VSIL_1.2V";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- vin-supply = <&buck7_reg>;
- };
+ vsil12: voltage-regulator-6 {
+ compatible = "regulator-fixed";
+ regulator-name = "VSIL_1.2V";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ vin-supply = <&buck7_reg>;
+ };
- vcc33mhl: voltage-regulator-7 {
- compatible = "regulator-fixed";
- regulator-name = "VCC_3.3_MHL";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
+ vcc33mhl: voltage-regulator-7 {
+ compatible = "regulator-fixed";
+ regulator-name = "VCC_3.3_MHL";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
- vcc18mhl: voltage-regulator-8 {
- compatible = "regulator-fixed";
- regulator-name = "VCC_1.8_MHL";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
+ vcc18mhl: voltage-regulator-8 {
+ compatible = "regulator-fixed";
+ regulator-name = "VCC_1.8_MHL";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ gpio = <&gpl0 4 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
};
gpio-keys {
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] ARM: dts: exynos: Remove unnecessary address/size properties in Origen
2018-04-24 17:45 [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards Krzysztof Kozlowski
@ 2018-04-24 17:45 ` Krzysztof Kozlowski
2018-04-24 17:46 ` [PATCH 3/5] ARM: dts: exynos: Remove regulators node container in Origen and N710x Krzysztof Kozlowski
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2018-04-24 17:45 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
Marek Szyprowski, devicetree, linux-arm-kernel,
linux-samsung-soc, linux-kernel
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 <krzk@kernel.org>
---
arch/arm/boot/dts/exynos4210-origen.dts | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index aa7a96cecee1..a81714745820 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -52,8 +52,6 @@
gpio_keys {
compatible = "gpio-keys";
- #address-cells = <1>;
- #size-cells = <0>;
up {
label = "Up";
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] ARM: dts: exynos: Remove regulators node container in Origen and N710x
2018-04-24 17:45 [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards Krzysztof Kozlowski
2018-04-24 17:45 ` [PATCH 2/5] ARM: dts: exynos: Remove unnecessary address/size properties in Origen Krzysztof Kozlowski
@ 2018-04-24 17:46 ` Krzysztof Kozlowski
2018-04-24 17:46 ` [PATCH 4/5] ARM: dts: exynos: Bring order in fixed-regulators naming in Midas boards Krzysztof Kozlowski
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2018-04-24 17:46 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
Marek Szyprowski, devicetree, linux-arm-kernel,
linux-samsung-soc, linux-kernel
Consistently put fixed regulators directly below root node, instead of
artificial "regulators" node in Exynos4210 Origen and Exynos4412 N710x.
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
arch/arm/boot/dts/exynos4210-origen.dts | 21 +++++++--------------
arch/arm/boot/dts/exynos4412-n710x.dts | 16 +++++++---------
2 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index a81714745820..2ab99f9f3d0a 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -34,20 +34,13 @@
stdout-path = &serial_2;
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- mmc_reg: regulator@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 {
diff --git a/arch/arm/boot/dts/exynos4412-n710x.dts b/arch/arm/boot/dts/exynos4412-n710x.dts
index eb402a0d6651..36818b1697a4 100644
--- a/arch/arm/boot/dts/exynos4412-n710x.dts
+++ b/arch/arm/boot/dts/exynos4412-n710x.dts
@@ -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;
};
};
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] ARM: dts: exynos: Bring order in fixed-regulators naming in Midas boards
2018-04-24 17:45 [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards Krzysztof Kozlowski
2018-04-24 17:45 ` [PATCH 2/5] ARM: dts: exynos: Remove unnecessary address/size properties in Origen Krzysztof Kozlowski
2018-04-24 17:46 ` [PATCH 3/5] ARM: dts: exynos: Remove regulators node container in Origen and N710x Krzysztof Kozlowski
@ 2018-04-24 17:46 ` Krzysztof Kozlowski
2018-04-24 17:46 ` [PATCH 5/5] ARM: dts: exynos: Remove unnecessary address/size properties in dp-controller of Exynos5 Krzysztof Kozlowski
2018-04-29 17:28 ` [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards Krzysztof Kozlowski
4 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2018-04-24 17:46 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
Marek Szyprowski, devicetree, linux-arm-kernel,
linux-samsung-soc, linux-kernel
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 <krzk@kernel.org>
---
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(-)
diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
index 31cd5f6fd83c..606946a264da 100644
--- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
+++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
index 4b182e26cfc8..dc11ca1673e8 100644
--- a/arch/arm/boot/dts/exynos4412-midas.dtsi
+++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/exynos4412-n710x.dts b/arch/arm/boot/dts/exynos4412-n710x.dts
index 36818b1697a4..fe2bfd76cc4e 100644
--- a/arch/arm/boot/dts/exynos4412-n710x.dts
+++ b/arch/arm/boot/dts/exynos4412-n710x.dts
@@ -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>;
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] ARM: dts: exynos: Remove unnecessary address/size properties in dp-controller of Exynos5
2018-04-24 17:45 [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards Krzysztof Kozlowski
` (2 preceding siblings ...)
2018-04-24 17:46 ` [PATCH 4/5] ARM: dts: exynos: Bring order in fixed-regulators naming in Midas boards Krzysztof Kozlowski
@ 2018-04-24 17:46 ` Krzysztof Kozlowski
2018-04-29 17:28 ` [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards Krzysztof Kozlowski
4 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2018-04-24 17:46 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
Marek Szyprowski, devicetree, linux-arm-kernel,
linux-samsung-soc, linux-kernel
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@145b0000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
---
arch/arm/boot/dts/exynos5.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 359f49bdd4e2..5d2f0a06fbef 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -196,8 +196,6 @@
reg = <0x145B0000 0x1000>;
interrupts = <10 3>;
interrupt-parent = <&combiner>;
- #address-cells = <1>;
- #size-cells = <0>;
status = "disabled";
};
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards
2018-04-24 17:45 [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards Krzysztof Kozlowski
` (3 preceding siblings ...)
2018-04-24 17:46 ` [PATCH 5/5] ARM: dts: exynos: Remove unnecessary address/size properties in dp-controller of Exynos5 Krzysztof Kozlowski
@ 2018-04-29 17:28 ` Krzysztof Kozlowski
4 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2018-04-29 17:28 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Marek Szyprowski,
devicetree, linux-arm-kernel, linux-samsung-soc, linux-kernel
On Tue, Apr 24, 2018 at 07:45:58PM +0200, Krzysztof Kozlowski wrote:
> 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 <krzk@kernel.org>
> ---
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-04-29 17:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-24 17:45 [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards Krzysztof Kozlowski
2018-04-24 17:45 ` [PATCH 2/5] ARM: dts: exynos: Remove unnecessary address/size properties in Origen Krzysztof Kozlowski
2018-04-24 17:46 ` [PATCH 3/5] ARM: dts: exynos: Remove regulators node container in Origen and N710x Krzysztof Kozlowski
2018-04-24 17:46 ` [PATCH 4/5] ARM: dts: exynos: Bring order in fixed-regulators naming in Midas boards Krzysztof Kozlowski
2018-04-24 17:46 ` [PATCH 5/5] ARM: dts: exynos: Remove unnecessary address/size properties in dp-controller of Exynos5 Krzysztof Kozlowski
2018-04-29 17:28 ` [PATCH 1/5] ARM: dts: exynos: Remove unnecessary address/size properties in Midas boards Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).