On Wednesday 18 June 2014 01:32 PM, Roger Quadros wrote: > On 04/23/2014 08:35 PM, Roger Quadros wrote: >> From: Nikhil Devshatwar <[email protected]> >> >> Add hwmods for ocp2scp3 and sata modules.
>From what I see this is actually adding the ocp2scp3 data and fixing up some of the sata data which is already added and erroneous. It would help if this is split up and the changelog explains whats fixed up for sata and why. Like for instance I see the opt clock data being removed but no mention of why. >> >> [Roger Q] Clean up. >> >> CC: Benoit Cousson <[email protected]> >> CC: Paul Walmsley <[email protected]> >> Signed-off-by: Balaji T K <[email protected]> >> Signed-off-by: Nikhil Devshatwar <[email protected]> >> Signed-off-by: Roger Quadros <[email protected]> > > Tested-by: Roger Quadros <[email protected]> > against 3.16-rc1, no dependency patches needed. > > Nishant/Rajendra, > > Could you please review this? We need this for 3.16 SATA support and > Paul won't take this in without your reviewed-by tag. Thanks. > > cheers, > -roger > >> --- >> arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 31 >> ++++++++++++++++++++++++++----- >> 1 file changed, 26 insertions(+), 5 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c >> b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c >> index 810c205..b02a4ab 100644 >> --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c >> +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c >> @@ -1215,6 +1215,30 @@ static struct omap_hwmod dra7xx_ocp2scp1_hwmod = { >> }, >> }; >> >> +/* ocp2scp3 */ >> +static struct omap_hwmod dra7xx_ocp2scp3_hwmod; >> + >> +/* l4_cfg -> ocp2scp3 */ >> +static struct omap_hwmod_ocp_if dra7xx_l4_cfg__ocp2scp3 = { >> + .master = &dra7xx_l4_cfg_hwmod, >> + .slave = &dra7xx_ocp2scp3_hwmod, >> + .clk = "l4_root_clk_div", >> + .user = OCP_USER_MPU | OCP_USER_SDMA, >> +}; All hwmod data files are organized in a certain way with all the hwmod/IP block info on top and Interface structs at the bottom. Can we follow the same for ocp2scp3? It helps with better readability. >> + >> +static struct omap_hwmod dra7xx_ocp2scp3_hwmod = { >> + .name = "ocp2scp3", >> + .class = &dra7xx_ocp2scp_hwmod_class, >> + .clkdm_name = "l3init_clkdm", No main_clk? regards, Rajendra >> + .prcm = { >> + .omap4 = { >> + .clkctrl_offs = >> DRA7XX_CM_L3INIT_OCP2SCP3_CLKCTRL_OFFSET, >> + .context_offs = >> DRA7XX_RM_L3INIT_OCP2SCP3_CONTEXT_OFFSET, >> + .modulemode = MODULEMODE_HWCTRL, >> + }, >> + }, >> +}; >> + >> /* >> * 'qspi' class >> * >> @@ -1268,9 +1292,6 @@ static struct omap_hwmod_class dra7xx_sata_hwmod_class >> = { >> }; >> >> /* sata */ >> -static struct omap_hwmod_opt_clk sata_opt_clks[] = { >> - { .role = "ref_clk", .clk = "sata_ref_clk" }, >> -}; >> >> static struct omap_hwmod dra7xx_sata_hwmod = { >> .name = "sata", >> @@ -1278,6 +1299,7 @@ static struct omap_hwmod dra7xx_sata_hwmod = { >> .clkdm_name = "l3init_clkdm", >> .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, >> .main_clk = "func_48m_fclk", >> + .mpu_rt_idx = 1, >> .prcm = { >> .omap4 = { >> .clkctrl_offs = DRA7XX_CM_L3INIT_SATA_CLKCTRL_OFFSET, >> @@ -1285,8 +1307,6 @@ static struct omap_hwmod dra7xx_sata_hwmod = { >> .modulemode = MODULEMODE_SWCTRL, >> }, >> }, >> - .opt_clks = sata_opt_clks, >> - .opt_clks_cnt = ARRAY_SIZE(sata_opt_clks), >> }; >> >> /* >> @@ -2682,6 +2702,7 @@ static struct omap_hwmod_ocp_if >> *dra7xx_hwmod_ocp_ifs[] __initdata = { >> &dra7xx_l4_per1__mmc4, >> &dra7xx_l4_cfg__mpu, >> &dra7xx_l4_cfg__ocp2scp1, >> + &dra7xx_l4_cfg__ocp2scp3, >> &dra7xx_l3_main_1__qspi, >> &dra7xx_l4_cfg__sata, >> &dra7xx_l4_cfg__smartreflex_core, >> > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
