Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 07:23:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mips: ralink: rt305x: define RT305X_SYSC_BASE with __iomem

Browse Source 
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>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
Sergio Paracuellos 2023-02-27 11:57:55 +01:00 committed by Thomas Bogendoerfer
parent e9a440e092
commit 13a9d0bea9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/mips/include/asm/mach-ralink/rt305x.h
View File

@ -43,7 +43,8 @@ static inline int soc_is_rt5350(void)
return ralink_soc == RT305X_SOC_RT5350; 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_NAME0 0x00
#define SYSC_REG_CHIP_NAME1 0x04 #define SYSC_REG_CHIP_NAME1 0x04

8
arch/mips/ralink/rt305x.c
View File

@ -21,11 +21,10 @@
static unsigned long rt5350_get_mem_size(void) static unsigned long rt5350_get_mem_size(void)
{ {
void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
unsigned long ret; unsigned long ret;
u32 t; 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) & t = (t >> RT5350_SYSCFG0_DRAM_SIZE_SHIFT) &
RT5350_SYSCFG0_DRAM_SIZE_MASK; 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 __init prom_soc_init(struct ralink_soc_info *soc_info)
{ {
void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE);
unsigned char *name; unsigned char *name;
u32 n0; u32 n0;
u32 n1; u32 n1;
u32 id; u32 id;
n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0); n0 = __raw_readl(RT305X_SYSC_BASE + SYSC_REG_CHIP_NAME0);
n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1); n1 = __raw_readl(RT305X_SYSC_BASE + SYSC_REG_CHIP_NAME1);
if (n0 == RT3052_CHIP_NAME0 && n1 == RT3052_CHIP_NAME1) { if (n0 == RT3052_CHIP_NAME0 && n1 == RT3052_CHIP_NAME1) {
unsigned long icache_sets; unsigned long icache_sets;