From patchwork Fri Jul 17 22:17:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 36120 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6HML5DM006883 for ; Fri, 17 Jul 2009 22:21:05 GMT Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6HMJRKM030626; Fri, 17 Jul 2009 17:19:32 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id n6HMJQ6o023566; Fri, 17 Jul 2009 17:19:26 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id BF78280644; Fri, 17 Jul 2009 17:19:24 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id A974680641 for ; Fri, 17 Jul 2009 17:17:56 -0500 (CDT) Received: from neches.ext.ti.com (localhost [127.0.0.1]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id n6HMHu9p005028 for ; Fri, 17 Jul 2009 17:17:56 -0500 (CDT) Received: from mail157-wa4-R.bigfish.com (mail-wa4.bigfish.com [216.32.181.114]) by neches.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6HMHpbi011167 for ; Fri, 17 Jul 2009 17:17:56 -0500 Received: from mail157-wa4 (localhost.localdomain [127.0.0.1]) by mail157-wa4-R.bigfish.com (Postfix) with ESMTP id E36AD17C819A for ; Fri, 17 Jul 2009 22:17:50 +0000 (UTC) X-SpamScore: 1 X-BigFish: vps1(z5edJz19c2kzz1202hzzz2dh62h) X-Spam-TCS-SCL: 1:0 X-FB-SS: 5, X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.221.174; Service: EHS Received: by mail157-wa4 (MessageSwitch) id 1247869069146618_32173; Fri, 17 Jul 2009 22:17:49 +0000 (UCT) Received: from mail-qy0-f174.google.com (mail-qy0-f174.google.com [209.85.221.174]) by mail157-wa4.bigfish.com (Postfix) with ESMTP id E53717A0050 for ; Fri, 17 Jul 2009 22:17:48 +0000 (UTC) Received: by mail-qy0-f174.google.com with SMTP id 4so947622qyk.4 for ; Fri, 17 Jul 2009 15:17:48 -0700 (PDT) Received: by 10.224.89.9 with SMTP id c9mr1137348qam.123.1247869068755; Fri, 17 Jul 2009 15:17:48 -0700 (PDT) Received: from localhost (deeprooted.net [216.254.16.51]) by mx.google.com with ESMTPS id 5sm2322146qwh.21.2009.07.17.15.17.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 17 Jul 2009 15:17:48 -0700 (PDT) From: Kevin Hilman To: linux-arm-kernel@lists.arm.linux.org.uk Date: Fri, 17 Jul 2009 15:17:25 -0700 Message-Id: <1247869060-10719-3-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1247869060-10719-2-git-send-email-khilman@deeprootsystems.com> References: <1247869060-10719-1-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-2-git-send-email-khilman@deeprootsystems.com> Cc: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 02/17] davinci: dm646x: Add clock info and update mux setup for ATA X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.4 Precedence: list List-Id: davinci-linux-open-source.linux.davincidsp.com List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com From: Hemant Pedanekar This patch adds clock data for IDE and also updates pin mux mask for ATA so as to disable PCI when ATA is selected. Signed-off-by: Hemant Pedanekar Signed-off-by: Kevin Hilman --- arch/arm/mach-davinci/dm646x.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 199f288..50f01e0 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -285,6 +285,13 @@ static struct clk timer2_clk = { .flags = ALWAYS_ENABLED, /* no LPSC, always enabled; c.f. spruep9a */ }; + +static struct clk ide_clk = { + .name = "ide", + .parent = &pll1_sysclk4, + .lpsc = DAVINCI_LPSC_ATA, +}; + static struct clk vpif0_clk = { .name = "vpif0", .parent = &ref_clk, @@ -336,6 +343,7 @@ struct davinci_clk dm646x_clks[] = { CLK(NULL, "timer0", &timer0_clk), CLK(NULL, "timer1", &timer1_clk), CLK("watchdog", NULL, &timer2_clk), + CLK("palm_bk3710", NULL, &ide_clk), CLK(NULL, "vpif0", &vpif0_clk), CLK(NULL, "vpif1", &vpif1_clk), CLK(NULL, NULL, NULL), @@ -399,7 +407,7 @@ static struct platform_device dm646x_emac_device = { */ static const struct mux_config dm646x_pins[] = { #ifdef CONFIG_DAVINCI_MUX -MUX_CFG(DM646X, ATAEN, 0, 0, 1, 1, true) +MUX_CFG(DM646X, ATAEN, 0, 0, 5, 1, true) MUX_CFG(DM646X, AUDCK1, 0, 29, 1, 0, false)