Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edec1786 authored by Suman Anna's avatar Suman Anna Committed by Paul Walmsley
Browse files

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: default avatarSuman Anna <s-anna@ti.com>
[paul@pwsan.com: dropped dra7xx_timer_secure_hwmod_class and
 dra7xx_timer_secure_sysc to avoid compiler warnings]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 1ac964f4

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+1 −16
Original line number Diff line number Diff line
@@ -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 = {