| Message ID | 1444087704-1429-5-git-send-email-s-anna@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Suman Anna <s-anna@ti.com> [151005 16:35]: > Add the hwmod data for GPTimer 12. GPTimer 12 is present in > WKUPAON power domain and is clocked from a secure 32K clock. > GPTimer 12 serves as a secure timer on HS devices, but is > available for kernel on regular GP devices. > > The hwmod link is registered only on GP devices. The hwmod data > also reused the existing timer class instead of reintroducing > the identical dra7xx_timer_secure_sysc class which was dropped > in commit edec17863362 ("ARM: DRA7: hwmod: Fix the hwmod class > for GPTimer4"). > > Signed-off-by: Suman Anna <s-anna@ti.com> Paul should take a look at this one. Regards, Tony > --- > arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 36 +++++++++++++++++++++++++++++-- > 1 file changed, 34 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > index 562247bced49..37a10f87fbcd 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > @@ -1929,6 +1929,20 @@ static struct omap_hwmod dra7xx_timer11_hwmod = { > }, > }; > > +/* timer12 */ > +static struct omap_hwmod dra7xx_timer12_hwmod = { > + .name = "timer12", > + .class = &dra7xx_timer_hwmod_class, > + .clkdm_name = "wkupaon_clkdm", > + .main_clk = "secure_32k_clk_src_ck", > + .prcm = { > + .omap4 = { > + .clkctrl_offs = DRA7XX_CM_WKUPAON_TIMER12_CLKCTRL_OFFSET, > + .context_offs = DRA7XX_RM_WKUPAON_TIMER12_CONTEXT_OFFSET, > + }, > + }, > +}; > + > /* timer13 */ > static struct omap_hwmod dra7xx_timer13_hwmod = { > .name = "timer13", > @@ -3135,6 +3149,14 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer11 = { > .user = OCP_USER_MPU | OCP_USER_SDMA, > }; > > +/* l4_wkup -> timer12 */ > +static struct omap_hwmod_ocp_if dra7xx_l4_wkup__timer12 = { > + .master = &dra7xx_l4_wkup_hwmod, > + .slave = &dra7xx_timer12_hwmod, > + .clk = "wkupaon_iclk_mux", > + .user = OCP_USER_MPU | OCP_USER_SDMA, > +}; > + > /* l4_per3 -> timer13 */ > static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer13 = { > .master = &dra7xx_l4_per3_hwmod, > @@ -3429,6 +3451,13 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { > NULL, > }; > > +/* GP-only hwmod links */ > +static struct omap_hwmod_ocp_if *dra7xx_gp_hwmod_ocp_ifs[] __initdata = { > + &dra7xx_l4_wkup__timer12, > + NULL, > +}; > + > +/* SoC variant specific hwmod links */ > static struct omap_hwmod_ocp_if *dra74x_hwmod_ocp_ifs[] __initdata = { > &dra7xx_l4_per3__usb_otg_ss4, > NULL, > @@ -3446,9 +3475,12 @@ int __init dra7xx_hwmod_init(void) > ret = omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs); > > if (!ret && soc_is_dra74x()) > - return omap_hwmod_register_links(dra74x_hwmod_ocp_ifs); > + ret = omap_hwmod_register_links(dra74x_hwmod_ocp_ifs); > else if (!ret && soc_is_dra72x()) > - return omap_hwmod_register_links(dra72x_hwmod_ocp_ifs); > + ret = omap_hwmod_register_links(dra72x_hwmod_ocp_ifs); > + > + if (!ret && omap_type() == OMAP2_DEVICE_TYPE_GP) > + ret = omap_hwmod_register_links(dra7xx_gp_hwmod_ocp_ifs); > > return ret; > } > -- > 2.6.0 >
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index 562247bced49..37a10f87fbcd 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -1929,6 +1929,20 @@ static struct omap_hwmod dra7xx_timer11_hwmod = { }, }; +/* timer12 */ +static struct omap_hwmod dra7xx_timer12_hwmod = { + .name = "timer12", + .class = &dra7xx_timer_hwmod_class, + .clkdm_name = "wkupaon_clkdm", + .main_clk = "secure_32k_clk_src_ck", + .prcm = { + .omap4 = { + .clkctrl_offs = DRA7XX_CM_WKUPAON_TIMER12_CLKCTRL_OFFSET, + .context_offs = DRA7XX_RM_WKUPAON_TIMER12_CONTEXT_OFFSET, + }, + }, +}; + /* timer13 */ static struct omap_hwmod dra7xx_timer13_hwmod = { .name = "timer13", @@ -3135,6 +3149,14 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer11 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; +/* l4_wkup -> timer12 */ +static struct omap_hwmod_ocp_if dra7xx_l4_wkup__timer12 = { + .master = &dra7xx_l4_wkup_hwmod, + .slave = &dra7xx_timer12_hwmod, + .clk = "wkupaon_iclk_mux", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; + /* l4_per3 -> timer13 */ static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer13 = { .master = &dra7xx_l4_per3_hwmod, @@ -3429,6 +3451,13 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { NULL, }; +/* GP-only hwmod links */ +static struct omap_hwmod_ocp_if *dra7xx_gp_hwmod_ocp_ifs[] __initdata = { + &dra7xx_l4_wkup__timer12, + NULL, +}; + +/* SoC variant specific hwmod links */ static struct omap_hwmod_ocp_if *dra74x_hwmod_ocp_ifs[] __initdata = { &dra7xx_l4_per3__usb_otg_ss4, NULL, @@ -3446,9 +3475,12 @@ int __init dra7xx_hwmod_init(void) ret = omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs); if (!ret && soc_is_dra74x()) - return omap_hwmod_register_links(dra74x_hwmod_ocp_ifs); + ret = omap_hwmod_register_links(dra74x_hwmod_ocp_ifs); else if (!ret && soc_is_dra72x()) - return omap_hwmod_register_links(dra72x_hwmod_ocp_ifs); + ret = omap_hwmod_register_links(dra72x_hwmod_ocp_ifs); + + if (!ret && omap_type() == OMAP2_DEVICE_TYPE_GP) + ret = omap_hwmod_register_links(dra7xx_gp_hwmod_ocp_ifs); return ret; }
Add the hwmod data for GPTimer 12. GPTimer 12 is present in WKUPAON power domain and is clocked from a secure 32K clock. GPTimer 12 serves as a secure timer on HS devices, but is available for kernel on regular GP devices. The hwmod link is registered only on GP devices. The hwmod data also reused the existing timer class instead of reintroducing the identical dra7xx_timer_secure_sysc class which was dropped in commit edec17863362 ("ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4"). Signed-off-by: Suman Anna <s-anna@ti.com> --- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 36 +++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)