| Message ID | 1248958183-15015-3-git-send-email-eduardo.valentin@nokia.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
On Thu, 30 Jul 2009 15:49:25 +0300 Eduardo Valentin <eduardo.valentin@nokia.com> wrote: > --- a/arch/arm/plat-omap/mcbsp.c > +++ b/arch/arm/plat-omap/mcbsp.c > @@ -257,6 +257,23 @@ int omap_mcbsp_request(unsigned int id) > clk_enable(mcbsp->iclk); > clk_enable(mcbsp->fclk); > > +#ifdef CONFIG_ARCH_OMAP34XX > + /* I'm sure there is a way to avoid all of these added ifdefs in this patch and in patches 7 and 8 as well.
On Thu, Jul 30, 2009 at 08:56:02PM +0200, ext Jarkko Nikula wrote: > On Thu, 30 Jul 2009 15:49:25 +0300 > Eduardo Valentin <eduardo.valentin@nokia.com> wrote: > > > --- a/arch/arm/plat-omap/mcbsp.c > > +++ b/arch/arm/plat-omap/mcbsp.c > > @@ -257,6 +257,23 @@ int omap_mcbsp_request(unsigned int id) > > clk_enable(mcbsp->iclk); > > clk_enable(mcbsp->fclk); > > > > +#ifdef CONFIG_ARCH_OMAP34XX > > + /* > > I'm sure there is a way to avoid all of these added ifdefs in this patch > and in patches 7 and 8 as well. hmmm.. these ifdef's are required because I've put the extra field (for 34xx only) inside an ifdef on their declaration in mcbsp.h. We can remove it there, but will leave a few extra bytes on !omap3xx binaries. > > > -- > Jarkko
On Thu, Aug 06, 2009 at 02:02:09PM +0200, ext Tony Lindgren wrote: > * Tony Lindgren <tony@atomide.com> [090806 15:00]: > > * Eduardo Valentin <eduardo.valentin@nokia.com> [090730 16:01]: > > > From: Eero Nurkkala <ext-eero.nurkkala@nokia.com> > > > > > > This patch enables the smart idle mode while > > > McBPS is being utilized. Once it's done, > > > force idle mode is taken instead. Apart of it, > > > it also configures what signals will wake mcbsp up. > > > > > > Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com> > > > Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com> > > > --- > > > arch/arm/plat-omap/include/mach/mcbsp.h | 17 +++++++++++++++ > > > arch/arm/plat-omap/mcbsp.c | 35 +++++++++++++++++++++++++++++++ > > > 2 files changed, 52 insertions(+), 0 deletions(-) > > > > > > diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h > > > index 77191c5..758ad5c 100644 > > > --- a/arch/arm/plat-omap/include/mach/mcbsp.h > > > +++ b/arch/arm/plat-omap/include/mach/mcbsp.h > > > @@ -134,6 +134,7 @@ > > > #define OMAP_MCBSP_REG_XCERG 0x74 > > > #define OMAP_MCBSP_REG_XCERH 0x78 > > > #define OMAP_MCBSP_REG_SYSCON 0x8C > > > +#define OMAP_MCBSP_REG_WAKEUPEN 0xA8 > > > #define OMAP_MCBSP_REG_XCCR 0xAC > > > #define OMAP_MCBSP_REG_RCCR 0xB0 > > > > > > @@ -249,8 +250,24 @@ > > > #define RDISABLE 0x0001 > > > > > > /********************** McBSP SYSCONFIG bit definitions ********************/ > > > +#define SIDLEMODE(value) ((value)<<3) > > > +#define ENAWAKEUP 0x0004 > > > #define SOFTRST 0x0002 > > > > > > +/********************** McBSP WAKEUPEN bit definitions *********************/ > > > +#define XEMPTYEOFEN 0x4000 > > > +#define XRDYEN 0x0400 > > > +#define XEOFEN 0x0200 > > > +#define XFSXEN 0x0100 > > > +#define XSYNCERREN 0x0080 > > > +#define RRDYEN 0x0008 > > > +#define REOFEN 0x0004 > > > +#define RFSREN 0x0002 > > > +#define RSYNCERREN 0x0001 > > > +#define WAKEUPEN_ALL (XEMPTYEOFEN | XRDYEN | XEOFEN | XFSXEN | \ > > > + XSYNCERREN | RRDYEN | REOFEN | RFSREN | \ > > > + RSYNCERREN) > > > + > > > /* we don't do multichannel for now */ > > > struct omap_mcbsp_reg_cfg { > > > u16 spcr2; > > > diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c > > > index 84cc323..b64896b 100644 > > > --- a/arch/arm/plat-omap/mcbsp.c > > > +++ b/arch/arm/plat-omap/mcbsp.c > > > @@ -257,6 +257,23 @@ int omap_mcbsp_request(unsigned int id) > > > clk_enable(mcbsp->iclk); > > > clk_enable(mcbsp->fclk); > > > > > > +#ifdef CONFIG_ARCH_OMAP34XX > > > + /* > > > + * Enable wakup behavior, smart idle and all wakeups > > > + * REVISIT: some wakeups may be unnecessary > > > + */ > > > + if (cpu_is_omap34xx()) { > > > + u16 syscon; > > > + > > > + syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); > > > + syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03)); > > > + syscon |= (ENAWAKEUP | SIDLEMODE(0x02)); > > > + OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); > > > + > > > + OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, WAKEUPEN_ALL); > > > + } > > > +#endif > > > + > > > /* > > > * Make sure that transmitter, receiver and sample-rate generator are > > > * not running before activating IRQs. > > > @@ -295,6 +312,7 @@ EXPORT_SYMBOL(omap_mcbsp_request); > > > void omap_mcbsp_free(unsigned int id) > > > { > > > struct omap_mcbsp *mcbsp; > > > + u16 wakeupen; > > > > > > if (!omap_mcbsp_check_valid_id(id)) { > > > printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > > @@ -305,6 +323,23 @@ void omap_mcbsp_free(unsigned int id) > > > if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free) > > > mcbsp->pdata->ops->free(id); > > > > > > +#ifdef CONFIG_ARCH_OMAP34XX > > > + /* > > > + * Disable wakup behavior, smart idle and all wakeups > > > + */ > > > + if (cpu_is_omap34xx()) { > > > + u16 syscon; > > > + > > > + syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); > > > + syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03)); > > > + OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); > > > + > > > + wakeupen = OMAP_MCBSP_READ(mcbsp->io_base, WAKEUPEN); > > > + wakeupen &= ~WAKEUPEN_ALL; > > > + OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, wakeupen); > > > + } > > > +#endif > > > + > > > clk_disable(mcbsp->fclk); > > > clk_disable(mcbsp->iclk); > > > > Looks like you should not need the ifdefs here, cpu_is_omap34xx() already > > optimizes the code out if not selected. > > Oops, sorry looks like Jarkko already made the same comment. Yes, no problem, I'll collect all comments and resend the series in its v2. The ifdefs are needed because I've enclosed the extra omap3 fields of struct omap_mcbsp inside a ifdef (following patch). And that will rise a compilation error for other arch's if no ifdefs were put here. But I'll remove the ifdefs from the struct declaration and leave then as extra bytes for arch != omap3. > > > Regards, > > > > Tony > > -- > > 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
On Thu, Aug 06, 2009 at 02:05:25PM +0200, ext Tony Lindgren wrote: > * Eduardo Valentin <eduardo.valentin@nokia.com> [090731 11:08]: > > On Thu, Jul 30, 2009 at 08:56:02PM +0200, ext Jarkko Nikula wrote: > > > On Thu, 30 Jul 2009 15:49:25 +0300 > > > Eduardo Valentin <eduardo.valentin@nokia.com> wrote: > > > > > > > --- a/arch/arm/plat-omap/mcbsp.c > > > > +++ b/arch/arm/plat-omap/mcbsp.c > > > > @@ -257,6 +257,23 @@ int omap_mcbsp_request(unsigned int id) > > > > clk_enable(mcbsp->iclk); > > > > clk_enable(mcbsp->fclk); > > > > > > > > +#ifdef CONFIG_ARCH_OMAP34XX > > > > + /* > > > > > > I'm sure there is a way to avoid all of these added ifdefs in this patch > > > and in patches 7 and 8 as well. > > > > hmmm.. these ifdef's are required because I've put the extra field (for > > 34xx only) inside an ifdef on their declaration in mcbsp.h. We can remove it > > there, but will leave a few extra bytes on !omap3xx binaries. > > Hmm which field are you talking about? The define does not matter, and the > u16 syscon also gets optimized out if 34xx is not selected. dma_op_mode. see patch 0012. > > Tony > -- > 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
* Eduardo Valentin <eduardo.valentin@nokia.com> [090730 16:01]: > From: Eero Nurkkala <ext-eero.nurkkala@nokia.com> > > This patch enables the smart idle mode while > McBPS is being utilized. Once it's done, > force idle mode is taken instead. Apart of it, > it also configures what signals will wake mcbsp up. > > Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com> > Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com> > --- > arch/arm/plat-omap/include/mach/mcbsp.h | 17 +++++++++++++++ > arch/arm/plat-omap/mcbsp.c | 35 +++++++++++++++++++++++++++++++ > 2 files changed, 52 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h > index 77191c5..758ad5c 100644 > --- a/arch/arm/plat-omap/include/mach/mcbsp.h > +++ b/arch/arm/plat-omap/include/mach/mcbsp.h > @@ -134,6 +134,7 @@ > #define OMAP_MCBSP_REG_XCERG 0x74 > #define OMAP_MCBSP_REG_XCERH 0x78 > #define OMAP_MCBSP_REG_SYSCON 0x8C > +#define OMAP_MCBSP_REG_WAKEUPEN 0xA8 > #define OMAP_MCBSP_REG_XCCR 0xAC > #define OMAP_MCBSP_REG_RCCR 0xB0 > > @@ -249,8 +250,24 @@ > #define RDISABLE 0x0001 > > /********************** McBSP SYSCONFIG bit definitions ********************/ > +#define SIDLEMODE(value) ((value)<<3) > +#define ENAWAKEUP 0x0004 > #define SOFTRST 0x0002 > > +/********************** McBSP WAKEUPEN bit definitions *********************/ > +#define XEMPTYEOFEN 0x4000 > +#define XRDYEN 0x0400 > +#define XEOFEN 0x0200 > +#define XFSXEN 0x0100 > +#define XSYNCERREN 0x0080 > +#define RRDYEN 0x0008 > +#define REOFEN 0x0004 > +#define RFSREN 0x0002 > +#define RSYNCERREN 0x0001 > +#define WAKEUPEN_ALL (XEMPTYEOFEN | XRDYEN | XEOFEN | XFSXEN | \ > + XSYNCERREN | RRDYEN | REOFEN | RFSREN | \ > + RSYNCERREN) > + > /* we don't do multichannel for now */ > struct omap_mcbsp_reg_cfg { > u16 spcr2; > diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c > index 84cc323..b64896b 100644 > --- a/arch/arm/plat-omap/mcbsp.c > +++ b/arch/arm/plat-omap/mcbsp.c > @@ -257,6 +257,23 @@ int omap_mcbsp_request(unsigned int id) > clk_enable(mcbsp->iclk); > clk_enable(mcbsp->fclk); > > +#ifdef CONFIG_ARCH_OMAP34XX > + /* > + * Enable wakup behavior, smart idle and all wakeups > + * REVISIT: some wakeups may be unnecessary > + */ > + if (cpu_is_omap34xx()) { > + u16 syscon; > + > + syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); > + syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03)); > + syscon |= (ENAWAKEUP | SIDLEMODE(0x02)); > + OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); > + > + OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, WAKEUPEN_ALL); > + } > +#endif > + > /* > * Make sure that transmitter, receiver and sample-rate generator are > * not running before activating IRQs. > @@ -295,6 +312,7 @@ EXPORT_SYMBOL(omap_mcbsp_request); > void omap_mcbsp_free(unsigned int id) > { > struct omap_mcbsp *mcbsp; > + u16 wakeupen; > > if (!omap_mcbsp_check_valid_id(id)) { > printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > @@ -305,6 +323,23 @@ void omap_mcbsp_free(unsigned int id) > if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free) > mcbsp->pdata->ops->free(id); > > +#ifdef CONFIG_ARCH_OMAP34XX > + /* > + * Disable wakup behavior, smart idle and all wakeups > + */ > + if (cpu_is_omap34xx()) { > + u16 syscon; > + > + syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); > + syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03)); > + OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); > + > + wakeupen = OMAP_MCBSP_READ(mcbsp->io_base, WAKEUPEN); > + wakeupen &= ~WAKEUPEN_ALL; > + OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, wakeupen); > + } > +#endif > + > clk_disable(mcbsp->fclk); > clk_disable(mcbsp->iclk); Looks like you should not need the ifdefs here, cpu_is_omap34xx() already optimizes the code out if not selected. Regards, Tony -- 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
* Tony Lindgren <tony@atomide.com> [090806 15:00]: > * Eduardo Valentin <eduardo.valentin@nokia.com> [090730 16:01]: > > From: Eero Nurkkala <ext-eero.nurkkala@nokia.com> > > > > This patch enables the smart idle mode while > > McBPS is being utilized. Once it's done, > > force idle mode is taken instead. Apart of it, > > it also configures what signals will wake mcbsp up. > > > > Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com> > > Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com> > > --- > > arch/arm/plat-omap/include/mach/mcbsp.h | 17 +++++++++++++++ > > arch/arm/plat-omap/mcbsp.c | 35 +++++++++++++++++++++++++++++++ > > 2 files changed, 52 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h > > index 77191c5..758ad5c 100644 > > --- a/arch/arm/plat-omap/include/mach/mcbsp.h > > +++ b/arch/arm/plat-omap/include/mach/mcbsp.h > > @@ -134,6 +134,7 @@ > > #define OMAP_MCBSP_REG_XCERG 0x74 > > #define OMAP_MCBSP_REG_XCERH 0x78 > > #define OMAP_MCBSP_REG_SYSCON 0x8C > > +#define OMAP_MCBSP_REG_WAKEUPEN 0xA8 > > #define OMAP_MCBSP_REG_XCCR 0xAC > > #define OMAP_MCBSP_REG_RCCR 0xB0 > > > > @@ -249,8 +250,24 @@ > > #define RDISABLE 0x0001 > > > > /********************** McBSP SYSCONFIG bit definitions ********************/ > > +#define SIDLEMODE(value) ((value)<<3) > > +#define ENAWAKEUP 0x0004 > > #define SOFTRST 0x0002 > > > > +/********************** McBSP WAKEUPEN bit definitions *********************/ > > +#define XEMPTYEOFEN 0x4000 > > +#define XRDYEN 0x0400 > > +#define XEOFEN 0x0200 > > +#define XFSXEN 0x0100 > > +#define XSYNCERREN 0x0080 > > +#define RRDYEN 0x0008 > > +#define REOFEN 0x0004 > > +#define RFSREN 0x0002 > > +#define RSYNCERREN 0x0001 > > +#define WAKEUPEN_ALL (XEMPTYEOFEN | XRDYEN | XEOFEN | XFSXEN | \ > > + XSYNCERREN | RRDYEN | REOFEN | RFSREN | \ > > + RSYNCERREN) > > + > > /* we don't do multichannel for now */ > > struct omap_mcbsp_reg_cfg { > > u16 spcr2; > > diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c > > index 84cc323..b64896b 100644 > > --- a/arch/arm/plat-omap/mcbsp.c > > +++ b/arch/arm/plat-omap/mcbsp.c > > @@ -257,6 +257,23 @@ int omap_mcbsp_request(unsigned int id) > > clk_enable(mcbsp->iclk); > > clk_enable(mcbsp->fclk); > > > > +#ifdef CONFIG_ARCH_OMAP34XX > > + /* > > + * Enable wakup behavior, smart idle and all wakeups > > + * REVISIT: some wakeups may be unnecessary > > + */ > > + if (cpu_is_omap34xx()) { > > + u16 syscon; > > + > > + syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); > > + syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03)); > > + syscon |= (ENAWAKEUP | SIDLEMODE(0x02)); > > + OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); > > + > > + OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, WAKEUPEN_ALL); > > + } > > +#endif > > + > > /* > > * Make sure that transmitter, receiver and sample-rate generator are > > * not running before activating IRQs. > > @@ -295,6 +312,7 @@ EXPORT_SYMBOL(omap_mcbsp_request); > > void omap_mcbsp_free(unsigned int id) > > { > > struct omap_mcbsp *mcbsp; > > + u16 wakeupen; > > > > if (!omap_mcbsp_check_valid_id(id)) { > > printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > @@ -305,6 +323,23 @@ void omap_mcbsp_free(unsigned int id) > > if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free) > > mcbsp->pdata->ops->free(id); > > > > +#ifdef CONFIG_ARCH_OMAP34XX > > + /* > > + * Disable wakup behavior, smart idle and all wakeups > > + */ > > + if (cpu_is_omap34xx()) { > > + u16 syscon; > > + > > + syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); > > + syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03)); > > + OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); > > + > > + wakeupen = OMAP_MCBSP_READ(mcbsp->io_base, WAKEUPEN); > > + wakeupen &= ~WAKEUPEN_ALL; > > + OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, wakeupen); > > + } > > +#endif > > + > > clk_disable(mcbsp->fclk); > > clk_disable(mcbsp->iclk); > > Looks like you should not need the ifdefs here, cpu_is_omap34xx() already > optimizes the code out if not selected. Oops, sorry looks like Jarkko already made the same comment. > Regards, > > Tony > -- > 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
* Eduardo Valentin <eduardo.valentin@nokia.com> [090731 11:08]: > On Thu, Jul 30, 2009 at 08:56:02PM +0200, ext Jarkko Nikula wrote: > > On Thu, 30 Jul 2009 15:49:25 +0300 > > Eduardo Valentin <eduardo.valentin@nokia.com> wrote: > > > > > --- a/arch/arm/plat-omap/mcbsp.c > > > +++ b/arch/arm/plat-omap/mcbsp.c > > > @@ -257,6 +257,23 @@ int omap_mcbsp_request(unsigned int id) > > > clk_enable(mcbsp->iclk); > > > clk_enable(mcbsp->fclk); > > > > > > +#ifdef CONFIG_ARCH_OMAP34XX > > > + /* > > > > I'm sure there is a way to avoid all of these added ifdefs in this patch > > and in patches 7 and 8 as well. > > hmmm.. these ifdef's are required because I've put the extra field (for > 34xx only) inside an ifdef on their declaration in mcbsp.h. We can remove it > there, but will leave a few extra bytes on !omap3xx binaries. Hmm which field are you talking about? The define does not matter, and the u16 syscon also gets optimized out if 34xx is not selected. Tony -- 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
diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h index 77191c5..758ad5c 100644 --- a/arch/arm/plat-omap/include/mach/mcbsp.h +++ b/arch/arm/plat-omap/include/mach/mcbsp.h @@ -134,6 +134,7 @@ #define OMAP_MCBSP_REG_XCERG 0x74 #define OMAP_MCBSP_REG_XCERH 0x78 #define OMAP_MCBSP_REG_SYSCON 0x8C +#define OMAP_MCBSP_REG_WAKEUPEN 0xA8 #define OMAP_MCBSP_REG_XCCR 0xAC #define OMAP_MCBSP_REG_RCCR 0xB0 @@ -249,8 +250,24 @@ #define RDISABLE 0x0001 /********************** McBSP SYSCONFIG bit definitions ********************/ +#define SIDLEMODE(value) ((value)<<3) +#define ENAWAKEUP 0x0004 #define SOFTRST 0x0002 +/********************** McBSP WAKEUPEN bit definitions *********************/ +#define XEMPTYEOFEN 0x4000 +#define XRDYEN 0x0400 +#define XEOFEN 0x0200 +#define XFSXEN 0x0100 +#define XSYNCERREN 0x0080 +#define RRDYEN 0x0008 +#define REOFEN 0x0004 +#define RFSREN 0x0002 +#define RSYNCERREN 0x0001 +#define WAKEUPEN_ALL (XEMPTYEOFEN | XRDYEN | XEOFEN | XFSXEN | \ + XSYNCERREN | RRDYEN | REOFEN | RFSREN | \ + RSYNCERREN) + /* we don't do multichannel for now */ struct omap_mcbsp_reg_cfg { u16 spcr2; diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 84cc323..b64896b 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -257,6 +257,23 @@ int omap_mcbsp_request(unsigned int id) clk_enable(mcbsp->iclk); clk_enable(mcbsp->fclk); +#ifdef CONFIG_ARCH_OMAP34XX + /* + * Enable wakup behavior, smart idle and all wakeups + * REVISIT: some wakeups may be unnecessary + */ + if (cpu_is_omap34xx()) { + u16 syscon; + + syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); + syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03)); + syscon |= (ENAWAKEUP | SIDLEMODE(0x02)); + OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); + + OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, WAKEUPEN_ALL); + } +#endif + /* * Make sure that transmitter, receiver and sample-rate generator are * not running before activating IRQs. @@ -295,6 +312,7 @@ EXPORT_SYMBOL(omap_mcbsp_request); void omap_mcbsp_free(unsigned int id) { struct omap_mcbsp *mcbsp; + u16 wakeupen; if (!omap_mcbsp_check_valid_id(id)) { printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); @@ -305,6 +323,23 @@ void omap_mcbsp_free(unsigned int id) if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free) mcbsp->pdata->ops->free(id); +#ifdef CONFIG_ARCH_OMAP34XX + /* + * Disable wakup behavior, smart idle and all wakeups + */ + if (cpu_is_omap34xx()) { + u16 syscon; + + syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); + syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03)); + OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); + + wakeupen = OMAP_MCBSP_READ(mcbsp->io_base, WAKEUPEN); + wakeupen &= ~WAKEUPEN_ALL; + OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, wakeupen); + } +#endif + clk_disable(mcbsp->fclk); clk_disable(mcbsp->iclk);