Merge remote-tracking branches 'regulator/fix/88pm800', 'regulator/fix/max8973',...

[linux-drm-fsl-dcu.git] / arch / arm / mach-exynos / exynos.c

diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 4bd8b76538175aa2ba4ab3f58a127b94bda08939..5f8ddcdeeacf1117d92313e6cb34608be136a955 100644 (file)
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -224,6 +224,25 @@ static void __init exynos_init_irq(void)
        exynos_map_pmu();
 }
 
+static const struct of_device_id exynos_cpufreq_matches[] = {
+       { .compatible = "samsung,exynos4210", .data = "cpufreq-dt" },
+       { /* sentinel */ }
+};
+
+static void __init exynos_cpufreq_init(void)
+{
+       struct device_node *root = of_find_node_by_path("/");
+       const struct of_device_id *match;
+
+       match = of_match_node(exynos_cpufreq_matches, root);
+       if (!match) {
+               platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);
+               return;
+       }
+
+       platform_device_register_simple(match->data, -1, NULL, 0);
+}
+
 static void __init exynos_dt_machine_init(void)
 {
        /*
@@ -246,7 +265,7 @@ static void __init exynos_dt_machine_init(void)
            of_machine_is_compatible("samsung,exynos5250"))
                platform_device_register(&exynos_cpuidle);
 
-       platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);
+       exynos_cpufreq_init();
 
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }