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

Commit adef953b authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: dts: push MMC/SD to board and add comments 



This moves the enable-active-high setting from the SoC to the
board for the VMMCQ regulators. It should at least be in the
vicinity of the GPIO line it is defined for.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7ce7d89f

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

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

		};



		/* ST6G3244ME level translator for 1.8/2.9 V */

		vmmci: regulator-gpio {

			compatible = "regulator-gpio";
@@ -120,7 +121,6 @@ 
			regulator-type = "voltage";



			startup-delay-us = <100>;

			enable-active-high;



			states = <1800000 0x1

				  2900000 0x0>;

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

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
		vmmci: regulator-gpio {

			gpios = <&tc3589x_gpio 18 GPIO_ACTIVE_HIGH>;

			enable-gpio = <&tc3589x_gpio 17 GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};



		pinctrl {

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

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ 
		vmmci: regulator-gpio {

			gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;

			enable-gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};



		pinctrl {

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

+5 −1
Original line number Diff line number Diff line
@@ -216,11 +216,15 @@ 
			};

		};



		/* ST6G3244ME level translator for 1.8/2.9 V */

		vmmci: regulator-gpio {

			compatible = "regulator-gpio";



			/* GPIO228 SD_SEL */

			gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;

			/* GPIO217 MMC_EN */

			enable-gpio = <&gpio6 25 GPIO_ACTIVE_HIGH>;

			enable-active-high;



			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2900000>;
@@ -228,7 +232,6 @@ 
			regulator-type = "voltage";



			startup-delay-us = <100>;

			enable-active-high;



			states = <1800000 0x1

				  2900000 0x0>;
@@ -546,6 +549,7 @@ 
				sdi0_default_mode: sdi0_default {

					snowball_mux {

						function = "mc0";

						/* Add the DAT31 pin even if it is not really used */

						groups = "mc0dat31dir_a_1";

					};

					snowball_cfg1 {