Commit 2e8f8518 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by David Gibson
Browse files

hw/ppc/40p: Move the MC146818 RTC to the board where it belongs 



The MC146818 RTC was incorrectly added to the i82378 chipset in
commit a04ff940. In the next commit (506b7ddf) the PReP
machine use the i82378.
Since the MC146818 is specific to the PReP machine, move its use
there.

Fixes: a04ff940
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190505152839.18650-3-philmd@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent c50be9e1

hw/isa/i82378.c

+0 −4
Original line number Diff line number Diff line
@@ -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)

hw/ppc/prep.c

+3 −0
Original line number Diff line number Diff line
@@ -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,