diff options
| author | Andy Green <andy@openmoko.com> | 2009-01-30 09:53:40 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-30 09:53:40 +0000 |
| commit | 88c1918a71b934844780b217d931485c497fc6b4 (patch) | |
| tree | 74461e8e394c2ca6581aa6500d619d857648b8db /arch | |
| parent | 4caf79de95c26495e7cdc8204023d97598f887d2 (diff) | |
fix-s3c6410-hsusb-phy-regs.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c6410/mach-smdk6410.c | 4 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c64xx/dev-usbgadget.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c index 8132ea37d7d..98f4a5bec77 100644 --- a/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c @@ -51,6 +51,8 @@ #include <plat/devs.h> #include <plat/cpu.h> +#include <plat/regs-usb-hs-otg.h> + #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE @@ -181,7 +183,7 @@ static void __init smdk6410_map_io(void) } struct s3c_plat_otg_data s3c_hs_otg_plat_data = { - .phyclk = 2, /* 12MHz osc */ + .phyclk = REF_CLK_OSCC | 2, /* 12MHz osc */ }; diff --git a/arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h b/arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h index 416c5d747a8..80f84614315 100644 --- a/arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h +++ b/arch/arm/plat-s3c/include/plat/regs-usb-hs-otg.h @@ -13,7 +13,7 @@ #define __ASM_ARCH_REGS_USB_HS_OTG_H /* USB2.0 OTG Controller register */ -#define S3C_USBOTG_PHYREG(x) ((x) /*+ S3C64XX_VA_OTGSFR */) +#define S3C_USBOTG_PHYREG(x) ((x) + 0x100000 /* S3C64XX_VA_OTGSFR */) #define S3C_USBOTG_PHYPWR S3C_USBOTG_PHYREG(0x0) #define S3C_USBOTG_PHYCLK S3C_USBOTG_PHYREG(0x4) #define S3C_USBOTG_RSTCON S3C_USBOTG_PHYREG(0x8) diff --git a/arch/arm/plat-s3c64xx/dev-usbgadget.c b/arch/arm/plat-s3c64xx/dev-usbgadget.c index 17d33f0b7e2..88bdfd70d37 100644 --- a/arch/arm/plat-s3c64xx/dev-usbgadget.c +++ b/arch/arm/plat-s3c64xx/dev-usbgadget.c @@ -13,7 +13,7 @@ static struct resource s3c_usbgadget_resource[] = { [0] = { .start = S3C64XX_PA_OTG, - .end = S3C64XX_PA_OTG + SZ_1M - 1, + .end = S3C64XX_PA_OTG + 0x200000 - 1, .flags = IORESOURCE_MEM, }, [1] = { |