| Message ID | 1398274487-24688-1-git-send-email-rogerq@ti.com |
|---|---|
| State | New |
| Headers | show |
Tony, Looks like we've missed this for 3.16. cheers, -roger On 04/23/2014 08:34 PM, Roger Quadros wrote: > From: Keshava Munegowda <keshava_mgowda@ti.com> > > Create hwmods for ocp2scp3 and sata modules. > > [Roger Q] Clean up. > > CC: Benoit Cousson <bcousson@baylibre.com> > Acked-by: Paul Walmsley <paul@pwsan.com> > Signed-off-by: Balaji T K <balajitk@ti.com> > Signed-off-by: Roger Quadros <rogerq@ti.com> > --- > arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 73 ++++++++++++++++++++++++++++++ > 1 file changed, 73 insertions(+) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c > index 8923172..e169f90 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c > @@ -1791,6 +1791,77 @@ static struct omap_hwmod omap54xx_wd_timer2_hwmod = { > }, > }; > > +/* > + * 'ocp2scp' class > + * bridge to transform ocp interface protocol to scp (serial control port) > + * protocol > + */ > +/* ocp2scp3 */ > +static struct omap_hwmod omap54xx_ocp2scp3_hwmod; > +/* l4_cfg -> ocp2scp3 */ > +static struct omap_hwmod_ocp_if omap54xx_l4_cfg__ocp2scp3 = { > + .master = &omap54xx_l4_cfg_hwmod, > + .slave = &omap54xx_ocp2scp3_hwmod, > + .clk = "l4_root_clk_div", > + .user = OCP_USER_MPU | OCP_USER_SDMA, > +}; > + > +static struct omap_hwmod omap54xx_ocp2scp3_hwmod = { > + .name = "ocp2scp3", > + .class = &omap54xx_ocp2scp_hwmod_class, > + .clkdm_name = "l3init_clkdm", > + .prcm = { > + .omap4 = { > + .clkctrl_offs = OMAP54XX_CM_L3INIT_OCP2SCP3_CLKCTRL_OFFSET, > + .context_offs = OMAP54XX_RM_L3INIT_OCP2SCP3_CONTEXT_OFFSET, > + .modulemode = MODULEMODE_HWCTRL, > + }, > + }, > +}; > + > +/* > + * 'sata' class > + * sata: serial ata interface gen2 compliant ( 1 rx/ 1 tx) > + */ > + > +static struct omap_hwmod_class_sysconfig omap54xx_sata_sysc = { > + .sysc_offs = 0x0000, > + .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE), > + .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | > + SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO | > + MSTANDBY_SMART | MSTANDBY_SMART_WKUP), > + .sysc_fields = &omap_hwmod_sysc_type2, > +}; > + > +static struct omap_hwmod_class omap54xx_sata_hwmod_class = { > + .name = "sata", > + .sysc = &omap54xx_sata_sysc, > +}; > + > +/* sata */ > +static struct omap_hwmod omap54xx_sata_hwmod = { > + .name = "sata", > + .class = &omap54xx_sata_hwmod_class, > + .clkdm_name = "l3init_clkdm", > + .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, > + .main_clk = "func_48m_fclk", > + .mpu_rt_idx = 1, > + .prcm = { > + .omap4 = { > + .clkctrl_offs = OMAP54XX_CM_L3INIT_SATA_CLKCTRL_OFFSET, > + .context_offs = OMAP54XX_RM_L3INIT_SATA_CONTEXT_OFFSET, > + .modulemode = MODULEMODE_SWCTRL, > + }, > + }, > +}; > + > +/* l4_cfg -> sata */ > +static struct omap_hwmod_ocp_if omap54xx_l4_cfg__sata = { > + .master = &omap54xx_l4_cfg_hwmod, > + .slave = &omap54xx_sata_hwmod, > + .clk = "l3_iclk_div", > + .user = OCP_USER_MPU | OCP_USER_SDMA, > +}; > > /* > * Interfaces > @@ -2482,6 +2553,8 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { > &omap54xx_l4_cfg__usb_tll_hs, > &omap54xx_l4_cfg__usb_otg_ss, > &omap54xx_l4_wkup__wd_timer2, > + &omap54xx_l4_cfg__ocp2scp3, > + &omap54xx_l4_cfg__sata, > NULL, > }; > > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thursday 12 June 2014 06:16 PM, Roger Quadros wrote: > Tony, > > Looks like we've missed this for 3.16. Without these SATA support will be broken for DRA7x and OMAP5 so can they be queued for -rc2? Thanks, Sekhar -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 23 Apr 2014, Roger Quadros wrote: > From: Keshava Munegowda <keshava_mgowda@ti.com> > > Create hwmods for ocp2scp3 and sata modules. > > [Roger Q] Clean up. > > CC: Benoit Cousson <bcousson@baylibre.com> > Acked-by: Paul Walmsley <paul@pwsan.com> > Signed-off-by: Balaji T K <balajitk@ti.com> > Signed-off-by: Roger Quadros <rogerq@ti.com> Queued here; will try to get this into the early -rcs. - Paul -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c index 8923172..e169f90 100644 --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c @@ -1791,6 +1791,77 @@ static struct omap_hwmod omap54xx_wd_timer2_hwmod = { }, }; +/* + * 'ocp2scp' class + * bridge to transform ocp interface protocol to scp (serial control port) + * protocol + */ +/* ocp2scp3 */ +static struct omap_hwmod omap54xx_ocp2scp3_hwmod; +/* l4_cfg -> ocp2scp3 */ +static struct omap_hwmod_ocp_if omap54xx_l4_cfg__ocp2scp3 = { + .master = &omap54xx_l4_cfg_hwmod, + .slave = &omap54xx_ocp2scp3_hwmod, + .clk = "l4_root_clk_div", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; + +static struct omap_hwmod omap54xx_ocp2scp3_hwmod = { + .name = "ocp2scp3", + .class = &omap54xx_ocp2scp_hwmod_class, + .clkdm_name = "l3init_clkdm", + .prcm = { + .omap4 = { + .clkctrl_offs = OMAP54XX_CM_L3INIT_OCP2SCP3_CLKCTRL_OFFSET, + .context_offs = OMAP54XX_RM_L3INIT_OCP2SCP3_CONTEXT_OFFSET, + .modulemode = MODULEMODE_HWCTRL, + }, + }, +}; + +/* + * 'sata' class + * sata: serial ata interface gen2 compliant ( 1 rx/ 1 tx) + */ + +static struct omap_hwmod_class_sysconfig omap54xx_sata_sysc = { + .sysc_offs = 0x0000, + .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE), + .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | + SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO | + MSTANDBY_SMART | MSTANDBY_SMART_WKUP), + .sysc_fields = &omap_hwmod_sysc_type2, +}; + +static struct omap_hwmod_class omap54xx_sata_hwmod_class = { + .name = "sata", + .sysc = &omap54xx_sata_sysc, +}; + +/* sata */ +static struct omap_hwmod omap54xx_sata_hwmod = { + .name = "sata", + .class = &omap54xx_sata_hwmod_class, + .clkdm_name = "l3init_clkdm", + .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, + .main_clk = "func_48m_fclk", + .mpu_rt_idx = 1, + .prcm = { + .omap4 = { + .clkctrl_offs = OMAP54XX_CM_L3INIT_SATA_CLKCTRL_OFFSET, + .context_offs = OMAP54XX_RM_L3INIT_SATA_CONTEXT_OFFSET, + .modulemode = MODULEMODE_SWCTRL, + }, + }, +}; + +/* l4_cfg -> sata */ +static struct omap_hwmod_ocp_if omap54xx_l4_cfg__sata = { + .master = &omap54xx_l4_cfg_hwmod, + .slave = &omap54xx_sata_hwmod, + .clk = "l3_iclk_div", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; /* * Interfaces @@ -2482,6 +2553,8 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { &omap54xx_l4_cfg__usb_tll_hs, &omap54xx_l4_cfg__usb_otg_ss, &omap54xx_l4_wkup__wd_timer2, + &omap54xx_l4_cfg__ocp2scp3, + &omap54xx_l4_cfg__sata, NULL, };