提交 8ad9375f 编写于 作者: A Aaro Koskinen 提交者: Tomi Valkeinen

OMAPDSS: do not fail if dpll4_m4_ck is missing

Do not fail if dpll4_m4_ck is missing. The clock is not there on omap24xx,
so this should not be a hard error.

The patch retains the functionality before the commit 185bae10 (OMAPDSS:
DSS: Cleanup cpu_is_xxxx checks).
Signed-off-by: NAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
上级 c415187b
...@@ -697,11 +697,15 @@ static int dss_get_clocks(void) ...@@ -697,11 +697,15 @@ static int dss_get_clocks(void)
dss.dss_clk = clk; dss.dss_clk = clk;
clk = clk_get(NULL, dss.feat->clk_name); if (dss.feat->clk_name) {
if (IS_ERR(clk)) { clk = clk_get(NULL, dss.feat->clk_name);
DSSERR("Failed to get %s\n", dss.feat->clk_name); if (IS_ERR(clk)) {
r = PTR_ERR(clk); DSSERR("Failed to get %s\n", dss.feat->clk_name);
goto err; r = PTR_ERR(clk);
goto err;
}
} else {
clk = NULL;
} }
dss.dpll4_m4_ck = clk; dss.dpll4_m4_ck = clk;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册