From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org,
qemu-ppc@nongnu.org, david@gibson.dropbear.id.au,
atar4qemu@gmail.com
Subject: [PULL 05/13] sun4m: use qdev properties instead of legacy m48t59_init() function
Date: Sun, 18 Oct 2020 16:59:11 +0100 [thread overview]
Message-ID: <20201018155919.21200-6-mark.cave-ayland@ilande.co.uk> (raw)
In-Reply-To: <20201018155919.21200-1-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20201016182739.22875-3-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/sparc/sun4m.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 54a2b2f9ef..38d1e0fd12 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -837,7 +837,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
{
DeviceState *slavio_intctl;
unsigned int i;
- void *nvram;
+ Nvram *nvram;
qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS];
qemu_irq fdc_tc;
unsigned long kernel_size;
@@ -966,7 +966,13 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000);
}
- nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 1968, 8);
+ dev = qdev_new("sysbus-m48t08");
+ qdev_prop_set_int32(dev, "base-year", 1968);
+ s = SYS_BUS_DEVICE(dev);
+ sysbus_realize_and_unref(s, &error_fatal);
+ sysbus_connect_irq(s, 0, slavio_irq[0]);
+ sysbus_mmio_map(s, 0, hwdef->nvram_base);
+ nvram = NVRAM(dev);
slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_irq, smp_cpus);
--
2.20.1
next prev parent reply other threads:[~2020-10-18 16:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-18 15:59 [PULL 00/13] qemu-macppc queue 20201018 Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 01/13] macio: don't reference serial_hd() directly within the device Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 02/13] grackle: use qdev gpios for PCI IRQs Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 03/13] uninorth: " Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 04/13] m48t59-isa: remove legacy m48t59_init_isa() function Mark Cave-Ayland
2020-10-18 15:59 ` Mark Cave-Ayland [this message]
2020-10-18 15:59 ` [PULL 06/13] sun4u: use qdev properties instead of legacy m48t59_init() function Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 07/13] ppc405_boards: " Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 08/13] m48t59: remove " Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 09/13] mac_oldworld: Allow loading binary ROM image Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 10/13] mac_newworld: " Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 11/13] mac_oldworld: Drop a variable, use get_system_memory() directly Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 12/13] mac_oldworld: Drop some variables Mark Cave-Ayland
2020-10-18 15:59 ` [PULL 13/13] mac_oldworld: Change PCI address of macio to match real hardware Mark Cave-Ayland
2020-10-19 7:18 ` [PULL 00/13] qemu-macppc queue 20201018 Mark Cave-Ayland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201018155919.21200-6-mark.cave-ayland@ilande.co.uk \
--to=mark.cave-ayland@ilande.co.uk \
--cc=atar4qemu@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).