Commit b85b634e authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'imx-fixes-4.0' of...

Merge tag 'imx-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

Pull "The i.MX fixes for 4.0" from Shawn Guo:

It includes a couple of i.MX6 dts fixes, which set an input supply to
vbus regulator.  Without the fixes, the voltage of vbus is incorrect
after system boots up.

* tag 'imx-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx6sl-evk: set swbst_reg as vbus's parent reg
  ARM: imx6qdl-sabresd: set swbst_reg as vbus's parent reg
parents 01f3e35f 2de9dd03
...@@ -35,6 +35,7 @@ reg_usb_otg_vbus: regulator@0 { ...@@ -35,6 +35,7 @@ reg_usb_otg_vbus: regulator@0 {
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio3 22 0>; gpio = <&gpio3 22 0>;
enable-active-high; enable-active-high;
vin-supply = <&swbst_reg>;
}; };
reg_usb_h1_vbus: regulator@1 { reg_usb_h1_vbus: regulator@1 {
...@@ -45,6 +46,7 @@ reg_usb_h1_vbus: regulator@1 { ...@@ -45,6 +46,7 @@ reg_usb_h1_vbus: regulator@1 {
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio1 29 0>; gpio = <&gpio1 29 0>;
enable-active-high; enable-active-high;
vin-supply = <&swbst_reg>;
}; };
reg_audio: regulator@2 { reg_audio: regulator@2 {
......
...@@ -52,6 +52,7 @@ reg_usb_otg1_vbus: regulator@0 { ...@@ -52,6 +52,7 @@ reg_usb_otg1_vbus: regulator@0 {
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio4 0 0>; gpio = <&gpio4 0 0>;
enable-active-high; enable-active-high;
vin-supply = <&swbst_reg>;
}; };
reg_usb_otg2_vbus: regulator@1 { reg_usb_otg2_vbus: regulator@1 {
...@@ -62,6 +63,7 @@ reg_usb_otg2_vbus: regulator@1 { ...@@ -62,6 +63,7 @@ reg_usb_otg2_vbus: regulator@1 {
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio4 2 0>; gpio = <&gpio4 2 0>;
enable-active-high; enable-active-high;
vin-supply = <&swbst_reg>;
}; };
reg_aud3v: regulator@2 { reg_aud3v: regulator@2 {
......
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