* [PATCH 05/10] [PM-WIP-MMC] OMAP4 hwmod: Updating hwmod data for MMC controllers @ 2010-08-20 20:10 kishore kadiyala 2010-08-23 8:00 ` Cousson, Benoit 0 siblings, 1 reply; 3+ messages in thread From: kishore kadiyala @ 2010-08-20 20:10 UTC (permalink / raw) To: linux-omap; +Cc: khilman, tony, b-cousson Update register offsets and dev attributes for MMC controllers on OMAP4 Cc: Kevin Hilman <khilman@deeprootsystems.com> Cc: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com> --- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index b7268f6..db62b84 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -22,6 +22,7 @@ #include <plat/omap_hwmod.h> #include <plat/cpu.h> +#include <plat/mmc.h> #include "omap_hwmod_common_data.h" @@ -408,8 +409,8 @@ static struct omap_hwmod omap44xx_l4_wkup_hwmod = { */ static struct omap_hwmod_class_sysconfig omap44xx_mmc_sysc = { - .rev_offs = 0x0000, - .sysc_offs = 0x0010, + .rev_offs = 0x02FC, + .sysc_offs = 0x0110, .syss_offs = 0x0114, .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_EMUFREE | SYSC_HAS_SOFTRESET | SYSC_HAS_MIDLEMODE), @@ -424,6 +425,11 @@ static struct omap_hwmod_class omap44xx_mmc_hwmod_class = { }; /* mmc1 */ + +static struct mmc_dev_attr mmc1_dev_attr = { + .flags = MMC_INTERNAL_XCVR, +}; + static struct omap_hwmod_irq_info omap44xx_mmc1_irqs[] = { { .irq = 83 + OMAP44XX_IRQ_GIC_START }, }; @@ -478,10 +484,16 @@ static struct omap_hwmod omap44xx_mmc1_hwmod = { .slaves_cnt = ARRAY_SIZE(omap44xx_mmc1_slaves), .masters = omap44xx_mmc1_masters, .masters_cnt = ARRAY_SIZE(omap44xx_mmc1_masters), + .dev_attr = &mmc1_dev_attr, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), }; /* mmc2 */ + +static struct mmc_dev_attr mmc2_dev_attr = { + .flags = MMC_SUPPORTS_EXTERNAL_XCVR, +}; + static struct omap_hwmod_irq_info omap44xx_mmc2_irqs[] = { { .irq = 86 + OMAP44XX_IRQ_GIC_START }, }; @@ -536,6 +548,7 @@ static struct omap_hwmod omap44xx_mmc2_hwmod = { .slaves_cnt = ARRAY_SIZE(omap44xx_mmc2_slaves), .masters = omap44xx_mmc2_masters, .masters_cnt = ARRAY_SIZE(omap44xx_mmc2_masters), + .dev_attr = &mmc2_dev_attr, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), }; -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 05/10] [PM-WIP-MMC] OMAP4 hwmod: Updating hwmod data for MMC controllers 2010-08-20 20:10 [PATCH 05/10] [PM-WIP-MMC] OMAP4 hwmod: Updating hwmod data for MMC controllers kishore kadiyala @ 2010-08-23 8:00 ` Cousson, Benoit 2010-08-27 14:34 ` kishore kadiyala 0 siblings, 1 reply; 3+ messages in thread From: Cousson, Benoit @ 2010-08-23 8:00 UTC (permalink / raw) To: Kadiyala, Kishore Cc: linux-omap@vger.kernel.org, khilman@deeprootsystems.com, tony@atomide.com Hi Kishore, On 8/20/2010 10:10 PM, Kadiyala, Kishore wrote: > Update register offsets and dev attributes for MMC controllers on > OMAP4 > > Cc: Kevin Hilman<khilman@deeprootsystems.com> > Cc: Benoit Cousson<b-cousson@ti.com> > Signed-off-by: Kishore Kadiyala<kishore.kadiyala@ti.com> > --- > arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 17 +++++++++++++++-- > 1 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > index b7268f6..db62b84 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > @@ -22,6 +22,7 @@ > > #include<plat/omap_hwmod.h> > #include<plat/cpu.h> > +#include<plat/mmc.h> > > #include "omap_hwmod_common_data.h" > > @@ -408,8 +409,8 @@ static struct omap_hwmod omap44xx_l4_wkup_hwmod = { > */ > > static struct omap_hwmod_class_sysconfig omap44xx_mmc_sysc = { > - .rev_offs = 0x0000, > - .sysc_offs = 0x0010, > + .rev_offs = 0x02FC, > + .sysc_offs = 0x0110, You should not use these registers. MMC is one of the few IP that contains both legacy and highlander version of the registers, hence the _HL prefix for the MMCHS_HL_REV and MMCHS_HL_SYSCONFIG. I don't know why the legacy registers are still there, but you should use the highlander version. Regards, Benoit > .syss_offs = 0x0114, > .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_EMUFREE | > SYSC_HAS_SOFTRESET | SYSC_HAS_MIDLEMODE), > @@ -424,6 +425,11 @@ static struct omap_hwmod_class omap44xx_mmc_hwmod_class = { > }; > > /* mmc1 */ > + > +static struct mmc_dev_attr mmc1_dev_attr = { > + .flags = MMC_INTERNAL_XCVR, > +}; > + > static struct omap_hwmod_irq_info omap44xx_mmc1_irqs[] = { > { .irq = 83 + OMAP44XX_IRQ_GIC_START }, > }; > @@ -478,10 +484,16 @@ static struct omap_hwmod omap44xx_mmc1_hwmod = { > .slaves_cnt = ARRAY_SIZE(omap44xx_mmc1_slaves), > .masters = omap44xx_mmc1_masters, > .masters_cnt = ARRAY_SIZE(omap44xx_mmc1_masters), > + .dev_attr =&mmc1_dev_attr, > .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), > }; > > /* mmc2 */ > + > +static struct mmc_dev_attr mmc2_dev_attr = { > + .flags = MMC_SUPPORTS_EXTERNAL_XCVR, > +}; > + > static struct omap_hwmod_irq_info omap44xx_mmc2_irqs[] = { > { .irq = 86 + OMAP44XX_IRQ_GIC_START }, > }; > @@ -536,6 +548,7 @@ static struct omap_hwmod omap44xx_mmc2_hwmod = { > .slaves_cnt = ARRAY_SIZE(omap44xx_mmc2_slaves), > .masters = omap44xx_mmc2_masters, > .masters_cnt = ARRAY_SIZE(omap44xx_mmc2_masters), > + .dev_attr =&mmc2_dev_attr, > .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), > }; > ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 05/10] [PM-WIP-MMC] OMAP4 hwmod: Updating hwmod data for MMC controllers 2010-08-23 8:00 ` Cousson, Benoit @ 2010-08-27 14:34 ` kishore kadiyala 0 siblings, 0 replies; 3+ messages in thread From: kishore kadiyala @ 2010-08-27 14:34 UTC (permalink / raw) To: Cousson, Benoit Cc: Kadiyala, Kishore, linux-omap@vger.kernel.org, khilman@deeprootsystems.com, tony@atomide.com Benoit, On Mon, Aug 23, 2010 at 1:30 PM, Cousson, Benoit <b-cousson@ti.com> wrote: > Hi Kishore, > > On 8/20/2010 10:10 PM, Kadiyala, Kishore wrote: >> >> Update register offsets and dev attributes for MMC controllers on >> OMAP4 >> >> Cc: Kevin Hilman<khilman@deeprootsystems.com> >> Cc: Benoit Cousson<b-cousson@ti.com> >> Signed-off-by: Kishore Kadiyala<kishore.kadiyala@ti.com> >> --- >> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 17 +++++++++++++++-- >> 1 files changed, 15 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c >> b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c >> index b7268f6..db62b84 100644 >> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c >> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c >> @@ -22,6 +22,7 @@ >> >> #include<plat/omap_hwmod.h> >> #include<plat/cpu.h> >> +#include<plat/mmc.h> >> >> #include "omap_hwmod_common_data.h" >> >> @@ -408,8 +409,8 @@ static struct omap_hwmod omap44xx_l4_wkup_hwmod = { >> */ >> >> static struct omap_hwmod_class_sysconfig omap44xx_mmc_sysc = { >> - .rev_offs = 0x0000, >> - .sysc_offs = 0x0010, >> + .rev_offs = 0x02FC, >> + .sysc_offs = 0x0110, > > You should not use these registers. MMC is one of the few IP that contains > both legacy and highlander version of the registers, hence the _HL prefix > for the MMCHS_HL_REV and MMCHS_HL_SYSCONFIG. > > I don't know why the legacy registers are still there, but you should use > the highlander version. Thanks for the info. I will drop the patch. Regards, Kishore > > Regards, > Benoit > >> .syss_offs = 0x0114, >> .sysc_flags = (SYSC_HAS_SIDLEMODE | SYSC_HAS_EMUFREE | >> SYSC_HAS_SOFTRESET | SYSC_HAS_MIDLEMODE), >> @@ -424,6 +425,11 @@ static struct omap_hwmod_class >> omap44xx_mmc_hwmod_class = { >> }; >> >> /* mmc1 */ >> + >> +static struct mmc_dev_attr mmc1_dev_attr = { >> + .flags = MMC_INTERNAL_XCVR, >> +}; >> + >> static struct omap_hwmod_irq_info omap44xx_mmc1_irqs[] = { >> { .irq = 83 + OMAP44XX_IRQ_GIC_START }, >> }; >> @@ -478,10 +484,16 @@ static struct omap_hwmod omap44xx_mmc1_hwmod = { >> .slaves_cnt = ARRAY_SIZE(omap44xx_mmc1_slaves), >> .masters = omap44xx_mmc1_masters, >> .masters_cnt = ARRAY_SIZE(omap44xx_mmc1_masters), >> + .dev_attr =&mmc1_dev_attr, >> .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), >> }; >> >> /* mmc2 */ >> + >> +static struct mmc_dev_attr mmc2_dev_attr = { >> + .flags = MMC_SUPPORTS_EXTERNAL_XCVR, >> +}; >> + >> static struct omap_hwmod_irq_info omap44xx_mmc2_irqs[] = { >> { .irq = 86 + OMAP44XX_IRQ_GIC_START }, >> }; >> @@ -536,6 +548,7 @@ static struct omap_hwmod omap44xx_mmc2_hwmod = { >> .slaves_cnt = ARRAY_SIZE(omap44xx_mmc2_slaves), >> .masters = omap44xx_mmc2_masters, >> .masters_cnt = ARRAY_SIZE(omap44xx_mmc2_masters), >> + .dev_attr =&mmc2_dev_attr, >> .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), >> }; >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-27 14:34 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-08-20 20:10 [PATCH 05/10] [PM-WIP-MMC] OMAP4 hwmod: Updating hwmod data for MMC controllers kishore kadiyala 2010-08-23 8:00 ` Cousson, Benoit 2010-08-27 14:34 ` kishore kadiyala
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.