From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
"Helge Deller" <deller@gmx.de>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Joel Stanley" <joel@jms.id.au>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Alistair Francis" <alistair@alistair23.me>,
qemu-arm@nongnu.org, "Cédric Le Goater" <clg@kaod.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"Andrew Jeffery" <andrew@aj.id.au>,
qemu-trivial@nongnu.org, qemu-ppc@nongnu.org,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PATCH v2 05/14] hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory
Date: Fri, 4 Oct 2019 01:03:55 +0200 [thread overview]
Message-ID: <20191003230404.19384-6-philmd@redhat.com> (raw)
In-Reply-To: <20191003230404.19384-1-philmd@redhat.com>
The M41T80 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
MAINTAINERS | 2 +-
hw/rtc/Kconfig | 4 ++++
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/m41t80.c | 0
hw/timer/Kconfig | 4 ----
hw/timer/Makefile.objs | 1 -
6 files changed, 6 insertions(+), 6 deletions(-)
rename hw/{timer => rtc}/m41t80.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 5d85424a33..0dfaa05d17 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1113,7 +1113,7 @@ F: hw/ppc/sam460ex.c
F: hw/ppc/ppc440_pcix.c
F: hw/display/sm501*
F: hw/ide/sii3112.c
-F: hw/timer/m41t80.c
+F: hw/rtc/m41t80.c
F: pc-bios/canyonlands.dt[sb]
F: pc-bios/u-boot-sam460ex-20100605.bin
F: roms/u-boot-sam460ex
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig
index 159c233517..434b20b2b1 100644
--- a/hw/rtc/Kconfig
+++ b/hw/rtc/Kconfig
@@ -1,3 +1,7 @@
+config M41T80
+ bool
+ depends on I2C
+
config M48T59
bool
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index c87f81405e..89e8e48c64 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -1,3 +1,4 @@
+common-obj-$(CONFIG_M41T80) += m41t80.o
common-obj-$(CONFIG_M48T59) += m48t59.o
ifeq ($(CONFIG_ISA_BUS),y)
common-obj-$(CONFIG_M48T59) += m48t59-isa.o
diff --git a/hw/timer/m41t80.c b/hw/rtc/m41t80.c
similarity index 100%
rename from hw/timer/m41t80.c
rename to hw/rtc/m41t80.c
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index a57e9b59fc..a6b668b255 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -20,10 +20,6 @@ config HPET
config I8254
bool
-config M41T80
- bool
- depends on I2C
-
config TWL92230
bool
depends on I2C
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index fe2d1fbc40..2fb12162a6 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -6,7 +6,6 @@ common-obj-$(CONFIG_CADENCE) += cadence_ttc.o
common-obj-$(CONFIG_DS1338) += ds1338.o
common-obj-$(CONFIG_HPET) += hpet.o
common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
-common-obj-$(CONFIG_M41T80) += m41t80.o
common-obj-$(CONFIG_PUV3) += puv3_ost.o
common-obj-$(CONFIG_TWL92230) += twl92230.o
common-obj-$(CONFIG_XILINX) += xilinx_timer.o
--
2.20.1
next prev parent reply other threads:[~2019-10-03 23:16 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 23:03 [PATCH v2 00/14] hw: Split RTC devices from hw/timer/ to hw/rtc/ Philippe Mathieu-Daudé
2019-10-03 23:03 ` [PATCH v2 01/14] hw/timer: Compile devices not target-dependent as common object Philippe Mathieu-Daudé
2019-10-24 18:02 ` Laurent Vivier
2019-10-03 23:03 ` [PATCH v2 02/14] hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory Philippe Mathieu-Daudé
2019-10-24 18:04 ` Laurent Vivier
2019-10-03 23:03 ` [PATCH v2 03/14] hw: Move MC146818 " Philippe Mathieu-Daudé
2019-10-24 18:14 ` Laurent Vivier
2019-10-03 23:03 ` [PATCH v2 04/14] hw: Move M48T59 " Philippe Mathieu-Daudé
2019-10-24 18:21 ` Laurent Vivier
2019-10-03 23:03 ` Philippe Mathieu-Daudé [this message]
2019-10-24 18:22 ` [PATCH v2 05/14] hw: Move M41T80 " Laurent Vivier
2019-10-03 23:03 ` [PATCH v2 06/14] hw: Move sun4v hypervisor RTC " Philippe Mathieu-Daudé
2019-10-24 14:10 ` Philippe Mathieu-Daudé
2019-10-24 16:41 ` Artyom Tarasenko
2019-10-24 18:23 ` Laurent Vivier
2019-10-03 23:03 ` [PATCH v2 07/14] hw: Move TWL92230 device " Philippe Mathieu-Daudé
2019-10-24 18:25 ` Laurent Vivier
2019-10-03 23:03 ` [PATCH v2 08/14] hw: Move DS1338 " Philippe Mathieu-Daudé
2019-10-24 18:26 ` Laurent Vivier
2019-10-03 23:03 ` [PATCH v2 09/14] hw: Move Xilinx ZynqMP RTC " Philippe Mathieu-Daudé
2019-10-24 18:28 ` Laurent Vivier
2019-10-03 23:04 ` [PATCH v2 10/14] hw: Move Exynos4210 " Philippe Mathieu-Daudé
2019-10-24 18:30 ` Laurent Vivier
2019-10-03 23:04 ` [PATCH v2 11/14] hw: Move Aspeed " Philippe Mathieu-Daudé
2019-10-24 18:32 ` Laurent Vivier
2019-10-03 23:04 ` [PATCH v2 12/14] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less Philippe Mathieu-Daudé
2019-10-24 18:33 ` Laurent Vivier
2019-10-03 23:04 ` [PATCH v2 13/14] hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include Philippe Mathieu-Daudé
2019-10-24 18:34 ` Laurent Vivier
2019-10-03 23:04 ` [PATCH v2 14/14] hw/rtc/aspeed_rtc: Remove unused includes Philippe Mathieu-Daudé
2019-10-24 18:35 ` Laurent Vivier
2019-10-24 15:51 ` [PATCH v2 00/14] hw: Split RTC devices from hw/timer/ to hw/rtc/ Peter Maydell
2019-10-24 17:36 ` Laurent Vivier
2019-10-24 17:55 ` Philippe Mathieu-Daudé
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=20191003230404.19384-6-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alistair.francis@wdc.com \
--cc=alistair@alistair23.me \
--cc=amarkovic@wavecomp.com \
--cc=andrew@aj.id.au \
--cc=arikalo@wavecomp.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=deller@gmx.de \
--cc=edgar.iglesias@gmail.com \
--cc=ehabkost@redhat.com \
--cc=hpoussin@reactos.org \
--cc=imammedo@redhat.com \
--cc=joel@jms.id.au \
--cc=lvivier@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/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).