[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 15/32] piix4: add a i8254 pit controller as specified in datashee
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 15/32] piix4: add a i8254 pit controller as specified in datasheet |
Date: |
Tue, 15 Oct 2019 18:26:48 +0200 |
From: Hervé Poussineau <address@hidden>
Remove i8254 instanciated in malta board, to not have it twice.
Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/isa/piix4.c | 4 ++++
hw/mips/mips_malta.c | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 1bc91b590c..0b0a0ecab1 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -30,6 +30,7 @@
#include "hw/isa/isa.h"
#include "hw/sysbus.h"
#include "hw/dma/i8257.h"
+#include "hw/timer/i8254.h"
#include "migration/vmstate.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
@@ -165,6 +166,9 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp)
/* initialize ISA irqs */
isa_bus_irqs(isa_bus, s->isa);
+ /* initialize pit */
+ i8254_pit_init(isa_bus, 0x40, 0, NULL);
+
/* DMA */
i8257_dma_init(isa_bus, 0);
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index df247177ca..16d7a0e785 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -45,7 +45,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/timer/mc146818rtc.h"
-#include "hw/timer/i8254.h"
#include "exec/address-spaces.h"
#include "hw/sysbus.h" /* SysBusDevice */
#include "qemu/host-utils.h"
@@ -99,8 +98,6 @@ typedef struct {
qemu_irq i8259[16];
} MaltaState;
-static ISADevice *pit;
-
static struct _loaderparams {
int ram_size, ram_low_size;
const char *kernel_filename;
@@ -1428,7 +1425,6 @@ void mips_malta_init(MachineState *machine)
pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci");
smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100,
isa_get_irq(NULL, 9), NULL, 0, NULL);
- pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
mc146818_rtc_init(isa_bus, 2000, NULL);
/* generate SPD EEPROM data */
--
2.21.0
- Re: [PATCH 10/32] piix4: add a i8259 interrupt controller as specified in datasheet, (continued)
- [PATCH 11/32] Revert "irq: introduce qemu_irq_proxy()", Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 12/32] piix4: rename PIIX4 object to piix4-isa, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 13/32] piix4: convert reset function to QOM, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 14/32] piix4: add a i8257 dma controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 15/32] piix4: add a i8254 pit controller as specified in datasheet,
Philippe Mathieu-Daudé <=
- [PATCH 16/32] piix4: add a mc146818rtc controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 17/32] hw/mips/mips_malta: Create IDE hard drive array dynamically, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 18/32] hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create(), Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 19/32] hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 20/32] hw/i386/pc: Extract pc_gsi_create(), Philippe Mathieu-Daudé, 2019/10/15