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

Commit 4ab82103 authored by Vaibhav Hiremath's avatar Vaibhav Hiremath Committed by Alexandre Belloni
Browse files

rtc: 88pm80x: add device tree support 



Along with DT support, this patch also cleans up the unnecessary
code around 'rtc_wakeup' initialization.

Signed-off-by: default avatarChao Xie <chao.xie@marvell.com>
Signed-off-by: default avatarVaibhav Hiremath <vaibhav.hiremath@linaro.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 617f6f7e

drivers/rtc/rtc-88pm80x.c

+17 −11
Original line number Diff line number Diff line
@@ -251,17 +251,26 @@ static SIMPLE_DEV_PM_OPS(pm80x_rtc_pm_ops, pm80x_rtc_suspend, pm80x_rtc_resume); 
static int pm80x_rtc_probe(struct platform_device *pdev)

{

	struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);

	struct pm80x_platform_data *pm80x_pdata =

				dev_get_platdata(pdev->dev.parent);

	struct pm80x_rtc_pdata *pdata = NULL;

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

	struct pm80x_rtc_info *info;

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

	struct rtc_time tm;

	unsigned long ticks = 0;

	int ret;



	pdata = dev_get_platdata(&pdev->dev);

	if (pdata == NULL)

		dev_warn(&pdev->dev, "No platform data!\n");

	if (!pdata && !node) {

		dev_err(&pdev->dev,

			"pm80x-rtc requires platform data or of_node\n");

		return -EINVAL;

	}



	if (!pdata) {

		pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

		if (!pdata) {

			dev_err(&pdev->dev, "failed to allocate memory\n");

			return -ENOMEM;

		}

	}



	info =

	    devm_kzalloc(&pdev->dev, sizeof(struct pm80x_rtc_info), GFP_KERNEL);
@@ -327,11 +336,8 @@ static int pm80x_rtc_probe(struct platform_device *pdev) 
	regmap_update_bits(info->map, PM800_RTC_CONTROL, PM800_RTC1_USE_XO,

			   PM800_RTC1_USE_XO);



	if (pm80x_pdata) {

		pdata = pm80x_pdata->rtc;

		if (pdata)

	/* remember whether this power up is caused by PMIC RTC or not */

	info->rtc_dev->dev.platform_data = &pdata->rtc_wakeup;

	}



	device_init_wakeup(&pdev->dev, 1);