diff options
author | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 10:45:04 -0400 |
---|---|---|
committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 10:45:04 -0400 |
commit | 4297103560b4c5aba904e4711e982a039619f1f6 (patch) | |
tree | 772c527706c8d7677d79390ac3336af11bcc34e2 /Documentation | |
parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
parent | 8ceffa7c4a4c378d8e371fe2f444656e75390b34 (diff) |
Merge tag 'spi-3.6' into v3.5-rc7-dt-v3
spi: Updates for 3.6
Since Grant is even more specacularly busy than usual for the time being
I've been collecting SPI patches for him for this release - probably
things will revert back to Grant before the next release. There's
nothing too exciting here, mostly it's simple driver specific stuff:
- Add spi: to the modaliases of SPI devices to provide namespacing.
- A driver for AD-FMCOMMS1-EBZ.
- DT binding for Orion.
- Fixes and cleanups for i.MX, PL0022, OMAP and bitbang drivers.
There may be a few more fixes I've missed, people keep sending me new
things.
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/spi/spi-orion.txt | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/spi/spi-orion.txt b/Documentation/devicetree/bindings/spi/spi-orion.txt new file mode 100644 index 00000000000..a3ff50fc76f --- /dev/null +++ b/Documentation/devicetree/bindings/spi/spi-orion.txt | |||
@@ -0,0 +1,19 @@ | |||
1 | Marvell Orion SPI device | ||
2 | |||
3 | Required properties: | ||
4 | - compatible : should be "marvell,orion-spi". | ||
5 | - reg : offset and length of the register set for the device | ||
6 | - cell-index : Which of multiple SPI controllers is this. | ||
7 | Optional properties: | ||
8 | - interrupts : Is currently not used. | ||
9 | |||
10 | Example: | ||
11 | spi@10600 { | ||
12 | compatible = "marvell,orion-spi"; | ||
13 | #address-cells = <1>; | ||
14 | #size-cells = <0>; | ||
15 | cell-index = <0>; | ||
16 | reg = <0x10600 0x28>; | ||
17 | interrupts = <23>; | ||
18 | status = "disabled"; | ||
19 | }; | ||