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

Commit 591d07bf authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Lee Jones:

* 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500: (31 commits)
  ARM: ux500: Convert DT_MACHINE_START to use SMP operations
  ARM: ux500: CONFIG: Enable GPIO Regulators
  ARM: ux500: Change the type of interrupt to something compatible
  ARM: ux500: Add node for the MMC GPIO regulator
  ARM: ux500: List DT compatibility using platform names rather than by board
  ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic
  ARM: ux500: Rename references to the ccu9540 dev board accordingly
  ARM: ux500: Enable all MMC devices on the u9540 when booting with DT
  ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree
  ARM: ux500: Add UART support to the u9540 Device Tree
  ARM: ux500: Add support for ST-Ericsson's u9540 SoC
  ARM: ux500: Add skeleton DTS file for the u9540
  ARM: ux500: Remove unused board compatible string
  ARM: ux500: Supply the STMPE keypad Device Tree node to the STUIB DT
  ARM: ux500: Apply a Device Tree node for the STMPE MFD
  ARM: ux500: Stop informing the regulator subsystem that we have full constraints
  ARM: ux500: Add all bu21013 touch screen components to supported Device Trees
  ARM: ux500: Stop calling the UIB init function when using Device Tree
  ARM: ux500: Create a new Device Tree include file for boards supporting STUIBs
  Documentation: Detail permitted DT properties for the BU21013 Touch Screen
  ...
parents 3d70f8c6 f44c5fd1

Documentation/devicetree/bindings/input/touchscreen/bu21013.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
* Rohm BU21013 Touch Screen



Required properties:

 - compatible              : "rohm,bu21013_tp"

 - reg                     :  I2C device address



Optional properties:

 - touch-gpio              : GPIO pin registering a touch event

 - <supply_name>-supply    : Phandle to a regulator supply

 - rohm,touch-max-x        : Maximum outward permitted limit in the X axis

 - rohm,touch-max-y        : Maximum outward permitted limit in the Y axis

 - rohm,flip-x             : Flip touch coordinates on the X axis

 - rohm,flip-y             : Flip touch coordinates on the Y axis



Example:



	i2c@80110000 {

		bu21013_tp@0x5c {

			compatible = "rohm,bu21013_tp";

			reg = <0x5c>;

			touch-gpio = <&gpio2 20 0x4>;

			avdd-supply = <&ab8500_ldo_aux1_reg>;



			rohm,touch-max-x = <384>;

			rohm,touch-max-y = <704>;

			rohm,flip-y;

		};

	};

arch/arm/boot/dts/ccu9540.dts

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 ST-Ericsson AB

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/dts-v1/;

/include/ "dbx5x0.dtsi"



/ {

	model = "ST-Ericsson CCU9540 platform with Device Tree";

	compatible = "st-ericsson,ccu9540", "st-ericsson,u9540";



	memory {

		reg = <0x00000000 0x20000000>;

	};



	soc-u9500 {

		uart@80120000 {

			status = "okay";

		};



		uart@80121000 {

			status = "okay";

		};



		uart@80007000 {

			status = "okay";

		};



		// 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  = <&gpio7 6 0x4>; // 230

			cd-inverted;



			status = "okay";

		};





		// WLAN SDIO channel

		sdi1_per2@80118000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <50000000>;

			bus-width = <4>;



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

		};

	};

};

arch/arm/boot/dts/dbx5x0.dtsi

