ARM: dts: exynos: Remove regulators node container in Origen and N710x

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>

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index a817147..2ab99f9 100644 (file)
--- 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 eb402a0..36818b1 100644 (file)
--- 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;
        };
 };