From: Grazvydas Ignotas Date: Thu, 13 Nov 2008 21:40:04 +0000 (+0200) Subject: HSMMC: Make loopback clock configurable X-Git-Tag: v2.6.28-omap1~151 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1d55c5dbf0a4db822198d46b03a3a451e0ede4df;p=linux-2.6-omap-h63xx.git HSMMC: Make loopback clock configurable 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. Signed-off-by: Grazvydas Ignotas Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index b1fe0f34471..0ea6ba6b867 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -250,8 +250,7 @@ static int twl_mmc1_set_power(struct device *dev, int slot, int power_on, omap_ctrl_writel(reg, OMAP243X_CONTROL_DEVCONF1); } - /* REVISIT: Loop back clock not needed for 2430? */ - if (!cpu_is_omap2430()) { + if (c->mmc->slots[0].internal_clock) { reg = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); reg |= OMAP2_MMCSDIO1ADPCLKISEL; omap_ctrl_writel(reg, OMAP2_CONTROL_DEVCONF0); @@ -298,11 +297,13 @@ static int twl_mmc2_set_power(struct device *dev, int slot, int power_on, int vd struct twl_mmc_controller *c = &hsmmc[1]; if (power_on) { - u32 reg; + if (c->mmc->slots[0].internal_clock) { + u32 reg; - reg = omap_ctrl_readl(control_devconf1_offset); - reg |= OMAP2_MMCSDIO2ADPCLKISEL; - omap_ctrl_writel(reg, control_devconf1_offset); + reg = omap_ctrl_readl(control_devconf1_offset); + reg |= OMAP2_MMCSDIO2ADPCLKISEL; + omap_ctrl_writel(reg, control_devconf1_offset); + } ret = twl_mmc_set_voltage(c, vdd); } else { ret = twl_mmc_set_voltage(c, 0); @@ -354,6 +355,7 @@ void __init hsmmc_init(struct twl4030_hsmmc_info *controllers) MMC_VDD_29_30 | MMC_VDD_30_31 | MMC_VDD_31_32; mmc->slots[0].wires = c->wires; + mmc->slots[0].internal_clock = !c->ext_clock; mmc->dma_mask = 0xffffffff; /* note: twl4030 card detect GPIOs normally switch VMMCx ... */ diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h index a2e60fed798..e2d58a28f24 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.h +++ b/arch/arm/mach-omap2/mmc-twl4030.h @@ -11,6 +11,7 @@ struct twl4030_hsmmc_info { u8 wires; /* 1/4/8 wires */ int gpio_cd; /* or -EINVAL */ int gpio_wp; /* or -EINVAL */ + int ext_clock:1; /* use external pin for input clock */ }; #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \