Commit f92717f6 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: dts: imx6sx-sdb: 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: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent e68ce7c4

arch/arm/boot/dts/imx6sx-sdb.dtsi

+61 −74
Original line number Diff line number Diff line
@@ -49,14 +49,8 @@ volume-down { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		vcc_sd3: regulator@0 {

	vcc_sd3: regulator-vcc-sd3 {

		compatible = "regulator-fixed";

			reg = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_vcc_sd3>;

		regulator-name = "VCC_SD3";
@@ -66,9 +60,8 @@ vcc_sd3: regulator@0 { 
		enable-active-high;

	};



		reg_usb_otg1_vbus: regulator@1 {

	reg_usb_otg1_vbus: regulator-usb-otg1-vbus {

		compatible = "regulator-fixed";

			reg = <1>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usb_otg1>;

		regulator-name = "usb_otg1_vbus";
@@ -78,9 +71,8 @@ reg_usb_otg1_vbus: regulator@1 { 
		enable-active-high;

	};



		reg_usb_otg2_vbus: regulator@2 {

	reg_usb_otg2_vbus: regulator-usb-otg2-vbus {

		compatible = "regulator-fixed";

			reg = <2>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usb_otg2>;

		regulator-name = "usb_otg2_vbus";
@@ -90,25 +82,22 @@ reg_usb_otg2_vbus: regulator@2 { 
		enable-active-high;

	};



		reg_psu_5v: regulator@3 {

	reg_psu_5v: regulator-psu-5v {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "PSU-5V0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



		reg_lcd_3v3: regulator@4 {

	reg_lcd_3v3: regulator-lcd-3v3 {

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "lcd-3v3";

		gpio = <&gpio3 27 0>;

		enable-active-high;

	};



		reg_peri_3v3: regulator@5 {

	reg_peri_3v3: regulator-peri-3v3 {

		compatible = "regulator-fixed";

			reg = <5>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_peri_3v3>;

		regulator-name = "peri_3v3";
@@ -119,9 +108,8 @@ reg_peri_3v3: regulator@5 { 
		regulator-always-on;

	};



		reg_enet_3v3: regulator@6 {

	reg_enet_3v3: regulator-enet-3v3 {

		compatible = "regulator-fixed";

			reg = <6>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_enet_3v3>;

		regulator-name = "enet_3v3";
@@ -129,7 +117,6 @@ reg_enet_3v3: regulator@6 { 
		regulator-max-microvolt = <3300000>;

		gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;

	};

	};



	sound {

		compatible = "fsl,imx6sx-sdb-wm8962", "fsl,imx-audio-wm8962";