libfdt: move working_fdt and FDT_RAMDISK_OVERHEAD to include/libfdt.h

[u-boot] / drivers / rtc / mc146818.c

diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index 363ade33e320a10a98911329efe32633fcca70d3..21705c84782f15a868289aeb0a1c74d5b1a36052 100644 (file)
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -14,7 +14,7 @@
 #include <dm.h>
 #include <rtc.h>
 
-#if defined(__I386__) || defined(CONFIG_MALTA)
+#if defined(CONFIG_X86) || defined(CONFIG_MALTA)
 #include <asm/io.h>
 #define in8(p) inb(p)
 #define out8(p, v) outb(v, p)
@@ -100,7 +100,7 @@ static int mc146818_get(struct rtc_time *tmp)
 #ifdef RTC_DEBUG
        printf("Get RTC year: %02x mon/cent: %02x mday: %02x wday: %02x hr: %02x min: %02x sec: %02x\n",
               year, mon, mday, wday, hour, min, sec);
-       printf("Alarms: month: %02x hour: %02x min: %02x sec: %02x\n",
+       printf("Alarms: mday: %02x hour: %02x min: %02x sec: %02x\n",
               mc146818_read8(RTC_CONFIG_D) & 0x3f,
               mc146818_read8(RTC_HOURS_ALARM),
               mc146818_read8(RTC_MINUTES_ALARM),
@@ -192,7 +192,7 @@ static void mc146818_init(void)
        /* Clear any pending interrupts */
        mc146818_read8(RTC_CONFIG_C);
 }
-#endif
+#endif /* CONFIG_CMD_DATE */
 
 #ifdef CONFIG_DM_RTC
 
@@ -225,7 +225,7 @@ static int rtc_mc146818_write8(struct udevice *dev, unsigned int reg, int val)
        return 0;
 }
 
-static int rtc_mc146818_bind(struct udevice *dev)
+static int rtc_mc146818_probe(struct udevice *dev)
 {
        mc146818_init();
 
@@ -249,7 +249,7 @@ U_BOOT_DRIVER(rtc_mc146818) = {
        .name = "rtc_mc146818",
        .id = UCLASS_RTC,
        .of_match = rtc_mc146818_ids,
-       .bind = rtc_mc146818_bind,
+       .probe = rtc_mc146818_probe,
        .ops = &rtc_mc146818_ops,
 };