Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-vexpress / ct-ca9x4.c

diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index 204038ef37950e3a89b1dd23125ea91ebf1b08d4..86150d7a2e7d977c1767795cfd3da082efae0013 100644 (file)
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -146,6 +146,10 @@ static struct platform_device pmu_device = {
        .resource       = pmu_resources,
 };
 
+static struct clk_lookup osc1_lookup = {
+       .dev_id         = "ct:clcd",
+};
+
 static struct platform_device osc1_device = {
        .name           = "vexpress-osc",
        .id             = 1,
@@ -153,6 +157,7 @@ static struct platform_device osc1_device = {
        .resource       = (struct resource []) {
                VEXPRESS_RES_FUNC(0xf, 1),
        },
+       .dev.platform_data = &osc1_lookup,
 };
 
 static void __init ct_ca9x4_init(void)
@@ -163,10 +168,7 @@ static void __init ct_ca9x4_init(void)
                amba_device_register(ct_ca9x4_amba_devs[i], &iomem_resource);
 
        platform_device_register(&pmu_device);
-       platform_device_register(&osc1_device);
-
-       WARN_ON(clk_register_clkdev(vexpress_osc_setup(&osc1_device.dev),
-                       NULL, "ct:clcd"));
+       vexpress_syscfg_device_register(&osc1_device);
 }
 
 #ifdef CONFIG_SMP