Skip to content

Commit

Permalink
mips: ralink: mt7621: define MT7621_SYSC_BASE with __iomem
Browse files Browse the repository at this point in the history
[ Upstream commit a2cab95 ]

So that MT7621_SYSC_BASE can be used later in multiple functions without
needing to repeat this __iomem declaration each time

Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Stable-dep-of: 7c18b64 ("mips: ralink: mt7621: do not use kzalloc too early")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
john-tho authored and gregkh committed Dec 31, 2022
1 parent 0f8e6fe commit 8348da0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 3 additions & 1 deletion arch/mips/include/asm/mach-ralink/mt7621.h
Expand Up @@ -7,10 +7,12 @@
#ifndef _MT7621_REGS_H_
#define _MT7621_REGS_H_

#define IOMEM(x) ((void __iomem *)(KSEG1ADDR(x)))

#define MT7621_PALMBUS_BASE 0x1C000000
#define MT7621_PALMBUS_SIZE 0x03FFFFFF

#define MT7621_SYSC_BASE 0x1E000000
#define MT7621_SYSC_BASE IOMEM(0x1E000000)

#define SYSC_REG_CHIP_NAME0 0x00
#define SYSC_REG_CHIP_NAME1 0x04
Expand Down
7 changes: 3 additions & 4 deletions arch/mips/ralink/mt7621.c
Expand Up @@ -95,7 +95,6 @@ static void soc_dev_init(struct ralink_soc_info *soc_info, u32 rev)

void __init prom_soc_init(struct ralink_soc_info *soc_info)
{
void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
unsigned char *name = NULL;
u32 n0;
u32 n1;
Expand Down Expand Up @@ -123,8 +122,8 @@ void __init prom_soc_init(struct ralink_soc_info *soc_info)
__sync();
}

n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
n0 = __raw_readl(MT7621_SYSC_BASE + SYSC_REG_CHIP_NAME0);
n1 = __raw_readl(MT7621_SYSC_BASE + SYSC_REG_CHIP_NAME1);

if (n0 == MT7621_CHIP_NAME0 && n1 == MT7621_CHIP_NAME1) {
name = "MT7621";
Expand All @@ -133,7 +132,7 @@ void __init prom_soc_init(struct ralink_soc_info *soc_info)
panic("mt7621: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
}
ralink_soc = MT762X_SOC_MT7621AT;
rev = __raw_readl(sysc + SYSC_REG_CHIP_REV);
rev = __raw_readl(MT7621_SYSC_BASE + SYSC_REG_CHIP_REV);

snprintf(soc_info->sys_type, RAMIPS_SYS_TYPE_LEN,
"MediaTek %s ver:%u eco:%u",
Expand Down

0 comments on commit 8348da0

Please sign in to comment.