[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140911094100.GB12295@localhost>
Date: Thu, 11 Sep 2014 11:41:00 +0200
From: Johan Hovold <johan@...nel.org>
To: Boris BREZILLON <boris.brezillon@...e-electrons.com>
Cc: Nicolas Ferre <nicolas.ferre@...el.com>,
Jean-Christophe Plagniol-Villard <plagnioj@...osoft.com>,
Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
Andrew Victor <linux@...im.org.za>,
Alessandro Zummo <a.zummo@...ertech.it>,
rtc-linux@...glegroups.com, Johan Hovold <jhovold@...il.com>,
Rob Herring <robh+dt@...nel.org>,
Pawel Moll <pawel.moll@....com>,
Mark Rutland <mark.rutland@....com>,
Ian Campbell <ijc+devicetree@...lion.org.uk>,
Kumar Gala <galak@...eaurora.org>, devicetree@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Douglas Gilbert <dgilbert@...erlog.com>
Subject: Re: [PATCH v3 5/8] rtc: at91sam9: make use of syscon/regmap to
access GPBR registers
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@...e-electrons.com>
>
> Conflicts:
> drivers/rtc/rtc-at91sam9.c
You probably don't want this here.
> ---
> 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?
Johan
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists