aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-10 17:40:04 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-10 17:40:04 -0400
commitb0efb42478c81ed0ed9aa0dc444db200c32624f0 (patch)
tree79d45597910c636892f6e7bc710df6174ef54bc8
parentbd78512e5c0d202847ee3dba2fc3740676e196c7 (diff)
parent4070243250dd06a96d874b0be3cb3a39ef23597c (diff)
Merge branch 'ep93xx' into devel
Diffstat
-rw-r--r--arch/arm/configs/ep93xx_defconfig853
-rw-r--r--arch/arm/mach-ep93xx/Kconfig82
-rw-r--r--arch/arm/mach-ep93xx/Makefile8
-rw-r--r--arch/arm/mach-ep93xx/Makefile.boot7
-rw-r--r--arch/arm/mach-ep93xx/clock.c54
-rw-r--r--arch/arm/mach-ep93xx/core.c8
-rw-r--r--arch/arm/mach-ep93xx/edb9302.c68
-rw-r--r--arch/arm/mach-ep93xx/edb9302a.c68
-rw-r--r--arch/arm/mach-ep93xx/edb9307.c68
-rw-r--r--arch/arm/mach-ep93xx/edb9307a.c80
-rw-r--r--arch/arm/mach-ep93xx/edb9312.c69
-rw-r--r--arch/arm/mach-ep93xx/edb9315.c68
-rw-r--r--arch/arm/mach-ep93xx/edb9315a.c68
-rw-r--r--arch/arm/mach-ep93xx/edb93xx.c217
-rw-r--r--arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h19
-rw-r--r--arch/arm/mach-ep93xx/include/mach/memory.h6
-rw-r--r--drivers/usb/host/ohci-ep93xx.c13
17 files changed, 898 insertions, 858 deletions
diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig
index 3f89d5f25bce..3fb083b81b0a 100644
--- a/arch/arm/configs/ep93xx_defconfig
+++ b/arch/arm/configs/ep93xx_defconfig
@@ -1,12 +1,19 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc1 3# Linux kernel version: 2.6.30-rc3
4# Sat Dec 16 06:05:24 2006 4# Tue May 19 12:26:49 2009
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
8CONFIG_GENERIC_GPIO=y
7# CONFIG_GENERIC_TIME is not set 9# CONFIG_GENERIC_TIME is not set
10# CONFIG_GENERIC_CLOCKEVENTS is not set
8CONFIG_MMU=y 11CONFIG_MMU=y
12# CONFIG_NO_IOPORT is not set
9CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_STACKTRACE_SUPPORT=y
15CONFIG_HAVE_LATENCYTOP_SUPPORT=y
16CONFIG_LOCKDEP_SUPPORT=y
10CONFIG_TRACE_IRQFLAGS_SUPPORT=y 17CONFIG_TRACE_IRQFLAGS_SUPPORT=y
11CONFIG_HARDIRQS_SW_RESEND=y 18CONFIG_HARDIRQS_SW_RESEND=y
12CONFIG_GENERIC_IRQ_PROBE=y 19CONFIG_GENERIC_IRQ_PROBE=y
@@ -15,42 +22,54 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
15# CONFIG_ARCH_HAS_ILOG2_U64 is not set 22# CONFIG_ARCH_HAS_ILOG2_U64 is not set
16CONFIG_GENERIC_HWEIGHT=y 23CONFIG_GENERIC_HWEIGHT=y
17CONFIG_GENERIC_CALIBRATE_DELAY=y 24CONFIG_GENERIC_CALIBRATE_DELAY=y
25CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
18CONFIG_VECTORS_BASE=0xffff0000 26CONFIG_VECTORS_BASE=0xffff0000
19CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 27CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
20 28
21# 29#
22# Code maturity level options 30# General setup
23# 31#
24CONFIG_EXPERIMENTAL=y 32CONFIG_EXPERIMENTAL=y
25CONFIG_BROKEN_ON_SMP=y 33CONFIG_BROKEN_ON_SMP=y
26CONFIG_INIT_ENV_ARG_LIMIT=32 34CONFIG_INIT_ENV_ARG_LIMIT=32
27
28#
29# General setup
30#
31CONFIG_LOCALVERSION="" 35CONFIG_LOCALVERSION=""
32CONFIG_LOCALVERSION_AUTO=y 36CONFIG_LOCALVERSION_AUTO=y
33CONFIG_SWAP=y 37CONFIG_SWAP=y
34CONFIG_SYSVIPC=y 38CONFIG_SYSVIPC=y
35# CONFIG_IPC_NS is not set 39CONFIG_SYSVIPC_SYSCTL=y
36# CONFIG_POSIX_MQUEUE is not set 40# CONFIG_POSIX_MQUEUE is not set
37# CONFIG_BSD_PROCESS_ACCT is not set 41# CONFIG_BSD_PROCESS_ACCT is not set
38# CONFIG_TASKSTATS is not set 42# CONFIG_TASKSTATS is not set
39# CONFIG_UTS_NS is not set
40# CONFIG_AUDIT is not set 43# CONFIG_AUDIT is not set
44
45#
46# RCU Subsystem
47#
48CONFIG_CLASSIC_RCU=y
49# CONFIG_TREE_RCU is not set
50# CONFIG_PREEMPT_RCU is not set
51# CONFIG_TREE_RCU_TRACE is not set
52# CONFIG_PREEMPT_RCU_TRACE is not set
41CONFIG_IKCONFIG=y 53CONFIG_IKCONFIG=y
42CONFIG_IKCONFIG_PROC=y 54CONFIG_IKCONFIG_PROC=y
55CONFIG_LOG_BUF_SHIFT=14
56# CONFIG_GROUP_SCHED is not set
57# CONFIG_CGROUPS is not set
43CONFIG_SYSFS_DEPRECATED=y 58CONFIG_SYSFS_DEPRECATED=y
59CONFIG_SYSFS_DEPRECATED_V2=y
44# CONFIG_RELAY is not set 60# CONFIG_RELAY is not set
45CONFIG_INITRAMFS_SOURCE="" 61# CONFIG_NAMESPACES is not set
62# CONFIG_BLK_DEV_INITRD is not set
46CONFIG_CC_OPTIMIZE_FOR_SIZE=y 63CONFIG_CC_OPTIMIZE_FOR_SIZE=y
47CONFIG_SYSCTL=y 64CONFIG_SYSCTL=y
65CONFIG_ANON_INODES=y
48CONFIG_EMBEDDED=y 66CONFIG_EMBEDDED=y
49CONFIG_UID16=y 67CONFIG_UID16=y
50CONFIG_SYSCTL_SYSCALL=y 68CONFIG_SYSCTL_SYSCALL=y
51CONFIG_KALLSYMS=y 69CONFIG_KALLSYMS=y
52# CONFIG_KALLSYMS_ALL is not set 70# CONFIG_KALLSYMS_ALL is not set
53# CONFIG_KALLSYMS_EXTRA_PASS is not set 71# CONFIG_KALLSYMS_EXTRA_PASS is not set
72# CONFIG_STRIP_ASM_SYMS is not set
54CONFIG_HOTPLUG=y 73CONFIG_HOTPLUG=y
55CONFIG_PRINTK=y 74CONFIG_PRINTK=y
56CONFIG_BUG=y 75CONFIG_BUG=y
@@ -58,31 +77,38 @@ CONFIG_ELF_CORE=y
58CONFIG_BASE_FULL=y 77CONFIG_BASE_FULL=y
59CONFIG_FUTEX=y 78CONFIG_FUTEX=y
60CONFIG_EPOLL=y 79CONFIG_EPOLL=y
80CONFIG_SIGNALFD=y
81CONFIG_TIMERFD=y
82CONFIG_EVENTFD=y
61CONFIG_SHMEM=y 83CONFIG_SHMEM=y
62CONFIG_SLAB=y 84CONFIG_AIO=y
63CONFIG_VM_EVENT_COUNTERS=y 85CONFIG_VM_EVENT_COUNTERS=y
86CONFIG_COMPAT_BRK=y
87CONFIG_SLAB=y
88# CONFIG_SLUB is not set
89# CONFIG_SLOB is not set
90# CONFIG_PROFILING is not set
91# CONFIG_MARKERS is not set
92CONFIG_HAVE_OPROFILE=y
93# CONFIG_KPROBES is not set
94CONFIG_HAVE_KPROBES=y
95CONFIG_HAVE_KRETPROBES=y
96CONFIG_HAVE_CLK=y
97# CONFIG_SLOW_WORK is not set
98CONFIG_HAVE_GENERIC_DMA_COHERENT=y
99CONFIG_SLABINFO=y
64CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
65# CONFIG_TINY_SHMEM is not set
66CONFIG_BASE_SMALL=0 101CONFIG_BASE_SMALL=0
67# CONFIG_SLOB is not set
68
69#
70# Loadable module support
71#
72CONFIG_MODULES=y 102CONFIG_MODULES=y
103# CONFIG_MODULE_FORCE_LOAD is not set
73CONFIG_MODULE_UNLOAD=y 104CONFIG_MODULE_UNLOAD=y
74CONFIG_MODULE_FORCE_UNLOAD=y 105CONFIG_MODULE_FORCE_UNLOAD=y
75# CONFIG_MODVERSIONS is not set 106# CONFIG_MODVERSIONS is not set
76# CONFIG_MODULE_SRCVERSION_ALL is not set 107# CONFIG_MODULE_SRCVERSION_ALL is not set
77CONFIG_KMOD=y
78
79#
80# Block layer
81#
82CONFIG_BLOCK=y 108CONFIG_BLOCK=y
83# CONFIG_LBD is not set 109# CONFIG_LBD is not set
84# CONFIG_BLK_DEV_IO_TRACE is not set 110# CONFIG_BLK_DEV_BSG is not set
85# CONFIG_LSF is not set 111# CONFIG_BLK_DEV_INTEGRITY is not set
86 112
87# 113#
88# IO Schedulers 114# IO Schedulers
@@ -96,6 +122,7 @@ CONFIG_DEFAULT_DEADLINE=y
96# CONFIG_DEFAULT_CFQ is not set 122# CONFIG_DEFAULT_CFQ is not set
97# CONFIG_DEFAULT_NOOP is not set 123# CONFIG_DEFAULT_NOOP is not set
98CONFIG_DEFAULT_IOSCHED="deadline" 124CONFIG_DEFAULT_IOSCHED="deadline"
125# CONFIG_FREEZER is not set
99 126
100# 127#
101# System Type 128# System Type
@@ -105,29 +132,40 @@ CONFIG_DEFAULT_IOSCHED="deadline"
105# CONFIG_ARCH_REALVIEW is not set 132# CONFIG_ARCH_REALVIEW is not set
106# CONFIG_ARCH_VERSATILE is not set 133# CONFIG_ARCH_VERSATILE is not set
107# CONFIG_ARCH_AT91 is not set 134# CONFIG_ARCH_AT91 is not set
108# CONFIG_ARCH_CLPS7500 is not set
109# CONFIG_ARCH_CLPS711X is not set 135# CONFIG_ARCH_CLPS711X is not set
110# CONFIG_ARCH_CO285 is not set 136# CONFIG_ARCH_GEMINI is not set
111# CONFIG_ARCH_EBSA110 is not set 137# CONFIG_ARCH_EBSA110 is not set
112CONFIG_ARCH_EP93XX=y 138CONFIG_ARCH_EP93XX=y
113# CONFIG_ARCH_FOOTBRIDGE is not set 139# CONFIG_ARCH_FOOTBRIDGE is not set
140# CONFIG_ARCH_MXC is not set
114# CONFIG_ARCH_NETX is not set 141# CONFIG_ARCH_NETX is not set
115# CONFIG_ARCH_H720X is not set 142# CONFIG_ARCH_H720X is not set
116# CONFIG_ARCH_IMX is not set 143# CONFIG_ARCH_IMX is not set
144# CONFIG_ARCH_IOP13XX is not set
117# CONFIG_ARCH_IOP32X is not set 145# CONFIG_ARCH_IOP32X is not set
118# CONFIG_ARCH_IOP33X is not set 146# CONFIG_ARCH_IOP33X is not set
119# CONFIG_ARCH_IOP13XX is not set
120# CONFIG_ARCH_IXP4XX is not set
121# CONFIG_ARCH_IXP2000 is not set
122# CONFIG_ARCH_IXP23XX is not set 147# CONFIG_ARCH_IXP23XX is not set
148# CONFIG_ARCH_IXP2000 is not set
149# CONFIG_ARCH_IXP4XX is not set
123# CONFIG_ARCH_L7200 is not set 150# CONFIG_ARCH_L7200 is not set
151# CONFIG_ARCH_KIRKWOOD is not set
152# CONFIG_ARCH_LOKI is not set
153# CONFIG_ARCH_MV78XX0 is not set
154# CONFIG_ARCH_ORION5X is not set
155# CONFIG_ARCH_MMP is not set
156# CONFIG_ARCH_KS8695 is not set
157# CONFIG_ARCH_NS9XXX is not set
158# CONFIG_ARCH_W90X900 is not set
124# CONFIG_ARCH_PNX4008 is not set 159# CONFIG_ARCH_PNX4008 is not set
125# CONFIG_ARCH_PXA is not set 160# CONFIG_ARCH_PXA is not set
161# CONFIG_ARCH_MSM is not set
126# CONFIG_ARCH_RPC is not set 162# CONFIG_ARCH_RPC is not set
127# CONFIG_ARCH_SA1100 is not set 163# CONFIG_ARCH_SA1100 is not set
128# CONFIG_ARCH_S3C2410 is not set 164# CONFIG_ARCH_S3C2410 is not set
165# CONFIG_ARCH_S3C64XX is not set
129# CONFIG_ARCH_SHARK is not set 166# CONFIG_ARCH_SHARK is not set
130# CONFIG_ARCH_LH7A40X is not set 167# CONFIG_ARCH_LH7A40X is not set
168# CONFIG_ARCH_DAVINCI is not set
131# CONFIG_ARCH_OMAP is not set 169# CONFIG_ARCH_OMAP is not set
132 170
133# 171#
@@ -138,14 +176,24 @@ CONFIG_CRUNCH=y
138# 176#
139# EP93xx Platforms 177# EP93xx Platforms
140# 178#
179# CONFIG_EP93XX_SDCE0_PHYS_OFFSET is not set
180CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET=y
141CONFIG_MACH_ADSSPHERE=y 181CONFIG_MACH_ADSSPHERE=y
182CONFIG_MACH_EDB93XX=y
183CONFIG_MACH_EDB9301=y
142CONFIG_MACH_EDB9302=y 184CONFIG_MACH_EDB9302=y
143CONFIG_MACH_EDB9302A=y 185CONFIG_MACH_EDB9307=y
144CONFIG_MACH_EDB9312=y 186CONFIG_MACH_EDB9312=y
145CONFIG_MACH_EDB9315=y 187CONFIG_MACH_EDB9315=y
146CONFIG_MACH_EDB9315A=y
147CONFIG_MACH_GESBC9312=y 188CONFIG_MACH_GESBC9312=y
189CONFIG_MACH_MICRO9=y
190CONFIG_MACH_MICRO9H=y
191CONFIG_MACH_MICRO9M=y
192CONFIG_MACH_MICRO9L=y
148CONFIG_MACH_TS72XX=y 193CONFIG_MACH_TS72XX=y
194CONFIG_EP93XX_EARLY_UART1=y
195# CONFIG_EP93XX_EARLY_UART2 is not set
196# CONFIG_EP93XX_EARLY_UART3 is not set
149 197
150# 198#
151# Processor Type 199# Processor Type
@@ -154,6 +202,7 @@ CONFIG_CPU_32=y
154CONFIG_CPU_ARM920T=y 202CONFIG_CPU_ARM920T=y
155CONFIG_CPU_32v4T=y 203CONFIG_CPU_32v4T=y
156CONFIG_CPU_ABRT_EV4T=y 204CONFIG_CPU_ABRT_EV4T=y
205CONFIG_CPU_PABRT_NOIFAR=y
157CONFIG_CPU_CACHE_V4WT=y 206CONFIG_CPU_CACHE_V4WT=y
158CONFIG_CPU_CACHE_VIVT=y 207CONFIG_CPU_CACHE_VIVT=y
159CONFIG_CPU_COPY_V4WB=y 208CONFIG_CPU_COPY_V4WB=y
@@ -168,34 +217,47 @@ CONFIG_ARM_THUMB=y
168# CONFIG_CPU_ICACHE_DISABLE is not set 217# CONFIG_CPU_ICACHE_DISABLE is not set
169# CONFIG_CPU_DCACHE_DISABLE is not set 218# CONFIG_CPU_DCACHE_DISABLE is not set
170# CONFIG_CPU_DCACHE_WRITETHROUGH is not set 219# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
220# CONFIG_OUTER_CACHE is not set
171CONFIG_ARM_VIC=y 221CONFIG_ARM_VIC=y
222CONFIG_COMMON_CLKDEV=y
172 223
173# 224#
174# Bus support 225# Bus support
175# 226#
176CONFIG_ARM_AMBA=y 227CONFIG_ARM_AMBA=y
177 228# CONFIG_PCI_SYSCALL is not set
178# 229# CONFIG_ARCH_SUPPORTS_MSI is not set
179# PCCARD (PCMCIA/CardBus) support
180#
181# CONFIG_PCCARD is not set 230# CONFIG_PCCARD is not set
182 231
183# 232#
184# Kernel Features 233# Kernel Features
185# 234#
235CONFIG_VMSPLIT_3G=y
236# CONFIG_VMSPLIT_2G is not set
237# CONFIG_VMSPLIT_1G is not set
238CONFIG_PAGE_OFFSET=0xC0000000
186# CONFIG_PREEMPT is not set 239# CONFIG_PREEMPT is not set
187CONFIG_HZ=100 240CONFIG_HZ=100
188# CONFIG_AEABI is not set 241CONFIG_AEABI=y
189# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 242CONFIG_OABI_COMPAT=y
243CONFIG_ARCH_FLATMEM_HAS_HOLES=y
244# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
245# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
246# CONFIG_HIGHMEM is not set
190CONFIG_SELECT_MEMORY_MODEL=y 247CONFIG_SELECT_MEMORY_MODEL=y
191CONFIG_FLATMEM_MANUAL=y 248CONFIG_FLATMEM_MANUAL=y
192# CONFIG_DISCONTIGMEM_MANUAL is not set 249# CONFIG_DISCONTIGMEM_MANUAL is not set
193# CONFIG_SPARSEMEM_MANUAL is not set 250# CONFIG_SPARSEMEM_MANUAL is not set
194CONFIG_FLATMEM=y 251CONFIG_FLATMEM=y
195CONFIG_FLAT_NODE_MEM_MAP=y 252CONFIG_FLAT_NODE_MEM_MAP=y
196# CONFIG_SPARSEMEM_STATIC is not set 253CONFIG_PAGEFLAGS_EXTENDED=y
197CONFIG_SPLIT_PTLOCK_CPUS=4096 254CONFIG_SPLIT_PTLOCK_CPUS=4096
198# CONFIG_RESOURCES_64BIT is not set 255# CONFIG_PHYS_ADDR_T_64BIT is not set
256CONFIG_ZONE_DMA_FLAG=0
257CONFIG_VIRT_TO_BUS=y
258CONFIG_UNEVICTABLE_LRU=y
259CONFIG_HAVE_MLOCK=y
260CONFIG_HAVE_MLOCKED_PAGE_BIT=y
199CONFIG_ALIGNMENT_TRAP=y 261CONFIG_ALIGNMENT_TRAP=y
200 262
201# 263#
@@ -205,6 +267,12 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
205CONFIG_ZBOOT_ROM_BSS=0x0 267CONFIG_ZBOOT_ROM_BSS=0x0
206CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/nfs ip=bootp" 268CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/nfs ip=bootp"
207# CONFIG_XIP_KERNEL is not set 269# CONFIG_XIP_KERNEL is not set
270# CONFIG_KEXEC is not set
271
272#
273# CPU Power Management
274#
275# CONFIG_CPU_IDLE is not set
208 276
209# 277#
210# Floating point emulation 278# Floating point emulation
@@ -221,32 +289,31 @@ CONFIG_FPE_NWFPE_XP=y
221# Userspace binary formats 289# Userspace binary formats
222# 290#
223CONFIG_BINFMT_ELF=y 291CONFIG_BINFMT_ELF=y
292# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
293CONFIG_HAVE_AOUT=y
224# CONFIG_BINFMT_AOUT is not set 294# CONFIG_BINFMT_AOUT is not set
225# CONFIG_BINFMT_MISC is not set 295# CONFIG_BINFMT_MISC is not set
226# CONFIG_ARTHUR is not set
227 296
228# 297#
229# Power management options 298# Power management options
230# 299#
231# CONFIG_PM is not set 300# CONFIG_PM is not set
232# CONFIG_APM is not set 301CONFIG_ARCH_SUSPEND_POSSIBLE=y
233
234#
235# Networking
236#
237CONFIG_NET=y 302CONFIG_NET=y
238 303
239# 304#
240# Networking options 305# Networking options
241# 306#
242# CONFIG_NETDEBUG is not set
243CONFIG_PACKET=y 307CONFIG_PACKET=y
244CONFIG_PACKET_MMAP=y 308CONFIG_PACKET_MMAP=y
245CONFIG_UNIX=y 309CONFIG_UNIX=y
246CONFIG_XFRM=y 310CONFIG_XFRM=y
247# CONFIG_XFRM_USER is not set 311# CONFIG_XFRM_USER is not set
248# CONFIG_XFRM_SUB_POLICY is not set 312# CONFIG_XFRM_SUB_POLICY is not set
313# CONFIG_XFRM_MIGRATE is not set
314# CONFIG_XFRM_STATISTICS is not set
249CONFIG_NET_KEY=y 315CONFIG_NET_KEY=y
316# CONFIG_NET_KEY_MIGRATE is not set
250CONFIG_INET=y 317CONFIG_INET=y
251# CONFIG_IP_MULTICAST is not set 318# CONFIG_IP_MULTICAST is not set
252# CONFIG_IP_ADVANCED_ROUTER is not set 319# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -267,6 +334,7 @@ CONFIG_SYN_COOKIES=y
267CONFIG_INET_XFRM_MODE_TRANSPORT=y 334CONFIG_INET_XFRM_MODE_TRANSPORT=y
268CONFIG_INET_XFRM_MODE_TUNNEL=y 335CONFIG_INET_XFRM_MODE_TUNNEL=y
269CONFIG_INET_XFRM_MODE_BEET=y 336CONFIG_INET_XFRM_MODE_BEET=y
337# CONFIG_INET_LRO is not set
270CONFIG_INET_DIAG=y 338CONFIG_INET_DIAG=y
271CONFIG_INET_TCP_DIAG=y 339CONFIG_INET_TCP_DIAG=y
272# CONFIG_TCP_CONG_ADVANCED is not set 340# CONFIG_TCP_CONG_ADVANCED is not set
@@ -276,6 +344,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
276CONFIG_IPV6=y 344CONFIG_IPV6=y
277# CONFIG_IPV6_PRIVACY is not set 345# CONFIG_IPV6_PRIVACY is not set
278# CONFIG_IPV6_ROUTER_PREF is not set 346# CONFIG_IPV6_ROUTER_PREF is not set
347# CONFIG_IPV6_OPTIMISTIC_DAD is not set
279# CONFIG_INET6_AH is not set 348# CONFIG_INET6_AH is not set
280# CONFIG_INET6_ESP is not set 349# CONFIG_INET6_ESP is not set
281# CONFIG_INET6_IPCOMP is not set 350# CONFIG_INET6_IPCOMP is not set
@@ -289,25 +358,15 @@ CONFIG_IPV6=y
289# CONFIG_IPV6_SIT is not set 358# CONFIG_IPV6_SIT is not set
290# CONFIG_IPV6_TUNNEL is not set 359# CONFIG_IPV6_TUNNEL is not set
291# CONFIG_IPV6_MULTIPLE_TABLES is not set 360# CONFIG_IPV6_MULTIPLE_TABLES is not set
361# CONFIG_IPV6_MROUTE is not set
292# CONFIG_NETWORK_SECMARK is not set 362# CONFIG_NETWORK_SECMARK is not set
293# CONFIG_NETFILTER is not set 363# CONFIG_NETFILTER is not set
294
295#
296# DCCP Configuration (EXPERIMENTAL)
297#
298# CONFIG_IP_DCCP is not set 364# CONFIG_IP_DCCP is not set
299
300#
301# SCTP Configuration (EXPERIMENTAL)
302#
303# CONFIG_IP_SCTP is not set 365# CONFIG_IP_SCTP is not set
304
305#
306# TIPC Configuration (EXPERIMENTAL)
307#
308# CONFIG_TIPC is not set 366# CONFIG_TIPC is not set
309# CONFIG_ATM is not set 367# CONFIG_ATM is not set
310# CONFIG_BRIDGE is not set 368# CONFIG_BRIDGE is not set
369# CONFIG_NET_DSA is not set
311# CONFIG_VLAN_8021Q is not set 370# CONFIG_VLAN_8021Q is not set
312# CONFIG_DECNET is not set 371# CONFIG_DECNET is not set
313# CONFIG_LLC2 is not set 372# CONFIG_LLC2 is not set
@@ -317,20 +376,28 @@ CONFIG_IPV6=y
317# CONFIG_LAPB is not set 376# CONFIG_LAPB is not set
318# CONFIG_ECONET is not set 377# CONFIG_ECONET is not set
319# CONFIG_WAN_ROUTER is not set 378# CONFIG_WAN_ROUTER is not set
320 379# CONFIG_PHONET is not set
321#
322# QoS and/or fair queueing
323#
324# CONFIG_NET_SCHED is not set 380# CONFIG_NET_SCHED is not set
381# CONFIG_DCB is not set
325 382
326# 383#
327# Network testing 384# Network testing
328# 385#
329# CONFIG_NET_PKTGEN is not set 386# CONFIG_NET_PKTGEN is not set
330# CONFIG_HAMRADIO is not set 387# CONFIG_HAMRADIO is not set
388# CONFIG_CAN is not set
331# CONFIG_IRDA is not set 389# CONFIG_IRDA is not set
332# CONFIG_BT is not set 390# CONFIG_BT is not set
333# CONFIG_IEEE80211 is not set 391# CONFIG_AF_RXRPC is not set
392CONFIG_WIRELESS=y
393# CONFIG_CFG80211 is not set
394# CONFIG_WIRELESS_OLD_REGULATORY is not set
395# CONFIG_WIRELESS_EXT is not set
396# CONFIG_LIB80211 is not set
397# CONFIG_MAC80211 is not set
398# CONFIG_WIMAX is not set
399# CONFIG_RFKILL is not set
400# CONFIG_NET_9P is not set
334 401
335# 402#
336# Device Drivers 403# Device Drivers
@@ -339,41 +406,39 @@ CONFIG_IPV6=y
339# 406#
340# Generic Driver Options 407# Generic Driver Options
341# 408#
409CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
342CONFIG_STANDALONE=y 410CONFIG_STANDALONE=y
343CONFIG_PREVENT_FIRMWARE_BUILD=y 411CONFIG_PREVENT_FIRMWARE_BUILD=y
344# CONFIG_FW_LOADER is not set 412# CONFIG_FW_LOADER is not set
345# CONFIG_DEBUG_DRIVER is not set 413# CONFIG_DEBUG_DRIVER is not set
414# CONFIG_DEBUG_DEVRES is not set
346# CONFIG_SYS_HYPERVISOR is not set 415# CONFIG_SYS_HYPERVISOR is not set
347
348#
349# Connector - unified userspace <-> kernelspace linker
350#
351# CONFIG_CONNECTOR is not set 416# CONFIG_CONNECTOR is not set
352
353#
354# Memory Technology Devices (MTD)
355#
356CONFIG_MTD=y 417CONFIG_MTD=y
357# CONFIG_MTD_DEBUG is not set 418# CONFIG_MTD_DEBUG is not set
358CONFIG_MTD_CONCAT=y 419CONFIG_MTD_CONCAT=y
359CONFIG_MTD_PARTITIONS=y 420CONFIG_MTD_PARTITIONS=y
421# CONFIG_MTD_TESTS is not set
360CONFIG_MTD_REDBOOT_PARTS=y 422CONFIG_MTD_REDBOOT_PARTS=y
361CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 423CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
362# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set 424# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
363# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set 425# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
364CONFIG_MTD_CMDLINE_PARTS=y 426CONFIG_MTD_CMDLINE_PARTS=y
365# CONFIG_MTD_AFS_PARTS is not set 427# CONFIG_MTD_AFS_PARTS is not set
428# CONFIG_MTD_AR7_PARTS is not set
366 429
367# 430#
368# User Modules And Translation Layers 431# User Modules And Translation Layers
369# 432#
370CONFIG_MTD_CHAR=y 433CONFIG_MTD_CHAR=y
434CONFIG_MTD_BLKDEVS=y
371CONFIG_MTD_BLOCK=y 435CONFIG_MTD_BLOCK=y
372# CONFIG_FTL is not set 436# CONFIG_FTL is not set
373# CONFIG_NFTL is not set 437# CONFIG_NFTL is not set
374# CONFIG_INFTL is not set 438# CONFIG_INFTL is not set
375# CONFIG_RFD_FTL is not set 439# CONFIG_RFD_FTL is not set
376# CONFIG_SSFDC is not set 440# CONFIG_SSFDC is not set
441# CONFIG_MTD_OOPS is not set
377 442
378# 443#
379# RAM/ROM/Flash chip drivers 444# RAM/ROM/Flash chip drivers
@@ -404,16 +469,13 @@ CONFIG_MTD_CFI_UTIL=y
404# CONFIG_MTD_RAM is not set 469# CONFIG_MTD_RAM is not set
405CONFIG_MTD_ROM=y 470CONFIG_MTD_ROM=y
406# CONFIG_MTD_ABSENT is not set 471# CONFIG_MTD_ABSENT is not set
407# CONFIG_MTD_OBSOLETE_CHIPS is not set
408 472
409# 473#
410# Mapping drivers for chip access 474# Mapping drivers for chip access
411# 475#
412# CONFIG_MTD_COMPLEX_MAPPINGS is not set 476# CONFIG_MTD_COMPLEX_MAPPINGS is not set
413CONFIG_MTD_PHYSMAP=y 477CONFIG_MTD_PHYSMAP=y
414CONFIG_MTD_PHYSMAP_START=0x0 478# CONFIG_MTD_PHYSMAP_COMPAT is not set
415CONFIG_MTD_PHYSMAP_LEN=0x0
416CONFIG_MTD_PHYSMAP_BANKWIDTH=1
417# CONFIG_MTD_ARM_INTEGRATOR is not set 479# CONFIG_MTD_ARM_INTEGRATOR is not set
418# CONFIG_MTD_PLATRAM is not set 480# CONFIG_MTD_PLATRAM is not set
419 481
@@ -431,49 +493,58 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
431# CONFIG_MTD_DOC2000 is not set 493# CONFIG_MTD_DOC2000 is not set
432# CONFIG_MTD_DOC2001 is not set 494# CONFIG_MTD_DOC2001 is not set
433# CONFIG_MTD_DOC2001PLUS is not set 495# CONFIG_MTD_DOC2001PLUS is not set
434
435#
436# NAND Flash Device Drivers
437#
438CONFIG_MTD_NAND=y 496CONFIG_MTD_NAND=y
439CONFIG_MTD_NAND_VERIFY_WRITE=y 497CONFIG_MTD_NAND_VERIFY_WRITE=y
440# CONFIG_MTD_NAND_ECC_SMC is not set 498# CONFIG_MTD_NAND_ECC_SMC is not set
441CONFIG_MTD_NAND_TS7250=y 499# CONFIG_MTD_NAND_MUSEUM_IDS is not set
500# CONFIG_MTD_NAND_GPIO is not set
501# CONFIG_MTD_NAND_TS7250 is not set
442CONFIG_MTD_NAND_IDS=y 502CONFIG_MTD_NAND_IDS=y
443# CONFIG_MTD_NAND_DISKONCHIP is not set 503# CONFIG_MTD_NAND_DISKONCHIP is not set
444# CONFIG_MTD_NAND_NANDSIM is not set 504# CONFIG_MTD_NAND_NANDSIM is not set
445 505# CONFIG_MTD_NAND_PLATFORM is not set
446# 506# CONFIG_MTD_ALAUDA is not set
447# OneNAND Flash Device Drivers
448#
449# CONFIG_MTD_ONENAND is not set 507# CONFIG_MTD_ONENAND is not set
450 508
451# 509#
452# Parallel port support 510# LPDDR flash memory drivers
453#
454# CONFIG_PARPORT is not set
455
456#
457# Plug and Play support
458# 511#
512# CONFIG_MTD_LPDDR is not set
459 513
460# 514#
461# Block devices 515# UBI - Unsorted block images
462# 516#
517# CONFIG_MTD_UBI is not set
518# CONFIG_PARPORT is not set
519CONFIG_BLK_DEV=y
463# CONFIG_BLK_DEV_COW_COMMON is not set 520# CONFIG_BLK_DEV_COW_COMMON is not set
464# CONFIG_BLK_DEV_LOOP is not set 521# CONFIG_BLK_DEV_LOOP is not set
465CONFIG_BLK_DEV_NBD=y 522CONFIG_BLK_DEV_NBD=y
466# CONFIG_BLK_DEV_UB is not set 523# CONFIG_BLK_DEV_UB is not set
467# CONFIG_BLK_DEV_RAM is not set 524# CONFIG_BLK_DEV_RAM is not set
468# CONFIG_BLK_DEV_INITRD is not set
469# CONFIG_CDROM_PKTCDVD is not set 525# CONFIG_CDROM_PKTCDVD is not set
470# CONFIG_ATA_OVER_ETH is not set 526# CONFIG_ATA_OVER_ETH is not set
527CONFIG_MISC_DEVICES=y
528# CONFIG_ICS932S401 is not set
529# CONFIG_ENCLOSURE_SERVICES is not set
530# CONFIG_ISL29003 is not set
531# CONFIG_C2PORT is not set
532
533#
534# EEPROM support
535#
536# CONFIG_EEPROM_AT24 is not set
537CONFIG_EEPROM_LEGACY=y
538# CONFIG_EEPROM_93CX6 is not set
539CONFIG_HAVE_IDE=y
540# CONFIG_IDE is not set
471 541
472# 542#
473# SCSI device support 543# SCSI device support
474# 544#
475# CONFIG_RAID_ATTRS is not set 545# CONFIG_RAID_ATTRS is not set
476CONFIG_SCSI=y 546CONFIG_SCSI=y
547CONFIG_SCSI_DMA=y
477# CONFIG_SCSI_TGT is not set 548# CONFIG_SCSI_TGT is not set
478# CONFIG_SCSI_NETLINK is not set 549# CONFIG_SCSI_NETLINK is not set
479# CONFIG_SCSI_PROC_FS is not set 550# CONFIG_SCSI_PROC_FS is not set
@@ -495,6 +566,7 @@ CONFIG_BLK_DEV_SD=y
495# CONFIG_SCSI_CONSTANTS is not set 566# CONFIG_SCSI_CONSTANTS is not set
496# CONFIG_SCSI_LOGGING is not set 567# CONFIG_SCSI_LOGGING is not set
497# CONFIG_SCSI_SCAN_ASYNC is not set 568# CONFIG_SCSI_SCAN_ASYNC is not set
569CONFIG_SCSI_WAIT_SCAN=m
498 570
499# 571#
500# SCSI Transports 572# SCSI Transports
@@ -502,92 +574,71 @@ CONFIG_BLK_DEV_SD=y
502# CONFIG_SCSI_SPI_ATTRS is not set 574# CONFIG_SCSI_SPI_ATTRS is not set
503# CONFIG_SCSI_FC_ATTRS is not set 575# CONFIG_SCSI_FC_ATTRS is not set
504# CONFIG_SCSI_ISCSI_ATTRS is not set 576# CONFIG_SCSI_ISCSI_ATTRS is not set
505# CONFIG_SCSI_SAS_ATTRS is not set
506# CONFIG_SCSI_SAS_LIBSAS is not set 577# CONFIG_SCSI_SAS_LIBSAS is not set
507 578# CONFIG_SCSI_SRP_ATTRS is not set
508# 579CONFIG_SCSI_LOWLEVEL=y
509# SCSI low-level drivers
510#
511# CONFIG_ISCSI_TCP is not set 580# CONFIG_ISCSI_TCP is not set
581# CONFIG_LIBFC is not set
582# CONFIG_LIBFCOE is not set
512# CONFIG_SCSI_DEBUG is not set 583# CONFIG_SCSI_DEBUG is not set
513 584# CONFIG_SCSI_DH is not set
514# 585# CONFIG_SCSI_OSD_INITIATOR is not set
515# Serial ATA (prod) and Parallel ATA (experimental) drivers
516#
517# CONFIG_ATA is not set 586# CONFIG_ATA is not set
518
519#
520# Multi-device support (RAID and LVM)
521#
522# CONFIG_MD is not set 587# CONFIG_MD is not set
523
524#
525# Fusion MPT device support
526#
527# CONFIG_FUSION is not set
528
529#
530# IEEE 1394 (FireWire) support
531#
532
533#
534# I2O device support
535#
536
537#
538# Network device support
539#
540CONFIG_NETDEVICES=y 588CONFIG_NETDEVICES=y
589CONFIG_COMPAT_NET_DEV_OPS=y
541# CONFIG_DUMMY is not set 590# CONFIG_DUMMY is not set
542# CONFIG_BONDING is not set 591# CONFIG_BONDING is not set
592# CONFIG_MACVLAN is not set
543# CONFIG_EQUALIZER is not set 593# CONFIG_EQUALIZER is not set
544# CONFIG_TUN is not set 594# CONFIG_TUN is not set
545 595# CONFIG_VETH is not set
546#
547# PHY device support
548#
549# CONFIG_PHYLIB is not set 596# CONFIG_PHYLIB is not set
550
551#
552# Ethernet (10 or 100Mbit)
553#
554CONFIG_NET_ETHERNET=y 597CONFIG_NET_ETHERNET=y
555CONFIG_MII=y 598CONFIG_MII=y
556CONFIG_EP93XX_ETH=y 599CONFIG_EP93XX_ETH=y
600# CONFIG_AX88796 is not set
557# CONFIG_SMC91X is not set 601# CONFIG_SMC91X is not set
558# CONFIG_DM9000 is not set 602# CONFIG_DM9000 is not set
603# CONFIG_ETHOC is not set
604# CONFIG_SMC911X is not set
605# CONFIG_SMSC911X is not set
606# CONFIG_DNET is not set
607# CONFIG_IBM_NEW_EMAC_ZMII is not set
608# CONFIG_IBM_NEW_EMAC_RGMII is not set
609# CONFIG_IBM_NEW_EMAC_TAH is not set
610# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
611# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
612# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
613# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
614# CONFIG_B44 is not set
615CONFIG_NETDEV_1000=y
616CONFIG_NETDEV_10000=y
559 617
560# 618#
561# Ethernet (1000 Mbit) 619# Wireless LAN
562#
563
564#
565# Ethernet (10000 Mbit)
566#
567
568#
569# Token Ring devices
570# 620#
621# CONFIG_WLAN_PRE80211 is not set
622# CONFIG_WLAN_80211 is not set
571 623
572# 624#
573# Wireless LAN (non-hamradio) 625# Enable WiMAX (Networking options) to see the WiMAX drivers
574# 626#
575# CONFIG_NET_RADIO is not set
576 627
577# 628#
578# Wan interfaces 629# USB Network Adapters
579# 630#
631# CONFIG_USB_CATC is not set
632# CONFIG_USB_KAWETH is not set
633# CONFIG_USB_PEGASUS is not set
634CONFIG_USB_RTL8150=y
635# CONFIG_USB_USBNET is not set
580# CONFIG_WAN is not set 636# CONFIG_WAN is not set
581# CONFIG_PPP is not set 637# CONFIG_PPP is not set
582# CONFIG_SLIP is not set 638# CONFIG_SLIP is not set
583# CONFIG_SHAPER is not set
584# CONFIG_NETCONSOLE is not set 639# CONFIG_NETCONSOLE is not set
585# CONFIG_NETPOLL is not set 640# CONFIG_NETPOLL is not set
586# CONFIG_NET_POLL_CONTROLLER is not set 641# CONFIG_NET_POLL_CONTROLLER is not set
587
588#
589# ISDN subsystem
590#
591# CONFIG_ISDN is not set 642# CONFIG_ISDN is not set
592 643
593# 644#
@@ -605,6 +656,7 @@ CONFIG_EP93XX_ETH=y
605# Character devices 656# Character devices
606# 657#
607# CONFIG_VT is not set 658# CONFIG_VT is not set
659CONFIG_DEVKMEM=y
608# CONFIG_SERIAL_NONSTANDARD is not set 660# CONFIG_SERIAL_NONSTANDARD is not set
609 661
610# 662#
@@ -621,104 +673,101 @@ CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
621CONFIG_SERIAL_CORE=y 673CONFIG_SERIAL_CORE=y
622CONFIG_SERIAL_CORE_CONSOLE=y 674CONFIG_SERIAL_CORE_CONSOLE=y
623CONFIG_UNIX98_PTYS=y 675CONFIG_UNIX98_PTYS=y
676# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
624# CONFIG_LEGACY_PTYS is not set 677# CONFIG_LEGACY_PTYS is not set
625
626#
627# IPMI
628#
629# CONFIG_IPMI_HANDLER is not set 678# CONFIG_IPMI_HANDLER is not set
630
631#
632# Watchdog Cards
633#
634CONFIG_WATCHDOG=y
635# CONFIG_WATCHDOG_NOWAYOUT is not set
636
637#
638# Watchdog Device Drivers
639#
640# CONFIG_SOFT_WATCHDOG is not set
641CONFIG_EP93XX_WATCHDOG=y
642
643#
644# USB-based Watchdog Cards
645#
646# CONFIG_USBPCWATCHDOG is not set
647# CONFIG_HW_RANDOM is not set 679# CONFIG_HW_RANDOM is not set
648# CONFIG_NVRAM is not set
649# CONFIG_DTLK is not set
650# CONFIG_R3964 is not set 680# CONFIG_R3964 is not set
651# CONFIG_RAW_DRIVER is not set 681# CONFIG_RAW_DRIVER is not set
682# CONFIG_TCG_TPM is not set
683CONFIG_I2C=y
684CONFIG_I2C_BOARDINFO=y
685CONFIG_I2C_CHARDEV=y
686CONFIG_I2C_HELPER_AUTO=y
652 687
653# 688#
654# TPM devices 689# I2C Hardware Bus support
655# 690#
656# CONFIG_TCG_TPM is not set
657 691
658# 692#
659# I2C support 693# I2C system bus drivers (mostly embedded / system-on-chip)
660# 694#
661CONFIG_I2C=y 695# CONFIG_I2C_GPIO is not set
662CONFIG_I2C_CHARDEV=y 696# CONFIG_I2C_OCORES is not set
697# CONFIG_I2C_SIMTEC is not set
663 698
664# 699#
665# I2C Algorithms 700# External I2C/SMBus adapter drivers
666# 701#
667CONFIG_I2C_ALGOBIT=y 702# CONFIG_I2C_PARPORT_LIGHT is not set
668# CONFIG_I2C_ALGOPCF is not set 703# CONFIG_I2C_TAOS_EVM is not set
669# CONFIG_I2C_ALGOPCA is not set 704# CONFIG_I2C_TINY_USB is not set
670 705
671# 706#
672# I2C Hardware Bus support 707# Other I2C/SMBus bus drivers
673# 708#
674# CONFIG_I2C_OCORES is not set 709# CONFIG_I2C_PCA_PLATFORM is not set
675# CONFIG_I2C_PARPORT_LIGHT is not set
676# CONFIG_I2C_STUB is not set 710# CONFIG_I2C_STUB is not set
677# CONFIG_I2C_PCA_ISA is not set
678 711
679# 712#
680# Miscellaneous I2C Chip support 713# Miscellaneous I2C Chip support
681# 714#
682# CONFIG_SENSORS_DS1337 is not set 715# CONFIG_DS1682 is not set
683# CONFIG_SENSORS_DS1374 is not set
684CONFIG_EEPROM_LEGACY=y
685# CONFIG_SENSORS_PCF8574 is not set 716# CONFIG_SENSORS_PCF8574 is not set
717# CONFIG_PCF8575 is not set
686# CONFIG_SENSORS_PCA9539 is not set 718# CONFIG_SENSORS_PCA9539 is not set
687# CONFIG_SENSORS_PCF8591 is not set
688# CONFIG_SENSORS_MAX6875 is not set 719# CONFIG_SENSORS_MAX6875 is not set
720# CONFIG_SENSORS_TSL2550 is not set
689CONFIG_I2C_DEBUG_CORE=y 721CONFIG_I2C_DEBUG_CORE=y
690CONFIG_I2C_DEBUG_ALGO=y 722CONFIG_I2C_DEBUG_ALGO=y
691CONFIG_I2C_DEBUG_BUS=y 723CONFIG_I2C_DEBUG_BUS=y
692CONFIG_I2C_DEBUG_CHIP=y 724CONFIG_I2C_DEBUG_CHIP=y
725# CONFIG_SPI is not set
726CONFIG_ARCH_REQUIRE_GPIOLIB=y
727CONFIG_GPIOLIB=y
728# CONFIG_DEBUG_GPIO is not set
729# CONFIG_GPIO_SYSFS is not set
693 730
694# 731#
695# SPI support 732# Memory mapped GPIO expanders:
696# 733#
697# CONFIG_SPI is not set
698# CONFIG_SPI_MASTER is not set
699 734
700# 735#
701# Dallas's 1-wire bus 736# I2C GPIO expanders:
702# 737#
703# CONFIG_W1 is not set 738# CONFIG_GPIO_MAX732X is not set
739# CONFIG_GPIO_PCA953X is not set
740# CONFIG_GPIO_PCF857X is not set
704 741
705# 742#
706# Hardware Monitoring support 743# PCI GPIO expanders:
707# 744#
745
746#
747# SPI GPIO expanders:
748#
749# CONFIG_W1 is not set
750# CONFIG_POWER_SUPPLY is not set
708CONFIG_HWMON=y 751CONFIG_HWMON=y
709# CONFIG_HWMON_VID is not set 752# CONFIG_HWMON_VID is not set
710# CONFIG_SENSORS_ABITUGURU is not set 753# CONFIG_SENSORS_AD7414 is not set
754# CONFIG_SENSORS_AD7418 is not set
711# CONFIG_SENSORS_ADM1021 is not set 755# CONFIG_SENSORS_ADM1021 is not set
712# CONFIG_SENSORS_ADM1025 is not set 756# CONFIG_SENSORS_ADM1025 is not set
713# CONFIG_SENSORS_ADM1026 is not set 757# CONFIG_SENSORS_ADM1026 is not set
758# CONFIG_SENSORS_ADM1029 is not set
714# CONFIG_SENSORS_ADM1031 is not set 759# CONFIG_SENSORS_ADM1031 is not set
715# CONFIG_SENSORS_ADM9240 is not set 760# CONFIG_SENSORS_ADM9240 is not set
716# CONFIG_SENSORS_ASB100 is not set 761# CONFIG_SENSORS_ADT7462 is not set
762# CONFIG_SENSORS_ADT7470 is not set
763# CONFIG_SENSORS_ADT7473 is not set
764# CONFIG_SENSORS_ADT7475 is not set
717# CONFIG_SENSORS_ATXP1 is not set 765# CONFIG_SENSORS_ATXP1 is not set
718# CONFIG_SENSORS_DS1621 is not set 766# CONFIG_SENSORS_DS1621 is not set
719# CONFIG_SENSORS_F71805F is not set 767# CONFIG_SENSORS_F71805F is not set
720# CONFIG_SENSORS_FSCHER is not set 768# CONFIG_SENSORS_F71882FG is not set
721# CONFIG_SENSORS_FSCPOS is not set 769# CONFIG_SENSORS_F75375S is not set
770# CONFIG_SENSORS_G760A is not set
722# CONFIG_SENSORS_GL518SM is not set 771# CONFIG_SENSORS_GL518SM is not set
723# CONFIG_SENSORS_GL520SM is not set 772# CONFIG_SENSORS_GL520SM is not set
724# CONFIG_SENSORS_IT87 is not set 773# CONFIG_SENSORS_IT87 is not set
@@ -732,158 +781,188 @@ CONFIG_HWMON=y
732# CONFIG_SENSORS_LM87 is not set 781# CONFIG_SENSORS_LM87 is not set
733# CONFIG_SENSORS_LM90 is not set 782# CONFIG_SENSORS_LM90 is not set
734# CONFIG_SENSORS_LM92 is not set 783# CONFIG_SENSORS_LM92 is not set
784# CONFIG_SENSORS_LM93 is not set
785# CONFIG_SENSORS_LTC4215 is not set
786# CONFIG_SENSORS_LTC4245 is not set
787# CONFIG_SENSORS_LM95241 is not set
735# CONFIG_SENSORS_MAX1619 is not set 788# CONFIG_SENSORS_MAX1619 is not set
789# CONFIG_SENSORS_MAX6650 is not set
736# CONFIG_SENSORS_PC87360 is not set 790# CONFIG_SENSORS_PC87360 is not set
737# CONFIG_SENSORS_PC87427 is not set 791# CONFIG_SENSORS_PC87427 is not set
792# CONFIG_SENSORS_PCF8591 is not set
793# CONFIG_SENSORS_SHT15 is not set
794# CONFIG_SENSORS_DME1737 is not set
738# CONFIG_SENSORS_SMSC47M1 is not set 795# CONFIG_SENSORS_SMSC47M1 is not set
739# CONFIG_SENSORS_SMSC47M192 is not set 796# CONFIG_SENSORS_SMSC47M192 is not set
740# CONFIG_SENSORS_SMSC47B397 is not set 797# CONFIG_SENSORS_SMSC47B397 is not set
798# CONFIG_SENSORS_ADS7828 is not set
799# CONFIG_SENSORS_THMC50 is not set
741# CONFIG_SENSORS_VT1211 is not set 800# CONFIG_SENSORS_VT1211 is not set
742# CONFIG_SENSORS_W83781D is not set 801# CONFIG_SENSORS_W83781D is not set
743# CONFIG_SENSORS_W83791D is not set 802# CONFIG_SENSORS_W83791D is not set
744# CONFIG_SENSORS_W83792D is not set 803# CONFIG_SENSORS_W83792D is not set
745# CONFIG_SENSORS_W83793 is not set 804# CONFIG_SENSORS_W83793 is not set
746# CONFIG_SENSORS_W83L785TS is not set 805# CONFIG_SENSORS_W83L785TS is not set
806# CONFIG_SENSORS_W83L786NG is not set
747# CONFIG_SENSORS_W83627HF is not set 807# CONFIG_SENSORS_W83627HF is not set
748# CONFIG_SENSORS_W83627EHF is not set 808# CONFIG_SENSORS_W83627EHF is not set
749# CONFIG_HWMON_DEBUG_CHIP is not set 809# CONFIG_HWMON_DEBUG_CHIP is not set
810# CONFIG_THERMAL is not set
811# CONFIG_THERMAL_HWMON is not set
812CONFIG_WATCHDOG=y
813# CONFIG_WATCHDOG_NOWAYOUT is not set
750 814
751# 815#
752# Misc devices 816# Watchdog Device Drivers
753# 817#
754# CONFIG_TIFM_CORE is not set 818# CONFIG_SOFT_WATCHDOG is not set
819CONFIG_EP93XX_WATCHDOG=y
755 820
756# 821#
757# LED devices 822# USB-based Watchdog Cards
758# 823#
759# CONFIG_NEW_LEDS is not set 824# CONFIG_USBPCWATCHDOG is not set
825CONFIG_SSB_POSSIBLE=y
760 826
761# 827#
762# LED drivers 828# Sonics Silicon Backplane
763# 829#
830# CONFIG_SSB is not set
764 831
765# 832#
766# LED Triggers 833# Multifunction device drivers
767# 834#
835# CONFIG_MFD_CORE is not set
836# CONFIG_MFD_SM501 is not set
837# CONFIG_MFD_ASIC3 is not set
838# CONFIG_HTC_EGPIO is not set
839# CONFIG_HTC_PASIC3 is not set
840# CONFIG_TPS65010 is not set
841# CONFIG_TWL4030_CORE is not set
842# CONFIG_MFD_TMIO is not set
843# CONFIG_MFD_T7L66XB is not set
844# CONFIG_MFD_TC6387XB is not set
845# CONFIG_MFD_TC6393XB is not set
846# CONFIG_PMIC_DA903X is not set
847# CONFIG_MFD_WM8400 is not set
848# CONFIG_MFD_WM8350_I2C is not set
849# CONFIG_MFD_PCF50633 is not set
768 850
769# 851#
770# Multimedia devices 852# Multimedia devices
771# 853#
854
855#
856# Multimedia core support
857#
772# CONFIG_VIDEO_DEV is not set 858# CONFIG_VIDEO_DEV is not set
859# CONFIG_DVB_CORE is not set
860# CONFIG_VIDEO_MEDIA is not set
773 861
774# 862#
775# Digital Video Broadcasting Devices 863# Multimedia drivers
776# 864#
777# CONFIG_DVB is not set 865# CONFIG_DAB is not set
778# CONFIG_USB_DABUSB is not set
779 866
780# 867#
781# Graphics support 868# Graphics support
782# 869#
783# CONFIG_FIRMWARE_EDID is not set 870# CONFIG_VGASTATE is not set
871# CONFIG_VIDEO_OUTPUT_CONTROL is not set
784# CONFIG_FB is not set 872# CONFIG_FB is not set
785# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 873# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
786 874
787# 875#
788# Sound 876# Display device support
789# 877#
878# CONFIG_DISPLAY_SUPPORT is not set
790# CONFIG_SOUND is not set 879# CONFIG_SOUND is not set
791 880CONFIG_USB_SUPPORT=y
792#
793# USB support
794#
795CONFIG_USB_ARCH_HAS_HCD=y 881CONFIG_USB_ARCH_HAS_HCD=y
796CONFIG_USB_ARCH_HAS_OHCI=y 882CONFIG_USB_ARCH_HAS_OHCI=y
797# CONFIG_USB_ARCH_HAS_EHCI is not set 883# CONFIG_USB_ARCH_HAS_EHCI is not set
798CONFIG_USB=y 884CONFIG_USB=y
799CONFIG_USB_DEBUG=y 885CONFIG_USB_DEBUG=y
886# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
800 887
801# 888#
802# Miscellaneous USB options 889# Miscellaneous USB options
803# 890#
804CONFIG_USB_DEVICEFS=y 891CONFIG_USB_DEVICEFS=y
805# CONFIG_USB_BANDWIDTH is not set 892CONFIG_USB_DEVICE_CLASS=y
806CONFIG_USB_DYNAMIC_MINORS=y 893CONFIG_USB_DYNAMIC_MINORS=y
807# CONFIG_USB_MULTITHREAD_PROBE is not set
808# CONFIG_USB_OTG is not set 894# CONFIG_USB_OTG is not set
895# CONFIG_USB_OTG_WHITELIST is not set
896# CONFIG_USB_OTG_BLACKLIST_HUB is not set
897# CONFIG_USB_MON is not set
898# CONFIG_USB_WUSB is not set
899# CONFIG_USB_WUSB_CBAF is not set
809 900
810# 901#
811# USB Host Controller Drivers 902# USB Host Controller Drivers
812# 903#
904# CONFIG_USB_C67X00_HCD is not set
905# CONFIG_USB_OXU210HP_HCD is not set
813# CONFIG_USB_ISP116X_HCD is not set 906# CONFIG_USB_ISP116X_HCD is not set
907# CONFIG_USB_ISP1760_HCD is not set
814CONFIG_USB_OHCI_HCD=y 908CONFIG_USB_OHCI_HCD=y
815# CONFIG_USB_OHCI_BIG_ENDIAN is not set 909# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
910# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
816CONFIG_USB_OHCI_LITTLE_ENDIAN=y 911CONFIG_USB_OHCI_LITTLE_ENDIAN=y
817# CONFIG_USB_SL811_HCD is not set 912# CONFIG_USB_SL811_HCD is not set
913# CONFIG_USB_R8A66597_HCD is not set
914# CONFIG_USB_HWA_HCD is not set
915# CONFIG_USB_MUSB_HDRC is not set
818 916
819# 917#
820# USB Device Class drivers 918# USB Device Class drivers
821# 919#
822# CONFIG_USB_ACM is not set 920# CONFIG_USB_ACM is not set
823# CONFIG_USB_PRINTER is not set 921# CONFIG_USB_PRINTER is not set
922# CONFIG_USB_WDM is not set
923# CONFIG_USB_TMC is not set
824 924
825# 925#
826# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 926# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
827# 927#
828 928
829# 929#
830# may also be needed; see USB_STORAGE Help for more information 930# also be needed; see USB_STORAGE Help for more info
831# 931#
832CONFIG_USB_STORAGE=y 932CONFIG_USB_STORAGE=y
833# CONFIG_USB_STORAGE_DEBUG is not set 933# CONFIG_USB_STORAGE_DEBUG is not set
834# CONFIG_USB_STORAGE_DATAFAB is not set 934# CONFIG_USB_STORAGE_DATAFAB is not set
835# CONFIG_USB_STORAGE_FREECOM is not set 935# CONFIG_USB_STORAGE_FREECOM is not set
836# CONFIG_USB_STORAGE_DPCM is not set 936# CONFIG_USB_STORAGE_ISD200 is not set
837# CONFIG_USB_STORAGE_USBAT is not set 937# CONFIG_USB_STORAGE_USBAT is not set
838# CONFIG_USB_STORAGE_SDDR09 is not set 938# CONFIG_USB_STORAGE_SDDR09 is not set
839# CONFIG_USB_STORAGE_SDDR55 is not set 939# CONFIG_USB_STORAGE_SDDR55 is not set
840# CONFIG_USB_STORAGE_JUMPSHOT is not set 940# CONFIG_USB_STORAGE_JUMPSHOT is not set
841# CONFIG_USB_STORAGE_ALAUDA is not set 941# CONFIG_USB_STORAGE_ALAUDA is not set
842# CONFIG_USB_STORAGE_KARMA is not set 942# CONFIG_USB_STORAGE_KARMA is not set
943# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
843# CONFIG_USB_LIBUSUAL is not set 944# CONFIG_USB_LIBUSUAL is not set
844 945
845# 946#
846# USB Input Devices
847#
848
849#
850# USB HID Boot Protocol drivers
851#
852
853#
854# USB Imaging devices 947# USB Imaging devices
855# 948#
856# CONFIG_USB_MDC800 is not set 949# CONFIG_USB_MDC800 is not set
857# CONFIG_USB_MICROTEK is not set 950# CONFIG_USB_MICROTEK is not set
858 951
859# 952#
860# USB Network Adapters
861#
862# CONFIG_USB_CATC is not set
863# CONFIG_USB_KAWETH is not set
864# CONFIG_USB_PEGASUS is not set
865CONFIG_USB_RTL8150=y
866# CONFIG_USB_USBNET_MII is not set
867# CONFIG_USB_USBNET is not set
868# CONFIG_USB_MON is not set
869
870#
871# USB port drivers 953# USB port drivers
872# 954#
873
874#
875# USB Serial Converter support
876#
877CONFIG_USB_SERIAL=y 955CONFIG_USB_SERIAL=y
878CONFIG_USB_SERIAL_CONSOLE=y 956CONFIG_USB_SERIAL_CONSOLE=y
957# CONFIG_USB_EZUSB is not set
879# CONFIG_USB_SERIAL_GENERIC is not set 958# CONFIG_USB_SERIAL_GENERIC is not set
880# CONFIG_USB_SERIAL_AIRCABLE is not set 959# CONFIG_USB_SERIAL_AIRCABLE is not set
881# CONFIG_USB_SERIAL_AIRPRIME is not set
882# CONFIG_USB_SERIAL_ARK3116 is not set 960# CONFIG_USB_SERIAL_ARK3116 is not set
883# CONFIG_USB_SERIAL_BELKIN is not set 961# CONFIG_USB_SERIAL_BELKIN is not set
962# CONFIG_USB_SERIAL_CH341 is not set
884# CONFIG_USB_SERIAL_WHITEHEAT is not set 963# CONFIG_USB_SERIAL_WHITEHEAT is not set
885# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 964# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
886# CONFIG_USB_SERIAL_CP2101 is not set 965# CONFIG_USB_SERIAL_CP210X is not set
887# CONFIG_USB_SERIAL_CYPRESS_M8 is not set 966# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
888# CONFIG_USB_SERIAL_EMPEG is not set 967# CONFIG_USB_SERIAL_EMPEG is not set
889# CONFIG_USB_SERIAL_FTDI_SIO is not set 968# CONFIG_USB_SERIAL_FTDI_SIO is not set
@@ -895,6 +974,7 @@ CONFIG_USB_SERIAL_CONSOLE=y
895# CONFIG_USB_SERIAL_EDGEPORT_TI is not set 974# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
896# CONFIG_USB_SERIAL_GARMIN is not set 975# CONFIG_USB_SERIAL_GARMIN is not set
897# CONFIG_USB_SERIAL_IPW is not set 976# CONFIG_USB_SERIAL_IPW is not set
977# CONFIG_USB_SERIAL_IUU is not set
898# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set 978# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
899# CONFIG_USB_SERIAL_KEYSPAN is not set 979# CONFIG_USB_SERIAL_KEYSPAN is not set
900# CONFIG_USB_SERIAL_KLSI is not set 980# CONFIG_USB_SERIAL_KLSI is not set
@@ -902,16 +982,23 @@ CONFIG_USB_SERIAL_CONSOLE=y
902# CONFIG_USB_SERIAL_MCT_U232 is not set 982# CONFIG_USB_SERIAL_MCT_U232 is not set
903# CONFIG_USB_SERIAL_MOS7720 is not set 983# CONFIG_USB_SERIAL_MOS7720 is not set
904# CONFIG_USB_SERIAL_MOS7840 is not set 984# CONFIG_USB_SERIAL_MOS7840 is not set
985# CONFIG_USB_SERIAL_MOTOROLA is not set
905# CONFIG_USB_SERIAL_NAVMAN is not set 986# CONFIG_USB_SERIAL_NAVMAN is not set
906CONFIG_USB_SERIAL_PL2303=y 987CONFIG_USB_SERIAL_PL2303=y
988# CONFIG_USB_SERIAL_OTI6858 is not set
989# CONFIG_USB_SERIAL_QUALCOMM is not set
990# CONFIG_USB_SERIAL_SPCP8X5 is not set
907# CONFIG_USB_SERIAL_HP4X is not set 991# CONFIG_USB_SERIAL_HP4X is not set
908# CONFIG_USB_SERIAL_SAFE is not set 992# CONFIG_USB_SERIAL_SAFE is not set
993# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
909# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set 994# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
995# CONFIG_USB_SERIAL_SYMBOL is not set
910# CONFIG_USB_SERIAL_TI is not set 996# CONFIG_USB_SERIAL_TI is not set
911# CONFIG_USB_SERIAL_CYBERJACK is not set 997# CONFIG_USB_SERIAL_CYBERJACK is not set
912# CONFIG_USB_SERIAL_XIRCOM is not set 998# CONFIG_USB_SERIAL_XIRCOM is not set
913# CONFIG_USB_SERIAL_OPTION is not set 999# CONFIG_USB_SERIAL_OPTION is not set
914# CONFIG_USB_SERIAL_OMNINET is not set 1000# CONFIG_USB_SERIAL_OMNINET is not set
1001# CONFIG_USB_SERIAL_OPTICON is not set
915# CONFIG_USB_SERIAL_DEBUG is not set 1002# CONFIG_USB_SERIAL_DEBUG is not set
916 1003
917# 1004#
@@ -920,38 +1007,34 @@ CONFIG_USB_SERIAL_PL2303=y
920# CONFIG_USB_EMI62 is not set 1007# CONFIG_USB_EMI62 is not set
921# CONFIG_USB_EMI26 is not set 1008# CONFIG_USB_EMI26 is not set
922# CONFIG_USB_ADUTUX is not set 1009# CONFIG_USB_ADUTUX is not set
923# CONFIG_USB_AUERSWALD is not set 1010# CONFIG_USB_SEVSEG is not set
924# CONFIG_USB_RIO500 is not set 1011# CONFIG_USB_RIO500 is not set
925# CONFIG_USB_LEGOTOWER is not set 1012# CONFIG_USB_LEGOTOWER is not set
926# CONFIG_USB_LCD is not set 1013# CONFIG_USB_LCD is not set
1014# CONFIG_USB_BERRY_CHARGE is not set
927# CONFIG_USB_LED is not set 1015# CONFIG_USB_LED is not set
928# CONFIG_USB_CYPRESS_CY7C63 is not set 1016# CONFIG_USB_CYPRESS_CY7C63 is not set
929# CONFIG_USB_CYTHERM is not set 1017# CONFIG_USB_CYTHERM is not set
930# CONFIG_USB_PHIDGET is not set
931# CONFIG_USB_IDMOUSE is not set 1018# CONFIG_USB_IDMOUSE is not set
932# CONFIG_USB_FTDI_ELAN is not set 1019# CONFIG_USB_FTDI_ELAN is not set
933# CONFIG_USB_APPLEDISPLAY is not set 1020# CONFIG_USB_APPLEDISPLAY is not set
934# CONFIG_USB_LD is not set 1021# CONFIG_USB_LD is not set
935# CONFIG_USB_TRANCEVIBRATOR is not set 1022# CONFIG_USB_TRANCEVIBRATOR is not set
1023# CONFIG_USB_IOWARRIOR is not set
936# CONFIG_USB_TEST is not set 1024# CONFIG_USB_TEST is not set
937 1025# CONFIG_USB_ISIGHTFW is not set
938# 1026# CONFIG_USB_VST is not set
939# USB DSL modem support
940#
941
942#
943# USB Gadget Support
944#
945# CONFIG_USB_GADGET is not set 1027# CONFIG_USB_GADGET is not set
946 1028
947# 1029#
948# MMC/SD Card support 1030# OTG and related infrastructure
949# 1031#
1032# CONFIG_USB_GPIO_VBUS is not set
1033# CONFIG_NOP_USB_XCEIV is not set
950# CONFIG_MMC is not set 1034# CONFIG_MMC is not set
951 1035# CONFIG_MEMSTICK is not set
952# 1036# CONFIG_ACCESSIBILITY is not set
953# Real Time Clock 1037# CONFIG_NEW_LEDS is not set
954#
955CONFIG_RTC_LIB=y 1038CONFIG_RTC_LIB=y
956CONFIG_RTC_CLASS=y 1039CONFIG_RTC_CLASS=y
957CONFIG_RTC_HCTOSYS=y 1040CONFIG_RTC_HCTOSYS=y
@@ -965,24 +1048,55 @@ CONFIG_RTC_INTF_SYSFS=y
965CONFIG_RTC_INTF_PROC=y 1048CONFIG_RTC_INTF_PROC=y
966CONFIG_RTC_INTF_DEV=y 1049CONFIG_RTC_INTF_DEV=y
967# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set 1050# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1051# CONFIG_RTC_DRV_TEST is not set
968 1052
969# 1053#
970# RTC drivers 1054# I2C RTC drivers
971# 1055#
972# CONFIG_RTC_DRV_X1205 is not set
973CONFIG_RTC_DRV_DS1307=y 1056CONFIG_RTC_DRV_DS1307=y
974# CONFIG_RTC_DRV_DS1553 is not set 1057# CONFIG_RTC_DRV_DS1374 is not set
975# CONFIG_RTC_DRV_ISL1208 is not set
976# CONFIG_RTC_DRV_DS1672 is not set 1058# CONFIG_RTC_DRV_DS1672 is not set
977# CONFIG_RTC_DRV_DS1742 is not set 1059# CONFIG_RTC_DRV_MAX6900 is not set
1060# CONFIG_RTC_DRV_RS5C372 is not set
1061# CONFIG_RTC_DRV_ISL1208 is not set
1062# CONFIG_RTC_DRV_X1205 is not set
978# CONFIG_RTC_DRV_PCF8563 is not set 1063# CONFIG_RTC_DRV_PCF8563 is not set
979# CONFIG_RTC_DRV_PCF8583 is not set 1064# CONFIG_RTC_DRV_PCF8583 is not set
980# CONFIG_RTC_DRV_RS5C372 is not set 1065# CONFIG_RTC_DRV_M41T80 is not set
1066# CONFIG_RTC_DRV_S35390A is not set
1067# CONFIG_RTC_DRV_FM3130 is not set
1068# CONFIG_RTC_DRV_RX8581 is not set
1069
1070#
1071# SPI RTC drivers
1072#
1073
1074#
1075# Platform RTC drivers
1076#
1077# CONFIG_RTC_DRV_CMOS is not set
1078# CONFIG_RTC_DRV_DS1286 is not set
1079# CONFIG_RTC_DRV_DS1511 is not set
1080# CONFIG_RTC_DRV_DS1553 is not set
1081# CONFIG_RTC_DRV_DS1742 is not set
1082# CONFIG_RTC_DRV_STK17TA8 is not set
981CONFIG_RTC_DRV_M48T86=y 1083CONFIG_RTC_DRV_M48T86=y
1084# CONFIG_RTC_DRV_M48T35 is not set
1085# CONFIG_RTC_DRV_M48T59 is not set
1086# CONFIG_RTC_DRV_BQ4802 is not set
1087# CONFIG_RTC_DRV_V3020 is not set
1088
1089#
1090# on-CPU RTC drivers
1091#
982CONFIG_RTC_DRV_EP93XX=y 1092CONFIG_RTC_DRV_EP93XX=y
1093# CONFIG_RTC_DRV_PL030 is not set
983# CONFIG_RTC_DRV_PL031 is not set 1094# CONFIG_RTC_DRV_PL031 is not set
984# CONFIG_RTC_DRV_TEST is not set 1095# CONFIG_DMADEVICES is not set
985# CONFIG_RTC_DRV_V3020 is not set 1096# CONFIG_AUXDISPLAY is not set
1097# CONFIG_REGULATOR is not set
1098# CONFIG_UIO is not set
1099# CONFIG_STAGING is not set
986 1100
987# 1101#
988# File systems 1102# File systems
@@ -991,27 +1105,31 @@ CONFIG_EXT2_FS=y
991# CONFIG_EXT2_FS_XATTR is not set 1105# CONFIG_EXT2_FS_XATTR is not set
992# CONFIG_EXT2_FS_XIP is not set 1106# CONFIG_EXT2_FS_XIP is not set
993CONFIG_EXT3_FS=y 1107CONFIG_EXT3_FS=y
1108# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
994# CONFIG_EXT3_FS_XATTR is not set 1109# CONFIG_EXT3_FS_XATTR is not set
995# CONFIG_EXT4DEV_FS is not set 1110# CONFIG_EXT4_FS is not set
996CONFIG_JBD=y 1111CONFIG_JBD=y
997# CONFIG_JBD_DEBUG is not set
998# CONFIG_REISERFS_FS is not set 1112# CONFIG_REISERFS_FS is not set
999# CONFIG_JFS_FS is not set 1113# CONFIG_JFS_FS is not set
1000# CONFIG_FS_POSIX_ACL is not set 1114# CONFIG_FS_POSIX_ACL is not set
1115CONFIG_FILE_LOCKING=y
1001# CONFIG_XFS_FS is not set 1116# CONFIG_XFS_FS is not set
1002# CONFIG_GFS2_FS is not set
1003# CONFIG_OCFS2_FS is not set 1117# CONFIG_OCFS2_FS is not set
1004# CONFIG_MINIX_FS is not set 1118# CONFIG_BTRFS_FS is not set
1005# CONFIG_ROMFS_FS is not set 1119CONFIG_DNOTIFY=y
1006CONFIG_INOTIFY=y 1120CONFIG_INOTIFY=y
1007CONFIG_INOTIFY_USER=y 1121CONFIG_INOTIFY_USER=y
1008# CONFIG_QUOTA is not set 1122# CONFIG_QUOTA is not set
1009CONFIG_DNOTIFY=y
1010# CONFIG_AUTOFS_FS is not set 1123# CONFIG_AUTOFS_FS is not set
1011# CONFIG_AUTOFS4_FS is not set 1124# CONFIG_AUTOFS4_FS is not set
1012# CONFIG_FUSE_FS is not set 1125# CONFIG_FUSE_FS is not set
1013 1126
1014# 1127#
1128# Caches
1129#
1130# CONFIG_FSCACHE is not set
1131
1132#
1015# CD-ROM/DVD Filesystems 1133# CD-ROM/DVD Filesystems
1016# 1134#
1017# CONFIG_ISO9660_FS is not set 1135# CONFIG_ISO9660_FS is not set
@@ -1032,16 +1150,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1032# 1150#
1033CONFIG_PROC_FS=y 1151CONFIG_PROC_FS=y
1034CONFIG_PROC_SYSCTL=y 1152CONFIG_PROC_SYSCTL=y
1153CONFIG_PROC_PAGE_MONITOR=y
1035CONFIG_SYSFS=y 1154CONFIG_SYSFS=y
1036CONFIG_TMPFS=y 1155CONFIG_TMPFS=y
1037# CONFIG_TMPFS_POSIX_ACL is not set 1156# CONFIG_TMPFS_POSIX_ACL is not set
1038# CONFIG_HUGETLB_PAGE is not set 1157# CONFIG_HUGETLB_PAGE is not set
1039CONFIG_RAMFS=y
1040# CONFIG_CONFIGFS_FS is not set 1158# CONFIG_CONFIGFS_FS is not set
1041 1159CONFIG_MISC_FILESYSTEMS=y
1042#
1043# Miscellaneous filesystems
1044#
1045# CONFIG_ADFS_FS is not set 1160# CONFIG_ADFS_FS is not set
1046# CONFIG_AFFS_FS is not set 1161# CONFIG_AFFS_FS is not set
1047# CONFIG_HFS_FS is not set 1162# CONFIG_HFS_FS is not set
@@ -1049,33 +1164,35 @@ CONFIG_RAMFS=y
1049# CONFIG_BEFS_FS is not set 1164# CONFIG_BEFS_FS is not set
1050# CONFIG_BFS_FS is not set 1165# CONFIG_BFS_FS is not set
1051# CONFIG_EFS_FS is not set 1166# CONFIG_EFS_FS is not set
1052# CONFIG_JFFS_FS is not set
1053CONFIG_JFFS2_FS=y 1167CONFIG_JFFS2_FS=y
1054CONFIG_JFFS2_FS_DEBUG=0 1168CONFIG_JFFS2_FS_DEBUG=0
1055CONFIG_JFFS2_FS_WRITEBUFFER=y 1169CONFIG_JFFS2_FS_WRITEBUFFER=y
1170# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
1056# CONFIG_JFFS2_SUMMARY is not set 1171# CONFIG_JFFS2_SUMMARY is not set
1057# CONFIG_JFFS2_FS_XATTR is not set 1172# CONFIG_JFFS2_FS_XATTR is not set
1058# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 1173# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1059CONFIG_JFFS2_ZLIB=y 1174CONFIG_JFFS2_ZLIB=y
1175# CONFIG_JFFS2_LZO is not set
1060CONFIG_JFFS2_RTIME=y 1176CONFIG_JFFS2_RTIME=y
1061# CONFIG_JFFS2_RUBIN is not set 1177# CONFIG_JFFS2_RUBIN is not set
1062# CONFIG_CRAMFS is not set 1178# CONFIG_CRAMFS is not set
1179# CONFIG_SQUASHFS is not set
1063# CONFIG_VXFS_FS is not set 1180# CONFIG_VXFS_FS is not set
1181# CONFIG_MINIX_FS is not set
1182# CONFIG_OMFS_FS is not set
1064# CONFIG_HPFS_FS is not set 1183# CONFIG_HPFS_FS is not set
1065# CONFIG_QNX4FS_FS is not set 1184# CONFIG_QNX4FS_FS is not set
1185# CONFIG_ROMFS_FS is not set
1066# CONFIG_SYSV_FS is not set 1186# CONFIG_SYSV_FS is not set
1067# CONFIG_UFS_FS is not set 1187# CONFIG_UFS_FS is not set
1068 1188# CONFIG_NILFS2_FS is not set
1069# 1189CONFIG_NETWORK_FILESYSTEMS=y
1070# Network File Systems
1071#
1072CONFIG_NFS_FS=y 1190CONFIG_NFS_FS=y
1073CONFIG_NFS_V3=y 1191CONFIG_NFS_V3=y
1074# CONFIG_NFS_V3_ACL is not set 1192# CONFIG_NFS_V3_ACL is not set
1075# CONFIG_NFS_V4 is not set 1193# CONFIG_NFS_V4 is not set
1076# CONFIG_NFS_DIRECTIO is not set
1077# CONFIG_NFSD is not set
1078CONFIG_ROOT_NFS=y 1194CONFIG_ROOT_NFS=y
1195# CONFIG_NFSD is not set
1079CONFIG_LOCKD=y 1196CONFIG_LOCKD=y
1080CONFIG_LOCKD_V4=y 1197CONFIG_LOCKD_V4=y
1081CONFIG_NFS_COMMON=y 1198CONFIG_NFS_COMMON=y
@@ -1087,7 +1204,6 @@ CONFIG_SUNRPC=y
1087# CONFIG_NCP_FS is not set 1204# CONFIG_NCP_FS is not set
1088# CONFIG_CODA_FS is not set 1205# CONFIG_CODA_FS is not set
1089# CONFIG_AFS_FS is not set 1206# CONFIG_AFS_FS is not set
1090# CONFIG_9P_FS is not set
1091 1207
1092# 1208#
1093# Partition Types 1209# Partition Types
@@ -1109,10 +1225,7 @@ CONFIG_MSDOS_PARTITION=y
1109# CONFIG_SUN_PARTITION is not set 1225# CONFIG_SUN_PARTITION is not set
1110# CONFIG_KARMA_PARTITION is not set 1226# CONFIG_KARMA_PARTITION is not set
1111# CONFIG_EFI_PARTITION is not set 1227# CONFIG_EFI_PARTITION is not set
1112 1228# CONFIG_SYSV68_PARTITION is not set
1113#
1114# Native Language Support
1115#
1116CONFIG_NLS=y 1229CONFIG_NLS=y
1117CONFIG_NLS_DEFAULT="iso8859-1" 1230CONFIG_NLS_DEFAULT="iso8859-1"
1118CONFIG_NLS_CODEPAGE_437=y 1231CONFIG_NLS_CODEPAGE_437=y
@@ -1153,49 +1266,83 @@ CONFIG_NLS_ISO8859_1=y
1153# CONFIG_NLS_KOI8_R is not set 1266# CONFIG_NLS_KOI8_R is not set
1154# CONFIG_NLS_KOI8_U is not set 1267# CONFIG_NLS_KOI8_U is not set
1155# CONFIG_NLS_UTF8 is not set 1268# CONFIG_NLS_UTF8 is not set
1156
1157#
1158# Distributed Lock Manager
1159#
1160# CONFIG_DLM is not set 1269# CONFIG_DLM is not set
1161 1270
1162# 1271#
1163# Profiling support
1164#
1165# CONFIG_PROFILING is not set
1166
1167#
1168# Kernel hacking 1272# Kernel hacking
1169# 1273#
1170# CONFIG_PRINTK_TIME is not set 1274# CONFIG_PRINTK_TIME is not set
1275CONFIG_ENABLE_WARN_DEPRECATED=y
1171CONFIG_ENABLE_MUST_CHECK=y 1276CONFIG_ENABLE_MUST_CHECK=y
1277CONFIG_FRAME_WARN=1024
1172CONFIG_MAGIC_SYSRQ=y 1278CONFIG_MAGIC_SYSRQ=y
1173# CONFIG_UNUSED_SYMBOLS is not set 1279# CONFIG_UNUSED_SYMBOLS is not set
1174# CONFIG_DEBUG_FS is not set 1280# CONFIG_DEBUG_FS is not set
1175# CONFIG_HEADERS_CHECK is not set 1281# CONFIG_HEADERS_CHECK is not set
1176CONFIG_DEBUG_KERNEL=y 1282CONFIG_DEBUG_KERNEL=y
1177CONFIG_LOG_BUF_SHIFT=14 1283# CONFIG_DEBUG_SHIRQ is not set
1178CONFIG_DETECT_SOFTLOCKUP=y 1284CONFIG_DETECT_SOFTLOCKUP=y
1285# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1286CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1287CONFIG_DETECT_HUNG_TASK=y
1288# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1289CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1290CONFIG_SCHED_DEBUG=y
1179# CONFIG_SCHEDSTATS is not set 1291# CONFIG_SCHEDSTATS is not set
1292# CONFIG_TIMER_STATS is not set
1293# CONFIG_DEBUG_OBJECTS is not set
1180CONFIG_DEBUG_SLAB=y 1294CONFIG_DEBUG_SLAB=y
1181# CONFIG_DEBUG_SLAB_LEAK is not set 1295# CONFIG_DEBUG_SLAB_LEAK is not set
1182# CONFIG_DEBUG_RT_MUTEXES is not set 1296# CONFIG_DEBUG_RT_MUTEXES is not set
1183# CONFIG_RT_MUTEX_TESTER is not set 1297# CONFIG_RT_MUTEX_TESTER is not set
1184CONFIG_DEBUG_SPINLOCK=y 1298CONFIG_DEBUG_SPINLOCK=y
1185CONFIG_DEBUG_MUTEXES=y 1299CONFIG_DEBUG_MUTEXES=y
1186# CONFIG_DEBUG_RWSEMS is not set 1300# CONFIG_DEBUG_LOCK_ALLOC is not set
1301# CONFIG_PROVE_LOCKING is not set
1302# CONFIG_LOCK_STAT is not set
1187# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1303# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1188# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1304# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1189# CONFIG_DEBUG_KOBJECT is not set 1305# CONFIG_DEBUG_KOBJECT is not set
1190CONFIG_DEBUG_BUGVERBOSE=y 1306CONFIG_DEBUG_BUGVERBOSE=y
1191# CONFIG_DEBUG_INFO is not set 1307# CONFIG_DEBUG_INFO is not set
1192# CONFIG_DEBUG_VM is not set 1308# CONFIG_DEBUG_VM is not set
1309# CONFIG_DEBUG_WRITECOUNT is not set
1310# CONFIG_DEBUG_MEMORY_INIT is not set
1193# CONFIG_DEBUG_LIST is not set 1311# CONFIG_DEBUG_LIST is not set
1194CONFIG_FRAME_POINTER=y 1312# CONFIG_DEBUG_SG is not set
1195CONFIG_FORCED_INLINING=y 1313# CONFIG_DEBUG_NOTIFIERS is not set
1314# CONFIG_BOOT_PRINTK_DELAY is not set
1196# CONFIG_RCU_TORTURE_TEST is not set 1315# CONFIG_RCU_TORTURE_TEST is not set
1316# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1317# CONFIG_BACKTRACE_SELF_TEST is not set
1318# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1319# CONFIG_FAULT_INJECTION is not set
1320# CONFIG_LATENCYTOP is not set
1321# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1322# CONFIG_PAGE_POISONING is not set
1323CONFIG_HAVE_FUNCTION_TRACER=y
1324CONFIG_TRACING_SUPPORT=y
1325
1326#
1327# Tracers
1328#
1329# CONFIG_FUNCTION_TRACER is not set
1330# CONFIG_SCHED_TRACER is not set
1331# CONFIG_CONTEXT_SWITCH_TRACER is not set
1332# CONFIG_EVENT_TRACER is not set
1333# CONFIG_BOOT_TRACER is not set
1334# CONFIG_TRACE_BRANCH_PROFILING is not set
1335# CONFIG_STACK_TRACER is not set
1336# CONFIG_KMEMTRACE is not set
1337# CONFIG_WORKQUEUE_TRACER is not set
1338# CONFIG_BLK_DEV_IO_TRACE is not set
1339# CONFIG_SAMPLES is not set
1340CONFIG_HAVE_ARCH_KGDB=y
1341# CONFIG_KGDB is not set
1342CONFIG_ARM_UNWIND=y
1197CONFIG_DEBUG_USER=y 1343CONFIG_DEBUG_USER=y
1198CONFIG_DEBUG_ERRORS=y 1344CONFIG_DEBUG_ERRORS=y
1345# CONFIG_DEBUG_STACK_USAGE is not set
1199CONFIG_DEBUG_LL=y 1346CONFIG_DEBUG_LL=y
1200# CONFIG_DEBUG_ICEDCC is not set 1347# CONFIG_DEBUG_ICEDCC is not set
1201 1348
@@ -1204,21 +1351,115 @@ CONFIG_DEBUG_LL=y
1204# 1351#
1205# CONFIG_KEYS is not set 1352# CONFIG_KEYS is not set
1206# CONFIG_SECURITY is not set 1353# CONFIG_SECURITY is not set
1354# CONFIG_SECURITYFS is not set
1355# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1356CONFIG_CRYPTO=y
1357
1358#
1359# Crypto core or helper
1360#
1361# CONFIG_CRYPTO_FIPS is not set
1362CONFIG_CRYPTO_ALGAPI=y
1363CONFIG_CRYPTO_ALGAPI2=y
1364CONFIG_CRYPTO_HASH=y
1365CONFIG_CRYPTO_HASH2=y
1366# CONFIG_CRYPTO_MANAGER is not set
1367# CONFIG_CRYPTO_MANAGER2 is not set
1368# CONFIG_CRYPTO_GF128MUL is not set
1369# CONFIG_CRYPTO_NULL is not set
1370# CONFIG_CRYPTO_CRYPTD is not set
1371# CONFIG_CRYPTO_AUTHENC is not set
1372# CONFIG_CRYPTO_TEST is not set
1373
1374#
1375# Authenticated Encryption with Associated Data
1376#
1377# CONFIG_CRYPTO_CCM is not set
1378# CONFIG_CRYPTO_GCM is not set
1379# CONFIG_CRYPTO_SEQIV is not set
1380
1381#
1382# Block modes
1383#
1384# CONFIG_CRYPTO_CBC is not set
1385# CONFIG_CRYPTO_CTR is not set
1386# CONFIG_CRYPTO_CTS is not set
1387# CONFIG_CRYPTO_ECB is not set
1388# CONFIG_CRYPTO_LRW is not set
1389# CONFIG_CRYPTO_PCBC is not set
1390# CONFIG_CRYPTO_XTS is not set
1391
1392#
1393# Hash modes
1394#
1395# CONFIG_CRYPTO_HMAC is not set
1396# CONFIG_CRYPTO_XCBC is not set
1397
1398#
1399# Digest
1400#
1401CONFIG_CRYPTO_CRC32C=y
1402# CONFIG_CRYPTO_MD4 is not set
1403# CONFIG_CRYPTO_MD5 is not set
1404# CONFIG_CRYPTO_MICHAEL_MIC is not set
1405# CONFIG_CRYPTO_RMD128 is not set
1406# CONFIG_CRYPTO_RMD160 is not set
1407# CONFIG_CRYPTO_RMD256 is not set
1408# CONFIG_CRYPTO_RMD320 is not set
1409# CONFIG_CRYPTO_SHA1 is not set
1410# CONFIG_CRYPTO_SHA256 is not set
1411# CONFIG_CRYPTO_SHA512 is not set
1412# CONFIG_CRYPTO_TGR192 is not set
1413# CONFIG_CRYPTO_WP512 is not set
1414
1415#
1416# Ciphers
1417#
1418# CONFIG_CRYPTO_AES is not set
1419# CONFIG_CRYPTO_ANUBIS is not set
1420# CONFIG_CRYPTO_ARC4 is not set
1421# CONFIG_CRYPTO_BLOWFISH is not set
1422# CONFIG_CRYPTO_CAMELLIA is not set
1423# CONFIG_CRYPTO_CAST5 is not set
1424# CONFIG_CRYPTO_CAST6 is not set
1425# CONFIG_CRYPTO_DES is not set
1426# CONFIG_CRYPTO_FCRYPT is not set
1427# CONFIG_CRYPTO_KHAZAD is not set
1428# CONFIG_CRYPTO_SALSA20 is not set
1429# CONFIG_CRYPTO_SEED is not set
1430# CONFIG_CRYPTO_SERPENT is not set
1431# CONFIG_CRYPTO_TEA is not set
1432# CONFIG_CRYPTO_TWOFISH is not set
1433
1434#
1435# Compression
1436#
1437# CONFIG_CRYPTO_DEFLATE is not set
1438# CONFIG_CRYPTO_ZLIB is not set
1439# CONFIG_CRYPTO_LZO is not set
1207 1440
1208# 1441#
1209# Cryptographic options 1442# Random Number Generation
1210# 1443#
1211# CONFIG_CRYPTO is not set 1444# CONFIG_CRYPTO_ANSI_CPRNG is not set
1445CONFIG_CRYPTO_HW=y
1446# CONFIG_BINARY_PRINTF is not set
1212 1447
1213# 1448#
1214# Library routines 1449# Library routines
1215# 1450#
1216CONFIG_BITREVERSE=y 1451CONFIG_BITREVERSE=y
1452CONFIG_GENERIC_FIND_LAST_BIT=y
1217# CONFIG_CRC_CCITT is not set 1453# CONFIG_CRC_CCITT is not set
1218# CONFIG_CRC16 is not set 1454# CONFIG_CRC16 is not set
1455# CONFIG_CRC_T10DIF is not set
1456# CONFIG_CRC_ITU_T is not set
1219CONFIG_CRC32=y 1457CONFIG_CRC32=y
1458# CONFIG_CRC7 is not set
1220CONFIG_LIBCRC32C=y 1459CONFIG_LIBCRC32C=y
1221CONFIG_ZLIB_INFLATE=y 1460CONFIG_ZLIB_INFLATE=y
1222CONFIG_ZLIB_DEFLATE=y 1461CONFIG_ZLIB_DEFLATE=y
1223CONFIG_PLIST=y 1462CONFIG_HAS_IOMEM=y
1224CONFIG_IOMAP_COPY=y 1463CONFIG_HAS_IOPORT=y
1464CONFIG_HAS_DMA=y
1465CONFIG_NLATTR=y
diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index 56bddcef6905..d7291c682a64 100644
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -9,87 +9,135 @@ config CRUNCH
9 9
10comment "EP93xx Platforms" 10comment "EP93xx Platforms"
11 11
12choice
13 prompt "EP93xx first SDRAM bank selection"
14 default EP93XX_SDCE3_SYNC_PHYS_OFFSET
15
16config EP93XX_SDCE3_SYNC_PHYS_OFFSET
17 bool "0x00000000 - SDCE3/SyncBoot"
18 help
19 Select this option if you want support for EP93xx boards with the
20 first SDRAM bank at 0x00000000
21
22config EP93XX_SDCE0_PHYS_OFFSET
23 bool "0xc0000000 - SDCEO"
24 help
25 Select this option if you want support for EP93xx boards with the
26 first SDRAM bank at 0xc0000000
27
28endchoice
29
12config MACH_ADSSPHERE 30config MACH_ADSSPHERE
13 bool "Support ADS Sphere" 31 bool "Support ADS Sphere"
32 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
14 help 33 help
15 Say 'Y' here if you want your kernel to support the ADS 34 Say 'Y' here if you want your kernel to support the ADS
16 Sphere board. 35 Sphere board.
17 36
37config MACH_EDB93XX
38 bool
39
40config MACH_EDB9301
41 bool "Support Cirrus Logic EDB9301"
42 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
43 select MACH_EDB93XX
44 help
45 Say 'Y' here if you want your kernel to support the Cirrus
46 Logic EDB9301 Evaluation Board.
47
18config MACH_EDB9302 48config MACH_EDB9302
19 bool "Support Cirrus Logic EDB9302" 49 bool "Support Cirrus Logic EDB9302"
50 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
51 select MACH_EDB93XX
20 help 52 help
21 Say 'Y' here if you want your kernel to support the Cirrus 53 Say 'Y' here if you want your kernel to support the Cirrus
22 Logic EDB9302 Evaluation Board. 54 Logic EDB9302 Evaluation Board.
23 55
24config MACH_EDB9302A 56config MACH_EDB9302A
25 bool "Support Cirrus Logic EDB9302A" 57 bool "Support Cirrus Logic EDB9302A"
58 depends on EP93XX_SDCE0_PHYS_OFFSET
59 select MACH_EDB93XX
26 help 60 help
27 Say 'Y' here if you want your kernel to support the Cirrus 61 Say 'Y' here if you want your kernel to support the Cirrus
28 Logic EDB9302A Evaluation Board. 62 Logic EDB9302A Evaluation Board.
29 63
30config MACH_EDB9307 64config MACH_EDB9307
31 bool "Support Cirrus Logic EDB9307" 65 bool "Support Cirrus Logic EDB9307"
66 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
67 select MACH_EDB93XX
32 help 68 help
33 Say 'Y' here if you want your kernel to support the Cirrus 69 Say 'Y' here if you want your kernel to support the Cirrus
34 Logic EDB9307 Evaluation Board. 70 Logic EDB9307 Evaluation Board.
35 71
36config MACH_EDB9307A 72config MACH_EDB9307A
37 bool "Support Cirrus Logic EDB9307A" 73 bool "Support Cirrus Logic EDB9307A"
74 depends on EP93XX_SDCE0_PHYS_OFFSET
75 select MACH_EDB93XX
38 help 76 help
39 Say 'Y' here if you want your kernel to support the Cirrus 77 Say 'Y' here if you want your kernel to support the Cirrus
40 Logic EDB9307A Evaluation Board. 78 Logic EDB9307A Evaluation Board.
41 79
42config MACH_EDB9312 80config MACH_EDB9312
43 bool "Support Cirrus Logic EDB9312" 81 bool "Support Cirrus Logic EDB9312"
82 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
83 select MACH_EDB93XX
44 help 84 help
45 Say 'Y' here if you want your kernel to support the Cirrus 85 Say 'Y' here if you want your kernel to support the Cirrus
46 Logic EDB9312 Evaluation Board. 86 Logic EDB9312 Evaluation Board.
47 87
48config MACH_EDB9315 88config MACH_EDB9315
49 bool "Support Cirrus Logic EDB9315" 89 bool "Support Cirrus Logic EDB9315"
90 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
91 select MACH_EDB93XX
50 help 92 help
51 Say 'Y' here if you want your kernel to support the Cirrus 93 Say 'Y' here if you want your kernel to support the Cirrus
52 Logic EDB9315 Evaluation Board. 94 Logic EDB9315 Evaluation Board.
53 95
54config MACH_EDB9315A 96config MACH_EDB9315A
55 bool "Support Cirrus Logic EDB9315A" 97 bool "Support Cirrus Logic EDB9315A"
98 depends on EP93XX_SDCE0_PHYS_OFFSET
99 select MACH_EDB93XX
56 help 100 help
57 Say 'Y' here if you want your kernel to support the Cirrus 101 Say 'Y' here if you want your kernel to support the Cirrus
58 Logic EDB9315A Evaluation Board. 102 Logic EDB9315A Evaluation Board.
59 103
60config MACH_GESBC9312 104config MACH_GESBC9312
105 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
61 bool "Support Glomation GESBC-9312-sx" 106 bool "Support Glomation GESBC-9312-sx"
62 help 107 help
63 Say 'Y' here if you want your kernel to support the Glomation 108 Say 'Y' here if you want your kernel to support the Glomation
64 GESBC-9312-sx board. 109 GESBC-9312-sx board.
65 110
66config MACH_MICRO9 111config MACH_MICRO9
67 bool 112 bool
68 default n
69 113
70config MACH_MICRO9H 114config MACH_MICRO9H
71 bool "Support Contec Hypercontrol Micro9-H" 115 bool "Support Contec Hypercontrol Micro9-H"
72 select MACH_MICRO9 116 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
73 help 117 select MACH_MICRO9
74 Say 'Y' here if you want your kernel to support the 118 help
75 Contec Hypercontrol Micro9-H board. 119 Say 'Y' here if you want your kernel to support the
120 Contec Hypercontrol Micro9-H board.
76 121
77config MACH_MICRO9M 122config MACH_MICRO9M
78 bool "Support Contec Hypercontrol Micro9-M" 123 bool "Support Contec Hypercontrol Micro9-M"
79 select MACH_MICRO9 124 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
80 help 125 select MACH_MICRO9
81 Say 'Y' here if you want your kernel to support the 126 help
82 Contec Hypercontrol Micro9-M board. 127 Say 'Y' here if you want your kernel to support the
128 Contec Hypercontrol Micro9-M board.
83 129
84config MACH_MICRO9L 130config MACH_MICRO9L
85 bool "Support Contec Hypercontrol Micro9-L" 131 bool "Support Contec Hypercontrol Micro9-L"
86 select MACH_MICRO9 132 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
87 help 133 select MACH_MICRO9
88 Say 'Y' here if you want your kernel to support the 134 help
89 Contec Hypercontrol Micro9-L board. 135 Say 'Y' here if you want your kernel to support the
136 Contec Hypercontrol Micro9-L board.
90 137
91config MACH_TS72XX 138config MACH_TS72XX
92 bool "Support Technologic Systems TS-72xx SBC" 139 bool "Support Technologic Systems TS-72xx SBC"
140 depends on EP93XX_SDCE3_SYNC_PHYS_OFFSET
93 help 141 help
94 Say 'Y' here if you want your kernel to support the 142 Say 'Y' here if you want your kernel to support the
95 Technologic Systems TS-72xx board. 143 Technologic Systems TS-72xx board.
diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile
index 9522e205b73f..eae6199a9891 100644
--- a/arch/arm/mach-ep93xx/Makefile
+++ b/arch/arm/mach-ep93xx/Makefile
@@ -7,13 +7,7 @@ obj-n :=
7obj- := 7obj- :=
8 8
9obj-$(CONFIG_MACH_ADSSPHERE) += adssphere.o 9obj-$(CONFIG_MACH_ADSSPHERE) += adssphere.o
10obj-$(CONFIG_MACH_EDB9302) += edb9302.o 10obj-$(CONFIG_MACH_EDB93XX) += edb93xx.o
11obj-$(CONFIG_MACH_EDB9302A) += edb9302a.o
12obj-$(CONFIG_MACH_EDB9307) += edb9307.o
13obj-$(CONFIG_MACH_EDB9307A) += edb9307a.o
14obj-$(CONFIG_MACH_EDB9312) += edb9312.o
15obj-$(CONFIG_MACH_EDB9315) += edb9315.o
16obj-$(CONFIG_MACH_EDB9315A) += edb9315a.o
17obj-$(CONFIG_MACH_GESBC9312) += gesbc9312.o 11obj-$(CONFIG_MACH_GESBC9312) += gesbc9312.o
18obj-$(CONFIG_MACH_MICRO9) += micro9.o 12obj-$(CONFIG_MACH_MICRO9) += micro9.o
19obj-$(CONFIG_MACH_TS72XX) += ts72xx.o 13obj-$(CONFIG_MACH_TS72XX) += ts72xx.o
diff --git a/arch/arm/mach-ep93xx/Makefile.boot b/arch/arm/mach-ep93xx/Makefile.boot
index d5561ad15bad..27a085a8f12a 100644
--- a/arch/arm/mach-ep93xx/Makefile.boot
+++ b/arch/arm/mach-ep93xx/Makefile.boot
@@ -1,2 +1,5 @@
1 zreladdr-y := 0x00008000 1 zreladdr-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) := 0x00008000
2params_phys-y := 0x00000100 2params_phys-$(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET) := 0x00000100
3
4 zreladdr-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) := 0xc0008000
5params_phys-$(CONFIG_EP93XX_SDCE0_PHYS_OFFSET) := 0xc0000100
diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
index b2eede5531c8..755e981968b7 100644
--- a/arch/arm/mach-ep93xx/clock.c
+++ b/arch/arm/mach-ep93xx/clock.c
@@ -72,58 +72,58 @@ static struct clk clk_h;
72static struct clk clk_p; 72static struct clk clk_p;
73static struct clk clk_pll2; 73static struct clk clk_pll2;
74static struct clk clk_usb_host = { 74static struct clk clk_usb_host = {
75 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 75 .enable_reg = EP93XX_SYSCON_PWRCNT,
76 .enable_mask = EP93XX_SYSCON_CLOCK_USH_EN, 76 .enable_mask = EP93XX_SYSCON_PWRCNT_USH_EN,
77}; 77};
78 78
79/* DMA Clocks */ 79/* DMA Clocks */
80static struct clk clk_m2p0 = { 80static struct clk clk_m2p0 = {
81 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 81 .enable_reg = EP93XX_SYSCON_PWRCNT,
82 .enable_mask = 0x00020000, 82 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2P0,
83}; 83};
84static struct clk clk_m2p1 = { 84static struct clk clk_m2p1 = {
85 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 85 .enable_reg = EP93XX_SYSCON_PWRCNT,
86 .enable_mask = 0x00010000, 86 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2P1,
87}; 87};
88static struct clk clk_m2p2 = { 88static struct clk clk_m2p2 = {
89 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 89 .enable_reg = EP93XX_SYSCON_PWRCNT,
90 .enable_mask = 0x00080000, 90 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2P2,
91}; 91};
92static struct clk clk_m2p3 = { 92static struct clk clk_m2p3 = {
93 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 93 .enable_reg = EP93XX_SYSCON_PWRCNT,
94 .enable_mask = 0x00040000, 94 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2P3,
95}; 95};
96static struct clk clk_m2p4 = { 96static struct clk clk_m2p4 = {
97 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 97 .enable_reg = EP93XX_SYSCON_PWRCNT,
98 .enable_mask = 0x00200000, 98 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2P4,
99}; 99};
100static struct clk clk_m2p5 = { 100static struct clk clk_m2p5 = {
101 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 101 .enable_reg = EP93XX_SYSCON_PWRCNT,
102 .enable_mask = 0x00100000, 102 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2P5,
103}; 103};
104static struct clk clk_m2p6 = { 104static struct clk clk_m2p6 = {
105 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 105 .enable_reg = EP93XX_SYSCON_PWRCNT,
106 .enable_mask = 0x00800000, 106 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2P6,
107}; 107};
108static struct clk clk_m2p7 = { 108static struct clk clk_m2p7 = {
109 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 109 .enable_reg = EP93XX_SYSCON_PWRCNT,
110 .enable_mask = 0x00400000, 110 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2P7,
111}; 111};
112static struct clk clk_m2p8 = { 112static struct clk clk_m2p8 = {
113 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 113 .enable_reg = EP93XX_SYSCON_PWRCNT,
114 .enable_mask = 0x02000000, 114 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2P8,
115}; 115};
116static struct clk clk_m2p9 = { 116static struct clk clk_m2p9 = {
117 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 117 .enable_reg = EP93XX_SYSCON_PWRCNT,
118 .enable_mask = 0x01000000, 118 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2P9,
119}; 119};
120static struct clk clk_m2m0 = { 120static struct clk clk_m2m0 = {
121 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 121 .enable_reg = EP93XX_SYSCON_PWRCNT,
122 .enable_mask = 0x04000000, 122 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2M0,
123}; 123};
124static struct clk clk_m2m1 = { 124static struct clk clk_m2m1 = {
125 .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, 125 .enable_reg = EP93XX_SYSCON_PWRCNT,
126 .enable_mask = 0x08000000, 126 .enable_mask = EP93XX_SYSCON_PWRCNT_DMA_M2M1,
127}; 127};
128 128
129#define INIT_CK(dev,con,ck) \ 129#define INIT_CK(dev,con,ck) \
@@ -138,7 +138,7 @@ static struct clk_lookup clocks[] = {
138 INIT_CK(NULL, "hclk", &clk_h), 138 INIT_CK(NULL, "hclk", &clk_h),
139 INIT_CK(NULL, "pclk", &clk_p), 139 INIT_CK(NULL, "pclk", &clk_p),
140 INIT_CK(NULL, "pll2", &clk_pll2), 140 INIT_CK(NULL, "pll2", &clk_pll2),
141 INIT_CK(NULL, "usb_host", &clk_usb_host), 141 INIT_CK("ep93xx-ohci", NULL, &clk_usb_host),
142 INIT_CK(NULL, "m2p0", &clk_m2p0), 142 INIT_CK(NULL, "m2p0", &clk_m2p0),
143 INIT_CK(NULL, "m2p1", &clk_m2p1), 143 INIT_CK(NULL, "m2p1", &clk_m2p1),
144 INIT_CK(NULL, "m2p2", &clk_m2p2), 144 INIT_CK(NULL, "m2p2", &clk_m2p2),
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index c535e8805a3b..f477df0e5e4c 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -155,7 +155,7 @@ static unsigned char gpio_int_unmasked[3];
155static unsigned char gpio_int_enabled[3]; 155static unsigned char gpio_int_enabled[3];
156static unsigned char gpio_int_type1[3]; 156static unsigned char gpio_int_type1[3];
157static unsigned char gpio_int_type2[3]; 157static unsigned char gpio_int_type2[3];
158static unsigned char gpio_int_debouce[3]; 158static unsigned char gpio_int_debounce[3];
159 159
160/* Port ordering is: A B F */ 160/* Port ordering is: A B F */
161static const u8 int_type1_register_offset[3] = { 0x90, 0xac, 0x4c }; 161static const u8 int_type1_register_offset[3] = { 0x90, 0xac, 0x4c };
@@ -192,11 +192,11 @@ void ep93xx_gpio_int_debounce(unsigned int irq, int enable)
192 int port_mask = 1 << (line & 7); 192 int port_mask = 1 << (line & 7);
193 193
194 if (enable) 194 if (enable)
195 gpio_int_debouce[port] |= port_mask; 195 gpio_int_debounce[port] |= port_mask;
196 else 196 else
197 gpio_int_debouce[port] &= ~port_mask; 197 gpio_int_debounce[port] &= ~port_mask;
198 198
199 __raw_writeb(gpio_int_debouce[port], 199 __raw_writeb(gpio_int_debounce[port],
200 EP93XX_GPIO_REG(int_debounce_register_offset[port])); 200 EP93XX_GPIO_REG(int_debounce_register_offset[port]));
201} 201}
202EXPORT_SYMBOL(ep93xx_gpio_int_debounce); 202EXPORT_SYMBOL(ep93xx_gpio_int_debounce);
diff --git a/arch/arm/mach-ep93xx/edb9302.c b/arch/arm/mach-ep93xx/edb9302.c
deleted file mode 100644
index 8bf8d7c78f1a..000000000000
--- a/arch/arm/mach-ep93xx/edb9302.c
+++ /dev/null
@@ -1,68 +0,0 @@
1/*
2 * arch/arm/mach-ep93xx/edb9302.c
3 * Cirrus Logic EDB9302 support.
4 *
5 * Copyright (C) 2006 George Kashperko <george@chas.com.ua>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or (at
10 * your option) any later version.
11 */
12
13#include <linux/kernel.h>
14#include <linux/init.h>
15#include <linux/mm.h>
16#include <linux/sched.h>
17#include <linux/interrupt.h>
18#include <linux/ioport.h>
19#include <linux/mtd/physmap.h>
20#include <linux/platform_device.h>
21#include <linux/io.h>
22#include <linux/i2c.h>
23#include <mach/hardware.h>
24#include <asm/mach-types.h>
25#include <asm/mach/arch.h>
26
27static struct physmap_flash_data edb9302_flash_data = {
28 .width = 2,
29};
30
31static struct resource edb9302_flash_resource = {
32 .start = EP93XX_CS6_PHYS_BASE,
33 .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1,
34 .flags = IORESOURCE_MEM,
35};
36
37static struct platform_device edb9302_flash = {
38 .name = "physmap-flash",
39 .id = 0,
40 .dev = {
41 .platform_data = &edb9302_flash_data,
42 },
43 .num_resources = 1,
44 .resource = &edb9302_flash_resource,
45};
46
47static struct ep93xx_eth_data edb9302_eth_data = {
48 .phy_id = 1,
49};
50
51static void __init edb9302_init_machine(void)
52{
53 ep93xx_init_devices();
54 platform_device_register(&edb9302_flash);
55
56 ep93xx_register_eth(&edb9302_eth_data, 1);
57}
58
59MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board")
60 /* Maintainer: George Kashperko <george@chas.com.ua> */
61 .phys_io = EP93XX_APB_PHYS_BASE,
62 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
63 .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
64 .map_io = ep93xx_map_io,
65 .init_irq = ep93xx_init_irq,
66 .timer = &ep93xx_timer,
67 .init_machine = edb9302_init_machine,
68MACHINE_END
diff --git a/arch/arm/mach-ep93xx/edb9302a.c b/arch/arm/mach-ep93xx/edb9302a.c
deleted file mode 100644
index a352c57c7b46..000000000000
--- a/arch/arm/mach-ep93xx/edb9302a.c
+++ /dev/null
@@ -1,68 +0,0 @@
1/*
2 * arch/arm/mach-ep93xx/edb9302a.c
3 * Cirrus Logic EDB9302A support.
4 *
5 * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or (at
10 * your option) any later version.
11 */
12
13#include <linux/kernel.h>
14#include <linux/init.h>
15#include <linux/mm.h>
16#include <linux/sched.h>
17#include <linux/interrupt.h>
18#include <linux/ioport.h>
19#include <linux/mtd/physmap.h>
20#include <linux/platform_device.h>
21#include <linux/io.h>
22#include <linux/i2c.h>
23#include <mach/hardware.h>
24#include <asm/mach-types.h>
25#include <asm/mach/arch.h>
26
27static struct physmap_flash_data edb9302a_flash_data = {
28 .width = 2,
29};
30
31static struct resource edb9302a_flash_resource = {
32 .start = EP93XX_CS6_PHYS_BASE,
33 .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1,
34 .flags = IORESOURCE_MEM,
35};
36
37static struct platform_device edb9302a_flash = {
38 .name = "physmap-flash",
39 .id = 0,
40 .dev = {
41 .platform_data = &edb9302a_flash_data,
42 },
43 .num_resources = 1,
44 .resource = &edb9302a_flash_resource,
45};
46
47static struct ep93xx_eth_data edb9302a_eth_data = {
48 .phy_id = 1,
49};
50
51static void __init edb9302a_init_machine(void)
52{
53 ep93xx_init_devices();
54 platform_device_register(&edb9302a_flash);
55
56 ep93xx_register_eth(&edb9302a_eth_data, 1);
57}
58
59MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board")
60 /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
61 .phys_io = EP93XX_APB_PHYS_BASE,
62 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
63 .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100,
64 .map_io = ep93xx_map_io,
65 .init_irq = ep93xx_init_irq,
66 .timer = &ep93xx_timer,
67 .init_machine = edb9302a_init_machine,
68MACHINE_END
diff --git a/arch/arm/mach-ep93xx/edb9307.c b/arch/arm/mach-ep93xx/edb9307.c
deleted file mode 100644
index 5ab22f63a4eb..000000000000
--- a/arch/arm/mach-ep93xx/edb9307.c
+++ /dev/null
@@ -1,68 +0,0 @@
1/*
2 * arch/arm/mach-ep93xx/edb9307.c
3 * Cirrus Logic EDB9307 support.
4 *
5 * Copyright (C) 2007 Herbert Valerio Riedel <hvr@gnu.org>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or (at
10 * your option) any later version.
11 */
12
13#include <linux/kernel.h>
14#include <linux/init.h>
15#include <linux/mm.h>
16#include <linux/sched.h>
17#include <linux/interrupt.h>
18#include <linux/ioport.h>
19#include <linux/mtd/physmap.h>
20#include <linux/platform_device.h>
21#include <linux/io.h>
22#include <linux/i2c.h>
23#include <mach/hardware.h>
24#include <asm/mach-types.h>
25#include <asm/mach/arch.h>
26
27static struct physmap_flash_data edb9307_flash_data = {
28 .width = 4,
29};
30
31static struct resource edb9307_flash_resource = {
32 .start = EP93XX_CS6_PHYS_BASE,
33 .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1,
34 .flags = IORESOURCE_MEM,
35};
36
37static struct platform_device edb9307_flash = {
38 .name = "physmap-flash",
39 .id = 0,
40 .dev = {
41 .platform_data = &edb9307_flash_data,
42 },
43 .num_resources = 1,
44 .resource = &edb9307_flash_resource,
45};
46
47static struct ep93xx_eth_data edb9307_eth_data = {
48 .phy_id = 1,
49};
50
51static void __init edb9307_init_machine(void)
52{
53 ep93xx_init_devices();
54 platform_device_register(&edb9307_flash);
55
56 ep93xx_register_eth(&edb9307_eth_data, 1);
57}
58
59MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board")
60 /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */
61 .phys_io = EP93XX_APB_PHYS_BASE,
62 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
63 .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
64 .map_io = ep93xx_map_io,
65 .init_irq = ep93xx_init_irq,
66 .timer = &ep93xx_timer,
67 .init_machine = edb9307_init_machine,
68MACHINE_END
diff --git a/arch/arm/mach-ep93xx/edb9307a.c b/arch/arm/mach-ep93xx/edb9307a.c
deleted file mode 100644
index 6171167d3315..000000000000
--- a/arch/arm/mach-ep93xx/edb9307a.c
+++ /dev/null
@@ -1,80 +0,0 @@
1/*
2 * arch/arm/mach-ep93xx/edb9307a.c
3 * Cirrus Logic EDB9307A support.
4 *
5 * Copyright (C) 2008 H Hartley Sweeten <hsweeten@visionengravers.com>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or (at
10 * your option) any later version.
11 */
12
13#include <linux/kernel.h>
14#include <linux/init.h>
15#include <linux/mm.h>
16#include <linux/sched.h>
17#include <linux/interrupt.h>
18#include <linux/ioport.h>
19#include <linux/mtd/physmap.h>
20#include <linux/platform_device.h>
21#include <linux/io.h>
22#include <linux/i2c.h>
23#include <mach/hardware.h>
24#include <asm/mach-types.h>
25#include <asm/mach/arch.h>
26
27static struct physmap_flash_data edb9307a_flash_data = {
28 .width = 2,
29};
30
31static struct resource edb9307a_flash_resource = {
32 .start = EP93XX_CS6_PHYS_BASE,
33 .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1,
34 .flags = IORESOURCE_MEM,
35};
36
37static struct platform_device edb9307a_flash = {
38 .name = "physmap-flash",
39 .id = 0,
40 .dev = {
41 .platform_data = &edb9307a_flash_data,
42 },
43 .num_resources = 1,
44 .resource = &edb9307a_flash_resource,
45};
46
47static struct ep93xx_eth_data edb9307a_eth_data = {
48 .phy_id = 1,
49};
50
51static struct i2c_board_info __initdata edb9307a_i2c_data[] = {
52 {
53 /* On-board battery backed RTC */
54 I2C_BOARD_INFO("isl1208", 0x6f),
55 },
56 /*
57 * The I2C signals are also routed to the Expansion Connector (J4)
58 */
59};
60
61static void __init edb9307a_init_machine(void)
62{
63 ep93xx_init_devices();
64 platform_device_register(&edb9307a_flash);
65
66 ep93xx_register_eth(&edb9307a_eth_data, 1);
67
68 ep93xx_init_i2c(edb9307a_i2c_data, ARRAY_SIZE(edb9307a_i2c_data));
69}
70
71MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board")
72 /* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */
73 .phys_io = EP93XX_APB_PHYS_BASE,
74 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
75 .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100,
76 .map_io = ep93xx_map_io,
77 .init_irq = ep93xx_init_irq,
78 .timer = &ep93xx_timer,
79 .init_machine = edb9307a_init_machine,
80MACHINE_END
diff --git a/arch/arm/mach-ep93xx/edb9312.c b/arch/arm/mach-ep93xx/edb9312.c
deleted file mode 100644
index d7179f66d804..000000000000
--- a/arch/arm/mach-ep93xx/edb9312.c
+++ /dev/null
@@ -1,69 +0,0 @@
1/*
2 * arch/arm/mach-ep93xx/edb9312.c
3 * Cirrus Logic EDB9312 support.
4 *
5 * Copyright (C) 2006 Infosys Technologies Limited
6 * Toufeeq Hussain <toufeeq_hussain@infosys.com>
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or (at
11 * your option) any later version.
12 */
13
14#include <linux/kernel.h>
15#include <linux/init.h>
16#include <linux/mm.h>
17#include <linux/sched.h>
18#include <linux/interrupt.h>
19#include <linux/ioport.h>
20#include <linux/mtd/physmap.h>
21#include <linux/platform_device.h>
22#include <linux/io.h>
23#include <linux/i2c.h>
24#include <mach/hardware.h>
25#include <asm/mach-types.h>
26#include <asm/mach/arch.h>
27
28static struct physmap_flash_data edb9312_flash_data = {
29 .width = 4,
30};
31
32static struct resource edb9312_flash_resource = {
33 .start = EP93XX_CS6_PHYS_BASE,
34 .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1,
35 .flags = IORESOURCE_MEM,
36};
37
38static struct platform_device edb9312_flash = {
39 .name = "physmap-flash",
40 .id = 0,
41 .dev = {
42 .platform_data = &edb9312_flash_data,
43 },
44 .num_resources = 1,
45 .resource = &edb9312_flash_resource,
46};
47
48static struct ep93xx_eth_data edb9312_eth_data = {
49 .phy_id = 1,
50};
51
52static void __init edb9312_init_machine(void)
53{
54 ep93xx_init_devices();
55 platform_device_register(&edb9312_flash);
56
57 ep93xx_register_eth(&edb9312_eth_data, 1);
58}
59
60MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board")
61 /* Maintainer: Toufeeq Hussain <toufeeq_hussain@infosys.com> */
62 .phys_io = EP93XX_APB_PHYS_BASE,
63 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
64 .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
65 .map_io = ep93xx_map_io,
66 .init_irq = ep93xx_init_irq,
67 .timer = &ep93xx_timer,
68 .init_machine = edb9312_init_machine,
69MACHINE_END
diff --git a/arch/arm/mach-ep93xx/edb9315.c b/arch/arm/mach-ep93xx/edb9315.c
deleted file mode 100644
index 025af6eaca10..000000000000
--- a/arch/arm/mach-ep93xx/edb9315.c
+++ /dev/null
@@ -1,68 +0,0 @@
1/*
2 * arch/arm/mach-ep93xx/edb9315.c
3 * Cirrus Logic EDB9315 support.
4 *
5 * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or (at
10 * your option) any later version.
11 */
12
13#include <linux/kernel.h>
14#include <linux/init.h>
15#include <linux/mm.h>
16#include <linux/sched.h>
17#include <linux/interrupt.h>
18#include <linux/ioport.h>
19#include <linux/mtd/physmap.h>
20#include <linux/platform_device.h>
21#include <linux/io.h>
22#include <linux/i2c.h>
23#include <mach/hardware.h>
24#include <asm/mach-types.h>
25#include <asm/mach/arch.h>
26
27static struct physmap_flash_data edb9315_flash_data = {
28 .width = 4,
29};
30
31static struct resource edb9315_flash_resource = {
32 .start = EP93XX_CS6_PHYS_BASE,
33 .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1,
34 .flags = IORESOURCE_MEM,
35};
36
37static struct platform_device edb9315_flash = {
38 .name = "physmap-flash",
39 .id = 0,
40 .dev = {
41 .platform_data = &edb9315_flash_data,
42 },
43 .num_resources = 1,
44 .resource = &edb9315_flash_resource,
45};
46
47static struct ep93xx_eth_data edb9315_eth_data = {
48 .phy_id = 1,
49};
50
51static void __init edb9315_init_machine(void)
52{
53 ep93xx_init_devices();
54 platform_device_register(&edb9315_flash);
55
56 ep93xx_register_eth(&edb9315_eth_data, 1);
57}
58
59MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board")
60 /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
61 .phys_io = EP93XX_APB_PHYS_BASE,
62 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
63 .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
64 .map_io = ep93xx_map_io,
65 .init_irq = ep93xx_init_irq,
66 .timer = &ep93xx_timer,
67 .init_machine = edb9315_init_machine,
68MACHINE_END
diff --git a/arch/arm/mach-ep93xx/edb9315a.c b/arch/arm/mach-ep93xx/edb9315a.c
deleted file mode 100644
index 4c9cc8a39f5c..000000000000
--- a/arch/arm/mach-ep93xx/edb9315a.c
+++ /dev/null
@@ -1,68 +0,0 @@
1/*
2 * arch/arm/mach-ep93xx/edb9315a.c
3 * Cirrus Logic EDB9315A support.
4 *
5 * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or (at
10 * your option) any later version.
11 */
12
13#include <linux/kernel.h>
14#include <linux/init.h>
15#include <linux/mm.h>
16#include <linux/sched.h>
17#include <linux/interrupt.h>
18#include <linux/ioport.h>
19#include <linux/mtd/physmap.h>
20#include <linux/platform_device.h>
21#include <linux/io.h>
22#include <linux/i2c.h>
23#include <mach/hardware.h>
24#include <asm/mach-types.h>
25#include <asm/mach/arch.h>
26
27static struct physmap_flash_data edb9315a_flash_data = {
28 .width = 2,
29};
30
31static struct resource edb9315a_flash_resource = {
32 .start = EP93XX_CS6_PHYS_BASE,
33 .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1,
34 .flags = IORESOURCE_MEM,
35};
36
37static struct platform_device edb9315a_flash = {
38 .name = "physmap-flash",
39 .id = 0,
40 .dev = {
41 .platform_data = &edb9315a_flash_data,
42 },
43 .num_resources = 1,
44 .resource = &edb9315a_flash_resource,
45};
46
47static struct ep93xx_eth_data edb9315a_eth_data = {
48 .phy_id = 1,
49};
50
51static void __init edb9315a_init_machine(void)
52{
53 ep93xx_init_devices();
54 platform_device_register(&edb9315a_flash);
55
56 ep93xx_register_eth(&edb9315a_eth_data, 1);
57}
58
59MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board")
60 /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
61 .phys_io = EP93XX_APB_PHYS_BASE,
62 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
63 .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100,
64 .map_io = ep93xx_map_io,
65 .init_irq = ep93xx_init_irq,
66 .timer = &ep93xx_timer,
67 .init_machine = edb9315a_init_machine,
68MACHINE_END
diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c
new file mode 100644
index 000000000000..e9e45b92457e
--- /dev/null
+++ b/arch/arm/mach-ep93xx/edb93xx.c
@@ -0,0 +1,217 @@
1/*
2 * arch/arm/mach-ep93xx/edb93xx.c
3 * Cirrus Logic EDB93xx Development Board support.
4 *
5 * EDB93XX, EDB9301, EDB9307A
6 * Copyright (C) 2008-2009 H Hartley Sweeten <hsweeten@visionengravers.com>
7 *
8 * EDB9302
9 * Copyright (C) 2006 George Kashperko <george@chas.com.ua>
10 *
11 * EDB9302A, EDB9315, EDB9315A
12 * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
13 *
14 * EDB9307
15 * Copyright (C) 2007 Herbert Valerio Riedel <hvr@gnu.org>
16 *
17 * EDB9312
18 * Copyright (C) 2006 Infosys Technologies Limited
19 * Toufeeq Hussain <toufeeq_hussain@infosys.com>
20 *
21 * This program is free software; you can redistribute it and/or modify
22 * it under the terms of the GNU General Public License as published by
23 * the Free Software Foundation; either version 2 of the License, or (at
24 * your option) any later version.
25 */
26
27#include <linux/kernel.h>
28#include <linux/init.h>
29#include <linux/mm.h>
30#include <linux/sched.h>
31#include <linux/interrupt.h>
32#include <linux/ioport.h>
33#include <linux/mtd/physmap.h>
34#include <linux/platform_device.h>
35#include <linux/io.h>
36#include <linux/i2c.h>
37#include <mach/hardware.h>
38#include <asm/mach-types.h>
39#include <asm/mach/arch.h>
40
41static struct physmap_flash_data edb93xx_flash_data;
42
43static struct resource edb93xx_flash_resource = {
44 .flags = IORESOURCE_MEM,
45};
46
47static struct platform_device edb93xx_flash = {
48 .name = "physmap-flash",
49 .id = 0,
50 .dev = {
51 .platform_data = &edb93xx_flash_data,
52 },
53 .num_resources = 1,
54 .resource = &edb93xx_flash_resource,
55};
56
57static void __init __edb93xx_register_flash(unsigned int width,
58 resource_size_t start, resource_size_t size)
59{
60 edb93xx_flash_data.width = width;
61 edb93xx_flash_resource.start = start;
62 edb93xx_flash_resource.end = start + size - 1;
63
64 platform_device_register(&edb93xx_flash);
65}
66
67static void __init edb93xx_register_flash(void)
68{
69 if (machine_is_edb9307() || machine_is_edb9312() ||
70 machine_is_edb9315()) {
71 __edb93xx_register_flash(4, EP93XX_CS6_PHYS_BASE, SZ_32M);
72 } else {
73 __edb93xx_register_flash(2, EP93XX_CS6_PHYS_BASE, SZ_16M);
74 }
75}
76
77static struct ep93xx_eth_data edb93xx_eth_data = {
78 .phy_id = 1,
79};
80
81static struct i2c_board_info __initdata edb93xxa_i2c_data[] = {
82 {
83 I2C_BOARD_INFO("isl1208", 0x6f),
84 },
85};
86
87static struct i2c_board_info __initdata edb93xx_i2c_data[] = {
88 {
89 I2C_BOARD_INFO("ds1337", 0x68),
90 },
91};
92
93static void __init edb93xx_register_i2c(void)
94{
95 if (machine_is_edb9302a() || machine_is_edb9307a() ||
96 machine_is_edb9315a()) {
97 ep93xx_register_i2c(edb93xxa_i2c_data,
98 ARRAY_SIZE(edb93xxa_i2c_data));
99 } else if (machine_is_edb9307() || machine_is_edb9312() ||
100 machine_is_edb9315()) {
101 ep93xx_register_i2c(edb93xx_i2c_data,
102 ARRAY_SIZE(edb93xx_i2c_data));
103 }
104}
105
106static void __init edb93xx_init_machine(void)
107{
108 ep93xx_init_devices();
109 edb93xx_register_flash();
110 ep93xx_register_eth(&edb93xx_eth_data, 1);
111 edb93xx_register_i2c();
112}
113
114
115#ifdef CONFIG_MACH_EDB9301
116MACHINE_START(EDB9301, "Cirrus Logic EDB9301 Evaluation Board")
117 /* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */
118 .phys_io = EP93XX_APB_PHYS_BASE,
119 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
120 .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
121 .map_io = ep93xx_map_io,
122 .init_irq = ep93xx_init_irq,
123 .timer = &ep93xx_timer,
124 .init_machine = edb93xx_init_machine,
125MACHINE_END
126#endif
127
128#ifdef CONFIG_MACH_EDB9302
129MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board")
130 /* Maintainer: George Kashperko <george@chas.com.ua> */
131 .phys_io = EP93XX_APB_PHYS_BASE,
132 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
133 .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
134 .map_io = ep93xx_map_io,
135 .init_irq = ep93xx_init_irq,
136 .timer = &ep93xx_timer,
137 .init_machine = edb93xx_init_machine,
138MACHINE_END
139#endif
140
141#ifdef CONFIG_MACH_EDB9302A
142MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board")
143 /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
144 .phys_io = EP93XX_APB_PHYS_BASE,
145 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
146 .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100,
147 .map_io = ep93xx_map_io,
148 .init_irq = ep93xx_init_irq,
149 .timer = &ep93xx_timer,
150 .init_machine = edb93xx_init_machine,
151MACHINE_END
152#endif
153
154#ifdef CONFIG_MACH_EDB9307
155MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board")
156 /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */
157 .phys_io = EP93XX_APB_PHYS_BASE,
158 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
159 .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
160 .map_io = ep93xx_map_io,
161 .init_irq = ep93xx_init_irq,
162 .timer = &ep93xx_timer,
163 .init_machine = edb93xx_init_machine,
164MACHINE_END
165#endif
166
167#ifdef CONFIG_MACH_EDB9307A
168MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board")
169 /* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */
170 .phys_io = EP93XX_APB_PHYS_BASE,
171 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
172 .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100,
173 .map_io = ep93xx_map_io,
174 .init_irq = ep93xx_init_irq,
175 .timer = &ep93xx_timer,
176 .init_machine = edb93xx_init_machine,
177MACHINE_END
178#endif
179
180#ifdef CONFIG_MACH_EDB9312
181MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board")
182 /* Maintainer: Toufeeq Hussain <toufeeq_hussain@infosys.com> */
183 .phys_io = EP93XX_APB_PHYS_BASE,
184 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
185 .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
186 .map_io = ep93xx_map_io,
187 .init_irq = ep93xx_init_irq,
188 .timer = &ep93xx_timer,
189 .init_machine = edb93xx_init_machine,
190MACHINE_END
191#endif
192
193#ifdef CONFIG_MACH_EDB9315
194MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board")
195 /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
196 .phys_io = EP93XX_APB_PHYS_BASE,
197 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
198 .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
199 .map_io = ep93xx_map_io,
200 .init_irq = ep93xx_init_irq,
201 .timer = &ep93xx_timer,
202 .init_machine = edb93xx_init_machine,
203MACHINE_END
204#endif
205
206#ifdef CONFIG_MACH_EDB9315A
207MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board")
208 /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
209 .phys_io = EP93XX_APB_PHYS_BASE,
210 .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
211 .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100,
212 .map_io = ep93xx_map_io,
213 .init_irq = ep93xx_init_irq,
214 .timer = &ep93xx_timer,
215 .init_machine = edb93xx_init_machine,
216MACHINE_END
217#endif
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
index 420f71b85123..967c079180db 100644
--- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
@@ -152,9 +152,22 @@
152#define EP93XX_SYSCON_BASE (EP93XX_APB_VIRT_BASE + 0x00130000) 152#define EP93XX_SYSCON_BASE (EP93XX_APB_VIRT_BASE + 0x00130000)
153#define EP93XX_SYSCON_REG(x) (EP93XX_SYSCON_BASE + (x)) 153#define EP93XX_SYSCON_REG(x) (EP93XX_SYSCON_BASE + (x))
154#define EP93XX_SYSCON_POWER_STATE EP93XX_SYSCON_REG(0x00) 154#define EP93XX_SYSCON_POWER_STATE EP93XX_SYSCON_REG(0x00)
155#define EP93XX_SYSCON_CLOCK_CONTROL EP93XX_SYSCON_REG(0x04) 155#define EP93XX_SYSCON_PWRCNT EP93XX_SYSCON_REG(0x04)
156#define EP93XX_SYSCON_CLOCK_UARTBAUD 0x20000000 156#define EP93XX_SYSCON_PWRCNT_FIR_EN (1<<31)
157#define EP93XX_SYSCON_CLOCK_USH_EN 0x10000000 157#define EP93XX_SYSCON_PWRCNT_UARTBAUD (1<<29)
158#define EP93XX_SYSCON_PWRCNT_USH_EN (1<<28)
159#define EP93XX_SYSCON_PWRCNT_DMA_M2M1 (1<<27)
160#define EP93XX_SYSCON_PWRCNT_DMA_M2M0 (1<<26)
161#define EP93XX_SYSCON_PWRCNT_DMA_M2P8 (1<<25)
162#define EP93XX_SYSCON_PWRCNT_DMA_M2P9 (1<<24)
163#define EP93XX_SYSCON_PWRCNT_DMA_M2P6 (1<<23)
164#define EP93XX_SYSCON_PWRCNT_DMA_M2P7 (1<<22)
165#define EP93XX_SYSCON_PWRCNT_DMA_M2P4 (1<<21)
166#define EP93XX_SYSCON_PWRCNT_DMA_M2P5 (1<<20)
167#define EP93XX_SYSCON_PWRCNT_DMA_M2P2 (1<<19)
168#define EP93XX_SYSCON_PWRCNT_DMA_M2P3 (1<<18)
169#define EP93XX_SYSCON_PWRCNT_DMA_M2P0 (1<<17)
170#define EP93XX_SYSCON_PWRCNT_DMA_M2P1 (1<<16)
158#define EP93XX_SYSCON_HALT EP93XX_SYSCON_REG(0x08) 171#define EP93XX_SYSCON_HALT EP93XX_SYSCON_REG(0x08)
159#define EP93XX_SYSCON_STANDBY EP93XX_SYSCON_REG(0x0c) 172#define EP93XX_SYSCON_STANDBY EP93XX_SYSCON_REG(0x0c)
160#define EP93XX_SYSCON_CLOCK_SET1 EP93XX_SYSCON_REG(0x20) 173#define EP93XX_SYSCON_CLOCK_SET1 EP93XX_SYSCON_REG(0x20)
diff --git a/arch/arm/mach-ep93xx/include/mach/memory.h b/arch/arm/mach-ep93xx/include/mach/memory.h
index 5c80c3c8158d..925b12ea0990 100644
--- a/arch/arm/mach-ep93xx/include/mach/memory.h
+++ b/arch/arm/mach-ep93xx/include/mach/memory.h
@@ -5,6 +5,12 @@
5#ifndef __ASM_ARCH_MEMORY_H 5#ifndef __ASM_ARCH_MEMORY_H
6#define __ASM_ARCH_MEMORY_H 6#define __ASM_ARCH_MEMORY_H
7 7
8#if defined(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET)
8#define PHYS_OFFSET UL(0x00000000) 9#define PHYS_OFFSET UL(0x00000000)
10#elif defined(CONFIG_EP93XX_SDCE0_PHYS_OFFSET)
11#define PHYS_OFFSET UL(0xc0000000)
12#else
13#error "Kconfig bug: No EP93xx PHYS_OFFSET set"
14#endif
9 15
10#endif 16#endif
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index 7cf74f8c2db1..b0dbf4157d29 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -47,7 +47,7 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver,
47 struct usb_hcd *hcd; 47 struct usb_hcd *hcd;
48 48
49 if (pdev->resource[1].flags != IORESOURCE_IRQ) { 49 if (pdev->resource[1].flags != IORESOURCE_IRQ) {
50 pr_debug("resource[1] is not IORESOURCE_IRQ"); 50 dbg("resource[1] is not IORESOURCE_IRQ");
51 return -ENOMEM; 51 return -ENOMEM;
52 } 52 }
53 53
@@ -65,12 +65,18 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver,
65 65
66 hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); 66 hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
67 if (hcd->regs == NULL) { 67 if (hcd->regs == NULL) {
68 pr_debug("ioremap failed"); 68 dbg("ioremap failed");
69 retval = -ENOMEM; 69 retval = -ENOMEM;
70 goto err2; 70 goto err2;
71 } 71 }
72 72
73 usb_host_clock = clk_get(&pdev->dev, "usb_host"); 73 usb_host_clock = clk_get(&pdev->dev, NULL);
74 if (IS_ERR(usb_host_clock)) {
75 dbg("clk_get failed");
76 retval = PTR_ERR(usb_host_clock);
77 goto err3;
78 }
79
74 ep93xx_start_hc(&pdev->dev); 80 ep93xx_start_hc(&pdev->dev);
75 81
76 ohci_hcd_init(hcd_to_ohci(hcd)); 82 ohci_hcd_init(hcd_to_ohci(hcd));
@@ -80,6 +86,7 @@ static int usb_hcd_ep93xx_probe(const struct hc_driver *driver,
80 return retval; 86 return retval;
81 87
82 ep93xx_stop_hc(&pdev->dev); 88 ep93xx_stop_hc(&pdev->dev);
89err3:
83 iounmap(hcd->regs); 90 iounmap(hcd->regs);
84err2: 91err2:
85 release_mem_region(hcd->rsrc_start, hcd->rsrc_len); 92 release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-30 21:33:12 -0400