rtc: mpc5121: simplify probe
Alexandre Belloni
maintainerPATCH 1/4 rtc: mpc5121: simplify probe
Use devm managed function to simplify probe and remove.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-mpc5121.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
drivers/rtc/rtc-mpc5121.c +8 -14
@@ -315,8 +315,8 @@ static int mpc5121_rtc_probe(struct platform_device *op)if (!rtc)return -ENOMEM ; - rtc->regs =of_iomap (op->dev.of_node,0 ); -if (!rtc->regs) { + rtc->regs =devm_platform_ioremap_resource (op,0 ); +if (IS_ERR (rtc->regs)) {dev_err (&op->dev,"%s: couldn't map io space\n" , __func__);return -ENOSYS ; }
@@ -326,8 +326,8 @@ static int mpc5121_rtc_probe(struct platform_device *op)platform_set_drvdata (op, rtc); rtc->irq =irq_of_parse_and_map (op->dev.of_node,1 ); - err =request_irq (rtc->irq, mpc5121_rtc_handler,0 , -"mpc5121-rtc" , &op->dev); + err =devm_request_irq (&op->dev, rtc->irq, mpc5121_rtc_handler,0 , +"mpc5121-rtc" , &op->dev);if (err) {dev_err (&op->dev,"%s: could not request irq: %i\n" , __func__, rtc->irq);
@@ -335,8 +335,9 @@ static int mpc5121_rtc_probe(struct platform_device *op) } rtc->irq_periodic =irq_of_parse_and_map (op->dev.of_node,0 ); - err =request_irq (rtc->irq_periodic, mpc5121_rtc_handler_upd, -0 ,"mpc5121-rtc_upd" , &op->dev); + err =devm_request_irq (&op->dev, rtc->irq_periodic, + mpc5121_rtc_handler_upd,0 ,"mpc5121-rtc_upd" , + &op->dev);if (err) {dev_err (&op->dev,"%s: could not request irq: %i\n" , __func__, rtc->irq_periodic);
@@ -361,20 +362,16 @@ static int mpc5121_rtc_probe(struct platform_device *op)if (IS_ERR (rtc->rtc)) { err =PTR_ERR (rtc->rtc); - goto out_free_irq; + goto out_dispose2; } rtc->rtc->uie_unsupported =1 ;return 0 ; -out_free_irq: -free_irq (rtc->irq_periodic, &op->dev); out_dispose2:irq_dispose_mapping (rtc->irq_periodic); -free_irq (rtc->irq, &op->dev); out_dispose:irq_dispose_mapping (rtc->irq); -iounmap (rtc->regs);return err; }
@@ -388,9 +385,6 @@ static int mpc5121_rtc_remove(struct platform_device *op)out_8 (®s->alm_enable,0 );out_8 (®s->int_enable,in_8 (®s->int_enable) & ~0x1 ); -iounmap (rtc->regs); -free_irq (rtc->irq, &op->dev); -free_irq (rtc->irq_periodic, &op->dev);irq_dispose_mapping (rtc->irq);irq_dispose_mapping (rtc->irq_periodic);
Signature · 1 line
2.24.1
Alexandre Belloni
maintainerPATCH 2/4 rtc: mpc5121: convert to devm_rtc_allocate_device
This simplifies the path for the rtc_ops selection.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-mpc5121.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/rtc/rtc-mpc5121.c +12 -10
@@ -344,6 +344,15 @@ static int mpc5121_rtc_probe(struct platform_device *op) goto out_dispose2; } + rtc->rtc =devm_rtc_allocate_device (&op->dev); +if (IS_ERR (rtc->rtc)) { + err =PTR_ERR (rtc->rtc); + goto out_dispose2; + } + + rtc->rtc->ops = &mpc5200_rtc_ops; + rtc->rtc->uie_unsupported =1 ; +if (of_device_is_compatible (op->dev.of_node,"fsl,mpc5121-rtc" )) {u32 ka; ka =in_be32 (&rtc->regs->keep_alive);
@@ -352,19 +361,12 @@ static int mpc5121_rtc_probe(struct platform_device *op) "mpc5121-rtc: Battery or oscillator failure!\n");out_be32 (&rtc->regs->keep_alive, ka); } - - rtc->rtc =devm_rtc_device_register (&op->dev,"mpc5121-rtc" , - &mpc5121_rtc_ops,THIS_MODULE ); - }else { - rtc->rtc =devm_rtc_device_register (&op->dev,"mpc5200-rtc" , - &mpc5200_rtc_ops,THIS_MODULE ); + rtc->rtc->ops = &mpc5121_rtc_ops; } -if (IS_ERR (rtc->rtc)) { - err =PTR_ERR (rtc->rtc); + err =rtc_register_device (rtc->rtc); +if (err) goto out_dispose2; - } - rtc->rtc->uie_unsupported =1 ;return 0 ;
Signature · 1 line
2.24.1
Alexandre Belloni
maintainerPATCH 3/4 rtc: mpc5121: set range
In reply to Alexandre BelloniThe datasheet states that 4052 is the maximum value for year. However, the mpc5121 read_time and set_time function abuse the target time register instead of using the broken down time so it is limited to 2106.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-mpc5121.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/rtc/rtc-mpc5121.c +9 -0
@@ -352,6 +352,8 @@ static int mpc5121_rtc_probe(struct platform_device *op) rtc->rtc->ops = &mpc5200_rtc_ops; rtc->rtc->uie_unsupported =1 ; + rtc->rtc->range_min =RTC_TIMESTAMP_BEGIN_0000 ; + rtc->rtc->range_max =65733206399ULL ;/* 4052-12-31 23:59:59 */ if (of_device_is_compatible (op->dev.of_node,"fsl,mpc5121-rtc" )) {u32 ka;
@@ -362,6 +364,13 @@ static int mpc5121_rtc_probe(struct platform_device *op)out_be32 (&rtc->regs->keep_alive, ka); } rtc->rtc->ops = &mpc5121_rtc_ops; +/* +* This is a limitation of the driver that abuses the target +* time register, the actual maximum year for the mpc5121 is +* also 4052. +*/ + rtc->rtc->range_min =0 ; + rtc->rtc->range_max =U32_MAX ; } err =rtc_register_device (rtc->rtc);
Signature · 1 line
2.24.1
Alexandre Belloni
maintainerPATCH 4/4 rtc: mpc5121: switch to rtc_time64_to_tm/rtc_tm_to_time64
In reply to Alexandre BelloniCall the 64bit versions of rtc_tm time conversion.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-mpc5121.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/rtc/rtc-mpc5121.c +3 -5
@@ -111,7 +111,7 @@ static int mpc5121_rtc_read_time(struct device *dev, struct rtc_time *tm)*/ now =in_be32 (®s->actual_time) +in_be32 (®s->target_time); -rtc_time_to_tm (now, tm); +rtc_time64_to_tm (now, tm);/* * update second minute hour registers
@@ -126,16 +126,14 @@ static int mpc5121_rtc_set_time(struct device *dev, struct rtc_time *tm) {struct mpc5121_rtc_data *rtc =dev_get_drvdata (dev);struct mpc5121_rtc_regs __iomem *regs = rtc->regs; -int ret;unsigned long now;/* * The actual_time register is read only so we write the offset * between it and linux time to the target_time register. */ - ret =rtc_tm_to_time (tm, &now); -if (ret ==0 ) -out_be32 (®s->target_time, now -in_be32 (®s->actual_time)); + now =rtc_tm_to_time64 (tm); +out_be32 (®s->target_time, now -in_be32 (®s->actual_time));/* * update second minute hour registers
Signature · 1 line
2.24.1