Commit 2cf98d12 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo

ARM: imx3: Retrieve the CCM base address from devicetree

Now that imx31 and imx35 has been converted to a devicetree-only platform,
retrieve the CCM base address from devicetree.
Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 3172225d
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/of_address.h>
#include <linux/pinctrl/machine.h> #include <linux/pinctrl/machine.h>
#include <asm/system_misc.h> #include <asm/system_misc.h>
...@@ -99,10 +100,14 @@ static void imx31_idle(void) ...@@ -99,10 +100,14 @@ static void imx31_idle(void)
void __init imx31_init_early(void) void __init imx31_init_early(void)
{ {
struct device_node *np;
mxc_set_cpu_type(MXC_CPU_MX31); mxc_set_cpu_type(MXC_CPU_MX31);
arch_ioremap_caller = imx3_ioremap_caller; arch_ioremap_caller = imx3_ioremap_caller;
arm_pm_idle = imx31_idle; arm_pm_idle = imx31_idle;
mx3_ccm_base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR); np = of_find_compatible_node(NULL, NULL, "fsl,imx31-ccm");
mx3_ccm_base = of_iomap(np, 0);
BUG_ON(!mx3_ccm_base);
} }
void __init mx31_init_irq(void) void __init mx31_init_irq(void)
...@@ -137,10 +142,14 @@ static void imx35_idle(void) ...@@ -137,10 +142,14 @@ static void imx35_idle(void)
void __init imx35_init_early(void) void __init imx35_init_early(void)
{ {
struct device_node *np;
mxc_set_cpu_type(MXC_CPU_MX35); mxc_set_cpu_type(MXC_CPU_MX35);
arm_pm_idle = imx35_idle; arm_pm_idle = imx35_idle;
arch_ioremap_caller = imx3_ioremap_caller; arch_ioremap_caller = imx3_ioremap_caller;
mx3_ccm_base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR); np = of_find_compatible_node(NULL, NULL, "fsl,imx35-ccm");
mx3_ccm_base = of_iomap(np, 0);
BUG_ON(!mx3_ccm_base);
} }
void __init mx35_init_irq(void) void __init mx35_init_irq(void)
......
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