Commit e6a2a9ce69400a8109e01030aec0d5e1e2bc73c2

Authored by Ben Dooks
Committed by Ben Dooks
1 parent 98fd63ba61

[ARM] S3C: Rename S3C24XX_PA_USBHOST to S3C_PA_USBHOST

The USB host base address is available on both the S3C24XX and S3C64XX
ranges.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

Showing 3 changed files with 3 additions and 4 deletions Side-by-side Diff

arch/arm/mach-s3c2410/include/mach/map.h
... ... @@ -84,7 +84,6 @@
84 84  
85 85 #define S3C24XX_PA_IRQ S3C2410_PA_IRQ
86 86 #define S3C24XX_PA_MEMCTRL S3C2410_PA_MEMCTRL
87   -#define S3C24XX_PA_USBHOST S3C2410_PA_USBHOST
88 87 #define S3C24XX_PA_DMA S3C2410_PA_DMA
89 88 #define S3C24XX_PA_CLKPWR S3C2410_PA_CLKPWR
90 89 #define S3C24XX_PA_LCD S3C2410_PA_LCD
... ... @@ -102,6 +101,7 @@
102 101  
103 102 #define S3C_PA_IIC S3C2410_PA_IIC
104 103 #define S3C_PA_UART S3C24XX_PA_UART
  104 +#define S3C_PA_USBHOST S3C2410_PA_USBHOST
105 105 #define S3C_PA_HSMMC0 S3C2443_PA_HSMMC
106 106  
107 107 #endif /* __ASM_ARCH_MAP_H */
arch/arm/plat-s3c/dev-usb.c
... ... @@ -23,8 +23,8 @@
23 23  
24 24 static struct resource s3c_usb_resource[] = {
25 25 [0] = {
26   - .start = S3C24XX_PA_USBHOST,
27   - .end = S3C24XX_PA_USBHOST + S3C24XX_SZ_USBHOST - 1,
  26 + .start = S3C_PA_USBHOST,
  27 + .end = S3C_PA_USBHOST + 0x100 - 1,
28 28 .flags = IORESOURCE_MEM,
29 29 },
30 30 [1] = {
arch/arm/plat-s3c24xx/include/plat/map.h
... ... @@ -58,7 +58,6 @@
58 58 #define S3C24XX_SZ_SPI SZ_1M
59 59 #define S3C24XX_SZ_SDI SZ_1M
60 60 #define S3C24XX_SZ_NAND SZ_1M
61   -#define S3C24XX_SZ_USBHOST SZ_1M
62 61  
63 62 /* GPIO ports */
64 63