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

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

Merge tag 'stericsson-fixes-v4.1' of... 

Merge tag 'stericsson-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

Merge "Ux500 fixes" from Linus Walleij:

This fixes an MMC/SD configuration issue present for some time
in the Ux500 DT but triggered by proper error handling in v4.1-rc1.

* tag 'stericsson-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: Enable GPIO regulator for SD-card for snowball
  ARM: ux500: Enable GPIO regulator for SD-card for HREF boards
  ARM: ux500: Move GPIO regulator for SD-card into board DTSs
parents 1e5f9ed0 11133db7

arch/arm/boot/dts/ste-dbx5x0.dtsi

+0 −17
Original line number Diff line number Diff line
@@ -1017,23 +1017,6 @@ 
			status = "disabled";

		};



		vmmci: regulator-gpio {

			compatible = "regulator-gpio";



			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2900000>;

			regulator-name = "mmci-reg";

			regulator-type = "voltage";



			startup-delay-us = <100>;

			enable-active-high;



			states = <1800000 0x1

				  2900000 0x0>;



			status = "disabled";

		};



		mcde@a0350000 {

			compatible = "stericsson,mcde";

			reg = <0xa0350000 0x1000>, /* MCDE */

arch/arm/boot/dts/ste-href.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -111,6 +111,21 @@ 
			pinctrl-1 = <&i2c3_sleep_mode>;

		};



		vmmci: regulator-gpio {

			compatible = "regulator-gpio";



			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2900000>;

			regulator-name = "mmci-reg";

			regulator-type = "voltage";



			startup-delay-us = <100>;

			enable-active-high;



			states = <1800000 0x1

				  2900000 0x0>;

		};



		// External Micro SD slot

		sdi0_per1@80126000 {

			arm,primecell-periphid = <0x10480180>;

arch/arm/boot/dts/ste-snowball.dts

+13 −0
Original line number Diff line number Diff line
@@ -146,8 +146,21 @@ 
		};



		vmmci: regulator-gpio {

			compatible = "regulator-gpio";



			gpios = <&gpio7 4 0x4>;

			enable-gpio = <&gpio6 25 0x4>;



			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2900000>;

			regulator-name = "mmci-reg";

			regulator-type = "voltage";



			startup-delay-us = <100>;

			enable-active-high;



			states = <1800000 0x1

				  2900000 0x0>;

		};



		// External Micro SD slot