common: Drop asm/global_data.h from common header

[u-boot.git] / drivers / timer / cadence-ttc.c

diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index 4125a078b385d8d5c2b3f0ee55c4e79ae6804149..2f95d45ecd7a1ed06bb372ba066c6da1bdbfeb26 100644 (file)
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -4,10 +4,15 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <timer.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/bitops.h>
+#include <linux/err.h>
 
 #define CNT_CNTRL_RESET                BIT(4)
 
@@ -53,13 +58,11 @@ ulong timer_get_boot_us(void)
 }
 #endif
 
-static int cadence_ttc_get_count(struct udevice *dev, u64 *count)
+static u64 cadence_ttc_get_count(struct udevice *dev)
 {
        struct cadence_ttc_priv *priv = dev_get_priv(dev);
 
-       *count = readl(&priv->regs->counter_val1);
-
-       return 0;
+       return readl(&priv->regs->counter_val1);
 }
 
 static int cadence_ttc_probe(struct udevice *dev)
@@ -82,7 +85,7 @@ static int cadence_ttc_probe(struct udevice *dev)
        return 0;
 }
 
-static int cadence_ttc_ofdata_to_platdata(struct udevice *dev)
+static int cadence_ttc_of_to_plat(struct udevice *dev)
 {
        struct cadence_ttc_priv *priv = dev_get_priv(dev);
 
@@ -107,9 +110,8 @@ U_BOOT_DRIVER(cadence_ttc) = {
        .name = "cadence_ttc",
        .id = UCLASS_TIMER,
        .of_match = cadence_ttc_ids,
-       .ofdata_to_platdata = cadence_ttc_ofdata_to_platdata,
-       .priv_auto_alloc_size = sizeof(struct cadence_ttc_priv),
+       .of_to_plat = cadence_ttc_of_to_plat,
+       .priv_auto      = sizeof(struct cadence_ttc_priv),
        .probe = cadence_ttc_probe,
        .ops = &cadence_ttc_ops,
-       .flags = DM_FLAG_PRE_RELOC,
 };