watchdog: sama5d4_wdt: cleanup the bit definitions
PATCH v4 1/3 watchdog: sama5d4_wdt: cleanup the bit definitions
From: Eugen Hristev <[email protected]>
Cleanup the macro definitions to use BIT and align with two spaces.
---
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(-)
drivers/watchdog/at91sam9_wdt.h +19 -15
@@ -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
Signature · 1 line
2.7.4
PATCH v4 2/3 dt-bindings: watchdog: sama5d4_wdt: add microchip,sam9x60-wdt compatible
From: Eugen Hristev <[email protected]>
The Atmel sama5d4_wdt needs to be compatible with microchip,sam9x60-wdt The sama5d4_wdt driver is updated to work with both hardware blocks (sama5d4/sama5d2 and sam9x60 based blocks)
--- Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/watchdog/atmel-sama5d4-wdt.txt +1 -1
@@ -1,7 +1,7 @@ * Atmel SAMA5D4 Watchdog Timer (WDT) Controller Required properties: -- compatible: "atmel,sama5d4-wdt" +- compatible: "atmel,sama5d4-wdt" or "microchip,sam9x60-wdt" - reg: base physical address and length of memory mapped region. Optional properties:
Signature · 1 line
2.7.4
PATCH v4 3/3 watchdog: sama5d4_wdt: addition of sam9x60 compatible watchdog
In reply to [email protected]From: Eugen Hristev <[email protected]>
Add support for SAM9X60 WDT into sama5d4_wdt.
This means that this driver gets a flag inside the data struct that represents the sam9x60 support.
This flag differentiates between the two hardware blocks, and is set according to the compatible of the driver instantiation.
---
Changes in v4:
- check compatible with different of_ function
- call irq parse and map only if need_irq
- changed tabbing in struct defintion
Changes in v3:
- changed need_irq to bool, instead of a single bit variable.
- the platform data config struct is gone now, changed to a pointer to a bool to have the sam9x60_support as 'true', pointing to a static bool with true value. Can have a better solution than this ?
- the specific sam9x60_support flag is assigned at probe time, corresponding to the flag value in .data
drivers/watchdog/at91sam9_wdt.h | 14 ++++++ drivers/watchdog/sama5d4_wdt.c | 109 +++++++++++++++++++++++++++++++--------- 2 files changed, 98 insertions(+), 25 deletions(-)
drivers/watchdog/at91sam9_wdt.h +14 -0
@@ -24,7 +24,10 @@#define AT91_WDT_MR 0x04/* Watchdog Mode Register */ #define AT91_WDT_WDV (0xfffUL << 0)/* Counter Value */ #define AT91_WDT_SET_WDV (x) ((x) & AT91_WDT_WDV) +#define AT91_SAM9X60_PERIODRST BIT(4)/* Period Reset */ +#define AT91_SAM9X60_RPTHRST BIT(5)/* Minimum Restart Period */ #define AT91_WDT_WDFIEN BIT(12)/* Fault Interrupt Enable */ +#define AT91_SAM9X60_WDDIS BIT(12)/* Watchdog Disable */ #define AT91_WDT_WDRSTEN BIT(13)/* Reset Processor */ #define AT91_WDT_WDRPROC BIT(14)/* Timer Restart */ #define AT91_WDT_WDDIS BIT(15)/* Watchdog Disable */
@@ -37,4 +40,15 @@#define AT91_WDT_WDUNF BIT(0)/* Watchdog Underflow */ #define AT91_WDT_WDERR BIT(1)/* Watchdog Error */ +#define AT91_SAM9X60_VR 0x08/* Watchdog Timer Value Register */ + +#define AT91_SAM9X60_WLR 0x0c +#define AT91_SAM9X60_COUNTER (0xfffUL << 0)/* Watchdog Period Value */ +#define AT91_SAM9X60_SET_COUNTER (x) ((x) & AT91_SAM9X60_COUNTER) + +#define AT91_SAM9X60_IER 0x14/* Interrupt Enable Register */ +#define AT91_SAM9X60_PERINT BIT(0)/* Period Interrupt Enable */ +#define AT91_SAM9X60_IDR 0x18/* Interrupt Disable Register */ +#define AT91_SAM9X60_ISR 0x1c/* Interrupt Status Register */ +#endif
drivers/watchdog/sama5d4_wdt.c +84 -25
212 lines not on this page · raw message
Signature · 1 line
2.7.4
Guenter Roeck
maintainerRe: [PATCH v4 3/3] watchdog: sama5d4_wdt: addition of sam9x60 compatible watchdog
Quoted 47 lines · On Fri, Nov 15, 2019 at 08:30:18AM +0000, [email protected] wrote:
From: Eugen Hristev <[email protected]>
Add support for SAM9X60 WDT into
sama5d4_wdt.
This means that this driver gets a flag inside the data struct that represents the sam9x60 support.
This flag differentiates between the two hardware blocks, and is set according to the compatible of the driver instantiation.Signed-off-by Eugen Hristev <[email protected]>---
Changes in v4:
- check compatible with differentof_function
- call irq parse and map only ifneed_irq
- changed tabbing in struct defintionChanges in v3:
- changedneed_irqto bool, instead of a single bit variable.
- the platform data config struct is gone now, changed to a pointer to a bool to have thesam9x60_supportas 'true', pointing to a static bool with true value. Can have a better solution than this ?
- the specificsam9x60_supportflag is assigned at probe time, corresponding to the flag value in .datadrivers/watchdog/at91sam9_wdt.h | 14 ++++++ drivers/watchdog/sama5d4_wdt.c | 109 +++++++++++++++++++++++++++++++--------- 2 files changed, 98 insertions(+), 25 deletions(-)drivers/watchdog/at91sam9_wdt.h +4
-0@@ -24,7 +24,10 @@#define AT91_WDT_MR 0x04/* Watchdog Mode Register */ #define AT91_WDT_WDV (0xfffUL << 0)/* Counter Value */ #define AT91_WDT_SET_WDV (x) ((x) & AT91_WDT_WDV) +#define AT91_SAM9X60_PERIODRST BIT(4)/* Period Reset */ +#define AT91_SAM9X60_RPTHRST BIT(5)/* Minimum Restart Period */ #define AT91_WDT_WDFIEN BIT(12)/* Fault Interrupt Enable */ +#define AT91_SAM9X60_WDDIS BIT(12)/* Watchdog Disable */ #define AT91_WDT_WDRSTEN BIT(13)/* Reset Processor */ #define AT91_WDT_WDRPROC BIT(14)/* Timer Restart */ #define AT91_WDT_WDDIS BIT(15)/* Watchdog Disable */ @@ -37,4 +40,15 @@#define AT91_WDT_WDUNF BIT(0)/* Watchdog Underflow */ #define AT91_WDT_WDERR BIT(1)/* Watchdog Error */ +#define AT91_SAM9X60_VR 0x08/* Watchdog Timer Value Register */
drivers/watchdog/at91sam9_wdt.h line 53
Quoted 10 lines
drivers/watchdog/at91sam9_wdt.h +10
-0+ +#define AT91_SAM9X60_WLR 0x0c +#define AT91_SAM9X60_COUNTER (0xfffUL << 0)/* Watchdog Period Value */ +#define AT91_SAM9X60_SET_COUNTER (x) ((x) & AT91_SAM9X60_COUNTER) + +#define AT91_SAM9X60_IER 0x14/* Interrupt Enable Register */ +#define AT91_SAM9X60_PERINT BIT(0)/* Period Interrupt Enable */ +#define AT91_SAM9X60_IDR 0x18/* Interrupt Disable Register */ +#define AT91_SAM9X60_ISR 0x1c/* Interrupt Status Register */ +
Lots of line-too-long checkpatch warnings. Please avoid.
Thanks,
Guenter
Quoted 5 lines · On Fri, Nov 15, 2019 at 08:30:13AM +0000, [email protected] wrote:
From: Eugen Hristev <[email protected]>
Cleanup the macro definitions to use BIT and align with two spaces.
Signed-off-by Eugen Hristev <[email protected]>
Quoted 69 lines
---
Changes in v4:
- added UL suffix to value macros to avoid compile warnings
- modified file header to include new copyright and datasheet
- includelinux/bits.hChanges in v3:
- new patch as requested from review on MLdrivers/watchdog/at91sam9_wdt.h | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)drivers/watchdog/at91sam9_wdt.h +19
-15@@ -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