Skip to content

Commit edec178

Browse files
sumanannaPaul Walmsley
authored andcommitted
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 <[email protected]> [[email protected]: dropped dra7xx_timer_secure_hwmod_class and dra7xx_timer_secure_sysc to avoid compiler warnings] Signed-off-by: Paul Walmsley <[email protected]>
1 parent 1ac964f commit edec178

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,21 +1763,6 @@ static struct omap_hwmod_class dra7xx_timer_1ms_hwmod_class = {
17631763
.sysc = &dra7xx_timer_1ms_sysc,
17641764
};
17651765

1766-
static struct omap_hwmod_class_sysconfig dra7xx_timer_secure_sysc = {
1767-
.rev_offs = 0x0000,
1768-
.sysc_offs = 0x0010,
1769-
.sysc_flags = (SYSC_HAS_EMUFREE | SYSC_HAS_RESET_STATUS |
1770-
SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
1771-
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
1772-
SIDLE_SMART_WKUP),
1773-
.sysc_fields = &omap_hwmod_sysc_type2,
1774-
};
1775-
1776-
static struct omap_hwmod_class dra7xx_timer_secure_hwmod_class = {
1777-
.name = "timer",
1778-
.sysc = &dra7xx_timer_secure_sysc,
1779-
};
1780-
17811766
static struct omap_hwmod_class_sysconfig dra7xx_timer_sysc = {
17821767
.rev_offs = 0x0000,
17831768
.sysc_offs = 0x0010,
@@ -1841,7 +1826,7 @@ static struct omap_hwmod dra7xx_timer3_hwmod = {
18411826
/* timer4 */
18421827
static struct omap_hwmod dra7xx_timer4_hwmod = {
18431828
.name = "timer4",
1844-
.class = &dra7xx_timer_secure_hwmod_class,
1829+
.class = &dra7xx_timer_hwmod_class,
18451830
.clkdm_name = "l4per_clkdm",
18461831
.main_clk = "timer4_gfclk_mux",
18471832
.prcm = {

0 commit comments

Comments
 (0)