On Thu, 11 Sep 2014 11:41:00 +0200
Johan Hovold <johan@xxxxxxxxxx> wrote:
> On Thu, Sep 11, 2014 at 10:56:04AM +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 <boris.brezillon@xxxxxxxxxxxxxxxxxx>
> >
> > Conflicts:
> > drivers/rtc/rtc-at91sam9.c
>
> You probably don't want this here.
Absolutely, it's a rebase leftover :-).
I'll remove this line from the commit message.
>
> > ---
> > drivers/rtc/Kconfig | 1 +
> > drivers/rtc/rtc-at91sam9.c | 58 +++++++++++++++++++++++++++++++++++++++-------
> > 2 files changed, 50 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..b953545 100644
> > --- a/drivers/rtc/rtc-at91sam9.c
> > +++ b/drivers/rtc/rtc-at91sam9.c
> > @@ -21,6 +21,8 @@
> > #include <linux/slab.h>
> > #include <linux/platform_data/atmel.h>
> > #include <linux/io.h>
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/regmap.h>
> >
> > /*
> > * 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,18 @@ 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) {
>
> Brace placement. Did you run checkpatch on the rest of the series?
Actually, I did last time I submitted, but forgot to run it this time.
Sorry, for the inconvenience, I'll fix that.
Best Regards,
Boris
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
