The spi data include: dma_type and version. dma_type to decide the SPI xfer mode: = 1(pdc), = 2(dmaengine), 0(no dma, using PIO) version to give the SPI ip version. Signed-off-by: Wenyou Yang <wenyou.yang@xxxxxxxxx> Cc: grant.likely@xxxxxxxxxxxx Cc: rob@xxxxxxxxxxx Cc: devicetree-discuss@xxxxxxxxxxxxxxxx Cc: linux-doc@xxxxxxxxxxxxxxx Cc: spi-devel-general@xxxxxxxxxxxxxxxxxxxxx --- .../devicetree/bindings/spi/spi_atmel.txt | 4 +++ drivers/spi/spi-atmel.c | 28 ++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/Documentation/devicetree/bindings/spi/spi_atmel.txt b/Documentation/devicetree/bindings/spi/spi_atmel.txt index 20cdc91..a1ceeb5 100644 --- a/Documentation/devicetree/bindings/spi/spi_atmel.txt +++ b/Documentation/devicetree/bindings/spi/spi_atmel.txt @@ -6,6 +6,8 @@ Required properties: - interrupts: Should contain macb interrupt - cs-gpio: Should contain the GPIOs used for chipselect. - dma-mask: device coherent dma mask. +- dma_type: The dma type supported by the spi of SoC: = 0 (no used), = 1 (pdc), = 2 (dma) +- version: The version of the spi IP. spi0: spi@f0000000 { #address-cells = <1>; @@ -19,5 +21,7 @@ spi0: spi@f0000000 { &pioB 3 0 /* conflicts with ERXDV */ >; dma-mask = <0xffffffff>; + dma_type = <1>; + version = <2>; status = "disabled"; }; diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 568df5b..791800e 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1467,6 +1467,30 @@ static void atmel_spi_cleanup(struct spi_device *spi) kfree(asd); } +static int of_get_atmel_spi_data(struct device_node *np, struct atmel_spi *as) +{ + const __be32 *val; + + val = of_get_property(np, "dma_type", NULL); + if (!val) { + pr_err("%s: have no 'dma_type' property\n", + np->full_name); + return -EINVAL; + } + + as->data.dma_type = be32_to_cpup(val); + + val = of_get_property(np, "version", NULL); + if (!val) { + pr_err("%s: have no 'version' property\n", np->full_name); + return -EINVAL; + } + + as->data.version = be32_to_cpup(val); + + return 0; +} + /*-------------------------------------------------------------------------*/ static int __devinit atmel_spi_probe(struct platform_device *pdev) @@ -1535,6 +1559,10 @@ static int __devinit atmel_spi_probe(struct platform_device *pdev) if (ret) goto out_unmap_regs; + ret = of_get_atmel_spi_data(pdev->dev.of_node, as); + if (ret) + goto out_unmap_regs; + /* Initialize the hardware */ clk_enable(clk); spi_writel(as, CR, SPI_BIT(SWRST)); -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html