From patchwork Mon Nov 12 08:52:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenyou Yang X-Patchwork-Id: 1727061 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 4B53B3FCAE for ; Mon, 12 Nov 2012 09:03:33 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TXpsL-0005mR-Nr; Mon, 12 Nov 2012 09:00:14 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TXpoz-0003k3-E9 for linux-arm-kernel@merlin.infradead.org; Mon, 12 Nov 2012 08:56:45 +0000 Received: from newsmtp5.atmel.com ([204.2.163.5] helo=sjogate2.atmel.com) by casper.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TXpov-0007QQ-Dj for linux-arm-kernel@lists.infradead.org; Mon, 12 Nov 2012 08:56:44 +0000 Received: from penbh01.corp.atmel.com ([10.168.5.31]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id qAC8ooNi029499; Mon, 12 Nov 2012 00:51:21 -0800 (PST) Received: from penmb01.corp.atmel.com ([10.168.5.33]) by penbh01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 12 Nov 2012 16:56:28 +0800 Received: from shaarm01.corp.atmel.com ([10.217.6.34]) by penmb01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 12 Nov 2012 16:56:28 +0800 From: Wenyou Yang To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/17] spi/atmel_spi: add DT support Date: Mon, 12 Nov 2012 16:52:31 +0800 Message-Id: <1352710357-3265-12-git-send-email-wenyou.yang@atmel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352710357-3265-1-git-send-email-wenyou.yang@atmel.com> References: <1352710357-3265-1-git-send-email-wenyou.yang@atmel.com> X-OriginalArrivalTime: 12 Nov 2012 08:56:28.0675 (UTC) FILETIME=[9A768530:01CDC0B3] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121112_085641_886386_ABB5AC41 X-CRM114-Status: GOOD ( 19.25 ) X-Spam-Score: 0.5 (/) X-Spam-Report: SpamAssassin version 3.3.2 on casper.infradead.org summary: Content analysis details: (0.5 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-doc@vger.kernel.org, richard.genoud@gmail.com, JM.Lin@atmel.com, nicolas.ferre@atmel.com, rob.herring@calxeda.com, wenyou.yang@atmel.com, grant.likely@secretlab.ca, rob@landley.net, spi-devel-general@lists.sourceforge.net, Jean-Christophe PLAGNIOL-VILLARD , devicetree-discuss@lists.ozlabs.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Jean-Christophe PLAGNIOL-VILLARD The atmel_spi use only gpio for chip select. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Cc: devicetree-discuss@lists.ozlabs.org Cc: spi-devel-general@lists.sourceforge.net Cc: grant.likely@secretlab.ca Cc: rob.herring@calxeda.com Cc: rob@landley.net Cc: linux-doc@vger.kernel.org Cc: richard.genoud@gmail.com --- Hi, Richard, This patches is based on the original patch from Jean-Christophe [PATCH] spi/atmel: add DT support and merged the patch from Richard Genoud [PATCH] spi-atmel OF: complete documentation Could you sign your signature in this patch? Best Regards, Wenyou Yang .../devicetree/bindings/spi/spi_atmel.txt | 23 ++++++++++++++++++++ drivers/spi/spi-atmel.c | 21 ++++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/spi_atmel.txt diff --git a/Documentation/devicetree/bindings/spi/spi_atmel.txt b/Documentation/devicetree/bindings/spi/spi_atmel.txt new file mode 100644 index 0000000..20cdc91 --- /dev/null +++ b/Documentation/devicetree/bindings/spi/spi_atmel.txt @@ -0,0 +1,23 @@ +Atmel SPI device + +Required properties: +- compatible : should be "atmel,at91rm9200-spi". +- reg: Address and length of the register set for the device +- interrupts: Should contain macb interrupt +- cs-gpio: Should contain the GPIOs used for chipselect. +- dma-mask: device coherent dma mask. + +spi0: spi@f0000000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "atmel,at91rm9200-spi"; + reg = <0xf0000000 0x100>; + interrupts = <13 4>; + cs-gpios = <&pioA 14 0 + &pioA 7 0 /* conflicts with TXD2 */ + &pioA 1 0 /* conflicts with RXD0 */ + &pioB 3 0 /* conflicts with ERXDV */ + >; + dma-mask = <0xffffffff>; + status = "disabled"; +}; diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 7a3613d..0cc347c 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -1242,7 +1243,7 @@ static int atmel_spi_setup(struct spi_device *spi) u32 scbr, csr; unsigned int bits = spi->bits_per_word; unsigned long bus_hz; - unsigned int npcs_pin; + int npcs_pin; int ret; as = spi_master_get_devdata(spi->master); @@ -1314,7 +1315,9 @@ static int atmel_spi_setup(struct spi_device *spi) csr |= SPI_BF(DLYBCT, 0); /* chipselect must have been muxed as GPIO (e.g. in board setup) */ - npcs_pin = (unsigned int)spi->controller_data; + if (!gpio_is_valid(spi->cs_gpio)) + spi->cs_gpio = (int)spi->controller_data; + npcs_pin = spi->cs_gpio; asd = spi->controller_state; if (!asd) { asd = kzalloc(sizeof(struct atmel_spi_device), GFP_KERNEL); @@ -1435,7 +1438,7 @@ static void atmel_spi_cleanup(struct spi_device *spi) { struct atmel_spi *as = spi_master_get_devdata(spi->master); struct atmel_spi_device *asd = spi->controller_state; - unsigned gpio = (unsigned) spi->controller_data; + unsigned gpio = spi->cs_gpio; if (!asd) return; @@ -1485,7 +1488,8 @@ static int __devinit atmel_spi_probe(struct platform_device *pdev) master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; master->bus_num = pdev->id; - master->num_chipselect = 4; + master->dev.of_node = pdev->dev.of_node; + master->num_chipselect = master->dev.of_node ? 0 : 4; master->setup = atmel_spi_setup; master->transfer = atmel_spi_transfer; master->cleanup = atmel_spi_cleanup; @@ -1637,11 +1641,20 @@ static int atmel_spi_resume(struct platform_device *pdev) #define atmel_spi_resume NULL #endif +#if defined(CONFIG_OF) +static const struct of_device_id atmel_spi_dt_ids[] = { + { .compatible = "atmel,at91rm9200-spi" }, + { /* sentinel */ } +}; + +MODULE_DEVICE_TABLE(of, atmel_spi_dt_ids); +#endif static struct platform_driver atmel_spi_driver = { .driver = { .name = "atmel_spi", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(atmel_spi_dt_ids), }, .suspend = atmel_spi_suspend, .resume = atmel_spi_resume,