Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad49fcbe authored by Lee Jones's avatar Lee Jones Committed by Linus Torvalds
Browse files

drivers/rtc/rtc-ab8500.c: ensure correct probing of the AB8500 RTC when 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.

[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3cfd16a5

drivers/rtc/rtc-ab8500.c

+7 −1
Original line number Diff line number Diff line
@@ -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
@@ -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");
@@ -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),