From: Sergio Paracuellos <sergio.paracuellos@gmail.com>
To: linux-mips@vger.kernel.org
Cc: tsbogend@alpha.franken.de, john@phrozen.org,
linux-kernel@vger.kernel.org, git@johnthomson.fastmail.com.au
Subject: [PATCH 04/12] mips: ralink: rt3883: define RT3883_SYSC_BASE with __iomem
Date: Mon, 27 Feb 2023 11:57:58 +0100 [thread overview]
Message-ID: <20230227105806.2394101-5-sergio.paracuellos@gmail.com> (raw)
In-Reply-To: <20230227105806.2394101-1-sergio.paracuellos@gmail.com>
So that RT3883_SYSC_BASE can be used later in multiple functions without
needing to repeat this __iomem declaration each time
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
---
arch/mips/include/asm/mach-ralink/rt3883.h | 4 +++-
arch/mips/ralink/rt3883.c | 7 +++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/mips/include/asm/mach-ralink/rt3883.h b/arch/mips/include/asm/mach-ralink/rt3883.h
index f250de9c055b..ad25d5e8d2dc 100644
--- a/arch/mips/include/asm/mach-ralink/rt3883.h
+++ b/arch/mips/include/asm/mach-ralink/rt3883.h
@@ -10,8 +10,10 @@
#include <linux/bitops.h>
+#define IOMEM(x) ((void __iomem *)(KSEG1ADDR(x)))
+
#define RT3883_SDRAM_BASE 0x00000000
-#define RT3883_SYSC_BASE 0x10000000
+#define RT3883_SYSC_BASE IOMEM(0x10000000)
#define RT3883_TIMER_BASE 0x10000100
#define RT3883_INTC_BASE 0x10000200
#define RT3883_MEMC_BASE 0x10000300
diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c
index d9875f146d66..fa215c07558d 100644
--- a/arch/mips/ralink/rt3883.c
+++ b/arch/mips/ralink/rt3883.c
@@ -72,15 +72,14 @@ void __init ralink_of_remap(void)
void __init prom_soc_init(struct ralink_soc_info *soc_info)
{
- void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT3883_SYSC_BASE);
const char *name;
u32 n0;
u32 n1;
u32 id;
- n0 = __raw_readl(sysc + RT3883_SYSC_REG_CHIPID0_3);
- n1 = __raw_readl(sysc + RT3883_SYSC_REG_CHIPID4_7);
- id = __raw_readl(sysc + RT3883_SYSC_REG_REVID);
+ n0 = __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_CHIPID0_3);
+ n1 = __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_CHIPID4_7);
+ id = __raw_readl(RT3883_SYSC_BASE + RT3883_SYSC_REG_REVID);
if (n0 == RT3883_CHIP_NAME0 && n1 == RT3883_CHIP_NAME1) {
soc_info->compatible = "ralink,rt3883-soc";
--
2.25.1
next prev parent reply other threads:[~2023-02-27 10:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 10:57 [PATCH 00/12] mips: ralink: introduce 'soc_device' initialization Sergio Paracuellos
2023-02-27 10:57 ` [PATCH 01/12] mips: ralink: rt305x: define RT305X_SYSC_BASE with __iomem Sergio Paracuellos
2023-02-27 10:57 ` [PATCH 02/12] mips: ralink: rt305x: soc queries and tests as functions Sergio Paracuellos
2023-02-27 10:57 ` [PATCH 03/12] mips: ralink: rt305x: introduce 'soc_device' initialization Sergio Paracuellos
2023-02-27 10:57 ` Sergio Paracuellos [this message]
2023-02-27 10:57 ` [PATCH 05/12] mips: ralink: rt3883: soc queries and tests as functions Sergio Paracuellos
2023-02-27 10:58 ` [PATCH 06/12] mips: ralink: rt3883: introduce 'soc_device' initialization Sergio Paracuellos
2023-02-27 10:58 ` [PATCH 07/12] mips: ralink: rt288x: define RT2880_SYSC_BASE with __iomem Sergio Paracuellos
2023-02-27 10:58 ` [PATCH 08/12] mips: ralink: rt288x: soc queries and tests as functions Sergio Paracuellos
2023-02-27 10:58 ` [PATCH 09/12] mips: ralink: rt288x: introduce 'soc_device' initialization Sergio Paracuellos
2023-02-27 10:58 ` [PATCH 10/12] mips: ralink: mt7620: define MT7620_SYSC_BASE with __iomem Sergio Paracuellos
2023-02-27 10:58 ` [PATCH 11/12] mips: ralink: mt7620: soc queries and tests as functions Sergio Paracuellos
2023-02-27 10:58 ` [PATCH 12/12] mips: ralink: mt7620: introduce 'soc_device' initialization Sergio Paracuellos
2023-03-14 16:21 ` [PATCH 00/12] mips: ralink: " Thomas Bogendoerfer
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=20230227105806.2394101-5-sergio.paracuellos@gmail.com \
--to=sergio.paracuellos@gmail.com \
--cc=git@johnthomson.fastmail.com.au \
--cc=john@phrozen.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=tsbogend@alpha.franken.de \
/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
all inboxes | Powered by JetHome®