arm, davinci: move davinci_rtc struct to hardware.h

move struct davinci_rtc to arch/arm/include/asm/arch-davinci/hardware.h
and add RTC_KICK0R_WE, RTC_KICK1R_WE defines,
so they are global useable.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>

diff --git a/arch/arm/include/asm/arch-davinci/hardware.h b/arch/arm/include/asm/arch-davinci/hardware.h
index 06819a68c8820369ccee5346cc3112c5e43e218a..dd89e84413bb4e890c556d30dd37148610038ffb 100644 (file)
--- a/arch/arm/include/asm/arch-davinci/hardware.h
+++ b/arch/arm/include/asm/arch-davinci/hardware.h
@@ -588,4 +588,43 @@ static inline int get_async3_src(void)
 #include <asm/arch/syscfg_defs.h>
 #include <asm/arch/timer_defs.h>
 #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  0x130be783
+#define RTC_KICK1R_WE  0xe0f1a495
+
+#define davinci_rtc_base ((struct davinci_rtc *)DAVINCI_RTC_BASE)
+
 #endif /* __ASM_ARCH_HARDWARE_H */

diff --git a/drivers/rtc/davinci.c b/drivers/rtc/davinci.c
index 8436cbf8e9039f479e1aad1768afdf886c77ed11..5cafff4d2109865b451948208b96bb8312cbbfc8 100644 (file)
--- a/drivers/rtc/davinci.c
+++ b/drivers/rtc/davinci.c
@@ -27,32 +27,6 @@
 #include <asm/arch/hardware.h>
 
 #if defined(CONFIG_CMD_DATE)
-struct davinci_rtc {
-       u_int32_t       second;
-       u_int32_t       minutes;
-       u_int32_t       hours;
-       u_int32_t       day;
-       u_int32_t       month; /* 0x10 */
-       u_int32_t       year;
-       u_int32_t       dotw;
-       u_int32_t       resv1;
-       u_int32_t       alarmsecond; /* 0x20 */
-       u_int32_t       alarmminute;
-       u_int32_t       alarmhour;
-       u_int32_t       alarmday;
-       u_int32_t       alarmmonth; /* 0x30 */
-       u_int32_t       alarmyear;
-       u_int32_t       resv2[2];
-       u_int32_t       ctrl; /* 0x40 */
-       u_int32_t       status;
-       u_int32_t       irq;
-};
-
-#define RTC_STATE_BUSY 0x01
-#define RTC_STATE_RUN  0x02
-
-#define davinci_rtc_base ((struct davinci_rtc *)DAVINCI_RTC_BASE)
-
 int rtc_get(struct rtc_time *tmp)
 {
        struct davinci_rtc *rtc = davinci_rtc_base;