Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[ARM] 4004/1: S3C24XX: UDC remove implict addition of VA to regs
Remove the implicit addition of a virtual address
to the UDC registers. This should have been done
by ioremap() in the driver, not by a static map.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by Ben Dooks and committed by Russell King 9fddda23 94b1e96d
+3
-4
include/asm-arm/arch-s3c2410/regs-udc.h
+3
-4
include/asm-arm/arch-s3c2410/regs-udc.h
···
11
#ifndef __ASM_ARCH_REGS_UDC_H
12
#define __ASM_ARCH_REGS_UDC_H
13
14
-
15
-
#define S3C2410_USBDREG(x) ((x) + S3C24XX_VA_USBDEV)
16
17
#define S3C2410_UDC_FUNC_ADDR_REG S3C2410_USBDREG(0x0140)
18
#define S3C2410_UDC_PWR_REG S3C2410_USBDREG(0x0144)
···
135
#define S3C2410_UDC_OCSR2_ISO (1<<6) // R/W
136
#define S3C2410_UDC_OCSR2_DMAIEN (1<<5) // R/W
137
138
-
#define S3C2410_UDC_SETIX(x) \
139
-
__raw_writel(S3C2410_UDC_INDEX_ ## x, S3C2410_UDC_INDEX_REG);
140
141
142
#define S3C2410_UDC_EP0_CSR_OPKRDY (1<<0)
···
11
#ifndef __ASM_ARCH_REGS_UDC_H
12
#define __ASM_ARCH_REGS_UDC_H
13
14
+
#define S3C2410_USBDREG(x) (x)
15
16
#define S3C2410_UDC_FUNC_ADDR_REG S3C2410_USBDREG(0x0140)
17
#define S3C2410_UDC_PWR_REG S3C2410_USBDREG(0x0144)
···
136
#define S3C2410_UDC_OCSR2_ISO (1<<6) // R/W
137
#define S3C2410_UDC_OCSR2_DMAIEN (1<<5) // R/W
138
139
+
#define S3C2410_UDC_SETIX(base,x) \
140
+
writel(S3C2410_UDC_INDEX_ ## x, base+S3C2410_UDC_INDEX_REG);
141
142
143
#define S3C2410_UDC_EP0_CSR_OPKRDY (1<<0)