aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-27 05:50:54 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-27 05:50:54 -0400
commit4944dd62de21230af039eda7cd218e9a09021d11 (patch)
treebac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /arch/arm
parentf17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff)
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff)
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig13
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/common/Kconfig2
-rw-r--r--arch/arm/common/sa1111.c4
-rw-r--r--arch/arm/configs/corgi_defconfig1396
-rw-r--r--arch/arm/configs/msm_defconfig2
-rw-r--r--arch/arm/configs/spitz_defconfig1294
-rw-r--r--arch/arm/configs/trizeps4_defconfig1
-rw-r--r--arch/arm/include/asm/div64.h6
-rw-r--r--arch/arm/mach-at91/gpio.c1
-rw-r--r--arch/arm/mach-clps711x/include/mach/memory.h2
-rw-r--r--arch/arm/mach-ixp4xx/Kconfig5
-rw-r--r--arch/arm/mach-kirkwood/Makefile2
-rw-r--r--arch/arm/mach-kirkwood/common.c35
-rw-r--r--arch/arm/mach-kirkwood/common.h2
-rw-r--r--arch/arm/mach-kirkwood/rd88f6281-setup.c11
-rw-r--r--arch/arm/mach-msm/Kconfig17
-rw-r--r--arch/arm/mach-msm/Makefile7
-rw-r--r--arch/arm/mach-msm/board-halibut.c38
-rw-r--r--arch/arm/mach-msm/clock-7x01a.c126
-rw-r--r--arch/arm/mach-msm/clock.c218
-rw-r--r--arch/arm/mach-msm/clock.h48
-rw-r--r--arch/arm/mach-msm/common.c116
-rw-r--r--arch/arm/mach-msm/devices.c267
-rw-r--r--arch/arm/mach-msm/devices.h36
-rw-r--r--arch/arm/mach-msm/dma.c72
-rw-r--r--arch/arm/mach-msm/include/mach/board.h1
-rw-r--r--arch/arm/mach-msm/include/mach/debug-macro.S8
-rw-r--r--arch/arm/mach-msm/include/mach/dma.h24
-rw-r--r--arch/arm/mach-msm/include/mach/msm_iomap.h69
-rw-r--r--arch/arm/mach-msm/include/mach/vreg.h29
-rw-r--r--arch/arm/mach-msm/io.c12
-rw-r--r--arch/arm/mach-msm/irq.c10
-rw-r--r--arch/arm/mach-msm/proc_comm.c110
-rw-r--r--arch/arm/mach-msm/proc_comm.h165
-rw-r--r--arch/arm/mach-msm/timer.c2
-rw-r--r--arch/arm/mach-msm/vreg.c143
-rw-r--r--arch/arm/mach-mv78xx0/db78x00-bp-setup.c5
-rw-r--r--arch/arm/mach-orion5x/common.c38
-rw-r--r--arch/arm/mach-orion5x/common.h2
-rw-r--r--arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c11
-rw-r--r--arch/arm/mach-orion5x/rd88f5181l-ge-setup.c11
-rw-r--r--arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c11
-rw-r--r--arch/arm/mach-orion5x/wrt350n-v2-setup.c11
-rw-r--r--arch/arm/mach-pxa/Kconfig9
-rw-r--r--arch/arm/mach-pxa/Makefile1
-rw-r--r--arch/arm/mach-pxa/corgi_lcd.c289
-rw-r--r--arch/arm/mach-pxa/corgi_ssp.c276
-rw-r--r--arch/arm/mach-pxa/include/mach/corgi.h1
-rw-r--r--arch/arm/mach-pxa/include/mach/irqs.h5
-rw-r--r--arch/arm/mach-pxa/include/mach/spitz.h3
-rw-r--r--arch/arm/mach-pxa/include/mach/tosa.h3
-rw-r--r--arch/arm/mach-pxa/pwm.c2
-rw-r--r--arch/arm/mach-pxa/sharpsl_pm.c17
-rw-r--r--arch/arm/mach-pxa/tosa.c21
-rw-r--r--arch/arm/mach-pxa/trizeps4.c2
-rw-r--r--arch/arm/mach-s3c2443/clock.c3
-rw-r--r--arch/arm/mm/Kconfig4
-rw-r--r--arch/arm/mm/cache-v4.S6
-rw-r--r--arch/arm/mm/proc-v7.S4
-rw-r--r--arch/arm/plat-s3c24xx/pwm-clock.c2
-rw-r--r--arch/arm/plat-s3c24xx/pwm.c12
62 files changed, 3772 insertions, 1273 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c5b431e231dd..9722f8bb506c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -355,7 +355,7 @@ config ARCH_IXP4XX
355 select GENERIC_GPIO 355 select GENERIC_GPIO
356 select GENERIC_TIME 356 select GENERIC_TIME
357 select GENERIC_CLOCKEVENTS 357 select GENERIC_CLOCKEVENTS
358 select ZONE_DMA if PCI 358 select DMABOUNCE if PCI
359 help 359 help
360 Support for Intel's IXP4XX (XScale) family of processors. 360 Support for Intel's IXP4XX (XScale) family of processors.
361 361
@@ -539,16 +539,15 @@ config ARCH_OMAP
539 help 539 help
540 Support for TI's OMAP platform (OMAP1 and OMAP2). 540 Support for TI's OMAP platform (OMAP1 and OMAP2).
541 541
542config ARCH_MSM7X00A 542config ARCH_MSM
543 bool "Qualcomm MSM7X00A" 543 bool "Qualcomm MSM"
544 select GENERIC_TIME 544 select GENERIC_TIME
545 select GENERIC_CLOCKEVENTS 545 select GENERIC_CLOCKEVENTS
546 help 546 help
547 Support for Qualcomm MSM7X00A based systems. This runs on the ARM11 547 Support for Qualcomm MSM7K based systems. This runs on the ARM11
548 apps processor of the MSM7X00A and depends on a shared memory 548 apps processor of the MSM7K and depends on a shared memory
549 interface to the ARM9 modem processor which runs the baseband stack 549 interface to the ARM9 modem processor which runs the baseband stack
550 and controls some vital subsystems (clock and power control, etc). 550 and controls some vital subsystems (clock and power control, etc).
551 <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
552 551
553endchoice 552endchoice
554 553
@@ -1255,6 +1254,8 @@ source "drivers/hid/Kconfig"
1255 1254
1256source "drivers/usb/Kconfig" 1255source "drivers/usb/Kconfig"
1257 1256
1257source "drivers/uwb/Kconfig"
1258
1258source "drivers/mmc/Kconfig" 1259source "drivers/mmc/Kconfig"
1259 1260
1260source "drivers/memstick/Kconfig" 1261source "drivers/memstick/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 7d5121260fda..bd6e28115ebb 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -141,7 +141,7 @@ endif
141 machine-$(CONFIG_ARCH_MX3) := mx3 141 machine-$(CONFIG_ARCH_MX3) := mx3
142 machine-$(CONFIG_ARCH_ORION5X) := orion5x 142 machine-$(CONFIG_ARCH_ORION5X) := orion5x
143 plat-$(CONFIG_PLAT_ORION) := orion 143 plat-$(CONFIG_PLAT_ORION) := orion
144 machine-$(CONFIG_ARCH_MSM7X00A) := msm 144 machine-$(CONFIG_ARCH_MSM) := msm
145 machine-$(CONFIG_ARCH_LOKI) := loki 145 machine-$(CONFIG_ARCH_LOKI) := loki
146 machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 146 machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
147 147
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 2e32acca02fb..86b5e6982660 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -13,10 +13,10 @@ config ICST307
13config SA1111 13config SA1111
14 bool 14 bool
15 select DMABOUNCE if !ARCH_PXA 15 select DMABOUNCE if !ARCH_PXA
16 select ZONE_DMA if !ARCH_PXA
17 16
18config DMABOUNCE 17config DMABOUNCE
19 bool 18 bool
19 select ZONE_DMA
20 20
21config TIMER_ACORN 21config TIMER_ACORN
22 bool 22 bool
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index fb86f248aab8..47ccec95f3e8 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -581,6 +581,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
581 goto out; 581 goto out;
582 } 582 }
583 583
584#ifdef CONFIG_DMABOUNCE
584 /* 585 /*
585 * If the parent device has a DMA mask associated with it, 586 * If the parent device has a DMA mask associated with it,
586 * propagate it down to the children. 587 * propagate it down to the children.
@@ -598,6 +599,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
598 } 599 }
599 } 600 }
600 } 601 }
602#endif
601 603
602out: 604out:
603 return ret; 605 return ret;
@@ -937,7 +939,7 @@ static int sa1111_resume(struct platform_device *dev)
937#define sa1111_resume NULL 939#define sa1111_resume NULL
938#endif 940#endif
939 941
940static int sa1111_probe(struct platform_device *pdev) 942static int __devinit sa1111_probe(struct platform_device *pdev)
941{ 943{
942 struct resource *mem; 944 struct resource *mem;
943 int irq; 945 int irq;
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig
index 9b8748a8d9dd..f3af0b593eb0 100644
--- a/arch/arm/configs/corgi_defconfig
+++ b/arch/arm/configs/corgi_defconfig
@@ -1,71 +1,111 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.27
4# Mon Nov 28 10:30:09 2005 4# Mon Oct 20 10:12:23 2008
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
8CONFIG_GENERIC_GPIO=y
9CONFIG_GENERIC_TIME=y
10CONFIG_GENERIC_CLOCKEVENTS=y
7CONFIG_MMU=y 11CONFIG_MMU=y
8CONFIG_UID16=y 12# CONFIG_NO_IOPORT is not set
13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_STACKTRACE_SUPPORT=y
15CONFIG_HAVE_LATENCYTOP_SUPPORT=y
16CONFIG_LOCKDEP_SUPPORT=y
17CONFIG_TRACE_IRQFLAGS_SUPPORT=y
18CONFIG_HARDIRQS_SW_RESEND=y
19CONFIG_GENERIC_IRQ_PROBE=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 20CONFIG_RWSEM_GENERIC_SPINLOCK=y
21# CONFIG_ARCH_HAS_ILOG2_U32 is not set
22# CONFIG_ARCH_HAS_ILOG2_U64 is not set
23CONFIG_GENERIC_HWEIGHT=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 24CONFIG_GENERIC_CALIBRATE_DELAY=y
25CONFIG_ARCH_MTD_XIP=y
26CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
27CONFIG_VECTORS_BASE=0xffff0000
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 29
12# 30#
13# Code maturity level options 31# General setup
14# 32#
15CONFIG_EXPERIMENTAL=y 33CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 34CONFIG_BROKEN_ON_SMP=y
18CONFIG_LOCK_KERNEL=y 35CONFIG_LOCK_KERNEL=y
19CONFIG_INIT_ENV_ARG_LIMIT=32 36CONFIG_INIT_ENV_ARG_LIMIT=32
20
21#
22# General setup
23#
24CONFIG_LOCALVERSION="" 37CONFIG_LOCALVERSION=""
25CONFIG_LOCALVERSION_AUTO=y 38CONFIG_LOCALVERSION_AUTO=y
26CONFIG_SWAP=y 39CONFIG_SWAP=y
27CONFIG_SYSVIPC=y 40CONFIG_SYSVIPC=y
41CONFIG_SYSVIPC_SYSCTL=y
28# CONFIG_POSIX_MQUEUE is not set 42# CONFIG_POSIX_MQUEUE is not set
29CONFIG_BSD_PROCESS_ACCT=y 43CONFIG_BSD_PROCESS_ACCT=y
30# CONFIG_BSD_PROCESS_ACCT_V3 is not set 44# CONFIG_BSD_PROCESS_ACCT_V3 is not set
31CONFIG_SYSCTL=y 45# CONFIG_TASKSTATS is not set
32# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
33CONFIG_HOTPLUG=y
34CONFIG_KOBJECT_UEVENT=y
35# CONFIG_IKCONFIG is not set 47# CONFIG_IKCONFIG is not set
36CONFIG_INITRAMFS_SOURCE="" 48CONFIG_LOG_BUF_SHIFT=14
49# CONFIG_CGROUPS is not set
50# CONFIG_GROUP_SCHED is not set
51CONFIG_SYSFS_DEPRECATED=y
52CONFIG_SYSFS_DEPRECATED_V2=y
53# CONFIG_RELAY is not set
54# CONFIG_NAMESPACES is not set
55# CONFIG_BLK_DEV_INITRD is not set
56# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
57CONFIG_SYSCTL=y
37CONFIG_EMBEDDED=y 58CONFIG_EMBEDDED=y
59CONFIG_UID16=y
60CONFIG_SYSCTL_SYSCALL=y
38CONFIG_KALLSYMS=y 61CONFIG_KALLSYMS=y
39# CONFIG_KALLSYMS_ALL is not set 62# CONFIG_KALLSYMS_ALL is not set
40# CONFIG_KALLSYMS_EXTRA_PASS is not set 63# CONFIG_KALLSYMS_EXTRA_PASS is not set
64CONFIG_HOTPLUG=y
41CONFIG_PRINTK=y 65CONFIG_PRINTK=y
42CONFIG_BUG=y 66CONFIG_BUG=y
67CONFIG_ELF_CORE=y
68CONFIG_COMPAT_BRK=y
43CONFIG_BASE_FULL=y 69CONFIG_BASE_FULL=y
44CONFIG_FUTEX=y 70CONFIG_FUTEX=y
71CONFIG_ANON_INODES=y
45CONFIG_EPOLL=y 72CONFIG_EPOLL=y
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 73CONFIG_SIGNALFD=y
74CONFIG_TIMERFD=y
75CONFIG_EVENTFD=y
47CONFIG_SHMEM=y 76CONFIG_SHMEM=y
48CONFIG_CC_ALIGN_FUNCTIONS=0 77CONFIG_AIO=y
49CONFIG_CC_ALIGN_LABELS=0 78CONFIG_VM_EVENT_COUNTERS=y
50CONFIG_CC_ALIGN_LOOPS=0 79CONFIG_SLUB_DEBUG=y
51CONFIG_CC_ALIGN_JUMPS=0 80# CONFIG_SLAB is not set
81CONFIG_SLUB=y
82# CONFIG_SLOB is not set
83CONFIG_PROFILING=y
84# CONFIG_MARKERS is not set
85CONFIG_OPROFILE=m
86CONFIG_HAVE_OPROFILE=y
87# CONFIG_KPROBES is not set
88CONFIG_HAVE_KPROBES=y
89CONFIG_HAVE_KRETPROBES=y
90CONFIG_HAVE_CLK=y
91CONFIG_HAVE_GENERIC_DMA_COHERENT=y
92CONFIG_SLABINFO=y
93CONFIG_RT_MUTEXES=y
52# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
54
55#
56# Loadable module support
57#
58CONFIG_MODULES=y 96CONFIG_MODULES=y
97# CONFIG_MODULE_FORCE_LOAD is not set
59CONFIG_MODULE_UNLOAD=y 98CONFIG_MODULE_UNLOAD=y
60CONFIG_MODULE_FORCE_UNLOAD=y 99CONFIG_MODULE_FORCE_UNLOAD=y
61CONFIG_OBSOLETE_MODPARM=y
62# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
63# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
64CONFIG_KMOD=y 102CONFIG_KMOD=y
65 103CONFIG_BLOCK=y
66# 104# CONFIG_LBD is not set
67# Block layer 105# CONFIG_BLK_DEV_IO_TRACE is not set
68# 106# CONFIG_LSF is not set
107# CONFIG_BLK_DEV_BSG is not set
108# CONFIG_BLK_DEV_INTEGRITY is not set
69 109
70# 110#
71# IO Schedulers 111# IO Schedulers
@@ -79,50 +119,97 @@ CONFIG_DEFAULT_AS=y
79# CONFIG_DEFAULT_CFQ is not set 119# CONFIG_DEFAULT_CFQ is not set
80# CONFIG_DEFAULT_NOOP is not set 120# CONFIG_DEFAULT_NOOP is not set
81CONFIG_DEFAULT_IOSCHED="anticipatory" 121CONFIG_DEFAULT_IOSCHED="anticipatory"
122CONFIG_CLASSIC_RCU=y
82 123
83# 124#
84# System Type 125# System Type
85# 126#
127# CONFIG_ARCH_AAEC2000 is not set
128# CONFIG_ARCH_INTEGRATOR is not set
129# CONFIG_ARCH_REALVIEW is not set
130# CONFIG_ARCH_VERSATILE is not set
131# CONFIG_ARCH_AT91 is not set
86# CONFIG_ARCH_CLPS7500 is not set 132# CONFIG_ARCH_CLPS7500 is not set
87# CONFIG_ARCH_CLPS711X is not set 133# CONFIG_ARCH_CLPS711X is not set
88# CONFIG_ARCH_CO285 is not set
89# CONFIG_ARCH_EBSA110 is not set 134# CONFIG_ARCH_EBSA110 is not set
135# CONFIG_ARCH_EP93XX is not set
90# CONFIG_ARCH_FOOTBRIDGE is not set 136# CONFIG_ARCH_FOOTBRIDGE is not set
91# CONFIG_ARCH_INTEGRATOR is not set 137# CONFIG_ARCH_NETX is not set
92# CONFIG_ARCH_IOP3XX is not set 138# CONFIG_ARCH_H720X is not set
93# CONFIG_ARCH_IXP4XX is not set 139# CONFIG_ARCH_IMX is not set
140# CONFIG_ARCH_IOP13XX is not set
141# CONFIG_ARCH_IOP32X is not set
142# CONFIG_ARCH_IOP33X is not set
143# CONFIG_ARCH_IXP23XX is not set
94# CONFIG_ARCH_IXP2000 is not set 144# CONFIG_ARCH_IXP2000 is not set
145# CONFIG_ARCH_IXP4XX is not set
95# CONFIG_ARCH_L7200 is not set 146# CONFIG_ARCH_L7200 is not set
147# CONFIG_ARCH_KIRKWOOD is not set
148# CONFIG_ARCH_KS8695 is not set
149# CONFIG_ARCH_NS9XXX is not set
150# CONFIG_ARCH_LOKI is not set
151# CONFIG_ARCH_MV78XX0 is not set
152# CONFIG_ARCH_MXC is not set
153# CONFIG_ARCH_ORION5X is not set
154# CONFIG_ARCH_PNX4008 is not set
96CONFIG_ARCH_PXA=y 155CONFIG_ARCH_PXA=y
97# CONFIG_ARCH_RPC is not set 156# CONFIG_ARCH_RPC is not set
98# CONFIG_ARCH_SA1100 is not set 157# CONFIG_ARCH_SA1100 is not set
99# CONFIG_ARCH_S3C2410 is not set 158# CONFIG_ARCH_S3C2410 is not set
100# CONFIG_ARCH_SHARK is not set 159# CONFIG_ARCH_SHARK is not set
101# CONFIG_ARCH_LH7A40X is not set 160# CONFIG_ARCH_LH7A40X is not set
161# CONFIG_ARCH_DAVINCI is not set
102# CONFIG_ARCH_OMAP is not set 162# CONFIG_ARCH_OMAP is not set
103# CONFIG_ARCH_VERSATILE is not set 163# CONFIG_ARCH_MSM7X00A is not set
104# CONFIG_ARCH_REALVIEW is not set
105# CONFIG_ARCH_IMX is not set
106# CONFIG_ARCH_H720X is not set
107# CONFIG_ARCH_AAEC2000 is not set
108 164
109# 165#
110# Intel PXA2xx Implementations 166# Intel PXA2xx/PXA3xx Implementations
111# 167#
168# CONFIG_ARCH_GUMSTIX is not set
112# CONFIG_ARCH_LUBBOCK is not set 169# CONFIG_ARCH_LUBBOCK is not set
170# CONFIG_MACH_LOGICPD_PXA270 is not set
113# CONFIG_MACH_MAINSTONE is not set 171# CONFIG_MACH_MAINSTONE is not set
172# CONFIG_MACH_MP900C is not set
114# CONFIG_ARCH_PXA_IDP is not set 173# CONFIG_ARCH_PXA_IDP is not set
115CONFIG_PXA_SHARPSL=y 174CONFIG_PXA_SHARPSL=y
116CONFIG_PXA_SHARPSL_25x=y
117# CONFIG_PXA_SHARPSL_27x is not set
118CONFIG_MACH_POODLE=y 175CONFIG_MACH_POODLE=y
119CONFIG_MACH_CORGI=y 176CONFIG_MACH_CORGI=y
120CONFIG_MACH_SHEPHERD=y 177CONFIG_MACH_SHEPHERD=y
121CONFIG_MACH_HUSKY=y 178CONFIG_MACH_HUSKY=y
179# CONFIG_MACH_AKITA is not set
180# CONFIG_MACH_SPITZ is not set
181# CONFIG_MACH_BORZOI is not set
122CONFIG_MACH_TOSA=y 182CONFIG_MACH_TOSA=y
183# CONFIG_ARCH_VIPER is not set
184# CONFIG_ARCH_PXA_ESERIES is not set
185# CONFIG_TRIZEPS_PXA is not set
186# CONFIG_MACH_EM_X270 is not set
187# CONFIG_MACH_COLIBRI is not set
188# CONFIG_MACH_ZYLONITE is not set
189# CONFIG_MACH_LITTLETON is not set
190# CONFIG_MACH_TAVOREVB is not set
191# CONFIG_MACH_SAAR is not set
192# CONFIG_MACH_ARMCORE is not set
193# CONFIG_MACH_CM_X300 is not set
194# CONFIG_MACH_MAGICIAN is not set
195# CONFIG_MACH_MIOA701 is not set
196# CONFIG_MACH_PCM027 is not set
197# CONFIG_ARCH_PXA_PALM is not set
198# CONFIG_PXA_EZX is not set
123CONFIG_PXA25x=y 199CONFIG_PXA25x=y
124CONFIG_PXA_SHARP_C7xx=y 200CONFIG_PXA_SHARP_C7xx=y
125CONFIG_PXA_SSP=y 201CONFIG_PXA_SSP=y
202# CONFIG_PXA_PWM is not set
203# CONFIG_TOSA_BT is not set
204CONFIG_PXA_HAVE_BOARD_IRQS=y
205
206#
207# Boot options
208#
209
210#
211# Power management
212#
126 213
127# 214#
128# Processor Type 215# Processor Type
@@ -131,25 +218,30 @@ CONFIG_CPU_32=y
131CONFIG_CPU_XSCALE=y 218CONFIG_CPU_XSCALE=y
132CONFIG_CPU_32v5=y 219CONFIG_CPU_32v5=y
133CONFIG_CPU_ABRT_EV5T=y 220CONFIG_CPU_ABRT_EV5T=y
221CONFIG_CPU_PABRT_NOIFAR=y
134CONFIG_CPU_CACHE_VIVT=y 222CONFIG_CPU_CACHE_VIVT=y
135CONFIG_CPU_TLB_V4WBI=y 223CONFIG_CPU_TLB_V4WBI=y
224CONFIG_CPU_CP15=y
225CONFIG_CPU_CP15_MMU=y
136 226
137# 227#
138# Processor Features 228# Processor Features
139# 229#
140CONFIG_ARM_THUMB=y 230CONFIG_ARM_THUMB=y
231# CONFIG_CPU_DCACHE_DISABLE is not set
232# CONFIG_OUTER_CACHE is not set
233# CONFIG_IWMMXT is not set
141CONFIG_XSCALE_PMU=y 234CONFIG_XSCALE_PMU=y
235CONFIG_SHARP_LOCOMO=y
142CONFIG_SHARP_PARAM=y 236CONFIG_SHARP_PARAM=y
237CONFIG_SHARPSL_PM=y
143CONFIG_SHARP_SCOOP=y 238CONFIG_SHARP_SCOOP=y
144 239
145# 240#
146# Bus support 241# Bus support
147# 242#
148CONFIG_ISA_DMA_API=y 243# CONFIG_PCI_SYSCALL is not set
149 244# CONFIG_ARCH_SUPPORTS_MSI is not set
150#
151# PCCARD (PCMCIA/CardBus) support
152#
153CONFIG_PCCARD=y 245CONFIG_PCCARD=y
154# CONFIG_PCMCIA_DEBUG is not set 246# CONFIG_PCMCIA_DEBUG is not set
155CONFIG_PCMCIA=y 247CONFIG_PCMCIA=y
@@ -164,16 +256,32 @@ CONFIG_PCMCIA_PXA2XX=y
164# 256#
165# Kernel Features 257# Kernel Features
166# 258#
259CONFIG_TICK_ONESHOT=y
260# CONFIG_NO_HZ is not set
261# CONFIG_HIGH_RES_TIMERS is not set
262CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
263CONFIG_VMSPLIT_3G=y
264# CONFIG_VMSPLIT_2G is not set
265# CONFIG_VMSPLIT_1G is not set
266CONFIG_PAGE_OFFSET=0xC0000000
167CONFIG_PREEMPT=y 267CONFIG_PREEMPT=y
168# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 268CONFIG_HZ=100
269# CONFIG_AEABI is not set
270CONFIG_ARCH_FLATMEM_HAS_HOLES=y
271# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
272# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
169CONFIG_SELECT_MEMORY_MODEL=y 273CONFIG_SELECT_MEMORY_MODEL=y
170CONFIG_FLATMEM_MANUAL=y 274CONFIG_FLATMEM_MANUAL=y
171# CONFIG_DISCONTIGMEM_MANUAL is not set 275# CONFIG_DISCONTIGMEM_MANUAL is not set
172# CONFIG_SPARSEMEM_MANUAL is not set 276# CONFIG_SPARSEMEM_MANUAL is not set
173CONFIG_FLATMEM=y 277CONFIG_FLATMEM=y
174CONFIG_FLAT_NODE_MEM_MAP=y 278CONFIG_FLAT_NODE_MEM_MAP=y
175# CONFIG_SPARSEMEM_STATIC is not set 279CONFIG_PAGEFLAGS_EXTENDED=y
176CONFIG_SPLIT_PTLOCK_CPUS=4096 280CONFIG_SPLIT_PTLOCK_CPUS=4096
281# CONFIG_RESOURCES_64BIT is not set
282# CONFIG_PHYS_ADDR_T_64BIT is not set
283CONFIG_ZONE_DMA_FLAG=0
284CONFIG_VIRT_TO_BUS=y
177CONFIG_ALIGNMENT_TRAP=y 285CONFIG_ALIGNMENT_TRAP=y
178 286
179# 287#
@@ -183,6 +291,13 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
183CONFIG_ZBOOT_ROM_BSS=0x0 291CONFIG_ZBOOT_ROM_BSS=0x0
184CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" 292CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug"
185# CONFIG_XIP_KERNEL is not set 293# CONFIG_XIP_KERNEL is not set
294# CONFIG_KEXEC is not set
295
296#
297# CPU Power Management
298#
299# CONFIG_CPU_FREQ is not set
300# CONFIG_CPU_IDLE is not set
186 301
187# 302#
188# Floating point emulation 303# Floating point emulation
@@ -199,6 +314,7 @@ CONFIG_FPE_NWFPE=y
199# Userspace binary formats 314# Userspace binary formats
200# 315#
201CONFIG_BINFMT_ELF=y 316CONFIG_BINFMT_ELF=y
317CONFIG_HAVE_AOUT=y
202CONFIG_BINFMT_AOUT=m 318CONFIG_BINFMT_AOUT=m
203CONFIG_BINFMT_MISC=m 319CONFIG_BINFMT_MISC=m
204# CONFIG_ARTHUR is not set 320# CONFIG_ARTHUR is not set
@@ -207,12 +323,12 @@ CONFIG_BINFMT_MISC=m
207# Power management options 323# Power management options
208# 324#
209CONFIG_PM=y 325CONFIG_PM=y
210# CONFIG_PM_LEGACY is not set 326# CONFIG_PM_DEBUG is not set
211CONFIG_APM=y 327CONFIG_PM_SLEEP=y
212 328CONFIG_SUSPEND=y
213# 329CONFIG_SUSPEND_FREEZER=y
214# Networking 330CONFIG_APM_EMULATION=y
215# 331CONFIG_ARCH_SUSPEND_POSSIBLE=y
216CONFIG_NET=y 332CONFIG_NET=y
217 333
218# 334#
@@ -223,6 +339,10 @@ CONFIG_PACKET_MMAP=y
223CONFIG_UNIX=y 339CONFIG_UNIX=y
224CONFIG_XFRM=y 340CONFIG_XFRM=y
225CONFIG_XFRM_USER=m 341CONFIG_XFRM_USER=m
342# CONFIG_XFRM_SUB_POLICY is not set
343# CONFIG_XFRM_MIGRATE is not set
344# CONFIG_XFRM_STATISTICS is not set
345CONFIG_XFRM_IPCOMP=m
226# CONFIG_NET_KEY is not set 346# CONFIG_NET_KEY is not set
227CONFIG_INET=y 347CONFIG_INET=y
228# CONFIG_IP_MULTICAST is not set 348# CONFIG_IP_MULTICAST is not set
@@ -236,140 +356,131 @@ CONFIG_SYN_COOKIES=y
236# CONFIG_INET_AH is not set 356# CONFIG_INET_AH is not set
237# CONFIG_INET_ESP is not set 357# CONFIG_INET_ESP is not set
238# CONFIG_INET_IPCOMP is not set 358# CONFIG_INET_IPCOMP is not set
239# CONFIG_INET_TUNNEL is not set 359# CONFIG_INET_XFRM_TUNNEL is not set
360CONFIG_INET_TUNNEL=m
361CONFIG_INET_XFRM_MODE_TRANSPORT=y
362CONFIG_INET_XFRM_MODE_TUNNEL=y
363CONFIG_INET_XFRM_MODE_BEET=y
364# CONFIG_INET_LRO is not set
240CONFIG_INET_DIAG=y 365CONFIG_INET_DIAG=y
241CONFIG_INET_TCP_DIAG=y 366CONFIG_INET_TCP_DIAG=y
242# CONFIG_TCP_CONG_ADVANCED is not set 367# CONFIG_TCP_CONG_ADVANCED is not set
243CONFIG_TCP_CONG_BIC=y 368CONFIG_TCP_CONG_CUBIC=y
244 369CONFIG_DEFAULT_TCP_CONG="cubic"
245# 370# CONFIG_TCP_MD5SIG is not set
246# IP: Virtual Server Configuration
247#
248# CONFIG_IP_VS is not set
249CONFIG_IPV6=m 371CONFIG_IPV6=m
250# CONFIG_IPV6_PRIVACY is not set 372# CONFIG_IPV6_PRIVACY is not set
373# CONFIG_IPV6_ROUTER_PREF is not set
374# CONFIG_IPV6_OPTIMISTIC_DAD is not set
251CONFIG_INET6_AH=m 375CONFIG_INET6_AH=m
252CONFIG_INET6_ESP=m 376CONFIG_INET6_ESP=m
253CONFIG_INET6_IPCOMP=m 377CONFIG_INET6_IPCOMP=m
378# CONFIG_IPV6_MIP6 is not set
379CONFIG_INET6_XFRM_TUNNEL=m
254CONFIG_INET6_TUNNEL=m 380CONFIG_INET6_TUNNEL=m
381CONFIG_INET6_XFRM_MODE_TRANSPORT=m
382CONFIG_INET6_XFRM_MODE_TUNNEL=m
383CONFIG_INET6_XFRM_MODE_BEET=m
384# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
385CONFIG_IPV6_SIT=m
386CONFIG_IPV6_NDISC_NODETYPE=y
255CONFIG_IPV6_TUNNEL=m 387CONFIG_IPV6_TUNNEL=m
388# CONFIG_IPV6_MULTIPLE_TABLES is not set
389# CONFIG_IPV6_MROUTE is not set
390# CONFIG_NETWORK_SECMARK is not set
256CONFIG_NETFILTER=y 391CONFIG_NETFILTER=y
257# CONFIG_NETFILTER_DEBUG is not set 392# CONFIG_NETFILTER_DEBUG is not set
393CONFIG_NETFILTER_ADVANCED=y
258 394
259# 395#
260# Core Netfilter Configuration 396# Core Netfilter Configuration
261# 397#
262# CONFIG_NETFILTER_NETLINK is not set 398# CONFIG_NETFILTER_NETLINK_QUEUE is not set
399# CONFIG_NETFILTER_NETLINK_LOG is not set
400# CONFIG_NF_CONNTRACK is not set
401CONFIG_NETFILTER_XTABLES=m
402# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
403# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
404# CONFIG_NETFILTER_XT_TARGET_MARK is not set
405# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
406# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
407# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
408# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
409# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
410# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
411# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
412# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
413# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
414# CONFIG_NETFILTER_XT_MATCH_ESP is not set
415# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
416# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
417# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
418# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
419# CONFIG_NETFILTER_XT_MATCH_MAC is not set
420# CONFIG_NETFILTER_XT_MATCH_MARK is not set
421# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
422# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
423# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
424# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
425# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
426# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
427# CONFIG_NETFILTER_XT_MATCH_REALM is not set
428# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
429# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
430# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
431# CONFIG_NETFILTER_XT_MATCH_STRING is not set
432# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
433# CONFIG_NETFILTER_XT_MATCH_TIME is not set
434# CONFIG_NETFILTER_XT_MATCH_U32 is not set
435# CONFIG_IP_VS is not set
263 436
264# 437#
265# IP: Netfilter Configuration 438# IP: Netfilter Configuration
266# 439#
267CONFIG_IP_NF_CONNTRACK=m 440# CONFIG_NF_DEFRAG_IPV4 is not set
268# CONFIG_IP_NF_CT_ACCT is not set
269# CONFIG_IP_NF_CONNTRACK_MARK is not set
270# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
271CONFIG_IP_NF_CT_PROTO_SCTP=m
272CONFIG_IP_NF_FTP=m
273CONFIG_IP_NF_IRC=m
274# CONFIG_IP_NF_NETBIOS_NS is not set
275CONFIG_IP_NF_TFTP=m
276CONFIG_IP_NF_AMANDA=m
277# CONFIG_IP_NF_PPTP is not set
278CONFIG_IP_NF_QUEUE=m 441CONFIG_IP_NF_QUEUE=m
279CONFIG_IP_NF_IPTABLES=m 442CONFIG_IP_NF_IPTABLES=m
280CONFIG_IP_NF_MATCH_LIMIT=m 443CONFIG_IP_NF_MATCH_ADDRTYPE=m
281CONFIG_IP_NF_MATCH_IPRANGE=m 444# CONFIG_IP_NF_MATCH_AH is not set
282CONFIG_IP_NF_MATCH_MAC=m
283CONFIG_IP_NF_MATCH_PKTTYPE=m
284CONFIG_IP_NF_MATCH_MARK=m
285CONFIG_IP_NF_MATCH_MULTIPORT=m
286CONFIG_IP_NF_MATCH_TOS=m
287CONFIG_IP_NF_MATCH_RECENT=m
288CONFIG_IP_NF_MATCH_ECN=m 445CONFIG_IP_NF_MATCH_ECN=m
289CONFIG_IP_NF_MATCH_DSCP=m
290CONFIG_IP_NF_MATCH_AH_ESP=m
291CONFIG_IP_NF_MATCH_LENGTH=m
292CONFIG_IP_NF_MATCH_TTL=m 446CONFIG_IP_NF_MATCH_TTL=m
293CONFIG_IP_NF_MATCH_TCPMSS=m
294CONFIG_IP_NF_MATCH_HELPER=m
295CONFIG_IP_NF_MATCH_STATE=m
296CONFIG_IP_NF_MATCH_CONNTRACK=m
297CONFIG_IP_NF_MATCH_OWNER=m
298CONFIG_IP_NF_MATCH_ADDRTYPE=m
299CONFIG_IP_NF_MATCH_REALM=m
300CONFIG_IP_NF_MATCH_SCTP=m
301# CONFIG_IP_NF_MATCH_DCCP is not set
302CONFIG_IP_NF_MATCH_COMMENT=m
303CONFIG_IP_NF_MATCH_HASHLIMIT=m
304# CONFIG_IP_NF_MATCH_STRING is not set
305CONFIG_IP_NF_FILTER=m 447CONFIG_IP_NF_FILTER=m
306# CONFIG_IP_NF_TARGET_REJECT is not set 448# CONFIG_IP_NF_TARGET_REJECT is not set
307CONFIG_IP_NF_TARGET_LOG=m 449CONFIG_IP_NF_TARGET_LOG=m
308CONFIG_IP_NF_TARGET_ULOG=m 450CONFIG_IP_NF_TARGET_ULOG=m
309CONFIG_IP_NF_TARGET_TCPMSS=m
310# CONFIG_IP_NF_TARGET_NFQUEUE is not set
311CONFIG_IP_NF_NAT=m
312CONFIG_IP_NF_NAT_NEEDED=y
313# CONFIG_IP_NF_TARGET_MASQUERADE is not set
314# CONFIG_IP_NF_TARGET_REDIRECT is not set
315# CONFIG_IP_NF_TARGET_NETMAP is not set
316# CONFIG_IP_NF_TARGET_SAME is not set
317# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
318CONFIG_IP_NF_NAT_IRC=m
319CONFIG_IP_NF_NAT_FTP=m
320CONFIG_IP_NF_NAT_TFTP=m
321CONFIG_IP_NF_NAT_AMANDA=m
322CONFIG_IP_NF_MANGLE=m 451CONFIG_IP_NF_MANGLE=m
323# CONFIG_IP_NF_TARGET_TOS is not set
324# CONFIG_IP_NF_TARGET_ECN is not set 452# CONFIG_IP_NF_TARGET_ECN is not set
325# CONFIG_IP_NF_TARGET_DSCP is not set
326# CONFIG_IP_NF_TARGET_MARK is not set
327# CONFIG_IP_NF_TARGET_CLASSIFY is not set
328# CONFIG_IP_NF_TARGET_TTL is not set 453# CONFIG_IP_NF_TARGET_TTL is not set
329CONFIG_IP_NF_RAW=m 454CONFIG_IP_NF_RAW=m
330# CONFIG_IP_NF_TARGET_NOTRACK is not set
331CONFIG_IP_NF_ARPTABLES=m 455CONFIG_IP_NF_ARPTABLES=m
332CONFIG_IP_NF_ARPFILTER=m 456CONFIG_IP_NF_ARPFILTER=m
333CONFIG_IP_NF_ARP_MANGLE=m 457CONFIG_IP_NF_ARP_MANGLE=m
334 458
335# 459#
336# IPv6: Netfilter Configuration (EXPERIMENTAL) 460# IPv6: Netfilter Configuration
337# 461#
338CONFIG_IP6_NF_QUEUE=m 462CONFIG_IP6_NF_QUEUE=m
339CONFIG_IP6_NF_IPTABLES=m 463CONFIG_IP6_NF_IPTABLES=m
340CONFIG_IP6_NF_MATCH_LIMIT=m 464# CONFIG_IP6_NF_MATCH_AH is not set
341CONFIG_IP6_NF_MATCH_MAC=m 465CONFIG_IP6_NF_MATCH_EUI64=m
342CONFIG_IP6_NF_MATCH_RT=m
343CONFIG_IP6_NF_MATCH_OPTS=m
344CONFIG_IP6_NF_MATCH_FRAG=m 466CONFIG_IP6_NF_MATCH_FRAG=m
467CONFIG_IP6_NF_MATCH_OPTS=m
345CONFIG_IP6_NF_MATCH_HL=m 468CONFIG_IP6_NF_MATCH_HL=m
346CONFIG_IP6_NF_MATCH_MULTIPORT=m
347CONFIG_IP6_NF_MATCH_OWNER=m
348CONFIG_IP6_NF_MATCH_MARK=m
349CONFIG_IP6_NF_MATCH_IPV6HEADER=m 469CONFIG_IP6_NF_MATCH_IPV6HEADER=m
350CONFIG_IP6_NF_MATCH_AHESP=m 470# CONFIG_IP6_NF_MATCH_MH is not set
351CONFIG_IP6_NF_MATCH_LENGTH=m 471CONFIG_IP6_NF_MATCH_RT=m
352CONFIG_IP6_NF_MATCH_EUI64=m
353CONFIG_IP6_NF_FILTER=m
354# CONFIG_IP6_NF_TARGET_LOG is not set 472# CONFIG_IP6_NF_TARGET_LOG is not set
473CONFIG_IP6_NF_FILTER=m
355# CONFIG_IP6_NF_TARGET_REJECT is not set 474# CONFIG_IP6_NF_TARGET_REJECT is not set
356# CONFIG_IP6_NF_TARGET_NFQUEUE is not set
357CONFIG_IP6_NF_MANGLE=m 475CONFIG_IP6_NF_MANGLE=m
358# CONFIG_IP6_NF_TARGET_MARK is not set
359# CONFIG_IP6_NF_TARGET_HL is not set 476# CONFIG_IP6_NF_TARGET_HL is not set
360CONFIG_IP6_NF_RAW=m 477CONFIG_IP6_NF_RAW=m
361
362#
363# DCCP Configuration (EXPERIMENTAL)
364#
365# CONFIG_IP_DCCP is not set 478# CONFIG_IP_DCCP is not set
366
367#
368# SCTP Configuration (EXPERIMENTAL)
369#
370# CONFIG_IP_SCTP is not set 479# CONFIG_IP_SCTP is not set
480# CONFIG_TIPC is not set
371# CONFIG_ATM is not set 481# CONFIG_ATM is not set
372# CONFIG_BRIDGE is not set 482# CONFIG_BRIDGE is not set
483# CONFIG_NET_DSA is not set
373# CONFIG_VLAN_8021Q is not set 484# CONFIG_VLAN_8021Q is not set
374# CONFIG_DECNET is not set 485# CONFIG_DECNET is not set
375# CONFIG_LLC2 is not set 486# CONFIG_LLC2 is not set
@@ -377,21 +488,16 @@ CONFIG_IP6_NF_RAW=m
377# CONFIG_ATALK is not set 488# CONFIG_ATALK is not set
378# CONFIG_X25 is not set 489# CONFIG_X25 is not set
379# CONFIG_LAPB is not set 490# CONFIG_LAPB is not set
380# CONFIG_NET_DIVERT is not set
381# CONFIG_ECONET is not set 491# CONFIG_ECONET is not set
382# CONFIG_WAN_ROUTER is not set 492# CONFIG_WAN_ROUTER is not set
383
384#
385# QoS and/or fair queueing
386#
387# CONFIG_NET_SCHED is not set 493# CONFIG_NET_SCHED is not set
388CONFIG_NET_CLS_ROUTE=y
389 494
390# 495#
391# Network testing 496# Network testing
392# 497#
393# CONFIG_NET_PKTGEN is not set 498# CONFIG_NET_PKTGEN is not set
394# CONFIG_HAMRADIO is not set 499# CONFIG_HAMRADIO is not set
500# CONFIG_CAN is not set
395CONFIG_IRDA=m 501CONFIG_IRDA=m
396 502
397# 503#
@@ -421,27 +527,17 @@ CONFIG_IRCOMM=m
421# 527#
422# Dongle support 528# Dongle support
423# 529#
424 530# CONFIG_KINGSUN_DONGLE is not set
425# 531# CONFIG_KSDAZZLE_DONGLE is not set
426# Old SIR device drivers 532# CONFIG_KS959_DONGLE is not set
427#
428# CONFIG_IRPORT_SIR is not set
429
430#
431# Old Serial dongle support
432#
433 533
434# 534#
435# FIR device drivers 535# FIR device drivers
436# 536#
437# CONFIG_USB_IRDA is not set 537# CONFIG_USB_IRDA is not set
438# CONFIG_SIGMATEL_FIR is not set 538# CONFIG_SIGMATEL_FIR is not set
439# CONFIG_NSC_FIR is not set
440# CONFIG_WINBOND_FIR is not set
441# CONFIG_SMC_IRCC_FIR is not set
442# CONFIG_ALI_FIR is not set
443# CONFIG_VIA_FIR is not set
444CONFIG_PXA_FICP=m 539CONFIG_PXA_FICP=m
540# CONFIG_MCS_FIR is not set
445CONFIG_BT=m 541CONFIG_BT=m
446CONFIG_BT_L2CAP=m 542CONFIG_BT_L2CAP=m
447CONFIG_BT_SCO=m 543CONFIG_BT_SCO=m
@@ -457,9 +553,12 @@ CONFIG_BT_HIDP=m
457# 553#
458CONFIG_BT_HCIUSB=m 554CONFIG_BT_HCIUSB=m
459# CONFIG_BT_HCIUSB_SCO is not set 555# CONFIG_BT_HCIUSB_SCO is not set
556# CONFIG_BT_HCIBTUSB is not set
557# CONFIG_BT_HCIBTSDIO is not set
460CONFIG_BT_HCIUART=m 558CONFIG_BT_HCIUART=m
461CONFIG_BT_HCIUART_H4=y 559CONFIG_BT_HCIUART_H4=y
462CONFIG_BT_HCIUART_BCSP=y 560CONFIG_BT_HCIUART_BCSP=y
561# CONFIG_BT_HCIUART_LL is not set
463CONFIG_BT_HCIBCM203X=m 562CONFIG_BT_HCIBCM203X=m
464CONFIG_BT_HCIBPA10X=m 563CONFIG_BT_HCIBPA10X=m
465CONFIG_BT_HCIBFUSB=m 564CONFIG_BT_HCIBFUSB=m
@@ -468,11 +567,20 @@ CONFIG_BT_HCIBT3C=m
468CONFIG_BT_HCIBLUECARD=m 567CONFIG_BT_HCIBLUECARD=m
469CONFIG_BT_HCIBTUART=m 568CONFIG_BT_HCIBTUART=m
470CONFIG_BT_HCIVHCI=m 569CONFIG_BT_HCIVHCI=m
570# CONFIG_AF_RXRPC is not set
571# CONFIG_PHONET is not set
572CONFIG_WIRELESS=y
573# CONFIG_CFG80211 is not set
574# CONFIG_WIRELESS_OLD_REGULATORY is not set
575# CONFIG_WIRELESS_EXT is not set
576# CONFIG_MAC80211 is not set
471CONFIG_IEEE80211=m 577CONFIG_IEEE80211=m
472# CONFIG_IEEE80211_DEBUG is not set 578# CONFIG_IEEE80211_DEBUG is not set
473CONFIG_IEEE80211_CRYPT_WEP=m 579CONFIG_IEEE80211_CRYPT_WEP=m
474# CONFIG_IEEE80211_CRYPT_CCMP is not set 580# CONFIG_IEEE80211_CRYPT_CCMP is not set
475# CONFIG_IEEE80211_CRYPT_TKIP is not set 581# CONFIG_IEEE80211_CRYPT_TKIP is not set
582# CONFIG_RFKILL is not set
583# CONFIG_NET_9P is not set
476 584
477# 585#
478# Device Drivers 586# Device Drivers
@@ -481,19 +589,16 @@ CONFIG_IEEE80211_CRYPT_WEP=m
481# 589#
482# Generic Driver Options 590# Generic Driver Options
483# 591#
592CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
484CONFIG_STANDALONE=y 593CONFIG_STANDALONE=y
485CONFIG_PREVENT_FIRMWARE_BUILD=y 594CONFIG_PREVENT_FIRMWARE_BUILD=y
486CONFIG_FW_LOADER=y 595CONFIG_FW_LOADER=y
596CONFIG_FIRMWARE_IN_KERNEL=y
597CONFIG_EXTRA_FIRMWARE=""
487# CONFIG_DEBUG_DRIVER is not set 598# CONFIG_DEBUG_DRIVER is not set
488 599# CONFIG_DEBUG_DEVRES is not set
489# 600# CONFIG_SYS_HYPERVISOR is not set
490# Connector - unified userspace <-> kernelspace linker
491#
492# CONFIG_CONNECTOR is not set 601# CONFIG_CONNECTOR is not set
493
494#
495# Memory Technology Devices (MTD)
496#
497CONFIG_MTD=y 602CONFIG_MTD=y
498# CONFIG_MTD_DEBUG is not set 603# CONFIG_MTD_DEBUG is not set
499# CONFIG_MTD_CONCAT is not set 604# CONFIG_MTD_CONCAT is not set
@@ -501,16 +606,20 @@ CONFIG_MTD_PARTITIONS=y
501# CONFIG_MTD_REDBOOT_PARTS is not set 606# CONFIG_MTD_REDBOOT_PARTS is not set
502CONFIG_MTD_CMDLINE_PARTS=y 607CONFIG_MTD_CMDLINE_PARTS=y
503# CONFIG_MTD_AFS_PARTS is not set 608# CONFIG_MTD_AFS_PARTS is not set
609# CONFIG_MTD_AR7_PARTS is not set
504 610
505# 611#
506# User Modules And Translation Layers 612# User Modules And Translation Layers
507# 613#
508CONFIG_MTD_CHAR=y 614CONFIG_MTD_CHAR=y
615CONFIG_MTD_BLKDEVS=y
509CONFIG_MTD_BLOCK=y 616CONFIG_MTD_BLOCK=y
510# CONFIG_FTL is not set 617# CONFIG_FTL is not set
511# CONFIG_NFTL is not set 618# CONFIG_NFTL is not set
512# CONFIG_INFTL is not set 619# CONFIG_INFTL is not set
513# CONFIG_RFD_FTL is not set 620# CONFIG_RFD_FTL is not set
621# CONFIG_SSFDC is not set
622# CONFIG_MTD_OOPS is not set
514 623
515# 624#
516# RAM/ROM/Flash chip drivers 625# RAM/ROM/Flash chip drivers
@@ -535,16 +644,18 @@ CONFIG_MTD_ROM=y
535# Mapping drivers for chip access 644# Mapping drivers for chip access
536# 645#
537CONFIG_MTD_COMPLEX_MAPPINGS=y 646CONFIG_MTD_COMPLEX_MAPPINGS=y
647# CONFIG_MTD_PHYSMAP is not set
538CONFIG_MTD_SHARP_SL=y 648CONFIG_MTD_SHARP_SL=y
539# CONFIG_MTD_PLATRAM is not set 649# CONFIG_MTD_PLATRAM is not set
540 650
541# 651#
542# Self-contained MTD device drivers 652# Self-contained MTD device drivers
543# 653#
654# CONFIG_MTD_DATAFLASH is not set
655# CONFIG_MTD_M25P80 is not set
544# CONFIG_MTD_SLRAM is not set 656# CONFIG_MTD_SLRAM is not set
545# CONFIG_MTD_PHRAM is not set 657# CONFIG_MTD_PHRAM is not set
546# CONFIG_MTD_MTDRAM is not set 658# CONFIG_MTD_MTDRAM is not set
547# CONFIG_MTD_BLKMTD is not set
548# CONFIG_MTD_BLOCK2MTD is not set 659# CONFIG_MTD_BLOCK2MTD is not set
549 660
550# 661#
@@ -553,78 +664,66 @@ CONFIG_MTD_SHARP_SL=y
553# CONFIG_MTD_DOC2000 is not set 664# CONFIG_MTD_DOC2000 is not set
554# CONFIG_MTD_DOC2001 is not set 665# CONFIG_MTD_DOC2001 is not set
555# CONFIG_MTD_DOC2001PLUS is not set 666# CONFIG_MTD_DOC2001PLUS is not set
556
557#
558# NAND Flash Device Drivers
559#
560CONFIG_MTD_NAND=y 667CONFIG_MTD_NAND=y
561CONFIG_MTD_NAND_VERIFY_WRITE=y 668CONFIG_MTD_NAND_VERIFY_WRITE=y
669# CONFIG_MTD_NAND_ECC_SMC is not set
670# CONFIG_MTD_NAND_MUSEUM_IDS is not set
562# CONFIG_MTD_NAND_H1900 is not set 671# CONFIG_MTD_NAND_H1900 is not set
563CONFIG_MTD_NAND_IDS=y 672CONFIG_MTD_NAND_IDS=y
564# CONFIG_MTD_NAND_DISKONCHIP is not set 673# CONFIG_MTD_NAND_DISKONCHIP is not set
565CONFIG_MTD_NAND_SHARPSL=y 674CONFIG_MTD_NAND_SHARPSL=y
566# CONFIG_MTD_NAND_NANDSIM is not set 675# CONFIG_MTD_NAND_NANDSIM is not set
567 676# CONFIG_MTD_NAND_PLATFORM is not set
568# 677# CONFIG_MTD_ALAUDA is not set
569# OneNAND Flash Device Drivers
570#
571# CONFIG_MTD_ONENAND is not set 678# CONFIG_MTD_ONENAND is not set
572 679
573# 680#
574# Parallel port support 681# UBI - Unsorted block images
575# 682#
683# CONFIG_MTD_UBI is not set
576# CONFIG_PARPORT is not set 684# CONFIG_PARPORT is not set
577 685CONFIG_BLK_DEV=y
578#
579# Plug and Play support
580#
581
582#
583# Block devices
584#
585# CONFIG_BLK_DEV_COW_COMMON is not set 686# CONFIG_BLK_DEV_COW_COMMON is not set
586CONFIG_BLK_DEV_LOOP=y 687CONFIG_BLK_DEV_LOOP=y
587# CONFIG_BLK_DEV_CRYPTOLOOP is not set 688# CONFIG_BLK_DEV_CRYPTOLOOP is not set
588# CONFIG_BLK_DEV_NBD is not set 689# CONFIG_BLK_DEV_NBD is not set
589# CONFIG_BLK_DEV_UB is not set 690# CONFIG_BLK_DEV_UB is not set
590# CONFIG_BLK_DEV_RAM is not set 691# CONFIG_BLK_DEV_RAM is not set
591CONFIG_BLK_DEV_RAM_COUNT=16
592# CONFIG_CDROM_PKTCDVD is not set 692# CONFIG_CDROM_PKTCDVD is not set
593# CONFIG_ATA_OVER_ETH is not set 693# CONFIG_ATA_OVER_ETH is not set
594 694CONFIG_MISC_DEVICES=y
595# 695# CONFIG_EEPROM_93CX6 is not set
596# ATA/ATAPI/MFM/RLL support 696# CONFIG_ENCLOSURE_SERVICES is not set
597# 697CONFIG_HAVE_IDE=y
598CONFIG_IDE=y 698CONFIG_IDE=y
599CONFIG_BLK_DEV_IDE=y
600 699
601# 700#
602# Please see Documentation/ide.txt for help/info on IDE drives 701# Please see Documentation/ide/ide.txt for help/info on IDE drives
603# 702#
604# CONFIG_BLK_DEV_IDE_SATA is not set 703# CONFIG_BLK_DEV_IDE_SATA is not set
605CONFIG_BLK_DEV_IDEDISK=y 704CONFIG_BLK_DEV_IDEDISK=y
606# CONFIG_IDEDISK_MULTI_MODE is not set
607CONFIG_BLK_DEV_IDECS=y 705CONFIG_BLK_DEV_IDECS=y
608# CONFIG_BLK_DEV_IDECD is not set 706# CONFIG_BLK_DEV_IDECD is not set
609# CONFIG_BLK_DEV_IDETAPE is not set 707# CONFIG_BLK_DEV_IDETAPE is not set
610# CONFIG_BLK_DEV_IDEFLOPPY is not set 708# CONFIG_BLK_DEV_IDEFLOPPY is not set
611# CONFIG_BLK_DEV_IDESCSI is not set 709# CONFIG_BLK_DEV_IDESCSI is not set
612# CONFIG_IDE_TASK_IOCTL is not set 710# CONFIG_IDE_TASK_IOCTL is not set
711CONFIG_IDE_PROC_FS=y
613 712
614# 713#
615# IDE chipset support/bugfixes 714# IDE chipset support/bugfixes
616# 715#
617CONFIG_IDE_GENERIC=y 716# CONFIG_BLK_DEV_PLATFORM is not set
618# CONFIG_IDE_ARM is not set
619# CONFIG_BLK_DEV_IDEDMA is not set 717# CONFIG_BLK_DEV_IDEDMA is not set
620# CONFIG_IDEDMA_AUTO is not set
621# CONFIG_BLK_DEV_HD is not set
622 718
623# 719#
624# SCSI device support 720# SCSI device support
625# 721#
626# CONFIG_RAID_ATTRS is not set 722# CONFIG_RAID_ATTRS is not set
627CONFIG_SCSI=m 723CONFIG_SCSI=m
724CONFIG_SCSI_DMA=y
725# CONFIG_SCSI_TGT is not set
726# CONFIG_SCSI_NETLINK is not set
628CONFIG_SCSI_PROC_FS=y 727CONFIG_SCSI_PROC_FS=y
629 728
630# 729#
@@ -644,121 +743,76 @@ CONFIG_CHR_DEV_SG=m
644CONFIG_SCSI_MULTI_LUN=y 743CONFIG_SCSI_MULTI_LUN=y
645# CONFIG_SCSI_CONSTANTS is not set 744# CONFIG_SCSI_CONSTANTS is not set
646# CONFIG_SCSI_LOGGING is not set 745# CONFIG_SCSI_LOGGING is not set
746# CONFIG_SCSI_SCAN_ASYNC is not set
747CONFIG_SCSI_WAIT_SCAN=m
647 748
648# 749#
649# SCSI Transport Attributes 750# SCSI Transports
650# 751#
651# CONFIG_SCSI_SPI_ATTRS is not set 752# CONFIG_SCSI_SPI_ATTRS is not set
652# CONFIG_SCSI_FC_ATTRS is not set 753# CONFIG_SCSI_FC_ATTRS is not set
653# CONFIG_SCSI_ISCSI_ATTRS is not set 754# CONFIG_SCSI_ISCSI_ATTRS is not set
654# CONFIG_SCSI_SAS_ATTRS is not set 755# CONFIG_SCSI_SAS_LIBSAS is not set
655 756# CONFIG_SCSI_SRP_ATTRS is not set
656# 757CONFIG_SCSI_LOWLEVEL=y
657# SCSI low-level drivers
658#
659# CONFIG_ISCSI_TCP is not set 758# CONFIG_ISCSI_TCP is not set
660# CONFIG_SCSI_SATA is not set
661# CONFIG_SCSI_DEBUG is not set 759# CONFIG_SCSI_DEBUG is not set
662 760# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
663# 761# CONFIG_SCSI_DH is not set
664# PCMCIA SCSI adapter support 762# CONFIG_ATA is not set
665#
666# CONFIG_PCMCIA_AHA152X is not set
667# CONFIG_PCMCIA_FDOMAIN is not set
668# CONFIG_PCMCIA_NINJA_SCSI is not set
669# CONFIG_PCMCIA_QLOGIC is not set
670# CONFIG_PCMCIA_SYM53C500 is not set
671
672#
673# Multi-device support (RAID and LVM)
674#
675# CONFIG_MD is not set 763# CONFIG_MD is not set
676
677#
678# Fusion MPT device support
679#
680# CONFIG_FUSION is not set
681
682#
683# IEEE 1394 (FireWire) support
684#
685
686#
687# I2O device support
688#
689
690#
691# Network device support
692#
693CONFIG_NETDEVICES=y 764CONFIG_NETDEVICES=y
694# CONFIG_DUMMY is not set 765# CONFIG_DUMMY is not set
695# CONFIG_BONDING is not set 766# CONFIG_BONDING is not set
767# CONFIG_MACVLAN is not set
696# CONFIG_EQUALIZER is not set 768# CONFIG_EQUALIZER is not set
697# CONFIG_TUN is not set 769# CONFIG_TUN is not set
698 770# CONFIG_VETH is not set
699#
700# PHY device support
701#
702# CONFIG_PHYLIB is not set 771# CONFIG_PHYLIB is not set
703
704#
705# Ethernet (10 or 100Mbit)
706#
707CONFIG_NET_ETHERNET=y 772CONFIG_NET_ETHERNET=y
708CONFIG_MII=m 773CONFIG_MII=m
774# CONFIG_AX88796 is not set
709# CONFIG_SMC91X is not set 775# CONFIG_SMC91X is not set
710# CONFIG_DM9000 is not set 776# CONFIG_DM9000 is not set
777# CONFIG_ENC28J60 is not set
778# CONFIG_SMC911X is not set
779# CONFIG_IBM_NEW_EMAC_ZMII is not set
780# CONFIG_IBM_NEW_EMAC_RGMII is not set
781# CONFIG_IBM_NEW_EMAC_TAH is not set
782# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
783# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
784# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
785# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
786# CONFIG_B44 is not set
787CONFIG_NETDEV_1000=y
788CONFIG_NETDEV_10000=y
711 789
712# 790#
713# Ethernet (1000 Mbit) 791# Wireless LAN
714#
715
716#
717# Ethernet (10000 Mbit)
718#
719
720#
721# Token Ring devices
722#
723
724#
725# Wireless LAN (non-hamradio)
726#
727CONFIG_NET_RADIO=y
728
729#
730# Obsolete Wireless cards support (pre-802.11)
731#
732# CONFIG_STRIP is not set
733# CONFIG_PCMCIA_WAVELAN is not set
734# CONFIG_PCMCIA_NETWAVE is not set
735
736#
737# Wireless 802.11 Frequency Hopping cards support
738# 792#
739# CONFIG_PCMCIA_RAYCS is not set 793# CONFIG_WLAN_PRE80211 is not set
794# CONFIG_WLAN_80211 is not set
795# CONFIG_IWLWIFI_LEDS is not set
740 796
741# 797#
742# Wireless 802.11b ISA/PCI cards support 798# USB Network Adapters
743#
744CONFIG_HERMES=m
745# CONFIG_ATMEL is not set
746
747#
748# Wireless 802.11b Pcmcia/Cardbus cards support
749#
750CONFIG_PCMCIA_HERMES=m
751CONFIG_PCMCIA_SPECTRUM=m
752# CONFIG_AIRO_CS is not set
753# CONFIG_PCMCIA_WL3501 is not set
754CONFIG_HOSTAP=m
755CONFIG_HOSTAP_FIRMWARE=y
756CONFIG_HOSTAP_CS=m
757CONFIG_NET_WIRELESS=y
758
759#
760# PCMCIA network device support
761# 799#
800CONFIG_USB_CATC=m
801CONFIG_USB_KAWETH=m
802CONFIG_USB_PEGASUS=m
803CONFIG_USB_RTL8150=m
804CONFIG_USB_USBNET=m
805CONFIG_USB_NET_AX8817X=m
806CONFIG_USB_NET_CDCETHER=m
807# CONFIG_USB_NET_DM9601 is not set
808# CONFIG_USB_NET_SMSC95XX is not set
809# CONFIG_USB_NET_GL620A is not set
810CONFIG_USB_NET_NET1080=m
811# CONFIG_USB_NET_PLUSB is not set
812# CONFIG_USB_NET_MCS7830 is not set
813# CONFIG_USB_NET_RNDIS_HOST is not set
814# CONFIG_USB_NET_CDC_SUBSET is not set
815CONFIG_USB_NET_ZAURUS=m
762CONFIG_NET_PCMCIA=y 816CONFIG_NET_PCMCIA=y
763# CONFIG_PCMCIA_3C589 is not set 817# CONFIG_PCMCIA_3C589 is not set
764# CONFIG_PCMCIA_3C574 is not set 818# CONFIG_PCMCIA_3C574 is not set
@@ -768,10 +822,6 @@ CONFIG_PCMCIA_PCNET=m
768# CONFIG_PCMCIA_SMC91C92 is not set 822# CONFIG_PCMCIA_SMC91C92 is not set
769# CONFIG_PCMCIA_XIRC2PS is not set 823# CONFIG_PCMCIA_XIRC2PS is not set
770# CONFIG_PCMCIA_AXNET is not set 824# CONFIG_PCMCIA_AXNET is not set
771
772#
773# Wan interfaces
774#
775# CONFIG_WAN is not set 825# CONFIG_WAN is not set
776CONFIG_PPP=m 826CONFIG_PPP=m
777# CONFIG_PPP_MULTILINK is not set 827# CONFIG_PPP_MULTILINK is not set
@@ -782,30 +832,29 @@ CONFIG_PPP_ASYNC=m
782CONFIG_PPP_BSDCOMP=m 832CONFIG_PPP_BSDCOMP=m
783# CONFIG_PPP_MPPE is not set 833# CONFIG_PPP_MPPE is not set
784# CONFIG_PPPOE is not set 834# CONFIG_PPPOE is not set
835# CONFIG_PPPOL2TP is not set
785# CONFIG_SLIP is not set 836# CONFIG_SLIP is not set
786# CONFIG_SHAPER is not set 837CONFIG_SLHC=m
787# CONFIG_NETCONSOLE is not set 838# CONFIG_NETCONSOLE is not set
788# CONFIG_NETPOLL is not set 839# CONFIG_NETPOLL is not set
789# CONFIG_NET_POLL_CONTROLLER is not set 840# CONFIG_NET_POLL_CONTROLLER is not set
790
791#
792# ISDN subsystem
793#
794# CONFIG_ISDN is not set 841# CONFIG_ISDN is not set
795 842
796# 843#
797# Input device support 844# Input device support
798# 845#
799CONFIG_INPUT=y 846CONFIG_INPUT=y
847CONFIG_INPUT_FF_MEMLESS=m
848# CONFIG_INPUT_POLLDEV is not set
800 849
801# 850#
802# Userland interfaces 851# Userland interfaces
803# 852#
804# CONFIG_INPUT_MOUSEDEV is not set 853# CONFIG_INPUT_MOUSEDEV is not set
805# CONFIG_INPUT_JOYDEV is not set 854# CONFIG_INPUT_JOYDEV is not set
806# CONFIG_INPUT_TSDEV is not set
807CONFIG_INPUT_EVDEV=y 855CONFIG_INPUT_EVDEV=y
808# CONFIG_INPUT_EVBUG is not set 856# CONFIG_INPUT_EVBUG is not set
857# CONFIG_INPUT_APMPOWER is not set
809 858
810# 859#
811# Input Device Drivers 860# Input Device Drivers
@@ -814,19 +863,39 @@ CONFIG_INPUT_KEYBOARD=y
814# CONFIG_KEYBOARD_ATKBD is not set 863# CONFIG_KEYBOARD_ATKBD is not set
815# CONFIG_KEYBOARD_SUNKBD is not set 864# CONFIG_KEYBOARD_SUNKBD is not set
816# CONFIG_KEYBOARD_LKKBD is not set 865# CONFIG_KEYBOARD_LKKBD is not set
866# CONFIG_KEYBOARD_LOCOMO is not set
817# CONFIG_KEYBOARD_XTKBD is not set 867# CONFIG_KEYBOARD_XTKBD is not set
818# CONFIG_KEYBOARD_NEWTON is not set 868# CONFIG_KEYBOARD_NEWTON is not set
869# CONFIG_KEYBOARD_STOWAWAY is not set
819CONFIG_KEYBOARD_CORGI=y 870CONFIG_KEYBOARD_CORGI=y
820CONFIG_KEYBOARD_SPITZ=y 871CONFIG_KEYBOARD_SPITZ=y
872CONFIG_KEYBOARD_TOSA=y
873# CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES is not set
874# CONFIG_KEYBOARD_GPIO is not set
821# CONFIG_INPUT_MOUSE is not set 875# CONFIG_INPUT_MOUSE is not set
822# CONFIG_INPUT_JOYSTICK is not set 876# CONFIG_INPUT_JOYSTICK is not set
877# CONFIG_INPUT_TABLET is not set
823CONFIG_INPUT_TOUCHSCREEN=y 878CONFIG_INPUT_TOUCHSCREEN=y
824CONFIG_TOUCHSCREEN_CORGI=y 879CONFIG_TOUCHSCREEN_ADS7846=y
880# CONFIG_TOUCHSCREEN_CORGI is not set
881# CONFIG_TOUCHSCREEN_FUJITSU is not set
825# CONFIG_TOUCHSCREEN_GUNZE is not set 882# CONFIG_TOUCHSCREEN_GUNZE is not set
826# CONFIG_TOUCHSCREEN_ELO is not set 883# CONFIG_TOUCHSCREEN_ELO is not set
827# CONFIG_TOUCHSCREEN_MTOUCH is not set 884# CONFIG_TOUCHSCREEN_MTOUCH is not set
885# CONFIG_TOUCHSCREEN_INEXIO is not set
828# CONFIG_TOUCHSCREEN_MK712 is not set 886# CONFIG_TOUCHSCREEN_MK712 is not set
887# CONFIG_TOUCHSCREEN_PENMOUNT is not set
888# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
889# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
890# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
891# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
829CONFIG_INPUT_MISC=y 892CONFIG_INPUT_MISC=y
893# CONFIG_INPUT_ATI_REMOTE is not set
894# CONFIG_INPUT_ATI_REMOTE2 is not set
895# CONFIG_INPUT_KEYSPAN_REMOTE is not set
896# CONFIG_INPUT_POWERMATE is not set
897# CONFIG_INPUT_YEALINK is not set
898# CONFIG_INPUT_CM109 is not set
830CONFIG_INPUT_UINPUT=m 899CONFIG_INPUT_UINPUT=m
831 900
832# 901#
@@ -839,8 +908,11 @@ CONFIG_INPUT_UINPUT=m
839# Character devices 908# Character devices
840# 909#
841CONFIG_VT=y 910CONFIG_VT=y
911CONFIG_CONSOLE_TRANSLATIONS=y
842CONFIG_VT_CONSOLE=y 912CONFIG_VT_CONSOLE=y
843CONFIG_HW_CONSOLE=y 913CONFIG_HW_CONSOLE=y
914# CONFIG_VT_HW_CONSOLE_BINDING is not set
915CONFIG_DEVKMEM=y
844# CONFIG_SERIAL_NONSTANDARD is not set 916# CONFIG_SERIAL_NONSTANDARD is not set
845 917
846# 918#
@@ -849,6 +921,7 @@ CONFIG_HW_CONSOLE=y
849CONFIG_SERIAL_8250=m 921CONFIG_SERIAL_8250=m
850CONFIG_SERIAL_8250_CS=m 922CONFIG_SERIAL_8250_CS=m
851CONFIG_SERIAL_8250_NR_UARTS=4 923CONFIG_SERIAL_8250_NR_UARTS=4
924CONFIG_SERIAL_8250_RUNTIME_UARTS=4
852# CONFIG_SERIAL_8250_EXTENDED is not set 925# CONFIG_SERIAL_8250_EXTENDED is not set
853 926
854# 927#
@@ -860,97 +933,130 @@ CONFIG_SERIAL_CORE=y
860CONFIG_SERIAL_CORE_CONSOLE=y 933CONFIG_SERIAL_CORE_CONSOLE=y
861CONFIG_UNIX98_PTYS=y 934CONFIG_UNIX98_PTYS=y
862# CONFIG_LEGACY_PTYS is not set 935# CONFIG_LEGACY_PTYS is not set
863
864#
865# IPMI
866#
867# CONFIG_IPMI_HANDLER is not set 936# CONFIG_IPMI_HANDLER is not set
868 937CONFIG_HW_RANDOM=m
869#
870# Watchdog Cards
871#
872# CONFIG_WATCHDOG is not set
873# CONFIG_NVRAM is not set 938# CONFIG_NVRAM is not set
874# CONFIG_RTC is not set
875# CONFIG_DTLK is not set
876# CONFIG_R3964 is not set 939# CONFIG_R3964 is not set
877 940
878# 941#
879# Ftape, the floppy tape device driver
880#
881
882#
883# PCMCIA character devices 942# PCMCIA character devices
884# 943#
885# CONFIG_SYNCLINK_CS is not set 944# CONFIG_SYNCLINK_CS is not set
886# CONFIG_CARDMAN_4000 is not set 945# CONFIG_CARDMAN_4000 is not set
887# CONFIG_CARDMAN_4040 is not set 946# CONFIG_CARDMAN_4040 is not set
947# CONFIG_IPWIRELESS is not set
888# CONFIG_RAW_DRIVER is not set 948# CONFIG_RAW_DRIVER is not set
889
890#
891# TPM devices
892#
893# CONFIG_TCG_TPM is not set 949# CONFIG_TCG_TPM is not set
894# CONFIG_TELCLOCK is not set
895
896#
897# I2C support
898#
899CONFIG_I2C=y 950CONFIG_I2C=y
951CONFIG_I2C_BOARDINFO=y
900# CONFIG_I2C_CHARDEV is not set 952# CONFIG_I2C_CHARDEV is not set
953CONFIG_I2C_HELPER_AUTO=y
901 954
902# 955#
903# I2C Algorithms 956# I2C Hardware Bus support
904# 957#
905CONFIG_I2C_ALGOBIT=y
906# CONFIG_I2C_ALGOPCF is not set
907# CONFIG_I2C_ALGOPCA is not set
908 958
909# 959#
910# I2C Hardware Bus support 960# I2C system bus drivers (mostly embedded / system-on-chip)
911# 961#
962# CONFIG_I2C_GPIO is not set
963# CONFIG_I2C_OCORES is not set
912CONFIG_I2C_PXA=y 964CONFIG_I2C_PXA=y
913# CONFIG_I2C_PXA_SLAVE is not set 965# CONFIG_I2C_PXA_SLAVE is not set
966# CONFIG_I2C_SIMTEC is not set
967
968#
969# External I2C/SMBus adapter drivers
970#
914# CONFIG_I2C_PARPORT_LIGHT is not set 971# CONFIG_I2C_PARPORT_LIGHT is not set
972# CONFIG_I2C_TAOS_EVM is not set
973# CONFIG_I2C_TINY_USB is not set
974
975#
976# Other I2C/SMBus bus drivers
977#
978# CONFIG_I2C_PCA_PLATFORM is not set
915# CONFIG_I2C_STUB is not set 979# CONFIG_I2C_STUB is not set
916# CONFIG_I2C_PCA_ISA is not set
917 980
918# 981#
919# Miscellaneous I2C Chip support 982# Miscellaneous I2C Chip support
920# 983#
921# CONFIG_SENSORS_DS1337 is not set 984# CONFIG_DS1682 is not set
922# CONFIG_SENSORS_DS1374 is not set 985# CONFIG_AT24 is not set
923# CONFIG_SENSORS_EEPROM is not set 986# CONFIG_SENSORS_EEPROM is not set
924# CONFIG_SENSORS_PCF8574 is not set 987# CONFIG_SENSORS_PCF8574 is not set
988# CONFIG_PCF8575 is not set
925# CONFIG_SENSORS_PCA9539 is not set 989# CONFIG_SENSORS_PCA9539 is not set
926# CONFIG_SENSORS_PCF8591 is not set 990# CONFIG_SENSORS_PCF8591 is not set
927# CONFIG_SENSORS_RTC8564 is not set 991# CONFIG_TPS65010 is not set
928# CONFIG_SENSORS_MAX6875 is not set 992# CONFIG_SENSORS_MAX6875 is not set
929# CONFIG_RTC_X1205_I2C is not set 993# CONFIG_SENSORS_TSL2550 is not set
930# CONFIG_I2C_DEBUG_CORE is not set 994# CONFIG_I2C_DEBUG_CORE is not set
931# CONFIG_I2C_DEBUG_ALGO is not set 995# CONFIG_I2C_DEBUG_ALGO is not set
932# CONFIG_I2C_DEBUG_BUS is not set 996# CONFIG_I2C_DEBUG_BUS is not set
933# CONFIG_I2C_DEBUG_CHIP is not set 997# CONFIG_I2C_DEBUG_CHIP is not set
998CONFIG_SPI=y
999# CONFIG_SPI_DEBUG is not set
1000CONFIG_SPI_MASTER=y
934 1001
935# 1002#
936# Hardware Monitoring support 1003# SPI Master Controller Drivers
937# 1004#
1005# CONFIG_SPI_BITBANG is not set
1006CONFIG_SPI_PXA2XX=y
1007
1008#
1009# SPI Protocol Masters
1010#
1011# CONFIG_SPI_AT25 is not set
1012# CONFIG_SPI_SPIDEV is not set
1013# CONFIG_SPI_TLE62X0 is not set
1014CONFIG_ARCH_REQUIRE_GPIOLIB=y
1015CONFIG_GPIOLIB=y
1016# CONFIG_DEBUG_GPIO is not set
1017# CONFIG_GPIO_SYSFS is not set
1018
1019#
1020# I2C GPIO expanders:
1021#
1022# CONFIG_GPIO_MAX732X is not set
1023# CONFIG_GPIO_PCA953X is not set
1024# CONFIG_GPIO_PCF857X is not set
1025
1026#
1027# PCI GPIO expanders:
1028#
1029
1030#
1031# SPI GPIO expanders:
1032#
1033# CONFIG_GPIO_MAX7301 is not set
1034# CONFIG_GPIO_MCP23S08 is not set
1035# CONFIG_W1 is not set
1036# CONFIG_POWER_SUPPLY is not set
938CONFIG_HWMON=y 1037CONFIG_HWMON=y
939# CONFIG_HWMON_VID is not set 1038# CONFIG_HWMON_VID is not set
1039# CONFIG_SENSORS_AD7414 is not set
1040# CONFIG_SENSORS_AD7418 is not set
1041# CONFIG_SENSORS_ADCXX is not set
940# CONFIG_SENSORS_ADM1021 is not set 1042# CONFIG_SENSORS_ADM1021 is not set
941# CONFIG_SENSORS_ADM1025 is not set 1043# CONFIG_SENSORS_ADM1025 is not set
942# CONFIG_SENSORS_ADM1026 is not set 1044# CONFIG_SENSORS_ADM1026 is not set
1045# CONFIG_SENSORS_ADM1029 is not set
943# CONFIG_SENSORS_ADM1031 is not set 1046# CONFIG_SENSORS_ADM1031 is not set
944# CONFIG_SENSORS_ADM9240 is not set 1047# CONFIG_SENSORS_ADM9240 is not set
945# CONFIG_SENSORS_ASB100 is not set 1048# CONFIG_SENSORS_ADT7470 is not set
1049# CONFIG_SENSORS_ADT7473 is not set
946# CONFIG_SENSORS_ATXP1 is not set 1050# CONFIG_SENSORS_ATXP1 is not set
947# CONFIG_SENSORS_DS1621 is not set 1051# CONFIG_SENSORS_DS1621 is not set
948# CONFIG_SENSORS_FSCHER is not set 1052# CONFIG_SENSORS_F71805F is not set
949# CONFIG_SENSORS_FSCPOS is not set 1053# CONFIG_SENSORS_F71882FG is not set
1054# CONFIG_SENSORS_F75375S is not set
950# CONFIG_SENSORS_GL518SM is not set 1055# CONFIG_SENSORS_GL518SM is not set
951# CONFIG_SENSORS_GL520SM is not set 1056# CONFIG_SENSORS_GL520SM is not set
952# CONFIG_SENSORS_IT87 is not set 1057# CONFIG_SENSORS_IT87 is not set
953# CONFIG_SENSORS_LM63 is not set 1058# CONFIG_SENSORS_LM63 is not set
1059# CONFIG_SENSORS_LM70 is not set
954# CONFIG_SENSORS_LM75 is not set 1060# CONFIG_SENSORS_LM75 is not set
955# CONFIG_SENSORS_LM77 is not set 1061# CONFIG_SENSORS_LM77 is not set
956# CONFIG_SENSORS_LM78 is not set 1062# CONFIG_SENSORS_LM78 is not set
@@ -960,70 +1066,193 @@ CONFIG_HWMON=y
960# CONFIG_SENSORS_LM87 is not set 1066# CONFIG_SENSORS_LM87 is not set
961# CONFIG_SENSORS_LM90 is not set 1067# CONFIG_SENSORS_LM90 is not set
962# CONFIG_SENSORS_LM92 is not set 1068# CONFIG_SENSORS_LM92 is not set
1069# CONFIG_SENSORS_LM93 is not set
1070CONFIG_SENSORS_MAX1111=y
963# CONFIG_SENSORS_MAX1619 is not set 1071# CONFIG_SENSORS_MAX1619 is not set
1072# CONFIG_SENSORS_MAX6650 is not set
964# CONFIG_SENSORS_PC87360 is not set 1073# CONFIG_SENSORS_PC87360 is not set
1074# CONFIG_SENSORS_PC87427 is not set
1075# CONFIG_SENSORS_DME1737 is not set
965# CONFIG_SENSORS_SMSC47M1 is not set 1076# CONFIG_SENSORS_SMSC47M1 is not set
1077# CONFIG_SENSORS_SMSC47M192 is not set
966# CONFIG_SENSORS_SMSC47B397 is not set 1078# CONFIG_SENSORS_SMSC47B397 is not set
1079# CONFIG_SENSORS_ADS7828 is not set
1080# CONFIG_SENSORS_THMC50 is not set
1081# CONFIG_SENSORS_VT1211 is not set
967# CONFIG_SENSORS_W83781D is not set 1082# CONFIG_SENSORS_W83781D is not set
1083# CONFIG_SENSORS_W83791D is not set
968# CONFIG_SENSORS_W83792D is not set 1084# CONFIG_SENSORS_W83792D is not set
1085# CONFIG_SENSORS_W83793 is not set
969# CONFIG_SENSORS_W83L785TS is not set 1086# CONFIG_SENSORS_W83L785TS is not set
1087# CONFIG_SENSORS_W83L786NG is not set
970# CONFIG_SENSORS_W83627HF is not set 1088# CONFIG_SENSORS_W83627HF is not set
971# CONFIG_SENSORS_W83627EHF is not set 1089# CONFIG_SENSORS_W83627EHF is not set
972# CONFIG_HWMON_DEBUG_CHIP is not set 1090# CONFIG_HWMON_DEBUG_CHIP is not set
1091# CONFIG_THERMAL is not set
1092# CONFIG_THERMAL_HWMON is not set
1093# CONFIG_WATCHDOG is not set
973 1094
974# 1095#
975# Misc devices 1096# Sonics Silicon Backplane
976# 1097#
1098CONFIG_SSB_POSSIBLE=y
1099# CONFIG_SSB is not set
977 1100
978# 1101#
979# Multimedia Capabilities Port drivers 1102# Multifunction device drivers
980# 1103#
1104# CONFIG_MFD_CORE is not set
1105# CONFIG_MFD_SM501 is not set
1106# CONFIG_MFD_ASIC3 is not set
1107# CONFIG_HTC_EGPIO is not set
1108# CONFIG_HTC_PASIC3 is not set
1109# CONFIG_UCB1400_CORE is not set
1110# CONFIG_MFD_TMIO is not set
1111# CONFIG_MFD_T7L66XB is not set
1112# CONFIG_MFD_TC6387XB is not set
1113# CONFIG_MFD_TC6393XB is not set
1114# CONFIG_MFD_WM8400 is not set
1115# CONFIG_MFD_WM8350_I2C is not set
981 1116
982# 1117#
983# Multimedia devices 1118# Multimedia devices
984# 1119#
985CONFIG_VIDEO_DEV=m
986
987#
988# Video For Linux
989#
990 1120
991# 1121#
992# Video Adapters 1122# Multimedia core support
993# 1123#
1124CONFIG_VIDEO_DEV=m
1125CONFIG_VIDEO_V4L2_COMMON=m
1126CONFIG_VIDEO_ALLOW_V4L1=y
1127CONFIG_VIDEO_V4L1_COMPAT=y
1128# CONFIG_DVB_CORE is not set
1129CONFIG_VIDEO_MEDIA=m
1130
1131#
1132# Multimedia drivers
1133#
1134# CONFIG_MEDIA_ATTACH is not set
1135CONFIG_MEDIA_TUNER=m
1136# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
1137CONFIG_MEDIA_TUNER_SIMPLE=m
1138CONFIG_MEDIA_TUNER_TDA8290=m
1139CONFIG_MEDIA_TUNER_TDA9887=m
1140CONFIG_MEDIA_TUNER_TEA5761=m
1141CONFIG_MEDIA_TUNER_TEA5767=m
1142CONFIG_MEDIA_TUNER_MT20XX=m
1143CONFIG_MEDIA_TUNER_XC2028=m
1144CONFIG_MEDIA_TUNER_XC5000=m
1145CONFIG_VIDEO_V4L2=m
1146CONFIG_VIDEO_V4L1=m
1147CONFIG_VIDEO_CAPTURE_DRIVERS=y
1148# CONFIG_VIDEO_ADV_DEBUG is not set
1149# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
1150CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
1151# CONFIG_VIDEO_VIVI is not set
994# CONFIG_VIDEO_CPIA is not set 1152# CONFIG_VIDEO_CPIA is not set
1153# CONFIG_VIDEO_CPIA2 is not set
995# CONFIG_VIDEO_SAA5246A is not set 1154# CONFIG_VIDEO_SAA5246A is not set
996# CONFIG_VIDEO_SAA5249 is not set 1155# CONFIG_VIDEO_SAA5249 is not set
997# CONFIG_TUNER_3036 is not set 1156# CONFIG_SOC_CAMERA is not set
1157CONFIG_V4L_USB_DRIVERS=y
1158# CONFIG_USB_VIDEO_CLASS is not set
1159CONFIG_USB_GSPCA=m
1160# CONFIG_USB_M5602 is not set
1161# CONFIG_USB_GSPCA_CONEX is not set
1162# CONFIG_USB_GSPCA_ETOMS is not set
1163# CONFIG_USB_GSPCA_FINEPIX is not set
1164# CONFIG_USB_GSPCA_MARS is not set
1165# CONFIG_USB_GSPCA_OV519 is not set
1166# CONFIG_USB_GSPCA_PAC207 is not set
1167# CONFIG_USB_GSPCA_PAC7311 is not set
1168# CONFIG_USB_GSPCA_SONIXB is not set
1169# CONFIG_USB_GSPCA_SONIXJ is not set
1170# CONFIG_USB_GSPCA_SPCA500 is not set
1171# CONFIG_USB_GSPCA_SPCA501 is not set
1172# CONFIG_USB_GSPCA_SPCA505 is not set
1173# CONFIG_USB_GSPCA_SPCA506 is not set
1174# CONFIG_USB_GSPCA_SPCA508 is not set
1175# CONFIG_USB_GSPCA_SPCA561 is not set
1176# CONFIG_USB_GSPCA_STK014 is not set
1177# CONFIG_USB_GSPCA_SUNPLUS is not set
1178# CONFIG_USB_GSPCA_T613 is not set
1179# CONFIG_USB_GSPCA_TV8532 is not set
1180# CONFIG_USB_GSPCA_VC032X is not set
1181# CONFIG_USB_GSPCA_ZC3XX is not set
1182# CONFIG_VIDEO_PVRUSB2 is not set
998# CONFIG_VIDEO_EM28XX is not set 1183# CONFIG_VIDEO_EM28XX is not set
1184# CONFIG_VIDEO_USBVISION is not set
1185CONFIG_VIDEO_USBVIDEO=m
1186CONFIG_USB_VICAM=m
1187CONFIG_USB_IBMCAM=m
1188CONFIG_USB_KONICAWC=m
1189# CONFIG_USB_QUICKCAM_MESSENGER is not set
1190# CONFIG_USB_ET61X251 is not set
999# CONFIG_VIDEO_OVCAMCHIP is not set 1191# CONFIG_VIDEO_OVCAMCHIP is not set
1000# CONFIG_VIDEO_AUDIO_DECODER is not set 1192CONFIG_USB_OV511=m
1001# CONFIG_VIDEO_DECODER is not set 1193CONFIG_USB_SE401=m
1002 1194CONFIG_USB_SN9C102=m
1003# 1195CONFIG_USB_STV680=m
1004# Radio Adapters 1196# CONFIG_USB_ZC0301 is not set
1005# 1197# CONFIG_USB_PWC is not set
1006# CONFIG_RADIO_MAESTRO is not set 1198# CONFIG_USB_ZR364XX is not set
1007 1199# CONFIG_USB_STKWEBCAM is not set
1008# 1200# CONFIG_USB_S2255 is not set
1009# Digital Video Broadcasting Devices 1201CONFIG_RADIO_ADAPTERS=y
1010# 1202CONFIG_USB_DSBR=m
1011# CONFIG_DVB is not set 1203# CONFIG_USB_SI470X is not set
1204# CONFIG_USB_MR800 is not set
1205# CONFIG_DAB is not set
1012 1206
1013# 1207#
1014# Graphics support 1208# Graphics support
1015# 1209#
1210# CONFIG_VGASTATE is not set
1211# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1016CONFIG_FB=y 1212CONFIG_FB=y
1213# CONFIG_FIRMWARE_EDID is not set
1214# CONFIG_FB_DDC is not set
1215# CONFIG_FB_BOOT_VESA_SUPPORT is not set
1017CONFIG_FB_CFB_FILLRECT=y 1216CONFIG_FB_CFB_FILLRECT=y
1018CONFIG_FB_CFB_COPYAREA=y 1217CONFIG_FB_CFB_COPYAREA=y
1019CONFIG_FB_CFB_IMAGEBLIT=y 1218CONFIG_FB_CFB_IMAGEBLIT=y
1219# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
1220# CONFIG_FB_SYS_FILLRECT is not set
1221# CONFIG_FB_SYS_COPYAREA is not set
1222# CONFIG_FB_SYS_IMAGEBLIT is not set
1223# CONFIG_FB_FOREIGN_ENDIAN is not set
1224# CONFIG_FB_SYS_FOPS is not set
1225# CONFIG_FB_SVGALIB is not set
1020# CONFIG_FB_MACMODES is not set 1226# CONFIG_FB_MACMODES is not set
1227# CONFIG_FB_BACKLIGHT is not set
1021# CONFIG_FB_MODE_HELPERS is not set 1228# CONFIG_FB_MODE_HELPERS is not set
1022# CONFIG_FB_TILEBLITTING is not set 1229# CONFIG_FB_TILEBLITTING is not set
1230
1231#
1232# Frame buffer hardware drivers
1233#
1023# CONFIG_FB_S1D13XXX is not set 1234# CONFIG_FB_S1D13XXX is not set
1024# CONFIG_FB_PXA is not set 1235# CONFIG_FB_PXA is not set
1236# CONFIG_FB_MBX is not set
1025CONFIG_FB_W100=y 1237CONFIG_FB_W100=y
1026# CONFIG_FB_VIRTUAL is not set 1238# CONFIG_FB_VIRTUAL is not set
1239# CONFIG_FB_METRONOME is not set
1240CONFIG_BACKLIGHT_LCD_SUPPORT=y
1241CONFIG_LCD_CLASS_DEVICE=y
1242CONFIG_LCD_CORGI=y
1243# CONFIG_LCD_LTV350QV is not set
1244# CONFIG_LCD_ILI9320 is not set
1245# CONFIG_LCD_TDO24M is not set
1246# CONFIG_LCD_VGG2432A4 is not set
1247# CONFIG_LCD_PLATFORM is not set
1248CONFIG_BACKLIGHT_CLASS_DEVICE=y
1249# CONFIG_BACKLIGHT_CORGI is not set
1250CONFIG_BACKLIGHT_LOCOMO=y
1251
1252#
1253# Display device support
1254#
1255# CONFIG_DISPLAY_SUPPORT is not set
1027 1256
1028# 1257#
1029# Console display driver support 1258# Console display driver support
@@ -1031,6 +1260,7 @@ CONFIG_FB_W100=y
1031# CONFIG_VGA_CONSOLE is not set 1260# CONFIG_VGA_CONSOLE is not set
1032CONFIG_DUMMY_CONSOLE=y 1261CONFIG_DUMMY_CONSOLE=y
1033CONFIG_FRAMEBUFFER_CONSOLE=y 1262CONFIG_FRAMEBUFFER_CONSOLE=y
1263# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
1034# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 1264# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
1035CONFIG_FONTS=y 1265CONFIG_FONTS=y
1036CONFIG_FONT_8x8=y 1266CONFIG_FONT_8x8=y
@@ -1043,93 +1273,95 @@ CONFIG_FONT_8x16=y
1043# CONFIG_FONT_SUN8x16 is not set 1273# CONFIG_FONT_SUN8x16 is not set
1044# CONFIG_FONT_SUN12x22 is not set 1274# CONFIG_FONT_SUN12x22 is not set
1045# CONFIG_FONT_10x18 is not set 1275# CONFIG_FONT_10x18 is not set
1046
1047#
1048# Logo configuration
1049#
1050# CONFIG_LOGO is not set 1276# CONFIG_LOGO is not set
1051CONFIG_BACKLIGHT_LCD_SUPPORT=y
1052CONFIG_BACKLIGHT_CLASS_DEVICE=y
1053CONFIG_BACKLIGHT_DEVICE=y
1054# CONFIG_LCD_CLASS_DEVICE is not set
1055CONFIG_BACKLIGHT_CORGI=y
1056
1057#
1058# Sound
1059#
1060CONFIG_SOUND=y 1277CONFIG_SOUND=y
1278CONFIG_SOUND_OSS_CORE=y
1279# CONFIG_SND is not set
1280CONFIG_SOUND_PRIME=y
1281CONFIG_HID_SUPPORT=y
1282CONFIG_HID=y
1283# CONFIG_HID_DEBUG is not set
1284# CONFIG_HIDRAW is not set
1061 1285
1062# 1286#
1063# Advanced Linux Sound Architecture 1287# USB Input Devices
1064# 1288#
1065# CONFIG_SND is not set 1289CONFIG_USB_HID=m
1290# CONFIG_HID_PID is not set
1291# CONFIG_USB_HIDDEV is not set
1066 1292
1067# 1293#
1068# Open Sound System 1294# USB HID Boot Protocol drivers
1069# 1295#
1070CONFIG_SOUND_PRIME=y 1296CONFIG_USB_KBD=m
1071# CONFIG_SOUND_MSNDCLAS is not set 1297CONFIG_USB_MOUSE=m
1072# CONFIG_SOUND_MSNDPIN is not set 1298
1073CONFIG_SOUND_OSS=y
1074# CONFIG_SOUND_TRACEINIT is not set
1075# CONFIG_SOUND_DMAP is not set
1076# CONFIG_SOUND_AD1816 is not set
1077# CONFIG_SOUND_SGALAXY is not set
1078# CONFIG_SOUND_ADLIB is not set
1079# CONFIG_SOUND_ACI_MIXER is not set
1080# CONFIG_SOUND_CS4232 is not set
1081# CONFIG_SOUND_SSCAPE is not set
1082# CONFIG_SOUND_GUS is not set
1083# CONFIG_SOUND_VMIDI is not set
1084# CONFIG_SOUND_TRIX is not set
1085# CONFIG_SOUND_MSS is not set
1086# CONFIG_SOUND_MPU401 is not set
1087# CONFIG_SOUND_NM256 is not set
1088# CONFIG_SOUND_MAD16 is not set
1089# CONFIG_SOUND_PAS is not set
1090# CONFIG_SOUND_PSS is not set
1091# CONFIG_SOUND_SB is not set
1092# CONFIG_SOUND_AWE32_SYNTH is not set
1093# CONFIG_SOUND_WAVEFRONT is not set
1094# CONFIG_SOUND_MAUI is not set
1095# CONFIG_SOUND_YM3812 is not set
1096# CONFIG_SOUND_OPL3SA1 is not set
1097# CONFIG_SOUND_OPL3SA2 is not set
1098# CONFIG_SOUND_UART6850 is not set
1099# CONFIG_SOUND_AEDSP16 is not set
1100# CONFIG_SOUND_TVMIXER is not set
1101# CONFIG_SOUND_AD1980 is not set
1102
1103#
1104# USB support
1105# 1299#
1300# Special HID drivers
1301#
1302CONFIG_HID_COMPAT=y
1303CONFIG_HID_A4TECH=m
1304CONFIG_HID_APPLE=m
1305CONFIG_HID_BELKIN=m
1306CONFIG_HID_BRIGHT=m
1307CONFIG_HID_CHERRY=m
1308CONFIG_HID_CHICONY=m
1309CONFIG_HID_CYPRESS=m
1310CONFIG_HID_DELL=m
1311CONFIG_HID_EZKEY=m
1312CONFIG_HID_GYRATION=m
1313CONFIG_HID_LOGITECH=m
1314# CONFIG_LOGITECH_FF is not set
1315# CONFIG_LOGIRUMBLEPAD2_FF is not set
1316CONFIG_HID_MICROSOFT=m
1317CONFIG_HID_MONTEREY=m
1318CONFIG_HID_PANTHERLORD=m
1319# CONFIG_PANTHERLORD_FF is not set
1320CONFIG_HID_PETALYNX=m
1321CONFIG_HID_SAMSUNG=m
1322CONFIG_HID_SONY=m
1323CONFIG_HID_SUNPLUS=m
1324CONFIG_THRUSTMASTER_FF=m
1325CONFIG_ZEROPLUS_FF=m
1326CONFIG_USB_SUPPORT=y
1106CONFIG_USB_ARCH_HAS_HCD=y 1327CONFIG_USB_ARCH_HAS_HCD=y
1107# CONFIG_USB_ARCH_HAS_OHCI is not set 1328# CONFIG_USB_ARCH_HAS_OHCI is not set
1329# CONFIG_USB_ARCH_HAS_EHCI is not set
1108CONFIG_USB=m 1330CONFIG_USB=m
1109# CONFIG_USB_DEBUG is not set 1331# CONFIG_USB_DEBUG is not set
1332# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1110 1333
1111# 1334#
1112# Miscellaneous USB options 1335# Miscellaneous USB options
1113# 1336#
1114CONFIG_USB_DEVICEFS=y 1337CONFIG_USB_DEVICEFS=y
1115# CONFIG_USB_BANDWIDTH is not set 1338CONFIG_USB_DEVICE_CLASS=y
1116# CONFIG_USB_DYNAMIC_MINORS is not set 1339# CONFIG_USB_DYNAMIC_MINORS is not set
1117# CONFIG_USB_SUSPEND is not set 1340# CONFIG_USB_SUSPEND is not set
1118# CONFIG_USB_OTG is not set 1341# CONFIG_USB_OTG is not set
1342# CONFIG_USB_OTG_WHITELIST is not set
1343# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1344CONFIG_USB_MON=y
1119 1345
1120# 1346#
1121# USB Host Controller Drivers 1347# USB Host Controller Drivers
1122# 1348#
1349# CONFIG_USB_C67X00_HCD is not set
1123# CONFIG_USB_ISP116X_HCD is not set 1350# CONFIG_USB_ISP116X_HCD is not set
1351# CONFIG_USB_ISP1760_HCD is not set
1124CONFIG_USB_SL811_HCD=m 1352CONFIG_USB_SL811_HCD=m
1125CONFIG_USB_SL811_CS=m 1353CONFIG_USB_SL811_CS=m
1354# CONFIG_USB_R8A66597_HCD is not set
1355# CONFIG_USB_MUSB_HDRC is not set
1356# CONFIG_USB_GADGET_MUSB_HDRC is not set
1126 1357
1127# 1358#
1128# USB Device Class drivers 1359# USB Device Class drivers
1129# 1360#
1130# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
1131CONFIG_USB_ACM=m 1361CONFIG_USB_ACM=m
1132CONFIG_USB_PRINTER=m 1362CONFIG_USB_PRINTER=m
1363# CONFIG_USB_WDM is not set
1364# CONFIG_USB_TMC is not set
1133 1365
1134# 1366#
1135# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1367# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1148,33 +1380,11 @@ CONFIG_USB_STORAGE=m
1148# CONFIG_USB_STORAGE_SDDR09 is not set 1380# CONFIG_USB_STORAGE_SDDR09 is not set
1149# CONFIG_USB_STORAGE_SDDR55 is not set 1381# CONFIG_USB_STORAGE_SDDR55 is not set
1150# CONFIG_USB_STORAGE_JUMPSHOT is not set 1382# CONFIG_USB_STORAGE_JUMPSHOT is not set
1151 1383# CONFIG_USB_STORAGE_ALAUDA is not set
1152# 1384# CONFIG_USB_STORAGE_ONETOUCH is not set
1153# USB Input Devices 1385# CONFIG_USB_STORAGE_KARMA is not set
1154# 1386# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1155CONFIG_USB_HID=m 1387# CONFIG_USB_LIBUSUAL is not set
1156CONFIG_USB_HIDINPUT=y
1157# CONFIG_HID_FF is not set
1158# CONFIG_USB_HIDDEV is not set
1159
1160#
1161# USB HID Boot Protocol drivers
1162#
1163CONFIG_USB_KBD=m
1164CONFIG_USB_MOUSE=m
1165CONFIG_USB_AIPTEK=m
1166CONFIG_USB_WACOM=m
1167# CONFIG_USB_ACECAD is not set
1168CONFIG_USB_KBTAB=m
1169CONFIG_USB_POWERMATE=m
1170CONFIG_USB_MTOUCH=m
1171# CONFIG_USB_ITMTOUCH is not set
1172CONFIG_USB_EGALAX=m
1173# CONFIG_USB_YEALINK is not set
1174CONFIG_USB_XPAD=m
1175CONFIG_USB_ATI_REMOTE=m
1176# CONFIG_USB_KEYSPAN_REMOTE is not set
1177# CONFIG_USB_APPLETOUCH is not set
1178 1388
1179# 1389#
1180# USB Imaging devices 1390# USB Imaging devices
@@ -1183,56 +1393,22 @@ CONFIG_USB_MDC800=m
1183CONFIG_USB_MICROTEK=m 1393CONFIG_USB_MICROTEK=m
1184 1394
1185# 1395#
1186# USB Multimedia devices
1187#
1188CONFIG_USB_DABUSB=m
1189CONFIG_USB_VICAM=m
1190CONFIG_USB_DSBR=m
1191CONFIG_USB_IBMCAM=m
1192CONFIG_USB_KONICAWC=m
1193CONFIG_USB_OV511=m
1194CONFIG_USB_SE401=m
1195CONFIG_USB_SN9C102=m
1196CONFIG_USB_STV680=m
1197# CONFIG_USB_PWC is not set
1198
1199#
1200# USB Network Adapters
1201#
1202CONFIG_USB_CATC=m
1203CONFIG_USB_KAWETH=m
1204CONFIG_USB_PEGASUS=m
1205CONFIG_USB_RTL8150=m
1206CONFIG_USB_USBNET=m
1207CONFIG_USB_NET_AX8817X=m
1208CONFIG_USB_NET_CDCETHER=m
1209# CONFIG_USB_NET_GL620A is not set
1210CONFIG_USB_NET_NET1080=m
1211# CONFIG_USB_NET_PLUSB is not set
1212# CONFIG_USB_NET_RNDIS_HOST is not set
1213# CONFIG_USB_NET_CDC_SUBSET is not set
1214CONFIG_USB_NET_ZAURUS=m
1215# CONFIG_USB_ZD1201 is not set
1216CONFIG_USB_MON=y
1217
1218#
1219# USB port drivers 1396# USB port drivers
1220# 1397#
1221
1222#
1223# USB Serial Converter support
1224#
1225CONFIG_USB_SERIAL=m 1398CONFIG_USB_SERIAL=m
1399CONFIG_USB_EZUSB=y
1226CONFIG_USB_SERIAL_GENERIC=y 1400CONFIG_USB_SERIAL_GENERIC=y
1227# CONFIG_USB_SERIAL_AIRPRIME is not set 1401# CONFIG_USB_SERIAL_AIRCABLE is not set
1228# CONFIG_USB_SERIAL_ANYDATA is not set 1402# CONFIG_USB_SERIAL_ARK3116 is not set
1229CONFIG_USB_SERIAL_BELKIN=m 1403CONFIG_USB_SERIAL_BELKIN=m
1404# CONFIG_USB_SERIAL_CH341 is not set
1230# CONFIG_USB_SERIAL_WHITEHEAT is not set 1405# CONFIG_USB_SERIAL_WHITEHEAT is not set
1231CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m 1406CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1232# CONFIG_USB_SERIAL_CP2101 is not set 1407# CONFIG_USB_SERIAL_CP2101 is not set
1233CONFIG_USB_SERIAL_CYPRESS_M8=m 1408CONFIG_USB_SERIAL_CYPRESS_M8=m
1234CONFIG_USB_SERIAL_EMPEG=m 1409CONFIG_USB_SERIAL_EMPEG=m
1235CONFIG_USB_SERIAL_FTDI_SIO=m 1410CONFIG_USB_SERIAL_FTDI_SIO=m
1411# CONFIG_USB_SERIAL_FUNSOFT is not set
1236CONFIG_USB_SERIAL_VISOR=m 1412CONFIG_USB_SERIAL_VISOR=m
1237CONFIG_USB_SERIAL_IPAQ=m 1413CONFIG_USB_SERIAL_IPAQ=m
1238CONFIG_USB_SERIAL_IR=m 1414CONFIG_USB_SERIAL_IR=m
@@ -1240,6 +1416,7 @@ CONFIG_USB_SERIAL_EDGEPORT=m
1240CONFIG_USB_SERIAL_EDGEPORT_TI=m 1416CONFIG_USB_SERIAL_EDGEPORT_TI=m
1241CONFIG_USB_SERIAL_GARMIN=m 1417CONFIG_USB_SERIAL_GARMIN=m
1242CONFIG_USB_SERIAL_IPW=m 1418CONFIG_USB_SERIAL_IPW=m
1419# CONFIG_USB_SERIAL_IUU is not set
1243CONFIG_USB_SERIAL_KEYSPAN_PDA=m 1420CONFIG_USB_SERIAL_KEYSPAN_PDA=m
1244CONFIG_USB_SERIAL_KEYSPAN=m 1421CONFIG_USB_SERIAL_KEYSPAN=m
1245# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set 1422# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
@@ -1257,50 +1434,68 @@ CONFIG_USB_SERIAL_KEYSPAN=m
1257CONFIG_USB_SERIAL_KLSI=m 1434CONFIG_USB_SERIAL_KLSI=m
1258CONFIG_USB_SERIAL_KOBIL_SCT=m 1435CONFIG_USB_SERIAL_KOBIL_SCT=m
1259CONFIG_USB_SERIAL_MCT_U232=m 1436CONFIG_USB_SERIAL_MCT_U232=m
1437# CONFIG_USB_SERIAL_MOS7720 is not set
1438# CONFIG_USB_SERIAL_MOS7840 is not set
1439# CONFIG_USB_SERIAL_MOTOROLA is not set
1440# CONFIG_USB_SERIAL_NAVMAN is not set
1260CONFIG_USB_SERIAL_PL2303=m 1441CONFIG_USB_SERIAL_PL2303=m
1442# CONFIG_USB_SERIAL_OTI6858 is not set
1443# CONFIG_USB_SERIAL_SPCP8X5 is not set
1261# CONFIG_USB_SERIAL_HP4X is not set 1444# CONFIG_USB_SERIAL_HP4X is not set
1262CONFIG_USB_SERIAL_SAFE=m 1445CONFIG_USB_SERIAL_SAFE=m
1263# CONFIG_USB_SERIAL_SAFE_PADDED is not set 1446# CONFIG_USB_SERIAL_SAFE_PADDED is not set
1447# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1264CONFIG_USB_SERIAL_TI=m 1448CONFIG_USB_SERIAL_TI=m
1265CONFIG_USB_SERIAL_CYBERJACK=m 1449CONFIG_USB_SERIAL_CYBERJACK=m
1266CONFIG_USB_SERIAL_XIRCOM=m 1450CONFIG_USB_SERIAL_XIRCOM=m
1451# CONFIG_USB_SERIAL_OPTION is not set
1267CONFIG_USB_SERIAL_OMNINET=m 1452CONFIG_USB_SERIAL_OMNINET=m
1268CONFIG_USB_EZUSB=y 1453# CONFIG_USB_SERIAL_DEBUG is not set
1269 1454
1270# 1455#
1271# USB Miscellaneous drivers 1456# USB Miscellaneous drivers
1272# 1457#
1273CONFIG_USB_EMI62=m 1458CONFIG_USB_EMI62=m
1274CONFIG_USB_EMI26=m 1459CONFIG_USB_EMI26=m
1275CONFIG_USB_AUERSWALD=m 1460# CONFIG_USB_ADUTUX is not set
1461# CONFIG_USB_SEVSEG is not set
1276CONFIG_USB_RIO500=m 1462CONFIG_USB_RIO500=m
1277CONFIG_USB_LEGOTOWER=m 1463CONFIG_USB_LEGOTOWER=m
1278CONFIG_USB_LCD=m 1464CONFIG_USB_LCD=m
1465# CONFIG_USB_BERRY_CHARGE is not set
1279CONFIG_USB_LED=m 1466CONFIG_USB_LED=m
1467# CONFIG_USB_CYPRESS_CY7C63 is not set
1280CONFIG_USB_CYTHERM=m 1468CONFIG_USB_CYTHERM=m
1281CONFIG_USB_PHIDGETKIT=m 1469# CONFIG_USB_PHIDGET is not set
1282CONFIG_USB_PHIDGETSERVO=m
1283CONFIG_USB_IDMOUSE=m 1470CONFIG_USB_IDMOUSE=m
1471# CONFIG_USB_FTDI_ELAN is not set
1472# CONFIG_USB_APPLEDISPLAY is not set
1284# CONFIG_USB_LD is not set 1473# CONFIG_USB_LD is not set
1474# CONFIG_USB_TRANCEVIBRATOR is not set
1475# CONFIG_USB_IOWARRIOR is not set
1285# CONFIG_USB_TEST is not set 1476# CONFIG_USB_TEST is not set
1286 1477# CONFIG_USB_ISIGHTFW is not set
1287# 1478# CONFIG_USB_VST is not set
1288# USB DSL modem support
1289#
1290
1291#
1292# USB Gadget Support
1293#
1294CONFIG_USB_GADGET=y 1479CONFIG_USB_GADGET=y
1480# CONFIG_USB_GADGET_DEBUG is not set
1295# CONFIG_USB_GADGET_DEBUG_FILES is not set 1481# CONFIG_USB_GADGET_DEBUG_FILES is not set
1482CONFIG_USB_GADGET_VBUS_DRAW=2
1296CONFIG_USB_GADGET_SELECTED=y 1483CONFIG_USB_GADGET_SELECTED=y
1297# CONFIG_USB_GADGET_NET2280 is not set 1484# CONFIG_USB_GADGET_AT91 is not set
1298CONFIG_USB_GADGET_PXA2XX=y 1485# CONFIG_USB_GADGET_ATMEL_USBA is not set
1299CONFIG_USB_PXA2XX=y 1486# CONFIG_USB_GADGET_FSL_USB2 is not set
1300# CONFIG_USB_PXA2XX_SMALL is not set
1301# CONFIG_USB_GADGET_GOKU is not set
1302# CONFIG_USB_GADGET_LH7A40X is not set 1487# CONFIG_USB_GADGET_LH7A40X is not set
1303# CONFIG_USB_GADGET_OMAP is not set 1488# CONFIG_USB_GADGET_OMAP is not set
1489CONFIG_USB_GADGET_PXA25X=y
1490CONFIG_USB_PXA25X=y
1491# CONFIG_USB_PXA25X_SMALL is not set
1492# CONFIG_USB_GADGET_PXA27X is not set
1493# CONFIG_USB_GADGET_S3C2410 is not set
1494# CONFIG_USB_GADGET_M66592 is not set
1495# CONFIG_USB_GADGET_AMD5536UDC is not set
1496# CONFIG_USB_GADGET_FSL_QE is not set
1497# CONFIG_USB_GADGET_NET2280 is not set
1498# CONFIG_USB_GADGET_GOKU is not set
1304# CONFIG_USB_GADGET_DUMMY_HCD is not set 1499# CONFIG_USB_GADGET_DUMMY_HCD is not set
1305# CONFIG_USB_GADGET_DUALSPEED is not set 1500# CONFIG_USB_GADGET_DUALSPEED is not set
1306CONFIG_USB_ZERO=m 1501CONFIG_USB_ZERO=m
@@ -1310,15 +1505,42 @@ CONFIG_USB_GADGETFS=m
1310CONFIG_USB_FILE_STORAGE=m 1505CONFIG_USB_FILE_STORAGE=m
1311# CONFIG_USB_FILE_STORAGE_TEST is not set 1506# CONFIG_USB_FILE_STORAGE_TEST is not set
1312CONFIG_USB_G_SERIAL=m 1507CONFIG_USB_G_SERIAL=m
1508# CONFIG_USB_MIDI_GADGET is not set
1509# CONFIG_USB_G_PRINTER is not set
1510# CONFIG_USB_CDC_COMPOSITE is not set
1511CONFIG_MMC=y
1512# CONFIG_MMC_DEBUG is not set
1513# CONFIG_MMC_UNSAFE_RESUME is not set
1313 1514
1314# 1515#
1315# MMC/SD Card support 1516# MMC/SD/SDIO Card Drivers
1316# 1517#
1317CONFIG_MMC=y
1318# CONFIG_MMC_DEBUG is not set
1319CONFIG_MMC_BLOCK=y 1518CONFIG_MMC_BLOCK=y
1519CONFIG_MMC_BLOCK_BOUNCE=y
1520# CONFIG_SDIO_UART is not set
1521# CONFIG_MMC_TEST is not set
1522
1523#
1524# MMC/SD/SDIO Host Controller Drivers
1525#
1320CONFIG_MMC_PXA=y 1526CONFIG_MMC_PXA=y
1321# CONFIG_MMC_WBSD is not set 1527# CONFIG_MMC_SDHCI is not set
1528# CONFIG_MMC_SPI is not set
1529# CONFIG_MEMSTICK is not set
1530# CONFIG_ACCESSIBILITY is not set
1531# CONFIG_NEW_LEDS is not set
1532CONFIG_RTC_LIB=y
1533# CONFIG_RTC_CLASS is not set
1534# CONFIG_DMADEVICES is not set
1535
1536#
1537# Voltage and Current regulators
1538#
1539# CONFIG_REGULATOR is not set
1540# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1541# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1542# CONFIG_REGULATOR_BQ24022 is not set
1543# CONFIG_UIO is not set
1322 1544
1323# 1545#
1324# File systems 1546# File systems
@@ -1327,16 +1549,17 @@ CONFIG_EXT2_FS=y
1327# CONFIG_EXT2_FS_XATTR is not set 1549# CONFIG_EXT2_FS_XATTR is not set
1328# CONFIG_EXT2_FS_XIP is not set 1550# CONFIG_EXT2_FS_XIP is not set
1329# CONFIG_EXT3_FS is not set 1551# CONFIG_EXT3_FS is not set
1330# CONFIG_JBD is not set 1552# CONFIG_EXT4_FS is not set
1331# CONFIG_REISERFS_FS is not set 1553# CONFIG_REISERFS_FS is not set
1332# CONFIG_JFS_FS is not set 1554# CONFIG_JFS_FS is not set
1333# CONFIG_FS_POSIX_ACL is not set 1555# CONFIG_FS_POSIX_ACL is not set
1556CONFIG_FILE_LOCKING=y
1334# CONFIG_XFS_FS is not set 1557# CONFIG_XFS_FS is not set
1335# CONFIG_MINIX_FS is not set 1558# CONFIG_OCFS2_FS is not set
1336# CONFIG_ROMFS_FS is not set 1559CONFIG_DNOTIFY=y
1337CONFIG_INOTIFY=y 1560CONFIG_INOTIFY=y
1561CONFIG_INOTIFY_USER=y
1338# CONFIG_QUOTA is not set 1562# CONFIG_QUOTA is not set
1339CONFIG_DNOTIFY=y
1340# CONFIG_AUTOFS_FS is not set 1563# CONFIG_AUTOFS_FS is not set
1341# CONFIG_AUTOFS4_FS is not set 1564# CONFIG_AUTOFS4_FS is not set
1342# CONFIG_FUSE_FS is not set 1565# CONFIG_FUSE_FS is not set
@@ -1361,11 +1584,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1361# Pseudo filesystems 1584# Pseudo filesystems
1362# 1585#
1363CONFIG_PROC_FS=y 1586CONFIG_PROC_FS=y
1587CONFIG_PROC_SYSCTL=y
1588CONFIG_PROC_PAGE_MONITOR=y
1364CONFIG_SYSFS=y 1589CONFIG_SYSFS=y
1365CONFIG_TMPFS=y 1590CONFIG_TMPFS=y
1591# CONFIG_TMPFS_POSIX_ACL is not set
1366# CONFIG_HUGETLB_PAGE is not set 1592# CONFIG_HUGETLB_PAGE is not set
1367CONFIG_RAMFS=y 1593# CONFIG_CONFIGFS_FS is not set
1368# CONFIG_RELAYFS_FS is not set
1369 1594
1370# 1595#
1371# Miscellaneous filesystems 1596# Miscellaneous filesystems
@@ -1377,39 +1602,42 @@ CONFIG_RAMFS=y
1377# CONFIG_BEFS_FS is not set 1602# CONFIG_BEFS_FS is not set
1378# CONFIG_BFS_FS is not set 1603# CONFIG_BFS_FS is not set
1379# CONFIG_EFS_FS is not set 1604# CONFIG_EFS_FS is not set
1380# CONFIG_JFFS_FS is not set
1381CONFIG_JFFS2_FS=y 1605CONFIG_JFFS2_FS=y
1382CONFIG_JFFS2_FS_DEBUG=0 1606CONFIG_JFFS2_FS_DEBUG=0
1383CONFIG_JFFS2_FS_WRITEBUFFER=y 1607CONFIG_JFFS2_FS_WRITEBUFFER=y
1608# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
1384CONFIG_JFFS2_SUMMARY=y 1609CONFIG_JFFS2_SUMMARY=y
1610# CONFIG_JFFS2_FS_XATTR is not set
1385CONFIG_JFFS2_COMPRESSION_OPTIONS=y 1611CONFIG_JFFS2_COMPRESSION_OPTIONS=y
1386CONFIG_JFFS2_ZLIB=y 1612CONFIG_JFFS2_ZLIB=y
1613# CONFIG_JFFS2_LZO is not set
1387CONFIG_JFFS2_RTIME=y 1614CONFIG_JFFS2_RTIME=y
1388CONFIG_JFFS2_RUBIN=y 1615CONFIG_JFFS2_RUBIN=y
1389# CONFIG_JFFS2_CMODE_NONE is not set 1616# CONFIG_JFFS2_CMODE_NONE is not set
1390CONFIG_JFFS2_CMODE_PRIORITY=y 1617CONFIG_JFFS2_CMODE_PRIORITY=y
1391# CONFIG_JFFS2_CMODE_SIZE is not set 1618# CONFIG_JFFS2_CMODE_SIZE is not set
1619# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
1392CONFIG_CRAMFS=m 1620CONFIG_CRAMFS=m
1393# CONFIG_VXFS_FS is not set 1621# CONFIG_VXFS_FS is not set
1622# CONFIG_MINIX_FS is not set
1623# CONFIG_OMFS_FS is not set
1394# CONFIG_HPFS_FS is not set 1624# CONFIG_HPFS_FS is not set
1395# CONFIG_QNX4FS_FS is not set 1625# CONFIG_QNX4FS_FS is not set
1626# CONFIG_ROMFS_FS is not set
1396# CONFIG_SYSV_FS is not set 1627# CONFIG_SYSV_FS is not set
1397# CONFIG_UFS_FS is not set 1628# CONFIG_UFS_FS is not set
1398 1629CONFIG_NETWORK_FILESYSTEMS=y
1399#
1400# Network File Systems
1401#
1402CONFIG_NFS_FS=m 1630CONFIG_NFS_FS=m
1403CONFIG_NFS_V3=y 1631CONFIG_NFS_V3=y
1404# CONFIG_NFS_V3_ACL is not set 1632# CONFIG_NFS_V3_ACL is not set
1405CONFIG_NFS_V4=y 1633CONFIG_NFS_V4=y
1406# CONFIG_NFS_DIRECTIO is not set
1407# CONFIG_NFSD is not set 1634# CONFIG_NFSD is not set
1408CONFIG_LOCKD=m 1635CONFIG_LOCKD=m
1409CONFIG_LOCKD_V4=y 1636CONFIG_LOCKD_V4=y
1410CONFIG_NFS_COMMON=y 1637CONFIG_NFS_COMMON=y
1411CONFIG_SUNRPC=m 1638CONFIG_SUNRPC=m
1412CONFIG_SUNRPC_GSS=m 1639CONFIG_SUNRPC_GSS=m
1640# CONFIG_SUNRPC_REGISTER_V4 is not set
1413CONFIG_RPCSEC_GSS_KRB5=m 1641CONFIG_RPCSEC_GSS_KRB5=m
1414# CONFIG_RPCSEC_GSS_SPKM3 is not set 1642# CONFIG_RPCSEC_GSS_SPKM3 is not set
1415CONFIG_SMB_FS=m 1643CONFIG_SMB_FS=m
@@ -1419,7 +1647,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
1419# CONFIG_NCP_FS is not set 1647# CONFIG_NCP_FS is not set
1420# CONFIG_CODA_FS is not set 1648# CONFIG_CODA_FS is not set
1421# CONFIG_AFS_FS is not set 1649# CONFIG_AFS_FS is not set
1422# CONFIG_9P_FS is not set
1423 1650
1424# 1651#
1425# Partition Types 1652# Partition Types
@@ -1439,11 +1666,9 @@ CONFIG_MSDOS_PARTITION=y
1439# CONFIG_SGI_PARTITION is not set 1666# CONFIG_SGI_PARTITION is not set
1440# CONFIG_ULTRIX_PARTITION is not set 1667# CONFIG_ULTRIX_PARTITION is not set
1441# CONFIG_SUN_PARTITION is not set 1668# CONFIG_SUN_PARTITION is not set
1669# CONFIG_KARMA_PARTITION is not set
1442# CONFIG_EFI_PARTITION is not set 1670# CONFIG_EFI_PARTITION is not set
1443 1671# CONFIG_SYSV68_PARTITION is not set
1444#
1445# Native Language Support
1446#
1447CONFIG_NLS=y 1672CONFIG_NLS=y
1448CONFIG_NLS_DEFAULT="cp437" 1673CONFIG_NLS_DEFAULT="cp437"
1449CONFIG_NLS_CODEPAGE_437=y 1674CONFIG_NLS_CODEPAGE_437=y
@@ -1484,35 +1709,71 @@ CONFIG_NLS_ISO8859_1=y
1484# CONFIG_NLS_KOI8_R is not set 1709# CONFIG_NLS_KOI8_R is not set
1485# CONFIG_NLS_KOI8_U is not set 1710# CONFIG_NLS_KOI8_U is not set
1486CONFIG_NLS_UTF8=y 1711CONFIG_NLS_UTF8=y
1487 1712# CONFIG_DLM is not set
1488#
1489# Profiling support
1490#
1491CONFIG_PROFILING=y
1492CONFIG_OPROFILE=m
1493 1713
1494# 1714#
1495# Kernel hacking 1715# Kernel hacking
1496# 1716#
1497# CONFIG_PRINTK_TIME is not set 1717# CONFIG_PRINTK_TIME is not set
1498CONFIG_DEBUG_KERNEL=y 1718CONFIG_ENABLE_WARN_DEPRECATED=y
1719CONFIG_ENABLE_MUST_CHECK=y
1720CONFIG_FRAME_WARN=1024
1499CONFIG_MAGIC_SYSRQ=y 1721CONFIG_MAGIC_SYSRQ=y
1500CONFIG_LOG_BUF_SHIFT=14 1722# CONFIG_UNUSED_SYMBOLS is not set
1723# CONFIG_DEBUG_FS is not set
1724# CONFIG_HEADERS_CHECK is not set
1725CONFIG_DEBUG_KERNEL=y
1726# CONFIG_DEBUG_SHIRQ is not set
1501CONFIG_DETECT_SOFTLOCKUP=y 1727CONFIG_DETECT_SOFTLOCKUP=y
1728# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1729CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1730CONFIG_SCHED_DEBUG=y
1502# CONFIG_SCHEDSTATS is not set 1731# CONFIG_SCHEDSTATS is not set
1503# CONFIG_DEBUG_SLAB is not set 1732# CONFIG_TIMER_STATS is not set
1733# CONFIG_DEBUG_OBJECTS is not set
1734# CONFIG_SLUB_DEBUG_ON is not set
1735# CONFIG_SLUB_STATS is not set
1504# CONFIG_DEBUG_PREEMPT is not set 1736# CONFIG_DEBUG_PREEMPT is not set
1737# CONFIG_DEBUG_RT_MUTEXES is not set
1738# CONFIG_RT_MUTEX_TESTER is not set
1505# CONFIG_DEBUG_SPINLOCK is not set 1739# CONFIG_DEBUG_SPINLOCK is not set
1740# CONFIG_DEBUG_MUTEXES is not set
1741# CONFIG_DEBUG_LOCK_ALLOC is not set
1742# CONFIG_PROVE_LOCKING is not set
1743# CONFIG_LOCK_STAT is not set
1506# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1744# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1745# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1507# CONFIG_DEBUG_KOBJECT is not set 1746# CONFIG_DEBUG_KOBJECT is not set
1508CONFIG_DEBUG_BUGVERBOSE=y 1747CONFIG_DEBUG_BUGVERBOSE=y
1509# CONFIG_DEBUG_INFO is not set 1748# CONFIG_DEBUG_INFO is not set
1510# CONFIG_DEBUG_FS is not set
1511# CONFIG_DEBUG_VM is not set 1749# CONFIG_DEBUG_VM is not set
1750# CONFIG_DEBUG_WRITECOUNT is not set
1751# CONFIG_DEBUG_MEMORY_INIT is not set
1752# CONFIG_DEBUG_LIST is not set
1753# CONFIG_DEBUG_SG is not set
1512CONFIG_FRAME_POINTER=y 1754CONFIG_FRAME_POINTER=y
1755# CONFIG_BOOT_PRINTK_DELAY is not set
1513# CONFIG_RCU_TORTURE_TEST is not set 1756# CONFIG_RCU_TORTURE_TEST is not set
1757# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1758# CONFIG_BACKTRACE_SELF_TEST is not set
1759# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1760# CONFIG_FAULT_INJECTION is not set
1761# CONFIG_LATENCYTOP is not set
1762# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1763CONFIG_HAVE_FTRACE=y
1764CONFIG_HAVE_DYNAMIC_FTRACE=y
1765# CONFIG_FTRACE is not set
1766# CONFIG_IRQSOFF_TRACER is not set
1767# CONFIG_PREEMPT_TRACER is not set
1768# CONFIG_SCHED_TRACER is not set
1769# CONFIG_CONTEXT_SWITCH_TRACER is not set
1770# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1771# CONFIG_SAMPLES is not set
1772CONFIG_HAVE_ARCH_KGDB=y
1773# CONFIG_KGDB is not set
1514# CONFIG_DEBUG_USER is not set 1774# CONFIG_DEBUG_USER is not set
1515CONFIG_DEBUG_ERRORS=y 1775CONFIG_DEBUG_ERRORS=y
1776# CONFIG_DEBUG_STACK_USAGE is not set
1516CONFIG_DEBUG_LL=y 1777CONFIG_DEBUG_LL=y
1517# CONFIG_DEBUG_ICEDCC is not set 1778# CONFIG_DEBUG_ICEDCC is not set
1518 1779
@@ -1521,46 +1782,113 @@ CONFIG_DEBUG_LL=y
1521# 1782#
1522# CONFIG_KEYS is not set 1783# CONFIG_KEYS is not set
1523# CONFIG_SECURITY is not set 1784# CONFIG_SECURITY is not set
1785# CONFIG_SECURITYFS is not set
1786# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1787CONFIG_CRYPTO=y
1524 1788
1525# 1789#
1526# Cryptographic options 1790# Crypto core or helper
1527# 1791#
1528CONFIG_CRYPTO=y 1792# CONFIG_CRYPTO_FIPS is not set
1529CONFIG_CRYPTO_HMAC=y 1793CONFIG_CRYPTO_ALGAPI=y
1794CONFIG_CRYPTO_AEAD=y
1795CONFIG_CRYPTO_BLKCIPHER=y
1796CONFIG_CRYPTO_HASH=y
1797CONFIG_CRYPTO_RNG=y
1798CONFIG_CRYPTO_MANAGER=y
1799# CONFIG_CRYPTO_GF128MUL is not set
1530CONFIG_CRYPTO_NULL=m 1800CONFIG_CRYPTO_NULL=m
1801# CONFIG_CRYPTO_CRYPTD is not set
1802CONFIG_CRYPTO_AUTHENC=m
1803CONFIG_CRYPTO_TEST=m
1804
1805#
1806# Authenticated Encryption with Associated Data
1807#
1808# CONFIG_CRYPTO_CCM is not set
1809# CONFIG_CRYPTO_GCM is not set
1810# CONFIG_CRYPTO_SEQIV is not set
1811
1812#
1813# Block modes
1814#
1815CONFIG_CRYPTO_CBC=m
1816# CONFIG_CRYPTO_CTR is not set
1817# CONFIG_CRYPTO_CTS is not set
1818CONFIG_CRYPTO_ECB=m
1819# CONFIG_CRYPTO_LRW is not set
1820# CONFIG_CRYPTO_PCBC is not set
1821# CONFIG_CRYPTO_XTS is not set
1822
1823#
1824# Hash modes
1825#
1826CONFIG_CRYPTO_HMAC=y
1827# CONFIG_CRYPTO_XCBC is not set
1828
1829#
1830# Digest
1831#
1832CONFIG_CRYPTO_CRC32C=m
1531CONFIG_CRYPTO_MD4=m 1833CONFIG_CRYPTO_MD4=m
1532CONFIG_CRYPTO_MD5=m 1834CONFIG_CRYPTO_MD5=m
1835CONFIG_CRYPTO_MICHAEL_MIC=m
1836# CONFIG_CRYPTO_RMD128 is not set
1837# CONFIG_CRYPTO_RMD160 is not set
1838# CONFIG_CRYPTO_RMD256 is not set
1839# CONFIG_CRYPTO_RMD320 is not set
1533CONFIG_CRYPTO_SHA1=m 1840CONFIG_CRYPTO_SHA1=m
1534CONFIG_CRYPTO_SHA256=m 1841CONFIG_CRYPTO_SHA256=m
1535CONFIG_CRYPTO_SHA512=m 1842CONFIG_CRYPTO_SHA512=m
1536CONFIG_CRYPTO_WP512=m
1537# CONFIG_CRYPTO_TGR192 is not set 1843# CONFIG_CRYPTO_TGR192 is not set
1538CONFIG_CRYPTO_DES=m 1844CONFIG_CRYPTO_WP512=m
1539CONFIG_CRYPTO_BLOWFISH=m 1845
1540CONFIG_CRYPTO_TWOFISH=m 1846#
1541CONFIG_CRYPTO_SERPENT=m 1847# Ciphers
1848#
1542CONFIG_CRYPTO_AES=m 1849CONFIG_CRYPTO_AES=m
1850CONFIG_CRYPTO_ANUBIS=m
1851CONFIG_CRYPTO_ARC4=m
1852CONFIG_CRYPTO_BLOWFISH=m
1853# CONFIG_CRYPTO_CAMELLIA is not set
1543CONFIG_CRYPTO_CAST5=m 1854CONFIG_CRYPTO_CAST5=m
1544CONFIG_CRYPTO_CAST6=m 1855CONFIG_CRYPTO_CAST6=m
1545CONFIG_CRYPTO_TEA=m 1856CONFIG_CRYPTO_DES=m
1546CONFIG_CRYPTO_ARC4=m 1857# CONFIG_CRYPTO_FCRYPT is not set
1547CONFIG_CRYPTO_KHAZAD=m 1858CONFIG_CRYPTO_KHAZAD=m
1548CONFIG_CRYPTO_ANUBIS=m 1859# CONFIG_CRYPTO_SALSA20 is not set
1860# CONFIG_CRYPTO_SEED is not set
1861CONFIG_CRYPTO_SERPENT=m
1862CONFIG_CRYPTO_TEA=m
1863CONFIG_CRYPTO_TWOFISH=m
1864CONFIG_CRYPTO_TWOFISH_COMMON=m
1865
1866#
1867# Compression
1868#
1549CONFIG_CRYPTO_DEFLATE=m 1869CONFIG_CRYPTO_DEFLATE=m
1550CONFIG_CRYPTO_MICHAEL_MIC=m 1870# CONFIG_CRYPTO_LZO is not set
1551CONFIG_CRYPTO_CRC32C=m
1552CONFIG_CRYPTO_TEST=m
1553 1871
1554# 1872#
1555# Hardware crypto devices 1873# Random Number Generation
1556# 1874#
1875# CONFIG_CRYPTO_ANSI_CPRNG is not set
1876CONFIG_CRYPTO_HW=y
1557 1877
1558# 1878#
1559# Library routines 1879# Library routines
1560# 1880#
1881CONFIG_BITREVERSE=y
1561CONFIG_CRC_CCITT=y 1882CONFIG_CRC_CCITT=y
1562# CONFIG_CRC16 is not set 1883# CONFIG_CRC16 is not set
1884# CONFIG_CRC_T10DIF is not set
1885# CONFIG_CRC_ITU_T is not set
1563CONFIG_CRC32=y 1886CONFIG_CRC32=y
1887# CONFIG_CRC7 is not set
1564CONFIG_LIBCRC32C=m 1888CONFIG_LIBCRC32C=m
1565CONFIG_ZLIB_INFLATE=y 1889CONFIG_ZLIB_INFLATE=y
1566CONFIG_ZLIB_DEFLATE=y 1890CONFIG_ZLIB_DEFLATE=y
1891CONFIG_PLIST=y
1892CONFIG_HAS_IOMEM=y
1893CONFIG_HAS_IOPORT=y
1894CONFIG_HAS_DMA=y
diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
index ae4c5e62086a..3b4ecf2a90dd 100644
--- a/arch/arm/configs/msm_defconfig
+++ b/arch/arm/configs/msm_defconfig
@@ -133,7 +133,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133# CONFIG_ARCH_LH7A40X is not set 133# CONFIG_ARCH_LH7A40X is not set
134# CONFIG_ARCH_DAVINCI is not set 134# CONFIG_ARCH_DAVINCI is not set
135# CONFIG_ARCH_OMAP is not set 135# CONFIG_ARCH_OMAP is not set
136CONFIG_ARCH_MSM7X00A=y 136CONFIG_ARCH_MSM=y
137 137
138# 138#
139# Boot options 139# Boot options
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig
index 7d59fb1f1cea..4df5b4db2aa0 100644
--- a/arch/arm/configs/spitz_defconfig
+++ b/arch/arm/configs/spitz_defconfig
@@ -1,71 +1,111 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.27
4# Mon Nov 28 10:26:52 2005 4# Mon Oct 20 10:25:37 2008
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
8CONFIG_GENERIC_GPIO=y
9CONFIG_GENERIC_TIME=y
10CONFIG_GENERIC_CLOCKEVENTS=y
7CONFIG_MMU=y 11CONFIG_MMU=y
8CONFIG_UID16=y 12# CONFIG_NO_IOPORT is not set
13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_STACKTRACE_SUPPORT=y
15CONFIG_HAVE_LATENCYTOP_SUPPORT=y
16CONFIG_LOCKDEP_SUPPORT=y
17CONFIG_TRACE_IRQFLAGS_SUPPORT=y
18CONFIG_HARDIRQS_SW_RESEND=y
19CONFIG_GENERIC_IRQ_PROBE=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 20CONFIG_RWSEM_GENERIC_SPINLOCK=y
21# CONFIG_ARCH_HAS_ILOG2_U32 is not set
22# CONFIG_ARCH_HAS_ILOG2_U64 is not set
23CONFIG_GENERIC_HWEIGHT=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 24CONFIG_GENERIC_CALIBRATE_DELAY=y
25CONFIG_ARCH_MTD_XIP=y
26CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
27CONFIG_VECTORS_BASE=0xffff0000
28CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 29
12# 30#
13# Code maturity level options 31# General setup
14# 32#
15CONFIG_EXPERIMENTAL=y 33CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 34CONFIG_BROKEN_ON_SMP=y
18CONFIG_LOCK_KERNEL=y 35CONFIG_LOCK_KERNEL=y
19CONFIG_INIT_ENV_ARG_LIMIT=32 36CONFIG_INIT_ENV_ARG_LIMIT=32
20
21#
22# General setup
23#
24CONFIG_LOCALVERSION="" 37CONFIG_LOCALVERSION=""
25CONFIG_LOCALVERSION_AUTO=y 38CONFIG_LOCALVERSION_AUTO=y
26CONFIG_SWAP=y 39CONFIG_SWAP=y
27CONFIG_SYSVIPC=y 40CONFIG_SYSVIPC=y
41CONFIG_SYSVIPC_SYSCTL=y
28# CONFIG_POSIX_MQUEUE is not set 42# CONFIG_POSIX_MQUEUE is not set
29CONFIG_BSD_PROCESS_ACCT=y 43CONFIG_BSD_PROCESS_ACCT=y
30# CONFIG_BSD_PROCESS_ACCT_V3 is not set 44# CONFIG_BSD_PROCESS_ACCT_V3 is not set
31CONFIG_SYSCTL=y 45# CONFIG_TASKSTATS is not set
32# CONFIG_AUDIT is not set 46# CONFIG_AUDIT is not set
33CONFIG_HOTPLUG=y
34CONFIG_KOBJECT_UEVENT=y
35# CONFIG_IKCONFIG is not set 47# CONFIG_IKCONFIG is not set
36CONFIG_INITRAMFS_SOURCE="" 48CONFIG_LOG_BUF_SHIFT=14
49# CONFIG_CGROUPS is not set
50# CONFIG_GROUP_SCHED is not set
51CONFIG_SYSFS_DEPRECATED=y
52CONFIG_SYSFS_DEPRECATED_V2=y
53# CONFIG_RELAY is not set
54# CONFIG_NAMESPACES is not set
55# CONFIG_BLK_DEV_INITRD is not set
56# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
57CONFIG_SYSCTL=y
37CONFIG_EMBEDDED=y 58CONFIG_EMBEDDED=y
59CONFIG_UID16=y
60CONFIG_SYSCTL_SYSCALL=y
38CONFIG_KALLSYMS=y 61CONFIG_KALLSYMS=y
39# CONFIG_KALLSYMS_ALL is not set 62# CONFIG_KALLSYMS_ALL is not set
40# CONFIG_KALLSYMS_EXTRA_PASS is not set 63# CONFIG_KALLSYMS_EXTRA_PASS is not set
64CONFIG_HOTPLUG=y
41CONFIG_PRINTK=y 65CONFIG_PRINTK=y
42CONFIG_BUG=y 66CONFIG_BUG=y
67CONFIG_ELF_CORE=y
68CONFIG_COMPAT_BRK=y
43CONFIG_BASE_FULL=y 69CONFIG_BASE_FULL=y
44CONFIG_FUTEX=y 70CONFIG_FUTEX=y
71CONFIG_ANON_INODES=y
45CONFIG_EPOLL=y 72CONFIG_EPOLL=y
46# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 73CONFIG_SIGNALFD=y
74CONFIG_TIMERFD=y
75CONFIG_EVENTFD=y
47CONFIG_SHMEM=y 76CONFIG_SHMEM=y
48CONFIG_CC_ALIGN_FUNCTIONS=0 77CONFIG_AIO=y
49CONFIG_CC_ALIGN_LABELS=0 78CONFIG_VM_EVENT_COUNTERS=y
50CONFIG_CC_ALIGN_LOOPS=0 79CONFIG_SLUB_DEBUG=y
51CONFIG_CC_ALIGN_JUMPS=0 80# CONFIG_SLAB is not set
81CONFIG_SLUB=y
82# CONFIG_SLOB is not set
83CONFIG_PROFILING=y
84# CONFIG_MARKERS is not set
85CONFIG_OPROFILE=m
86CONFIG_HAVE_OPROFILE=y
87# CONFIG_KPROBES is not set
88CONFIG_HAVE_KPROBES=y
89CONFIG_HAVE_KRETPROBES=y
90CONFIG_HAVE_CLK=y
91CONFIG_HAVE_GENERIC_DMA_COHERENT=y
92CONFIG_SLABINFO=y
93CONFIG_RT_MUTEXES=y
52# CONFIG_TINY_SHMEM is not set 94# CONFIG_TINY_SHMEM is not set
53CONFIG_BASE_SMALL=0 95CONFIG_BASE_SMALL=0
54
55#
56# Loadable module support
57#
58CONFIG_MODULES=y 96CONFIG_MODULES=y
97# CONFIG_MODULE_FORCE_LOAD is not set
59CONFIG_MODULE_UNLOAD=y 98CONFIG_MODULE_UNLOAD=y
60CONFIG_MODULE_FORCE_UNLOAD=y 99CONFIG_MODULE_FORCE_UNLOAD=y
61CONFIG_OBSOLETE_MODPARM=y
62# CONFIG_MODVERSIONS is not set 100# CONFIG_MODVERSIONS is not set
63# CONFIG_MODULE_SRCVERSION_ALL is not set 101# CONFIG_MODULE_SRCVERSION_ALL is not set
64CONFIG_KMOD=y 102CONFIG_KMOD=y
65 103CONFIG_BLOCK=y
66# 104# CONFIG_LBD is not set
67# Block layer 105# CONFIG_BLK_DEV_IO_TRACE is not set
68# 106# CONFIG_LSF is not set
107# CONFIG_BLK_DEV_BSG is not set
108# CONFIG_BLK_DEV_INTEGRITY is not set
69 109
70# 110#
71# IO Schedulers 111# IO Schedulers
@@ -79,49 +119,95 @@ CONFIG_DEFAULT_AS=y
79# CONFIG_DEFAULT_CFQ is not set 119# CONFIG_DEFAULT_CFQ is not set
80# CONFIG_DEFAULT_NOOP is not set 120# CONFIG_DEFAULT_NOOP is not set
81CONFIG_DEFAULT_IOSCHED="anticipatory" 121CONFIG_DEFAULT_IOSCHED="anticipatory"
122CONFIG_CLASSIC_RCU=y
82 123
83# 124#
84# System Type 125# System Type
85# 126#
127# CONFIG_ARCH_AAEC2000 is not set
128# CONFIG_ARCH_INTEGRATOR is not set
129# CONFIG_ARCH_REALVIEW is not set
130# CONFIG_ARCH_VERSATILE is not set
131# CONFIG_ARCH_AT91 is not set
86# CONFIG_ARCH_CLPS7500 is not set 132# CONFIG_ARCH_CLPS7500 is not set
87# CONFIG_ARCH_CLPS711X is not set 133# CONFIG_ARCH_CLPS711X is not set
88# CONFIG_ARCH_CO285 is not set
89# CONFIG_ARCH_EBSA110 is not set 134# CONFIG_ARCH_EBSA110 is not set
135# CONFIG_ARCH_EP93XX is not set
90# CONFIG_ARCH_FOOTBRIDGE is not set 136# CONFIG_ARCH_FOOTBRIDGE is not set
91# CONFIG_ARCH_INTEGRATOR is not set 137# CONFIG_ARCH_NETX is not set
92# CONFIG_ARCH_IOP3XX is not set 138# CONFIG_ARCH_H720X is not set
93# CONFIG_ARCH_IXP4XX is not set 139# CONFIG_ARCH_IMX is not set
140# CONFIG_ARCH_IOP13XX is not set
141# CONFIG_ARCH_IOP32X is not set
142# CONFIG_ARCH_IOP33X is not set
143# CONFIG_ARCH_IXP23XX is not set
94# CONFIG_ARCH_IXP2000 is not set 144# CONFIG_ARCH_IXP2000 is not set
145# CONFIG_ARCH_IXP4XX is not set
95# CONFIG_ARCH_L7200 is not set 146# CONFIG_ARCH_L7200 is not set
147# CONFIG_ARCH_KIRKWOOD is not set
148# CONFIG_ARCH_KS8695 is not set
149# CONFIG_ARCH_NS9XXX is not set
150# CONFIG_ARCH_LOKI is not set
151# CONFIG_ARCH_MV78XX0 is not set
152# CONFIG_ARCH_MXC is not set
153# CONFIG_ARCH_ORION5X is not set
154# CONFIG_ARCH_PNX4008 is not set
96CONFIG_ARCH_PXA=y 155CONFIG_ARCH_PXA=y
97# CONFIG_ARCH_RPC is not set 156# CONFIG_ARCH_RPC is not set
98# CONFIG_ARCH_SA1100 is not set 157# CONFIG_ARCH_SA1100 is not set
99# CONFIG_ARCH_S3C2410 is not set 158# CONFIG_ARCH_S3C2410 is not set
100# CONFIG_ARCH_SHARK is not set 159# CONFIG_ARCH_SHARK is not set
101# CONFIG_ARCH_LH7A40X is not set 160# CONFIG_ARCH_LH7A40X is not set
161# CONFIG_ARCH_DAVINCI is not set
102# CONFIG_ARCH_OMAP is not set 162# CONFIG_ARCH_OMAP is not set
103# CONFIG_ARCH_VERSATILE is not set 163# CONFIG_ARCH_MSM7X00A is not set
104# CONFIG_ARCH_REALVIEW is not set
105# CONFIG_ARCH_IMX is not set
106# CONFIG_ARCH_H720X is not set
107# CONFIG_ARCH_AAEC2000 is not set
108 164
109# 165#
110# Intel PXA2xx Implementations 166# Intel PXA2xx/PXA3xx Implementations
111# 167#
168# CONFIG_ARCH_GUMSTIX is not set
112# CONFIG_ARCH_LUBBOCK is not set 169# CONFIG_ARCH_LUBBOCK is not set
170# CONFIG_MACH_LOGICPD_PXA270 is not set
113# CONFIG_MACH_MAINSTONE is not set 171# CONFIG_MACH_MAINSTONE is not set
172# CONFIG_MACH_MP900C is not set
114# CONFIG_ARCH_PXA_IDP is not set 173# CONFIG_ARCH_PXA_IDP is not set
115CONFIG_PXA_SHARPSL=y 174CONFIG_PXA_SHARPSL=y
116# CONFIG_PXA_SHARPSL_25x is not set 175# CONFIG_MACH_POODLE is not set
117CONFIG_PXA_SHARPSL_27x=y 176# CONFIG_MACH_CORGI is not set
177# CONFIG_MACH_SHEPHERD is not set
178# CONFIG_MACH_HUSKY is not set
118CONFIG_MACH_AKITA=y 179CONFIG_MACH_AKITA=y
119CONFIG_MACH_SPITZ=y 180CONFIG_MACH_SPITZ=y
120CONFIG_MACH_BORZOI=y 181CONFIG_MACH_BORZOI=y
182# CONFIG_MACH_TOSA is not set
183# CONFIG_ARCH_VIPER is not set
184# CONFIG_ARCH_PXA_ESERIES is not set
185# CONFIG_TRIZEPS_PXA is not set
186# CONFIG_MACH_EM_X270 is not set
187# CONFIG_MACH_COLIBRI is not set
188# CONFIG_MACH_ZYLONITE is not set
189# CONFIG_MACH_LITTLETON is not set
190# CONFIG_MACH_TAVOREVB is not set
191# CONFIG_MACH_SAAR is not set
192# CONFIG_MACH_ARMCORE is not set
193# CONFIG_MACH_CM_X300 is not set
194# CONFIG_MACH_MAGICIAN is not set
195# CONFIG_MACH_MIOA701 is not set
196# CONFIG_MACH_PCM027 is not set
197# CONFIG_ARCH_PXA_PALM is not set
198# CONFIG_PXA_EZX is not set
121CONFIG_PXA27x=y 199CONFIG_PXA27x=y
122CONFIG_IWMMXT=y
123CONFIG_PXA_SHARP_Cxx00=y 200CONFIG_PXA_SHARP_Cxx00=y
124CONFIG_PXA_SSP=y 201CONFIG_PXA_SSP=y
202# CONFIG_PXA_PWM is not set
203
204#
205# Boot options
206#
207
208#
209# Power management
210#
125 211
126# 212#
127# Processor Type 213# Processor Type
@@ -130,25 +216,29 @@ CONFIG_CPU_32=y
130CONFIG_CPU_XSCALE=y 216CONFIG_CPU_XSCALE=y
131CONFIG_CPU_32v5=y 217CONFIG_CPU_32v5=y
132CONFIG_CPU_ABRT_EV5T=y 218CONFIG_CPU_ABRT_EV5T=y
219CONFIG_CPU_PABRT_NOIFAR=y
133CONFIG_CPU_CACHE_VIVT=y 220CONFIG_CPU_CACHE_VIVT=y
134CONFIG_CPU_TLB_V4WBI=y 221CONFIG_CPU_TLB_V4WBI=y
222CONFIG_CPU_CP15=y
223CONFIG_CPU_CP15_MMU=y
135 224
136# 225#
137# Processor Features 226# Processor Features
138# 227#
139CONFIG_ARM_THUMB=y 228CONFIG_ARM_THUMB=y
229# CONFIG_CPU_DCACHE_DISABLE is not set
230# CONFIG_OUTER_CACHE is not set
231CONFIG_IWMMXT=y
140CONFIG_XSCALE_PMU=y 232CONFIG_XSCALE_PMU=y
141CONFIG_SHARP_PARAM=y 233CONFIG_SHARP_PARAM=y
234CONFIG_SHARPSL_PM=y
142CONFIG_SHARP_SCOOP=y 235CONFIG_SHARP_SCOOP=y
143 236
144# 237#
145# Bus support 238# Bus support
146# 239#
147CONFIG_ISA_DMA_API=y 240# CONFIG_PCI_SYSCALL is not set
148 241# CONFIG_ARCH_SUPPORTS_MSI is not set
149#
150# PCCARD (PCMCIA/CardBus) support
151#
152CONFIG_PCCARD=y 242CONFIG_PCCARD=y
153# CONFIG_PCMCIA_DEBUG is not set 243# CONFIG_PCMCIA_DEBUG is not set
154CONFIG_PCMCIA=y 244CONFIG_PCMCIA=y
@@ -163,16 +253,32 @@ CONFIG_PCMCIA_PXA2XX=y
163# 253#
164# Kernel Features 254# Kernel Features
165# 255#
256CONFIG_TICK_ONESHOT=y
257# CONFIG_NO_HZ is not set
258# CONFIG_HIGH_RES_TIMERS is not set
259CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
260CONFIG_VMSPLIT_3G=y
261# CONFIG_VMSPLIT_2G is not set
262# CONFIG_VMSPLIT_1G is not set
263CONFIG_PAGE_OFFSET=0xC0000000
166CONFIG_PREEMPT=y 264CONFIG_PREEMPT=y
167# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 265CONFIG_HZ=100
266# CONFIG_AEABI is not set
267CONFIG_ARCH_FLATMEM_HAS_HOLES=y
268# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
269# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
168CONFIG_SELECT_MEMORY_MODEL=y 270CONFIG_SELECT_MEMORY_MODEL=y
169CONFIG_FLATMEM_MANUAL=y 271CONFIG_FLATMEM_MANUAL=y
170# CONFIG_DISCONTIGMEM_MANUAL is not set 272# CONFIG_DISCONTIGMEM_MANUAL is not set
171# CONFIG_SPARSEMEM_MANUAL is not set 273# CONFIG_SPARSEMEM_MANUAL is not set
172CONFIG_FLATMEM=y 274CONFIG_FLATMEM=y
173CONFIG_FLAT_NODE_MEM_MAP=y 275CONFIG_FLAT_NODE_MEM_MAP=y
174# CONFIG_SPARSEMEM_STATIC is not set 276CONFIG_PAGEFLAGS_EXTENDED=y
175CONFIG_SPLIT_PTLOCK_CPUS=4096 277CONFIG_SPLIT_PTLOCK_CPUS=4096
278# CONFIG_RESOURCES_64BIT is not set
279# CONFIG_PHYS_ADDR_T_64BIT is not set
280CONFIG_ZONE_DMA_FLAG=0
281CONFIG_VIRT_TO_BUS=y
176CONFIG_ALIGNMENT_TRAP=y 282CONFIG_ALIGNMENT_TRAP=y
177 283
178# 284#
@@ -182,6 +288,13 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
182CONFIG_ZBOOT_ROM_BSS=0x0 288CONFIG_ZBOOT_ROM_BSS=0x0
183CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" 289CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug"
184# CONFIG_XIP_KERNEL is not set 290# CONFIG_XIP_KERNEL is not set
291# CONFIG_KEXEC is not set
292
293#
294# CPU Power Management
295#
296# CONFIG_CPU_FREQ is not set
297# CONFIG_CPU_IDLE is not set
185 298
186# 299#
187# Floating point emulation 300# Floating point emulation
@@ -198,6 +311,7 @@ CONFIG_FPE_NWFPE=y
198# Userspace binary formats 311# Userspace binary formats
199# 312#
200CONFIG_BINFMT_ELF=y 313CONFIG_BINFMT_ELF=y
314CONFIG_HAVE_AOUT=y
201CONFIG_BINFMT_AOUT=m 315CONFIG_BINFMT_AOUT=m
202CONFIG_BINFMT_MISC=m 316CONFIG_BINFMT_MISC=m
203# CONFIG_ARTHUR is not set 317# CONFIG_ARTHUR is not set
@@ -206,12 +320,12 @@ CONFIG_BINFMT_MISC=m
206# Power management options 320# Power management options
207# 321#
208CONFIG_PM=y 322CONFIG_PM=y
209# CONFIG_PM_LEGACY is not set 323# CONFIG_PM_DEBUG is not set
210CONFIG_APM=y 324CONFIG_PM_SLEEP=y
211 325CONFIG_SUSPEND=y
212# 326CONFIG_SUSPEND_FREEZER=y
213# Networking 327CONFIG_APM_EMULATION=y
214# 328CONFIG_ARCH_SUSPEND_POSSIBLE=y
215CONFIG_NET=y 329CONFIG_NET=y
216 330
217# 331#
@@ -222,6 +336,10 @@ CONFIG_PACKET_MMAP=y
222CONFIG_UNIX=y 336CONFIG_UNIX=y
223CONFIG_XFRM=y 337CONFIG_XFRM=y
224# CONFIG_XFRM_USER is not set 338# CONFIG_XFRM_USER is not set
339# CONFIG_XFRM_SUB_POLICY is not set
340# CONFIG_XFRM_MIGRATE is not set
341# CONFIG_XFRM_STATISTICS is not set
342CONFIG_XFRM_IPCOMP=m
225# CONFIG_NET_KEY is not set 343# CONFIG_NET_KEY is not set
226CONFIG_INET=y 344CONFIG_INET=y
227# CONFIG_IP_MULTICAST is not set 345# CONFIG_IP_MULTICAST is not set
@@ -235,140 +353,131 @@ CONFIG_SYN_COOKIES=y
235# CONFIG_INET_AH is not set 353# CONFIG_INET_AH is not set
236# CONFIG_INET_ESP is not set 354# CONFIG_INET_ESP is not set
237# CONFIG_INET_IPCOMP is not set 355# CONFIG_INET_IPCOMP is not set
238# CONFIG_INET_TUNNEL is not set 356# CONFIG_INET_XFRM_TUNNEL is not set
357CONFIG_INET_TUNNEL=m
358CONFIG_INET_XFRM_MODE_TRANSPORT=y
359CONFIG_INET_XFRM_MODE_TUNNEL=y
360CONFIG_INET_XFRM_MODE_BEET=y
361# CONFIG_INET_LRO is not set
239CONFIG_INET_DIAG=y 362CONFIG_INET_DIAG=y
240CONFIG_INET_TCP_DIAG=y 363CONFIG_INET_TCP_DIAG=y
241# CONFIG_TCP_CONG_ADVANCED is not set 364# CONFIG_TCP_CONG_ADVANCED is not set
242CONFIG_TCP_CONG_BIC=y 365CONFIG_TCP_CONG_CUBIC=y
243 366CONFIG_DEFAULT_TCP_CONG="cubic"
244# 367# CONFIG_TCP_MD5SIG is not set
245# IP: Virtual Server Configuration
246#
247# CONFIG_IP_VS is not set
248CONFIG_IPV6=m 368CONFIG_IPV6=m
249# CONFIG_IPV6_PRIVACY is not set 369# CONFIG_IPV6_PRIVACY is not set
370# CONFIG_IPV6_ROUTER_PREF is not set
371# CONFIG_IPV6_OPTIMISTIC_DAD is not set
250CONFIG_INET6_AH=m 372CONFIG_INET6_AH=m
251CONFIG_INET6_ESP=m 373CONFIG_INET6_ESP=m
252CONFIG_INET6_IPCOMP=m 374CONFIG_INET6_IPCOMP=m
375# CONFIG_IPV6_MIP6 is not set
376CONFIG_INET6_XFRM_TUNNEL=m
253CONFIG_INET6_TUNNEL=m 377CONFIG_INET6_TUNNEL=m
378CONFIG_INET6_XFRM_MODE_TRANSPORT=m
379CONFIG_INET6_XFRM_MODE_TUNNEL=m
380CONFIG_INET6_XFRM_MODE_BEET=m
381# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
382CONFIG_IPV6_SIT=m
383CONFIG_IPV6_NDISC_NODETYPE=y
254CONFIG_IPV6_TUNNEL=m 384CONFIG_IPV6_TUNNEL=m
385# CONFIG_IPV6_MULTIPLE_TABLES is not set
386# CONFIG_IPV6_MROUTE is not set
387# CONFIG_NETWORK_SECMARK is not set
255CONFIG_NETFILTER=y 388CONFIG_NETFILTER=y
256# CONFIG_NETFILTER_DEBUG is not set 389# CONFIG_NETFILTER_DEBUG is not set
390CONFIG_NETFILTER_ADVANCED=y
257 391
258# 392#
259# Core Netfilter Configuration 393# Core Netfilter Configuration
260# 394#
261# CONFIG_NETFILTER_NETLINK is not set 395# CONFIG_NETFILTER_NETLINK_QUEUE is not set
396# CONFIG_NETFILTER_NETLINK_LOG is not set
397# CONFIG_NF_CONNTRACK is not set
398CONFIG_NETFILTER_XTABLES=m
399# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
400# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
401# CONFIG_NETFILTER_XT_TARGET_MARK is not set
402# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
403# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
404# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
405# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
406# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
407# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
408# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
409# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
410# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
411# CONFIG_NETFILTER_XT_MATCH_ESP is not set
412# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
413# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
414# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
415# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
416# CONFIG_NETFILTER_XT_MATCH_MAC is not set
417# CONFIG_NETFILTER_XT_MATCH_MARK is not set
418# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
419# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
420# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
421# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
422# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
423# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
424# CONFIG_NETFILTER_XT_MATCH_REALM is not set
425# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
426# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
427# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
428# CONFIG_NETFILTER_XT_MATCH_STRING is not set
429# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
430# CONFIG_NETFILTER_XT_MATCH_TIME is not set
431# CONFIG_NETFILTER_XT_MATCH_U32 is not set
432# CONFIG_IP_VS is not set
262 433
263# 434#
264# IP: Netfilter Configuration 435# IP: Netfilter Configuration
265# 436#
266CONFIG_IP_NF_CONNTRACK=m 437# CONFIG_NF_DEFRAG_IPV4 is not set
267# CONFIG_IP_NF_CT_ACCT is not set
268# CONFIG_IP_NF_CONNTRACK_MARK is not set
269# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
270CONFIG_IP_NF_CT_PROTO_SCTP=m
271CONFIG_IP_NF_FTP=m
272CONFIG_IP_NF_IRC=m
273# CONFIG_IP_NF_NETBIOS_NS is not set
274CONFIG_IP_NF_TFTP=m
275CONFIG_IP_NF_AMANDA=m
276# CONFIG_IP_NF_PPTP is not set
277CONFIG_IP_NF_QUEUE=m 438CONFIG_IP_NF_QUEUE=m
278CONFIG_IP_NF_IPTABLES=m 439CONFIG_IP_NF_IPTABLES=m
279CONFIG_IP_NF_MATCH_LIMIT=m 440CONFIG_IP_NF_MATCH_ADDRTYPE=m
280CONFIG_IP_NF_MATCH_IPRANGE=m 441# CONFIG_IP_NF_MATCH_AH is not set
281CONFIG_IP_NF_MATCH_MAC=m
282CONFIG_IP_NF_MATCH_PKTTYPE=m
283CONFIG_IP_NF_MATCH_MARK=m
284CONFIG_IP_NF_MATCH_MULTIPORT=m
285CONFIG_IP_NF_MATCH_TOS=m
286CONFIG_IP_NF_MATCH_RECENT=m
287CONFIG_IP_NF_MATCH_ECN=m 442CONFIG_IP_NF_MATCH_ECN=m
288CONFIG_IP_NF_MATCH_DSCP=m
289CONFIG_IP_NF_MATCH_AH_ESP=m
290CONFIG_IP_NF_MATCH_LENGTH=m
291CONFIG_IP_NF_MATCH_TTL=m 443CONFIG_IP_NF_MATCH_TTL=m
292CONFIG_IP_NF_MATCH_TCPMSS=m
293CONFIG_IP_NF_MATCH_HELPER=m
294CONFIG_IP_NF_MATCH_STATE=m
295CONFIG_IP_NF_MATCH_CONNTRACK=m
296CONFIG_IP_NF_MATCH_OWNER=m
297CONFIG_IP_NF_MATCH_ADDRTYPE=m
298CONFIG_IP_NF_MATCH_REALM=m
299CONFIG_IP_NF_MATCH_SCTP=m
300# CONFIG_IP_NF_MATCH_DCCP is not set
301CONFIG_IP_NF_MATCH_COMMENT=m
302CONFIG_IP_NF_MATCH_HASHLIMIT=m
303# CONFIG_IP_NF_MATCH_STRING is not set
304CONFIG_IP_NF_FILTER=m 444CONFIG_IP_NF_FILTER=m
305# CONFIG_IP_NF_TARGET_REJECT is not set 445# CONFIG_IP_NF_TARGET_REJECT is not set
306CONFIG_IP_NF_TARGET_LOG=m 446CONFIG_IP_NF_TARGET_LOG=m
307CONFIG_IP_NF_TARGET_ULOG=m 447CONFIG_IP_NF_TARGET_ULOG=m
308CONFIG_IP_NF_TARGET_TCPMSS=m
309# CONFIG_IP_NF_TARGET_NFQUEUE is not set
310CONFIG_IP_NF_NAT=m
311CONFIG_IP_NF_NAT_NEEDED=y
312# CONFIG_IP_NF_TARGET_MASQUERADE is not set
313# CONFIG_IP_NF_TARGET_REDIRECT is not set
314# CONFIG_IP_NF_TARGET_NETMAP is not set
315# CONFIG_IP_NF_TARGET_SAME is not set
316# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
317CONFIG_IP_NF_NAT_IRC=m
318CONFIG_IP_NF_NAT_FTP=m
319CONFIG_IP_NF_NAT_TFTP=m
320CONFIG_IP_NF_NAT_AMANDA=m
321CONFIG_IP_NF_MANGLE=m 448CONFIG_IP_NF_MANGLE=m
322# CONFIG_IP_NF_TARGET_TOS is not set
323# CONFIG_IP_NF_TARGET_ECN is not set 449# CONFIG_IP_NF_TARGET_ECN is not set
324# CONFIG_IP_NF_TARGET_DSCP is not set
325# CONFIG_IP_NF_TARGET_MARK is not set
326# CONFIG_IP_NF_TARGET_CLASSIFY is not set
327# CONFIG_IP_NF_TARGET_TTL is not set 450# CONFIG_IP_NF_TARGET_TTL is not set
328CONFIG_IP_NF_RAW=m 451CONFIG_IP_NF_RAW=m
329# CONFIG_IP_NF_TARGET_NOTRACK is not set
330CONFIG_IP_NF_ARPTABLES=m 452CONFIG_IP_NF_ARPTABLES=m
331CONFIG_IP_NF_ARPFILTER=m 453CONFIG_IP_NF_ARPFILTER=m
332CONFIG_IP_NF_ARP_MANGLE=m 454CONFIG_IP_NF_ARP_MANGLE=m
333 455
334# 456#
335# IPv6: Netfilter Configuration (EXPERIMENTAL) 457# IPv6: Netfilter Configuration
336# 458#
337CONFIG_IP6_NF_QUEUE=m 459CONFIG_IP6_NF_QUEUE=m
338CONFIG_IP6_NF_IPTABLES=m 460CONFIG_IP6_NF_IPTABLES=m
339CONFIG_IP6_NF_MATCH_LIMIT=m 461# CONFIG_IP6_NF_MATCH_AH is not set
340CONFIG_IP6_NF_MATCH_MAC=m 462CONFIG_IP6_NF_MATCH_EUI64=m
341CONFIG_IP6_NF_MATCH_RT=m
342CONFIG_IP6_NF_MATCH_OPTS=m
343CONFIG_IP6_NF_MATCH_FRAG=m 463CONFIG_IP6_NF_MATCH_FRAG=m
464CONFIG_IP6_NF_MATCH_OPTS=m
344CONFIG_IP6_NF_MATCH_HL=m 465CONFIG_IP6_NF_MATCH_HL=m
345CONFIG_IP6_NF_MATCH_MULTIPORT=m
346CONFIG_IP6_NF_MATCH_OWNER=m
347CONFIG_IP6_NF_MATCH_MARK=m
348CONFIG_IP6_NF_MATCH_IPV6HEADER=m 466CONFIG_IP6_NF_MATCH_IPV6HEADER=m
349CONFIG_IP6_NF_MATCH_AHESP=m 467# CONFIG_IP6_NF_MATCH_MH is not set
350CONFIG_IP6_NF_MATCH_LENGTH=m 468CONFIG_IP6_NF_MATCH_RT=m
351CONFIG_IP6_NF_MATCH_EUI64=m
352CONFIG_IP6_NF_FILTER=m
353# CONFIG_IP6_NF_TARGET_LOG is not set 469# CONFIG_IP6_NF_TARGET_LOG is not set
470CONFIG_IP6_NF_FILTER=m
354# CONFIG_IP6_NF_TARGET_REJECT is not set 471# CONFIG_IP6_NF_TARGET_REJECT is not set
355# CONFIG_IP6_NF_TARGET_NFQUEUE is not set
356CONFIG_IP6_NF_MANGLE=m 472CONFIG_IP6_NF_MANGLE=m
357# CONFIG_IP6_NF_TARGET_MARK is not set
358# CONFIG_IP6_NF_TARGET_HL is not set 473# CONFIG_IP6_NF_TARGET_HL is not set
359CONFIG_IP6_NF_RAW=m 474CONFIG_IP6_NF_RAW=m
360
361#
362# DCCP Configuration (EXPERIMENTAL)
363#
364# CONFIG_IP_DCCP is not set 475# CONFIG_IP_DCCP is not set
365
366#
367# SCTP Configuration (EXPERIMENTAL)
368#
369# CONFIG_IP_SCTP is not set 476# CONFIG_IP_SCTP is not set
477# CONFIG_TIPC is not set
370# CONFIG_ATM is not set 478# CONFIG_ATM is not set
371# CONFIG_BRIDGE is not set 479# CONFIG_BRIDGE is not set
480# CONFIG_NET_DSA is not set
372# CONFIG_VLAN_8021Q is not set 481# CONFIG_VLAN_8021Q is not set
373# CONFIG_DECNET is not set 482# CONFIG_DECNET is not set
374# CONFIG_LLC2 is not set 483# CONFIG_LLC2 is not set
@@ -376,21 +485,16 @@ CONFIG_IP6_NF_RAW=m
376# CONFIG_ATALK is not set 485# CONFIG_ATALK is not set
377# CONFIG_X25 is not set 486# CONFIG_X25 is not set
378# CONFIG_LAPB is not set 487# CONFIG_LAPB is not set
379# CONFIG_NET_DIVERT is not set
380# CONFIG_ECONET is not set 488# CONFIG_ECONET is not set
381# CONFIG_WAN_ROUTER is not set 489# CONFIG_WAN_ROUTER is not set
382
383#
384# QoS and/or fair queueing
385#
386# CONFIG_NET_SCHED is not set 490# CONFIG_NET_SCHED is not set
387CONFIG_NET_CLS_ROUTE=y
388 491
389# 492#
390# Network testing 493# Network testing
391# 494#
392# CONFIG_NET_PKTGEN is not set 495# CONFIG_NET_PKTGEN is not set
393# CONFIG_HAMRADIO is not set 496# CONFIG_HAMRADIO is not set
497# CONFIG_CAN is not set
394CONFIG_IRDA=m 498CONFIG_IRDA=m
395 499
396# 500#
@@ -420,27 +524,17 @@ CONFIG_IRCOMM=m
420# 524#
421# Dongle support 525# Dongle support
422# 526#
423 527# CONFIG_KINGSUN_DONGLE is not set
424# 528# CONFIG_KSDAZZLE_DONGLE is not set
425# Old SIR device drivers 529# CONFIG_KS959_DONGLE is not set
426#
427# CONFIG_IRPORT_SIR is not set
428
429#
430# Old Serial dongle support
431#
432 530
433# 531#
434# FIR device drivers 532# FIR device drivers
435# 533#
436# CONFIG_USB_IRDA is not set 534# CONFIG_USB_IRDA is not set
437# CONFIG_SIGMATEL_FIR is not set 535# CONFIG_SIGMATEL_FIR is not set
438# CONFIG_NSC_FIR is not set
439# CONFIG_WINBOND_FIR is not set
440# CONFIG_SMC_IRCC_FIR is not set
441# CONFIG_ALI_FIR is not set
442# CONFIG_VIA_FIR is not set
443CONFIG_PXA_FICP=m 536CONFIG_PXA_FICP=m
537# CONFIG_MCS_FIR is not set
444CONFIG_BT=m 538CONFIG_BT=m
445CONFIG_BT_L2CAP=m 539CONFIG_BT_L2CAP=m
446CONFIG_BT_SCO=m 540CONFIG_BT_SCO=m
@@ -456,9 +550,12 @@ CONFIG_BT_HIDP=m
456# 550#
457CONFIG_BT_HCIUSB=m 551CONFIG_BT_HCIUSB=m
458# CONFIG_BT_HCIUSB_SCO is not set 552# CONFIG_BT_HCIUSB_SCO is not set
553# CONFIG_BT_HCIBTUSB is not set
554# CONFIG_BT_HCIBTSDIO is not set
459CONFIG_BT_HCIUART=m 555CONFIG_BT_HCIUART=m
460CONFIG_BT_HCIUART_H4=y 556CONFIG_BT_HCIUART_H4=y
461CONFIG_BT_HCIUART_BCSP=y 557CONFIG_BT_HCIUART_BCSP=y
558# CONFIG_BT_HCIUART_LL is not set
462CONFIG_BT_HCIBCM203X=m 559CONFIG_BT_HCIBCM203X=m
463CONFIG_BT_HCIBPA10X=m 560CONFIG_BT_HCIBPA10X=m
464CONFIG_BT_HCIBFUSB=m 561CONFIG_BT_HCIBFUSB=m
@@ -467,11 +564,20 @@ CONFIG_BT_HCIBT3C=m
467CONFIG_BT_HCIBLUECARD=m 564CONFIG_BT_HCIBLUECARD=m
468CONFIG_BT_HCIBTUART=m 565CONFIG_BT_HCIBTUART=m
469CONFIG_BT_HCIVHCI=m 566CONFIG_BT_HCIVHCI=m
567# CONFIG_AF_RXRPC is not set
568# CONFIG_PHONET is not set
569CONFIG_WIRELESS=y
570# CONFIG_CFG80211 is not set
571# CONFIG_WIRELESS_OLD_REGULATORY is not set
572# CONFIG_WIRELESS_EXT is not set
573# CONFIG_MAC80211 is not set
470CONFIG_IEEE80211=m 574CONFIG_IEEE80211=m
471# CONFIG_IEEE80211_DEBUG is not set 575# CONFIG_IEEE80211_DEBUG is not set
472CONFIG_IEEE80211_CRYPT_WEP=m 576CONFIG_IEEE80211_CRYPT_WEP=m
473# CONFIG_IEEE80211_CRYPT_CCMP is not set 577# CONFIG_IEEE80211_CRYPT_CCMP is not set
474# CONFIG_IEEE80211_CRYPT_TKIP is not set 578# CONFIG_IEEE80211_CRYPT_TKIP is not set
579# CONFIG_RFKILL is not set
580# CONFIG_NET_9P is not set
475 581
476# 582#
477# Device Drivers 583# Device Drivers
@@ -480,19 +586,16 @@ CONFIG_IEEE80211_CRYPT_WEP=m
480# 586#
481# Generic Driver Options 587# Generic Driver Options
482# 588#
589CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
483CONFIG_STANDALONE=y 590CONFIG_STANDALONE=y
484CONFIG_PREVENT_FIRMWARE_BUILD=y 591CONFIG_PREVENT_FIRMWARE_BUILD=y
485CONFIG_FW_LOADER=y 592CONFIG_FW_LOADER=y
593CONFIG_FIRMWARE_IN_KERNEL=y
594CONFIG_EXTRA_FIRMWARE=""
486# CONFIG_DEBUG_DRIVER is not set 595# CONFIG_DEBUG_DRIVER is not set
487 596# CONFIG_DEBUG_DEVRES is not set
488# 597# CONFIG_SYS_HYPERVISOR is not set
489# Connector - unified userspace <-> kernelspace linker
490#
491# CONFIG_CONNECTOR is not set 598# CONFIG_CONNECTOR is not set
492
493#
494# Memory Technology Devices (MTD)
495#
496CONFIG_MTD=y 599CONFIG_MTD=y
497# CONFIG_MTD_DEBUG is not set 600# CONFIG_MTD_DEBUG is not set
498# CONFIG_MTD_CONCAT is not set 601# CONFIG_MTD_CONCAT is not set
@@ -500,16 +603,20 @@ CONFIG_MTD_PARTITIONS=y
500# CONFIG_MTD_REDBOOT_PARTS is not set 603# CONFIG_MTD_REDBOOT_PARTS is not set
501CONFIG_MTD_CMDLINE_PARTS=y 604CONFIG_MTD_CMDLINE_PARTS=y
502# CONFIG_MTD_AFS_PARTS is not set 605# CONFIG_MTD_AFS_PARTS is not set
606# CONFIG_MTD_AR7_PARTS is not set
503 607
504# 608#
505# User Modules And Translation Layers 609# User Modules And Translation Layers
506# 610#
507CONFIG_MTD_CHAR=y 611CONFIG_MTD_CHAR=y
612CONFIG_MTD_BLKDEVS=y
508CONFIG_MTD_BLOCK=y 613CONFIG_MTD_BLOCK=y
509# CONFIG_FTL is not set 614# CONFIG_FTL is not set
510# CONFIG_NFTL is not set 615# CONFIG_NFTL is not set
511# CONFIG_INFTL is not set 616# CONFIG_INFTL is not set
512# CONFIG_RFD_FTL is not set 617# CONFIG_RFD_FTL is not set
618# CONFIG_SSFDC is not set
619# CONFIG_MTD_OOPS is not set
513 620
514# 621#
515# RAM/ROM/Flash chip drivers 622# RAM/ROM/Flash chip drivers
@@ -534,16 +641,18 @@ CONFIG_MTD_ROM=y
534# Mapping drivers for chip access 641# Mapping drivers for chip access
535# 642#
536CONFIG_MTD_COMPLEX_MAPPINGS=y 643CONFIG_MTD_COMPLEX_MAPPINGS=y
644# CONFIG_MTD_PHYSMAP is not set
537CONFIG_MTD_SHARP_SL=y 645CONFIG_MTD_SHARP_SL=y
538# CONFIG_MTD_PLATRAM is not set 646# CONFIG_MTD_PLATRAM is not set
539 647
540# 648#
541# Self-contained MTD device drivers 649# Self-contained MTD device drivers
542# 650#
651# CONFIG_MTD_DATAFLASH is not set
652# CONFIG_MTD_M25P80 is not set
543# CONFIG_MTD_SLRAM is not set 653# CONFIG_MTD_SLRAM is not set
544# CONFIG_MTD_PHRAM is not set 654# CONFIG_MTD_PHRAM is not set
545# CONFIG_MTD_MTDRAM is not set 655# CONFIG_MTD_MTDRAM is not set
546# CONFIG_MTD_BLKMTD is not set
547# CONFIG_MTD_BLOCK2MTD is not set 656# CONFIG_MTD_BLOCK2MTD is not set
548 657
549# 658#
@@ -552,78 +661,66 @@ CONFIG_MTD_SHARP_SL=y
552# CONFIG_MTD_DOC2000 is not set 661# CONFIG_MTD_DOC2000 is not set
553# CONFIG_MTD_DOC2001 is not set 662# CONFIG_MTD_DOC2001 is not set
554# CONFIG_MTD_DOC2001PLUS is not set 663# CONFIG_MTD_DOC2001PLUS is not set
555
556#
557# NAND Flash Device Drivers
558#
559CONFIG_MTD_NAND=y 664CONFIG_MTD_NAND=y
560CONFIG_MTD_NAND_VERIFY_WRITE=y 665CONFIG_MTD_NAND_VERIFY_WRITE=y
666# CONFIG_MTD_NAND_ECC_SMC is not set
667# CONFIG_MTD_NAND_MUSEUM_IDS is not set
561# CONFIG_MTD_NAND_H1900 is not set 668# CONFIG_MTD_NAND_H1900 is not set
562CONFIG_MTD_NAND_IDS=y 669CONFIG_MTD_NAND_IDS=y
563# CONFIG_MTD_NAND_DISKONCHIP is not set 670# CONFIG_MTD_NAND_DISKONCHIP is not set
564CONFIG_MTD_NAND_SHARPSL=y 671CONFIG_MTD_NAND_SHARPSL=y
565# CONFIG_MTD_NAND_NANDSIM is not set 672# CONFIG_MTD_NAND_NANDSIM is not set
566 673# CONFIG_MTD_NAND_PLATFORM is not set
567# 674# CONFIG_MTD_ALAUDA is not set
568# OneNAND Flash Device Drivers
569#
570# CONFIG_MTD_ONENAND is not set 675# CONFIG_MTD_ONENAND is not set
571 676
572# 677#
573# Parallel port support 678# UBI - Unsorted block images
574# 679#
680# CONFIG_MTD_UBI is not set
575# CONFIG_PARPORT is not set 681# CONFIG_PARPORT is not set
576 682CONFIG_BLK_DEV=y
577#
578# Plug and Play support
579#
580
581#
582# Block devices
583#
584# CONFIG_BLK_DEV_COW_COMMON is not set 683# CONFIG_BLK_DEV_COW_COMMON is not set
585CONFIG_BLK_DEV_LOOP=y 684CONFIG_BLK_DEV_LOOP=y
586# CONFIG_BLK_DEV_CRYPTOLOOP is not set 685# CONFIG_BLK_DEV_CRYPTOLOOP is not set
587# CONFIG_BLK_DEV_NBD is not set 686# CONFIG_BLK_DEV_NBD is not set
588# CONFIG_BLK_DEV_UB is not set 687# CONFIG_BLK_DEV_UB is not set
589# CONFIG_BLK_DEV_RAM is not set 688# CONFIG_BLK_DEV_RAM is not set
590CONFIG_BLK_DEV_RAM_COUNT=16
591# CONFIG_CDROM_PKTCDVD is not set 689# CONFIG_CDROM_PKTCDVD is not set
592# CONFIG_ATA_OVER_ETH is not set 690# CONFIG_ATA_OVER_ETH is not set
593 691CONFIG_MISC_DEVICES=y
594# 692# CONFIG_EEPROM_93CX6 is not set
595# ATA/ATAPI/MFM/RLL support 693# CONFIG_ENCLOSURE_SERVICES is not set
596# 694CONFIG_HAVE_IDE=y
597CONFIG_IDE=y 695CONFIG_IDE=y
598CONFIG_BLK_DEV_IDE=y
599 696
600# 697#
601# Please see Documentation/ide.txt for help/info on IDE drives 698# Please see Documentation/ide/ide.txt for help/info on IDE drives
602# 699#
603# CONFIG_BLK_DEV_IDE_SATA is not set 700# CONFIG_BLK_DEV_IDE_SATA is not set
604CONFIG_BLK_DEV_IDEDISK=y 701CONFIG_BLK_DEV_IDEDISK=y
605# CONFIG_IDEDISK_MULTI_MODE is not set
606CONFIG_BLK_DEV_IDECS=y 702CONFIG_BLK_DEV_IDECS=y
607# CONFIG_BLK_DEV_IDECD is not set 703# CONFIG_BLK_DEV_IDECD is not set
608# CONFIG_BLK_DEV_IDETAPE is not set 704# CONFIG_BLK_DEV_IDETAPE is not set
609# CONFIG_BLK_DEV_IDEFLOPPY is not set 705# CONFIG_BLK_DEV_IDEFLOPPY is not set
610# CONFIG_BLK_DEV_IDESCSI is not set 706# CONFIG_BLK_DEV_IDESCSI is not set
611# CONFIG_IDE_TASK_IOCTL is not set 707# CONFIG_IDE_TASK_IOCTL is not set
708CONFIG_IDE_PROC_FS=y
612 709
613# 710#
614# IDE chipset support/bugfixes 711# IDE chipset support/bugfixes
615# 712#
616CONFIG_IDE_GENERIC=y 713# CONFIG_BLK_DEV_PLATFORM is not set
617# CONFIG_IDE_ARM is not set
618# CONFIG_BLK_DEV_IDEDMA is not set 714# CONFIG_BLK_DEV_IDEDMA is not set
619# CONFIG_IDEDMA_AUTO is not set
620# CONFIG_BLK_DEV_HD is not set
621 715
622# 716#
623# SCSI device support 717# SCSI device support
624# 718#
625# CONFIG_RAID_ATTRS is not set 719# CONFIG_RAID_ATTRS is not set
626CONFIG_SCSI=m 720CONFIG_SCSI=m
721CONFIG_SCSI_DMA=y
722# CONFIG_SCSI_TGT is not set
723# CONFIG_SCSI_NETLINK is not set
627CONFIG_SCSI_PROC_FS=y 724CONFIG_SCSI_PROC_FS=y
628 725
629# 726#
@@ -643,121 +740,76 @@ CONFIG_CHR_DEV_SG=m
643CONFIG_SCSI_MULTI_LUN=y 740CONFIG_SCSI_MULTI_LUN=y
644# CONFIG_SCSI_CONSTANTS is not set 741# CONFIG_SCSI_CONSTANTS is not set
645# CONFIG_SCSI_LOGGING is not set 742# CONFIG_SCSI_LOGGING is not set
743# CONFIG_SCSI_SCAN_ASYNC is not set
744CONFIG_SCSI_WAIT_SCAN=m
646 745
647# 746#
648# SCSI Transport Attributes 747# SCSI Transports
649# 748#
650# CONFIG_SCSI_SPI_ATTRS is not set 749# CONFIG_SCSI_SPI_ATTRS is not set
651# CONFIG_SCSI_FC_ATTRS is not set 750# CONFIG_SCSI_FC_ATTRS is not set
652# CONFIG_SCSI_ISCSI_ATTRS is not set 751# CONFIG_SCSI_ISCSI_ATTRS is not set
653# CONFIG_SCSI_SAS_ATTRS is not set 752# CONFIG_SCSI_SAS_LIBSAS is not set
654 753# CONFIG_SCSI_SRP_ATTRS is not set
655# 754CONFIG_SCSI_LOWLEVEL=y
656# SCSI low-level drivers
657#
658# CONFIG_ISCSI_TCP is not set 755# CONFIG_ISCSI_TCP is not set
659# CONFIG_SCSI_SATA is not set
660# CONFIG_SCSI_DEBUG is not set 756# CONFIG_SCSI_DEBUG is not set
661 757# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
662# 758# CONFIG_SCSI_DH is not set
663# PCMCIA SCSI adapter support 759# CONFIG_ATA is not set
664#
665# CONFIG_PCMCIA_AHA152X is not set
666# CONFIG_PCMCIA_FDOMAIN is not set
667# CONFIG_PCMCIA_NINJA_SCSI is not set
668# CONFIG_PCMCIA_QLOGIC is not set
669# CONFIG_PCMCIA_SYM53C500 is not set
670
671#
672# Multi-device support (RAID and LVM)
673#
674# CONFIG_MD is not set 760# CONFIG_MD is not set
675
676#
677# Fusion MPT device support
678#
679# CONFIG_FUSION is not set
680
681#
682# IEEE 1394 (FireWire) support
683#
684
685#
686# I2O device support
687#
688
689#
690# Network device support
691#
692CONFIG_NETDEVICES=y 761CONFIG_NETDEVICES=y
693# CONFIG_DUMMY is not set 762# CONFIG_DUMMY is not set
694# CONFIG_BONDING is not set 763# CONFIG_BONDING is not set
764# CONFIG_MACVLAN is not set
695# CONFIG_EQUALIZER is not set 765# CONFIG_EQUALIZER is not set
696# CONFIG_TUN is not set 766# CONFIG_TUN is not set
697 767# CONFIG_VETH is not set
698#
699# PHY device support
700#
701# CONFIG_PHYLIB is not set 768# CONFIG_PHYLIB is not set
702
703#
704# Ethernet (10 or 100Mbit)
705#
706CONFIG_NET_ETHERNET=y 769CONFIG_NET_ETHERNET=y
707CONFIG_MII=m 770CONFIG_MII=m
771# CONFIG_AX88796 is not set
708# CONFIG_SMC91X is not set 772# CONFIG_SMC91X is not set
709# CONFIG_DM9000 is not set 773# CONFIG_DM9000 is not set
774# CONFIG_ENC28J60 is not set
775# CONFIG_SMC911X is not set
776# CONFIG_IBM_NEW_EMAC_ZMII is not set
777# CONFIG_IBM_NEW_EMAC_RGMII is not set
778# CONFIG_IBM_NEW_EMAC_TAH is not set
779# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
780# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
781# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
782# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
783# CONFIG_B44 is not set
784CONFIG_NETDEV_1000=y
785CONFIG_NETDEV_10000=y
710 786
711# 787#
712# Ethernet (1000 Mbit) 788# Wireless LAN
713#
714
715#
716# Ethernet (10000 Mbit)
717#
718
719#
720# Token Ring devices
721# 789#
790# CONFIG_WLAN_PRE80211 is not set
791# CONFIG_WLAN_80211 is not set
792# CONFIG_IWLWIFI_LEDS is not set
722 793
723# 794#
724# Wireless LAN (non-hamradio) 795# USB Network Adapters
725#
726CONFIG_NET_RADIO=y
727
728#
729# Obsolete Wireless cards support (pre-802.11)
730#
731# CONFIG_STRIP is not set
732# CONFIG_PCMCIA_WAVELAN is not set
733# CONFIG_PCMCIA_NETWAVE is not set
734
735#
736# Wireless 802.11 Frequency Hopping cards support
737#
738# CONFIG_PCMCIA_RAYCS is not set
739
740#
741# Wireless 802.11b ISA/PCI cards support
742#
743CONFIG_HERMES=m
744# CONFIG_ATMEL is not set
745
746#
747# Wireless 802.11b Pcmcia/Cardbus cards support
748#
749CONFIG_PCMCIA_HERMES=m
750CONFIG_PCMCIA_SPECTRUM=m
751# CONFIG_AIRO_CS is not set
752# CONFIG_PCMCIA_WL3501 is not set
753CONFIG_HOSTAP=m
754CONFIG_HOSTAP_FIRMWARE=y
755CONFIG_HOSTAP_CS=m
756CONFIG_NET_WIRELESS=y
757
758#
759# PCMCIA network device support
760# 796#
797CONFIG_USB_CATC=m
798CONFIG_USB_KAWETH=m
799CONFIG_USB_PEGASUS=m
800CONFIG_USB_RTL8150=m
801CONFIG_USB_USBNET=m
802CONFIG_USB_NET_AX8817X=m
803CONFIG_USB_NET_CDCETHER=m
804# CONFIG_USB_NET_DM9601 is not set
805# CONFIG_USB_NET_SMSC95XX is not set
806# CONFIG_USB_NET_GL620A is not set
807CONFIG_USB_NET_NET1080=m
808# CONFIG_USB_NET_PLUSB is not set
809# CONFIG_USB_NET_MCS7830 is not set
810# CONFIG_USB_NET_RNDIS_HOST is not set
811# CONFIG_USB_NET_CDC_SUBSET is not set
812CONFIG_USB_NET_ZAURUS=m
761CONFIG_NET_PCMCIA=y 813CONFIG_NET_PCMCIA=y
762# CONFIG_PCMCIA_3C589 is not set 814# CONFIG_PCMCIA_3C589 is not set
763# CONFIG_PCMCIA_3C574 is not set 815# CONFIG_PCMCIA_3C574 is not set
@@ -767,10 +819,6 @@ CONFIG_PCMCIA_PCNET=m
767# CONFIG_PCMCIA_SMC91C92 is not set 819# CONFIG_PCMCIA_SMC91C92 is not set
768# CONFIG_PCMCIA_XIRC2PS is not set 820# CONFIG_PCMCIA_XIRC2PS is not set
769# CONFIG_PCMCIA_AXNET is not set 821# CONFIG_PCMCIA_AXNET is not set
770
771#
772# Wan interfaces
773#
774# CONFIG_WAN is not set 822# CONFIG_WAN is not set
775CONFIG_PPP=m 823CONFIG_PPP=m
776# CONFIG_PPP_MULTILINK is not set 824# CONFIG_PPP_MULTILINK is not set
@@ -781,31 +829,29 @@ CONFIG_PPP_ASYNC=m
781CONFIG_PPP_BSDCOMP=m 829CONFIG_PPP_BSDCOMP=m
782# CONFIG_PPP_MPPE is not set 830# CONFIG_PPP_MPPE is not set
783# CONFIG_PPPOE is not set 831# CONFIG_PPPOE is not set
832# CONFIG_PPPOL2TP is not set
784# CONFIG_SLIP is not set 833# CONFIG_SLIP is not set
785# CONFIG_SHAPER is not set 834CONFIG_SLHC=m
786# CONFIG_NETCONSOLE is not set 835# CONFIG_NETCONSOLE is not set
787# CONFIG_NETPOLL is not set 836# CONFIG_NETPOLL is not set
788# CONFIG_NET_POLL_CONTROLLER is not set 837# CONFIG_NET_POLL_CONTROLLER is not set
789
790#
791# ISDN subsystem
792#
793# CONFIG_ISDN is not set 838# CONFIG_ISDN is not set
794 839
795# 840#
796# Input device support 841# Input device support
797# 842#
798CONFIG_INPUT=y 843CONFIG_INPUT=y
844CONFIG_INPUT_FF_MEMLESS=m
845# CONFIG_INPUT_POLLDEV is not set
799 846
800# 847#
801# Userland interfaces 848# Userland interfaces
802# 849#
803# CONFIG_INPUT_MOUSEDEV is not set 850# CONFIG_INPUT_MOUSEDEV is not set
804# CONFIG_INPUT_JOYDEV is not set 851# CONFIG_INPUT_JOYDEV is not set
805# CONFIG_INPUT_TSDEV is not set
806CONFIG_INPUT_EVDEV=y 852CONFIG_INPUT_EVDEV=y
807# CONFIG_INPUT_EVBUG is not set 853# CONFIG_INPUT_EVBUG is not set
808# CONFIG_INPUT_POWER is not set 854# CONFIG_INPUT_APMPOWER is not set
809 855
810# 856#
811# Input Device Drivers 857# Input Device Drivers
@@ -816,17 +862,35 @@ CONFIG_INPUT_KEYBOARD=y
816# CONFIG_KEYBOARD_LKKBD is not set 862# CONFIG_KEYBOARD_LKKBD is not set
817# CONFIG_KEYBOARD_XTKBD is not set 863# CONFIG_KEYBOARD_XTKBD is not set
818# CONFIG_KEYBOARD_NEWTON is not set 864# CONFIG_KEYBOARD_NEWTON is not set
865# CONFIG_KEYBOARD_STOWAWAY is not set
819# CONFIG_KEYBOARD_CORGI is not set 866# CONFIG_KEYBOARD_CORGI is not set
820CONFIG_KEYBOARD_SPITZ=y 867CONFIG_KEYBOARD_SPITZ=y
868# CONFIG_KEYBOARD_PXA27x is not set
869# CONFIG_KEYBOARD_GPIO is not set
821# CONFIG_INPUT_MOUSE is not set 870# CONFIG_INPUT_MOUSE is not set
822# CONFIG_INPUT_JOYSTICK is not set 871# CONFIG_INPUT_JOYSTICK is not set
872# CONFIG_INPUT_TABLET is not set
823CONFIG_INPUT_TOUCHSCREEN=y 873CONFIG_INPUT_TOUCHSCREEN=y
824CONFIG_TOUCHSCREEN_CORGI=y 874CONFIG_TOUCHSCREEN_ADS7846=y
875# CONFIG_TOUCHSCREEN_CORGI is not set
876# CONFIG_TOUCHSCREEN_FUJITSU is not set
825# CONFIG_TOUCHSCREEN_GUNZE is not set 877# CONFIG_TOUCHSCREEN_GUNZE is not set
826# CONFIG_TOUCHSCREEN_ELO is not set 878# CONFIG_TOUCHSCREEN_ELO is not set
827# CONFIG_TOUCHSCREEN_MTOUCH is not set 879# CONFIG_TOUCHSCREEN_MTOUCH is not set
880# CONFIG_TOUCHSCREEN_INEXIO is not set
828# CONFIG_TOUCHSCREEN_MK712 is not set 881# CONFIG_TOUCHSCREEN_MK712 is not set
882# CONFIG_TOUCHSCREEN_PENMOUNT is not set
883# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
884# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
885# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
886# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
829CONFIG_INPUT_MISC=y 887CONFIG_INPUT_MISC=y
888# CONFIG_INPUT_ATI_REMOTE is not set
889# CONFIG_INPUT_ATI_REMOTE2 is not set
890# CONFIG_INPUT_KEYSPAN_REMOTE is not set
891# CONFIG_INPUT_POWERMATE is not set
892# CONFIG_INPUT_YEALINK is not set
893# CONFIG_INPUT_CM109 is not set
830CONFIG_INPUT_UINPUT=m 894CONFIG_INPUT_UINPUT=m
831 895
832# 896#
@@ -839,8 +903,11 @@ CONFIG_INPUT_UINPUT=m
839# Character devices 903# Character devices
840# 904#
841CONFIG_VT=y 905CONFIG_VT=y
906CONFIG_CONSOLE_TRANSLATIONS=y
842CONFIG_VT_CONSOLE=y 907CONFIG_VT_CONSOLE=y
843CONFIG_HW_CONSOLE=y 908CONFIG_HW_CONSOLE=y
909# CONFIG_VT_HW_CONSOLE_BINDING is not set
910CONFIG_DEVKMEM=y
844# CONFIG_SERIAL_NONSTANDARD is not set 911# CONFIG_SERIAL_NONSTANDARD is not set
845 912
846# 913#
@@ -849,6 +916,7 @@ CONFIG_HW_CONSOLE=y
849CONFIG_SERIAL_8250=m 916CONFIG_SERIAL_8250=m
850CONFIG_SERIAL_8250_CS=m 917CONFIG_SERIAL_8250_CS=m
851CONFIG_SERIAL_8250_NR_UARTS=4 918CONFIG_SERIAL_8250_NR_UARTS=4
919CONFIG_SERIAL_8250_RUNTIME_UARTS=4
852# CONFIG_SERIAL_8250_EXTENDED is not set 920# CONFIG_SERIAL_8250_EXTENDED is not set
853 921
854# 922#
@@ -860,101 +928,253 @@ CONFIG_SERIAL_CORE=y
860CONFIG_SERIAL_CORE_CONSOLE=y 928CONFIG_SERIAL_CORE_CONSOLE=y
861CONFIG_UNIX98_PTYS=y 929CONFIG_UNIX98_PTYS=y
862# CONFIG_LEGACY_PTYS is not set 930# CONFIG_LEGACY_PTYS is not set
863
864#
865# IPMI
866#
867# CONFIG_IPMI_HANDLER is not set 931# CONFIG_IPMI_HANDLER is not set
868 932CONFIG_HW_RANDOM=m
869#
870# Watchdog Cards
871#
872# CONFIG_WATCHDOG is not set
873# CONFIG_NVRAM is not set 933# CONFIG_NVRAM is not set
874# CONFIG_RTC is not set
875# CONFIG_DTLK is not set
876# CONFIG_R3964 is not set 934# CONFIG_R3964 is not set
877 935
878# 936#
879# Ftape, the floppy tape device driver
880#
881
882#
883# PCMCIA character devices 937# PCMCIA character devices
884# 938#
885# CONFIG_SYNCLINK_CS is not set 939# CONFIG_SYNCLINK_CS is not set
886# CONFIG_CARDMAN_4000 is not set 940# CONFIG_CARDMAN_4000 is not set
887# CONFIG_CARDMAN_4040 is not set 941# CONFIG_CARDMAN_4040 is not set
942# CONFIG_IPWIRELESS is not set
888# CONFIG_RAW_DRIVER is not set 943# CONFIG_RAW_DRIVER is not set
889
890#
891# TPM devices
892#
893# CONFIG_TCG_TPM is not set 944# CONFIG_TCG_TPM is not set
894# CONFIG_TELCLOCK is not set
895
896#
897# I2C support
898#
899CONFIG_I2C=y 945CONFIG_I2C=y
946CONFIG_I2C_BOARDINFO=y
900# CONFIG_I2C_CHARDEV is not set 947# CONFIG_I2C_CHARDEV is not set
948CONFIG_I2C_HELPER_AUTO=y
901 949
902# 950#
903# I2C Algorithms 951# I2C Hardware Bus support
904# 952#
905# CONFIG_I2C_ALGOBIT is not set
906# CONFIG_I2C_ALGOPCF is not set
907# CONFIG_I2C_ALGOPCA is not set
908 953
909# 954#
910# I2C Hardware Bus support 955# I2C system bus drivers (mostly embedded / system-on-chip)
911# 956#
957# CONFIG_I2C_GPIO is not set
958# CONFIG_I2C_OCORES is not set
912CONFIG_I2C_PXA=y 959CONFIG_I2C_PXA=y
913# CONFIG_I2C_PXA_SLAVE is not set 960# CONFIG_I2C_PXA_SLAVE is not set
961# CONFIG_I2C_SIMTEC is not set
962
963#
964# External I2C/SMBus adapter drivers
965#
914# CONFIG_I2C_PARPORT_LIGHT is not set 966# CONFIG_I2C_PARPORT_LIGHT is not set
967# CONFIG_I2C_TAOS_EVM is not set
968# CONFIG_I2C_TINY_USB is not set
969
970#
971# Other I2C/SMBus bus drivers
972#
973# CONFIG_I2C_PCA_PLATFORM is not set
915# CONFIG_I2C_STUB is not set 974# CONFIG_I2C_STUB is not set
916# CONFIG_I2C_PCA_ISA is not set
917 975
918# 976#
919# Hardware Monitoring support 977# Miscellaneous I2C Chip support
978#
979# CONFIG_DS1682 is not set
980# CONFIG_AT24 is not set
981# CONFIG_SENSORS_EEPROM is not set
982# CONFIG_SENSORS_PCF8574 is not set
983# CONFIG_PCF8575 is not set
984# CONFIG_SENSORS_PCA9539 is not set
985# CONFIG_SENSORS_PCF8591 is not set
986# CONFIG_TPS65010 is not set
987# CONFIG_SENSORS_MAX6875 is not set
988# CONFIG_SENSORS_TSL2550 is not set
989# CONFIG_I2C_DEBUG_CORE is not set
990# CONFIG_I2C_DEBUG_ALGO is not set
991# CONFIG_I2C_DEBUG_BUS is not set
992# CONFIG_I2C_DEBUG_CHIP is not set
993CONFIG_SPI=y
994# CONFIG_SPI_DEBUG is not set
995CONFIG_SPI_MASTER=y
996
997#
998# SPI Master Controller Drivers
999#
1000# CONFIG_SPI_BITBANG is not set
1001CONFIG_SPI_PXA2XX=y
1002
1003#
1004# SPI Protocol Masters
1005#
1006# CONFIG_SPI_AT25 is not set
1007# CONFIG_SPI_SPIDEV is not set
1008# CONFIG_SPI_TLE62X0 is not set
1009CONFIG_ARCH_REQUIRE_GPIOLIB=y
1010CONFIG_GPIOLIB=y
1011# CONFIG_DEBUG_GPIO is not set
1012# CONFIG_GPIO_SYSFS is not set
1013
1014#
1015# I2C GPIO expanders:
1016#
1017# CONFIG_GPIO_MAX732X is not set
1018# CONFIG_GPIO_PCA953X is not set
1019# CONFIG_GPIO_PCF857X is not set
1020
1021#
1022# PCI GPIO expanders:
1023#
1024
1025#
1026# SPI GPIO expanders:
920# 1027#
1028# CONFIG_GPIO_MAX7301 is not set
1029# CONFIG_GPIO_MCP23S08 is not set
1030# CONFIG_W1 is not set
1031# CONFIG_POWER_SUPPLY is not set
921CONFIG_HWMON=y 1032CONFIG_HWMON=y
922# CONFIG_HWMON_VID is not set 1033# CONFIG_HWMON_VID is not set
1034# CONFIG_SENSORS_AD7414 is not set
1035# CONFIG_SENSORS_AD7418 is not set
1036# CONFIG_SENSORS_ADCXX is not set
1037# CONFIG_SENSORS_ADM1021 is not set
1038# CONFIG_SENSORS_ADM1025 is not set
1039# CONFIG_SENSORS_ADM1026 is not set
1040# CONFIG_SENSORS_ADM1029 is not set
1041# CONFIG_SENSORS_ADM1031 is not set
1042# CONFIG_SENSORS_ADM9240 is not set
1043# CONFIG_SENSORS_ADT7470 is not set
1044# CONFIG_SENSORS_ADT7473 is not set
1045# CONFIG_SENSORS_ATXP1 is not set
1046# CONFIG_SENSORS_DS1621 is not set
1047# CONFIG_SENSORS_F71805F is not set
1048# CONFIG_SENSORS_F71882FG is not set
1049# CONFIG_SENSORS_F75375S is not set
1050# CONFIG_SENSORS_GL518SM is not set
1051# CONFIG_SENSORS_GL520SM is not set
1052# CONFIG_SENSORS_IT87 is not set
1053# CONFIG_SENSORS_LM63 is not set
1054# CONFIG_SENSORS_LM70 is not set
1055# CONFIG_SENSORS_LM75 is not set
1056# CONFIG_SENSORS_LM77 is not set
1057# CONFIG_SENSORS_LM78 is not set
1058# CONFIG_SENSORS_LM80 is not set
1059# CONFIG_SENSORS_LM83 is not set
1060# CONFIG_SENSORS_LM85 is not set
1061# CONFIG_SENSORS_LM87 is not set
1062# CONFIG_SENSORS_LM90 is not set
1063# CONFIG_SENSORS_LM92 is not set
1064# CONFIG_SENSORS_LM93 is not set
1065CONFIG_SENSORS_MAX1111=y
1066# CONFIG_SENSORS_MAX1619 is not set
1067# CONFIG_SENSORS_MAX6650 is not set
1068# CONFIG_SENSORS_PC87360 is not set
1069# CONFIG_SENSORS_PC87427 is not set
1070# CONFIG_SENSORS_DME1737 is not set
1071# CONFIG_SENSORS_SMSC47M1 is not set
1072# CONFIG_SENSORS_SMSC47M192 is not set
1073# CONFIG_SENSORS_SMSC47B397 is not set
1074# CONFIG_SENSORS_ADS7828 is not set
1075# CONFIG_SENSORS_THMC50 is not set
1076# CONFIG_SENSORS_VT1211 is not set
1077# CONFIG_SENSORS_W83781D is not set
1078# CONFIG_SENSORS_W83791D is not set
1079# CONFIG_SENSORS_W83792D is not set
1080# CONFIG_SENSORS_W83793 is not set
1081# CONFIG_SENSORS_W83L785TS is not set
1082# CONFIG_SENSORS_W83L786NG is not set
1083# CONFIG_SENSORS_W83627HF is not set
1084# CONFIG_SENSORS_W83627EHF is not set
923# CONFIG_HWMON_DEBUG_CHIP is not set 1085# CONFIG_HWMON_DEBUG_CHIP is not set
1086# CONFIG_THERMAL is not set
1087# CONFIG_THERMAL_HWMON is not set
1088# CONFIG_WATCHDOG is not set
924 1089
925# 1090#
926# Misc devices 1091# Sonics Silicon Backplane
927# 1092#
1093CONFIG_SSB_POSSIBLE=y
1094# CONFIG_SSB is not set
928 1095
929# 1096#
930# Multimedia Capabilities Port drivers 1097# Multifunction device drivers
931# 1098#
1099# CONFIG_MFD_CORE is not set
1100# CONFIG_MFD_SM501 is not set
1101# CONFIG_MFD_ASIC3 is not set
1102# CONFIG_HTC_EGPIO is not set
1103# CONFIG_HTC_PASIC3 is not set
1104# CONFIG_UCB1400_CORE is not set
1105# CONFIG_MFD_TMIO is not set
1106# CONFIG_MFD_T7L66XB is not set
1107# CONFIG_MFD_TC6387XB is not set
1108# CONFIG_MFD_TC6393XB is not set
1109# CONFIG_MFD_WM8400 is not set
1110# CONFIG_MFD_WM8350_I2C is not set
932 1111
933# 1112#
934# Multimedia devices 1113# Multimedia devices
935# 1114#
1115
1116#
1117# Multimedia core support
1118#
936# CONFIG_VIDEO_DEV is not set 1119# CONFIG_VIDEO_DEV is not set
1120# CONFIG_DVB_CORE is not set
1121# CONFIG_VIDEO_MEDIA is not set
937 1122
938# 1123#
939# Digital Video Broadcasting Devices 1124# Multimedia drivers
940# 1125#
941# CONFIG_DVB is not set 1126# CONFIG_DAB is not set
942 1127
943# 1128#
944# Graphics support 1129# Graphics support
945# 1130#
1131# CONFIG_VGASTATE is not set
1132# CONFIG_VIDEO_OUTPUT_CONTROL is not set
946CONFIG_FB=y 1133CONFIG_FB=y
1134# CONFIG_FIRMWARE_EDID is not set
1135# CONFIG_FB_DDC is not set
1136# CONFIG_FB_BOOT_VESA_SUPPORT is not set
947CONFIG_FB_CFB_FILLRECT=y 1137CONFIG_FB_CFB_FILLRECT=y
948CONFIG_FB_CFB_COPYAREA=y 1138CONFIG_FB_CFB_COPYAREA=y
949CONFIG_FB_CFB_IMAGEBLIT=y 1139CONFIG_FB_CFB_IMAGEBLIT=y
1140# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
1141# CONFIG_FB_SYS_FILLRECT is not set
1142# CONFIG_FB_SYS_COPYAREA is not set
1143# CONFIG_FB_SYS_IMAGEBLIT is not set
1144# CONFIG_FB_FOREIGN_ENDIAN is not set
1145# CONFIG_FB_SYS_FOPS is not set
1146# CONFIG_FB_SVGALIB is not set
950# CONFIG_FB_MACMODES is not set 1147# CONFIG_FB_MACMODES is not set
1148# CONFIG_FB_BACKLIGHT is not set
951# CONFIG_FB_MODE_HELPERS is not set 1149# CONFIG_FB_MODE_HELPERS is not set
952# CONFIG_FB_TILEBLITTING is not set 1150# CONFIG_FB_TILEBLITTING is not set
1151
1152#
1153# Frame buffer hardware drivers
1154#
953# CONFIG_FB_S1D13XXX is not set 1155# CONFIG_FB_S1D13XXX is not set
954CONFIG_FB_PXA=y 1156CONFIG_FB_PXA=y
1157# CONFIG_FB_PXA_SMARTPANEL is not set
955# CONFIG_FB_PXA_PARAMETERS is not set 1158# CONFIG_FB_PXA_PARAMETERS is not set
1159# CONFIG_FB_MBX is not set
956# CONFIG_FB_W100 is not set 1160# CONFIG_FB_W100 is not set
957# CONFIG_FB_VIRTUAL is not set 1161# CONFIG_FB_VIRTUAL is not set
1162# CONFIG_FB_METRONOME is not set
1163CONFIG_BACKLIGHT_LCD_SUPPORT=y
1164CONFIG_LCD_CLASS_DEVICE=y
1165CONFIG_LCD_CORGI=y
1166# CONFIG_LCD_LTV350QV is not set
1167# CONFIG_LCD_ILI9320 is not set
1168# CONFIG_LCD_TDO24M is not set
1169# CONFIG_LCD_VGG2432A4 is not set
1170# CONFIG_LCD_PLATFORM is not set
1171CONFIG_BACKLIGHT_CLASS_DEVICE=y
1172# CONFIG_BACKLIGHT_CORGI is not set
1173
1174#
1175# Display device support
1176#
1177# CONFIG_DISPLAY_SUPPORT is not set
958 1178
959# 1179#
960# Console display driver support 1180# Console display driver support
@@ -962,6 +1182,7 @@ CONFIG_FB_PXA=y
962# CONFIG_VGA_CONSOLE is not set 1182# CONFIG_VGA_CONSOLE is not set
963CONFIG_DUMMY_CONSOLE=y 1183CONFIG_DUMMY_CONSOLE=y
964CONFIG_FRAMEBUFFER_CONSOLE=y 1184CONFIG_FRAMEBUFFER_CONSOLE=y
1185# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
965CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y 1186CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
966CONFIG_FONTS=y 1187CONFIG_FONTS=y
967CONFIG_FONT_8x8=y 1188CONFIG_FONT_8x8=y
@@ -974,55 +1195,96 @@ CONFIG_FONT_8x16=y
974# CONFIG_FONT_SUN8x16 is not set 1195# CONFIG_FONT_SUN8x16 is not set
975# CONFIG_FONT_SUN12x22 is not set 1196# CONFIG_FONT_SUN12x22 is not set
976# CONFIG_FONT_10x18 is not set 1197# CONFIG_FONT_10x18 is not set
1198# CONFIG_LOGO is not set
1199# CONFIG_SOUND is not set
1200CONFIG_HID_SUPPORT=y
1201CONFIG_HID=y
1202# CONFIG_HID_DEBUG is not set
1203# CONFIG_HIDRAW is not set
977 1204
978# 1205#
979# Logo configuration 1206# USB Input Devices
980# 1207#
981# CONFIG_LOGO is not set 1208CONFIG_USB_HID=m
982CONFIG_BACKLIGHT_LCD_SUPPORT=y 1209# CONFIG_HID_PID is not set
983CONFIG_BACKLIGHT_CLASS_DEVICE=y 1210# CONFIG_USB_HIDDEV is not set
984CONFIG_BACKLIGHT_DEVICE=y
985CONFIG_LCD_CLASS_DEVICE=y
986CONFIG_LCD_DEVICE=y
987CONFIG_BACKLIGHT_CORGI=y
988 1211
989# 1212#
990# Sound 1213# USB HID Boot Protocol drivers
991# 1214#
992# CONFIG_SOUND is not set 1215CONFIG_USB_KBD=m
1216CONFIG_USB_MOUSE=m
993 1217
994# 1218#
995# USB support 1219# Special HID drivers
996# 1220#
1221CONFIG_HID_COMPAT=y
1222CONFIG_HID_A4TECH=m
1223CONFIG_HID_APPLE=m
1224CONFIG_HID_BELKIN=m
1225CONFIG_HID_BRIGHT=m
1226CONFIG_HID_CHERRY=m
1227CONFIG_HID_CHICONY=m
1228CONFIG_HID_CYPRESS=m
1229CONFIG_HID_DELL=m
1230CONFIG_HID_EZKEY=m
1231CONFIG_HID_GYRATION=m
1232CONFIG_HID_LOGITECH=m
1233# CONFIG_LOGITECH_FF is not set
1234# CONFIG_LOGIRUMBLEPAD2_FF is not set
1235CONFIG_HID_MICROSOFT=m
1236CONFIG_HID_MONTEREY=m
1237CONFIG_HID_PANTHERLORD=m
1238# CONFIG_PANTHERLORD_FF is not set
1239CONFIG_HID_PETALYNX=m
1240CONFIG_HID_SAMSUNG=m
1241CONFIG_HID_SONY=m
1242CONFIG_HID_SUNPLUS=m
1243CONFIG_THRUSTMASTER_FF=m
1244CONFIG_ZEROPLUS_FF=m
1245CONFIG_USB_SUPPORT=y
997CONFIG_USB_ARCH_HAS_HCD=y 1246CONFIG_USB_ARCH_HAS_HCD=y
998CONFIG_USB_ARCH_HAS_OHCI=y 1247CONFIG_USB_ARCH_HAS_OHCI=y
1248# CONFIG_USB_ARCH_HAS_EHCI is not set
999CONFIG_USB=m 1249CONFIG_USB=m
1000# CONFIG_USB_DEBUG is not set 1250# CONFIG_USB_DEBUG is not set
1251# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
1001 1252
1002# 1253#
1003# Miscellaneous USB options 1254# Miscellaneous USB options
1004# 1255#
1005CONFIG_USB_DEVICEFS=y 1256CONFIG_USB_DEVICEFS=y
1006# CONFIG_USB_BANDWIDTH is not set 1257CONFIG_USB_DEVICE_CLASS=y
1007# CONFIG_USB_DYNAMIC_MINORS is not set 1258# CONFIG_USB_DYNAMIC_MINORS is not set
1008# CONFIG_USB_SUSPEND is not set 1259# CONFIG_USB_SUSPEND is not set
1009# CONFIG_USB_OTG is not set 1260# CONFIG_USB_OTG is not set
1261# CONFIG_USB_OTG_WHITELIST is not set
1262# CONFIG_USB_OTG_BLACKLIST_HUB is not set
1263CONFIG_USB_MON=y
1010 1264
1011# 1265#
1012# USB Host Controller Drivers 1266# USB Host Controller Drivers
1013# 1267#
1268# CONFIG_USB_C67X00_HCD is not set
1014# CONFIG_USB_ISP116X_HCD is not set 1269# CONFIG_USB_ISP116X_HCD is not set
1270# CONFIG_USB_ISP1760_HCD is not set
1015CONFIG_USB_OHCI_HCD=m 1271CONFIG_USB_OHCI_HCD=m
1016# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1272# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1273# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1017CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1274CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1018CONFIG_USB_SL811_HCD=m 1275CONFIG_USB_SL811_HCD=m
1019CONFIG_USB_SL811_CS=m 1276CONFIG_USB_SL811_CS=m
1277# CONFIG_USB_R8A66597_HCD is not set
1278# CONFIG_USB_MUSB_HDRC is not set
1279# CONFIG_USB_GADGET_MUSB_HDRC is not set
1020 1280
1021# 1281#
1022# USB Device Class drivers 1282# USB Device Class drivers
1023# 1283#
1024CONFIG_USB_ACM=m 1284CONFIG_USB_ACM=m
1025CONFIG_USB_PRINTER=m 1285CONFIG_USB_PRINTER=m
1286# CONFIG_USB_WDM is not set
1287# CONFIG_USB_TMC is not set
1026 1288
1027# 1289#
1028# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1290# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1041,33 +1303,11 @@ CONFIG_USB_STORAGE=m
1041# CONFIG_USB_STORAGE_SDDR09 is not set 1303# CONFIG_USB_STORAGE_SDDR09 is not set
1042# CONFIG_USB_STORAGE_SDDR55 is not set 1304# CONFIG_USB_STORAGE_SDDR55 is not set
1043# CONFIG_USB_STORAGE_JUMPSHOT is not set 1305# CONFIG_USB_STORAGE_JUMPSHOT is not set
1044 1306# CONFIG_USB_STORAGE_ALAUDA is not set
1045# 1307# CONFIG_USB_STORAGE_ONETOUCH is not set
1046# USB Input Devices 1308# CONFIG_USB_STORAGE_KARMA is not set
1047# 1309# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
1048CONFIG_USB_HID=m 1310# CONFIG_USB_LIBUSUAL is not set
1049CONFIG_USB_HIDINPUT=y
1050# CONFIG_HID_FF is not set
1051# CONFIG_USB_HIDDEV is not set
1052
1053#
1054# USB HID Boot Protocol drivers
1055#
1056CONFIG_USB_KBD=m
1057CONFIG_USB_MOUSE=m
1058CONFIG_USB_AIPTEK=m
1059CONFIG_USB_WACOM=m
1060# CONFIG_USB_ACECAD is not set
1061CONFIG_USB_KBTAB=m
1062CONFIG_USB_POWERMATE=m
1063CONFIG_USB_MTOUCH=m
1064# CONFIG_USB_ITMTOUCH is not set
1065CONFIG_USB_EGALAX=m
1066# CONFIG_USB_YEALINK is not set
1067CONFIG_USB_XPAD=m
1068CONFIG_USB_ATI_REMOTE=m
1069# CONFIG_USB_KEYSPAN_REMOTE is not set
1070# CONFIG_USB_APPLETOUCH is not set
1071 1311
1072# 1312#
1073# USB Imaging devices 1313# USB Imaging devices
@@ -1076,51 +1316,22 @@ CONFIG_USB_MDC800=m
1076CONFIG_USB_MICROTEK=m 1316CONFIG_USB_MICROTEK=m
1077 1317
1078# 1318#
1079# USB Multimedia devices
1080#
1081CONFIG_USB_DABUSB=m
1082
1083#
1084# Video4Linux support is needed for USB Multimedia device support
1085#
1086
1087#
1088# USB Network Adapters
1089#
1090CONFIG_USB_CATC=m
1091CONFIG_USB_KAWETH=m
1092CONFIG_USB_PEGASUS=m
1093CONFIG_USB_RTL8150=m
1094CONFIG_USB_USBNET=m
1095CONFIG_USB_NET_AX8817X=m
1096CONFIG_USB_NET_CDCETHER=m
1097# CONFIG_USB_NET_GL620A is not set
1098CONFIG_USB_NET_NET1080=m
1099# CONFIG_USB_NET_PLUSB is not set
1100# CONFIG_USB_NET_RNDIS_HOST is not set
1101# CONFIG_USB_NET_CDC_SUBSET is not set
1102CONFIG_USB_NET_ZAURUS=m
1103# CONFIG_USB_ZD1201 is not set
1104CONFIG_USB_MON=y
1105
1106#
1107# USB port drivers 1319# USB port drivers
1108# 1320#
1109
1110#
1111# USB Serial Converter support
1112#
1113CONFIG_USB_SERIAL=m 1321CONFIG_USB_SERIAL=m
1322CONFIG_USB_EZUSB=y
1114CONFIG_USB_SERIAL_GENERIC=y 1323CONFIG_USB_SERIAL_GENERIC=y
1115# CONFIG_USB_SERIAL_AIRPRIME is not set 1324# CONFIG_USB_SERIAL_AIRCABLE is not set
1116# CONFIG_USB_SERIAL_ANYDATA is not set 1325# CONFIG_USB_SERIAL_ARK3116 is not set
1117CONFIG_USB_SERIAL_BELKIN=m 1326CONFIG_USB_SERIAL_BELKIN=m
1327# CONFIG_USB_SERIAL_CH341 is not set
1118# CONFIG_USB_SERIAL_WHITEHEAT is not set 1328# CONFIG_USB_SERIAL_WHITEHEAT is not set
1119CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m 1329CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1120# CONFIG_USB_SERIAL_CP2101 is not set 1330# CONFIG_USB_SERIAL_CP2101 is not set
1121CONFIG_USB_SERIAL_CYPRESS_M8=m 1331CONFIG_USB_SERIAL_CYPRESS_M8=m
1122CONFIG_USB_SERIAL_EMPEG=m 1332CONFIG_USB_SERIAL_EMPEG=m
1123CONFIG_USB_SERIAL_FTDI_SIO=m 1333CONFIG_USB_SERIAL_FTDI_SIO=m
1334# CONFIG_USB_SERIAL_FUNSOFT is not set
1124CONFIG_USB_SERIAL_VISOR=m 1335CONFIG_USB_SERIAL_VISOR=m
1125CONFIG_USB_SERIAL_IPAQ=m 1336CONFIG_USB_SERIAL_IPAQ=m
1126CONFIG_USB_SERIAL_IR=m 1337CONFIG_USB_SERIAL_IR=m
@@ -1128,6 +1339,7 @@ CONFIG_USB_SERIAL_EDGEPORT=m
1128CONFIG_USB_SERIAL_EDGEPORT_TI=m 1339CONFIG_USB_SERIAL_EDGEPORT_TI=m
1129CONFIG_USB_SERIAL_GARMIN=m 1340CONFIG_USB_SERIAL_GARMIN=m
1130CONFIG_USB_SERIAL_IPW=m 1341CONFIG_USB_SERIAL_IPW=m
1342# CONFIG_USB_SERIAL_IUU is not set
1131CONFIG_USB_SERIAL_KEYSPAN_PDA=m 1343CONFIG_USB_SERIAL_KEYSPAN_PDA=m
1132CONFIG_USB_SERIAL_KEYSPAN=m 1344CONFIG_USB_SERIAL_KEYSPAN=m
1133# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set 1345# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
@@ -1145,49 +1357,66 @@ CONFIG_USB_SERIAL_KEYSPAN=m
1145CONFIG_USB_SERIAL_KLSI=m 1357CONFIG_USB_SERIAL_KLSI=m
1146CONFIG_USB_SERIAL_KOBIL_SCT=m 1358CONFIG_USB_SERIAL_KOBIL_SCT=m
1147CONFIG_USB_SERIAL_MCT_U232=m 1359CONFIG_USB_SERIAL_MCT_U232=m
1360# CONFIG_USB_SERIAL_MOS7720 is not set
1361# CONFIG_USB_SERIAL_MOS7840 is not set
1362# CONFIG_USB_SERIAL_MOTOROLA is not set
1363# CONFIG_USB_SERIAL_NAVMAN is not set
1148CONFIG_USB_SERIAL_PL2303=m 1364CONFIG_USB_SERIAL_PL2303=m
1365# CONFIG_USB_SERIAL_OTI6858 is not set
1366# CONFIG_USB_SERIAL_SPCP8X5 is not set
1149# CONFIG_USB_SERIAL_HP4X is not set 1367# CONFIG_USB_SERIAL_HP4X is not set
1150CONFIG_USB_SERIAL_SAFE=m 1368CONFIG_USB_SERIAL_SAFE=m
1151# CONFIG_USB_SERIAL_SAFE_PADDED is not set 1369# CONFIG_USB_SERIAL_SAFE_PADDED is not set
1370# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1152CONFIG_USB_SERIAL_TI=m 1371CONFIG_USB_SERIAL_TI=m
1153CONFIG_USB_SERIAL_CYBERJACK=m 1372CONFIG_USB_SERIAL_CYBERJACK=m
1154CONFIG_USB_SERIAL_XIRCOM=m 1373CONFIG_USB_SERIAL_XIRCOM=m
1155# CONFIG_USB_SERIAL_OPTION is not set 1374# CONFIG_USB_SERIAL_OPTION is not set
1156CONFIG_USB_SERIAL_OMNINET=m 1375CONFIG_USB_SERIAL_OMNINET=m
1157CONFIG_USB_EZUSB=y 1376# CONFIG_USB_SERIAL_DEBUG is not set
1158 1377
1159# 1378#
1160# USB Miscellaneous drivers 1379# USB Miscellaneous drivers
1161# 1380#
1162CONFIG_USB_EMI62=m 1381CONFIG_USB_EMI62=m
1163CONFIG_USB_EMI26=m 1382CONFIG_USB_EMI26=m
1164CONFIG_USB_AUERSWALD=m 1383# CONFIG_USB_ADUTUX is not set
1384# CONFIG_USB_SEVSEG is not set
1165CONFIG_USB_RIO500=m 1385CONFIG_USB_RIO500=m
1166CONFIG_USB_LEGOTOWER=m 1386CONFIG_USB_LEGOTOWER=m
1167CONFIG_USB_LCD=m 1387CONFIG_USB_LCD=m
1388# CONFIG_USB_BERRY_CHARGE is not set
1168CONFIG_USB_LED=m 1389CONFIG_USB_LED=m
1390# CONFIG_USB_CYPRESS_CY7C63 is not set
1169CONFIG_USB_CYTHERM=m 1391CONFIG_USB_CYTHERM=m
1170CONFIG_USB_PHIDGETKIT=m 1392# CONFIG_USB_PHIDGET is not set
1171CONFIG_USB_PHIDGETSERVO=m
1172CONFIG_USB_IDMOUSE=m 1393CONFIG_USB_IDMOUSE=m
1394# CONFIG_USB_FTDI_ELAN is not set
1395# CONFIG_USB_APPLEDISPLAY is not set
1173# CONFIG_USB_LD is not set 1396# CONFIG_USB_LD is not set
1397# CONFIG_USB_TRANCEVIBRATOR is not set
1398# CONFIG_USB_IOWARRIOR is not set
1174# CONFIG_USB_TEST is not set 1399# CONFIG_USB_TEST is not set
1175 1400# CONFIG_USB_ISIGHTFW is not set
1176# 1401# CONFIG_USB_VST is not set
1177# USB DSL modem support
1178#
1179
1180#
1181# USB Gadget Support
1182#
1183CONFIG_USB_GADGET=m 1402CONFIG_USB_GADGET=m
1403# CONFIG_USB_GADGET_DEBUG is not set
1184# CONFIG_USB_GADGET_DEBUG_FILES is not set 1404# CONFIG_USB_GADGET_DEBUG_FILES is not set
1405CONFIG_USB_GADGET_VBUS_DRAW=2
1185CONFIG_USB_GADGET_SELECTED=y 1406CONFIG_USB_GADGET_SELECTED=y
1186# CONFIG_USB_GADGET_NET2280 is not set 1407# CONFIG_USB_GADGET_AT91 is not set
1187# CONFIG_USB_GADGET_PXA2XX is not set 1408# CONFIG_USB_GADGET_ATMEL_USBA is not set
1188# CONFIG_USB_GADGET_GOKU is not set 1409# CONFIG_USB_GADGET_FSL_USB2 is not set
1189# CONFIG_USB_GADGET_LH7A40X is not set 1410# CONFIG_USB_GADGET_LH7A40X is not set
1190# CONFIG_USB_GADGET_OMAP is not set 1411# CONFIG_USB_GADGET_OMAP is not set
1412# CONFIG_USB_GADGET_PXA25X is not set
1413# CONFIG_USB_GADGET_PXA27X is not set
1414# CONFIG_USB_GADGET_S3C2410 is not set
1415# CONFIG_USB_GADGET_M66592 is not set
1416# CONFIG_USB_GADGET_AMD5536UDC is not set
1417# CONFIG_USB_GADGET_FSL_QE is not set
1418# CONFIG_USB_GADGET_NET2280 is not set
1419# CONFIG_USB_GADGET_GOKU is not set
1191CONFIG_USB_GADGET_DUMMY_HCD=y 1420CONFIG_USB_GADGET_DUMMY_HCD=y
1192CONFIG_USB_DUMMY_HCD=m 1421CONFIG_USB_DUMMY_HCD=m
1193CONFIG_USB_GADGET_DUALSPEED=y 1422CONFIG_USB_GADGET_DUALSPEED=y
@@ -1198,15 +1427,42 @@ CONFIG_USB_GADGETFS=m
1198CONFIG_USB_FILE_STORAGE=m 1427CONFIG_USB_FILE_STORAGE=m
1199# CONFIG_USB_FILE_STORAGE_TEST is not set 1428# CONFIG_USB_FILE_STORAGE_TEST is not set
1200CONFIG_USB_G_SERIAL=m 1429CONFIG_USB_G_SERIAL=m
1430# CONFIG_USB_MIDI_GADGET is not set
1431# CONFIG_USB_G_PRINTER is not set
1432# CONFIG_USB_CDC_COMPOSITE is not set
1433CONFIG_MMC=y
1434# CONFIG_MMC_DEBUG is not set
1435# CONFIG_MMC_UNSAFE_RESUME is not set
1201 1436
1202# 1437#
1203# MMC/SD Card support 1438# MMC/SD/SDIO Card Drivers
1204# 1439#
1205CONFIG_MMC=y
1206# CONFIG_MMC_DEBUG is not set
1207CONFIG_MMC_BLOCK=y 1440CONFIG_MMC_BLOCK=y
1441CONFIG_MMC_BLOCK_BOUNCE=y
1442# CONFIG_SDIO_UART is not set
1443# CONFIG_MMC_TEST is not set
1444
1445#
1446# MMC/SD/SDIO Host Controller Drivers
1447#
1208CONFIG_MMC_PXA=y 1448CONFIG_MMC_PXA=y
1209# CONFIG_MMC_WBSD is not set 1449# CONFIG_MMC_SDHCI is not set
1450# CONFIG_MMC_SPI is not set
1451# CONFIG_MEMSTICK is not set
1452# CONFIG_ACCESSIBILITY is not set
1453# CONFIG_NEW_LEDS is not set
1454CONFIG_RTC_LIB=y
1455# CONFIG_RTC_CLASS is not set
1456# CONFIG_DMADEVICES is not set
1457
1458#
1459# Voltage and Current regulators
1460#
1461# CONFIG_REGULATOR is not set
1462# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1463# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1464# CONFIG_REGULATOR_BQ24022 is not set
1465# CONFIG_UIO is not set
1210 1466
1211# 1467#
1212# File systems 1468# File systems
@@ -1218,18 +1474,19 @@ CONFIG_EXT2_FS_SECURITY=y
1218# CONFIG_EXT2_FS_XIP is not set 1474# CONFIG_EXT2_FS_XIP is not set
1219CONFIG_EXT3_FS=y 1475CONFIG_EXT3_FS=y
1220# CONFIG_EXT3_FS_XATTR is not set 1476# CONFIG_EXT3_FS_XATTR is not set
1477# CONFIG_EXT4_FS is not set
1221CONFIG_JBD=y 1478CONFIG_JBD=y
1222# CONFIG_JBD_DEBUG is not set
1223CONFIG_FS_MBCACHE=y 1479CONFIG_FS_MBCACHE=y
1224# CONFIG_REISERFS_FS is not set 1480# CONFIG_REISERFS_FS is not set
1225# CONFIG_JFS_FS is not set 1481# CONFIG_JFS_FS is not set
1226CONFIG_FS_POSIX_ACL=y 1482CONFIG_FS_POSIX_ACL=y
1483CONFIG_FILE_LOCKING=y
1227# CONFIG_XFS_FS is not set 1484# CONFIG_XFS_FS is not set
1228# CONFIG_MINIX_FS is not set 1485# CONFIG_OCFS2_FS is not set
1229# CONFIG_ROMFS_FS is not set 1486CONFIG_DNOTIFY=y
1230CONFIG_INOTIFY=y 1487CONFIG_INOTIFY=y
1488CONFIG_INOTIFY_USER=y
1231# CONFIG_QUOTA is not set 1489# CONFIG_QUOTA is not set
1232CONFIG_DNOTIFY=y
1233# CONFIG_AUTOFS_FS is not set 1490# CONFIG_AUTOFS_FS is not set
1234# CONFIG_AUTOFS4_FS is not set 1491# CONFIG_AUTOFS4_FS is not set
1235# CONFIG_FUSE_FS is not set 1492# CONFIG_FUSE_FS is not set
@@ -1254,11 +1511,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1254# Pseudo filesystems 1511# Pseudo filesystems
1255# 1512#
1256CONFIG_PROC_FS=y 1513CONFIG_PROC_FS=y
1514CONFIG_PROC_SYSCTL=y
1515CONFIG_PROC_PAGE_MONITOR=y
1257CONFIG_SYSFS=y 1516CONFIG_SYSFS=y
1258CONFIG_TMPFS=y 1517CONFIG_TMPFS=y
1518# CONFIG_TMPFS_POSIX_ACL is not set
1259# CONFIG_HUGETLB_PAGE is not set 1519# CONFIG_HUGETLB_PAGE is not set
1260CONFIG_RAMFS=y 1520# CONFIG_CONFIGFS_FS is not set
1261# CONFIG_RELAYFS_FS is not set
1262 1521
1263# 1522#
1264# Miscellaneous filesystems 1523# Miscellaneous filesystems
@@ -1270,39 +1529,42 @@ CONFIG_RAMFS=y
1270# CONFIG_BEFS_FS is not set 1529# CONFIG_BEFS_FS is not set
1271# CONFIG_BFS_FS is not set 1530# CONFIG_BFS_FS is not set
1272# CONFIG_EFS_FS is not set 1531# CONFIG_EFS_FS is not set
1273# CONFIG_JFFS_FS is not set
1274CONFIG_JFFS2_FS=y 1532CONFIG_JFFS2_FS=y
1275CONFIG_JFFS2_FS_DEBUG=0 1533CONFIG_JFFS2_FS_DEBUG=0
1276CONFIG_JFFS2_FS_WRITEBUFFER=y 1534CONFIG_JFFS2_FS_WRITEBUFFER=y
1535# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
1277CONFIG_JFFS2_SUMMARY=y 1536CONFIG_JFFS2_SUMMARY=y
1537# CONFIG_JFFS2_FS_XATTR is not set
1278CONFIG_JFFS2_COMPRESSION_OPTIONS=y 1538CONFIG_JFFS2_COMPRESSION_OPTIONS=y
1279CONFIG_JFFS2_ZLIB=y 1539CONFIG_JFFS2_ZLIB=y
1540# CONFIG_JFFS2_LZO is not set
1280CONFIG_JFFS2_RTIME=y 1541CONFIG_JFFS2_RTIME=y
1281CONFIG_JFFS2_RUBIN=y 1542CONFIG_JFFS2_RUBIN=y
1282# CONFIG_JFFS2_CMODE_NONE is not set 1543# CONFIG_JFFS2_CMODE_NONE is not set
1283CONFIG_JFFS2_CMODE_PRIORITY=y 1544CONFIG_JFFS2_CMODE_PRIORITY=y
1284# CONFIG_JFFS2_CMODE_SIZE is not set 1545# CONFIG_JFFS2_CMODE_SIZE is not set
1546# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
1285CONFIG_CRAMFS=m 1547CONFIG_CRAMFS=m
1286# CONFIG_VXFS_FS is not set 1548# CONFIG_VXFS_FS is not set
1549# CONFIG_MINIX_FS is not set
1550# CONFIG_OMFS_FS is not set
1287# CONFIG_HPFS_FS is not set 1551# CONFIG_HPFS_FS is not set
1288# CONFIG_QNX4FS_FS is not set 1552# CONFIG_QNX4FS_FS is not set
1553# CONFIG_ROMFS_FS is not set
1289# CONFIG_SYSV_FS is not set 1554# CONFIG_SYSV_FS is not set
1290# CONFIG_UFS_FS is not set 1555# CONFIG_UFS_FS is not set
1291 1556CONFIG_NETWORK_FILESYSTEMS=y
1292#
1293# Network File Systems
1294#
1295CONFIG_NFS_FS=m 1557CONFIG_NFS_FS=m
1296CONFIG_NFS_V3=y 1558CONFIG_NFS_V3=y
1297# CONFIG_NFS_V3_ACL is not set 1559# CONFIG_NFS_V3_ACL is not set
1298CONFIG_NFS_V4=y 1560CONFIG_NFS_V4=y
1299# CONFIG_NFS_DIRECTIO is not set
1300# CONFIG_NFSD is not set 1561# CONFIG_NFSD is not set
1301CONFIG_LOCKD=m 1562CONFIG_LOCKD=m
1302CONFIG_LOCKD_V4=y 1563CONFIG_LOCKD_V4=y
1303CONFIG_NFS_COMMON=y 1564CONFIG_NFS_COMMON=y
1304CONFIG_SUNRPC=m 1565CONFIG_SUNRPC=m
1305CONFIG_SUNRPC_GSS=m 1566CONFIG_SUNRPC_GSS=m
1567# CONFIG_SUNRPC_REGISTER_V4 is not set
1306CONFIG_RPCSEC_GSS_KRB5=m 1568CONFIG_RPCSEC_GSS_KRB5=m
1307# CONFIG_RPCSEC_GSS_SPKM3 is not set 1569# CONFIG_RPCSEC_GSS_SPKM3 is not set
1308CONFIG_SMB_FS=m 1570CONFIG_SMB_FS=m
@@ -1312,7 +1574,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
1312# CONFIG_NCP_FS is not set 1574# CONFIG_NCP_FS is not set
1313# CONFIG_CODA_FS is not set 1575# CONFIG_CODA_FS is not set
1314# CONFIG_AFS_FS is not set 1576# CONFIG_AFS_FS is not set
1315# CONFIG_9P_FS is not set
1316 1577
1317# 1578#
1318# Partition Types 1579# Partition Types
@@ -1332,11 +1593,9 @@ CONFIG_MSDOS_PARTITION=y
1332# CONFIG_SGI_PARTITION is not set 1593# CONFIG_SGI_PARTITION is not set
1333# CONFIG_ULTRIX_PARTITION is not set 1594# CONFIG_ULTRIX_PARTITION is not set
1334# CONFIG_SUN_PARTITION is not set 1595# CONFIG_SUN_PARTITION is not set
1596# CONFIG_KARMA_PARTITION is not set
1335# CONFIG_EFI_PARTITION is not set 1597# CONFIG_EFI_PARTITION is not set
1336 1598# CONFIG_SYSV68_PARTITION is not set
1337#
1338# Native Language Support
1339#
1340CONFIG_NLS=y 1599CONFIG_NLS=y
1341CONFIG_NLS_DEFAULT="cp437" 1600CONFIG_NLS_DEFAULT="cp437"
1342CONFIG_NLS_CODEPAGE_437=y 1601CONFIG_NLS_CODEPAGE_437=y
@@ -1377,35 +1636,71 @@ CONFIG_NLS_ISO8859_1=y
1377# CONFIG_NLS_KOI8_R is not set 1636# CONFIG_NLS_KOI8_R is not set
1378# CONFIG_NLS_KOI8_U is not set 1637# CONFIG_NLS_KOI8_U is not set
1379CONFIG_NLS_UTF8=y 1638CONFIG_NLS_UTF8=y
1380 1639# CONFIG_DLM is not set
1381#
1382# Profiling support
1383#
1384CONFIG_PROFILING=y
1385CONFIG_OPROFILE=m
1386 1640
1387# 1641#
1388# Kernel hacking 1642# Kernel hacking
1389# 1643#
1390# CONFIG_PRINTK_TIME is not set 1644# CONFIG_PRINTK_TIME is not set
1391CONFIG_DEBUG_KERNEL=y 1645CONFIG_ENABLE_WARN_DEPRECATED=y
1646CONFIG_ENABLE_MUST_CHECK=y
1647CONFIG_FRAME_WARN=1024
1392CONFIG_MAGIC_SYSRQ=y 1648CONFIG_MAGIC_SYSRQ=y
1393CONFIG_LOG_BUF_SHIFT=14 1649# CONFIG_UNUSED_SYMBOLS is not set
1650# CONFIG_DEBUG_FS is not set
1651# CONFIG_HEADERS_CHECK is not set
1652CONFIG_DEBUG_KERNEL=y
1653# CONFIG_DEBUG_SHIRQ is not set
1394CONFIG_DETECT_SOFTLOCKUP=y 1654CONFIG_DETECT_SOFTLOCKUP=y
1655# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1656CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1657CONFIG_SCHED_DEBUG=y
1395# CONFIG_SCHEDSTATS is not set 1658# CONFIG_SCHEDSTATS is not set
1396# CONFIG_DEBUG_SLAB is not set 1659# CONFIG_TIMER_STATS is not set
1660# CONFIG_DEBUG_OBJECTS is not set
1661# CONFIG_SLUB_DEBUG_ON is not set
1662# CONFIG_SLUB_STATS is not set
1397# CONFIG_DEBUG_PREEMPT is not set 1663# CONFIG_DEBUG_PREEMPT is not set
1664# CONFIG_DEBUG_RT_MUTEXES is not set
1665# CONFIG_RT_MUTEX_TESTER is not set
1398# CONFIG_DEBUG_SPINLOCK is not set 1666# CONFIG_DEBUG_SPINLOCK is not set
1667# CONFIG_DEBUG_MUTEXES is not set
1668# CONFIG_DEBUG_LOCK_ALLOC is not set
1669# CONFIG_PROVE_LOCKING is not set
1670# CONFIG_LOCK_STAT is not set
1399# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1671# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1672# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1400# CONFIG_DEBUG_KOBJECT is not set 1673# CONFIG_DEBUG_KOBJECT is not set
1401CONFIG_DEBUG_BUGVERBOSE=y 1674CONFIG_DEBUG_BUGVERBOSE=y
1402# CONFIG_DEBUG_INFO is not set 1675# CONFIG_DEBUG_INFO is not set
1403# CONFIG_DEBUG_FS is not set
1404# CONFIG_DEBUG_VM is not set 1676# CONFIG_DEBUG_VM is not set
1677# CONFIG_DEBUG_WRITECOUNT is not set
1678# CONFIG_DEBUG_MEMORY_INIT is not set
1679# CONFIG_DEBUG_LIST is not set
1680# CONFIG_DEBUG_SG is not set
1405CONFIG_FRAME_POINTER=y 1681CONFIG_FRAME_POINTER=y
1682# CONFIG_BOOT_PRINTK_DELAY is not set
1406# CONFIG_RCU_TORTURE_TEST is not set 1683# CONFIG_RCU_TORTURE_TEST is not set
1684# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1685# CONFIG_BACKTRACE_SELF_TEST is not set
1686# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1687# CONFIG_FAULT_INJECTION is not set
1688# CONFIG_LATENCYTOP is not set
1689# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1690CONFIG_HAVE_FTRACE=y
1691CONFIG_HAVE_DYNAMIC_FTRACE=y
1692# CONFIG_FTRACE is not set
1693# CONFIG_IRQSOFF_TRACER is not set
1694# CONFIG_PREEMPT_TRACER is not set
1695# CONFIG_SCHED_TRACER is not set
1696# CONFIG_CONTEXT_SWITCH_TRACER is not set
1697# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1698# CONFIG_SAMPLES is not set
1699CONFIG_HAVE_ARCH_KGDB=y
1700# CONFIG_KGDB is not set
1407# CONFIG_DEBUG_USER is not set 1701# CONFIG_DEBUG_USER is not set
1408CONFIG_DEBUG_ERRORS=y 1702CONFIG_DEBUG_ERRORS=y
1703# CONFIG_DEBUG_STACK_USAGE is not set
1409CONFIG_DEBUG_LL=y 1704CONFIG_DEBUG_LL=y
1410# CONFIG_DEBUG_ICEDCC is not set 1705# CONFIG_DEBUG_ICEDCC is not set
1411 1706
@@ -1414,46 +1709,113 @@ CONFIG_DEBUG_LL=y
1414# 1709#
1415# CONFIG_KEYS is not set 1710# CONFIG_KEYS is not set
1416# CONFIG_SECURITY is not set 1711# CONFIG_SECURITY is not set
1712# CONFIG_SECURITYFS is not set
1713# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1714CONFIG_CRYPTO=y
1417 1715
1418# 1716#
1419# Cryptographic options 1717# Crypto core or helper
1420# 1718#
1421CONFIG_CRYPTO=y 1719# CONFIG_CRYPTO_FIPS is not set
1422CONFIG_CRYPTO_HMAC=y 1720CONFIG_CRYPTO_ALGAPI=y
1721CONFIG_CRYPTO_AEAD=y
1722CONFIG_CRYPTO_BLKCIPHER=y
1723CONFIG_CRYPTO_HASH=y
1724CONFIG_CRYPTO_RNG=y
1725CONFIG_CRYPTO_MANAGER=y
1726# CONFIG_CRYPTO_GF128MUL is not set
1423CONFIG_CRYPTO_NULL=m 1727CONFIG_CRYPTO_NULL=m
1728# CONFIG_CRYPTO_CRYPTD is not set
1729CONFIG_CRYPTO_AUTHENC=m
1730CONFIG_CRYPTO_TEST=m
1731
1732#
1733# Authenticated Encryption with Associated Data
1734#
1735# CONFIG_CRYPTO_CCM is not set
1736# CONFIG_CRYPTO_GCM is not set
1737# CONFIG_CRYPTO_SEQIV is not set
1738
1739#
1740# Block modes
1741#
1742CONFIG_CRYPTO_CBC=m
1743# CONFIG_CRYPTO_CTR is not set
1744# CONFIG_CRYPTO_CTS is not set
1745CONFIG_CRYPTO_ECB=m
1746# CONFIG_CRYPTO_LRW is not set
1747# CONFIG_CRYPTO_PCBC is not set
1748# CONFIG_CRYPTO_XTS is not set
1749
1750#
1751# Hash modes
1752#
1753CONFIG_CRYPTO_HMAC=y
1754# CONFIG_CRYPTO_XCBC is not set
1755
1756#
1757# Digest
1758#
1759CONFIG_CRYPTO_CRC32C=m
1424CONFIG_CRYPTO_MD4=m 1760CONFIG_CRYPTO_MD4=m
1425CONFIG_CRYPTO_MD5=m 1761CONFIG_CRYPTO_MD5=m
1762CONFIG_CRYPTO_MICHAEL_MIC=m
1763# CONFIG_CRYPTO_RMD128 is not set
1764# CONFIG_CRYPTO_RMD160 is not set
1765# CONFIG_CRYPTO_RMD256 is not set
1766# CONFIG_CRYPTO_RMD320 is not set
1426CONFIG_CRYPTO_SHA1=m 1767CONFIG_CRYPTO_SHA1=m
1427CONFIG_CRYPTO_SHA256=m 1768CONFIG_CRYPTO_SHA256=m
1428CONFIG_CRYPTO_SHA512=m 1769CONFIG_CRYPTO_SHA512=m
1429CONFIG_CRYPTO_WP512=m
1430# CONFIG_CRYPTO_TGR192 is not set 1770# CONFIG_CRYPTO_TGR192 is not set
1431CONFIG_CRYPTO_DES=m 1771CONFIG_CRYPTO_WP512=m
1432CONFIG_CRYPTO_BLOWFISH=m 1772
1433CONFIG_CRYPTO_TWOFISH=m 1773#
1434CONFIG_CRYPTO_SERPENT=m 1774# Ciphers
1775#
1435CONFIG_CRYPTO_AES=m 1776CONFIG_CRYPTO_AES=m
1777CONFIG_CRYPTO_ANUBIS=m
1778CONFIG_CRYPTO_ARC4=m
1779CONFIG_CRYPTO_BLOWFISH=m
1780# CONFIG_CRYPTO_CAMELLIA is not set
1436CONFIG_CRYPTO_CAST5=m 1781CONFIG_CRYPTO_CAST5=m
1437CONFIG_CRYPTO_CAST6=m 1782CONFIG_CRYPTO_CAST6=m
1438CONFIG_CRYPTO_TEA=m 1783CONFIG_CRYPTO_DES=m
1439CONFIG_CRYPTO_ARC4=m 1784# CONFIG_CRYPTO_FCRYPT is not set
1440CONFIG_CRYPTO_KHAZAD=m 1785CONFIG_CRYPTO_KHAZAD=m
1441CONFIG_CRYPTO_ANUBIS=m 1786# CONFIG_CRYPTO_SALSA20 is not set
1787# CONFIG_CRYPTO_SEED is not set
1788CONFIG_CRYPTO_SERPENT=m
1789CONFIG_CRYPTO_TEA=m
1790CONFIG_CRYPTO_TWOFISH=m
1791CONFIG_CRYPTO_TWOFISH_COMMON=m
1792
1793#
1794# Compression
1795#
1442CONFIG_CRYPTO_DEFLATE=m 1796CONFIG_CRYPTO_DEFLATE=m
1443CONFIG_CRYPTO_MICHAEL_MIC=m 1797# CONFIG_CRYPTO_LZO is not set
1444CONFIG_CRYPTO_CRC32C=m
1445CONFIG_CRYPTO_TEST=m
1446 1798
1447# 1799#
1448# Hardware crypto devices 1800# Random Number Generation
1449# 1801#
1802# CONFIG_CRYPTO_ANSI_CPRNG is not set
1803CONFIG_CRYPTO_HW=y
1450 1804
1451# 1805#
1452# Library routines 1806# Library routines
1453# 1807#
1808CONFIG_BITREVERSE=y
1454CONFIG_CRC_CCITT=y 1809CONFIG_CRC_CCITT=y
1455# CONFIG_CRC16 is not set 1810# CONFIG_CRC16 is not set
1811# CONFIG_CRC_T10DIF is not set
1812# CONFIG_CRC_ITU_T is not set
1456CONFIG_CRC32=y 1813CONFIG_CRC32=y
1814# CONFIG_CRC7 is not set
1457CONFIG_LIBCRC32C=m 1815CONFIG_LIBCRC32C=m
1458CONFIG_ZLIB_INFLATE=y 1816CONFIG_ZLIB_INFLATE=y
1459CONFIG_ZLIB_DEFLATE=y 1817CONFIG_ZLIB_DEFLATE=y
1818CONFIG_PLIST=y
1819CONFIG_HAS_IOMEM=y
1820CONFIG_HAS_IOPORT=y
1821CONFIG_HAS_DMA=y
diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig
index 8b7a431a8bfc..9033d147f052 100644
--- a/arch/arm/configs/trizeps4_defconfig
+++ b/arch/arm/configs/trizeps4_defconfig
@@ -147,6 +147,7 @@ CONFIG_ARCH_PXA=y
147# CONFIG_MACH_MAINSTONE is not set 147# CONFIG_MACH_MAINSTONE is not set
148# CONFIG_ARCH_PXA_IDP is not set 148# CONFIG_ARCH_PXA_IDP is not set
149# CONFIG_PXA_SHARPSL is not set 149# CONFIG_PXA_SHARPSL is not set
150CONFIG_TRIZEPS_PXA=y
150CONFIG_MACH_TRIZEPS4=y 151CONFIG_MACH_TRIZEPS4=y
151CONFIG_MACH_TRIZEPS4_CONXS=y 152CONFIG_MACH_TRIZEPS4_CONXS=y
152# CONFIG_MACH_TRIZEPS4_ANY is not set 153# CONFIG_MACH_TRIZEPS4_ANY is not set
diff --git a/arch/arm/include/asm/div64.h b/arch/arm/include/asm/div64.h
index 5001390be958..d3f0a9eee9f6 100644
--- a/arch/arm/include/asm/div64.h
+++ b/arch/arm/include/asm/div64.h
@@ -165,7 +165,7 @@
165 __res = __m; \ 165 __res = __m; \
166 asm ( "umlal %Q0, %R0, %Q1, %Q2\n\t" \ 166 asm ( "umlal %Q0, %R0, %Q1, %Q2\n\t" \
167 "mov %Q0, #0" \ 167 "mov %Q0, #0" \
168 : "+r" (__res) \ 168 : "+&r" (__res) \
169 : "r" (__m), "r" (__n) \ 169 : "r" (__m), "r" (__n) \
170 : "cc" ); \ 170 : "cc" ); \
171 } else { \ 171 } else { \
@@ -182,7 +182,7 @@
182 "umlal %R0, %Q0, %Q1, %R2\n\t" \ 182 "umlal %R0, %Q0, %Q1, %R2\n\t" \
183 "mov %R0, #0\n\t" \ 183 "mov %R0, #0\n\t" \
184 "umlal %Q0, %R0, %R1, %R2" \ 184 "umlal %Q0, %R0, %R1, %R2" \
185 : "+r" (__res) \ 185 : "+&r" (__res) \
186 : "r" (__m), "r" (__n) \ 186 : "r" (__m), "r" (__n) \
187 : "cc" ); \ 187 : "cc" ); \
188 } else { \ 188 } else { \
@@ -192,7 +192,7 @@
192 "adds %Q0, %1, %Q0\n\t" \ 192 "adds %Q0, %1, %Q0\n\t" \
193 "adc %R0, %R0, #0\n\t" \ 193 "adc %R0, %R0, #0\n\t" \
194 "umlal %Q0, %R0, %R2, %R3" \ 194 "umlal %Q0, %R0, %R2, %R3" \
195 : "+r" (__res), "+r" (__z) \ 195 : "+&r" (__res), "+&r" (__z) \
196 : "r" (__m), "r" (__n) \ 196 : "r" (__m), "r" (__n) \
197 : "cc" ); \ 197 : "cc" ); \
198 } \ 198 } \
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c
index 7e5ebb5bdd17..9b0447c3d59b 100644
--- a/arch/arm/mach-at91/gpio.c
+++ b/arch/arm/mach-at91/gpio.c
@@ -404,6 +404,7 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
404 } 404 }
405 405
406 pin = bank->chipbase; 406 pin = bank->chipbase;
407 gpio = &irq_desc[pin];
407 408
408 while (isr) { 409 while (isr) {
409 if (isr & 1) { 410 if (isr & 1) {
diff --git a/arch/arm/mach-clps711x/include/mach/memory.h b/arch/arm/mach-clps711x/include/mach/memory.h
index 71c2fa70c8e8..98ec30c97bbe 100644
--- a/arch/arm/mach-clps711x/include/mach/memory.h
+++ b/arch/arm/mach-clps711x/include/mach/memory.h
@@ -89,6 +89,8 @@
89 * node 3: 0xd8000000 - 0xdfffffff 89 * node 3: 0xd8000000 - 0xdfffffff
90 */ 90 */
91#define NODE_MEM_SIZE_BITS 24 91#define NODE_MEM_SIZE_BITS 24
92#define SECTION_SIZE_BITS 24
93#define MAX_PHYSMEM_BITS 32
92 94
93#endif 95#endif
94 96
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index db8b5fe06c0d..2c5a02b8520e 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -167,11 +167,6 @@ config MACH_GTWX5715
167 167
168comment "IXP4xx Options" 168comment "IXP4xx Options"
169 169
170config DMABOUNCE
171 bool
172 default y
173 depends on PCI
174
175config IXP4XX_INDIRECT_PCI 170config IXP4XX_INDIRECT_PCI
176 bool "Use indirect PCI memory access" 171 bool "Use indirect PCI memory access"
177 depends on PCI 172 depends on PCI
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index e14bf40bfb07..b96c55dad343 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -2,4 +2,4 @@ obj-y += common.o addr-map.o irq.o pcie.o
2 2
3obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o 3obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o
4obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o 4obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o
5obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6281-setup.o 5obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 85cad05d8c5b..0bb1fbd84ccb 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -16,6 +16,7 @@
16#include <linux/mv643xx_eth.h> 16#include <linux/mv643xx_eth.h>
17#include <linux/ata_platform.h> 17#include <linux/ata_platform.h>
18#include <linux/spi/orion_spi.h> 18#include <linux/spi/orion_spi.h>
19#include <net/dsa.h>
19#include <asm/page.h> 20#include <asm/page.h>
20#include <asm/timex.h> 21#include <asm/timex.h>
21#include <asm/mach/map.h> 22#include <asm/mach/map.h>
@@ -152,6 +153,40 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)
152 153
153 154
154/***************************************************************************** 155/*****************************************************************************
156 * Ethernet switch
157 ****************************************************************************/
158static struct resource kirkwood_switch_resources[] = {
159 {
160 .start = 0,
161 .end = 0,
162 .flags = IORESOURCE_IRQ,
163 },
164};
165
166static struct platform_device kirkwood_switch_device = {
167 .name = "dsa",
168 .id = 0,
169 .num_resources = 0,
170 .resource = kirkwood_switch_resources,
171};
172
173void __init kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq)
174{
175 if (irq != NO_IRQ) {
176 kirkwood_switch_resources[0].start = irq;
177 kirkwood_switch_resources[0].end = irq;
178 kirkwood_switch_device.num_resources = 1;
179 }
180
181 d->mii_bus = &kirkwood_ge00_shared.dev;
182 d->netdev = &kirkwood_ge00.dev;
183 kirkwood_switch_device.dev.platform_data = d;
184
185 platform_device_register(&kirkwood_switch_device);
186}
187
188
189/*****************************************************************************
155 * SoC RTC 190 * SoC RTC
156 ****************************************************************************/ 191 ****************************************************************************/
157static struct resource kirkwood_rtc_resource = { 192static struct resource kirkwood_rtc_resource = {
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index 8fa0f6a27635..5774632a67e3 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@ -11,6 +11,7 @@
11#ifndef __ARCH_KIRKWOOD_COMMON_H 11#ifndef __ARCH_KIRKWOOD_COMMON_H
12#define __ARCH_KIRKWOOD_COMMON_H 12#define __ARCH_KIRKWOOD_COMMON_H
13 13
14struct dsa_platform_data;
14struct mv643xx_eth_platform_data; 15struct mv643xx_eth_platform_data;
15struct mv_sata_platform_data; 16struct mv_sata_platform_data;
16 17
@@ -29,6 +30,7 @@ void kirkwood_pcie_id(u32 *dev, u32 *rev);
29 30
30void kirkwood_ehci_init(void); 31void kirkwood_ehci_init(void);
31void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); 32void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data);
33void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq);
32void kirkwood_pcie_init(void); 34void kirkwood_pcie_init(void);
33void kirkwood_rtc_init(void); 35void kirkwood_rtc_init(void);
34void kirkwood_sata_init(struct mv_sata_platform_data *sata_data); 36void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index f785093e433f..175054abd630 100644
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -19,6 +19,7 @@
19#include <linux/ata_platform.h> 19#include <linux/ata_platform.h>
20#include <linux/mv643xx_eth.h> 20#include <linux/mv643xx_eth.h>
21#include <linux/ethtool.h> 21#include <linux/ethtool.h>
22#include <net/dsa.h>
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/mach/pci.h> 25#include <asm/mach/pci.h>
@@ -74,6 +75,15 @@ static struct mv643xx_eth_platform_data rd88f6281_ge00_data = {
74 .duplex = DUPLEX_FULL, 75 .duplex = DUPLEX_FULL,
75}; 76};
76 77
78static struct dsa_platform_data rd88f6281_switch_data = {
79 .port_names[0] = "lan1",
80 .port_names[1] = "lan2",
81 .port_names[2] = "lan3",
82 .port_names[3] = "lan4",
83 .port_names[4] = "wan",
84 .port_names[5] = "cpu",
85};
86
77static struct mv_sata_platform_data rd88f6281_sata_data = { 87static struct mv_sata_platform_data rd88f6281_sata_data = {
78 .n_ports = 2, 88 .n_ports = 2,
79}; 89};
@@ -87,6 +97,7 @@ static void __init rd88f6281_init(void)
87 97
88 kirkwood_ehci_init(); 98 kirkwood_ehci_init();
89 kirkwood_ge00_init(&rd88f6281_ge00_data); 99 kirkwood_ge00_init(&rd88f6281_ge00_data);
100 kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ);
90 kirkwood_rtc_init(); 101 kirkwood_rtc_init();
91 kirkwood_sata_init(&rd88f6281_sata_data); 102 kirkwood_sata_init(&rd88f6281_sata_data);
92 kirkwood_uart0_init(); 103 kirkwood_uart0_init();
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 3553babbbf05..d140abca690a 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1,18 +1,13 @@
1if ARCH_MSM7X00A 1if ARCH_MSM
2 2
3comment "MSM7X00A Board Type" 3comment "MSM Board Type"
4 depends on ARCH_MSM7X00A 4 depends on ARCH_MSM
5 5
6config MACH_HALIBUT 6config MACH_HALIBUT
7 depends on ARCH_MSM7X00A 7 depends on ARCH_MSM
8 default y 8 default y
9 bool "Halibut Board (QCT SURF7200A)" 9 bool "Halibut Board (QCT SURF7201A)"
10 help 10 help
11 Support for the Qualcomm SURF7200A eval board. 11 Support for the Qualcomm SURF7201A eval board.
12
13config MSM7X00A_IDLE
14 depends on ARCH_MSM7X00A
15 default y
16 bool "Idle Support for MSM7X00A"
17 12
18endif 13endif
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index d12f23655850..1aa47001aa3b 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,7 +1,8 @@
1obj-y += io.o idle.o irq.o timer.o dma.o 1obj-y += io.o idle.o irq.o timer.o dma.o
2 2obj-y += devices.o
3# Common code for board init 3obj-y += proc_comm.o
4obj-y += common.o 4obj-y += vreg.o
5obj-y += clock.o clock-7x01a.o
5 6
6obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o 7obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o
7 8
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c
index a24259133e07..c2a96e3965a6 100644
--- a/arch/arm/mach-msm/board-halibut.c
+++ b/arch/arm/mach-msm/board-halibut.c
@@ -33,6 +33,8 @@
33#include <linux/mtd/nand.h> 33#include <linux/mtd/nand.h>
34#include <linux/mtd/partitions.h> 34#include <linux/mtd/partitions.h>
35 35
36#include "devices.h"
37
36static struct resource smc91x_resources[] = { 38static struct resource smc91x_resources[] = {
37 [0] = { 39 [0] = {
38 .start = 0x9C004300, 40 .start = 0x9C004300,
@@ -53,31 +55,12 @@ static struct platform_device smc91x_device = {
53 .resource = smc91x_resources, 55 .resource = smc91x_resources,
54}; 56};
55 57
56static void mddi0_panel_power(int on)
57{
58}
59
60static struct msm_mddi_platform_data msm_mddi0_pdata = {
61 .panel_power = mddi0_panel_power,
62 .has_vsync_irq = 0,
63};
64
65static struct platform_device msm_mddi0_device = {
66 .name = "msm_mddi",
67 .id = 0,
68 .dev = {
69 .platform_data = &msm_mddi0_pdata
70 },
71};
72
73static struct platform_device msm_serial0_device = {
74 .name = "msm_serial",
75 .id = 0,
76};
77
78static struct platform_device *devices[] __initdata = { 58static struct platform_device *devices[] __initdata = {
79 &msm_serial0_device, 59 &msm_device_uart3,
80 &msm_mddi0_device, 60 &msm_device_smd,
61 &msm_device_nand,
62 &msm_device_hsusb,
63 &msm_device_i2c,
81 &smc91x_device, 64 &smc91x_device,
82}; 65};
83 66
@@ -91,20 +74,15 @@ static void __init halibut_init_irq(void)
91static void __init halibut_init(void) 74static void __init halibut_init(void)
92{ 75{
93 platform_add_devices(devices, ARRAY_SIZE(devices)); 76 platform_add_devices(devices, ARRAY_SIZE(devices));
94 msm_add_devices();
95} 77}
96 78
97static void __init halibut_map_io(void) 79static void __init halibut_map_io(void)
98{ 80{
99 msm_map_common_io(); 81 msm_map_common_io();
82 msm_clock_init();
100} 83}
101 84
102MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)") 85MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")
103
104/* UART for LL DEBUG */
105 .phys_io = MSM_UART1_PHYS,
106 .io_pg_offst = ((MSM_UART1_BASE) >> 18) & 0xfffc,
107
108 .boot_params = 0x10000100, 86 .boot_params = 0x10000100,
109 .map_io = halibut_map_io, 87 .map_io = halibut_map_io,
110 .init_irq = halibut_init_irq, 88 .init_irq = halibut_init_irq,
diff --git a/arch/arm/mach-msm/clock-7x01a.c b/arch/arm/mach-msm/clock-7x01a.c
new file mode 100644
index 000000000000..62230a3428ee
--- /dev/null
+++ b/arch/arm/mach-msm/clock-7x01a.c
@@ -0,0 +1,126 @@
1/* arch/arm/mach-msm/clock-7x01a.c
2 *
3 * Clock tables for MSM7X01A
4 *
5 * Copyright (C) 2007 Google, Inc.
6 * Copyright (c) 2007 QUALCOMM Incorporated
7 *
8 * This software is licensed under the terms of the GNU General Public
9 * License version 2, as published by the Free Software Foundation, and
10 * may be copied, distributed, and modified under those terms.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 */
18
19#include <linux/kernel.h>
20#include <linux/platform_device.h>
21
22#include "clock.h"
23#include "devices.h"
24
25/* clock IDs used by the modem processor */
26
27#define ACPU_CLK 0 /* Applications processor clock */
28#define ADM_CLK 1 /* Applications data mover clock */
29#define ADSP_CLK 2 /* ADSP clock */
30#define EBI1_CLK 3 /* External bus interface 1 clock */
31#define EBI2_CLK 4 /* External bus interface 2 clock */
32#define ECODEC_CLK 5 /* External CODEC clock */
33#define EMDH_CLK 6 /* External MDDI host clock */
34#define GP_CLK 7 /* General purpose clock */
35#define GRP_CLK 8 /* Graphics clock */
36#define I2C_CLK 9 /* I2C clock */
37#define ICODEC_RX_CLK 10 /* Internal CODEX RX clock */
38#define ICODEC_TX_CLK 11 /* Internal CODEX TX clock */
39#define IMEM_CLK 12 /* Internal graphics memory clock */
40#define MDC_CLK 13 /* MDDI client clock */
41#define MDP_CLK 14 /* Mobile display processor clock */
42#define PBUS_CLK 15 /* Peripheral bus clock */
43#define PCM_CLK 16 /* PCM clock */
44#define PMDH_CLK 17 /* Primary MDDI host clock */
45#define SDAC_CLK 18 /* Stereo DAC clock */
46#define SDC1_CLK 19 /* Secure Digital Card clocks */
47#define SDC1_PCLK 20
48#define SDC2_CLK 21
49#define SDC2_PCLK 22
50#define SDC3_CLK 23
51#define SDC3_PCLK 24
52#define SDC4_CLK 25
53#define SDC4_PCLK 26
54#define TSIF_CLK 27 /* Transport Stream Interface clocks */
55#define TSIF_REF_CLK 28
56#define TV_DAC_CLK 29 /* TV clocks */
57#define TV_ENC_CLK 30
58#define UART1_CLK 31 /* UART clocks */
59#define UART2_CLK 32
60#define UART3_CLK 33
61#define UART1DM_CLK 34
62#define UART2DM_CLK 35
63#define USB_HS_CLK 36 /* High speed USB core clock */
64#define USB_HS_PCLK 37 /* High speed USB pbus clock */
65#define USB_OTG_CLK 38 /* Full speed USB clock */
66#define VDC_CLK 39 /* Video controller clock */
67#define VFE_CLK 40 /* Camera / Video Front End clock */
68#define VFE_MDC_CLK 41 /* VFE MDDI client clock */
69
70#define NR_CLKS 42
71
72#define CLOCK(clk_name, clk_id, clk_dev, clk_flags) { \
73 .name = clk_name, \
74 .id = clk_id, \
75 .flags = clk_flags, \
76 .dev = clk_dev, \
77 }
78
79#define OFF CLKFLAG_AUTO_OFF
80#define MINMAX CLKFLAG_USE_MIN_MAX_TO_SET
81
82struct clk msm_clocks[] = {
83 CLOCK("adm_clk", ADM_CLK, NULL, 0),
84 CLOCK("adsp_clk", ADSP_CLK, NULL, 0),
85 CLOCK("ebi1_clk", EBI1_CLK, NULL, 0),
86 CLOCK("ebi2_clk", EBI2_CLK, NULL, 0),
87 CLOCK("ecodec_clk", ECODEC_CLK, NULL, 0),
88 CLOCK("emdh_clk", EMDH_CLK, NULL, OFF),
89 CLOCK("gp_clk", GP_CLK, NULL, 0),
90 CLOCK("grp_clk", GRP_CLK, NULL, OFF),
91 CLOCK("i2c_clk", I2C_CLK, &msm_device_i2c.dev, 0),
92 CLOCK("icodec_rx_clk", ICODEC_RX_CLK, NULL, 0),
93 CLOCK("icodec_tx_clk", ICODEC_TX_CLK, NULL, 0),
94 CLOCK("imem_clk", IMEM_CLK, NULL, OFF),
95 CLOCK("mdc_clk", MDC_CLK, NULL, 0),
96 CLOCK("mdp_clk", MDP_CLK, NULL, OFF),
97 CLOCK("pbus_clk", PBUS_CLK, NULL, 0),
98 CLOCK("pcm_clk", PCM_CLK, NULL, 0),
99 CLOCK("pmdh_clk", PMDH_CLK, NULL, OFF | MINMAX),
100 CLOCK("sdac_clk", SDAC_CLK, NULL, OFF),
101 CLOCK("sdc_clk", SDC1_CLK, &msm_device_sdc1.dev, OFF),
102 CLOCK("sdc_pclk", SDC1_PCLK, &msm_device_sdc1.dev, OFF),
103 CLOCK("sdc_clk", SDC2_CLK, &msm_device_sdc2.dev, OFF),
104 CLOCK("sdc_pclk", SDC2_PCLK, &msm_device_sdc2.dev, OFF),
105 CLOCK("sdc_clk", SDC3_CLK, &msm_device_sdc3.dev, OFF),
106 CLOCK("sdc_pclk", SDC3_PCLK, &msm_device_sdc3.dev, OFF),
107 CLOCK("sdc_clk", SDC4_CLK, &msm_device_sdc4.dev, OFF),
108 CLOCK("sdc_pclk", SDC4_PCLK, &msm_device_sdc4.dev, OFF),
109 CLOCK("tsif_clk", TSIF_CLK, NULL, 0),
110 CLOCK("tsif_ref_clk", TSIF_REF_CLK, NULL, 0),
111 CLOCK("tv_dac_clk", TV_DAC_CLK, NULL, 0),
112 CLOCK("tv_enc_clk", TV_ENC_CLK, NULL, 0),
113 CLOCK("uart_clk", UART1_CLK, &msm_device_uart1.dev, OFF),
114 CLOCK("uart_clk", UART2_CLK, &msm_device_uart2.dev, 0),
115 CLOCK("uart_clk", UART3_CLK, &msm_device_uart3.dev, OFF),
116 CLOCK("uart1dm_clk", UART1DM_CLK, NULL, OFF),
117 CLOCK("uart2dm_clk", UART2DM_CLK, NULL, 0),
118 CLOCK("usb_hs_clk", USB_HS_CLK, &msm_device_hsusb.dev, OFF),
119 CLOCK("usb_hs_pclk", USB_HS_PCLK, &msm_device_hsusb.dev, OFF),
120 CLOCK("usb_otg_clk", USB_OTG_CLK, NULL, 0),
121 CLOCK("vdc_clk", VDC_CLK, NULL, OFF | MINMAX),
122 CLOCK("vfe_clk", VFE_CLK, NULL, OFF),
123 CLOCK("vfe_mdc_clk", VFE_MDC_CLK, NULL, OFF),
124};
125
126unsigned msm_num_clocks = ARRAY_SIZE(msm_clocks);
diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c
new file mode 100644
index 000000000000..3b1ce36f1032
--- /dev/null
+++ b/arch/arm/mach-msm/clock.c
@@ -0,0 +1,218 @@
1/* arch/arm/mach-msm/clock.c
2 *
3 * Copyright (C) 2007 Google, Inc.
4 * Copyright (c) 2007 QUALCOMM Incorporated
5 *
6 * This software is licensed under the terms of the GNU General Public
7 * License version 2, as published by the Free Software Foundation, and
8 * may be copied, distributed, and modified under those terms.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 */
16
17#include <linux/version.h>
18#include <linux/kernel.h>
19#include <linux/init.h>
20#include <linux/module.h>
21#include <linux/list.h>
22#include <linux/err.h>
23#include <linux/clk.h>
24#include <linux/spinlock.h>
25
26#include "clock.h"
27#include "proc_comm.h"
28
29static DEFINE_MUTEX(clocks_mutex);
30static DEFINE_SPINLOCK(clocks_lock);
31static LIST_HEAD(clocks);
32
33/*
34 * glue for the proc_comm interface
35 */
36static inline int pc_clk_enable(unsigned id)
37{
38 return msm_proc_comm(PCOM_CLKCTL_RPC_ENABLE, &id, NULL);
39}
40
41static inline void pc_clk_disable(unsigned id)
42{
43 msm_proc_comm(PCOM_CLKCTL_RPC_DISABLE, &id, NULL);
44}
45
46static inline int pc_clk_set_rate(unsigned id, unsigned rate)
47{
48 return msm_proc_comm(PCOM_CLKCTL_RPC_SET_RATE, &id, &rate);
49}
50
51static inline int pc_clk_set_min_rate(unsigned id, unsigned rate)
52{
53 return msm_proc_comm(PCOM_CLKCTL_RPC_MIN_RATE, &id, &rate);
54}
55
56static inline int pc_clk_set_max_rate(unsigned id, unsigned rate)
57{
58 return msm_proc_comm(PCOM_CLKCTL_RPC_MAX_RATE, &id, &rate);
59}
60
61static inline int pc_clk_set_flags(unsigned id, unsigned flags)
62{
63 return msm_proc_comm(PCOM_CLKCTL_RPC_SET_FLAGS, &id, &flags);
64}
65
66static inline unsigned pc_clk_get_rate(unsigned id)
67{
68 if (msm_proc_comm(PCOM_CLKCTL_RPC_RATE, &id, NULL))
69 return 0;
70 else
71 return id;
72}
73
74static inline unsigned pc_clk_is_enabled(unsigned id)
75{
76 if (msm_proc_comm(PCOM_CLKCTL_RPC_ENABLED, &id, NULL))
77 return 0;
78 else
79 return id;
80}
81
82static inline int pc_pll_request(unsigned id, unsigned on)
83{
84 on = !!on;
85 return msm_proc_comm(PCOM_CLKCTL_RPC_PLL_REQUEST, &id, &on);
86}
87
88/*
89 * Standard clock functions defined in include/linux/clk.h
90 */
91struct clk *clk_get(struct device *dev, const char *id)
92{
93 struct clk *clk;
94
95 mutex_lock(&clocks_mutex);
96
97 list_for_each_entry(clk, &clocks, list)
98 if (!strcmp(id, clk->name) && clk->dev == dev)
99 goto found_it;
100
101 list_for_each_entry(clk, &clocks, list)
102 if (!strcmp(id, clk->name) && clk->dev == NULL)
103 goto found_it;
104
105 clk = ERR_PTR(-ENOENT);
106found_it:
107 mutex_unlock(&clocks_mutex);
108 return clk;
109}
110EXPORT_SYMBOL(clk_get);
111
112void clk_put(struct clk *clk)
113{
114}
115EXPORT_SYMBOL(clk_put);
116
117int clk_enable(struct clk *clk)
118{
119 unsigned long flags;
120 spin_lock_irqsave(&clocks_lock, flags);
121 clk->count++;
122 if (clk->count == 1)
123 pc_clk_enable(clk->id);
124 spin_unlock_irqrestore(&clocks_lock, flags);
125 return 0;
126}
127EXPORT_SYMBOL(clk_enable);
128
129void clk_disable(struct clk *clk)
130{
131 unsigned long flags;
132 spin_lock_irqsave(&clocks_lock, flags);
133 BUG_ON(clk->count == 0);
134 clk->count--;
135 if (clk->count == 0)
136 pc_clk_disable(clk->id);
137 spin_unlock_irqrestore(&clocks_lock, flags);
138}
139EXPORT_SYMBOL(clk_disable);
140
141unsigned long clk_get_rate(struct clk *clk)
142{
143 return pc_clk_get_rate(clk->id);
144}
145EXPORT_SYMBOL(clk_get_rate);
146
147int clk_set_rate(struct clk *clk, unsigned long rate)
148{
149 int ret;
150 if (clk->flags & CLKFLAG_USE_MIN_MAX_TO_SET) {
151 ret = pc_clk_set_max_rate(clk->id, rate);
152 if (ret)
153 return ret;
154 return pc_clk_set_min_rate(clk->id, rate);
155 }
156 return pc_clk_set_rate(clk->id, rate);
157}
158EXPORT_SYMBOL(clk_set_rate);
159
160int clk_set_parent(struct clk *clk, struct clk *parent)
161{
162 return -ENOSYS;
163}
164EXPORT_SYMBOL(clk_set_parent);
165
166struct clk *clk_get_parent(struct clk *clk)
167{
168 return ERR_PTR(-ENOSYS);
169}
170EXPORT_SYMBOL(clk_get_parent);
171
172int clk_set_flags(struct clk *clk, unsigned long flags)
173{
174 if (clk == NULL || IS_ERR(clk))
175 return -EINVAL;
176 return pc_clk_set_flags(clk->id, flags);
177}
178EXPORT_SYMBOL(clk_set_flags);
179
180
181void __init msm_clock_init(void)
182{
183 unsigned n;
184
185 spin_lock_init(&clocks_lock);
186 mutex_lock(&clocks_mutex);
187 for (n = 0; n < msm_num_clocks; n++)
188 list_add_tail(&msm_clocks[n].list, &clocks);
189 mutex_unlock(&clocks_mutex);
190}
191
192/* The bootloader and/or AMSS may have left various clocks enabled.
193 * Disable any clocks that belong to us (CLKFLAG_AUTO_OFF) but have
194 * not been explicitly enabled by a clk_enable() call.
195 */
196static int __init clock_late_init(void)
197{
198 unsigned long flags;
199 struct clk *clk;
200 unsigned count = 0;
201
202 mutex_lock(&clocks_mutex);
203 list_for_each_entry(clk, &clocks, list) {
204 if (clk->flags & CLKFLAG_AUTO_OFF) {
205 spin_lock_irqsave(&clocks_lock, flags);
206 if (!clk->count) {
207 count++;
208 pc_clk_disable(clk->id);
209 }
210 spin_unlock_irqrestore(&clocks_lock, flags);
211 }
212 }
213 mutex_unlock(&clocks_mutex);
214 pr_info("clock_late_init() disabled %d unused clocks\n", count);
215 return 0;
216}
217
218late_initcall(clock_late_init);
diff --git a/arch/arm/mach-msm/clock.h b/arch/arm/mach-msm/clock.h
new file mode 100644
index 000000000000..f875e1544e5f
--- /dev/null
+++ b/arch/arm/mach-msm/clock.h
@@ -0,0 +1,48 @@
1/* arch/arm/mach-msm/clock.h
2 *
3 * Copyright (C) 2007 Google, Inc.
4 * Copyright (c) 2007 QUALCOMM Incorporated
5 *
6 * This software is licensed under the terms of the GNU General Public
7 * License version 2, as published by the Free Software Foundation, and
8 * may be copied, distributed, and modified under those terms.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 */
16
17#ifndef __ARCH_ARM_MACH_MSM_CLOCK_H
18#define __ARCH_ARM_MACH_MSM_CLOCK_H
19
20#include <linux/list.h>
21
22#define CLKFLAG_INVERT 0x00000001
23#define CLKFLAG_NOINVERT 0x00000002
24#define CLKFLAG_NONEST 0x00000004
25#define CLKFLAG_NORESET 0x00000008
26
27#define CLK_FIRST_AVAILABLE_FLAG 0x00000100
28#define CLKFLAG_USE_MIN_MAX_TO_SET 0x00000200
29#define CLKFLAG_AUTO_OFF 0x00000400
30
31struct clk {
32 uint32_t id;
33 uint32_t count;
34 uint32_t flags;
35 const char *name;
36 struct list_head list;
37 struct device *dev;
38};
39
40#define A11S_CLK_CNTL_ADDR (MSM_CSR_BASE + 0x100)
41#define A11S_CLK_SEL_ADDR (MSM_CSR_BASE + 0x104)
42#define A11S_VDD_SVS_PLEVEL_ADDR (MSM_CSR_BASE + 0x124)
43
44extern struct clk msm_clocks[];
45extern unsigned msm_num_clocks;
46
47#endif
48
diff --git a/arch/arm/mach-msm/common.c b/arch/arm/mach-msm/common.c
deleted file mode 100644
index 604f8ade9587..000000000000
--- a/arch/arm/mach-msm/common.c
+++ /dev/null
@@ -1,116 +0,0 @@
1/* linux/arch/arm/mach-msm/common.c
2 *
3 * Common setup code for MSM7K Boards
4 *
5 * Copyright (C) 2007 Google, Inc.
6 * Author: Brian Swetland <swetland@google.com>
7 *
8 * This software is licensed under the terms of the GNU General Public
9 * License version 2, as published by the Free Software Foundation, and
10 * may be copied, distributed, and modified under those terms.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 */
18
19#include <linux/kernel.h>
20#include <linux/init.h>
21#include <linux/platform_device.h>
22#include <linux/io.h>
23
24#include <asm/mach/flash.h>
25
26#include <asm/setup.h>
27
28#include <linux/mtd/nand.h>
29#include <linux/mtd/partitions.h>
30
31#include <mach/msm_iomap.h>
32
33#include <mach/board.h>
34
35struct flash_platform_data msm_nand_data = {
36 .parts = 0,
37 .nr_parts = 0,
38};
39
40static struct resource msm_nand_resources[] = {
41 [0] = {
42 .start = 7,
43 .end = 7,
44 .flags = IORESOURCE_DMA,
45 },
46};
47
48static struct platform_device msm_nand_device = {
49 .name = "msm_nand",
50 .id = -1,
51 .num_resources = ARRAY_SIZE(msm_nand_resources),
52 .resource = msm_nand_resources,
53 .dev = {
54 .platform_data = &msm_nand_data,
55 },
56};
57
58static struct platform_device msm_smd_device = {
59 .name = "msm_smd",
60 .id = -1,
61};
62
63static struct resource msm_i2c_resources[] = {
64 {
65 .start = MSM_I2C_BASE,
66 .end = MSM_I2C_BASE + MSM_I2C_SIZE - 1,
67 .flags = IORESOURCE_MEM,
68 },
69 {
70 .start = INT_PWB_I2C,
71 .end = INT_PWB_I2C,
72 .flags = IORESOURCE_IRQ,
73 },
74};
75
76static struct platform_device msm_i2c_device = {
77 .name = "msm_i2c",
78 .id = 0,
79 .num_resources = ARRAY_SIZE(msm_i2c_resources),
80 .resource = msm_i2c_resources,
81};
82
83static struct resource usb_resources[] = {
84 {
85 .start = MSM_HSUSB_PHYS,
86 .end = MSM_HSUSB_PHYS + MSM_HSUSB_SIZE,
87 .flags = IORESOURCE_MEM,
88 },
89 {
90 .start = INT_USB_HS,
91 .end = INT_USB_HS,
92 .flags = IORESOURCE_IRQ,
93 },
94};
95
96static struct platform_device msm_hsusb_device = {
97 .name = "msm_hsusb",
98 .id = -1,
99 .num_resources = ARRAY_SIZE(usb_resources),
100 .resource = usb_resources,
101 .dev = {
102 .coherent_dma_mask = 0xffffffff,
103 },
104};
105
106static struct platform_device *devices[] __initdata = {
107 &msm_nand_device,
108 &msm_smd_device,
109 &msm_i2c_device,
110 &msm_hsusb_device,
111};
112
113void __init msm_add_devices(void)
114{
115 platform_add_devices(devices, ARRAY_SIZE(devices));
116}
diff --git a/arch/arm/mach-msm/devices.c b/arch/arm/mach-msm/devices.c
new file mode 100644
index 000000000000..f2a74b92a97f
--- /dev/null
+++ b/arch/arm/mach-msm/devices.c
@@ -0,0 +1,267 @@
1/* linux/arch/arm/mach-msm/devices.c
2 *
3 * Copyright (C) 2008 Google, Inc.
4 *
5 * This software is licensed under the terms of the GNU General Public
6 * License version 2, as published by the Free Software Foundation, and
7 * may be copied, distributed, and modified under those terms.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 */
15
16#include <linux/kernel.h>
17#include <linux/platform_device.h>
18
19#include <mach/msm_iomap.h>
20#include "devices.h"
21
22#include <asm/mach/flash.h>
23#include <linux/mtd/nand.h>
24#include <linux/mtd/partitions.h>
25
26static struct resource resources_uart1[] = {
27 {
28 .start = INT_UART1,
29 .end = INT_UART1,
30 .flags = IORESOURCE_IRQ,
31 },
32 {
33 .start = MSM_UART1_PHYS,
34 .end = MSM_UART1_PHYS + MSM_UART1_SIZE - 1,
35 .flags = IORESOURCE_MEM,
36 },
37};
38
39static struct resource resources_uart2[] = {
40 {
41 .start = INT_UART2,
42 .end = INT_UART2,
43 .flags = IORESOURCE_IRQ,
44 },
45 {
46 .start = MSM_UART2_PHYS,
47 .end = MSM_UART2_PHYS + MSM_UART2_SIZE - 1,
48 .flags = IORESOURCE_MEM,
49 },
50};
51
52static struct resource resources_uart3[] = {
53 {
54 .start = INT_UART3,
55 .end = INT_UART3,
56 .flags = IORESOURCE_IRQ,
57 },
58 {
59 .start = MSM_UART3_PHYS,
60 .end = MSM_UART3_PHYS + MSM_UART3_SIZE - 1,
61 .flags = IORESOURCE_MEM,
62 },
63};
64
65struct platform_device msm_device_uart1 = {
66 .name = "msm_serial",
67 .id = 0,
68 .num_resources = ARRAY_SIZE(resources_uart1),
69 .resource = resources_uart1,
70};
71
72struct platform_device msm_device_uart2 = {
73 .name = "msm_serial",
74 .id = 1,
75 .num_resources = ARRAY_SIZE(resources_uart2),
76 .resource = resources_uart2,
77};
78
79struct platform_device msm_device_uart3 = {
80 .name = "msm_serial",
81 .id = 2,
82 .num_resources = ARRAY_SIZE(resources_uart3),
83 .resource = resources_uart3,
84};
85
86static struct resource resources_i2c[] = {
87 {
88 .start = MSM_I2C_PHYS,
89 .end = MSM_I2C_PHYS + MSM_I2C_SIZE - 1,
90 .flags = IORESOURCE_MEM,
91 },
92 {
93 .start = INT_PWB_I2C,
94 .end = INT_PWB_I2C,
95 .flags = IORESOURCE_IRQ,
96 },
97};
98
99struct platform_device msm_device_i2c = {
100 .name = "msm_i2c",
101 .id = 0,
102 .num_resources = ARRAY_SIZE(resources_i2c),
103 .resource = resources_i2c,
104};
105
106static struct resource resources_hsusb[] = {
107 {
108 .start = MSM_HSUSB_PHYS,
109 .end = MSM_HSUSB_PHYS + MSM_HSUSB_SIZE,
110 .flags = IORESOURCE_MEM,
111 },
112 {
113 .start = INT_USB_HS,
114 .end = INT_USB_HS,
115 .flags = IORESOURCE_IRQ,
116 },
117};
118
119struct platform_device msm_device_hsusb = {
120 .name = "msm_hsusb",
121 .id = -1,
122 .num_resources = ARRAY_SIZE(resources_hsusb),
123 .resource = resources_hsusb,
124 .dev = {
125 .coherent_dma_mask = 0xffffffff,
126 },
127};
128
129struct flash_platform_data msm_nand_data = {
130 .parts = NULL,
131 .nr_parts = 0,
132};
133
134static struct resource resources_nand[] = {
135 [0] = {
136 .start = 7,
137 .end = 7,
138 .flags = IORESOURCE_DMA,
139 },
140};
141
142struct platform_device msm_device_nand = {
143 .name = "msm_nand",
144 .id = -1,
145 .num_resources = ARRAY_SIZE(resources_nand),
146 .resource = resources_nand,
147 .dev = {
148 .platform_data = &msm_nand_data,
149 },
150};
151
152struct platform_device msm_device_smd = {
153 .name = "msm_smd",
154 .id = -1,
155};
156
157static struct resource resources_sdc1[] = {
158 {
159 .start = MSM_SDC1_PHYS,
160 .end = MSM_SDC1_PHYS + MSM_SDC1_SIZE - 1,
161 .flags = IORESOURCE_MEM,
162 },
163 {
164 .start = INT_SDC1_0,
165 .end = INT_SDC1_1,
166 .flags = IORESOURCE_IRQ,
167 },
168 {
169 .start = 8,
170 .end = 8,
171 .flags = IORESOURCE_DMA,
172 },
173};
174
175static struct resource resources_sdc2[] = {
176 {
177 .start = MSM_SDC2_PHYS,
178 .end = MSM_SDC2_PHYS + MSM_SDC2_SIZE - 1,
179 .flags = IORESOURCE_MEM,
180 },
181 {
182 .start = INT_SDC2_0,
183 .end = INT_SDC2_1,
184 .flags = IORESOURCE_IRQ,
185 },
186 {
187 .start = 8,
188 .end = 8,
189 .flags = IORESOURCE_DMA,
190 },
191};
192
193static struct resource resources_sdc3[] = {
194 {
195 .start = MSM_SDC3_PHYS,
196 .end = MSM_SDC3_PHYS + MSM_SDC3_SIZE - 1,
197 .flags = IORESOURCE_MEM,
198 },
199 {
200 .start = INT_SDC3_0,
201 .end = INT_SDC3_1,
202 .flags = IORESOURCE_IRQ,
203 },
204 {
205 .start = 8,
206 .end = 8,
207 .flags = IORESOURCE_DMA,
208 },
209};
210
211static struct resource resources_sdc4[] = {
212 {
213 .start = MSM_SDC4_PHYS,
214 .end = MSM_SDC4_PHYS + MSM_SDC4_SIZE - 1,
215 .flags = IORESOURCE_MEM,
216 },
217 {
218 .start = INT_SDC4_0,
219 .end = INT_SDC4_1,
220 .flags = IORESOURCE_IRQ,
221 },
222 {
223 .start = 8,
224 .end = 8,
225 .flags = IORESOURCE_DMA,
226 },
227};
228
229struct platform_device msm_device_sdc1 = {
230 .name = "msm_sdcc",
231 .id = 1,
232 .num_resources = ARRAY_SIZE(resources_sdc1),
233 .resource = resources_sdc1,
234 .dev = {
235 .coherent_dma_mask = 0xffffffff,
236 },
237};
238
239struct platform_device msm_device_sdc2 = {
240 .name = "msm_sdcc",
241 .id = 2,
242 .num_resources = ARRAY_SIZE(resources_sdc2),
243 .resource = resources_sdc2,
244 .dev = {
245 .coherent_dma_mask = 0xffffffff,
246 },
247};
248
249struct platform_device msm_device_sdc3 = {
250 .name = "msm_sdcc",
251 .id = 3,
252 .num_resources = ARRAY_SIZE(resources_sdc3),
253 .resource = resources_sdc3,
254 .dev = {
255 .coherent_dma_mask = 0xffffffff,
256 },
257};
258
259struct platform_device msm_device_sdc4 = {
260 .name = "msm_sdcc",
261 .id = 4,
262 .num_resources = ARRAY_SIZE(resources_sdc4),
263 .resource = resources_sdc4,
264 .dev = {
265 .coherent_dma_mask = 0xffffffff,
266 },
267};
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
new file mode 100644
index 000000000000..0744c4a27d6a
--- /dev/null
+++ b/arch/arm/mach-msm/devices.h
@@ -0,0 +1,36 @@
1/* linux/arch/arm/mach-msm/devices.h
2 *
3 * Copyright (C) 2008 Google, Inc.
4 *
5 * This software is licensed under the terms of the GNU General Public
6 * License version 2, as published by the Free Software Foundation, and
7 * may be copied, distributed, and modified under those terms.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 */
15
16#ifndef __ARCH_ARM_MACH_MSM_DEVICES_H
17#define __ARCH_ARM_MACH_MSM_DEVICES_H
18
19extern struct platform_device msm_device_uart1;
20extern struct platform_device msm_device_uart2;
21extern struct platform_device msm_device_uart3;
22
23extern struct platform_device msm_device_sdc1;
24extern struct platform_device msm_device_sdc2;
25extern struct platform_device msm_device_sdc3;
26extern struct platform_device msm_device_sdc4;
27
28extern struct platform_device msm_device_hsusb;
29
30extern struct platform_device msm_device_i2c;
31
32extern struct platform_device msm_device_smd;
33
34extern struct platform_device msm_device_nand;
35
36#endif
diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c
index 0c8f252637e1..f5420f9585c5 100644
--- a/arch/arm/mach-msm/dma.c
+++ b/arch/arm/mach-msm/dma.c
@@ -26,7 +26,7 @@ enum {
26}; 26};
27 27
28static DEFINE_SPINLOCK(msm_dmov_lock); 28static DEFINE_SPINLOCK(msm_dmov_lock);
29static struct msm_dmov_cmd active_command; 29static unsigned int channel_active;
30static struct list_head ready_commands[MSM_DMOV_CHANNEL_COUNT]; 30static struct list_head ready_commands[MSM_DMOV_CHANNEL_COUNT];
31static struct list_head active_commands[MSM_DMOV_CHANNEL_COUNT]; 31static struct list_head active_commands[MSM_DMOV_CHANNEL_COUNT];
32unsigned int msm_dmov_print_mask = MSM_DMOV_PRINT_ERRORS; 32unsigned int msm_dmov_print_mask = MSM_DMOV_PRINT_ERRORS;
@@ -43,6 +43,11 @@ unsigned int msm_dmov_print_mask = MSM_DMOV_PRINT_ERRORS;
43#define PRINT_FLOW(format, args...) \ 43#define PRINT_FLOW(format, args...) \
44 MSM_DMOV_DPRINTF(MSM_DMOV_PRINT_FLOW, format, args); 44 MSM_DMOV_DPRINTF(MSM_DMOV_PRINT_FLOW, format, args);
45 45
46void msm_dmov_stop_cmd(unsigned id, struct msm_dmov_cmd *cmd, int graceful)
47{
48 writel((graceful << 31), DMOV_FLUSH0(id));
49}
50
46void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd) 51void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd)
47{ 52{
48 unsigned long irq_flags; 53 unsigned long irq_flags;
@@ -60,6 +65,9 @@ void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd)
60#endif 65#endif
61 PRINT_IO("msm_dmov_enqueue_cmd(%d), start command, status %x\n", id, status); 66 PRINT_IO("msm_dmov_enqueue_cmd(%d), start command, status %x\n", id, status);
62 list_add_tail(&cmd->list, &active_commands[id]); 67 list_add_tail(&cmd->list, &active_commands[id]);
68 if (!channel_active)
69 enable_irq(INT_ADM_AARM);
70 channel_active |= 1U << id;
63 writel(cmd->cmdptr, DMOV_CMD_PTR(id)); 71 writel(cmd->cmdptr, DMOV_CMD_PTR(id));
64 } else { 72 } else {
65 if (list_empty(&active_commands[id])) 73 if (list_empty(&active_commands[id]))
@@ -76,21 +84,19 @@ struct msm_dmov_exec_cmdptr_cmd {
76 struct completion complete; 84 struct completion complete;
77 unsigned id; 85 unsigned id;
78 unsigned int result; 86 unsigned int result;
79 unsigned int flush[6]; 87 struct msm_dmov_errdata err;
80}; 88};
81 89
82static void dmov_exec_cmdptr_complete_func(struct msm_dmov_cmd *_cmd, unsigned int result) 90static void
91dmov_exec_cmdptr_complete_func(struct msm_dmov_cmd *_cmd,
92 unsigned int result,
93 struct msm_dmov_errdata *err)
83{ 94{
84 struct msm_dmov_exec_cmdptr_cmd *cmd = container_of(_cmd, struct msm_dmov_exec_cmdptr_cmd, dmov_cmd); 95 struct msm_dmov_exec_cmdptr_cmd *cmd = container_of(_cmd, struct msm_dmov_exec_cmdptr_cmd, dmov_cmd);
85 cmd->result = result; 96 cmd->result = result;
86 if (result != 0x80000002) { 97 if (result != 0x80000002 && err)
87 cmd->flush[0] = readl(DMOV_FLUSH0(cmd->id)); 98 memcpy(&cmd->err, err, sizeof(struct msm_dmov_errdata));
88 cmd->flush[1] = readl(DMOV_FLUSH1(cmd->id)); 99
89 cmd->flush[2] = readl(DMOV_FLUSH2(cmd->id));
90 cmd->flush[3] = readl(DMOV_FLUSH3(cmd->id));
91 cmd->flush[4] = readl(DMOV_FLUSH4(cmd->id));
92 cmd->flush[5] = readl(DMOV_FLUSH5(cmd->id));
93 }
94 complete(&cmd->complete); 100 complete(&cmd->complete);
95} 101}
96 102
@@ -111,7 +117,7 @@ int msm_dmov_exec_cmd(unsigned id, unsigned int cmdptr)
111 if (cmd.result != 0x80000002) { 117 if (cmd.result != 0x80000002) {
112 PRINT_ERROR("dmov_exec_cmdptr(%d): ERROR, result: %x\n", id, cmd.result); 118 PRINT_ERROR("dmov_exec_cmdptr(%d): ERROR, result: %x\n", id, cmd.result);
113 PRINT_ERROR("dmov_exec_cmdptr(%d): flush: %x %x %x %x\n", 119 PRINT_ERROR("dmov_exec_cmdptr(%d): flush: %x %x %x %x\n",
114 id, cmd.flush[0], cmd.flush[1], cmd.flush[2], cmd.flush[3]); 120 id, cmd.err.flush[0], cmd.err.flush[1], cmd.err.flush[2], cmd.err.flush[3]);
115 return -EIO; 121 return -EIO;
116 } 122 }
117 PRINT_FLOW("dmov_exec_cmdptr(%d, %x) done\n", id, cmdptr); 123 PRINT_FLOW("dmov_exec_cmdptr(%d, %x) done\n", id, cmdptr);
@@ -159,25 +165,40 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void *dev_id)
159 "for %p, result %x\n", id, cmd, ch_result); 165 "for %p, result %x\n", id, cmd, ch_result);
160 if (cmd) { 166 if (cmd) {
161 list_del(&cmd->list); 167 list_del(&cmd->list);
162 cmd->complete_func(cmd, ch_result); 168 cmd->complete_func(cmd, ch_result, NULL);
163 } 169 }
164 } 170 }
165 if (ch_result & DMOV_RSLT_FLUSH) { 171 if (ch_result & DMOV_RSLT_FLUSH) {
166 unsigned int flush0 = readl(DMOV_FLUSH0(id)); 172 struct msm_dmov_errdata errdata;
173
174 errdata.flush[0] = readl(DMOV_FLUSH0(id));
175 errdata.flush[1] = readl(DMOV_FLUSH1(id));
176 errdata.flush[2] = readl(DMOV_FLUSH2(id));
177 errdata.flush[3] = readl(DMOV_FLUSH3(id));
178 errdata.flush[4] = readl(DMOV_FLUSH4(id));
179 errdata.flush[5] = readl(DMOV_FLUSH5(id));
167 PRINT_FLOW("msm_datamover_irq_handler id %d, status %x\n", id, ch_status); 180 PRINT_FLOW("msm_datamover_irq_handler id %d, status %x\n", id, ch_status);
168 PRINT_FLOW("msm_datamover_irq_handler id %d, flush, result %x, flush0 %x\n", id, ch_result, flush0); 181 PRINT_FLOW("msm_datamover_irq_handler id %d, flush, result %x, flush0 %x\n", id, ch_result, errdata.flush[0]);
169 if (cmd) { 182 if (cmd) {
170 list_del(&cmd->list); 183 list_del(&cmd->list);
171 cmd->complete_func(cmd, ch_result); 184 cmd->complete_func(cmd, ch_result, &errdata);
172 } 185 }
173 } 186 }
174 if (ch_result & DMOV_RSLT_ERROR) { 187 if (ch_result & DMOV_RSLT_ERROR) {
175 unsigned int flush0 = readl(DMOV_FLUSH0(id)); 188 struct msm_dmov_errdata errdata;
189
190 errdata.flush[0] = readl(DMOV_FLUSH0(id));
191 errdata.flush[1] = readl(DMOV_FLUSH1(id));
192 errdata.flush[2] = readl(DMOV_FLUSH2(id));
193 errdata.flush[3] = readl(DMOV_FLUSH3(id));
194 errdata.flush[4] = readl(DMOV_FLUSH4(id));
195 errdata.flush[5] = readl(DMOV_FLUSH5(id));
196
176 PRINT_ERROR("msm_datamover_irq_handler id %d, status %x\n", id, ch_status); 197 PRINT_ERROR("msm_datamover_irq_handler id %d, status %x\n", id, ch_status);
177 PRINT_ERROR("msm_datamover_irq_handler id %d, error, result %x, flush0 %x\n", id, ch_result, flush0); 198 PRINT_ERROR("msm_datamover_irq_handler id %d, error, result %x, flush0 %x\n", id, ch_result, errdata.flush[0]);
178 if (cmd) { 199 if (cmd) {
179 list_del(&cmd->list); 200 list_del(&cmd->list);
180 cmd->complete_func(cmd, ch_result); 201 cmd->complete_func(cmd, ch_result, &errdata);
181 } 202 }
182 /* this does not seem to work, once we get an error */ 203 /* this does not seem to work, once we get an error */
183 /* the datamover will no longer accept commands */ 204 /* the datamover will no longer accept commands */
@@ -193,8 +214,14 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void *dev_id)
193 writel(cmd->cmdptr, DMOV_CMD_PTR(id)); 214 writel(cmd->cmdptr, DMOV_CMD_PTR(id));
194 } 215 }
195 } while (ch_status & DMOV_STATUS_RSLT_VALID); 216 } while (ch_status & DMOV_STATUS_RSLT_VALID);
217 if (list_empty(&active_commands[id]) && list_empty(&ready_commands[id]))
218 channel_active &= ~(1U << id);
196 PRINT_FLOW("msm_datamover_irq_handler id %d, status %x\n", id, ch_status); 219 PRINT_FLOW("msm_datamover_irq_handler id %d, status %x\n", id, ch_status);
197 } 220 }
221
222 if (!channel_active)
223 disable_irq(INT_ADM_AARM);
224
198 spin_unlock_irqrestore(&msm_dmov_lock, irq_flags); 225 spin_unlock_irqrestore(&msm_dmov_lock, irq_flags);
199 return IRQ_HANDLED; 226 return IRQ_HANDLED;
200} 227}
@@ -202,12 +229,17 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void *dev_id)
202static int __init msm_init_datamover(void) 229static int __init msm_init_datamover(void)
203{ 230{
204 int i; 231 int i;
232 int ret;
205 for (i = 0; i < MSM_DMOV_CHANNEL_COUNT; i++) { 233 for (i = 0; i < MSM_DMOV_CHANNEL_COUNT; i++) {
206 INIT_LIST_HEAD(&ready_commands[i]); 234 INIT_LIST_HEAD(&ready_commands[i]);
207 INIT_LIST_HEAD(&active_commands[i]); 235 INIT_LIST_HEAD(&active_commands[i]);
208 writel(DMOV_CONFIG_IRQ_EN | DMOV_CONFIG_FORCE_TOP_PTR_RSLT | DMOV_CONFIG_FORCE_FLUSH_RSLT, DMOV_CONFIG(i)); 236 writel(DMOV_CONFIG_IRQ_EN | DMOV_CONFIG_FORCE_TOP_PTR_RSLT | DMOV_CONFIG_FORCE_FLUSH_RSLT, DMOV_CONFIG(i));
209 } 237 }
210 return request_irq(INT_ADM_AARM, msm_datamover_irq_handler, 0, "msmdatamover", NULL); 238 ret = request_irq(INT_ADM_AARM, msm_datamover_irq_handler, 0, "msmdatamover", NULL);
239 if (ret)
240 return ret;
241 disable_irq(INT_ADM_AARM);
242 return 0;
211} 243}
212 244
213arch_initcall(msm_init_datamover); 245arch_initcall(msm_init_datamover);
diff --git a/arch/arm/mach-msm/include/mach/board.h b/arch/arm/mach-msm/include/mach/board.h
index a7639493c095..264d62e519f3 100644
--- a/arch/arm/mach-msm/include/mach/board.h
+++ b/arch/arm/mach-msm/include/mach/board.h
@@ -33,5 +33,6 @@ void __init msm_add_devices(void);
33void __init msm_map_common_io(void); 33void __init msm_map_common_io(void);
34void __init msm_init_irq(void); 34void __init msm_init_irq(void);
35void __init msm_init_gpio(void); 35void __init msm_init_gpio(void);
36void __init msm_clock_init(void);
36 37
37#endif 38#endif
diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S
index 528eef4b605c..1db3c97dbc49 100644
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@ -22,18 +22,22 @@
22 mrc p15, 0, \rx, c1, c0 22 mrc p15, 0, \rx, c1, c0
23 tst \rx, #1 23 tst \rx, #1
24 ldreq \rx, =MSM_UART1_PHYS 24 ldreq \rx, =MSM_UART1_PHYS
25 ldrne \rx, =MSM_UART1_BASE 25 movne \rx, #0
26 .endm 26 .endm
27 27
28 .macro senduart,rd,rx 28 .macro senduart,rd,rx
29 str \rd, [\rx, #0x0C] 29 teq \rx, #0
30 strne \rd, [\rx, #0x0C]
30 .endm 31 .endm
31 32
32 .macro waituart,rd,rx 33 .macro waituart,rd,rx
33 @ wait for TX_READY 34 @ wait for TX_READY
35 teq \rx, #0
36 bne 2f
341: ldr \rd, [\rx, #0x08] 371: ldr \rd, [\rx, #0x08]
35 tst \rd, #0x04 38 tst \rd, #0x04
36 beq 1b 39 beq 1b
402:
37 .endm 41 .endm
38 42
39 .macro busyuart,rd,rx 43 .macro busyuart,rd,rx
diff --git a/arch/arm/mach-msm/include/mach/dma.h b/arch/arm/mach-msm/include/mach/dma.h
index ad1c87f86d10..5ab5bdffab07 100644
--- a/arch/arm/mach-msm/include/mach/dma.h
+++ b/arch/arm/mach-msm/include/mach/dma.h
@@ -1,4 +1,4 @@
1/* arch/arm/mach-msm/include/mach/dma.h 1/* linux/include/asm-arm/arch-msm/dma.h
2 * 2 *
3 * Copyright (C) 2007 Google, Inc. 3 * Copyright (C) 2007 Google, Inc.
4 * 4 *
@@ -18,17 +18,21 @@
18#include <linux/list.h> 18#include <linux/list.h>
19#include <mach/msm_iomap.h> 19#include <mach/msm_iomap.h>
20 20
21struct msm_dmov_errdata {
22 uint32_t flush[6];
23};
24
21struct msm_dmov_cmd { 25struct msm_dmov_cmd {
22 struct list_head list; 26 struct list_head list;
23 unsigned int cmdptr; 27 unsigned int cmdptr;
24 void (*complete_func)(struct msm_dmov_cmd *cmd, unsigned int result); 28 void (*complete_func)(struct msm_dmov_cmd *cmd,
25/* void (*user_result_func)(struct msm_dmov_cmd *cmd); */ 29 unsigned int result,
30 struct msm_dmov_errdata *err);
26}; 31};
27 32
28void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd); 33void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd);
29void msm_dmov_stop_cmd(unsigned id, struct msm_dmov_cmd *cmd); 34void msm_dmov_stop_cmd(unsigned id, struct msm_dmov_cmd *cmd, int graceful);
30int msm_dmov_exec_cmd(unsigned id, unsigned int cmdptr); 35int msm_dmov_exec_cmd(unsigned id, unsigned int cmdptr);
31/* int msm_dmov_exec_cmd_etc(unsigned id, unsigned int cmdptr, int timeout, int interruptible); */
32 36
33 37
34 38
@@ -122,6 +126,16 @@ typedef struct {
122 unsigned _reserved; 126 unsigned _reserved;
123} dmov_sg; 127} dmov_sg;
124 128
129/* Box mode */
130typedef struct {
131 uint32_t cmd;
132 uint32_t src_row_addr;
133 uint32_t dst_row_addr;
134 uint32_t src_dst_len;
135 uint32_t num_rows;
136 uint32_t row_offset;
137} dmov_box;
138
125/* bits for the cmd field of the above structures */ 139/* bits for the cmd field of the above structures */
126 140
127#define CMD_LC (1 << 31) /* last command */ 141#define CMD_LC (1 << 31) /* last command */
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
index e221f58ceea3..2f7b4c8620d9 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -37,11 +37,17 @@
37 * 37 *
38 */ 38 */
39 39
40#define MSM_VIC_BASE 0xE0000000 40#ifdef __ASSEMBLY__
41#define IOMEM(x) x
42#else
43#define IOMEM(x) ((void __force __iomem *)(x))
44#endif
45
46#define MSM_VIC_BASE IOMEM(0xE0000000)
41#define MSM_VIC_PHYS 0xC0000000 47#define MSM_VIC_PHYS 0xC0000000
42#define MSM_VIC_SIZE SZ_4K 48#define MSM_VIC_SIZE SZ_4K
43 49
44#define MSM_CSR_BASE 0xE0001000 50#define MSM_CSR_BASE IOMEM(0xE0001000)
45#define MSM_CSR_PHYS 0xC0100000 51#define MSM_CSR_PHYS 0xC0100000
46#define MSM_CSR_SIZE SZ_4K 52#define MSM_CSR_SIZE SZ_4K
47 53
@@ -49,56 +55,67 @@
49#define MSM_GPT_BASE MSM_CSR_BASE 55#define MSM_GPT_BASE MSM_CSR_BASE
50#define MSM_GPT_SIZE SZ_4K 56#define MSM_GPT_SIZE SZ_4K
51 57
52#define MSM_DMOV_BASE 0xE0002000 58#define MSM_DMOV_BASE IOMEM(0xE0002000)
53#define MSM_DMOV_PHYS 0xA9700000 59#define MSM_DMOV_PHYS 0xA9700000
54#define MSM_DMOV_SIZE SZ_4K 60#define MSM_DMOV_SIZE SZ_4K
55 61
56#define MSM_UART1_BASE 0xE0003000 62#define MSM_GPIO1_BASE IOMEM(0xE0003000)
63#define MSM_GPIO1_PHYS 0xA9200000
64#define MSM_GPIO1_SIZE SZ_4K
65
66#define MSM_GPIO2_BASE IOMEM(0xE0004000)
67#define MSM_GPIO2_PHYS 0xA9300000
68#define MSM_GPIO2_SIZE SZ_4K
69
70#define MSM_CLK_CTL_BASE IOMEM(0xE0005000)
71#define MSM_CLK_CTL_PHYS 0xA8600000
72#define MSM_CLK_CTL_SIZE SZ_4K
73
74#define MSM_SHARED_RAM_BASE IOMEM(0xE0100000)
75#define MSM_SHARED_RAM_PHYS 0x01F00000
76#define MSM_SHARED_RAM_SIZE SZ_1M
77
57#define MSM_UART1_PHYS 0xA9A00000 78#define MSM_UART1_PHYS 0xA9A00000
58#define MSM_UART1_SIZE SZ_4K 79#define MSM_UART1_SIZE SZ_4K
59 80
60#define MSM_UART2_BASE 0xE0004000
61#define MSM_UART2_PHYS 0xA9B00000 81#define MSM_UART2_PHYS 0xA9B00000
62#define MSM_UART2_SIZE SZ_4K 82#define MSM_UART2_SIZE SZ_4K
63 83
64#define MSM_UART3_BASE 0xE0005000
65#define MSM_UART3_PHYS 0xA9C00000 84#define MSM_UART3_PHYS 0xA9C00000
66#define MSM_UART3_SIZE SZ_4K 85#define MSM_UART3_SIZE SZ_4K
67 86
68#define MSM_I2C_BASE 0xE0006000 87#define MSM_SDC1_PHYS 0xA0400000
69#define MSM_I2C_PHYS 0xA9900000 88#define MSM_SDC1_SIZE SZ_4K
70#define MSM_I2C_SIZE SZ_4K
71 89
72#define MSM_GPIO1_BASE 0xE0007000 90#define MSM_SDC2_PHYS 0xA0500000
73#define MSM_GPIO1_PHYS 0xA9200000 91#define MSM_SDC2_SIZE SZ_4K
74#define MSM_GPIO1_SIZE SZ_4K
75 92
76#define MSM_GPIO2_BASE 0xE0008000 93#define MSM_SDC3_PHYS 0xA0600000
77#define MSM_GPIO2_PHYS 0xA9300000 94#define MSM_SDC3_SIZE SZ_4K
78#define MSM_GPIO2_SIZE SZ_4K 95
96#define MSM_SDC4_PHYS 0xA0700000
97#define MSM_SDC4_SIZE SZ_4K
98
99#define MSM_I2C_PHYS 0xA9900000
100#define MSM_I2C_SIZE SZ_4K
79 101
80#define MSM_HSUSB_BASE 0xE0009000
81#define MSM_HSUSB_PHYS 0xA0800000 102#define MSM_HSUSB_PHYS 0xA0800000
82#define MSM_HSUSB_SIZE SZ_4K 103#define MSM_HSUSB_SIZE SZ_4K
83 104
84#define MSM_CLK_CTL_BASE 0xE000A000
85#define MSM_CLK_CTL_PHYS 0xA8600000
86#define MSM_CLK_CTL_SIZE SZ_4K
87
88#define MSM_PMDH_BASE 0xE000B000
89#define MSM_PMDH_PHYS 0xAA600000 105#define MSM_PMDH_PHYS 0xAA600000
90#define MSM_PMDH_SIZE SZ_4K 106#define MSM_PMDH_SIZE SZ_4K
91 107
92#define MSM_EMDH_BASE 0xE000C000
93#define MSM_EMDH_PHYS 0xAA700000 108#define MSM_EMDH_PHYS 0xAA700000
94#define MSM_EMDH_SIZE SZ_4K 109#define MSM_EMDH_SIZE SZ_4K
95 110
96#define MSM_MDP_BASE 0xE0010000
97#define MSM_MDP_PHYS 0xAA200000 111#define MSM_MDP_PHYS 0xAA200000
98#define MSM_MDP_SIZE 0x000F0000 112#define MSM_MDP_SIZE 0x000F0000
99 113
100#define MSM_SHARED_RAM_BASE 0xE0100000 114#define MSM_MDC_PHYS 0xAA500000
101#define MSM_SHARED_RAM_PHYS 0x01F00000 115#define MSM_MDC_SIZE SZ_1M
102#define MSM_SHARED_RAM_SIZE SZ_1M 116
117#define MSM_AD5_PHYS 0xAC000000
118#define MSM_AD5_SIZE (SZ_1M*13)
119
103 120
104#endif 121#endif
diff --git a/arch/arm/mach-msm/include/mach/vreg.h b/arch/arm/mach-msm/include/mach/vreg.h
new file mode 100644
index 000000000000..9f9e25cb718e
--- /dev/null
+++ b/arch/arm/mach-msm/include/mach/vreg.h
@@ -0,0 +1,29 @@
1/* linux/include/asm-arm/arch-msm/vreg.h
2 *
3 * Copyright (C) 2008 Google, Inc.
4 * Author: Brian Swetland <swetland@google.com>
5 *
6 * This software is licensed under the terms of the GNU General Public
7 * License version 2, as published by the Free Software Foundation, and
8 * may be copied, distributed, and modified under those terms.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 */
16
17#ifndef __ARCH_ARM_MACH_MSM_VREG_H
18#define __ARCH_ARM_MACH_MSM_VREG_H
19
20struct vreg;
21
22struct vreg *vreg_get(struct device *dev, const char *id);
23void vreg_put(struct vreg *vreg);
24
25int vreg_enable(struct vreg *vreg);
26void vreg_disable(struct vreg *vreg);
27int vreg_set_level(struct vreg *vreg, unsigned mv);
28
29#endif
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 7999e4ba8e20..6e7692ff6f2c 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -28,7 +28,7 @@
28#include <mach/board.h> 28#include <mach/board.h>
29 29
30#define MSM_DEVICE(name) { \ 30#define MSM_DEVICE(name) { \
31 .virtual = MSM_##name##_BASE, \ 31 .virtual = (unsigned long) MSM_##name##_BASE, \
32 .pfn = __phys_to_pfn(MSM_##name##_PHYS), \ 32 .pfn = __phys_to_pfn(MSM_##name##_PHYS), \
33 .length = MSM_##name##_SIZE, \ 33 .length = MSM_##name##_SIZE, \
34 .type = MT_DEVICE_NONSHARED, \ 34 .type = MT_DEVICE_NONSHARED, \
@@ -39,19 +39,11 @@ static struct map_desc msm_io_desc[] __initdata = {
39 MSM_DEVICE(CSR), 39 MSM_DEVICE(CSR),
40 MSM_DEVICE(GPT), 40 MSM_DEVICE(GPT),
41 MSM_DEVICE(DMOV), 41 MSM_DEVICE(DMOV),
42 MSM_DEVICE(UART1),
43 MSM_DEVICE(UART2),
44 MSM_DEVICE(UART3),
45 MSM_DEVICE(I2C),
46 MSM_DEVICE(GPIO1), 42 MSM_DEVICE(GPIO1),
47 MSM_DEVICE(GPIO2), 43 MSM_DEVICE(GPIO2),
48 MSM_DEVICE(HSUSB),
49 MSM_DEVICE(CLK_CTL), 44 MSM_DEVICE(CLK_CTL),
50 MSM_DEVICE(PMDH),
51 MSM_DEVICE(EMDH),
52 MSM_DEVICE(MDP),
53 { 45 {
54 .virtual = MSM_SHARED_RAM_BASE, 46 .virtual = (unsigned long) MSM_SHARED_RAM_BASE,
55 .pfn = __phys_to_pfn(MSM_SHARED_RAM_PHYS), 47 .pfn = __phys_to_pfn(MSM_SHARED_RAM_PHYS),
56 .length = MSM_SHARED_RAM_SIZE, 48 .length = MSM_SHARED_RAM_SIZE,
57 .type = MT_DEVICE, 49 .type = MT_DEVICE,
diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c
index 04b8d182ff8a..69ca0dd79bdf 100644
--- a/arch/arm/mach-msm/irq.c
+++ b/arch/arm/mach-msm/irq.c
@@ -66,20 +66,20 @@
66 66
67static void msm_irq_ack(unsigned int irq) 67static void msm_irq_ack(unsigned int irq)
68{ 68{
69 unsigned reg = VIC_INT_CLEAR0 + ((irq & 32) ? 4 : 0); 69 void __iomem *reg = VIC_INT_CLEAR0 + ((irq & 32) ? 4 : 0);
70 irq = 1 << (irq & 31); 70 irq = 1 << (irq & 31);
71 writel(irq, reg); 71 writel(irq, reg);
72} 72}
73 73
74static void msm_irq_mask(unsigned int irq) 74static void msm_irq_mask(unsigned int irq)
75{ 75{
76 unsigned reg = VIC_INT_ENCLEAR0 + ((irq & 32) ? 4 : 0); 76 void __iomem *reg = VIC_INT_ENCLEAR0 + ((irq & 32) ? 4 : 0);
77 writel(1 << (irq & 31), reg); 77 writel(1 << (irq & 31), reg);
78} 78}
79 79
80static void msm_irq_unmask(unsigned int irq) 80static void msm_irq_unmask(unsigned int irq)
81{ 81{
82 unsigned reg = VIC_INT_ENSET0 + ((irq & 32) ? 4 : 0); 82 void __iomem *reg = VIC_INT_ENSET0 + ((irq & 32) ? 4 : 0);
83 writel(1 << (irq & 31), reg); 83 writel(1 << (irq & 31), reg);
84} 84}
85 85
@@ -90,8 +90,8 @@ static int msm_irq_set_wake(unsigned int irq, unsigned int on)
90 90
91static int msm_irq_set_type(unsigned int irq, unsigned int flow_type) 91static int msm_irq_set_type(unsigned int irq, unsigned int flow_type)
92{ 92{
93 unsigned treg = VIC_INT_TYPE0 + ((irq & 32) ? 4 : 0); 93 void __iomem *treg = VIC_INT_TYPE0 + ((irq & 32) ? 4 : 0);
94 unsigned preg = VIC_INT_POLARITY0 + ((irq & 32) ? 4 : 0); 94 void __iomem *preg = VIC_INT_POLARITY0 + ((irq & 32) ? 4 : 0);
95 int b = 1 << (irq & 31); 95 int b = 1 << (irq & 31);
96 96
97 if (flow_type & (IRQF_TRIGGER_FALLING | IRQF_TRIGGER_LOW)) 97 if (flow_type & (IRQF_TRIGGER_FALLING | IRQF_TRIGGER_LOW))
diff --git a/arch/arm/mach-msm/proc_comm.c b/arch/arm/mach-msm/proc_comm.c
new file mode 100644
index 000000000000..915ee704ed3c
--- /dev/null
+++ b/arch/arm/mach-msm/proc_comm.c
@@ -0,0 +1,110 @@
1/* arch/arm/mach-msm/proc_comm.c
2 *
3 * Copyright (C) 2007-2008 Google, Inc.
4 * Author: Brian Swetland <swetland@google.com>
5 *
6 * This software is licensed under the terms of the GNU General Public
7 * License version 2, as published by the Free Software Foundation, and
8 * may be copied, distributed, and modified under those terms.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 */
16
17#include <linux/delay.h>
18#include <linux/errno.h>
19#include <linux/io.h>
20#include <linux/spinlock.h>
21#include <mach/msm_iomap.h>
22#include <mach/system.h>
23
24#include "proc_comm.h"
25
26#define MSM_A2M_INT(n) (MSM_CSR_BASE + 0x400 + (n) * 4)
27
28static inline void notify_other_proc_comm(void)
29{
30 writel(1, MSM_A2M_INT(6));
31}
32
33#define APP_COMMAND 0x00
34#define APP_STATUS 0x04
35#define APP_DATA1 0x08
36#define APP_DATA2 0x0C
37
38#define MDM_COMMAND 0x10
39#define MDM_STATUS 0x14
40#define MDM_DATA1 0x18
41#define MDM_DATA2 0x1C
42
43static DEFINE_SPINLOCK(proc_comm_lock);
44
45/* The higher level SMD support will install this to
46 * provide a way to check for and handle modem restart.
47 */
48int (*msm_check_for_modem_crash)(void);
49
50/* Poll for a state change, checking for possible
51 * modem crashes along the way (so we don't wait
52 * forever while the ARM9 is blowing up).
53 *
54 * Return an error in the event of a modem crash and
55 * restart so the msm_proc_comm() routine can restart
56 * the operation from the beginning.
57 */
58static int proc_comm_wait_for(void __iomem *addr, unsigned value)
59{
60 for (;;) {
61 if (readl(addr) == value)
62 return 0;
63
64 if (msm_check_for_modem_crash)
65 if (msm_check_for_modem_crash())
66 return -EAGAIN;
67 }
68}
69
70int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2)
71{
72 void __iomem *base = MSM_SHARED_RAM_BASE;
73 unsigned long flags;
74 int ret;
75
76 spin_lock_irqsave(&proc_comm_lock, flags);
77
78 for (;;) {
79 if (proc_comm_wait_for(base + MDM_STATUS, PCOM_READY))
80 continue;
81
82 writel(cmd, base + APP_COMMAND);
83 writel(data1 ? *data1 : 0, base + APP_DATA1);
84 writel(data2 ? *data2 : 0, base + APP_DATA2);
85
86 notify_other_proc_comm();
87
88 if (proc_comm_wait_for(base + APP_COMMAND, PCOM_CMD_DONE))
89 continue;
90
91 if (readl(base + APP_STATUS) != PCOM_CMD_FAIL) {
92 if (data1)
93 *data1 = readl(base + APP_DATA1);
94 if (data2)
95 *data2 = readl(base + APP_DATA2);
96 ret = 0;
97 } else {
98 ret = -EIO;
99 }
100 break;
101 }
102
103 writel(PCOM_CMD_IDLE, base + APP_COMMAND);
104
105 spin_unlock_irqrestore(&proc_comm_lock, flags);
106
107 return ret;
108}
109
110
diff --git a/arch/arm/mach-msm/proc_comm.h b/arch/arm/mach-msm/proc_comm.h
new file mode 100644
index 000000000000..834760f25692
--- /dev/null
+++ b/arch/arm/mach-msm/proc_comm.h
@@ -0,0 +1,165 @@
1/* arch/arm/mach-msm/proc_comm.h
2 *
3 * Copyright (c) 2007 QUALCOMM Incorporated
4 *
5 * This software is licensed under the terms of the GNU General Public
6 * License version 2, as published by the Free Software Foundation, and
7 * may be copied, distributed, and modified under those terms.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 */
15
16#ifndef _ARCH_ARM_MACH_MSM_PROC_COMM_H_
17#define _ARCH_ARM_MACH_MSM_PROC_COMM_H_
18
19enum {
20 PCOM_CMD_IDLE = 0x0,
21 PCOM_CMD_DONE,
22 PCOM_RESET_APPS,
23 PCOM_RESET_CHIP,
24 PCOM_CONFIG_NAND_MPU,
25 PCOM_CONFIG_USB_CLKS,
26 PCOM_GET_POWER_ON_STATUS,
27 PCOM_GET_WAKE_UP_STATUS,
28 PCOM_GET_BATT_LEVEL,
29 PCOM_CHG_IS_CHARGING,
30 PCOM_POWER_DOWN,
31 PCOM_USB_PIN_CONFIG,
32 PCOM_USB_PIN_SEL,
33 PCOM_SET_RTC_ALARM,
34 PCOM_NV_READ,
35 PCOM_NV_WRITE,
36 PCOM_GET_UUID_HIGH,
37 PCOM_GET_UUID_LOW,
38 PCOM_GET_HW_ENTROPY,
39 PCOM_RPC_GPIO_TLMM_CONFIG_REMOTE,
40 PCOM_CLKCTL_RPC_ENABLE,
41 PCOM_CLKCTL_RPC_DISABLE,
42 PCOM_CLKCTL_RPC_RESET,
43 PCOM_CLKCTL_RPC_SET_FLAGS,
44 PCOM_CLKCTL_RPC_SET_RATE,
45 PCOM_CLKCTL_RPC_MIN_RATE,
46 PCOM_CLKCTL_RPC_MAX_RATE,
47 PCOM_CLKCTL_RPC_RATE,
48 PCOM_CLKCTL_RPC_PLL_REQUEST,
49 PCOM_CLKCTL_RPC_ENABLED,
50 PCOM_VREG_SWITCH,
51 PCOM_VREG_SET_LEVEL,
52 PCOM_GPIO_TLMM_CONFIG_GROUP,
53 PCOM_GPIO_TLMM_UNCONFIG_GROUP,
54 PCOM_NV_WRITE_BYTES_4_7,
55 PCOM_CONFIG_DISP,
56 PCOM_GET_FTM_BOOT_COUNT,
57 PCOM_RPC_GPIO_TLMM_CONFIG_EX,
58 PCOM_PM_MPP_CONFIG,
59 PCOM_GPIO_IN,
60 PCOM_GPIO_OUT,
61 PCOM_RESET_MODEM,
62 PCOM_RESET_CHIP_IMM,
63 PCOM_PM_VID_EN,
64 PCOM_VREG_PULLDOWN,
65 PCOM_NUM_CMDS,
66};
67
68enum {
69 PCOM_INVALID_STATUS = 0x0,
70 PCOM_READY,
71 PCOM_CMD_RUNNING,
72 PCOM_CMD_SUCCESS,
73 PCOM_CMD_FAIL,
74};
75
76/* List of VREGs that support the Pull Down Resistor setting. */
77enum {
78 PM_VREG_PDOWN_MSMA_ID,
79 PM_VREG_PDOWN_MSMP_ID,
80 PM_VREG_PDOWN_MSME1_ID, /* Not supported in Panoramix */
81 PM_VREG_PDOWN_MSMC1_ID, /* Not supported in PM6620 */
82 PM_VREG_PDOWN_MSMC2_ID, /* Supported in PM7500 only */
83 PM_VREG_PDOWN_GP3_ID, /* Supported in PM7500 only */
84 PM_VREG_PDOWN_MSME2_ID, /* Supported in PM7500 and Panoramix only */
85 PM_VREG_PDOWN_GP4_ID, /* Supported in PM7500 only */
86 PM_VREG_PDOWN_GP1_ID, /* Supported in PM7500 only */
87 PM_VREG_PDOWN_TCXO_ID,
88 PM_VREG_PDOWN_PA_ID,
89 PM_VREG_PDOWN_RFTX_ID,
90 PM_VREG_PDOWN_RFRX1_ID,
91 PM_VREG_PDOWN_RFRX2_ID,
92 PM_VREG_PDOWN_SYNT_ID,
93 PM_VREG_PDOWN_WLAN_ID,
94 PM_VREG_PDOWN_USB_ID,
95 PM_VREG_PDOWN_MMC_ID,
96 PM_VREG_PDOWN_RUIM_ID,
97 PM_VREG_PDOWN_MSMC0_ID, /* Supported in PM6610 only */
98 PM_VREG_PDOWN_GP2_ID, /* Supported in PM7500 only */
99 PM_VREG_PDOWN_GP5_ID, /* Supported in PM7500 only */
100 PM_VREG_PDOWN_GP6_ID, /* Supported in PM7500 only */
101 PM_VREG_PDOWN_RF_ID,
102 PM_VREG_PDOWN_RF_VCO_ID,
103 PM_VREG_PDOWN_MPLL_ID,
104 PM_VREG_PDOWN_S2_ID,
105 PM_VREG_PDOWN_S3_ID,
106 PM_VREG_PDOWN_RFUBM_ID,
107
108 /* new for HAN */
109 PM_VREG_PDOWN_RF1_ID,
110 PM_VREG_PDOWN_RF2_ID,
111 PM_VREG_PDOWN_RFA_ID,
112 PM_VREG_PDOWN_CDC2_ID,
113 PM_VREG_PDOWN_RFTX2_ID,
114 PM_VREG_PDOWN_USIM_ID,
115 PM_VREG_PDOWN_USB2P6_ID,
116 PM_VREG_PDOWN_USB3P3_ID,
117 PM_VREG_PDOWN_INVALID_ID,
118
119 /* backward compatible enums only */
120 PM_VREG_PDOWN_CAM_ID = PM_VREG_PDOWN_GP1_ID,
121 PM_VREG_PDOWN_MDDI_ID = PM_VREG_PDOWN_GP2_ID,
122 PM_VREG_PDOWN_RUIM2_ID = PM_VREG_PDOWN_GP3_ID,
123 PM_VREG_PDOWN_AUX_ID = PM_VREG_PDOWN_GP4_ID,
124 PM_VREG_PDOWN_AUX2_ID = PM_VREG_PDOWN_GP5_ID,
125 PM_VREG_PDOWN_BT_ID = PM_VREG_PDOWN_GP6_ID,
126
127 PM_VREG_PDOWN_MSME_ID = PM_VREG_PDOWN_MSME1_ID,
128 PM_VREG_PDOWN_MSMC_ID = PM_VREG_PDOWN_MSMC1_ID,
129 PM_VREG_PDOWN_RFA1_ID = PM_VREG_PDOWN_RFRX2_ID,
130 PM_VREG_PDOWN_RFA2_ID = PM_VREG_PDOWN_RFTX2_ID,
131 PM_VREG_PDOWN_XO_ID = PM_VREG_PDOWN_TCXO_ID
132};
133
134/* gpio info for PCOM_RPC_GPIO_TLMM_CONFIG_EX */
135
136#define GPIO_ENABLE 0
137#define GPIO_DISABLE 1
138
139#define GPIO_INPUT 0
140#define GPIO_OUTPUT 1
141
142#define GPIO_NO_PULL 0
143#define GPIO_PULL_DOWN 1
144#define GPIO_KEEPER 2
145#define GPIO_PULL_UP 3
146
147#define GPIO_2MA 0
148#define GPIO_4MA 1
149#define GPIO_6MA 2
150#define GPIO_8MA 3
151#define GPIO_10MA 4
152#define GPIO_12MA 5
153#define GPIO_14MA 6
154#define GPIO_16MA 7
155
156#define PCOM_GPIO_CFG(gpio, func, dir, pull, drvstr) \
157 ((((gpio) & 0x3FF) << 4) | \
158 ((func) & 0xf) | \
159 (((dir) & 0x1) << 14) | \
160 (((pull) & 0x3) << 15) | \
161 (((drvstr) & 0xF) << 17))
162
163int msm_proc_comm(unsigned cmd, unsigned *data1, unsigned *data2);
164
165#endif
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 2bffe9b7e9fe..345a14cb73c3 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -45,7 +45,7 @@ struct msm_clock {
45 struct clock_event_device clockevent; 45 struct clock_event_device clockevent;
46 struct clocksource clocksource; 46 struct clocksource clocksource;
47 struct irqaction irq; 47 struct irqaction irq;
48 uint32_t regbase; 48 void __iomem *regbase;
49 uint32_t freq; 49 uint32_t freq;
50 uint32_t shift; 50 uint32_t shift;
51}; 51};
diff --git a/arch/arm/mach-msm/vreg.c b/arch/arm/mach-msm/vreg.c
new file mode 100644
index 000000000000..fcb0b9f25684
--- /dev/null
+++ b/arch/arm/mach-msm/vreg.c
@@ -0,0 +1,143 @@
1/* arch/arm/mach-msm/vreg.c
2 *
3 * Copyright (C) 2008 Google, Inc.
4 * Author: Brian Swetland <swetland@google.com>
5 *
6 * This software is licensed under the terms of the GNU General Public
7 * License version 2, as published by the Free Software Foundation, and
8 * may be copied, distributed, and modified under those terms.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 */
16
17#include <linux/kernel.h>
18#include <linux/device.h>
19#include <linux/init.h>
20#include <linux/debugfs.h>
21#include <mach/vreg.h>
22
23#include "proc_comm.h"
24
25struct vreg {
26 const char *name;
27 unsigned id;
28};
29
30#define VREG(_name, _id) { .name = _name, .id = _id, }
31
32static struct vreg vregs[] = {
33 VREG("msma", 0),
34 VREG("msmp", 1),
35 VREG("msme1", 2),
36 VREG("msmc1", 3),
37 VREG("msmc2", 4),
38 VREG("gp3", 5),
39 VREG("msme2", 6),
40 VREG("gp4", 7),
41 VREG("gp1", 8),
42 VREG("tcxo", 9),
43 VREG("pa", 10),
44 VREG("rftx", 11),
45 VREG("rfrx1", 12),
46 VREG("rfrx2", 13),
47 VREG("synt", 14),
48 VREG("wlan", 15),
49 VREG("usb", 16),
50 VREG("boost", 17),
51 VREG("mmc", 18),
52 VREG("ruim", 19),
53 VREG("msmc0", 20),
54 VREG("gp2", 21),
55 VREG("gp5", 22),
56 VREG("gp6", 23),
57 VREG("rf", 24),
58 VREG("rf_vco", 26),
59 VREG("mpll", 27),
60 VREG("s2", 28),
61 VREG("s3", 29),
62 VREG("rfubm", 30),
63 VREG("ncp", 31),
64};
65
66struct vreg *vreg_get(struct device *dev, const char *id)
67{
68 int n;
69 for (n = 0; n < ARRAY_SIZE(vregs); n++) {
70 if (!strcmp(vregs[n].name, id))
71 return vregs + n;
72 }
73 return 0;
74}
75
76void vreg_put(struct vreg *vreg)
77{
78}
79
80int vreg_enable(struct vreg *vreg)
81{
82 unsigned id = vreg->id;
83 unsigned enable = 1;
84 return msm_proc_comm(PCOM_VREG_SWITCH, &id, &enable);
85}
86
87void vreg_disable(struct vreg *vreg)
88{
89 unsigned id = vreg->id;
90 unsigned enable = 0;
91 msm_proc_comm(PCOM_VREG_SWITCH, &id, &enable);
92}
93
94int vreg_set_level(struct vreg *vreg, unsigned mv)
95{
96 unsigned id = vreg->id;
97 return msm_proc_comm(PCOM_VREG_SET_LEVEL, &id, &mv);
98}
99
100#if defined(CONFIG_DEBUG_FS)
101
102static int vreg_debug_set(void *data, u64 val)
103{
104 struct vreg *vreg = data;
105 switch (val) {
106 case 0:
107 vreg_disable(vreg);
108 break;
109 case 1:
110 vreg_enable(vreg);
111 break;
112 default:
113 vreg_set_level(vreg, val);
114 break;
115 }
116 return 0;
117}
118
119static int vreg_debug_get(void *data, u64 *val)
120{
121 return -ENOSYS;
122}
123
124DEFINE_SIMPLE_ATTRIBUTE(vreg_fops, vreg_debug_get, vreg_debug_set, "%llu\n");
125
126static int __init vreg_debug_init(void)
127{
128 struct dentry *dent;
129 int n;
130
131 dent = debugfs_create_dir("vreg", 0);
132 if (IS_ERR(dent))
133 return 0;
134
135 for (n = 0; n < ARRAY_SIZE(vregs); n++)
136 (void) debugfs_create_file(vregs[n].name, 0644,
137 dent, vregs + n, &vreg_fops);
138
139 return 0;
140}
141
142device_initcall(vreg_debug_init);
143#endif
diff --git a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c
index 49f434c39eb7..2e285bbb7bbd 100644
--- a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c
+++ b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c
@@ -13,6 +13,7 @@
13#include <linux/platform_device.h> 13#include <linux/platform_device.h>
14#include <linux/ata_platform.h> 14#include <linux/ata_platform.h>
15#include <linux/mv643xx_eth.h> 15#include <linux/mv643xx_eth.h>
16#include <linux/ethtool.h>
16#include <mach/mv78xx0.h> 17#include <mach/mv78xx0.h>
17#include <asm/mach-types.h> 18#include <asm/mach-types.h>
18#include <asm/mach/arch.h> 19#include <asm/mach/arch.h>
@@ -28,10 +29,14 @@ static struct mv643xx_eth_platform_data db78x00_ge01_data = {
28 29
29static struct mv643xx_eth_platform_data db78x00_ge10_data = { 30static struct mv643xx_eth_platform_data db78x00_ge10_data = {
30 .phy_addr = MV643XX_ETH_PHY_NONE, 31 .phy_addr = MV643XX_ETH_PHY_NONE,
32 .speed = SPEED_1000,
33 .duplex = DUPLEX_FULL,
31}; 34};
32 35
33static struct mv643xx_eth_platform_data db78x00_ge11_data = { 36static struct mv643xx_eth_platform_data db78x00_ge11_data = {
34 .phy_addr = MV643XX_ETH_PHY_NONE, 37 .phy_addr = MV643XX_ETH_PHY_NONE,
38 .speed = SPEED_1000,
39 .duplex = DUPLEX_FULL,
35}; 40};
36 41
37static struct mv_sata_platform_data db78x00_sata_data = { 42static struct mv_sata_platform_data db78x00_sata_data = {
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 9625ef5975d0..437065c25c9c 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -19,6 +19,7 @@
19#include <linux/mv643xx_i2c.h> 19#include <linux/mv643xx_i2c.h>
20#include <linux/ata_platform.h> 20#include <linux/ata_platform.h>
21#include <linux/spi/orion_spi.h> 21#include <linux/spi/orion_spi.h>
22#include <net/dsa.h>
22#include <asm/page.h> 23#include <asm/page.h>
23#include <asm/setup.h> 24#include <asm/setup.h>
24#include <asm/timex.h> 25#include <asm/timex.h>
@@ -198,6 +199,40 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
198 199
199 200
200/***************************************************************************** 201/*****************************************************************************
202 * Ethernet switch
203 ****************************************************************************/
204static struct resource orion5x_switch_resources[] = {
205 {
206 .start = 0,
207 .end = 0,
208 .flags = IORESOURCE_IRQ,
209 },
210};
211
212static struct platform_device orion5x_switch_device = {
213 .name = "dsa",
214 .id = 0,
215 .num_resources = 0,
216 .resource = orion5x_switch_resources,
217};
218
219void __init orion5x_eth_switch_init(struct dsa_platform_data *d, int irq)
220{
221 if (irq != NO_IRQ) {
222 orion5x_switch_resources[0].start = irq;
223 orion5x_switch_resources[0].end = irq;
224 orion5x_switch_device.num_resources = 1;
225 }
226
227 d->mii_bus = &orion5x_eth_shared.dev;
228 d->netdev = &orion5x_eth.dev;
229 orion5x_switch_device.dev.platform_data = d;
230
231 platform_device_register(&orion5x_switch_device);
232}
233
234
235/*****************************************************************************
201 * I2C 236 * I2C
202 ****************************************************************************/ 237 ****************************************************************************/
203static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = { 238static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = {
@@ -275,7 +310,8 @@ void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data)
275 * SPI 310 * SPI
276 ****************************************************************************/ 311 ****************************************************************************/
277static struct orion_spi_info orion5x_spi_plat_data = { 312static struct orion_spi_info orion5x_spi_plat_data = {
278 .tclk = 0, 313 .tclk = 0,
314 .enable_clock_fix = 1,
279}; 315};
280 316
281static struct resource orion5x_spi_resources[] = { 317static struct resource orion5x_spi_resources[] = {
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h
index 1f8b2da676a5..a000c7c6ee96 100644
--- a/arch/arm/mach-orion5x/common.h
+++ b/arch/arm/mach-orion5x/common.h
@@ -1,6 +1,7 @@
1#ifndef __ARCH_ORION5X_COMMON_H 1#ifndef __ARCH_ORION5X_COMMON_H
2#define __ARCH_ORION5X_COMMON_H 2#define __ARCH_ORION5X_COMMON_H
3 3
4struct dsa_platform_data;
4struct mv643xx_eth_platform_data; 5struct mv643xx_eth_platform_data;
5struct mv_sata_platform_data; 6struct mv_sata_platform_data;
6 7
@@ -29,6 +30,7 @@ void orion5x_setup_pcie_wa_win(u32 base, u32 size);
29void orion5x_ehci0_init(void); 30void orion5x_ehci0_init(void);
30void orion5x_ehci1_init(void); 31void orion5x_ehci1_init(void);
31void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data); 32void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);
33void orion5x_eth_switch_init(struct dsa_platform_data *d, int irq);
32void orion5x_i2c_init(void); 34void orion5x_i2c_init(void);
33void orion5x_sata_init(struct mv_sata_platform_data *sata_data); 35void orion5x_sata_init(struct mv_sata_platform_data *sata_data);
34void orion5x_spi_init(void); 36void orion5x_spi_init(void);
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index 500cdadaf09c..15f53235ee30 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -16,6 +16,7 @@
16#include <linux/mtd/physmap.h> 16#include <linux/mtd/physmap.h>
17#include <linux/mv643xx_eth.h> 17#include <linux/mv643xx_eth.h>
18#include <linux/ethtool.h> 18#include <linux/ethtool.h>
19#include <net/dsa.h>
19#include <asm/mach-types.h> 20#include <asm/mach-types.h>
20#include <asm/gpio.h> 21#include <asm/gpio.h>
21#include <asm/leds.h> 22#include <asm/leds.h>
@@ -93,6 +94,15 @@ static struct mv643xx_eth_platform_data rd88f5181l_fxo_eth_data = {
93 .duplex = DUPLEX_FULL, 94 .duplex = DUPLEX_FULL,
94}; 95};
95 96
97static struct dsa_platform_data rd88f5181l_fxo_switch_data = {
98 .port_names[0] = "lan2",
99 .port_names[1] = "lan1",
100 .port_names[2] = "wan",
101 .port_names[3] = "cpu",
102 .port_names[5] = "lan4",
103 .port_names[7] = "lan3",
104};
105
96static void __init rd88f5181l_fxo_init(void) 106static void __init rd88f5181l_fxo_init(void)
97{ 107{
98 /* 108 /*
@@ -107,6 +117,7 @@ static void __init rd88f5181l_fxo_init(void)
107 */ 117 */
108 orion5x_ehci0_init(); 118 orion5x_ehci0_init();
109 orion5x_eth_init(&rd88f5181l_fxo_eth_data); 119 orion5x_eth_init(&rd88f5181l_fxo_eth_data);
120 orion5x_eth_switch_init(&rd88f5181l_fxo_switch_data, NO_IRQ);
110 orion5x_uart0_init(); 121 orion5x_uart0_init();
111 122
112 orion5x_setup_dev_boot_win(RD88F5181L_FXO_NOR_BOOT_BASE, 123 orion5x_setup_dev_boot_win(RD88F5181L_FXO_NOR_BOOT_BASE,
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index ebde81416499..8ad3934399d4 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -17,6 +17,7 @@
17#include <linux/mv643xx_eth.h> 17#include <linux/mv643xx_eth.h>
18#include <linux/ethtool.h> 18#include <linux/ethtool.h>
19#include <linux/i2c.h> 19#include <linux/i2c.h>
20#include <net/dsa.h>
20#include <asm/mach-types.h> 21#include <asm/mach-types.h>
21#include <asm/gpio.h> 22#include <asm/gpio.h>
22#include <asm/leds.h> 23#include <asm/leds.h>
@@ -94,6 +95,15 @@ static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = {
94 .duplex = DUPLEX_FULL, 95 .duplex = DUPLEX_FULL,
95}; 96};
96 97
98static struct dsa_platform_data rd88f5181l_ge_switch_data = {
99 .port_names[0] = "lan2",
100 .port_names[1] = "lan1",
101 .port_names[2] = "wan",
102 .port_names[3] = "cpu",
103 .port_names[5] = "lan4",
104 .port_names[7] = "lan3",
105};
106
97static struct i2c_board_info __initdata rd88f5181l_ge_i2c_rtc = { 107static struct i2c_board_info __initdata rd88f5181l_ge_i2c_rtc = {
98 I2C_BOARD_INFO("ds1338", 0x68), 108 I2C_BOARD_INFO("ds1338", 0x68),
99}; 109};
@@ -112,6 +122,7 @@ static void __init rd88f5181l_ge_init(void)
112 */ 122 */
113 orion5x_ehci0_init(); 123 orion5x_ehci0_init();
114 orion5x_eth_init(&rd88f5181l_ge_eth_data); 124 orion5x_eth_init(&rd88f5181l_ge_eth_data);
125 orion5x_eth_switch_init(&rd88f5181l_ge_switch_data, gpio_to_irq(8));
115 orion5x_i2c_init(); 126 orion5x_i2c_init();
116 orion5x_uart0_init(); 127 orion5x_uart0_init();
117 128
diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
index 40e049539091..262e25e4dace 100644
--- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
@@ -19,6 +19,7 @@
19#include <linux/spi/orion_spi.h> 19#include <linux/spi/orion_spi.h>
20#include <linux/spi/flash.h> 20#include <linux/spi/flash.h>
21#include <linux/ethtool.h> 21#include <linux/ethtool.h>
22#include <net/dsa.h>
22#include <asm/mach-types.h> 23#include <asm/mach-types.h>
23#include <asm/gpio.h> 24#include <asm/gpio.h>
24#include <asm/leds.h> 25#include <asm/leds.h>
@@ -34,6 +35,15 @@ static struct mv643xx_eth_platform_data rd88f6183ap_ge_eth_data = {
34 .duplex = DUPLEX_FULL, 35 .duplex = DUPLEX_FULL,
35}; 36};
36 37
38static struct dsa_platform_data rd88f6183ap_ge_switch_data = {
39 .port_names[0] = "lan1",
40 .port_names[1] = "lan2",
41 .port_names[2] = "lan3",
42 .port_names[3] = "lan4",
43 .port_names[4] = "wan",
44 .port_names[5] = "cpu",
45};
46
37static struct mtd_partition rd88f6183ap_ge_partitions[] = { 47static struct mtd_partition rd88f6183ap_ge_partitions[] = {
38 { 48 {
39 .name = "kernel", 49 .name = "kernel",
@@ -79,6 +89,7 @@ static void __init rd88f6183ap_ge_init(void)
79 */ 89 */
80 orion5x_ehci0_init(); 90 orion5x_ehci0_init();
81 orion5x_eth_init(&rd88f6183ap_ge_eth_data); 91 orion5x_eth_init(&rd88f6183ap_ge_eth_data);
92 orion5x_eth_switch_init(&rd88f6183ap_ge_switch_data, gpio_to_irq(3));
82 spi_register_board_info(rd88f6183ap_ge_spi_slave_info, 93 spi_register_board_info(rd88f6183ap_ge_spi_slave_info,
83 ARRAY_SIZE(rd88f6183ap_ge_spi_slave_info)); 94 ARRAY_SIZE(rd88f6183ap_ge_spi_slave_info));
84 orion5x_spi_init(); 95 orion5x_spi_init();
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index 9a4fd5256462..cc8f89200865 100644
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -15,6 +15,7 @@
15#include <linux/mtd/physmap.h> 15#include <linux/mtd/physmap.h>
16#include <linux/mv643xx_eth.h> 16#include <linux/mv643xx_eth.h>
17#include <linux/ethtool.h> 17#include <linux/ethtool.h>
18#include <net/dsa.h>
18#include <asm/mach-types.h> 19#include <asm/mach-types.h>
19#include <asm/gpio.h> 20#include <asm/gpio.h>
20#include <asm/mach/arch.h> 21#include <asm/mach/arch.h>
@@ -105,6 +106,15 @@ static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = {
105 .duplex = DUPLEX_FULL, 106 .duplex = DUPLEX_FULL,
106}; 107};
107 108
109static struct dsa_platform_data wrt350n_v2_switch_data = {
110 .port_names[0] = "lan2",
111 .port_names[1] = "lan1",
112 .port_names[2] = "wan",
113 .port_names[3] = "cpu",
114 .port_names[5] = "lan3",
115 .port_names[7] = "lan4",
116};
117
108static void __init wrt350n_v2_init(void) 118static void __init wrt350n_v2_init(void)
109{ 119{
110 /* 120 /*
@@ -119,6 +129,7 @@ static void __init wrt350n_v2_init(void)
119 */ 129 */
120 orion5x_ehci0_init(); 130 orion5x_ehci0_init();
121 orion5x_eth_init(&wrt350n_v2_eth_data); 131 orion5x_eth_init(&wrt350n_v2_eth_data);
132 orion5x_eth_switch_init(&wrt350n_v2_switch_data, NO_IRQ);
122 orion5x_uart0_init(); 133 orion5x_uart0_init();
123 134
124 orion5x_setup_dev_boot_win(WRT350N_V2_NOR_BOOT_BASE, 135 orion5x_setup_dev_boot_win(WRT350N_V2_NOR_BOOT_BASE,
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index f27f6b3d6e6f..a062235e83a8 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -71,6 +71,14 @@ config PXA_SHARPSL
71 SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) 71 SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
72 handheld computer. 72 handheld computer.
73 73
74config CORGI_SSP_DEPRECATED
75 bool
76 select PXA_SSP
77 help
78 This option will include corgi_ssp.c and corgi_lcd.c
79 that corgi_ts.c and other legacy drivers (corgi_bl.c
80 and sharpsl_pm.c) may depend on.
81
74config MACH_POODLE 82config MACH_POODLE
75 bool "Enable Sharp SL-5600 (Poodle) Support" 83 bool "Enable Sharp SL-5600 (Poodle) Support"
76 depends on PXA_SHARPSL 84 depends on PXA_SHARPSL
@@ -257,7 +265,6 @@ config MACH_ARMCORE
257 bool "CompuLab CM-X255/CM-X270 modules" 265 bool "CompuLab CM-X255/CM-X270 modules"
258 select PXA27x 266 select PXA27x
259 select IWMMXT 267 select IWMMXT
260 select ZONE_DMA if PCI
261 select PXA25x 268 select PXA25x
262 select PXA_SSP 269 select PXA_SSP
263 270
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index d31c9979cfa3..d64c68b232e3 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -37,6 +37,7 @@ obj-$(CONFIG_MACH_TRIZEPS4) += trizeps4.o
37obj-$(CONFIG_MACH_COLIBRI) += colibri.o 37obj-$(CONFIG_MACH_COLIBRI) += colibri.o
38obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o sharpsl_pm.o corgi_pm.o 38obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o sharpsl_pm.o corgi_pm.o
39obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o 39obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o
40obj-$(CONFIG_CORGI_SSP_DEPRECATED) += corgi_ssp.o corgi_lcd.o
40obj-$(CONFIG_MACH_POODLE) += poodle.o 41obj-$(CONFIG_MACH_POODLE) += poodle.o
41obj-$(CONFIG_MACH_PCM027) += pcm027.o 42obj-$(CONFIG_MACH_PCM027) += pcm027.o
42obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o 43obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o
diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c
new file mode 100644
index 000000000000..411607bc1fc2
--- /dev/null
+++ b/arch/arm/mach-pxa/corgi_lcd.c
@@ -0,0 +1,289 @@
1/*
2 * linux/arch/arm/mach-pxa/corgi_lcd.c
3 *
4 * Corgi/Spitz LCD Specific Code
5 *
6 * Copyright (C) 2005 Richard Purdie
7 *
8 * Connectivity:
9 * Corgi - LCD to ATI Imageon w100 (Wallaby)
10 * Spitz - LCD to PXA Framebuffer
11 *
12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License version 2 as
14 * published by the Free Software Foundation.
15 *
16 */
17
18#include <linux/delay.h>
19#include <linux/kernel.h>
20#include <linux/platform_device.h>
21#include <linux/module.h>
22#include <linux/string.h>
23#include <mach/corgi.h>
24#include <mach/hardware.h>
25#include <mach/pxa-regs.h>
26#include <mach/sharpsl.h>
27#include <mach/spitz.h>
28#include <asm/hardware/scoop.h>
29#include <asm/mach/sharpsl_param.h>
30#include "generic.h"
31
32/* Register Addresses */
33#define RESCTL_ADRS 0x00
34#define PHACTRL_ADRS 0x01
35#define DUTYCTRL_ADRS 0x02
36#define POWERREG0_ADRS 0x03
37#define POWERREG1_ADRS 0x04
38#define GPOR3_ADRS 0x05
39#define PICTRL_ADRS 0x06
40#define POLCTRL_ADRS 0x07
41
42/* Register Bit Definitions */
43#define RESCTL_QVGA 0x01
44#define RESCTL_VGA 0x00
45
46#define POWER1_VW_ON 0x01 /* VW Supply FET ON */
47#define POWER1_GVSS_ON 0x02 /* GVSS(-8V) Power Supply ON */
48#define POWER1_VDD_ON 0x04 /* VDD(8V),SVSS(-4V) Power Supply ON */
49
50#define POWER1_VW_OFF 0x00 /* VW Supply FET OFF */
51#define POWER1_GVSS_OFF 0x00 /* GVSS(-8V) Power Supply OFF */
52#define POWER1_VDD_OFF 0x00 /* VDD(8V),SVSS(-4V) Power Supply OFF */
53
54#define POWER0_COM_DCLK 0x01 /* COM Voltage DC Bias DAC Serial Data Clock */
55#define POWER0_COM_DOUT 0x02 /* COM Voltage DC Bias DAC Serial Data Out */
56#define POWER0_DAC_ON 0x04 /* DAC Power Supply ON */
57#define POWER0_COM_ON 0x08 /* COM Power Supply ON */
58#define POWER0_VCC5_ON 0x10 /* VCC5 Power Supply ON */
59
60#define POWER0_DAC_OFF 0x00 /* DAC Power Supply OFF */
61#define POWER0_COM_OFF 0x00 /* COM Power Supply OFF */
62#define POWER0_VCC5_OFF 0x00 /* VCC5 Power Supply OFF */
63
64#define PICTRL_INIT_STATE 0x01
65#define PICTRL_INIOFF 0x02
66#define PICTRL_POWER_DOWN 0x04
67#define PICTRL_COM_SIGNAL_OFF 0x08
68#define PICTRL_DAC_SIGNAL_OFF 0x10
69
70#define POLCTRL_SYNC_POL_FALL 0x01
71#define POLCTRL_EN_POL_FALL 0x02
72#define POLCTRL_DATA_POL_FALL 0x04
73#define POLCTRL_SYNC_ACT_H 0x08
74#define POLCTRL_EN_ACT_L 0x10
75
76#define POLCTRL_SYNC_POL_RISE 0x00
77#define POLCTRL_EN_POL_RISE 0x00
78#define POLCTRL_DATA_POL_RISE 0x00
79#define POLCTRL_SYNC_ACT_L 0x00
80#define POLCTRL_EN_ACT_H 0x00
81
82#define PHACTRL_PHASE_MANUAL 0x01
83#define DEFAULT_PHAD_QVGA (9)
84#define DEFAULT_COMADJ (125)
85
86/*
87 * This is only a psuedo I2C interface. We can't use the standard kernel
88 * routines as the interface is write only. We just assume the data is acked...
89 */
90static void lcdtg_ssp_i2c_send(u8 data)
91{
92 corgi_ssp_lcdtg_send(POWERREG0_ADRS, data);
93 udelay(10);
94}
95
96static void lcdtg_i2c_send_bit(u8 data)
97{
98 lcdtg_ssp_i2c_send(data);
99 lcdtg_ssp_i2c_send(data | POWER0_COM_DCLK);
100 lcdtg_ssp_i2c_send(data);
101}
102
103static void lcdtg_i2c_send_start(u8 base)
104{
105 lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK | POWER0_COM_DOUT);
106 lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK);
107 lcdtg_ssp_i2c_send(base);
108}
109
110static void lcdtg_i2c_send_stop(u8 base)
111{
112 lcdtg_ssp_i2c_send(base);
113 lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK);
114 lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK | POWER0_COM_DOUT);
115}
116
117static void lcdtg_i2c_send_byte(u8 base, u8 data)
118{
119 int i;
120 for (i = 0; i < 8; i++) {
121 if (data & 0x80)
122 lcdtg_i2c_send_bit(base | POWER0_COM_DOUT);
123 else
124 lcdtg_i2c_send_bit(base);
125 data <<= 1;
126 }
127}
128
129static void lcdtg_i2c_wait_ack(u8 base)
130{
131 lcdtg_i2c_send_bit(base);
132}
133
134static void lcdtg_set_common_voltage(u8 base_data, u8 data)
135{
136 /* Set Common Voltage to M62332FP via I2C */
137 lcdtg_i2c_send_start(base_data);
138 lcdtg_i2c_send_byte(base_data, 0x9c);
139 lcdtg_i2c_wait_ack(base_data);
140 lcdtg_i2c_send_byte(base_data, 0x00);
141 lcdtg_i2c_wait_ack(base_data);
142 lcdtg_i2c_send_byte(base_data, data);
143 lcdtg_i2c_wait_ack(base_data);
144 lcdtg_i2c_send_stop(base_data);
145}
146
147/* Set Phase Adjust */
148static void lcdtg_set_phadadj(int mode)
149{
150 int adj;
151 switch(mode) {
152 case 480:
153 case 640:
154 /* Setting for VGA */
155 adj = sharpsl_param.phadadj;
156 if (adj < 0) {
157 adj = PHACTRL_PHASE_MANUAL;
158 } else {
159 adj = ((adj & 0x0f) << 1) | PHACTRL_PHASE_MANUAL;
160 }
161 break;
162 case 240:
163 case 320:
164 default:
165 /* Setting for QVGA */
166 adj = (DEFAULT_PHAD_QVGA << 1) | PHACTRL_PHASE_MANUAL;
167 break;
168 }
169
170 corgi_ssp_lcdtg_send(PHACTRL_ADRS, adj);
171}
172
173static int lcd_inited;
174
175void corgi_lcdtg_hw_init(int mode)
176{
177 if (!lcd_inited) {
178 int comadj;
179
180 /* Initialize Internal Logic & Port */
181 corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_POWER_DOWN | PICTRL_INIOFF | PICTRL_INIT_STATE
182 | PICTRL_COM_SIGNAL_OFF | PICTRL_DAC_SIGNAL_OFF);
183
184 corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_OFF
185 | POWER0_COM_OFF | POWER0_VCC5_OFF);
186
187 corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);
188
189 /* VDD(+8V), SVSS(-4V) ON */
190 corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);
191 mdelay(3);
192
193 /* DAC ON */
194 corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON
195 | POWER0_COM_OFF | POWER0_VCC5_OFF);
196
197 /* INIB = H, INI = L */
198 /* PICTL[0] = H , PICTL[1] = PICTL[2] = PICTL[4] = L */
199 corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_INIT_STATE | PICTRL_COM_SIGNAL_OFF);
200
201 /* Set Common Voltage */
202 comadj = sharpsl_param.comadj;
203 if (comadj < 0)
204 comadj = DEFAULT_COMADJ;
205 lcdtg_set_common_voltage((POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF), comadj);
206
207 /* VCC5 ON, DAC ON */
208 corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON |
209 POWER0_COM_OFF | POWER0_VCC5_ON);
210
211 /* GVSS(-8V) ON, VDD ON */
212 corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);
213 mdelay(2);
214
215 /* COM SIGNAL ON (PICTL[3] = L) */
216 corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_INIT_STATE);
217
218 /* COM ON, DAC ON, VCC5_ON */
219 corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON
220 | POWER0_COM_ON | POWER0_VCC5_ON);
221
222 /* VW ON, GVSS ON, VDD ON */
223 corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_ON | POWER1_GVSS_ON | POWER1_VDD_ON);
224
225 /* Signals output enable */
226 corgi_ssp_lcdtg_send(PICTRL_ADRS, 0);
227
228 /* Set Phase Adjust */
229 lcdtg_set_phadadj(mode);
230
231 /* Initialize for Input Signals from ATI */
232 corgi_ssp_lcdtg_send(POLCTRL_ADRS, POLCTRL_SYNC_POL_RISE | POLCTRL_EN_POL_RISE
233 | POLCTRL_DATA_POL_RISE | POLCTRL_SYNC_ACT_L | POLCTRL_EN_ACT_H);
234 udelay(1000);
235
236 lcd_inited=1;
237 } else {
238 lcdtg_set_phadadj(mode);
239 }
240
241 switch(mode) {
242 case 480:
243 case 640:
244 /* Set Lcd Resolution (VGA) */
245 corgi_ssp_lcdtg_send(RESCTL_ADRS, RESCTL_VGA);
246 break;
247 case 240:
248 case 320:
249 default:
250 /* Set Lcd Resolution (QVGA) */
251 corgi_ssp_lcdtg_send(RESCTL_ADRS, RESCTL_QVGA);
252 break;
253 }
254}
255
256void corgi_lcdtg_suspend(void)
257{
258 /* 60Hz x 2 frame = 16.7msec x 2 = 33.4 msec */
259 mdelay(34);
260
261 /* (1)VW OFF */
262 corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);
263
264 /* (2)COM OFF */
265 corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_COM_SIGNAL_OFF);
266 corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON);
267
268 /* (3)Set Common Voltage Bias 0V */
269 lcdtg_set_common_voltage(POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON, 0);
270
271 /* (4)GVSS OFF */
272 corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);
273
274 /* (5)VCC5 OFF */
275 corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF);
276
277 /* (6)Set PDWN, INIOFF, DACOFF */
278 corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_INIOFF | PICTRL_DAC_SIGNAL_OFF |
279 PICTRL_POWER_DOWN | PICTRL_COM_SIGNAL_OFF);
280
281 /* (7)DAC OFF */
282 corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_DAC_OFF | POWER0_COM_OFF | POWER0_VCC5_OFF);
283
284 /* (8)VDD OFF */
285 corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);
286
287 lcd_inited = 0;
288}
289
diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c
new file mode 100644
index 000000000000..8e2f2215c4ba
--- /dev/null
+++ b/arch/arm/mach-pxa/corgi_ssp.c
@@ -0,0 +1,276 @@
1/*
2 * SSP control code for Sharp Corgi devices
3 *
4 * Copyright (c) 2004-2005 Richard Purdie
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 */
11
12#include <linux/module.h>
13#include <linux/init.h>
14#include <linux/kernel.h>
15#include <linux/sched.h>
16#include <linux/slab.h>
17#include <linux/delay.h>
18#include <linux/platform_device.h>
19#include <mach/hardware.h>
20#include <asm/mach-types.h>
21
22#include <mach/ssp.h>
23#include <mach/pxa-regs.h>
24#include <mach/pxa2xx-gpio.h>
25#include <mach/regs-ssp.h>
26#include "sharpsl.h"
27
28static DEFINE_SPINLOCK(corgi_ssp_lock);
29static struct ssp_dev corgi_ssp_dev;
30static struct ssp_state corgi_ssp_state;
31static struct corgissp_machinfo *ssp_machinfo;
32
33/*
34 * There are three devices connected to the SSP interface:
35 * 1. A touchscreen controller (TI ADS7846 compatible)
36 * 2. An LCD controller (with some Backlight functionality)
37 * 3. A battery monitoring IC (Maxim MAX1111)
38 *
39 * Each device uses a different speed/mode of communication.
40 *
41 * The touchscreen is very sensitive and the most frequently used
42 * so the port is left configured for this.
43 *
44 * Devices are selected using Chip Selects on GPIOs.
45 */
46
47/*
48 * ADS7846 Routines
49 */
50unsigned long corgi_ssp_ads7846_putget(ulong data)
51{
52 unsigned long flag;
53 u32 ret = 0;
54
55 spin_lock_irqsave(&corgi_ssp_lock, flag);
56 if (ssp_machinfo->cs_ads7846 >= 0)
57 GPCR(ssp_machinfo->cs_ads7846) = GPIO_bit(ssp_machinfo->cs_ads7846);
58
59 ssp_write_word(&corgi_ssp_dev,data);
60 ssp_read_word(&corgi_ssp_dev, &ret);
61
62 if (ssp_machinfo->cs_ads7846 >= 0)
63 GPSR(ssp_machinfo->cs_ads7846) = GPIO_bit(ssp_machinfo->cs_ads7846);
64 spin_unlock_irqrestore(&corgi_ssp_lock, flag);
65
66 return ret;
67}
68
69/*
70 * NOTE: These functions should always be called in interrupt context
71 * and use the _lock and _unlock functions. They are very time sensitive.
72 */
73void corgi_ssp_ads7846_lock(void)
74{
75 spin_lock(&corgi_ssp_lock);
76 if (ssp_machinfo->cs_ads7846 >= 0)
77 GPCR(ssp_machinfo->cs_ads7846) = GPIO_bit(ssp_machinfo->cs_ads7846);
78}
79
80void corgi_ssp_ads7846_unlock(void)
81{
82 if (ssp_machinfo->cs_ads7846 >= 0)
83 GPSR(ssp_machinfo->cs_ads7846) = GPIO_bit(ssp_machinfo->cs_ads7846);
84 spin_unlock(&corgi_ssp_lock);
85}
86
87void corgi_ssp_ads7846_put(ulong data)
88{
89 ssp_write_word(&corgi_ssp_dev,data);
90}
91
92unsigned long corgi_ssp_ads7846_get(void)
93{
94 u32 ret = 0;
95 ssp_read_word(&corgi_ssp_dev, &ret);
96 return ret;
97}
98
99EXPORT_SYMBOL(corgi_ssp_ads7846_putget);
100EXPORT_SYMBOL(corgi_ssp_ads7846_lock);
101EXPORT_SYMBOL(corgi_ssp_ads7846_unlock);
102EXPORT_SYMBOL(corgi_ssp_ads7846_put);
103EXPORT_SYMBOL(corgi_ssp_ads7846_get);
104
105
106/*
107 * LCD/Backlight Routines
108 */
109unsigned long corgi_ssp_dac_put(ulong data)
110{
111 unsigned long flag, sscr1 = SSCR1_SPH;
112 u32 tmp;
113
114 spin_lock_irqsave(&corgi_ssp_lock, flag);
115
116 if (machine_is_spitz() || machine_is_akita() || machine_is_borzoi())
117 sscr1 = 0;
118
119 ssp_disable(&corgi_ssp_dev);
120 ssp_config(&corgi_ssp_dev, (SSCR0_Motorola | (SSCR0_DSS & 0x07 )), sscr1, 0, SSCR0_SerClkDiv(ssp_machinfo->clk_lcdcon));
121 ssp_enable(&corgi_ssp_dev);
122
123 if (ssp_machinfo->cs_lcdcon >= 0)
124 GPCR(ssp_machinfo->cs_lcdcon) = GPIO_bit(ssp_machinfo->cs_lcdcon);
125 ssp_write_word(&corgi_ssp_dev,data);
126 /* Read null data back from device to prevent SSP overflow */
127 ssp_read_word(&corgi_ssp_dev, &tmp);
128 if (ssp_machinfo->cs_lcdcon >= 0)
129 GPSR(ssp_machinfo->cs_lcdcon) = GPIO_bit(ssp_machinfo->cs_lcdcon);
130
131 ssp_disable(&corgi_ssp_dev);
132 ssp_config(&corgi_ssp_dev, (SSCR0_National | (SSCR0_DSS & 0x0b )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo->clk_ads7846));
133 ssp_enable(&corgi_ssp_dev);
134
135 spin_unlock_irqrestore(&corgi_ssp_lock, flag);
136
137 return 0;
138}
139
140void corgi_ssp_lcdtg_send(u8 adrs, u8 data)
141{
142 corgi_ssp_dac_put(((adrs & 0x07) << 5) | (data & 0x1f));
143}
144
145void corgi_ssp_blduty_set(int duty)
146{
147 corgi_ssp_lcdtg_send(0x02,duty);
148}
149
150EXPORT_SYMBOL(corgi_ssp_lcdtg_send);
151EXPORT_SYMBOL(corgi_ssp_blduty_set);
152
153/*
154 * Max1111 Routines
155 */
156int corgi_ssp_max1111_get(ulong data)
157{
158 unsigned long flag;
159 long voltage = 0, voltage1 = 0, voltage2 = 0;
160
161 spin_lock_irqsave(&corgi_ssp_lock, flag);
162 if (ssp_machinfo->cs_max1111 >= 0)
163 GPCR(ssp_machinfo->cs_max1111) = GPIO_bit(ssp_machinfo->cs_max1111);
164 ssp_disable(&corgi_ssp_dev);
165 ssp_config(&corgi_ssp_dev, (SSCR0_Motorola | (SSCR0_DSS & 0x07 )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo->clk_max1111));
166 ssp_enable(&corgi_ssp_dev);
167
168 udelay(1);
169
170 /* TB1/RB1 */
171 ssp_write_word(&corgi_ssp_dev,data);
172 ssp_read_word(&corgi_ssp_dev, (u32*)&voltage1); /* null read */
173
174 /* TB12/RB2 */
175 ssp_write_word(&corgi_ssp_dev,0);
176 ssp_read_word(&corgi_ssp_dev, (u32*)&voltage1);
177
178 /* TB13/RB3*/
179 ssp_write_word(&corgi_ssp_dev,0);
180 ssp_read_word(&corgi_ssp_dev, (u32*)&voltage2);
181
182 ssp_disable(&corgi_ssp_dev);
183 ssp_config(&corgi_ssp_dev, (SSCR0_National | (SSCR0_DSS & 0x0b )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo->clk_ads7846));
184 ssp_enable(&corgi_ssp_dev);
185 if (ssp_machinfo->cs_max1111 >= 0)
186 GPSR(ssp_machinfo->cs_max1111) = GPIO_bit(ssp_machinfo->cs_max1111);
187 spin_unlock_irqrestore(&corgi_ssp_lock, flag);
188
189 if (voltage1 & 0xc0 || voltage2 & 0x3f)
190 voltage = -1;
191 else
192 voltage = ((voltage1 << 2) & 0xfc) | ((voltage2 >> 6) & 0x03);
193
194 return voltage;
195}
196
197EXPORT_SYMBOL(corgi_ssp_max1111_get);
198
199/*
200 * Support Routines
201 */
202
203void __init corgi_ssp_set_machinfo(struct corgissp_machinfo *machinfo)
204{
205 ssp_machinfo = machinfo;
206}
207
208static int __init corgi_ssp_probe(struct platform_device *dev)
209{
210 int ret;
211
212 /* Chip Select - Disable All */
213 if (ssp_machinfo->cs_lcdcon >= 0)
214 pxa_gpio_mode(ssp_machinfo->cs_lcdcon | GPIO_OUT | GPIO_DFLT_HIGH);
215 if (ssp_machinfo->cs_max1111 >= 0)
216 pxa_gpio_mode(ssp_machinfo->cs_max1111 | GPIO_OUT | GPIO_DFLT_HIGH);
217 if (ssp_machinfo->cs_ads7846 >= 0)
218 pxa_gpio_mode(ssp_machinfo->cs_ads7846 | GPIO_OUT | GPIO_DFLT_HIGH);
219
220 ret = ssp_init(&corgi_ssp_dev, ssp_machinfo->port, 0);
221
222 if (ret)
223 printk(KERN_ERR "Unable to register SSP handler!\n");
224 else {
225 ssp_disable(&corgi_ssp_dev);
226 ssp_config(&corgi_ssp_dev, (SSCR0_National | (SSCR0_DSS & 0x0b )), 0, 0, SSCR0_SerClkDiv(ssp_machinfo->clk_ads7846));
227 ssp_enable(&corgi_ssp_dev);
228 }
229
230 return ret;
231}
232
233static int corgi_ssp_remove(struct platform_device *dev)
234{
235 ssp_exit(&corgi_ssp_dev);
236 return 0;
237}
238
239static int corgi_ssp_suspend(struct platform_device *dev, pm_message_t state)
240{
241 ssp_flush(&corgi_ssp_dev);
242 ssp_save_state(&corgi_ssp_dev,&corgi_ssp_state);
243
244 return 0;
245}
246
247static int corgi_ssp_resume(struct platform_device *dev)
248{
249 if (ssp_machinfo->cs_lcdcon >= 0)
250 GPSR(ssp_machinfo->cs_lcdcon) = GPIO_bit(ssp_machinfo->cs_lcdcon); /* High - Disable LCD Control/Timing Gen */
251 if (ssp_machinfo->cs_max1111 >= 0)
252 GPSR(ssp_machinfo->cs_max1111) = GPIO_bit(ssp_machinfo->cs_max1111); /* High - Disable MAX1111*/
253 if (ssp_machinfo->cs_ads7846 >= 0)
254 GPSR(ssp_machinfo->cs_ads7846) = GPIO_bit(ssp_machinfo->cs_ads7846); /* High - Disable ADS7846*/
255 ssp_restore_state(&corgi_ssp_dev,&corgi_ssp_state);
256 ssp_enable(&corgi_ssp_dev);
257
258 return 0;
259}
260
261static struct platform_driver corgissp_driver = {
262 .probe = corgi_ssp_probe,
263 .remove = corgi_ssp_remove,
264 .suspend = corgi_ssp_suspend,
265 .resume = corgi_ssp_resume,
266 .driver = {
267 .name = "corgi-ssp",
268 },
269};
270
271int __init corgi_ssp_init(void)
272{
273 return platform_driver_register(&corgissp_driver);
274}
275
276arch_initcall(corgi_ssp_init);
diff --git a/arch/arm/mach-pxa/include/mach/corgi.h b/arch/arm/mach-pxa/include/mach/corgi.h
index 585970ef08ce..7239281788de 100644
--- a/arch/arm/mach-pxa/include/mach/corgi.h
+++ b/arch/arm/mach-pxa/include/mach/corgi.h
@@ -113,6 +113,7 @@
113 * Shared data structures 113 * Shared data structures
114 */ 114 */
115extern struct platform_device corgiscoop_device; 115extern struct platform_device corgiscoop_device;
116extern struct platform_device corgissp_device;
116 117
117#endif /* __ASM_ARCH_CORGI_H */ 118#endif /* __ASM_ARCH_CORGI_H */
118 119
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index 9c163e19ada9..32bb4a2eb7f1 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -9,7 +9,8 @@
9 * it under the terms of the GNU General Public License version 2 as 9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 */ 11 */
12 12#ifndef __ASM_MACH_IRQS_H
13#define __ASM_MACH_IRQS_H
13 14
14#ifdef CONFIG_PXA_HAVE_ISA_IRQS 15#ifdef CONFIG_PXA_HAVE_ISA_IRQS
15#define PXA_ISA_IRQ(x) (x) 16#define PXA_ISA_IRQ(x) (x)
@@ -264,3 +265,5 @@
264#endif 265#endif
265 266
266#endif /* CONFIG_PCI_HOST_ITE8152 */ 267#endif /* CONFIG_PCI_HOST_ITE8152 */
268
269#endif /* __ASM_MACH_IRQS_H */
diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h
index 31ac26b55bc1..fa1998caa78e 100644
--- a/arch/arm/mach-pxa/include/mach/spitz.h
+++ b/arch/arm/mach-pxa/include/mach/spitz.h
@@ -142,7 +142,7 @@
142 142
143#define SPITZ_SCP2_GPIO_BASE (NR_BUILTIN_GPIO + 12) 143#define SPITZ_SCP2_GPIO_BASE (NR_BUILTIN_GPIO + 12)
144#define SPITZ_GPIO_IR_ON (SPITZ_SCP2_GPIO_BASE + 0) 144#define SPITZ_GPIO_IR_ON (SPITZ_SCP2_GPIO_BASE + 0)
145#define SPITZ_GPIO_AKIN_PULLUP (SPITZ_SCP2_GPIO_BASE + 1 145#define SPITZ_GPIO_AKIN_PULLUP (SPITZ_SCP2_GPIO_BASE + 1)
146#define SPITZ_GPIO_RESERVED_1 (SPITZ_SCP2_GPIO_BASE + 2) 146#define SPITZ_GPIO_RESERVED_1 (SPITZ_SCP2_GPIO_BASE + 2)
147#define SPITZ_GPIO_RESERVED_2 (SPITZ_SCP2_GPIO_BASE + 3) 147#define SPITZ_GPIO_RESERVED_2 (SPITZ_SCP2_GPIO_BASE + 3)
148#define SPITZ_GPIO_RESERVED_3 (SPITZ_SCP2_GPIO_BASE + 4) 148#define SPITZ_GPIO_RESERVED_3 (SPITZ_SCP2_GPIO_BASE + 4)
@@ -187,4 +187,5 @@
187 */ 187 */
188extern struct platform_device spitzscoop_device; 188extern struct platform_device spitzscoop_device;
189extern struct platform_device spitzscoop2_device; 189extern struct platform_device spitzscoop2_device;
190extern struct platform_device spitzssp_device;
190extern struct sharpsl_charger_machinfo spitz_pm_machinfo; 191extern struct sharpsl_charger_machinfo spitz_pm_machinfo;
diff --git a/arch/arm/mach-pxa/include/mach/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h
index 8bce6d8615b9..4df2d38507dc 100644
--- a/arch/arm/mach-pxa/include/mach/tosa.h
+++ b/arch/arm/mach-pxa/include/mach/tosa.h
@@ -193,4 +193,7 @@
193#define TOSA_KEY_MAIL KEY_MAIL 193#define TOSA_KEY_MAIL KEY_MAIL
194#endif 194#endif
195 195
196struct spi_device;
197extern int tosa_bl_enable(struct spi_device *spi, int enable);
198
196#endif /* _ASM_ARCH_TOSA_H_ */ 199#endif /* _ASM_ARCH_TOSA_H_ */
diff --git a/arch/arm/mach-pxa/pwm.c b/arch/arm/mach-pxa/pwm.c
index 316cd986da5c..74e2ead8cee8 100644
--- a/arch/arm/mach-pxa/pwm.c
+++ b/arch/arm/mach-pxa/pwm.c
@@ -60,7 +60,7 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
60 do_div(c, 1000000000); 60 do_div(c, 1000000000);
61 period_cycles = c; 61 period_cycles = c;
62 62
63 if (period_cycles < 0) 63 if (period_cycles < 1)
64 period_cycles = 1; 64 period_cycles = 1;
65 prescale = (period_cycles - 1) / 1024; 65 prescale = (period_cycles - 1) / 1024;
66 pv = period_cycles / (prescale + 1) - 1; 66 pv = period_cycles / (prescale + 1) - 1;
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 15c2f1a8623b..f0845c1b001c 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -116,20 +116,33 @@ struct battery_thresh spitz_battery_levels_noac[] = {
116 { 0, 0}, 116 { 0, 0},
117}; 117};
118 118
119/* MAX1111 Commands */
120#define MAXCTRL_PD0 1u << 0
121#define MAXCTRL_PD1 1u << 1
122#define MAXCTRL_SGL 1u << 2
123#define MAXCTRL_UNI 1u << 3
124#define MAXCTRL_SEL_SH 4
125#define MAXCTRL_STR 1u << 7
126
119/* 127/*
120 * Read MAX1111 ADC 128 * Read MAX1111 ADC
121 */ 129 */
122extern int max1111_read_channel(int);
123
124int sharpsl_pm_pxa_read_max1111(int channel) 130int sharpsl_pm_pxa_read_max1111(int channel)
125{ 131{
126 if (machine_is_tosa()) // Ugly, better move this function into another module 132 if (machine_is_tosa()) // Ugly, better move this function into another module
127 return 0; 133 return 0;
128 134
135#ifdef CONFIG_CORGI_SSP_DEPRECATED
136 return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
137 | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
138#else
139 extern int max1111_read_channel(int);
140
129 /* max1111 accepts channels from 0-3, however, 141 /* max1111 accepts channels from 0-3, however,
130 * it is encoded from 0-7 here in the code. 142 * it is encoded from 0-7 here in the code.
131 */ 143 */
132 return max1111_read_channel(channel >> 1); 144 return max1111_read_channel(channel >> 1);
145#endif
133} 146}
134 147
135void sharpsl_pm_pxa_init(void) 148void sharpsl_pm_pxa_init(void)
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index a6c4694359ca..224897a67d15 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -31,6 +31,7 @@
31#include <linux/gpio.h> 31#include <linux/gpio.h>
32#include <linux/pda_power.h> 32#include <linux/pda_power.h>
33#include <linux/rfkill.h> 33#include <linux/rfkill.h>
34#include <linux/spi/spi.h>
34 35
35#include <asm/setup.h> 36#include <asm/setup.h>
36#include <asm/mach-types.h> 37#include <asm/mach-types.h>
@@ -42,6 +43,7 @@
42#include <mach/mmc.h> 43#include <mach/mmc.h>
43#include <mach/udc.h> 44#include <mach/udc.h>
44#include <mach/tosa_bt.h> 45#include <mach/tosa_bt.h>
46#include <mach/pxa2xx_spi.h>
45 47
46#include <asm/mach/arch.h> 48#include <asm/mach/arch.h>
47#include <mach/tosa.h> 49#include <mach/tosa.h>
@@ -612,7 +614,7 @@ static int tosa_tc6393xb_enable(struct platform_device *dev)
612 rc = gpio_request(TOSA_GPIO_TC6393XB_SUSPEND, "tc6393xb #suspend"); 614 rc = gpio_request(TOSA_GPIO_TC6393XB_SUSPEND, "tc6393xb #suspend");
613 if (rc) 615 if (rc)
614 goto err_req_suspend; 616 goto err_req_suspend;
615 rc = gpio_request(TOSA_GPIO_TC6393XB_L3V_ON, "l3v"); 617 rc = gpio_request(TOSA_GPIO_TC6393XB_L3V_ON, "tc6393xb l3v");
616 if (rc) 618 if (rc)
617 goto err_req_l3v; 619 goto err_req_l3v;
618 rc = gpio_direction_output(TOSA_GPIO_TC6393XB_L3V_ON, 0); 620 rc = gpio_direction_output(TOSA_GPIO_TC6393XB_L3V_ON, 0);
@@ -772,6 +774,20 @@ static struct platform_device tosa_bt_device = {
772 .dev.platform_data = &tosa_bt_data, 774 .dev.platform_data = &tosa_bt_data,
773}; 775};
774 776
777static struct pxa2xx_spi_master pxa_ssp_master_info = {
778 .num_chipselect = 1,
779};
780
781static struct spi_board_info spi_board_info[] __initdata = {
782 {
783 .modalias = "tosa-lcd",
784 // .platform_data
785 .max_speed_hz = 28750,
786 .bus_num = 2,
787 .chip_select = 0,
788 .mode = SPI_MODE_0,
789 },
790};
775 791
776static struct platform_device *devices[] __initdata = { 792static struct platform_device *devices[] __initdata = {
777 &tosascoop_device, 793 &tosascoop_device,
@@ -826,6 +842,9 @@ static void __init tosa_init(void)
826 pxa_set_i2c_info(NULL); 842 pxa_set_i2c_info(NULL);
827 platform_scoop_config = &tosa_pcmcia_config; 843 platform_scoop_config = &tosa_pcmcia_config;
828 844
845 pxa2xx_set_spi_info(2, &pxa_ssp_master_info);
846 spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
847
829 clk_add_alias("CLK_CK3P6MI", &tc6393xb_device.dev, "GPIO11_CLK", NULL); 848 clk_add_alias("CLK_CK3P6MI", &tc6393xb_device.dev, "GPIO11_CLK", NULL);
830 849
831 platform_add_devices(devices, ARRAY_SIZE(devices)); 850 platform_add_devices(devices, ARRAY_SIZE(devices));
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index a13dbf3c2c05..a72e3add743c 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -399,7 +399,7 @@ static void trizeps4_irda_transceiver_mode(struct device *dev, int mode)
399 /* Switch mode */ 399 /* Switch mode */
400 if (mode & IR_SIRMODE) 400 if (mode & IR_SIRMODE)
401 trizeps_conxs_ircr &= ~ConXS_IRCR_MODE; /* Slow mode */ 401 trizeps_conxs_ircr &= ~ConXS_IRCR_MODE; /* Slow mode */
402 else if (mode & IR_FIRMODE) { 402 else if (mode & IR_FIRMODE)
403 trizeps_conxs_ircr |= ConXS_IRCR_MODE; /* Fast mode */ 403 trizeps_conxs_ircr |= ConXS_IRCR_MODE; /* Fast mode */
404 404
405 /* Switch power */ 405 /* Switch power */
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c
index 2f60bf6b8d43..f854e7385e3c 100644
--- a/arch/arm/mach-s3c2443/clock.c
+++ b/arch/arm/mach-s3c2443/clock.c
@@ -1033,8 +1033,7 @@ void __init s3c2443_init_clocks(int xtal)
1033 1033
1034 fclk = pll / s3c2443_fclk_div(clkdiv0); 1034 fclk = pll / s3c2443_fclk_div(clkdiv0);
1035 hclk = s3c2443_prediv_getrate(&clk_prediv); 1035 hclk = s3c2443_prediv_getrate(&clk_prediv);
1036 hclk = hclk / s3c2443_get_hdiv(clkdiv0); 1036 hclk /= s3c2443_get_hdiv(clkdiv0);
1037 hclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_HCLK) ? 2 : 1);
1038 pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1); 1037 pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1);
1039 1038
1040 s3c24xx_setup_clocks(xtal, fclk, hclk, pclk); 1039 s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index d1193884d76d..ab5f7a21350b 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -400,9 +400,9 @@ config CPU_FEROCEON_OLD_ID
400# ARMv6 400# ARMv6
401config CPU_V6 401config CPU_V6
402 bool "Support ARM V6 processor" 402 bool "Support ARM V6 processor"
403 depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM7X00A || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 403 depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176
404 default y if ARCH_MX3 404 default y if ARCH_MX3
405 default y if ARCH_MSM7X00A 405 default y if ARCH_MSM
406 select CPU_32v6 406 select CPU_32v6
407 select CPU_ABRT_EV6 407 select CPU_ABRT_EV6
408 select CPU_PABRT_NOIFAR 408 select CPU_PABRT_NOIFAR
diff --git a/arch/arm/mm/cache-v4.S b/arch/arm/mm/cache-v4.S
index 33926c9fcda6..5786adf10040 100644
--- a/arch/arm/mm/cache-v4.S
+++ b/arch/arm/mm/cache-v4.S
@@ -29,7 +29,7 @@ ENTRY(v4_flush_user_cache_all)
29 * Clean and invalidate the entire cache. 29 * Clean and invalidate the entire cache.
30 */ 30 */
31ENTRY(v4_flush_kern_cache_all) 31ENTRY(v4_flush_kern_cache_all)
32#ifdef CPU_CP15 32#ifdef CONFIG_CPU_CP15
33 mov r0, #0 33 mov r0, #0
34 mcr p15, 0, r0, c7, c7, 0 @ flush ID cache 34 mcr p15, 0, r0, c7, c7, 0 @ flush ID cache
35 mov pc, lr 35 mov pc, lr
@@ -48,7 +48,7 @@ ENTRY(v4_flush_kern_cache_all)
48 * - flags - vma_area_struct flags describing address space 48 * - flags - vma_area_struct flags describing address space
49 */ 49 */
50ENTRY(v4_flush_user_cache_range) 50ENTRY(v4_flush_user_cache_range)
51#ifdef CPU_CP15 51#ifdef CONFIG_CPU_CP15
52 mov ip, #0 52 mov ip, #0
53 mcreq p15, 0, ip, c7, c7, 0 @ flush ID cache 53 mcreq p15, 0, ip, c7, c7, 0 @ flush ID cache
54 mov pc, lr 54 mov pc, lr
@@ -116,7 +116,7 @@ ENTRY(v4_dma_inv_range)
116 * - end - virtual end address 116 * - end - virtual end address
117 */ 117 */
118ENTRY(v4_dma_flush_range) 118ENTRY(v4_dma_flush_range)
119#ifdef CPU_CP15 119#ifdef CONFIG_CPU_CP15
120 mov r0, #0 120 mov r0, #0
121 mcr p15, 0, r0, c7, c7, 0 @ flush ID cache 121 mcr p15, 0, r0, c7, c7, 0 @ flush ID cache
122#endif 122#endif
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 34e424041927..07f82db70945 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -180,8 +180,8 @@ __v7_setup:
180 mov r10, #0x1f @ domains 0, 1 = manager 180 mov r10, #0x1f @ domains 0, 1 = manager
181 mcr p15, 0, r10, c3, c0, 0 @ load domain access register 181 mcr p15, 0, r10, c3, c0, 0 @ load domain access register
182#endif 182#endif
183 ldr r5, =0x40e040e0 183 ldr r5, =0xff0aa1a8
184 ldr r6, =0xff0aa1a8 184 ldr r6, =0x40e040e0
185 mcr p15, 0, r5, c10, c2, 0 @ write PRRR 185 mcr p15, 0, r5, c10, c2, 0 @ write PRRR
186 mcr p15, 0, r6, c10, c2, 1 @ write NMRR 186 mcr p15, 0, r6, c10, c2, 1 @ write NMRR
187 adr r5, v7_crval 187 adr r5, v7_crval
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c
index b8e854f1b1d5..3fad68a1e6bc 100644
--- a/arch/arm/plat-s3c24xx/pwm-clock.c
+++ b/arch/arm/plat-s3c24xx/pwm-clock.c
@@ -315,7 +315,7 @@ static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent)
315 if (parent == s3c24xx_pwmclk_tclk(id)) 315 if (parent == s3c24xx_pwmclk_tclk(id))
316 bits = S3C2410_TCFG1_MUX_TCLK << shift; 316 bits = S3C2410_TCFG1_MUX_TCLK << shift;
317 else if (parent == s3c24xx_pwmclk_tdiv(id)) 317 else if (parent == s3c24xx_pwmclk_tdiv(id))
318 bits = clk_pwm_tdiv_bits(to_tdiv(clk)) << shift; 318 bits = clk_pwm_tdiv_bits(to_tdiv(parent)) << shift;
319 else 319 else
320 return -EINVAL; 320 return -EINVAL;
321 321
diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c
index feb770f2e84e..ec56b88866c4 100644
--- a/arch/arm/plat-s3c24xx/pwm.c
+++ b/arch/arm/plat-s3c24xx/pwm.c
@@ -56,7 +56,7 @@ static struct clk *clk_scaler[2];
56 } \ 56 } \
57 } 57 }
58 58
59#define DEFINE_TIMER(_tmr_no, _irq) \ 59#define DEFINE_S3C_TIMER(_tmr_no, _irq) \
60 .name = "s3c24xx-pwm", \ 60 .name = "s3c24xx-pwm", \
61 .id = _tmr_no, \ 61 .id = _tmr_no, \
62 .num_resources = TIMER_RESOURCE_SIZE, \ 62 .num_resources = TIMER_RESOURCE_SIZE, \
@@ -67,11 +67,11 @@ static struct clk *clk_scaler[2];
67 */ 67 */
68 68
69struct platform_device s3c_device_timer[] = { 69struct platform_device s3c_device_timer[] = {
70 [0] = { DEFINE_TIMER(0, IRQ_TIMER0) }, 70 [0] = { DEFINE_S3C_TIMER(0, IRQ_TIMER0) },
71 [1] = { DEFINE_TIMER(1, IRQ_TIMER1) }, 71 [1] = { DEFINE_S3C_TIMER(1, IRQ_TIMER1) },
72 [2] = { DEFINE_TIMER(2, IRQ_TIMER2) }, 72 [2] = { DEFINE_S3C_TIMER(2, IRQ_TIMER2) },
73 [3] = { DEFINE_TIMER(3, IRQ_TIMER3) }, 73 [3] = { DEFINE_S3C_TIMER(3, IRQ_TIMER3) },
74 [4] = { DEFINE_TIMER(4, IRQ_TIMER4) }, 74 [4] = { DEFINE_S3C_TIMER(4, IRQ_TIMER4) },
75}; 75};
76 76
77static inline int pwm_is_tdiv(struct pwm_device *pwm) 77static inline int pwm_is_tdiv(struct pwm_device *pwm)
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-17 16:26:04 -0500