Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b85b634e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

arch/arm/boot/dts/imx6qdl-sabresd.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
			regulator-max-microvolt = <5000000>;

			gpio = <&gpio3 22 0>;

			enable-active-high;

			vin-supply = <&swbst_reg>;

		};



		reg_usb_h1_vbus: regulator@1 {
@@ -45,6 +46,7 @@ 
			regulator-max-microvolt = <5000000>;

			gpio = <&gpio1 29 0>;

			enable-active-high;

			vin-supply = <&swbst_reg>;

		};



		reg_audio: regulator@2 {

arch/arm/boot/dts/imx6sl-evk.dts

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
			regulator-max-microvolt = <5000000>;

			gpio = <&gpio4 0 0>;

			enable-active-high;

			vin-supply = <&swbst_reg>;

		};



		reg_usb_otg2_vbus: regulator@1 {
@@ -62,6 +63,7 @@ 
			regulator-max-microvolt = <5000000>;

			gpio = <&gpio4 2 0>;

			enable-active-high;

			vin-supply = <&swbst_reg>;

		};



		reg_aud3v: regulator@2 {