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 <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi
index ee8e1f445370003438296606a3b43d7b5b725053..31cd5f6fd83c9b22d1edb68169ec99edfa879090 100644 (file)
--- 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 76f2b30f173189ec795402df7812d2fa40df003a..4b182e26cfc81c4c57aed7b5b07df31f060a79f6 100644 (file)
--- 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 {