From patchwork Tue Aug 9 13:57:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 1047672 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7983BbV007077 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 9 Aug 2011 08:03:33 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QqhHH-0001vO-4V; Tue, 09 Aug 2011 08:03:07 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QqhHG-0006ki-L7; Tue, 09 Aug 2011 08:03:06 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QqhHC-0006kQ-Uh for linux-arm-kernel@lists.infradead.org; Tue, 09 Aug 2011 08:03:04 +0000 Received: from epcpsbgm1.samsung.com (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LPN00G7WICULB00@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 09 Aug 2011 17:02:56 +0900 (KST) X-AuditID: cbfee61a-b7cf0ae000006bc6-46-4e40e9b035da Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (MMPCPMTA) with SMTP id 89.19.27590.0B9E04E4; Tue, 09 Aug 2011 17:02:56 +0900 (KST) Received: from localhost.localdomain ([107.108.73.106]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LPN009QEICJ4C@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Tue, 09 Aug 2011 17:02:56 +0900 (KST) Date: Tue, 09 Aug 2011 09:57:02 -0400 From: Padmavathi Venna Subject: [RFC][PATCH 1/2] S5PV210: SPI: Add clkdev support To: kgene.kim@samsung.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, grant.likely@secretlab.ca, jassisinghbrar@gmail.com, ben-linux@fluff.org Message-id: <1312898222-7165-1-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.0.4 X-Brightmail-Tracker: AAAAAA== X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110809_040303_266554_9A434ECA X-CRM114-Status: GOOD ( 23.61 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.8 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 2.4 DATE_IN_FUTURE_03_06 Date: is 3 to 6 hours after Received: date -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [203.254.224.34 listed in list.dnswl.org] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 09 Aug 2011 08:03:33 +0000 (UTC) Create a clkdev alias for spi bus clock and modify the spi driver to lookup the clock using the alias name instead of passing clock name and clock number from SPI platform data. Signed-off-by: Padmavathi Venna --- This patch is tested for S5PV210 platform and similar changes can be adopted for rest of the Samsung's s3c and s5p platforms, if this approach is accepted. arch/arm/mach-s5pv210/dev-spi.c | 31 ++++++++++++++++++--- arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 7 +---- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-s5pv210/dev-spi.c b/arch/arm/mach-s5pv210/dev-spi.c index eaf9a7b..e81b67d 100644 --- a/arch/arm/mach-s5pv210/dev-spi.c +++ b/arch/arm/mach-s5pv210/dev-spi.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -145,13 +146,15 @@ struct platform_device s5pv210_device_spi1 = { }, }; -void __init s5pv210_spi_set_info(int cntrlr, int src_clk_nr, int num_cs) +void __init s5pv210_spi_set_info(int cntrlr, int num_cs) { struct s3c64xx_spi_info *pd; + struct device *dev; + char devname[16], clk_alias_name[16]; + int ret, i; /* Reject invalid configuration */ - if (!num_cs || src_clk_nr < 0 - || src_clk_nr > S5PV210_SPI_SRCCLK_SCLK) { + if (!num_cs) { printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__); return; } @@ -159,9 +162,11 @@ void __init s5pv210_spi_set_info(int cntrlr, int src_clk_nr, int num_cs) switch (cntrlr) { case 0: pd = &s5pv210_spi0_pdata; + dev = &s5pv210_device_spi0.dev; break; case 1: pd = &s5pv210_spi1_pdata; + dev = &s5pv210_device_spi1.dev; break; default: printk(KERN_ERR "%s: Invalid SPI controller(%d)\n", @@ -169,7 +174,23 @@ void __init s5pv210_spi_set_info(int cntrlr, int src_clk_nr, int num_cs) return; } + sprintf(devname, "s3c64xx-spi.%d", cntrlr); + + for (i = 0; i < ARRAY_SIZE(spi_src_clks); i++) { + sprintf(clk_alias_name, "clk_spi_bus%d", i); + + if (!strcmp(spi_src_clks[i], "pclk")) + ret = clk_add_alias(clk_alias_name, devname, + spi_src_clks[i], NULL); + else + ret = clk_add_alias(clk_alias_name, devname, + spi_src_clks[i], dev); + if (ret) { + printk(KERN_ERR "failed to create alias for" + " SPI%d source clock%d\n", cntrlr, i); + continue; + } + } + pd->num_cs = num_cs; - pd->src_clk_nr = src_clk_nr; - pd->src_clk_name = spi_src_clks[src_clk_nr]; } diff --git a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h index 4c16fa3..70ddd8c 100644 --- a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h +++ b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h @@ -30,8 +30,6 @@ struct s3c64xx_spi_csinfo { /** * struct s3c64xx_spi_info - SPI Controller defining structure - * @src_clk_nr: Clock source index for the CLK_CFG[SPI_CLKSEL] field. - * @src_clk_name: Platform name of the corresponding clock. * @clk_from_cmu: If the SPI clock/prescalar control block is present * by the platform's clock-management-unit and not in SPI controller. * @num_cs: Number of CS this controller emulates. @@ -42,8 +40,6 @@ struct s3c64xx_spi_csinfo { * @tx_st_done: Depends on tx fifo_lvl field */ struct s3c64xx_spi_info { - int src_clk_nr; - char *src_clk_name; bool clk_from_cmu; int num_cs; @@ -61,7 +57,6 @@ struct s3c64xx_spi_info { * s3c64xx_spi_set_info - SPI Controller configure callback by the board * initialization code. * @cntrlr: SPI controller number the configuration is for. - * @src_clk_nr: Clock the SPI controller is to use to generate SPI clocks. * @num_cs: Number of elements in the 'cs' array. * * Call this from machine init code for each SPI Controller that @@ -69,7 +64,7 @@ struct s3c64xx_spi_info { */ extern void s3c64xx_spi_set_info(int cntrlr, int src_clk_nr, int num_cs); extern void s5pc100_spi_set_info(int cntrlr, int src_clk_nr, int num_cs); -extern void s5pv210_spi_set_info(int cntrlr, int src_clk_nr, int num_cs); +extern void s5pv210_spi_set_info(int cntrlr, int num_cs); extern void s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs); #endif /* __S3C64XX_PLAT_SPI_H */