| Message ID | 20210922230947.1864357-2-linus.walleij@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] watchdog: ux500_wdt: Drop platform data | expand |
On 9/22/21 4:09 PM, Linus Walleij wrote: > This driver is named after the ambition to support more SoCs than > the DB8500. Those were never produced, so cut down the scope and > rename the driver accordingly. Since the Kconfig for the watchdog > defaults to y this will still be built by default. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/Kconfig | 8 ++++---- > drivers/watchdog/Makefile | 2 +- > drivers/watchdog/{ux500_wdt.c => db8500_wdt.c} | 0 > 3 files changed, 5 insertions(+), 5 deletions(-) > rename drivers/watchdog/{ux500_wdt.c => db8500_wdt.c} (100%) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index b81fe4f7d434..b5fe869991f9 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -743,17 +743,17 @@ config IMX7ULP_WDT > To compile this driver as a module, choose M here: the > module will be called imx7ulp_wdt. > > -config UX500_WATCHDOG > - tristate "ST-Ericsson Ux500 watchdog" > +config DB500_WATCHDOG > + tristate "ST-Ericsson DB800 watchdog" > depends on MFD_DB8500_PRCMU > select WATCHDOG_CORE > default y > help > Say Y here to include Watchdog timer support for the watchdog > - existing in the prcmu of ST-Ericsson Ux500 series platforms. > + existing in the prcmu of ST-Ericsson DB8500 platform. > > To compile this driver as a module, choose M here: the > - module will be called ux500_wdt. > + module will be called db500_wdt. > > config RETU_WATCHDOG > tristate "Retu watchdog" > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index 1bd2d6f37c53..f500f242f46b 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -69,7 +69,7 @@ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o > obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o > obj-$(CONFIG_IMX_SC_WDT) += imx_sc_wdt.o > obj-$(CONFIG_IMX7ULP_WDT) += imx7ulp_wdt.o > -obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o > +obj-$(CONFIG_DB500_WATCHDOG) += db8500_wdt.o > obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o > obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o > obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o > diff --git a/drivers/watchdog/ux500_wdt.c b/drivers/watchdog/db8500_wdt.c > similarity index 100% > rename from drivers/watchdog/ux500_wdt.c > rename to drivers/watchdog/db8500_wdt.c >
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b81fe4f7d434..b5fe869991f9 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -743,17 +743,17 @@ config IMX7ULP_WDT To compile this driver as a module, choose M here: the module will be called imx7ulp_wdt. -config UX500_WATCHDOG - tristate "ST-Ericsson Ux500 watchdog" +config DB500_WATCHDOG + tristate "ST-Ericsson DB800 watchdog" depends on MFD_DB8500_PRCMU select WATCHDOG_CORE default y help Say Y here to include Watchdog timer support for the watchdog - existing in the prcmu of ST-Ericsson Ux500 series platforms. + existing in the prcmu of ST-Ericsson DB8500 platform. To compile this driver as a module, choose M here: the - module will be called ux500_wdt. + module will be called db500_wdt. config RETU_WATCHDOG tristate "Retu watchdog" diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 1bd2d6f37c53..f500f242f46b 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -69,7 +69,7 @@ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o obj-$(CONFIG_IMX_SC_WDT) += imx_sc_wdt.o obj-$(CONFIG_IMX7ULP_WDT) += imx7ulp_wdt.o -obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o +obj-$(CONFIG_DB500_WATCHDOG) += db8500_wdt.o obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o diff --git a/drivers/watchdog/ux500_wdt.c b/drivers/watchdog/db8500_wdt.c similarity index 100% rename from drivers/watchdog/ux500_wdt.c rename to drivers/watchdog/db8500_wdt.c
This driver is named after the ambition to support more SoCs than the DB8500. Those were never produced, so cut down the scope and rename the driver accordingly. Since the Kconfig for the watchdog defaults to y this will still be built by default. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/watchdog/Kconfig | 8 ++++---- drivers/watchdog/Makefile | 2 +- drivers/watchdog/{ux500_wdt.c => db8500_wdt.c} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename drivers/watchdog/{ux500_wdt.c => db8500_wdt.c} (100%) -- 2.31.1