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 10/12] mips: ralink: mt7620: define MT7620_SYSC_BASE with __iomem
Date: Mon, 27 Feb 2023 11:58:04 +0100 [thread overview]
Message-ID: <20230227105806.2394101-11-sergio.paracuellos@gmail.com> (raw)
In-Reply-To: <20230227105806.2394101-1-sergio.paracuellos@gmail.com>
So that MT7620_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/mt7620.h | 3 ++-
arch/mips/ralink/mt7620.c | 15 +++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h
index d51dfad8f543..3e37705ea9cf 100644
--- a/arch/mips/include/asm/mach-ralink/mt7620.h
+++ b/arch/mips/include/asm/mach-ralink/mt7620.h
@@ -11,7 +11,8 @@
#ifndef _MT7620_REGS_H_
#define _MT7620_REGS_H_
-#define MT7620_SYSC_BASE 0x10000000
+#define IOMEM(x) ((void __iomem *)(KSEG1ADDR(x)))
+#define MT7620_SYSC_BASE IOMEM(0x10000000)
#define SYSC_REG_CHIP_NAME0 0x00
#define SYSC_REG_CHIP_NAME1 0x04
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index ae1fa0391c88..c13b73b6ee3f 100644
--- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c
@@ -326,7 +326,6 @@ mt7628_dram_init(struct ralink_soc_info *soc_info)
void __init prom_soc_init(struct ralink_soc_info *soc_info)
{
- void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7620_SYSC_BASE);
unsigned char *name = NULL;
u32 n0;
u32 n1;
@@ -336,9 +335,9 @@ void __init prom_soc_init(struct ralink_soc_info *soc_info)
u32 pmu1;
u32 bga;
- n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
- n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
- rev = __raw_readl(sysc + SYSC_REG_CHIP_REV);
+ n0 = __raw_readl(MT7620_SYSC_BASE + SYSC_REG_CHIP_NAME0);
+ n1 = __raw_readl(MT7620_SYSC_BASE + SYSC_REG_CHIP_NAME1);
+ rev = __raw_readl(MT7620_SYSC_BASE + SYSC_REG_CHIP_REV);
bga = (rev >> CHIP_REV_PKG_SHIFT) & CHIP_REV_PKG_MASK;
if (n0 == MT7620_CHIP_NAME0 && n1 == MT7620_CHIP_NAME1) {
@@ -352,7 +351,7 @@ void __init prom_soc_init(struct ralink_soc_info *soc_info)
soc_info->compatible = "ralink,mt7620n-soc";
}
} else if (n0 == MT7620_CHIP_NAME0 && n1 == MT7628_CHIP_NAME1) {
- u32 efuse = __raw_readl(sysc + SYSC_REG_EFUSE_CFG);
+ u32 efuse = __raw_readl(MT7620_SYSC_BASE + SYSC_REG_EFUSE_CFG);
if (efuse & EFUSE_MT7688) {
ralink_soc = MT762X_SOC_MT7688;
@@ -372,7 +371,7 @@ void __init prom_soc_init(struct ralink_soc_info *soc_info)
(rev >> CHIP_REV_VER_SHIFT) & CHIP_REV_VER_MASK,
(rev & CHIP_REV_ECO_MASK));
- cfg0 = __raw_readl(sysc + SYSC_REG_SYSTEM_CONFIG0);
+ cfg0 = __raw_readl(MT7620_SYSC_BASE + SYSC_REG_SYSTEM_CONFIG0);
if (is_mt76x8()) {
dram_type = cfg0 & DRAM_TYPE_MT7628_MASK;
} else {
@@ -388,8 +387,8 @@ void __init prom_soc_init(struct ralink_soc_info *soc_info)
else
mt7620_dram_init(soc_info);
- pmu0 = __raw_readl(sysc + PMU0_CFG);
- pmu1 = __raw_readl(sysc + PMU1_CFG);
+ pmu0 = __raw_readl(MT7620_SYSC_BASE + PMU0_CFG);
+ pmu1 = __raw_readl(MT7620_SYSC_BASE + PMU1_CFG);
pr_info("Analog PMU set to %s control\n",
(pmu0 & PMU_SW_SET) ? ("sw") : ("hw"));
--
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 ` [PATCH 04/12] mips: ralink: rt3883: define RT3883_SYSC_BASE with __iomem Sergio Paracuellos
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 ` Sergio Paracuellos [this message]
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-11-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®