[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/13] hw: Move TWL92230 device from hw/timer/ to hw
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 07/13] hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory |
Date: |
Mon, 16 Sep 2019 17:48:41 +0200 |
The TWL92230 is an "energy management device" companion with
a RTC. Since we mostly model the RTC, move it under the hw/rtc/
subdirectory.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
MAINTAINERS | 2 +-
hw/rtc/Kconfig | 4 ++++
hw/rtc/Makefile.objs | 1 +
hw/{timer => rtc}/twl92230.c | 0
hw/timer/Kconfig | 4 ----
hw/timer/Makefile.objs | 1 -
6 files changed, 6 insertions(+), 6 deletions(-)
rename hw/{timer => rtc}/twl92230.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index fb9a1ed075..d17058264b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -663,7 +663,7 @@ F: hw/display/blizzard.c
F: hw/input/lm832x.c
F: hw/input/tsc2005.c
F: hw/misc/cbus.c
-F: hw/timer/twl92230.c
+F: hw/rtc/twl92230.c
F: include/hw/display/blizzard.h
F: include/hw/input/tsc2xxx.h
F: include/hw/misc/cbus.h
diff --git a/hw/rtc/Kconfig b/hw/rtc/Kconfig
index cc7fead764..dff9d60946 100644
--- a/hw/rtc/Kconfig
+++ b/hw/rtc/Kconfig
@@ -8,6 +8,10 @@ config M48T59
config PL031
bool
+config TWL92230
+ bool
+ depends on I2C
+
config MC146818RTC
bool
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
index 4621b37bc2..810a38ee7b 100644
--- a/hw/rtc/Makefile.objs
+++ b/hw/rtc/Makefile.objs
@@ -4,5 +4,6 @@ ifeq ($(CONFIG_ISA_BUS),y)
common-obj-$(CONFIG_M48T59) += m48t59-isa.o
endif
common-obj-$(CONFIG_PL031) += pl031.o
+common-obj-$(CONFIG_TWL92230) += twl92230.o
obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
diff --git a/hw/timer/twl92230.c b/hw/rtc/twl92230.c
similarity index 100%
rename from hw/timer/twl92230.c
rename to hw/rtc/twl92230.c
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index b04c928136..9357875f28 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -20,10 +20,6 @@ config HPET
config I8254
bool
-config TWL92230
- bool
- depends on I2C
-
config ALTERA_TIMER
bool
select PTIMER
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 034bd30255..23be70b71d 100644
--- a/hw/timer/Makefile.objs
+++ b/hw/timer/Makefile.objs
@@ -7,7 +7,6 @@ common-obj-$(CONFIG_DS1338) += ds1338.o
common-obj-$(CONFIG_HPET) += hpet.o
common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
common-obj-$(CONFIG_PUV3) += puv3_ost.o
-common-obj-$(CONFIG_TWL92230) += twl92230.o
common-obj-$(CONFIG_XILINX) += xilinx_timer.o
common-obj-$(CONFIG_SLAVIO) += slavio_timer.o
common-obj-$(CONFIG_ETRAXFS) += etraxfs_timer.o
--
2.20.1
- Re: [Qemu-devel] [PATCH 03/13] hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory, (continued)
- [Qemu-devel] [PATCH 04/13] hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16
- [Qemu-devel] [PATCH 05/13] hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16
- [Qemu-devel] [PATCH 06/13] hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16
- [Qemu-devel] [PATCH 07/13] hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 08/13] hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16
- [Qemu-devel] [PATCH 09/13] hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16
- [Qemu-devel] [PATCH 10/13] hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16
- [Qemu-devel] [PATCH 11/13] hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/09/16