From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grazvydas Ignotas Subject: Re: [PATCH 1/2] HSMMC: Make loopback clock configurable Date: Fri, 14 Nov 2008 12:49:12 +0200 Message-ID: <1226659752-21741-1-git-send-email-notasas@gmail.com> References: <5e088bd90811132241i3a8ccdc3ua30d941e0315dc6f@mail.gmail.com> Return-path: Received: from ug-out-1314.google.com ([66.249.92.173]:8980 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750877AbYKNKt0 (ORCPT ); Fri, 14 Nov 2008 05:49:26 -0500 Received: by ug-out-1314.google.com with SMTP id 39so1604467ugf.37 for ; Fri, 14 Nov 2008 02:49:24 -0800 (PST) In-Reply-To: <5e088bd90811132241i3a8ccdc3ua30d941e0315dc6f@mail.gmail.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: linux-omap@vger.kernel.org Cc: sakoman@gmail.com, Grazvydas Ignotas On Fri, Nov 14, 2008 at 8:41 AM, Steve Sakoman wrote: > On Thu, Nov 13, 2008 at 3:06 PM, Tony Lindgren wrote: >> * Grazvydas Ignotas [081113 13:40]: >>> Some boards use input clock from external pin for MMC/SDIO >>> modules in OMAP chips. Make that option selectable instead of >>> forcing loop back clock on everyone. >> >> Thanks, pushing both today. > > Hmm . . . not sure if it is related to this patch, but I now get an > oops on Overo. Oops.. Haven't thought to try it without gpio_cd set up, in which case c->mmc is not set initialized.. Please try the following patch: diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index 0ea6ba6..626d668 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -239,6 +239,7 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, u32 reg; int ret = 0; struct twl_mmc_controller *c = &hsmmc[0]; + struct omap_mmc_platform_data *mmc = dev->platform_data; if (power_on) { if (cpu_is_omap2430()) { @@ -250,7 +251,7 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, omap_ctrl_writel(reg, OMAP243X_CONTROL_DEVCONF1); } - if (c->mmc->slots[0].internal_clock) { + if (mmc->slots[0].internal_clock) { reg = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); reg |= OMAP2_MMCSDIO1ADPCLKISEL; omap_ctrl_writel(reg, OMAP2_CONTROL_DEVCONF0); @@ -293,11 +294,11 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, static int twl_mmc2_set_power(struct device *dev, int slot, int power_on, int vdd) { int ret; - struct twl_mmc_controller *c = &hsmmc[1]; + struct omap_mmc_platform_data *mmc = dev->platform_data; if (power_on) { - if (c->mmc->slots[0].internal_clock) { + if (mmc->slots[0].internal_clock) { u32 reg; reg = omap_ctrl_readl(control_devconf1_offset);