From patchwork Wed Nov 7 11:40:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 1710321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 9D073DFFEC for ; Wed, 7 Nov 2012 11:44:58 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TW425-000060-SZ; Wed, 07 Nov 2012 11:42:58 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TW41U-0008RL-4w for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2012 11:42:21 +0000 Received: by mail-bk0-f49.google.com with SMTP id j4so639324bkw.36 for ; Wed, 07 Nov 2012 03:42:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=8BangKwglFj0J18lLfIQ2GOscGkRzG/AURcTXyEZFwE=; b=DJV5cW/lYm5gibdfOpqtEav/A0zpC+Dm3tpwtObGz+I8LXh5WPMkl8FCeg+aODTNqK JACFOfuZxFsYzJqipZHpPXllj2KuurB9jGIO6mgJEhAzIwiTclYBZZMLyXV7/QlgeOA1 aS0QYqNrD+11XyeFMbzXqhkr93wIvXbX1C+cfRUQk523m0CjkpVFjtDmcfPJNjf7sNYh PKNtQZrBYuJlbMSmK4/r/nJwO7aJijhSggmVGSrzc4kFw28GAwkEtYAXhlOdRBjcOBZl W3K6H3cgVDIO+sPfZ1nHiaAKLID0ifQirnyLlJ1AktVVdSKjbeJBaFJ5SA7By/mm4g4I ICWg== Received: by 10.204.129.211 with SMTP id p19mr1057516bks.94.1352288538973; Wed, 07 Nov 2012 03:42:18 -0800 (PST) Received: from localhost.localdomain (p4FD24697.dip.t-dialin.net. [79.210.70.151]) by mx.google.com with ESMTPS id r15sm14130206bkw.9.2012.11.07.03.42.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 03:42:18 -0800 (PST) From: Bastian Hecht To: spi-devel-general@lists.sourceforge.net Subject: [PATCH 3/4] spi: sh-msiof: Add device tree parsing to driver Date: Wed, 7 Nov 2012 12:40:06 +0100 Message-Id: <1352288407-20594-4-git-send-email-hechtb@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352288407-20594-1-git-send-email-hechtb@gmail.com> References: <1352288407-20594-1-git-send-email-hechtb@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121107_064220_380689_8C8F7F96 X-CRM114-Status: GOOD ( 19.31 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (hechtb[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Magnus Damm , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.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 This adds the capability to retrieve setup data from the device tree node. The usage of platform data is still available. Signed-off-by: Bastian Hecht --- drivers/spi/spi-sh-msiof.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 96358d0..65cd19c 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -592,6 +593,35 @@ static u32 sh_msiof_spi_txrx_word(struct spi_device *spi, unsigned nsecs, return 0; } +#ifdef CONFIG_OF +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 chipselect = 0; + + info = devm_kzalloc(dev, sizeof(struct sh_msiof_spi_info), GFP_KERNEL); + if (!info) { + dev_err(dev, "failed to allocate setup data\n"); + return NULL; + } + + /* Parse the MSIOF properties */ + of_property_read_u32(np, "chip-select", &chipselect); + of_property_read_u32(np, "tx_fifo_size", &info->tx_fifo_override); + of_property_read_u32(np, "rx_fifo_size", &info->rx_fifo_override); + + info->num_chipselect = chipselect; + + return info; +} +#else +static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev) +{ + return NULL; +} +#endif + static int sh_msiof_spi_probe(struct platform_device *pdev) { struct resource *r; @@ -610,7 +640,17 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) p = spi_master_get_devdata(master); platform_set_drvdata(pdev, p); - p->info = pdev->dev.platform_data; + if (pdev->dev.of_node) + p->info = sh_msiof_spi_parse_dt(&pdev->dev); + else + p->info = pdev->dev.platform_data; + + if (!p->info) { + dev_err(&pdev->dev, "failed to obtain device info\n"); + ret = -ENXIO; + goto err1; + } + init_completion(&p->done); p->clk = clk_get(&pdev->dev, NULL); @@ -715,6 +755,17 @@ static int sh_msiof_spi_runtime_nop(struct device *dev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id sh_msiof_match[] = { + { .compatible = "renesas,sh-msiof", }, + { .compatible = "renesas,sh-mobile-msiof", }, + {}, +}; +MODULE_DEVICE_TABLE(of, sh_msiof_match); +#else +#define sh_msiof_match NULL +#endif + static struct dev_pm_ops sh_msiof_spi_dev_pm_ops = { .runtime_suspend = sh_msiof_spi_runtime_nop, .runtime_resume = sh_msiof_spi_runtime_nop, @@ -727,6 +778,7 @@ static struct platform_driver sh_msiof_spi_drv = { .name = "spi_sh_msiof", .owner = THIS_MODULE, .pm = &sh_msiof_spi_dev_pm_ops, + .of_match_table = sh_msiof_match, }, }; module_platform_driver(sh_msiof_spi_drv);