Commit 97321ee7 authored by Russell King's avatar Russell King Committed by Shawn Guo

ARM: dts: imx6qdl: SolidRun: remove redundant regulators node

The regulators node is redundant, and serves no useful function.
Remove it from i.MX6 SolidRun platforms.
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent d0ed3f54
...@@ -64,38 +64,34 @@ front { ...@@ -64,38 +64,34 @@ front {
}; };
}; };
regulators { reg_3p3v: 3p3v {
compatible = "simple-bus"; compatible = "regulator-fixed";
regulator-name = "3P3V";
reg_3p3v: 3p3v { regulator-min-microvolt = <3300000>;
compatible = "regulator-fixed"; regulator-max-microvolt = <3300000>;
regulator-name = "3P3V"; regulator-always-on;
regulator-min-microvolt = <3300000>; };
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_usbh1_vbus: usb-h1-vbus { reg_usbh1_vbus: usb-h1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio1 0 0>; gpio = <&gpio1 0 0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_cubox_i_usbh1_vbus>; pinctrl-0 = <&pinctrl_cubox_i_usbh1_vbus>;
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>;
}; };
reg_usbotg_vbus: usb-otg-vbus { reg_usbotg_vbus: usb-otg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio3 22 0>; gpio = <&gpio3 22 0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_cubox_i_usbotg_vbus>; pinctrl-0 = <&pinctrl_cubox_i_usbotg_vbus>;
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>;
};
}; };
sound-spdif { sound-spdif {
......
...@@ -53,38 +53,34 @@ ir_recv: ir-receiver { ...@@ -53,38 +53,34 @@ ir_recv: ir-receiver {
pinctrl-0 = <&pinctrl_hummingboard_gpio3_5>; pinctrl-0 = <&pinctrl_hummingboard_gpio3_5>;
}; };
regulators { reg_3p3v: 3p3v {
compatible = "simple-bus"; compatible = "regulator-fixed";
regulator-name = "3P3V";
reg_3p3v: 3p3v { regulator-min-microvolt = <3300000>;
compatible = "regulator-fixed"; regulator-max-microvolt = <3300000>;
regulator-name = "3P3V"; regulator-always-on;
regulator-min-microvolt = <3300000>; };
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_usbh1_vbus: usb-h1-vbus { reg_usbh1_vbus: usb-h1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_hummingboard_usbh1_vbus>; pinctrl-0 = <&pinctrl_hummingboard_usbh1_vbus>;
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>;
}; };
reg_usbotg_vbus: usb-otg-vbus { reg_usbotg_vbus: usb-otg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_hummingboard_usbotg_vbus>; pinctrl-0 = <&pinctrl_hummingboard_usbotg_vbus>;
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>;
};
}; };
sound-sgtl5000 { sound-sgtl5000 {
......
...@@ -48,20 +48,16 @@ clk_sdio: sdio-clock { ...@@ -48,20 +48,16 @@ clk_sdio: sdio-clock {
enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
}; };
regulators { reg_brcm: brcm-reg {
compatible = "simple-bus"; compatible = "regulator-fixed";
enable-active-high;
reg_brcm: brcm-reg { gpio = <&gpio3 19 0>;
compatible = "regulator-fixed"; pinctrl-names = "default";
enable-active-high; pinctrl-0 = <&pinctrl_microsom_brcm_reg>;
gpio = <&gpio3 19 0>; regulator-name = "brcm_reg";
pinctrl-names = "default"; regulator-min-microvolt = <3300000>;
pinctrl-0 = <&pinctrl_microsom_brcm_reg>; regulator-max-microvolt = <3300000>;
regulator-name = "brcm_reg"; startup-delay-us = <200000>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
startup-delay-us = <200000>;
};
}; };
usdhc1_pwrseq: usdhc1_pwrseq { usdhc1_pwrseq: usdhc1_pwrseq {
......
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