watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig
PATCH v2 1/3 watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig
Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig and update the headers accordingly, no functional change. The S10 enables the WDT only in SPL, but does not enable it in U-Boot itself, hence disable it in the config again.
---
V2: Use non-DM watchdog in SPL on S10
--- configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + drivers/watchdog/Kconfig | 7 +++++++ include/configs/socfpga_common.h | 3 --- include/configs/socfpga_stratix10_socdk.h | 6 ++++-- scripts/config_whitelist.txt | 1 - 6 files changed, 13 insertions(+), 6 deletions(-)
configs/socfpga_stratix10_defconfig +1 -0
@@ -56,3 +56,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_DESIGNWARE_WATCHDOG=y
configs/socfpga_vining_fpga_defconfig +1 -0
@@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_DESIGNWARE_WATCHDOG=y
drivers/watchdog/Kconfig +7 -0
@@ -36,6 +36,13 @@ config ULP_WATCHDOG help Say Y here to enable i.MX7ULP watchdog driver. +config DESIGNWARE_WATCHDOG + bool "Designware watchdog timer support" + select HW_WATCHDOG + help + Enable this to support Designware Watchdog Timer IP, present e.g. + on Altera SoCFPGA SoCs. + config WDT bool "Enable driver model for watchdog timer drivers" depends on DM
include/configs/socfpga_common.h +0 -3
@@ -104,12 +104,9 @@/* * L4 Watchdog */ -#ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#define CONFIG_DW_WDT_CLOCK_KHZ 25000#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 -#endif /* * MMC Driver
include/configs/socfpga_stratix10_socdk.h +4 -2
@@ -162,14 +162,16 @@ unsigned int cm_get_qspi_controller_clk_hz(void);*/ #ifdef CONFIG_SPL_BUILD #define CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG +#else +#undef CONFIG_HW_WATCHDOG +#undef CONFIG_DESIGNWARE_WATCHDOG +#endif #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#ifndef __ASSEMBLY__unsigned int cm_get_l4_sys_free_clk_hz (void );#define CONFIG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000)#endif #define CONFIG_WATCHDOG_TIMEOUT_MSECS 3000 -#endif /* * SPL memory layout
scripts/config_whitelist.txt +0 -1
@@ -320,7 +320,6 @@ CONFIG_DEFAULT_IMMR CONFIG_DEF_HWCONFIG CONFIG_DELAY_ENVIRONMENT CONFIG_DESIGNWARE_ETH -CONFIG_DESIGNWARE_WATCHDOG CONFIG_DEVELOP CONFIG_DEVICE_TREE_LIST CONFIG_DFU_ALT
Signature · 1 line
2.23.0
PATCH v2 2/3 watchdog: designware: Convert to DM and DT probing
Convert the designware watchdog timer driver to DM and add DT probing support. Perform minor coding style clean up, like drop superfluous braces. There ought to be no functional change.
---
V2: - Support both DM and non-DM probing
- Fix watchdog stop handling by setting CR bit
--- configs/socfpga_stratix10_defconfig | 2 + configs/socfpga_vining_fpga_defconfig | 1 + drivers/watchdog/Kconfig | 2 +- drivers/watchdog/designware_wdt.c | 122 ++++++++++++++++++---- include/configs/socfpga_stratix10_socdk.h | 1 + 5 files changed, 104 insertions(+), 24 deletions(-)
configs/socfpga_stratix10_defconfig +2 -0
@@ -57,3 +57,5 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_DESIGNWARE_WATCHDOG=y +CONFIG_WDT=y +# CONFIG_SPL_WDT is not set
configs/socfpga_vining_fpga_defconfig +1 -0
@@ -91,4 +91,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_WDT=y CONFIG_DESIGNWARE_WATCHDOG=y
drivers/watchdog/Kconfig +1 -1
@@ -38,7 +38,7 @@ config ULP_WATCHDOG config DESIGNWARE_WATCHDOG bool "Designware watchdog timer support" - select HW_WATCHDOG + select HW_WATCHDOG if !WDT help Enable this to support Designware Watchdog Timer IP, present e.g. on Altera SoCFPGA SoCs.
drivers/watchdog/designware_wdt.c +99 -23
162 lines not on this page · raw message
include/configs/socfpga_stratix10_socdk.h +1 -0
@@ -161,6 +161,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);* L4 Watchdog */ #ifdef CONFIG_SPL_BUILD +#undef CONFIG_WATCHDOG#define CONFIG_HW_WATCHDOG #else #undef CONFIG_HW_WATCHDOG
Signature · 1 line
2.23.0
PATCH v2 2/3 watchdog: designware: Convert to DM and DT probing
Quoted 4 lines · Marek Vasut
Convert the designware watchdog timer driver to DM and add DT probing support. Perform minor coding style clean up, like drop superfluous braces. There ought to be no functional change.
All watchdog DT nodes with compatible "snps,dw-wdt" need to add "u-boot,dm-pre-reloc;".
Quoted 10 lines
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dalon Westergreen <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Jagan Teki <[email protected]>Cc Ley Foon Tan <[email protected]>Cc Philipp Tomisch <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>
Quoted 6 lines
---
V2: - Support both DM and non-DM probing
- Fix watchdog stop handling by setting CR bit--- configs/socfpga_stratix10_defconfig | 2 + configs/socfpga_vining_fpga_defconfig | 1 +
Same here. All socfpga defconfig files need to add CONFIG_WDT.
Quoted 127 lines
drivers/watchdog/Kconfig | 2 +- drivers/watchdog/designware_wdt.c | 122 ++++++++++++++++++---- include/configs/socfpga_stratix10_socdk.h | 1 + 5 files changed, 104 insertions(+), 24 deletions(-)configs/socfpga_stratix10_defconfig +2
-0@@ -57,3 +57,5 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_DESIGNWARE_WATCHDOG=y +CONFIG_WDT=y +# CONFIG_SPL_WDT is not setconfigs/socfpga_vining_fpga_defconfig +1
-0@@ -91,4 +91,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_WDT=y CONFIG_DESIGNWARE_WATCHDOG=ydrivers/watchdog/Kconfig +1
-1@@ -38,7 +38,7 @@ config ULP_WATCHDOG config DESIGNWARE_WATCHDOG bool "Designware watchdog timer support" - select HW_WATCHDOG + select HW_WATCHDOG if !WDT help Enable this to support Designware Watchdog Timer IP, present e.g. on Altera SoCFPGA SoCs.drivers/watchdog/designware_wdt.c +27
-21@@ -4,7 +4,8 @@*/ #include <common.h> -#include <watchdog.h> +#include <dm.h> +#include <wdt.h> #include <asm/io.h> #include <asm/utils.h> @@ -17,46 +18,51 @@#define DW_WDT_CR_RMOD_VAL 0x00#define DW_WDT_CRR_RESTART_VAL 0x76 +struct designware_wdt_priv { +void __iomem *base; +}; +/* * Set the watchdog time interval. * Counter is 32 bit. */ -static int designware_wdt_settimeout (unsigned int timeout) +static int designware_wdt_settimeout (void __iomem *base,unsigned int clk_khz, +unsigned int timeout) {signed int i;/* calculate the timeout range value */ - i = (log_2_n_round_up (timeout *CONFIG_DW_WDT_CLOCK_KHZ )) -16 ; -if (i >15 ) - i =15 ; -if (i <0 ) - i =0 ; + i =log_2_n_round_up (timeout * clk_khz) -16 ; + i =clamp (i,0 ,15 ); + +writel (i | (i <<4 ), base +DW_WDT_TORR ); -writel ((i | (i <<4 )), (CONFIG_DW_WDT_BASE +DW_WDT_TORR ));return 0 ; } -static void designware_wdt_enable (void ) +static void designware_wdt_enable (void __iomem *base) { -writel (((DW_WDT_CR_RMOD_VAL <<DW_WDT_CR_RMOD_OFFSET ) | - (0x1 <<DW_WDT_CR_EN_OFFSET )), - (CONFIG_DW_WDT_BASE +DW_WDT_CR )); +writel ((DW_WDT_CR_RMOD_VAL <<DW_WDT_CR_RMOD_OFFSET ) | +BIT (DW_WDT_CR_EN_OFFSET ), + base +DW_WDT_CR ); } -static unsigned int designware_wdt_is_enabled (void ) +static unsigned int designware_wdt_is_enabled (void __iomem *base) { -unsigned long val; - val =readl ((CONFIG_DW_WDT_BASE +DW_WDT_CR )); -return val &0x1 ; +return readl (base +DW_WDT_CR ) &BIT (0 ); } -#if defined(CONFIG_HW_WATCHDOG ) -void hw_watchdog_reset (void ) +static void designware_wdt_reset_common (void __iomem *base) { -if (designware_wdt_is_enabled ()) +if (designware_wdt_is_enabled (base))/* restart the watchdog counter */ -writel (DW_WDT_CRR_RESTART_VAL , - (CONFIG_DW_WDT_BASE +DW_WDT_CRR )); +writel (DW_WDT_CRR_RESTART_VAL , base +DW_WDT_CRR ); +} + +#if !CONFIG_IS_ENABLED (WDT ) +void hw_watchdog_reset (void ) +{ +designware_wdt_reset_common ((void __iomem *)CONFIG_DW_WDT_BASE ); }void hw_watchdog_init (void )@@ -64,10 +70,80 @@ void hw_watchdog_init(void)/* reset to disable the watchdog */ hw_watchdog_reset ();
drivers/watchdog/designware_wdt.c void hw_watchdog_init(void) · line 79
Quoted 10 lines
drivers/watchdog/designware_wdt.c +4
-2/* set timer in miliseconds */ -designware_wdt_settimeout (CONFIG_WATCHDOG_TIMEOUT_MSECS ); +designware_wdt_settimeout ((void __iomem *)CONFIG_DW_WDT_BASE , +CONFIG_DW_WDT_CLOCK_KHZ , +CONFIG_WATCHDOG_TIMEOUT_MSECS );/* enable the watchdog */ -designware_wdt_enable (); +designware_wdt_enable ((void __iomem *)CONFIG_DW_WDT_BASE );/* reset the watchdog */ hw_watchdog_reset ();
In my "arm: socfpga: Convert drivers from struct to defines" patch series, I have moved spl_early_init() to the beginning of spl_board_f().
So, DM framework is initialized in early stage, you should able to use DM for watchdog in SPL too.
But, maybe need to add a wrapper function to probe watchdog device and start watchdog. Something like this:
uclass_get_device(UCLASS_WDT, 0, &dev);wdt_start(dev, CONFIG_WATCHDOG_TIMEOUT_MSECS, 0);
Quoted 8 lines
drivers/watchdog/designware_wdt.c +7
-0} +#else +static int designware_wdt_reset (struct udevice *dev) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); + +designware_wdt_reset_common (priv->base); +
drivers/watchdog/designware_wdt.c void hw_watchdog_init(void) · line 97
Quoted 10 lines
drivers/watchdog/designware_wdt.c +10
-0+return 0 ; +} + +static int designware_wdt_stop (struct udevice *dev) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); + +designware_wdt_reset (dev); +writel (DW_WDT_CR_RMOD_VAL <<DW_WDT_CR_RMOD_OFFSET , + priv->base +DW_WDT_CR );
Still no fixing clear BIT(DW_WDT_CR_EN_OFFSET) in CR register to disable watchdog.
Quoted 13 lines
drivers/watchdog/designware_wdt.c +13
-0+ +return 0 ; +} + +static int designware_wdt_start (struct udevice *dev,u64 timeout,ulong flags) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); + +designware_wdt_stop (dev); + +/* set timer in miliseconds */ +designware_wdt_settimeout (priv->base,CONFIG_DW_WDT_CLOCK_KHZ , timeout); +
drivers/watchdog/designware_wdt.c void hw_watchdog_init(void) · line 120
Quoted 10 lines
drivers/watchdog/designware_wdt.c +10
-0+designware_wdt_enable (priv->base); + +/* reset the watchdog */ +return designware_wdt_reset (dev); +} + +static int designware_wdt_probe (struct udevice *dev) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); +
Need de-assert watchdog reset using reset framework function, reset_get_bulk().
Quoted 48 lines
drivers/watchdog/designware_wdt.c +28
-0+ priv->base =dev_remap_addr (dev); +if (!priv->base) +return -EINVAL ; + +/* reset to disable the watchdog */ + return designware_wdt_stop(dev); +} + +static const struct wdt_ops designware_wdt_ops = { + .start = designware_wdt_start, + .reset = designware_wdt_reset, + .stop = designware_wdt_stop, +}; + +static const struct udevice_id designware_wdt_ids[] = { + { .compatible ="snps,dw-wdt" }, + {} +}; + +U_BOOT_DRIVER (designware_wdt) = { + .name ="designware_wdt" , + .id =UCLASS_WDT , + .of_match = designware_wdt_ids, + .priv_auto_alloc_size =sizeof (struct designware_wdt_priv ), + .probe = designware_wdt_probe, + .ops = &designware_wdt_ops, + .flags =DM_FLAG_PRE_RELOC , +};#endif include/configs/socfpga_stratix10_socdk.h +1
-1@@ -161,6 +161,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);* L4 Watchdog */ #ifdef CONFIG_SPL_BUILD +#undef CONFIG_WATCHDOG#define CONFIG_HW_WATCHDOG #else #undef CONFIG_HW_WATCHDOG --2.23.0
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH v2 2/3 watchdog: designware: Convert to DM and DT probing
Quoted 8 lines · Ley Foon Tan
Quoted 4 lines · Marek Vasut
Convert the designware watchdog timer driver to DM and add DT probing support. Perform minor coding style clean up, like drop superfluous braces. There ought to be no functional change.
All watchdog DT nodes with compatible "snps,dw-wdt" need to add "u-boot,dm-pre-reloc;".
Only those boards which actually use the WDT, right ? That is, these two boards below.
Quoted 8 lines
Quoted 6 lines
---
V2: - Support both DM and non-DM probing
- Fix watchdog stop handling by setting CR bit--- configs/socfpga_stratix10_defconfig | 2 + configs/socfpga_vining_fpga_defconfig | 1 +Same here. All socfpga defconfig files need to add
CONFIG_WDT.
Only those two, since only those two boards enable the WDT, no ?
[...]
Quoted 23 lines
Quoted 4 lines
void
hw_watchdog_init(void)drivers/watchdog/designware_wdt.c +0
-0@@ -64,10 +70,80 @@ void hw_watchdog_init(void)/* reset to disable the watchdog */ hw_watchdog_reset ();drivers/watchdog/designware_wdt.c void hw_watchdog_init(void) · line 79
Quoted 10 lines
drivers/watchdog/designware_wdt.c +4
-2/* set timer in miliseconds */ -designware_wdt_settimeout (CONFIG_WATCHDOG_TIMEOUT_MSECS ); +designware_wdt_settimeout ((void __iomem *)CONFIG_DW_WDT_BASE , +CONFIG_DW_WDT_CLOCK_KHZ , +CONFIG_WATCHDOG_TIMEOUT_MSECS );/* enable the watchdog */ -designware_wdt_enable (); +designware_wdt_enable ((void __iomem *)CONFIG_DW_WDT_BASE );/* reset the watchdog */ hw_watchdog_reset ();In my "arm: socfpga: Convert drivers from struct to defines" patch series, I have moved
spl_early_init()to the beginning ofspl_board_f().
So, DM framework is initialized in early stage, you should able to use DM for watchdog in SPL too.
But, maybe need to add a wrapper function to probe watchdog device and start watchdog. Something like this:
Quoted 2 lines
uclass_get_device(UCLASS_WDT, 0, &dev);wdt_start(dev, CONFIG_WATCHDOG_TIMEOUT_MSECS, 0);
Except this driver is not used only on SoCFPGA.
So the question is, with your conversion series, will there be boards left which use non-DM version of this WDT driver ?
Quoted 13 lines
Quoted 13 lines
drivers/watchdog/designware_wdt.c +12
-0} +#else +static int designware_wdt_reset (struct udevice *dev) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); + +designware_wdt_reset_common (priv->base); + +return 0 ; +} + +static int designware_wdt_stop (struct udevice *dev) +{
Quoted 8 lines
drivers/watchdog/designware_wdt.c void hw_watchdog_init(void) · line 97
Quoted 5 lines
drivers/watchdog/designware_wdt.c +5
-0+struct designware_wdt_priv *priv =dev_get_priv (dev); + +designware_wdt_reset (dev); +writel (DW_WDT_CR_RMOD_VAL <<DW_WDT_CR_RMOD_OFFSET , + priv->base +DW_WDT_CR );Still no fixing clear
BIT(DW_WDT_CR_EN_OFFSET)in CR register to disable watchdog.
I guess we an just write 0 to the CR register and get rid of RMOD_VAL altogether ?
Quoted 17 lines
Quoted 17 lines
drivers/watchdog/designware_wdt.c +17
-0+ +return 0 ; +} + +static int designware_wdt_start (struct udevice *dev,u64 timeout,ulong flags) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); + +designware_wdt_stop (dev); + +/* set timer in miliseconds */ +designware_wdt_settimeout (priv->base,CONFIG_DW_WDT_CLOCK_KHZ , timeout); + +designware_wdt_enable (priv->base); + +/* reset the watchdog */ +return designware_wdt_reset (dev);
Quoted 8 lines
drivers/watchdog/designware_wdt.c void hw_watchdog_init(void) · line 120
Quoted 6 lines
drivers/watchdog/designware_wdt.c +6
-0+} + +static int designware_wdt_probe (struct udevice *dev) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); +Need de-assert watchdog reset using reset framework function,
reset_get_bulk().
Ah yes, and make it presumably optional.
[...]
PATCH v2 2/3 watchdog: designware: Convert to DM and DT probing
In reply to Marek VasutAm 03.10.2019 um 14:59 schrieb Marek Vasut:
Quoted 231 lines
Convert the designware watchdog timer driver to DM and add DT probing support. Perform minor coding style clean up, like drop superfluous braces. There ought to be no functional change.
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dalon Westergreen <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Jagan Teki <[email protected]>Cc Ley Foon Tan <[email protected]>Cc Philipp Tomisch <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>---
V2: - Support both DM and non-DM probing
- Fix watchdog stop handling by setting CR bit--- configs/socfpga_stratix10_defconfig | 2 + configs/socfpga_vining_fpga_defconfig | 1 + drivers/watchdog/Kconfig | 2 +- drivers/watchdog/designware_wdt.c | 122 ++++++++++++++++++---- include/configs/socfpga_stratix10_socdk.h | 1 + 5 files changed, 104 insertions(+), 24 deletions(-)configs/socfpga_stratix10_defconfig +2
-0@@ -57,3 +57,5 @@ CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y CONFIG_DESIGNWARE_WATCHDOG=y +CONFIG_WDT=y +# CONFIG_SPL_WDT is not setconfigs/socfpga_vining_fpga_defconfig +1
-0@@ -91,4 +91,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_WDT=y CONFIG_DESIGNWARE_WATCHDOG=ydrivers/watchdog/Kconfig +1
-1@@ -38,7 +38,7 @@ config ULP_WATCHDOG config DESIGNWARE_WATCHDOG bool "Designware watchdog timer support" - select HW_WATCHDOG + select HW_WATCHDOG if !WDT help Enable this to support Designware Watchdog Timer IP, present e.g. on Altera SoCFPGA SoCs.drivers/watchdog/designware_wdt.c +99
-23@@ -4,7 +4,8 @@*/ #include <common.h> -#include <watchdog.h> +#include <dm.h> +#include <wdt.h> #include <asm/io.h> #include <asm/utils.h> @@ -17,46 +18,51 @@#define DW_WDT_CR_RMOD_VAL 0x00#define DW_WDT_CRR_RESTART_VAL 0x76 +struct designware_wdt_priv { +void __iomem *base; +}; +/* * Set the watchdog time interval. * Counter is 32 bit. */ -static int designware_wdt_settimeout (unsigned int timeout) +static int designware_wdt_settimeout (void __iomem *base,unsigned int clk_khz, +unsigned int timeout) {signed int i;/* calculate the timeout range value */ - i = (log_2_n_round_up (timeout *CONFIG_DW_WDT_CLOCK_KHZ )) -16 ; -if (i >15 ) - i =15 ; -if (i <0 ) - i =0 ; + i =log_2_n_round_up (timeout * clk_khz) -16 ; + i =clamp (i,0 ,15 ); + +writel (i | (i <<4 ), base +DW_WDT_TORR ); -writel ((i | (i <<4 )), (CONFIG_DW_WDT_BASE +DW_WDT_TORR ));return 0 ; } -static void designware_wdt_enable (void ) +static void designware_wdt_enable (void __iomem *base) { -writel (((DW_WDT_CR_RMOD_VAL <<DW_WDT_CR_RMOD_OFFSET ) | - (0x1 <<DW_WDT_CR_EN_OFFSET )), - (CONFIG_DW_WDT_BASE +DW_WDT_CR )); +writel ((DW_WDT_CR_RMOD_VAL <<DW_WDT_CR_RMOD_OFFSET ) | +BIT (DW_WDT_CR_EN_OFFSET ), + base +DW_WDT_CR ); } -static unsigned int designware_wdt_is_enabled (void ) +static unsigned int designware_wdt_is_enabled (void __iomem *base) { -unsigned long val; - val =readl ((CONFIG_DW_WDT_BASE +DW_WDT_CR )); -return val &0x1 ; +return readl (base +DW_WDT_CR ) &BIT (0 ); } -#if defined(CONFIG_HW_WATCHDOG ) -void hw_watchdog_reset (void ) +static void designware_wdt_reset_common (void __iomem *base) { -if (designware_wdt_is_enabled ()) +if (designware_wdt_is_enabled (base))/* restart the watchdog counter */ -writel (DW_WDT_CRR_RESTART_VAL , - (CONFIG_DW_WDT_BASE +DW_WDT_CRR )); +writel (DW_WDT_CRR_RESTART_VAL , base +DW_WDT_CRR ); +} + +#if !CONFIG_IS_ENABLED (WDT ) +void hw_watchdog_reset (void ) +{ +designware_wdt_reset_common ((void __iomem *)CONFIG_DW_WDT_BASE ); }void hw_watchdog_init (void )@@ -64,10 +70,80 @@ void hw_watchdog_init(void)/* reset to disable the watchdog */ hw_watchdog_reset ();/* set timer in miliseconds */ -designware_wdt_settimeout (CONFIG_WATCHDOG_TIMEOUT_MSECS ); +designware_wdt_settimeout ((void __iomem *)CONFIG_DW_WDT_BASE , +CONFIG_DW_WDT_CLOCK_KHZ , +CONFIG_WATCHDOG_TIMEOUT_MSECS );/* enable the watchdog */ -designware_wdt_enable (); +designware_wdt_enable ((void __iomem *)CONFIG_DW_WDT_BASE );/* reset the watchdog */ hw_watchdog_reset (); } +#else +static int designware_wdt_reset (struct udevice *dev) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); + +designware_wdt_reset_common (priv->base); + +return 0 ; +} + +static int designware_wdt_stop (struct udevice *dev) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); + +designware_wdt_reset (dev); +writel (DW_WDT_CR_RMOD_VAL <<DW_WDT_CR_RMOD_OFFSET , + priv->base +DW_WDT_CR ); + +return 0 ; +} + +static int designware_wdt_start (struct udevice *dev,u64 timeout,ulong flags) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); + +designware_wdt_stop (dev); + +/* set timer in miliseconds */ +designware_wdt_settimeout (priv->base,CONFIG_DW_WDT_CLOCK_KHZ , timeout); + +designware_wdt_enable (priv->base); + +/* reset the watchdog */ +return designware_wdt_reset (dev); +} + +static int designware_wdt_probe (struct udevice *dev) +{ +struct designware_wdt_priv *priv =dev_get_priv (dev); + + priv->base =dev_remap_addr (dev); +if (!priv->base) +return -EINVAL ; + +/* reset to disable the watchdog */ +return designware_wdt_stop (dev); +} + +static const struct wdt_ops designware_wdt_ops = { + .start = designware_wdt_start, + .reset = designware_wdt_reset, + .stop = designware_wdt_stop, +}; + +static const struct udevice_id designware_wdt_ids[] = { + { .compatible ="snps,dw-wdt" }, + {} +}; + +U_BOOT_DRIVER (designware_wdt) = { + .name ="designware_wdt" , + .id =UCLASS_WDT , + .of_match = designware_wdt_ids, + .priv_auto_alloc_size =sizeof (struct designware_wdt_priv ), + .probe = designware_wdt_probe, + .ops = &designware_wdt_ops, + .flags =DM_FLAG_PRE_RELOC , +};#endif include/configs/socfpga_stratix10_socdk.h +0
-0
include/configs/socfpga_stratix10_socdk.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 164
Quoted 4 lines
include/configs/socfpga_stratix10_socdk.h +1
-0@@ -161,6 +161,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);* L4 Watchdog */ #ifdef CONFIG_SPL_BUILD +#undef CONFIG_WATCHDOG
I somehow missed this series.
Why is this line here?
Other than that:
Regards,
Simon
Quoted 4 lines
include/configs/socfpga_stratix10_socdk.h +0
-0#define CONFIG_HW_WATCHDOG #else #undef CONFIG_HW_WATCHDOG
PATCH v2 2/3 watchdog: designware: Convert to DM and DT probing
On 11/7/19 8:30 PM, Simon Goldschmidt wrote:
[...]
Quoted 5 lines
Quoted 5 lines
include/configs/socfpga_stratix10_socdk.h +0
-0
Quoted 8 lines
include/configs/socfpga_stratix10_socdk.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 164
Quoted 5 lines
include/configs/socfpga_stratix10_socdk.h +1
-0@@ -161,6 +161,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);* L4 Watchdog */ #ifdef CONFIG_SPL_BUILD +#undef CONFIG_WATCHDOGI somehow missed this series.
Why is this line here?
To avoid using DM watchdog in SPL on S10.
PATCH v2 2/3 watchdog: designware: Convert to DM and DT probing
In reply to Marek VasutHi Marek,
Quoted 14 lines · Marek Vasut
Convert the designware watchdog timer driver to DM and add DT probing support. Perform minor coding style clean up, like drop superfluous braces. There ought to be no functional change.
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dalon Westergreen <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Jagan Teki <[email protected]>Cc Ley Foon Tan <[email protected]>Cc Philipp Tomisch <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>
Quoted 4 lines
---
V2: - Support both DM and non-DM probing
- Fix watchdog stop handling by setting CR bit
---
Please resend on top of master, would like to check it on rockchip.
Jagan.
PATCH v2 2/3 watchdog: designware: Convert to DM and DT probing
Quoted 22 lines · Jagan Teki
Hi Marek,
Quoted 14 lines · Marek Vasut
Convert the designware watchdog timer driver to DM and add DT probing support. Perform minor coding style clean up, like drop superfluous braces. There ought to be no functional change.
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dalon Westergreen <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Jagan Teki <[email protected]>Cc Ley Foon Tan <[email protected]>Cc Philipp Tomisch <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>Quoted 4 lines
---
V2: - Support both DM and non-DM probing
- Fix watchdog stop handling by setting CR bit
---
Quoted 1 line
Please resend on top of master, would like to check it on rockchip.
Done, please give it a try.
PATCH v2 3/3 watchdog: designware: Optionally fetch clock from DT
In reply to Marek VasutAdd optional support for fetching watchdog clock rate from DT. This is optional as not all platforms using DW WDT support the clock framework yet.
---
V2: - New patch
--- drivers/watchdog/designware_wdt.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/watchdog/designware_wdt.c +16 -1
@@ -20,6 +20,7 @@struct designware_wdt_priv {void __iomem *base; +unsigned int clk_khz; };/*
@@ -106,7 +107,7 @@ static int designware_wdt_start(struct udevice *dev, u64 timeout, ulong flags)designware_wdt_stop (dev);/* set timer in miliseconds */ -designware_wdt_settimeout (priv->base,CONFIG_DW_WDT_CLOCK_KHZ , timeout); +designware_wdt_settimeout (priv->base, priv->clk_khz, timeout);designware_wdt_enable (priv->base);
@@ -122,6 +123,20 @@ static int designware_wdt_probe(struct udevice *dev)if (!priv->base)return -EINVAL ; +#if CONFIG_IS_ENABLED (CLK ) +struct clk clk; + + ret =clk_get_by_index (dev,0 , &clk); +if (ret) +return ret; + + priv->clk_khz =clk_get_rate (&clk); +if (!priv->clk_khz) +return -EINVAL ; +#else + priv->clk_khz =CONFIG_DW_WDT_CLOCK_KHZ ; +#endif +/* reset to disable the watchdog */ return designware_wdt_stop (dev); }
Signature · 1 line
2.23.0
PATCH v2 1/3 watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig
In reply to Marek VasutQuoted 15 lines · Marek Vasut
Migrate
CONFIG_DESIGNWARE_WATCHDOGtoKconfigand update the headers accordingly, no functional change. The S10 enables the WDT only in SPL, but does not enable it in U-Boot itself, hence disable it in the config again.Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dalon Westergreen <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Jagan Teki <[email protected]>Cc Ley Foon Tan <[email protected]>Cc Philipp Tomisch <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>
Quoted 5 lines
---
V2: Use non-DM watchdog in SPL on S10--- configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 +
All socfpga deconfig files need to add CONFIG_DESIGNWARE_WATCHDOG too. socfpga_common.h is used by Gen5 and A10 platform.
Regards
Ley Foon
Quoted 101 lines
drivers/watchdog/Kconfig | 7 +++++++ include/configs/socfpga_common.h | 3 --- include/configs/socfpga_stratix10_socdk.h | 6 ++++-- scripts/config_whitelist.txt | 1 - 6 files changed, 13 insertions(+), 6 deletions(-)configs/socfpga_stratix10_defconfig CONFIG_DESIGNWARE_WATCHDOG renamed from configs/socfpga_stratix10_defconfig +1
-0@@ -56,3 +56,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_DESIGNWARE_WATCHDOG=yconfigs/socfpga_vining_fpga_defconfig +1
-0@@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_DESIGNWARE_WATCHDOG=ydrivers/watchdog/Kconfig +7
-0@@ -36,6 +36,13 @@ config ULP_WATCHDOG help Say Y here to enable i.MX7ULP watchdog driver. +config DESIGNWARE_WATCHDOG + bool "Designware watchdog timer support" + select HW_WATCHDOG + help + Enable this to support Designware Watchdog Timer IP, present e.g. + on Altera SoCFPGA SoCs. + config WDT bool "Enable driver model for watchdog timer drivers" depends on DMinclude/configs/socfpga_common.h +0
-3@@ -104,12 +104,9 @@/* * L4 Watchdog */ -#ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#define CONFIG_DW_WDT_CLOCK_KHZ 25000#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 -#endif /* * MMC Driver include/configs/socfpga_stratix10_socdk.h +4
-2@@ -162,14 +162,16 @@ unsigned int cm_get_qspi_controller_clk_hz(void);*/ #ifdef CONFIG_SPL_BUILD #define CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG +#else +#undef CONFIG_HW_WATCHDOG +#undef CONFIG_DESIGNWARE_WATCHDOG +#endif #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#ifndef __ASSEMBLY__unsigned int cm_get_l4_sys_free_clk_hz (void );#define CONFIG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000)#endif #define CONFIG_WATCHDOG_TIMEOUT_MSECS 3000 -#endif /* * SPL memory layout scripts/config_whitelist.txt +0
-2@@ -320,7 +320,6 @@ CONFIG_DEFAULT_IMMR CONFIG_DEF_HWCONFIG CONFIG_DELAY_ENVIRONMENT CONFIG_DESIGNWARE_ETH -CONFIG_DESIGNWARE_WATCHDOG CONFIG_DEVELOP CONFIG_DEVICE_TREE_LIST CONFIG_DFU_ALT --2.23.0
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
PATCH v2 1/3 watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig
Quoted 12 lines · Ley Foon Tan
Quoted 10 lines · Marek Vasut
Migrate
CONFIG_DESIGNWARE_WATCHDOGtoKconfigand update the headers accordingly, no functional change. The S10 enables the WDT only in SPL, but does not enable it in U-Boot itself, hence disable it in the config again.
---
V2: Use non-DM watchdog in SPL on S10--- configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 +
Quoted 2 lines
All socfpga deconfig files need to add
CONFIG_DESIGNWARE_WATCHDOGtoo.socfpga_common.his used by Gen5 and A10 platform.
Only those which defined CONFIG_HW_WATCHDOG need to enable the CONFIG_DESIGNWARE_WATCHDOG, right ? (see below)
[...]
Quoted 14 lines
Quoted 14 lines
include/configs/socfpga_common.h +0
-3@@ -104,12 +104,9 @@/* * L4 Watchdog */ -#ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#define CONFIG_DW_WDT_CLOCK_KHZ 25000#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 -#endif
[...]
PATCH v2 1/3 watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig
Quoted 14 lines · Marek Vasut
Quoted 12 lines · Ley Foon Tan
Quoted 10 lines · Marek Vasut
Migrate
CONFIG_DESIGNWARE_WATCHDOGtoKconfigand update the headers accordingly, no functional change. The S10 enables the WDT only in SPL, but does not enable it in U-Boot itself, hence disable it in the config again.
---
V2: Use non-DM watchdog in SPL on S10--- configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 +
Quoted 5 lines
Quoted 2 lines
All socfpga deconfig files need to add
CONFIG_DESIGNWARE_WATCHDOGtoo.socfpga_common.his used by Gen5 and A10 platform.Only those which defined
CONFIG_HW_WATCHDOGneed to enable theCONFIG_DESIGNWARE_WATCHDOG, right ? (see below)
$ git grep socfpga_common.h include/configs/socfpga_arria10_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_arria5_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_cyclone5_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_dbm_soc1.h:#include <configs/socfpga_common.h> include/configs/socfpga_de0_nano_soc.h:#include <configs/socfpga_common.h> include/configs/socfpga_de10_nano.h:#include <configs/socfpga_common.h> include/configs/socfpga_de1_soc.h:#include <configs/socfpga_common.h> include/configs/socfpga_is1.h:#include <configs/socfpga_common.h> include/configs/socfpga_mcvevk.h:#include <configs/socfpga_common.h> include/configs/socfpga_sockit.h:#include <configs/socfpga_common.h> include/configs/socfpga_socrates.h:#include <configs/socfpga_common.h> include/configs/socfpga_sr1500.h:#include <configs/socfpga_common.h> include/configs/socfpga_vining_fpga.h:#include <configs/socfpga_common.h>
These platforms include socfpga_common.h file, so their _defconfig need to update too.
Quoted 19 lines
[...]
Quoted 14 lines
Quoted 14 lines
include/configs/socfpga_common.h +0
-3@@ -104,12 +104,9 @@/* * L4 Watchdog */ -#ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#define CONFIG_DW_WDT_CLOCK_KHZ 25000#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 -#endif [...]
PATCH v2 1/3 watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig
Quoted 36 lines · Ley Foon Tan
Quoted 14 lines · Marek Vasut
Quoted 12 lines · Ley Foon Tan
Quoted 10 lines · Marek Vasut
Migrate
CONFIG_DESIGNWARE_WATCHDOGtoKconfigand update the headers accordingly, no functional change. The S10 enables the WDT only in SPL, but does not enable it in U-Boot itself, hence disable it in the config again.
---
V2: Use non-DM watchdog in SPL on S10--- configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 +Quoted 5 lines
Quoted 2 lines
All socfpga deconfig files need to add
CONFIG_DESIGNWARE_WATCHDOGtoo.socfpga_common.his used by Gen5 and A10 platform.Only those which defined
CONFIG_HW_WATCHDOGneed to enable theCONFIG_DESIGNWARE_WATCHDOG, right ? (see below)$ git grep socfpga_common.h include/configs/socfpga_arria10_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_arria5_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_cyclone5_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_dbm_soc1.h:#include <configs/socfpga_common.h> include/configs/socfpga_de0_nano_soc.h:#include <configs/socfpga_common.h> include/configs/socfpga_de10_nano.h:#include <configs/socfpga_common.h> include/configs/socfpga_de1_soc.h:#include <configs/socfpga_common.h> include/configs/socfpga_is1.h:#include <configs/socfpga_common.h> include/configs/socfpga_mcvevk.h:#include <configs/socfpga_common.h> include/configs/socfpga_sockit.h:#include <configs/socfpga_common.h> include/configs/socfpga_socrates.h:#include <configs/socfpga_common.h> include/configs/socfpga_sr1500.h:#include <configs/socfpga_common.h> include/configs/socfpga_vining_fpga.h:#include <configs/socfpga_common.h>
Quoted 2 lines
These platforms include
socfpga_common.hfile, so their_defconfigneed to update too.
They don't enable HW_WATCHDOG, so it doesn't ... or ?
Quoted 18 lines
Quoted 18 lines
[...]
Quoted 14 lines
Quoted 14 lines
include/configs/socfpga_common.h +0
-3@@ -104,12 +104,9 @@/* * L4 Watchdog */ -#ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#define CONFIG_DW_WDT_CLOCK_KHZ 25000#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 -#endif [...]
Signature · 2 lines
Best regards, Marek Vasut
PATCH v2 1/3 watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig
Quoted 38 lines · Marek Vasut
Quoted 36 lines · Ley Foon Tan
Quoted 14 lines · Marek Vasut
Quoted 12 lines · Ley Foon Tan
Quoted 10 lines · Marek Vasut
Migrate
CONFIG_DESIGNWARE_WATCHDOGtoKconfigand update the headers accordingly, no functional change. The S10 enables the WDT only in SPL, but does not enable it in U-Boot itself, hence disable it in the config again.
---
V2: Use non-DM watchdog in SPL on S10--- configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 +Quoted 5 lines
Quoted 2 lines
All socfpga deconfig files need to add
CONFIG_DESIGNWARE_WATCHDOGtoo.socfpga_common.his used by Gen5 and A10 platform.Only those which defined
CONFIG_HW_WATCHDOGneed to enable theCONFIG_DESIGNWARE_WATCHDOG, right ? (see below)$ git grep socfpga_common.h include/configs/socfpga_arria10_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_arria5_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_cyclone5_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_dbm_soc1.h:#include <configs/socfpga_common.h> include/configs/socfpga_de0_nano_soc.h:#include <configs/socfpga_common.h> include/configs/socfpga_de10_nano.h:#include <configs/socfpga_common.h> include/configs/socfpga_de1_soc.h:#include <configs/socfpga_common.h> include/configs/socfpga_is1.h:#include <configs/socfpga_common.h> include/configs/socfpga_mcvevk.h:#include <configs/socfpga_common.h> include/configs/socfpga_sockit.h:#include <configs/socfpga_common.h> include/configs/socfpga_socrates.h:#include <configs/socfpga_common.h> include/configs/socfpga_sr1500.h:#include <configs/socfpga_common.h> include/configs/socfpga_vining_fpga.h:#include <configs/socfpga_common.h>
Quoted 4 lines
Quoted 2 lines
These platforms include
socfpga_common.hfile, so their_defconfigneed to update too.They don't enable
HW_WATCHDOG, so it doesn't ... or ?
Sorry, I see wrongly. I thought HW_WATCHDOG is defined in socfpga_common.h. Then no problem now.
Regards
Ley Foon
Quoted 24 lines
Quoted 19 lines
Quoted 19 lines
[...]
Quoted 14 lines
Quoted 14 lines
include/configs/socfpga_common.h +0
-3@@ -104,12 +104,9 @@/* * L4 Watchdog */ -#ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#define CONFIG_DW_WDT_CLOCK_KHZ 25000#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 -#endif [...]
--
Best regards,
Marek Vasut
PATCH v2 1/3 watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig
Quoted 39 lines · Ley Foon Tan
Quoted 38 lines · Marek Vasut
Quoted 36 lines · Ley Foon Tan
Quoted 14 lines · Marek Vasut
Quoted 12 lines · Ley Foon Tan
Quoted 10 lines · Marek Vasut
Migrate
CONFIG_DESIGNWARE_WATCHDOGtoKconfigand update the headers accordingly, no functional change. The S10 enables the WDT only in SPL, but does not enable it in U-Boot itself, hence disable it in the config again.
---
V2: Use non-DM watchdog in SPL on S10--- configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 +Quoted 5 lines
Quoted 2 lines
All socfpga deconfig files need to add
CONFIG_DESIGNWARE_WATCHDOGtoo.socfpga_common.his used by Gen5 and A10 platform.Only those which defined
CONFIG_HW_WATCHDOGneed to enable theCONFIG_DESIGNWARE_WATCHDOG, right ? (see below)$ git grep socfpga_common.h include/configs/socfpga_arria10_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_arria5_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_cyclone5_socdk.h:#include <configs/socfpga_common.h> include/configs/socfpga_dbm_soc1.h:#include <configs/socfpga_common.h> include/configs/socfpga_de0_nano_soc.h:#include <configs/socfpga_common.h> include/configs/socfpga_de10_nano.h:#include <configs/socfpga_common.h> include/configs/socfpga_de1_soc.h:#include <configs/socfpga_common.h> include/configs/socfpga_is1.h:#include <configs/socfpga_common.h> include/configs/socfpga_mcvevk.h:#include <configs/socfpga_common.h> include/configs/socfpga_sockit.h:#include <configs/socfpga_common.h> include/configs/socfpga_socrates.h:#include <configs/socfpga_common.h> include/configs/socfpga_sr1500.h:#include <configs/socfpga_common.h> include/configs/socfpga_vining_fpga.h:#include <configs/socfpga_common.h>
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
These platforms include
socfpga_common.hfile, so their_defconfigneed to update too.They don't enable
HW_WATCHDOG, so it doesn't ... or ?Sorry, I see wrongly. I thought
HW_WATCHDOGis defined insocfpga_common.h. Then no problem now.
Sorry for the late reply.
Are we OK with this patch then ?
PATCH v2 1/3 watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig
In reply to Marek VasutAm 03.10.2019 um 14:59 schrieb Marek Vasut:
Quoted 5 lines
Migrate
CONFIG_DESIGNWARE_WATCHDOGtoKconfigand update the headers accordingly, no functional change. The S10 enables the WDT only in SPL, but does not enable it in U-Boot itself, hence disable it in the config again.
Quoted 9 lines
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dalon Westergreen <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Jagan Teki <[email protected]>Cc Ley Foon Tan <[email protected]>Cc Philipp Tomisch <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>
Quoted 100 lines
---
V2: Use non-DM watchdog in SPL on S10--- configs/socfpga_stratix10_defconfig | 1 + configs/socfpga_vining_fpga_defconfig | 1 + drivers/watchdog/Kconfig | 7 +++++++ include/configs/socfpga_common.h | 3 --- include/configs/socfpga_stratix10_socdk.h | 6 ++++-- scripts/config_whitelist.txt | 1 - 6 files changed, 13 insertions(+), 6 deletions(-)configs/socfpga_stratix10_defconfig +1
-0@@ -56,3 +56,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_DWC2=y CONFIG_USB_STORAGE=y +CONFIG_DESIGNWARE_WATCHDOG=yconfigs/socfpga_vining_fpga_defconfig +1
-0@@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_DESIGNWARE_WATCHDOG=ydrivers/watchdog/Kconfig +7
-0@@ -36,6 +36,13 @@ config ULP_WATCHDOG help Say Y here to enable i.MX7ULP watchdog driver. +config DESIGNWARE_WATCHDOG + bool "Designware watchdog timer support" + select HW_WATCHDOG + help + Enable this to support Designware Watchdog Timer IP, present e.g. + on Altera SoCFPGA SoCs. + config WDT bool "Enable driver model for watchdog timer drivers" depends on DMinclude/configs/socfpga_common.h +0
-3@@ -104,12 +104,9 @@/* * L4 Watchdog */ -#ifdef CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#define CONFIG_DW_WDT_CLOCK_KHZ 25000#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 -#endif /* * MMC Driver include/configs/socfpga_stratix10_socdk.h +4
-2@@ -162,14 +162,16 @@ unsigned int cm_get_qspi_controller_clk_hz(void);*/ #ifdef CONFIG_SPL_BUILD #define CONFIG_HW_WATCHDOG -#define CONFIG_DESIGNWARE_WATCHDOG +#else +#undef CONFIG_HW_WATCHDOG +#undef CONFIG_DESIGNWARE_WATCHDOG +#endif #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS#ifndef __ASSEMBLY__unsigned int cm_get_l4_sys_free_clk_hz (void );#define CONFIG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000)#endif #define CONFIG_WATCHDOG_TIMEOUT_MSECS 3000 -#endif /* * SPL memory layout scripts/config_whitelist.txt +0
-1@@ -320,7 +320,6 @@ CONFIG_DEFAULT_IMMR CONFIG_DEF_HWCONFIG CONFIG_DELAY_ENVIRONMENT CONFIG_DESIGNWARE_ETH -CONFIG_DESIGNWARE_WATCHDOG CONFIG_DEVELOP CONFIG_DEVICE_TREE_LIST CONFIG_DFU_ALT