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 01/12] mips: ralink: rt305x: define RT305X_SYSC_BASE with __iomem
Date: Mon, 27 Feb 2023 11:57:55 +0100 [thread overview]
Message-ID: <20230227105806.2394101-2-sergio.paracuellos@gmail.com> (raw)
In-Reply-To: <20230227105806.2394101-1-sergio.paracuellos@gmail.com>
So that RT305X_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/rt305x.h | 3 ++-
arch/mips/ralink/rt305x.c | 8 +++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/mips/include/asm/mach-ralink/rt305x.h b/arch/mips/include/asm/mach-ralink/rt305x.h
index 4d8e8c8d83ce..ef58f7bff957 100644
--- a/arch/mips/include/asm/mach-ralink/rt305x.h
+++ b/arch/mips/include/asm/mach-ralink/rt305x.h
@@ -43,7 +43,8 @@ static inline int soc_is_rt5350(void)
return ralink_soc == RT305X_SOC_RT5350;
}
-#define RT305X_SYSC_BASE 0x10000000
+#define IOMEM(x) ((void __iomem *)(KSEG1ADDR(x)))
+#define RT305X_SYSC_BASE IOMEM(0x10000000)
#define SYSC_REG_CHIP_NAME0 0x00
#define SYSC_REG_CHIP_NAME1 0x04
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
index 8b095a9dcb15..135a46517763 100644
--- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c
@@ -21,11 +21,10 @@
static unsigned long rt5350_get_mem_size(void)
{
- void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
unsigned long ret;
u32 t;
- t = __raw_readl(sysc + SYSC_REG_SYSTEM_CONFIG);
+ t = __raw_readl(RT305X_SYSC_BASE + SYSC_REG_SYSTEM_CONFIG);
t = (t >> RT5350_SYSCFG0_DRAM_SIZE_SHIFT) &
RT5350_SYSCFG0_DRAM_SIZE_MASK;
@@ -142,14 +141,13 @@ void __init ralink_of_remap(void)
void __init prom_soc_init(struct ralink_soc_info *soc_info)
{
- void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
unsigned char *name;
u32 n0;
u32 n1;
u32 id;
- n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
- n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
+ n0 = __raw_readl(RT305X_SYSC_BASE + SYSC_REG_CHIP_NAME0);
+ n1 = __raw_readl(RT305X_SYSC_BASE + SYSC_REG_CHIP_NAME1);
if (n0 == RT3052_CHIP_NAME0 && n1 == RT3052_CHIP_NAME1) {
unsigned long icache_sets;
--
2.25.1
next prev parent reply other threads:[~2023-02-27 10:58 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 ` Sergio Paracuellos [this message]
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 ` [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-2-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®