Skip to content

L
linux
Commit c6af561a authored by Thierry Reding's avatar Thierry Reding Committed by Alexandre Belloni
Browse files
Options

rtc: tegra: Use consistent variable names and types 

Many of the variables have redundant prefixes or suffixes. Drop all of
them where not necessary for context. Also make sure to use data types
consistently. For instance, values read from 32-bit register accessors
should be stored in u32.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent a2d29238
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 60 deletions
drivers/rtc/rtc-tegra.c
View file @ c6af561a
...@@ -47,11 +47,11 @@ ...@@ -47,11 +47,11 @@
struct tegra_rtc_info { struct tegra_rtc_info {
struct platform_device *pdev; struct platform_device *pdev;
struct rtc_device *rtc_dev; struct rtc_device *rtc;
void __iomem *rtc_base; /* NULL if not initialized */ void __iomem *base; /* NULL if not initialized */
struct clk *clk; struct clk *clk;
int tegra_rtc_irq; /* alarm and periodic IRQ */ int irq; /* alarm and periodic IRQ */
spinlock_t tegra_rtc_lock; spinlock_t lock;
}; };
/* /*
...@@ -61,7 +61,7 @@ struct tegra_rtc_info { ...@@ -61,7 +61,7 @@ struct tegra_rtc_info {
*/ */
static inline u32 tegra_rtc_check_busy(struct tegra_rtc_info *info) static inline u32 tegra_rtc_check_busy(struct tegra_rtc_info *info)
{ {
return readl(info->rtc_base + TEGRA_RTC_REG_BUSY) & 1; return readl(info->base + TEGRA_RTC_REG_BUSY) & 1;
} }
/* /*
...@@ -102,19 +102,19 @@ static int tegra_rtc_wait_while_busy(struct device *dev) ...@@ -102,19 +102,19 @@ static int tegra_rtc_wait_while_busy(struct device *dev)
static int tegra_rtc_read_time(struct device *dev, struct rtc_time *tm) static int tegra_rtc_read_time(struct device *dev, struct rtc_time *tm)
{ {
struct tegra_rtc_info *info = dev_get_drvdata(dev); struct tegra_rtc_info *info = dev_get_drvdata(dev);
unsigned long sec, msec; unsigned long flags;
unsigned long sl_irq_flags; u32 sec, msec;
/* /*
* RTC hardware copies seconds to shadow seconds when a read of * RTC hardware copies seconds to shadow seconds when a read of
* milliseconds occurs. use a lock to keep other threads out. * milliseconds occurs. use a lock to keep other threads out.
*/ */
spin_lock_irqsave(&info->tegra_rtc_lock, sl_irq_flags); spin_lock_irqsave(&info->lock, flags);
msec = readl(info->rtc_base + TEGRA_RTC_REG_MILLI_SECONDS); msec = readl(info->base + TEGRA_RTC_REG_MILLI_SECONDS);
sec = readl(info->rtc_base + TEGRA_RTC_REG_SHADOW_SECONDS); sec = readl(info->base + TEGRA_RTC_REG_SHADOW_SECONDS);
spin_unlock_irqrestore(&info->tegra_rtc_lock, sl_irq_flags); spin_unlock_irqrestore(&info->lock, flags);
rtc_time64_to_tm(sec, tm); rtc_time64_to_tm(sec, tm);
...@@ -126,7 +126,7 @@ static int tegra_rtc_read_time(struct device *dev, struct rtc_time *tm) ...@@ -126,7 +126,7 @@ static int tegra_rtc_read_time(struct device *dev, struct rtc_time *tm)
static int tegra_rtc_set_time(struct device *dev, struct rtc_time *tm) static int tegra_rtc_set_time(struct device *dev, struct rtc_time *tm)
{ {
struct tegra_rtc_info *info = dev_get_drvdata(dev); struct tegra_rtc_info *info = dev_get_drvdata(dev);
unsigned long sec; u32 sec;
int ret; int ret;
/* convert tm to seconds */ /* convert tm to seconds */
...@@ -137,10 +137,10 @@ static int tegra_rtc_set_time(struct device *dev, struct rtc_time *tm) ...@@ -137,10 +137,10 @@ static int tegra_rtc_set_time(struct device *dev, struct rtc_time *tm)
/* seconds only written if wait succeeded */ /* seconds only written if wait succeeded */
ret = tegra_rtc_wait_while_busy(dev); ret = tegra_rtc_wait_while_busy(dev);
if (!ret) if (!ret)
writel(sec, info->rtc_base + TEGRA_RTC_REG_SECONDS); writel(sec, info->base + TEGRA_RTC_REG_SECONDS);
dev_vdbg(dev, "time read back as %d\n", dev_vdbg(dev, "time read back as %d\n",
readl(info->rtc_base + TEGRA_RTC_REG_SECONDS)); readl(info->base + TEGRA_RTC_REG_SECONDS));
return ret; return ret;
} }
...@@ -148,10 +148,9 @@ static int tegra_rtc_set_time(struct device *dev, struct rtc_time *tm) ...@@ -148,10 +148,9 @@ static int tegra_rtc_set_time(struct device *dev, struct rtc_time *tm)
static int tegra_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) static int tegra_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{ {
struct tegra_rtc_info *info = dev_get_drvdata(dev); struct tegra_rtc_info *info = dev_get_drvdata(dev);
unsigned long sec; u32 sec, value;
unsigned int tmp;
sec = readl(info->rtc_base + TEGRA_RTC_REG_SECONDS_ALARM0); sec = readl(info->base + TEGRA_RTC_REG_SECONDS_ALARM0);
if (sec == 0) { if (sec == 0) {
/* alarm is disabled */ /* alarm is disabled */
...@@ -162,8 +161,8 @@ static int tegra_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) ...@@ -162,8 +161,8 @@ static int tegra_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
rtc_time64_to_tm(sec, &alarm->time); rtc_time64_to_tm(sec, &alarm->time);
} }
tmp = readl(info->rtc_base + TEGRA_RTC_REG_INTR_STATUS); value = readl(info->base + TEGRA_RTC_REG_INTR_STATUS);
alarm->pending = (tmp & TEGRA_RTC_INTR_STATUS_SEC_ALARM0) != 0; alarm->pending = (value & TEGRA_RTC_INTR_STATUS_SEC_ALARM0) != 0;
return 0; return 0;
} }
...@@ -171,22 +170,22 @@ static int tegra_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) ...@@ -171,22 +170,22 @@ static int tegra_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
static int tegra_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) static int tegra_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
{ {
struct tegra_rtc_info *info = dev_get_drvdata(dev); struct tegra_rtc_info *info = dev_get_drvdata(dev);
unsigned long sl_irq_flags; unsigned long flags;
unsigned int status; u32 status;
tegra_rtc_wait_while_busy(dev); tegra_rtc_wait_while_busy(dev);
spin_lock_irqsave(&info->tegra_rtc_lock, sl_irq_flags); spin_lock_irqsave(&info->lock, flags);
/* read the original value, and OR in the flag */ /* read the original value, and OR in the flag */
status = readl(info->rtc_base + TEGRA_RTC_REG_INTR_MASK); status = readl(info->base + TEGRA_RTC_REG_INTR_MASK);
if (enabled) if (enabled)
status |= TEGRA_RTC_INTR_MASK_SEC_ALARM0; /* set it */ status |= TEGRA_RTC_INTR_MASK_SEC_ALARM0; /* set it */
else else
status &= ~TEGRA_RTC_INTR_MASK_SEC_ALARM0; /* clear it */ status &= ~TEGRA_RTC_INTR_MASK_SEC_ALARM0; /* clear it */
writel(status, info->rtc_base + TEGRA_RTC_REG_INTR_MASK); writel(status, info->base + TEGRA_RTC_REG_INTR_MASK);
spin_unlock_irqrestore(&info->tegra_rtc_lock, sl_irq_flags); spin_unlock_irqrestore(&info->lock, flags);
return 0; return 0;
} }
...@@ -194,7 +193,7 @@ static int tegra_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) ...@@ -194,7 +193,7 @@ static int tegra_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
static int tegra_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) static int tegra_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{ {
struct tegra_rtc_info *info = dev_get_drvdata(dev); struct tegra_rtc_info *info = dev_get_drvdata(dev);
unsigned long sec; u32 sec;
if (alarm->enabled) if (alarm->enabled)
sec = rtc_tm_to_time64(&alarm->time); sec = rtc_tm_to_time64(&alarm->time);
...@@ -202,9 +201,9 @@ static int tegra_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) ...@@ -202,9 +201,9 @@ static int tegra_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
sec = 0; sec = 0;
tegra_rtc_wait_while_busy(dev); tegra_rtc_wait_while_busy(dev);
writel(sec, info->rtc_base + TEGRA_RTC_REG_SECONDS_ALARM0); writel(sec, info->base + TEGRA_RTC_REG_SECONDS_ALARM0);
dev_vdbg(dev, "alarm read back as %d\n", dev_vdbg(dev, "alarm read back as %d\n",
readl(info->rtc_base + TEGRA_RTC_REG_SECONDS_ALARM0)); readl(info->base + TEGRA_RTC_REG_SECONDS_ALARM0));
/* if successfully written and alarm is enabled ... */ /* if successfully written and alarm is enabled ... */
if (sec) { if (sec) {
...@@ -233,19 +232,18 @@ static irqreturn_t tegra_rtc_irq_handler(int irq, void *data) ...@@ -233,19 +232,18 @@ static irqreturn_t tegra_rtc_irq_handler(int irq, void *data)
{ {
struct device *dev = data; struct device *dev = data;
struct tegra_rtc_info *info = dev_get_drvdata(dev); struct tegra_rtc_info *info = dev_get_drvdata(dev);
unsigned long events = 0; unsigned long events = 0, flags;
unsigned long sl_irq_flags; u32 status;
unsigned int status;
status = readl(info->rtc_base + TEGRA_RTC_REG_INTR_STATUS); status = readl(info->base + TEGRA_RTC_REG_INTR_STATUS);
if (status) { if (status) {
/* clear the interrupt masks and status on any IRQ */ /* clear the interrupt masks and status on any IRQ */
tegra_rtc_wait_while_busy(dev); tegra_rtc_wait_while_busy(dev);
spin_lock_irqsave(&info->tegra_rtc_lock, sl_irq_flags); spin_lock_irqsave(&info->lock, flags);
writel(0, info->rtc_base + TEGRA_RTC_REG_INTR_MASK); writel(0, info->base + TEGRA_RTC_REG_INTR_MASK);
writel(status, info->rtc_base + TEGRA_RTC_REG_INTR_STATUS); writel(status, info->base + TEGRA_RTC_REG_INTR_STATUS);
spin_unlock_irqrestore(&info->tegra_rtc_lock, sl_irq_flags); spin_unlock_irqrestore(&info->lock, flags);
} }
/* check if alarm */ /* check if alarm */
...@@ -256,7 +254,7 @@ static irqreturn_t tegra_rtc_irq_handler(int irq, void *data) ...@@ -256,7 +254,7 @@ static irqreturn_t tegra_rtc_irq_handler(int irq, void *data)
if (status & TEGRA_RTC_INTR_STATUS_SEC_CDN_ALARM) if (status & TEGRA_RTC_INTR_STATUS_SEC_CDN_ALARM)
events |= RTC_IRQF | RTC_PF; events |= RTC_IRQF | RTC_PF;
rtc_update_irq(info->rtc_dev, 1, events); rtc_update_irq(info->rtc, 1, events);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -287,9 +285,9 @@ static int __init tegra_rtc_probe(struct platform_device *pdev) ...@@ -287,9 +285,9 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
info->rtc_base = devm_ioremap_resource(&pdev->dev, res); info->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(info->rtc_base)) if (IS_ERR(info->base))
return PTR_ERR(info->rtc_base); return PTR_ERR(info->base);
ret = platform_get_irq(pdev, 0); ret = platform_get_irq(pdev, 0);
if (ret <= 0) { if (ret <= 0) {
...@@ -297,14 +295,14 @@ static int __init tegra_rtc_probe(struct platform_device *pdev) ...@@ -297,14 +295,14 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)
return ret; return ret;
} }
info->tegra_rtc_irq = ret; info->irq = ret;
info->rtc_dev = devm_rtc_allocate_device(&pdev->dev); info->rtc = devm_rtc_allocate_device(&pdev->dev);
if (IS_ERR(info->rtc_dev)) if (IS_ERR(info->rtc))
return PTR_ERR(info->rtc_dev); return PTR_ERR(info->rtc);
info->rtc_dev->ops = &tegra_rtc_ops; info->rtc->ops = &tegra_rtc_ops;
info->rtc_dev->range_max = U32_MAX; info->rtc->range_max = U32_MAX;
info->clk = devm_clk_get(&pdev->dev, NULL); info->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(info->clk)) if (IS_ERR(info->clk))
...@@ -316,26 +314,26 @@ static int __init tegra_rtc_probe(struct platform_device *pdev) ...@@ -316,26 +314,26 @@ static int __init tegra_rtc_probe(struct platform_device *pdev)
/* set context info */ /* set context info */
info->pdev = pdev; info->pdev = pdev;
spin_lock_init(&info->tegra_rtc_lock); spin_lock_init(&info->lock);
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
/* clear out the hardware */ /* clear out the hardware */
writel(0, info->rtc_base + TEGRA_RTC_REG_SECONDS_ALARM0); writel(0, info->base + TEGRA_RTC_REG_SECONDS_ALARM0);
writel(0xffffffff, info->rtc_base + TEGRA_RTC_REG_INTR_STATUS); writel(0xffffffff, info->base + TEGRA_RTC_REG_INTR_STATUS);
writel(0, info->rtc_base + TEGRA_RTC_REG_INTR_MASK); writel(0, info->base + TEGRA_RTC_REG_INTR_MASK);
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
ret = devm_request_irq(&pdev->dev, info->tegra_rtc_irq, ret = devm_request_irq(&pdev->dev, info->irq, tegra_rtc_irq_handler,
tegra_rtc_irq_handler, IRQF_TRIGGER_HIGH, IRQF_TRIGGER_HIGH, dev_name(&pdev->dev),
dev_name(&pdev->dev), &pdev->dev); &pdev->dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to request interrupt: %d\n", ret); dev_err(&pdev->dev, "failed to request interrupt: %d\n", ret);
goto disable_clk; goto disable_clk;
} }
ret = rtc_register_device(info->rtc_dev); ret = rtc_register_device(info->rtc);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register device: %d\n", ret); dev_err(&pdev->dev, "failed to register device: %d\n", ret);
goto disable_clk; goto disable_clk;
...@@ -367,19 +365,19 @@ static int tegra_rtc_suspend(struct device *dev) ...@@ -367,19 +365,19 @@ static int tegra_rtc_suspend(struct device *dev)
tegra_rtc_wait_while_busy(dev); tegra_rtc_wait_while_busy(dev);
/* only use ALARM0 as a wake source */ /* only use ALARM0 as a wake source */
writel(0xffffffff, info->rtc_base + TEGRA_RTC_REG_INTR_STATUS); writel(0xffffffff, info->base + TEGRA_RTC_REG_INTR_STATUS);
writel(TEGRA_RTC_INTR_STATUS_SEC_ALARM0, writel(TEGRA_RTC_INTR_STATUS_SEC_ALARM0,
info->rtc_base + TEGRA_RTC_REG_INTR_MASK); info->base + TEGRA_RTC_REG_INTR_MASK);
dev_vdbg(dev, "alarm sec = %d\n", dev_vdbg(dev, "alarm sec = %d\n",
readl(info->rtc_base + TEGRA_RTC_REG_SECONDS_ALARM0)); readl(info->base + TEGRA_RTC_REG_SECONDS_ALARM0));
dev_vdbg(dev, "Suspend (device_may_wakeup=%d) IRQ:%d\n", dev_vdbg(dev, "Suspend (device_may_wakeup=%d) IRQ:%d\n",
device_may_wakeup(dev), info->tegra_rtc_irq); device_may_wakeup(dev), info->irq);
/* leave the alarms on as a wake source */ /* leave the alarms on as a wake source */
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
enable_irq_wake(info->tegra_rtc_irq); enable_irq_wake(info->irq);
return 0; return 0;
} }
...@@ -393,7 +391,7 @@ static int tegra_rtc_resume(struct device *dev) ...@@ -393,7 +391,7 @@ static int tegra_rtc_resume(struct device *dev)
/* alarms were left on as a wake source, turn them off */ /* alarms were left on as a wake source, turn them off */
if (device_may_wakeup(dev)) if (device_may_wakeup(dev))
disable_irq_wake(info->tegra_rtc_irq); disable_irq_wake(info->irq);
return 0; return 0;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7