diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-13 08:16:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-13 08:16:44 +0100 |
| commit | 4e11672653a4ad639ca2d2158b1266b258951f93 (patch) | |
| tree | f414be44a08fa1bf479ced828a412102b0646785 /drivers | |
| parent | 93c55ce0986a47f5b6774a81443e9b3a15fc727c (diff) | |
| parent | 0482159e9ab9fcd23ab8db2e9d6f585c3929d447 (diff) | |
| download | barebox-4e11672653a4ad639ca2d2158b1266b258951f93.tar.gz barebox-4e11672653a4ad639ca2d2158b1266b258951f93.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/imx/clk-imx6.c | 5 | ||||
| -rw-r--r-- | drivers/clk/imx/clk-imx6ul.c | 3 |
2 files changed, 2 insertions, 6 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 diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index 0ca0652cfd..f28660d6ea 100644 --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -91,6 +91,7 @@ static int imx6_ccm_probe(struct device_d *dev) int i; struct device_node *ccm_node = dev->device_node; + anatop_base = IOMEM(MX6_ANATOP_BASE_ADDR); iores = dev_request_mem_resource(dev, 0); if (IS_ERR(iores)) return PTR_ERR(iores); @@ -100,8 +101,6 @@ static int imx6_ccm_probe(struct device_d *dev) clks[IMX6UL_CLK_DUMMY] = clk_fixed("dummy", 0); - base = IOMEM(MX6_ANATOP_BASE_ADDR); - clks[IMX6UL_PLL1_BYPASS_SRC] = imx_clk_mux("pll1_bypass_src", base + 0x00, 14, 1, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels)); clks[IMX6UL_PLL2_BYPASS_SRC] = imx_clk_mux("pll2_bypass_src", base + 0x30, 14, 1, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels)); clks[IMX6UL_PLL3_BYPASS_SRC] = imx_clk_mux("pll3_bypass_src", base + 0x10, 14, 1, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels)); |