diff options
| author | Nikita Kiryanov <nikita@compulab.co.il> | 2015-07-23 17:19:31 +0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-08-02 10:51:37 +0200 |
| commit | b406f90342751a9534a00ab8f702a3b23ebbdd04 (patch) | |
| tree | 6bbf190091af7dab85f6600bcddb557bec8a305a /board | |
| parent | 33299499492586b8af3c6fa930b3122cd9293039 (diff) | |
| download | u-boot-b406f90342751a9534a00ab8f702a3b23ebbdd04.tar.gz u-boot-b406f90342751a9534a00ab8f702a3b23ebbdd04.tar.xz u-boot-b406f90342751a9534a00ab8f702a3b23ebbdd04.zip | |
arm: mx6: cm-fx6: setup hdmi only on hdmi enable
Refactor display code to only setup hdmi if do_enable_hdmi() is invoked.
Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'board')
| -rw-r--r-- | board/compulab/cm_fx6/cm_fx6.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 3e518c18d4..e85c8aba45 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -52,6 +52,9 @@ int splash_screen_prepare(void) #ifdef CONFIG_IMX_HDMI static void cm_fx6_enable_hdmi(struct display_info_t const *dev) { + struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; + imx_setup_hdmi(); + setbits_le32(&mxc_ccm->CCGR3, MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK); imx_enable_hdmi_phy(); } @@ -79,15 +82,9 @@ static struct display_info_t preset_hdmi_1024X768 = { static void cm_fx6_setup_display(void) { - struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; - int reg; enable_ipu_clock(); - imx_setup_hdmi(); - reg = __raw_readl(&mxc_ccm->CCGR3); - reg |= MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK; - writel(reg, &mxc_ccm->CCGR3); clrbits_le32(&iomuxc_regs->gpr[3], MXC_CCM_CCGR3_IPU1_IPU_DI0_MASK); } |