diff options
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/rtc/ds1672.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/max313xx.c | 1 | ||||
| -rw-r--r-- | drivers/rtc/mc146818.c | 4 | ||||
| -rw-r--r-- | drivers/rtc/pl031.c | 4 |
5 files changed, 7 insertions, 6 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 79b879d68d1..ed903999f06 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -218,7 +218,7 @@ config RTC_PL031 config RTC_MV bool "Enable Marvell RTC driver" - depends on DM_RTC + depends on DM_RTC && ARCH_KIRKWOOD help Enable Marvell RTC driver. This driver supports the rtc that is present on some Marvell SoCs. diff --git a/drivers/rtc/ds1672.c b/drivers/rtc/ds1672.c index 4705e5abc93..651b1dc950f 100644 --- a/drivers/rtc/ds1672.c +++ b/drivers/rtc/ds1672.c @@ -108,7 +108,7 @@ static const struct udevice_id ds1672_of_id[] = { { } }; -U_BOOT_DRIVER(rtc_max313xx) = { +U_BOOT_DRIVER(rtc_ds1672) = { .name = "rtc-ds1672", .id = UCLASS_RTC, .probe = ds1672_probe, diff --git a/drivers/rtc/max313xx.c b/drivers/rtc/max313xx.c index 2cb3f245041..f0d38b10c97 100644 --- a/drivers/rtc/max313xx.c +++ b/drivers/rtc/max313xx.c @@ -308,6 +308,7 @@ static int max313xx_set_time(struct udevice *dev, const struct rtc_time *t) return ret; break; + case ID_MAX31331: case ID_MAX31343: /* Time is not updated for 1 second after writing */ /* Sleep here so the date command shows the new time */ diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c index c0d86c6d063..08bc528aeaf 100644 --- a/drivers/rtc/mc146818.c +++ b/drivers/rtc/mc146818.c @@ -11,9 +11,9 @@ #include <command.h> #include <dm.h> #include <rtc.h> - -#if defined(CONFIG_X86) || defined(CONFIG_TARGET_MALTA) #include <asm/io.h> + +#if !defined(CONFIG_PPC) #define in8(p) inb(p) #define out8(p, v) outb(v, p) #endif diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c index 855ee913416..6f189bc503e 100644 --- a/drivers/rtc/pl031.c +++ b/drivers/rtc/pl031.c @@ -39,11 +39,11 @@ static inline u32 pl031_read_reg(struct udevice *dev, int reg) return readl(pdata->base + reg); } -static inline u32 pl031_write_reg(struct udevice *dev, int reg, u32 value) +static inline void pl031_write_reg(struct udevice *dev, int reg, u32 value) { struct pl031_plat *pdata = dev_get_plat(dev); - return writel(value, pdata->base + reg); + writel(value, pdata->base + reg); } /* |