Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / drivers / clk / x86 / clk-lpt.c

diff --git a/drivers/clk/x86/clk-lpt.c b/drivers/clk/x86/clk-lpt.c
index 81298aeef7e3c76999f1d549204f083b1449946c..5cf4f4686406e639e71353984ea7b84d0bc2709b 100644 (file)
--- a/drivers/clk/x86/clk-lpt.c
+++ b/drivers/clk/x86/clk-lpt.c
@@ -10,7 +10,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/acpi.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/clk-provider.h>
@@ -18,8 +17,6 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include "clk-lpss.h"
-
 #define PRV_CLOCK_PARAMS 0x800
 
 static int lpt_clk_probe(struct platform_device *pdev)
@@ -34,40 +31,6 @@ static int lpt_clk_probe(struct platform_device *pdev)
 
        /* Shared DMA clock */
        clk_register_clkdev(clk, "hclk", "INTL9C60.0.auto");
-
-       /* SPI clocks */
-       clk = clk_register_lpss_gate("spi0_clk", "lpss_clk", "INT33C0", NULL,
-                                    PRV_CLOCK_PARAMS);
-       if (!IS_ERR(clk))
-               clk_register_clkdev(clk, NULL, "INT33C0:00");
-
-       clk = clk_register_lpss_gate("spi1_clk", "lpss_clk", "INT33C1", NULL,
-                                    PRV_CLOCK_PARAMS);
-       if (!IS_ERR(clk))
-               clk_register_clkdev(clk, NULL, "INT33C1:00");
-
-       /* I2C clocks */
-       clk = clk_register_lpss_gate("i2c0_clk", "lpss_clk", "INT33C2", NULL,
-                                    PRV_CLOCK_PARAMS);
-       if (!IS_ERR(clk))
-               clk_register_clkdev(clk, NULL, "INT33C2:00");
-
-       clk = clk_register_lpss_gate("i2c1_clk", "lpss_clk", "INT33C3", NULL,
-                                    PRV_CLOCK_PARAMS);
-       if (!IS_ERR(clk))
-               clk_register_clkdev(clk, NULL, "INT33C3:00");
-
-       /* UART clocks */
-       clk = clk_register_lpss_gate("uart0_clk", "lpss_clk", "INT33C4", NULL,
-                                    PRV_CLOCK_PARAMS);
-       if (!IS_ERR(clk))
-               clk_register_clkdev(clk, NULL, "INT33C4:00");
-
-       clk = clk_register_lpss_gate("uart1_clk", "lpss_clk", "INT33C5", NULL,
-                                    PRV_CLOCK_PARAMS);
-       if (!IS_ERR(clk))
-               clk_register_clkdev(clk, NULL, "INT33C5:00");
-
        return 0;
 }
 
@@ -79,8 +42,7 @@ static struct platform_driver lpt_clk_driver = {
        .probe = lpt_clk_probe,
 };
 
-static int __init lpt_clk_init(void)
+int __init lpt_clk_init(void)
 {
        return platform_driver_register(&lpt_clk_driver);
 }
-arch_initcall(lpt_clk_init);