diff options
Diffstat (limited to 'drivers/rtc/rtc-rk808.c')
-rw-r--r-- | drivers/rtc/rtc-rk808.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/drivers/rtc/rtc-rk808.c b/drivers/rtc/rtc-rk808.c index 739c0d42e835..1fb864d4ef83 100644 --- a/drivers/rtc/rtc-rk808.c +++ b/drivers/rtc/rtc-rk808.c | |||
@@ -138,9 +138,7 @@ static int rk808_rtc_readtime(struct device *dev, struct rtc_time *tm) | |||
138 | tm->tm_year = (bcd2bin(rtc_data[5] & YEARS_REG_MSK)) + 100; | 138 | tm->tm_year = (bcd2bin(rtc_data[5] & YEARS_REG_MSK)) + 100; |
139 | tm->tm_wday = bcd2bin(rtc_data[6] & WEEKS_REG_MSK); | 139 | tm->tm_wday = bcd2bin(rtc_data[6] & WEEKS_REG_MSK); |
140 | rockchip_to_gregorian(tm); | 140 | rockchip_to_gregorian(tm); |
141 | dev_dbg(dev, "RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n", | 141 | dev_dbg(dev, "RTC date/time %ptRd(%d) %ptRt\n", tm, tm->tm_wday, tm); |
142 | 1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday, | ||
143 | tm->tm_wday, tm->tm_hour, tm->tm_min, tm->tm_sec); | ||
144 | 142 | ||
145 | return ret; | 143 | return ret; |
146 | } | 144 | } |
@@ -153,9 +151,7 @@ static int rk808_rtc_set_time(struct device *dev, struct rtc_time *tm) | |||
153 | u8 rtc_data[NUM_TIME_REGS]; | 151 | u8 rtc_data[NUM_TIME_REGS]; |
154 | int ret; | 152 | int ret; |
155 | 153 | ||
156 | dev_dbg(dev, "set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n", | 154 | dev_dbg(dev, "set RTC date/time %ptRd(%d) %ptRt\n", tm, tm->tm_wday, tm); |
157 | 1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday, | ||
158 | tm->tm_wday, tm->tm_hour, tm->tm_min, tm->tm_sec); | ||
159 | gregorian_to_rockchip(tm); | 155 | gregorian_to_rockchip(tm); |
160 | rtc_data[0] = bin2bcd(tm->tm_sec); | 156 | rtc_data[0] = bin2bcd(tm->tm_sec); |
161 | rtc_data[1] = bin2bcd(tm->tm_min); | 157 | rtc_data[1] = bin2bcd(tm->tm_min); |
@@ -216,10 +212,8 @@ static int rk808_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
216 | return ret; | 212 | return ret; |
217 | } | 213 | } |
218 | 214 | ||
219 | dev_dbg(dev, "alrm read RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n", | 215 | dev_dbg(dev, "alrm read RTC date/time %ptRd(%d) %ptRt\n", |
220 | 1900 + alrm->time.tm_year, alrm->time.tm_mon + 1, | 216 | &alrm->time, alrm->time.tm_wday, &alrm->time); |
221 | alrm->time.tm_mday, alrm->time.tm_wday, alrm->time.tm_hour, | ||
222 | alrm->time.tm_min, alrm->time.tm_sec); | ||
223 | 217 | ||
224 | alrm->enabled = (int_reg & BIT_RTC_INTERRUPTS_REG_IT_ALARM_M) ? 1 : 0; | 218 | alrm->enabled = (int_reg & BIT_RTC_INTERRUPTS_REG_IT_ALARM_M) ? 1 : 0; |
225 | 219 | ||
@@ -261,10 +255,8 @@ static int rk808_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
261 | dev_err(dev, "Failed to stop alarm: %d\n", ret); | 255 | dev_err(dev, "Failed to stop alarm: %d\n", ret); |
262 | return ret; | 256 | return ret; |
263 | } | 257 | } |
264 | dev_dbg(dev, "alrm set RTC date/time %4d-%02d-%02d(%d) %02d:%02d:%02d\n", | 258 | dev_dbg(dev, "alrm set RTC date/time %ptRd(%d) %ptRt\n", |
265 | 1900 + alrm->time.tm_year, alrm->time.tm_mon + 1, | 259 | &alrm->time, alrm->time.tm_wday, &alrm->time); |
266 | alrm->time.tm_mday, alrm->time.tm_wday, alrm->time.tm_hour, | ||
267 | alrm->time.tm_min, alrm->time.tm_sec); | ||
268 | 260 | ||
269 | gregorian_to_rockchip(&alrm->time); | 261 | gregorian_to_rockchip(&alrm->time); |
270 | alrm_data[0] = bin2bcd(alrm->time.tm_sec); | 262 | alrm_data[0] = bin2bcd(alrm->time.tm_sec); |
@@ -400,7 +392,7 @@ static int rk808_rtc_probe(struct platform_device *pdev) | |||
400 | if (ret) { | 392 | if (ret) { |
401 | dev_err(&pdev->dev, | 393 | dev_err(&pdev->dev, |
402 | "Failed to write RTC status: %d\n", ret); | 394 | "Failed to write RTC status: %d\n", ret); |
403 | return ret; | 395 | return ret; |
404 | } | 396 | } |
405 | 397 | ||
406 | device_init_wakeup(&pdev->dev, 1); | 398 | device_init_wakeup(&pdev->dev, 1); |