diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-05 08:54:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-05 08:54:55 -0400 |
| commit | 8dcb6f1f81e03846b9f6dbc4cb7a6bb8dbfcbb81 (patch) | |
| tree | 0d7588fec2e4070ab6c08f8183f144c385a51dfb /drivers | |
| parent | 08d0c53d6b1ba9fcca19883e20f4735eabe8bb3a (diff) | |
| parent | c967fb78e488c148700dc8747472d7e1d7eaec30 (diff) | |
| download | u-boot-8dcb6f1f81e03846b9f6dbc4cb7a6bb8dbfcbb81.tar.gz | |
Merge git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/ipu.h | 1 | ||||
| -rw-r--r-- | drivers/video/ipu_common.c | 5 | ||||
| -rw-r--r-- | drivers/video/mxc_ipuv3_fb.c | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/ipu.h b/drivers/video/ipu.h index 348be58bf6..ff91d18868 100644 --- a/drivers/video/ipu.h +++ b/drivers/video/ipu.h @@ -253,6 +253,7 @@ struct clk *clk_get_parent(struct clk *clk); void ipu_dump_registers(void); int ipu_probe(void); +bool ipu_clk_enabled(void); void ipu_dmfc_init(int dmfc_type, int first); void ipu_init_dc_mappings(void); diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c index f8d4488fce..f259fb9633 100644 --- a/drivers/video/ipu_common.c +++ b/drivers/video/ipu_common.c @@ -1243,3 +1243,8 @@ int ipu_set_ldb_clock(int rate) return 0; } + +bool ipu_clk_enabled(void) +{ + return g_ipu_clk_enabled; +} diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c index 0d0a0a97ff..1ab5cb7b1c 100644 --- a/drivers/video/mxc_ipuv3_fb.c +++ b/drivers/video/mxc_ipuv3_fb.c @@ -571,6 +571,9 @@ void ipuv3_fb_shutdown(void) int i; struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT; + if (!ipu_clk_enabled()) + return; + for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) { struct fb_info *fbi = mxcfb_info[i]; if (fbi) { |