+20 −37
Original line number Diff line number Diff line
@@ -209,123 +209,103 @@ 
				// DB8500_REGULATOR_VAPE

				db8500_vape_reg: db8500_vape {

					regulator-compatible = "db8500_vape";

					regulator-name = "db8500-vape";

					regulator-always-on;

				};



				// DB8500_REGULATOR_VARM

				db8500_varm_reg: db8500_varm {

					regulator-compatible = "db8500_varm";

					regulator-name = "db8500-varm";

				};



				// DB8500_REGULATOR_VMODEM

				db8500_vmodem_reg: db8500_vmodem {

					regulator-compatible = "db8500_vmodem";

					regulator-name = "db8500-vmodem";

				};



				// DB8500_REGULATOR_VPLL

				db8500_vpll_reg: db8500_vpll {

					regulator-compatible = "db8500_vpll";

					regulator-name = "db8500-vpll";

				};



				// DB8500_REGULATOR_VSMPS1

				db8500_vsmps1_reg: db8500_vsmps1 {

					regulator-compatible = "db8500_vsmps1";

					regulator-name = "db8500-vsmps1";

				};



				// DB8500_REGULATOR_VSMPS2

				db8500_vsmps2_reg: db8500_vsmps2 {

					regulator-compatible = "db8500_vsmps2";

					regulator-name = "db8500-vsmps2";

				};



				// DB8500_REGULATOR_VSMPS3

				db8500_vsmps3_reg: db8500_vsmps3 {

					regulator-compatible = "db8500_vsmps3";

					regulator-name = "db8500-vsmps3";

				};



				// DB8500_REGULATOR_VRF1

				db8500_vrf1_reg: db8500_vrf1 {

					regulator-compatible = "db8500_vrf1";

					regulator-name = "db8500-vrf1";

				};



				// DB8500_REGULATOR_SWITCH_SVAMMDSP

				db8500_sva_mmdsp_reg: db8500_sva_mmdsp {

					regulator-compatible = "db8500_sva_mmdsp";

					regulator-name = "db8500-sva-mmdsp";

				};



				// DB8500_REGULATOR_SWITCH_SVAMMDSPRET

				db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {

					regulator-compatible = "db8500_sva_mmdsp_ret";

					regulator-name = "db8500-sva-mmdsp-ret";

				};



				// DB8500_REGULATOR_SWITCH_SVAPIPE

				db8500_sva_pipe_reg: db8500_sva_pipe {

					regulator-compatible = "db8500_sva_pipe";

					regulator-name = "db8500_sva_pipe";

				};



				// DB8500_REGULATOR_SWITCH_SIAMMDSP

				db8500_sia_mmdsp_reg: db8500_sia_mmdsp {

					regulator-compatible = "db8500_sia_mmdsp";

					regulator-name = "db8500_sia_mmdsp";

				};



				// DB8500_REGULATOR_SWITCH_SIAMMDSPRET

				db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {

					regulator-name = "db8500-sia-mmdsp-ret";

				};



				// DB8500_REGULATOR_SWITCH_SIAPIPE

				db8500_sia_pipe_reg: db8500_sia_pipe {

					regulator-compatible = "db8500_sia_pipe";

					regulator-name = "db8500-sia-pipe";

				};



				// DB8500_REGULATOR_SWITCH_SGA

				db8500_sga_reg: db8500_sga {

					regulator-compatible = "db8500_sga";

					regulator-name = "db8500-sga";

					vin-supply = <&db8500_vape_reg>;

				};



				// DB8500_REGULATOR_SWITCH_B2R2_MCDE

				db8500_b2r2_mcde_reg: db8500_b2r2_mcde {

					regulator-compatible = "db8500_b2r2_mcde";

					regulator-name = "db8500-b2r2-mcde";

					vin-supply = <&db8500_vape_reg>;

				};



				// DB8500_REGULATOR_SWITCH_ESRAM12

				db8500_esram12_reg: db8500_esram12 {

					regulator-compatible = "db8500_esram12";

					regulator-name = "db8500-esram12";

				};



				// DB8500_REGULATOR_SWITCH_ESRAM12RET

				db8500_esram12_ret_reg: db8500_esram12_ret {

					regulator-compatible = "db8500_esram12_ret";

					regulator-name = "db8500-esram12-ret";

				};



				// DB8500_REGULATOR_SWITCH_ESRAM34

				db8500_esram34_reg: db8500_esram34 {

					regulator-compatible = "db8500_esram34";

					regulator-name = "db8500-esram34";

				};



				// DB8500_REGULATOR_SWITCH_ESRAM34RET

				db8500_esram34_ret_reg: db8500_esram34_ret {

					regulator-compatible = "db8500_esram34_ret";

					regulator-name = "db8500-esram34-ret";

				};

			};
