diff options
| author | David Jander <david@protonic.nl> | 2017-03-03 08:33:53 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-09 08:17:01 +0100 |
| commit | 0482159e9ab9fcd23ab8db2e9d6f585c3929d447 (patch) | |
| tree | 2b1691afc0be1eb45a7d6d4c4a1fad322f5a6167 | |
| parent | 3ca576cc4a4236a2556ab172b524c1e50e9ee4ad (diff) | |
| download | barebox-0482159e9ab9fcd23ab8db2e9d6f585c3929d447.tar.gz barebox-0482159e9ab9fcd23ab8db2e9d6f585c3929d447.tar.xz | |
drivers: clk: clk-imx6.c: Don't gate LDB and IPUs
Depending on CONFIG_DRIVER_VIDEO_IMX_IPUV3 to decide whether to
gate IPU clocks or not is rather fragile. Any inadvertent
dependency on the IPU (like setting the NoC AQoS registers for
i.MX6QP) will result in a freeze if CONFIG_DRIVER_VIDEO_IMX_IPUV3
is disabled.
Signed-off-by: David Jander <david@protonic.nl>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/clk/imx/clk-imx6.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/clk/imx/clk-imx6.c b/drivers/clk/imx/clk-imx6.c index 8ac43bebb0..d0571bce5e 100644 --- a/drivers/clk/imx/clk-imx6.c +++ b/drivers/clk/imx/clk-imx6.c @@ -494,10 +494,7 @@ static int imx6_ccm_probe(struct device_d *dev) writel(0xffffffff, ccm_base + CCGR0); writel(0xf0ffffff, ccm_base + CCGR1); /* gate GPU3D, GPU2D */ writel(0xffffffff, ccm_base + CCGR2); - if (IS_ENABLED(CONFIG_DRIVER_VIDEO_IMX_IPUV3)) - writel(0x3fffffff, ccm_base + CCGR3); /* gate OpenVG */ - else - writel(0x3fff0000, ccm_base + CCGR3); /* gate OpenVG, LDB, IPU1, IPU2 */ + writel(0x3fffffff, ccm_base + CCGR3); /* gate OpenVG */ if (IS_ENABLED(CONFIG_PCI_IMX6)) writel(0xffffffff, ccm_base + CCGR4); else |