Skip to content

Commit d615a6f

Browse files
ehristevWim Van Sebroeck
authored andcommitted
watchdog: sama5d4_wdt: cleanup the bit definitions
Cleanup the macro definitions to use BIT and align with two spaces. Signed-off-by: Eugen Hristev <[email protected]> Reviewed-by: Guenter Roeck <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
1 parent 39e68d9 commit d615a6f

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

drivers/watchdog/at91sam9_wdt.h

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,37 @@
44
*
55
* Copyright (C) 2007 Andrew Victor
66
* Copyright (C) 2007 Atmel Corporation.
7+
* Copyright (C) 2019 Microchip Technology Inc. and its subsidiaries
78
*
89
* Watchdog Timer (WDT) - System peripherals regsters.
910
* Based on AT91SAM9261 datasheet revision D.
11+
* Based on SAM9X60 datasheet.
1012
*
1113
*/
1214

1315
#ifndef AT91_WDT_H
1416
#define AT91_WDT_H
1517

18+
#include <linux/bits.h>
19+
1620
#define AT91_WDT_CR 0x00 /* Watchdog Control Register */
17-
#define AT91_WDT_WDRSTT (1 << 0) /* Restart */
18-
#define AT91_WDT_KEY (0xa5 << 24) /* KEY Password */
21+
#define AT91_WDT_WDRSTT BIT(0) /* Restart */
22+
#define AT91_WDT_KEY (0xa5UL << 24) /* KEY Password */
1923

2024
#define AT91_WDT_MR 0x04 /* Watchdog Mode Register */
21-
#define AT91_WDT_WDV (0xfff << 0) /* Counter Value */
22-
#define AT91_WDT_SET_WDV(x) ((x) & AT91_WDT_WDV)
23-
#define AT91_WDT_WDFIEN (1 << 12) /* Fault Interrupt Enable */
24-
#define AT91_WDT_WDRSTEN (1 << 13) /* Reset Processor */
25-
#define AT91_WDT_WDRPROC (1 << 14) /* Timer Restart */
26-
#define AT91_WDT_WDDIS (1 << 15) /* Watchdog Disable */
27-
#define AT91_WDT_WDD (0xfff << 16) /* Delta Value */
28-
#define AT91_WDT_SET_WDD(x) (((x) << 16) & AT91_WDT_WDD)
29-
#define AT91_WDT_WDDBGHLT (1 << 28) /* Debug Halt */
30-
#define AT91_WDT_WDIDLEHLT (1 << 29) /* Idle Halt */
25+
#define AT91_WDT_WDV (0xfffUL << 0) /* Counter Value */
26+
#define AT91_WDT_SET_WDV(x) ((x) & AT91_WDT_WDV)
27+
#define AT91_WDT_WDFIEN BIT(12) /* Fault Interrupt Enable */
28+
#define AT91_WDT_WDRSTEN BIT(13) /* Reset Processor */
29+
#define AT91_WDT_WDRPROC BIT(14) /* Timer Restart */
30+
#define AT91_WDT_WDDIS BIT(15) /* Watchdog Disable */
31+
#define AT91_WDT_WDD (0xfffUL << 16) /* Delta Value */
32+
#define AT91_WDT_SET_WDD(x) (((x) << 16) & AT91_WDT_WDD)
33+
#define AT91_WDT_WDDBGHLT BIT(28) /* Debug Halt */
34+
#define AT91_WDT_WDIDLEHLT BIT(29) /* Idle Halt */
3135

32-
#define AT91_WDT_SR 0x08 /* Watchdog Status Register */
33-
#define AT91_WDT_WDUNF (1 << 0) /* Watchdog Underflow */
34-
#define AT91_WDT_WDERR (1 << 1) /* Watchdog Error */
36+
#define AT91_WDT_SR 0x08 /* Watchdog Status Register */
37+
#define AT91_WDT_WDUNF BIT(0) /* Watchdog Underflow */
38+
#define AT91_WDT_WDERR BIT(1) /* Watchdog Error */
3539

3640
#endif

0 commit comments

Comments
 (0)