@@ -404,7 +384,6 @@ 
					// supplies to the display/camera

					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

						regulator-compatible = "ab8500_ldo_aux1";

						regulator-name = "V-DISPLAY";

						regulator-min-microvolt = <2500000>;

						regulator-max-microvolt = <2900000>;

						regulator-boot-on;
@@ -415,7 +394,6 @@ 
					// supplies to the on-board eMMC

					ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {

						regulator-compatible = "ab8500_ldo_aux2";

						regulator-name = "V-eMMC1";

						regulator-min-microvolt = <1100000>;

						regulator-max-microvolt = <3300000>;

					};
@@ -423,7 +401,6 @@ 
					// supply for VAUX3; SDcard slots

					ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {

						regulator-compatible = "ab8500_ldo_aux3";

						regulator-name = "V-MMC-SD";

						regulator-min-microvolt = <1100000>;

						regulator-max-microvolt = <3300000>;

					};
@@ -431,49 +408,41 @@ 
					// supply for v-intcore12; VINTCORE12 LDO

					ab8500_ldo_initcore_reg: ab8500_ldo_initcore {

						regulator-compatible = "ab8500_ldo_initcore";

						regulator-name = "V-INTCORE";

					};



					// supply for tvout; gpadc; TVOUT LDO

					ab8500_ldo_tvout_reg: ab8500_ldo_tvout {

						regulator-compatible = "ab8500_ldo_tvout";

						regulator-name = "V-TVOUT";

					};



					// supply for ab8500-usb; USB LDO

					ab8500_ldo_usb_reg: ab8500_ldo_usb {

						regulator-compatible = "ab8500_ldo_usb";

						regulator-name = "dummy";

					};



					// supply for ab8500-vaudio; VAUDIO LDO

					ab8500_ldo_audio_reg: ab8500_ldo_audio {

						regulator-compatible = "ab8500_ldo_audio";

						regulator-name = "V-AUD";

					};



					// supply for v-anamic1 VAMic1-LDO

					ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {

						regulator-compatible = "ab8500_ldo_anamic1";

						regulator-name = "V-AMIC1";

					};



					// supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1

					ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {

						regulator-compatible = "ab8500_ldo_amamic2";

						regulator-name = "V-AMIC2";

					};



					// supply for v-dmic; VDMIC LDO

					ab8500_ldo_dmic_reg: ab8500_ldo_dmic {

						regulator-compatible = "ab8500_ldo_dmic";

						regulator-name = "V-DMIC";

					};



					// supply for U8500 CSI/DSI; VANA LDO

					ab8500_ldo_ana_reg: ab8500_ldo_ana {

						regulator-compatible = "ab8500_ldo_ana";

						regulator-name = "V-CSI/DSI";

					};

				};

			};
