From patchwork Mon Jul 4 01:41:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cho KyongHo X-Patchwork-Id: 941342 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 p642FsrG004711 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 4 Jul 2011 02:16:15 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QdYhN-0007bP-9v; Mon, 04 Jul 2011 02:15:45 +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 1QdYhM-0006Xg-Ed; Mon, 04 Jul 2011 02:15:44 +0000 Received: from ganesha.gnumonks.org ([2001:780:45:1d:2e0:81ff:fe28:898a]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QdYgB-0006D7-Cz for linux-arm-kernel@lists.infradead.org; Mon, 04 Jul 2011 02:14:34 +0000 Received: from uucp by ganesha.gnumonks.org with local-bsmtp (Exim 4.72) (envelope-from ) id 1QdYg4-0006Fq-Jd; Mon, 04 Jul 2011 04:14:24 +0200 Received: from [12.23.102.153] (helo=sunrise.dsn.sec.samsung.com) by jackpot.kr.gnumonks.org with esmtp (Exim 4.69) (envelope-from ) id 1QdXqr-0002uX-Tf; Mon, 04 Jul 2011 10:21:29 +0900 From: KyongHo Cho To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] ARM: EXYNOS4: SYSMMU: add devname in SYSMMU clock to support clkdev. Date: Mon, 4 Jul 2011 10:41:45 +0900 Message-Id: <1309743708-1505-5-git-send-email-pullip.cho@samsung.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1309743708-1505-1-git-send-email-pullip.cho@samsung.com> References: <1309743708-1505-1-git-send-email-pullip.cho@samsung.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110703_221432_069728_098C0780 X-CRM114-Status: GOOD ( 13.81 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- Cc: Kukjin Kim , Joerg Roedel , Ilho Lee , Kwanghyun La , Sanghyun Lee , KyongHo Cho 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]); Mon, 04 Jul 2011 02:16:15 +0000 (UTC) This patch adds 'devname' memeber to clk structure definition for System MMUs. Use of 'name' member of clk structure is obsolete anymore. Signed-off-by: KyongHo Cho --- arch/arm/mach-exynos4/clock.c | 15 +++++++++++++++ arch/arm/mach-exynos4/dev-sysmmu.c | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-exynos4/clock.c b/arch/arm/mach-exynos4/clock.c index ecbe87b..7d9fbeb 100644 --- a/arch/arm/mach-exynos4/clock.c +++ b/arch/arm/mach-exynos4/clock.c @@ -628,62 +628,77 @@ static struct clk init_clocks_off[] = { .ctrlbit = (1 << 13), }, { .name = "SYSMMU_SSS", + .devname = "s5p-sysmmu.0", .enable = exynos4_clk_ip_dmc_ctrl, .ctrlbit = (1 << 12), }, { .name = "SYSMMU_FIMC0", + .devname = "s5p-sysmmu.1", .enable = exynos4_clk_ip_cam_ctrl, .ctrlbit = (1 << 7), }, { .name = "SYSMMU_FIMC1", + .devname = "s5p-sysmmu.2", .enable = exynos4_clk_ip_cam_ctrl, .ctrlbit = (1 << 8), }, { .name = "SYSMMU_FIMC2", + .devname = "s5p-sysmmu.3", .enable = exynos4_clk_ip_cam_ctrl, .ctrlbit = (1 << 9), }, { .name = "SYSMMU_FIMC3", + .devname = "s5p-sysmmu.4", .enable = exynos4_clk_ip_cam_ctrl, .ctrlbit = (1 << 10), }, { .name = "SYSMMU_JPEG", + .devname = "s5p-sysmmu.5", .enable = exynos4_clk_ip_cam_ctrl, .ctrlbit = (1 << 11), }, { .name = "SYSMMU_FIMD0", + .devname = "s5p-sysmmu.6", .enable = exynos4_clk_ip_lcd0_ctrl, .ctrlbit = (1 << 4), }, { .name = "SYSMMU_FIMD1", + .devname = "s5p-sysmmu.7", .enable = exynos4_clk_ip_lcd1_ctrl, .ctrlbit = (1 << 4), }, { .name = "SYSMMU_PCIe", + .devname = "s5p-sysmmu.8", .enable = exynos4_clk_ip_fsys_ctrl, .ctrlbit = (1 << 18), }, { .name = "SYSMMU_G2D", + .devname = "s5p-sysmmu.9", .enable = exynos4_clk_ip_image_ctrl, .ctrlbit = (1 << 3), }, { .name = "SYSMMU_ROTATOR", + .devname = "s5p-sysmmu.10", .enable = exynos4_clk_ip_image_ctrl, .ctrlbit = (1 << 4), }, { .name = "SYSMMU_MDMA", + .devname = "s5p-sysmmu.11", .enable = exynos4_clk_ip_image_ctrl, .ctrlbit = (1 << 5), }, { .name = "SYSMMU_TV", + .devname = "s5p-sysmmu.12", .enable = exynos4_clk_ip_tv_ctrl, .ctrlbit = (1 << 4), }, { .name = "SYSMMU_MFC_L", + .devname = "s5p-sysmmu.13", .enable = exynos4_clk_ip_mfc_ctrl, .ctrlbit = (1 << 1), }, { .name = "SYSMMU_MFC_R", + .devname = "s5p-sysmmu.14", .enable = exynos4_clk_ip_mfc_ctrl, .ctrlbit = (1 << 2), } diff --git a/arch/arm/mach-exynos4/dev-sysmmu.c b/arch/arm/mach-exynos4/dev-sysmmu.c index 5da8a4c..824a079 100644 --- a/arch/arm/mach-exynos4/dev-sysmmu.c +++ b/arch/arm/mach-exynos4/dev-sysmmu.c @@ -103,7 +103,7 @@ struct platform_device exynos4_device_sysmmu[S5P_SYSMMU_TOTAL_IPNUM] = { static struct clk *sysmmu_clk[S5P_SYSMMU_TOTAL_IPNUM]; void sysmmu_clk_init(struct device *dev, sysmmu_ips ips) { - sysmmu_clk[ips] = clk_get(dev, sysmmu_ips_name[ips]); + sysmmu_clk[ips] = clk_get(dev, NULL); if (IS_ERR(sysmmu_clk[ips])) sysmmu_clk[ips] = NULL; else