From patchwork Sat Oct 3 21:58:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cory Maccarrone X-Patchwork-Id: 51556 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n93M428t027045 for ; Sat, 3 Oct 2009 22:04:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753300AbZJCV7i (ORCPT ); Sat, 3 Oct 2009 17:59:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752257AbZJCV7i (ORCPT ); Sat, 3 Oct 2009 17:59:38 -0400 Received: from mail-yw0-f176.google.com ([209.85.211.176]:44139 "EHLO mail-yw0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751331AbZJCV7h (ORCPT ); Sat, 3 Oct 2009 17:59:37 -0400 Received: by ywh6 with SMTP id 6so1498344ywh.4 for ; Sat, 03 Oct 2009 14:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:from:date:message-id :subject:to:content-type; bh=k5KO+ixUmCHCZSx3vjmePRgZ4UIMGlpwUFFJBubF5pE=; b=dcs4ZElTsWkAW4TMIw/CNJhspQNHunl3oTgHnGXPVa+GsEzjjVSBpHklvBV13aPz4v lTvgYoym5NVv0swqdsgKcxfj2WjtcvMmiQ+TCB3vyKGG1Z2X451fqV1JcWYnxp96UzGY YIM8duYHHlNYgyY0w0oU0fv8PqjTg15Tqefow= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=N3kTLGkJpXEZNwpnxncY305NKPBkNTVzZWaS27TOmcuuMWuq7mqeNinJnF2tKjMlLK oKyRzY4g9vRLSZZ+BM1s0uzAQzzLHvn9APLvA0s5dVCH+sqdRl0a9DiTdIV1IerU409G i6WI0MMmaHaoDOIloevReAG3Jj40mAQebZPJ4= MIME-Version: 1.0 Received: by 10.151.86.12 with SMTP id o12mr6964768ybl.253.1254607141049; Sat, 03 Oct 2009 14:59:01 -0700 (PDT) From: Cory Maccarrone Date: Sat, 3 Oct 2009 14:58:41 -0700 Message-ID: <6cb013310910031458x666606cagdd1c5f9d4fb26dac@mail.gmail.com> Subject: [PATCH] [OMAP7XX] Add missing clocks for MMC To: linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 5f77b83..8ff0a07 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -125,7 +125,8 @@ static struct omap_clk omap_clks[] = { CLK(NULL, "bclk", &bclk_1510, CK_1510 | CK_310), CLK(NULL, "bclk", &bclk_16xx, CK_16XX), CLK("mmci-omap.0", "fck", &mmc1_ck, CK_16XX | CK_1510 | CK_310), - CLK("mmci-omap.0", "ick", &armper_ck.clk, CK_16XX | CK_1510 | CK_310), + CLK("mmci-omap.0", "fck", &mmc3_ck, CK_7XX), + CLK("mmci-omap.0", "ick", &armper_ck.clk, CK_16XX | CK_1510 | CK_310 | CK_7XX), CLK("mmci-omap.1", "fck", &mmc2_ck, CK_16XX), CLK("mmci-omap.1", "ick", &armper_ck.clk, CK_16XX), /* Virtual clocks */ diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 17f8742..fac921c 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h @@ -637,6 +637,18 @@ static struct clk mmc2_ck = { .enable_bit = 20, }; +static struct clk mmc3_ck = { + .name = "mmc_ck", + .id = 2, + .ops = &clkops_generic, + /* Functional clock is direct from ULPD, interface clock is ARMPER */ + .parent = &armper_ck.clk, + .rate = 48000000, + .flags = RATE_FIXED | ENABLE_REG_32BIT | CLOCK_NO_IDLE_PARENT, + .enable_reg = OMAP1_IO_ADDRESS(SOFT_REQ_REG), + .enable_bit = 12, +}; + static struct clk virtual_ck_mpu = { .name = "mpu", .ops = &clkops_null,