@@ -577,42 +546,42 @@ 
			status = "disabled";

		};



		sdi@80126000 {

		sdi0_per1@80126000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80126000 0x1000>;

			interrupts = <0 60 0x4>;

			status = "disabled";

		};



		sdi@80118000 {

		sdi1_per2@80118000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80118000 0x1000>;

			interrupts = <0 50 0x4>;

			status = "disabled";

		};



		sdi@80005000 {

		sdi2_per3@80005000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80005000 0x1000>;

			interrupts = <0 41 0x4>;

			status = "disabled";

		};



		sdi@80119000 {

		sdi3_per2@80119000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80119000 0x1000>;

			interrupts = <0 59 0x4>;

			status = "disabled";

		};



		sdi@80114000 {

		sdi4_per2@80114000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80114000 0x1000>;

			interrupts = <0 99 0x4>;

			status = "disabled";

		};



		sdi@80008000 {

		sdi5_per3@80008000 {

			compatible = "arm,pl18x", "arm,primecell";

			reg = <0x80008000 0x1000>;

			interrupts = <0 100 0x4>;
@@ -660,5 +629,19 @@ 
			ranges = <0 0x50000000 0x4000000>;

			status = "disabled";

		};



		vmmci: regulator-gpio {

			compatible = "regulator-gpio";



			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2600000>;

			regulator-name = "mmci-reg";

			regulator-type = "voltage";



			gpios = <&tc3589x_gpio 18 0x4>;

			gpio-enable = <&tc3589x_gpio 17 0x4>;

			states = <1800000 0x1

				  2900000 0x0>;

		};

	};

};

arch/arm/boot/dts/href.dtsi

0 → 100644
+273 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 ST-Ericsson AB

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/include/ "dbx5x0.dtsi"



