-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 ...
- Loading branch information
Showing
14 changed files
with
779 additions
and
281 deletions.
There are no files selected for viewing
28 changes: 28 additions & 0 deletions
28
Documentation/devicetree/bindings/input/touchscreen/bu21013.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| * 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; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * 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"; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.