ARM: dts: imx6sl-evk: Rearrange the regulators node

It is not recommended to place regulators inside "simple-bus", so move
them out.

The motivation for doing this is to make it easier to adding new
regulators.
Signed-off-by: Marco Franchi <marcofrk@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

arch/arm/boot/dts/imx6sl-evk.dts

@@ -39,59 +39,48 @@ user {
 		};
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		reg_usb_otg1_vbus: regulator@0 {
+	reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
 		compatible = "regulator-fixed";
-			reg = <0>;
 		regulator-name = "usb_otg1_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-			gpio = <&gpio4 0 0>;
+		gpio = <&gpio4 0 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 		vin-supply = <&swbst_reg>;
 	};
 
-		reg_usb_otg2_vbus: regulator@1 {
+	reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
 		compatible = "regulator-fixed";
-			reg = <1>;
 		regulator-name = "usb_otg2_vbus";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-			gpio = <&gpio4 2 0>;
+		gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 		vin-supply = <&swbst_reg>;
 	};
 
-		reg_aud3v: regulator@2 {
+	reg_aud3v: regulator-aud3v {
 		compatible = "regulator-fixed";
-			reg = <2>;
 		regulator-name = "wm8962-supply-3v15";
 		regulator-min-microvolt = <3150000>;
 		regulator-max-microvolt = <3150000>;
 		regulator-boot-on;
 	};
 
-		reg_aud4v: regulator@3 {
+	reg_aud4v: regulator-aud4v {
 		compatible = "regulator-fixed";
-			reg = <3>;
 		regulator-name = "wm8962-supply-4v2";
 		regulator-min-microvolt = <4325000>;
 		regulator-max-microvolt = <4325000>;
 		regulator-boot-on;
 	};
 
-		reg_lcd_3v3: regulator@4 {
+	reg_lcd_3v3: regulator-lcd-3v3 {
 		compatible = "regulator-fixed";
-			reg = <4>;
 		regulator-name = "lcd-3v3";
-			gpio = <&gpio4 3 0>;
+		gpio = <&gpio4 3 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 	};
-	};
 
 	sound {
 		compatible = "fsl,imx6sl-evk-wm8962", "fsl,imx-audio-wm8962";