Commit 831bbbeb authored Mar 15, 2013 by Arnd Bergmann

Merge tag 'ux500-dt-fixes' of...

Merge tag 'ux500-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/fixes-non-critical

From Linus Walleij <linus.walleij@linaro.org>:

Ux500 Device Tree fixes
All are necessary to make a proper DT boot on the v3.9
series:
- IRQ edges.
- Register defines.
- FSMC clock.
- Ethernet clk fixup (one patch to drivers/net ACKed by
  David Miller)
- Proper IOS and regulator voltages for MMCI.
- AB8500 GPIOs restored after they were fixed in the v3.9
  merge window from the pinctrl tree.
- There is also a minor cleanup in the platform code, but it
  is strongly connected to the other patches.

* tag 'ux500-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: allow Snowball access to the AB8500 GPIO pins
  ARM: ux500: enable AB8500 GPIO for HREF
  ARM: ux500: Remove traces of the ios_handler from platform code
  ARM: ux500: Use the GPIO regulator framework for SDI0's 'en' and 'vsel'
  ARM: ux500: Setup correct settling time for the MMCI regulator
  ARM: ux500: Use the correct name when supplying a GPIO enable pin
  ARM: ux500: Specify which IOS regulator to use for MMCI
  ARM: ux500: Specify the ux5x0 MMCI regulator's on/off GPIO as high-enable
  ARM: ux500: Set correct MMCI regulator voltages in the ux5x0 Device Tree
  mmc: mmci: Move ios_handler functionality into the driver
  net/smsc911x: Provide common clock functionality
  clk: ux500: Provide an alias for the SMSC911x Ethernet chip
  clk: ux500: Ensure the FMSC clock is obtainable
  ARM: ux500: Provide a means to obtain the SMSC9115 clock when DT is enabled
  ARM: ux500: Include the PRCMU's Secure Registers in DB8500's DT
  ARM: ux500: Change IRQ from low-to-high edge triggered to high-to-low

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents f6161aa1 924e82da

arch/arm/boot/dts/dbx5x0.dtsi

+5 −2

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@

		prcmu: prcmu@80157000 {
		compatible = "stericsson,db8500-prcmu";
		reg = <0x80157000 0x1000>;
		reg = <0x80157000 0x2000>;
		reg-names = "prcmu";
		interrupts = <0 47 0x4>;
		#address-cells = <1>;
		@@ -675,10 +675,13 @@
		compatible = "regulator-gpio";

		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <2600000>;
		regulator-max-microvolt = <2900000>;
		regulator-name = "mmci-reg";
		regulator-type = "voltage";

		startup-delay-us = <100>;
		enable-active-high;

		states = <1800000 0x1
		2900000 0x0>;

arch/arm/boot/dts/href.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@
		mmc-cap-sd-highspeed;
		mmc-cap-mmc-highspeed;
		vmmc-supply = <&ab8500_ldo_aux3_reg>;
		vqmmc-supply = <&vmmci>;

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

arch/arm/boot/dts/hrefprev60.dts

+9 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,14 @@
		};

		soc-u9500 {
		prcmu@80157000 {
		ab8500@5 {
		ab8500-gpio {
		compatible = "stericsson,ab8500-gpio";
		};
		};
		};

		i2c@80004000 {
		tps61052@33 {
		compatible = "tps61052";
		@@ -40,7 +48,7 @@

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

		status = "okay";
		};

arch/arm/boot/dts/snowball.dts

+4 −0

Original line number	Diff line number	Diff line
		@@ -299,6 +299,10 @@
		};

		ab8500@5 {
		ab8500-gpio {
		compatible = "stericsson,ab8500-gpio";
		};

		ab8500-regulators {
		ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
		regulator-name = "V-DISPLAY";

arch/arm/boot/dts/stuib.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		stmpe1601: stmpe1601@40 {
		compatible = "st,stmpe1601";
		reg = <0x40>;
		interrupts = <26 0x1>;
		interrupts = <26 0x2>;
		interrupt-parent = <&gpio6>;
		interrupt-controller;