am33xx, davinci: Create and use <asm/davinci_rtc.h>

Create a common header file for the RTC IP block that is shared between
davinci and am33xx.

Signed-off-by: Tom Rini <trini@ti.com>

diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c
index a31bf40e5b3664567a9a722918c489d836c8587a..453effa541a8837b8c34489c0dc63db91dcfd99f 100644 (file)
--- a/arch/arm/cpu/armv7/am33xx/board.c
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -32,6 +32,7 @@
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
 #include <asm/omap_musb.h>
+#include <asm/davinci_rtc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -150,15 +151,15 @@ __weak void am33xx_spl_board_init(void)
 
 static void rtc32k_enable(void)
 {
-       struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE;
+       struct davinci_rtc *rtc = (struct davinci_rtc *)RTC_BASE;
 
        /*
         * Unlock the RTC's registers.  For more details please see the
         * RTC_SS section of the TRM.  In order to unlock we need to
         * write these specific values (keys) in this order.
         */
-       writel(0x83e70b13, &rtc->kick0r);
-       writel(0x95a4f1e0, &rtc->kick1r);
+       writel(RTC_KICK0R_WE, &rtc->kick0r);
+       writel(RTC_KICK1R_WE, &rtc->kick1r);
 
        /* Enable the RTC 32K OSC by setting bits 3 and 6. */
        writel((1 << 3) | (1 << 6), &rtc->osc);

diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h
index 52fa128af905cf7c6b153612ecc23280de1a00f5..05752ce689ce3dc45b8ad8daadc7ac0ab9a237f1 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/cpu.h
+++ b/arch/arm/include/asm/arch-am33xx/cpu.h
@@ -457,15 +457,6 @@ struct gptimer {
        unsigned int tcar2;             /* offset 0x58 */
 };
 
-/* RTC Registers */
-struct rtc_regs {
-       unsigned int res[21];
-       unsigned int osc;               /* offset 0x54 */
-       unsigned int res2[5];
-       unsigned int kick0r;            /* offset 0x6c */
-       unsigned int kick1r;            /* offset 0x70 */
-};
-
 /* UART Registers */
 struct uart_sys {
        unsigned int resv1[21];

diff --git a/arch/arm/include/asm/arch-davinci/hardware.h b/arch/arm/include/asm/arch-davinci/hardware.h
index 05ecc787685d40b1bf3d45a5053452fd9d936832..7aaf4bff851ff073eef09c144772523e4e137b66 100644 (file)
--- a/arch/arm/include/asm/arch-davinci/hardware.h
+++ b/arch/arm/include/asm/arch-davinci/hardware.h
@@ -613,42 +613,4 @@ static inline enum davinci_clk_ids get_async3_src(void)
 
 #endif
 
-struct davinci_rtc {
-       dv_reg  second;
-       dv_reg  minutes;
-       dv_reg  hours;
-       dv_reg  day;
-       dv_reg  month; /* 0x10 */
-       dv_reg  year;
-       dv_reg  dotw;
-       dv_reg  resv1;
-       dv_reg  alarmsecond; /* 0x20 */
-       dv_reg  alarmminute;
-       dv_reg  alarmhour;
-       dv_reg  alarmday;
-       dv_reg  alarmmonth; /* 0x30 */
-       dv_reg  alarmyear;
-       dv_reg  resv2[2];
-       dv_reg  ctrl; /* 0x40 */
-       dv_reg  status;
-       dv_reg  irq;
-       dv_reg  complsb;
-       dv_reg  compmsb; /* 0x50 */
-       dv_reg  osc;
-       dv_reg  resv3[2];
-       dv_reg  scratch0; /* 0x60 */
-       dv_reg  scratch1;
-       dv_reg  scratch2;
-       dv_reg  kick0r;
-       dv_reg  kick1r; /* 0x70 */
-};
-
-#define RTC_STATE_BUSY 0x01
-#define RTC_STATE_RUN  0x02
-
-#define RTC_KICK0R_WE  0x83e70b13
-#define RTC_KICK1R_WE  0x95a4f1e0
-
-#define davinci_rtc_base ((struct davinci_rtc *)DAVINCI_RTC_BASE)
-
 #endif /* __ASM_ARCH_HARDWARE_H */

diff --git a/arch/arm/include/asm/davinci_rtc.h b/arch/arm/include/asm/davinci_rtc.h
new file mode 100644 (file)
index 0000000..575b590
--- /dev/null
+++ b/arch/arm/include/asm/davinci_rtc.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
+ *
+ * Based on:
+ *
+ * -------------------------------------------------------------------------
+ *
+ *  linux/include/asm-arm/arch-davinci/hardware.h
+ *
+ *  Copyright (C) 2006 Texas Instruments.
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+#ifndef __ASM_DAVINCI_RTC_H
+#define __ASM_DAVINCI_RTC_H
+
+struct davinci_rtc {
+       unsigned int    second;
+       unsigned int    minutes;
+       unsigned int    hours;
+       unsigned int    day;
+       unsigned int    month; /* 0x10 */
+       unsigned int    year;
+       unsigned int    dotw;
+       unsigned int    resv1;
+       unsigned int    alarmsecond; /* 0x20 */
+       unsigned int    alarmminute;
+       unsigned int    alarmhour;
+       unsigned int    alarmday;
+       unsigned int    alarmmonth; /* 0x30 */
+       unsigned int    alarmyear;
+       unsigned int    resv2[2];
+       unsigned int    ctrl; /* 0x40 */
+       unsigned int    status;
+       unsigned int    irq;
+       unsigned int    complsb;
+       unsigned int    compmsb; /* 0x50 */
+       unsigned int    osc;
+       unsigned int    resv3[2];
+       unsigned int    scratch0; /* 0x60 */
+       unsigned int    scratch1;
+       unsigned int    scratch2;
+       unsigned int    kick0r;
+       unsigned int    kick1r; /* 0x70 */
+};
+
+#define RTC_STATE_BUSY 0x01
+#define RTC_STATE_RUN  0x02
+
+#define RTC_KICK0R_WE  0x83e70b13
+#define RTC_KICK1R_WE  0x95a4f1e0
+#endif

diff --git a/board/enbw/enbw_cmc/enbw_cmc.c b/board/enbw/enbw_cmc/enbw_cmc.c
index c477962f3476749cb32051362747a932dbcb52e6..39efe20bfdf49b836edf0f1cce4332db13372157 100644 (file)
--- a/board/enbw/enbw_cmc/enbw_cmc.c
+++ b/board/enbw/enbw_cmc/enbw_cmc.c
@@ -36,6 +36,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/sdmmc_defs.h>
 #include <asm/arch/timer_defs.h>
+#include <asm/davinci_rtc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/drivers/bootcount/bootcount_davinci.c b/drivers/bootcount/bootcount_davinci.c
index efa4d42cbf4ca7181ca83ebb6909104e2cf6ecbe..eddd9400055fc47bca9512ae695311b9beddbae0 100644 (file)
--- a/drivers/bootcount/bootcount_davinci.c
+++ b/drivers/bootcount/bootcount_davinci.c
@@ -6,8 +6,7 @@
  */
 
 #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)
 {

diff --git a/drivers/rtc/davinci.c b/drivers/rtc/davinci.c
index 018779e192f59a9bb4d620a869dc0789f7fd2bdd..f862e2f951c451e1d7213e8d468232bcb262c281 100644 (file)
--- a/drivers/rtc/davinci.c
+++ b/drivers/rtc/davinci.c
@@ -8,7 +8,7 @@
 #include <command.h>
 #include <rtc.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <asm/davinci_rtc.h>
 
 #if defined(CONFIG_CMD_DATE)
 int rtc_get(struct rtc_time *tmp)