Commit 75ad7ff1 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo

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: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 404c0c93
...@@ -17,14 +17,8 @@ memory@10000000 { ...@@ -17,14 +17,8 @@ memory@10000000 {
reg = <0x10000000 0x40000000>; reg = <0x10000000 0x40000000>;
}; };
regulators { reg_usb_otg_vbus: regulator-usb-otg-vbus {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
reg_usb_otg_vbus: regulator@0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>;
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -33,9 +27,8 @@ reg_usb_otg_vbus: regulator@0 { ...@@ -33,9 +27,8 @@ reg_usb_otg_vbus: regulator@0 {
vin-supply = <&swbst_reg>; vin-supply = <&swbst_reg>;
}; };
reg_usb_h1_vbus: regulator@1 { reg_usb_h1_vbus: regulator-usb-h1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>;
regulator-name = "usb_h1_vbus"; regulator-name = "usb_h1_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -44,17 +37,15 @@ reg_usb_h1_vbus: regulator@1 { ...@@ -44,17 +37,15 @@ reg_usb_h1_vbus: regulator@1 {
vin-supply = <&swbst_reg>; vin-supply = <&swbst_reg>;
}; };
reg_audio: regulator@2 { reg_audio: regulator-audio {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>;
regulator-name = "wm8962-supply"; regulator-name = "wm8962-supply";
gpio = <&gpio4 10 0>; gpio = <&gpio4 10 0>;
enable-active-high; enable-active-high;
}; };
reg_pcie: regulator@3 { reg_pcie: regulator-pcie {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pcie_reg>; pinctrl-0 = <&pinctrl_pcie_reg>;
regulator-name = "MPCIE_3V3"; regulator-name = "MPCIE_3V3";
...@@ -63,7 +54,6 @@ reg_pcie: regulator@3 { ...@@ -63,7 +54,6 @@ reg_pcie: regulator@3 {
gpio = <&gpio3 19 0>; gpio = <&gpio3 19 0>;
enable-active-high; enable-active-high;
}; };
};
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment