diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 20:21:46 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 20:21:46 +0200 |
| commit | aaad5cbad757b21457874a6b7adbeaaad36a0ce3 (patch) | |
| tree | 55a34386c6229c1f245638f5ad014800c9c33eb9 /arch/arm/mach-imx/clk-imx21.c | |
| parent | 09efce4ad3c08b89291cedffa054e03ef44f521a (diff) | |
| parent | a4c86922406104f615c179bdaecf47d1ab56c995 (diff) | |
| download | barebox-aaad5cbad757b21457874a6b7adbeaaad36a0ce3.tar.gz barebox-aaad5cbad757b21457874a6b7adbeaaad36a0ce3.tar.xz | |
Merge branch 'for-next/clk' into for-next/imx
Conflicts:
drivers/net/fec_imx.c
Diffstat (limited to 'arch/arm/mach-imx/clk-imx21.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-imx21.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/clk-imx21.c b/arch/arm/mach-imx/clk-imx21.c index a7c5732260..9e7af816a2 100644 --- a/arch/arm/mach-imx/clk-imx21.c +++ b/arch/arm/mach-imx/clk-imx21.c @@ -47,7 +47,7 @@ enum imx21_clks { ckil, ckih, fpm, mpll_sel, spll_sel, mpll, spll, fclk, hclk, ipg, per1, - per2, per3, per4, usb_div, nfc_div, clk_max + per2, per3, per4, usb_div, nfc_div, lcdc_per_gate, clk_max }; static struct clk *clks[clk_max]; @@ -70,6 +70,16 @@ static int imx21_ccm_probe(struct device_d *dev) base = dev_request_mem_region(dev, 0); + writel((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5) | + (1 << 9) | (1 << 10) | (1 << 11) | (1 << 12) | + (1 << 13) | (1 << 14) | (1 << 19) | (1 << 22) | + (1 << 24) | (1 << 26) | (1 << 30), + base + CCM_PCCR0); + + writel((1 << 23) | (1 << 24) | (1 << 25) | (1 << 26) | (1 << 27) | + (1 << 28) | (1 << 29) | (1 << 30) | (1 << 31), + base + CCM_PCCR1); + clks[ckil] = clk_fixed("ckil", lref); clks[ckih] = clk_fixed("ckih", href); clks[fpm] = imx_clk_fixed_factor("fpm", "ckil", 512, 1); @@ -88,6 +98,7 @@ static int imx21_ccm_probe(struct device_d *dev) clks[per4] = imx_clk_divider("per4", "mpll", base + CCM_PCDR1, 24, 6); clks[usb_div] = imx_clk_divider("usb_div", "spll", base + CCM_CSCR, 26, 3); clks[nfc_div] = imx_clk_divider("nfc_div", "ipg", base + CCM_PCDR0, 12, 4); + clks[lcdc_per_gate] = imx_clk_gate("lcdc_per_gate", "per3", base + CCM_PCCR0, 18); clkdev_add_physbase(clks[per1], MX21_GPT1_BASE_ADDR, NULL); clkdev_add_physbase(clks[per1], MX21_GPT2_BASE_ADDR, NULL); @@ -98,11 +109,11 @@ static int imx21_ccm_probe(struct device_d *dev) clkdev_add_physbase(clks[per1], MX21_UART4_BASE_ADDR, NULL); clkdev_add_physbase(clks[per2], MX21_CSPI1_BASE_ADDR, NULL); clkdev_add_physbase(clks[per2], MX21_CSPI2_BASE_ADDR, NULL); + clkdev_add_physbase(clks[per2], MX21_CSPI3_BASE_ADDR, NULL); clkdev_add_physbase(clks[ipg], MX21_I2C_BASE_ADDR, NULL); clkdev_add_physbase(clks[ipg], MX21_SDHC1_BASE_ADDR, NULL); clkdev_add_physbase(clks[ipg], MX21_SDHC2_BASE_ADDR, NULL); - clkdev_add_physbase(clks[per3], MX21_CSPI3_BASE_ADDR, NULL); - clkdev_add_physbase(clks[per3], MX21_LCDC_BASE_ADDR, NULL); + clkdev_add_physbase(clks[lcdc_per_gate], MX21_LCDC_BASE_ADDR, NULL); return 0; } |