dm: cros_ec: Remove use of fdtdec GPIO support

[karo-tx-uboot.git] / drivers / bootcount / bootcount_davinci.c

diff --git a/drivers/bootcount/bootcount_davinci.c b/drivers/bootcount/bootcount_davinci.c
index efa4d42cbf4ca7181ca83ebb6909104e2cf6ecbe..fa87b5e7b948cc398fc413711ffea47be94a4bb4 100644 (file)
--- a/drivers/bootcount/bootcount_davinci.c
+++ b/drivers/bootcount/bootcount_davinci.c
@@ -2,12 +2,15 @@
  * (C) Copyright 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
+ * A bootcount driver for the RTC IP block found on many TI platforms.
+ * This requires the RTC clocks, etc, to be enabled prior to use and
+ * not all boards with this IP block on it will have the RTC in use.
+ *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <bootcount.h>
-#include <asm/arch/da850_lowlevel.h>
-#include <asm/arch/davinci_misc.h>
+#include <asm/davinci_rtc.h>
 
 void bootcount_store(ulong a)
 {
@@ -21,17 +24,19 @@ void bootcount_store(ulong a)
         */
        writel(RTC_KICK0R_WE, &reg->kick0r);
        writel(RTC_KICK1R_WE, &reg->kick1r);
-       raw_bootcount_store(&reg->scratch0, a);
-       raw_bootcount_store(&reg->scratch1, BOOTCOUNT_MAGIC);
+       raw_bootcount_store(&reg->scratch2,
+                           (BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff));
 }
 
 ulong bootcount_load(void)
 {
+       unsigned long val;
        struct davinci_rtc *reg =
                (struct davinci_rtc *)CONFIG_SYS_BOOTCOUNT_ADDR;
 
-       if (raw_bootcount_load(&reg->scratch1) != BOOTCOUNT_MAGIC)
+       val = raw_bootcount_load(&reg->scratch2);
+       if ((val & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000))
                return 0;
        else
-               return raw_bootcount_load(&reg->scratch0);
+               return val & 0x0000ffff;
 }