| Message ID | 1436424952-29680-1-git-send-email-vaibhav.hiremath@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On 09/07/2015 at 12:25:51 +0530, Vaibhav Hiremath wrote : > Along with DT support, this patch also cleans up the unnecessary > code around 'rtc_wakeup' initialization. > > Signed-off-by: Chao Xie <chao.xie@marvell.com> > Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org> No need to resend, I'll take it. I'm current busy with other things and it is still early in the development cycle. > - if (pm80x_pdata) { > - pdata = pm80x_pdata->rtc; > - if (pdata) > - info->rtc_dev->dev.platform_data = &pdata->rtc_wakeup; > - } > + /* remeber whether this power up is caused by PMIC RTC or not */ I'll fix that typo... > + info->rtc_dev->dev.platform_data = &pdata->rtc_wakeup; >
On Thursday 09 July 2015 05:25 PM, Alexandre Belloni wrote: > Hi, > > On 09/07/2015 at 12:25:51 +0530, Vaibhav Hiremath wrote : >> Along with DT support, this patch also cleans up the unnecessary >> code around 'rtc_wakeup' initialization. >> >> Signed-off-by: Chao Xie <chao.xie@marvell.com> >> Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org> > > No need to resend, I'll take it. I'm current busy with other things and > it is still early in the development cycle. > Thanks, And sorry for noise, I was not so sure about the status, so resent it. >> - if (pm80x_pdata) { >> - pdata = pm80x_pdata->rtc; >> - if (pdata) >> - info->rtc_dev->dev.platform_data = &pdata->rtc_wakeup; >> - } >> + /* remeber whether this power up is caused by PMIC RTC or not */ > > I'll fix that typo... > Oops. Thankks for noting and correcting it. Thanks, Vaibhav
On 09/07/2015 at 12:25:51 +0530, Vaibhav Hiremath wrote : > Along with DT support, this patch also cleans up the unnecessary > code around 'rtc_wakeup' initialization. > > Signed-off-by: Chao Xie <chao.xie@marvell.com> > Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org> > --- > drivers/rtc/rtc-88pm80x.c | 28 +++++++++++++++++----------- > 1 file changed, 17 insertions(+), 11 deletions(-) > Applied, thanks.
diff --git a/drivers/rtc/rtc-88pm80x.c b/drivers/rtc/rtc-88pm80x.c index 7df0579..8f66519 100644 --- a/drivers/rtc/rtc-88pm80x.c +++ b/drivers/rtc/rtc-88pm80x.c @@ -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) - info->rtc_dev->dev.platform_data = &pdata->rtc_wakeup; - } + /* remeber 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);