From: Guenter Roeck <linux@roeck-us.net>
To: Eugen.Hristev@microchip.com
Cc: wim@linux-watchdog.org, robh+dt@kernel.org,
alexandre.belloni@bootlin.com, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Nicolas.Ferre@microchip.com,
linux-watchdog@vger.kernel.org
Subject: Re: [PATCH v4 1/3] watchdog: sama5d4_wdt: cleanup the bit definitions
Date: Sat, 16 Nov 2019 08:12:04 -0800 [thread overview]
Message-ID: <20191116161204.GA22568@roeck-us.net> (raw)
In-Reply-To: <1573806579-7981-1-git-send-email-eugen.hristev@microchip.com>
On Fri, Nov 15, 2019 at 08:30:13AM +0000, Eugen.Hristev@microchip.com wrote:
> From: Eugen Hristev <eugen.hristev@microchip.com>
>
> Cleanup the macro definitions to use BIT and align with two spaces.
>
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Changes in v4:
> - added UL suffix to value macros to avoid compile warnings
> - modified file header to include new copyright and datasheet
> - include linux/bits.h
>
> Changes in v3:
> - new patch as requested from review on ML
>
> drivers/watchdog/at91sam9_wdt.h | 34 +++++++++++++++++++---------------
> 1 file changed, 19 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/watchdog/at91sam9_wdt.h b/drivers/watchdog/at91sam9_wdt.h
> index 390941c..abfe34d 100644
> --- a/drivers/watchdog/at91sam9_wdt.h
> +++ b/drivers/watchdog/at91sam9_wdt.h
> @@ -4,33 +4,37 @@
> *
> * Copyright (C) 2007 Andrew Victor
> * Copyright (C) 2007 Atmel Corporation.
> + * Copyright (C) 2019 Microchip Technology Inc. and its subsidiaries
> *
> * Watchdog Timer (WDT) - System peripherals regsters.
> * Based on AT91SAM9261 datasheet revision D.
> + * Based on SAM9X60 datasheet.
> *
> */
>
> #ifndef AT91_WDT_H
> #define AT91_WDT_H
>
> +#include <linux/bits.h>
> +
> #define AT91_WDT_CR 0x00 /* Watchdog Control Register */
> -#define AT91_WDT_WDRSTT (1 << 0) /* Restart */
> -#define AT91_WDT_KEY (0xa5 << 24) /* KEY Password */
> +#define AT91_WDT_WDRSTT BIT(0) /* Restart */
> +#define AT91_WDT_KEY (0xa5UL << 24) /* KEY Password */
>
> #define AT91_WDT_MR 0x04 /* Watchdog Mode Register */
> -#define AT91_WDT_WDV (0xfff << 0) /* Counter Value */
> -#define AT91_WDT_SET_WDV(x) ((x) & AT91_WDT_WDV)
> -#define AT91_WDT_WDFIEN (1 << 12) /* Fault Interrupt Enable */
> -#define AT91_WDT_WDRSTEN (1 << 13) /* Reset Processor */
> -#define AT91_WDT_WDRPROC (1 << 14) /* Timer Restart */
> -#define AT91_WDT_WDDIS (1 << 15) /* Watchdog Disable */
> -#define AT91_WDT_WDD (0xfff << 16) /* Delta Value */
> -#define AT91_WDT_SET_WDD(x) (((x) << 16) & AT91_WDT_WDD)
> -#define AT91_WDT_WDDBGHLT (1 << 28) /* Debug Halt */
> -#define AT91_WDT_WDIDLEHLT (1 << 29) /* Idle Halt */
> +#define AT91_WDT_WDV (0xfffUL << 0) /* Counter Value */
> +#define AT91_WDT_SET_WDV(x) ((x) & AT91_WDT_WDV)
> +#define AT91_WDT_WDFIEN BIT(12) /* Fault Interrupt Enable */
> +#define AT91_WDT_WDRSTEN BIT(13) /* Reset Processor */
> +#define AT91_WDT_WDRPROC BIT(14) /* Timer Restart */
> +#define AT91_WDT_WDDIS BIT(15) /* Watchdog Disable */
> +#define AT91_WDT_WDD (0xfffUL << 16) /* Delta Value */
> +#define AT91_WDT_SET_WDD(x) (((x) << 16) & AT91_WDT_WDD)
> +#define AT91_WDT_WDDBGHLT BIT(28) /* Debug Halt */
> +#define AT91_WDT_WDIDLEHLT BIT(29) /* Idle Halt */
>
> -#define AT91_WDT_SR 0x08 /* Watchdog Status Register */
> -#define AT91_WDT_WDUNF (1 << 0) /* Watchdog Underflow */
> -#define AT91_WDT_WDERR (1 << 1) /* Watchdog Error */
> +#define AT91_WDT_SR 0x08 /* Watchdog Status Register */
> +#define AT91_WDT_WDUNF BIT(0) /* Watchdog Underflow */
> +#define AT91_WDT_WDERR BIT(1) /* Watchdog Error */
>
> #endif
prev parent reply other threads:[~2019-11-16 16:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 8:30 [PATCH v4 1/3] watchdog: sama5d4_wdt: cleanup the bit definitions Eugen.Hristev
2019-11-15 8:30 ` [PATCH v4 2/3] dt-bindings: watchdog: sama5d4_wdt: add microchip,sam9x60-wdt compatible Eugen.Hristev
2019-11-15 8:30 ` [PATCH v4 3/3] watchdog: sama5d4_wdt: addition of sam9x60 compatible watchdog Eugen.Hristev
2019-11-16 16:20 ` Guenter Roeck
2019-11-16 16:12 ` Guenter Roeck [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191116161204.GA22568@roeck-us.net \
--to=linux@roeck-us.net \
--cc=Eugen.Hristev@microchip.com \
--cc=Nicolas.Ferre@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).