Merge branch 'msm/cleanup' into next/cleanup

From David Brown <davidb@codeaurora.org>:
* msm/cleanup:
  ARM: msm: Only compile io.c on platforms that use it
  iommu/msm: Move mach includes to iommu directory
  ARM: msm: Remove devices-iommu.c
  ARM: msm: Move mach/board.h contents to common.h
  ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
  ARM: msm: Remove TMR and TMR0 static mappings
  ARM: msm: Move debug-macro.S to include/debug
  ARM: msm: Don't compile __msm_ioremap_caller() unless used
  ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60

Signed-off-by: Kevin Hilman <khilman@linaro.org>

1 files changed, 3 insertions, 14 deletions

diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index a7afbacae61a..696fb73296d0 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -233,15 +233,8 @@ err:
 }
 
 #ifdef CONFIG_OF
-static const struct of_device_id msm_timer_match[] __initconst = {
-        { .compatible = "qcom,kpss-timer" },
-        { .compatible = "qcom,scss-timer" },
-        { },
-};
-
-void __init msm_dt_timer_init(void)
+static void __init msm_dt_timer_init(struct device_node *np)
 {
-        struct device_node *np;
         u32 freq;
         int irq;
         struct resource res;
@@ -249,12 +242,6 @@ void __init msm_dt_timer_init(void)
         void __iomem *base;
         void __iomem *cpu0_base;
 
-        np = of_find_matching_node(NULL, msm_timer_match);
-        if (!np) {
-                pr_err("Can't find msm timer DT node\n");
-                return;
-        }
-
         base = of_iomap(np, 0);
         if (!base) {
                 pr_err("Failed to map event base\n");
@@ -297,6 +284,8 @@ void __init msm_dt_timer_init(void)
 
         msm_timer_init(freq, 32, irq, !!percpu_offset);
 }
+CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init);
+CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init);
 #endif
 
 static int __init msm_timer_map(phys_addr_t addr, u32 event, u32 source,