From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Guenter Roeck <linux@roeck-us.net>,
Peter Maydell <peter.maydell@linaro.org>
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
qemu-arm@nongnu.org, Peter Chubb <peter.chubb@nicta.com.au>,
qemu-devel@nongnu.org,
Jean-Christophe Dubois <jcd@tribudubois.net>
Subject: Re: [PATCH 1/8] hw: Move i.MX watchdog driver to hw/watchdog
Date: Sat, 14 Mar 2020 22:43:29 +0100 [thread overview]
Message-ID: <2f4064d2-445c-19a4-b873-b9dd0b09ff1c@redhat.com> (raw)
In-Reply-To: <20200314172736.24528-2-linux@roeck-us.net>
Hi Guenter,
On 3/14/20 6:27 PM, Guenter Roeck wrote:
> 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.
>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> MAINTAINERS | 2 ++
> hw/misc/Makefile.objs | 1 -
> hw/watchdog/Kconfig | 5 +++++
> hw/watchdog/Makefile.objs | 1 +
> hw/{misc/imx2_wdt.c => watchdog/wdt_imx2.c} | 2 +-
> include/hw/arm/fsl-imx6.h | 2 +-
> include/hw/arm/fsl-imx6ul.h | 2 +-
> include/hw/arm/fsl-imx7.h | 2 +-
> include/hw/{misc/imx2_wdt.h => watchdog/wdt_imx2.h} | 0
> 9 files changed, 12 insertions(+), 5 deletions(-)
> rename hw/{misc/imx2_wdt.c => watchdog/wdt_imx2.c} (98%)
> rename include/hw/{misc/imx2_wdt.h => watchdog/wdt_imx2.h} (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 32867bc636..d1197014e8 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -603,8 +603,10 @@ S: Odd Fixes
> F: hw/arm/fsl-imx25.c
> F: hw/arm/imx25_pdk.c
> F: hw/misc/imx25_ccm.c
> +F: hw/watchdog/wdt_imx2.c
> F: include/hw/arm/fsl-imx25.h
> F: include/hw/misc/imx25_ccm.h
> +F: include/hw/watchdog/wdt_imx2.h
>
> i.MX31 (kzm)
> M: Peter Chubb <peter.chubb@nicta.com.au>
> diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
> index 68aae2eabb..b25181b711 100644
> --- a/hw/misc/Makefile.objs
> +++ b/hw/misc/Makefile.objs
> @@ -44,7 +44,6 @@ common-obj-$(CONFIG_IMX) += imx6_ccm.o
> common-obj-$(CONFIG_IMX) += imx6ul_ccm.o
> obj-$(CONFIG_IMX) += imx6_src.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_gpr.o
> common-obj-$(CONFIG_IMX) += imx_rngc.o
> diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig
> index 2118d897c9..2c225b4b17 100644
> --- a/hw/watchdog/Kconfig
> +++ b/hw/watchdog/Kconfig
> @@ -14,3 +14,8 @@ config WDT_IB700
>
> config WDT_DIAG288
> bool
> +
> +config WDT_IMX2
> + bool
> + default y
> + depends on IMX
- it does not depend of IMX (you could use it in another SoC)
- since it is not user-creatable, it is pointless as a default device.
Instead, select it in each iMX SoC:
-- >8 --
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index e5a876c8d1..cdb01c4e03 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -358,6 +358,7 @@ config FSL_IMX25
select IMX
select IMX_FEC
select IMX_I2C
+ select WDT_IMX2
select DS1338
config FSL_IMX31
@@ -365,6 +366,7 @@ config FSL_IMX31
select SERIAL
select IMX
select IMX_I2C
+ select WDT_IMX2
select LAN9118
config FSL_IMX6
@@ -373,6 +375,7 @@ config FSL_IMX6
select IMX
select IMX_FEC
select IMX_I2C
+ select WDT_IMX2
select SDHCI
---
With this hunk amended (and removing "default y" and "depends on IMX"):
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> diff --git a/hw/watchdog/Makefile.objs b/hw/watchdog/Makefile.objs
> index 3f536d1cad..dd9b37f642 100644
> --- a/hw/watchdog/Makefile.objs
> +++ b/hw/watchdog/Makefile.objs
> @@ -4,3 +4,4 @@ common-obj-$(CONFIG_WDT_IB6300ESB) += wdt_i6300esb.o
> common-obj-$(CONFIG_WDT_IB700) += wdt_ib700.o
> common-obj-$(CONFIG_WDT_DIAG288) += wdt_diag288.o
> common-obj-$(CONFIG_ASPEED_SOC) += wdt_aspeed.o
> +common-obj-$(CONFIG_WDT_IMX) += wdt_imx2.o
> diff --git a/hw/misc/imx2_wdt.c b/hw/watchdog/wdt_imx2.c
> similarity index 98%
> rename from hw/misc/imx2_wdt.c
> rename to hw/watchdog/wdt_imx2.c
> index 2aedfe803a..ad1ef02e9e 100644
> --- a/hw/misc/imx2_wdt.c
> +++ b/hw/watchdog/wdt_imx2.c
> @@ -14,7 +14,7 @@
> #include "qemu/module.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_SRS BIT(4) /* -> Software Reset Signal */
> diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h
> index 60eadccb42..5b02dc1f4b 100644
> --- a/include/hw/arm/fsl-imx6.h
> +++ b/include/hw/arm/fsl-imx6.h
> @@ -21,7 +21,7 @@
> #include "hw/cpu/a9mpcore.h"
> #include "hw/misc/imx6_ccm.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/timer/imx_gpt.h"
> #include "hw/timer/imx_epit.h"
> diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
> index eda389aec7..91c746918a 100644
> --- a/include/hw/arm/fsl-imx6ul.h
> +++ b/include/hw/arm/fsl-imx6ul.h
> @@ -24,7 +24,7 @@
> #include "hw/misc/imx7_snvs.h"
> #include "hw/misc/imx7_gpr.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/char/imx_serial.h"
> #include "hw/timer/imx_gpt.h"
> diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h
> index 706aef2e7e..3a0041c4c2 100644
> --- a/include/hw/arm/fsl-imx7.h
> +++ b/include/hw/arm/fsl-imx7.h
> @@ -26,7 +26,7 @@
> #include "hw/misc/imx7_snvs.h"
> #include "hw/misc/imx7_gpr.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/char/imx_serial.h"
> #include "hw/timer/imx_gpt.h"
> diff --git a/include/hw/misc/imx2_wdt.h b/include/hw/watchdog/wdt_imx2.h
> similarity index 100%
> rename from include/hw/misc/imx2_wdt.h
> rename to include/hw/watchdog/wdt_imx2.h
>
next prev parent reply other threads:[~2020-03-14 21:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-14 17:27 [PATCH 0/8] hw/arm: Implement i.MX watchdog support Guenter Roeck
2020-03-14 17:27 ` [PATCH 1/8] hw: Move i.MX watchdog driver to hw/watchdog Guenter Roeck
2020-03-14 21:43 ` Philippe Mathieu-Daudé [this message]
2020-03-14 21:46 ` Philippe Mathieu-Daudé
2020-03-14 22:11 ` Guenter Roeck
2020-03-14 17:27 ` [PATCH 2/8] hw/watchdog: Implement full i.MX watchdog support Guenter Roeck
2020-03-14 17:27 ` [PATCH 3/8] hw/arm/fsl-imx25: Wire up watchdog Guenter Roeck
2020-03-14 21:48 ` Philippe Mathieu-Daudé
2020-03-14 22:12 ` Guenter Roeck
2020-03-14 17:27 ` [PATCH 4/8] hw/arm/fsl-imx31: " Guenter Roeck
2020-03-14 21:50 ` Philippe Mathieu-Daudé
2020-03-14 22:12 ` Guenter Roeck
2020-03-14 17:27 ` [PATCH 5/8] hw/arm/fsl-imx6: Connect watchdog interrupts Guenter Roeck
2020-03-14 17:27 ` [PATCH 6/8] hw/arm/fsl-imx6ul: " Guenter Roeck
2020-03-14 17:27 ` [PATCH 7/8] hw/arm/fsl-imx7: Instantiate various unimplemented devices Guenter Roeck
2020-03-14 17:27 ` [PATCH 8/8] hw/arm/fsl-imx7: Connect watchdog interrupts Guenter Roeck
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=2f4064d2-445c-19a4-b873-b9dd0b09ff1c@redhat.com \
--to=philmd@redhat.com \
--cc=andrew.smirnov@gmail.com \
--cc=jcd@tribudubois.net \
--cc=linux@roeck-us.net \
--cc=peter.chubb@nicta.com.au \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).