[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/29] piix4: add a i8254 pit controller as specifie
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 19/29] piix4: add a i8254 pit controller as specified in datasheet |
Date: |
Sun, 7 Jan 2018 23:45:48 -0300 |
From: Hervé Poussineau <address@hidden>
Remove i8254 instanciated in malta board, to not have it twice.
Signed-off-by: Hervé Poussineau <address@hidden>
[PMD: rebased]
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 56a1c7d429..04b13f97c6 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -31,6 +31,7 @@
#include "hw/southbridge/i82371_piix.h"
#include "hw/dma/i8257.h"
#include "hw/sysbus.h"
+#include "hw/timer/i8254.h"
PCIDevice *piix4_dev;
@@ -164,6 +165,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 db5a8b1811..84b4d5c423 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -44,7 +44,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/timer/mc146818rtc.h"
-#include "hw/timer/i8254.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
#include "hw/sysbus.h" /* SysBusDevice */
@@ -98,8 +97,6 @@ typedef struct {
qemu_irq i8259[16];
} MaltaState;
-static ISADevice *pit;
-
static struct _loaderparams {
int ram_size, ram_low_size;
const char *kernel_filename;
@@ -1206,7 +1203,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.15.1
- [Qemu-devel] [PATCH 09/29] hw/mips/malta: code movement, (continued)
- [Qemu-devel] [PATCH 09/29] hw/mips/malta: code movement, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 10/29] hw/mips/malta: add fdc37m81x_init() which uses isa_superio_init(), Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 11/29] mc146818rtc: always register rtc to rtc list, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 12/29] piix4: rename some variables in realize function, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 13/29] piix4: convert reset function to QOM, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 14/29] piix4: add Reset Control Register, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 15/29] piix4: add a i8259 interrupt controller as specified in datasheet, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [RFC PATCH 16/29] Revert "irq: introduce qemu_irq_proxy()", Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 17/29] piix: move piix4 declaration into new southbridge/i82371_piix.h, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 18/29] piix4: add a i8257 dma controller as specified in datasheet, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 19/29] piix4: add a i8254 pit controller as specified in datasheet,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 20/29] piix4: add a speaker as specified in datasheet, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 21/29] piix: move southbridge related declarations/definitions to i82371_piix.h, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 22/29] piix3: extract piix3_init() from i440fx_init(), Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 23/29] hw/i386: extract i440fx related declarations/definitions to i440fx.h, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 25/29] hw/i386: move piix from hw/pci-host to hw/southbridge, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 24/29] hw/i386: extract i440fx code from piix.c into i440fx.c, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 26/29] configs/mips-softmmu: use common CONFIG_PCI_PIIX instead of CONFIG_PIIX4, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 27/29] piix3: convert reset function to QOM, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [PATCH 28/29] piix: merge common code from isa/piix4.c with southbridge piix3, Philippe Mathieu-Daudé, 2018/01/07
- [Qemu-devel] [NOTFORMERGE PATCH 29/29] piix4: add isa_superio_init, Philippe Mathieu-Daudé, 2018/01/07