jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory

Move RTC devices under the hw/rtc/ subdirectory.

Remove Alistair outdated email address (see commit c22e580c2ad).

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-10-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>

authored by

Philippe Mathieu-Daudé and committed by
Laurent Vivier 8035f85e 64e85ffd

+9 -9
+1
hw/rtc/Makefile.objs
··· 6 6 endif 7 7 common-obj-$(CONFIG_PL031) += pl031.o 8 8 common-obj-$(CONFIG_TWL92230) += twl92230.o 9 + common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o 9 10 obj-$(CONFIG_MC146818RTC) += mc146818rtc.o 10 11 common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
+3
hw/rtc/trace-events
··· 4 4 sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " value 0x%" PRIx64 5 5 sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " value 0x%" PRIx64 6 6 7 + # xlnx-zynqmp-rtc.c 8 + xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec) "Get time from host: %d-%d-%d %2d:%02d:%02d" 9 + 7 10 # pl031.c 8 11 pl031_irq_state(int level) "irq state %d" 9 12 pl031_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
-1
hw/timer/Makefile.objs
··· 14 14 common-obj-$(CONFIG_IMX) += imx_gpt.o 15 15 common-obj-$(CONFIG_LM32) += lm32_timer.o 16 16 common-obj-$(CONFIG_MILKYMIST) += milkymist-sysctl.o 17 - common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o 18 17 common-obj-$(CONFIG_NRF51_SOC) += nrf51_timer.o 19 18 20 19 common-obj-$(CONFIG_ALTERA_TIMER) += altera_timer.o
-3
hw/timer/trace-events
··· 70 70 aspeed_rtc_read(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64 71 71 aspeed_rtc_write(uint64_t addr, uint64_t value) "addr 0x%02" PRIx64 " value 0x%08" PRIx64 72 72 73 - # xlnx-zynqmp-rtc.c 74 - xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec) "Get time from host: %d-%d-%d %2d:%02d:%02d" 75 - 76 73 # nrf51_timer.c 77 74 nrf51_timer_read(uint64_t addr, uint32_t value, unsigned size) "read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" 78 75 nrf51_timer_write(uint64_t addr, uint32_t value, unsigned size) "write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"
+1 -1
hw/timer/xlnx-zynqmp-rtc.c hw/rtc/xlnx-zynqmp-rtc.c
··· 36 36 #include "qemu/cutils.h" 37 37 #include "sysemu/sysemu.h" 38 38 #include "trace.h" 39 - #include "hw/timer/xlnx-zynqmp-rtc.h" 39 + #include "hw/rtc/xlnx-zynqmp-rtc.h" 40 40 #include "migration/vmstate.h" 41 41 42 42 #ifndef XLNX_ZYNQMP_RTC_ERR_DEBUG
+1 -1
include/hw/arm/xlnx-zynqmp.h
··· 29 29 #include "hw/dma/xlnx-zdma.h" 30 30 #include "hw/display/xlnx_dp.h" 31 31 #include "hw/intc/xlnx-zynqmp-ipi.h" 32 - #include "hw/timer/xlnx-zynqmp-rtc.h" 32 + #include "hw/rtc/xlnx-zynqmp-rtc.h" 33 33 #include "hw/cpu/cluster.h" 34 34 #include "target/arm/cpu.h" 35 35
+3 -3
include/hw/timer/xlnx-zynqmp-rtc.h include/hw/rtc/xlnx-zynqmp-rtc.h
··· 3 3 * 4 4 * Copyright (c) 2017 Xilinx Inc. 5 5 * 6 - * Written-by: Alistair Francis <alistair.francis@xilinx.com> 6 + * Written-by: Alistair Francis 7 7 * 8 8 * Permission is hereby granted, free of charge, to any person obtaining a copy 9 9 * of this software and associated documentation files (the "Software"), to deal ··· 24 24 * THE SOFTWARE. 25 25 */ 26 26 27 - #ifndef HW_TIMER_XLNX_ZYNQMP_RTC_H 28 - #define HW_TIMER_XLNX_ZYNQMP_RTC_H 27 + #ifndef HW_RTC_XLNX_ZYNQMP_H 28 + #define HW_RTC_XLNX_ZYNQMP_H 29 29 30 30 #include "hw/register.h" 31 31 #include "hw/sysbus.h"