tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ARM: spear13xx: use __iomem pointers for MMIO
ARM is moving to stricter checks on readl/write functions,
so we need to use the correct types everywhere.
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Cc: spear-devel@list.st.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+10
-10
+7
-7
arch/arm/mach-spear13xx/include/mach/spear.h
+7
-7
arch/arm/mach-spear13xx/include/mach/spear.h
···
17
17
#include <asm/memory.h>
18
18
19
19
#define PERIP_GRP2_BASE UL(0xB3000000)
20
-
#define VA_PERIP_GRP2_BASE UL(0xFE000000)
20
+
#define VA_PERIP_GRP2_BASE IOMEM(0xFE000000)
21
21
#define MCIF_SDHCI_BASE UL(0xB3000000)
22
22
#define SYSRAM0_BASE UL(0xB3800000)
23
-
#define VA_SYSRAM0_BASE UL(0xFE800000)
23
+
#define VA_SYSRAM0_BASE IOMEM(0xFE800000)
24
24
#define SYS_LOCATION (VA_SYSRAM0_BASE + 0x600)
25
25
26
26
#define PERIP_GRP1_BASE UL(0xE0000000)
27
-
#define VA_PERIP_GRP1_BASE UL(0xFD000000)
27
+
#define VA_PERIP_GRP1_BASE IOMEM(0xFD000000)
28
28
#define UART_BASE UL(0xE0000000)
29
-
#define VA_UART_BASE UL(0xFD000000)
29
+
#define VA_UART_BASE IOMEM(0xFD000000)
30
30
#define SSP_BASE UL(0xE0100000)
31
31
#define MISC_BASE UL(0xE0700000)
32
-
#define VA_MISC_BASE IOMEM(UL(0xFD700000))
32
+
#define VA_MISC_BASE IOMEM(0xFD700000)
33
33
34
34
#define A9SM_AND_MPMC_BASE UL(0xEC000000)
35
-
#define VA_A9SM_AND_MPMC_BASE UL(0xFC000000)
35
+
#define VA_A9SM_AND_MPMC_BASE IOMEM(0xFC000000)
36
36
37
37
/* A9SM peripheral offsets */
38
38
#define A9SM_PERIP_BASE UL(0xEC800000)
39
-
#define VA_A9SM_PERIP_BASE UL(0xFC800000)
39
+
#define VA_A9SM_PERIP_BASE IOMEM(0xFC800000)
40
40
#define VA_SCU_BASE (VA_A9SM_PERIP_BASE + 0x00)
41
41
42
42
#define L2CC_BASE UL(0xED000000)
+3
-3
arch/arm/mach-spear13xx/spear13xx.c
+3
-3
arch/arm/mach-spear13xx/spear13xx.c
···
114
114
*/
115
115
struct map_desc spear13xx_io_desc[] __initdata = {
116
116
{
117
-
.virtual = VA_PERIP_GRP2_BASE,
117
+
.virtual = (unsigned long)VA_PERIP_GRP2_BASE,
118
118
.pfn = __phys_to_pfn(PERIP_GRP2_BASE),
119
119
.length = SZ_16M,
120
120
.type = MT_DEVICE
121
121
}, {
122
-
.virtual = VA_PERIP_GRP1_BASE,
122
+
.virtual = (unsigned long)VA_PERIP_GRP1_BASE,
123
123
.pfn = __phys_to_pfn(PERIP_GRP1_BASE),
124
124
.length = SZ_16M,
125
125
.type = MT_DEVICE
126
126
}, {
127
-
.virtual = VA_A9SM_AND_MPMC_BASE,
127
+
.virtual = (unsigned long)VA_A9SM_AND_MPMC_BASE,
128
128
.pfn = __phys_to_pfn(A9SM_AND_MPMC_BASE),
129
129
.length = SZ_16M,
130
130
.type = MT_DEVICE