diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 09:35:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 09:35:42 -0800 |
| commit | a6f243a4d6cbc9d7b0f63dcf7eb1e79f08880553 (patch) | |
| tree | bb47e613d17083e90d067a81a9b56b2f28a8d0e8 /Documentation | |
| parent | 440f39a4fda5d80f290e32f67bd084b63a41a436 (diff) | |
| parent | dea3eacd087cfa692ea20aafbfaf4827607afe45 (diff) | |
| download | linux-a6f243a4d6cbc9d7b0f63dcf7eb1e79f08880553.tar.gz linux-a6f243a4d6cbc9d7b0f63dcf7eb1e79f08880553.tar.bz2 linux-a6f243a4d6cbc9d7b0f63dcf7eb1e79f08880553.zip | |
Merge tag 'nmk-dt-on-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt
From Linus Walleij:
Nomadik Device Tree conversion rebased on ARM SoC cleanup branch
This patch set converts the Nomadik (mach-nomadik) to
Device Tree and delete the old board files, paving the
road for single zImage.
* tag 'nmk-dt-on-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: nomadik: get rid of <mach/hardware.h>
ARM: nomadik: delete old board files
ARM: nomadik: add I2C devices to the device tree
ARM: nomadik: migrate MMC/SD card support to device tree
ARM: nomadik: convert SMSC91x ethernet to device tree
ARM: nomadik: move GPIO and pinctrl to device tree
ARM: nomadik: add FSMC NAND
ARM: nomadik: move remaining PrimeCells to device tree
ARM: nomadik: move pin maps to cpu file
ARM: nomadik: initial devicetree support
ARM: nomadik: move last custom calls to pinctrl
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/ste-nomadik.txt | 27 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/fsmc-nand.txt | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/ste-nomadik.txt b/Documentation/devicetree/bindings/arm/ste-nomadik.txt new file mode 100644 index 000000000000..19bca04b81c9 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/ste-nomadik.txt @@ -0,0 +1,27 @@ +ST-Ericsson Nomadik Device Tree Bindings + +For various board the "board" node may contain specific properties +that pertain to this particular board, such as board-specific GPIOs. + +Boards with the Nomadik SoC include: + +S8815 "MiniKit" manufactured by Calao Systems: + +Required root node property: + +compatible="calaosystems,usb-s8815"; + +Required node: usb-s8815 + +Example: + +usb-s8815 { + ethernet-gpio { + gpios = <&gpio3 19 0x1>; + interrupts = <19 0x1>; + interrupt-parent = <&gpio3>; + }; + mmcsd-gpio { + gpios = <&gpio3 16 0x1>; + }; +}; diff --git a/Documentation/devicetree/bindings/mtd/fsmc-nand.txt b/Documentation/devicetree/bindings/mtd/fsmc-nand.txt index e3ea32e7de3e..2240ac09f6ba 100644 --- a/Documentation/devicetree/bindings/mtd/fsmc-nand.txt +++ b/Documentation/devicetree/bindings/mtd/fsmc-nand.txt @@ -1,7 +1,7 @@ * FSMC NAND Required properties: -- compatible : "st,spear600-fsmc-nand" +- compatible : "st,spear600-fsmc-nand", "stericsson,fsmc-nand" - reg : Address range of the mtd chip - reg-names: Should contain the reg names "fsmc_regs", "nand_data", "nand_addr" and "nand_cmd" |