From: Tony Lindgren <tony@atomide.com>
To: Paul Walmsley <paul@pwsan.com>, Jon Hunter <jon-hunter@ti.com>
Cc: linux-omap <linux-omap@vger.kernel.org>,
Tarun Kanti DebBarma <tarun.kanti@ti.com>
Subject: Re: [PATCH V4 05/12] ARM: OMAP2+: HWMOD: Correct timer device attributes
Date: Fri, 8 Jun 2012 00:40:20 -0700 [thread overview]
Message-ID: <20120608074019.GN12766@atomide.com> (raw)
In-Reply-To: <1338917700-29174-6-git-send-email-jon-hunter@ti.com>
Paul,
* Jon Hunter <jon-hunter@ti.com> [120605 10:39]:
> Fix the following issues with the timer device attributes for OMAP2+ devices:
>
> 1. For OMAP24xx devices, timers 2-8 have the ALWAYS-ON attribute indicating
> that these timers are in an ALWAYS-ON power domain. This is not the case
> only timer1 is in an ALWAYS-ON power domain.
> 2. For OMAP3xxx devices, timers 2-7 have the ALWAYS-ON attribute indicating
> that these timers are in an ALWAYS-ON power domain. This is not the case
> only timer1 and timer12 are in an ALWAYS-ON power domain.
> 3. For OMAP3xxx devices, timer12 does not have the ALWAYS-ON attribute but
> is in an always-on power domain.
Care to review and potentially ack the hwmod parts of this series?
We should try to merge this early into linux-omap master for testing.
Regards,
Tony
> Signed-off-by: Jon Hunter <jon-hunter@ti.com>
> ---
> arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 7 -------
> arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 +-------
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 ------
> 3 files changed, 1 insertion(+), 20 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
> index 83eafd9..7814e83 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
> @@ -257,7 +257,6 @@ struct omap_hwmod omap2xxx_timer2_hwmod = {
> .idlest_idle_bit = OMAP24XX_ST_GPT2_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap2xxx_timer_hwmod_class,
> };
>
> @@ -276,7 +275,6 @@ struct omap_hwmod omap2xxx_timer3_hwmod = {
> .idlest_idle_bit = OMAP24XX_ST_GPT3_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap2xxx_timer_hwmod_class,
> };
>
> @@ -295,7 +293,6 @@ struct omap_hwmod omap2xxx_timer4_hwmod = {
> .idlest_idle_bit = OMAP24XX_ST_GPT4_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap2xxx_timer_hwmod_class,
> };
>
> @@ -314,7 +311,6 @@ struct omap_hwmod omap2xxx_timer5_hwmod = {
> .idlest_idle_bit = OMAP24XX_ST_GPT5_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap2xxx_timer_hwmod_class,
> };
>
> @@ -333,7 +329,6 @@ struct omap_hwmod omap2xxx_timer6_hwmod = {
> .idlest_idle_bit = OMAP24XX_ST_GPT6_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap2xxx_timer_hwmod_class,
> };
>
> @@ -352,7 +347,6 @@ struct omap_hwmod omap2xxx_timer7_hwmod = {
> .idlest_idle_bit = OMAP24XX_ST_GPT7_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap2xxx_timer_hwmod_class,
> };
>
> @@ -371,7 +365,6 @@ struct omap_hwmod omap2xxx_timer8_hwmod = {
> .idlest_idle_bit = OMAP24XX_ST_GPT8_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap2xxx_timer_hwmod_class,
> };
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> index b26d3c9..7b33094 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -150,7 +150,7 @@ static struct omap_hwmod_class omap3xxx_timer_hwmod_class = {
>
> /* secure timers dev attribute */
> static struct omap_timer_capability_dev_attr capability_secure_dev_attr = {
> - .timer_capability = OMAP_TIMER_SECURE,
> + .timer_capability = OMAP_TIMER_ALWON | OMAP_TIMER_SECURE,
> };
>
> /* always-on timers dev attribute */
> @@ -195,7 +195,6 @@ static struct omap_hwmod omap3xxx_timer2_hwmod = {
> .idlest_idle_bit = OMAP3430_ST_GPT2_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap3xxx_timer_1ms_hwmod_class,
> };
>
> @@ -213,7 +212,6 @@ static struct omap_hwmod omap3xxx_timer3_hwmod = {
> .idlest_idle_bit = OMAP3430_ST_GPT3_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap3xxx_timer_hwmod_class,
> };
>
> @@ -231,7 +229,6 @@ static struct omap_hwmod omap3xxx_timer4_hwmod = {
> .idlest_idle_bit = OMAP3430_ST_GPT4_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap3xxx_timer_hwmod_class,
> };
>
> @@ -249,7 +246,6 @@ static struct omap_hwmod omap3xxx_timer5_hwmod = {
> .idlest_idle_bit = OMAP3430_ST_GPT5_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap3xxx_timer_hwmod_class,
> };
>
> @@ -267,7 +263,6 @@ static struct omap_hwmod omap3xxx_timer6_hwmod = {
> .idlest_idle_bit = OMAP3430_ST_GPT6_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap3xxx_timer_hwmod_class,
> };
>
> @@ -285,7 +280,6 @@ static struct omap_hwmod omap3xxx_timer7_hwmod = {
> .idlest_idle_bit = OMAP3430_ST_GPT7_SHIFT,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> .class = &omap3xxx_timer_hwmod_class,
> };
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index 950454a..ebf9657 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -2943,7 +2943,6 @@ static struct omap_hwmod omap44xx_timer2_hwmod = {
> .modulemode = MODULEMODE_SWCTRL,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> };
>
> /* timer3 */
> @@ -2965,7 +2964,6 @@ static struct omap_hwmod omap44xx_timer3_hwmod = {
> .modulemode = MODULEMODE_SWCTRL,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> };
>
> /* timer4 */
> @@ -2987,7 +2985,6 @@ static struct omap_hwmod omap44xx_timer4_hwmod = {
> .modulemode = MODULEMODE_SWCTRL,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> };
>
> /* timer5 */
> @@ -3009,7 +3006,6 @@ static struct omap_hwmod omap44xx_timer5_hwmod = {
> .modulemode = MODULEMODE_SWCTRL,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> };
>
> /* timer6 */
> @@ -3032,7 +3028,6 @@ static struct omap_hwmod omap44xx_timer6_hwmod = {
> .modulemode = MODULEMODE_SWCTRL,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> };
>
> /* timer7 */
> @@ -3054,7 +3049,6 @@ static struct omap_hwmod omap44xx_timer7_hwmod = {
> .modulemode = MODULEMODE_SWCTRL,
> },
> },
> - .dev_attr = &capability_alwon_dev_attr,
> };
>
> /* timer8 */
> --
> 1.7.9.5
>
next prev parent reply other threads:[~2012-06-08 7:40 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-05 17:34 [PATCH V4 00/12] ARM: OMAP: DMTIMER clean-up and fixes in preparation for device-tree Jon Hunter
2012-06-05 17:34 ` [PATCH V4 01/12] ARM: OMAP: Remove unnecessary clk structure Jon Hunter
2012-06-05 17:34 ` [PATCH V4 02/12] ARM: OMAP2+: Remove unused max number of timers definition Jon Hunter
2012-06-05 17:34 ` [PATCH V4 03/12] ARM: OMAP2+: Add dmtimer platform function to reserve systimers Jon Hunter
2012-06-05 17:34 ` [PATCH V4 04/12] ARM: OMAP: Add DMTIMER capability variable to represent timer features Jon Hunter
2012-06-05 17:34 ` [PATCH V4 05/12] ARM: OMAP2+: HWMOD: Correct timer device attributes Jon Hunter
2012-06-08 7:40 ` Tony Lindgren [this message]
2012-06-13 23:53 ` Paul Walmsley
2012-06-14 9:44 ` Tony Lindgren
2012-06-13 23:53 ` Paul Walmsley
2012-06-05 17:34 ` [PATCH V4 06/12] ARM: OMAP2+: Fix external clock support for dmtimers Jon Hunter
2012-06-05 17:34 ` [PATCH V4 07/12] ARM: OMAP: Remove loses_context variable from timer platform data Jon Hunter
2012-06-05 17:34 ` [PATCH V4 08/12] ARM: OMAP: Remove timer function pointer for context loss counter Jon Hunter
2012-06-05 17:34 ` [PATCH V4 09/12] ARM: OMAP: Add flag to indicate if a timer needs a manual reset Jon Hunter
2012-06-05 17:34 ` [PATCH V4 10/12] ARM: OMAP1: Fix dmtimer support Jon Hunter
2012-06-05 17:34 ` [PATCH V4 11/12] ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver Jon Hunter
2012-06-05 17:35 ` [PATCH V4 12/12] ARM: OMAP2+: Simplify dmtimer clock aliases Jon Hunter
2012-06-14 20:31 ` Paul Walmsley
2012-06-15 15:27 ` Jon Hunter
2012-06-16 1:34 ` Paul Walmsley
2012-06-16 1:38 ` Paul Walmsley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120608074019.GN12766@atomide.com \
--to=tony@atomide.com \
--cc=jon-hunter@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=tarun.kanti@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.