From: Kever Yang <kever.yang@rock-chips.com> To: Jagan Teki <jagan@amarulasolutions.com>, Simon Glass <sjg@chromium.org>, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Cc: Chin-Liang See <clsee@altera.com>, u-boot@lists.denx.de, Akash Gajjar <akash@openedev.com>, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: Re: [PATCH 09/15] wdt: dw: Rename to dw_wdt.c Date: Mon, 5 Aug 2019 20:40:17 +0800 [thread overview] Message-ID: <e7507f4e-de8d-e61c-5538-0a3cc203ceba@rock-chips.com> (raw) In-Reply-To: <20190729074711.16988-10-jagan@amarulasolutions.com> On 2019/7/29 下午3:47, Jagan Teki wrote: > - use dw instead of designware for driver file since > Linux following the same. > - add CONFIG macro start with CONFIG_WDT since the > driver mode wdt drivers follow this. > > Cc: Dinh Nguyen <dinguyen@kernel.org> > Cc: Chin-Liang See <clsee@altera.com> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > common/board_f.c | 2 +- > drivers/watchdog/Makefile | 2 +- > drivers/watchdog/{designware_wdt.c => dw_wdt.c} | 0 > include/configs/socfpga_common.h | 2 +- > include/configs/socfpga_stratix10_socdk.h | 2 +- > scripts/config_whitelist.txt | 2 +- > 6 files changed, 5 insertions(+), 5 deletions(-) > rename drivers/watchdog/{designware_wdt.c => dw_wdt.c} (100%) > > diff --git a/common/board_f.c b/common/board_f.c > index 4760d728f3..79efef0792 100644 > --- a/common/board_f.c > +++ b/common/board_f.c > @@ -95,7 +95,7 @@ static int init_func_watchdog_init(void) > # if defined(CONFIG_HW_WATCHDOG) && \ > (defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \ > defined(CONFIG_SH) || \ > - defined(CONFIG_DESIGNWARE_WATCHDOG) || \ > + defined(CONFIG_WDT_DW) || \ > defined(CONFIG_IMX_WATCHDOG)) > hw_watchdog_init(); > puts(" Watchdog enabled\n"); > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index 68c989aa0b..a14fdabf8d 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -13,7 +13,6 @@ endif > obj-$(CONFIG_S5P) += s5p_wdt.o > obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o > obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o > -obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o > obj-$(CONFIG_ULP_WATCHDOG) += ulp_wdog.o > obj-$(CONFIG_WDT) += wdt-uclass.o > obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o > @@ -23,6 +22,7 @@ obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o > obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o > obj-$(CONFIG_WDT_ORION) += orion_wdt.o > obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o > +obj-$(CONFIG_WDT_DW) += dw_wdt.o > obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o > obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o > obj-$(CONFIG_WDT_MTK) += mtk_wdt.o > diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/dw_wdt.c > similarity index 100% > rename from drivers/watchdog/designware_wdt.c > rename to drivers/watchdog/dw_wdt.c > diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h > index d1034ac280..65f02eca2e 100644 > --- a/include/configs/socfpga_common.h > +++ b/include/configs/socfpga_common.h > @@ -105,7 +105,7 @@ > * L4 Watchdog > */ > #ifdef CONFIG_HW_WATCHDOG > -#define CONFIG_DESIGNWARE_WATCHDOG > +#define CONFIG_WDT_DW > #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS > #define CONFIG_DW_WDT_CLOCK_KHZ 25000 > #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 > diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h > index 8d2971c6e2..3582aec822 100644 > --- a/include/configs/socfpga_stratix10_socdk.h > +++ b/include/configs/socfpga_stratix10_socdk.h > @@ -161,7 +161,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); > */ > #ifdef CONFIG_SPL_BUILD > #define CONFIG_HW_WATCHDOG > -#define CONFIG_DESIGNWARE_WATCHDOG > +#define CONFIG_WDT_DW > #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS > #ifndef __ASSEMBLY__ > unsigned int cm_get_l4_sys_free_clk_hz(void); > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index e616f7229b..f2453728c6 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -323,7 +323,7 @@ CONFIG_DEFAULT_IMMR > CONFIG_DEF_HWCONFIG > CONFIG_DELAY_ENVIRONMENT > CONFIG_DESIGNWARE_ETH > -CONFIG_DESIGNWARE_WATCHDOG > +CONFIG_WDT_DW Is it better to define a WDT_DW in drivers/watchdog/Kconfig so that we don't need this white list? Thanks, - Kever > CONFIG_DEVELOP > CONFIG_DEVICE_TREE_LIST > CONFIG_DFU_ALT _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
WARNING: multiple messages have this Message-ID (diff)
From: Kever Yang <kever.yang@rock-chips.com> To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 09/15] wdt: dw: Rename to dw_wdt.c Date: Mon, 5 Aug 2019 20:40:17 +0800 [thread overview] Message-ID: <e7507f4e-de8d-e61c-5538-0a3cc203ceba@rock-chips.com> (raw) In-Reply-To: <20190729074711.16988-10-jagan@amarulasolutions.com> On 2019/7/29 下午3:47, Jagan Teki wrote: > - use dw instead of designware for driver file since > Linux following the same. > - add CONFIG macro start with CONFIG_WDT since the > driver mode wdt drivers follow this. > > Cc: Dinh Nguyen <dinguyen@kernel.org> > Cc: Chin-Liang See <clsee@altera.com> > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > common/board_f.c | 2 +- > drivers/watchdog/Makefile | 2 +- > drivers/watchdog/{designware_wdt.c => dw_wdt.c} | 0 > include/configs/socfpga_common.h | 2 +- > include/configs/socfpga_stratix10_socdk.h | 2 +- > scripts/config_whitelist.txt | 2 +- > 6 files changed, 5 insertions(+), 5 deletions(-) > rename drivers/watchdog/{designware_wdt.c => dw_wdt.c} (100%) > > diff --git a/common/board_f.c b/common/board_f.c > index 4760d728f3..79efef0792 100644 > --- a/common/board_f.c > +++ b/common/board_f.c > @@ -95,7 +95,7 @@ static int init_func_watchdog_init(void) > # if defined(CONFIG_HW_WATCHDOG) && \ > (defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \ > defined(CONFIG_SH) || \ > - defined(CONFIG_DESIGNWARE_WATCHDOG) || \ > + defined(CONFIG_WDT_DW) || \ > defined(CONFIG_IMX_WATCHDOG)) > hw_watchdog_init(); > puts(" Watchdog enabled\n"); > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index 68c989aa0b..a14fdabf8d 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -13,7 +13,6 @@ endif > obj-$(CONFIG_S5P) += s5p_wdt.o > obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o > obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o > -obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o > obj-$(CONFIG_ULP_WATCHDOG) += ulp_wdog.o > obj-$(CONFIG_WDT) += wdt-uclass.o > obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o > @@ -23,6 +22,7 @@ obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o > obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o > obj-$(CONFIG_WDT_ORION) += orion_wdt.o > obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o > +obj-$(CONFIG_WDT_DW) += dw_wdt.o > obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o > obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o > obj-$(CONFIG_WDT_MTK) += mtk_wdt.o > diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/dw_wdt.c > similarity index 100% > rename from drivers/watchdog/designware_wdt.c > rename to drivers/watchdog/dw_wdt.c > diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h > index d1034ac280..65f02eca2e 100644 > --- a/include/configs/socfpga_common.h > +++ b/include/configs/socfpga_common.h > @@ -105,7 +105,7 @@ > * L4 Watchdog > */ > #ifdef CONFIG_HW_WATCHDOG > -#define CONFIG_DESIGNWARE_WATCHDOG > +#define CONFIG_WDT_DW > #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS > #define CONFIG_DW_WDT_CLOCK_KHZ 25000 > #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 > diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h > index 8d2971c6e2..3582aec822 100644 > --- a/include/configs/socfpga_stratix10_socdk.h > +++ b/include/configs/socfpga_stratix10_socdk.h > @@ -161,7 +161,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); > */ > #ifdef CONFIG_SPL_BUILD > #define CONFIG_HW_WATCHDOG > -#define CONFIG_DESIGNWARE_WATCHDOG > +#define CONFIG_WDT_DW > #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS > #ifndef __ASSEMBLY__ > unsigned int cm_get_l4_sys_free_clk_hz(void); > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index e616f7229b..f2453728c6 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -323,7 +323,7 @@ CONFIG_DEFAULT_IMMR > CONFIG_DEF_HWCONFIG > CONFIG_DELAY_ENVIRONMENT > CONFIG_DESIGNWARE_ETH > -CONFIG_DESIGNWARE_WATCHDOG > +CONFIG_WDT_DW Is it better to define a WDT_DW in drivers/watchdog/Kconfig so that we don't need this white list? Thanks, - Kever > CONFIG_DEVELOP > CONFIG_DEVICE_TREE_LIST > CONFIG_DFU_ALT
next prev parent reply other threads:[~2019-08-05 12:40 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-29 7:46 [PATCH 00/15] rk3399: Add redundant boot support Jagan Teki 2019-07-29 7:46 ` [U-Boot] " Jagan Teki [not found] ` <20190729074711.16988-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> 2019-07-29 7:46 ` [PATCH 01/15] arm: rockchip: Add common cru.h Jagan Teki 2019-07-29 7:46 ` [U-Boot] " Jagan Teki [not found] ` <20190729074711.16988-2-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> 2019-08-05 12:25 ` Kever Yang 2019-08-05 12:25 ` [U-Boot] " Kever Yang 2019-08-25 17:25 ` Jagan Teki 2019-08-25 17:25 ` [U-Boot] " Jagan Teki 2019-07-29 7:46 ` [PATCH 02/15] rockchip: Add cpu-info Jagan Teki 2019-07-29 7:46 ` [U-Boot] " Jagan Teki [not found] ` <20190729074711.16988-3-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> 2019-08-05 12:27 ` Kever Yang 2019-08-05 12:27 ` [U-Boot] " Kever Yang 2019-07-29 7:46 ` [PATCH 03/15] rockchip: rk3288: Print reset reason Jagan Teki 2019-07-29 7:46 ` [U-Boot] " Jagan Teki [not found] ` <20190729074711.16988-4-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> 2019-07-29 7:57 ` Matthias Urlichs 2019-08-05 12:30 ` Kever Yang 2019-08-05 12:30 ` [U-Boot] " Kever Yang [not found] ` <98408a3c-84bd-d54b-1b3a-49901c85ba3c-TNX95d0MmH7DzftRWevZcw@public.gmane.org> 2019-08-14 9:40 ` Jagan Teki 2019-08-14 9:40 ` [U-Boot] " Jagan Teki 2019-08-14 10:43 ` Wadim Egorov 2019-08-14 10:43 ` [U-Boot] " Wadim Egorov 2019-08-14 10:46 ` Michael Nazzareno Trimarchi 2019-08-14 10:46 ` [U-Boot] " Michael Nazzareno Trimarchi 2019-07-29 7:47 ` [PATCH 04/15] rockchip: Add common " Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki 2019-07-29 7:47 ` [PATCH 05/15] rockchip: rk3288/rk3399: Enable DISPLAY_CPUINFO Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki 2019-08-05 12:35 ` Kever Yang 2019-08-05 12:35 ` [U-Boot] " Kever Yang 2019-07-29 7:47 ` [PATCH 06/15] wdt: designware: Simplify is_enabled function Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki 2019-07-29 7:47 ` [PATCH 07/15] wdt: designware: Simplify enable function Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki 2019-07-29 7:47 ` [PATCH 08/15] wdt: dw: Add driver-model support Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki [not found] ` <20190729074711.16988-9-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> 2019-07-29 9:09 ` Andy Shevchenko 2019-07-29 9:09 ` Andy Shevchenko 2019-07-29 7:47 ` [PATCH 09/15] wdt: dw: Rename to dw_wdt.c Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki 2019-08-05 12:40 ` Kever Yang [this message] 2019-08-05 12:40 ` Kever Yang [not found] ` <e7507f4e-de8d-e61c-5538-0a3cc203ceba-TNX95d0MmH7DzftRWevZcw@public.gmane.org> 2019-08-14 9:44 ` Jagan Teki 2019-08-14 9:44 ` [U-Boot] " Jagan Teki 2019-07-29 7:47 ` [PATCH 10/15] rockchip: dts: rk3399: Add u-boot, dm-pre-reloc for watchdog Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki 2019-07-29 7:47 ` [PATCH 11/15] wdt: Kconfig: Add WDT_DW entry Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki 2019-07-29 7:47 ` [PATCH 12/15] include: rk3399: Disable watchdog in TPL Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki [not found] ` <20190729074711.16988-13-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> 2019-08-05 12:43 ` Kever Yang 2019-08-05 12:43 ` [U-Boot] " Kever Yang 2019-08-25 20:14 ` Jagan Teki 2019-08-25 20:14 ` [U-Boot] " Jagan Teki 2019-08-26 1:34 ` Kever Yang 2019-08-26 1:34 ` [U-Boot] " Kever Yang 2019-07-29 7:47 ` [DO NOT MERGE] [PATCH 13/15] rk3399: rockpro64: Enable watchdog Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki 2019-07-29 7:47 ` [PATCH 14/15] rockchip: rk3399: Add bootcount support Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki 2019-08-12 12:16 ` Kever Yang 2019-08-12 12:16 ` [U-Boot] " Kever Yang 2019-08-13 1:02 ` [PATCH 14/15] rockchip: rk3399: Add bootcount support【请注意,邮件由u-boot-bounces@lists.denx.de代发】 Kever Yang 2019-08-13 1:02 ` [U-Boot] " Kever Yang 2019-07-29 7:47 ` [DO NOT MERGE] [PATCH 15/15] rk3399: rockpro64: Enable bootcount Jagan Teki 2019-07-29 7:47 ` [U-Boot] " Jagan Teki 2019-08-05 12:18 ` [PATCH 00/15] rk3399: Add redundant boot support Kever Yang 2019-08-05 12:18 ` [U-Boot] " Kever Yang
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=e7507f4e-de8d-e61c-5538-0a3cc203ceba@rock-chips.com \ --to=kever.yang@rock-chips.com \ --cc=akash@openedev.com \ --cc=clsee@altera.com \ --cc=jagan@amarulasolutions.com \ --cc=linux-amarula@amarulasolutions.com \ --cc=linux-rockchip@lists.infradead.org \ --cc=philipp.tomsich@theobroma-systems.com \ --cc=sjg@chromium.org \ --cc=u-boot@lists.denx.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.