Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8ac10d8 authored Nov 08, 2011 by Tomi Valkeinen Committed by Paul Walmsley Nov 08, 2011

ARM: OMAP2xxx: HWMOD: fix DSS clock data



The OMAP2xxx HWMOD data currently contains two errors with DSS clocks:

- dss_rfbi is missing ick opt-clock, which is needed for RFBI to
  calculate timings

- dss_venc's interface and main clocks are wrong, causing VENC to fail
  to start

These problems were temporarily fixed with a DSS patch
9ede365a ("HACK: OMAP: DSS2: clk hack
for OMAP2/3"), which can be reverted after this patch (and the similar
patches for other OMAPs).

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>

parent 1258ea59

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -965,6 +965,10 @@ static struct omap_hwmod_ocp_if *omap2420_dss_rfbi_slaves[] = {
		&omap2420_l4_core__dss_rfbi,
		};

		static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = {
		{ .role = "ick", .clk = "dss_ick" },
		};

		static struct omap_hwmod omap2420_dss_rfbi_hwmod = {
		.name = "dss_rfbi",
		.class = &omap2_rfbi_hwmod_class,
		@@ -976,6 +980,8 @@ static struct omap_hwmod omap2420_dss_rfbi_hwmod = {
		.module_offs = CORE_MOD,
		},
		},
		.opt_clks = dss_rfbi_opt_clks,
		.opt_clks_cnt = ARRAY_SIZE(dss_rfbi_opt_clks),
		.slaves = omap2420_dss_rfbi_slaves,
		.slaves_cnt = ARRAY_SIZE(omap2420_dss_rfbi_slaves),
		.flags = HWMOD_NO_IDLEST,
		@@ -985,7 +991,7 @@ static struct omap_hwmod omap2420_dss_rfbi_hwmod = {
		static struct omap_hwmod_ocp_if omap2420_l4_core__dss_venc = {
		.master = &omap2420_l4_core_hwmod,
		.slave = &omap2420_dss_venc_hwmod,
		.clk = "dss_54m_fck",
		.clk = "dss_ick",
		.addr = omap2_dss_venc_addrs,
		.fw = {
		.omap2 = {
		@@ -1005,7 +1011,7 @@ static struct omap_hwmod_ocp_if *omap2420_dss_venc_slaves[] = {
		static struct omap_hwmod omap2420_dss_venc_hwmod = {
		.name = "dss_venc",
		.class = &omap2_venc_hwmod_class,
		.main_clk = "dss1_fck",
		.main_clk = "dss_54m_fck",
		.prcm = {
		.omap2 = {
		.prcm_reg_id = 1,

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -1020,6 +1020,10 @@ static struct omap_hwmod_ocp_if *omap2430_dss_rfbi_slaves[] = {
		&omap2430_l4_core__dss_rfbi,
		};

		static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = {
		{ .role = "ick", .clk = "dss_ick" },
		};

		static struct omap_hwmod omap2430_dss_rfbi_hwmod = {
		.name = "dss_rfbi",
		.class = &omap2_rfbi_hwmod_class,
		@@ -1031,6 +1035,8 @@ static struct omap_hwmod omap2430_dss_rfbi_hwmod = {
		.module_offs = CORE_MOD,
		},
		},
		.opt_clks = dss_rfbi_opt_clks,
		.opt_clks_cnt = ARRAY_SIZE(dss_rfbi_opt_clks),
		.slaves = omap2430_dss_rfbi_slaves,
		.slaves_cnt = ARRAY_SIZE(omap2430_dss_rfbi_slaves),
		.flags = HWMOD_NO_IDLEST,
		@@ -1040,7 +1046,7 @@ static struct omap_hwmod omap2430_dss_rfbi_hwmod = {
		static struct omap_hwmod_ocp_if omap2430_l4_core__dss_venc = {
		.master = &omap2430_l4_core_hwmod,
		.slave = &omap2430_dss_venc_hwmod,
		.clk = "dss_54m_fck",
		.clk = "dss_ick",
		.addr = omap2_dss_venc_addrs,
		.flags = OCPIF_SWSUP_IDLE,
		.user = OCP_USER_MPU \| OCP_USER_SDMA,
		@@ -1054,7 +1060,7 @@ static struct omap_hwmod_ocp_if *omap2430_dss_venc_slaves[] = {
		static struct omap_hwmod omap2430_dss_venc_hwmod = {
		.name = "dss_venc",
		.class = &omap2_venc_hwmod_class,
		.main_clk = "dss1_fck",
		.main_clk = "dss_54m_fck",
		.prcm = {
		.omap2 = {
		.prcm_reg_id = 1,