mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 13:41:31 +00:00
watchdog: mpc8xx_wdt: Watchdog driver and macros cleanup
With the generic watchdog driver now implemented, this patch removes some legacy stuff from the MPC8xx watchdog driver and its Kconfig integration. CONFIG_MPC8xx_WATCHDOG is completely removed and hw_watchdog_reset() is made static, as the watchdog will now get serviced via the DM infrastructure if enabled via CONFIG_WATCHDOG. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Christophe Leroy <christophe.leroy@c-s.fr>
This commit is contained in:
parent
782ef57edc
commit
f3729ba6e7
5 changed files with 6 additions and 9 deletions
|
@ -35,7 +35,7 @@ config MPC8xx
|
||||||
bool "MPC8xx"
|
bool "MPC8xx"
|
||||||
select BOARD_EARLY_INIT_F
|
select BOARD_EARLY_INIT_F
|
||||||
imply CMD_REGINFO
|
imply CMD_REGINFO
|
||||||
imply MPC8xx_WATCHDOG
|
imply WDT_MPC8xx
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
|
|
@ -25,9 +25,9 @@ config MPC885
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
config MPC8xx_WATCHDOG
|
#config MPC8xx_WATCHDOG
|
||||||
bool "Watchdog"
|
# bool "Watchdog"
|
||||||
select HW_WATCHDOG
|
# select HW_WATCHDOG
|
||||||
|
|
||||||
config 8xx_GCLK_FREQ
|
config 8xx_GCLK_FREQ
|
||||||
int "CPU GCLK Frequency"
|
int "CPU GCLK Frequency"
|
||||||
|
|
|
@ -151,7 +151,6 @@ config WDT_MT7621
|
||||||
config WDT_MPC8xx
|
config WDT_MPC8xx
|
||||||
bool "MPC8xx watchdog timer support"
|
bool "MPC8xx watchdog timer support"
|
||||||
depends on WDT && MPC8xx
|
depends on WDT && MPC8xx
|
||||||
select CONFIG_MPC8xx_WATCHDOG
|
|
||||||
help
|
help
|
||||||
Select this to enable mpc8xx watchdog timer
|
Select this to enable mpc8xx watchdog timer
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,6 @@ obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o
|
||||||
obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o
|
obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o
|
||||||
obj-$(CONFIG_WDT_ORION) += orion_wdt.o
|
obj-$(CONFIG_WDT_ORION) += orion_wdt.o
|
||||||
obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o
|
obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o
|
||||||
obj-$(CONFIG_MPC8xx_WATCHDOG) += mpc8xx_wdt.o
|
obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o
|
||||||
obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o
|
obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o
|
||||||
obj-$(CONFIG_WDT_MTK) += mtk_wdt.o
|
obj-$(CONFIG_WDT_MTK) += mtk_wdt.o
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include <asm/cpm_8xx.h>
|
#include <asm/cpm_8xx.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
void hw_watchdog_reset(void)
|
static void hw_watchdog_reset(void)
|
||||||
{
|
{
|
||||||
immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR;
|
immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR;
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@ void hw_watchdog_reset(void)
|
||||||
out_be16(&immap->im_siu_conf.sc_swsr, 0xaa39); /* write magic2 */
|
out_be16(&immap->im_siu_conf.sc_swsr, 0xaa39); /* write magic2 */
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_WDT_MPC8xx
|
|
||||||
static int mpc8xx_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
|
static int mpc8xx_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
|
||||||
{
|
{
|
||||||
immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR;
|
immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR;
|
||||||
|
@ -66,4 +65,3 @@ U_BOOT_DRIVER(wdt_mpc8xx) = {
|
||||||
.of_match = mpc8xx_wdt_ids,
|
.of_match = mpc8xx_wdt_ids,
|
||||||
.ops = &mpc8xx_wdt_ops,
|
.ops = &mpc8xx_wdt_ops,
|
||||||
};
|
};
|
||||||
#endif /* CONFIG_WDT_MPC8xx */
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue