From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Magnus Damm" <magnus.damm@gmail.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>
Subject: [RFC PATCH 2/4] !fixup hw/rx: rx62n switch renesas_timer.
Date: Thu, 24 Jun 2021 11:23:34 +0200 [thread overview]
Message-ID: <20210624092336.1078504-3-f4bug@amsat.org> (raw)
In-Reply-To: <20210624092336.1078504-1-f4bug@amsat.org>
Fixup while reviewing.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
include/hw/rx/rx62n.h | 3 +--
hw/rx/rx62n.c | 6 +++---
hw/rx/Kconfig | 1 -
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/include/hw/rx/rx62n.h b/include/hw/rx/rx62n.h
index c35bf3998c7..a34b845e1e7 100644
--- a/include/hw/rx/rx62n.h
+++ b/include/hw/rx/rx62n.h
@@ -26,7 +26,6 @@
#include "target/rx/cpu.h"
#include "hw/intc/rx_icu.h"
-#include "hw/timer/renesas_tmr.h"
#include "hw/timer/renesas_timer.h"
#include "hw/char/renesas_sci.h"
#include "qemu/units.h"
@@ -55,7 +54,7 @@ struct RX62NState {
RXCPU cpu;
RXICUState icu;
- RTMRState tmr[RX62N_NR_TMR];
+ RenesasTMUState tmr[RX62N_NR_TMR];
RenesasCMTState cmt[RX62N_NR_CMT];
RSCIState sci[RX62N_NR_SCI];
diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
index fa5add9f9db..626d027a2db 100644
--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -163,13 +163,13 @@ static void register_tmr(RX62NState *s, int unit)
int i, irqbase;
object_initialize_child(OBJECT(s), "tmr[*]",
- &s->tmr[unit], TYPE_RENESAS_TMR);
+ &s->tmr[unit], TYPE_RENESAS_TMU);
tmr = SYS_BUS_DEVICE(&s->tmr[unit]);
qdev_prop_set_uint64(DEVICE(tmr), "input-freq", s->pclk_freq_hz);
sysbus_realize(tmr, &error_abort);
- irqbase = RX62N_TMR_IRQ + TMR_NR_IRQ * unit;
- for (i = 0; i < TMR_NR_IRQ; i++) {
+ irqbase = RX62N_TMR_IRQ + TMU_NR_IRQ * unit;
+ for (i = 0; i < TMU_NR_IRQ; i++) {
sysbus_connect_irq(tmr, i, s->irq[irqbase + i]);
}
sysbus_mmio_map(tmr, 0, RX62N_TMR_BASE + unit * 0x10);
diff --git a/hw/rx/Kconfig b/hw/rx/Kconfig
index f9cb892633a..845ef416e38 100644
--- a/hw/rx/Kconfig
+++ b/hw/rx/Kconfig
@@ -1,7 +1,6 @@
config RX62N_MCU
bool
select RX_ICU
- select RENESAS_TMR
select RENESAS_TIMER
select RENESAS_SCI
--
2.31.1
next prev parent reply other threads:[~2021-06-24 9:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-24 9:23 [PATCH 0/4] Integrate renesas MCU/SoC timer module [part 2 from review] Philippe Mathieu-Daudé
2021-06-24 9:23 ` [PATCH 1/4] !fixup hw/timer: Add renesas_timer Philippe Mathieu-Daudé
2021-06-24 9:23 ` Philippe Mathieu-Daudé [this message]
2021-06-25 14:02 ` [RFC PATCH 2/4] !fixup hw/rx: rx62n switch renesas_timer Yoshinori Sato
2021-06-24 9:23 ` [PATCH 3/4] hw/timer: Remove RENESAS_TMR / RENESAS_CMT Philippe Mathieu-Daudé
2021-06-24 9:23 ` [PATCH 4/4] hw/timer: Remove SH_TIMER Philippe Mathieu-Daudé
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=20210624092336.1078504-3-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=magnus.damm@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=ysato@users.sourceforge.jp \
/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).