+2 -2

MAINTAINERS

··· 495 495 F: hw/sd/pl181.c 496 496 F: hw/ssi/pl022.c 497 497 F: include/hw/ssi/pl022.h 498 498 - F: hw/timer/pl031.c 499 499 - F: include/hw/timer/pl031.h 498 498 + F: hw/rtc/pl031.c 499 499 + F: include/hw/rtc/pl031.h 500 500 F: include/hw/arm/primecell.h 501 501 F: hw/timer/cmsdk-apb-timer.c 502 502 F: include/hw/timer/cmsdk-apb-timer.h

+1

Makefile.objs

··· 173 173 trace-events-subdirs += hw/ppc 174 174 trace-events-subdirs += hw/rdma 175 175 trace-events-subdirs += hw/rdma/vmw 176 176 + trace-events-subdirs += hw/rtc 176 177 trace-events-subdirs += hw/s390x 177 178 trace-events-subdirs += hw/scsi 178 179 trace-events-subdirs += hw/sd

+1

hw/Kconfig

··· 27 27 source pcmcia/Kconfig 28 28 source pci/Kconfig 29 29 source rdma/Kconfig 30 30 + source rtc/Kconfig 30 31 source scsi/Kconfig 31 32 source sd/Kconfig 32 33 source semihosting/Kconfig

+1

hw/Makefile.objs

··· 26 26 devices-dirs-y += pci/ 27 27 devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ 28 28 devices-dirs-y += pcmcia/ 29 29 + devices-dirs-y += rtc/ 29 30 devices-dirs-$(CONFIG_SCSI) += scsi/ 30 31 devices-dirs-y += sd/ 31 32 devices-dirs-y += ssi/

+1 -1

hw/arm/musca.c

··· 32 32 #include "hw/misc/tz-mpc.h" 33 33 #include "hw/misc/tz-ppc.h" 34 34 #include "hw/misc/unimp.h" 35 35 - #include "hw/timer/pl031.h" 35 35 + #include "hw/rtc/pl031.h" 36 36 37 37 #define MUSCA_NUMIRQ_MAX 96 38 38 #define MUSCA_PPC_MAX 3

+2

hw/rtc/Kconfig

··· 1 1 + config PL031 2 2 + bool

+1

hw/rtc/Makefile.objs

··· 1 1 + common-obj-$(CONFIG_PL031) += pl031.o

+8

hw/rtc/trace-events

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

-3

hw/timer/Kconfig

··· 27 27 config M48T59 28 28 bool 29 29 30 30 - config PL031 31 31 - bool 32 32 - 33 30 config TWL92230 34 31 bool 35 32 depends on I2C

-1

hw/timer/Makefile.objs

··· 11 11 ifeq ($(CONFIG_ISA_BUS),y) 12 12 common-obj-$(CONFIG_M48T59) += m48t59-isa.o 13 13 endif 14 14 - common-obj-$(CONFIG_PL031) += pl031.o 15 14 common-obj-$(CONFIG_PUV3) += puv3_ost.o 16 15 common-obj-$(CONFIG_TWL92230) += twl92230.o 17 16 common-obj-$(CONFIG_XILINX) += xilinx_timer.o

+1 -1

hw/timer/pl031.c hw/rtc/pl031.c

··· 13 13 14 14 #include "qemu/osdep.h" 15 15 #include "qemu-common.h" 16 16 - #include "hw/timer/pl031.h" 16 16 + #include "hw/rtc/pl031.h" 17 17 #include "migration/vmstate.h" 18 18 #include "hw/irq.h" 19 19 #include "hw/qdev-properties.h"

-7

hw/timer/trace-events

··· 80 80 # nrf51_timer.c 81 81 nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" 82 82 nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" 83 83 - 84 84 - # pl031.c 85 85 - pl031_irq_state(int level) "irq state %d" 86 86 - pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" 87 87 - pl031_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" 88 88 - pl031_alarm_raised(void) "alarm raised" 89 89 - pl031_set_alarm(uint32_t ticks) "alarm set for %u ticks"

+3 -2

include/hw/timer/pl031.h include/hw/rtc/pl031.h

··· 11 11 * GNU GPL, version 2 or (at your option) any later version. 12 12 */ 13 13 14 14 - #ifndef HW_TIMER_PL031_H 15 15 - #define HW_TIMER_PL031_H 14 14 + #ifndef HW_RTC_PL031_H 15 15 + #define HW_RTC_PL031_H 16 16 17 17 #include "hw/sysbus.h" 18 18 + #include "qemu/timer.h" 18 19 19 20 #define TYPE_PL031 "pl031" 20 21 #define PL031(obj) OBJECT_CHECK(PL031State, (obj), TYPE_PL031)