On Wednesday 09 July 2014 02:32 PM, Kishon Vijay Abraham I wrote: > Added hwmod data for pcie1 and pcie2 subsystem present in DRA7xx SOC. > > Cc: Tony Lindgren <t...@atomide.com> > Cc: Russell King <li...@arm.linux.org.uk> > Cc: Paul Walmsley <p...@pwsan.com> > Signed-off-by: Kishon Vijay Abraham I <kis...@ti.com> > Tested-by: Kishon Vijay Abraham I <kis...@ti.com> > --- > Changes from v1: > * changed the clock domain to "pcie_clkdm" > * Added PCIe as a slave port for l3_main.
Looks good to me, Reviewed-by: Rajendra Nayak <rna...@ti.com> > > Boot log for dra7xx can be found at http://paste.ubuntu.com/7769402/ > > arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 73 > +++++++++++++++++++++++++++++ > 1 file changed, 73 insertions(+) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > index 6ff40a6..2f37ca8 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > @@ -1290,6 +1290,43 @@ static struct omap_hwmod dra7xx_ocp2scp3_hwmod = { > }; > > /* > + * 'PCIE' class > + * > + */ > + > +static struct omap_hwmod_class dra7xx_pcie_hwmod_class = { > + .name = "pcie", > +}; > + > +/* pcie1 */ > +static struct omap_hwmod dra7xx_pcie1_hwmod = { > + .name = "pcie1", > + .class = &dra7xx_pcie_hwmod_class, > + .clkdm_name = "pcie_clkdm", > + .main_clk = "l4_root_clk_div", > + .prcm = { > + .omap4 = { > + .clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET, > + .modulemode = MODULEMODE_SWCTRL, > + }, > + }, > +}; > + > +/* pcie2 */ > +static struct omap_hwmod dra7xx_pcie2_hwmod = { > + .name = "pcie2", > + .class = &dra7xx_pcie_hwmod_class, > + .clkdm_name = "pcie_clkdm", > + .main_clk = "l4_root_clk_div", > + .prcm = { > + .omap4 = { > + .clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET, > + .modulemode = MODULEMODE_SWCTRL, > + }, > + }, > +}; > + > +/* > * 'PCIE PHY' class > * > */ > @@ -2448,6 +2485,38 @@ static struct omap_hwmod_ocp_if > dra7xx_l4_cfg__ocp2scp1 = { > .user = OCP_USER_MPU | OCP_USER_SDMA, > }; > > +/* l3_main_1 -> pcie1 */ > +static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pcie1 = { > + .master = &dra7xx_l3_main_1_hwmod, > + .slave = &dra7xx_pcie1_hwmod, > + .clk = "l3_iclk_div", > + .user = OCP_USER_MPU | OCP_USER_SDMA, > +}; > + > +/* l4_cfg -> pcie1 */ > +static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie1 = { > + .master = &dra7xx_l4_cfg_hwmod, > + .slave = &dra7xx_pcie1_hwmod, > + .clk = "l4_root_clk_div", > + .user = OCP_USER_MPU | OCP_USER_SDMA, > +}; > + > +/* l3_main_1 -> pcie2 */ > +static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pcie2 = { > + .master = &dra7xx_l3_main_1_hwmod, > + .slave = &dra7xx_pcie2_hwmod, > + .clk = "l3_iclk_div", > + .user = OCP_USER_MPU | OCP_USER_SDMA, > +}; > + > +/* l4_cfg -> pcie2 */ > +static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie2 = { > + .master = &dra7xx_l4_cfg_hwmod, > + .slave = &dra7xx_pcie2_hwmod, > + .clk = "l4_root_clk_div", > + .user = OCP_USER_MPU | OCP_USER_SDMA, > +}; > + > /* l4_cfg -> pcie1 phy */ > static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie1_phy = { > .master = &dra7xx_l4_cfg_hwmod, > @@ -2813,6 +2882,10 @@ static struct omap_hwmod_ocp_if > *dra7xx_hwmod_ocp_ifs[] __initdata = { > &dra7xx_l4_cfg__mpu, > &dra7xx_l4_cfg__ocp2scp1, > &dra7xx_l4_cfg__ocp2scp3, > + &dra7xx_l3_main_1__pcie1, > + &dra7xx_l4_cfg__pcie1, > + &dra7xx_l3_main_1__pcie2, > + &dra7xx_l4_cfg__pcie2, > &dra7xx_l4_cfg__pcie1_phy, > &dra7xx_l4_cfg__pcie2_phy, > &dra7xx_l3_main_1__qspi, > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
