Commit 9291e340 authored by Johan Hovold's avatar Johan Hovold Committed by Linus Torvalds

rtc: omap: silence bogus power-up reset message at probe

Some legacy RTC IP revisions has a power-up reset flag in the status
register that later revisions lack.

As this flag is always read back as set on later revisions (or is
overloaded with a different flag), make sure to only clear the flag and
print the info message on legacy platforms.
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Benot Cousson <bcousson@baylibre.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Keerthy J <j-keerthy@ti.com>
Tested-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2153f949
...@@ -106,6 +106,7 @@ struct omap_rtc_device_type { ...@@ -106,6 +106,7 @@ struct omap_rtc_device_type {
bool has_32kclk_en; bool has_32kclk_en;
bool has_kicker; bool has_kicker;
bool has_irqwakeen; bool has_irqwakeen;
bool has_power_up_reset;
}; };
struct omap_rtc { struct omap_rtc {
...@@ -346,6 +347,7 @@ static struct rtc_class_ops omap_rtc_ops = { ...@@ -346,6 +347,7 @@ static struct rtc_class_ops omap_rtc_ops = {
}; };
static const struct omap_rtc_device_type omap_rtc_default_type = { static const struct omap_rtc_device_type omap_rtc_default_type = {
.has_power_up_reset = true,
}; };
static const struct omap_rtc_device_type omap_rtc_am3352_type = { static const struct omap_rtc_device_type omap_rtc_am3352_type = {
...@@ -391,7 +393,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev) ...@@ -391,7 +393,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
{ {
struct omap_rtc *rtc; struct omap_rtc *rtc;
struct resource *res; struct resource *res;
u8 reg, new_ctrl; u8 reg, mask, new_ctrl;
const struct platform_device_id *id_entry; const struct platform_device_id *id_entry;
const struct of_device_id *of_id; const struct of_device_id *of_id;
int ret; int ret;
...@@ -448,12 +450,17 @@ static int __init omap_rtc_probe(struct platform_device *pdev) ...@@ -448,12 +450,17 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
/* clear old status */ /* clear old status */
reg = rtc_read(rtc, OMAP_RTC_STATUS_REG); reg = rtc_read(rtc, OMAP_RTC_STATUS_REG);
if (reg & (u8) OMAP_RTC_STATUS_POWER_UP) {
dev_info(&pdev->dev, "RTC power up reset detected\n"); mask = OMAP_RTC_STATUS_ALARM;
rtc_write(rtc, OMAP_RTC_STATUS_REG, OMAP_RTC_STATUS_POWER_UP);
if (rtc->type->has_power_up_reset) {
mask |= OMAP_RTC_STATUS_POWER_UP;
if (reg & OMAP_RTC_STATUS_POWER_UP)
dev_info(&pdev->dev, "RTC power up reset detected\n");
} }
if (reg & (u8) OMAP_RTC_STATUS_ALARM)
rtc_write(rtc, OMAP_RTC_STATUS_REG, OMAP_RTC_STATUS_ALARM); if (reg & mask)
rtc_write(rtc, OMAP_RTC_STATUS_REG, reg & mask);
/* On boards with split power, RTC_ON_NOFF won't reset the RTC */ /* On boards with split power, RTC_ON_NOFF won't reset the RTC */
reg = rtc_read(rtc, OMAP_RTC_CTRL_REG); reg = rtc_read(rtc, OMAP_RTC_CTRL_REG);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment