From: Michael Davidsaver <mdavidsaver@gmail.com>
To: Peter Maydell <peter.maydell@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>,
Antoine Mathys <barsamin@gmail.com>,
David Gibson <david@gibson.dropbear.id.au>,
qemu-devel@nongnu.org, Michael Davidsaver <mdavidsaver@gmail.com>
Subject: [Qemu-devel] [PATCH 13/14] timer: ds-rtc model ds1375
Date: Thu, 5 Jul 2018 11:20:00 -0700 [thread overview]
Message-ID: <20180705182001.16537-14-mdavidsaver@gmail.com> (raw)
In-Reply-To: <20180705182001.16537-1-mdavidsaver@gmail.com>
differences from ds1338
* Has alarms (not modeled)
* different control register (not modeled)
* smaller address space (0x20 vs. 0x40)
Signed-off-by: Michael Davidsaver <mdavidsaver@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/timer/ds-rtc.c | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/hw/timer/ds-rtc.c b/hw/timer/ds-rtc.c
index 9abac38628..3a8ad1a00f 100644
--- a/hw/timer/ds-rtc.c
+++ b/hw/timer/ds-rtc.c
@@ -1,8 +1,9 @@
/*
- * MAXIM DS1338 I2C RTC+NVRAM
+ * MAXIM/Dallas DS1338 and DS1375 I2C RTC+NVRAM
*
+ * Copyright (c) 2018 Michael Davidsaver
* Copyright (c) 2009 CodeSourcery.
- * Written by Paul Brook
+ * Written by Paul Brook, Michael Davidsaver
*
* This code is licensed under the GNU GPL v2.
*
@@ -41,6 +42,7 @@
#define R_YEAR (0x6)
#define R_DS1338_CTRL (0x7)
+#define R_DS1375_CTRL (0xe)
/* use 12 hour mode when set */
FIELD(HOUR, SET12, 6, 1)
@@ -300,10 +302,34 @@ static const TypeInfo ds1338_info = {
.class_init = ds1338_class_init,
};
+static void ds1375_control_write(DSRTCState *s, uint8_t data)
+{
+ /* just store it, we don't model any features */
+ s->nvram[R_DS1375_CTRL] = data;
+}
+
+static void ds1375_class_init(ObjectClass *klass, void *data)
+{
+ DSRTCClass *k = DSRTC_CLASS(klass);
+
+ k->has_century = true;
+ k->addr_size = 0x20;
+ k->ctrl_offset = R_DS1375_CTRL;
+ k->ctrl_write = ds1375_control_write;
+}
+
+static const TypeInfo ds1375_info = {
+ .name = "ds1375",
+ .parent = TYPE_DSRTC,
+ .class_size = sizeof(DSRTCClass),
+ .class_init = ds1375_class_init,
+};
+
static void dsrtc_register_types(void)
{
type_register_static(&dsrtc_info);
type_register_static(&ds1338_info);
+ type_register_static(&ds1375_info);
}
type_init(dsrtc_register_types)
--
2.11.0
next prev parent reply other threads:[~2018-07-05 18:20 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 18:19 [Qemu-devel] [PATCH 00/14] Generalize Dallas/Maxim I2C RTC devices v3 Michael Davidsaver
2018-07-05 18:19 ` [Qemu-devel] [PATCH 01/14] tests: more thorough tests of ds1338 Michael Davidsaver
2018-07-17 15:28 ` Peter Maydell
2018-07-05 18:19 ` [Qemu-devel] [PATCH 02/14] timer: ds1338 use registerfields.h Michael Davidsaver
2018-07-06 1:35 ` David Gibson
2018-07-05 18:19 ` [Qemu-devel] [PATCH 03/14] timer: ds1338 persist 12-hour mode selection Michael Davidsaver
2018-07-06 3:39 ` David Gibson
2018-07-06 4:35 ` Michael Davidsaver
2018-07-07 17:59 ` Michael Davidsaver
2018-07-09 5:09 ` David Gibson
2018-07-05 18:19 ` [Qemu-devel] [PATCH 04/14] timer: ds1338 clarify HOUR handling Michael Davidsaver
2018-07-09 5:12 ` David Gibson
2018-07-05 18:19 ` [Qemu-devel] [PATCH 05/14] timer: ds1338 change write handling and fix wday_offset handling Michael Davidsaver
2018-07-16 4:25 ` David Gibson
2018-07-05 18:19 ` [Qemu-devel] [PATCH 06/14] tests: ds-rtc test 12 hour mode Michael Davidsaver
2018-07-07 17:49 ` [Qemu-devel] [PATCH v2 " Michael Davidsaver
2018-07-09 6:49 ` David Gibson
2018-07-05 18:19 ` [Qemu-devel] [PATCH 07/14] tests: ds-rtc test wday offset Michael Davidsaver
2018-07-07 17:50 ` [Qemu-devel] [PATCH v2 " Michael Davidsaver
2018-07-09 6:50 ` David Gibson
2018-07-05 18:19 ` [Qemu-devel] [PATCH 08/14] timer: rename ds1338 -> dsrtc Michael Davidsaver
2018-07-05 18:19 ` [Qemu-devel] [PATCH 09/14] timer: rename file ds1338.c -> ds-rtc.c Michael Davidsaver
2018-07-05 18:19 ` [Qemu-devel] [PATCH 10/14] timer: ds1338 remove vestige of un-modeled OSF Michael Davidsaver
2018-07-16 4:26 ` David Gibson
2018-07-05 18:19 ` [Qemu-devel] [PATCH 12/14] timer: ds-rtc handle CENTURY bit Michael Davidsaver
2018-07-16 9:43 ` David Gibson
2018-07-05 18:20 ` Michael Davidsaver [this message]
2018-07-16 9:44 ` [Qemu-devel] [PATCH 13/14] timer: ds-rtc model ds1375 David Gibson
2018-07-05 18:20 ` [Qemu-devel] [PATCH 14/14] tests: drop ds1338-test Michael Davidsaver
2018-07-17 15:23 ` Peter Maydell
[not found] ` <20180705182001.16537-12-mdavidsaver@gmail.com>
2018-07-16 9:19 ` [Qemu-devel] [PATCH 11/14] timer: generalize ds1338 David Gibson
-- strict thread matches above, loose matches on Subject: below --
2018-03-24 19:24 [Qemu-devel] [PATCH 00/14] Generalize Dallas/Maxim I2C RTC devices v2 Michael Davidsaver
2018-03-24 19:24 ` [Qemu-devel] [PATCH 13/14] timer: ds-rtc model ds1375 Michael Davidsaver
2018-04-13 13:01 ` Peter Maydell
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=20180705182001.16537-14-mdavidsaver@gmail.com \
--to=mdavidsaver@gmail.com \
--cc=barsamin@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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).