diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2021-02-01 00:01:39 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2021-02-01 00:01:39 +0000 |
| commit | be9bde5a8b7b5cff58bd01c8ca094d571295c40b (patch) | |
| tree | 000752cf6a99660b0a10ef4e8a8dcd3c2bcd43d4 | |
| parent | 3ee6d1b962983976c088a87c931a2d4b6253ba13 (diff) | |
Revert "rtc: mc146818: Detect and handle broken RTCs"
This reverts commit 211e5db19d15a721b2953ea54b8f26c2963720eb.
| -rw-r--r-- | drivers/rtc/rtc-cmos.c | 8 | ||||
| -rw-r--r-- | drivers/rtc/rtc-mc146818-lib.c | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 68a9ac6f2fe1..51e80bc70d42 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -805,14 +805,6 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) spin_lock_irq(&rtc_lock); - /* Ensure that the RTC is accessible. Bit 0-6 must be 0! */ - if ((CMOS_READ(RTC_VALID) & 0x7f) != 0) { - spin_unlock_irq(&rtc_lock); - dev_warn(dev, "not accessible\n"); - retval = -ENXIO; - goto cleanup1; - } - if (!(flags & CMOS_RTC_FLAGS_NOFREQ)) { /* force periodic irq to CMOS reset default of 1024Hz; * diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c index f83c13818af3..972a5b9a629d 100644 --- a/drivers/rtc/rtc-mc146818-lib.c +++ b/drivers/rtc/rtc-mc146818-lib.c @@ -21,13 +21,6 @@ unsigned int mc146818_get_time(struct rtc_time *time) again: spin_lock_irqsave(&rtc_lock, flags); - /* Ensure that the RTC is accessible. Bit 0-6 must be 0! */ - if (WARN_ON_ONCE((CMOS_READ(RTC_VALID) & 0x7f) != 0)) { - spin_unlock_irqrestore(&rtc_lock, flags); - memset(time, 0xff, sizeof(*time)); - return 0; - } - /* * Check whether there is an update in progress during which the * readout is unspecified. The maximum update time is ~2ms. Poll |