ARM: dts: imx6qdl-sabresd: Move regulators outside of "simple-bus"

It is not recommended to place regulators inside "simple-bus", so move
them out to make it cleaner the addition of new regulators.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Fabio Estevam 2018-12-06 01:42:30 +00:00 committed by Shawn Guo
parent 404c0c9314
commit 75ad7ff179

View File

@ -17,52 +17,42 @@ memory@10000000 {
reg = <0x10000000 0x40000000>; reg = <0x10000000 0x40000000>;
}; };
regulators { reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "usb_otg_vbus";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>;
enable-active-high;
vin-supply = <&swbst_reg>;
};
reg_usb_otg_vbus: regulator@0 { reg_usb_h1_vbus: regulator-usb-h1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>; regulator-name = "usb_h1_vbus";
regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio1 29 0>;
gpio = <&gpio3 22 0>; enable-active-high;
enable-active-high; vin-supply = <&swbst_reg>;
vin-supply = <&swbst_reg>; };
};
reg_usb_h1_vbus: regulator@1 { reg_audio: regulator-audio {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "wm8962-supply";
regulator-name = "usb_h1_vbus"; gpio = <&gpio4 10 0>;
regulator-min-microvolt = <5000000>; enable-active-high;
regulator-max-microvolt = <5000000>; };
gpio = <&gpio1 29 0>;
enable-active-high;
vin-supply = <&swbst_reg>;
};
reg_audio: regulator@2 { reg_pcie: regulator-pcie {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; pinctrl-names = "default";
regulator-name = "wm8962-supply"; pinctrl-0 = <&pinctrl_pcie_reg>;
gpio = <&gpio4 10 0>; regulator-name = "MPCIE_3V3";
enable-active-high; regulator-min-microvolt = <3300000>;
}; regulator-max-microvolt = <3300000>;
gpio = <&gpio3 19 0>;
reg_pcie: regulator@3 { enable-active-high;
compatible = "regulator-fixed";
reg = <3>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pcie_reg>;
regulator-name = "MPCIE_3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio3 19 0>;
enable-active-high;
};
}; };
gpio-keys { gpio-keys {