Commit 5ab96a8d authored by Shawn Guo's avatar Shawn Guo

ARM: imx: use dynamic mapping for CCM

Replace the static mapping of CCM block in clock drivers with dynamic
mapping.
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 6c529c49
...@@ -75,7 +75,8 @@ static void __init _mx1_clocks_init(unsigned long fref) ...@@ -75,7 +75,8 @@ static void __init _mx1_clocks_init(unsigned long fref)
int __init mx1_clocks_init(unsigned long fref) int __init mx1_clocks_init(unsigned long fref)
{ {
ccm = MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR); ccm = ioremap(MX1_CCM_BASE_ADDR, SZ_4K);
BUG_ON(!ccm);
_mx1_clocks_init(fref); _mx1_clocks_init(fref);
......
...@@ -50,9 +50,12 @@ static struct clk_onecell_data clk_data; ...@@ -50,9 +50,12 @@ static struct clk_onecell_data clk_data;
int __init mx31_clocks_init(unsigned long fref) int __init mx31_clocks_init(unsigned long fref)
{ {
void __iomem *base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR); void __iomem *base;
struct device_node *np; struct device_node *np;
base = ioremap(MX31_CCM_BASE_ADDR, SZ_4K);
BUG_ON(!base);
clk[dummy] = imx_clk_fixed("dummy", 0); clk[dummy] = imx_clk_fixed("dummy", 0);
clk[ckih] = imx_clk_fixed("ckih", fref); clk[ckih] = imx_clk_fixed("ckih", fref);
clk[ckil] = imx_clk_fixed("ckil", 32768); clk[ckil] = imx_clk_fixed("ckil", 32768);
......
...@@ -71,11 +71,14 @@ static struct clk *clk[clk_max]; ...@@ -71,11 +71,14 @@ static struct clk *clk[clk_max];
int __init mx35_clocks_init(void) int __init mx35_clocks_init(void)
{ {
void __iomem *base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR); void __iomem *base;
u32 pdr0, consumer_sel, hsp_sel; u32 pdr0, consumer_sel, hsp_sel;
struct arm_ahb_div *aad; struct arm_ahb_div *aad;
unsigned char *hsp_div; unsigned char *hsp_div;
base = ioremap(MX35_CCM_BASE_ADDR, SZ_4K);
BUG_ON(!base);
pdr0 = __raw_readl(base + MXC_CCM_PDR0); pdr0 = __raw_readl(base + MXC_CCM_PDR0);
consumer_sel = (pdr0 >> 16) & 0xf; consumer_sel = (pdr0 >> 16) & 0xf;
aad = &clk_consumer[consumer_sel]; aad = &clk_consumer[consumer_sel];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment