Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 12:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: imx6sx-sdb: Rearrange the regulators node

Browse Source 
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: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Fabio Estevam 2017-11-21 20:49:59 -02:00 committed by Shawn Guo
parent e68ce7c493
commit f92717f610
1 changed files with 61 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
arch/arm/boot/dts/imx6sx-sdb.dtsi
View File

@ -49,86 +49,73 @@
}; };
}; };
regulators { vcc_sd3: regulator-vcc-sd3 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; pinctrl-names = "default";
#size-cells = <0>; pinctrl-0 = <&pinctrl_vcc_sd3>;
regulator-name = "VCC_SD3";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
vcc_sd3: regulator@0 { reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb_otg1>;
pinctrl-0 = <&pinctrl_vcc_sd3>; regulator-name = "usb_otg1_vbus";
regulator-name = "VCC_SD3"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <3000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <3000000>; gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
reg_usb_otg1_vbus: regulator@1 { reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb_otg2>;
pinctrl-0 = <&pinctrl_usb_otg1>; regulator-name = "usb_otg2_vbus";
regulator-name = "usb_otg1_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
reg_usb_otg2_vbus: regulator@2 { reg_psu_5v: regulator-psu-5v {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "PSU-5V0";
pinctrl-names = "default"; regulator-min-microvolt = <5000000>;
pinctrl-0 = <&pinctrl_usb_otg2>; regulator-max-microvolt = <5000000>;
regulator-name = "usb_otg2_vbus"; };
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
reg_psu_5v: regulator@3 { reg_lcd_3v3: regulator-lcd-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "lcd-3v3";
regulator-name = "PSU-5V0"; gpio = <&gpio3 27 0>;
regulator-min-microvolt = <5000000>; enable-active-high;
regulator-max-microvolt = <5000000>; };
};
reg_lcd_3v3: regulator@4 { reg_peri_3v3: regulator-peri-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <4>; pinctrl-names = "default";
regulator-name = "lcd-3v3"; pinctrl-0 = <&pinctrl_peri_3v3>;
gpio = <&gpio3 27 0>; regulator-name = "peri_3v3";
enable-active-high; regulator-min-microvolt = <3300000>;
}; regulator-max-microvolt = <3300000>;
gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-always-on;
};
reg_peri_3v3: regulator@5 { reg_enet_3v3: regulator-enet-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <5>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet_3v3>;
pinctrl-0 = <&pinctrl_peri_3v3>; regulator-name = "enet_3v3";
regulator-name = "peri_3v3"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-always-on;
};
reg_enet_3v3: regulator@6 {
compatible = "regulator-fixed";
reg = <6>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet_3v3>;
regulator-name = "enet_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
};
}; };
sound { sound {