| Message ID | 1249633796-12266-1-git-send-email-tomi.valkeinen@nokia.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | Paul Walmsley |
| Headers | show |
Hmm sorry, this was meant to be [PATCH 1/1]. Tomi Valkeinen Tomi (Nokia-D/Helsinki) wrote: > SMS_ROT_* registers are used by VRFB rotation engine. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> > --- > arch/arm/mach-omap2/sdrc.c | 16 ++++++++++++++++ > arch/arm/plat-omap/include/mach/sdrc.h | 8 +++++++- > 2 files changed, 23 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c > index 2045441..56f6dab 100644 > --- a/arch/arm/mach-omap2/sdrc.c > +++ b/arch/arm/mach-omap2/sdrc.c > @@ -111,3 +111,19 @@ void __init omap2_sdrc_init(struct omap_sdrc_params *sp) > (1 << SDRC_POWER_PAGEPOLICY_SHIFT); > sdrc_write_reg(l, SDRC_POWER); > } > + > +void omap2_sms_write_rot_control(u32 val, unsigned ctx) > +{ > + sms_write_reg(val, SMS_ROT_CONTROL(ctx)); > +} > + > +void omap2_sms_write_rot_size(u32 val, unsigned ctx) > +{ > + sms_write_reg(val, SMS_ROT_SIZE(ctx)); > +} > + > +void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx) > +{ > + sms_write_reg(val, SMS_ROT_PHYSICAL_BA(ctx)); > +} > + > diff --git a/arch/arm/plat-omap/include/mach/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h > index adc7352..4199c19 100644 > --- a/arch/arm/plat-omap/include/mach/sdrc.h > +++ b/arch/arm/plat-omap/include/mach/sdrc.h > @@ -75,7 +75,10 @@ > > /* SMS register offsets - read/write with sms_{read,write}_reg() */ > > -#define SMS_SYSCONFIG 0x010 > +#define SMS_SYSCONFIG 0x010 > +#define SMS_ROT_CONTROL(context) (0x180 + 0x10 * context) > +#define SMS_ROT_SIZE(context) (0x184 + 0x10 * context) > +#define SMS_ROT_PHYSICAL_BA(context) (0x188 + 0x10 * context) > /* REVISIT: fill in other SMS registers here */ > > > @@ -104,6 +107,9 @@ struct omap_sdrc_params { > > void __init omap2_sdrc_init(struct omap_sdrc_params *sp); > struct omap_sdrc_params *omap2_sdrc_get_params(unsigned long r); > +void omap2_sms_write_rot_control(u32 val, unsigned ctx); > +void omap2_sms_write_rot_size(u32 val, unsigned ctx); > +void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx); > > #ifdef CONFIG_ARCH_OMAP2 > -- 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
Hi, * Tomi Valkeinen <tomi.valkeinen@nokia.com> [090807 11:36]: > Hmm sorry, this was meant to be [PATCH 1/1]. > > Tomi > > > Valkeinen Tomi (Nokia-D/Helsinki) wrote: >> SMS_ROT_* registers are used by VRFB rotation engine. Assuming Paul acks it too, I suggest you merge this via the fbdev queue to avoid dependencies of having to wait for all the arm patches to get merged. Acked-by: Tony Lindgren <tony@atomide.com> >> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> >> --- >> arch/arm/mach-omap2/sdrc.c | 16 ++++++++++++++++ >> arch/arm/plat-omap/include/mach/sdrc.h | 8 +++++++- >> 2 files changed, 23 insertions(+), 1 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c >> index 2045441..56f6dab 100644 >> --- a/arch/arm/mach-omap2/sdrc.c >> +++ b/arch/arm/mach-omap2/sdrc.c >> @@ -111,3 +111,19 @@ void __init omap2_sdrc_init(struct omap_sdrc_params *sp) >> (1 << SDRC_POWER_PAGEPOLICY_SHIFT); >> sdrc_write_reg(l, SDRC_POWER); >> } >> + >> +void omap2_sms_write_rot_control(u32 val, unsigned ctx) >> +{ >> + sms_write_reg(val, SMS_ROT_CONTROL(ctx)); >> +} >> + >> +void omap2_sms_write_rot_size(u32 val, unsigned ctx) >> +{ >> + sms_write_reg(val, SMS_ROT_SIZE(ctx)); >> +} >> + >> +void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx) >> +{ >> + sms_write_reg(val, SMS_ROT_PHYSICAL_BA(ctx)); >> +} >> + >> diff --git a/arch/arm/plat-omap/include/mach/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h >> index adc7352..4199c19 100644 >> --- a/arch/arm/plat-omap/include/mach/sdrc.h >> +++ b/arch/arm/plat-omap/include/mach/sdrc.h >> @@ -75,7 +75,10 @@ >> /* SMS register offsets - read/write with sms_{read,write}_reg() */ >> -#define SMS_SYSCONFIG 0x010 >> +#define SMS_SYSCONFIG 0x010 >> +#define SMS_ROT_CONTROL(context) (0x180 + 0x10 * context) >> +#define SMS_ROT_SIZE(context) (0x184 + 0x10 * context) >> +#define SMS_ROT_PHYSICAL_BA(context) (0x188 + 0x10 * context) >> /* REVISIT: fill in other SMS registers here */ >> @@ -104,6 +107,9 @@ struct omap_sdrc_params { >> void __init omap2_sdrc_init(struct omap_sdrc_params *sp); >> struct omap_sdrc_params *omap2_sdrc_get_params(unsigned long r); >> +void omap2_sms_write_rot_control(u32 val, unsigned ctx); >> +void omap2_sms_write_rot_size(u32 val, unsigned ctx); >> +void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx); >> #ifdef CONFIG_ARCH_OMAP2 >> > > -- > 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
On Fri, 7 Aug 2009, Tony Lindgren wrote: > * Tomi Valkeinen <tomi.valkeinen@nokia.com> [090807 11:36]: > > Hmm sorry, this was meant to be [PATCH 1/1]. > > > > Tomi > > > > > > Valkeinen Tomi (Nokia-D/Helsinki) wrote: > >> SMS_ROT_* registers are used by VRFB rotation engine. > > Assuming Paul acks it too, I suggest you merge this via the fbdev queue > to avoid dependencies of having to wait for all the arm patches to get > merged. > > Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Paul Walmsley <paul@pwsan.com> > > > >> > >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> > >> --- > >> arch/arm/mach-omap2/sdrc.c | 16 ++++++++++++++++ > >> arch/arm/plat-omap/include/mach/sdrc.h | 8 +++++++- > >> 2 files changed, 23 insertions(+), 1 deletions(-) > >> > >> diff --git a/arch/arm/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c > >> index 2045441..56f6dab 100644 > >> --- a/arch/arm/mach-omap2/sdrc.c > >> +++ b/arch/arm/mach-omap2/sdrc.c > >> @@ -111,3 +111,19 @@ void __init omap2_sdrc_init(struct omap_sdrc_params *sp) > >> (1 << SDRC_POWER_PAGEPOLICY_SHIFT); > >> sdrc_write_reg(l, SDRC_POWER); > >> } > >> + > >> +void omap2_sms_write_rot_control(u32 val, unsigned ctx) > >> +{ > >> + sms_write_reg(val, SMS_ROT_CONTROL(ctx)); > >> +} > >> + > >> +void omap2_sms_write_rot_size(u32 val, unsigned ctx) > >> +{ > >> + sms_write_reg(val, SMS_ROT_SIZE(ctx)); > >> +} > >> + > >> +void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx) > >> +{ > >> + sms_write_reg(val, SMS_ROT_PHYSICAL_BA(ctx)); > >> +} > >> + > >> diff --git a/arch/arm/plat-omap/include/mach/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h > >> index adc7352..4199c19 100644 > >> --- a/arch/arm/plat-omap/include/mach/sdrc.h > >> +++ b/arch/arm/plat-omap/include/mach/sdrc.h > >> @@ -75,7 +75,10 @@ > >> /* SMS register offsets - read/write with sms_{read,write}_reg() */ > >> -#define SMS_SYSCONFIG 0x010 > >> +#define SMS_SYSCONFIG 0x010 > >> +#define SMS_ROT_CONTROL(context) (0x180 + 0x10 * context) > >> +#define SMS_ROT_SIZE(context) (0x184 + 0x10 * context) > >> +#define SMS_ROT_PHYSICAL_BA(context) (0x188 + 0x10 * context) > >> /* REVISIT: fill in other SMS registers here */ > >> @@ -104,6 +107,9 @@ struct omap_sdrc_params { > >> void __init omap2_sdrc_init(struct omap_sdrc_params *sp); > >> struct omap_sdrc_params *omap2_sdrc_get_params(unsigned long r); > >> +void omap2_sms_write_rot_control(u32 val, unsigned ctx); > >> +void omap2_sms_write_rot_size(u32 val, unsigned ctx); > >> +void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx); > >> #ifdef CONFIG_ARCH_OMAP2 > >> > > > > -- > > 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 > - Paul -- 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/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c index 2045441..56f6dab 100644 --- a/arch/arm/mach-omap2/sdrc.c +++ b/arch/arm/mach-omap2/sdrc.c @@ -111,3 +111,19 @@ void __init omap2_sdrc_init(struct omap_sdrc_params *sp) (1 << SDRC_POWER_PAGEPOLICY_SHIFT); sdrc_write_reg(l, SDRC_POWER); } + +void omap2_sms_write_rot_control(u32 val, unsigned ctx) +{ + sms_write_reg(val, SMS_ROT_CONTROL(ctx)); +} + +void omap2_sms_write_rot_size(u32 val, unsigned ctx) +{ + sms_write_reg(val, SMS_ROT_SIZE(ctx)); +} + +void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx) +{ + sms_write_reg(val, SMS_ROT_PHYSICAL_BA(ctx)); +} + diff --git a/arch/arm/plat-omap/include/mach/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h index adc7352..4199c19 100644 --- a/arch/arm/plat-omap/include/mach/sdrc.h +++ b/arch/arm/plat-omap/include/mach/sdrc.h @@ -75,7 +75,10 @@ /* SMS register offsets - read/write with sms_{read,write}_reg() */ -#define SMS_SYSCONFIG 0x010 +#define SMS_SYSCONFIG 0x010 +#define SMS_ROT_CONTROL(context) (0x180 + 0x10 * context) +#define SMS_ROT_SIZE(context) (0x184 + 0x10 * context) +#define SMS_ROT_PHYSICAL_BA(context) (0x188 + 0x10 * context) /* REVISIT: fill in other SMS registers here */ @@ -104,6 +107,9 @@ struct omap_sdrc_params { void __init omap2_sdrc_init(struct omap_sdrc_params *sp); struct omap_sdrc_params *omap2_sdrc_get_params(unsigned long r); +void omap2_sms_write_rot_control(u32 val, unsigned ctx); +void omap2_sms_write_rot_size(u32 val, unsigned ctx); +void omap2_sms_write_rot_physical_ba(u32 val, unsigned ctx); #ifdef CONFIG_ARCH_OMAP2
SMS_ROT_* registers are used by VRFB rotation engine. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- arch/arm/mach-omap2/sdrc.c | 16 ++++++++++++++++ arch/arm/plat-omap/include/mach/sdrc.h | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletions(-)