From patchwork Thu Oct 20 11:49:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 120793 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0783CB6F68 for ; Thu, 20 Oct 2011 22:43:58 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RGr2I-00068h-DN; Thu, 20 Oct 2011 11:43:46 +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 1RGr2I-0002Vl-5V; Thu, 20 Oct 2011 11:43:46 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RGr2D-0002VQ-FE for linux-arm-kernel@lists.infradead.org; Thu, 20 Oct 2011 11:43:43 +0000 Received: from epcpsbgm2.samsung.com (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LTD00MO04KQMGU0@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 20 Oct 2011 20:43:38 +0900 (KST) X-AuditID: cbfee61b-b7b7fae000005864-35-4ea00969ec2d Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id 09.38.22628.96900AE4; Thu, 20 Oct 2011 20:43:38 +0900 (KST) Received: from padma-linuxpc.sisodomain.com ([107.108.83.35]) by mmp1.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTPA id <0LTD00LF34KJ3U80@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 20 Oct 2011 20:43:37 +0900 (KST) From: Padmavathi Venna To: padma.v@samsung.com, padma.kvr@gmail.com, kgene.kim@samsung.com, linux-arm-kernel@lists.infradead.org, linux@arm.linux.org.uk, linux-samsung-soc@vger.kernel.org Subject: [PATCH] ARM: mx5: Use CLKDEV_INIT for creating clk_lookup instance Date: Thu, 20 Oct 2011 17:19:51 +0530 Message-id: <1319111391-27820-1-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.4.4 X-Brightmail-Tracker: AAAAAA== X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111020_074342_005976_BADA598A X-CRM114-Status: GOOD ( 11.36 ) X-Spam-Score: -2.8 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [203.254.224.24 listed in list.dnswl.org] -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: amit.kucheria@canonical.com, kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list 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+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org A common macro CLKDEV_INIT was added for creating clk_lookup instance in include/linux/clkdev.h. So replace _REGISTER_CLOCK macro with CLKDEV_INIT. Suggested-by: Russell King Acked-by: Amit Kucheria Signed-off-by: Padmavathi Venna --- arch/arm/mach-mx5/clock-mx51-mx53.c | 149 +++++++++++++++++------------------ 1 files changed, 71 insertions(+), 78 deletions(-) diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c index 2b9bd1f..d198515 100644 --- a/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c @@ -1422,97 +1422,90 @@ DEFINE_CLOCK(ipu_di1_clk, 0, MXC_CCM_CCGR6, MXC_CCM_CCGRx_CG6_OFFSET, DEFINE_CLOCK(pata_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG0_OFFSET, NULL, NULL, &ipg_clk, &spba_clk); -#define _REGISTER_CLOCK(d, n, c) \ - { \ - .dev_id = d, \ - .con_id = n, \ - .clk = &c, \ - }, - static struct clk_lookup mx51_lookups[] = { /* i.mx51 has the i.mx21 type uart */ - _REGISTER_CLOCK("imx21-uart.0", NULL, uart1_clk) - _REGISTER_CLOCK("imx21-uart.1", NULL, uart2_clk) - _REGISTER_CLOCK("imx21-uart.2", NULL, uart3_clk) - _REGISTER_CLOCK(NULL, "gpt", gpt_clk) + CLKDEV_INIT("imx21-uart.0", NULL, &uart1_clk), + CLKDEV_INIT("imx21-uart.1", NULL, &uart2_clk), + CLKDEV_INIT("imx21-uart.2", NULL, &uart3_clk), + CLKDEV_INIT(NULL, "gpt", &gpt_clk), /* i.mx51 has the i.mx27 type fec */ - _REGISTER_CLOCK("imx27-fec.0", NULL, fec_clk) - _REGISTER_CLOCK("mxc_pwm.0", "pwm", pwm1_clk) - _REGISTER_CLOCK("mxc_pwm.1", "pwm", pwm2_clk) - _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk) - _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk) - _REGISTER_CLOCK("imx-i2c.2", NULL, hsi2c_clk) - _REGISTER_CLOCK("mxc-ehci.0", "usb", usboh3_clk) - _REGISTER_CLOCK("mxc-ehci.0", "usb_ahb", usb_ahb_clk) - _REGISTER_CLOCK("mxc-ehci.0", "usb_phy1", usb_phy1_clk) - _REGISTER_CLOCK("mxc-ehci.1", "usb", usboh3_clk) - _REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", usb_ahb_clk) - _REGISTER_CLOCK("mxc-ehci.2", "usb", usboh3_clk) - _REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", usb_ahb_clk) - _REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk) - _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk) - _REGISTER_CLOCK("imx-keypad", NULL, dummy_clk) - _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) - _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) - _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) - _REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk) + CLKDEV_INIT("imx27-fec.0", NULL, &fec_clk), + CLKDEV_INIT("mxc_pwm.0", "pwm", &pwm1_clk), + CLKDEV_INIT("mxc_pwm.1", "pwm", &pwm2_clk), + CLKDEV_INIT("imx-i2c.0", NULL, &i2c1_clk), + CLKDEV_INIT("imx-i2c.1", NULL, &i2c2_clk), + CLKDEV_INIT("imx-i2c.2", NULL, &hsi2c_clk), + CLKDEV_INIT("mxc-ehci.0", "usb", &usboh3_clk), + CLKDEV_INIT("mxc-ehci.0", "usb_ahb", &usb_ahb_clk), + CLKDEV_INIT("mxc-ehci.0", "usb_phy1", &usb_phy1_clk), + CLKDEV_INIT("mxc-ehci.1", "usb", &usboh3_clk), + CLKDEV_INIT("mxc-ehci.1", "usb_ahb", &usb_ahb_clk), + CLKDEV_INIT("mxc-ehci.2", "usb", &usboh3_clk), + CLKDEV_INIT("mxc-ehci.2", "usb_ahb", &usb_ahb_clk), + CLKDEV_INIT("fsl-usb2-udc", "usb", &usboh3_clk), + CLKDEV_INIT("fsl-usb2-udc", "usb_ahb", &ahb_clk), + CLKDEV_INIT("imx-keypad", NULL, &dummy_clk), + CLKDEV_INIT("mxc_nand", NULL, &nfc_clk), + CLKDEV_INIT("imx-ssi.0", NULL, &ssi1_clk), + CLKDEV_INIT("imx-ssi.1", NULL, &ssi2_clk), + CLKDEV_INIT("imx-ssi.2", NULL, &ssi3_clk), /* i.mx51 has the i.mx35 type sdma */ - _REGISTER_CLOCK("imx35-sdma", NULL, sdma_clk) - _REGISTER_CLOCK(NULL, "ckih", ckih_clk) - _REGISTER_CLOCK(NULL, "ckih2", ckih2_clk) - _REGISTER_CLOCK(NULL, "gpt_32k", gpt_32k_clk) - _REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk) - _REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk) + CLKDEV_INIT("imx35-sdma", NULL, &sdma_clk), + CLKDEV_INIT(NULL, "ckih", &ckih_clk), + CLKDEV_INIT(NULL, "ckih2", &ckih2_clk), + CLKDEV_INIT(NULL, "gpt_32k", &gpt_32k_clk), + CLKDEV_INIT("imx51-ecspi.0", NULL, &ecspi1_clk), + CLKDEV_INIT("imx51-ecspi.1", NULL, &ecspi2_clk), /* i.mx51 has the i.mx35 type cspi */ - _REGISTER_CLOCK("imx35-cspi.0", NULL, cspi_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx51.0", NULL, esdhc1_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx51.1", NULL, esdhc2_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx51.2", NULL, esdhc3_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx51.3", NULL, esdhc4_clk) - _REGISTER_CLOCK(NULL, "cpu_clk", cpu_clk) - _REGISTER_CLOCK(NULL, "iim_clk", iim_clk) - _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk) - _REGISTER_CLOCK("imx2-wdt.1", NULL, dummy_clk) - _REGISTER_CLOCK(NULL, "mipi_hsp", mipi_hsp_clk) - _REGISTER_CLOCK("imx-ipuv3", NULL, ipu_clk) - _REGISTER_CLOCK("imx-ipuv3", "di0", ipu_di0_clk) - _REGISTER_CLOCK("imx-ipuv3", "di1", ipu_di1_clk) - _REGISTER_CLOCK(NULL, "gpc_dvfs", gpc_dvfs_clk) - _REGISTER_CLOCK("pata_imx", NULL, pata_clk) + CLKDEV_INIT("imx35-cspi.0", NULL, &cspi_clk), + CLKDEV_INIT("sdhci-esdhc-imx51.0", NULL, &esdhc1_clk), + CLKDEV_INIT("sdhci-esdhc-imx51.1", NULL, &esdhc2_clk), + CLKDEV_INIT("sdhci-esdhc-imx51.2", NULL, &esdhc3_clk), + CLKDEV_INIT("sdhci-esdhc-imx51.3", NULL, &esdhc4_clk), + CLKDEV_INIT(NULL, "cpu_clk", &cpu_clk), + CLKDEV_INIT(NULL, "iim_clk", &iim_clk), + CLKDEV_INIT("imx2-wdt.0", NULL, &dummy_clk), + CLKDEV_INIT("imx2-wdt.1", NULL, &dummy_clk), + CLKDEV_INIT(NULL, "mipi_hsp", &mipi_hsp_clk), + CLKDEV_INIT("imx-ipuv3", NULL, &ipu_clk), + CLKDEV_INIT("imx-ipuv3", "di0", &ipu_di0_clk), + CLKDEV_INIT("imx-ipuv3", "di1", &ipu_di1_clk), + CLKDEV_INIT(NULL, "gpc_dvfs", &gpc_dvfs_clk), + CLKDEV_INIT("pata_imx", NULL, &pata_clk), }; static struct clk_lookup mx53_lookups[] = { /* i.mx53 has the i.mx21 type uart */ - _REGISTER_CLOCK("imx21-uart.0", NULL, uart1_clk) - _REGISTER_CLOCK("imx21-uart.1", NULL, uart2_clk) - _REGISTER_CLOCK("imx21-uart.2", NULL, uart3_clk) - _REGISTER_CLOCK("imx21-uart.3", NULL, uart4_clk) - _REGISTER_CLOCK("imx21-uart.4", NULL, uart5_clk) - _REGISTER_CLOCK(NULL, "gpt", gpt_clk) + CLKDEV_INIT("imx21-uart.0", NULL, &uart1_clk), + CLKDEV_INIT("imx21-uart.1", NULL, &uart2_clk), + CLKDEV_INIT("imx21-uart.2", NULL, &uart3_clk), + CLKDEV_INIT("imx21-uart.3", NULL, &uart4_clk), + CLKDEV_INIT("imx21-uart.4", NULL, &uart5_clk), + CLKDEV_INIT(NULL, "gpt", &gpt_clk), /* i.mx53 has the i.mx25 type fec */ - _REGISTER_CLOCK("imx25-fec.0", NULL, fec_clk) - _REGISTER_CLOCK(NULL, "iim_clk", iim_clk) - _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk) - _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk) - _REGISTER_CLOCK("imx-i2c.2", NULL, i2c3_mx53_clk) + CLKDEV_INIT("imx25-fec.0", NULL, &fec_clk), + CLKDEV_INIT(NULL, "iim_clk", &iim_clk), + CLKDEV_INIT("imx-i2c.0", NULL, &i2c1_clk), + CLKDEV_INIT("imx-i2c.1", NULL, &i2c2_clk), + CLKDEV_INIT("imx-i2c.2", NULL, &i2c3_mx53_clk), /* i.mx53 has the i.mx51 type ecspi */ - _REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk) - _REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk) + CLKDEV_INIT("imx51-ecspi.0", NULL, &ecspi1_clk), + CLKDEV_INIT("imx51-ecspi.1", NULL, &ecspi2_clk), /* i.mx53 has the i.mx25 type cspi */ - _REGISTER_CLOCK("imx35-cspi.0", NULL, cspi_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx53.0", NULL, esdhc1_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx53.1", NULL, esdhc2_mx53_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx53.2", NULL, esdhc3_mx53_clk) - _REGISTER_CLOCK("sdhci-esdhc-imx53.3", NULL, esdhc4_mx53_clk) - _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk) - _REGISTER_CLOCK("imx2-wdt.1", NULL, dummy_clk) + CLKDEV_INIT("imx35-cspi.0", NULL, &cspi_clk), + CLKDEV_INIT("sdhci-esdhc-imx53.0", NULL, &esdhc1_clk), + CLKDEV_INIT("sdhci-esdhc-imx53.1", NULL, &esdhc2_mx53_clk), + CLKDEV_INIT("sdhci-esdhc-imx53.2", NULL, &esdhc3_mx53_clk), + CLKDEV_INIT("sdhci-esdhc-imx53.3", NULL, &esdhc4_mx53_clk), + CLKDEV_INIT("imx2-wdt.0", NULL, &dummy_clk), + CLKDEV_INIT("imx2-wdt.1", NULL, &dummy_clk), /* i.mx53 has the i.mx35 type sdma */ - _REGISTER_CLOCK("imx35-sdma", NULL, sdma_clk) - _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) - _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) - _REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk) - _REGISTER_CLOCK("imx-keypad", NULL, dummy_clk) - _REGISTER_CLOCK("pata_imx", NULL, pata_clk) + CLKDEV_INIT("imx35-sdma", NULL, &sdma_clk), + CLKDEV_INIT("imx-ssi.0", NULL, &ssi1_clk), + CLKDEV_INIT("imx-ssi.1", NULL, &ssi2_clk), + CLKDEV_INIT("imx-ssi.2", NULL, &ssi3_clk), + CLKDEV_INIT("imx-keypad", NULL, &dummy_clk), + CLKDEV_INIT("pata_imx", NULL, &pata_clk), }; static void clk_tree_init(void)