| Message ID | 1349982281-10785-9-git-send-email-mporter@ti.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
Matt On Fri, Oct 12, 2012 at 00:34:33, Porter, Matt wrote: > AM33xx requires special handling in hsmmc initialization > platform glue. Since AM335x boots mainly through DT, do we still need this patch. This function will be called in case of initializing hsmmc with Platform data. > > Signed-off-by: Matt Porter <mporter@ti.com> > --- > arch/arm/mach-omap2/hsmmc.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > ..snip.. ..snip.. > name = "omap_hsmmc"; > res = snprintf(oh_name, MAX_OMAP_MMC_HWMOD_NAME_LEN, > -- > 1.7.9.5 > > _______________________________________________ > Davinci-linux-open-source mailing list > Davinci-linux-open-source@linux.davincidsp.com > http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source > Regards, Gururaja ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev
On Fri, Oct 12, 2012 at 09:17:53AM +0000, Hebbar, Gururaja wrote: > Matt > > On Fri, Oct 12, 2012 at 00:34:33, Porter, Matt wrote: > > AM33xx requires special handling in hsmmc initialization > > platform glue. > > Since AM335x boots mainly through DT, do we still need this patch. > This function will be called in case of initializing hsmmc with > Platform data. Yes, thanks, will drop in v3. -Matt ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 4d3a632..42ce988 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -365,7 +365,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, else mmc->slots[0].ocr_mask = c->ocr_mask; - if (!soc_is_am35xx()) + if (!soc_is_am35xx() && !soc_is_am33xx()) mmc->slots[0].features |= HSMMC_HAS_PBIAS; if (cpu_is_omap44xx() && (omap_rev() > OMAP4430_REV_ES1_0)) @@ -388,7 +388,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, } } - if (soc_is_am35xx()) + if (soc_is_am35xx() || soc_is_am33xx()) mmc->slots[0].set_power = nop_mmc_set_power; /* OMAP3630 HSMMC1 supports only 4-bit */ @@ -489,7 +489,8 @@ static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo, if (res < 0) goto free_mmc; - omap_hsmmc_mux(mmc_data, (ctrl_nr - 1)); + if (!soc_is_am33xx()) + omap_hsmmc_mux(mmc_data, (ctrl_nr - 1)); name = "omap_hsmmc"; res = snprintf(oh_name, MAX_OMAP_MMC_HWMOD_NAME_LEN,
AM33xx requires special handling in hsmmc initialization platform glue. Signed-off-by: Matt Porter <mporter@ti.com> --- arch/arm/mach-omap2/hsmmc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)