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

Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt 

From Lee Jones <lee.jones@linaro.org>:

* 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500

:
  ARM: ux500: Remove PMU platform registration when booting with DT
  ARM: ux500: Remove temporary snowball_of_platform_devs enablement structure
  ARM: ux500: Ensure vendor specific properties have the vendor's identifier
  pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes
  ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled
  ARM: ux500: Enable the AB8500 RTC for all DT:ed DB8500 based devices
  ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree
  ARM: ux500: Apply ab8500-debug node do the db8500 DT structure
  ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices
  ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm
  ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl
  ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT
  ARM: ux500: Enable LED heartbeat functionality on Snowball
  ARM: ux500: Add support for input/ponkey into the db8500's Device Tree
  ARM: ux500: Add a ab8500-gpadc node to the db8500 Device Tree
  ARM: ux500: Enable the user LED on Snowball via Device Tree
  ARM: ux500: Kconfig: Compile in leds-gpio support for Snowball
  ARM: ux500: Provide auxdata to be used as name base clock search for nmk-i2c
  ARM: ux500: Remove unused i2c platform_data initialisation code
  ARM: ux500: Enable Device Tree support mmci for Snowball

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a89e14ed da384870

Documentation/devicetree/bindings/gpio/gpio-nmk.txt

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ Example: 
                        #gpio-cells = <2>;

                        gpio-controller;

                        interrupt-controller;

                        supports-sleepmode;

                        st,supports-sleepmode;

                        gpio-bank = <1>;

                };

arch/arm/boot/dts/db8500.dtsi

+67 −10
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
		};



		rtc@80154000 {

			compatible = "stericsson,db8500-rtc";

			compatible = "arm,rtc-pl031", "arm,primecell";

			reg = <0x80154000 0x1000>;

			interrupts = <0 18 0x4>;

		};
@@ -60,7 +60,7 @@ 
			interrupts = <0 119 0x4>;

			interrupt-controller;

			#interrupt-cells = <2>;

			supports-sleepmode;

			st,supports-sleepmode;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-bank = <0>;
@@ -73,7 +73,7 @@ 
			interrupts = <0 120 0x4>;

			interrupt-controller;

			#interrupt-cells = <2>;

			supports-sleepmode;

			st,supports-sleepmode;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-bank = <1>;
@@ -86,7 +86,7 @@ 
			interrupts = <0 121 0x4>;

			interrupt-controller;

			#interrupt-cells = <2>;

			supports-sleepmode;

			st,supports-sleepmode;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-bank = <2>;
@@ -99,7 +99,7 @@ 
			interrupts = <0 122 0x4>;

			interrupt-controller;

			#interrupt-cells = <2>;

			supports-sleepmode;

			st,supports-sleepmode;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-bank = <3>;
@@ -112,7 +112,7 @@ 
			interrupts = <0 123 0x4>;

			interrupt-controller;

			#interrupt-cells = <2>;

			supports-sleepmode;

			st,supports-sleepmode;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-bank = <4>;
@@ -125,7 +125,7 @@ 
			interrupts = <0 124 0x4>;

			interrupt-controller;

			#interrupt-cells = <2>;

			supports-sleepmode;

			st,supports-sleepmode;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-bank = <5>;
@@ -138,7 +138,7 @@ 
			interrupts = <0 125 0x4>;

			interrupt-controller;

			#interrupt-cells = <2>;

			supports-sleepmode;

			st,supports-sleepmode;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-bank = <6>;
@@ -151,7 +151,7 @@ 
			interrupts = <0 126 0x4>;

			interrupt-controller;

			#interrupt-cells = <2>;

			supports-sleepmode;

			st,supports-sleepmode;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-bank = <7>;
@@ -164,7 +164,7 @@ 
			interrupts = <0 127 0x4>;

			interrupt-controller;

			#interrupt-cells = <2>;

			supports-sleepmode;

			st,supports-sleepmode;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-bank = <8>;
@@ -312,6 +312,63 @@ 
				compatible = "stericsson,ab8500";

				reg = <5>; /* mailbox 5 is i2c */

				interrupts = <0 40 0x4>;

				interrupt-controller;

				#interrupt-cells = <2>;



				ab8500-rtc {

					compatible = "stericsson,ab8500-rtc";

					interrupts = <17 0x4

					              18 0x4>;

					interrupt-names = "60S", "ALARM";

				};



				ab8500-gpadc {

					compatible = "stericsson,ab8500-gpadc";

					interrupts = <32 0x4

						      39 0x4>;

					interrupt-names = "HW_CONV_END", "SW_CONV_END";

					vddadc-supply = <&ab8500_ldo_tvout_reg>;

				};



				ab8500-usb {

					compatible = "stericsson,ab8500-usb";

					interrupts = < 90 0x4

						       96 0x4

						       14 0x4

						       15 0x4

						       79 0x4

						       74 0x4

						       75 0x4>;

					interrupt-names = "ID_WAKEUP_R",

							  "ID_WAKEUP_F",

							  "VBUS_DET_F",

							  "VBUS_DET_R",

							  "USB_LINK_STATUS",

							  "USB_ADP_PROBE_PLUG",

							  "USB_ADP_PROBE_UNPLUG";

					vddulpivio18-supply = <&ab8500_ldo_initcore_reg>;

					v-ape-supply = <&db8500_vape_reg>;

					musb_1v8-supply = <&db8500_vsmps2_reg>;

				};



				ab8500-ponkey {

					compatible = "stericsson,ab8500-ponkey";

					interrupts = <6 0x4

						      7 0x4>;

					interrupt-names = "ONKEY_DBF", "ONKEY_DBR";

				};



				ab8500-sysctrl {

					compatible = "stericsson,ab8500-sysctrl";

				};



				ab8500-pwm {

					compatible = "stericsson,ab8500-pwm";

				};



				ab8500-debugfs {

					compatible = "stericsson,ab8500-debug";

				};



				ab8500-regulators {

					compatible = "stericsson,ab8500-regulator";

arch/arm/boot/dts/snowball.dts

+19 −2
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ 
		used-led {

			label = "user_led";

			gpios = <&gpio4 14 0x4>;

			default-state = "on";

			linux,default-trigger = "heartbeat";

		};

	};
@@ -101,15 +103,30 @@ 
			};

		};



		// External Micro SD slot

		sdi@80126000 {

			status = "enabled";

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <50000000>;

			bus-width = <8>;

			mmc-cap-mmc-highspeed;

			vmmc-supply = <&ab8500_ldo_aux3_reg>;



			#gpio-cells = <1>;

			cd-gpios  = <&gpio6 26 0x4>; // 218

			cd-inverted;



			status = "okay";

		};



		// On-board eMMC

		sdi@80114000 {

			status = "enabled";

			arm,primecell-periphid = <0x10480180>;

		        max-frequency = <50000000>;

			bus-width = <8>;

			mmc-cap-mmc-highspeed;

			vmmc-supply = <&ab8500_ldo_aux2_reg>;



			status = "okay";

		};



		uart@80120000 {

arch/arm/mach-ux500/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ config MACH_HREFV60 
config MACH_SNOWBALL

	bool "U8500 Snowball platform"

	select MACH_MOP500

	select LEDS_GPIO

	help

	  Include support for the snowball development platform.

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

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = { 
};

#endif



static struct mmci_platform_data mop500_sdi0_data = {

struct mmci_platform_data mop500_sdi0_data = {

	.ios_handler	= mop500_sdi0_ios_handler,

	.ocr_mask	= MMC_VDD_29_30,

	.f_max		= 50000000,
@@ -227,7 +227,7 @@ static struct stedma40_chan_cfg mop500_sdi4_dma_cfg_tx = { 
};

#endif



static struct mmci_platform_data mop500_sdi4_data = {

struct mmci_platform_data mop500_sdi4_data = {

	.ocr_mask	= MMC_VDD_29_30,

	.f_max		= 50000000,

	.capabilities	= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |

CRA Git | Maintained and supported by SUSTech CRA and CCSE