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

Commit 48b29c7f authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: 88pm80x: stop setting a default time 



It doesn't make sense to set the RTC to a default value at probe time. Let
the core handle invalid date and time.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 6c78a872

drivers/rtc/rtc-88pm80x.c

+0 −22
Original line number Original line Diff line number Diff line
@@ -254,8 +254,6 @@ static int pm80x_rtc_probe(struct platform_device *pdev) 
	struct pm80x_rtc_pdata *pdata = dev_get_platdata(&pdev->dev);

	struct pm80x_rtc_pdata *pdata = dev_get_platdata(&pdev->dev);

	struct pm80x_rtc_info *info;

	struct pm80x_rtc_info *info;

	struct device_node *node = pdev->dev.of_node;

	struct device_node *node = pdev->dev.of_node;

	struct rtc_time tm;

	unsigned long ticks = 0;

	int ret;

	int ret;





	if (!pdata && !node) {

	if (!pdata && !node) {
@@ -302,26 +300,6 @@ static int pm80x_rtc_probe(struct platform_device *pdev) 
		goto out;

		goto out;

	}

	}





	ret = pm80x_rtc_read_time(&pdev->dev, &tm);

	if (ret < 0) {

		dev_err(&pdev->dev, "Failed to read initial time.\n");

		goto out_rtc;

	}

	if ((tm.tm_year < 70) || (tm.tm_year > 138)) {

		tm.tm_year = 70;

		tm.tm_mon = 0;

		tm.tm_mday = 1;

		tm.tm_hour = 0;

		tm.tm_min = 0;

		tm.tm_sec = 0;

		ret = pm80x_rtc_set_time(&pdev->dev, &tm);

		if (ret < 0) {

			dev_err(&pdev->dev, "Failed to set initial time.\n");

			goto out_rtc;

		}

	}

	rtc_tm_to_time(&tm, &ticks);



	info->rtc_dev = devm_rtc_device_register(&pdev->dev, "88pm80x-rtc",

	info->rtc_dev = devm_rtc_device_register(&pdev->dev, "88pm80x-rtc",

					    &pm80x_rtc_ops, THIS_MODULE);

					    &pm80x_rtc_ops, THIS_MODULE);

	if (IS_ERR(info->rtc_dev)) {

	if (IS_ERR(info->rtc_dev)) {