The patch titled Subject: rtc: rtc-mxc: adapt to the new i.mx clock framework has been added to the -mm tree. Its filename is rtc-rtc-mxc-adapt-to-the-new-imx-clock-framework.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> Subject: rtc: rtc-mxc: adapt to the new i.mx clock framework i.mx drivers should use clk_prepare_enable/clk_disable_unprepare() in order to avoid clk warnings. While at it, convert to devm_clk_get() since other devm_ functions are used in this driver and it can also save some clk_put() calls. Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-mxc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff -puN drivers/rtc/rtc-mxc.c~rtc-rtc-mxc-adapt-to-the-new-imx-clock-framework drivers/rtc/rtc-mxc.c --- a/drivers/rtc/rtc-mxc.c~rtc-rtc-mxc-adapt-to-the-new-imx-clock-framework +++ a/drivers/rtc/rtc-mxc.c @@ -367,14 +367,14 @@ static int __init mxc_rtc_probe(struct p pdata->ioaddr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - pdata->clk = clk_get(&pdev->dev, "rtc"); + pdata->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(pdata->clk)) { dev_err(&pdev->dev, "unable to get clock!\n"); ret = PTR_ERR(pdata->clk); goto exit_free_pdata; } - clk_enable(pdata->clk); + clk_prepare_enable(pdata->clk); rate = clk_get_rate(pdata->clk); if (rate == 32768) @@ -426,8 +426,7 @@ static int __init mxc_rtc_probe(struct p exit_clr_drvdata: platform_set_drvdata(pdev, NULL); exit_put_clk: - clk_disable(pdata->clk); - clk_put(pdata->clk); + clk_disable_unprepare(pdata->clk); exit_free_pdata: @@ -440,8 +439,7 @@ static int __exit mxc_rtc_remove(struct rtc_device_unregister(pdata->rtc); - clk_disable(pdata->clk); - clk_put(pdata->clk); + clk_disable_unprepare(pdata->clk); platform_set_drvdata(pdev, NULL); return 0; _ Patches currently in -mm which might be from fabio.estevam@xxxxxxxxxxxxx are linux-next.patch dma-dmaengine-lower-the-priority-of-failed-to-get-dma-channel-message.patch rtc-rtc-mxc-adapt-to-the-new-imx-clock-framework.patch rtc-rtc-mxc-convert-to-module_platform_driver.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html