On 03/24/2015 01:06 PM, Paul Walmsley wrote:
> On Mon, 16 Mar 2015, Suman Anna wrote:
>
>> GPTimer 4 is a regular timer and not a secure timer, so fix
>> the hwmod to use the correct hwmod class (even though there
>> are no differences in the class definition itself).
>>
>> Signed-off-by: Suman Anna <s-anna@xxxxxx>
>
> This one results in compiler warnings:
>
> arch/arm/mach-omap2/omap_hwmod_7xx_data.c:1776:32: warning:
> ʽdra7xx_timer_secure_hwmod_classʼ defined but not used [-Wunused-variable]
> static struct omap_hwmod_class dra7xx_timer_secure_hwmod_class = {
>
> Have queued the following for v4.1.
Thanks Paul. I will add it back when I post the hwmod for Timer 12, I
had the Timer12 locally in my tree, so missed the warning.
regards
Suman
>
>
> - Paul
>
> From: Suman Anna <s-anna@xxxxxx>
> Date: Mon, 16 Mar 2015 15:54:54 -0500
> Subject: [PATCH] ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
>
> GPTimer 4 is a regular timer and not a secure timer, so fix
> the hwmod to use the correct hwmod class (even though there
> are no differences in the class definition itself).
>
> Signed-off-by: Suman Anna <s-anna@xxxxxx>
> [paul@xxxxxxxxx: dropped dra7xx_timer_secure_hwmod_class and
> dra7xx_timer_secure_sysc to avoid compiler warnings]
> Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
> ---
> arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 17 +----------------
> 1 file changed, 1 insertion(+), 16 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
> index d0f03e73add4..701234d8db1b 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
> @@ -1763,21 +1763,6 @@ static struct omap_hwmod_class dra7xx_timer_1ms_hwmod_class = {
> .sysc = &dra7xx_timer_1ms_sysc,
> };
>
> -static struct omap_hwmod_class_sysconfig dra7xx_timer_secure_sysc = {
> - .rev_offs = 0x0000,
> - .sysc_offs = 0x0010,
> - .sysc_flags = (SYSC_HAS_EMUFREE | SYSC_HAS_RESET_STATUS |
> - SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
> - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
> - SIDLE_SMART_WKUP),
> - .sysc_fields = &omap_hwmod_sysc_type2,
> -};
> -
> -static struct omap_hwmod_class dra7xx_timer_secure_hwmod_class = {
> - .name = "timer",
> - .sysc = &dra7xx_timer_secure_sysc,
> -};
> -
> static struct omap_hwmod_class_sysconfig dra7xx_timer_sysc = {
> .rev_offs = 0x0000,
> .sysc_offs = 0x0010,
> @@ -1841,7 +1826,7 @@ static struct omap_hwmod dra7xx_timer3_hwmod = {
> /* timer4 */
> static struct omap_hwmod dra7xx_timer4_hwmod = {
> .name = "timer4",
> - .class = &dra7xx_timer_secure_hwmod_class,
> + .class = &dra7xx_timer_hwmod_class,
> .clkdm_name = "l4per_clkdm",
> .main_clk = "timer4_gfclk_mux",
> .prcm = {
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
