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

Commit 9ebde306 authored Jan 08, 2014 by Olof Johansson

Merge tag 'ux500-devicetree-v3.14-2' of...

Merge tag 'ux500-devicetree-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

From Linus Walleij:
Ux500 device tree patches for v3.14, take 2
- Delete some unused U8540 UART platform data.
- MMC/SD-fixes from Ulf Hansson so everything works with
  the device tree again.

* tag 'ux500-devicetree-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: regulators: Remove dead code for SD-card regulator
  ARM: ux500: Configure regulator for I/O voltage for SD-card slot
  ARM: ux500: Refactor common DT configs for sdi[n] devices
  ARM: ux500: delete U8540 UART auxdata

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 708d2aa1 0e7a268a

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -124,8 +124,6 @@
		pinctrl-0 = <&sdi0_default_mode>;
		pinctrl-1 = <&sdi0_sleep_mode>;

		cd-gpios = <&tc3589x_gpio 3 0x4>;

		status = "okay";
		};

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -60,11 +60,14 @@
		pinctrl-0 = <&ssp0_hrefprev60_mode>;
		};

		// External Micro SD slot
		sdi0_per1@80126000 {
		cd-gpios = <&tc3589x_gpio 3 0x4>;
		};

		vmmci: regulator-gpio {
		gpios = <&tc3589x_gpio 18 0x4>;
		enable-gpio = <&tc3589x_gpio 17 0x4>;

		status = "okay";
		};

		pinctrl {

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

+3 −37

Original line number	Diff line number	Diff line
		@@ -19,46 +19,12 @@
		soc {
		// External Micro SD slot
		sdi0_per1@80126000 {
		arm,primecell-periphid = <0x10480180>;
		max-frequency = <100000000>;
		bus-width = <4>;
		mmc-cap-sd-highspeed;
		mmc-cap-mmc-highspeed;
		vmmc-supply = <&ab8500_ldo_aux3_reg>;

		cd-gpios = <&gpio2 31 0x4>; // 95

		status = "okay";
		};

		// WLAN SDIO channel
		sdi1_per2@80118000 {
		arm,primecell-periphid = <0x10480180>;
		max-frequency = <100000000>;
		bus-width = <4>;

		status = "okay";
		};

		// PoP:ed eMMC
		sdi2_per3@80005000 {
		arm,primecell-periphid = <0x10480180>;
		max-frequency = <100000000>;
		bus-width = <8>;
		mmc-cap-mmc-highspeed;

		status = "okay";
		};

		// On-board eMMC
		sdi4_per2@80114000 {
		arm,primecell-periphid = <0x10480180>;
		max-frequency = <100000000>;
		bus-width = <8>;
		mmc-cap-mmc-highspeed;
		vmmc-supply = <&ab8500_ldo_aux2_reg>;

		status = "okay";
		vmmci: regulator-gpio {
		gpios = <&gpio0 5 0x4>;
		enable-gpio = <&gpio5 9 0x4>;
		};

		pinctrl {

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -146,10 +146,8 @@
		};

		vmmci: regulator-gpio {
		gpios = <&gpio6 25 0x4>;
		enable-gpio = <&gpio7 4 0x4>;

		status = "okay";
		gpios = <&gpio7 4 0x4>;
		enable-gpio = <&gpio6 25 0x4>;
		};

		// External Micro SD slot

arch/arm/mach-ux500/board-mop500-regulators.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -30,20 +30,6 @@ struct regulator_init_data gpio_en_3v3_regulator = {
		.consumer_supplies = gpio_en_3v3_consumers,
		};

		static struct regulator_consumer_supply sdi0_reg_consumers[] = {
		REGULATOR_SUPPLY("vqmmc", "sdi0"),
		};

		struct regulator_init_data sdi0_reg_init_data = {
		.constraints = {
		.min_uV = 1800000,
		.max_uV = 2900000,
		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE\|REGULATOR_CHANGE_STATUS,
		},
		.num_consumer_supplies = ARRAY_SIZE(sdi0_reg_consumers),
		.consumer_supplies = sdi0_reg_consumers,
		};

		/*
		* TPS61052 regulator
		*/