mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-25 21:24:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtc: pl031: convert the driver to driver model

Browse Source 
With this patch, PL031 driver is converted to driver-model-compliant
driver. In addition, CONFIG_SYS_RTC_PL031_BASE is no longer valid.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
AKASHI Takahiro 2018-09-14 17:06:53 +09:00 committed by Alexander Graf
parent 24638a1f21
commit a370e429a7
3 changed files with 92 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
drivers/rtc/pl031.c
View File

@ -8,13 +8,11 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <dm.h>
#include <errno.h>
#include <rtc.h> #include <rtc.h>
#include <asm/io.h>
#if defined(CONFIG_CMD_DATE) #include <asm/types.h>
#ifndef CONFIG_SYS_RTC_PL031_BASE
#error CONFIG_SYS_RTC_PL031_BASE is not defined!
#endif
/* /*
* Register definitions * Register definitions
@ -30,78 +28,114 @@
#define RTC_CR_START (1 << 0) #define RTC_CR_START (1 << 0)
#define RTC_WRITE_REG(addr, val) \ struct pl031_platdata {
(*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)) = (val)) phys_addr_t base;
#define RTC_READ_REG(addr) \ };
(*(volatile unsigned int *)(CONFIG_SYS_RTC_PL031_BASE + (addr)))
static int pl031_initted = 0; static inline u32 pl031_read_reg(struct udevice *dev, int reg)
/* Enable RTC Start in Control register*/
void rtc_init(void)
{ {
RTC_WRITE_REG(RTC_CR, RTC_CR_START); struct pl031_platdata *pdata = dev_get_platdata(dev);
pl031_initted = 1; return readl(pdata->base + reg);
}
static inline u32 pl031_write_reg(struct udevice *dev, int reg, u32 value)
{
struct pl031_platdata *pdata = dev_get_platdata(dev);
return writel(value, pdata->base + reg);
} }
/* /*
* Reset the RTC. We set the date back to 1970-01-01. * Probe RTC device
*/ */
void rtc_reset(void) static int pl031_probe(struct udevice *dev)
{ {
RTC_WRITE_REG(RTC_LR, 0x00); /* Enable RTC Start in Control register*/
if(!pl031_initted) pl031_write_reg(dev, RTC_CR, RTC_CR_START);
rtc_init();
}
/* return 0;
* Set the RTC
*/
int rtc_set(struct rtc_time *tmp)
{
unsigned long tim;
if(!pl031_initted)
rtc_init();
if (tmp == NULL) {
puts("Error setting the date/time\n");
return -1;
}
/* Calculate number of seconds this incoming time represents */
tim = rtc_mktime(tmp);
RTC_WRITE_REG(RTC_LR, tim);
return -1;
} }
/* /*
* Get the current time from the RTC * Get the current time from the RTC
*/ */
int rtc_get(struct rtc_time *tmp) static int pl031_get(struct udevice *dev, struct rtc_time *tm)
{ {
ulong tim; unsigned long tim;
if(!pl031_initted) if (!tm)
rtc_init(); return -EINVAL;
if (tmp == NULL) { tim = pl031_read_reg(dev, RTC_DR);
puts("Error getting the date/time\n");
return -1;
}
tim = RTC_READ_REG(RTC_DR); rtc_to_tm(tim, tm);
rtc_to_tm(tim, tmp); debug("Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
debug ( "Get DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n", tm->tm_hour, tm->tm_min, tm->tm_sec);
tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
return 0; return 0;
} }
#endif /*
* Set the RTC
*/
static int pl031_set(struct udevice *dev, const struct rtc_time *tm)
{
unsigned long tim;
if (!tm)
return -EINVAL;
debug("Set DATE: %4d-%02d-%02d (wday=%d) TIME: %2d:%02d:%02d\n",
tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_wday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
/* Calculate number of seconds this incoming time represents */
tim = rtc_mktime(tm);
pl031_write_reg(dev, RTC_LR, tim);
return 0;
}
/*
* Reset the RTC. We set the date back to 1970-01-01.
*/
static int pl031_reset(struct udevice *dev)
{
pl031_write_reg(dev, RTC_LR, 0);
return 0;
}
static const struct rtc_ops pl031_ops = {
.get = pl031_get,
.set = pl031_set,
.reset = pl031_reset,
};
static const struct udevice_id pl031_ids[] = {
{ .compatible = "arm,pl031" },
{ }
};
static int pl031_ofdata_to_platdata(struct udevice *dev)
{
struct pl031_platdata *pdata = dev_get_platdata(dev);
pdata->base = dev_read_addr(dev);
return 0;
}
U_BOOT_DRIVER(rtc_pl031) = {
.name = "rtc-pl031",
.id = UCLASS_RTC,
.of_match = pl031_ids,
.probe = pl031_probe,
.ofdata_to_platdata = pl031_ofdata_to_platdata,
.platdata_auto_alloc_size = sizeof(struct pl031_platdata),
.ops = &pl031_ops,
};

3
include/configs/qemu-arm.h
View File

@ -23,9 +23,6 @@
/* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */ /* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 6 #define CONFIG_SYS_SCSI_MAX_SCSI_ID 6
/* QEMU emulates the ARM AMBA PL031 RTC */
#define CONFIG_SYS_RTC_PL031_BASE 0x09010000
/* Environment options */ /* Environment options */
#define CONFIG_ENV_SIZE SZ_64K #define CONFIG_ENV_SIZE SZ_64K

1
scripts/config_whitelist.txt
View File

@ -4070,7 +4070,6 @@ CONFIG_SYS_RSTC_RMR_VAL
CONFIG_SYS_RTC_BUS_NUM CONFIG_SYS_RTC_BUS_NUM
CONFIG_SYS_RTC_CNT CONFIG_SYS_RTC_CNT
CONFIG_SYS_RTC_OSCILLATOR CONFIG_SYS_RTC_OSCILLATOR
CONFIG_SYS_RTC_PL031_BASE
CONFIG_SYS_RTC_REG_BASE_ADDR CONFIG_SYS_RTC_REG_BASE_ADDR
CONFIG_SYS_RTC_SETUP CONFIG_SYS_RTC_SETUP
CONFIG_SYS_RV3029_TCR CONFIG_SYS_RV3029_TCR