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

hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory

Browse Source 
The PL031 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>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20191003230404.19384-3-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Philippe Mathieu-Daudé 2019-10-04 01:03:52 +02:00 committed by Laurent Vivier
parent 2baa483bb7
commit 877c181cd4
13 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -495,8 +495,8 @@ F: hw/intc/pl190.c
F: hw/sd/pl181.c F: hw/sd/pl181.c
F: hw/ssi/pl022.c F: hw/ssi/pl022.c
F: include/hw/ssi/pl022.h F: include/hw/ssi/pl022.h
F: hw/timer/pl031.c F: hw/rtc/pl031.c
F: include/hw/timer/pl031.h F: include/hw/rtc/pl031.h
F: include/hw/arm/primecell.h F: include/hw/arm/primecell.h
F: hw/timer/cmsdk-apb-timer.c F: hw/timer/cmsdk-apb-timer.c
F: include/hw/timer/cmsdk-apb-timer.h F: include/hw/timer/cmsdk-apb-timer.h

1
Makefile.objs
View File

@ -173,6 +173,7 @@ trace-events-subdirs += hw/pci-host
trace-events-subdirs += hw/ppc trace-events-subdirs += hw/ppc
trace-events-subdirs += hw/rdma trace-events-subdirs += hw/rdma
trace-events-subdirs += hw/rdma/vmw trace-events-subdirs += hw/rdma/vmw
trace-events-subdirs += hw/rtc
trace-events-subdirs += hw/s390x trace-events-subdirs += hw/s390x
trace-events-subdirs += hw/scsi trace-events-subdirs += hw/scsi
trace-events-subdirs += hw/sd trace-events-subdirs += hw/sd

1
hw/Kconfig
View File

@ -27,6 +27,7 @@ source pci-host/Kconfig
source pcmcia/Kconfig source pcmcia/Kconfig
source pci/Kconfig source pci/Kconfig
source rdma/Kconfig source rdma/Kconfig
source rtc/Kconfig
source scsi/Kconfig source scsi/Kconfig
source sd/Kconfig source sd/Kconfig
source semihosting/Kconfig source semihosting/Kconfig

1
hw/Makefile.objs
View File

@ -26,6 +26,7 @@ devices-dirs-y += nvram/
devices-dirs-y += pci/ devices-dirs-y += pci/
devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
devices-dirs-y += pcmcia/ devices-dirs-y += pcmcia/
devices-dirs-y += rtc/
devices-dirs-$(CONFIG_SCSI) += scsi/ devices-dirs-$(CONFIG_SCSI) += scsi/
devices-dirs-y += sd/ devices-dirs-y += sd/
devices-dirs-y += ssi/ devices-dirs-y += ssi/

2
hw/arm/musca.c
View File

@ -32,7 +32,7 @@
#include "hw/misc/tz-mpc.h" #include "hw/misc/tz-mpc.h"
#include "hw/misc/tz-ppc.h" #include "hw/misc/tz-ppc.h"
#include "hw/misc/unimp.h" #include "hw/misc/unimp.h"
#include "hw/timer/pl031.h" #include "hw/rtc/pl031.h"
#define MUSCA_NUMIRQ_MAX 96 #define MUSCA_NUMIRQ_MAX 96
#define MUSCA_PPC_MAX 3 #define MUSCA_PPC_MAX 3

2
hw/rtc/Kconfig Normal file
View File

@ -0,0 +1,2 @@
config PL031
bool

1
hw/rtc/Makefile.objs Normal file
View File

@ -0,0 +1 @@
common-obj-$(CONFIG_PL031) += pl031.o

2
hw/timer/pl031.c → hw/rtc/pl031.c
View File

@ -13,7 +13,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "hw/timer/pl031.h" #include "hw/rtc/pl031.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"

8
hw/rtc/trace-events Normal file
View File

@ -0,0 +1,8 @@
# See docs/devel/tracing.txt for syntax documentation.
# pl031.c
pl031_irq_state(int level) "irq state %d"
pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
pl031_alarm_raised(void) "alarm raised"
pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"

3
hw/timer/Kconfig
View File

@ -27,9 +27,6 @@ config M41T80
config M48T59 config M48T59
bool bool
config PL031
bool
config TWL92230 config TWL92230
bool bool
depends on I2C depends on I2C

1
hw/timer/Makefile.objs
View File

@ -11,7 +11,6 @@ common-obj-$(CONFIG_M48T59) += m48t59.o
ifeq ($(CONFIG_ISA_BUS),y) ifeq ($(CONFIG_ISA_BUS),y)
common-obj-$(CONFIG_M48T59) += m48t59-isa.o common-obj-$(CONFIG_M48T59) += m48t59-isa.o
endif endif
common-obj-$(CONFIG_PL031) += pl031.o
common-obj-$(CONFIG_PUV3) += puv3_ost.o common-obj-$(CONFIG_PUV3) += puv3_ost.o
common-obj-$(CONFIG_TWL92230) += twl92230.o common-obj-$(CONFIG_TWL92230) += twl92230.o
common-obj-$(CONFIG_XILINX) += xilinx_timer.o common-obj-$(CONFIG_XILINX) += xilinx_timer.o

7
hw/timer/trace-events
View File

@ -80,10 +80,3 @@ xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec
# nrf51_timer.c # nrf51_timer.c
nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
# pl031.c
pl031_irq_state(int level) "irq state %d"
pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
pl031_alarm_raised(void) "alarm raised"
pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"

5
include/hw/timer/pl031.h → include/hw/rtc/pl031.h
View File

@ -11,10 +11,11 @@
* GNU GPL, version 2 or (at your option) any later version. * GNU GPL, version 2 or (at your option) any later version.
*/ */
#ifndef HW_TIMER_PL031_H #ifndef HW_RTC_PL031_H
#define HW_TIMER_PL031_H #define HW_RTC_PL031_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "qemu/timer.h"
#define TYPE_PL031 "pl031" #define TYPE_PL031 "pl031"
#define PL031(obj) OBJECT_CHECK(PL031State, (obj), TYPE_PL031) #define PL031(obj) OBJECT_CHECK(PL031State, (obj), TYPE_PL031)