Skip to contentSkip to conversation

S3C64xx: fix USB OTG compilation

PATCH New Maurus Cuelenaere 2 participants 2 messages Nov 20, 2009 – Nov 23, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 5/8 S3C64xx: fix USB OTG compilation

This adds the S3C_VA_USB_HSPHY mapping.

---
 arch/arm/mach-s3c6400/include/mach/map.h |    4 ++++
 arch/arm/plat-s3c64xx/cpu.c              |    5 +++++
 2 files changed, 9 insertions(+), 0 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-s3c6400/include/mach/map.h
index fc8b223..f3b48f8 100644

arch/arm/mach-s3c6400/include/mach/map.h +4 -0
@@ -64,6 +64,9 @@
 
 #define S3C64XX_PA_USBHOST	(0x74300000)
 
+#define S3C64XX_PA_USB_HSPHY	(0x7C100000)
+#define S3C64XX_VA_USB_HSPHY	S3C_ADDR_CPU(0x00200000)
+
 /* place VICs close together */
 #define S3C_VA_VIC0		(S3C_VA_IRQ + 0x00)
 #define S3C_VA_VIC1		(S3C_VA_IRQ + 0x10000)
@@ -79,5 +82,6 @@
 #define S3C_PA_FB		S3C64XX_PA_FB
 #define S3C_PA_USBHOST		S3C64XX_PA_USBHOST
 #define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG
+#define S3C_VA_USB_HSPHY	S3C64XX_VA_USB_HSPHY
 
 #endif /* __ASM_ARCH_6400_MAP_H */
arch/arm/plat-s3c64xx/cpu.c +5 -0
index b1fdd83..49796d2 100644
@@ -107,6 +107,11 @@ static struct map_desc s3c_iodesc[] __initdata = {
 		.pfn		= __phys_to_pfn(S3C64XX_PA_WATCHDOG),
 		.length		= SZ_4K,
 		.type		= MT_DEVICE,
+	}, {
+		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,
+		.pfn		= __phys_to_pfn(S3C64XX_PA_USB_HSPHY),
+		.length		= SZ_1K,
+		.type		= MT_DEVICE,
 	},
 };
 
Signature · 1 line
1.6.5.3
#1 lore raw

PATCH 5/8 S3C64xx: fix USB OTG compilation

Quoted 1 line · Maurus Cuelenaere

This adds the S3C_VA_USB_HSPHY mapping.

will apply, not sure whether to try another fixes patch or to add this to -next.

Quoted 51 lines
---
 arch/arm/mach-s3c6400/include/mach/map.h |    4 ++++
 arch/arm/plat-s3c64xx/cpu.c              |    5 +++++
 2 files changed, 9 insertions(+), 0 deletions(-)
arch/arm/mach-s3c6400/include/mach/map.h +4 -0
index fc8b223..f3b48f8 100644
@@ -64,6 +64,9 @@
 
 #define S3C64XX_PA_USBHOST	(0x74300000)
 
+#define S3C64XX_PA_USB_HSPHY	(0x7C100000)
+#define S3C64XX_VA_USB_HSPHY	S3C_ADDR_CPU(0x00200000)
+
 /* place VICs close together */
 #define S3C_VA_VIC0		(S3C_VA_IRQ + 0x00)
 #define S3C_VA_VIC1		(S3C_VA_IRQ + 0x10000)
@@ -79,5 +82,6 @@
 #define S3C_PA_FB		S3C64XX_PA_FB
 #define S3C_PA_USBHOST		S3C64XX_PA_USBHOST
 #define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG
+#define S3C_VA_USB_HSPHY	S3C64XX_VA_USB_HSPHY
 
 #endif /* __ASM_ARCH_6400_MAP_H */
arch/arm/plat-s3c64xx/cpu.c +5 -0
index b1fdd83..49796d2 100644
@@ -107,6 +107,11 @@ static struct map_desc s3c_iodesc[] __initdata = {
 		.pfn		= __phys_to_pfn(S3C64XX_PA_WATCHDOG),
 		.length		= SZ_4K,
 		.type		= MT_DEVICE,
+	}, {
+		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,
+		.pfn		= __phys_to_pfn(S3C64XX_PA_USB_HSPHY),
+		.length		= SZ_1K,
+		.type		= MT_DEVICE,
 	},
 };
 
Signature · 6 lines
1.6.5.3

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.