aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-23 15:33:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-23 15:33:02 -0400
commitc44dead70a841d90ddc01968012f323c33217c9e (patch)
tree85489ebe9b9a3413cd8ee197ffb40c8aa8d97e63 /arch/arm/mach-s3c2410
parent99dff5856220a02b8711f2e8746413ea6e53ccf6 (diff)
parentd5f6db9e1aff6ccf1876224f152c0268b0c8a992 (diff)
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (205 commits) USB: EHCI: Remove SPARC_LEON {read,write}_be definitions from ehci.h USB: UHCI: Support big endian GRUSBHC HC sparc: add {read,write}*_be routines USB: UHCI: Add support for big endian descriptors USB: UHCI: Use ACCESS_ONCE rather than using a full compiler barrier USB: UHCI: Add support for big endian mmio usb-storage: Correct adjust_quirks to include latest flags usb/isp1760: Fix possible unlink problems usb/isp1760: Move function isp1760_endpoint_disable() within file. USB: remove remaining usages of hcd->state from usbcore and fix regression usb: musb: ux500: add configuration and build options for ux500 dma usb: musb: ux500: add dma glue layer for ux500 usb: musb: ux500: add dma name for ux500 usb: musb: ux500: add ux500 specific code for gadget side usb: musb: fix compile error usb-storage: fix up the unusual_realtek device list USB: gadget: f_audio: Fix invalid dereference of initdata EHCI: don't rescan interrupt QHs needlessly OHCI: fix regression caused by nVidia shutdown workaround USB: OTG: msm: Free VCCCX regulator even if we can't set the voltage ...
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/map.h4
-rw-r--r--arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h25
2 files changed, 29 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/map.h b/arch/arm/mach-s3c2410/include/mach/map.h
index 25bbf5a942dd..425552d84b60 100644
--- a/arch/arm/mach-s3c2410/include/mach/map.h
+++ b/arch/arm/mach-s3c2410/include/mach/map.h
@@ -21,6 +21,10 @@
21/* USB host controller */ 21/* USB host controller */
22#define S3C2410_PA_USBHOST (0x49000000) 22#define S3C2410_PA_USBHOST (0x49000000)
23 23
24/* S3C2416/S3C2443/S3C2450 High-Speed USB Gadget */
25#define S3C2416_PA_HSUDC (0x49800000)
26#define S3C2416_SZ_HSUDC (SZ_4K)
27
24/* DMA controller */ 28/* DMA controller */
25#define S3C2410_PA_DMA (0x4B000000) 29#define S3C2410_PA_DMA (0x4B000000)
26#define S3C24XX_SZ_DMA SZ_1M 30#define S3C24XX_SZ_DMA SZ_1M
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
index 44494a56e68b..5e06c7265835 100644
--- a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
@@ -37,6 +37,10 @@
37#define S3C2443_SYSID S3C2443_CLKREG(0x5C) 37#define S3C2443_SYSID S3C2443_CLKREG(0x5C)
38#define S3C2443_PWRCFG S3C2443_CLKREG(0x60) 38#define S3C2443_PWRCFG S3C2443_CLKREG(0x60)
39#define S3C2443_RSTCON S3C2443_CLKREG(0x64) 39#define S3C2443_RSTCON S3C2443_CLKREG(0x64)
40#define S3C2443_PHYCTRL S3C2443_CLKREG(0x80)
41#define S3C2443_PHYPWR S3C2443_CLKREG(0x84)
42#define S3C2443_URSTCON S3C2443_CLKREG(0x88)
43#define S3C2443_UCLKCON S3C2443_CLKREG(0x8C)
40 44
41#define S3C2443_SWRST_RESET (0x533c2443) 45#define S3C2443_SWRST_RESET (0x533c2443)
42 46
@@ -121,6 +125,27 @@
121 125
122#define S3C2443_PWRCFG_SLEEP (1<<15) 126#define S3C2443_PWRCFG_SLEEP (1<<15)
123 127
128#define S3C2443_PWRCFG_USBPHY (1 << 4)
129
130#define S3C2443_URSTCON_FUNCRST (1 << 2)
131#define S3C2443_URSTCON_PHYRST (1 << 0)
132
133#define S3C2443_PHYCTRL_CLKSEL (1 << 3)
134#define S3C2443_PHYCTRL_EXTCLK (1 << 2)
135#define S3C2443_PHYCTRL_PLLSEL (1 << 1)
136#define S3C2443_PHYCTRL_DSPORT (1 << 0)
137
138#define S3C2443_PHYPWR_COMMON_ON (1 << 31)
139#define S3C2443_PHYPWR_ANALOG_PD (1 << 4)
140#define S3C2443_PHYPWR_PLL_REFCLK (1 << 3)
141#define S3C2443_PHYPWR_XO_ON (1 << 2)
142#define S3C2443_PHYPWR_PLL_PWRDN (1 << 1)
143#define S3C2443_PHYPWR_FSUSPEND (1 << 0)
144
145#define S3C2443_UCLKCON_DETECT_VBUS (1 << 31)
146#define S3C2443_UCLKCON_FUNC_CLKEN (1 << 2)
147#define S3C2443_UCLKCON_TCLKEN (1 << 0)
148
124#include <asm/div64.h> 149#include <asm/div64.h>
125 150
126static inline unsigned int 151static inline unsigned int