diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-08-06 10:48:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-08-06 10:48:06 +0100 |
| commit | 896b63dbff3869944ef76993bd11ddec614b016d (patch) | |
| tree | 9406ff1c9b41c46926ef4d1996c6b1ab7c8232fb /hw/misc/macio/pmu.c | |
| parent | e3a4129abdccfc2fcc2fb9305339af41b07e8215 (diff) | |
| parent | 6484ab3dffadc79020a71376010f517d60b81b83 (diff) | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-3.0-20180801' into staging
ppc patch queue for 2018-08-01
Here are a final couple of fixes for the 3.0 release.
# gpg: Signature made Wed 01 Aug 2018 04:52:57 BST
# gpg: using RSA key 6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-for-3.0-20180801:
sam460ex: Fix PCI interrupts with multiple devices
hw/misc/macio: Fix device introspection problems in macio devices
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/macio/pmu.c')
| -rw-r--r-- | hw/misc/macio/pmu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index e246b0fd41..d25344f888 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -770,9 +770,8 @@ static void pmu_init(Object *obj) qdev_prop_allow_set_link_before_realize, 0, NULL); - object_initialize(&s->mos6522_pmu, sizeof(s->mos6522_pmu), - TYPE_MOS6522_PMU); - qdev_set_parent_bus(DEVICE(&s->mos6522_pmu), sysbus_get_default()); + sysbus_init_child_obj(obj, "mos6522-pmu", &s->mos6522_pmu, + sizeof(s->mos6522_pmu), TYPE_MOS6522_PMU); memory_region_init_io(&s->mem, obj, &mos6522_pmu_ops, s, "via-pmu", 0x2000); |