Hi Paul, On Tue, Jan 11, 2011 at 5:29 AM, Paul Walmsley <paul@xxxxxxxxx> wrote: > On Fri, 7 Jan 2011, Sumit Semwal wrote: > >> From: Senthilvadivu Guruswamy <svadivu@xxxxxx> >> >> All clock management is moved to dss platform driver. clk_get/put APIs use >> dss device instead of core platform device. >> >> Hwmod adaptation design requires each of the DSS HW IP to be a platform driver. >> So the device name is changed from omap_display to omap_dss in 2420, 2430, >> 3xxx clock database files. Now the core driver "omap_display" only takes care >> of panel registration with the custom bus. >> core driver also uses the clk_enable() / clk_disable() APIs exposed by DSS for >> clock management. >> DSS driver would do clock management of clocks needed by DISPC, RFBI, DSI, VENC >> >> TODO: The clock content would be adapted to omap_hwmod in a seperate series. >> >> Signed-off-by: Senthilvadivu Guruswamy <svadivu@xxxxxx> >> Signed-off-by: Sumit Semwal <sumit.semwal@xxxxxx> >> --- >> arch/arm/mach-omap2/clock2420_data.c | 8 +- >> arch/arm/mach-omap2/clock2430_data.c | 8 +- >> arch/arm/mach-omap2/clock3xxx_data.c | 14 +- > > ... > >> >> diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c >> index a220820..7a56c67 100644 >> --- a/arch/arm/mach-omap2/clock2420_data.c >> +++ b/arch/arm/mach-omap2/clock2420_data.c >> @@ -1786,10 +1786,10 @@ static struct omap_clk omap2420_clks[] = { >> CLK(NULL, "gfx_2d_fck", &gfx_2d_fck, CK_242X), >> CLK(NULL, "gfx_ick", &gfx_ick, CK_242X), >> /* DSS domain clocks */ >> - CLK("omap_display", "ick", &dss_ick, CK_242X), >> - CLK("omap_display", "dss1_fck", &dss1_fck, CK_242X), >> - CLK("omap_display", "dss2_fck", &dss2_fck, CK_242X), >> - CLK("omap_display", "tv_fck", &dss_54m_fck, CK_242X), >> + CLK("omap_dss", "ick", &dss_ick, CK_242X), >> + CLK("omap_dss", "dss1_fck", &dss1_fck, CK_242X), >> + CLK("omap_dss", "dss2_fck", &dss2_fck, CK_242X), >> + CLK("omap_dss", "tv_fck", &dss_54m_fck, CK_242X), >> /* L3 domain clocks */ >> CLK(NULL, "core_l3_ck", &core_l3_ck, CK_242X), >> CLK(NULL, "ssi_fck", &ssi_ssr_sst_fck, CK_242X), > > It would be nice if you could figure out some way to combine or > restructure these changes with the patch 4 changes, to avoid changing > these from "omapdss" to "omap_display" then to "omap_dss". I thought, and realized that this is done to make sure functionality's not broken after each patch; here's the logic. patch 4 is the first step in re-defining role of core.c - this DSS file should not handle ALL clocks / regulators, but just some related to displays, hence the move to device name 'omap_display'. At this point, since all DSS clock handling is still in the same file, we changed the controlling device name also to 'omap_display'. patch 10 then is the second step, when all clock handling is moved to dss.c, and as a result, device_name for all clocks gets changed to 'omap_dss'; for display regulator supplies [like DVI], still the controlling device is 'omap_display'. > > In any case, > > Acked-by: Paul Walmsley <paul@xxxxxxxxx> Thanks for the Ack! :) ~Sumit. > > > > - Paul > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html