From patchwork Tue Aug 16 21:31:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Zapolskiy X-Patchwork-Id: 1072452 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 p7GLWMxw000884 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 16 Aug 2011 21:32:43 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QtRF2-0003Ft-8d; Tue, 16 Aug 2011 21:32:08 +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 1QtRF1-00007B-MC; Tue, 16 Aug 2011 21:32:07 +0000 Received: from li271-223.members.linode.com ([178.79.152.223] helo=mail.mleia.com) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QtREg-0008Ux-UP for linux-arm-kernel@lists.infradead.org; Tue, 16 Aug 2011 21:31:48 +0000 Received: from localhost.localdomain (a88-114-218-111.elisa-laajakaista.fi [88.114.218.111]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.mleia.com (Postfix) with ESMTPSA id 6B45B182A4; Tue, 16 Aug 2011 22:31:43 +0100 (BST) From: Vladimir Zapolskiy To: Kukjin Kim Subject: [PATCH 2/3] ARM: S5PC100: use dma-pl330 device name for clock Date: Wed, 17 Aug 2011 00:31:05 +0300 Message-Id: <1313530266-14939-3-git-send-email-vz@mleia.com> X-Mailer: git-send-email 1.7.5.1 In-Reply-To: <1313530266-14939-1-git-send-email-vz@mleia.com> References: <1313530266-14939-1-git-send-email-vz@mleia.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110816_173147_099053_D2B46B57 X-CRM114-Status: GOOD ( 13.01 ) 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: Boojin Kim , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vladimir Zapolskiy 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, 16 Aug 2011 21:32:43 +0000 (UTC) This change replaces s3c-pl330.x clock device names with dma-pl330.x, otherwise there won't be a correspondence between clock device name and amba device name, thus clocks can't be enabled. Fixes runtime errors on clk_get() from drivers/dma/pl330.c: dma-pl330 dma-pl330.0: Cannot get operation clock. dma-pl330: probe of dma-pl330.0 failed with error -22 Signed-off-by: Vladimir Zapolskiy Cc: Boojin Kim --- arch/arm/mach-s5pc100/clock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c index 6527c05..8d47709 100644 --- a/arch/arm/mach-s5pc100/clock.c +++ b/arch/arm/mach-s5pc100/clock.c @@ -460,13 +460,13 @@ static struct clk init_clocks_off[] = { .ctrlbit = (1 << 2), }, { .name = "dma", - .devname = "s3c-pl330.1", + .devname = "dma-pl330.1", .parent = &clk_div_d1_bus.clk, .enable = s5pc100_d1_0_ctrl, .ctrlbit = (1 << 1), }, { .name = "dma", - .devname = "s3c-pl330.0", + .devname = "dma-pl330.0", .parent = &clk_div_d1_bus.clk, .enable = s5pc100_d1_0_ctrl, .ctrlbit = (1 << 0),