On Tue, Mar 06, 2012 at 04:26:40, Tony Lindgren wrote: > * Vaibhav Hiremath <hvaib...@ti.com> [120119 06:01]: > > Add missing idle_st bit for 32k-sync timer into the prcm-common > > header file, required for hwmod data. > > These should be queued by Paul when the related hwmod changes > are done. >
Paul, Can you queue this up into your next-branch? Thanks, Vaibhav > Regards, > > Tony > > > Signed-off-by: Vaibhav Hiremath <hvaib...@ti.com> > > Cc: Felipe Balbi <ba...@ti.com> > > Cc: Benoit Cousson <b-cous...@ti.com> > > Cc: Tony Lindgren <t...@atomide.com> > > Cc: Paul Walmsley <p...@pwsan.com> > > --- > > arch/arm/mach-omap2/prcm-common.h | 4 ++++ > > 1 files changed, 4 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/prcm-common.h > > b/arch/arm/mach-omap2/prcm-common.h > > index 5aa5435..29955d5 100644 > > --- a/arch/arm/mach-omap2/prcm-common.h > > +++ b/arch/arm/mach-omap2/prcm-common.h > > @@ -177,6 +177,8 @@ > > /* PM_WKST_WKUP, CM_IDLEST_WKUP shared bits */ > > #define OMAP24XX_ST_GPIOS_SHIFT 2 > > #define OMAP24XX_ST_GPIOS_MASK (1 << 2) > > +#define OMAP24XX_ST_32KSYNC_SHIFT 1 > > +#define OMAP24XX_ST_32KSYNC_MASK (1 << 1) > > #define OMAP24XX_ST_GPT1_SHIFT 0 > > #define OMAP24XX_ST_GPT1_MASK (1 << 0) > > > > @@ -307,6 +309,8 @@ > > #define OMAP3430_ST_SR1_MASK (1 << 6) > > #define OMAP3430_ST_GPIO1_SHIFT 3 > > #define OMAP3430_ST_GPIO1_MASK (1 << 3) > > +#define OMAP3430_ST_32KSYNC_SHIFT 2 > > +#define OMAP3430_ST_32KSYNC_MASK (1 << 2) > > #define OMAP3430_ST_GPT12_SHIFT 1 > > #define OMAP3430_ST_GPT12_MASK (1 << 1) > > #define OMAP3430_ST_GPT1_SHIFT 0 > > -- > > 1.7.0.4 > > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
