Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-16 14:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Tom Rini 2013-08-28 09:00:28 -04:00
parent 5d4d38d1cc
commit 155d424a9a
7 changed files with 59 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/cpu/armv7/am33xx/board.c
View file

@ -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);

9
arch/arm/include/asm/arch-am33xx/cpu.h
View file

@ -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];

38
arch/arm/include/asm/arch-davinci/hardware.h
View file

@ -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 */

52
arch/arm/include/asm/davinci_rtc.h Normal file
View file

@ -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

1
board/enbw/enbw_cmc/enbw_cmc.c
View file

@ -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;

3
drivers/bootcount/bootcount_davinci.c
View file

@ -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)
{

2
drivers/rtc/davinci.c
View file

@ -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)