mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw: Move i.MX watchdog driver to hw/watchdog

Browse Source 
In preparation for a full implementation, move i.MX watchdog driver
from hw/misc to hw/watchdog. While at it, add the watchdog files
to MAINTAINERS.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Message-id: 20200517162135.110364-2-linux@roeck-us.net
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Guenter Roeck 2020-05-17 09:21:28 -07:00 committed by Peter Maydell
parent ef81aa68a7
commit 37f95959c7
10 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -633,8 +633,10 @@ S: Odd Fixes
F: hw/arm/fsl-imx25.c F: hw/arm/fsl-imx25.c
F: hw/arm/imx25_pdk.c F: hw/arm/imx25_pdk.c
F: hw/misc/imx25_ccm.c F: hw/misc/imx25_ccm.c
F: hw/watchdog/wdt_imx2.c
F: include/hw/arm/fsl-imx25.h F: include/hw/arm/fsl-imx25.h
F: include/hw/misc/imx25_ccm.h F: include/hw/misc/imx25_ccm.h
F: include/hw/watchdog/wdt_imx2.h
i.MX31 (kzm) i.MX31 (kzm)
M: Peter Chubb <peter.chubb@nicta.com.au> M: Peter Chubb <peter.chubb@nicta.com.au>

3
hw/arm/Kconfig
View File

@ -375,6 +375,7 @@ config FSL_IMX6
select IMX_FEC select IMX_FEC
select IMX_I2C select IMX_I2C
select IMX_USBPHY select IMX_USBPHY
select WDT_IMX2
select SDHCI select SDHCI
config ASPEED_SOC config ASPEED_SOC
@ -412,6 +413,7 @@ config FSL_IMX7
select IMX select IMX
select IMX_FEC select IMX_FEC
select IMX_I2C select IMX_I2C
select WDT_IMX2
select PCI_EXPRESS_DESIGNWARE select PCI_EXPRESS_DESIGNWARE
select SDHCI select SDHCI
select UNIMP select UNIMP
@ -425,6 +427,7 @@ config FSL_IMX6UL
select IMX select IMX
select IMX_FEC select IMX_FEC
select IMX_I2C select IMX_I2C
select WDT_IMX2
select SDHCI select SDHCI
select UNIMP select UNIMP

1
hw/misc/Makefile.objs
View File

@ -44,7 +44,6 @@ common-obj-$(CONFIG_IMX) += imx6_ccm.o
common-obj-$(CONFIG_IMX) += imx6ul_ccm.o common-obj-$(CONFIG_IMX) += imx6ul_ccm.o
obj-$(CONFIG_IMX) += imx6_src.o obj-$(CONFIG_IMX) += imx6_src.o
common-obj-$(CONFIG_IMX) += imx7_ccm.o common-obj-$(CONFIG_IMX) += imx7_ccm.o
common-obj-$(CONFIG_IMX) += imx2_wdt.o
common-obj-$(CONFIG_IMX) += imx7_snvs.o common-obj-$(CONFIG_IMX) += imx7_snvs.o
common-obj-$(CONFIG_IMX) += imx7_gpr.o common-obj-$(CONFIG_IMX) += imx7_gpr.o
common-obj-$(CONFIG_IMX) += imx_rngc.o common-obj-$(CONFIG_IMX) += imx_rngc.o

3
hw/watchdog/Kconfig
View File

@ -14,3 +14,6 @@ config WDT_IB700
config WDT_DIAG288 config WDT_DIAG288
bool bool
config WDT_IMX2
bool

1
hw/watchdog/Makefile.objs
View File

@ -4,3 +4,4 @@ common-obj-$(CONFIG_WDT_IB6300ESB) += wdt_i6300esb.o
common-obj-$(CONFIG_WDT_IB700) += wdt_ib700.o common-obj-$(CONFIG_WDT_IB700) += wdt_ib700.o
common-obj-$(CONFIG_WDT_DIAG288) += wdt_diag288.o common-obj-$(CONFIG_WDT_DIAG288) += wdt_diag288.o
common-obj-$(CONFIG_ASPEED_SOC) += wdt_aspeed.o common-obj-$(CONFIG_ASPEED_SOC) += wdt_aspeed.o
common-obj-$(CONFIG_WDT_IMX2) += wdt_imx2.o

2
hw/misc/imx2_wdt.c → hw/watchdog/wdt_imx2.c
View File

@ -14,7 +14,7 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "sysemu/watchdog.h" #include "sysemu/watchdog.h"
#include "hw/misc/imx2_wdt.h" #include "hw/watchdog/wdt_imx2.h"
#define IMX2_WDT_WCR_WDA BIT(5) /* -> External Reset WDOG_B */ #define IMX2_WDT_WCR_WDA BIT(5) /* -> External Reset WDOG_B */
#define IMX2_WDT_WCR_SRS BIT(4) /* -> Software Reset Signal */ #define IMX2_WDT_WCR_SRS BIT(4) /* -> Software Reset Signal */

2
include/hw/arm/fsl-imx6.h
View File

@ -21,7 +21,7 @@
#include "hw/cpu/a9mpcore.h" #include "hw/cpu/a9mpcore.h"
#include "hw/misc/imx6_ccm.h" #include "hw/misc/imx6_ccm.h"
#include "hw/misc/imx6_src.h" #include "hw/misc/imx6_src.h"
#include "hw/misc/imx2_wdt.h" #include "hw/watchdog/wdt_imx2.h"
#include "hw/char/imx_serial.h" #include "hw/char/imx_serial.h"
#include "hw/timer/imx_gpt.h" #include "hw/timer/imx_gpt.h"
#include "hw/timer/imx_epit.h" #include "hw/timer/imx_epit.h"

2
include/hw/arm/fsl-imx6ul.h
View File

@ -24,7 +24,7 @@
#include "hw/misc/imx7_snvs.h" #include "hw/misc/imx7_snvs.h"
#include "hw/misc/imx7_gpr.h" #include "hw/misc/imx7_gpr.h"
#include "hw/intc/imx_gpcv2.h" #include "hw/intc/imx_gpcv2.h"
#include "hw/misc/imx2_wdt.h" #include "hw/watchdog/wdt_imx2.h"
#include "hw/gpio/imx_gpio.h" #include "hw/gpio/imx_gpio.h"
#include "hw/char/imx_serial.h" #include "hw/char/imx_serial.h"
#include "hw/timer/imx_gpt.h" #include "hw/timer/imx_gpt.h"

2
include/hw/arm/fsl-imx7.h
View File

@ -26,7 +26,7 @@
#include "hw/misc/imx7_snvs.h" #include "hw/misc/imx7_snvs.h"
#include "hw/misc/imx7_gpr.h" #include "hw/misc/imx7_gpr.h"
#include "hw/misc/imx6_src.h" #include "hw/misc/imx6_src.h"
#include "hw/misc/imx2_wdt.h" #include "hw/watchdog/wdt_imx2.h"
#include "hw/gpio/imx_gpio.h" #include "hw/gpio/imx_gpio.h"
#include "hw/char/imx_serial.h" #include "hw/char/imx_serial.h"
#include "hw/timer/imx_gpt.h" #include "hw/timer/imx_gpt.h"

0
include/hw/misc/imx2_wdt.h → include/hw/watchdog/wdt_imx2.h
View File