/ {

	memory {

		reg = <0x00000000 0x20000000>;

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button@1 {

			linux,code = <11>;

			label = "SFH7741 Proximity Sensor";

		};

	};



	soc-u9500 {

		uart@80120000 {

			status = "okay";

		};



		uart@80121000 {

			status = "okay";

		};



		uart@80007000 {

			status = "okay";

		};



		i2c@80004000 {

			tc3589x@42 {

				compatible = "tc3589x";

				reg = <0x42>;

				interrupt-parent = <&gpio6>;

				interrupts = <25 0x1>;



				interrupt-controller;

				#interrupt-cells = <2>;



				tc3589x_gpio: tc3589x_gpio {

					compatible = "tc3589x-gpio";

					interrupts = <0 0x1>;



					interrupt-controller;

					#interrupt-cells = <2>;

					gpio-controller;

					#gpio-cells = <2>;

				};

			};

		};



		i2c@80128000 {

			lp5521@0x33 {

				compatible = "lp5521";

				reg = <0x33>;

			};



			lp5521@0x34 {

				compatible = "lp5521";

				reg = <0x34>;

			};



			bh1780@0x29 {

				compatible = "rohm,bh1780gli";

				reg = <0x33>;

			};

		};



		// External Micro SD slot

		sdi0_per1@80126000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <50000000>;

			bus-width = <4>;

			mmc-cap-sd-highspeed;

			mmc-cap-mmc-highspeed;

			vmmc-supply = <&ab8500_ldo_aux3_reg>;



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



			status = "okay";

		};



		// WLAN SDIO channel

		sdi1_per2@80118000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <50000000>;

			bus-width = <4>;



			status = "okay";

		};



		// PoP:ed eMMC

		sdi2_per3@80005000 {

			arm,primecell-periphid = <0x10480180>;

			max-frequency = <50000000>;

			bus-width = <8>;

			mmc-cap-mmc-highspeed;



			status = "okay";

		};



		// On-board eMMC

		sdi4_per2@80114000 {

			arm,primecell-periphid = <0x10480180>;

		        max-frequency = <50000000>;

			bus-width = <8>;

			mmc-cap-mmc-highspeed;

			vmmc-supply = <&ab8500_ldo_aux2_reg>;



			status = "okay";

		};



		sound {

			compatible = "stericsson,snd-soc-mop500";



			stericsson,cpu-dai = <&msp1 &msp3>;

			stericsson,audio-codec = <&codec>;

		};



		msp1: msp@80124000 {

			status = "okay";

		};



		msp3: msp@80125000 {

			status = "okay";

		};



		prcmu@80157000 {

			db8500-prcmu-regulators {

				db8500_vape_reg: db8500_vape {

					regulator-name = "db8500-vape";

				};



				db8500_varm_reg: db8500_varm {

					regulator-name = "db8500-varm";

				};



				db8500_vmodem_reg: db8500_vmodem {

					regulator-name = "db8500-vmodem";

				};



				db8500_vpll_reg: db8500_vpll {

					regulator-name = "db8500-vpll";

				};



				db8500_vsmps1_reg: db8500_vsmps1 {

					regulator-name = "db8500-vsmps1";

				};



				db8500_vsmps2_reg: db8500_vsmps2 {

					regulator-name = "db8500-vsmps2";

				};



				db8500_vsmps3_reg: db8500_vsmps3 {

					regulator-name = "db8500-vsmps3";

				};



				db8500_vrf1_reg: db8500_vrf1 {

					regulator-name = "db8500-vrf1";

				};



				db8500_sva_mmdsp_reg: db8500_sva_mmdsp {

					regulator-name = "db8500-sva-mmdsp";

				};



				db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {

					regulator-name = "db8500-sva-mmdsp-ret";

				};



				db8500_sva_pipe_reg: db8500_sva_pipe {

					regulator-name = "db8500_sva_pipe";

				};



				db8500_sia_mmdsp_reg: db8500_sia_mmdsp {

					regulator-name = "db8500_sia_mmdsp";

				};



				db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {

					regulator-name = "db8500-sia-mmdsp-ret";

				};



				db8500_sia_pipe_reg: db8500_sia_pipe {

					regulator-name = "db8500-sia-pipe";

				};



				db8500_sga_reg: db8500_sga {

					regulator-name = "db8500-sga";

				};



				db8500_b2r2_mcde_reg: db8500_b2r2_mcde {

					regulator-name = "db8500-b2r2-mcde";

				};



				db8500_esram12_reg: db8500_esram12 {

					regulator-name = "db8500-esram12";

				};



				db8500_esram12_ret_reg: db8500_esram12_ret {

					regulator-name = "db8500-esram12-ret";

				};



				db8500_esram34_reg: db8500_esram34 {

					regulator-name = "db8500-esram34";

				};



				db8500_esram34_ret_reg: db8500_esram34_ret {

					regulator-name = "db8500-esram34-ret";

				};

			};



			ab8500@5 {

				ab8500-regulators {

					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {

						regulator-name = "V-DISPLAY";

					};



					ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {

						regulator-name = "V-eMMC1";

					};



					ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {

						regulator-name = "V-MMC-SD";

					};



					ab8500_ldo_initcore_reg: ab8500_ldo_initcore {

						regulator-name = "V-INTCORE";

					};



					ab8500_ldo_tvout_reg: ab8500_ldo_tvout {

						regulator-name = "V-TVOUT";

					};



					ab8500_ldo_usb_reg: ab8500_ldo_usb {

						regulator-name = "dummy";

					};



					ab8500_ldo_audio_reg: ab8500_ldo_audio {

						regulator-name = "V-AUD";

					};



					ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {

						regulator-name = "V-AMIC1";

					};



					ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {

						regulator-name = "V-AMIC2";

					};



					ab8500_ldo_dmic_reg: ab8500_ldo_dmic {

						regulator-name = "V-DMIC";

					};



					ab8500_ldo_ana_reg: ab8500_ldo_ana {

						regulator-name = "V-CSI/DSI";

					};

				};

			};

		};

	};

};

arch/arm/boot/dts/hrefprev60.dts

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 ST-Ericsson AB

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/dts-v1/;

/include/ "dbx5x0.dtsi"

/include/ "href.dtsi"

/include/ "stuib.dtsi"



/ {

	model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";

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



	gpio_keys {

		button@1 {

			gpios = <&tc3589x_gpio 7 0x4>;

		};

	};



	soc-u9500 {

		i2c@80004000 {

			tps61052@33 {

				compatible = "tps61052";

				reg = <0x33>;

			};

		};



		i2c@80110000 {

			bu21013_tp@0x5c {

				reset-gpio = <&tc3589x_gpio 13 0x4>;

			};

		};

	};

};