diff options
Diffstat (limited to 'arch/arm')
37 files changed, 1562 insertions, 1900 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b786e68914d4..c274dbb89a83 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -22,6 +22,9 @@ config ARM | |||
22 | Europe. There is an ARM Linux project with a web page at | 22 | Europe. There is an ARM Linux project with a web page at |
23 | <http://www.arm.linux.org.uk/>. | 23 | <http://www.arm.linux.org.uk/>. |
24 | 24 | ||
25 | config HAVE_PWM | ||
26 | bool | ||
27 | |||
25 | config SYS_SUPPORTS_APM_EMULATION | 28 | config SYS_SUPPORTS_APM_EMULATION |
26 | bool | 29 | bool |
27 | 30 | ||
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index 5bba5255b119..8822b684d474 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
32 | #include <asm/arch/pm.h> | 32 | #include <asm/arch/pm.h> |
33 | #include <asm/arch/pxa-regs.h> | 33 | #include <asm/arch/pxa-regs.h> |
34 | #include <asm/arch/pxa2xx-regs.h> | ||
34 | #include <asm/arch/sharpsl.h> | 35 | #include <asm/arch/sharpsl.h> |
35 | #include <asm/hardware/sharpsl_pm.h> | 36 | #include <asm/hardware/sharpsl_pm.h> |
36 | 37 | ||
@@ -157,6 +158,7 @@ static void sharpsl_battery_thread(struct work_struct *private_) | |||
157 | dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage, | 158 | dev_dbg(sharpsl_pm.dev, "Battery: voltage: %d, status: %d, percentage: %d, time: %ld\n", voltage, |
158 | sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies); | 159 | sharpsl_pm.battstat.mainbat_status, sharpsl_pm.battstat.mainbat_percent, jiffies); |
159 | 160 | ||
161 | #ifdef CONFIG_BACKLIGHT_CORGI | ||
160 | /* If battery is low. limit backlight intensity to save power. */ | 162 | /* If battery is low. limit backlight intensity to save power. */ |
161 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) | 163 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) |
162 | && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW) || | 164 | && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW) || |
@@ -169,6 +171,7 @@ static void sharpsl_battery_thread(struct work_struct *private_) | |||
169 | sharpsl_pm.machinfo->backlight_limit(0); | 171 | sharpsl_pm.machinfo->backlight_limit(0); |
170 | sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT; | 172 | sharpsl_pm.flags &= ~SHARPSL_BL_LIMIT; |
171 | } | 173 | } |
174 | #endif | ||
172 | 175 | ||
173 | /* Suspend if critical battery level */ | 176 | /* Suspend if critical battery level */ |
174 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) | 177 | if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) |
diff --git a/arch/arm/configs/em_x270_defconfig b/arch/arm/configs/em_x270_defconfig deleted file mode 100644 index 6bea0901bdf0..000000000000 --- a/arch/arm/configs/em_x270_defconfig +++ /dev/null | |||
@@ -1,1265 +0,0 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.22 | ||
4 | # Mon Jul 9 15:18: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 is not set | ||
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 | # Code maturity level options | ||
31 | # | ||
32 | CONFIG_EXPERIMENTAL=y | ||
33 | CONFIG_BROKEN_ON_SMP=y | ||
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
35 | |||
36 | # | ||
37 | # General setup | ||
38 | # | ||
39 | CONFIG_LOCALVERSION="-em-x270" | ||
40 | # CONFIG_LOCALVERSION_AUTO is not set | ||
41 | CONFIG_SWAP=y | ||
42 | CONFIG_SYSVIPC=y | ||
43 | # CONFIG_IPC_NS is not set | ||
44 | CONFIG_SYSVIPC_SYSCTL=y | ||
45 | # CONFIG_POSIX_MQUEUE is not set | ||
46 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
47 | # CONFIG_TASKSTATS is not set | ||
48 | # CONFIG_UTS_NS is not set | ||
49 | # CONFIG_AUDIT is not set | ||
50 | CONFIG_IKCONFIG=y | ||
51 | CONFIG_IKCONFIG_PROC=y | ||
52 | CONFIG_LOG_BUF_SHIFT=17 | ||
53 | CONFIG_SYSFS_DEPRECATED=y | ||
54 | # CONFIG_RELAY is not set | ||
55 | CONFIG_BLK_DEV_INITRD=y | ||
56 | CONFIG_INITRAMFS_SOURCE="" | ||
57 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
58 | CONFIG_SYSCTL=y | ||
59 | CONFIG_EMBEDDED=y | ||
60 | CONFIG_UID16=y | ||
61 | CONFIG_SYSCTL_SYSCALL=y | ||
62 | CONFIG_KALLSYMS=y | ||
63 | # CONFIG_KALLSYMS_ALL is not set | ||
64 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
65 | CONFIG_HOTPLUG=y | ||
66 | CONFIG_PRINTK=y | ||
67 | CONFIG_BUG=y | ||
68 | CONFIG_ELF_CORE=y | ||
69 | CONFIG_BASE_FULL=y | ||
70 | CONFIG_FUTEX=y | ||
71 | CONFIG_ANON_INODES=y | ||
72 | CONFIG_EPOLL=y | ||
73 | CONFIG_SIGNALFD=y | ||
74 | CONFIG_TIMERFD=y | ||
75 | CONFIG_EVENTFD=y | ||
76 | CONFIG_SHMEM=y | ||
77 | CONFIG_VM_EVENT_COUNTERS=y | ||
78 | CONFIG_SLAB=y | ||
79 | # CONFIG_SLUB is not set | ||
80 | # CONFIG_SLOB is not set | ||
81 | CONFIG_RT_MUTEXES=y | ||
82 | # CONFIG_TINY_SHMEM is not set | ||
83 | CONFIG_BASE_SMALL=0 | ||
84 | |||
85 | # | ||
86 | # Loadable module support | ||
87 | # | ||
88 | CONFIG_MODULES=y | ||
89 | CONFIG_MODULE_UNLOAD=y | ||
90 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
91 | # CONFIG_MODVERSIONS is not set | ||
92 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
93 | CONFIG_KMOD=y | ||
94 | |||
95 | # | ||
96 | # Block layer | ||
97 | # | ||
98 | CONFIG_BLOCK=y | ||
99 | # CONFIG_LBD is not set | ||
100 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
101 | # CONFIG_LSF is not set | ||
102 | |||
103 | # | ||
104 | # IO Schedulers | ||
105 | # | ||
106 | CONFIG_IOSCHED_NOOP=y | ||
107 | CONFIG_IOSCHED_AS=y | ||
108 | CONFIG_IOSCHED_DEADLINE=y | ||
109 | CONFIG_IOSCHED_CFQ=y | ||
110 | CONFIG_DEFAULT_AS=y | ||
111 | # CONFIG_DEFAULT_DEADLINE is not set | ||
112 | # CONFIG_DEFAULT_CFQ is not set | ||
113 | # CONFIG_DEFAULT_NOOP is not set | ||
114 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
115 | |||
116 | # | ||
117 | # System Type | ||
118 | # | ||
119 | # CONFIG_ARCH_AAEC2000 is not set | ||
120 | # CONFIG_ARCH_INTEGRATOR is not set | ||
121 | # CONFIG_ARCH_REALVIEW is not set | ||
122 | # CONFIG_ARCH_VERSATILE is not set | ||
123 | # CONFIG_ARCH_AT91 is not set | ||
124 | # CONFIG_ARCH_CLPS7500 is not set | ||
125 | # CONFIG_ARCH_CLPS711X is not set | ||
126 | # CONFIG_ARCH_CO285 is not set | ||
127 | # CONFIG_ARCH_EBSA110 is not set | ||
128 | # CONFIG_ARCH_EP93XX is not set | ||
129 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
130 | # CONFIG_ARCH_NETX is not set | ||
131 | # CONFIG_ARCH_H720X is not set | ||
132 | # CONFIG_ARCH_IMX is not set | ||
133 | # CONFIG_ARCH_IOP13XX is not set | ||
134 | # CONFIG_ARCH_IOP32X is not set | ||
135 | # CONFIG_ARCH_IOP33X is not set | ||
136 | # CONFIG_ARCH_IXP23XX is not set | ||
137 | # CONFIG_ARCH_IXP2000 is not set | ||
138 | # CONFIG_ARCH_IXP4XX is not set | ||
139 | # CONFIG_ARCH_L7200 is not set | ||
140 | # CONFIG_ARCH_KS8695 is not set | ||
141 | # CONFIG_ARCH_NS9XXX is not set | ||
142 | # CONFIG_ARCH_PNX4008 is not set | ||
143 | CONFIG_ARCH_PXA=y | ||
144 | # CONFIG_ARCH_RPC is not set | ||
145 | # CONFIG_ARCH_SA1100 is not set | ||
146 | # CONFIG_ARCH_S3C2410 is not set | ||
147 | # CONFIG_ARCH_SHARK is not set | ||
148 | # CONFIG_ARCH_LH7A40X is not set | ||
149 | # CONFIG_ARCH_DAVINCI is not set | ||
150 | # CONFIG_ARCH_OMAP is not set | ||
151 | |||
152 | # | ||
153 | # Intel PXA2xx Implementations | ||
154 | # | ||
155 | # CONFIG_ARCH_LUBBOCK is not set | ||
156 | # CONFIG_MACH_LOGICPD_PXA270 is not set | ||
157 | # CONFIG_MACH_MAINSTONE is not set | ||
158 | # CONFIG_ARCH_PXA_IDP is not set | ||
159 | # CONFIG_PXA_SHARPSL is not set | ||
160 | # CONFIG_MACH_TRIZEPS4 is not set | ||
161 | CONFIG_MACH_EM_X270=y | ||
162 | CONFIG_PXA27x=y | ||
163 | |||
164 | # | ||
165 | # Processor Type | ||
166 | # | ||
167 | CONFIG_CPU_32=y | ||
168 | CONFIG_CPU_XSCALE=y | ||
169 | CONFIG_CPU_32v5=y | ||
170 | CONFIG_CPU_ABRT_EV5T=y | ||
171 | CONFIG_CPU_CACHE_VIVT=y | ||
172 | CONFIG_CPU_TLB_V4WBI=y | ||
173 | CONFIG_CPU_CP15=y | ||
174 | CONFIG_CPU_CP15_MMU=y | ||
175 | |||
176 | # | ||
177 | # Processor Features | ||
178 | # | ||
179 | CONFIG_ARM_THUMB=y | ||
180 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
181 | # CONFIG_OUTER_CACHE is not set | ||
182 | CONFIG_IWMMXT=y | ||
183 | CONFIG_XSCALE_PMU=y | ||
184 | |||
185 | # | ||
186 | # Bus support | ||
187 | # | ||
188 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
189 | |||
190 | # | ||
191 | # PCCARD (PCMCIA/CardBus) support | ||
192 | # | ||
193 | # CONFIG_PCCARD is not set | ||
194 | |||
195 | # | ||
196 | # Kernel Features | ||
197 | # | ||
198 | # CONFIG_TICK_ONESHOT is not set | ||
199 | # CONFIG_PREEMPT is not set | ||
200 | # CONFIG_NO_IDLE_HZ is not set | ||
201 | CONFIG_HZ=100 | ||
202 | CONFIG_AEABI=y | ||
203 | CONFIG_OABI_COMPAT=y | ||
204 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
205 | CONFIG_SELECT_MEMORY_MODEL=y | ||
206 | CONFIG_FLATMEM_MANUAL=y | ||
207 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
208 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
209 | CONFIG_FLATMEM=y | ||
210 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
211 | # CONFIG_SPARSEMEM_STATIC is not set | ||
212 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
213 | # CONFIG_RESOURCES_64BIT is not set | ||
214 | CONFIG_ZONE_DMA_FLAG=1 | ||
215 | CONFIG_ALIGNMENT_TRAP=y | ||
216 | |||
217 | # | ||
218 | # Boot options | ||
219 | # | ||
220 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
221 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
222 | CONFIG_CMDLINE="" | ||
223 | # CONFIG_XIP_KERNEL is not set | ||
224 | # CONFIG_KEXEC is not set | ||
225 | |||
226 | # | ||
227 | # Floating point emulation | ||
228 | # | ||
229 | |||
230 | # | ||
231 | # At least one emulation must be selected | ||
232 | # | ||
233 | CONFIG_FPE_NWFPE=y | ||
234 | # CONFIG_FPE_NWFPE_XP is not set | ||
235 | # CONFIG_FPE_FASTFPE is not set | ||
236 | |||
237 | # | ||
238 | # Userspace binary formats | ||
239 | # | ||
240 | CONFIG_BINFMT_ELF=y | ||
241 | # CONFIG_BINFMT_AOUT is not set | ||
242 | # CONFIG_BINFMT_MISC is not set | ||
243 | |||
244 | # | ||
245 | # Power management options | ||
246 | # | ||
247 | CONFIG_PM=y | ||
248 | CONFIG_PM_LEGACY=y | ||
249 | # CONFIG_PM_DEBUG is not set | ||
250 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
251 | CONFIG_APM_EMULATION=m | ||
252 | |||
253 | # | ||
254 | # Networking | ||
255 | # | ||
256 | CONFIG_NET=y | ||
257 | |||
258 | # | ||
259 | # Networking options | ||
260 | # | ||
261 | CONFIG_PACKET=y | ||
262 | # CONFIG_PACKET_MMAP is not set | ||
263 | CONFIG_UNIX=y | ||
264 | CONFIG_XFRM=y | ||
265 | # CONFIG_XFRM_USER is not set | ||
266 | # CONFIG_XFRM_SUB_POLICY is not set | ||
267 | # CONFIG_XFRM_MIGRATE is not set | ||
268 | # CONFIG_NET_KEY is not set | ||
269 | CONFIG_INET=y | ||
270 | # CONFIG_IP_MULTICAST is not set | ||
271 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
272 | CONFIG_IP_FIB_HASH=y | ||
273 | CONFIG_IP_PNP=y | ||
274 | CONFIG_IP_PNP_DHCP=y | ||
275 | CONFIG_IP_PNP_BOOTP=y | ||
276 | # CONFIG_IP_PNP_RARP is not set | ||
277 | # CONFIG_NET_IPIP is not set | ||
278 | # CONFIG_NET_IPGRE is not set | ||
279 | # CONFIG_ARPD is not set | ||
280 | # CONFIG_SYN_COOKIES is not set | ||
281 | # CONFIG_INET_AH is not set | ||
282 | # CONFIG_INET_ESP is not set | ||
283 | # CONFIG_INET_IPCOMP is not set | ||
284 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
285 | # CONFIG_INET_TUNNEL is not set | ||
286 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
287 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
288 | CONFIG_INET_XFRM_MODE_BEET=y | ||
289 | CONFIG_INET_DIAG=y | ||
290 | CONFIG_INET_TCP_DIAG=y | ||
291 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
292 | CONFIG_TCP_CONG_CUBIC=y | ||
293 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
294 | # CONFIG_TCP_MD5SIG is not set | ||
295 | # CONFIG_IPV6 is not set | ||
296 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
297 | # CONFIG_INET6_TUNNEL is not set | ||
298 | # CONFIG_NETWORK_SECMARK is not set | ||
299 | # CONFIG_NETFILTER is not set | ||
300 | # CONFIG_IP_DCCP is not set | ||
301 | # CONFIG_IP_SCTP is not set | ||
302 | # CONFIG_TIPC is not set | ||
303 | # CONFIG_ATM is not set | ||
304 | # CONFIG_BRIDGE is not set | ||
305 | # CONFIG_VLAN_8021Q is not set | ||
306 | # CONFIG_DECNET is not set | ||
307 | # CONFIG_LLC2 is not set | ||
308 | # CONFIG_IPX is not set | ||
309 | # CONFIG_ATALK is not set | ||
310 | # CONFIG_X25 is not set | ||
311 | # CONFIG_LAPB is not set | ||
312 | # CONFIG_ECONET is not set | ||
313 | # CONFIG_WAN_ROUTER is not set | ||
314 | |||
315 | # | ||
316 | # QoS and/or fair queueing | ||
317 | # | ||
318 | # CONFIG_NET_SCHED is not set | ||
319 | |||
320 | # | ||
321 | # Network testing | ||
322 | # | ||
323 | # CONFIG_NET_PKTGEN is not set | ||
324 | # CONFIG_HAMRADIO is not set | ||
325 | # CONFIG_IRDA is not set | ||
326 | CONFIG_BT=m | ||
327 | CONFIG_BT_L2CAP=m | ||
328 | CONFIG_BT_SCO=m | ||
329 | CONFIG_BT_RFCOMM=m | ||
330 | # CONFIG_BT_RFCOMM_TTY is not set | ||
331 | CONFIG_BT_BNEP=m | ||
332 | # CONFIG_BT_BNEP_MC_FILTER is not set | ||
333 | # CONFIG_BT_BNEP_PROTO_FILTER is not set | ||
334 | CONFIG_BT_HIDP=m | ||
335 | |||
336 | # | ||
337 | # Bluetooth device drivers | ||
338 | # | ||
339 | CONFIG_BT_HCIUSB=m | ||
340 | # CONFIG_BT_HCIUSB_SCO is not set | ||
341 | CONFIG_BT_HCIUART=m | ||
342 | # CONFIG_BT_HCIUART_H4 is not set | ||
343 | # CONFIG_BT_HCIUART_BCSP is not set | ||
344 | CONFIG_BT_HCIBCM203X=m | ||
345 | CONFIG_BT_HCIBPA10X=m | ||
346 | CONFIG_BT_HCIBFUSB=m | ||
347 | # CONFIG_BT_HCIVHCI is not set | ||
348 | # CONFIG_AF_RXRPC is not set | ||
349 | |||
350 | # | ||
351 | # Wireless | ||
352 | # | ||
353 | # CONFIG_CFG80211 is not set | ||
354 | # CONFIG_WIRELESS_EXT is not set | ||
355 | # CONFIG_MAC80211 is not set | ||
356 | CONFIG_IEEE80211=m | ||
357 | # CONFIG_IEEE80211_DEBUG is not set | ||
358 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
359 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
360 | # CONFIG_IEEE80211_CRYPT_TKIP is not set | ||
361 | # CONFIG_IEEE80211_SOFTMAC is not set | ||
362 | # CONFIG_RFKILL is not set | ||
363 | |||
364 | # | ||
365 | # Device Drivers | ||
366 | # | ||
367 | |||
368 | # | ||
369 | # Generic Driver Options | ||
370 | # | ||
371 | CONFIG_STANDALONE=y | ||
372 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
373 | CONFIG_FW_LOADER=y | ||
374 | # CONFIG_DEBUG_DRIVER is not set | ||
375 | # CONFIG_DEBUG_DEVRES is not set | ||
376 | # CONFIG_SYS_HYPERVISOR is not set | ||
377 | |||
378 | # | ||
379 | # Connector - unified userspace <-> kernelspace linker | ||
380 | # | ||
381 | # CONFIG_CONNECTOR is not set | ||
382 | CONFIG_MTD=y | ||
383 | # CONFIG_MTD_DEBUG is not set | ||
384 | CONFIG_MTD_CONCAT=y | ||
385 | CONFIG_MTD_PARTITIONS=y | ||
386 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
387 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
388 | # CONFIG_MTD_AFS_PARTS is not set | ||
389 | |||
390 | # | ||
391 | # User Modules And Translation Layers | ||
392 | # | ||
393 | CONFIG_MTD_CHAR=y | ||
394 | CONFIG_MTD_BLKDEVS=y | ||
395 | CONFIG_MTD_BLOCK=y | ||
396 | # CONFIG_FTL is not set | ||
397 | # CONFIG_NFTL is not set | ||
398 | # CONFIG_INFTL is not set | ||
399 | # CONFIG_RFD_FTL is not set | ||
400 | # CONFIG_SSFDC is not set | ||
401 | |||
402 | # | ||
403 | # RAM/ROM/Flash chip drivers | ||
404 | # | ||
405 | # CONFIG_MTD_CFI is not set | ||
406 | # CONFIG_MTD_JEDECPROBE is not set | ||
407 | # CONFIG_MTD_CFI_NOSWAP is not set | ||
408 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
409 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
410 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
411 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
412 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
413 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
414 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
415 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
416 | CONFIG_MTD_CFI_I1=y | ||
417 | CONFIG_MTD_CFI_I2=y | ||
418 | # CONFIG_MTD_CFI_I4 is not set | ||
419 | # CONFIG_MTD_CFI_I8 is not set | ||
420 | # CONFIG_MTD_RAM is not set | ||
421 | # CONFIG_MTD_ROM is not set | ||
422 | # CONFIG_MTD_ABSENT is not set | ||
423 | |||
424 | # | ||
425 | # Mapping drivers for chip access | ||
426 | # | ||
427 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
428 | # CONFIG_MTD_SHARP_SL is not set | ||
429 | # CONFIG_MTD_PLATRAM is not set | ||
430 | |||
431 | # | ||
432 | # Self-contained MTD device drivers | ||
433 | # | ||
434 | # CONFIG_MTD_SLRAM is not set | ||
435 | # CONFIG_MTD_PHRAM is not set | ||
436 | # CONFIG_MTD_MTDRAM is not set | ||
437 | # CONFIG_MTD_BLOCK2MTD is not set | ||
438 | |||
439 | # | ||
440 | # Disk-On-Chip Device Drivers | ||
441 | # | ||
442 | # CONFIG_MTD_DOC2000 is not set | ||
443 | # CONFIG_MTD_DOC2001 is not set | ||
444 | # CONFIG_MTD_DOC2001PLUS is not set | ||
445 | CONFIG_MTD_NAND=y | ||
446 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
447 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
448 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
449 | # CONFIG_MTD_NAND_H1900 is not set | ||
450 | CONFIG_MTD_NAND_IDS=y | ||
451 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
452 | # CONFIG_MTD_NAND_SHARPSL is not set | ||
453 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
454 | CONFIG_MTD_NAND_PLATFORM=y | ||
455 | # CONFIG_MTD_ONENAND is not set | ||
456 | |||
457 | # | ||
458 | # UBI - Unsorted block images | ||
459 | # | ||
460 | # CONFIG_MTD_UBI is not set | ||
461 | |||
462 | # | ||
463 | # Parallel port support | ||
464 | # | ||
465 | # CONFIG_PARPORT is not set | ||
466 | |||
467 | # | ||
468 | # Plug and Play support | ||
469 | # | ||
470 | # CONFIG_PNPACPI is not set | ||
471 | |||
472 | # | ||
473 | # Block devices | ||
474 | # | ||
475 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
476 | CONFIG_BLK_DEV_LOOP=y | ||
477 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
478 | # CONFIG_BLK_DEV_NBD is not set | ||
479 | # CONFIG_BLK_DEV_UB is not set | ||
480 | CONFIG_BLK_DEV_RAM=y | ||
481 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
482 | CONFIG_BLK_DEV_RAM_SIZE=12000 | ||
483 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
484 | # CONFIG_CDROM_PKTCDVD is not set | ||
485 | # CONFIG_ATA_OVER_ETH is not set | ||
486 | # CONFIG_IDE is not set | ||
487 | |||
488 | # | ||
489 | # SCSI device support | ||
490 | # | ||
491 | # CONFIG_RAID_ATTRS is not set | ||
492 | CONFIG_SCSI=y | ||
493 | # CONFIG_SCSI_TGT is not set | ||
494 | # CONFIG_SCSI_NETLINK is not set | ||
495 | # CONFIG_SCSI_PROC_FS is not set | ||
496 | |||
497 | # | ||
498 | # SCSI support type (disk, tape, CD-ROM) | ||
499 | # | ||
500 | CONFIG_BLK_DEV_SD=y | ||
501 | # CONFIG_CHR_DEV_ST is not set | ||
502 | # CONFIG_CHR_DEV_OSST is not set | ||
503 | # CONFIG_BLK_DEV_SR is not set | ||
504 | # CONFIG_CHR_DEV_SG is not set | ||
505 | # CONFIG_CHR_DEV_SCH is not set | ||
506 | |||
507 | # | ||
508 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
509 | # | ||
510 | # CONFIG_SCSI_MULTI_LUN is not set | ||
511 | # CONFIG_SCSI_CONSTANTS is not set | ||
512 | # CONFIG_SCSI_LOGGING is not set | ||
513 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
514 | CONFIG_SCSI_WAIT_SCAN=m | ||
515 | |||
516 | # | ||
517 | # SCSI Transports | ||
518 | # | ||
519 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
520 | # CONFIG_SCSI_FC_ATTRS is not set | ||
521 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
522 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
523 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
524 | |||
525 | # | ||
526 | # SCSI low-level drivers | ||
527 | # | ||
528 | # CONFIG_ISCSI_TCP is not set | ||
529 | # CONFIG_SCSI_DEBUG is not set | ||
530 | # CONFIG_ATA is not set | ||
531 | |||
532 | # | ||
533 | # Multi-device support (RAID and LVM) | ||
534 | # | ||
535 | # CONFIG_MD is not set | ||
536 | |||
537 | # | ||
538 | # Network device support | ||
539 | # | ||
540 | CONFIG_NETDEVICES=y | ||
541 | # CONFIG_DUMMY is not set | ||
542 | # CONFIG_BONDING is not set | ||
543 | # CONFIG_EQUALIZER is not set | ||
544 | # CONFIG_TUN is not set | ||
545 | # CONFIG_PHYLIB is not set | ||
546 | |||
547 | # | ||
548 | # Ethernet (10 or 100Mbit) | ||
549 | # | ||
550 | CONFIG_NET_ETHERNET=y | ||
551 | CONFIG_MII=y | ||
552 | # CONFIG_SMC91X is not set | ||
553 | CONFIG_DM9000=y | ||
554 | # CONFIG_SMC911X is not set | ||
555 | # CONFIG_NETDEV_1000 is not set | ||
556 | # CONFIG_NETDEV_10000 is not set | ||
557 | |||
558 | # | ||
559 | # Wireless LAN | ||
560 | # | ||
561 | # CONFIG_WLAN_PRE80211 is not set | ||
562 | # CONFIG_WLAN_80211 is not set | ||
563 | |||
564 | # | ||
565 | # USB Network Adapters | ||
566 | # | ||
567 | # CONFIG_USB_CATC is not set | ||
568 | # CONFIG_USB_KAWETH is not set | ||
569 | # CONFIG_USB_PEGASUS is not set | ||
570 | # CONFIG_USB_RTL8150 is not set | ||
571 | # CONFIG_USB_USBNET_MII is not set | ||
572 | # CONFIG_USB_USBNET is not set | ||
573 | # CONFIG_WAN is not set | ||
574 | # CONFIG_PPP is not set | ||
575 | # CONFIG_SLIP is not set | ||
576 | # CONFIG_SHAPER is not set | ||
577 | # CONFIG_NETCONSOLE is not set | ||
578 | # CONFIG_NETPOLL is not set | ||
579 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
580 | |||
581 | # | ||
582 | # ISDN subsystem | ||
583 | # | ||
584 | # CONFIG_ISDN is not set | ||
585 | |||
586 | # | ||
587 | # Input device support | ||
588 | # | ||
589 | CONFIG_INPUT=y | ||
590 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
591 | # CONFIG_INPUT_POLLDEV is not set | ||
592 | |||
593 | # | ||
594 | # Userland interfaces | ||
595 | # | ||
596 | CONFIG_INPUT_MOUSEDEV=y | ||
597 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
598 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
599 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
600 | # CONFIG_INPUT_JOYDEV is not set | ||
601 | # CONFIG_INPUT_TSDEV is not set | ||
602 | CONFIG_INPUT_EVDEV=y | ||
603 | # CONFIG_INPUT_EVBUG is not set | ||
604 | |||
605 | # | ||
606 | # Input Device Drivers | ||
607 | # | ||
608 | CONFIG_INPUT_KEYBOARD=y | ||
609 | # CONFIG_KEYBOARD_ATKBD is not set | ||
610 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
611 | # CONFIG_KEYBOARD_LKKBD is not set | ||
612 | # CONFIG_KEYBOARD_XTKBD is not set | ||
613 | # CONFIG_KEYBOARD_NEWTON is not set | ||
614 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
615 | CONFIG_KEYBOARD_PXA27x=m | ||
616 | # CONFIG_KEYBOARD_GPIO is not set | ||
617 | # CONFIG_INPUT_MOUSE is not set | ||
618 | # CONFIG_INPUT_JOYSTICK is not set | ||
619 | # CONFIG_INPUT_TABLET is not set | ||
620 | CONFIG_INPUT_TOUCHSCREEN=y | ||
621 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
622 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
623 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
624 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
625 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
626 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
627 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
628 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
629 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
630 | # CONFIG_INPUT_MISC is not set | ||
631 | |||
632 | # | ||
633 | # Hardware I/O ports | ||
634 | # | ||
635 | CONFIG_SERIO=y | ||
636 | # CONFIG_SERIO_SERPORT is not set | ||
637 | CONFIG_SERIO_LIBPS2=y | ||
638 | # CONFIG_SERIO_RAW is not set | ||
639 | # CONFIG_GAMEPORT is not set | ||
640 | |||
641 | # | ||
642 | # Character devices | ||
643 | # | ||
644 | CONFIG_VT=y | ||
645 | CONFIG_VT_CONSOLE=y | ||
646 | CONFIG_HW_CONSOLE=y | ||
647 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
648 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
649 | |||
650 | # | ||
651 | # Serial drivers | ||
652 | # | ||
653 | # CONFIG_SERIAL_8250 is not set | ||
654 | |||
655 | # | ||
656 | # Non-8250 serial port support | ||
657 | # | ||
658 | CONFIG_SERIAL_PXA=y | ||
659 | CONFIG_SERIAL_PXA_CONSOLE=y | ||
660 | CONFIG_SERIAL_CORE=y | ||
661 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
662 | CONFIG_UNIX98_PTYS=y | ||
663 | CONFIG_LEGACY_PTYS=y | ||
664 | CONFIG_LEGACY_PTY_COUNT=256 | ||
665 | |||
666 | # | ||
667 | # IPMI | ||
668 | # | ||
669 | # CONFIG_IPMI_HANDLER is not set | ||
670 | # CONFIG_WATCHDOG is not set | ||
671 | CONFIG_HW_RANDOM=m | ||
672 | # CONFIG_NVRAM is not set | ||
673 | # CONFIG_R3964 is not set | ||
674 | # CONFIG_RAW_DRIVER is not set | ||
675 | |||
676 | # | ||
677 | # TPM devices | ||
678 | # | ||
679 | # CONFIG_TCG_TPM is not set | ||
680 | # CONFIG_I2C is not set | ||
681 | |||
682 | # | ||
683 | # SPI support | ||
684 | # | ||
685 | # CONFIG_SPI is not set | ||
686 | # CONFIG_SPI_MASTER is not set | ||
687 | |||
688 | # | ||
689 | # Dallas's 1-wire bus | ||
690 | # | ||
691 | # CONFIG_W1 is not set | ||
692 | # CONFIG_HWMON is not set | ||
693 | |||
694 | # | ||
695 | # Misc devices | ||
696 | # | ||
697 | |||
698 | # | ||
699 | # Multifunction device drivers | ||
700 | # | ||
701 | # CONFIG_MFD_SM501 is not set | ||
702 | |||
703 | # | ||
704 | # LED devices | ||
705 | # | ||
706 | # CONFIG_NEW_LEDS is not set | ||
707 | |||
708 | # | ||
709 | # LED drivers | ||
710 | # | ||
711 | |||
712 | # | ||
713 | # LED Triggers | ||
714 | # | ||
715 | |||
716 | # | ||
717 | # Multimedia devices | ||
718 | # | ||
719 | # CONFIG_VIDEO_DEV is not set | ||
720 | # CONFIG_DVB_CORE is not set | ||
721 | # CONFIG_DAB is not set | ||
722 | |||
723 | # | ||
724 | # Graphics support | ||
725 | # | ||
726 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
727 | |||
728 | # | ||
729 | # Display device support | ||
730 | # | ||
731 | # CONFIG_DISPLAY_SUPPORT is not set | ||
732 | # CONFIG_VGASTATE is not set | ||
733 | CONFIG_FB=y | ||
734 | # CONFIG_FIRMWARE_EDID is not set | ||
735 | # CONFIG_FB_DDC is not set | ||
736 | CONFIG_FB_CFB_FILLRECT=y | ||
737 | CONFIG_FB_CFB_COPYAREA=y | ||
738 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
739 | # CONFIG_FB_SYS_FILLRECT is not set | ||
740 | # CONFIG_FB_SYS_COPYAREA is not set | ||
741 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
742 | # CONFIG_FB_SYS_FOPS is not set | ||
743 | CONFIG_FB_DEFERRED_IO=y | ||
744 | # CONFIG_FB_SVGALIB is not set | ||
745 | # CONFIG_FB_MACMODES is not set | ||
746 | # CONFIG_FB_BACKLIGHT is not set | ||
747 | # CONFIG_FB_MODE_HELPERS is not set | ||
748 | # CONFIG_FB_TILEBLITTING is not set | ||
749 | |||
750 | # | ||
751 | # Frame buffer hardware drivers | ||
752 | # | ||
753 | # CONFIG_FB_S1D13XXX is not set | ||
754 | CONFIG_FB_PXA=y | ||
755 | # CONFIG_FB_PXA_PARAMETERS is not set | ||
756 | # CONFIG_FB_MBX is not set | ||
757 | # CONFIG_FB_VIRTUAL is not set | ||
758 | |||
759 | # | ||
760 | # Console display driver support | ||
761 | # | ||
762 | # CONFIG_VGA_CONSOLE is not set | ||
763 | CONFIG_DUMMY_CONSOLE=y | ||
764 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
765 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
766 | # CONFIG_FONTS is not set | ||
767 | CONFIG_FONT_8x8=y | ||
768 | CONFIG_FONT_8x16=y | ||
769 | CONFIG_LOGO=y | ||
770 | CONFIG_LOGO_LINUX_MONO=y | ||
771 | CONFIG_LOGO_LINUX_VGA16=y | ||
772 | CONFIG_LOGO_LINUX_CLUT224=y | ||
773 | |||
774 | # | ||
775 | # Sound | ||
776 | # | ||
777 | CONFIG_SOUND=m | ||
778 | |||
779 | # | ||
780 | # Advanced Linux Sound Architecture | ||
781 | # | ||
782 | CONFIG_SND=m | ||
783 | CONFIG_SND_TIMER=m | ||
784 | CONFIG_SND_PCM=m | ||
785 | # CONFIG_SND_SEQUENCER is not set | ||
786 | CONFIG_SND_OSSEMUL=y | ||
787 | CONFIG_SND_MIXER_OSS=m | ||
788 | CONFIG_SND_PCM_OSS=m | ||
789 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
790 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
791 | CONFIG_SND_SUPPORT_OLD_API=y | ||
792 | CONFIG_SND_VERBOSE_PROCFS=y | ||
793 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
794 | # CONFIG_SND_DEBUG is not set | ||
795 | |||
796 | # | ||
797 | # Generic devices | ||
798 | # | ||
799 | CONFIG_SND_AC97_CODEC=m | ||
800 | # CONFIG_SND_DUMMY is not set | ||
801 | # CONFIG_SND_MTPAV is not set | ||
802 | # CONFIG_SND_SERIAL_U16550 is not set | ||
803 | # CONFIG_SND_MPU401 is not set | ||
804 | |||
805 | # | ||
806 | # ALSA ARM devices | ||
807 | # | ||
808 | CONFIG_SND_PXA2XX_PCM=m | ||
809 | CONFIG_SND_PXA2XX_AC97=m | ||
810 | |||
811 | # | ||
812 | # USB devices | ||
813 | # | ||
814 | # CONFIG_SND_USB_AUDIO is not set | ||
815 | # CONFIG_SND_USB_CAIAQ is not set | ||
816 | |||
817 | # | ||
818 | # System on Chip audio support | ||
819 | # | ||
820 | # CONFIG_SND_SOC is not set | ||
821 | |||
822 | # | ||
823 | # Open Sound System | ||
824 | # | ||
825 | # CONFIG_SOUND_PRIME is not set | ||
826 | CONFIG_AC97_BUS=m | ||
827 | |||
828 | # | ||
829 | # HID Devices | ||
830 | # | ||
831 | CONFIG_HID=y | ||
832 | # CONFIG_HID_DEBUG is not set | ||
833 | |||
834 | # | ||
835 | # USB Input Devices | ||
836 | # | ||
837 | CONFIG_USB_HID=y | ||
838 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
839 | # CONFIG_HID_FF is not set | ||
840 | # CONFIG_USB_HIDDEV is not set | ||
841 | |||
842 | # | ||
843 | # USB support | ||
844 | # | ||
845 | CONFIG_USB_ARCH_HAS_HCD=y | ||
846 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
847 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
848 | CONFIG_USB=y | ||
849 | # CONFIG_USB_DEBUG is not set | ||
850 | |||
851 | # | ||
852 | # Miscellaneous USB options | ||
853 | # | ||
854 | CONFIG_USB_DEVICEFS=y | ||
855 | # CONFIG_USB_DEVICE_CLASS is not set | ||
856 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
857 | # CONFIG_USB_SUSPEND is not set | ||
858 | # CONFIG_USB_OTG is not set | ||
859 | |||
860 | # | ||
861 | # USB Host Controller Drivers | ||
862 | # | ||
863 | # CONFIG_USB_ISP116X_HCD is not set | ||
864 | CONFIG_USB_OHCI_HCD=y | ||
865 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
866 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
867 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
868 | # CONFIG_USB_SL811_HCD is not set | ||
869 | |||
870 | # | ||
871 | # USB Device Class drivers | ||
872 | # | ||
873 | # CONFIG_USB_ACM is not set | ||
874 | # CONFIG_USB_PRINTER is not set | ||
875 | |||
876 | # | ||
877 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
878 | # | ||
879 | |||
880 | # | ||
881 | # may also be needed; see USB_STORAGE Help for more information | ||
882 | # | ||
883 | CONFIG_USB_STORAGE=y | ||
884 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
885 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
886 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
887 | # CONFIG_USB_STORAGE_DPCM is not set | ||
888 | # CONFIG_USB_STORAGE_USBAT is not set | ||
889 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
890 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
891 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
892 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
893 | # CONFIG_USB_STORAGE_KARMA is not set | ||
894 | # CONFIG_USB_LIBUSUAL is not set | ||
895 | |||
896 | # | ||
897 | # USB Imaging devices | ||
898 | # | ||
899 | # CONFIG_USB_MDC800 is not set | ||
900 | # CONFIG_USB_MICROTEK is not set | ||
901 | # CONFIG_USB_MON is not set | ||
902 | |||
903 | # | ||
904 | # USB port drivers | ||
905 | # | ||
906 | |||
907 | # | ||
908 | # USB Serial Converter support | ||
909 | # | ||
910 | # CONFIG_USB_SERIAL is not set | ||
911 | |||
912 | # | ||
913 | # USB Miscellaneous drivers | ||
914 | # | ||
915 | # CONFIG_USB_EMI62 is not set | ||
916 | # CONFIG_USB_EMI26 is not set | ||
917 | # CONFIG_USB_ADUTUX is not set | ||
918 | # CONFIG_USB_AUERSWALD is not set | ||
919 | # CONFIG_USB_RIO500 is not set | ||
920 | # CONFIG_USB_LEGOTOWER is not set | ||
921 | # CONFIG_USB_LCD is not set | ||
922 | # CONFIG_USB_BERRY_CHARGE is not set | ||
923 | # CONFIG_USB_LED is not set | ||
924 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
925 | # CONFIG_USB_CYTHERM is not set | ||
926 | # CONFIG_USB_PHIDGET is not set | ||
927 | # CONFIG_USB_IDMOUSE is not set | ||
928 | # CONFIG_USB_FTDI_ELAN is not set | ||
929 | # CONFIG_USB_APPLEDISPLAY is not set | ||
930 | # CONFIG_USB_LD is not set | ||
931 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
932 | # CONFIG_USB_IOWARRIOR is not set | ||
933 | # CONFIG_USB_TEST is not set | ||
934 | |||
935 | # | ||
936 | # USB DSL modem support | ||
937 | # | ||
938 | |||
939 | # | ||
940 | # USB Gadget Support | ||
941 | # | ||
942 | # CONFIG_USB_GADGET is not set | ||
943 | CONFIG_MMC=m | ||
944 | # CONFIG_MMC_DEBUG is not set | ||
945 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
946 | |||
947 | # | ||
948 | # MMC/SD Card Drivers | ||
949 | # | ||
950 | CONFIG_MMC_BLOCK=m | ||
951 | |||
952 | # | ||
953 | # MMC/SD Host Controller Drivers | ||
954 | # | ||
955 | CONFIG_MMC_PXA=m | ||
956 | |||
957 | # | ||
958 | # Real Time Clock | ||
959 | # | ||
960 | CONFIG_RTC_LIB=y | ||
961 | CONFIG_RTC_CLASS=m | ||
962 | |||
963 | # | ||
964 | # RTC interfaces | ||
965 | # | ||
966 | CONFIG_RTC_INTF_SYSFS=y | ||
967 | CONFIG_RTC_INTF_PROC=y | ||
968 | CONFIG_RTC_INTF_DEV=y | ||
969 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
970 | # CONFIG_RTC_DRV_TEST is not set | ||
971 | |||
972 | # | ||
973 | # I2C RTC drivers | ||
974 | # | ||
975 | |||
976 | # | ||
977 | # SPI RTC drivers | ||
978 | # | ||
979 | |||
980 | # | ||
981 | # Platform RTC drivers | ||
982 | # | ||
983 | # CONFIG_RTC_DRV_CMOS is not set | ||
984 | # CONFIG_RTC_DRV_DS1553 is not set | ||
985 | # CONFIG_RTC_DRV_DS1742 is not set | ||
986 | # CONFIG_RTC_DRV_M48T86 is not set | ||
987 | CONFIG_RTC_DRV_V3020=m | ||
988 | |||
989 | # | ||
990 | # on-CPU RTC drivers | ||
991 | # | ||
992 | CONFIG_RTC_DRV_SA1100=m | ||
993 | |||
994 | # | ||
995 | # File systems | ||
996 | # | ||
997 | CONFIG_EXT2_FS=y | ||
998 | # CONFIG_EXT2_FS_XATTR is not set | ||
999 | # CONFIG_EXT2_FS_XIP is not set | ||
1000 | CONFIG_EXT3_FS=y | ||
1001 | CONFIG_EXT3_FS_XATTR=y | ||
1002 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
1003 | # CONFIG_EXT3_FS_SECURITY is not set | ||
1004 | # CONFIG_EXT4DEV_FS is not set | ||
1005 | CONFIG_JBD=y | ||
1006 | # CONFIG_JBD_DEBUG is not set | ||
1007 | CONFIG_FS_MBCACHE=y | ||
1008 | # CONFIG_REISERFS_FS is not set | ||
1009 | # CONFIG_JFS_FS is not set | ||
1010 | # CONFIG_FS_POSIX_ACL is not set | ||
1011 | # CONFIG_XFS_FS is not set | ||
1012 | # CONFIG_GFS2_FS is not set | ||
1013 | # CONFIG_OCFS2_FS is not set | ||
1014 | # CONFIG_MINIX_FS is not set | ||
1015 | # CONFIG_ROMFS_FS is not set | ||
1016 | CONFIG_INOTIFY=y | ||
1017 | CONFIG_INOTIFY_USER=y | ||
1018 | # CONFIG_QUOTA is not set | ||
1019 | CONFIG_DNOTIFY=y | ||
1020 | # CONFIG_AUTOFS_FS is not set | ||
1021 | # CONFIG_AUTOFS4_FS is not set | ||
1022 | # CONFIG_FUSE_FS is not set | ||
1023 | |||
1024 | # | ||
1025 | # CD-ROM/DVD Filesystems | ||
1026 | # | ||
1027 | # CONFIG_ISO9660_FS is not set | ||
1028 | # CONFIG_UDF_FS is not set | ||
1029 | |||
1030 | # | ||
1031 | # DOS/FAT/NT Filesystems | ||
1032 | # | ||
1033 | CONFIG_FAT_FS=y | ||
1034 | CONFIG_MSDOS_FS=y | ||
1035 | CONFIG_VFAT_FS=y | ||
1036 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
1037 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
1038 | # CONFIG_NTFS_FS is not set | ||
1039 | |||
1040 | # | ||
1041 | # Pseudo filesystems | ||
1042 | # | ||
1043 | CONFIG_PROC_FS=y | ||
1044 | CONFIG_PROC_SYSCTL=y | ||
1045 | CONFIG_SYSFS=y | ||
1046 | CONFIG_TMPFS=y | ||
1047 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
1048 | # CONFIG_HUGETLB_PAGE is not set | ||
1049 | CONFIG_RAMFS=y | ||
1050 | # CONFIG_CONFIGFS_FS is not set | ||
1051 | |||
1052 | # | ||
1053 | # Miscellaneous filesystems | ||
1054 | # | ||
1055 | # CONFIG_ADFS_FS is not set | ||
1056 | # CONFIG_AFFS_FS is not set | ||
1057 | # CONFIG_HFS_FS is not set | ||
1058 | # CONFIG_HFSPLUS_FS is not set | ||
1059 | # CONFIG_BEFS_FS is not set | ||
1060 | # CONFIG_BFS_FS is not set | ||
1061 | # CONFIG_EFS_FS is not set | ||
1062 | CONFIG_JFFS2_FS=y | ||
1063 | CONFIG_JFFS2_FS_DEBUG=0 | ||
1064 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
1065 | CONFIG_JFFS2_SUMMARY=y | ||
1066 | # CONFIG_JFFS2_FS_XATTR is not set | ||
1067 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
1068 | CONFIG_JFFS2_ZLIB=y | ||
1069 | CONFIG_JFFS2_RTIME=y | ||
1070 | # CONFIG_JFFS2_RUBIN is not set | ||
1071 | # CONFIG_CRAMFS is not set | ||
1072 | # CONFIG_VXFS_FS is not set | ||
1073 | # CONFIG_HPFS_FS is not set | ||
1074 | # CONFIG_QNX4FS_FS is not set | ||
1075 | # CONFIG_SYSV_FS is not set | ||
1076 | # CONFIG_UFS_FS is not set | ||
1077 | |||
1078 | # | ||
1079 | # Network File Systems | ||
1080 | # | ||
1081 | CONFIG_NFS_FS=y | ||
1082 | CONFIG_NFS_V3=y | ||
1083 | # CONFIG_NFS_V3_ACL is not set | ||
1084 | # CONFIG_NFS_V4 is not set | ||
1085 | # CONFIG_NFS_DIRECTIO is not set | ||
1086 | # CONFIG_NFSD is not set | ||
1087 | CONFIG_ROOT_NFS=y | ||
1088 | CONFIG_LOCKD=y | ||
1089 | CONFIG_LOCKD_V4=y | ||
1090 | CONFIG_NFS_COMMON=y | ||
1091 | CONFIG_SUNRPC=y | ||
1092 | # CONFIG_SUNRPC_BIND34 is not set | ||
1093 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1094 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1095 | CONFIG_SMB_FS=y | ||
1096 | # CONFIG_SMB_NLS_DEFAULT is not set | ||
1097 | # CONFIG_CIFS is not set | ||
1098 | # CONFIG_NCP_FS is not set | ||
1099 | # CONFIG_CODA_FS is not set | ||
1100 | # CONFIG_AFS_FS is not set | ||
1101 | # CONFIG_9P_FS is not set | ||
1102 | |||
1103 | # | ||
1104 | # Partition Types | ||
1105 | # | ||
1106 | # CONFIG_PARTITION_ADVANCED is not set | ||
1107 | CONFIG_MSDOS_PARTITION=y | ||
1108 | |||
1109 | # | ||
1110 | # Native Language Support | ||
1111 | # | ||
1112 | CONFIG_NLS=y | ||
1113 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1114 | CONFIG_NLS_CODEPAGE_437=y | ||
1115 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1116 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1117 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1118 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1119 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1120 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1121 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1122 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1123 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1124 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1125 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1126 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1127 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1128 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1129 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1130 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1131 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1132 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1133 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1134 | # CONFIG_NLS_ISO8859_8 is not set | ||
1135 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1136 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1137 | # CONFIG_NLS_ASCII is not set | ||
1138 | CONFIG_NLS_ISO8859_1=y | ||
1139 | # CONFIG_NLS_ISO8859_2 is not set | ||
1140 | # CONFIG_NLS_ISO8859_3 is not set | ||
1141 | # CONFIG_NLS_ISO8859_4 is not set | ||
1142 | # CONFIG_NLS_ISO8859_5 is not set | ||
1143 | # CONFIG_NLS_ISO8859_6 is not set | ||
1144 | # CONFIG_NLS_ISO8859_7 is not set | ||
1145 | # CONFIG_NLS_ISO8859_9 is not set | ||
1146 | # CONFIG_NLS_ISO8859_13 is not set | ||
1147 | # CONFIG_NLS_ISO8859_14 is not set | ||
1148 | # CONFIG_NLS_ISO8859_15 is not set | ||
1149 | # CONFIG_NLS_KOI8_R is not set | ||
1150 | # CONFIG_NLS_KOI8_U is not set | ||
1151 | CONFIG_NLS_UTF8=y | ||
1152 | |||
1153 | # | ||
1154 | # Distributed Lock Manager | ||
1155 | # | ||
1156 | # CONFIG_DLM is not set | ||
1157 | |||
1158 | # | ||
1159 | # Profiling support | ||
1160 | # | ||
1161 | # CONFIG_PROFILING is not set | ||
1162 | |||
1163 | # | ||
1164 | # Kernel hacking | ||
1165 | # | ||
1166 | # CONFIG_PRINTK_TIME is not set | ||
1167 | CONFIG_ENABLE_MUST_CHECK=y | ||
1168 | CONFIG_MAGIC_SYSRQ=y | ||
1169 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1170 | # CONFIG_DEBUG_FS is not set | ||
1171 | # CONFIG_HEADERS_CHECK is not set | ||
1172 | CONFIG_DEBUG_KERNEL=y | ||
1173 | # CONFIG_DEBUG_SHIRQ is not set | ||
1174 | # CONFIG_DETECT_SOFTLOCKUP is not set | ||
1175 | # CONFIG_SCHEDSTATS is not set | ||
1176 | # CONFIG_TIMER_STATS is not set | ||
1177 | # CONFIG_DEBUG_SLAB is not set | ||
1178 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1179 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1180 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1181 | # CONFIG_DEBUG_MUTEXES is not set | ||
1182 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1183 | # CONFIG_PROVE_LOCKING is not set | ||
1184 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1185 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1186 | # CONFIG_DEBUG_KOBJECT is not set | ||
1187 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
1188 | CONFIG_DEBUG_INFO=y | ||
1189 | # CONFIG_DEBUG_VM is not set | ||
1190 | # CONFIG_DEBUG_LIST is not set | ||
1191 | CONFIG_FRAME_POINTER=y | ||
1192 | CONFIG_FORCED_INLINING=y | ||
1193 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1194 | # CONFIG_FAULT_INJECTION is not set | ||
1195 | CONFIG_DEBUG_USER=y | ||
1196 | CONFIG_DEBUG_ERRORS=y | ||
1197 | CONFIG_DEBUG_LL=y | ||
1198 | # CONFIG_DEBUG_ICEDCC is not set | ||
1199 | |||
1200 | # | ||
1201 | # Security options | ||
1202 | # | ||
1203 | # CONFIG_KEYS is not set | ||
1204 | # CONFIG_SECURITY is not set | ||
1205 | |||
1206 | # | ||
1207 | # Cryptographic options | ||
1208 | # | ||
1209 | CONFIG_CRYPTO=y | ||
1210 | CONFIG_CRYPTO_ALGAPI=m | ||
1211 | CONFIG_CRYPTO_BLKCIPHER=m | ||
1212 | CONFIG_CRYPTO_MANAGER=m | ||
1213 | # CONFIG_CRYPTO_HMAC is not set | ||
1214 | # CONFIG_CRYPTO_XCBC is not set | ||
1215 | # CONFIG_CRYPTO_NULL is not set | ||
1216 | # CONFIG_CRYPTO_MD4 is not set | ||
1217 | # CONFIG_CRYPTO_MD5 is not set | ||
1218 | # CONFIG_CRYPTO_SHA1 is not set | ||
1219 | # CONFIG_CRYPTO_SHA256 is not set | ||
1220 | # CONFIG_CRYPTO_SHA512 is not set | ||
1221 | # CONFIG_CRYPTO_WP512 is not set | ||
1222 | # CONFIG_CRYPTO_TGR192 is not set | ||
1223 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1224 | CONFIG_CRYPTO_ECB=m | ||
1225 | CONFIG_CRYPTO_CBC=m | ||
1226 | CONFIG_CRYPTO_PCBC=m | ||
1227 | # CONFIG_CRYPTO_LRW is not set | ||
1228 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1229 | # CONFIG_CRYPTO_DES is not set | ||
1230 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1231 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1232 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1233 | # CONFIG_CRYPTO_SERPENT is not set | ||
1234 | CONFIG_CRYPTO_AES=m | ||
1235 | # CONFIG_CRYPTO_CAST5 is not set | ||
1236 | # CONFIG_CRYPTO_CAST6 is not set | ||
1237 | # CONFIG_CRYPTO_TEA is not set | ||
1238 | CONFIG_CRYPTO_ARC4=m | ||
1239 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1240 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1241 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1242 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1243 | # CONFIG_CRYPTO_CRC32C is not set | ||
1244 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1245 | # CONFIG_CRYPTO_TEST is not set | ||
1246 | |||
1247 | # | ||
1248 | # Hardware crypto devices | ||
1249 | # | ||
1250 | |||
1251 | # | ||
1252 | # Library routines | ||
1253 | # | ||
1254 | CONFIG_BITREVERSE=y | ||
1255 | # CONFIG_CRC_CCITT is not set | ||
1256 | # CONFIG_CRC16 is not set | ||
1257 | # CONFIG_CRC_ITU_T is not set | ||
1258 | CONFIG_CRC32=y | ||
1259 | # CONFIG_LIBCRC32C is not set | ||
1260 | CONFIG_ZLIB_INFLATE=y | ||
1261 | CONFIG_ZLIB_DEFLATE=y | ||
1262 | CONFIG_PLIST=y | ||
1263 | CONFIG_HAS_IOMEM=y | ||
1264 | CONFIG_HAS_IOPORT=y | ||
1265 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/cm_x270_defconfig b/arch/arm/configs/xm_x270_defconfig index 5cab08397ae7..7b3576e41e36 100644 --- a/arch/arm/configs/cm_x270_defconfig +++ b/arch/arm/configs/xm_x270_defconfig | |||
@@ -1,13 +1,13 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.22 | 3 | # Linux kernel version: 2.6.25 |
4 | # Wed Jul 18 14:11:48 2007 | 4 | # Sun May 11 15:12:52 2008 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
8 | CONFIG_GENERIC_GPIO=y | 8 | CONFIG_GENERIC_GPIO=y |
9 | CONFIG_GENERIC_TIME=y | 9 | CONFIG_GENERIC_TIME=y |
10 | # CONFIG_GENERIC_CLOCKEVENTS is not set | 10 | CONFIG_GENERIC_CLOCKEVENTS=y |
11 | CONFIG_MMU=y | 11 | CONFIG_MMU=y |
12 | # CONFIG_NO_IOPORT is not set | 12 | # CONFIG_NO_IOPORT is not set |
13 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
@@ -21,21 +21,18 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
22 | CONFIG_GENERIC_HWEIGHT=y | 22 | CONFIG_GENERIC_HWEIGHT=y |
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
24 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
24 | CONFIG_ZONE_DMA=y | 25 | CONFIG_ZONE_DMA=y |
25 | CONFIG_ARCH_MTD_XIP=y | 26 | CONFIG_ARCH_MTD_XIP=y |
26 | CONFIG_VECTORS_BASE=0xffff0000 | 27 | CONFIG_VECTORS_BASE=0xffff0000 |
27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
28 | 29 | ||
29 | # | 30 | # |
30 | # Code maturity level options | 31 | # General setup |
31 | # | 32 | # |
32 | CONFIG_EXPERIMENTAL=y | 33 | CONFIG_EXPERIMENTAL=y |
33 | CONFIG_BROKEN_ON_SMP=y | 34 | CONFIG_BROKEN_ON_SMP=y |
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 35 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
35 | |||
36 | # | ||
37 | # General setup | ||
38 | # | ||
39 | CONFIG_LOCALVERSION="" | 36 | CONFIG_LOCALVERSION="" |
40 | # CONFIG_LOCALVERSION_AUTO is not set | 37 | # CONFIG_LOCALVERSION_AUTO is not set |
41 | CONFIG_SWAP=y | 38 | CONFIG_SWAP=y |
@@ -44,13 +41,20 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
44 | # CONFIG_POSIX_MQUEUE is not set | 41 | # CONFIG_POSIX_MQUEUE is not set |
45 | # CONFIG_BSD_PROCESS_ACCT is not set | 42 | # CONFIG_BSD_PROCESS_ACCT is not set |
46 | # CONFIG_TASKSTATS is not set | 43 | # CONFIG_TASKSTATS is not set |
47 | # CONFIG_USER_NS is not set | ||
48 | # CONFIG_AUDIT is not set | 44 | # CONFIG_AUDIT is not set |
49 | CONFIG_IKCONFIG=y | 45 | CONFIG_IKCONFIG=y |
50 | CONFIG_IKCONFIG_PROC=y | 46 | CONFIG_IKCONFIG_PROC=y |
51 | CONFIG_LOG_BUF_SHIFT=17 | 47 | CONFIG_LOG_BUF_SHIFT=14 |
48 | # CONFIG_CGROUPS is not set | ||
49 | CONFIG_GROUP_SCHED=y | ||
50 | CONFIG_FAIR_GROUP_SCHED=y | ||
51 | # CONFIG_RT_GROUP_SCHED is not set | ||
52 | CONFIG_USER_SCHED=y | ||
53 | # CONFIG_CGROUP_SCHED is not set | ||
52 | CONFIG_SYSFS_DEPRECATED=y | 54 | CONFIG_SYSFS_DEPRECATED=y |
55 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
53 | # CONFIG_RELAY is not set | 56 | # CONFIG_RELAY is not set |
57 | # CONFIG_NAMESPACES is not set | ||
54 | CONFIG_BLK_DEV_INITRD=y | 58 | CONFIG_BLK_DEV_INITRD=y |
55 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 60 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -58,6 +62,7 @@ CONFIG_SYSCTL=y | |||
58 | CONFIG_EMBEDDED=y | 62 | CONFIG_EMBEDDED=y |
59 | CONFIG_UID16=y | 63 | CONFIG_UID16=y |
60 | CONFIG_SYSCTL_SYSCALL=y | 64 | CONFIG_SYSCTL_SYSCALL=y |
65 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
61 | CONFIG_KALLSYMS=y | 66 | CONFIG_KALLSYMS=y |
62 | # CONFIG_KALLSYMS_ALL is not set | 67 | # CONFIG_KALLSYMS_ALL is not set |
63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 68 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -65,24 +70,34 @@ CONFIG_HOTPLUG=y | |||
65 | CONFIG_PRINTK=y | 70 | CONFIG_PRINTK=y |
66 | CONFIG_BUG=y | 71 | CONFIG_BUG=y |
67 | CONFIG_ELF_CORE=y | 72 | CONFIG_ELF_CORE=y |
73 | # CONFIG_COMPAT_BRK is not set | ||
68 | CONFIG_BASE_FULL=y | 74 | CONFIG_BASE_FULL=y |
69 | CONFIG_FUTEX=y | 75 | CONFIG_FUTEX=y |
70 | CONFIG_ANON_INODES=y | 76 | CONFIG_ANON_INODES=y |
71 | # CONFIG_EPOLL is not set | 77 | CONFIG_EPOLL=y |
72 | # CONFIG_SIGNALFD is not set | 78 | CONFIG_SIGNALFD=y |
73 | # CONFIG_TIMERFD is not set | 79 | CONFIG_TIMERFD=y |
74 | # CONFIG_EVENTFD is not set | 80 | CONFIG_EVENTFD=y |
75 | CONFIG_SHMEM=y | 81 | CONFIG_SHMEM=y |
76 | CONFIG_VM_EVENT_COUNTERS=y | 82 | # CONFIG_VM_EVENT_COUNTERS is not set |
77 | CONFIG_SLAB=y | 83 | # CONFIG_SLUB_DEBUG is not set |
78 | # CONFIG_SLUB is not set | 84 | # CONFIG_SLAB is not set |
85 | CONFIG_SLUB=y | ||
79 | # CONFIG_SLOB is not set | 86 | # CONFIG_SLOB is not set |
87 | # CONFIG_PROFILING is not set | ||
88 | # CONFIG_MARKERS is not set | ||
89 | CONFIG_HAVE_OPROFILE=y | ||
90 | # CONFIG_KPROBES is not set | ||
91 | CONFIG_HAVE_KPROBES=y | ||
92 | CONFIG_HAVE_KRETPROBES=y | ||
93 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
94 | # CONFIG_PROC_PAGE_MONITOR is not set | ||
80 | CONFIG_RT_MUTEXES=y | 95 | CONFIG_RT_MUTEXES=y |
81 | # CONFIG_TINY_SHMEM is not set | 96 | # CONFIG_TINY_SHMEM is not set |
82 | CONFIG_BASE_SMALL=0 | 97 | CONFIG_BASE_SMALL=0 |
83 | CONFIG_MODULES=y | 98 | CONFIG_MODULES=y |
84 | CONFIG_MODULE_UNLOAD=y | 99 | CONFIG_MODULE_UNLOAD=y |
85 | CONFIG_MODULE_FORCE_UNLOAD=y | 100 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
86 | # CONFIG_MODVERSIONS is not set | 101 | # CONFIG_MODVERSIONS is not set |
87 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 102 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
88 | CONFIG_KMOD=y | 103 | CONFIG_KMOD=y |
@@ -99,11 +114,12 @@ CONFIG_IOSCHED_NOOP=y | |||
99 | CONFIG_IOSCHED_AS=y | 114 | CONFIG_IOSCHED_AS=y |
100 | CONFIG_IOSCHED_DEADLINE=y | 115 | CONFIG_IOSCHED_DEADLINE=y |
101 | CONFIG_IOSCHED_CFQ=y | 116 | CONFIG_IOSCHED_CFQ=y |
102 | CONFIG_DEFAULT_AS=y | 117 | # CONFIG_DEFAULT_AS is not set |
103 | # CONFIG_DEFAULT_DEADLINE is not set | 118 | # CONFIG_DEFAULT_DEADLINE is not set |
104 | # CONFIG_DEFAULT_CFQ is not set | 119 | CONFIG_DEFAULT_CFQ=y |
105 | # CONFIG_DEFAULT_NOOP is not set | 120 | # CONFIG_DEFAULT_NOOP is not set |
106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 121 | CONFIG_DEFAULT_IOSCHED="cfq" |
122 | CONFIG_CLASSIC_RCU=y | ||
107 | 123 | ||
108 | # | 124 | # |
109 | # System Type | 125 | # System Type |
@@ -131,6 +147,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
131 | # CONFIG_ARCH_L7200 is not set | 147 | # CONFIG_ARCH_L7200 is not set |
132 | # CONFIG_ARCH_KS8695 is not set | 148 | # CONFIG_ARCH_KS8695 is not set |
133 | # CONFIG_ARCH_NS9XXX is not set | 149 | # CONFIG_ARCH_NS9XXX is not set |
150 | # CONFIG_ARCH_MXC is not set | ||
151 | # CONFIG_ARCH_ORION5X is not set | ||
134 | # CONFIG_ARCH_PNX4008 is not set | 152 | # CONFIG_ARCH_PNX4008 is not set |
135 | CONFIG_ARCH_PXA=y | 153 | CONFIG_ARCH_PXA=y |
136 | # CONFIG_ARCH_RPC is not set | 154 | # CONFIG_ARCH_RPC is not set |
@@ -140,19 +158,41 @@ CONFIG_ARCH_PXA=y | |||
140 | # CONFIG_ARCH_LH7A40X is not set | 158 | # CONFIG_ARCH_LH7A40X is not set |
141 | # CONFIG_ARCH_DAVINCI is not set | 159 | # CONFIG_ARCH_DAVINCI is not set |
142 | # CONFIG_ARCH_OMAP is not set | 160 | # CONFIG_ARCH_OMAP is not set |
161 | # CONFIG_ARCH_MSM7X00A is not set | ||
143 | CONFIG_DMABOUNCE=y | 162 | CONFIG_DMABOUNCE=y |
144 | 163 | ||
145 | # | 164 | # |
146 | # Intel PXA2xx Implementations | 165 | # Intel PXA2xx/PXA3xx Implementations |
147 | # | 166 | # |
167 | |||
168 | # | ||
169 | # Select target boards | ||
170 | # | ||
171 | # CONFIG_ARCH_GUMSTIX is not set | ||
148 | # CONFIG_ARCH_LUBBOCK is not set | 172 | # CONFIG_ARCH_LUBBOCK is not set |
149 | # CONFIG_MACH_LOGICPD_PXA270 is not set | 173 | # CONFIG_MACH_LOGICPD_PXA270 is not set |
150 | # CONFIG_MACH_MAINSTONE is not set | 174 | # CONFIG_MACH_MAINSTONE is not set |
151 | # CONFIG_ARCH_PXA_IDP is not set | 175 | # CONFIG_ARCH_PXA_IDP is not set |
152 | # CONFIG_PXA_SHARPSL is not set | 176 | # CONFIG_PXA_SHARPSL is not set |
177 | # CONFIG_ARCH_PXA_ESERIES is not set | ||
153 | # CONFIG_MACH_TRIZEPS4 is not set | 178 | # CONFIG_MACH_TRIZEPS4 is not set |
179 | CONFIG_MACH_EM_X270=y | ||
180 | # CONFIG_MACH_COLIBRI is not set | ||
181 | # CONFIG_MACH_ZYLONITE is not set | ||
182 | # CONFIG_MACH_LITTLETON is not set | ||
154 | CONFIG_MACH_ARMCORE=y | 183 | CONFIG_MACH_ARMCORE=y |
184 | # CONFIG_MACH_MAGICIAN is not set | ||
185 | # CONFIG_MACH_PCM027 is not set | ||
155 | CONFIG_PXA27x=y | 186 | CONFIG_PXA27x=y |
187 | # CONFIG_PXA_PWM is not set | ||
188 | |||
189 | # | ||
190 | # Boot options | ||
191 | # | ||
192 | |||
193 | # | ||
194 | # Power management | ||
195 | # | ||
156 | 196 | ||
157 | # | 197 | # |
158 | # Processor Type | 198 | # Processor Type |
@@ -161,6 +201,7 @@ CONFIG_CPU_32=y | |||
161 | CONFIG_CPU_XSCALE=y | 201 | CONFIG_CPU_XSCALE=y |
162 | CONFIG_CPU_32v5=y | 202 | CONFIG_CPU_32v5=y |
163 | CONFIG_CPU_ABRT_EV5T=y | 203 | CONFIG_CPU_ABRT_EV5T=y |
204 | CONFIG_CPU_PABRT_NOIFAR=y | ||
164 | CONFIG_CPU_CACHE_VIVT=y | 205 | CONFIG_CPU_CACHE_VIVT=y |
165 | CONFIG_CPU_TLB_V4WBI=y | 206 | CONFIG_CPU_TLB_V4WBI=y |
166 | CONFIG_CPU_CP15=y | 207 | CONFIG_CPU_CP15=y |
@@ -182,21 +223,41 @@ CONFIG_PCI=y | |||
182 | CONFIG_PCI_SYSCALL=y | 223 | CONFIG_PCI_SYSCALL=y |
183 | CONFIG_PCI_HOST_ITE8152=y | 224 | CONFIG_PCI_HOST_ITE8152=y |
184 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 225 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
226 | CONFIG_PCI_LEGACY=y | ||
185 | # CONFIG_PCI_DEBUG is not set | 227 | # CONFIG_PCI_DEBUG is not set |
228 | CONFIG_PCCARD=m | ||
229 | # CONFIG_PCMCIA_DEBUG is not set | ||
230 | CONFIG_PCMCIA=m | ||
231 | CONFIG_PCMCIA_LOAD_CIS=y | ||
232 | CONFIG_PCMCIA_IOCTL=y | ||
233 | CONFIG_CARDBUS=y | ||
186 | 234 | ||
187 | # | 235 | # |
188 | # PCCARD (PCMCIA/CardBus) support | 236 | # PC-card bridges |
189 | # | 237 | # |
190 | # CONFIG_PCCARD is not set | 238 | CONFIG_YENTA=m |
239 | # CONFIG_YENTA_O2 is not set | ||
240 | # CONFIG_YENTA_RICOH is not set | ||
241 | CONFIG_YENTA_TI=y | ||
242 | # CONFIG_YENTA_ENE_TUNE is not set | ||
243 | # CONFIG_YENTA_TOSHIBA is not set | ||
244 | # CONFIG_PD6729 is not set | ||
245 | # CONFIG_I82092 is not set | ||
246 | CONFIG_PCMCIA_PXA2XX=m | ||
247 | CONFIG_PCCARD_NONSTATIC=m | ||
191 | 248 | ||
192 | # | 249 | # |
193 | # Kernel Features | 250 | # Kernel Features |
194 | # | 251 | # |
195 | # CONFIG_TICK_ONESHOT is not set | 252 | CONFIG_TICK_ONESHOT=y |
196 | # CONFIG_PREEMPT is not set | 253 | CONFIG_NO_HZ=y |
197 | # CONFIG_NO_IDLE_HZ is not set | 254 | # CONFIG_NO_IDLE_HZ is not set |
255 | # CONFIG_HIGH_RES_TIMERS is not set | ||
256 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
257 | # CONFIG_PREEMPT is not set | ||
198 | CONFIG_HZ=100 | 258 | CONFIG_HZ=100 |
199 | # CONFIG_AEABI is not set | 259 | CONFIG_AEABI=y |
260 | CONFIG_OABI_COMPAT=y | ||
200 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 261 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
201 | CONFIG_SELECT_MEMORY_MODEL=y | 262 | CONFIG_SELECT_MEMORY_MODEL=y |
202 | CONFIG_FLATMEM_MANUAL=y | 263 | CONFIG_FLATMEM_MANUAL=y |
@@ -205,6 +266,8 @@ CONFIG_FLATMEM_MANUAL=y | |||
205 | CONFIG_FLATMEM=y | 266 | CONFIG_FLATMEM=y |
206 | CONFIG_FLAT_NODE_MEM_MAP=y | 267 | CONFIG_FLAT_NODE_MEM_MAP=y |
207 | # CONFIG_SPARSEMEM_STATIC is not set | 268 | # CONFIG_SPARSEMEM_STATIC is not set |
269 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
270 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
208 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 271 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
209 | # CONFIG_RESOURCES_64BIT is not set | 272 | # CONFIG_RESOURCES_64BIT is not set |
210 | CONFIG_ZONE_DMA_FLAG=1 | 273 | CONFIG_ZONE_DMA_FLAG=1 |
@@ -217,11 +280,16 @@ CONFIG_ALIGNMENT_TRAP=y | |||
217 | # | 280 | # |
218 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 281 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
219 | CONFIG_ZBOOT_ROM_BSS=0x0 | 282 | CONFIG_ZBOOT_ROM_BSS=0x0 |
220 | CONFIG_CMDLINE="" | 283 | CONFIG_CMDLINE="root=1f03 mem=32M" |
221 | # CONFIG_XIP_KERNEL is not set | 284 | # CONFIG_XIP_KERNEL is not set |
222 | # CONFIG_KEXEC is not set | 285 | # CONFIG_KEXEC is not set |
223 | 286 | ||
224 | # | 287 | # |
288 | # CPU Frequency scaling | ||
289 | # | ||
290 | # CONFIG_CPU_FREQ is not set | ||
291 | |||
292 | # | ||
225 | # Floating point emulation | 293 | # Floating point emulation |
226 | # | 294 | # |
227 | 295 | ||
@@ -238,16 +306,17 @@ CONFIG_FPE_NWFPE=y | |||
238 | CONFIG_BINFMT_ELF=y | 306 | CONFIG_BINFMT_ELF=y |
239 | # CONFIG_BINFMT_AOUT is not set | 307 | # CONFIG_BINFMT_AOUT is not set |
240 | # CONFIG_BINFMT_MISC is not set | 308 | # CONFIG_BINFMT_MISC is not set |
241 | # CONFIG_ARTHUR is not set | ||
242 | 309 | ||
243 | # | 310 | # |
244 | # Power management options | 311 | # Power management options |
245 | # | 312 | # |
246 | CONFIG_PM=y | 313 | CONFIG_PM=y |
247 | # CONFIG_PM_LEGACY is not set | ||
248 | # CONFIG_PM_DEBUG is not set | 314 | # CONFIG_PM_DEBUG is not set |
249 | # CONFIG_PM_SYSFS_DEPRECATED is not set | 315 | CONFIG_PM_SLEEP=y |
250 | # CONFIG_APM_EMULATION is not set | 316 | CONFIG_SUSPEND=y |
317 | CONFIG_SUSPEND_FREEZER=y | ||
318 | CONFIG_APM_EMULATION=m | ||
319 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
251 | 320 | ||
252 | # | 321 | # |
253 | # Networking | 322 | # Networking |
@@ -258,15 +327,16 @@ CONFIG_NET=y | |||
258 | # Networking options | 327 | # Networking options |
259 | # | 328 | # |
260 | CONFIG_PACKET=y | 329 | CONFIG_PACKET=y |
261 | # CONFIG_PACKET_MMAP is not set | 330 | CONFIG_PACKET_MMAP=y |
262 | CONFIG_UNIX=y | 331 | CONFIG_UNIX=y |
263 | CONFIG_XFRM=y | 332 | CONFIG_XFRM=y |
264 | # CONFIG_XFRM_USER is not set | 333 | # CONFIG_XFRM_USER is not set |
265 | # CONFIG_XFRM_SUB_POLICY is not set | 334 | # CONFIG_XFRM_SUB_POLICY is not set |
266 | # CONFIG_XFRM_MIGRATE is not set | 335 | # CONFIG_XFRM_MIGRATE is not set |
336 | # CONFIG_XFRM_STATISTICS is not set | ||
267 | # CONFIG_NET_KEY is not set | 337 | # CONFIG_NET_KEY is not set |
268 | CONFIG_INET=y | 338 | CONFIG_INET=y |
269 | # CONFIG_IP_MULTICAST is not set | 339 | CONFIG_IP_MULTICAST=y |
270 | # CONFIG_IP_ADVANCED_ROUTER is not set | 340 | # CONFIG_IP_ADVANCED_ROUTER is not set |
271 | CONFIG_IP_FIB_HASH=y | 341 | CONFIG_IP_FIB_HASH=y |
272 | CONFIG_IP_PNP=y | 342 | CONFIG_IP_PNP=y |
@@ -275,6 +345,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
275 | # CONFIG_IP_PNP_RARP is not set | 345 | # CONFIG_IP_PNP_RARP is not set |
276 | # CONFIG_NET_IPIP is not set | 346 | # CONFIG_NET_IPIP is not set |
277 | # CONFIG_NET_IPGRE is not set | 347 | # CONFIG_NET_IPGRE is not set |
348 | # CONFIG_IP_MROUTE is not set | ||
278 | # CONFIG_ARPD is not set | 349 | # CONFIG_ARPD is not set |
279 | # CONFIG_SYN_COOKIES is not set | 350 | # CONFIG_SYN_COOKIES is not set |
280 | # CONFIG_INET_AH is not set | 351 | # CONFIG_INET_AH is not set |
@@ -285,15 +356,13 @@ CONFIG_IP_PNP_BOOTP=y | |||
285 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 356 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
286 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 357 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
287 | CONFIG_INET_XFRM_MODE_BEET=y | 358 | CONFIG_INET_XFRM_MODE_BEET=y |
288 | CONFIG_INET_DIAG=y | 359 | # CONFIG_INET_LRO is not set |
289 | CONFIG_INET_TCP_DIAG=y | 360 | # CONFIG_INET_DIAG is not set |
290 | # CONFIG_TCP_CONG_ADVANCED is not set | 361 | # CONFIG_TCP_CONG_ADVANCED is not set |
291 | CONFIG_TCP_CONG_CUBIC=y | 362 | CONFIG_TCP_CONG_CUBIC=y |
292 | CONFIG_DEFAULT_TCP_CONG="cubic" | 363 | CONFIG_DEFAULT_TCP_CONG="cubic" |
293 | # CONFIG_TCP_MD5SIG is not set | 364 | # CONFIG_TCP_MD5SIG is not set |
294 | # CONFIG_IPV6 is not set | 365 | # CONFIG_IPV6 is not set |
295 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
296 | # CONFIG_INET6_TUNNEL is not set | ||
297 | # CONFIG_NETWORK_SECMARK is not set | 366 | # CONFIG_NETWORK_SECMARK is not set |
298 | # CONFIG_NETFILTER is not set | 367 | # CONFIG_NETFILTER is not set |
299 | # CONFIG_IP_DCCP is not set | 368 | # CONFIG_IP_DCCP is not set |
@@ -310,10 +379,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
310 | # CONFIG_LAPB is not set | 379 | # CONFIG_LAPB is not set |
311 | # CONFIG_ECONET is not set | 380 | # CONFIG_ECONET is not set |
312 | # CONFIG_WAN_ROUTER is not set | 381 | # CONFIG_WAN_ROUTER is not set |
313 | |||
314 | # | ||
315 | # QoS and/or fair queueing | ||
316 | # | ||
317 | # CONFIG_NET_SCHED is not set | 382 | # CONFIG_NET_SCHED is not set |
318 | 383 | ||
319 | # | 384 | # |
@@ -321,8 +386,33 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
321 | # | 386 | # |
322 | # CONFIG_NET_PKTGEN is not set | 387 | # CONFIG_NET_PKTGEN is not set |
323 | # CONFIG_HAMRADIO is not set | 388 | # CONFIG_HAMRADIO is not set |
389 | # CONFIG_CAN is not set | ||
324 | # CONFIG_IRDA is not set | 390 | # CONFIG_IRDA is not set |
325 | # CONFIG_BT is not set | 391 | CONFIG_BT=m |
392 | CONFIG_BT_L2CAP=m | ||
393 | CONFIG_BT_SCO=m | ||
394 | CONFIG_BT_RFCOMM=m | ||
395 | # CONFIG_BT_RFCOMM_TTY is not set | ||
396 | CONFIG_BT_BNEP=m | ||
397 | # CONFIG_BT_BNEP_MC_FILTER is not set | ||
398 | # CONFIG_BT_BNEP_PROTO_FILTER is not set | ||
399 | CONFIG_BT_HIDP=m | ||
400 | |||
401 | # | ||
402 | # Bluetooth device drivers | ||
403 | # | ||
404 | CONFIG_BT_HCIUSB=m | ||
405 | CONFIG_BT_HCIUSB_SCO=y | ||
406 | # CONFIG_BT_HCIBTSDIO is not set | ||
407 | # CONFIG_BT_HCIUART is not set | ||
408 | # CONFIG_BT_HCIBCM203X is not set | ||
409 | # CONFIG_BT_HCIBPA10X is not set | ||
410 | # CONFIG_BT_HCIBFUSB is not set | ||
411 | # CONFIG_BT_HCIDTL1 is not set | ||
412 | # CONFIG_BT_HCIBT3C is not set | ||
413 | # CONFIG_BT_HCIBLUECARD is not set | ||
414 | # CONFIG_BT_HCIBTUART is not set | ||
415 | # CONFIG_BT_HCIVHCI is not set | ||
326 | # CONFIG_AF_RXRPC is not set | 416 | # CONFIG_AF_RXRPC is not set |
327 | 417 | ||
328 | # | 418 | # |
@@ -331,12 +421,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
331 | # CONFIG_CFG80211 is not set | 421 | # CONFIG_CFG80211 is not set |
332 | CONFIG_WIRELESS_EXT=y | 422 | CONFIG_WIRELESS_EXT=y |
333 | # CONFIG_MAC80211 is not set | 423 | # CONFIG_MAC80211 is not set |
334 | CONFIG_IEEE80211=m | 424 | # CONFIG_IEEE80211 is not set |
335 | # CONFIG_IEEE80211_DEBUG is not set | ||
336 | CONFIG_IEEE80211_CRYPT_WEP=m | ||
337 | CONFIG_IEEE80211_CRYPT_CCMP=m | ||
338 | # CONFIG_IEEE80211_CRYPT_TKIP is not set | ||
339 | # CONFIG_IEEE80211_SOFTMAC is not set | ||
340 | # CONFIG_RFKILL is not set | 425 | # CONFIG_RFKILL is not set |
341 | # CONFIG_NET_9P is not set | 426 | # CONFIG_NET_9P is not set |
342 | 427 | ||
@@ -347,38 +432,47 @@ CONFIG_IEEE80211_CRYPT_CCMP=m | |||
347 | # | 432 | # |
348 | # Generic Driver Options | 433 | # Generic Driver Options |
349 | # | 434 | # |
435 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
350 | CONFIG_STANDALONE=y | 436 | CONFIG_STANDALONE=y |
351 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 437 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
352 | CONFIG_FW_LOADER=y | 438 | CONFIG_FW_LOADER=m |
353 | # CONFIG_DEBUG_DRIVER is not set | 439 | # CONFIG_DEBUG_DRIVER is not set |
354 | # CONFIG_DEBUG_DEVRES is not set | 440 | # CONFIG_DEBUG_DEVRES is not set |
355 | # CONFIG_SYS_HYPERVISOR is not set | 441 | # CONFIG_SYS_HYPERVISOR is not set |
356 | # CONFIG_CONNECTOR is not set | 442 | # CONFIG_CONNECTOR is not set |
357 | CONFIG_MTD=m | 443 | CONFIG_MTD=y |
358 | # CONFIG_MTD_DEBUG is not set | 444 | # CONFIG_MTD_DEBUG is not set |
359 | # CONFIG_MTD_CONCAT is not set | 445 | # CONFIG_MTD_CONCAT is not set |
360 | CONFIG_MTD_PARTITIONS=y | 446 | CONFIG_MTD_PARTITIONS=y |
361 | # CONFIG_MTD_REDBOOT_PARTS is not set | 447 | # CONFIG_MTD_REDBOOT_PARTS is not set |
448 | CONFIG_MTD_CMDLINE_PARTS=y | ||
362 | # CONFIG_MTD_AFS_PARTS is not set | 449 | # CONFIG_MTD_AFS_PARTS is not set |
450 | # CONFIG_MTD_AR7_PARTS is not set | ||
363 | 451 | ||
364 | # | 452 | # |
365 | # User Modules And Translation Layers | 453 | # User Modules And Translation Layers |
366 | # | 454 | # |
367 | CONFIG_MTD_CHAR=m | 455 | CONFIG_MTD_CHAR=y |
368 | CONFIG_MTD_BLKDEVS=m | 456 | CONFIG_MTD_BLKDEVS=y |
369 | CONFIG_MTD_BLOCK=m | 457 | CONFIG_MTD_BLOCK=y |
370 | # CONFIG_MTD_BLOCK_RO is not set | ||
371 | # CONFIG_FTL is not set | 458 | # CONFIG_FTL is not set |
372 | # CONFIG_NFTL is not set | 459 | # CONFIG_NFTL is not set |
373 | # CONFIG_INFTL is not set | 460 | # CONFIG_INFTL is not set |
374 | # CONFIG_RFD_FTL is not set | 461 | # CONFIG_RFD_FTL is not set |
375 | # CONFIG_SSFDC is not set | 462 | # CONFIG_SSFDC is not set |
463 | # CONFIG_MTD_OOPS is not set | ||
376 | 464 | ||
377 | # | 465 | # |
378 | # RAM/ROM/Flash chip drivers | 466 | # RAM/ROM/Flash chip drivers |
379 | # | 467 | # |
380 | # CONFIG_MTD_CFI is not set | 468 | CONFIG_MTD_CFI=y |
381 | # CONFIG_MTD_JEDECPROBE is not set | 469 | CONFIG_MTD_JEDECPROBE=y |
470 | CONFIG_MTD_GEN_PROBE=y | ||
471 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
472 | CONFIG_MTD_CFI_NOSWAP=y | ||
473 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
474 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
475 | # CONFIG_MTD_CFI_GEOMETRY is not set | ||
382 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | 476 | CONFIG_MTD_MAP_BANK_WIDTH_1=y |
383 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | 477 | CONFIG_MTD_MAP_BANK_WIDTH_2=y |
384 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | 478 | CONFIG_MTD_MAP_BANK_WIDTH_4=y |
@@ -389,15 +483,29 @@ CONFIG_MTD_CFI_I1=y | |||
389 | CONFIG_MTD_CFI_I2=y | 483 | CONFIG_MTD_CFI_I2=y |
390 | # CONFIG_MTD_CFI_I4 is not set | 484 | # CONFIG_MTD_CFI_I4 is not set |
391 | # CONFIG_MTD_CFI_I8 is not set | 485 | # CONFIG_MTD_CFI_I8 is not set |
486 | # CONFIG_MTD_OTP is not set | ||
487 | CONFIG_MTD_CFI_INTELEXT=y | ||
488 | CONFIG_MTD_CFI_AMDSTD=y | ||
489 | CONFIG_MTD_CFI_STAA=y | ||
490 | CONFIG_MTD_CFI_UTIL=y | ||
392 | # CONFIG_MTD_RAM is not set | 491 | # CONFIG_MTD_RAM is not set |
393 | # CONFIG_MTD_ROM is not set | 492 | # CONFIG_MTD_ROM is not set |
394 | # CONFIG_MTD_ABSENT is not set | 493 | # CONFIG_MTD_ABSENT is not set |
494 | # CONFIG_MTD_XIP is not set | ||
395 | 495 | ||
396 | # | 496 | # |
397 | # Mapping drivers for chip access | 497 | # Mapping drivers for chip access |
398 | # | 498 | # |
399 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 499 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
500 | CONFIG_MTD_PHYSMAP=y | ||
501 | CONFIG_MTD_PHYSMAP_START=0x0 | ||
502 | CONFIG_MTD_PHYSMAP_LEN=0x400000 | ||
503 | CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | ||
504 | CONFIG_MTD_PXA2XX=y | ||
505 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
506 | # CONFIG_MTD_IMPA7 is not set | ||
400 | # CONFIG_MTD_SHARP_SL is not set | 507 | # CONFIG_MTD_SHARP_SL is not set |
508 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
401 | # CONFIG_MTD_PLATRAM is not set | 509 | # CONFIG_MTD_PLATRAM is not set |
402 | 510 | ||
403 | # | 511 | # |
@@ -415,18 +523,19 @@ CONFIG_MTD_CFI_I2=y | |||
415 | # CONFIG_MTD_DOC2000 is not set | 523 | # CONFIG_MTD_DOC2000 is not set |
416 | # CONFIG_MTD_DOC2001 is not set | 524 | # CONFIG_MTD_DOC2001 is not set |
417 | # CONFIG_MTD_DOC2001PLUS is not set | 525 | # CONFIG_MTD_DOC2001PLUS is not set |
418 | CONFIG_MTD_NAND=m | 526 | CONFIG_MTD_NAND=y |
419 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | 527 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set |
420 | # CONFIG_MTD_NAND_ECC_SMC is not set | 528 | # CONFIG_MTD_NAND_ECC_SMC is not set |
421 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 529 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
422 | # CONFIG_MTD_NAND_H1900 is not set | 530 | # CONFIG_MTD_NAND_H1900 is not set |
423 | CONFIG_MTD_NAND_IDS=m | 531 | CONFIG_MTD_NAND_IDS=y |
424 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 532 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
425 | # CONFIG_MTD_NAND_SHARPSL is not set | 533 | # CONFIG_MTD_NAND_SHARPSL is not set |
426 | # CONFIG_MTD_NAND_CAFE is not set | 534 | # CONFIG_MTD_NAND_CAFE is not set |
427 | CONFIG_MTD_NAND_CM_X270=m | 535 | CONFIG_MTD_NAND_CM_X270=y |
428 | # CONFIG_MTD_NAND_NANDSIM is not set | 536 | # CONFIG_MTD_NAND_NANDSIM is not set |
429 | # CONFIG_MTD_NAND_PLATFORM is not set | 537 | CONFIG_MTD_NAND_PLATFORM=y |
538 | # CONFIG_MTD_ALAUDA is not set | ||
430 | # CONFIG_MTD_ONENAND is not set | 539 | # CONFIG_MTD_ONENAND is not set |
431 | 540 | ||
432 | # | 541 | # |
@@ -447,36 +556,13 @@ CONFIG_BLK_DEV_LOOP=y | |||
447 | # CONFIG_BLK_DEV_UB is not set | 556 | # CONFIG_BLK_DEV_UB is not set |
448 | CONFIG_BLK_DEV_RAM=y | 557 | CONFIG_BLK_DEV_RAM=y |
449 | CONFIG_BLK_DEV_RAM_COUNT=16 | 558 | CONFIG_BLK_DEV_RAM_COUNT=16 |
450 | CONFIG_BLK_DEV_RAM_SIZE=12000 | 559 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
451 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 560 | # CONFIG_BLK_DEV_XIP is not set |
452 | # CONFIG_CDROM_PKTCDVD is not set | 561 | # CONFIG_CDROM_PKTCDVD is not set |
453 | # CONFIG_ATA_OVER_ETH is not set | 562 | # CONFIG_ATA_OVER_ETH is not set |
454 | CONFIG_IDE=m | 563 | # CONFIG_MISC_DEVICES is not set |
455 | CONFIG_IDE_MAX_HWIFS=4 | 564 | CONFIG_HAVE_IDE=y |
456 | CONFIG_BLK_DEV_IDE=m | 565 | # CONFIG_IDE is not set |
457 | |||
458 | # | ||
459 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
460 | # | ||
461 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
462 | CONFIG_BLK_DEV_IDEDISK=m | ||
463 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
464 | CONFIG_BLK_DEV_IDECD=m | ||
465 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
466 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
467 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
468 | # CONFIG_IDE_TASK_IOCTL is not set | ||
469 | CONFIG_IDE_PROC_FS=y | ||
470 | |||
471 | # | ||
472 | # IDE chipset support/bugfixes | ||
473 | # | ||
474 | # CONFIG_IDE_GENERIC is not set | ||
475 | # CONFIG_BLK_DEV_IDEPCI is not set | ||
476 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
477 | # CONFIG_IDE_ARM is not set | ||
478 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
479 | # CONFIG_BLK_DEV_HD is not set | ||
480 | 566 | ||
481 | # | 567 | # |
482 | # SCSI device support | 568 | # SCSI device support |
@@ -486,7 +572,7 @@ CONFIG_SCSI=y | |||
486 | CONFIG_SCSI_DMA=y | 572 | CONFIG_SCSI_DMA=y |
487 | # CONFIG_SCSI_TGT is not set | 573 | # CONFIG_SCSI_TGT is not set |
488 | # CONFIG_SCSI_NETLINK is not set | 574 | # CONFIG_SCSI_NETLINK is not set |
489 | # CONFIG_SCSI_PROC_FS is not set | 575 | CONFIG_SCSI_PROC_FS=y |
490 | 576 | ||
491 | # | 577 | # |
492 | # SCSI support type (disk, tape, CD-ROM) | 578 | # SCSI support type (disk, tape, CD-ROM) |
@@ -513,12 +599,9 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
513 | # CONFIG_SCSI_SPI_ATTRS is not set | 599 | # CONFIG_SCSI_SPI_ATTRS is not set |
514 | # CONFIG_SCSI_FC_ATTRS is not set | 600 | # CONFIG_SCSI_FC_ATTRS is not set |
515 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 601 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
516 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
517 | # CONFIG_SCSI_SAS_LIBSAS is not set | 602 | # CONFIG_SCSI_SAS_LIBSAS is not set |
518 | 603 | # CONFIG_SCSI_SRP_ATTRS is not set | |
519 | # | 604 | CONFIG_SCSI_LOWLEVEL=y |
520 | # SCSI low-level drivers | ||
521 | # | ||
522 | # CONFIG_ISCSI_TCP is not set | 605 | # CONFIG_ISCSI_TCP is not set |
523 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 606 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
524 | # CONFIG_SCSI_3W_9XXX is not set | 607 | # CONFIG_SCSI_3W_9XXX is not set |
@@ -529,6 +612,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
529 | # CONFIG_SCSI_AIC79XX is not set | 612 | # CONFIG_SCSI_AIC79XX is not set |
530 | # CONFIG_SCSI_AIC94XX is not set | 613 | # CONFIG_SCSI_AIC94XX is not set |
531 | # CONFIG_SCSI_DPT_I2O is not set | 614 | # CONFIG_SCSI_DPT_I2O is not set |
615 | # CONFIG_SCSI_ADVANSYS is not set | ||
532 | # CONFIG_SCSI_ARCMSR is not set | 616 | # CONFIG_SCSI_ARCMSR is not set |
533 | # CONFIG_MEGARAID_NEWGEN is not set | 617 | # CONFIG_MEGARAID_NEWGEN is not set |
534 | # CONFIG_MEGARAID_LEGACY is not set | 618 | # CONFIG_MEGARAID_LEGACY is not set |
@@ -539,8 +623,10 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
539 | # CONFIG_SCSI_IPS is not set | 623 | # CONFIG_SCSI_IPS is not set |
540 | # CONFIG_SCSI_INITIO is not set | 624 | # CONFIG_SCSI_INITIO is not set |
541 | # CONFIG_SCSI_INIA100 is not set | 625 | # CONFIG_SCSI_INIA100 is not set |
626 | # CONFIG_SCSI_MVSAS is not set | ||
542 | # CONFIG_SCSI_STEX is not set | 627 | # CONFIG_SCSI_STEX is not set |
543 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 628 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
629 | # CONFIG_SCSI_IPR is not set | ||
544 | # CONFIG_SCSI_QLOGIC_1280 is not set | 630 | # CONFIG_SCSI_QLOGIC_1280 is not set |
545 | # CONFIG_SCSI_QLA_FC is not set | 631 | # CONFIG_SCSI_QLA_FC is not set |
546 | # CONFIG_SCSI_QLA_ISCSI is not set | 632 | # CONFIG_SCSI_QLA_ISCSI is not set |
@@ -550,16 +636,69 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
550 | # CONFIG_SCSI_NSP32 is not set | 636 | # CONFIG_SCSI_NSP32 is not set |
551 | # CONFIG_SCSI_DEBUG is not set | 637 | # CONFIG_SCSI_DEBUG is not set |
552 | # CONFIG_SCSI_SRP is not set | 638 | # CONFIG_SCSI_SRP is not set |
553 | # CONFIG_ATA is not set | 639 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
640 | CONFIG_ATA=m | ||
641 | # CONFIG_ATA_NONSTANDARD is not set | ||
642 | # CONFIG_SATA_PMP is not set | ||
643 | # CONFIG_SATA_AHCI is not set | ||
644 | # CONFIG_SATA_SIL24 is not set | ||
645 | CONFIG_ATA_SFF=y | ||
646 | # CONFIG_SATA_SVW is not set | ||
647 | # CONFIG_ATA_PIIX is not set | ||
648 | # CONFIG_SATA_MV is not set | ||
649 | # CONFIG_SATA_NV is not set | ||
650 | # CONFIG_PDC_ADMA is not set | ||
651 | # CONFIG_SATA_QSTOR is not set | ||
652 | # CONFIG_SATA_PROMISE is not set | ||
653 | # CONFIG_SATA_SX4 is not set | ||
654 | # CONFIG_SATA_SIL is not set | ||
655 | # CONFIG_SATA_SIS is not set | ||
656 | # CONFIG_SATA_ULI is not set | ||
657 | # CONFIG_SATA_VIA is not set | ||
658 | # CONFIG_SATA_VITESSE is not set | ||
659 | # CONFIG_SATA_INIC162X is not set | ||
660 | # CONFIG_PATA_ALI is not set | ||
661 | # CONFIG_PATA_AMD is not set | ||
662 | # CONFIG_PATA_ARTOP is not set | ||
663 | # CONFIG_PATA_ATIIXP is not set | ||
664 | # CONFIG_PATA_CMD640_PCI is not set | ||
665 | # CONFIG_PATA_CMD64X is not set | ||
666 | # CONFIG_PATA_CS5520 is not set | ||
667 | # CONFIG_PATA_CS5530 is not set | ||
668 | # CONFIG_PATA_CYPRESS is not set | ||
669 | # CONFIG_PATA_EFAR is not set | ||
670 | # CONFIG_ATA_GENERIC is not set | ||
671 | # CONFIG_PATA_HPT366 is not set | ||
672 | # CONFIG_PATA_HPT37X is not set | ||
673 | # CONFIG_PATA_HPT3X2N is not set | ||
674 | # CONFIG_PATA_HPT3X3 is not set | ||
675 | # CONFIG_PATA_IT821X is not set | ||
676 | # CONFIG_PATA_IT8213 is not set | ||
677 | # CONFIG_PATA_JMICRON is not set | ||
678 | # CONFIG_PATA_TRIFLEX is not set | ||
679 | # CONFIG_PATA_MARVELL is not set | ||
680 | # CONFIG_PATA_MPIIX is not set | ||
681 | # CONFIG_PATA_OLDPIIX is not set | ||
682 | # CONFIG_PATA_NETCELL is not set | ||
683 | # CONFIG_PATA_NINJA32 is not set | ||
684 | # CONFIG_PATA_NS87410 is not set | ||
685 | # CONFIG_PATA_NS87415 is not set | ||
686 | # CONFIG_PATA_OPTI is not set | ||
687 | # CONFIG_PATA_OPTIDMA is not set | ||
688 | CONFIG_PATA_PCMCIA=m | ||
689 | # CONFIG_PATA_PDC_OLD is not set | ||
690 | # CONFIG_PATA_RADISYS is not set | ||
691 | # CONFIG_PATA_RZ1000 is not set | ||
692 | # CONFIG_PATA_SC1200 is not set | ||
693 | # CONFIG_PATA_SERVERWORKS is not set | ||
694 | # CONFIG_PATA_PDC2027X is not set | ||
695 | # CONFIG_PATA_SIL680 is not set | ||
696 | # CONFIG_PATA_SIS is not set | ||
697 | # CONFIG_PATA_VIA is not set | ||
698 | # CONFIG_PATA_WINBOND is not set | ||
699 | # CONFIG_PATA_PLATFORM is not set | ||
554 | # CONFIG_MD is not set | 700 | # CONFIG_MD is not set |
555 | |||
556 | # | ||
557 | # Fusion MPT device support | ||
558 | # | ||
559 | # CONFIG_FUSION is not set | 701 | # CONFIG_FUSION is not set |
560 | # CONFIG_FUSION_SPI is not set | ||
561 | # CONFIG_FUSION_FC is not set | ||
562 | # CONFIG_FUSION_SAS is not set | ||
563 | 702 | ||
564 | # | 703 | # |
565 | # IEEE 1394 (FireWire) support | 704 | # IEEE 1394 (FireWire) support |
@@ -574,6 +713,7 @@ CONFIG_NETDEVICES=y | |||
574 | # CONFIG_MACVLAN is not set | 713 | # CONFIG_MACVLAN is not set |
575 | # CONFIG_EQUALIZER is not set | 714 | # CONFIG_EQUALIZER is not set |
576 | # CONFIG_TUN is not set | 715 | # CONFIG_TUN is not set |
716 | # CONFIG_VETH is not set | ||
577 | # CONFIG_ARCNET is not set | 717 | # CONFIG_ARCNET is not set |
578 | # CONFIG_PHYLIB is not set | 718 | # CONFIG_PHYLIB is not set |
579 | CONFIG_NET_ETHERNET=y | 719 | CONFIG_NET_ETHERNET=y |
@@ -585,64 +725,65 @@ CONFIG_MII=y | |||
585 | # CONFIG_NET_VENDOR_3COM is not set | 725 | # CONFIG_NET_VENDOR_3COM is not set |
586 | # CONFIG_SMC91X is not set | 726 | # CONFIG_SMC91X is not set |
587 | CONFIG_DM9000=y | 727 | CONFIG_DM9000=y |
728 | CONFIG_DM9000_DEBUGLEVEL=1 | ||
588 | # CONFIG_SMC911X is not set | 729 | # CONFIG_SMC911X is not set |
589 | # CONFIG_NET_TULIP is not set | 730 | # CONFIG_NET_TULIP is not set |
590 | # CONFIG_HP100 is not set | 731 | # CONFIG_HP100 is not set |
732 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
733 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
734 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
735 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
591 | CONFIG_NET_PCI=y | 736 | CONFIG_NET_PCI=y |
592 | # CONFIG_PCNET32 is not set | 737 | # CONFIG_PCNET32 is not set |
593 | # CONFIG_AMD8111_ETH is not set | 738 | # CONFIG_AMD8111_ETH is not set |
594 | # CONFIG_ADAPTEC_STARFIRE is not set | 739 | # CONFIG_ADAPTEC_STARFIRE is not set |
595 | # CONFIG_B44 is not set | 740 | # CONFIG_B44 is not set |
596 | # CONFIG_FORCEDETH is not set | 741 | # CONFIG_FORCEDETH is not set |
597 | # CONFIG_DGRS is not set | ||
598 | # CONFIG_EEPRO100 is not set | 742 | # CONFIG_EEPRO100 is not set |
599 | # CONFIG_E100 is not set | 743 | # CONFIG_E100 is not set |
600 | # CONFIG_FEALNX is not set | 744 | # CONFIG_FEALNX is not set |
601 | # CONFIG_NATSEMI is not set | 745 | # CONFIG_NATSEMI is not set |
602 | # CONFIG_NE2K_PCI is not set | 746 | # CONFIG_NE2K_PCI is not set |
603 | # CONFIG_8139CP is not set | 747 | # CONFIG_8139CP is not set |
604 | CONFIG_8139TOO=m | 748 | CONFIG_8139TOO=y |
605 | # CONFIG_8139TOO_PIO is not set | 749 | # CONFIG_8139TOO_PIO is not set |
606 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 750 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
607 | # CONFIG_8139TOO_8129 is not set | 751 | # CONFIG_8139TOO_8129 is not set |
608 | # CONFIG_8139_OLD_RX_RESET is not set | 752 | # CONFIG_8139_OLD_RX_RESET is not set |
753 | # CONFIG_R6040 is not set | ||
609 | # CONFIG_SIS900 is not set | 754 | # CONFIG_SIS900 is not set |
610 | # CONFIG_EPIC100 is not set | 755 | # CONFIG_EPIC100 is not set |
611 | # CONFIG_SUNDANCE is not set | 756 | # CONFIG_SUNDANCE is not set |
612 | # CONFIG_TLAN is not set | 757 | # CONFIG_TLAN is not set |
613 | # CONFIG_VIA_RHINE is not set | 758 | # CONFIG_VIA_RHINE is not set |
614 | # CONFIG_SC92031 is not set | 759 | # CONFIG_SC92031 is not set |
615 | CONFIG_NETDEV_1000=y | 760 | # CONFIG_NETDEV_1000 is not set |
616 | # CONFIG_ACENIC is not set | 761 | # CONFIG_NETDEV_10000 is not set |
617 | # CONFIG_DL2K is not set | ||
618 | # CONFIG_E1000 is not set | ||
619 | # CONFIG_NS83820 is not set | ||
620 | # CONFIG_HAMACHI is not set | ||
621 | # CONFIG_YELLOWFIN is not set | ||
622 | # CONFIG_R8169 is not set | ||
623 | # CONFIG_SIS190 is not set | ||
624 | # CONFIG_SKGE is not set | ||
625 | # CONFIG_SKY2 is not set | ||
626 | # CONFIG_VIA_VELOCITY is not set | ||
627 | # CONFIG_TIGON3 is not set | ||
628 | # CONFIG_BNX2 is not set | ||
629 | # CONFIG_QLA3XXX is not set | ||
630 | # CONFIG_ATL1 is not set | ||
631 | CONFIG_NETDEV_10000=y | ||
632 | # CONFIG_CHELSIO_T1 is not set | ||
633 | # CONFIG_CHELSIO_T3 is not set | ||
634 | # CONFIG_IXGB is not set | ||
635 | # CONFIG_S2IO is not set | ||
636 | # CONFIG_MYRI10GE is not set | ||
637 | # CONFIG_NETXEN_NIC is not set | ||
638 | # CONFIG_MLX4_CORE is not set | ||
639 | # CONFIG_TR is not set | 762 | # CONFIG_TR is not set |
640 | 763 | ||
641 | # | 764 | # |
642 | # Wireless LAN | 765 | # Wireless LAN |
643 | # | 766 | # |
644 | # CONFIG_WLAN_PRE80211 is not set | 767 | # CONFIG_WLAN_PRE80211 is not set |
645 | # CONFIG_WLAN_80211 is not set | 768 | CONFIG_WLAN_80211=y |
769 | # CONFIG_PCMCIA_RAYCS is not set | ||
770 | # CONFIG_IPW2100 is not set | ||
771 | # CONFIG_IPW2200 is not set | ||
772 | CONFIG_LIBERTAS=m | ||
773 | # CONFIG_LIBERTAS_USB is not set | ||
774 | # CONFIG_LIBERTAS_CS is not set | ||
775 | CONFIG_LIBERTAS_SDIO=m | ||
776 | # CONFIG_LIBERTAS_DEBUG is not set | ||
777 | # CONFIG_HERMES is not set | ||
778 | # CONFIG_ATMEL is not set | ||
779 | # CONFIG_AIRO_CS is not set | ||
780 | # CONFIG_PCMCIA_WL3501 is not set | ||
781 | # CONFIG_PRISM54 is not set | ||
782 | # CONFIG_USB_ZD1201 is not set | ||
783 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
784 | # CONFIG_IWLWIFI is not set | ||
785 | # CONFIG_IWLWIFI_LEDS is not set | ||
786 | # CONFIG_HOSTAP is not set | ||
646 | 787 | ||
647 | # | 788 | # |
648 | # USB Network Adapters | 789 | # USB Network Adapters |
@@ -651,15 +792,24 @@ CONFIG_NETDEV_10000=y | |||
651 | # CONFIG_USB_KAWETH is not set | 792 | # CONFIG_USB_KAWETH is not set |
652 | # CONFIG_USB_PEGASUS is not set | 793 | # CONFIG_USB_PEGASUS is not set |
653 | # CONFIG_USB_RTL8150 is not set | 794 | # CONFIG_USB_RTL8150 is not set |
654 | # CONFIG_USB_USBNET_MII is not set | ||
655 | # CONFIG_USB_USBNET is not set | 795 | # CONFIG_USB_USBNET is not set |
796 | # CONFIG_NET_PCMCIA is not set | ||
656 | # CONFIG_WAN is not set | 797 | # CONFIG_WAN is not set |
657 | # CONFIG_FDDI is not set | 798 | # CONFIG_FDDI is not set |
658 | # CONFIG_HIPPI is not set | 799 | # CONFIG_HIPPI is not set |
659 | # CONFIG_PPP is not set | 800 | CONFIG_PPP=m |
801 | CONFIG_PPP_MULTILINK=y | ||
802 | CONFIG_PPP_FILTER=y | ||
803 | CONFIG_PPP_ASYNC=m | ||
804 | # CONFIG_PPP_SYNC_TTY is not set | ||
805 | CONFIG_PPP_DEFLATE=m | ||
806 | CONFIG_PPP_BSDCOMP=m | ||
807 | # CONFIG_PPP_MPPE is not set | ||
808 | # CONFIG_PPPOE is not set | ||
809 | # CONFIG_PPPOL2TP is not set | ||
660 | # CONFIG_SLIP is not set | 810 | # CONFIG_SLIP is not set |
811 | CONFIG_SLHC=m | ||
661 | # CONFIG_NET_FC is not set | 812 | # CONFIG_NET_FC is not set |
662 | # CONFIG_SHAPER is not set | ||
663 | # CONFIG_NETCONSOLE is not set | 813 | # CONFIG_NETCONSOLE is not set |
664 | # CONFIG_NETPOLL is not set | 814 | # CONFIG_NETPOLL is not set |
665 | # CONFIG_NET_POLL_CONTROLLER is not set | 815 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -675,20 +825,32 @@ CONFIG_INPUT=y | |||
675 | # | 825 | # |
676 | # Userland interfaces | 826 | # Userland interfaces |
677 | # | 827 | # |
678 | # CONFIG_INPUT_MOUSEDEV is not set | 828 | CONFIG_INPUT_MOUSEDEV=y |
829 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
830 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
831 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
679 | # CONFIG_INPUT_JOYDEV is not set | 832 | # CONFIG_INPUT_JOYDEV is not set |
680 | # CONFIG_INPUT_TSDEV is not set | ||
681 | CONFIG_INPUT_EVDEV=y | 833 | CONFIG_INPUT_EVDEV=y |
682 | # CONFIG_INPUT_EVBUG is not set | 834 | # CONFIG_INPUT_EVBUG is not set |
835 | # CONFIG_INPUT_APMPOWER is not set | ||
683 | 836 | ||
684 | # | 837 | # |
685 | # Input Device Drivers | 838 | # Input Device Drivers |
686 | # | 839 | # |
687 | # CONFIG_INPUT_KEYBOARD is not set | 840 | CONFIG_INPUT_KEYBOARD=y |
841 | CONFIG_KEYBOARD_ATKBD=y | ||
842 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
843 | # CONFIG_KEYBOARD_LKKBD is not set | ||
844 | # CONFIG_KEYBOARD_XTKBD is not set | ||
845 | # CONFIG_KEYBOARD_NEWTON is not set | ||
846 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
847 | CONFIG_KEYBOARD_PXA27x=m | ||
848 | # CONFIG_KEYBOARD_GPIO is not set | ||
688 | # CONFIG_INPUT_MOUSE is not set | 849 | # CONFIG_INPUT_MOUSE is not set |
689 | # CONFIG_INPUT_JOYSTICK is not set | 850 | # CONFIG_INPUT_JOYSTICK is not set |
690 | # CONFIG_INPUT_TABLET is not set | 851 | # CONFIG_INPUT_TABLET is not set |
691 | CONFIG_INPUT_TOUCHSCREEN=y | 852 | CONFIG_INPUT_TOUCHSCREEN=y |
853 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
692 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 854 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
693 | # CONFIG_TOUCHSCREEN_ELO is not set | 855 | # CONFIG_TOUCHSCREEN_ELO is not set |
694 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 856 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
@@ -697,13 +859,22 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
697 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | 859 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set |
698 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | 860 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
699 | CONFIG_TOUCHSCREEN_UCB1400=m | 861 | CONFIG_TOUCHSCREEN_UCB1400=m |
862 | CONFIG_TOUCHSCREEN_WM97XX=m | ||
863 | # CONFIG_TOUCHSCREEN_WM9705 is not set | ||
864 | CONFIG_TOUCHSCREEN_WM9712=y | ||
865 | # CONFIG_TOUCHSCREEN_WM9713 is not set | ||
866 | # CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set | ||
700 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | 867 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set |
701 | # CONFIG_INPUT_MISC is not set | 868 | # CONFIG_INPUT_MISC is not set |
702 | 869 | ||
703 | # | 870 | # |
704 | # Hardware I/O ports | 871 | # Hardware I/O ports |
705 | # | 872 | # |
706 | # CONFIG_SERIO is not set | 873 | CONFIG_SERIO=y |
874 | # CONFIG_SERIO_SERPORT is not set | ||
875 | # CONFIG_SERIO_PCIPS2 is not set | ||
876 | CONFIG_SERIO_LIBPS2=y | ||
877 | # CONFIG_SERIO_RAW is not set | ||
707 | # CONFIG_GAMEPORT is not set | 878 | # CONFIG_GAMEPORT is not set |
708 | 879 | ||
709 | # | 880 | # |
@@ -713,7 +884,9 @@ CONFIG_VT=y | |||
713 | CONFIG_VT_CONSOLE=y | 884 | CONFIG_VT_CONSOLE=y |
714 | CONFIG_HW_CONSOLE=y | 885 | CONFIG_HW_CONSOLE=y |
715 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 886 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
887 | CONFIG_DEVKMEM=y | ||
716 | # CONFIG_SERIAL_NONSTANDARD is not set | 888 | # CONFIG_SERIAL_NONSTANDARD is not set |
889 | # CONFIG_NOZOMI is not set | ||
717 | 890 | ||
718 | # | 891 | # |
719 | # Serial drivers | 892 | # Serial drivers |
@@ -730,83 +903,141 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
730 | # CONFIG_SERIAL_JSM is not set | 903 | # CONFIG_SERIAL_JSM is not set |
731 | CONFIG_UNIX98_PTYS=y | 904 | CONFIG_UNIX98_PTYS=y |
732 | CONFIG_LEGACY_PTYS=y | 905 | CONFIG_LEGACY_PTYS=y |
733 | CONFIG_LEGACY_PTY_COUNT=256 | 906 | CONFIG_LEGACY_PTY_COUNT=16 |
734 | # CONFIG_IPMI_HANDLER is not set | 907 | # CONFIG_IPMI_HANDLER is not set |
735 | # CONFIG_WATCHDOG is not set | 908 | # CONFIG_HW_RANDOM is not set |
736 | CONFIG_HW_RANDOM=m | ||
737 | # CONFIG_NVRAM is not set | 909 | # CONFIG_NVRAM is not set |
738 | # CONFIG_R3964 is not set | 910 | # CONFIG_R3964 is not set |
739 | # CONFIG_APPLICOM is not set | 911 | # CONFIG_APPLICOM is not set |
740 | # CONFIG_DRM is not set | 912 | |
913 | # | ||
914 | # PCMCIA character devices | ||
915 | # | ||
916 | # CONFIG_SYNCLINK_CS is not set | ||
917 | # CONFIG_CARDMAN_4000 is not set | ||
918 | # CONFIG_CARDMAN_4040 is not set | ||
919 | # CONFIG_IPWIRELESS is not set | ||
741 | # CONFIG_RAW_DRIVER is not set | 920 | # CONFIG_RAW_DRIVER is not set |
742 | # CONFIG_TCG_TPM is not set | 921 | # CONFIG_TCG_TPM is not set |
743 | CONFIG_DEVPORT=y | 922 | CONFIG_DEVPORT=y |
744 | # CONFIG_I2C is not set | 923 | CONFIG_I2C=y |
924 | CONFIG_I2C_BOARDINFO=y | ||
925 | CONFIG_I2C_CHARDEV=m | ||
926 | |||
927 | # | ||
928 | # I2C Hardware Bus support | ||
929 | # | ||
930 | # CONFIG_I2C_ALI1535 is not set | ||
931 | # CONFIG_I2C_ALI1563 is not set | ||
932 | # CONFIG_I2C_ALI15X3 is not set | ||
933 | # CONFIG_I2C_AMD756 is not set | ||
934 | # CONFIG_I2C_AMD8111 is not set | ||
935 | # CONFIG_I2C_GPIO is not set | ||
936 | # CONFIG_I2C_I801 is not set | ||
937 | # CONFIG_I2C_I810 is not set | ||
938 | CONFIG_I2C_PXA=y | ||
939 | # CONFIG_I2C_PXA_SLAVE is not set | ||
940 | # CONFIG_I2C_PIIX4 is not set | ||
941 | # CONFIG_I2C_NFORCE2 is not set | ||
942 | # CONFIG_I2C_OCORES is not set | ||
943 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
944 | # CONFIG_I2C_PROSAVAGE is not set | ||
945 | # CONFIG_I2C_SAVAGE4 is not set | ||
946 | # CONFIG_I2C_SIMTEC is not set | ||
947 | # CONFIG_I2C_SIS5595 is not set | ||
948 | # CONFIG_I2C_SIS630 is not set | ||
949 | # CONFIG_I2C_SIS96X is not set | ||
950 | # CONFIG_I2C_TAOS_EVM is not set | ||
951 | # CONFIG_I2C_STUB is not set | ||
952 | # CONFIG_I2C_TINY_USB is not set | ||
953 | # CONFIG_I2C_VIA is not set | ||
954 | # CONFIG_I2C_VIAPRO is not set | ||
955 | # CONFIG_I2C_VOODOO3 is not set | ||
956 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
957 | |||
958 | # | ||
959 | # Miscellaneous I2C Chip support | ||
960 | # | ||
961 | # CONFIG_DS1682 is not set | ||
962 | # CONFIG_SENSORS_EEPROM is not set | ||
963 | # CONFIG_SENSORS_PCF8574 is not set | ||
964 | # CONFIG_PCF8575 is not set | ||
965 | # CONFIG_SENSORS_PCF8591 is not set | ||
966 | # CONFIG_TPS65010 is not set | ||
967 | # CONFIG_SENSORS_MAX6875 is not set | ||
968 | # CONFIG_SENSORS_TSL2550 is not set | ||
969 | # CONFIG_I2C_DEBUG_CORE is not set | ||
970 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
971 | # CONFIG_I2C_DEBUG_BUS is not set | ||
972 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
973 | # CONFIG_SPI is not set | ||
974 | CONFIG_HAVE_GPIO_LIB=y | ||
745 | 975 | ||
746 | # | 976 | # |
747 | # SPI support | 977 | # GPIO Support |
748 | # | 978 | # |
749 | # CONFIG_SPI is not set | 979 | # CONFIG_DEBUG_GPIO is not set |
750 | # CONFIG_SPI_MASTER is not set | ||
751 | # CONFIG_W1 is not set | ||
752 | # CONFIG_HWMON is not set | ||
753 | CONFIG_MISC_DEVICES=y | ||
754 | # CONFIG_PHANTOM is not set | ||
755 | # CONFIG_EEPROM_93CX6 is not set | ||
756 | # CONFIG_SGI_IOC4 is not set | ||
757 | # CONFIG_TIFM_CORE is not set | ||
758 | 980 | ||
759 | # | 981 | # |
760 | # Multifunction device drivers | 982 | # I2C GPIO expanders: |
761 | # | 983 | # |
762 | # CONFIG_MFD_SM501 is not set | 984 | # CONFIG_GPIO_PCA953X is not set |
985 | # CONFIG_GPIO_PCF857X is not set | ||
763 | 986 | ||
764 | # | 987 | # |
765 | # LED devices | 988 | # SPI GPIO expanders: |
766 | # | 989 | # |
767 | CONFIG_NEW_LEDS=y | 990 | # CONFIG_W1 is not set |
768 | CONFIG_LEDS_CLASS=y | 991 | # CONFIG_POWER_SUPPLY is not set |
992 | # CONFIG_HWMON is not set | ||
993 | # CONFIG_WATCHDOG is not set | ||
769 | 994 | ||
770 | # | 995 | # |
771 | # LED drivers | 996 | # Sonics Silicon Backplane |
772 | # | 997 | # |
773 | CONFIG_LEDS_CM_X270=y | 998 | CONFIG_SSB_POSSIBLE=y |
999 | # CONFIG_SSB is not set | ||
774 | 1000 | ||
775 | # | 1001 | # |
776 | # LED Triggers | 1002 | # Multifunction device drivers |
777 | # | 1003 | # |
778 | CONFIG_LEDS_TRIGGERS=y | 1004 | # CONFIG_MFD_SM501 is not set |
779 | # CONFIG_LEDS_TRIGGER_TIMER is not set | 1005 | # CONFIG_MFD_ASIC3 is not set |
780 | # CONFIG_LEDS_TRIGGER_IDE_DISK is not set | 1006 | # CONFIG_HTC_EGPIO is not set |
781 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 1007 | # CONFIG_HTC_PASIC3 is not set |
782 | 1008 | ||
783 | # | 1009 | # |
784 | # Multimedia devices | 1010 | # Multimedia devices |
785 | # | 1011 | # |
1012 | |||
1013 | # | ||
1014 | # Multimedia core support | ||
1015 | # | ||
786 | # CONFIG_VIDEO_DEV is not set | 1016 | # CONFIG_VIDEO_DEV is not set |
787 | # CONFIG_DVB_CORE is not set | 1017 | # CONFIG_DVB_CORE is not set |
788 | CONFIG_DAB=y | ||
789 | # CONFIG_USB_DABUSB is not set | ||
790 | 1018 | ||
791 | # | 1019 | # |
792 | # Graphics support | 1020 | # Multimedia drivers |
793 | # | 1021 | # |
794 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1022 | # CONFIG_DAB is not set |
795 | 1023 | ||
796 | # | 1024 | # |
797 | # Display device support | 1025 | # Graphics support |
798 | # | 1026 | # |
799 | # CONFIG_DISPLAY_SUPPORT is not set | 1027 | # CONFIG_DRM is not set |
800 | # CONFIG_VGASTATE is not set | 1028 | # CONFIG_VGASTATE is not set |
1029 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
801 | CONFIG_FB=y | 1030 | CONFIG_FB=y |
802 | # CONFIG_FIRMWARE_EDID is not set | 1031 | # CONFIG_FIRMWARE_EDID is not set |
803 | # CONFIG_FB_DDC is not set | 1032 | # CONFIG_FB_DDC is not set |
804 | CONFIG_FB_CFB_FILLRECT=y | 1033 | CONFIG_FB_CFB_FILLRECT=y |
805 | CONFIG_FB_CFB_COPYAREA=y | 1034 | CONFIG_FB_CFB_COPYAREA=y |
806 | CONFIG_FB_CFB_IMAGEBLIT=y | 1035 | CONFIG_FB_CFB_IMAGEBLIT=y |
1036 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
807 | # CONFIG_FB_SYS_FILLRECT is not set | 1037 | # CONFIG_FB_SYS_FILLRECT is not set |
808 | # CONFIG_FB_SYS_COPYAREA is not set | 1038 | # CONFIG_FB_SYS_COPYAREA is not set |
809 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1039 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1040 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
810 | # CONFIG_FB_SYS_FOPS is not set | 1041 | # CONFIG_FB_SYS_FOPS is not set |
811 | CONFIG_FB_DEFERRED_IO=y | 1042 | CONFIG_FB_DEFERRED_IO=y |
812 | # CONFIG_FB_SVGALIB is not set | 1043 | # CONFIG_FB_SVGALIB is not set |
@@ -842,9 +1073,17 @@ CONFIG_FB_DEFERRED_IO=y | |||
842 | # CONFIG_FB_ARK is not set | 1073 | # CONFIG_FB_ARK is not set |
843 | # CONFIG_FB_PM3 is not set | 1074 | # CONFIG_FB_PM3 is not set |
844 | CONFIG_FB_PXA=y | 1075 | CONFIG_FB_PXA=y |
845 | # CONFIG_FB_PXA_PARAMETERS is not set | 1076 | # CONFIG_FB_PXA_SMARTPANEL is not set |
1077 | CONFIG_FB_PXA_PARAMETERS=y | ||
846 | CONFIG_FB_MBX=m | 1078 | CONFIG_FB_MBX=m |
1079 | # CONFIG_FB_AM200EPD is not set | ||
847 | # CONFIG_FB_VIRTUAL is not set | 1080 | # CONFIG_FB_VIRTUAL is not set |
1081 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
1082 | |||
1083 | # | ||
1084 | # Display device support | ||
1085 | # | ||
1086 | # CONFIG_DISPLAY_SUPPORT is not set | ||
848 | 1087 | ||
849 | # | 1088 | # |
850 | # Console display driver support | 1089 | # Console display driver support |
@@ -904,10 +1143,12 @@ CONFIG_SND_AC97_CODEC=m | |||
904 | # CONFIG_SND_AU8810 is not set | 1143 | # CONFIG_SND_AU8810 is not set |
905 | # CONFIG_SND_AU8820 is not set | 1144 | # CONFIG_SND_AU8820 is not set |
906 | # CONFIG_SND_AU8830 is not set | 1145 | # CONFIG_SND_AU8830 is not set |
1146 | # CONFIG_SND_AW2 is not set | ||
907 | # CONFIG_SND_AZT3328 is not set | 1147 | # CONFIG_SND_AZT3328 is not set |
908 | # CONFIG_SND_BT87X is not set | 1148 | # CONFIG_SND_BT87X is not set |
909 | # CONFIG_SND_CA0106 is not set | 1149 | # CONFIG_SND_CA0106 is not set |
910 | # CONFIG_SND_CMIPCI is not set | 1150 | # CONFIG_SND_CMIPCI is not set |
1151 | # CONFIG_SND_OXYGEN is not set | ||
911 | # CONFIG_SND_CS4281 is not set | 1152 | # CONFIG_SND_CS4281 is not set |
912 | # CONFIG_SND_CS46XX is not set | 1153 | # CONFIG_SND_CS46XX is not set |
913 | # CONFIG_SND_DARLA20 is not set | 1154 | # CONFIG_SND_DARLA20 is not set |
@@ -932,6 +1173,7 @@ CONFIG_SND_AC97_CODEC=m | |||
932 | # CONFIG_SND_HDA_INTEL is not set | 1173 | # CONFIG_SND_HDA_INTEL is not set |
933 | # CONFIG_SND_HDSP is not set | 1174 | # CONFIG_SND_HDSP is not set |
934 | # CONFIG_SND_HDSPM is not set | 1175 | # CONFIG_SND_HDSPM is not set |
1176 | # CONFIG_SND_HIFIER is not set | ||
935 | # CONFIG_SND_ICE1712 is not set | 1177 | # CONFIG_SND_ICE1712 is not set |
936 | # CONFIG_SND_ICE1724 is not set | 1178 | # CONFIG_SND_ICE1724 is not set |
937 | # CONFIG_SND_INTEL8X0 is not set | 1179 | # CONFIG_SND_INTEL8X0 is not set |
@@ -949,6 +1191,7 @@ CONFIG_SND_AC97_CODEC=m | |||
949 | # CONFIG_SND_TRIDENT is not set | 1191 | # CONFIG_SND_TRIDENT is not set |
950 | # CONFIG_SND_VIA82XX is not set | 1192 | # CONFIG_SND_VIA82XX is not set |
951 | # CONFIG_SND_VIA82XX_MODEM is not set | 1193 | # CONFIG_SND_VIA82XX_MODEM is not set |
1194 | # CONFIG_SND_VIRTUOSO is not set | ||
952 | # CONFIG_SND_VX222 is not set | 1195 | # CONFIG_SND_VX222 is not set |
953 | # CONFIG_SND_YMFPCI is not set | 1196 | # CONFIG_SND_YMFPCI is not set |
954 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1197 | # CONFIG_SND_AC97_POWER_SAVE is not set |
@@ -966,18 +1209,33 @@ CONFIG_SND_PXA2XX_AC97=m | |||
966 | # CONFIG_SND_USB_CAIAQ is not set | 1209 | # CONFIG_SND_USB_CAIAQ is not set |
967 | 1210 | ||
968 | # | 1211 | # |
1212 | # PCMCIA devices | ||
1213 | # | ||
1214 | # CONFIG_SND_VXPOCKET is not set | ||
1215 | # CONFIG_SND_PDAUDIOCF is not set | ||
1216 | |||
1217 | # | ||
969 | # System on Chip audio support | 1218 | # System on Chip audio support |
970 | # | 1219 | # |
971 | # CONFIG_SND_SOC is not set | 1220 | # CONFIG_SND_SOC is not set |
972 | 1221 | ||
973 | # | 1222 | # |
1223 | # ALSA SoC audio for Freescale SOCs | ||
1224 | # | ||
1225 | |||
1226 | # | ||
1227 | # SoC Audio for the Texas Instruments OMAP | ||
1228 | # | ||
1229 | |||
1230 | # | ||
974 | # Open Sound System | 1231 | # Open Sound System |
975 | # | 1232 | # |
976 | # CONFIG_SOUND_PRIME is not set | 1233 | # CONFIG_SOUND_PRIME is not set |
977 | CONFIG_AC97_BUS=m | 1234 | CONFIG_AC97_BUS=m |
978 | CONFIG_HID_SUPPORT=y | 1235 | CONFIG_HID_SUPPORT=y |
979 | CONFIG_HID=y | 1236 | CONFIG_HID=y |
980 | # CONFIG_HID_DEBUG is not set | 1237 | CONFIG_HID_DEBUG=y |
1238 | # CONFIG_HIDRAW is not set | ||
981 | 1239 | ||
982 | # | 1240 | # |
983 | # USB Input Devices | 1241 | # USB Input Devices |
@@ -992,6 +1250,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
992 | CONFIG_USB_ARCH_HAS_EHCI=y | 1250 | CONFIG_USB_ARCH_HAS_EHCI=y |
993 | CONFIG_USB=y | 1251 | CONFIG_USB=y |
994 | # CONFIG_USB_DEBUG is not set | 1252 | # CONFIG_USB_DEBUG is not set |
1253 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
995 | 1254 | ||
996 | # | 1255 | # |
997 | # Miscellaneous USB options | 1256 | # Miscellaneous USB options |
@@ -1000,8 +1259,9 @@ CONFIG_USB_DEVICEFS=y | |||
1000 | # CONFIG_USB_DEVICE_CLASS is not set | 1259 | # CONFIG_USB_DEVICE_CLASS is not set |
1001 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1260 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1002 | # CONFIG_USB_SUSPEND is not set | 1261 | # CONFIG_USB_SUSPEND is not set |
1003 | # CONFIG_USB_PERSIST is not set | ||
1004 | # CONFIG_USB_OTG is not set | 1262 | # CONFIG_USB_OTG is not set |
1263 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1264 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1005 | 1265 | ||
1006 | # | 1266 | # |
1007 | # USB Host Controller Drivers | 1267 | # USB Host Controller Drivers |
@@ -1033,13 +1293,16 @@ CONFIG_USB_STORAGE=y | |||
1033 | # CONFIG_USB_STORAGE_DEBUG is not set | 1293 | # CONFIG_USB_STORAGE_DEBUG is not set |
1034 | # CONFIG_USB_STORAGE_DATAFAB is not set | 1294 | # CONFIG_USB_STORAGE_DATAFAB is not set |
1035 | # CONFIG_USB_STORAGE_FREECOM is not set | 1295 | # CONFIG_USB_STORAGE_FREECOM is not set |
1296 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
1036 | # CONFIG_USB_STORAGE_DPCM is not set | 1297 | # CONFIG_USB_STORAGE_DPCM is not set |
1037 | # CONFIG_USB_STORAGE_USBAT is not set | 1298 | # CONFIG_USB_STORAGE_USBAT is not set |
1038 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1299 | # CONFIG_USB_STORAGE_SDDR09 is not set |
1039 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1300 | # CONFIG_USB_STORAGE_SDDR55 is not set |
1040 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1301 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
1041 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1302 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1303 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1042 | # CONFIG_USB_STORAGE_KARMA is not set | 1304 | # CONFIG_USB_STORAGE_KARMA is not set |
1305 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1043 | # CONFIG_USB_LIBUSUAL is not set | 1306 | # CONFIG_USB_LIBUSUAL is not set |
1044 | 1307 | ||
1045 | # | 1308 | # |
@@ -1052,10 +1315,6 @@ CONFIG_USB_MON=y | |||
1052 | # | 1315 | # |
1053 | # USB port drivers | 1316 | # USB port drivers |
1054 | # | 1317 | # |
1055 | |||
1056 | # | ||
1057 | # USB Serial Converter support | ||
1058 | # | ||
1059 | # CONFIG_USB_SERIAL is not set | 1318 | # CONFIG_USB_SERIAL is not set |
1060 | 1319 | ||
1061 | # | 1320 | # |
@@ -1080,14 +1339,6 @@ CONFIG_USB_MON=y | |||
1080 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1339 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1081 | # CONFIG_USB_IOWARRIOR is not set | 1340 | # CONFIG_USB_IOWARRIOR is not set |
1082 | # CONFIG_USB_TEST is not set | 1341 | # CONFIG_USB_TEST is not set |
1083 | |||
1084 | # | ||
1085 | # USB DSL modem support | ||
1086 | # | ||
1087 | |||
1088 | # | ||
1089 | # USB Gadget Support | ||
1090 | # | ||
1091 | # CONFIG_USB_GADGET is not set | 1342 | # CONFIG_USB_GADGET is not set |
1092 | CONFIG_MMC=m | 1343 | CONFIG_MMC=m |
1093 | # CONFIG_MMC_DEBUG is not set | 1344 | # CONFIG_MMC_DEBUG is not set |
@@ -1098,6 +1349,7 @@ CONFIG_MMC=m | |||
1098 | # | 1349 | # |
1099 | CONFIG_MMC_BLOCK=m | 1350 | CONFIG_MMC_BLOCK=m |
1100 | CONFIG_MMC_BLOCK_BOUNCE=y | 1351 | CONFIG_MMC_BLOCK_BOUNCE=y |
1352 | # CONFIG_SDIO_UART is not set | ||
1101 | 1353 | ||
1102 | # | 1354 | # |
1103 | # MMC/SD Host Controller Drivers | 1355 | # MMC/SD Host Controller Drivers |
@@ -1105,10 +1357,22 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
1105 | CONFIG_MMC_PXA=m | 1357 | CONFIG_MMC_PXA=m |
1106 | # CONFIG_MMC_SDHCI is not set | 1358 | # CONFIG_MMC_SDHCI is not set |
1107 | # CONFIG_MMC_TIFM_SD is not set | 1359 | # CONFIG_MMC_TIFM_SD is not set |
1360 | CONFIG_NEW_LEDS=y | ||
1361 | CONFIG_LEDS_CLASS=y | ||
1108 | 1362 | ||
1109 | # | 1363 | # |
1110 | # Real Time Clock | 1364 | # LED drivers |
1365 | # | ||
1366 | # CONFIG_LEDS_GPIO is not set | ||
1367 | CONFIG_LEDS_CM_X270=y | ||
1368 | |||
1369 | # | ||
1370 | # LED Triggers | ||
1111 | # | 1371 | # |
1372 | CONFIG_LEDS_TRIGGERS=y | ||
1373 | # CONFIG_LEDS_TRIGGER_TIMER is not set | ||
1374 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
1375 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
1112 | CONFIG_RTC_LIB=y | 1376 | CONFIG_RTC_LIB=y |
1113 | CONFIG_RTC_CLASS=y | 1377 | CONFIG_RTC_CLASS=y |
1114 | CONFIG_RTC_HCTOSYS=y | 1378 | CONFIG_RTC_HCTOSYS=y |
@@ -1125,11 +1389,32 @@ CONFIG_RTC_INTF_DEV=y | |||
1125 | # CONFIG_RTC_DRV_TEST is not set | 1389 | # CONFIG_RTC_DRV_TEST is not set |
1126 | 1390 | ||
1127 | # | 1391 | # |
1392 | # I2C RTC drivers | ||
1393 | # | ||
1394 | # CONFIG_RTC_DRV_DS1307 is not set | ||
1395 | # CONFIG_RTC_DRV_DS1374 is not set | ||
1396 | # CONFIG_RTC_DRV_DS1672 is not set | ||
1397 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
1398 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
1399 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
1400 | # CONFIG_RTC_DRV_X1205 is not set | ||
1401 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
1402 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
1403 | # CONFIG_RTC_DRV_M41T80 is not set | ||
1404 | # CONFIG_RTC_DRV_S35390A is not set | ||
1405 | |||
1406 | # | ||
1407 | # SPI RTC drivers | ||
1408 | # | ||
1409 | |||
1410 | # | ||
1128 | # Platform RTC drivers | 1411 | # Platform RTC drivers |
1129 | # | 1412 | # |
1130 | # CONFIG_RTC_DRV_CMOS is not set | 1413 | # CONFIG_RTC_DRV_CMOS is not set |
1414 | # CONFIG_RTC_DRV_DS1511 is not set | ||
1131 | # CONFIG_RTC_DRV_DS1553 is not set | 1415 | # CONFIG_RTC_DRV_DS1553 is not set |
1132 | # CONFIG_RTC_DRV_DS1742 is not set | 1416 | # CONFIG_RTC_DRV_DS1742 is not set |
1417 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
1133 | # CONFIG_RTC_DRV_M48T86 is not set | 1418 | # CONFIG_RTC_DRV_M48T86 is not set |
1134 | # CONFIG_RTC_DRV_M48T59 is not set | 1419 | # CONFIG_RTC_DRV_M48T59 is not set |
1135 | CONFIG_RTC_DRV_V3020=y | 1420 | CONFIG_RTC_DRV_V3020=y |
@@ -1138,19 +1423,7 @@ CONFIG_RTC_DRV_V3020=y | |||
1138 | # on-CPU RTC drivers | 1423 | # on-CPU RTC drivers |
1139 | # | 1424 | # |
1140 | CONFIG_RTC_DRV_SA1100=y | 1425 | CONFIG_RTC_DRV_SA1100=y |
1141 | 1426 | # CONFIG_UIO is not set | |
1142 | # | ||
1143 | # DMA Engine support | ||
1144 | # | ||
1145 | # CONFIG_DMA_ENGINE is not set | ||
1146 | |||
1147 | # | ||
1148 | # DMA Clients | ||
1149 | # | ||
1150 | |||
1151 | # | ||
1152 | # DMA Devices | ||
1153 | # | ||
1154 | 1427 | ||
1155 | # | 1428 | # |
1156 | # File systems | 1429 | # File systems |
@@ -1164,20 +1437,16 @@ CONFIG_EXT3_FS_XATTR=y | |||
1164 | # CONFIG_EXT3_FS_SECURITY is not set | 1437 | # CONFIG_EXT3_FS_SECURITY is not set |
1165 | # CONFIG_EXT4DEV_FS is not set | 1438 | # CONFIG_EXT4DEV_FS is not set |
1166 | CONFIG_JBD=y | 1439 | CONFIG_JBD=y |
1167 | # CONFIG_JBD_DEBUG is not set | ||
1168 | CONFIG_FS_MBCACHE=y | 1440 | CONFIG_FS_MBCACHE=y |
1169 | # CONFIG_REISERFS_FS is not set | 1441 | # CONFIG_REISERFS_FS is not set |
1170 | # CONFIG_JFS_FS is not set | 1442 | # CONFIG_JFS_FS is not set |
1171 | # CONFIG_FS_POSIX_ACL is not set | 1443 | # CONFIG_FS_POSIX_ACL is not set |
1172 | # CONFIG_XFS_FS is not set | 1444 | # CONFIG_XFS_FS is not set |
1173 | # CONFIG_GFS2_FS is not set | ||
1174 | # CONFIG_OCFS2_FS is not set | 1445 | # CONFIG_OCFS2_FS is not set |
1175 | # CONFIG_MINIX_FS is not set | 1446 | CONFIG_DNOTIFY=y |
1176 | # CONFIG_ROMFS_FS is not set | ||
1177 | CONFIG_INOTIFY=y | 1447 | CONFIG_INOTIFY=y |
1178 | CONFIG_INOTIFY_USER=y | 1448 | CONFIG_INOTIFY_USER=y |
1179 | # CONFIG_QUOTA is not set | 1449 | # CONFIG_QUOTA is not set |
1180 | CONFIG_DNOTIFY=y | ||
1181 | # CONFIG_AUTOFS_FS is not set | 1450 | # CONFIG_AUTOFS_FS is not set |
1182 | # CONFIG_AUTOFS4_FS is not set | 1451 | # CONFIG_AUTOFS4_FS is not set |
1183 | # CONFIG_FUSE_FS is not set | 1452 | # CONFIG_FUSE_FS is not set |
@@ -1191,9 +1460,9 @@ CONFIG_DNOTIFY=y | |||
1191 | # | 1460 | # |
1192 | # DOS/FAT/NT Filesystems | 1461 | # DOS/FAT/NT Filesystems |
1193 | # | 1462 | # |
1194 | CONFIG_FAT_FS=y | 1463 | CONFIG_FAT_FS=m |
1195 | CONFIG_MSDOS_FS=y | 1464 | # CONFIG_MSDOS_FS is not set |
1196 | CONFIG_VFAT_FS=y | 1465 | CONFIG_VFAT_FS=m |
1197 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | 1466 | CONFIG_FAT_DEFAULT_CODEPAGE=437 |
1198 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | 1467 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" |
1199 | # CONFIG_NTFS_FS is not set | 1468 | # CONFIG_NTFS_FS is not set |
@@ -1207,7 +1476,6 @@ CONFIG_SYSFS=y | |||
1207 | CONFIG_TMPFS=y | 1476 | CONFIG_TMPFS=y |
1208 | # CONFIG_TMPFS_POSIX_ACL is not set | 1477 | # CONFIG_TMPFS_POSIX_ACL is not set |
1209 | # CONFIG_HUGETLB_PAGE is not set | 1478 | # CONFIG_HUGETLB_PAGE is not set |
1210 | CONFIG_RAMFS=y | ||
1211 | # CONFIG_CONFIGFS_FS is not set | 1479 | # CONFIG_CONFIGFS_FS is not set |
1212 | 1480 | ||
1213 | # | 1481 | # |
@@ -1220,22 +1488,30 @@ CONFIG_RAMFS=y | |||
1220 | # CONFIG_BEFS_FS is not set | 1488 | # CONFIG_BEFS_FS is not set |
1221 | # CONFIG_BFS_FS is not set | 1489 | # CONFIG_BFS_FS is not set |
1222 | # CONFIG_EFS_FS is not set | 1490 | # CONFIG_EFS_FS is not set |
1223 | # CONFIG_JFFS2_FS is not set | 1491 | CONFIG_JFFS2_FS=y |
1492 | CONFIG_JFFS2_FS_DEBUG=0 | ||
1493 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
1494 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
1495 | CONFIG_JFFS2_SUMMARY=y | ||
1496 | # CONFIG_JFFS2_FS_XATTR is not set | ||
1497 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
1498 | CONFIG_JFFS2_ZLIB=y | ||
1499 | # CONFIG_JFFS2_LZO is not set | ||
1500 | CONFIG_JFFS2_RTIME=y | ||
1501 | # CONFIG_JFFS2_RUBIN is not set | ||
1224 | # CONFIG_CRAMFS is not set | 1502 | # CONFIG_CRAMFS is not set |
1225 | # CONFIG_VXFS_FS is not set | 1503 | # CONFIG_VXFS_FS is not set |
1504 | # CONFIG_MINIX_FS is not set | ||
1226 | # CONFIG_HPFS_FS is not set | 1505 | # CONFIG_HPFS_FS is not set |
1227 | # CONFIG_QNX4FS_FS is not set | 1506 | # CONFIG_QNX4FS_FS is not set |
1507 | # CONFIG_ROMFS_FS is not set | ||
1228 | # CONFIG_SYSV_FS is not set | 1508 | # CONFIG_SYSV_FS is not set |
1229 | # CONFIG_UFS_FS is not set | 1509 | # CONFIG_UFS_FS is not set |
1230 | 1510 | CONFIG_NETWORK_FILESYSTEMS=y | |
1231 | # | ||
1232 | # Network File Systems | ||
1233 | # | ||
1234 | CONFIG_NFS_FS=y | 1511 | CONFIG_NFS_FS=y |
1235 | CONFIG_NFS_V3=y | 1512 | CONFIG_NFS_V3=y |
1236 | # CONFIG_NFS_V3_ACL is not set | 1513 | # CONFIG_NFS_V3_ACL is not set |
1237 | # CONFIG_NFS_V4 is not set | 1514 | # CONFIG_NFS_V4 is not set |
1238 | # CONFIG_NFS_DIRECTIO is not set | ||
1239 | # CONFIG_NFSD is not set | 1515 | # CONFIG_NFSD is not set |
1240 | CONFIG_ROOT_NFS=y | 1516 | CONFIG_ROOT_NFS=y |
1241 | CONFIG_LOCKD=y | 1517 | CONFIG_LOCKD=y |
@@ -1245,9 +1521,13 @@ CONFIG_SUNRPC=y | |||
1245 | # CONFIG_SUNRPC_BIND34 is not set | 1521 | # CONFIG_SUNRPC_BIND34 is not set |
1246 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1522 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1247 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1523 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1248 | CONFIG_SMB_FS=y | 1524 | # CONFIG_SMB_FS is not set |
1249 | # CONFIG_SMB_NLS_DEFAULT is not set | 1525 | CONFIG_CIFS=m |
1250 | # CONFIG_CIFS is not set | 1526 | # CONFIG_CIFS_STATS is not set |
1527 | # CONFIG_CIFS_WEAK_PW_HASH is not set | ||
1528 | # CONFIG_CIFS_XATTR is not set | ||
1529 | # CONFIG_CIFS_DEBUG2 is not set | ||
1530 | # CONFIG_CIFS_EXPERIMENTAL is not set | ||
1251 | # CONFIG_NCP_FS is not set | 1531 | # CONFIG_NCP_FS is not set |
1252 | # CONFIG_CODA_FS is not set | 1532 | # CONFIG_CODA_FS is not set |
1253 | # CONFIG_AFS_FS is not set | 1533 | # CONFIG_AFS_FS is not set |
@@ -1255,15 +1535,27 @@ CONFIG_SMB_FS=y | |||
1255 | # | 1535 | # |
1256 | # Partition Types | 1536 | # Partition Types |
1257 | # | 1537 | # |
1258 | # CONFIG_PARTITION_ADVANCED is not set | 1538 | CONFIG_PARTITION_ADVANCED=y |
1539 | # CONFIG_ACORN_PARTITION is not set | ||
1540 | # CONFIG_OSF_PARTITION is not set | ||
1541 | # CONFIG_AMIGA_PARTITION is not set | ||
1542 | # CONFIG_ATARI_PARTITION is not set | ||
1543 | # CONFIG_MAC_PARTITION is not set | ||
1259 | CONFIG_MSDOS_PARTITION=y | 1544 | CONFIG_MSDOS_PARTITION=y |
1260 | 1545 | # CONFIG_BSD_DISKLABEL is not set | |
1261 | # | 1546 | # CONFIG_MINIX_SUBPARTITION is not set |
1262 | # Native Language Support | 1547 | # CONFIG_SOLARIS_X86_PARTITION is not set |
1263 | # | 1548 | # CONFIG_UNIXWARE_DISKLABEL is not set |
1264 | CONFIG_NLS=y | 1549 | # CONFIG_LDM_PARTITION is not set |
1550 | # CONFIG_SGI_PARTITION is not set | ||
1551 | # CONFIG_ULTRIX_PARTITION is not set | ||
1552 | # CONFIG_SUN_PARTITION is not set | ||
1553 | # CONFIG_KARMA_PARTITION is not set | ||
1554 | # CONFIG_EFI_PARTITION is not set | ||
1555 | # CONFIG_SYSV68_PARTITION is not set | ||
1556 | CONFIG_NLS=m | ||
1265 | CONFIG_NLS_DEFAULT="iso8859-1" | 1557 | CONFIG_NLS_DEFAULT="iso8859-1" |
1266 | CONFIG_NLS_CODEPAGE_437=y | 1558 | CONFIG_NLS_CODEPAGE_437=m |
1267 | # CONFIG_NLS_CODEPAGE_737 is not set | 1559 | # CONFIG_NLS_CODEPAGE_737 is not set |
1268 | # CONFIG_NLS_CODEPAGE_775 is not set | 1560 | # CONFIG_NLS_CODEPAGE_775 is not set |
1269 | # CONFIG_NLS_CODEPAGE_850 is not set | 1561 | # CONFIG_NLS_CODEPAGE_850 is not set |
@@ -1287,7 +1579,7 @@ CONFIG_NLS_CODEPAGE_437=y | |||
1287 | # CONFIG_NLS_CODEPAGE_1250 is not set | 1579 | # CONFIG_NLS_CODEPAGE_1250 is not set |
1288 | # CONFIG_NLS_CODEPAGE_1251 is not set | 1580 | # CONFIG_NLS_CODEPAGE_1251 is not set |
1289 | # CONFIG_NLS_ASCII is not set | 1581 | # CONFIG_NLS_ASCII is not set |
1290 | CONFIG_NLS_ISO8859_1=y | 1582 | CONFIG_NLS_ISO8859_1=m |
1291 | # CONFIG_NLS_ISO8859_2 is not set | 1583 | # CONFIG_NLS_ISO8859_2 is not set |
1292 | # CONFIG_NLS_ISO8859_3 is not set | 1584 | # CONFIG_NLS_ISO8859_3 is not set |
1293 | # CONFIG_NLS_ISO8859_4 is not set | 1585 | # CONFIG_NLS_ISO8859_4 is not set |
@@ -1300,53 +1592,52 @@ CONFIG_NLS_ISO8859_1=y | |||
1300 | # CONFIG_NLS_ISO8859_15 is not set | 1592 | # CONFIG_NLS_ISO8859_15 is not set |
1301 | # CONFIG_NLS_KOI8_R is not set | 1593 | # CONFIG_NLS_KOI8_R is not set |
1302 | # CONFIG_NLS_KOI8_U is not set | 1594 | # CONFIG_NLS_KOI8_U is not set |
1303 | # CONFIG_NLS_UTF8 is not set | 1595 | CONFIG_NLS_UTF8=m |
1304 | |||
1305 | # | ||
1306 | # Distributed Lock Manager | ||
1307 | # | ||
1308 | # CONFIG_DLM is not set | 1596 | # CONFIG_DLM is not set |
1309 | 1597 | ||
1310 | # | 1598 | # |
1311 | # Profiling support | ||
1312 | # | ||
1313 | # CONFIG_PROFILING is not set | ||
1314 | |||
1315 | # | ||
1316 | # Kernel hacking | 1599 | # Kernel hacking |
1317 | # | 1600 | # |
1318 | # CONFIG_PRINTK_TIME is not set | 1601 | # CONFIG_PRINTK_TIME is not set |
1602 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1319 | CONFIG_ENABLE_MUST_CHECK=y | 1603 | CONFIG_ENABLE_MUST_CHECK=y |
1320 | CONFIG_MAGIC_SYSRQ=y | 1604 | CONFIG_FRAME_WARN=0 |
1605 | # CONFIG_MAGIC_SYSRQ is not set | ||
1321 | # CONFIG_UNUSED_SYMBOLS is not set | 1606 | # CONFIG_UNUSED_SYMBOLS is not set |
1322 | # CONFIG_DEBUG_FS is not set | 1607 | # CONFIG_DEBUG_FS is not set |
1323 | # CONFIG_HEADERS_CHECK is not set | 1608 | # CONFIG_HEADERS_CHECK is not set |
1324 | CONFIG_DEBUG_KERNEL=y | 1609 | CONFIG_DEBUG_KERNEL=y |
1325 | # CONFIG_DEBUG_SHIRQ is not set | 1610 | # CONFIG_DEBUG_SHIRQ is not set |
1326 | # CONFIG_DETECT_SOFTLOCKUP is not set | 1611 | # CONFIG_DETECT_SOFTLOCKUP is not set |
1327 | CONFIG_SCHED_DEBUG=y | 1612 | # CONFIG_SCHED_DEBUG is not set |
1328 | # CONFIG_SCHEDSTATS is not set | 1613 | # CONFIG_SCHEDSTATS is not set |
1329 | # CONFIG_TIMER_STATS is not set | 1614 | # CONFIG_TIMER_STATS is not set |
1330 | # CONFIG_DEBUG_SLAB is not set | 1615 | # CONFIG_DEBUG_OBJECTS is not set |
1331 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1616 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1332 | # CONFIG_RT_MUTEX_TESTER is not set | 1617 | # CONFIG_RT_MUTEX_TESTER is not set |
1333 | # CONFIG_DEBUG_SPINLOCK is not set | 1618 | # CONFIG_DEBUG_SPINLOCK is not set |
1334 | # CONFIG_DEBUG_MUTEXES is not set | 1619 | # CONFIG_DEBUG_MUTEXES is not set |
1335 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 1620 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
1336 | # CONFIG_PROVE_LOCKING is not set | 1621 | # CONFIG_PROVE_LOCKING is not set |
1622 | # CONFIG_LOCK_STAT is not set | ||
1337 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1623 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1338 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1624 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1339 | # CONFIG_DEBUG_KOBJECT is not set | 1625 | # CONFIG_DEBUG_KOBJECT is not set |
1340 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1626 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1341 | CONFIG_DEBUG_INFO=y | 1627 | # CONFIG_DEBUG_INFO is not set |
1342 | # CONFIG_DEBUG_VM is not set | 1628 | # CONFIG_DEBUG_VM is not set |
1629 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1343 | # CONFIG_DEBUG_LIST is not set | 1630 | # CONFIG_DEBUG_LIST is not set |
1631 | # CONFIG_DEBUG_SG is not set | ||
1344 | CONFIG_FRAME_POINTER=y | 1632 | CONFIG_FRAME_POINTER=y |
1345 | CONFIG_FORCED_INLINING=y | 1633 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1346 | # CONFIG_RCU_TORTURE_TEST is not set | 1634 | # CONFIG_RCU_TORTURE_TEST is not set |
1635 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1347 | # CONFIG_FAULT_INJECTION is not set | 1636 | # CONFIG_FAULT_INJECTION is not set |
1637 | # CONFIG_SAMPLES is not set | ||
1348 | CONFIG_DEBUG_USER=y | 1638 | CONFIG_DEBUG_USER=y |
1349 | CONFIG_DEBUG_ERRORS=y | 1639 | CONFIG_DEBUG_ERRORS=y |
1640 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
1350 | CONFIG_DEBUG_LL=y | 1641 | CONFIG_DEBUG_LL=y |
1351 | # CONFIG_DEBUG_ICEDCC is not set | 1642 | # CONFIG_DEBUG_ICEDCC is not set |
1352 | 1643 | ||
@@ -1355,55 +1646,96 @@ CONFIG_DEBUG_LL=y | |||
1355 | # | 1646 | # |
1356 | # CONFIG_KEYS is not set | 1647 | # CONFIG_KEYS is not set |
1357 | # CONFIG_SECURITY is not set | 1648 | # CONFIG_SECURITY is not set |
1649 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
1358 | CONFIG_CRYPTO=y | 1650 | CONFIG_CRYPTO=y |
1359 | CONFIG_CRYPTO_ALGAPI=m | 1651 | |
1360 | CONFIG_CRYPTO_BLKCIPHER=m | 1652 | # |
1361 | CONFIG_CRYPTO_MANAGER=m | 1653 | # Crypto core or helper |
1654 | # | ||
1655 | # CONFIG_CRYPTO_MANAGER is not set | ||
1656 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1657 | # CONFIG_CRYPTO_NULL is not set | ||
1658 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1659 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1660 | # CONFIG_CRYPTO_TEST is not set | ||
1661 | |||
1662 | # | ||
1663 | # Authenticated Encryption with Associated Data | ||
1664 | # | ||
1665 | # CONFIG_CRYPTO_CCM is not set | ||
1666 | # CONFIG_CRYPTO_GCM is not set | ||
1667 | # CONFIG_CRYPTO_SEQIV is not set | ||
1668 | |||
1669 | # | ||
1670 | # Block modes | ||
1671 | # | ||
1672 | # CONFIG_CRYPTO_CBC is not set | ||
1673 | # CONFIG_CRYPTO_CTR is not set | ||
1674 | # CONFIG_CRYPTO_CTS is not set | ||
1675 | # CONFIG_CRYPTO_ECB is not set | ||
1676 | # CONFIG_CRYPTO_LRW is not set | ||
1677 | # CONFIG_CRYPTO_PCBC is not set | ||
1678 | # CONFIG_CRYPTO_XTS is not set | ||
1679 | |||
1680 | # | ||
1681 | # Hash modes | ||
1682 | # | ||
1362 | # CONFIG_CRYPTO_HMAC is not set | 1683 | # CONFIG_CRYPTO_HMAC is not set |
1363 | # CONFIG_CRYPTO_XCBC is not set | 1684 | # CONFIG_CRYPTO_XCBC is not set |
1364 | # CONFIG_CRYPTO_NULL is not set | 1685 | |
1686 | # | ||
1687 | # Digest | ||
1688 | # | ||
1689 | # CONFIG_CRYPTO_CRC32C is not set | ||
1365 | # CONFIG_CRYPTO_MD4 is not set | 1690 | # CONFIG_CRYPTO_MD4 is not set |
1366 | # CONFIG_CRYPTO_MD5 is not set | 1691 | # CONFIG_CRYPTO_MD5 is not set |
1692 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1367 | # CONFIG_CRYPTO_SHA1 is not set | 1693 | # CONFIG_CRYPTO_SHA1 is not set |
1368 | # CONFIG_CRYPTO_SHA256 is not set | 1694 | # CONFIG_CRYPTO_SHA256 is not set |
1369 | # CONFIG_CRYPTO_SHA512 is not set | 1695 | # CONFIG_CRYPTO_SHA512 is not set |
1370 | # CONFIG_CRYPTO_WP512 is not set | ||
1371 | # CONFIG_CRYPTO_TGR192 is not set | 1696 | # CONFIG_CRYPTO_TGR192 is not set |
1372 | # CONFIG_CRYPTO_GF128MUL is not set | 1697 | # CONFIG_CRYPTO_WP512 is not set |
1373 | CONFIG_CRYPTO_ECB=m | 1698 | |
1374 | CONFIG_CRYPTO_CBC=m | 1699 | # |
1375 | CONFIG_CRYPTO_PCBC=m | 1700 | # Ciphers |
1376 | # CONFIG_CRYPTO_LRW is not set | 1701 | # |
1377 | # CONFIG_CRYPTO_CRYPTD is not set | 1702 | # CONFIG_CRYPTO_AES is not set |
1378 | # CONFIG_CRYPTO_DES is not set | 1703 | # CONFIG_CRYPTO_ANUBIS is not set |
1379 | # CONFIG_CRYPTO_FCRYPT is not set | 1704 | # CONFIG_CRYPTO_ARC4 is not set |
1380 | # CONFIG_CRYPTO_BLOWFISH is not set | 1705 | # CONFIG_CRYPTO_BLOWFISH is not set |
1381 | # CONFIG_CRYPTO_TWOFISH is not set | 1706 | # CONFIG_CRYPTO_CAMELLIA is not set |
1382 | # CONFIG_CRYPTO_SERPENT is not set | ||
1383 | CONFIG_CRYPTO_AES=m | ||
1384 | # CONFIG_CRYPTO_CAST5 is not set | 1707 | # CONFIG_CRYPTO_CAST5 is not set |
1385 | # CONFIG_CRYPTO_CAST6 is not set | 1708 | # CONFIG_CRYPTO_CAST6 is not set |
1386 | # CONFIG_CRYPTO_TEA is not set | 1709 | # CONFIG_CRYPTO_DES is not set |
1387 | CONFIG_CRYPTO_ARC4=m | 1710 | # CONFIG_CRYPTO_FCRYPT is not set |
1388 | # CONFIG_CRYPTO_KHAZAD is not set | 1711 | # CONFIG_CRYPTO_KHAZAD is not set |
1389 | # CONFIG_CRYPTO_ANUBIS is not set | 1712 | # CONFIG_CRYPTO_SALSA20 is not set |
1713 | # CONFIG_CRYPTO_SEED is not set | ||
1714 | # CONFIG_CRYPTO_SERPENT is not set | ||
1715 | # CONFIG_CRYPTO_TEA is not set | ||
1716 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1717 | |||
1718 | # | ||
1719 | # Compression | ||
1720 | # | ||
1390 | # CONFIG_CRYPTO_DEFLATE is not set | 1721 | # CONFIG_CRYPTO_DEFLATE is not set |
1391 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1722 | # CONFIG_CRYPTO_LZO is not set |
1392 | # CONFIG_CRYPTO_CRC32C is not set | 1723 | # CONFIG_CRYPTO_HW is not set |
1393 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1394 | # CONFIG_CRYPTO_TEST is not set | ||
1395 | CONFIG_CRYPTO_HW=y | ||
1396 | 1724 | ||
1397 | # | 1725 | # |
1398 | # Library routines | 1726 | # Library routines |
1399 | # | 1727 | # |
1400 | CONFIG_BITREVERSE=y | 1728 | CONFIG_BITREVERSE=y |
1401 | # CONFIG_CRC_CCITT is not set | 1729 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1730 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1731 | CONFIG_CRC_CCITT=m | ||
1402 | # CONFIG_CRC16 is not set | 1732 | # CONFIG_CRC16 is not set |
1403 | # CONFIG_CRC_ITU_T is not set | 1733 | # CONFIG_CRC_ITU_T is not set |
1404 | CONFIG_CRC32=y | 1734 | CONFIG_CRC32=y |
1405 | # CONFIG_CRC7 is not set | 1735 | # CONFIG_CRC7 is not set |
1406 | # CONFIG_LIBCRC32C is not set | 1736 | # CONFIG_LIBCRC32C is not set |
1737 | CONFIG_ZLIB_INFLATE=y | ||
1738 | CONFIG_ZLIB_DEFLATE=y | ||
1407 | CONFIG_PLIST=y | 1739 | CONFIG_PLIST=y |
1408 | CONFIG_HAS_IOMEM=y | 1740 | CONFIG_HAS_IOMEM=y |
1409 | CONFIG_HAS_IOPORT=y | 1741 | CONFIG_HAS_IOPORT=y |
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index f6d66dce6852..3781b3db9f49 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -326,11 +326,11 @@ static struct resource ixp4xx_udc_resources[] = { | |||
326 | }; | 326 | }; |
327 | 327 | ||
328 | /* | 328 | /* |
329 | * USB device controller. The IXP4xx uses the same controller as PXA2XX, | 329 | * USB device controller. The IXP4xx uses the same controller as PXA25X, |
330 | * so we just use the same device. | 330 | * so we just use the same device. |
331 | */ | 331 | */ |
332 | static struct platform_device ixp4xx_udc_device = { | 332 | static struct platform_device ixp4xx_udc_device = { |
333 | .name = "pxa2xx-udc", | 333 | .name = "pxa25x-udc", |
334 | .id = -1, | 334 | .id = -1, |
335 | .num_resources = 2, | 335 | .num_resources = 2, |
336 | .resource = ixp4xx_udc_resources, | 336 | .resource = ixp4xx_udc_resources, |
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 5da7a6820492..faa2c3f6c1af 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -20,15 +20,17 @@ endmenu | |||
20 | 20 | ||
21 | endif | 21 | endif |
22 | 22 | ||
23 | choice | ||
24 | prompt "Select target board" | ||
25 | |||
26 | config ARCH_GUMSTIX | 23 | config ARCH_GUMSTIX |
27 | bool "Gumstix XScale boards" | 24 | bool "Gumstix XScale boards" |
28 | help | 25 | help |
29 | Say Y here if you intend to run this kernel on a | 26 | Say Y here if you intend to run this kernel on a |
30 | Gumstix Full Function Minature Computer. | 27 | Gumstix Full Function Minature Computer. |
31 | 28 | ||
29 | config MACH_GUMSTIX_F | ||
30 | bool "Basix, Connex, ws-200ax, ws-400ax systems" | ||
31 | depends on ARCH_GUMSTIX | ||
32 | select PXA25x | ||
33 | |||
32 | config ARCH_LUBBOCK | 34 | config ARCH_LUBBOCK |
33 | bool "Intel DBPXA250 Development Platform" | 35 | bool "Intel DBPXA250 Development Platform" |
34 | select PXA25x | 36 | select PXA25x |
@@ -37,10 +39,12 @@ config ARCH_LUBBOCK | |||
37 | config MACH_LOGICPD_PXA270 | 39 | config MACH_LOGICPD_PXA270 |
38 | bool "LogicPD PXA270 Card Engine Development Platform" | 40 | bool "LogicPD PXA270 Card Engine Development Platform" |
39 | select PXA27x | 41 | select PXA27x |
42 | select HAVE_PWM | ||
40 | 43 | ||
41 | config MACH_MAINSTONE | 44 | config MACH_MAINSTONE |
42 | bool "Intel HCDDBBVA0 Development Platform" | 45 | bool "Intel HCDDBBVA0 Development Platform" |
43 | select PXA27x | 46 | select PXA27x |
47 | select HAVE_PWM | ||
44 | 48 | ||
45 | config ARCH_PXA_IDP | 49 | config ARCH_PXA_IDP |
46 | bool "Accelent Xscale IDP" | 50 | bool "Accelent Xscale IDP" |
@@ -57,6 +61,57 @@ config PXA_SHARPSL | |||
57 | SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) | 61 | SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) |
58 | handheld computer. | 62 | handheld computer. |
59 | 63 | ||
64 | config MACH_POODLE | ||
65 | bool "Enable Sharp SL-5600 (Poodle) Support" | ||
66 | depends on PXA_SHARPSL | ||
67 | select PXA25x | ||
68 | select SHARP_LOCOMO | ||
69 | select PXA_SSP | ||
70 | |||
71 | config MACH_CORGI | ||
72 | bool "Enable Sharp SL-C700 (Corgi) Support" | ||
73 | depends on PXA_SHARPSL | ||
74 | select PXA25x | ||
75 | select PXA_SHARP_C7xx | ||
76 | |||
77 | config MACH_SHEPHERD | ||
78 | bool "Enable Sharp SL-C750 (Shepherd) Support" | ||
79 | depends on PXA_SHARPSL | ||
80 | select PXA25x | ||
81 | select PXA_SHARP_C7xx | ||
82 | |||
83 | config MACH_HUSKY | ||
84 | bool "Enable Sharp SL-C760 (Husky) Support" | ||
85 | depends on PXA_SHARPSL | ||
86 | select PXA25x | ||
87 | select PXA_SHARP_C7xx | ||
88 | |||
89 | config MACH_AKITA | ||
90 | bool "Enable Sharp SL-1000 (Akita) Support" | ||
91 | depends on PXA_SHARPSL | ||
92 | select PXA27x | ||
93 | select PXA_SHARP_Cxx00 | ||
94 | select MACH_SPITZ | ||
95 | select I2C | ||
96 | select I2C_PXA | ||
97 | |||
98 | config MACH_SPITZ | ||
99 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" | ||
100 | depends on PXA_SHARPSL | ||
101 | select PXA27x | ||
102 | select PXA_SHARP_Cxx00 | ||
103 | |||
104 | config MACH_BORZOI | ||
105 | bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" | ||
106 | depends on PXA_SHARPSL | ||
107 | select PXA27x | ||
108 | select PXA_SHARP_Cxx00 | ||
109 | |||
110 | config MACH_TOSA | ||
111 | bool "Enable Sharp SL-6000x (Tosa) Support" | ||
112 | depends on PXA_SHARPSL | ||
113 | select PXA25x | ||
114 | |||
60 | config ARCH_PXA_ESERIES | 115 | config ARCH_PXA_ESERIES |
61 | bool "PXA based Toshiba e-series PDAs" | 116 | bool "PXA based Toshiba e-series PDAs" |
62 | select PXA25x | 117 | select PXA25x |
@@ -105,6 +160,10 @@ config MACH_TRIZEPS4 | |||
105 | bool "Keith und Koep Trizeps4 DIMM-Module" | 160 | bool "Keith und Koep Trizeps4 DIMM-Module" |
106 | select PXA27x | 161 | select PXA27x |
107 | 162 | ||
163 | config MACH_TRIZEPS4_CONXS | ||
164 | bool "ConXS Eval Board" | ||
165 | depends on MACH_TRIZEPS4 | ||
166 | |||
108 | config MACH_EM_X270 | 167 | config MACH_EM_X270 |
109 | bool "CompuLab EM-x270 platform" | 168 | bool "CompuLab EM-x270 platform" |
110 | select PXA27x | 169 | select PXA27x |
@@ -116,6 +175,7 @@ config MACH_COLIBRI | |||
116 | config MACH_ZYLONITE | 175 | config MACH_ZYLONITE |
117 | bool "PXA3xx Development Platform" | 176 | bool "PXA3xx Development Platform" |
118 | select PXA3xx | 177 | select PXA3xx |
178 | select HAVE_PWM | ||
119 | 179 | ||
120 | config MACH_LITTLETON | 180 | config MACH_LITTLETON |
121 | bool "PXA3xx Form Factor Platform (aka Littleton)" | 181 | bool "PXA3xx Form Factor Platform (aka Littleton)" |
@@ -137,109 +197,31 @@ config MACH_PCM027 | |||
137 | bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" | 197 | bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" |
138 | select PXA27x | 198 | select PXA27x |
139 | select IWMMXT | 199 | select IWMMXT |
140 | 200 | select PXA_SSP | |
141 | endchoice | ||
142 | |||
143 | choice | ||
144 | prompt "Used baseboard" | ||
145 | depends on MACH_PCM027 | ||
146 | 201 | ||
147 | config MACH_PCM990_BASEBOARD | 202 | config MACH_PCM990_BASEBOARD |
148 | bool "PHYTEC PCM-990 development board" | 203 | bool "PHYTEC PCM-990 development board" |
149 | 204 | select HAVE_PWM | |
150 | endchoice | 205 | depends on MACH_PCM027 |
151 | |||
152 | if PXA_SHARPSL | ||
153 | |||
154 | choice | ||
155 | prompt "Select target Sharp Zaurus device range" | ||
156 | |||
157 | config PXA_SHARPSL_25x | ||
158 | bool "Sharp PXA25x models (SL-5600, SL-C7xx and SL-C6000x)" | ||
159 | select PXA25x | ||
160 | |||
161 | config PXA_SHARPSL_27x | ||
162 | bool "Sharp PXA270 models (SL-Cxx00)" | ||
163 | select PXA27x | ||
164 | |||
165 | endchoice | ||
166 | |||
167 | endif | ||
168 | |||
169 | if ARCH_GUMSTIX | ||
170 | 206 | ||
171 | choice | 207 | choice |
172 | prompt "Select target Gumstix board" | 208 | prompt "display on pcm990" |
173 | 209 | depends on MACH_PCM990_BASEBOARD | |
174 | config MACH_GUMSTIX_F | ||
175 | bool "Basix, Connex, ws-200ax, ws-400ax systems" | ||
176 | select PXA25x | ||
177 | 210 | ||
178 | endchoice | 211 | config PCM990_DISPLAY_SHARP |
212 | bool "sharp lq084v1dg21 stn display" | ||
179 | 213 | ||
180 | endif | 214 | config PCM990_DISPLAY_NEC |
215 | bool "nec nl6448bc20_18d tft display" | ||
181 | 216 | ||
182 | 217 | config PCM990_DISPLAY_NONE | |
183 | if MACH_TRIZEPS4 | 218 | bool "no display" |
184 | |||
185 | choice | ||
186 | prompt "Select base board for Trizeps 4 module" | ||
187 | |||
188 | config MACH_TRIZEPS4_CONXS | ||
189 | bool "ConXS Eval Board" | ||
190 | |||
191 | config MACH_TRIZEPS4_ANY | ||
192 | bool "another Board" | ||
193 | 219 | ||
194 | endchoice | 220 | endchoice |
195 | 221 | ||
196 | endif | ||
197 | 222 | ||
198 | endmenu | 223 | endmenu |
199 | 224 | ||
200 | config MACH_POODLE | ||
201 | bool "Enable Sharp SL-5600 (Poodle) Support" | ||
202 | depends on PXA_SHARPSL_25x | ||
203 | select SHARP_LOCOMO | ||
204 | select PXA_SSP | ||
205 | |||
206 | config MACH_CORGI | ||
207 | bool "Enable Sharp SL-C700 (Corgi) Support" | ||
208 | depends on PXA_SHARPSL_25x | ||
209 | select PXA_SHARP_C7xx | ||
210 | |||
211 | config MACH_SHEPHERD | ||
212 | bool "Enable Sharp SL-C750 (Shepherd) Support" | ||
213 | depends on PXA_SHARPSL_25x | ||
214 | select PXA_SHARP_C7xx | ||
215 | |||
216 | config MACH_HUSKY | ||
217 | bool "Enable Sharp SL-C760 (Husky) Support" | ||
218 | depends on PXA_SHARPSL_25x | ||
219 | select PXA_SHARP_C7xx | ||
220 | |||
221 | config MACH_AKITA | ||
222 | bool "Enable Sharp SL-1000 (Akita) Support" | ||
223 | depends on PXA_SHARPSL_27x | ||
224 | select PXA_SHARP_Cxx00 | ||
225 | select MACH_SPITZ | ||
226 | select I2C | ||
227 | select I2C_PXA | ||
228 | |||
229 | config MACH_SPITZ | ||
230 | bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" | ||
231 | depends on PXA_SHARPSL_27x | ||
232 | select PXA_SHARP_Cxx00 | ||
233 | |||
234 | config MACH_BORZOI | ||
235 | bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" | ||
236 | depends on PXA_SHARPSL_27x | ||
237 | select PXA_SHARP_Cxx00 | ||
238 | |||
239 | config MACH_TOSA | ||
240 | bool "Enable Sharp SL-6000x (Tosa) Support" | ||
241 | depends on PXA_SHARPSL_25x | ||
242 | |||
243 | config PXA25x | 225 | config PXA25x |
244 | bool | 226 | bool |
245 | help | 227 | help |
@@ -273,4 +255,10 @@ config PXA_SSP | |||
273 | tristate | 255 | tristate |
274 | help | 256 | help |
275 | Enable support for PXA2xx SSP ports | 257 | Enable support for PXA2xx SSP ports |
258 | |||
259 | config PXA_PWM | ||
260 | tristate | ||
261 | default BACKLIGHT_PWM | ||
262 | help | ||
263 | Enable support for PXA2xx/PXA3xx PWM controllers | ||
276 | endif | 264 | endif |
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 0e6d05bb81aa..c4dfbe87fc4e 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
@@ -10,10 +10,11 @@ obj-$(CONFIG_CPU_FREQ) += cpu-pxa.o | |||
10 | 10 | ||
11 | # Generic drivers that other drivers may depend upon | 11 | # Generic drivers that other drivers may depend upon |
12 | obj-$(CONFIG_PXA_SSP) += ssp.o | 12 | obj-$(CONFIG_PXA_SSP) += ssp.o |
13 | obj-$(CONFIG_PXA_PWM) += pwm.o | ||
13 | 14 | ||
14 | # SoC-specific code | 15 | # SoC-specific code |
15 | obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa25x.o | 16 | obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o |
16 | obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o pxa27x.o | 17 | obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o pxa2xx.o pxa27x.o |
17 | obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o pxa3xx.o smemc.o | 18 | obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o pxa3xx.o smemc.o |
18 | obj-$(CONFIG_CPU_PXA300) += pxa300.o | 19 | obj-$(CONFIG_CPU_PXA300) += pxa300.o |
19 | obj-$(CONFIG_CPU_PXA320) += pxa320.o | 20 | obj-$(CONFIG_CPU_PXA320) += pxa320.o |
diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c index e97dc59813c8..b4d04955dcb0 100644 --- a/arch/arm/mach-pxa/clock.c +++ b/arch/arm/mach-pxa/clock.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
13 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
14 | 14 | ||
15 | #include <asm/arch/pxa-regs.h> | 15 | #include <asm/arch/pxa2xx-regs.h> |
16 | #include <asm/arch/pxa2xx-gpio.h> | 16 | #include <asm/arch/pxa2xx-gpio.h> |
17 | #include <asm/hardware.h> | 17 | #include <asm/hardware.h> |
18 | 18 | ||
@@ -47,6 +47,9 @@ struct clk *clk_get(struct device *dev, const char *id) | |||
47 | clk = p; | 47 | clk = p; |
48 | mutex_unlock(&clocks_mutex); | 48 | mutex_unlock(&clocks_mutex); |
49 | 49 | ||
50 | if (!IS_ERR(clk) && clk->ops == NULL) | ||
51 | clk = clk->other; | ||
52 | |||
50 | return clk; | 53 | return clk; |
51 | } | 54 | } |
52 | EXPORT_SYMBOL(clk_get); | 55 | EXPORT_SYMBOL(clk_get); |
diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h index bc6b77e1592e..83cbfaba485d 100644 --- a/arch/arm/mach-pxa/clock.h +++ b/arch/arm/mach-pxa/clock.h | |||
@@ -15,6 +15,7 @@ struct clk { | |||
15 | unsigned int cken; | 15 | unsigned int cken; |
16 | unsigned int delay; | 16 | unsigned int delay; |
17 | unsigned int enabled; | 17 | unsigned int enabled; |
18 | struct clk *other; | ||
18 | }; | 19 | }; |
19 | 20 | ||
20 | #define INIT_CKEN(_name, _cken, _rate, _delay, _dev) \ | 21 | #define INIT_CKEN(_name, _cken, _rate, _delay, _dev) \ |
@@ -35,6 +36,17 @@ struct clk { | |||
35 | .cken = CKEN_##_cken, \ | 36 | .cken = CKEN_##_cken, \ |
36 | } | 37 | } |
37 | 38 | ||
39 | /* | ||
40 | * This is a placeholder to alias one clock device+name pair | ||
41 | * to another struct clk. | ||
42 | */ | ||
43 | #define INIT_CKOTHER(_name, _other, _dev) \ | ||
44 | { \ | ||
45 | .name = _name, \ | ||
46 | .dev = _dev, \ | ||
47 | .other = _other, \ | ||
48 | } | ||
49 | |||
38 | extern const struct clkops clk_cken_ops; | 50 | extern const struct clkops clk_cken_ops; |
39 | 51 | ||
40 | void clk_cken_enable(struct clk *clk); | 52 | void clk_cken_enable(struct clk *clk); |
diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c index ac7f05f9f3eb..319c9ff3ab9a 100644 --- a/arch/arm/mach-pxa/cm-x270-pci.c +++ b/arch/arm/mach-pxa/cm-x270-pci.c | |||
@@ -41,18 +41,20 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size, | |||
41 | { | 41 | { |
42 | unsigned int sz = SZ_64M >> PAGE_SHIFT; | 42 | unsigned int sz = SZ_64M >> PAGE_SHIFT; |
43 | 43 | ||
44 | pr_info("Adjusting zones for CM-x270\n"); | 44 | if (machine_is_armcore()) { |
45 | 45 | pr_info("Adjusting zones for CM-x270\n"); | |
46 | /* | 46 | |
47 | * Only adjust if > 64M on current system | 47 | /* |
48 | */ | 48 | * Only adjust if > 64M on current system |
49 | if (node || (zone_size[0] <= sz)) | 49 | */ |
50 | return; | 50 | if (node || (zone_size[0] <= sz)) |
51 | 51 | return; | |
52 | zone_size[1] = zone_size[0] - sz; | 52 | |
53 | zone_size[0] = sz; | 53 | zone_size[1] = zone_size[0] - sz; |
54 | zhole_size[1] = zhole_size[0]; | 54 | zone_size[0] = sz; |
55 | zhole_size[0] = 0; | 55 | zhole_size[1] = zhole_size[0]; |
56 | zhole_size[0] = 0; | ||
57 | } | ||
56 | } | 58 | } |
57 | 59 | ||
58 | static void cmx270_it8152_irq_demux(unsigned int irq, struct irq_desc *desc) | 60 | static void cmx270_it8152_irq_demux(unsigned int irq, struct irq_desc *desc) |
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index f5851d1adc25..01b9964acec1 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <asm/arch/pxa-regs.h> | 31 | #include <asm/arch/pxa-regs.h> |
32 | #include <asm/arch/pxa2xx-regs.h> | 32 | #include <asm/arch/pxa2xx-regs.h> |
33 | #include <asm/arch/pxa2xx-gpio.h> | 33 | #include <asm/arch/pxa2xx-gpio.h> |
34 | #include <asm/arch/audio.h> | ||
34 | #include <asm/arch/pxafb.h> | 35 | #include <asm/arch/pxafb.h> |
35 | #include <asm/arch/ohci.h> | 36 | #include <asm/arch/ohci.h> |
36 | #include <asm/arch/mmc.h> | 37 | #include <asm/arch/mmc.h> |
@@ -81,12 +82,6 @@ static struct platform_device cmx270_device_dm9k = { | |||
81 | } | 82 | } |
82 | }; | 83 | }; |
83 | 84 | ||
84 | /* audio device */ | ||
85 | static struct platform_device cmx270_audio_device = { | ||
86 | .name = "pxa2xx-ac97", | ||
87 | .id = -1, | ||
88 | }; | ||
89 | |||
90 | /* touchscreen controller */ | 85 | /* touchscreen controller */ |
91 | static struct platform_device cmx270_ts_device = { | 86 | static struct platform_device cmx270_ts_device = { |
92 | .name = "ucb1400_ts", | 87 | .name = "ucb1400_ts", |
@@ -219,7 +214,6 @@ static struct platform_device cmx270_ata = { | |||
219 | /* platform devices */ | 214 | /* platform devices */ |
220 | static struct platform_device *platform_devices[] __initdata = { | 215 | static struct platform_device *platform_devices[] __initdata = { |
221 | &cmx270_device_dm9k, | 216 | &cmx270_device_dm9k, |
222 | &cmx270_audio_device, | ||
223 | &cmx270_rtc_device, | 217 | &cmx270_rtc_device, |
224 | &cmx270_2700G, | 218 | &cmx270_2700G, |
225 | &cmx270_led_device, | 219 | &cmx270_led_device, |
@@ -594,6 +588,7 @@ static void __init cmx270_init(void) | |||
594 | 588 | ||
595 | /* register CM-X270 platform devices */ | 589 | /* register CM-X270 platform devices */ |
596 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 590 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
591 | pxa_set_ac97_info(NULL); | ||
597 | 592 | ||
598 | /* set MCI and OHCI platform parameters */ | 593 | /* set MCI and OHCI platform parameters */ |
599 | pxa_set_mci_info(&cmx270_mci_platform_data); | 594 | pxa_set_mci_info(&cmx270_mci_platform_data); |
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index b757dd756655..b37671b71886 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <asm/mach/irq.h> | 36 | #include <asm/mach/irq.h> |
37 | 37 | ||
38 | #include <asm/arch/pxa-regs.h> | 38 | #include <asm/arch/pxa-regs.h> |
39 | #include <asm/arch/pxa2xx-regs.h> | ||
39 | #include <asm/arch/pxa2xx-gpio.h> | 40 | #include <asm/arch/pxa2xx-gpio.h> |
40 | #include <asm/arch/irda.h> | 41 | #include <asm/arch/irda.h> |
41 | #include <asm/arch/mmc.h> | 42 | #include <asm/arch/mmc.h> |
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index 0a85f706e887..e91c0f26c412 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <asm/arch/sharpsl.h> | 26 | #include <asm/arch/sharpsl.h> |
27 | #include <asm/arch/corgi.h> | 27 | #include <asm/arch/corgi.h> |
28 | #include <asm/arch/pxa-regs.h> | 28 | #include <asm/arch/pxa-regs.h> |
29 | #include <asm/arch/pxa2xx-regs.h> | ||
29 | #include <asm/arch/pxa2xx-gpio.h> | 30 | #include <asm/arch/pxa2xx-gpio.h> |
30 | #include "sharpsl.h" | 31 | #include "sharpsl.h" |
31 | 32 | ||
@@ -204,7 +205,9 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = { | |||
204 | .read_devdata = corgipm_read_devdata, | 205 | .read_devdata = corgipm_read_devdata, |
205 | .charger_wakeup = corgi_charger_wakeup, | 206 | .charger_wakeup = corgi_charger_wakeup, |
206 | .should_wakeup = corgi_should_wakeup, | 207 | .should_wakeup = corgi_should_wakeup, |
208 | #ifdef CONFIG_BACKLIGHT_CORGI | ||
207 | .backlight_limit = corgibl_limit_intensity, | 209 | .backlight_limit = corgibl_limit_intensity, |
210 | #endif | ||
208 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, | 211 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, |
209 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, | 212 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, |
210 | .charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH, | 213 | .charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH, |
@@ -226,6 +229,10 @@ static int __devinit corgipm_init(void) | |||
226 | { | 229 | { |
227 | int ret; | 230 | int ret; |
228 | 231 | ||
232 | if (!machine_is_corgi() && !machine_is_shepherd() | ||
233 | && !machine_is_husky()) | ||
234 | return -ENODEV; | ||
235 | |||
229 | corgipm_device = platform_device_alloc("sharpsl-pm", -1); | 236 | corgipm_device = platform_device_alloc("sharpsl-pm", -1); |
230 | if (!corgipm_device) | 237 | if (!corgipm_device) |
231 | return -ENOMEM; | 238 | return -ENOMEM; |
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index d6c05b6eab35..abc161dd083a 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
@@ -10,11 +10,15 @@ | |||
10 | #include <asm/arch/mmc.h> | 10 | #include <asm/arch/mmc.h> |
11 | #include <asm/arch/irda.h> | 11 | #include <asm/arch/irda.h> |
12 | #include <asm/arch/i2c.h> | 12 | #include <asm/arch/i2c.h> |
13 | #include <asm/arch/mfp-pxa27x.h> | ||
13 | #include <asm/arch/ohci.h> | 14 | #include <asm/arch/ohci.h> |
14 | #include <asm/arch/pxa27x_keypad.h> | 15 | #include <asm/arch/pxa27x_keypad.h> |
16 | #include <asm/arch/pxa2xx_spi.h> | ||
15 | #include <asm/arch/camera.h> | 17 | #include <asm/arch/camera.h> |
18 | #include <asm/arch/audio.h> | ||
16 | 19 | ||
17 | #include "devices.h" | 20 | #include "devices.h" |
21 | #include "generic.h" | ||
18 | 22 | ||
19 | void __init pxa_register_device(struct platform_device *dev, void *data) | 23 | void __init pxa_register_device(struct platform_device *dev, void *data) |
20 | { | 24 | { |
@@ -91,8 +95,19 @@ static struct resource pxa2xx_udc_resources[] = { | |||
91 | 95 | ||
92 | static u64 udc_dma_mask = ~(u32)0; | 96 | static u64 udc_dma_mask = ~(u32)0; |
93 | 97 | ||
94 | struct platform_device pxa_device_udc = { | 98 | struct platform_device pxa25x_device_udc = { |
95 | .name = "pxa2xx-udc", | 99 | .name = "pxa25x-udc", |
100 | .id = -1, | ||
101 | .resource = pxa2xx_udc_resources, | ||
102 | .num_resources = ARRAY_SIZE(pxa2xx_udc_resources), | ||
103 | .dev = { | ||
104 | .platform_data = &pxa_udc_info, | ||
105 | .dma_mask = &udc_dma_mask, | ||
106 | } | ||
107 | }; | ||
108 | |||
109 | struct platform_device pxa27x_device_udc = { | ||
110 | .name = "pxa27x-udc", | ||
96 | .id = -1, | 111 | .id = -1, |
97 | .resource = pxa2xx_udc_resources, | 112 | .resource = pxa2xx_udc_resources, |
98 | .num_resources = ARRAY_SIZE(pxa2xx_udc_resources), | 113 | .num_resources = ARRAY_SIZE(pxa2xx_udc_resources), |
@@ -233,8 +248,15 @@ struct platform_device pxa_device_i2c = { | |||
233 | .num_resources = ARRAY_SIZE(pxai2c_resources), | 248 | .num_resources = ARRAY_SIZE(pxai2c_resources), |
234 | }; | 249 | }; |
235 | 250 | ||
251 | static unsigned long pxa27x_i2c_mfp_cfg[] = { | ||
252 | GPIO117_I2C_SCL, | ||
253 | GPIO118_I2C_SDA, | ||
254 | }; | ||
255 | |||
236 | void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info) | 256 | void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info) |
237 | { | 257 | { |
258 | if (cpu_is_pxa27x()) | ||
259 | pxa2xx_mfp_config(ARRAY_AND_SIZE(pxa27x_i2c_mfp_cfg)); | ||
238 | pxa_register_device(&pxa_device_i2c, info); | 260 | pxa_register_device(&pxa_device_i2c, info); |
239 | } | 261 | } |
240 | 262 | ||
@@ -278,8 +300,69 @@ struct platform_device pxa_device_rtc = { | |||
278 | .id = -1, | 300 | .id = -1, |
279 | }; | 301 | }; |
280 | 302 | ||
303 | static struct resource pxa_ac97_resources[] = { | ||
304 | [0] = { | ||
305 | .start = 0x40500000, | ||
306 | .end = 0x40500000 + 0xfff, | ||
307 | .flags = IORESOURCE_MEM, | ||
308 | }, | ||
309 | [1] = { | ||
310 | .start = IRQ_AC97, | ||
311 | .end = IRQ_AC97, | ||
312 | .flags = IORESOURCE_IRQ, | ||
313 | }, | ||
314 | }; | ||
315 | |||
316 | static u64 pxa_ac97_dmamask = 0xffffffffUL; | ||
317 | |||
318 | struct platform_device pxa_device_ac97 = { | ||
319 | .name = "pxa2xx-ac97", | ||
320 | .id = -1, | ||
321 | .dev = { | ||
322 | .dma_mask = &pxa_ac97_dmamask, | ||
323 | .coherent_dma_mask = 0xffffffff, | ||
324 | }, | ||
325 | .num_resources = ARRAY_SIZE(pxa_ac97_resources), | ||
326 | .resource = pxa_ac97_resources, | ||
327 | }; | ||
328 | |||
329 | void __init pxa_set_ac97_info(pxa2xx_audio_ops_t *ops) | ||
330 | { | ||
331 | pxa_register_device(&pxa_device_ac97, ops); | ||
332 | } | ||
333 | |||
281 | #ifdef CONFIG_PXA25x | 334 | #ifdef CONFIG_PXA25x |
282 | 335 | ||
336 | static struct resource pxa25x_resource_pwm0[] = { | ||
337 | [0] = { | ||
338 | .start = 0x40b00000, | ||
339 | .end = 0x40b0000f, | ||
340 | .flags = IORESOURCE_MEM, | ||
341 | }, | ||
342 | }; | ||
343 | |||
344 | struct platform_device pxa25x_device_pwm0 = { | ||
345 | .name = "pxa25x-pwm", | ||
346 | .id = 0, | ||
347 | .resource = pxa25x_resource_pwm0, | ||
348 | .num_resources = ARRAY_SIZE(pxa25x_resource_pwm0), | ||
349 | }; | ||
350 | |||
351 | static struct resource pxa25x_resource_pwm1[] = { | ||
352 | [0] = { | ||
353 | .start = 0x40c00000, | ||
354 | .end = 0x40c0000f, | ||
355 | .flags = IORESOURCE_MEM, | ||
356 | }, | ||
357 | }; | ||
358 | |||
359 | struct platform_device pxa25x_device_pwm1 = { | ||
360 | .name = "pxa25x-pwm", | ||
361 | .id = 1, | ||
362 | .resource = pxa25x_resource_pwm1, | ||
363 | .num_resources = ARRAY_SIZE(pxa25x_resource_pwm1), | ||
364 | }; | ||
365 | |||
283 | static u64 pxa25x_ssp_dma_mask = DMA_BIT_MASK(32); | 366 | static u64 pxa25x_ssp_dma_mask = DMA_BIT_MASK(32); |
284 | 367 | ||
285 | static struct resource pxa25x_resource_ssp[] = { | 368 | static struct resource pxa25x_resource_ssp[] = { |
@@ -568,6 +651,36 @@ struct platform_device pxa27x_device_ssp3 = { | |||
568 | .num_resources = ARRAY_SIZE(pxa27x_resource_ssp3), | 651 | .num_resources = ARRAY_SIZE(pxa27x_resource_ssp3), |
569 | }; | 652 | }; |
570 | 653 | ||
654 | static struct resource pxa27x_resource_pwm0[] = { | ||
655 | [0] = { | ||
656 | .start = 0x40b00000, | ||
657 | .end = 0x40b0001f, | ||
658 | .flags = IORESOURCE_MEM, | ||
659 | }, | ||
660 | }; | ||
661 | |||
662 | struct platform_device pxa27x_device_pwm0 = { | ||
663 | .name = "pxa27x-pwm", | ||
664 | .id = 0, | ||
665 | .resource = pxa27x_resource_pwm0, | ||
666 | .num_resources = ARRAY_SIZE(pxa27x_resource_pwm0), | ||
667 | }; | ||
668 | |||
669 | static struct resource pxa27x_resource_pwm1[] = { | ||
670 | [0] = { | ||
671 | .start = 0x40c00000, | ||
672 | .end = 0x40c0001f, | ||
673 | .flags = IORESOURCE_MEM, | ||
674 | }, | ||
675 | }; | ||
676 | |||
677 | struct platform_device pxa27x_device_pwm1 = { | ||
678 | .name = "pxa27x-pwm", | ||
679 | .id = 1, | ||
680 | .resource = pxa27x_resource_pwm1, | ||
681 | .num_resources = ARRAY_SIZE(pxa27x_resource_pwm1), | ||
682 | }; | ||
683 | |||
571 | static struct resource pxa27x_resource_camera[] = { | 684 | static struct resource pxa27x_resource_camera[] = { |
572 | [0] = { | 685 | [0] = { |
573 | .start = 0x50000000, | 686 | .start = 0x50000000, |
@@ -719,3 +832,20 @@ void __init pxa3xx_set_mci3_info(struct pxamci_platform_data *info) | |||
719 | } | 832 | } |
720 | 833 | ||
721 | #endif /* CONFIG_PXA3xx */ | 834 | #endif /* CONFIG_PXA3xx */ |
835 | |||
836 | /* pxa2xx-spi platform-device ID equals respective SSP platform-device ID + 1. | ||
837 | * See comment in arch/arm/mach-pxa/ssp.c::ssp_probe() */ | ||
838 | void __init pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info) | ||
839 | { | ||
840 | struct platform_device *pd; | ||
841 | |||
842 | pd = platform_device_alloc("pxa2xx-spi", id); | ||
843 | if (pd == NULL) { | ||
844 | printk(KERN_ERR "pxa2xx-spi: failed to allocate device id %d\n", | ||
845 | id); | ||
846 | return; | ||
847 | } | ||
848 | |||
849 | pd->dev.platform_data = info; | ||
850 | platform_device_add(pd); | ||
851 | } | ||
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h index fcab017f27ee..b852eb18daa5 100644 --- a/arch/arm/mach-pxa/devices.h +++ b/arch/arm/mach-pxa/devices.h | |||
@@ -1,7 +1,8 @@ | |||
1 | extern struct platform_device pxa_device_mci; | 1 | extern struct platform_device pxa_device_mci; |
2 | extern struct platform_device pxa3xx_device_mci2; | 2 | extern struct platform_device pxa3xx_device_mci2; |
3 | extern struct platform_device pxa3xx_device_mci3; | 3 | extern struct platform_device pxa3xx_device_mci3; |
4 | extern struct platform_device pxa_device_udc; | 4 | extern struct platform_device pxa25x_device_udc; |
5 | extern struct platform_device pxa27x_device_udc; | ||
5 | extern struct platform_device pxa_device_fb; | 6 | extern struct platform_device pxa_device_fb; |
6 | extern struct platform_device pxa_device_ffuart; | 7 | extern struct platform_device pxa_device_ffuart; |
7 | extern struct platform_device pxa_device_btuart; | 8 | extern struct platform_device pxa_device_btuart; |
@@ -11,6 +12,7 @@ extern struct platform_device pxa_device_i2c; | |||
11 | extern struct platform_device pxa_device_i2s; | 12 | extern struct platform_device pxa_device_i2s; |
12 | extern struct platform_device pxa_device_ficp; | 13 | extern struct platform_device pxa_device_ficp; |
13 | extern struct platform_device pxa_device_rtc; | 14 | extern struct platform_device pxa_device_rtc; |
15 | extern struct platform_device pxa_device_ac97; | ||
14 | 16 | ||
15 | extern struct platform_device pxa27x_device_i2c_power; | 17 | extern struct platform_device pxa27x_device_i2c_power; |
16 | extern struct platform_device pxa27x_device_ohci; | 18 | extern struct platform_device pxa27x_device_ohci; |
@@ -24,4 +26,9 @@ extern struct platform_device pxa27x_device_ssp2; | |||
24 | extern struct platform_device pxa27x_device_ssp3; | 26 | extern struct platform_device pxa27x_device_ssp3; |
25 | extern struct platform_device pxa3xx_device_ssp4; | 27 | extern struct platform_device pxa3xx_device_ssp4; |
26 | 28 | ||
29 | extern struct platform_device pxa25x_device_pwm0; | ||
30 | extern struct platform_device pxa25x_device_pwm1; | ||
31 | extern struct platform_device pxa27x_device_pwm0; | ||
32 | extern struct platform_device pxa27x_device_pwm1; | ||
33 | |||
27 | void __init pxa_register_device(struct platform_device *dev, void *data); | 34 | void __init pxa_register_device(struct platform_device *dev, void *data); |
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 9c57700ee5c2..1bf680749928 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -24,6 +24,8 @@ | |||
24 | 24 | ||
25 | #include <asm/arch/pxa-regs.h> | 25 | #include <asm/arch/pxa-regs.h> |
26 | #include <asm/arch/pxa2xx-gpio.h> | 26 | #include <asm/arch/pxa2xx-gpio.h> |
27 | #include <asm/arch/pxa27x-udc.h> | ||
28 | #include <asm/arch/audio.h> | ||
27 | #include <asm/arch/pxafb.h> | 29 | #include <asm/arch/pxafb.h> |
28 | #include <asm/arch/ohci.h> | 30 | #include <asm/arch/ohci.h> |
29 | #include <asm/arch/mmc.h> | 31 | #include <asm/arch/mmc.h> |
@@ -72,12 +74,6 @@ static struct platform_device em_x270_dm9k = { | |||
72 | } | 74 | } |
73 | }; | 75 | }; |
74 | 76 | ||
75 | /* audio device */ | ||
76 | static struct platform_device em_x270_audio = { | ||
77 | .name = "pxa2xx-ac97", | ||
78 | .id = -1, | ||
79 | }; | ||
80 | |||
81 | /* WM9712 touchscreen controller. Hopefully the driver will make it to | 77 | /* WM9712 touchscreen controller. Hopefully the driver will make it to |
82 | * the mainstream sometime */ | 78 | * the mainstream sometime */ |
83 | static struct platform_device em_x270_ts = { | 79 | static struct platform_device em_x270_ts = { |
@@ -217,7 +213,6 @@ static struct platform_device em_x270_nand = { | |||
217 | /* platform devices */ | 213 | /* platform devices */ |
218 | static struct platform_device *platform_devices[] __initdata = { | 214 | static struct platform_device *platform_devices[] __initdata = { |
219 | &em_x270_dm9k, | 215 | &em_x270_dm9k, |
220 | &em_x270_audio, | ||
221 | &em_x270_ts, | 216 | &em_x270_ts, |
222 | &em_x270_rtc, | 217 | &em_x270_rtc, |
223 | &em_x270_nand, | 218 | &em_x270_nand, |
@@ -325,6 +320,7 @@ static void __init em_x270_init(void) | |||
325 | 320 | ||
326 | /* register EM-X270 platform devices */ | 321 | /* register EM-X270 platform devices */ |
327 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 322 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
323 | pxa_set_ac97_info(NULL); | ||
328 | 324 | ||
329 | /* set MCI and OHCI platform parameters */ | 325 | /* set MCI and OHCI platform parameters */ |
330 | pxa_set_mci_info(&em_x270_mci_platform_data); | 326 | pxa_set_mci_info(&em_x270_mci_platform_data); |
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 44617938f3f1..ca053226fba0 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -60,23 +60,6 @@ unsigned int get_memclk_frequency_10khz(void) | |||
60 | EXPORT_SYMBOL(get_memclk_frequency_10khz); | 60 | EXPORT_SYMBOL(get_memclk_frequency_10khz); |
61 | 61 | ||
62 | /* | 62 | /* |
63 | * Routine to safely enable or disable a clock in the CKEN | ||
64 | */ | ||
65 | void __pxa_set_cken(int clock, int enable) | ||
66 | { | ||
67 | unsigned long flags; | ||
68 | local_irq_save(flags); | ||
69 | |||
70 | if (enable) | ||
71 | CKEN |= (1 << clock); | ||
72 | else | ||
73 | CKEN &= ~(1 << clock); | ||
74 | |||
75 | local_irq_restore(flags); | ||
76 | } | ||
77 | EXPORT_SYMBOL(__pxa_set_cken); | ||
78 | |||
79 | /* | ||
80 | * Intel PXA2xx internal register mapping. | 63 | * Intel PXA2xx internal register mapping. |
81 | * | 64 | * |
82 | * Note 1: not all PXA2xx variants implement all those addresses. | 65 | * Note 1: not all PXA2xx variants implement all those addresses. |
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index a9a0c3fab159..fbff557bb225 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
22 | #include <asm/mach/irq.h> | 22 | #include <asm/mach/irq.h> |
23 | #include <asm/arch/pxa-regs.h> | 23 | #include <asm/arch/pxa-regs.h> |
24 | #include <asm/arch/pxa2xx-gpio.h> | ||
25 | 24 | ||
26 | #include "generic.h" | 25 | #include "generic.h" |
27 | 26 | ||
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c index a20e4b1649d6..cc1c4fa06145 100644 --- a/arch/arm/mach-pxa/lpd270.c +++ b/arch/arm/mach-pxa/lpd270.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/ioport.h> | 23 | #include <linux/ioport.h> |
24 | #include <linux/mtd/mtd.h> | 24 | #include <linux/mtd/mtd.h> |
25 | #include <linux/mtd/partitions.h> | 25 | #include <linux/mtd/partitions.h> |
26 | #include <linux/pwm_backlight.h> | ||
26 | 27 | ||
27 | #include <asm/types.h> | 28 | #include <asm/types.h> |
28 | #include <asm/setup.h> | 29 | #include <asm/setup.h> |
@@ -134,9 +135,12 @@ static struct sys_device lpd270_irq_device = { | |||
134 | 135 | ||
135 | static int __init lpd270_irq_device_init(void) | 136 | static int __init lpd270_irq_device_init(void) |
136 | { | 137 | { |
137 | int ret = sysdev_class_register(&lpd270_irq_sysclass); | 138 | int ret = -ENODEV; |
138 | if (ret == 0) | 139 | if (machine_is_logicpd_pxa270()) { |
139 | ret = sysdev_register(&lpd270_irq_device); | 140 | ret = sysdev_class_register(&lpd270_irq_sysclass); |
141 | if (ret == 0) | ||
142 | ret = sysdev_register(&lpd270_irq_device); | ||
143 | } | ||
140 | return ret; | 144 | return ret; |
141 | } | 145 | } |
142 | 146 | ||
@@ -164,11 +168,6 @@ static struct platform_device smc91x_device = { | |||
164 | .resource = smc91x_resources, | 168 | .resource = smc91x_resources, |
165 | }; | 169 | }; |
166 | 170 | ||
167 | static struct platform_device lpd270_audio_device = { | ||
168 | .name = "pxa2xx-ac97", | ||
169 | .id = -1, | ||
170 | }; | ||
171 | |||
172 | static struct resource lpd270_flash_resources[] = { | 171 | static struct resource lpd270_flash_resources[] = { |
173 | [0] = { | 172 | [0] = { |
174 | .start = PXA_CS0_PHYS, | 173 | .start = PXA_CS0_PHYS, |
@@ -233,21 +232,20 @@ static struct platform_device lpd270_flash_device[2] = { | |||
233 | }, | 232 | }, |
234 | }; | 233 | }; |
235 | 234 | ||
236 | static void lpd270_backlight_power(int on) | 235 | static struct platform_pwm_backlight_data lpd270_backlight_data = { |
237 | { | 236 | .pwm_id = 0, |
238 | if (on) { | 237 | .max_brightness = 1, |
239 | pxa_gpio_mode(GPIO16_PWM0_MD); | 238 | .dft_brightness = 1, |
240 | pxa_set_cken(CKEN_PWM0, 1); | 239 | .pwm_period_ns = 78770, |
241 | PWM_CTRL0 = 0; | 240 | }; |
242 | PWM_PWDUTY0 = 0x3ff; | 241 | |
243 | PWM_PERVAL0 = 0x3ff; | 242 | static struct platform_device lpd270_backlight_device = { |
244 | } else { | 243 | .name = "pwm-backlight", |
245 | PWM_CTRL0 = 0; | 244 | .dev = { |
246 | PWM_PWDUTY0 = 0x0; | 245 | .parent = &pxa27x_device_pwm0.dev, |
247 | PWM_PERVAL0 = 0x3FF; | 246 | .platform_data = &lpd270_backlight_data, |
248 | pxa_set_cken(CKEN_PWM0, 0); | 247 | }, |
249 | } | 248 | }; |
250 | } | ||
251 | 249 | ||
252 | /* 5.7" TFT QVGA (LoLo display number 1) */ | 250 | /* 5.7" TFT QVGA (LoLo display number 1) */ |
253 | static struct pxafb_mode_info sharp_lq057q3dc02_mode = { | 251 | static struct pxafb_mode_info sharp_lq057q3dc02_mode = { |
@@ -269,7 +267,6 @@ static struct pxafb_mach_info sharp_lq057q3dc02 = { | |||
269 | .num_modes = 1, | 267 | .num_modes = 1, |
270 | .lccr0 = 0x07800080, | 268 | .lccr0 = 0x07800080, |
271 | .lccr3 = 0x00400000, | 269 | .lccr3 = 0x00400000, |
272 | .pxafb_backlight_power = lpd270_backlight_power, | ||
273 | }; | 270 | }; |
274 | 271 | ||
275 | /* 12.1" TFT SVGA (LoLo display number 2) */ | 272 | /* 12.1" TFT SVGA (LoLo display number 2) */ |
@@ -292,7 +289,6 @@ static struct pxafb_mach_info sharp_lq121s1dg31 = { | |||
292 | .num_modes = 1, | 289 | .num_modes = 1, |
293 | .lccr0 = 0x07800080, | 290 | .lccr0 = 0x07800080, |
294 | .lccr3 = 0x00400000, | 291 | .lccr3 = 0x00400000, |
295 | .pxafb_backlight_power = lpd270_backlight_power, | ||
296 | }; | 292 | }; |
297 | 293 | ||
298 | /* 3.6" TFT QVGA (LoLo display number 3) */ | 294 | /* 3.6" TFT QVGA (LoLo display number 3) */ |
@@ -315,7 +311,6 @@ static struct pxafb_mach_info sharp_lq036q1da01 = { | |||
315 | .num_modes = 1, | 311 | .num_modes = 1, |
316 | .lccr0 = 0x07800080, | 312 | .lccr0 = 0x07800080, |
317 | .lccr3 = 0x00400000, | 313 | .lccr3 = 0x00400000, |
318 | .pxafb_backlight_power = lpd270_backlight_power, | ||
319 | }; | 314 | }; |
320 | 315 | ||
321 | /* 6.4" TFT VGA (LoLo display number 5) */ | 316 | /* 6.4" TFT VGA (LoLo display number 5) */ |
@@ -338,7 +333,6 @@ static struct pxafb_mach_info sharp_lq64d343 = { | |||
338 | .num_modes = 1, | 333 | .num_modes = 1, |
339 | .lccr0 = 0x07800080, | 334 | .lccr0 = 0x07800080, |
340 | .lccr3 = 0x00400000, | 335 | .lccr3 = 0x00400000, |
341 | .pxafb_backlight_power = lpd270_backlight_power, | ||
342 | }; | 336 | }; |
343 | 337 | ||
344 | /* 10.4" TFT VGA (LoLo display number 7) */ | 338 | /* 10.4" TFT VGA (LoLo display number 7) */ |
@@ -361,7 +355,6 @@ static struct pxafb_mach_info sharp_lq10d368 = { | |||
361 | .num_modes = 1, | 355 | .num_modes = 1, |
362 | .lccr0 = 0x07800080, | 356 | .lccr0 = 0x07800080, |
363 | .lccr3 = 0x00400000, | 357 | .lccr3 = 0x00400000, |
364 | .pxafb_backlight_power = lpd270_backlight_power, | ||
365 | }; | 358 | }; |
366 | 359 | ||
367 | /* 3.5" TFT QVGA (LoLo display number 8) */ | 360 | /* 3.5" TFT QVGA (LoLo display number 8) */ |
@@ -384,7 +377,6 @@ static struct pxafb_mach_info sharp_lq035q7db02_20 = { | |||
384 | .num_modes = 1, | 377 | .num_modes = 1, |
385 | .lccr0 = 0x07800080, | 378 | .lccr0 = 0x07800080, |
386 | .lccr3 = 0x00400000, | 379 | .lccr3 = 0x00400000, |
387 | .pxafb_backlight_power = lpd270_backlight_power, | ||
388 | }; | 380 | }; |
389 | 381 | ||
390 | static struct pxafb_mach_info *lpd270_lcd_to_use; | 382 | static struct pxafb_mach_info *lpd270_lcd_to_use; |
@@ -414,7 +406,7 @@ __setup("lcd=", lpd270_set_lcd); | |||
414 | 406 | ||
415 | static struct platform_device *platform_devices[] __initdata = { | 407 | static struct platform_device *platform_devices[] __initdata = { |
416 | &smc91x_device, | 408 | &smc91x_device, |
417 | &lpd270_audio_device, | 409 | &lpd270_backlight_device, |
418 | &lpd270_flash_device[0], | 410 | &lpd270_flash_device[0], |
419 | &lpd270_flash_device[1], | 411 | &lpd270_flash_device[1], |
420 | }; | 412 | }; |
@@ -454,9 +446,12 @@ static void __init lpd270_init(void) | |||
454 | * On LogicPD PXA270, we route AC97_SYSCLK via GPIO45. | 446 | * On LogicPD PXA270, we route AC97_SYSCLK via GPIO45. |
455 | */ | 447 | */ |
456 | pxa_gpio_mode(GPIO45_SYSCLK_AC97_MD); | 448 | pxa_gpio_mode(GPIO45_SYSCLK_AC97_MD); |
449 | pxa_gpio_mode(GPIO16_PWM0_MD); | ||
457 | 450 | ||
458 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 451 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
459 | 452 | ||
453 | pxa_set_ac97_info(NULL); | ||
454 | |||
460 | if (lpd270_lcd_to_use != NULL) | 455 | if (lpd270_lcd_to_use != NULL) |
461 | set_pxa_fb_info(lpd270_lcd_to_use); | 456 | set_pxa_fb_info(lpd270_lcd_to_use); |
462 | 457 | ||
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index 7b9bdd0c6665..e041cceab16b 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <asm/arch/pxa-regs.h> | 43 | #include <asm/arch/pxa-regs.h> |
44 | #include <asm/arch/pxa2xx-regs.h> | 44 | #include <asm/arch/pxa2xx-regs.h> |
45 | #include <asm/arch/mfp-pxa25x.h> | 45 | #include <asm/arch/mfp-pxa25x.h> |
46 | #include <asm/arch/audio.h> | ||
46 | #include <asm/arch/lubbock.h> | 47 | #include <asm/arch/lubbock.h> |
47 | #include <asm/arch/udc.h> | 48 | #include <asm/arch/udc.h> |
48 | #include <asm/arch/irda.h> | 49 | #include <asm/arch/irda.h> |
@@ -196,11 +197,6 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = { | |||
196 | // no D+ pullup; lubbock can't connect/disconnect in software | 197 | // no D+ pullup; lubbock can't connect/disconnect in software |
197 | }; | 198 | }; |
198 | 199 | ||
199 | static struct platform_device lub_audio_device = { | ||
200 | .name = "pxa2xx-ac97", | ||
201 | .id = -1, | ||
202 | }; | ||
203 | |||
204 | static struct resource sa1111_resources[] = { | 200 | static struct resource sa1111_resources[] = { |
205 | [0] = { | 201 | [0] = { |
206 | .start = 0x10000000, | 202 | .start = 0x10000000, |
@@ -230,14 +226,6 @@ static struct pxa2xx_spi_master pxa_ssp_master_info = { | |||
230 | .num_chipselect = 0, | 226 | .num_chipselect = 0, |
231 | }; | 227 | }; |
232 | 228 | ||
233 | static struct platform_device pxa_ssp = { | ||
234 | .name = "pxa2xx-spi", | ||
235 | .id = 1, | ||
236 | .dev = { | ||
237 | .platform_data = &pxa_ssp_master_info, | ||
238 | }, | ||
239 | }; | ||
240 | |||
241 | static int lubbock_ads7846_pendown_state(void) | 229 | static int lubbock_ads7846_pendown_state(void) |
242 | { | 230 | { |
243 | /* TS_BUSY is bit 8 in LUB_MISC_RD, but pendown is irq-only */ | 231 | /* TS_BUSY is bit 8 in LUB_MISC_RD, but pendown is irq-only */ |
@@ -368,11 +356,9 @@ static struct platform_device lubbock_flash_device[2] = { | |||
368 | 356 | ||
369 | static struct platform_device *devices[] __initdata = { | 357 | static struct platform_device *devices[] __initdata = { |
370 | &sa1111_device, | 358 | &sa1111_device, |
371 | &lub_audio_device, | ||
372 | &smc91x_device, | 359 | &smc91x_device, |
373 | &lubbock_flash_device[0], | 360 | &lubbock_flash_device[0], |
374 | &lubbock_flash_device[1], | 361 | &lubbock_flash_device[1], |
375 | &pxa_ssp, | ||
376 | }; | 362 | }; |
377 | 363 | ||
378 | static struct pxafb_mode_info sharp_lm8v31_mode = { | 364 | static struct pxafb_mode_info sharp_lm8v31_mode = { |
@@ -494,6 +480,7 @@ static void __init lubbock_init(void) | |||
494 | set_pxa_fb_info(&sharp_lm8v31); | 480 | set_pxa_fb_info(&sharp_lm8v31); |
495 | pxa_set_mci_info(&lubbock_mci_platform_data); | 481 | pxa_set_mci_info(&lubbock_mci_platform_data); |
496 | pxa_set_ficp_info(&lubbock_ficp_platform_data); | 482 | pxa_set_ficp_info(&lubbock_ficp_platform_data); |
483 | pxa_set_ac97_info(NULL); | ||
497 | 484 | ||
498 | lubbock_flash_data[0].width = lubbock_flash_data[1].width = | 485 | lubbock_flash_data[0].width = lubbock_flash_data[1].width = |
499 | (BOOT_DEF & 1) ? 2 : 4; | 486 | (BOOT_DEF & 1) ? 2 : 4; |
@@ -505,6 +492,7 @@ static void __init lubbock_init(void) | |||
505 | lubbock_flash_data[flashboot].name = "boot-rom"; | 492 | lubbock_flash_data[flashboot].name = "boot-rom"; |
506 | (void) platform_add_devices(devices, ARRAY_SIZE(devices)); | 493 | (void) platform_add_devices(devices, ARRAY_SIZE(devices)); |
507 | 494 | ||
495 | pxa2xx_set_spi_info(1, &pxa_ssp_master_info); | ||
508 | spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); | 496 | spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); |
509 | } | 497 | } |
510 | 498 | ||
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index badba064dc04..01b2fa790217 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/mtd/map.h> | 25 | #include <linux/mtd/map.h> |
26 | #include <linux/mtd/physmap.h> | 26 | #include <linux/mtd/physmap.h> |
27 | #include <linux/pda_power.h> | 27 | #include <linux/pda_power.h> |
28 | #include <linux/pwm_backlight.h> | ||
28 | 29 | ||
29 | #include <asm/gpio.h> | 30 | #include <asm/gpio.h> |
30 | #include <asm/hardware.h> | 31 | #include <asm/hardware.h> |
@@ -33,12 +34,14 @@ | |||
33 | #include <asm/arch/magician.h> | 34 | #include <asm/arch/magician.h> |
34 | #include <asm/arch/mfp-pxa27x.h> | 35 | #include <asm/arch/mfp-pxa27x.h> |
35 | #include <asm/arch/pxa-regs.h> | 36 | #include <asm/arch/pxa-regs.h> |
37 | #include <asm/arch/pxa2xx-regs.h> | ||
36 | #include <asm/arch/pxafb.h> | 38 | #include <asm/arch/pxafb.h> |
37 | #include <asm/arch/i2c.h> | 39 | #include <asm/arch/i2c.h> |
38 | #include <asm/arch/mmc.h> | 40 | #include <asm/arch/mmc.h> |
39 | #include <asm/arch/irda.h> | 41 | #include <asm/arch/irda.h> |
40 | #include <asm/arch/ohci.h> | 42 | #include <asm/arch/ohci.h> |
41 | 43 | ||
44 | #include "devices.h" | ||
42 | #include "generic.h" | 45 | #include "generic.h" |
43 | 46 | ||
44 | static unsigned long magician_pin_config[] = { | 47 | static unsigned long magician_pin_config[] = { |
@@ -348,40 +351,58 @@ static struct pxafb_mach_info samsung_info = { | |||
348 | * Backlight | 351 | * Backlight |
349 | */ | 352 | */ |
350 | 353 | ||
351 | static void magician_set_bl_intensity(int intensity) | 354 | static int magician_backlight_init(struct device *dev) |
352 | { | 355 | { |
353 | if (intensity) { | 356 | int ret; |
354 | PWM_CTRL0 = 1; | 357 | |
355 | PWM_PERVAL0 = 0xc8; | 358 | ret = gpio_request(EGPIO_MAGICIAN_BL_POWER, "BL_POWER"); |
356 | if (intensity > 0xc7) { | 359 | if (ret) |
357 | PWM_PWDUTY0 = intensity - 0x48; | 360 | goto err; |
358 | gpio_set_value(EGPIO_MAGICIAN_BL_POWER2, 1); | 361 | ret = gpio_request(EGPIO_MAGICIAN_BL_POWER2, "BL_POWER2"); |
359 | } else { | 362 | if (ret) |
360 | PWM_PWDUTY0 = intensity; | 363 | goto err2; |
361 | gpio_set_value(EGPIO_MAGICIAN_BL_POWER2, 0); | 364 | return 0; |
362 | } | 365 | |
363 | gpio_set_value(EGPIO_MAGICIAN_BL_POWER, 1); | 366 | err2: |
364 | pxa_set_cken(CKEN_PWM0, 1); | 367 | gpio_free(EGPIO_MAGICIAN_BL_POWER); |
368 | err: | ||
369 | return ret; | ||
370 | } | ||
371 | |||
372 | static int magician_backlight_notify(int brightness) | ||
373 | { | ||
374 | gpio_set_value(EGPIO_MAGICIAN_BL_POWER, brightness); | ||
375 | if (brightness >= 200) { | ||
376 | gpio_set_value(EGPIO_MAGICIAN_BL_POWER2, 1); | ||
377 | return brightness - 72; | ||
365 | } else { | 378 | } else { |
366 | /* PWM_PWDUTY0 = intensity; */ | 379 | gpio_set_value(EGPIO_MAGICIAN_BL_POWER2, 0); |
367 | gpio_set_value(EGPIO_MAGICIAN_BL_POWER, 0); | 380 | return brightness; |
368 | pxa_set_cken(CKEN_PWM0, 0); | ||
369 | } | 381 | } |
370 | } | 382 | } |
371 | 383 | ||
372 | static struct generic_bl_info backlight_info = { | 384 | static void magician_backlight_exit(struct device *dev) |
373 | .default_intensity = 0x64, | 385 | { |
374 | .limit_mask = 0x0b, | 386 | gpio_free(EGPIO_MAGICIAN_BL_POWER); |
375 | .max_intensity = 0xc7+0x48, | 387 | gpio_free(EGPIO_MAGICIAN_BL_POWER2); |
376 | .set_bl_intensity = magician_set_bl_intensity, | 388 | } |
389 | |||
390 | static struct platform_pwm_backlight_data backlight_data = { | ||
391 | .pwm_id = 0, | ||
392 | .max_brightness = 272, | ||
393 | .dft_brightness = 100, | ||
394 | .pwm_period_ns = 30923, | ||
395 | .init = magician_backlight_init, | ||
396 | .notify = magician_backlight_notify, | ||
397 | .exit = magician_backlight_exit, | ||
377 | }; | 398 | }; |
378 | 399 | ||
379 | static struct platform_device backlight = { | 400 | static struct platform_device backlight = { |
380 | .name = "generic-bl", | 401 | .name = "pwm-backlight", |
381 | .dev = { | 402 | .dev = { |
382 | .platform_data = &backlight_info, | 403 | .parent = &pxa27x_device_pwm0.dev, |
404 | .platform_data = &backlight_data, | ||
383 | }, | 405 | }, |
384 | .id = -1, | ||
385 | }; | 406 | }; |
386 | 407 | ||
387 | /* | 408 | /* |
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 7399fb34da4e..f2e9e7c4da8e 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
@@ -23,9 +23,9 @@ | |||
23 | #include <linux/ioport.h> | 23 | #include <linux/ioport.h> |
24 | #include <linux/mtd/mtd.h> | 24 | #include <linux/mtd/mtd.h> |
25 | #include <linux/mtd/partitions.h> | 25 | #include <linux/mtd/partitions.h> |
26 | #include <linux/backlight.h> | ||
27 | #include <linux/input.h> | 26 | #include <linux/input.h> |
28 | #include <linux/gpio_keys.h> | 27 | #include <linux/gpio_keys.h> |
28 | #include <linux/pwm_backlight.h> | ||
29 | 29 | ||
30 | #include <asm/types.h> | 30 | #include <asm/types.h> |
31 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
@@ -280,12 +280,6 @@ static pxa2xx_audio_ops_t mst_audio_ops = { | |||
280 | .resume = mst_audio_resume, | 280 | .resume = mst_audio_resume, |
281 | }; | 281 | }; |
282 | 282 | ||
283 | static struct platform_device mst_audio_device = { | ||
284 | .name = "pxa2xx-ac97", | ||
285 | .id = -1, | ||
286 | .dev = { .platform_data = &mst_audio_ops }, | ||
287 | }; | ||
288 | |||
289 | static struct resource flash_resources[] = { | 283 | static struct resource flash_resources[] = { |
290 | [0] = { | 284 | [0] = { |
291 | .start = PXA_CS0_PHYS, | 285 | .start = PXA_CS0_PHYS, |
@@ -349,56 +343,27 @@ static struct platform_device mst_flash_device[2] = { | |||
349 | }, | 343 | }, |
350 | }; | 344 | }; |
351 | 345 | ||
352 | #ifdef CONFIG_BACKLIGHT_CLASS_DEVICE | 346 | #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) |
353 | static int mainstone_backlight_update_status(struct backlight_device *bl) | 347 | static struct platform_pwm_backlight_data mainstone_backlight_data = { |
354 | { | 348 | .pwm_id = 0, |
355 | int brightness = bl->props.brightness; | 349 | .max_brightness = 1023, |
356 | 350 | .dft_brightness = 1023, | |
357 | if (bl->props.power != FB_BLANK_UNBLANK || | 351 | .pwm_period_ns = 78770, |
358 | bl->props.fb_blank != FB_BLANK_UNBLANK) | 352 | }; |
359 | brightness = 0; | ||
360 | |||
361 | if (brightness != 0) | ||
362 | pxa_set_cken(CKEN_PWM0, 1); | ||
363 | |||
364 | PWM_CTRL0 = 0; | ||
365 | PWM_PWDUTY0 = brightness; | ||
366 | PWM_PERVAL0 = bl->props.max_brightness; | ||
367 | |||
368 | if (brightness == 0) | ||
369 | pxa_set_cken(CKEN_PWM0, 0); | ||
370 | return 0; /* pointless return value */ | ||
371 | } | ||
372 | |||
373 | static int mainstone_backlight_get_brightness(struct backlight_device *bl) | ||
374 | { | ||
375 | return PWM_PWDUTY0; | ||
376 | } | ||
377 | 353 | ||
378 | static /*const*/ struct backlight_ops mainstone_backlight_ops = { | 354 | static struct platform_device mainstone_backlight_device = { |
379 | .update_status = mainstone_backlight_update_status, | 355 | .name = "pwm-backlight", |
380 | .get_brightness = mainstone_backlight_get_brightness, | 356 | .dev = { |
357 | .parent = &pxa27x_device_pwm0.dev, | ||
358 | .platform_data = &mainstone_backlight_data, | ||
359 | }, | ||
381 | }; | 360 | }; |
382 | 361 | ||
383 | static void __init mainstone_backlight_register(void) | 362 | static void __init mainstone_backlight_register(void) |
384 | { | 363 | { |
385 | struct backlight_device *bl; | 364 | int ret = platform_device_register(&mainstone_backlight_device); |
386 | 365 | if (ret) | |
387 | bl = backlight_device_register("mainstone-bl", &pxa_device_fb.dev, | 366 | printk(KERN_ERR "mainstone: failed to register backlight device: %d\n", ret); |
388 | NULL, &mainstone_backlight_ops); | ||
389 | if (IS_ERR(bl)) { | ||
390 | printk(KERN_ERR "mainstone: unable to register backlight: %ld\n", | ||
391 | PTR_ERR(bl)); | ||
392 | return; | ||
393 | } | ||
394 | |||
395 | /* | ||
396 | * broken design - register-then-setup interfaces are | ||
397 | * utterly broken by definition. | ||
398 | */ | ||
399 | bl->props.max_brightness = 1023; | ||
400 | bl->props.brightness = 1023; | ||
401 | backlight_update_status(bl); | ||
402 | } | 367 | } |
403 | #else | 368 | #else |
404 | #define mainstone_backlight_register() do { } while (0) | 369 | #define mainstone_backlight_register() do { } while (0) |
@@ -528,7 +493,6 @@ static struct platform_device mst_gpio_keys_device = { | |||
528 | 493 | ||
529 | static struct platform_device *platform_devices[] __initdata = { | 494 | static struct platform_device *platform_devices[] __initdata = { |
530 | &smc91x_device, | 495 | &smc91x_device, |
531 | &mst_audio_device, | ||
532 | &mst_flash_device[0], | 496 | &mst_flash_device[0], |
533 | &mst_flash_device[1], | 497 | &mst_flash_device[1], |
534 | &mst_gpio_keys_device, | 498 | &mst_gpio_keys_device, |
@@ -638,6 +602,7 @@ static void __init mainstone_init(void) | |||
638 | pxa_set_ficp_info(&mainstone_ficp_platform_data); | 602 | pxa_set_ficp_info(&mainstone_ficp_platform_data); |
639 | pxa_set_ohci_info(&mainstone_ohci_platform_data); | 603 | pxa_set_ohci_info(&mainstone_ohci_platform_data); |
640 | pxa_set_i2c_info(NULL); | 604 | pxa_set_i2c_info(NULL); |
605 | pxa_set_ac97_info(&mst_audio_ops); | ||
641 | 606 | ||
642 | mainstone_init_keypad(); | 607 | mainstone_init_keypad(); |
643 | } | 608 | } |
diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c index 22097a1707cc..d1cdb4ecb0b8 100644 --- a/arch/arm/mach-pxa/mfp-pxa2xx.c +++ b/arch/arm/mach-pxa/mfp-pxa2xx.c | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #include <asm/arch/hardware.h> | 21 | #include <asm/arch/hardware.h> |
22 | #include <asm/arch/pxa-regs.h> | 22 | #include <asm/arch/pxa-regs.h> |
23 | #include <asm/arch/pxa2xx-regs.h> | ||
23 | #include <asm/arch/mfp-pxa2xx.h> | 24 | #include <asm/arch/mfp-pxa2xx.h> |
24 | 25 | ||
25 | #include "generic.h" | 26 | #include "generic.h" |
diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c index 3b945eb0aee3..377f3be8ce57 100644 --- a/arch/arm/mach-pxa/pcm027.c +++ b/arch/arm/mach-pxa/pcm027.c | |||
@@ -24,7 +24,9 @@ | |||
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/mtd/physmap.h> | 25 | #include <linux/mtd/physmap.h> |
26 | #include <linux/spi/spi.h> | 26 | #include <linux/spi/spi.h> |
27 | #include <linux/spi/max7301.h> | ||
27 | #include <linux/leds.h> | 28 | #include <linux/leds.h> |
29 | |||
28 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
29 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
30 | #include <asm/arch/hardware.h> | 32 | #include <asm/arch/hardware.h> |
@@ -108,6 +110,32 @@ static struct platform_device smc91x_device = { | |||
108 | .resource = smc91x_resources, | 110 | .resource = smc91x_resources, |
109 | }; | 111 | }; |
110 | 112 | ||
113 | /* | ||
114 | * SPI host and devices | ||
115 | */ | ||
116 | static struct pxa2xx_spi_master pxa_ssp_master_info = { | ||
117 | .num_chipselect = 1, | ||
118 | }; | ||
119 | |||
120 | static struct max7301_platform_data max7301_info = { | ||
121 | .base = -1, | ||
122 | }; | ||
123 | |||
124 | /* bus_num must match id in pxa2xx_set_spi_info() call */ | ||
125 | static struct spi_board_info spi_board_info[] __initdata = { | ||
126 | { | ||
127 | .modalias = "max7301", | ||
128 | .platform_data = &max7301_info, | ||
129 | .max_speed_hz = 13000000, | ||
130 | .bus_num = 1, | ||
131 | .chip_select = 0, | ||
132 | .mode = SPI_MODE_0, | ||
133 | }, | ||
134 | }; | ||
135 | |||
136 | /* | ||
137 | * NOR flash | ||
138 | */ | ||
111 | static struct physmap_flash_data pcm027_flash_data = { | 139 | static struct physmap_flash_data pcm027_flash_data = { |
112 | .width = 4, | 140 | .width = 4, |
113 | }; | 141 | }; |
@@ -190,6 +218,9 @@ static void __init pcm027_init(void) | |||
190 | #ifdef CONFIG_MACH_PCM990_BASEBOARD | 218 | #ifdef CONFIG_MACH_PCM990_BASEBOARD |
191 | pcm990_baseboard_init(); | 219 | pcm990_baseboard_init(); |
192 | #endif | 220 | #endif |
221 | |||
222 | pxa2xx_set_spi_info(1, &pxa_ssp_master_info); | ||
223 | spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); | ||
193 | } | 224 | } |
194 | 225 | ||
195 | static void __init pcm027_map_io(void) | 226 | static void __init pcm027_map_io(void) |
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index 49d951db0f3d..5d87c7c866e4 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/ide.h> | 25 | #include <linux/ide.h> |
26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
27 | #include <linux/pwm_backlight.h> | ||
27 | 28 | ||
28 | #include <media/soc_camera.h> | 29 | #include <media/soc_camera.h> |
29 | 30 | ||
@@ -33,12 +34,103 @@ | |||
33 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
34 | #include <asm/arch/pxa-regs.h> | 35 | #include <asm/arch/pxa-regs.h> |
35 | #include <asm/arch/pxa2xx-gpio.h> | 36 | #include <asm/arch/pxa2xx-gpio.h> |
37 | #include <asm/arch/audio.h> | ||
36 | #include <asm/arch/mmc.h> | 38 | #include <asm/arch/mmc.h> |
37 | #include <asm/arch/ohci.h> | 39 | #include <asm/arch/ohci.h> |
38 | #include <asm/arch/pcm990_baseboard.h> | 40 | #include <asm/arch/pcm990_baseboard.h> |
41 | #include <asm/arch/pxafb.h> | ||
42 | |||
43 | #include "devices.h" | ||
39 | 44 | ||
40 | /* | 45 | /* |
41 | * The PCM-990 development baseboard uses PCM-027's hardeware in the | 46 | * pcm990_lcd_power - control power supply to the LCD |
47 | * @on: 0 = switch off, 1 = switch on | ||
48 | * | ||
49 | * Called by the pxafb driver | ||
50 | */ | ||
51 | #ifndef CONFIG_PCM990_DISPLAY_NONE | ||
52 | static void pcm990_lcd_power(int on, struct fb_var_screeninfo *var) | ||
53 | { | ||
54 | if (on) { | ||
55 | /* enable LCD-Latches | ||
56 | * power on LCD | ||
57 | */ | ||
58 | __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG3) = | ||
59 | PCM990_CTRL_LCDPWR + PCM990_CTRL_LCDON; | ||
60 | } else { | ||
61 | /* disable LCD-Latches | ||
62 | * power off LCD | ||
63 | */ | ||
64 | __PCM990_CTRL_REG(PCM990_CTRL_PHYS + PCM990_CTRL_REG3) = 0x00; | ||
65 | } | ||
66 | } | ||
67 | #endif | ||
68 | |||
69 | #if defined(CONFIG_PCM990_DISPLAY_SHARP) | ||
70 | static struct pxafb_mode_info fb_info_sharp_lq084v1dg21 = { | ||
71 | .pixclock = 28000, | ||
72 | .xres = 640, | ||
73 | .yres = 480, | ||
74 | .bpp = 16, | ||
75 | .hsync_len = 20, | ||
76 | .left_margin = 103, | ||
77 | .right_margin = 47, | ||
78 | .vsync_len = 6, | ||
79 | .upper_margin = 28, | ||
80 | .lower_margin = 5, | ||
81 | .sync = 0, | ||
82 | .cmap_greyscale = 0, | ||
83 | }; | ||
84 | |||
85 | static struct pxafb_mach_info pcm990_fbinfo __initdata = { | ||
86 | .modes = &fb_info_sharp_lq084v1dg21, | ||
87 | .num_modes = 1, | ||
88 | .lccr0 = LCCR0_PAS, | ||
89 | .lccr3 = LCCR3_PCP, | ||
90 | .pxafb_lcd_power = pcm990_lcd_power, | ||
91 | }; | ||
92 | #elif defined(CONFIG_PCM990_DISPLAY_NEC) | ||
93 | struct pxafb_mode_info fb_info_nec_nl6448bc20_18d = { | ||
94 | .pixclock = 39720, | ||
95 | .xres = 640, | ||
96 | .yres = 480, | ||
97 | .bpp = 16, | ||
98 | .hsync_len = 32, | ||
99 | .left_margin = 16, | ||
100 | .right_margin = 48, | ||
101 | .vsync_len = 2, | ||
102 | .upper_margin = 12, | ||
103 | .lower_margin = 17, | ||
104 | .sync = 0, | ||
105 | .cmap_greyscale = 0, | ||
106 | }; | ||
107 | |||
108 | static struct pxafb_mach_info pcm990_fbinfo __initdata = { | ||
109 | .modes = &fb_info_nec_nl6448bc20_18d, | ||
110 | .num_modes = 1, | ||
111 | .lccr0 = LCCR0_Act, | ||
112 | .lccr3 = LCCR3_PixFlEdg, | ||
113 | .pxafb_lcd_power = pcm990_lcd_power, | ||
114 | }; | ||
115 | #endif | ||
116 | |||
117 | static struct platform_pwm_backlight_data pcm990_backlight_data = { | ||
118 | .pwm_id = 0, | ||
119 | .max_brightness = 1023, | ||
120 | .dft_brightness = 1023, | ||
121 | .pwm_period_ns = 78770, | ||
122 | }; | ||
123 | |||
124 | static struct platform_device pcm990_backlight_device = { | ||
125 | .name = "pwm-backlight", | ||
126 | .dev = { | ||
127 | .parent = &pxa27x_device_pwm0.dev, | ||
128 | .platform_data = &pcm990_backlight_data, | ||
129 | }, | ||
130 | }; | ||
131 | |||
132 | /* | ||
133 | * The PCM-990 development baseboard uses PCM-027's hardware in the | ||
42 | * following way: | 134 | * following way: |
43 | * | 135 | * |
44 | * - LCD support is in use | 136 | * - LCD support is in use |
@@ -333,36 +425,6 @@ static struct i2c_board_info __initdata pcm990_i2c_devices[] = { | |||
333 | #endif /* CONFIG_VIDEO_PXA27x ||CONFIG_VIDEO_PXA27x_MODULE */ | 425 | #endif /* CONFIG_VIDEO_PXA27x ||CONFIG_VIDEO_PXA27x_MODULE */ |
334 | 426 | ||
335 | /* | 427 | /* |
336 | * AC97 support | ||
337 | * Note: The connected AC97 mixer also reports interrupts at PCM990_AC97_IRQ | ||
338 | */ | ||
339 | static struct resource pxa27x_ac97_resources[] = { | ||
340 | [0] = { | ||
341 | .start = 0x40500000, | ||
342 | .end = 0x40500000 + 0xfff, | ||
343 | .flags = IORESOURCE_MEM, | ||
344 | }, | ||
345 | [1] = { | ||
346 | .start = IRQ_AC97, | ||
347 | .end = IRQ_AC97, | ||
348 | .flags = IORESOURCE_IRQ, | ||
349 | }, | ||
350 | }; | ||
351 | |||
352 | static u64 pxa_ac97_dmamask = 0xffffffffUL; | ||
353 | |||
354 | static struct platform_device pxa27x_device_ac97 = { | ||
355 | .name = "pxa2xx-ac97", | ||
356 | .id = -1, | ||
357 | .dev = { | ||
358 | .dma_mask = &pxa_ac97_dmamask, | ||
359 | .coherent_dma_mask = 0xffffffff, | ||
360 | }, | ||
361 | .num_resources = ARRAY_SIZE(pxa27x_ac97_resources), | ||
362 | .resource = pxa27x_ac97_resources, | ||
363 | }; | ||
364 | |||
365 | /* | ||
366 | * enable generic access to the base board control CPLDs U6 and U7 | 428 | * enable generic access to the base board control CPLDs U6 and U7 |
367 | */ | 429 | */ |
368 | static struct map_desc pcm990_io_desc[] __initdata = { | 430 | static struct map_desc pcm990_io_desc[] __initdata = { |
@@ -393,7 +455,11 @@ void __init pcm990_baseboard_init(void) | |||
393 | /* register CPLD's IRQ controller */ | 455 | /* register CPLD's IRQ controller */ |
394 | pcm990_init_irq(); | 456 | pcm990_init_irq(); |
395 | 457 | ||
396 | platform_device_register(&pxa27x_device_ac97); | 458 | #ifndef CONFIG_PCM990_DISPLAY_NONE |
459 | set_pxa_fb_info(&pcm990_fbinfo); | ||
460 | #endif | ||
461 | pxa_gpio_mode(GPIO16_PWM0_MD); | ||
462 | platform_device_register(&pcm990_backlight_device); | ||
397 | 463 | ||
398 | /* MMC */ | 464 | /* MMC */ |
399 | pxa_set_mci_info(&pcm990_mci_platform_data); | 465 | pxa_set_mci_info(&pcm990_mci_platform_data); |
@@ -402,6 +468,7 @@ void __init pcm990_baseboard_init(void) | |||
402 | pxa_set_ohci_info(&pcm990_ohci_platform_data); | 468 | pxa_set_ohci_info(&pcm990_ohci_platform_data); |
403 | 469 | ||
404 | pxa_set_i2c_info(NULL); | 470 | pxa_set_i2c_info(NULL); |
471 | pxa_set_ac97_info(NULL); | ||
405 | 472 | ||
406 | #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE) | 473 | #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE) |
407 | pxa_set_camera_info(&pcm990_pxacamera_platform_data); | 474 | pxa_set_camera_info(&pcm990_pxacamera_platform_data); |
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 0b30f25cff3c..f81c10cafd48 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <asm/mach/irq.h> | 32 | #include <asm/mach/irq.h> |
33 | 33 | ||
34 | #include <asm/arch/pxa-regs.h> | 34 | #include <asm/arch/pxa-regs.h> |
35 | #include <asm/arch/pxa2xx-regs.h> | ||
35 | #include <asm/arch/pxa2xx-gpio.h> | 36 | #include <asm/arch/pxa2xx-gpio.h> |
36 | #include <asm/arch/mmc.h> | 37 | #include <asm/arch/mmc.h> |
37 | #include <asm/arch/udc.h> | 38 | #include <asm/arch/udc.h> |
diff --git a/arch/arm/mach-pxa/pwm.c b/arch/arm/mach-pxa/pwm.c new file mode 100644 index 000000000000..ce28cd9fed16 --- /dev/null +++ b/arch/arm/mach-pxa/pwm.c | |||
@@ -0,0 +1,319 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-pxa/pwm.c | ||
3 | * | ||
4 | * simple driver for PWM (Pulse Width Modulator) controller | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * 2008-02-13 initial version | ||
11 | * eric miao <eric.miao@marvell.com> | ||
12 | */ | ||
13 | |||
14 | #include <linux/module.h> | ||
15 | #include <linux/kernel.h> | ||
16 | #include <linux/platform_device.h> | ||
17 | #include <linux/err.h> | ||
18 | #include <linux/clk.h> | ||
19 | #include <linux/io.h> | ||
20 | #include <linux/pwm.h> | ||
21 | |||
22 | #include <asm/div64.h> | ||
23 | #include <asm/arch/pxa-regs.h> | ||
24 | |||
25 | /* PWM registers and bits definitions */ | ||
26 | #define PWMCR (0x00) | ||
27 | #define PWMDCR (0x04) | ||
28 | #define PWMPCR (0x08) | ||
29 | |||
30 | #define PWMCR_SD (1 << 6) | ||
31 | #define PWMDCR_FD (1 << 10) | ||
32 | |||
33 | struct pwm_device { | ||
34 | struct list_head node; | ||
35 | struct platform_device *pdev; | ||
36 | |||
37 | const char *label; | ||
38 | struct clk *clk; | ||
39 | int clk_enabled; | ||
40 | void __iomem *mmio_base; | ||
41 | |||
42 | unsigned int use_count; | ||
43 | unsigned int pwm_id; | ||
44 | }; | ||
45 | |||
46 | /* | ||
47 | * period_ns = 10^9 * (PRESCALE + 1) * (PV + 1) / PWM_CLK_RATE | ||
48 | * duty_ns = 10^9 * (PRESCALE + 1) * DC / PWM_CLK_RATE | ||
49 | */ | ||
50 | int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) | ||
51 | { | ||
52 | unsigned long long c; | ||
53 | unsigned long period_cycles, prescale, pv, dc; | ||
54 | |||
55 | if (pwm == NULL || period_ns == 0 || duty_ns > period_ns) | ||
56 | return -EINVAL; | ||
57 | |||
58 | c = clk_get_rate(pwm->clk); | ||
59 | c = c * period_ns; | ||
60 | do_div(c, 1000000000); | ||
61 | period_cycles = c; | ||
62 | |||
63 | if (period_cycles < 0) | ||
64 | period_cycles = 1; | ||
65 | prescale = (period_cycles - 1) / 1024; | ||
66 | pv = period_cycles / (prescale + 1) - 1; | ||
67 | |||
68 | if (prescale > 63) | ||
69 | return -EINVAL; | ||
70 | |||
71 | if (duty_ns == period_ns) | ||
72 | dc = PWMDCR_FD; | ||
73 | else | ||
74 | dc = (pv + 1) * duty_ns / period_ns; | ||
75 | |||
76 | /* NOTE: the clock to PWM has to be enabled first | ||
77 | * before writing to the registers | ||
78 | */ | ||
79 | clk_enable(pwm->clk); | ||
80 | __raw_writel(prescale, pwm->mmio_base + PWMCR); | ||
81 | __raw_writel(dc, pwm->mmio_base + PWMDCR); | ||
82 | __raw_writel(pv, pwm->mmio_base + PWMPCR); | ||
83 | clk_disable(pwm->clk); | ||
84 | |||
85 | return 0; | ||
86 | } | ||
87 | EXPORT_SYMBOL(pwm_config); | ||
88 | |||
89 | int pwm_enable(struct pwm_device *pwm) | ||
90 | { | ||
91 | int rc = 0; | ||
92 | |||
93 | if (!pwm->clk_enabled) { | ||
94 | rc = clk_enable(pwm->clk); | ||
95 | if (!rc) | ||
96 | pwm->clk_enabled = 1; | ||
97 | } | ||
98 | return rc; | ||
99 | } | ||
100 | EXPORT_SYMBOL(pwm_enable); | ||
101 | |||
102 | void pwm_disable(struct pwm_device *pwm) | ||
103 | { | ||
104 | if (pwm->clk_enabled) { | ||
105 | clk_disable(pwm->clk); | ||
106 | pwm->clk_enabled = 0; | ||
107 | } | ||
108 | } | ||
109 | EXPORT_SYMBOL(pwm_disable); | ||
110 | |||
111 | static DEFINE_MUTEX(pwm_lock); | ||
112 | static LIST_HEAD(pwm_list); | ||
113 | |||
114 | struct pwm_device *pwm_request(int pwm_id, const char *label) | ||
115 | { | ||
116 | struct pwm_device *pwm; | ||
117 | int found = 0; | ||
118 | |||
119 | mutex_lock(&pwm_lock); | ||
120 | |||
121 | list_for_each_entry(pwm, &pwm_list, node) { | ||
122 | if (pwm->pwm_id == pwm_id) { | ||
123 | found = 1; | ||
124 | break; | ||
125 | } | ||
126 | } | ||
127 | |||
128 | if (found) { | ||
129 | if (pwm->use_count == 0) { | ||
130 | pwm->use_count++; | ||
131 | pwm->label = label; | ||
132 | } else | ||
133 | pwm = ERR_PTR(-EBUSY); | ||
134 | } else | ||
135 | pwm = ERR_PTR(-ENOENT); | ||
136 | |||
137 | mutex_unlock(&pwm_lock); | ||
138 | return pwm; | ||
139 | } | ||
140 | EXPORT_SYMBOL(pwm_request); | ||
141 | |||
142 | void pwm_free(struct pwm_device *pwm) | ||
143 | { | ||
144 | mutex_lock(&pwm_lock); | ||
145 | |||
146 | if (pwm->use_count) { | ||
147 | pwm->use_count--; | ||
148 | pwm->label = NULL; | ||
149 | } else | ||
150 | pr_warning("PWM device already freed\n"); | ||
151 | |||
152 | mutex_unlock(&pwm_lock); | ||
153 | } | ||
154 | EXPORT_SYMBOL(pwm_free); | ||
155 | |||
156 | static inline void __add_pwm(struct pwm_device *pwm) | ||
157 | { | ||
158 | mutex_lock(&pwm_lock); | ||
159 | list_add_tail(&pwm->node, &pwm_list); | ||
160 | mutex_unlock(&pwm_lock); | ||
161 | } | ||
162 | |||
163 | static struct pwm_device *pwm_probe(struct platform_device *pdev, | ||
164 | unsigned int pwm_id, struct pwm_device *parent_pwm) | ||
165 | { | ||
166 | struct pwm_device *pwm; | ||
167 | struct resource *r; | ||
168 | int ret = 0; | ||
169 | |||
170 | pwm = kzalloc(sizeof(struct pwm_device), GFP_KERNEL); | ||
171 | if (pwm == NULL) { | ||
172 | dev_err(&pdev->dev, "failed to allocate memory\n"); | ||
173 | return ERR_PTR(-ENOMEM); | ||
174 | } | ||
175 | |||
176 | pwm->clk = clk_get(&pdev->dev, "PWMCLK"); | ||
177 | if (IS_ERR(pwm->clk)) { | ||
178 | ret = PTR_ERR(pwm->clk); | ||
179 | goto err_free; | ||
180 | } | ||
181 | pwm->clk_enabled = 0; | ||
182 | |||
183 | pwm->use_count = 0; | ||
184 | pwm->pwm_id = pwm_id; | ||
185 | pwm->pdev = pdev; | ||
186 | |||
187 | if (parent_pwm != NULL) { | ||
188 | /* registers for the second PWM has offset of 0x10 */ | ||
189 | pwm->mmio_base = parent_pwm->mmio_base + 0x10; | ||
190 | __add_pwm(pwm); | ||
191 | return pwm; | ||
192 | } | ||
193 | |||
194 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
195 | if (r == NULL) { | ||
196 | dev_err(&pdev->dev, "no memory resource defined\n"); | ||
197 | ret = -ENODEV; | ||
198 | goto err_free_clk; | ||
199 | } | ||
200 | |||
201 | r = request_mem_region(r->start, r->end - r->start + 1, pdev->name); | ||
202 | if (r == NULL) { | ||
203 | dev_err(&pdev->dev, "failed to request memory resource\n"); | ||
204 | ret = -EBUSY; | ||
205 | goto err_free_clk; | ||
206 | } | ||
207 | |||
208 | pwm->mmio_base = ioremap(r->start, r->end - r->start + 1); | ||
209 | if (pwm->mmio_base == NULL) { | ||
210 | dev_err(&pdev->dev, "failed to ioremap() registers\n"); | ||
211 | ret = -ENODEV; | ||
212 | goto err_free_mem; | ||
213 | } | ||
214 | |||
215 | __add_pwm(pwm); | ||
216 | platform_set_drvdata(pdev, pwm); | ||
217 | return pwm; | ||
218 | |||
219 | err_free_mem: | ||
220 | release_mem_region(r->start, r->end - r->start + 1); | ||
221 | err_free_clk: | ||
222 | clk_put(pwm->clk); | ||
223 | err_free: | ||
224 | kfree(pwm); | ||
225 | return ERR_PTR(ret); | ||
226 | } | ||
227 | |||
228 | static int __devinit pxa25x_pwm_probe(struct platform_device *pdev) | ||
229 | { | ||
230 | struct pwm_device *pwm = pwm_probe(pdev, pdev->id, NULL); | ||
231 | |||
232 | if (IS_ERR(pwm)) | ||
233 | return PTR_ERR(pwm); | ||
234 | |||
235 | return 0; | ||
236 | } | ||
237 | |||
238 | static int __devinit pxa27x_pwm_probe(struct platform_device *pdev) | ||
239 | { | ||
240 | struct pwm_device *pwm; | ||
241 | |||
242 | pwm = pwm_probe(pdev, pdev->id, NULL); | ||
243 | if (IS_ERR(pwm)) | ||
244 | return PTR_ERR(pwm); | ||
245 | |||
246 | pwm = pwm_probe(pdev, pdev->id + 2, pwm); | ||
247 | if (IS_ERR(pwm)) | ||
248 | return PTR_ERR(pwm); | ||
249 | |||
250 | return 0; | ||
251 | } | ||
252 | |||
253 | static int __devexit pwm_remove(struct platform_device *pdev) | ||
254 | { | ||
255 | struct pwm_device *pwm; | ||
256 | struct resource *r; | ||
257 | |||
258 | pwm = platform_get_drvdata(pdev); | ||
259 | if (pwm == NULL) | ||
260 | return -ENODEV; | ||
261 | |||
262 | mutex_lock(&pwm_lock); | ||
263 | list_del(&pwm->node); | ||
264 | mutex_unlock(&pwm_lock); | ||
265 | |||
266 | iounmap(pwm->mmio_base); | ||
267 | |||
268 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
269 | release_mem_region(r->start, r->end - r->start + 1); | ||
270 | |||
271 | clk_put(pwm->clk); | ||
272 | kfree(pwm); | ||
273 | return 0; | ||
274 | } | ||
275 | |||
276 | static struct platform_driver pxa25x_pwm_driver = { | ||
277 | .driver = { | ||
278 | .name = "pxa25x-pwm", | ||
279 | }, | ||
280 | .probe = pxa25x_pwm_probe, | ||
281 | .remove = __devexit_p(pwm_remove), | ||
282 | }; | ||
283 | |||
284 | static struct platform_driver pxa27x_pwm_driver = { | ||
285 | .driver = { | ||
286 | .name = "pxa27x-pwm", | ||
287 | }, | ||
288 | .probe = pxa27x_pwm_probe, | ||
289 | .remove = __devexit_p(pwm_remove), | ||
290 | }; | ||
291 | |||
292 | static int __init pwm_init(void) | ||
293 | { | ||
294 | int ret = 0; | ||
295 | |||
296 | ret = platform_driver_register(&pxa25x_pwm_driver); | ||
297 | if (ret) { | ||
298 | printk(KERN_ERR "failed to register pxa25x_pwm_driver\n"); | ||
299 | return ret; | ||
300 | } | ||
301 | |||
302 | ret = platform_driver_register(&pxa27x_pwm_driver); | ||
303 | if (ret) { | ||
304 | printk(KERN_ERR "failed to register pxa27x_pwm_driver\n"); | ||
305 | return ret; | ||
306 | } | ||
307 | |||
308 | return ret; | ||
309 | } | ||
310 | arch_initcall(pwm_init); | ||
311 | |||
312 | static void __exit pwm_exit(void) | ||
313 | { | ||
314 | platform_driver_unregister(&pxa25x_pwm_driver); | ||
315 | platform_driver_unregister(&pxa27x_pwm_driver); | ||
316 | } | ||
317 | module_exit(pwm_exit); | ||
318 | |||
319 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index e5b417d14bb0..4cd50e3005e9 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <asm/hardware.h> | 26 | #include <asm/hardware.h> |
27 | #include <asm/arch/irqs.h> | 27 | #include <asm/arch/irqs.h> |
28 | #include <asm/arch/pxa-regs.h> | 28 | #include <asm/arch/pxa-regs.h> |
29 | #include <asm/arch/pxa2xx-regs.h> | ||
29 | #include <asm/arch/mfp-pxa25x.h> | 30 | #include <asm/arch/mfp-pxa25x.h> |
30 | #include <asm/arch/pm.h> | 31 | #include <asm/arch/pm.h> |
31 | #include <asm/arch/dma.h> | 32 | #include <asm/arch/dma.h> |
@@ -117,29 +118,35 @@ static struct clk pxa25x_hwuart_clk = | |||
117 | INIT_CKEN("UARTCLK", HWUART, 14745600, 1, &pxa_device_hwuart.dev) | 118 | INIT_CKEN("UARTCLK", HWUART, 14745600, 1, &pxa_device_hwuart.dev) |
118 | ; | 119 | ; |
119 | 120 | ||
121 | /* | ||
122 | * PXA 2xx clock declarations. Order is important (see aliases below) | ||
123 | * Please be careful not to disrupt the ordering. | ||
124 | */ | ||
120 | static struct clk pxa25x_clks[] = { | 125 | static struct clk pxa25x_clks[] = { |
121 | INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), | 126 | INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), |
122 | INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev), | 127 | INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev), |
123 | INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), | 128 | INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), |
124 | INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL), | 129 | INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL), |
125 | INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev), | 130 | INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa25x_device_udc.dev), |
126 | INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev), | 131 | INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev), |
127 | INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev), | 132 | INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev), |
128 | 133 | ||
129 | INIT_CKEN("SSPCLK", SSP, 3686400, 0, &pxa25x_device_ssp.dev), | 134 | INIT_CKEN("SSPCLK", SSP, 3686400, 0, &pxa25x_device_ssp.dev), |
130 | INIT_CKEN("SSPCLK", NSSP, 3686400, 0, &pxa25x_device_nssp.dev), | 135 | INIT_CKEN("SSPCLK", NSSP, 3686400, 0, &pxa25x_device_nssp.dev), |
131 | INIT_CKEN("SSPCLK", ASSP, 3686400, 0, &pxa25x_device_assp.dev), | 136 | INIT_CKEN("SSPCLK", ASSP, 3686400, 0, &pxa25x_device_assp.dev), |
137 | INIT_CKEN("PWMCLK", PWM0, 3686400, 0, &pxa25x_device_pwm0.dev), | ||
138 | INIT_CKEN("PWMCLK", PWM1, 3686400, 0, &pxa25x_device_pwm1.dev), | ||
132 | 139 | ||
133 | INIT_CKEN("AC97CLK", AC97, 24576000, 0, NULL), | 140 | INIT_CKEN("AC97CLK", AC97, 24576000, 0, NULL), |
134 | 141 | ||
135 | /* | 142 | /* |
136 | INIT_CKEN("PWMCLK", PWM0, 3686400, 0, NULL), | ||
137 | INIT_CKEN("PWMCLK", PWM0, 3686400, 0, NULL), | ||
138 | INIT_CKEN("I2SCLK", I2S, 14745600, 0, NULL), | 143 | INIT_CKEN("I2SCLK", I2S, 14745600, 0, NULL), |
139 | */ | 144 | */ |
140 | INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), | 145 | INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), |
141 | }; | 146 | }; |
142 | 147 | ||
148 | static struct clk gpio7_clk = INIT_CKOTHER("GPIO7_CK", &pxa25x_clks[4], NULL); | ||
149 | |||
143 | #ifdef CONFIG_PM | 150 | #ifdef CONFIG_PM |
144 | 151 | ||
145 | #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x | 152 | #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x |
@@ -260,7 +267,7 @@ void __init pxa25x_init_irq(void) | |||
260 | } | 267 | } |
261 | 268 | ||
262 | static struct platform_device *pxa25x_devices[] __initdata = { | 269 | static struct platform_device *pxa25x_devices[] __initdata = { |
263 | &pxa_device_udc, | 270 | &pxa25x_device_udc, |
264 | &pxa_device_ffuart, | 271 | &pxa_device_ffuart, |
265 | &pxa_device_btuart, | 272 | &pxa_device_btuart, |
266 | &pxa_device_stuart, | 273 | &pxa_device_stuart, |
@@ -269,6 +276,8 @@ static struct platform_device *pxa25x_devices[] __initdata = { | |||
269 | &pxa25x_device_ssp, | 276 | &pxa25x_device_ssp, |
270 | &pxa25x_device_nssp, | 277 | &pxa25x_device_nssp, |
271 | &pxa25x_device_assp, | 278 | &pxa25x_device_assp, |
279 | &pxa25x_device_pwm0, | ||
280 | &pxa25x_device_pwm1, | ||
272 | }; | 281 | }; |
273 | 282 | ||
274 | static struct sys_device pxa25x_sysdev[] = { | 283 | static struct sys_device pxa25x_sysdev[] = { |
@@ -311,6 +320,8 @@ static int __init pxa25x_init(void) | |||
311 | if (cpu_is_pxa25x()) | 320 | if (cpu_is_pxa25x()) |
312 | ret = platform_device_register(&pxa_device_hwuart); | 321 | ret = platform_device_register(&pxa_device_hwuart); |
313 | 322 | ||
323 | clks_register(&gpio7_clk, 1); | ||
324 | |||
314 | return ret; | 325 | return ret; |
315 | } | 326 | } |
316 | 327 | ||
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 7e945836e129..d5d14ea33f27 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -146,7 +146,7 @@ static struct clk pxa27x_clks[] = { | |||
146 | 146 | ||
147 | INIT_CKEN("I2SCLK", I2S, 14682000, 0, &pxa_device_i2s.dev), | 147 | INIT_CKEN("I2SCLK", I2S, 14682000, 0, &pxa_device_i2s.dev), |
148 | INIT_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), | 148 | INIT_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), |
149 | INIT_CKEN("UDCCLK", USB, 48000000, 5, &pxa_device_udc.dev), | 149 | INIT_CKEN("UDCCLK", USB, 48000000, 5, &pxa27x_device_udc.dev), |
150 | INIT_CKEN("MMCCLK", MMC, 19500000, 0, &pxa_device_mci.dev), | 150 | INIT_CKEN("MMCCLK", MMC, 19500000, 0, &pxa_device_mci.dev), |
151 | INIT_CKEN("FICPCLK", FICP, 48000000, 0, &pxa_device_ficp.dev), | 151 | INIT_CKEN("FICPCLK", FICP, 48000000, 0, &pxa_device_ficp.dev), |
152 | 152 | ||
@@ -157,12 +157,13 @@ static struct clk pxa27x_clks[] = { | |||
157 | INIT_CKEN("SSPCLK", SSP1, 13000000, 0, &pxa27x_device_ssp1.dev), | 157 | INIT_CKEN("SSPCLK", SSP1, 13000000, 0, &pxa27x_device_ssp1.dev), |
158 | INIT_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev), | 158 | INIT_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev), |
159 | INIT_CKEN("SSPCLK", SSP3, 13000000, 0, &pxa27x_device_ssp3.dev), | 159 | INIT_CKEN("SSPCLK", SSP3, 13000000, 0, &pxa27x_device_ssp3.dev), |
160 | INIT_CKEN("PWMCLK", PWM0, 13000000, 0, &pxa27x_device_pwm0.dev), | ||
161 | INIT_CKEN("PWMCLK", PWM1, 13000000, 0, &pxa27x_device_pwm1.dev), | ||
160 | 162 | ||
161 | INIT_CKEN("AC97CLK", AC97, 24576000, 0, NULL), | 163 | INIT_CKEN("AC97CLK", AC97, 24576000, 0, NULL), |
162 | INIT_CKEN("AC97CONFCLK", AC97CONF, 24576000, 0, NULL), | 164 | INIT_CKEN("AC97CONFCLK", AC97CONF, 24576000, 0, NULL), |
163 | 165 | ||
164 | /* | 166 | /* |
165 | INIT_CKEN("PWMCLK", PWM0, 13000000, 0, NULL), | ||
166 | INIT_CKEN("MSLCLK", MSL, 48000000, 0, NULL), | 167 | INIT_CKEN("MSLCLK", MSL, 48000000, 0, NULL), |
167 | INIT_CKEN("USIMCLK", USIM, 48000000, 0, NULL), | 168 | INIT_CKEN("USIMCLK", USIM, 48000000, 0, NULL), |
168 | INIT_CKEN("MSTKCLK", MEMSTK, 19500000, 0, NULL), | 169 | INIT_CKEN("MSTKCLK", MEMSTK, 19500000, 0, NULL), |
@@ -349,11 +350,14 @@ struct platform_device pxa27x_device_i2c_power = { | |||
349 | 350 | ||
350 | void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info) | 351 | void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info) |
351 | { | 352 | { |
353 | local_irq_disable(); | ||
354 | PCFR |= PCFR_PI2CEN; | ||
355 | local_irq_enable(); | ||
352 | pxa27x_device_i2c_power.dev.platform_data = info; | 356 | pxa27x_device_i2c_power.dev.platform_data = info; |
353 | } | 357 | } |
354 | 358 | ||
355 | static struct platform_device *devices[] __initdata = { | 359 | static struct platform_device *devices[] __initdata = { |
356 | &pxa_device_udc, | 360 | &pxa27x_device_udc, |
357 | &pxa_device_ffuart, | 361 | &pxa_device_ffuart, |
358 | &pxa_device_btuart, | 362 | &pxa_device_btuart, |
359 | &pxa_device_stuart, | 363 | &pxa_device_stuart, |
@@ -363,6 +367,8 @@ static struct platform_device *devices[] __initdata = { | |||
363 | &pxa27x_device_ssp1, | 367 | &pxa27x_device_ssp1, |
364 | &pxa27x_device_ssp2, | 368 | &pxa27x_device_ssp2, |
365 | &pxa27x_device_ssp3, | 369 | &pxa27x_device_ssp3, |
370 | &pxa27x_device_pwm0, | ||
371 | &pxa27x_device_pwm1, | ||
366 | }; | 372 | }; |
367 | 373 | ||
368 | static struct sys_device pxa27x_sysdev[] = { | 374 | static struct sys_device pxa27x_sysdev[] = { |
diff --git a/arch/arm/mach-pxa/pxa2xx.c b/arch/arm/mach-pxa/pxa2xx.c new file mode 100644 index 000000000000..d4f6415e8413 --- /dev/null +++ b/arch/arm/mach-pxa/pxa2xx.c | |||
@@ -0,0 +1,46 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-pxa/pxa2xx.c | ||
3 | * | ||
4 | * code specific to pxa2xx | ||
5 | * | ||
6 | * Copyright (C) 2008 Dmitry Baryshkov | ||
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 version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #include <linux/module.h> | ||
14 | #include <linux/kernel.h> | ||
15 | #include <linux/device.h> | ||
16 | |||
17 | #include <asm/arch/mfp-pxa2xx.h> | ||
18 | #include <asm/arch/mfp-pxa25x.h> | ||
19 | #include <asm/arch/irda.h> | ||
20 | |||
21 | static unsigned long pxa2xx_mfp_fir[] = { | ||
22 | GPIO46_FICP_RXD, | ||
23 | GPIO47_FICP_TXD, | ||
24 | }; | ||
25 | |||
26 | static unsigned long pxa2xx_mfp_sir[] = { | ||
27 | GPIO46_STUART_RXD, | ||
28 | GPIO47_STUART_TXD, | ||
29 | }; | ||
30 | |||
31 | static unsigned long pxa2xx_mfp_off[] = { | ||
32 | GPIO46_GPIO | MFP_LPM_DRIVE_LOW, | ||
33 | GPIO47_GPIO | MFP_LPM_DRIVE_LOW, | ||
34 | }; | ||
35 | |||
36 | void pxa2xx_transceiver_mode(struct device *dev, int mode) | ||
37 | { | ||
38 | if (mode & IR_OFF) { | ||
39 | pxa2xx_mfp_config(pxa2xx_mfp_off, ARRAY_SIZE(pxa2xx_mfp_off)); | ||
40 | } else if (mode & IR_SIRMODE) { | ||
41 | pxa2xx_mfp_config(pxa2xx_mfp_sir, ARRAY_SIZE(pxa2xx_mfp_sir)); | ||
42 | } else if (mode & IR_FIRMODE) { | ||
43 | pxa2xx_mfp_config(pxa2xx_mfp_fir, ARRAY_SIZE(pxa2xx_mfp_fir)); | ||
44 | } else | ||
45 | BUG(); | ||
46 | } | ||
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 644550bfa330..15685d2b8f8c 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
@@ -231,7 +231,7 @@ static struct clk pxa3xx_clks[] = { | |||
231 | PXA3xx_CKEN("UARTCLK", STUART, 14857000, 1, NULL), | 231 | PXA3xx_CKEN("UARTCLK", STUART, 14857000, 1, NULL), |
232 | 232 | ||
233 | PXA3xx_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), | 233 | PXA3xx_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev), |
234 | PXA3xx_CKEN("UDCCLK", UDC, 48000000, 5, &pxa_device_udc.dev), | 234 | PXA3xx_CKEN("UDCCLK", UDC, 48000000, 5, &pxa27x_device_udc.dev), |
235 | PXA3xx_CKEN("USBCLK", USBH, 48000000, 0, &pxa27x_device_ohci.dev), | 235 | PXA3xx_CKEN("USBCLK", USBH, 48000000, 0, &pxa27x_device_ohci.dev), |
236 | PXA3xx_CKEN("KBDCLK", KEYPAD, 32768, 0, &pxa27x_device_keypad.dev), | 236 | PXA3xx_CKEN("KBDCLK", KEYPAD, 32768, 0, &pxa27x_device_keypad.dev), |
237 | 237 | ||
@@ -239,6 +239,8 @@ static struct clk pxa3xx_clks[] = { | |||
239 | PXA3xx_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev), | 239 | PXA3xx_CKEN("SSPCLK", SSP2, 13000000, 0, &pxa27x_device_ssp2.dev), |
240 | PXA3xx_CKEN("SSPCLK", SSP3, 13000000, 0, &pxa27x_device_ssp3.dev), | 240 | PXA3xx_CKEN("SSPCLK", SSP3, 13000000, 0, &pxa27x_device_ssp3.dev), |
241 | PXA3xx_CKEN("SSPCLK", SSP4, 13000000, 0, &pxa3xx_device_ssp4.dev), | 241 | PXA3xx_CKEN("SSPCLK", SSP4, 13000000, 0, &pxa3xx_device_ssp4.dev), |
242 | PXA3xx_CKEN("PWMCLK", PWM0, 13000000, 0, &pxa27x_device_pwm0.dev), | ||
243 | PXA3xx_CKEN("PWMCLK", PWM1, 13000000, 0, &pxa27x_device_pwm1.dev), | ||
242 | 244 | ||
243 | PXA3xx_CKEN("MMCCLK", MMC1, 19500000, 0, &pxa_device_mci.dev), | 245 | PXA3xx_CKEN("MMCCLK", MMC1, 19500000, 0, &pxa_device_mci.dev), |
244 | PXA3xx_CKEN("MMCCLK", MMC2, 19500000, 0, &pxa3xx_device_mci2.dev), | 246 | PXA3xx_CKEN("MMCCLK", MMC2, 19500000, 0, &pxa3xx_device_mci2.dev), |
@@ -520,7 +522,7 @@ void __init pxa3xx_init_irq(void) | |||
520 | */ | 522 | */ |
521 | 523 | ||
522 | static struct platform_device *devices[] __initdata = { | 524 | static struct platform_device *devices[] __initdata = { |
523 | &pxa_device_udc, | 525 | /* &pxa_device_udc, The UDC driver is PXA25x only */ |
524 | &pxa_device_ffuart, | 526 | &pxa_device_ffuart, |
525 | &pxa_device_btuart, | 527 | &pxa_device_btuart, |
526 | &pxa_device_stuart, | 528 | &pxa_device_stuart, |
@@ -530,6 +532,8 @@ static struct platform_device *devices[] __initdata = { | |||
530 | &pxa27x_device_ssp2, | 532 | &pxa27x_device_ssp2, |
531 | &pxa27x_device_ssp3, | 533 | &pxa27x_device_ssp3, |
532 | &pxa3xx_device_ssp4, | 534 | &pxa3xx_device_ssp4, |
535 | &pxa27x_device_pwm0, | ||
536 | &pxa27x_device_pwm1, | ||
533 | }; | 537 | }; |
534 | 538 | ||
535 | static struct sys_device pxa3xx_sysdev[] = { | 539 | static struct sys_device pxa3xx_sysdev[] = { |
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 23f050feb208..360354084ae4 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <asm/arch/sharpsl.h> | 26 | #include <asm/arch/sharpsl.h> |
27 | #include <asm/arch/spitz.h> | 27 | #include <asm/arch/spitz.h> |
28 | #include <asm/arch/pxa-regs.h> | 28 | #include <asm/arch/pxa-regs.h> |
29 | #include <asm/arch/pxa2xx-regs.h> | ||
29 | #include <asm/arch/pxa2xx-gpio.h> | 30 | #include <asm/arch/pxa2xx-gpio.h> |
30 | #include "sharpsl.h" | 31 | #include "sharpsl.h" |
31 | 32 | ||
@@ -207,7 +208,9 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = { | |||
207 | .read_devdata = spitzpm_read_devdata, | 208 | .read_devdata = spitzpm_read_devdata, |
208 | .charger_wakeup = spitz_charger_wakeup, | 209 | .charger_wakeup = spitz_charger_wakeup, |
209 | .should_wakeup = spitz_should_wakeup, | 210 | .should_wakeup = spitz_should_wakeup, |
211 | #ifdef CONFIG_BACKLIGHT_CORGI | ||
210 | .backlight_limit = corgibl_limit_intensity, | 212 | .backlight_limit = corgibl_limit_intensity, |
213 | #endif | ||
211 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, | 214 | .charge_on_volt = SHARPSL_CHARGE_ON_VOLT, |
212 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, | 215 | .charge_on_temp = SHARPSL_CHARGE_ON_TEMP, |
213 | .charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH, | 216 | .charge_acin_high = SHARPSL_CHARGE_ON_ACIN_HIGH, |
@@ -229,6 +232,10 @@ static int __devinit spitzpm_init(void) | |||
229 | { | 232 | { |
230 | int ret; | 233 | int ret; |
231 | 234 | ||
235 | if (!machine_is_spitz() && !machine_is_akita() | ||
236 | && !machine_is_borzoi()) | ||
237 | return -ENODEV; | ||
238 | |||
232 | spitzpm_device = platform_device_alloc("sharpsl-pm", -1); | 239 | spitzpm_device = platform_device_alloc("sharpsl-pm", -1); |
233 | if (!spitzpm_device) | 240 | if (!spitzpm_device) |
234 | return -ENOMEM; | 241 | return -ENOMEM; |
diff --git a/arch/arm/mach-pxa/standby.S b/arch/arm/mach-pxa/standby.S index 167412e6bec8..40bb70eff3fe 100644 --- a/arch/arm/mach-pxa/standby.S +++ b/arch/arm/mach-pxa/standby.S | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <asm/hardware.h> | 14 | #include <asm/hardware.h> |
15 | 15 | ||
16 | #include <asm/arch/pxa-regs.h> | 16 | #include <asm/arch/pxa-regs.h> |
17 | #include <asm/arch/pxa2xx-regs.h> | ||
17 | 18 | ||
18 | .text | 19 | .text |
19 | 20 | ||
@@ -35,20 +36,20 @@ ENTRY(pxa_cpu_standby) | |||
35 | 36 | ||
36 | #ifdef CONFIG_PXA3xx | 37 | #ifdef CONFIG_PXA3xx |
37 | 38 | ||
38 | #define MDCNFG 0x0000 | 39 | #define PXA3_MDCNFG 0x0000 |
39 | #define MDCNFG_DMCEN (1 << 30) | 40 | #define PXA3_MDCNFG_DMCEN (1 << 30) |
40 | #define DDR_HCAL 0x0060 | 41 | #define PXA3_DDR_HCAL 0x0060 |
41 | #define DDR_HCAL_HCRNG 0x1f | 42 | #define PXA3_DDR_HCAL_HCRNG 0x1f |
42 | #define DDR_HCAL_HCPROG (1 << 28) | 43 | #define PXA3_DDR_HCAL_HCPROG (1 << 28) |
43 | #define DDR_HCAL_HCEN (1 << 31) | 44 | #define PXA3_DDR_HCAL_HCEN (1 << 31) |
44 | #define DMCIER 0x0070 | 45 | #define PXA3_DMCIER 0x0070 |
45 | #define DMCIER_EDLP (1 << 29) | 46 | #define PXA3_DMCIER_EDLP (1 << 29) |
46 | #define DMCISR 0x0078 | 47 | #define PXA3_DMCISR 0x0078 |
47 | #define RCOMP 0x0100 | 48 | #define PXA3_RCOMP 0x0100 |
48 | #define RCOMP_SWEVAL (1 << 31) | 49 | #define PXA3_RCOMP_SWEVAL (1 << 31) |
49 | 50 | ||
50 | ENTRY(pm_enter_standby_start) | 51 | ENTRY(pm_enter_standby_start) |
51 | mov r1, #0xf6000000 @ DMEMC_REG_BASE (MDCNFG) | 52 | mov r1, #0xf6000000 @ DMEMC_REG_BASE (PXA3_MDCNFG) |
52 | add r1, r1, #0x00100000 | 53 | add r1, r1, #0x00100000 |
53 | 54 | ||
54 | /* | 55 | /* |
@@ -59,54 +60,54 @@ ENTRY(pm_enter_standby_start) | |||
59 | * This also means that only the dynamic memory controller | 60 | * This also means that only the dynamic memory controller |
60 | * can be reliably accessed in the code following standby. | 61 | * can be reliably accessed in the code following standby. |
61 | */ | 62 | */ |
62 | ldr r2, [r1] @ Dummy read MDCNFG | 63 | ldr r2, [r1] @ Dummy read PXA3_MDCNFG |
63 | 64 | ||
64 | mcr p14, 0, r0, c7, c0, 0 | 65 | mcr p14, 0, r0, c7, c0, 0 |
65 | .rept 8 | 66 | .rept 8 |
66 | nop | 67 | nop |
67 | .endr | 68 | .endr |
68 | 69 | ||
69 | ldr r0, [r1, #DDR_HCAL] @ Clear (and wait for) HCEN | 70 | ldr r0, [r1, #PXA3_DDR_HCAL] @ Clear (and wait for) HCEN |
70 | bic r0, r0, #DDR_HCAL_HCEN | 71 | bic r0, r0, #PXA3_DDR_HCAL_HCEN |
71 | str r0, [r1, #DDR_HCAL] | 72 | str r0, [r1, #PXA3_DDR_HCAL] |
72 | 1: ldr r0, [r1, #DDR_HCAL] | 73 | 1: ldr r0, [r1, #PXA3_DDR_HCAL] |
73 | tst r0, #DDR_HCAL_HCEN | 74 | tst r0, #PXA3_DDR_HCAL_HCEN |
74 | bne 1b | 75 | bne 1b |
75 | 76 | ||
76 | ldr r0, [r1, #RCOMP] @ Initiate RCOMP | 77 | ldr r0, [r1, #PXA3_RCOMP] @ Initiate RCOMP |
77 | orr r0, r0, #RCOMP_SWEVAL | 78 | orr r0, r0, #PXA3_RCOMP_SWEVAL |
78 | str r0, [r1, #RCOMP] | 79 | str r0, [r1, #PXA3_RCOMP] |
79 | 80 | ||
80 | mov r0, #~0 @ Clear interrupts | 81 | mov r0, #~0 @ Clear interrupts |
81 | str r0, [r1, #DMCISR] | 82 | str r0, [r1, #PXA3_DMCISR] |
82 | 83 | ||
83 | ldr r0, [r1, #DMCIER] @ set DMIER[EDLP] | 84 | ldr r0, [r1, #PXA3_DMCIER] @ set DMIER[EDLP] |
84 | orr r0, r0, #DMCIER_EDLP | 85 | orr r0, r0, #PXA3_DMCIER_EDLP |
85 | str r0, [r1, #DMCIER] | 86 | str r0, [r1, #PXA3_DMCIER] |
86 | 87 | ||
87 | ldr r0, [r1, #DDR_HCAL] @ clear HCRNG, set HCPROG, HCEN | 88 | ldr r0, [r1, #PXA3_DDR_HCAL] @ clear HCRNG, set HCPROG, HCEN |
88 | bic r0, r0, #DDR_HCAL_HCRNG | 89 | bic r0, r0, #PXA3_DDR_HCAL_HCRNG |
89 | orr r0, r0, #DDR_HCAL_HCEN | DDR_HCAL_HCPROG | 90 | orr r0, r0, #PXA3_DDR_HCAL_HCEN | PXA3_DDR_HCAL_HCPROG |
90 | str r0, [r1, #DDR_HCAL] | 91 | str r0, [r1, #PXA3_DDR_HCAL] |
91 | 92 | ||
92 | 1: ldr r0, [r1, #DMCISR] | 93 | 1: ldr r0, [r1, #PXA3_DMCISR] |
93 | tst r0, #DMCIER_EDLP | 94 | tst r0, #PXA3_DMCIER_EDLP |
94 | beq 1b | 95 | beq 1b |
95 | 96 | ||
96 | ldr r0, [r1, #MDCNFG] @ set MDCNFG[DMCEN] | 97 | ldr r0, [r1, #PXA3_MDCNFG] @ set PXA3_MDCNFG[DMCEN] |
97 | orr r0, r0, #MDCNFG_DMCEN | 98 | orr r0, r0, #PXA3_MDCNFG_DMCEN |
98 | str r0, [r1, #MDCNFG] | 99 | str r0, [r1, #PXA3_MDCNFG] |
99 | 1: ldr r0, [r1, #MDCNFG] | 100 | 1: ldr r0, [r1, #PXA3_MDCNFG] |
100 | tst r0, #MDCNFG_DMCEN | 101 | tst r0, #PXA3_MDCNFG_DMCEN |
101 | beq 1b | 102 | beq 1b |
102 | 103 | ||
103 | ldr r0, [r1, #DDR_HCAL] @ set DDR_HCAL[HCRNG] | 104 | ldr r0, [r1, #PXA3_DDR_HCAL] @ set PXA3_DDR_HCAL[HCRNG] |
104 | orr r0, r0, #2 @ HCRNG | 105 | orr r0, r0, #2 @ HCRNG |
105 | str r0, [r1, #DDR_HCAL] | 106 | str r0, [r1, #PXA3_DDR_HCAL] |
106 | 107 | ||
107 | ldr r0, [r1, #DMCIER] @ Clear the interrupt | 108 | ldr r0, [r1, #PXA3_DMCIER] @ Clear the interrupt |
108 | bic r0, r0, #0x20000000 | 109 | bic r0, r0, #0x20000000 |
109 | str r0, [r1, #DMCIER] | 110 | str r0, [r1, #PXA3_DMCIER] |
110 | 111 | ||
111 | mov pc, lr | 112 | mov pc, lr |
112 | ENTRY(pm_enter_standby_end) | 113 | ENTRY(pm_enter_standby_end) |
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index 931885d86b91..61e244023089 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <asm/mach/flash.h> | 41 | #include <asm/mach/flash.h> |
42 | 42 | ||
43 | #include <asm/arch/pxa-regs.h> | 43 | #include <asm/arch/pxa-regs.h> |
44 | #include <asm/arch/pxa2xx-regs.h> | ||
44 | #include <asm/arch/pxa2xx-gpio.h> | 45 | #include <asm/arch/pxa2xx-gpio.h> |
45 | #include <asm/arch/trizeps4.h> | 46 | #include <asm/arch/trizeps4.h> |
46 | #include <asm/arch/audio.h> | 47 | #include <asm/arch/audio.h> |
@@ -175,19 +176,10 @@ static struct platform_device uart_devices = { | |||
175 | .resource = NULL, | 176 | .resource = NULL, |
176 | }; | 177 | }; |
177 | 178 | ||
178 | /******************************************************************************************** | ||
179 | * PXA270 ac97 sound codec | ||
180 | ********************************************************************************************/ | ||
181 | static struct platform_device ac97_audio_device = { | ||
182 | .name = "pxa2xx-ac97", | ||
183 | .id = -1, | ||
184 | }; | ||
185 | |||
186 | static struct platform_device * trizeps4_devices[] __initdata = { | 179 | static struct platform_device * trizeps4_devices[] __initdata = { |
187 | &flash_device, | 180 | &flash_device, |
188 | &uart_devices, | 181 | &uart_devices, |
189 | &dm9000_device, | 182 | &dm9000_device, |
190 | &ac97_audio_device, | ||
191 | }; | 183 | }; |
192 | 184 | ||
193 | #ifdef CONFIG_MACH_TRIZEPS4_CONXS | 185 | #ifdef CONFIG_MACH_TRIZEPS4_CONXS |
@@ -438,6 +430,7 @@ static void __init trizeps4_init(void) | |||
438 | pxa_set_mci_info(&trizeps4_mci_platform_data); | 430 | pxa_set_mci_info(&trizeps4_mci_platform_data); |
439 | pxa_set_ficp_info(&trizeps4_ficp_platform_data); | 431 | pxa_set_ficp_info(&trizeps4_ficp_platform_data); |
440 | pxa_set_ohci_info(&trizeps4_ohci_platform_data); | 432 | pxa_set_ohci_info(&trizeps4_ohci_platform_data); |
433 | pxa_set_ac97_info(NULL); | ||
441 | } | 434 | } |
442 | 435 | ||
443 | static void __init trizeps4_map_io(void) | 436 | static void __init trizeps4_map_io(void) |
@@ -487,6 +480,7 @@ static void __init trizeps4_map_io(void) | |||
487 | ConXS_BCR = trizeps_conxs_bcr; | 480 | ConXS_BCR = trizeps_conxs_bcr; |
488 | #endif | 481 | #endif |
489 | 482 | ||
483 | #warning FIXME - accessing PM registers directly is deprecated | ||
490 | PWER = 0x00000002; | 484 | PWER = 0x00000002; |
491 | PFER = 0x00000000; | 485 | PFER = 0x00000000; |
492 | PRER = 0x00000002; | 486 | PRER = 0x00000002; |
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index 4a0028087ea6..66b446ca273d 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
@@ -18,22 +18,24 @@ | |||
18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | #include <linux/pwm_backlight.h> | ||
21 | 22 | ||
22 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
23 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
24 | #include <asm/hardware.h> | 25 | #include <asm/hardware.h> |
26 | #include <asm/arch/audio.h> | ||
25 | #include <asm/arch/gpio.h> | 27 | #include <asm/arch/gpio.h> |
26 | #include <asm/arch/pxafb.h> | 28 | #include <asm/arch/pxafb.h> |
27 | #include <asm/arch/zylonite.h> | 29 | #include <asm/arch/zylonite.h> |
28 | #include <asm/arch/mmc.h> | 30 | #include <asm/arch/mmc.h> |
29 | #include <asm/arch/pxa27x_keypad.h> | 31 | #include <asm/arch/pxa27x_keypad.h> |
30 | 32 | ||
33 | #include "devices.h" | ||
31 | #include "generic.h" | 34 | #include "generic.h" |
32 | 35 | ||
33 | #define MAX_SLOTS 3 | 36 | #define MAX_SLOTS 3 |
34 | struct platform_mmc_slot zylonite_mmc_slot[MAX_SLOTS]; | 37 | struct platform_mmc_slot zylonite_mmc_slot[MAX_SLOTS]; |
35 | 38 | ||
36 | int gpio_backlight; | ||
37 | int gpio_eth_irq; | 39 | int gpio_eth_irq; |
38 | 40 | ||
39 | int wm9713_irq; | 41 | int wm9713_irq; |
@@ -62,10 +64,20 @@ static struct platform_device smc91x_device = { | |||
62 | }; | 64 | }; |
63 | 65 | ||
64 | #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) | 66 | #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) |
65 | static void zylonite_backlight_power(int on) | 67 | static struct platform_pwm_backlight_data zylonite_backlight_data = { |
66 | { | 68 | .pwm_id = 3, |
67 | gpio_set_value(gpio_backlight, on); | 69 | .max_brightness = 100, |
68 | } | 70 | .dft_brightness = 100, |
71 | .pwm_period_ns = 10000, | ||
72 | }; | ||
73 | |||
74 | static struct platform_device zylonite_backlight_device = { | ||
75 | .name = "pwm-backlight", | ||
76 | .dev = { | ||
77 | .parent = &pxa27x_device_pwm1.dev, | ||
78 | .platform_data = &zylonite_backlight_data, | ||
79 | }, | ||
80 | }; | ||
69 | 81 | ||
70 | static struct pxafb_mode_info toshiba_ltm035a776c_mode = { | 82 | static struct pxafb_mode_info toshiba_ltm035a776c_mode = { |
71 | .pixclock = 110000, | 83 | .pixclock = 110000, |
@@ -98,7 +110,6 @@ static struct pxafb_mode_info toshiba_ltm04c380k_mode = { | |||
98 | static struct pxafb_mach_info zylonite_toshiba_lcd_info = { | 110 | static struct pxafb_mach_info zylonite_toshiba_lcd_info = { |
99 | .num_modes = 1, | 111 | .num_modes = 1, |
100 | .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL, | 112 | .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL, |
101 | .pxafb_backlight_power = zylonite_backlight_power, | ||
102 | }; | 113 | }; |
103 | 114 | ||
104 | static struct pxafb_mode_info sharp_ls037_modes[] = { | 115 | static struct pxafb_mode_info sharp_ls037_modes[] = { |
@@ -134,13 +145,11 @@ static struct pxafb_mach_info zylonite_sharp_lcd_info = { | |||
134 | .modes = sharp_ls037_modes, | 145 | .modes = sharp_ls037_modes, |
135 | .num_modes = 2, | 146 | .num_modes = 2, |
136 | .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL, | 147 | .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL, |
137 | .pxafb_backlight_power = zylonite_backlight_power, | ||
138 | }; | 148 | }; |
139 | 149 | ||
140 | static void __init zylonite_init_lcd(void) | 150 | static void __init zylonite_init_lcd(void) |
141 | { | 151 | { |
142 | /* backlight GPIO: output, default on */ | 152 | platform_device_register(&zylonite_backlight_device); |
143 | gpio_direction_output(gpio_backlight, 1); | ||
144 | 153 | ||
145 | if (lcd_id & 0x20) { | 154 | if (lcd_id & 0x20) { |
146 | set_pxa_fb_info(&zylonite_sharp_lcd_info); | 155 | set_pxa_fb_info(&zylonite_sharp_lcd_info); |
@@ -329,6 +338,7 @@ static void __init zylonite_init(void) | |||
329 | smc91x_resources[1].end = gpio_to_irq(gpio_eth_irq); | 338 | smc91x_resources[1].end = gpio_to_irq(gpio_eth_irq); |
330 | platform_device_register(&smc91x_device); | 339 | platform_device_register(&smc91x_device); |
331 | 340 | ||
341 | pxa_set_ac97_info(NULL); | ||
332 | zylonite_init_lcd(); | 342 | zylonite_init_lcd(); |
333 | zylonite_init_mmc(); | 343 | zylonite_init_mmc(); |
334 | zylonite_init_keypad(); | 344 | zylonite_init_keypad(); |
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index 324fb9daae28..6f7ae972b8db 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c | |||
@@ -50,6 +50,7 @@ static mfp_cfg_t common_mfp_cfg[] __initdata = { | |||
50 | GPIO75_LCD_BIAS, | 50 | GPIO75_LCD_BIAS, |
51 | GPIO76_LCD_VSYNC, | 51 | GPIO76_LCD_VSYNC, |
52 | GPIO127_LCD_CS_N, | 52 | GPIO127_LCD_CS_N, |
53 | GPIO20_PWM3_OUT, /* backlight */ | ||
53 | 54 | ||
54 | /* BTUART */ | 55 | /* BTUART */ |
55 | GPIO111_UART2_RTS, | 56 | GPIO111_UART2_RTS, |
@@ -200,9 +201,6 @@ void __init zylonite_pxa300_init(void) | |||
200 | /* detect LCD panel */ | 201 | /* detect LCD panel */ |
201 | zylonite_detect_lcd_panel(); | 202 | zylonite_detect_lcd_panel(); |
202 | 203 | ||
203 | /* GPIO pin assignment */ | ||
204 | gpio_backlight = mfp_to_gpio(MFP_PIN_GPIO20); | ||
205 | |||
206 | /* MMC card detect & write protect for controller 0 */ | 204 | /* MMC card detect & write protect for controller 0 */ |
207 | zylonite_mmc_slot[0].gpio_cd = EXT_GPIO(0); | 205 | zylonite_mmc_slot[0].gpio_cd = EXT_GPIO(0); |
208 | zylonite_mmc_slot[0].gpio_wp = EXT_GPIO(2); | 206 | zylonite_mmc_slot[0].gpio_wp = EXT_GPIO(2); |
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index 193d07903b06..2b4fc34919ac 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c | |||
@@ -49,6 +49,7 @@ static mfp_cfg_t mfp_cfg[] __initdata = { | |||
49 | GPIO15_2_LCD_LCLK, | 49 | GPIO15_2_LCD_LCLK, |
50 | GPIO16_2_LCD_PCLK, | 50 | GPIO16_2_LCD_PCLK, |
51 | GPIO17_2_LCD_BIAS, | 51 | GPIO17_2_LCD_BIAS, |
52 | GPIO14_PWM3_OUT, /* backlight */ | ||
52 | 53 | ||
53 | /* FFUART */ | 54 | /* FFUART */ |
54 | GPIO41_UART1_RXD | MFP_LPM_EDGE_FALL, | 55 | GPIO41_UART1_RXD | MFP_LPM_EDGE_FALL, |
@@ -187,7 +188,6 @@ void __init zylonite_pxa320_init(void) | |||
187 | zylonite_detect_lcd_panel(); | 188 | zylonite_detect_lcd_panel(); |
188 | 189 | ||
189 | /* GPIO pin assignment */ | 190 | /* GPIO pin assignment */ |
190 | gpio_backlight = mfp_to_gpio(MFP_PIN_GPIO14); | ||
191 | gpio_eth_irq = mfp_to_gpio(MFP_PIN_GPIO9); | 191 | gpio_eth_irq = mfp_to_gpio(MFP_PIN_GPIO9); |
192 | 192 | ||
193 | /* MMC card detect & write protect for controller 0 */ | 193 | /* MMC card detect & write protect for controller 0 */ |