diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-10-04 01:03:57 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2019-10-24 20:24:50 +0200 |
| commit | 6a648a5f230d8cfb191a3cef52b15a05db1c47b5 (patch) | |
| tree | 24638612f09c76120f30e69c01a24aa3b3490232 /hw | |
| parent | 2811ac30596644c1bfc3eee4e2ebffd2a107c3e4 (diff) | |
hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory
The TWL92230 is an "energy management device" companion with
a RTC. Since we mostly model the RTC, move it under the hw/rtc/
subdirectory.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-8-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/rtc/Kconfig | 4 | ||||
| -rw-r--r-- | hw/rtc/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/rtc/twl92230.c (renamed from hw/timer/twl92230.c) | 0 | ||||
| -rw-r--r-- | hw/timer/Kconfig | 4 | ||||
| -rw-r--r-- | hw/timer/Makefile.objs | 1 |
5 files changed, 5 insertions, 5 deletions
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 index 63bd13d2ca..63bd13d2ca 100644 --- a/hw/timer/twl92230.c +++ b/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 |