diff options
-rw-r--r-- | arch/arm/configs/zylonite_defconfig | 736 | ||||
-rw-r--r-- | arch/arm/mach-netx/xc.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/mfp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa300.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa320.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/time.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa300.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa320.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm926.S | 4 | ||||
-rw-r--r-- | drivers/mmc/host/pxamci.c | 11 | ||||
-rw-r--r-- | drivers/scsi/arm/scsi.h | 8 | ||||
-rw-r--r-- | include/asm-arm/arch-at91/board.h | 3 | ||||
-rw-r--r-- | include/asm-arm/arch-davinci/gpio.h | 3 | ||||
-rw-r--r-- | include/asm-arm/arch-pxa/mfp-pxa300.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-pxa/mfp-pxa320.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-pxa/mfp.h | 2 | ||||
-rw-r--r-- | include/asm-arm/flat.h | 3 | ||||
-rw-r--r-- | include/asm-arm/plat-s3c/regs-nand.h | 2 |
22 files changed, 781 insertions, 24 deletions
diff --git a/arch/arm/configs/zylonite_defconfig b/arch/arm/configs/zylonite_defconfig new file mode 100644 index 00000000000..7949d04a360 --- /dev/null +++ b/arch/arm/configs/zylonite_defconfig | |||
@@ -0,0 +1,736 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23 | ||
4 | # Tue Oct 23 13:33:20 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_ARCH_MTD_XIP=y | ||
26 | CONFIG_VECTORS_BASE=0xffff0000 | ||
27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
28 | |||
29 | # | ||
30 | # General setup | ||
31 | # | ||
32 | CONFIG_EXPERIMENTAL=y | ||
33 | CONFIG_BROKEN_ON_SMP=y | ||
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
35 | CONFIG_LOCALVERSION="" | ||
36 | CONFIG_LOCALVERSION_AUTO=y | ||
37 | CONFIG_SWAP=y | ||
38 | CONFIG_SYSVIPC=y | ||
39 | CONFIG_SYSVIPC_SYSCTL=y | ||
40 | # CONFIG_POSIX_MQUEUE is not set | ||
41 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
42 | # CONFIG_TASKSTATS is not set | ||
43 | # CONFIG_USER_NS is not set | ||
44 | # CONFIG_AUDIT is not set | ||
45 | # CONFIG_IKCONFIG is not set | ||
46 | CONFIG_LOG_BUF_SHIFT=18 | ||
47 | # CONFIG_CGROUPS is not set | ||
48 | CONFIG_FAIR_GROUP_SCHED=y | ||
49 | CONFIG_FAIR_USER_SCHED=y | ||
50 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
51 | CONFIG_SYSFS_DEPRECATED=y | ||
52 | # CONFIG_RELAY is not set | ||
53 | # CONFIG_BLK_DEV_INITRD is not set | ||
54 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
55 | CONFIG_SYSCTL=y | ||
56 | # CONFIG_EMBEDDED is not set | ||
57 | CONFIG_UID16=y | ||
58 | CONFIG_SYSCTL_SYSCALL=y | ||
59 | CONFIG_KALLSYMS=y | ||
60 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
61 | CONFIG_HOTPLUG=y | ||
62 | CONFIG_PRINTK=y | ||
63 | CONFIG_BUG=y | ||
64 | CONFIG_ELF_CORE=y | ||
65 | CONFIG_BASE_FULL=y | ||
66 | CONFIG_FUTEX=y | ||
67 | CONFIG_ANON_INODES=y | ||
68 | CONFIG_EPOLL=y | ||
69 | CONFIG_SIGNALFD=y | ||
70 | CONFIG_EVENTFD=y | ||
71 | CONFIG_SHMEM=y | ||
72 | CONFIG_VM_EVENT_COUNTERS=y | ||
73 | CONFIG_SLUB_DEBUG=y | ||
74 | # CONFIG_SLAB is not set | ||
75 | CONFIG_SLUB=y | ||
76 | # CONFIG_SLOB is not set | ||
77 | CONFIG_RT_MUTEXES=y | ||
78 | # CONFIG_TINY_SHMEM is not set | ||
79 | CONFIG_BASE_SMALL=0 | ||
80 | CONFIG_MODULES=y | ||
81 | # CONFIG_MODULE_UNLOAD is not set | ||
82 | # CONFIG_MODVERSIONS is not set | ||
83 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
84 | # CONFIG_KMOD is not set | ||
85 | CONFIG_BLOCK=y | ||
86 | # CONFIG_LBD is not set | ||
87 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
88 | # CONFIG_LSF is not set | ||
89 | # CONFIG_BLK_DEV_BSG is not set | ||
90 | |||
91 | # | ||
92 | # IO Schedulers | ||
93 | # | ||
94 | CONFIG_IOSCHED_NOOP=y | ||
95 | CONFIG_IOSCHED_AS=y | ||
96 | CONFIG_IOSCHED_DEADLINE=y | ||
97 | CONFIG_IOSCHED_CFQ=y | ||
98 | # CONFIG_DEFAULT_AS is not set | ||
99 | # CONFIG_DEFAULT_DEADLINE is not set | ||
100 | CONFIG_DEFAULT_CFQ=y | ||
101 | # CONFIG_DEFAULT_NOOP is not set | ||
102 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
103 | |||
104 | # | ||
105 | # System Type | ||
106 | # | ||
107 | # CONFIG_ARCH_AAEC2000 is not set | ||
108 | # CONFIG_ARCH_INTEGRATOR is not set | ||
109 | # CONFIG_ARCH_REALVIEW is not set | ||
110 | # CONFIG_ARCH_VERSATILE is not set | ||
111 | # CONFIG_ARCH_AT91 is not set | ||
112 | # CONFIG_ARCH_CLPS7500 is not set | ||
113 | # CONFIG_ARCH_CLPS711X is not set | ||
114 | # CONFIG_ARCH_CO285 is not set | ||
115 | # CONFIG_ARCH_EBSA110 is not set | ||
116 | # CONFIG_ARCH_EP93XX is not set | ||
117 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
118 | # CONFIG_ARCH_NETX is not set | ||
119 | # CONFIG_ARCH_H720X is not set | ||
120 | # CONFIG_ARCH_IMX is not set | ||
121 | # CONFIG_ARCH_IOP13XX is not set | ||
122 | # CONFIG_ARCH_IOP32X is not set | ||
123 | # CONFIG_ARCH_IOP33X is not set | ||
124 | # CONFIG_ARCH_IXP23XX is not set | ||
125 | # CONFIG_ARCH_IXP2000 is not set | ||
126 | # CONFIG_ARCH_IXP4XX is not set | ||
127 | # CONFIG_ARCH_L7200 is not set | ||
128 | # CONFIG_ARCH_KS8695 is not set | ||
129 | # CONFIG_ARCH_NS9XXX is not set | ||
130 | # CONFIG_ARCH_MXC is not set | ||
131 | # CONFIG_ARCH_PNX4008 is not set | ||
132 | CONFIG_ARCH_PXA=y | ||
133 | # CONFIG_ARCH_RPC is not set | ||
134 | # CONFIG_ARCH_SA1100 is not set | ||
135 | # CONFIG_ARCH_S3C2410 is not set | ||
136 | # CONFIG_ARCH_SHARK is not set | ||
137 | # CONFIG_ARCH_LH7A40X is not set | ||
138 | # CONFIG_ARCH_DAVINCI is not set | ||
139 | # CONFIG_ARCH_OMAP is not set | ||
140 | |||
141 | # | ||
142 | # Intel PXA2xx/PXA3xx Implementations | ||
143 | # | ||
144 | |||
145 | # | ||
146 | # Supported PXA3xx Processor Variants | ||
147 | # | ||
148 | CONFIG_CPU_PXA300=y | ||
149 | CONFIG_CPU_PXA310=y | ||
150 | CONFIG_CPU_PXA320=y | ||
151 | # CONFIG_ARCH_LUBBOCK is not set | ||
152 | # CONFIG_MACH_LOGICPD_PXA270 is not set | ||
153 | # CONFIG_MACH_MAINSTONE is not set | ||
154 | # CONFIG_ARCH_PXA_IDP is not set | ||
155 | # CONFIG_PXA_SHARPSL is not set | ||
156 | # CONFIG_MACH_TRIZEPS4 is not set | ||
157 | # CONFIG_MACH_EM_X270 is not set | ||
158 | CONFIG_MACH_ZYLONITE=y | ||
159 | # CONFIG_MACH_ARMCORE is not set | ||
160 | CONFIG_PXA3xx=y | ||
161 | |||
162 | # | ||
163 | # Boot options | ||
164 | # | ||
165 | |||
166 | # | ||
167 | # Power management | ||
168 | # | ||
169 | |||
170 | # | ||
171 | # Processor Type | ||
172 | # | ||
173 | CONFIG_CPU_32=y | ||
174 | CONFIG_CPU_XSC3=y | ||
175 | CONFIG_CPU_32v5=y | ||
176 | CONFIG_CPU_ABRT_EV5T=y | ||
177 | CONFIG_CPU_CACHE_VIVT=y | ||
178 | CONFIG_CPU_TLB_V4WBI=y | ||
179 | CONFIG_CPU_CP15=y | ||
180 | CONFIG_CPU_CP15_MMU=y | ||
181 | CONFIG_IO_36=y | ||
182 | |||
183 | # | ||
184 | # Processor Features | ||
185 | # | ||
186 | # CONFIG_ARM_THUMB is not set | ||
187 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
188 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
189 | # CONFIG_OUTER_CACHE is not set | ||
190 | CONFIG_IWMMXT=y | ||
191 | |||
192 | # | ||
193 | # Bus support | ||
194 | # | ||
195 | # CONFIG_PCI_SYSCALL is not set | ||
196 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
197 | # CONFIG_PCCARD is not set | ||
198 | |||
199 | # | ||
200 | # Kernel Features | ||
201 | # | ||
202 | # CONFIG_TICK_ONESHOT is not set | ||
203 | # CONFIG_NO_HZ is not set | ||
204 | # CONFIG_HIGH_RES_TIMERS is not set | ||
205 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
206 | # CONFIG_PREEMPT is not set | ||
207 | CONFIG_HZ=100 | ||
208 | CONFIG_AEABI=y | ||
209 | CONFIG_OABI_COMPAT=y | ||
210 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
211 | CONFIG_SELECT_MEMORY_MODEL=y | ||
212 | CONFIG_FLATMEM_MANUAL=y | ||
213 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
214 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
215 | CONFIG_FLATMEM=y | ||
216 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
217 | # CONFIG_SPARSEMEM_STATIC is not set | ||
218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
219 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
220 | # CONFIG_RESOURCES_64BIT is not set | ||
221 | CONFIG_ZONE_DMA_FLAG=1 | ||
222 | CONFIG_BOUNCE=y | ||
223 | CONFIG_VIRT_TO_BUS=y | ||
224 | CONFIG_ALIGNMENT_TRAP=y | ||
225 | |||
226 | # | ||
227 | # Boot options | ||
228 | # | ||
229 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
230 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
231 | CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfs/rootfs/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS0,38400 mem=64M debug" | ||
232 | # CONFIG_XIP_KERNEL is not set | ||
233 | # CONFIG_KEXEC is not set | ||
234 | |||
235 | # | ||
236 | # Floating point emulation | ||
237 | # | ||
238 | |||
239 | # | ||
240 | # At least one emulation must be selected | ||
241 | # | ||
242 | CONFIG_FPE_NWFPE=y | ||
243 | # CONFIG_FPE_NWFPE_XP is not set | ||
244 | # CONFIG_FPE_FASTFPE is not set | ||
245 | |||
246 | # | ||
247 | # Userspace binary formats | ||
248 | # | ||
249 | CONFIG_BINFMT_ELF=y | ||
250 | # CONFIG_BINFMT_AOUT is not set | ||
251 | # CONFIG_BINFMT_MISC is not set | ||
252 | |||
253 | # | ||
254 | # Power management options | ||
255 | # | ||
256 | # CONFIG_PM is not set | ||
257 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
258 | |||
259 | # | ||
260 | # Networking | ||
261 | # | ||
262 | CONFIG_NET=y | ||
263 | |||
264 | # | ||
265 | # Networking options | ||
266 | # | ||
267 | CONFIG_PACKET=y | ||
268 | # CONFIG_PACKET_MMAP is not set | ||
269 | CONFIG_UNIX=y | ||
270 | # CONFIG_NET_KEY is not set | ||
271 | CONFIG_INET=y | ||
272 | # CONFIG_IP_MULTICAST is not set | ||
273 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
274 | CONFIG_IP_FIB_HASH=y | ||
275 | CONFIG_IP_PNP=y | ||
276 | CONFIG_IP_PNP_DHCP=y | ||
277 | CONFIG_IP_PNP_BOOTP=y | ||
278 | CONFIG_IP_PNP_RARP=y | ||
279 | # CONFIG_NET_IPIP is not set | ||
280 | # CONFIG_NET_IPGRE is not set | ||
281 | # CONFIG_ARPD is not set | ||
282 | # CONFIG_SYN_COOKIES is not set | ||
283 | # CONFIG_INET_AH is not set | ||
284 | # CONFIG_INET_ESP is not set | ||
285 | # CONFIG_INET_IPCOMP is not set | ||
286 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
287 | # CONFIG_INET_TUNNEL is not set | ||
288 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
289 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
290 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
291 | # CONFIG_INET_LRO is not set | ||
292 | # CONFIG_INET_DIAG is not set | ||
293 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
294 | CONFIG_TCP_CONG_CUBIC=y | ||
295 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
296 | # CONFIG_TCP_MD5SIG is not set | ||
297 | # CONFIG_IPV6 is not set | ||
298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
299 | # CONFIG_INET6_TUNNEL is not set | ||
300 | # CONFIG_NETWORK_SECMARK is not set | ||
301 | # CONFIG_NETFILTER is not set | ||
302 | # CONFIG_IP_DCCP is not set | ||
303 | # CONFIG_IP_SCTP is not set | ||
304 | # CONFIG_TIPC is not set | ||
305 | # CONFIG_ATM is not set | ||
306 | # CONFIG_BRIDGE is not set | ||
307 | # CONFIG_VLAN_8021Q is not set | ||
308 | # CONFIG_DECNET is not set | ||
309 | # CONFIG_LLC2 is not set | ||
310 | # CONFIG_IPX is not set | ||
311 | # CONFIG_ATALK is not set | ||
312 | # CONFIG_X25 is not set | ||
313 | # CONFIG_LAPB is not set | ||
314 | # CONFIG_ECONET is not set | ||
315 | # CONFIG_WAN_ROUTER is not set | ||
316 | # CONFIG_NET_SCHED is not set | ||
317 | |||
318 | # | ||
319 | # Network testing | ||
320 | # | ||
321 | # CONFIG_NET_PKTGEN is not set | ||
322 | # CONFIG_HAMRADIO is not set | ||
323 | # CONFIG_IRDA is not set | ||
324 | # CONFIG_BT is not set | ||
325 | # CONFIG_AF_RXRPC is not set | ||
326 | |||
327 | # | ||
328 | # Wireless | ||
329 | # | ||
330 | # CONFIG_CFG80211 is not set | ||
331 | # CONFIG_WIRELESS_EXT is not set | ||
332 | # CONFIG_MAC80211 is not set | ||
333 | # CONFIG_IEEE80211 is not set | ||
334 | # CONFIG_RFKILL is not set | ||
335 | # CONFIG_NET_9P is not set | ||
336 | |||
337 | # | ||
338 | # Device Drivers | ||
339 | # | ||
340 | |||
341 | # | ||
342 | # Generic Driver Options | ||
343 | # | ||
344 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
345 | CONFIG_STANDALONE=y | ||
346 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
347 | CONFIG_FW_LOADER=y | ||
348 | # CONFIG_SYS_HYPERVISOR is not set | ||
349 | # CONFIG_CONNECTOR is not set | ||
350 | # CONFIG_MTD is not set | ||
351 | # CONFIG_PARPORT is not set | ||
352 | # CONFIG_BLK_DEV is not set | ||
353 | # CONFIG_MISC_DEVICES is not set | ||
354 | # CONFIG_IDE is not set | ||
355 | |||
356 | # | ||
357 | # SCSI device support | ||
358 | # | ||
359 | # CONFIG_RAID_ATTRS is not set | ||
360 | # CONFIG_SCSI is not set | ||
361 | # CONFIG_SCSI_DMA is not set | ||
362 | # CONFIG_SCSI_NETLINK is not set | ||
363 | # CONFIG_ATA is not set | ||
364 | # CONFIG_MD is not set | ||
365 | CONFIG_NETDEVICES=y | ||
366 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
367 | # CONFIG_DUMMY is not set | ||
368 | # CONFIG_BONDING is not set | ||
369 | # CONFIG_MACVLAN is not set | ||
370 | # CONFIG_EQUALIZER is not set | ||
371 | # CONFIG_TUN is not set | ||
372 | # CONFIG_VETH is not set | ||
373 | # CONFIG_PHYLIB is not set | ||
374 | CONFIG_NET_ETHERNET=y | ||
375 | CONFIG_MII=y | ||
376 | # CONFIG_AX88796 is not set | ||
377 | CONFIG_SMC91X=y | ||
378 | # CONFIG_DM9000 is not set | ||
379 | # CONFIG_SMC911X is not set | ||
380 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
381 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
382 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
383 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
384 | # CONFIG_B44 is not set | ||
385 | # CONFIG_NETDEV_1000 is not set | ||
386 | # CONFIG_NETDEV_10000 is not set | ||
387 | |||
388 | # | ||
389 | # Wireless LAN | ||
390 | # | ||
391 | # CONFIG_WLAN_PRE80211 is not set | ||
392 | # CONFIG_WLAN_80211 is not set | ||
393 | # CONFIG_WAN is not set | ||
394 | # CONFIG_PPP is not set | ||
395 | # CONFIG_SLIP is not set | ||
396 | # CONFIG_SHAPER is not set | ||
397 | # CONFIG_NETCONSOLE is not set | ||
398 | # CONFIG_NETPOLL is not set | ||
399 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
400 | # CONFIG_ISDN is not set | ||
401 | |||
402 | # | ||
403 | # Input device support | ||
404 | # | ||
405 | CONFIG_INPUT=y | ||
406 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
407 | # CONFIG_INPUT_POLLDEV is not set | ||
408 | |||
409 | # | ||
410 | # Userland interfaces | ||
411 | # | ||
412 | CONFIG_INPUT_MOUSEDEV=y | ||
413 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
414 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
415 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
416 | # CONFIG_INPUT_JOYDEV is not set | ||
417 | # CONFIG_INPUT_EVDEV is not set | ||
418 | # CONFIG_INPUT_EVBUG is not set | ||
419 | |||
420 | # | ||
421 | # Input Device Drivers | ||
422 | # | ||
423 | # CONFIG_INPUT_KEYBOARD is not set | ||
424 | # CONFIG_INPUT_MOUSE is not set | ||
425 | # CONFIG_INPUT_JOYSTICK is not set | ||
426 | # CONFIG_INPUT_TABLET is not set | ||
427 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
428 | # CONFIG_INPUT_MISC is not set | ||
429 | |||
430 | # | ||
431 | # Hardware I/O ports | ||
432 | # | ||
433 | # CONFIG_SERIO is not set | ||
434 | # CONFIG_GAMEPORT is not set | ||
435 | |||
436 | # | ||
437 | # Character devices | ||
438 | # | ||
439 | CONFIG_VT=y | ||
440 | CONFIG_VT_CONSOLE=y | ||
441 | CONFIG_HW_CONSOLE=y | ||
442 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
443 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
444 | |||
445 | # | ||
446 | # Serial drivers | ||
447 | # | ||
448 | # CONFIG_SERIAL_8250 is not set | ||
449 | |||
450 | # | ||
451 | # Non-8250 serial port support | ||
452 | # | ||
453 | CONFIG_SERIAL_PXA=y | ||
454 | CONFIG_SERIAL_PXA_CONSOLE=y | ||
455 | CONFIG_SERIAL_CORE=y | ||
456 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
457 | CONFIG_UNIX98_PTYS=y | ||
458 | # CONFIG_LEGACY_PTYS is not set | ||
459 | # CONFIG_IPMI_HANDLER is not set | ||
460 | # CONFIG_HW_RANDOM is not set | ||
461 | # CONFIG_NVRAM is not set | ||
462 | # CONFIG_R3964 is not set | ||
463 | # CONFIG_RAW_DRIVER is not set | ||
464 | # CONFIG_TCG_TPM is not set | ||
465 | # CONFIG_I2C is not set | ||
466 | |||
467 | # | ||
468 | # SPI support | ||
469 | # | ||
470 | # CONFIG_SPI is not set | ||
471 | # CONFIG_SPI_MASTER is not set | ||
472 | # CONFIG_W1 is not set | ||
473 | # CONFIG_POWER_SUPPLY is not set | ||
474 | # CONFIG_HWMON is not set | ||
475 | |||
476 | # | ||
477 | # Sonics Silicon Backplane | ||
478 | # | ||
479 | CONFIG_SSB_POSSIBLE=y | ||
480 | # CONFIG_SSB is not set | ||
481 | |||
482 | # | ||
483 | # Multifunction device drivers | ||
484 | # | ||
485 | # CONFIG_MFD_SM501 is not set | ||
486 | |||
487 | # | ||
488 | # Multimedia devices | ||
489 | # | ||
490 | # CONFIG_VIDEO_DEV is not set | ||
491 | # CONFIG_DVB_CORE is not set | ||
492 | # CONFIG_DAB is not set | ||
493 | |||
494 | # | ||
495 | # Graphics support | ||
496 | # | ||
497 | # CONFIG_VGASTATE is not set | ||
498 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
499 | CONFIG_FB=y | ||
500 | # CONFIG_FIRMWARE_EDID is not set | ||
501 | # CONFIG_FB_DDC is not set | ||
502 | CONFIG_FB_CFB_FILLRECT=y | ||
503 | CONFIG_FB_CFB_COPYAREA=y | ||
504 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
505 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
506 | # CONFIG_FB_SYS_FILLRECT is not set | ||
507 | # CONFIG_FB_SYS_COPYAREA is not set | ||
508 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
509 | # CONFIG_FB_SYS_FOPS is not set | ||
510 | CONFIG_FB_DEFERRED_IO=y | ||
511 | # CONFIG_FB_SVGALIB is not set | ||
512 | # CONFIG_FB_MACMODES is not set | ||
513 | # CONFIG_FB_BACKLIGHT is not set | ||
514 | # CONFIG_FB_MODE_HELPERS is not set | ||
515 | # CONFIG_FB_TILEBLITTING is not set | ||
516 | |||
517 | # | ||
518 | # Frame buffer hardware drivers | ||
519 | # | ||
520 | # CONFIG_FB_S1D13XXX is not set | ||
521 | CONFIG_FB_PXA=y | ||
522 | # CONFIG_FB_PXA_PARAMETERS is not set | ||
523 | # CONFIG_FB_MBX is not set | ||
524 | # CONFIG_FB_VIRTUAL is not set | ||
525 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
526 | |||
527 | # | ||
528 | # Display device support | ||
529 | # | ||
530 | # CONFIG_DISPLAY_SUPPORT is not set | ||
531 | |||
532 | # | ||
533 | # Console display driver support | ||
534 | # | ||
535 | # CONFIG_VGA_CONSOLE is not set | ||
536 | CONFIG_DUMMY_CONSOLE=y | ||
537 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
538 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||
539 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
540 | CONFIG_FONTS=y | ||
541 | # CONFIG_FONT_8x8 is not set | ||
542 | # CONFIG_FONT_8x16 is not set | ||
543 | CONFIG_FONT_6x11=y | ||
544 | # CONFIG_FONT_7x14 is not set | ||
545 | # CONFIG_FONT_PEARL_8x8 is not set | ||
546 | # CONFIG_FONT_ACORN_8x8 is not set | ||
547 | # CONFIG_FONT_MINI_4x6 is not set | ||
548 | # CONFIG_FONT_SUN8x16 is not set | ||
549 | # CONFIG_FONT_SUN12x22 is not set | ||
550 | # CONFIG_FONT_10x18 is not set | ||
551 | CONFIG_LOGO=y | ||
552 | CONFIG_LOGO_LINUX_MONO=y | ||
553 | CONFIG_LOGO_LINUX_VGA16=y | ||
554 | CONFIG_LOGO_LINUX_CLUT224=y | ||
555 | |||
556 | # | ||
557 | # Sound | ||
558 | # | ||
559 | # CONFIG_SOUND is not set | ||
560 | # CONFIG_HID_SUPPORT is not set | ||
561 | # CONFIG_USB_SUPPORT is not set | ||
562 | # CONFIG_MMC is not set | ||
563 | # CONFIG_NEW_LEDS is not set | ||
564 | CONFIG_RTC_LIB=y | ||
565 | # CONFIG_RTC_CLASS is not set | ||
566 | |||
567 | # | ||
568 | # File systems | ||
569 | # | ||
570 | # CONFIG_EXT2_FS is not set | ||
571 | # CONFIG_EXT3_FS is not set | ||
572 | # CONFIG_EXT4DEV_FS is not set | ||
573 | # CONFIG_REISERFS_FS is not set | ||
574 | # CONFIG_JFS_FS is not set | ||
575 | CONFIG_FS_POSIX_ACL=y | ||
576 | # CONFIG_XFS_FS is not set | ||
577 | # CONFIG_GFS2_FS is not set | ||
578 | # CONFIG_OCFS2_FS is not set | ||
579 | # CONFIG_MINIX_FS is not set | ||
580 | # CONFIG_ROMFS_FS is not set | ||
581 | # CONFIG_INOTIFY is not set | ||
582 | # CONFIG_QUOTA is not set | ||
583 | CONFIG_DNOTIFY=y | ||
584 | # CONFIG_AUTOFS_FS is not set | ||
585 | # CONFIG_AUTOFS4_FS is not set | ||
586 | # CONFIG_FUSE_FS is not set | ||
587 | |||
588 | # | ||
589 | # CD-ROM/DVD Filesystems | ||
590 | # | ||
591 | # CONFIG_ISO9660_FS is not set | ||
592 | # CONFIG_UDF_FS is not set | ||
593 | |||
594 | # | ||
595 | # DOS/FAT/NT Filesystems | ||
596 | # | ||
597 | # CONFIG_MSDOS_FS is not set | ||
598 | # CONFIG_VFAT_FS is not set | ||
599 | # CONFIG_NTFS_FS is not set | ||
600 | |||
601 | # | ||
602 | # Pseudo filesystems | ||
603 | # | ||
604 | CONFIG_PROC_FS=y | ||
605 | CONFIG_PROC_SYSCTL=y | ||
606 | CONFIG_SYSFS=y | ||
607 | # CONFIG_TMPFS is not set | ||
608 | # CONFIG_HUGETLB_PAGE is not set | ||
609 | # CONFIG_CONFIGFS_FS is not set | ||
610 | |||
611 | # | ||
612 | # Miscellaneous filesystems | ||
613 | # | ||
614 | # CONFIG_ADFS_FS is not set | ||
615 | # CONFIG_AFFS_FS is not set | ||
616 | # CONFIG_HFS_FS is not set | ||
617 | # CONFIG_HFSPLUS_FS is not set | ||
618 | # CONFIG_BEFS_FS is not set | ||
619 | # CONFIG_BFS_FS is not set | ||
620 | # CONFIG_EFS_FS is not set | ||
621 | # CONFIG_CRAMFS is not set | ||
622 | # CONFIG_VXFS_FS is not set | ||
623 | # CONFIG_HPFS_FS is not set | ||
624 | # CONFIG_QNX4FS_FS is not set | ||
625 | # CONFIG_SYSV_FS is not set | ||
626 | # CONFIG_UFS_FS is not set | ||
627 | CONFIG_NETWORK_FILESYSTEMS=y | ||
628 | CONFIG_NFS_FS=y | ||
629 | CONFIG_NFS_V3=y | ||
630 | CONFIG_NFS_V3_ACL=y | ||
631 | CONFIG_NFS_V4=y | ||
632 | CONFIG_NFS_DIRECTIO=y | ||
633 | # CONFIG_NFSD is not set | ||
634 | CONFIG_ROOT_NFS=y | ||
635 | CONFIG_LOCKD=y | ||
636 | CONFIG_LOCKD_V4=y | ||
637 | CONFIG_NFS_ACL_SUPPORT=y | ||
638 | CONFIG_NFS_COMMON=y | ||
639 | CONFIG_SUNRPC=y | ||
640 | CONFIG_SUNRPC_GSS=y | ||
641 | # CONFIG_SUNRPC_BIND34 is not set | ||
642 | CONFIG_RPCSEC_GSS_KRB5=y | ||
643 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
644 | # CONFIG_SMB_FS is not set | ||
645 | # CONFIG_CIFS is not set | ||
646 | # CONFIG_NCP_FS is not set | ||
647 | # CONFIG_CODA_FS is not set | ||
648 | # CONFIG_AFS_FS is not set | ||
649 | |||
650 | # | ||
651 | # Partition Types | ||
652 | # | ||
653 | # CONFIG_PARTITION_ADVANCED is not set | ||
654 | CONFIG_MSDOS_PARTITION=y | ||
655 | # CONFIG_NLS is not set | ||
656 | # CONFIG_DLM is not set | ||
657 | # CONFIG_INSTRUMENTATION is not set | ||
658 | |||
659 | # | ||
660 | # Kernel hacking | ||
661 | # | ||
662 | # CONFIG_PRINTK_TIME is not set | ||
663 | CONFIG_ENABLE_MUST_CHECK=y | ||
664 | # CONFIG_MAGIC_SYSRQ is not set | ||
665 | # CONFIG_UNUSED_SYMBOLS is not set | ||
666 | # CONFIG_DEBUG_FS is not set | ||
667 | # CONFIG_HEADERS_CHECK is not set | ||
668 | # CONFIG_DEBUG_KERNEL is not set | ||
669 | # CONFIG_SLUB_DEBUG_ON is not set | ||
670 | CONFIG_DEBUG_BUGVERBOSE=y | ||
671 | CONFIG_FRAME_POINTER=y | ||
672 | # CONFIG_SAMPLES is not set | ||
673 | CONFIG_DEBUG_USER=y | ||
674 | |||
675 | # | ||
676 | # Security options | ||
677 | # | ||
678 | # CONFIG_KEYS is not set | ||
679 | # CONFIG_SECURITY is not set | ||
680 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
681 | CONFIG_CRYPTO=y | ||
682 | CONFIG_CRYPTO_ALGAPI=y | ||
683 | CONFIG_CRYPTO_BLKCIPHER=y | ||
684 | CONFIG_CRYPTO_MANAGER=y | ||
685 | # CONFIG_CRYPTO_HMAC is not set | ||
686 | # CONFIG_CRYPTO_XCBC is not set | ||
687 | # CONFIG_CRYPTO_NULL is not set | ||
688 | # CONFIG_CRYPTO_MD4 is not set | ||
689 | CONFIG_CRYPTO_MD5=y | ||
690 | # CONFIG_CRYPTO_SHA1 is not set | ||
691 | # CONFIG_CRYPTO_SHA256 is not set | ||
692 | # CONFIG_CRYPTO_SHA512 is not set | ||
693 | # CONFIG_CRYPTO_WP512 is not set | ||
694 | # CONFIG_CRYPTO_TGR192 is not set | ||
695 | # CONFIG_CRYPTO_GF128MUL is not set | ||
696 | # CONFIG_CRYPTO_ECB is not set | ||
697 | CONFIG_CRYPTO_CBC=y | ||
698 | # CONFIG_CRYPTO_PCBC is not set | ||
699 | # CONFIG_CRYPTO_LRW is not set | ||
700 | # CONFIG_CRYPTO_XTS is not set | ||
701 | # CONFIG_CRYPTO_CRYPTD is not set | ||
702 | CONFIG_CRYPTO_DES=y | ||
703 | # CONFIG_CRYPTO_FCRYPT is not set | ||
704 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
705 | # CONFIG_CRYPTO_TWOFISH is not set | ||
706 | # CONFIG_CRYPTO_SERPENT is not set | ||
707 | # CONFIG_CRYPTO_AES is not set | ||
708 | # CONFIG_CRYPTO_CAST5 is not set | ||
709 | # CONFIG_CRYPTO_CAST6 is not set | ||
710 | # CONFIG_CRYPTO_TEA is not set | ||
711 | # CONFIG_CRYPTO_ARC4 is not set | ||
712 | # CONFIG_CRYPTO_KHAZAD is not set | ||
713 | # CONFIG_CRYPTO_ANUBIS is not set | ||
714 | # CONFIG_CRYPTO_SEED is not set | ||
715 | # CONFIG_CRYPTO_DEFLATE is not set | ||
716 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
717 | # CONFIG_CRYPTO_CRC32C is not set | ||
718 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
719 | # CONFIG_CRYPTO_TEST is not set | ||
720 | # CONFIG_CRYPTO_AUTHENC is not set | ||
721 | # CONFIG_CRYPTO_HW is not set | ||
722 | |||
723 | # | ||
724 | # Library routines | ||
725 | # | ||
726 | CONFIG_BITREVERSE=y | ||
727 | # CONFIG_CRC_CCITT is not set | ||
728 | # CONFIG_CRC16 is not set | ||
729 | # CONFIG_CRC_ITU_T is not set | ||
730 | CONFIG_CRC32=y | ||
731 | # CONFIG_CRC7 is not set | ||
732 | # CONFIG_LIBCRC32C is not set | ||
733 | CONFIG_PLIST=y | ||
734 | CONFIG_HAS_IOMEM=y | ||
735 | CONFIG_HAS_IOPORT=y | ||
736 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c index 172a058ddd6..bd5184fe177 100644 --- a/arch/arm/mach-netx/xc.c +++ b/arch/arm/mach-netx/xc.c | |||
@@ -190,15 +190,15 @@ struct xc *request_xc(int xcno, struct device *dev) | |||
190 | goto exit; | 190 | goto exit; |
191 | 191 | ||
192 | if (!request_mem_region | 192 | if (!request_mem_region |
193 | (NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, dev->kobj.name)) | 193 | (NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, kobject_name(dev->kobj))) |
194 | goto exit_free; | 194 | goto exit_free; |
195 | 195 | ||
196 | if (!request_mem_region | 196 | if (!request_mem_region |
197 | (NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, dev->kobj.name)) | 197 | (NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, kobject_name(dev->kobj))) |
198 | goto exit_release_1; | 198 | goto exit_release_1; |
199 | 199 | ||
200 | if (!request_mem_region | 200 | if (!request_mem_region |
201 | (SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, dev->kobj.name)) | 201 | (SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, kobject_name(dev->kobj))) |
202 | goto exit_release_2; | 202 | goto exit_release_2; |
203 | 203 | ||
204 | x->xpec_base = (void * __iomem)io_p2v(NETX_PA_XPEC(xcno)); | 204 | x->xpec_base = (void * __iomem)io_p2v(NETX_PA_XPEC(xcno)); |
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index b0921622566..130681201c1 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -343,6 +343,7 @@ static struct platform_device *h2_devices[] __initdata = { | |||
343 | &h2_mcbsp1_device, | 343 | &h2_mcbsp1_device, |
344 | }; | 344 | }; |
345 | 345 | ||
346 | #ifdef CONFIG_I2C_BOARDINFO | ||
346 | static struct i2c_board_info __initdata h2_i2c_board_info[] = { | 347 | static struct i2c_board_info __initdata h2_i2c_board_info[] = { |
347 | { | 348 | { |
348 | I2C_BOARD_INFO("tps65010", 0x48), | 349 | I2C_BOARD_INFO("tps65010", 0x48), |
@@ -356,6 +357,7 @@ static struct i2c_board_info __initdata h2_i2c_board_info[] = { | |||
356 | * - ... etc | 357 | * - ... etc |
357 | */ | 358 | */ |
358 | }; | 359 | }; |
360 | #endif | ||
359 | 361 | ||
360 | static void __init h2_init_smc91x(void) | 362 | static void __init h2_init_smc91x(void) |
361 | { | 363 | { |
@@ -467,8 +469,10 @@ static void __init h2_init(void) | |||
467 | if (gpio_request(58, "tps65010") == 0) | 469 | if (gpio_request(58, "tps65010") == 0) |
468 | gpio_direction_input(58); | 470 | gpio_direction_input(58); |
469 | 471 | ||
472 | #ifdef CONFIG_I2C_BOARDINFO | ||
470 | i2c_register_board_info(1, h2_i2c_board_info, | 473 | i2c_register_board_info(1, h2_i2c_board_info, |
471 | ARRAY_SIZE(h2_i2c_board_info)); | 474 | ARRAY_SIZE(h2_i2c_board_info)); |
475 | #endif | ||
472 | } | 476 | } |
473 | 477 | ||
474 | static void __init h2_map_io(void) | 478 | static void __init h2_map_io(void) |
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index d9af4367f8b..e6e85b7b097 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
@@ -651,7 +651,7 @@ static u32 omap2_get_clksel(u32 *div_sel, u32 *field_mask, | |||
651 | break; | 651 | break; |
652 | case CM_SYSCLKOUT_SEL1: | 652 | case CM_SYSCLKOUT_SEL1: |
653 | div_addr = (u32)&PRCM_CLKOUT_CTRL; | 653 | div_addr = (u32)&PRCM_CLKOUT_CTRL; |
654 | if ((div_off == 3) || (div_off = 11)) | 654 | if ((div_off == 3) || (div_off == 11)) |
655 | mask= 0x3; | 655 | mask= 0x3; |
656 | break; | 656 | break; |
657 | case CM_CORE_SEL1: | 657 | case CM_CORE_SEL1: |
diff --git a/arch/arm/mach-pxa/mfp.c b/arch/arm/mach-pxa/mfp.c index 5cd3cadbbd1..436f9657496 100644 --- a/arch/arm/mach-pxa/mfp.c +++ b/arch/arm/mach-pxa/mfp.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2007 Marvell Internation Ltd. | 6 | * Copyright (C) 2007 Marvell Internation Ltd. |
7 | * | 7 | * |
8 | * 2007-08-21: eric miao <eric.y.miao@gmail.com> | 8 | * 2007-08-21: eric miao <eric.miao@marvell.com> |
9 | * initial version | 9 | * initial version |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c index 7a34231f317..0a0d3877f21 100644 --- a/arch/arm/mach-pxa/pxa300.c +++ b/arch/arm/mach-pxa/pxa300.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2007 Marvell Internation Ltd. | 6 | * Copyright (C) 2007 Marvell Internation Ltd. |
7 | * | 7 | * |
8 | * 2007-08-21: eric miao <eric.y.miao@gmail.com> | 8 | * 2007-08-21: eric miao <eric.miao@marvell.com> |
9 | * initial version | 9 | * initial version |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c index cd9eba5b3df..1010f77d977 100644 --- a/arch/arm/mach-pxa/pxa320.c +++ b/arch/arm/mach-pxa/pxa320.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2007 Marvell Internation Ltd. | 6 | * Copyright (C) 2007 Marvell Internation Ltd. |
7 | * | 7 | * |
8 | * 2007-08-21: eric miao <eric.y.miao@gmail.com> | 8 | * 2007-08-21: eric miao <eric.miao@marvell.com> |
9 | * initial version | 9 | * initial version |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 39f0de8c189..5da798282a5 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2006 Marvell International Ltd. | 6 | * Copyright (C) 2006 Marvell International Ltd. |
7 | * | 7 | * |
8 | * 2007-09-02: eric miao <eric.y.miao@gmail.com> | 8 | * 2007-09-02: eric miao <eric.miao@marvell.com> |
9 | * initial version | 9 | * initial version |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index ec4286c7931..a2d45d742ce 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -151,6 +151,9 @@ pxa_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *dev) | |||
151 | OIER &= ~OIER_E0; | 151 | OIER &= ~OIER_E0; |
152 | raw_local_irq_restore(irqflags); | 152 | raw_local_irq_restore(irqflags); |
153 | break; | 153 | break; |
154 | |||
155 | case CLOCK_EVT_MODE_RESUME: | ||
156 | break; | ||
154 | } | 157 | } |
155 | } | 158 | } |
156 | 159 | ||
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index 3f18d760dd1..743a87b2faa 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2006 Marvell International Ltd. | 6 | * Copyright (C) 2006 Marvell International Ltd. |
7 | * | 7 | * |
8 | * 2007-09-04: eric miao <eric.y.miao@gmail.com> | 8 | * 2007-09-04: eric miao <eric.miao@marvell.com> |
9 | * rewrite to align with latest kernel | 9 | * rewrite to align with latest kernel |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index b5fbd2f4c69..1832bc31650 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * PXA3xx Development Platform (aka Zylonite) | 5 | * PXA3xx Development Platform (aka Zylonite) |
6 | * | 6 | * |
7 | * Copyright (C) 2007 Marvell Internation Ltd. | 7 | * Copyright (C) 2007 Marvell Internation Ltd. |
8 | * 2007-08-21: eric miao <eric.y.miao@gmail.com> | 8 | * 2007-08-21: eric miao <eric.miao@marvell.com> |
9 | * initial version | 9 | * initial version |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index 63cb36be086..94c715808b5 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * PXA3xx Development Platform (aka Zylonite) | 5 | * PXA3xx Development Platform (aka Zylonite) |
6 | * | 6 | * |
7 | * Copyright (C) 2007 Marvell Internation Ltd. | 7 | * Copyright (C) 2007 Marvell Internation Ltd. |
8 | * 2007-08-21: eric miao <eric.y.miao@gmail.com> | 8 | * 2007-08-21: eric miao <eric.miao@marvell.com> |
9 | * initial version | 9 | * initial version |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S index 5b80b6bdd0c..194ef48968e 100644 --- a/arch/arm/mm/proc-arm926.S +++ b/arch/arm/mm/proc-arm926.S | |||
@@ -105,9 +105,13 @@ ENTRY(cpu_arm926_do_idle) | |||
105 | mrc p15, 0, r1, c1, c0, 0 @ Read control register | 105 | mrc p15, 0, r1, c1, c0, 0 @ Read control register |
106 | mcr p15, 0, r0, c7, c10, 4 @ Drain write buffer | 106 | mcr p15, 0, r0, c7, c10, 4 @ Drain write buffer |
107 | bic r2, r1, #1 << 12 | 107 | bic r2, r1, #1 << 12 |
108 | mrs r3, cpsr @ Disable FIQs while Icache | ||
109 | orr ip, r3, #PSR_F_BIT @ is disabled | ||
110 | msr cpsr_c, ip | ||
108 | mcr p15, 0, r2, c1, c0, 0 @ Disable I cache | 111 | mcr p15, 0, r2, c1, c0, 0 @ Disable I cache |
109 | mcr p15, 0, r0, c7, c0, 4 @ Wait for interrupt | 112 | mcr p15, 0, r0, c7, c0, 4 @ Wait for interrupt |
110 | mcr p15, 0, r1, c1, c0, 0 @ Restore ICache enable | 113 | mcr p15, 0, r1, c1, c0, 0 @ Restore ICache enable |
114 | msr cpsr_c, r3 @ Restore FIQ state | ||
111 | mov pc, lr | 115 | mov pc, lr |
112 | 116 | ||
113 | /* | 117 | /* |
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index a25ee71998a..1654a333034 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #define DRIVER_NAME "pxa2xx-mci" | 39 | #define DRIVER_NAME "pxa2xx-mci" |
40 | 40 | ||
41 | #define NR_SG 1 | 41 | #define NR_SG 1 |
42 | #define CLKRT_OFF (~0) | ||
42 | 43 | ||
43 | struct pxamci_host { | 44 | struct pxamci_host { |
44 | struct mmc_host *mmc; | 45 | struct mmc_host *mmc; |
@@ -371,6 +372,9 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
371 | unsigned long rate = host->clkrate; | 372 | unsigned long rate = host->clkrate; |
372 | unsigned int clk = rate / ios->clock; | 373 | unsigned int clk = rate / ios->clock; |
373 | 374 | ||
375 | if (host->clkrt == CLKRT_OFF) | ||
376 | clk_enable(host->clk); | ||
377 | |||
374 | /* | 378 | /* |
375 | * clk might result in a lower divisor than we | 379 | * clk might result in a lower divisor than we |
376 | * desire. check for that condition and adjust | 380 | * desire. check for that condition and adjust |
@@ -379,14 +383,16 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
379 | if (rate / clk > ios->clock) | 383 | if (rate / clk > ios->clock) |
380 | clk <<= 1; | 384 | clk <<= 1; |
381 | host->clkrt = fls(clk) - 1; | 385 | host->clkrt = fls(clk) - 1; |
382 | clk_enable(host->clk); | ||
383 | 386 | ||
384 | /* | 387 | /* |
385 | * we write clkrt on the next command | 388 | * we write clkrt on the next command |
386 | */ | 389 | */ |
387 | } else { | 390 | } else { |
388 | pxamci_stop_clock(host); | 391 | pxamci_stop_clock(host); |
389 | clk_disable(host->clk); | 392 | if (host->clkrt != CLKRT_OFF) { |
393 | host->clkrt = CLKRT_OFF; | ||
394 | clk_disable(host->clk); | ||
395 | } | ||
390 | } | 396 | } |
391 | 397 | ||
392 | if (host->power_mode != ios->power_mode) { | 398 | if (host->power_mode != ios->power_mode) { |
@@ -498,6 +504,7 @@ static int pxamci_probe(struct platform_device *pdev) | |||
498 | host->mmc = mmc; | 504 | host->mmc = mmc; |
499 | host->dma = -1; | 505 | host->dma = -1; |
500 | host->pdata = pdev->dev.platform_data; | 506 | host->pdata = pdev->dev.platform_data; |
507 | host->clkrt = CLKRT_OFF; | ||
501 | 508 | ||
502 | host->clk = clk_get(&pdev->dev, "MMCCLK"); | 509 | host->clk = clk_get(&pdev->dev, "MMCCLK"); |
503 | if (IS_ERR(host->clk)) { | 510 | if (IS_ERR(host->clk)) { |
diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h index 21ba57155be..bb6550e3192 100644 --- a/drivers/scsi/arm/scsi.h +++ b/drivers/scsi/arm/scsi.h | |||
@@ -38,9 +38,7 @@ static inline int next_SCp(struct scsi_pointer *SCp) | |||
38 | if (ret) { | 38 | if (ret) { |
39 | SCp->buffer++; | 39 | SCp->buffer++; |
40 | SCp->buffers_residual--; | 40 | SCp->buffers_residual--; |
41 | SCp->ptr = (char *) | 41 | SCp->ptr = sg_virt(SCp->buffer); |
42 | (page_address(SCp->buffer->page) + | ||
43 | SCp->buffer->offset); | ||
44 | SCp->this_residual = SCp->buffer->length; | 42 | SCp->this_residual = SCp->buffer->length; |
45 | } else { | 43 | } else { |
46 | SCp->ptr = NULL; | 44 | SCp->ptr = NULL; |
@@ -76,9 +74,7 @@ static inline void init_SCp(struct scsi_cmnd *SCpnt) | |||
76 | 74 | ||
77 | SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->request_buffer; | 75 | SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->request_buffer; |
78 | SCpnt->SCp.buffers_residual = SCpnt->use_sg - 1; | 76 | SCpnt->SCp.buffers_residual = SCpnt->use_sg - 1; |
79 | SCpnt->SCp.ptr = (char *) | 77 | SCpnt->SCp.ptr = sg_virt(SCpnt->SCp.buffer); |
80 | (page_address(SCpnt->SCp.buffer->page) + | ||
81 | SCpnt->SCp.buffer->offset); | ||
82 | SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length; | 78 | SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length; |
83 | SCpnt->SCp.phase = SCpnt->request_bufflen; | 79 | SCpnt->SCp.phase = SCpnt->request_bufflen; |
84 | 80 | ||
diff --git a/include/asm-arm/arch-at91/board.h b/include/asm-arm/arch-at91/board.h index d96b10fd449..c0d7075982c 100644 --- a/include/asm-arm/arch-at91/board.h +++ b/include/asm-arm/arch-at91/board.h | |||
@@ -130,4 +130,7 @@ extern u8 at91_leds_cpu; | |||
130 | extern u8 at91_leds_timer; | 130 | extern u8 at91_leds_timer; |
131 | extern void __init at91_init_leds(u8 cpu_led, u8 timer_led); | 131 | extern void __init at91_init_leds(u8 cpu_led, u8 timer_led); |
132 | 132 | ||
133 | /* FIXME: this needs a better location, but gets stuff building again */ | ||
134 | extern int at91_suspend_entering_slow_clock(void); | ||
135 | |||
133 | #endif | 136 | #endif |
diff --git a/include/asm-arm/arch-davinci/gpio.h b/include/asm-arm/arch-davinci/gpio.h index ea24a0e0bfd..ff8de30b2fb 100644 --- a/include/asm-arm/arch-davinci/gpio.h +++ b/include/asm-arm/arch-davinci/gpio.h | |||
@@ -13,6 +13,9 @@ | |||
13 | #ifndef __DAVINCI_GPIO_H | 13 | #ifndef __DAVINCI_GPIO_H |
14 | #define __DAVINCI_GPIO_H | 14 | #define __DAVINCI_GPIO_H |
15 | 15 | ||
16 | #include <linux/io.h> | ||
17 | #include <asm/hardware.h> | ||
18 | |||
16 | /* | 19 | /* |
17 | * basic gpio routines | 20 | * basic gpio routines |
18 | * | 21 | * |
diff --git a/include/asm-arm/arch-pxa/mfp-pxa300.h b/include/asm-arm/arch-pxa/mfp-pxa300.h index 7513c7a3402..822a27cd786 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa300.h +++ b/include/asm-arm/arch-pxa/mfp-pxa300.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * PXA300/PXA310 specific MFP configuration definitions | 4 | * PXA300/PXA310 specific MFP configuration definitions |
5 | * | 5 | * |
6 | * Copyright (C) 2007 Marvell International Ltd. | 6 | * Copyright (C) 2007 Marvell International Ltd. |
7 | * 2007-08-21: eric miao <eric.y.miao@gmail.com> | 7 | * 2007-08-21: eric miao <eric.miao@marvell.com> |
8 | * initial version | 8 | * initial version |
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
diff --git a/include/asm-arm/arch-pxa/mfp-pxa320.h b/include/asm-arm/arch-pxa/mfp-pxa320.h index ae8ba34194c..488a5bbc49e 100644 --- a/include/asm-arm/arch-pxa/mfp-pxa320.h +++ b/include/asm-arm/arch-pxa/mfp-pxa320.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * PXA320 specific MFP configuration definitions | 4 | * PXA320 specific MFP configuration definitions |
5 | * | 5 | * |
6 | * Copyright (C) 2007 Marvell International Ltd. | 6 | * Copyright (C) 2007 Marvell International Ltd. |
7 | * 2007-08-21: eric miao <eric.y.miao@gmail.com> | 7 | * 2007-08-21: eric miao <eric.miao@marvell.com> |
8 | * initial version | 8 | * initial version |
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
diff --git a/include/asm-arm/arch-pxa/mfp.h b/include/asm-arm/arch-pxa/mfp.h index 60291742ffd..ac4157af5a8 100644 --- a/include/asm-arm/arch-pxa/mfp.h +++ b/include/asm-arm/arch-pxa/mfp.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2007 Marvell International Ltd. | 6 | * Copyright (C) 2007 Marvell International Ltd. |
7 | * | 7 | * |
8 | * 2007-8-21: eric miao <eric.y.miao@gmail.com> | 8 | * 2007-8-21: eric miao <eric.miao@marvell.com> |
9 | * initial version | 9 | * initial version |
10 | * | 10 | * |
11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
diff --git a/include/asm-arm/flat.h b/include/asm-arm/flat.h index 16f5375e57b..9918aa46d9e 100644 --- a/include/asm-arm/flat.h +++ b/include/asm-arm/flat.h | |||
@@ -11,8 +11,9 @@ | |||
11 | #define flat_argvp_envp_on_stack() 1 | 11 | #define flat_argvp_envp_on_stack() 1 |
12 | #define flat_old_ram_flag(flags) (flags) | 12 | #define flat_old_ram_flag(flags) (flags) |
13 | #define flat_reloc_valid(reloc, size) ((reloc) <= (size)) | 13 | #define flat_reloc_valid(reloc, size) ((reloc) <= (size)) |
14 | #define flat_get_addr_from_rp(rp, relval, flags) get_unaligned(rp) | 14 | #define flat_get_addr_from_rp(rp, relval, flags, persistent) get_unaligned(rp) |
15 | #define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp) | 15 | #define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp) |
16 | #define flat_get_relocate_addr(rel) (rel) | 16 | #define flat_get_relocate_addr(rel) (rel) |
17 | #define flat_set_persistent(relval, p) 0 | ||
17 | 18 | ||
18 | #endif /* __ARM_FLAT_H__ */ | 19 | #endif /* __ARM_FLAT_H__ */ |
diff --git a/include/asm-arm/plat-s3c/regs-nand.h b/include/asm-arm/plat-s3c/regs-nand.h index b824d371ae0..d742205ac17 100644 --- a/include/asm-arm/plat-s3c/regs-nand.h +++ b/include/asm-arm/plat-s3c/regs-nand.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #define S3C2440_NFESTAT1 S3C2410_NFREG(0x28) | 35 | #define S3C2440_NFESTAT1 S3C2410_NFREG(0x28) |
36 | #define S3C2440_NFMECC0 S3C2410_NFREG(0x2C) | 36 | #define S3C2440_NFMECC0 S3C2410_NFREG(0x2C) |
37 | #define S3C2440_NFMECC1 S3C2410_NFREG(0x30) | 37 | #define S3C2440_NFMECC1 S3C2410_NFREG(0x30) |
38 | #define S3C2440_NFSECC S3C24E10_NFREG(0x34) | 38 | #define S3C2440_NFSECC S3C2410_NFREG(0x34) |
39 | #define S3C2440_NFSBLK S3C2410_NFREG(0x38) | 39 | #define S3C2440_NFSBLK S3C2410_NFREG(0x38) |
40 | #define S3C2440_NFEBLK S3C2410_NFREG(0x3C) | 40 | #define S3C2440_NFEBLK S3C2410_NFREG(0x3C) |
41 | 41 | ||