Commit 5282da45 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: dts: ux500: Push VMMCI down to each tree 



The setting of VMMCI differs so much between different
boards that we need to handle it on a per-board basis
rather that complicating things by overriding stuff from
the included DTSI:s. Push it down into top-level tree
instead.

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

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

+0 −15
Original line number Diff line number Diff line
@@ -113,21 +113,6 @@ i2c@80110000 { 
			status = "okay";

		};



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

		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>;



			states = <1800000 0x1

				  2900000 0x0>;

		};



		// External Micro SD slot

		sdi0_per1@80126000 {

			arm,primecell-periphid = <0x10480180>;

arch/arm/boot/dts/ste-href520-tvk.dts

+37 −5
Original line number Diff line number Diff line
@@ -12,11 +12,43 @@ / { 
	model = "ST-Ericsson HREF520 and TVK1281618 UIB";

	compatible = "st-ericsson,href520", "st-ericsson,u8500";



	soc {



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

	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>;



		states = <1800000 0x1

			  2900000 0x0>;



		gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;

		enable-gpio = <&gpio2 14 GPIO_ACTIVE_HIGH>;

		enable-active-high;



		pinctrl-names = "default";

		pinctrl-0 = <&vmmci_default_mode>;

	};

};



&pinctrl {

	vmmci {

		vmmci_default_mode: vmmc_default {

			/* VMMCI level-shifter enable */

			default_href520_cfg1 {

				pins = "GPIO78_F4";

				ste,config = <&gpio_out_hi>;

			};

			/* VMMCI level-shifter voltage select */

			default_href520_cfg2 {

				pins = "GPIO5_AG6";

				ste,config = <&gpio_out_hi>;

			};

		};

	};

};

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

+19 −0
Original line number Diff line number Diff line
@@ -12,6 +12,25 @@ / { 
	model = "ST-Ericsson HREF (pre-v60) and ST UIB";

	compatible = "st-ericsson,mop500", "st-ericsson,u8500";



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

	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>;



		states = <1800000 0x1

			  2900000 0x0>;



		gpios = <&tc3589x_gpio 18 GPIO_ACTIVE_HIGH>;

		enable-gpio = <&tc3589x_gpio 17 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	soc {

		/* Reset line for the BU21013 touchscreen */

		i2c@80110000 {

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

+19 −0
Original line number Diff line number Diff line
@@ -11,4 +11,23 @@ 
/ {

	model = "ST-Ericsson HREF (pre-v60) and TVK1281618 UIB";

	compatible = "st-ericsson,mop500", "st-ericsson,u8500";



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

	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>;



		states = <1800000 0x1

			  2900000 0x0>;



		gpios = <&tc3589x_gpio 18 GPIO_ACTIVE_HIGH>;

		enable-gpio = <&tc3589x_gpio 17 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};

};

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

+0 −6
Original line number Diff line number Diff line
@@ -65,12 +65,6 @@ sdi0_per1@80126000 { 
			cd-gpios  = <&tc3589x_gpio 3 GPIO_ACTIVE_HIGH>;

		};



		vmmci: regulator-gpio {

			gpios = <&tc3589x_gpio 18 GPIO_ACTIVE_HIGH>;

			enable-gpio = <&tc3589x_gpio 17 GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};



		pinctrl {

			/* Set this up using hogs */

			pinctrl-names = "default";