From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Damien Hedde" <damien.hedde@greensocs.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Luc Michel" <luc@lmichel.fr>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-arm@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>
Subject: [RFC PATCH-for-6.1 3/9] hw/arm: Use new machine_create_constant_clock() helper
Date: Fri, 9 Apr 2021 08:23:55 +0200 [thread overview]
Message-ID: <20210409062401.2350436-4-f4bug@amsat.org> (raw)
In-Reply-To: <20210409062401.2350436-1-f4bug@amsat.org>
Use the newly added machine_create_constant_clock() helper
to create the SYSCLKs.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/arm/mps2-tz.c | 6 ++----
hw/arm/mps2.c | 3 +--
hw/arm/musca.c | 6 ++----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 3fbe3d29f95..86481fbe40d 100644
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -740,10 +740,8 @@ static void mps2tz_common_init(MachineState *machine)
}
/* These clocks don't need migration because they are fixed-frequency */
- mms->sysclk = clock_new(OBJECT(machine), "SYSCLK");
- clock_set_hz(mms->sysclk, mmc->sysclk_frq);
- mms->s32kclk = clock_new(OBJECT(machine), "S32KCLK");
- clock_set_hz(mms->s32kclk, S32KCLK_FRQ);
+ mms->sysclk = machine_create_constant_clock(machine, "SYSCLK", mmc->sysclk_frq);
+ mms->s32kclk = machine_create_constant_clock(machine, "S32KCLK", S32KCLK_FRQ);
object_initialize_child(OBJECT(machine), TYPE_IOTKIT, &mms->iotkit,
mmc->armsse_type);
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index 81413b7133e..5d9250da615 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -143,8 +143,7 @@ static void mps2_common_init(MachineState *machine)
}
/* This clock doesn't need migration because it is fixed-frequency */
- mms->sysclk = clock_new(OBJECT(machine), "SYSCLK");
- clock_set_hz(mms->sysclk, SYSCLK_FRQ);
+ mms->sysclk = machine_create_constant_clock(machine, "SYSCLK", SYSCLK_FRQ);
/* The FPGA images have an odd combination of different RAMs,
* because in hardware they are different implementations and
diff --git a/hw/arm/musca.c b/hw/arm/musca.c
index 7a83f7dda7d..e15149f3a27 100644
--- a/hw/arm/musca.c
+++ b/hw/arm/musca.c
@@ -372,10 +372,8 @@ static void musca_init(MachineState *machine)
exit(1);
}
- mms->sysclk = clock_new(OBJECT(machine), "SYSCLK");
- clock_set_hz(mms->sysclk, SYSCLK_FRQ);
- mms->s32kclk = clock_new(OBJECT(machine), "S32KCLK");
- clock_set_hz(mms->s32kclk, S32KCLK_FRQ);
+ mms->sysclk = machine_create_constant_clock(machine, "SYSCLK", SYSCLK_FRQ);
+ mms->s32kclk = machine_create_constant_clock(machine, "S32KCLK", S32KCLK_FRQ);
object_initialize_child(OBJECT(machine), "sse-200", &mms->sse,
TYPE_SSE200);
--
2.26.3
next prev parent reply other threads:[~2021-04-09 6:29 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 6:23 [RFC PATCH-for-6.1 0/9] hw/clock: Strengthen machine (non-qdev) clock propagation Philippe Mathieu-Daudé
2021-04-09 6:23 ` [RFC PATCH-for-6.1 1/9] hw/core/clock: Increase clock propagation trace events verbosity Philippe Mathieu-Daudé
2021-04-09 6:23 ` [RFC PATCH-for-6.1 2/9] hw/core/machine: Add machine_create_constant_clock() helper Philippe Mathieu-Daudé
2021-04-09 6:23 ` Philippe Mathieu-Daudé [this message]
2021-04-09 6:23 ` [RFC PATCH-for-6.1 4/9] hw/mips: Use new " Philippe Mathieu-Daudé
2021-04-09 6:23 ` [RFC PATCH-for-6.1 5/9] hw/core/qdev-clock: Add qdev_ground_clock() helper Philippe Mathieu-Daudé
2021-04-19 14:22 ` Peter Maydell
2021-04-09 6:23 ` [RFC PATCH-for-6.1 6/9] hw/misc/bcm2835_cprman: Use " Philippe Mathieu-Daudé
2021-04-09 6:23 ` [RFC PATCH-for-6.1 7/9] hw/misc/bcm2835_cprman: Feed 'xosc' from the board Philippe Mathieu-Daudé
2021-04-19 14:24 ` Peter Maydell
2021-04-09 6:24 ` [RFC PATCH-for-6.1 8/9] hw/clock: Declare clock_new() internally Philippe Mathieu-Daudé
2021-04-19 14:26 ` Peter Maydell
2021-04-20 9:27 ` Philippe Mathieu-Daudé
2021-04-09 6:24 ` [RFC PATCH-for-6.1 9/9] hw/core/machine: Reset machine clocks using qemu_register_reset() Philippe Mathieu-Daudé
2021-04-19 14:27 ` Peter Maydell
2021-04-09 13:12 ` [RFC PATCH-for-6.1 0/9] hw/clock: Strengthen machine (non-qdev) clock propagation Philippe Mathieu-Daudé
2021-04-09 14:11 ` Philippe Mathieu-Daudé
2021-04-09 14:20 ` Philippe Mathieu-Daudé
2021-04-10 13:19 ` Luc Michel
2021-04-10 13:53 ` Philippe Mathieu-Daudé
2021-04-10 15:15 ` Peter Maydell
2021-04-10 16:14 ` Philippe Mathieu-Daudé
2021-04-12 10:11 ` Peter Maydell
2021-04-12 10:31 ` Philippe Mathieu-Daudé
2021-04-12 10:44 ` Peter Maydell
2021-04-12 11:00 ` Philippe Mathieu-Daudé
2021-04-13 19:43 ` Eduardo Habkost
2021-05-03 15:20 ` Igor Mammedov
2021-05-03 16:37 ` Philippe Mathieu-Daudé
2021-04-19 19:39 ` Luc Michel
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=20210409062401.2350436-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=damien.hedde@greensocs.com \
--cc=ehabkost@redhat.com \
--cc=luc@lmichel.fr \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@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).