diff options
| author | Sandor Yu <R01008@freescale.com> | 2015-09-30 16:15:00 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:20:42 +0300 |
| commit | 27c5646032e1af02e400fc54933c0459c1093a09 (patch) | |
| tree | 98c6c50fad80a62c97ff3f8d0e981653add7c0aa /drivers/mxc/ipu3 | |
| parent | c9e392647134096955ff76ee506093942252cd55 (diff) | |
MLK-11657: IPU: check ldb clock with clk name
4.1 kernel apply the followed patch:
commit 73e0e496afdac9a5190eb3b9c51fdfebcc14ebd4
clkdev: Always allocate a struct clk and call __clk_get() w/ CCF
clock_get will return a new struct clk, so we can't use the pointer
of clk struct to compare clk whether is equal, replace with clk name.
Signed-off-by: Sandor Yu <R01008@freescale.com>
Diffstat (limited to 'drivers/mxc/ipu3')
| -rw-r--r-- | drivers/mxc/ipu3/ipu_disp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mxc/ipu3/ipu_disp.c b/drivers/mxc/ipu3/ipu_disp.c index f7044c297389..633fc56bca85 100644 --- a/drivers/mxc/ipu3/ipu_disp.c +++ b/drivers/mxc/ipu3/ipu_disp.c @@ -1086,8 +1086,8 @@ int32_t ipu_init_sync_panel(struct ipu_soc *ipu, int disp, uint32_t pixel_clk, dev_err(ipu->dev, "clk_get di1 failed"); return PTR_ERR(ldb_di1_clk); } - - if (ldb_di0_clk == di_parent || ldb_di1_clk == di_parent) { + if (!strcmp(__clk_get_name(di_parent), __clk_get_name(ldb_di1_clk)) || + !strcmp(__clk_get_name(di_parent), __clk_get_name(ldb_di1_clk))) { /* if di clk parent is tve/ldb, then keep it;*/ dev_dbg(ipu->dev, "use special clk parent\n"); ret = clk_set_parent(ipu->pixel_clk_sel[disp], ipu->di_clk[disp]); |