rtc: remove __raw_* accessors from PL031 RTC
This switches __raw_[read|write]l() for plain [read|write]l in the PL031 RTC driver. The sister driver for PL030 use the simple accessors as most PrimeCell drivers. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
1ce7c83fa9
commit
2934d6a859
|
@ -51,10 +51,10 @@ static int pl031_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case RTC_AIE_OFF:
|
case RTC_AIE_OFF:
|
||||||
__raw_writel(1, ldata->base + RTC_MIS);
|
writel(1, ldata->base + RTC_MIS);
|
||||||
return 0;
|
return 0;
|
||||||
case RTC_AIE_ON:
|
case RTC_AIE_ON:
|
||||||
__raw_writel(0, ldata->base + RTC_MIS);
|
writel(0, ldata->base + RTC_MIS);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ static int pl031_read_time(struct device *dev, struct rtc_time *tm)
|
||||||
{
|
{
|
||||||
struct pl031_local *ldata = dev_get_drvdata(dev);
|
struct pl031_local *ldata = dev_get_drvdata(dev);
|
||||||
|
|
||||||
rtc_time_to_tm(__raw_readl(ldata->base + RTC_DR), tm);
|
rtc_time_to_tm(readl(ldata->base + RTC_DR), tm);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ static int pl031_set_time(struct device *dev, struct rtc_time *tm)
|
||||||
struct pl031_local *ldata = dev_get_drvdata(dev);
|
struct pl031_local *ldata = dev_get_drvdata(dev);
|
||||||
|
|
||||||
rtc_tm_to_time(tm, &time);
|
rtc_tm_to_time(tm, &time);
|
||||||
__raw_writel(time, ldata->base + RTC_LR);
|
writel(time, ldata->base + RTC_LR);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -85,9 +85,9 @@ static int pl031_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
|
||||||
{
|
{
|
||||||
struct pl031_local *ldata = dev_get_drvdata(dev);
|
struct pl031_local *ldata = dev_get_drvdata(dev);
|
||||||
|
|
||||||
rtc_time_to_tm(__raw_readl(ldata->base + RTC_MR), &alarm->time);
|
rtc_time_to_tm(readl(ldata->base + RTC_MR), &alarm->time);
|
||||||
alarm->pending = __raw_readl(ldata->base + RTC_RIS);
|
alarm->pending = readl(ldata->base + RTC_RIS);
|
||||||
alarm->enabled = __raw_readl(ldata->base + RTC_IMSC);
|
alarm->enabled = readl(ldata->base + RTC_IMSC);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -99,8 +99,8 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
|
||||||
|
|
||||||
rtc_tm_to_time(&alarm->time, &time);
|
rtc_tm_to_time(&alarm->time, &time);
|
||||||
|
|
||||||
__raw_writel(time, ldata->base + RTC_MR);
|
writel(time, ldata->base + RTC_MR);
|
||||||
__raw_writel(!alarm->enabled, ldata->base + RTC_MIS);
|
writel(!alarm->enabled, ldata->base + RTC_MIS);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -180,8 +180,9 @@ err_req:
|
||||||
|
|
||||||
static struct amba_id pl031_ids[] __initdata = {
|
static struct amba_id pl031_ids[] __initdata = {
|
||||||
{
|
{
|
||||||
.id = 0x00041031,
|
.id = 0x00041031,
|
||||||
.mask = 0x000fffff, },
|
.mask = 0x000fffff,
|
||||||
|
},
|
||||||
{0, 0},
|
{0, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue