All of lore.kernel.org
 help / color / mirror / Atom feed
From: ~axelheider <axelheider@git.sr.ht>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, peter.maydell@linaro.org
Subject: [PATCH qemu.git v3 2/8] hw/timer/imx_epit: cleanup CR defines
Date: Mon, 31 Oct 2022 00:59:29 +0100	[thread overview]
Message-ID: <166990932074.29941.8709118178538288040-2@git.sr.ht> (raw)
In-Reply-To: <166990932074.29941.8709118178538288040-0@git.sr.ht>

From: Axel Heider <axel.heider@hensoldt.net>

remove unused defines, add needed defines

Signed-off-by: Axel Heider <axel.heider@hensoldt.net>
---
 hw/timer/imx_epit.c         | 4 ++--
 include/hw/timer/imx_epit.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c
index 2841fbaa1c..661e9158e3 100644
--- a/hw/timer/imx_epit.c
+++ b/hw/timer/imx_epit.c
@@ -82,8 +82,8 @@ static void imx_epit_set_freq(IMXEPITState *s)
     uint32_t clksrc;
     uint32_t prescaler;
 
-    clksrc = extract32(s->cr, CR_CLKSRC_SHIFT, 2);
-    prescaler = 1 + extract32(s->cr, CR_PRESCALE_SHIFT, 12);
+    clksrc = extract32(s->cr, CR_CLKSRC_SHIFT, CR_CLKSRC_BITS);
+    prescaler = 1 + extract32(s->cr, CR_PRESCALE_SHIFT, CR_PRESCALE_BITS);
 
     s->freq = imx_ccm_get_clock_frequency(s->ccm,
                                 imx_epit_clocks[clksrc]) / prescaler;
diff --git a/include/hw/timer/imx_epit.h b/include/hw/timer/imx_epit.h
index 2acc41e982..e2cb96229b 100644
--- a/include/hw/timer/imx_epit.h
+++ b/include/hw/timer/imx_epit.h
@@ -43,7 +43,7 @@
 #define CR_OCIEN    (1 << 2)
 #define CR_RLD      (1 << 3)
 #define CR_PRESCALE_SHIFT (4)
-#define CR_PRESCALE_MASK  (0xfff)
+#define CR_PRESCALE_BITS  (12)
 #define CR_SWR      (1 << 16)
 #define CR_IOVW     (1 << 17)
 #define CR_DBGEN    (1 << 18)
@@ -51,7 +51,7 @@
 #define CR_DOZEN    (1 << 20)
 #define CR_STOPEN   (1 << 21)
 #define CR_CLKSRC_SHIFT (24)
-#define CR_CLKSRC_MASK  (0x3 << CR_CLKSRC_SHIFT)
+#define CR_CLKSRC_BITS  (2)
 
 #define EPIT_TIMER_MAX  0XFFFFFFFFUL
 
-- 
2.34.5



  parent reply	other threads:[~2022-12-01 15:44 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-01 15:42 [PATCH qemu.git v3 0/8] hw/timer/imx_epit: improve and fix EPIT compare timer ~axelheider
2022-10-25 10:33 ` [PATCH qemu.git v3 7/8] hw/timer/imx_epit: remove explicit fields cnt and freq ~axelheider
2023-01-05 12:08   ` Peter Maydell
2022-10-25 15:33 ` [PATCH qemu.git v3 1/8] hw/timer/imx_epit: improve comments ~axelheider
2023-01-05 12:00   ` Peter Maydell
2022-10-25 18:32 ` [PATCH qemu.git v3 4/8] hw/timer/imx_epit: update interrupt state on CR write access ~axelheider
2023-01-05 12:03   ` Peter Maydell
2022-10-27 13:09 ` [PATCH qemu.git v3 6/8] hw/timer/imx_epit: factor out register write handlers ~axelheider
2023-01-05 12:04   ` Peter Maydell
2022-10-30 23:59 ` ~axelheider [this message]
2023-01-05 12:00   ` [PATCH qemu.git v3 2/8] hw/timer/imx_epit: cleanup CR defines Peter Maydell
2022-11-19 14:59 ` [PATCH qemu.git v3 3/8] hw/timer/imx_epit: define SR_OCIF ~axelheider
2023-01-05 12:01   ` Peter Maydell
2022-11-19 16:09 ` [PATCH qemu.git v3 5/8] hw/timer/imx_epit: hard reset initializes CR with 0 ~axelheider
2023-01-05 12:04   ` Peter Maydell
2022-11-20 19:05 ` [PATCH qemu.git v3 8/8] hw/timer/imx_epit: fix compare timer handling ~axelheider
2023-01-05 12:21   ` Peter Maydell
2023-01-05 21:08     ` Axel Heider
2023-04-04 15:44   ` Peter Maydell
2023-04-04 16:26     ` Axel Heider
2023-01-05 12:23 ` [PATCH qemu.git v3 0/8] hw/timer/imx_epit: improve and fix EPIT compare timer Peter Maydell
2023-01-05 21:11   ` Axel Heider

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=166990932074.29941.8709118178538288040-2@git.sr.ht \
    --to=axelheider@git.sr.ht \
    --cc=axelheider@gmx.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.