diff options
author | Geert Uytterhoeven <geert+renesas@linux-m68k.org> | 2014-02-25 05:21:08 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-02-27 05:33:47 -0500 |
commit | 32d3b2d1ddeafe105ab6f738fba427242141194e (patch) | |
tree | 66074650e2ae2eb772472b50ffcb62287dd61802 | |
parent | 4867147bcde8fa94f56fc6e8149c57ca65c4e5ed (diff) |
spi: sh-msiof: Improve bindings
Documentation:
- Add missing "interrupt-parent", "#address-cells", "#size-cells", and
"clocks" properties,
- Add missing default values for "num-cs", "renesas,tx-fifo-size" and
"renesas,rx-fifo-size",
- Add a reference to the pinctrl documentation.
Implementation:
- As "num-cs" is marked optional, provide a sensible default.
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | Documentation/devicetree/bindings/spi/sh-msiof.txt | 24 | ||||
-rw-r--r-- | drivers/spi/spi-sh-msiof.c | 2 |
2 files changed, 18 insertions, 8 deletions
diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt index e6222106ca36..eae3c8c9300e 100644 --- a/Documentation/devicetree/bindings/spi/sh-msiof.txt +++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt | |||
@@ -1,12 +1,22 @@ | |||
1 | Renesas MSIOF spi controller | 1 | Renesas MSIOF spi controller |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : "renesas,sh-msiof" for SuperH or | 4 | - compatible : "renesas,sh-msiof" for SuperH, or |
5 | "renesas,sh-mobile-msiof" for SH Mobile series | 5 | "renesas,sh-mobile-msiof" for SH Mobile series. |
6 | - reg : Offset and length of the register set for the device | 6 | - reg : Offset and length of the register set for the device |
7 | - interrupts : interrupt line used by MSIOF | 7 | - interrupt-parent : The phandle for the interrupt controller that |
8 | services interrupts for this device | ||
9 | - interrupts : Interrupt specifier | ||
10 | - #address-cells : Must be <1> | ||
11 | - #size-cells : Must be <0> | ||
8 | 12 | ||
9 | Optional properties: | 13 | Optional properties: |
10 | - num-cs : total number of chip-selects | 14 | - clocks : Must contain a reference to the functional clock. |
11 | - renesas,tx-fifo-size : Overrides the default tx fifo size given in words | 15 | - num-cs : Total number of chip-selects (default is 1) |
12 | - renesas,rx-fifo-size : Overrides the default rx fifo size given in words | 16 | - renesas,tx-fifo-size : Overrides the default tx fifo size given in words |
17 | (default is 64) | ||
18 | - renesas,rx-fifo-size : Overrides the default rx fifo size given in words | ||
19 | (default is 64) | ||
20 | |||
21 | Pinctrl properties might be needed, too. See | ||
22 | Documentation/devicetree/bindings/pinctrl/renesas,*. | ||
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 6e2ba62ceb63..181efd049d12 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c | |||
@@ -664,7 +664,7 @@ static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev) | |||
664 | { | 664 | { |
665 | struct sh_msiof_spi_info *info; | 665 | struct sh_msiof_spi_info *info; |
666 | struct device_node *np = dev->of_node; | 666 | struct device_node *np = dev->of_node; |
667 | u32 num_cs = 0; | 667 | u32 num_cs = 1; |
668 | 668 | ||
669 | info = devm_kzalloc(dev, sizeof(struct sh_msiof_spi_info), GFP_KERNEL); | 669 | info = devm_kzalloc(dev, sizeof(struct sh_msiof_spi_info), GFP_KERNEL); |
670 | if (!info) { | 670 | if (!info) { |