Skip to content

Commit

Permalink
drivers/rtc/rtc-ab8500.c: ensure correct probing of the AB8500 RTC wh…
Browse files Browse the repository at this point in the history
…en Device Tree is enabled

Without this patch, if Device Tree is enabled the AB8500 RTC wouldn't get
probed at all, as there is no reference to it from platform code.  This
patch ensures the driver is probed during normal DT start-up.

[[email protected]: checkpatch fixes]
Signed-off-by: Lee Jones <[email protected]>
Cc: Alessandro Zummo <[email protected]>
Acked-by: Linus Walleij <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Lee Jones authored and torvalds committed Jul 11, 2012
1 parent 3cfd16a commit ad49fcb
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/rtc/rtc-ab8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <linux/mfd/abx500.h>
#include <linux/mfd/abx500/ab8500.h>
#include <linux/delay.h>
#include <linux/of.h>

#define AB8500_RTC_SOFF_STAT_REG 0x00
#define AB8500_RTC_CC_CONF_REG 0x01
Expand Down Expand Up @@ -430,7 +431,6 @@ static int __devinit ab8500_rtc_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, rtc);


err = ab8500_sysfs_rtc_register(&pdev->dev);
if (err) {
dev_err(&pdev->dev, "sysfs RTC failed to register\n");
Expand All @@ -454,10 +454,16 @@ static int __devexit ab8500_rtc_remove(struct platform_device *pdev)
return 0;
}

static const struct of_device_id ab8500_rtc_match[] = {
{ .compatible = "stericsson,ab8500-rtc", },
{}
};

static struct platform_driver ab8500_rtc_driver = {
.driver = {
.name = "ab8500-rtc",
.owner = THIS_MODULE,
.of_match_table = ab8500_rtc_match,
},
.probe = ab8500_rtc_probe,
.remove = __devexit_p(ab8500_rtc_remove),
Expand Down

0 comments on commit ad49fcb

Please sign in to comment.