From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris BREZILLON Subject: Re: [PATCH v4 5/9] rtc: at91sam9: make use of syscon/regmap to access GPBR registers Date: Thu, 11 Sep 2014 15:44:26 +0200 Message-ID: <20140911154426.1ac09018@bbrezillon> References: <1410441525-25258-1-git-send-email-boris.brezillon@free-electrons.com> <1410441525-25258-6-git-send-email-boris.brezillon@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1410441525-25258-6-git-send-email-boris.brezillon@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org To: Boris BREZILLON Cc: Nicolas Ferre , Jean-Christophe Plagniol-Villard , Alexandre Belloni , Andrew Victor , Alessandro Zummo , rtc-linux@googlegroups.com, Johan Hovold , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org On Thu, 11 Sep 2014 15:18:41 +0200 Boris BREZILLON wrote: > The GPBR registers are not part of the RTT block and thus should not be > defined in the reg property of the rtt node. > > Use syscon to provide a proper DT representation and reference the GPBR > syscon device in a new "atmel,time-reg" property which store both the > syscon device phandle and the register offset within the GPBR block. > > When using non DT boards, we won't be able to retrieve the syscon regmap, > hence we need to create our own regmap using the memory region defined > in the 2nd memory resource assigned to the RTT platform device. > > Signed-off-by: Boris BREZILLON > --- > drivers/rtc/Kconfig | 1 + > drivers/rtc/rtc-at91sam9.c | 59 +++++++++++++++++++++++++++++++++++++++------- > 2 files changed, 51 insertions(+), 9 deletions(-) > > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig > index a168e96..7d76da8 100644 > --- a/drivers/rtc/Kconfig > +++ b/drivers/rtc/Kconfig > @@ -1081,6 +1081,7 @@ config RTC_DRV_AT91RM9200 > config RTC_DRV_AT91SAM9 > tristate "AT91SAM9x/AT91CAP9 RTT as RTC" > depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40) > + select MFD_SYSCON > help > RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT > (Real Time Timer). These timers are powered by the backup power > diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c > index d72c34d..e1b7109 100644 > --- a/drivers/rtc/rtc-at91sam9.c > +++ b/drivers/rtc/rtc-at91sam9.c > @@ -21,6 +21,8 @@ > #include > #include > #include > +#include > +#include > > /* > * This driver uses two configurable hardware resources that live in the > @@ -72,7 +74,8 @@ struct sam9_rtc { > void __iomem *rtt; > struct rtc_device *rtcdev; > u32 imr; > - void __iomem *gpbr; > + struct regmap *gpbr; > + unsigned int gpbr_offset; > int irq; > }; > > @@ -81,10 +84,19 @@ struct sam9_rtc { > #define rtt_writel(rtc, field, val) \ > writel((val), (rtc)->rtt + AT91_RTT_ ## field) > > -#define gpbr_readl(rtc) \ > - readl((rtc)->gpbr) > -#define gpbr_writel(rtc, val) \ > - writel((val), (rtc)->gpbr) > +static inline unsigned int gpbr_readl(struct sam9_rtc *rtc) > +{ > + unsigned int val; > + > + regmap_read(rtc->gpbr, rtc->gpbr_offset, &val); > + > + return val; > +} > + > +static inline void gpbr_writel(struct sam9_rtc *rtc, unsigned int val) > +{ > + regmap_write(rtc->gpbr, rtc->gpbr_offset, val); > +} > > /* > * Read current time and date in RTC > @@ -301,6 +313,12 @@ static const struct rtc_class_ops at91_rtc_ops = { > .alarm_irq_enable = at91_rtc_alarm_irq_enable, > }; > > +static struct regmap_config gpbr_regmap_config = { > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > /* > * Initialize and install RTC driver > */ > @@ -334,10 +352,33 @@ static int at91_rtc_probe(struct platform_device *pdev) > if (IS_ERR(rtc->rtt)) > return PTR_ERR(rtc->rtt); > > - r = platform_get_resource(pdev, IORESOURCE_MEM, 1); > - rtc->gpbr = devm_ioremap_resource(&pdev->dev, r); > - if (IS_ERR(rtc->gpbr)) > - return PTR_ERR(rtc->rtt); > + if (!pdev->dev.of_node) { > + void __iomem *gpbr; > + > + r = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + gpbr = devm_ioremap_resource(&pdev->dev, r); > + if (IS_ERR(gpbr)) > + return PTR_ERR(gpbr); > + > + rtc->gpbr = regmap_init_mmio(NULL, gpbr, > + &gpbr_regmap_config); > + } else { > + struct of_phandle_args args; > + > + ret = of_parse_phandle_with_fixed_args(pdev->dev.of_node, > + "atmel,time-reg", 1, 0, I forgot to change the property name here ^ Should be "atmel,rtt-rtc-time-reg". I'll fix that and send a new version of this patch (not the whole series). Sorry for the inconvenience. -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com