From patchwork Mon Nov 12 21:28:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 1730901 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by patchwork2.kernel.org (Postfix) with ESMTP id 9C92DDFE80 for ; Mon, 12 Nov 2012 21:29:51 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id qACLST94024315; Mon, 12 Nov 2012 15:28:29 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id qACLST7c011996; Mon, 12 Nov 2012 15:28:29 -0600 Received: from dlelxv23.itg.ti.com (172.17.1.198) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Mon, 12 Nov 2012 15:28:28 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id qACLSScP025243; Mon, 12 Nov 2012 15:28:28 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 733F880627; Mon, 12 Nov 2012 15:28:28 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dlelxv30.itg.ti.com (dlelxv30.itg.ti.com [172.17.2.17]) by linux.omap.com (Postfix) with ESMTP id ACBCC80626 for ; Mon, 12 Nov 2012 15:28:26 -0600 (CST) Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id qACLSQ86011967; Mon, 12 Nov 2012 15:28:26 -0600 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Mon, 12 Nov 2012 15:28:26 -0600 Received: from ares-ubuntu.am.dhcp.ti.com (ares-ubuntu.am.dhcp.ti.com [158.218.103.17]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id qACLSPkX015575; Mon, 12 Nov 2012 15:28:25 -0600 Received: from a0868495 by ares-ubuntu.am.dhcp.ti.com with local (Exim 4.76) (envelope-from ) id 1TY1YP-0005b9-4k; Mon, 12 Nov 2012 16:28:25 -0500 From: Murali Karicheri To: , , , , , , , , Subject: [PATCH] spi: davinci: add OF support for the spi controller Date: Mon, 12 Nov 2012 16:28:22 -0500 Message-ID: <1352755702-21488-1-git-send-email-m-karicheri2@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com This adds OF support to DaVinci SPI controller to configure platform data through device bindings. Signed-off-by: Murali Karicheri --- .../devicetree/bindings/spi/spi-davinci.txt | 50 ++++++++++++ drivers/spi/spi-davinci.c | 80 +++++++++++++++++++- 2 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/spi-davinci.txt diff --git a/Documentation/devicetree/bindings/spi/spi-davinci.txt b/Documentation/devicetree/bindings/spi/spi-davinci.txt new file mode 100644 index 0000000..0369369 --- /dev/null +++ b/Documentation/devicetree/bindings/spi/spi-davinci.txt @@ -0,0 +1,50 @@ +Davinci SPI controller device bindings + +Required properties: +- #address-cells: number of cells required to define a chip select + address on the SPI bus. +- #size-cells: should be zero. +- compatible: + - "ti,davinci-spi" +- reg: Offset and length of SPI controller register space +- ti,davinci-spi-version: SPI version :- "1.0" or "2.0" +- ti,davinci-spi-num-cs: Number of chip selects +- ti,davinci-spi-intr-line: interrupt line used to connect the SPI + IP to the ARM interrupt controller withn the SoC. Possible values + are 0 and 1. +- interrupts: interrupt number offset at the irq parent +- clocks: spi clk phandle + +Example of a NOR flash slave device (n25q032) connected to DaVinci +SPI controller device over the SPI bus. + +spi:spi0@20BF0000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "ti,davinci-spi"; + reg = <0x20BF0000 0x1000>; + ti,davinci-spi-version = "1.0"; + ti,davinci-spi-num-cs = <4>; + ti,davinci-spi-intr-line = <0>; + interrupts = <338>; + clocks = <&clkspi>; + + flash: n25q032@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p32"; + spi-max-frequency = <25000000>; + reg = <0>; + + partition@0 { + label = "u-boot-spl"; + reg = <0x0 0x80000>; + read-only; + }; + + partition@1 { + label = "test"; + reg = <0x80000 0x380000>; + }; + }; +}; diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 71a6423..0f50319 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -26,6 +26,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -788,6 +791,69 @@ rx_dma_failed: return r; } +#if defined(CONFIG_OF) +static const struct of_device_id davinci_spi_of_match[] = { + { + .compatible = "ti,davinci-spi", + }, + { }, +}; +MODULE_DEVICE_TABLE(of, davini_spi_of_match); + +/** + * spi_davinci_get_pdata - Get platform_data from DTS binding + * @pdev: ptr to platform data + * + * Parses and populate platform_data from device tree bindings. + * + * NOTE: Not all platform_data params are supported currently. + */ +static struct davinci_spi_platform_data + *spi_davinci_get_pdata(struct platform_device *pdev) +{ + struct device_node *node = pdev->dev.of_node; + struct davinci_spi_platform_data *pdata; + unsigned int num_cs, intr_line = 0; + const char *version; + + if (pdev->dev.platform_data) + return pdev->dev.platform_data; + + if (!pdev->dev.of_node) + return NULL; + + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); + pdev->dev.platform_data = pdata; + if (!pdata) + return NULL; + + /* default version is 1.0 */ + pdata->version = SPI_VERSION_1; + of_property_read_string(node, "ti,davinci-spi-version", &version); + if (!strcmp(version, "2.0")) + pdata->version = SPI_VERSION_2; + + /* + * default num_cs is 1 and all chipsel are internal to the chip + * indicated by chip_sel being NULL. GPIO based CS is not + * supported yet in DT bindings. + */ + num_cs = 1; + of_property_read_u32(node, "ti,davinci-spi-num-cs", &num_cs); + pdata->num_chipselect = num_cs; + of_property_read_u32(node, "ti,davinci-spi-intr-line", &intr_line); + pdata->intr_line = intr_line; + return pdev->dev.platform_data; +} +#else +#define davinci_spi_of_match NULL +static struct davinci_spi_platform_data + *spi_davinci_get_pdata(struct platform_device *pdev) +{ + return pdev->dev.platform_data; +} +#endif + /** * davinci_spi_probe - probe function for SPI Master Controller * @pdev: platform_device structure which contains plateform specific data @@ -801,16 +867,16 @@ rx_dma_failed: */ static int __devinit davinci_spi_probe(struct platform_device *pdev) { + resource_size_t dma_rx_chan = SPI_NO_RESOURCE; + resource_size_t dma_tx_chan = SPI_NO_RESOURCE; + struct davinci_spi_platform_data *pdata; struct spi_master *master; struct davinci_spi *dspi; - struct davinci_spi_platform_data *pdata; struct resource *r, *mem; - resource_size_t dma_rx_chan = SPI_NO_RESOURCE; - resource_size_t dma_tx_chan = SPI_NO_RESOURCE; int i = 0, ret = 0; u32 spipc0; - pdata = pdev->dev.platform_data; + pdata = spi_davinci_get_pdata(pdev); if (pdata == NULL) { ret = -ENODEV; goto err; @@ -851,7 +917,11 @@ static int __devinit davinci_spi_probe(struct platform_device *pdev) goto release_region; } + /* first get irq through resource table, else try of irq method */ dspi->irq = platform_get_irq(pdev, 0); + if (dspi->irq <= 0) + dspi->irq = irq_of_parse_and_map(pdev->dev.of_node, 0); + if (dspi->irq <= 0) { ret = -EINVAL; goto unmap_io; @@ -875,6 +945,7 @@ static int __devinit davinci_spi_probe(struct platform_device *pdev) } clk_prepare_enable(dspi->clk); + master->dev.of_node = pdev->dev.of_node; master->bus_num = pdev->id; master->num_chipselect = pdata->num_chipselect; master->setup = davinci_spi_setup; @@ -1010,6 +1081,7 @@ static struct platform_driver davinci_spi_driver = { .driver = { .name = "spi_davinci", .owner = THIS_MODULE, + .of_match_table = davinci_spi_of_match, }, .probe = davinci_spi_probe, .remove = __devexit_p(davinci_spi_remove),