[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 05/38] hw/ppc/40p: Move the MC146818 RTC to the board w
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 05/38] hw/ppc/40p: Move the MC146818 RTC to the board where it belongs |
Date: |
Wed, 22 May 2019 14:45:27 +1000 |
From: Philippe Mathieu-Daudé <address@hidden>
The MC146818 RTC was incorrectly added to the i82378 chipset in
commit a04ff940974a. In the next commit (506b7ddf8893) the PReP
machine use the i82378.
Since the MC146818 is specific to the PReP machine, move its use
there.
Fixes: a04ff940974a
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/isa/i82378.c | 4 ----
hw/ppc/prep.c | 3 +++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c
index a5d67bc6d7..c08970b24a 100644
--- a/hw/isa/i82378.c
+++ b/hw/isa/i82378.c
@@ -21,7 +21,6 @@
#include "hw/pci/pci.h"
#include "hw/i386/pc.h"
#include "hw/timer/i8254.h"
-#include "hw/timer/mc146818rtc.h"
#include "hw/audio/pcspk.h"
#define TYPE_I82378 "i82378"
@@ -105,9 +104,6 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
/* 2 82C37 (dma) */
isa = isa_create_simple(isabus, "i82374");
-
- /* timer */
- isa_create_simple(isabus, TYPE_MC146818_RTC);
}
static void i82378_init(Object *obj)
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index ebee321148..7a0d311d43 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -675,6 +675,9 @@ static void ibm_40p_init(MachineState *machine)
qdev_prop_set_uint32(dev, "ram-size", machine->ram_size);
qdev_init_nofail(dev);
+ /* RTC */
+ isa_create_simple(isa_bus, TYPE_MC146818_RTC);
+
/* initialize CMOS checksums */
cmos_checksum = 0x6aa9;
qbus_walk_children(BUS(isa_bus), prep_set_cmos_checksum, NULL, NULL, NULL,
--
2.21.0
- [Qemu-ppc] [PULL 00/38] ppc-for-4.1 queue 20190522, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 03/38] configure: Use quotes around uses of $CPU_CFLAGS, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 04/38] hw/ppc/prep: use TYPE_MC146818_RTC instead of a hardcoded string, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 05/38] hw/ppc/40p: Move the MC146818 RTC to the board where it belongs,
David Gibson <=
- [Qemu-ppc] [PULL 01/38] target/ppc/kvm: Fix trace typo, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 06/38] hw/ppc/40p: use 1900 as a base year, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 07/38] target/ppc: Add ibm, purr and ibm, spurr device-tree properties, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 02/38] configure: Distinguish ppc64 and ppc64le hosts, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 11/38] target/ppc: Fix vsum2sws, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 15/38] spapr/xive: print out the EQ page address in the monitor, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 10/38] target/ppc: Fix vslv and vsrv, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 09/38] target/ppc: Fix xxbrq, xxbrw, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 08/38] target/ppc: Fix xvxsigdp, David Gibson, 2019/05/22
- [Qemu-ppc] [PULL 33/38] spapr: check for the activation of the KVM IRQ device, David Gibson, 2019/05/22