dm: mmc: sunxi: Add A10/A20 compatible strings

[u-boot] / drivers / bootcount / bootcount_davinci.c

diff --git a/drivers/bootcount/bootcount_davinci.c b/drivers/bootcount/bootcount_davinci.c
index 1cd943630a28107af9d834eecec24a203718dc3b..7101ad9413ecf60bc08958214a1790738afdef30 100644 (file)
--- a/drivers/bootcount/bootcount_davinci.c
+++ b/drivers/bootcount/bootcount_davinci.c
@@ -1,25 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ * 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.
  */
 
 #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)
 {
@@ -27,23 +17,25 @@ void bootcount_store(ulong a)
                (struct davinci_rtc *)CONFIG_SYS_BOOTCOUNT_ADDR;
 
        /*
-        * write RTC kick register to enable write
-        * for RTC Scratch registers. Scratch0 and 1 are
-        * used for bootcount values.
+        * write RTC kick registers to enable write
+        * for RTC Scratch registers. Scratch register 2 is
+        * used for bootcount value.
         */
        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;
 }