From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754060AbbFDV0M (ORCPT ); Thu, 4 Jun 2015 17:26:12 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:35402 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753019AbbFDV0J (ORCPT ); Thu, 4 Jun 2015 17:26:09 -0400 Message-ID: <5570C26D.5080204@gmail.com> Date: Thu, 04 Jun 2015 23:26:05 +0200 From: Philippe Reynes User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.5) Gecko/20120623 Thunderbird/10.0.5 MIME-Version: 1.0 To: Alexandre Belloni CC: shawn.guo@linaro.org, kernel@pengutronix.de, linux@arm.linux.org.uk, a.zummo@towertech.it, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, rtc-linux@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, fabio.estevam@freescale.com Subject: Re: [PATCH 2/2] rtc: mxc: add support of device tree References: <1431729330-7625-1-git-send-email-tremyfr@gmail.com> <1431729330-7625-3-git-send-email-tremyfr@gmail.com> <20150528120601.GO2185@piout.net> In-Reply-To: <20150528120601.GO2185@piout.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Alexandre, On 28/05/15 14:06, Alexandre Belloni wrote: > Hi, > > On 16/05/2015 at 00:35:30 +0200, Philippe Reynes wrote : >> > > Please always include a commit message. Oh yes, sorry about that. >> Signed-off-by: Philippe Reynes >> --- >> Documentation/devicetree/bindings/rtc/rtc-mxc.txt | 27 +++++++++++++++++++++ >> drivers/rtc/rtc-mxc.c | 22 ++++++++++++++++- >> 2 files changed, 48 insertions(+), 1 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/rtc/rtc-mxc.txt >> >> diff --git a/Documentation/devicetree/bindings/rtc/rtc-mxc.txt b/Documentation/devicetree/bindings/rtc/rtc-mxc.txt >> new file mode 100644 >> index 0000000..5505493 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/rtc/rtc-mxc.txt >> @@ -0,0 +1,27 @@ >> +* Real Time Clock of the i.MX SoCs >> + >> +RTC controller for the i.MX SoCs >> + >> +Required properties: >> +- compatible: Should be "fsl,imx1-rtc" or "fsl,imx21-rtc". >> +- reg: physical base address of the controller and length of memory mapped >> + region. >> +- interrupts: IRQ line for the RTC. >> +- clocks: should contain two entries: >> + * one for the input reference >> + * one for the the SoC RTC >> +- clock-names: should contain: >> + * "rtc" for the input reference clock >> + * "ipg" for the SoC RTC clock >> + >> +Example: >> + >> +rtc@10007000 { >> + compatible = "fsl,imx21-rtc"; >> + reg =<0x10007000 0x1000>; >> + interrupts =<22>; >> + clocks =<&clks IMX27_CLK_CKIL>, >> + <&clks IMX27_CLK_RTC_IPG_GATE>; >> + clock-names = "rtc, "ipg"; >> + status = "disabled"; >> +}; >> diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c >> index e916a91..df6483d 100644 >> --- a/drivers/rtc/rtc-mxc.c >> +++ b/drivers/rtc/rtc-mxc.c >> @@ -16,6 +16,8 @@ >> #include >> #include >> #include >> +#include >> +#include >> >> #define RTC_INPUT_CLK_32768HZ (0x00<< 5) >> #define RTC_INPUT_CLK_32000HZ (0x01<< 5) >> @@ -98,6 +100,15 @@ static struct platform_device_id imx_rtc_devtype[] = { >> }; >> MODULE_DEVICE_TABLE(platform, imx_rtc_devtype); >> >> +#ifdef CONFIG_OF >> +static const struct of_device_id imx_rtc_dt_ids[] = { >> + { .compatible = "fsl,imx1-rtc", .data =&imx_rtc_devtype[IMX1_RTC] }, >> + { .compatible = "fsl,imx21-rtc", .data =&imx_rtc_devtype[IMX21_RTC] }, > > Maybe you can use directly IMX1_RTC and IMX21_RTC which... I've seen both "style" on the code. I may change the code to simply use IMX1_RTC and IMX21_RTC. >> >> - pdata->devtype = pdev->id_entry->driver_data; >> + of_id = of_match_device(imx_rtc_dt_ids,&pdev->dev); >> + if (of_id) { >> + struct platform_device_id *id_entry; >> + >> + id_entry = (struct platform_device_id *)of_id->data; >> + pdata->devtype = id_entry->driver_data; > > ... also simplifies that part. I'll do it in the next version of this patch. >> + } else >> + pdata->devtype = pdev->id_entry->driver_data; >> > Do you prefer that I wait the clock driver has move to drivers/clk/imx (as requested by Shawn) before sending a v2 ? Regards, Philippe