| From 68c878089cde013cc27e0746257851bad51351d5 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> |
| Date: Tue, 25 Feb 2014 11:21:08 +0100 |
| Subject: 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> |
| (cherry picked from commit 32d3b2d1ddeafe105ab6f738fba427242141194e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| Documentation/devicetree/bindings/spi/sh-msiof.txt | 24 +++++++++++++++------- |
| 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 @@ |
| Renesas MSIOF spi controller |
| |
| Required properties: |
| -- compatible : "renesas,sh-msiof" for SuperH or |
| - "renesas,sh-mobile-msiof" for SH Mobile series |
| -- reg : Offset and length of the register set for the device |
| -- interrupts : interrupt line used by MSIOF |
| +- compatible : "renesas,sh-msiof" for SuperH, or |
| + "renesas,sh-mobile-msiof" for SH Mobile series. |
| +- reg : Offset and length of the register set for the device |
| +- interrupt-parent : The phandle for the interrupt controller that |
| + services interrupts for this device |
| +- interrupts : Interrupt specifier |
| +- #address-cells : Must be <1> |
| +- #size-cells : Must be <0> |
| |
| Optional properties: |
| -- num-cs : total number of chip-selects |
| -- renesas,tx-fifo-size : Overrides the default tx fifo size given in words |
| -- renesas,rx-fifo-size : Overrides the default rx fifo size given in words |
| +- clocks : Must contain a reference to the functional clock. |
| +- num-cs : Total number of chip-selects (default is 1) |
| +- renesas,tx-fifo-size : Overrides the default tx fifo size given in words |
| + (default is 64) |
| +- renesas,rx-fifo-size : Overrides the default rx fifo size given in words |
| + (default is 64) |
| + |
| +Pinctrl properties might be needed, too. See |
| +Documentation/devicetree/bindings/pinctrl/renesas,*. |
| diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c |
| index 92515c1ececa..bbe963018e1a 100644 |
| --- a/drivers/spi/spi-sh-msiof.c |
| +++ b/drivers/spi/spi-sh-msiof.c |
| @@ -663,7 +663,7 @@ static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev) |
| { |
| struct sh_msiof_spi_info *info; |
| struct device_node *np = dev->of_node; |
| - u32 num_cs = 0; |
| + u32 num_cs = 1; |
| |
| info = devm_kzalloc(dev, sizeof(struct sh_msiof_spi_info), GFP_KERNEL); |
| if (!info) { |
| -- |
| 2.1.2 |
| |
