diff options
263 files changed, 11810 insertions, 3158 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1c2ca1dc66f2..9633fb0a92b0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -622,7 +622,7 @@ P: Dirk Opfer | |||
622 | M: dirk@opfer-online.de | 622 | M: dirk@opfer-online.de |
623 | S: Maintained | 623 | S: Maintained |
624 | 624 | ||
625 | ARM/PALMTX SUPPORT | 625 | ARM/PALMTX,PALMT5,PALMLD SUPPORT |
626 | P: Marek Vasut | 626 | P: Marek Vasut |
627 | M: marek.vasut@gmail.com | 627 | M: marek.vasut@gmail.com |
628 | W: http://hackndev.com | 628 | W: http://hackndev.com |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dbfdf87f993f..12abdd43201f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -241,6 +241,7 @@ config ARCH_VERSATILE | |||
241 | config ARCH_AT91 | 241 | config ARCH_AT91 |
242 | bool "Atmel AT91" | 242 | bool "Atmel AT91" |
243 | select GENERIC_GPIO | 243 | select GENERIC_GPIO |
244 | select ARCH_REQUIRE_GPIOLIB | ||
244 | select HAVE_CLK | 245 | select HAVE_CLK |
245 | help | 246 | help |
246 | This enables support for systems based on the Atmel AT91RM9200, | 247 | This enables support for systems based on the Atmel AT91RM9200, |
@@ -1092,7 +1093,7 @@ source "drivers/cpufreq/Kconfig" | |||
1092 | 1093 | ||
1093 | config CPU_FREQ_SA1100 | 1094 | config CPU_FREQ_SA1100 |
1094 | bool | 1095 | bool |
1095 | depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_H3800 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4 || SA1100_HACKKIT) | 1096 | depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4 || SA1100_HACKKIT) |
1096 | default y | 1097 | default y |
1097 | 1098 | ||
1098 | config CPU_FREQ_SA1110 | 1099 | config CPU_FREQ_SA1110 |
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 192ee01a9ba2..a71fd941ade7 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
@@ -2,18 +2,29 @@ menu "Kernel hacking" | |||
2 | 2 | ||
3 | source "lib/Kconfig.debug" | 3 | source "lib/Kconfig.debug" |
4 | 4 | ||
5 | # RMK wants arm kernels compiled with frame pointers so hardwire this to y. | 5 | # RMK wants arm kernels compiled with frame pointers or stack unwinding. |
6 | # If you know what you are doing and are willing to live without stack | 6 | # If you know what you are doing and are willing to live without stack |
7 | # traces, you can get a slightly smaller kernel by setting this option to | 7 | # traces, you can get a slightly smaller kernel by setting this option to |
8 | # n, but then RMK will have to kill you ;). | 8 | # n, but then RMK will have to kill you ;). |
9 | config FRAME_POINTER | 9 | config FRAME_POINTER |
10 | bool | 10 | bool |
11 | default y | 11 | default y if !ARM_UNWIND |
12 | help | 12 | help |
13 | If you say N here, the resulting kernel will be slightly smaller and | 13 | If you say N here, the resulting kernel will be slightly smaller and |
14 | faster. However, when a problem occurs with the kernel, the | 14 | faster. However, if neither FRAME_POINTER nor ARM_UNWIND are enabled, |
15 | information that is reported is severely limited. Most people | 15 | when a problem occurs with the kernel, the information that is |
16 | should say Y here. | 16 | reported is severely limited. |
17 | |||
18 | config ARM_UNWIND | ||
19 | bool "Enable stack unwinding support" | ||
20 | depends on AEABI && EXPERIMENTAL | ||
21 | default y | ||
22 | help | ||
23 | This option enables stack unwinding support in the kernel | ||
24 | using the information automatically generated by the | ||
25 | compiler. The resulting kernel image is slightly bigger but | ||
26 | the performance is not affected. Currently, this feature | ||
27 | only works with EABI compilers. If unsure say Y. | ||
17 | 28 | ||
18 | config DEBUG_USER | 29 | config DEBUG_USER |
19 | bool "Verbose user fault messages" | 30 | bool "Verbose user fault messages" |
@@ -66,7 +77,7 @@ config DEBUG_ICEDCC | |||
66 | Say Y here if you want the debug print routines to direct their | 77 | Say Y here if you want the debug print routines to direct their |
67 | output to the EmbeddedICE macrocell's DCC channel using | 78 | output to the EmbeddedICE macrocell's DCC channel using |
68 | co-processor 14. This is known to work on the ARM9 style ICE | 79 | co-processor 14. This is known to work on the ARM9 style ICE |
69 | channel. | 80 | channel and on the XScale with the PEEDI. |
70 | 81 | ||
71 | It does include a timeout to ensure that the system does not | 82 | It does include a timeout to ensure that the system does not |
72 | totally freeze when there is nothing connected to read. | 83 | totally freeze when there is nothing connected to read. |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 24e0f0187697..e7ef876e574b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -85,6 +85,10 @@ else | |||
85 | CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) | 85 | CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) |
86 | endif | 86 | endif |
87 | 87 | ||
88 | ifeq ($(CONFIG_ARM_UNWIND),y) | ||
89 | CFLAGS_ABI +=-funwind-tables | ||
90 | endif | ||
91 | |||
88 | # Need -Uarm for gcc < 3.x | 92 | # Need -Uarm for gcc < 3.x |
89 | KBUILD_CFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm | 93 | KBUILD_CFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm |
90 | KBUILD_AFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float | 94 | KBUILD_AFLAGS +=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float |
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 77d614232d81..d1b678dc120b 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
@@ -27,6 +27,12 @@ | |||
27 | .macro writeb, ch, rb | 27 | .macro writeb, ch, rb |
28 | mcr p14, 0, \ch, c0, c5, 0 | 28 | mcr p14, 0, \ch, c0, c5, 0 |
29 | .endm | 29 | .endm |
30 | #elif defined(CONFIG_CPU_XSCALE) | ||
31 | .macro loadsp, rb | ||
32 | .endm | ||
33 | .macro writeb, ch, rb | ||
34 | mcr p14, 0, \ch, c8, c0, 0 | ||
35 | .endm | ||
30 | #else | 36 | #else |
31 | .macro loadsp, rb | 37 | .macro loadsp, rb |
32 | .endm | 38 | .endm |
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 3fc08413fff0..393c81641314 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c | |||
@@ -46,6 +46,21 @@ static void icedcc_putc(int ch) | |||
46 | 46 | ||
47 | asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch)); | 47 | asm("mcr p14, 0, %0, c0, c5, 0" : : "r" (ch)); |
48 | } | 48 | } |
49 | #elif defined(CONFIG_CPU_XSCALE) | ||
50 | |||
51 | static void icedcc_putc(int ch) | ||
52 | { | ||
53 | int status, i = 0x4000000; | ||
54 | |||
55 | do { | ||
56 | if (--i < 0) | ||
57 | return; | ||
58 | |||
59 | asm volatile ("mrc p14, 0, %0, c14, c0, 0" : "=r" (status)); | ||
60 | } while (status & (1 << 28)); | ||
61 | |||
62 | asm("mcr p14, 0, %0, c8, c0, 0" : : "r" (ch)); | ||
63 | } | ||
49 | 64 | ||
50 | #else | 65 | #else |
51 | 66 | ||
diff --git a/arch/arm/boot/compressed/vmlinux.lds.in b/arch/arm/boot/compressed/vmlinux.lds.in index 153a07e7222b..a5924b9b88bd 100644 --- a/arch/arm/boot/compressed/vmlinux.lds.in +++ b/arch/arm/boot/compressed/vmlinux.lds.in | |||
@@ -11,6 +11,11 @@ OUTPUT_ARCH(arm) | |||
11 | ENTRY(_start) | 11 | ENTRY(_start) |
12 | SECTIONS | 12 | SECTIONS |
13 | { | 13 | { |
14 | /DISCARD/ : { | ||
15 | *(.ARM.exidx*) | ||
16 | *(.ARM.extab*) | ||
17 | } | ||
18 | |||
14 | . = TEXT_START; | 19 | . = TEXT_START; |
15 | _text = .; | 20 | _text = .; |
16 | 21 | ||
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index 780bbf7cb26f..140f1d721d50 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c | |||
@@ -29,8 +29,8 @@ | |||
29 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
30 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
31 | #include <mach/pm.h> | 31 | #include <mach/pm.h> |
32 | #include <mach/pxa-regs.h> | ||
33 | #include <mach/pxa2xx-regs.h> | 32 | #include <mach/pxa2xx-regs.h> |
33 | #include <mach/regs-rtc.h> | ||
34 | #include <mach/sharpsl.h> | 34 | #include <mach/sharpsl.h> |
35 | #include <asm/hardware/sharpsl_pm.h> | 35 | #include <asm/hardware/sharpsl_pm.h> |
36 | 36 | ||
diff --git a/arch/arm/configs/acs5k_defconfig b/arch/arm/configs/acs5k_defconfig new file mode 100644 index 000000000000..1cab4e79d368 --- /dev/null +++ b/arch/arm/configs/acs5k_defconfig | |||
@@ -0,0 +1,1233 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.27-simtec-micrel1 | ||
4 | # Tue Dec 16 13:31:34 2008 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | # CONFIG_GENERIC_TIME is not set | ||
10 | # CONFIG_GENERIC_CLOCKEVENTS is not set | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
16 | CONFIG_LOCKDEP_SUPPORT=y | ||
17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
23 | CONFIG_GENERIC_HWEIGHT=y | ||
24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
25 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
26 | CONFIG_ZONE_DMA=y | ||
27 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
28 | CONFIG_VECTORS_BASE=0xffff0000 | ||
29 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
30 | |||
31 | # | ||
32 | # General setup | ||
33 | # | ||
34 | CONFIG_EXPERIMENTAL=y | ||
35 | CONFIG_BROKEN_ON_SMP=y | ||
36 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
37 | CONFIG_LOCALVERSION="" | ||
38 | CONFIG_LOCALVERSION_AUTO=y | ||
39 | # CONFIG_SWAP is not set | ||
40 | CONFIG_SYSVIPC=y | ||
41 | CONFIG_SYSVIPC_SYSCTL=y | ||
42 | CONFIG_POSIX_MQUEUE=y | ||
43 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
44 | # CONFIG_TASKSTATS is not set | ||
45 | # CONFIG_AUDIT is not set | ||
46 | # CONFIG_IKCONFIG is not set | ||
47 | CONFIG_LOG_BUF_SHIFT=14 | ||
48 | # CONFIG_CGROUPS is not set | ||
49 | # CONFIG_GROUP_SCHED is not set | ||
50 | CONFIG_SYSFS_DEPRECATED=y | ||
51 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
52 | # CONFIG_RELAY is not set | ||
53 | CONFIG_NAMESPACES=y | ||
54 | # CONFIG_UTS_NS is not set | ||
55 | # CONFIG_IPC_NS is not set | ||
56 | # CONFIG_USER_NS is not set | ||
57 | # CONFIG_PID_NS is not set | ||
58 | CONFIG_BLK_DEV_INITRD=y | ||
59 | CONFIG_INITRAMFS_SOURCE="" | ||
60 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
61 | CONFIG_SYSCTL=y | ||
62 | # CONFIG_EMBEDDED is not set | ||
63 | CONFIG_UID16=y | ||
64 | CONFIG_SYSCTL_SYSCALL=y | ||
65 | CONFIG_KALLSYMS=y | ||
66 | # CONFIG_KALLSYMS_ALL is not set | ||
67 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
68 | CONFIG_HOTPLUG=y | ||
69 | CONFIG_PRINTK=y | ||
70 | CONFIG_BUG=y | ||
71 | CONFIG_ELF_CORE=y | ||
72 | CONFIG_COMPAT_BRK=y | ||
73 | CONFIG_BASE_FULL=y | ||
74 | CONFIG_FUTEX=y | ||
75 | CONFIG_ANON_INODES=y | ||
76 | CONFIG_EPOLL=y | ||
77 | CONFIG_SIGNALFD=y | ||
78 | CONFIG_TIMERFD=y | ||
79 | CONFIG_EVENTFD=y | ||
80 | CONFIG_SHMEM=y | ||
81 | CONFIG_VM_EVENT_COUNTERS=y | ||
82 | CONFIG_SLAB=y | ||
83 | # CONFIG_SLUB is not set | ||
84 | # CONFIG_SLOB is not set | ||
85 | # CONFIG_PROFILING is not set | ||
86 | # CONFIG_MARKERS is not set | ||
87 | CONFIG_HAVE_OPROFILE=y | ||
88 | # CONFIG_KPROBES is not set | ||
89 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
90 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
91 | CONFIG_HAVE_KPROBES=y | ||
92 | CONFIG_HAVE_KRETPROBES=y | ||
93 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
94 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
95 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
96 | # CONFIG_HAVE_CLK is not set | ||
97 | CONFIG_PROC_PAGE_MONITOR=y | ||
98 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
99 | CONFIG_SLABINFO=y | ||
100 | CONFIG_RT_MUTEXES=y | ||
101 | # CONFIG_TINY_SHMEM is not set | ||
102 | CONFIG_BASE_SMALL=0 | ||
103 | CONFIG_MODULES=y | ||
104 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
105 | CONFIG_MODULE_UNLOAD=y | ||
106 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
107 | # CONFIG_MODVERSIONS is not set | ||
108 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
109 | CONFIG_KMOD=y | ||
110 | CONFIG_BLOCK=y | ||
111 | # CONFIG_LBD is not set | ||
112 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
113 | # CONFIG_LSF is not set | ||
114 | # CONFIG_BLK_DEV_BSG is not set | ||
115 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
116 | |||
117 | # | ||
118 | # IO Schedulers | ||
119 | # | ||
120 | CONFIG_IOSCHED_NOOP=y | ||
121 | CONFIG_IOSCHED_AS=y | ||
122 | # CONFIG_IOSCHED_DEADLINE is not set | ||
123 | # CONFIG_IOSCHED_CFQ is not set | ||
124 | CONFIG_DEFAULT_AS=y | ||
125 | # CONFIG_DEFAULT_DEADLINE is not set | ||
126 | # CONFIG_DEFAULT_CFQ is not set | ||
127 | # CONFIG_DEFAULT_NOOP is not set | ||
128 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
129 | CONFIG_CLASSIC_RCU=y | ||
130 | |||
131 | # | ||
132 | # System Type | ||
133 | # | ||
134 | # CONFIG_ARCH_AAEC2000 is not set | ||
135 | # CONFIG_ARCH_INTEGRATOR is not set | ||
136 | # CONFIG_ARCH_REALVIEW is not set | ||
137 | # CONFIG_ARCH_VERSATILE is not set | ||
138 | # CONFIG_ARCH_AT91 is not set | ||
139 | # CONFIG_ARCH_CLPS7500 is not set | ||
140 | # CONFIG_ARCH_CLPS711X is not set | ||
141 | # CONFIG_ARCH_EBSA110 is not set | ||
142 | # CONFIG_ARCH_EP93XX is not set | ||
143 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
144 | # CONFIG_ARCH_NETX is not set | ||
145 | # CONFIG_ARCH_H720X is not set | ||
146 | # CONFIG_ARCH_IMX is not set | ||
147 | # CONFIG_ARCH_IOP13XX is not set | ||
148 | # CONFIG_ARCH_IOP32X is not set | ||
149 | # CONFIG_ARCH_IOP33X is not set | ||
150 | # CONFIG_ARCH_IXP23XX is not set | ||
151 | # CONFIG_ARCH_IXP2000 is not set | ||
152 | # CONFIG_ARCH_IXP4XX is not set | ||
153 | # CONFIG_ARCH_L7200 is not set | ||
154 | # CONFIG_ARCH_KIRKWOOD is not set | ||
155 | CONFIG_ARCH_KS8695=y | ||
156 | # CONFIG_ARCH_NS9XXX is not set | ||
157 | # CONFIG_ARCH_LOKI is not set | ||
158 | # CONFIG_ARCH_MV78XX0 is not set | ||
159 | # CONFIG_ARCH_MXC is not set | ||
160 | # CONFIG_ARCH_ORION5X is not set | ||
161 | # CONFIG_ARCH_PNX4008 is not set | ||
162 | # CONFIG_ARCH_PXA is not set | ||
163 | # CONFIG_ARCH_RPC is not set | ||
164 | # CONFIG_ARCH_SA1100 is not set | ||
165 | # CONFIG_ARCH_S3C2410 is not set | ||
166 | # CONFIG_ARCH_SHARK is not set | ||
167 | # CONFIG_ARCH_LH7A40X is not set | ||
168 | # CONFIG_ARCH_DAVINCI is not set | ||
169 | # CONFIG_ARCH_OMAP is not set | ||
170 | # CONFIG_ARCH_MSM7X00A is not set | ||
171 | |||
172 | # | ||
173 | # Boot options | ||
174 | # | ||
175 | |||
176 | # | ||
177 | # Power management | ||
178 | # | ||
179 | |||
180 | # | ||
181 | # Kendin/Micrel KS8695 Implementations | ||
182 | # | ||
183 | CONFIG_MACH_KS8695=y | ||
184 | CONFIG_MACH_DSM320=y | ||
185 | CONFIG_MACH_ACS5K=y | ||
186 | |||
187 | # | ||
188 | # Processor Type | ||
189 | # | ||
190 | CONFIG_CPU_32=y | ||
191 | CONFIG_CPU_ARM922T=y | ||
192 | CONFIG_CPU_32v4T=y | ||
193 | CONFIG_CPU_ABRT_EV4T=y | ||
194 | CONFIG_CPU_PABRT_NOIFAR=y | ||
195 | CONFIG_CPU_CACHE_V4WT=y | ||
196 | CONFIG_CPU_CACHE_VIVT=y | ||
197 | CONFIG_CPU_COPY_V4WB=y | ||
198 | CONFIG_CPU_TLB_V4WBI=y | ||
199 | CONFIG_CPU_CP15=y | ||
200 | CONFIG_CPU_CP15_MMU=y | ||
201 | |||
202 | # | ||
203 | # Processor Features | ||
204 | # | ||
205 | # CONFIG_ARM_THUMB is not set | ||
206 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
207 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
208 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
209 | # CONFIG_OUTER_CACHE is not set | ||
210 | |||
211 | # | ||
212 | # Bus support | ||
213 | # | ||
214 | CONFIG_PCI=y | ||
215 | CONFIG_PCI_SYSCALL=y | ||
216 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
217 | CONFIG_PCI_LEGACY=y | ||
218 | CONFIG_PCI_DEBUG=y | ||
219 | CONFIG_PCCARD=y | ||
220 | # CONFIG_PCMCIA_DEBUG is not set | ||
221 | CONFIG_PCMCIA=y | ||
222 | CONFIG_PCMCIA_LOAD_CIS=y | ||
223 | CONFIG_PCMCIA_IOCTL=y | ||
224 | CONFIG_CARDBUS=y | ||
225 | |||
226 | # | ||
227 | # PC-card bridges | ||
228 | # | ||
229 | CONFIG_YENTA=y | ||
230 | CONFIG_YENTA_O2=y | ||
231 | CONFIG_YENTA_RICOH=y | ||
232 | CONFIG_YENTA_TI=y | ||
233 | CONFIG_YENTA_ENE_TUNE=y | ||
234 | CONFIG_YENTA_TOSHIBA=y | ||
235 | # CONFIG_PD6729 is not set | ||
236 | # CONFIG_I82092 is not set | ||
237 | CONFIG_PCCARD_NONSTATIC=y | ||
238 | |||
239 | # | ||
240 | # Kernel Features | ||
241 | # | ||
242 | # CONFIG_TICK_ONESHOT is not set | ||
243 | # CONFIG_PREEMPT is not set | ||
244 | CONFIG_HZ=100 | ||
245 | CONFIG_AEABI=y | ||
246 | CONFIG_OABI_COMPAT=y | ||
247 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
248 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
249 | CONFIG_SELECT_MEMORY_MODEL=y | ||
250 | CONFIG_FLATMEM_MANUAL=y | ||
251 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
252 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
253 | CONFIG_FLATMEM=y | ||
254 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
255 | # CONFIG_SPARSEMEM_STATIC is not set | ||
256 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
257 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
258 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
259 | # CONFIG_RESOURCES_64BIT is not set | ||
260 | CONFIG_ZONE_DMA_FLAG=1 | ||
261 | CONFIG_BOUNCE=y | ||
262 | CONFIG_VIRT_TO_BUS=y | ||
263 | # CONFIG_LEDS is not set | ||
264 | CONFIG_ALIGNMENT_TRAP=y | ||
265 | |||
266 | # | ||
267 | # Boot options | ||
268 | # | ||
269 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
270 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
271 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" | ||
272 | # CONFIG_XIP_KERNEL is not set | ||
273 | # CONFIG_KEXEC is not set | ||
274 | |||
275 | # | ||
276 | # Floating point emulation | ||
277 | # | ||
278 | |||
279 | # | ||
280 | # At least one emulation must be selected | ||
281 | # | ||
282 | # CONFIG_FPE_NWFPE is not set | ||
283 | # CONFIG_FPE_FASTFPE is not set | ||
284 | |||
285 | # | ||
286 | # Userspace binary formats | ||
287 | # | ||
288 | CONFIG_BINFMT_ELF=y | ||
289 | # CONFIG_BINFMT_AOUT is not set | ||
290 | # CONFIG_BINFMT_MISC is not set | ||
291 | |||
292 | # | ||
293 | # Power management options | ||
294 | # | ||
295 | # CONFIG_PM is not set | ||
296 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
297 | CONFIG_NET=y | ||
298 | |||
299 | # | ||
300 | # Networking options | ||
301 | # | ||
302 | CONFIG_PACKET=y | ||
303 | # CONFIG_PACKET_MMAP is not set | ||
304 | CONFIG_UNIX=y | ||
305 | CONFIG_XFRM=y | ||
306 | # CONFIG_XFRM_USER is not set | ||
307 | # CONFIG_XFRM_SUB_POLICY is not set | ||
308 | # CONFIG_XFRM_MIGRATE is not set | ||
309 | # CONFIG_XFRM_STATISTICS is not set | ||
310 | # CONFIG_NET_KEY is not set | ||
311 | CONFIG_INET=y | ||
312 | # CONFIG_IP_MULTICAST is not set | ||
313 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
314 | CONFIG_IP_FIB_HASH=y | ||
315 | CONFIG_IP_PNP=y | ||
316 | CONFIG_IP_PNP_DHCP=y | ||
317 | # CONFIG_IP_PNP_BOOTP is not set | ||
318 | # CONFIG_IP_PNP_RARP is not set | ||
319 | # CONFIG_NET_IPIP is not set | ||
320 | # CONFIG_NET_IPGRE is not set | ||
321 | # CONFIG_ARPD is not set | ||
322 | # CONFIG_SYN_COOKIES is not set | ||
323 | # CONFIG_INET_AH is not set | ||
324 | # CONFIG_INET_ESP is not set | ||
325 | # CONFIG_INET_IPCOMP is not set | ||
326 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
327 | # CONFIG_INET_TUNNEL is not set | ||
328 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
329 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
330 | CONFIG_INET_XFRM_MODE_BEET=y | ||
331 | # CONFIG_INET_LRO is not set | ||
332 | CONFIG_INET_DIAG=y | ||
333 | CONFIG_INET_TCP_DIAG=y | ||
334 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
335 | CONFIG_TCP_CONG_CUBIC=y | ||
336 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
337 | # CONFIG_TCP_MD5SIG is not set | ||
338 | # CONFIG_IPV6 is not set | ||
339 | # CONFIG_NETWORK_SECMARK is not set | ||
340 | # CONFIG_NETFILTER is not set | ||
341 | # CONFIG_IP_DCCP is not set | ||
342 | # CONFIG_IP_SCTP is not set | ||
343 | # CONFIG_TIPC is not set | ||
344 | # CONFIG_ATM is not set | ||
345 | # CONFIG_BRIDGE is not set | ||
346 | # CONFIG_VLAN_8021Q is not set | ||
347 | # CONFIG_DECNET is not set | ||
348 | # CONFIG_LLC2 is not set | ||
349 | # CONFIG_IPX is not set | ||
350 | # CONFIG_ATALK is not set | ||
351 | # CONFIG_X25 is not set | ||
352 | # CONFIG_LAPB is not set | ||
353 | # CONFIG_ECONET is not set | ||
354 | # CONFIG_WAN_ROUTER is not set | ||
355 | # CONFIG_NET_SCHED is not set | ||
356 | |||
357 | # | ||
358 | # Network testing | ||
359 | # | ||
360 | # CONFIG_NET_PKTGEN is not set | ||
361 | # CONFIG_HAMRADIO is not set | ||
362 | # CONFIG_CAN is not set | ||
363 | # CONFIG_IRDA is not set | ||
364 | # CONFIG_BT is not set | ||
365 | # CONFIG_AF_RXRPC is not set | ||
366 | |||
367 | # | ||
368 | # Wireless | ||
369 | # | ||
370 | # CONFIG_CFG80211 is not set | ||
371 | CONFIG_WIRELESS_EXT=y | ||
372 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
373 | # CONFIG_MAC80211 is not set | ||
374 | # CONFIG_IEEE80211 is not set | ||
375 | # CONFIG_RFKILL is not set | ||
376 | # CONFIG_NET_9P is not set | ||
377 | |||
378 | # | ||
379 | # Device Drivers | ||
380 | # | ||
381 | |||
382 | # | ||
383 | # Generic Driver Options | ||
384 | # | ||
385 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
386 | CONFIG_STANDALONE=y | ||
387 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
388 | CONFIG_FW_LOADER=y | ||
389 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
390 | CONFIG_EXTRA_FIRMWARE="" | ||
391 | # CONFIG_DEBUG_DRIVER is not set | ||
392 | # CONFIG_DEBUG_DEVRES is not set | ||
393 | # CONFIG_SYS_HYPERVISOR is not set | ||
394 | # CONFIG_CONNECTOR is not set | ||
395 | CONFIG_MTD=y | ||
396 | # CONFIG_MTD_DEBUG is not set | ||
397 | CONFIG_MTD_CONCAT=y | ||
398 | CONFIG_MTD_PARTITIONS=y | ||
399 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
400 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
401 | # CONFIG_MTD_AFS_PARTS is not set | ||
402 | # CONFIG_MTD_AR7_PARTS is not set | ||
403 | |||
404 | # | ||
405 | # User Modules And Translation Layers | ||
406 | # | ||
407 | CONFIG_MTD_CHAR=y | ||
408 | CONFIG_MTD_BLKDEVS=y | ||
409 | CONFIG_MTD_BLOCK=y | ||
410 | # CONFIG_FTL is not set | ||
411 | # CONFIG_NFTL is not set | ||
412 | # CONFIG_INFTL is not set | ||
413 | # CONFIG_RFD_FTL is not set | ||
414 | # CONFIG_SSFDC is not set | ||
415 | # CONFIG_MTD_OOPS is not set | ||
416 | |||
417 | # | ||
418 | # RAM/ROM/Flash chip drivers | ||
419 | # | ||
420 | CONFIG_MTD_CFI=y | ||
421 | CONFIG_MTD_JEDECPROBE=y | ||
422 | CONFIG_MTD_GEN_PROBE=y | ||
423 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
424 | CONFIG_MTD_CFI_NOSWAP=y | ||
425 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
426 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
427 | # CONFIG_MTD_CFI_GEOMETRY is not set | ||
428 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
429 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
430 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
431 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
432 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
433 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
434 | CONFIG_MTD_CFI_I1=y | ||
435 | CONFIG_MTD_CFI_I2=y | ||
436 | # CONFIG_MTD_CFI_I4 is not set | ||
437 | # CONFIG_MTD_CFI_I8 is not set | ||
438 | # CONFIG_MTD_OTP is not set | ||
439 | CONFIG_MTD_CFI_INTELEXT=y | ||
440 | CONFIG_MTD_CFI_AMDSTD=y | ||
441 | # CONFIG_MTD_CFI_STAA is not set | ||
442 | CONFIG_MTD_CFI_UTIL=y | ||
443 | # CONFIG_MTD_RAM is not set | ||
444 | # CONFIG_MTD_ROM is not set | ||
445 | # CONFIG_MTD_ABSENT is not set | ||
446 | |||
447 | # | ||
448 | # Mapping drivers for chip access | ||
449 | # | ||
450 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
451 | CONFIG_MTD_PHYSMAP=y | ||
452 | CONFIG_MTD_PHYSMAP_START=0x8000000 | ||
453 | CONFIG_MTD_PHYSMAP_LEN=0 | ||
454 | CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | ||
455 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
456 | # CONFIG_MTD_IMPA7 is not set | ||
457 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
458 | # CONFIG_MTD_PLATRAM is not set | ||
459 | |||
460 | # | ||
461 | # Self-contained MTD device drivers | ||
462 | # | ||
463 | # CONFIG_MTD_PMC551 is not set | ||
464 | # CONFIG_MTD_SLRAM is not set | ||
465 | # CONFIG_MTD_PHRAM is not set | ||
466 | # CONFIG_MTD_MTDRAM is not set | ||
467 | # CONFIG_MTD_BLOCK2MTD is not set | ||
468 | |||
469 | # | ||
470 | # Disk-On-Chip Device Drivers | ||
471 | # | ||
472 | # CONFIG_MTD_DOC2000 is not set | ||
473 | # CONFIG_MTD_DOC2001 is not set | ||
474 | # CONFIG_MTD_DOC2001PLUS is not set | ||
475 | # CONFIG_MTD_NAND is not set | ||
476 | # CONFIG_MTD_ONENAND is not set | ||
477 | |||
478 | # | ||
479 | # UBI - Unsorted block images | ||
480 | # | ||
481 | # CONFIG_MTD_UBI is not set | ||
482 | # CONFIG_PARPORT is not set | ||
483 | CONFIG_BLK_DEV=y | ||
484 | # CONFIG_BLK_CPQ_DA is not set | ||
485 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
486 | # CONFIG_BLK_DEV_DAC960 is not set | ||
487 | # CONFIG_BLK_DEV_UMEM is not set | ||
488 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
489 | # CONFIG_BLK_DEV_LOOP is not set | ||
490 | # CONFIG_BLK_DEV_NBD is not set | ||
491 | # CONFIG_BLK_DEV_SX8 is not set | ||
492 | CONFIG_BLK_DEV_RAM=y | ||
493 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
494 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
495 | # CONFIG_BLK_DEV_XIP is not set | ||
496 | # CONFIG_CDROM_PKTCDVD is not set | ||
497 | # CONFIG_ATA_OVER_ETH is not set | ||
498 | CONFIG_MISC_DEVICES=y | ||
499 | # CONFIG_PHANTOM is not set | ||
500 | # CONFIG_EEPROM_93CX6 is not set | ||
501 | # CONFIG_SGI_IOC4 is not set | ||
502 | # CONFIG_TIFM_CORE is not set | ||
503 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
504 | # CONFIG_HP_ILO is not set | ||
505 | CONFIG_HAVE_IDE=y | ||
506 | # CONFIG_IDE is not set | ||
507 | |||
508 | # | ||
509 | # SCSI device support | ||
510 | # | ||
511 | # CONFIG_RAID_ATTRS is not set | ||
512 | # CONFIG_SCSI is not set | ||
513 | # CONFIG_SCSI_DMA is not set | ||
514 | # CONFIG_SCSI_NETLINK is not set | ||
515 | # CONFIG_ATA is not set | ||
516 | # CONFIG_MD is not set | ||
517 | # CONFIG_FUSION is not set | ||
518 | |||
519 | # | ||
520 | # IEEE 1394 (FireWire) support | ||
521 | # | ||
522 | |||
523 | # | ||
524 | # Enable only one of the two stacks, unless you know what you are doing | ||
525 | # | ||
526 | # CONFIG_FIREWIRE is not set | ||
527 | # CONFIG_IEEE1394 is not set | ||
528 | # CONFIG_I2O is not set | ||
529 | CONFIG_NETDEVICES=y | ||
530 | # CONFIG_DUMMY is not set | ||
531 | # CONFIG_BONDING is not set | ||
532 | # CONFIG_MACVLAN is not set | ||
533 | # CONFIG_EQUALIZER is not set | ||
534 | # CONFIG_TUN is not set | ||
535 | # CONFIG_VETH is not set | ||
536 | # CONFIG_ARCNET is not set | ||
537 | # CONFIG_PHYLIB is not set | ||
538 | CONFIG_NET_ETHERNET=y | ||
539 | CONFIG_MII=y | ||
540 | CONFIG_ARM_KS8695_ETHER=y | ||
541 | # CONFIG_AX88796 is not set | ||
542 | # CONFIG_HAPPYMEAL is not set | ||
543 | # CONFIG_SUNGEM is not set | ||
544 | # CONFIG_CASSINI is not set | ||
545 | # CONFIG_NET_VENDOR_3COM is not set | ||
546 | # CONFIG_SMC91X is not set | ||
547 | # CONFIG_DM9000 is not set | ||
548 | # CONFIG_NET_TULIP is not set | ||
549 | # CONFIG_HP100 is not set | ||
550 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
551 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
552 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
553 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
554 | # CONFIG_NET_PCI is not set | ||
555 | # CONFIG_B44 is not set | ||
556 | # CONFIG_NETDEV_1000 is not set | ||
557 | # CONFIG_NETDEV_10000 is not set | ||
558 | # CONFIG_TR is not set | ||
559 | |||
560 | # | ||
561 | # Wireless LAN | ||
562 | # | ||
563 | # CONFIG_WLAN_PRE80211 is not set | ||
564 | CONFIG_WLAN_80211=y | ||
565 | # CONFIG_PCMCIA_RAYCS is not set | ||
566 | # CONFIG_IPW2100 is not set | ||
567 | # CONFIG_IPW2200 is not set | ||
568 | # CONFIG_LIBERTAS is not set | ||
569 | # CONFIG_HERMES is not set | ||
570 | # CONFIG_ATMEL is not set | ||
571 | # CONFIG_AIRO_CS is not set | ||
572 | # CONFIG_PCMCIA_WL3501 is not set | ||
573 | CONFIG_PRISM54=m | ||
574 | # CONFIG_IWLWIFI_LEDS is not set | ||
575 | # CONFIG_HOSTAP is not set | ||
576 | # CONFIG_NET_PCMCIA is not set | ||
577 | # CONFIG_WAN is not set | ||
578 | # CONFIG_FDDI is not set | ||
579 | # CONFIG_HIPPI is not set | ||
580 | # CONFIG_PPP is not set | ||
581 | # CONFIG_SLIP is not set | ||
582 | # CONFIG_NETCONSOLE is not set | ||
583 | # CONFIG_NETPOLL is not set | ||
584 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
585 | # CONFIG_ISDN is not set | ||
586 | |||
587 | # | ||
588 | # Input device support | ||
589 | # | ||
590 | CONFIG_INPUT=y | ||
591 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
592 | # CONFIG_INPUT_POLLDEV is not set | ||
593 | |||
594 | # | ||
595 | # Userland interfaces | ||
596 | # | ||
597 | CONFIG_INPUT_MOUSEDEV=y | ||
598 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
599 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
600 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
601 | # CONFIG_INPUT_JOYDEV is not set | ||
602 | # CONFIG_INPUT_EVDEV is not set | ||
603 | # CONFIG_INPUT_EVBUG is not set | ||
604 | |||
605 | # | ||
606 | # Input Device Drivers | ||
607 | # | ||
608 | # CONFIG_INPUT_KEYBOARD is not set | ||
609 | # CONFIG_INPUT_MOUSE is not set | ||
610 | # CONFIG_INPUT_JOYSTICK is not set | ||
611 | # CONFIG_INPUT_TABLET is not set | ||
612 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
613 | # CONFIG_INPUT_MISC is not set | ||
614 | |||
615 | # | ||
616 | # Hardware I/O ports | ||
617 | # | ||
618 | # CONFIG_SERIO is not set | ||
619 | # CONFIG_GAMEPORT is not set | ||
620 | |||
621 | # | ||
622 | # Character devices | ||
623 | # | ||
624 | CONFIG_VT=y | ||
625 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
626 | CONFIG_VT_CONSOLE=y | ||
627 | CONFIG_HW_CONSOLE=y | ||
628 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
629 | CONFIG_DEVKMEM=y | ||
630 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
631 | # CONFIG_NOZOMI is not set | ||
632 | |||
633 | # | ||
634 | # Serial drivers | ||
635 | # | ||
636 | # CONFIG_SERIAL_8250 is not set | ||
637 | |||
638 | # | ||
639 | # Non-8250 serial port support | ||
640 | # | ||
641 | CONFIG_SERIAL_KS8695=y | ||
642 | CONFIG_SERIAL_KS8695_CONSOLE=y | ||
643 | CONFIG_SERIAL_CORE=y | ||
644 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
645 | # CONFIG_SERIAL_JSM is not set | ||
646 | CONFIG_UNIX98_PTYS=y | ||
647 | CONFIG_LEGACY_PTYS=y | ||
648 | CONFIG_LEGACY_PTY_COUNT=256 | ||
649 | # CONFIG_IPMI_HANDLER is not set | ||
650 | CONFIG_HW_RANDOM=m | ||
651 | # CONFIG_NVRAM is not set | ||
652 | # CONFIG_R3964 is not set | ||
653 | # CONFIG_APPLICOM is not set | ||
654 | |||
655 | # | ||
656 | # PCMCIA character devices | ||
657 | # | ||
658 | # CONFIG_SYNCLINK_CS is not set | ||
659 | # CONFIG_CARDMAN_4000 is not set | ||
660 | # CONFIG_CARDMAN_4040 is not set | ||
661 | # CONFIG_IPWIRELESS is not set | ||
662 | # CONFIG_RAW_DRIVER is not set | ||
663 | # CONFIG_TCG_TPM is not set | ||
664 | CONFIG_DEVPORT=y | ||
665 | CONFIG_ACS5KCAN=y | ||
666 | CONFIG_I2C=y | ||
667 | CONFIG_I2C_BOARDINFO=y | ||
668 | CONFIG_I2C_CHARDEV=y | ||
669 | CONFIG_I2C_HELPER_AUTO=y | ||
670 | CONFIG_I2C_ALGOBIT=y | ||
671 | |||
672 | # | ||
673 | # I2C Hardware Bus support | ||
674 | # | ||
675 | |||
676 | # | ||
677 | # PC SMBus host controller drivers | ||
678 | # | ||
679 | # CONFIG_I2C_ALI1535 is not set | ||
680 | # CONFIG_I2C_ALI1563 is not set | ||
681 | # CONFIG_I2C_ALI15X3 is not set | ||
682 | # CONFIG_I2C_AMD756 is not set | ||
683 | # CONFIG_I2C_AMD8111 is not set | ||
684 | # CONFIG_I2C_I801 is not set | ||
685 | # CONFIG_I2C_ISCH is not set | ||
686 | # CONFIG_I2C_PIIX4 is not set | ||
687 | # CONFIG_I2C_NFORCE2 is not set | ||
688 | # CONFIG_I2C_SIS5595 is not set | ||
689 | # CONFIG_I2C_SIS630 is not set | ||
690 | # CONFIG_I2C_SIS96X is not set | ||
691 | # CONFIG_I2C_VIA is not set | ||
692 | # CONFIG_I2C_VIAPRO is not set | ||
693 | |||
694 | # | ||
695 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
696 | # | ||
697 | CONFIG_I2C_GPIO=y | ||
698 | # CONFIG_I2C_OCORES is not set | ||
699 | # CONFIG_I2C_SIMTEC is not set | ||
700 | |||
701 | # | ||
702 | # External I2C/SMBus adapter drivers | ||
703 | # | ||
704 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
705 | # CONFIG_I2C_TAOS_EVM is not set | ||
706 | |||
707 | # | ||
708 | # Graphics adapter I2C/DDC channel drivers | ||
709 | # | ||
710 | # CONFIG_I2C_VOODOO3 is not set | ||
711 | |||
712 | # | ||
713 | # Other I2C/SMBus bus drivers | ||
714 | # | ||
715 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
716 | # CONFIG_I2C_STUB is not set | ||
717 | |||
718 | # | ||
719 | # Miscellaneous I2C Chip support | ||
720 | # | ||
721 | # CONFIG_DS1682 is not set | ||
722 | # CONFIG_AT24 is not set | ||
723 | # CONFIG_SENSORS_EEPROM is not set | ||
724 | # CONFIG_SENSORS_PCF8574 is not set | ||
725 | # CONFIG_PCF8575 is not set | ||
726 | # CONFIG_SENSORS_PCF8591 is not set | ||
727 | # CONFIG_TPS65010 is not set | ||
728 | # CONFIG_SENSORS_MAX6875 is not set | ||
729 | # CONFIG_SENSORS_TSL2550 is not set | ||
730 | # CONFIG_I2C_DEBUG_CORE is not set | ||
731 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
732 | # CONFIG_I2C_DEBUG_BUS is not set | ||
733 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
734 | # CONFIG_SPI is not set | ||
735 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
736 | CONFIG_GPIOLIB=y | ||
737 | # CONFIG_DEBUG_GPIO is not set | ||
738 | CONFIG_GPIO_SYSFS=y | ||
739 | |||
740 | # | ||
741 | # I2C GPIO expanders: | ||
742 | # | ||
743 | # CONFIG_GPIO_MAX732X is not set | ||
744 | CONFIG_GPIO_PCA953X=y | ||
745 | # CONFIG_GPIO_PCF857X is not set | ||
746 | |||
747 | # | ||
748 | # PCI GPIO expanders: | ||
749 | # | ||
750 | # CONFIG_GPIO_BT8XX is not set | ||
751 | |||
752 | # | ||
753 | # SPI GPIO expanders: | ||
754 | # | ||
755 | # CONFIG_W1 is not set | ||
756 | # CONFIG_POWER_SUPPLY is not set | ||
757 | CONFIG_HWMON=y | ||
758 | # CONFIG_HWMON_VID is not set | ||
759 | # CONFIG_SENSORS_AD7414 is not set | ||
760 | # CONFIG_SENSORS_AD7418 is not set | ||
761 | # CONFIG_SENSORS_ADM1021 is not set | ||
762 | # CONFIG_SENSORS_ADM1025 is not set | ||
763 | # CONFIG_SENSORS_ADM1026 is not set | ||
764 | # CONFIG_SENSORS_ADM1029 is not set | ||
765 | # CONFIG_SENSORS_ADM1031 is not set | ||
766 | # CONFIG_SENSORS_ADM9240 is not set | ||
767 | # CONFIG_SENSORS_ADT7470 is not set | ||
768 | # CONFIG_SENSORS_ADT7473 is not set | ||
769 | # CONFIG_SENSORS_ATXP1 is not set | ||
770 | # CONFIG_SENSORS_DS1621 is not set | ||
771 | # CONFIG_SENSORS_I5K_AMB is not set | ||
772 | # CONFIG_SENSORS_F71805F is not set | ||
773 | # CONFIG_SENSORS_F71882FG is not set | ||
774 | # CONFIG_SENSORS_F75375S is not set | ||
775 | # CONFIG_SENSORS_GL518SM is not set | ||
776 | # CONFIG_SENSORS_GL520SM is not set | ||
777 | # CONFIG_SENSORS_IT87 is not set | ||
778 | # CONFIG_SENSORS_LM63 is not set | ||
779 | # CONFIG_SENSORS_LM75 is not set | ||
780 | # CONFIG_SENSORS_LM77 is not set | ||
781 | # CONFIG_SENSORS_LM78 is not set | ||
782 | # CONFIG_SENSORS_LM80 is not set | ||
783 | # CONFIG_SENSORS_LM83 is not set | ||
784 | # CONFIG_SENSORS_LM85 is not set | ||
785 | # CONFIG_SENSORS_LM87 is not set | ||
786 | # CONFIG_SENSORS_LM90 is not set | ||
787 | # CONFIG_SENSORS_LM92 is not set | ||
788 | # CONFIG_SENSORS_LM93 is not set | ||
789 | # CONFIG_SENSORS_MAX1619 is not set | ||
790 | # CONFIG_SENSORS_MAX6650 is not set | ||
791 | # CONFIG_SENSORS_PC87360 is not set | ||
792 | # CONFIG_SENSORS_PC87427 is not set | ||
793 | # CONFIG_SENSORS_SIS5595 is not set | ||
794 | # CONFIG_SENSORS_DME1737 is not set | ||
795 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
796 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
797 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
798 | # CONFIG_SENSORS_ADS7828 is not set | ||
799 | # CONFIG_SENSORS_THMC50 is not set | ||
800 | # CONFIG_SENSORS_VIA686A is not set | ||
801 | # CONFIG_SENSORS_VT1211 is not set | ||
802 | # CONFIG_SENSORS_VT8231 is not set | ||
803 | # CONFIG_SENSORS_W83781D is not set | ||
804 | # CONFIG_SENSORS_W83791D is not set | ||
805 | # CONFIG_SENSORS_W83792D is not set | ||
806 | # CONFIG_SENSORS_W83793 is not set | ||
807 | # CONFIG_SENSORS_W83L785TS is not set | ||
808 | # CONFIG_SENSORS_W83L786NG is not set | ||
809 | # CONFIG_SENSORS_W83627HF is not set | ||
810 | # CONFIG_SENSORS_W83627EHF is not set | ||
811 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
812 | CONFIG_WATCHDOG=y | ||
813 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
814 | |||
815 | # | ||
816 | # Watchdog Device Drivers | ||
817 | # | ||
818 | # CONFIG_SOFT_WATCHDOG is not set | ||
819 | CONFIG_KS8695_WATCHDOG=y | ||
820 | # CONFIG_ALIM7101_WDT is not set | ||
821 | |||
822 | # | ||
823 | # PCI-based Watchdog Cards | ||
824 | # | ||
825 | # CONFIG_PCIPCWATCHDOG is not set | ||
826 | # CONFIG_WDTPCI is not set | ||
827 | |||
828 | # | ||
829 | # Sonics Silicon Backplane | ||
830 | # | ||
831 | CONFIG_SSB_POSSIBLE=y | ||
832 | # CONFIG_SSB is not set | ||
833 | |||
834 | # | ||
835 | # Multifunction device drivers | ||
836 | # | ||
837 | # CONFIG_MFD_CORE is not set | ||
838 | # CONFIG_MFD_SM501 is not set | ||
839 | # CONFIG_MFD_ASIC3 is not set | ||
840 | # CONFIG_HTC_EGPIO is not set | ||
841 | # CONFIG_HTC_PASIC3 is not set | ||
842 | # CONFIG_MFD_TMIO is not set | ||
843 | # CONFIG_MFD_T7L66XB is not set | ||
844 | # CONFIG_MFD_TC6387XB is not set | ||
845 | # CONFIG_MFD_TC6393XB is not set | ||
846 | |||
847 | # | ||
848 | # Multimedia devices | ||
849 | # | ||
850 | |||
851 | # | ||
852 | # Multimedia core support | ||
853 | # | ||
854 | # CONFIG_VIDEO_DEV is not set | ||
855 | # CONFIG_DVB_CORE is not set | ||
856 | # CONFIG_VIDEO_MEDIA is not set | ||
857 | |||
858 | # | ||
859 | # Multimedia drivers | ||
860 | # | ||
861 | # CONFIG_DAB is not set | ||
862 | |||
863 | # | ||
864 | # Graphics support | ||
865 | # | ||
866 | # CONFIG_DRM is not set | ||
867 | # CONFIG_VGASTATE is not set | ||
868 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
869 | # CONFIG_FB is not set | ||
870 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
871 | |||
872 | # | ||
873 | # Display device support | ||
874 | # | ||
875 | # CONFIG_DISPLAY_SUPPORT is not set | ||
876 | |||
877 | # | ||
878 | # Console display driver support | ||
879 | # | ||
880 | # CONFIG_VGA_CONSOLE is not set | ||
881 | CONFIG_DUMMY_CONSOLE=y | ||
882 | # CONFIG_SOUND is not set | ||
883 | CONFIG_HID_SUPPORT=y | ||
884 | CONFIG_HID=y | ||
885 | CONFIG_HID_DEBUG=y | ||
886 | # CONFIG_HIDRAW is not set | ||
887 | CONFIG_USB_SUPPORT=y | ||
888 | CONFIG_USB_ARCH_HAS_HCD=y | ||
889 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
890 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
891 | # CONFIG_USB is not set | ||
892 | |||
893 | # | ||
894 | # Enable Host or Gadget support to see Inventra options | ||
895 | # | ||
896 | |||
897 | # | ||
898 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
899 | # | ||
900 | # CONFIG_USB_GADGET is not set | ||
901 | # CONFIG_MMC is not set | ||
902 | # CONFIG_NEW_LEDS is not set | ||
903 | CONFIG_RTC_LIB=y | ||
904 | CONFIG_RTC_CLASS=y | ||
905 | CONFIG_RTC_HCTOSYS=y | ||
906 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
907 | # CONFIG_RTC_DEBUG is not set | ||
908 | |||
909 | # | ||
910 | # RTC interfaces | ||
911 | # | ||
912 | CONFIG_RTC_INTF_SYSFS=y | ||
913 | CONFIG_RTC_INTF_PROC=y | ||
914 | CONFIG_RTC_INTF_DEV=y | ||
915 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
916 | # CONFIG_RTC_DRV_TEST is not set | ||
917 | |||
918 | # | ||
919 | # I2C RTC drivers | ||
920 | # | ||
921 | # CONFIG_RTC_DRV_DS1307 is not set | ||
922 | # CONFIG_RTC_DRV_DS1374 is not set | ||
923 | # CONFIG_RTC_DRV_DS1672 is not set | ||
924 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
925 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
926 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
927 | # CONFIG_RTC_DRV_X1205 is not set | ||
928 | CONFIG_RTC_DRV_PCF8563=y | ||
929 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
930 | # CONFIG_RTC_DRV_M41T80 is not set | ||
931 | # CONFIG_RTC_DRV_S35390A is not set | ||
932 | # CONFIG_RTC_DRV_FM3130 is not set | ||
933 | |||
934 | # | ||
935 | # SPI RTC drivers | ||
936 | # | ||
937 | |||
938 | # | ||
939 | # Platform RTC drivers | ||
940 | # | ||
941 | # CONFIG_RTC_DRV_CMOS is not set | ||
942 | # CONFIG_RTC_DRV_DS1511 is not set | ||
943 | # CONFIG_RTC_DRV_DS1553 is not set | ||
944 | # CONFIG_RTC_DRV_DS1742 is not set | ||
945 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
946 | # CONFIG_RTC_DRV_M48T86 is not set | ||
947 | # CONFIG_RTC_DRV_M48T59 is not set | ||
948 | # CONFIG_RTC_DRV_V3020 is not set | ||
949 | |||
950 | # | ||
951 | # on-CPU RTC drivers | ||
952 | # | ||
953 | # CONFIG_DMADEVICES is not set | ||
954 | |||
955 | # | ||
956 | # Voltage and Current regulators | ||
957 | # | ||
958 | # CONFIG_REGULATOR is not set | ||
959 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
960 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
961 | # CONFIG_REGULATOR_BQ24022 is not set | ||
962 | # CONFIG_UIO is not set | ||
963 | |||
964 | # | ||
965 | # File systems | ||
966 | # | ||
967 | CONFIG_EXT2_FS=y | ||
968 | # CONFIG_EXT2_FS_XATTR is not set | ||
969 | # CONFIG_EXT2_FS_XIP is not set | ||
970 | # CONFIG_EXT3_FS is not set | ||
971 | # CONFIG_EXT4DEV_FS is not set | ||
972 | # CONFIG_REISERFS_FS is not set | ||
973 | # CONFIG_JFS_FS is not set | ||
974 | # CONFIG_FS_POSIX_ACL is not set | ||
975 | # CONFIG_XFS_FS is not set | ||
976 | # CONFIG_OCFS2_FS is not set | ||
977 | CONFIG_DNOTIFY=y | ||
978 | CONFIG_INOTIFY=y | ||
979 | CONFIG_INOTIFY_USER=y | ||
980 | # CONFIG_QUOTA is not set | ||
981 | # CONFIG_AUTOFS_FS is not set | ||
982 | # CONFIG_AUTOFS4_FS is not set | ||
983 | # CONFIG_FUSE_FS is not set | ||
984 | |||
985 | # | ||
986 | # CD-ROM/DVD Filesystems | ||
987 | # | ||
988 | # CONFIG_ISO9660_FS is not set | ||
989 | # CONFIG_UDF_FS is not set | ||
990 | |||
991 | # | ||
992 | # DOS/FAT/NT Filesystems | ||
993 | # | ||
994 | # CONFIG_MSDOS_FS is not set | ||
995 | # CONFIG_VFAT_FS is not set | ||
996 | # CONFIG_NTFS_FS is not set | ||
997 | |||
998 | # | ||
999 | # Pseudo filesystems | ||
1000 | # | ||
1001 | CONFIG_PROC_FS=y | ||
1002 | CONFIG_PROC_SYSCTL=y | ||
1003 | CONFIG_SYSFS=y | ||
1004 | CONFIG_TMPFS=y | ||
1005 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
1006 | # CONFIG_HUGETLB_PAGE is not set | ||
1007 | # CONFIG_CONFIGFS_FS is not set | ||
1008 | |||
1009 | # | ||
1010 | # Miscellaneous filesystems | ||
1011 | # | ||
1012 | # CONFIG_ADFS_FS is not set | ||
1013 | # CONFIG_AFFS_FS is not set | ||
1014 | # CONFIG_HFS_FS is not set | ||
1015 | # CONFIG_HFSPLUS_FS is not set | ||
1016 | # CONFIG_BEFS_FS is not set | ||
1017 | # CONFIG_BFS_FS is not set | ||
1018 | # CONFIG_EFS_FS is not set | ||
1019 | CONFIG_JFFS2_FS=y | ||
1020 | CONFIG_JFFS2_FS_DEBUG=0 | ||
1021 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
1022 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
1023 | CONFIG_JFFS2_SUMMARY=y | ||
1024 | # CONFIG_JFFS2_FS_XATTR is not set | ||
1025 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
1026 | CONFIG_JFFS2_ZLIB=y | ||
1027 | # CONFIG_JFFS2_LZO is not set | ||
1028 | CONFIG_JFFS2_RTIME=y | ||
1029 | CONFIG_JFFS2_RUBIN=y | ||
1030 | # CONFIG_JFFS2_CMODE_NONE is not set | ||
1031 | CONFIG_JFFS2_CMODE_PRIORITY=y | ||
1032 | # CONFIG_JFFS2_CMODE_SIZE is not set | ||
1033 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
1034 | CONFIG_CRAMFS=y | ||
1035 | # CONFIG_VXFS_FS is not set | ||
1036 | # CONFIG_MINIX_FS is not set | ||
1037 | # CONFIG_OMFS_FS is not set | ||
1038 | # CONFIG_HPFS_FS is not set | ||
1039 | # CONFIG_QNX4FS_FS is not set | ||
1040 | # CONFIG_ROMFS_FS is not set | ||
1041 | # CONFIG_SYSV_FS is not set | ||
1042 | # CONFIG_UFS_FS is not set | ||
1043 | CONFIG_NETWORK_FILESYSTEMS=y | ||
1044 | CONFIG_NFS_FS=y | ||
1045 | CONFIG_NFS_V3=y | ||
1046 | # CONFIG_NFS_V3_ACL is not set | ||
1047 | # CONFIG_NFS_V4 is not set | ||
1048 | CONFIG_ROOT_NFS=y | ||
1049 | # CONFIG_NFSD is not set | ||
1050 | CONFIG_LOCKD=y | ||
1051 | CONFIG_LOCKD_V4=y | ||
1052 | CONFIG_NFS_COMMON=y | ||
1053 | CONFIG_SUNRPC=y | ||
1054 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1055 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1056 | # CONFIG_SMB_FS is not set | ||
1057 | # CONFIG_CIFS is not set | ||
1058 | # CONFIG_NCP_FS is not set | ||
1059 | # CONFIG_CODA_FS is not set | ||
1060 | # CONFIG_AFS_FS is not set | ||
1061 | |||
1062 | # | ||
1063 | # Partition Types | ||
1064 | # | ||
1065 | # CONFIG_PARTITION_ADVANCED is not set | ||
1066 | CONFIG_MSDOS_PARTITION=y | ||
1067 | # CONFIG_NLS is not set | ||
1068 | # CONFIG_DLM is not set | ||
1069 | |||
1070 | # | ||
1071 | # Kernel hacking | ||
1072 | # | ||
1073 | # CONFIG_PRINTK_TIME is not set | ||
1074 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1075 | CONFIG_ENABLE_MUST_CHECK=y | ||
1076 | CONFIG_FRAME_WARN=1024 | ||
1077 | # CONFIG_MAGIC_SYSRQ is not set | ||
1078 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1079 | # CONFIG_DEBUG_FS is not set | ||
1080 | # CONFIG_HEADERS_CHECK is not set | ||
1081 | CONFIG_DEBUG_KERNEL=y | ||
1082 | # CONFIG_DEBUG_SHIRQ is not set | ||
1083 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1084 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1085 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1086 | CONFIG_SCHED_DEBUG=y | ||
1087 | # CONFIG_SCHEDSTATS is not set | ||
1088 | # CONFIG_TIMER_STATS is not set | ||
1089 | # CONFIG_DEBUG_OBJECTS is not set | ||
1090 | # CONFIG_DEBUG_SLAB is not set | ||
1091 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1092 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1093 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1094 | CONFIG_DEBUG_MUTEXES=y | ||
1095 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1096 | # CONFIG_PROVE_LOCKING is not set | ||
1097 | # CONFIG_LOCK_STAT is not set | ||
1098 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1099 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1100 | # CONFIG_DEBUG_KOBJECT is not set | ||
1101 | CONFIG_DEBUG_BUGVERBOSE=y | ||
1102 | # CONFIG_DEBUG_INFO is not set | ||
1103 | # CONFIG_DEBUG_VM is not set | ||
1104 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1105 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1106 | # CONFIG_DEBUG_LIST is not set | ||
1107 | # CONFIG_DEBUG_SG is not set | ||
1108 | CONFIG_FRAME_POINTER=y | ||
1109 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1110 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1111 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1112 | # CONFIG_FAULT_INJECTION is not set | ||
1113 | # CONFIG_LATENCYTOP is not set | ||
1114 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
1115 | CONFIG_HAVE_FTRACE=y | ||
1116 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1117 | # CONFIG_FTRACE is not set | ||
1118 | # CONFIG_SCHED_TRACER is not set | ||
1119 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1120 | # CONFIG_SAMPLES is not set | ||
1121 | CONFIG_HAVE_ARCH_KGDB=y | ||
1122 | # CONFIG_KGDB is not set | ||
1123 | CONFIG_DEBUG_USER=y | ||
1124 | # CONFIG_DEBUG_ERRORS is not set | ||
1125 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
1126 | CONFIG_DEBUG_LL=y | ||
1127 | # CONFIG_DEBUG_ICEDCC is not set | ||
1128 | |||
1129 | # | ||
1130 | # Security options | ||
1131 | # | ||
1132 | # CONFIG_KEYS is not set | ||
1133 | # CONFIG_SECURITY is not set | ||
1134 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
1135 | CONFIG_CRYPTO=y | ||
1136 | |||
1137 | # | ||
1138 | # Crypto core or helper | ||
1139 | # | ||
1140 | # CONFIG_CRYPTO_MANAGER is not set | ||
1141 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1142 | # CONFIG_CRYPTO_NULL is not set | ||
1143 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1144 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1145 | # CONFIG_CRYPTO_TEST is not set | ||
1146 | |||
1147 | # | ||
1148 | # Authenticated Encryption with Associated Data | ||
1149 | # | ||
1150 | # CONFIG_CRYPTO_CCM is not set | ||
1151 | # CONFIG_CRYPTO_GCM is not set | ||
1152 | # CONFIG_CRYPTO_SEQIV is not set | ||
1153 | |||
1154 | # | ||
1155 | # Block modes | ||
1156 | # | ||
1157 | # CONFIG_CRYPTO_CBC is not set | ||
1158 | # CONFIG_CRYPTO_CTR is not set | ||
1159 | # CONFIG_CRYPTO_CTS is not set | ||
1160 | # CONFIG_CRYPTO_ECB is not set | ||
1161 | # CONFIG_CRYPTO_LRW is not set | ||
1162 | # CONFIG_CRYPTO_PCBC is not set | ||
1163 | # CONFIG_CRYPTO_XTS is not set | ||
1164 | |||
1165 | # | ||
1166 | # Hash modes | ||
1167 | # | ||
1168 | # CONFIG_CRYPTO_HMAC is not set | ||
1169 | # CONFIG_CRYPTO_XCBC is not set | ||
1170 | |||
1171 | # | ||
1172 | # Digest | ||
1173 | # | ||
1174 | # CONFIG_CRYPTO_CRC32C is not set | ||
1175 | # CONFIG_CRYPTO_MD4 is not set | ||
1176 | # CONFIG_CRYPTO_MD5 is not set | ||
1177 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1178 | # CONFIG_CRYPTO_RMD128 is not set | ||
1179 | # CONFIG_CRYPTO_RMD160 is not set | ||
1180 | # CONFIG_CRYPTO_RMD256 is not set | ||
1181 | # CONFIG_CRYPTO_RMD320 is not set | ||
1182 | # CONFIG_CRYPTO_SHA1 is not set | ||
1183 | # CONFIG_CRYPTO_SHA256 is not set | ||
1184 | # CONFIG_CRYPTO_SHA512 is not set | ||
1185 | # CONFIG_CRYPTO_TGR192 is not set | ||
1186 | # CONFIG_CRYPTO_WP512 is not set | ||
1187 | |||
1188 | # | ||
1189 | # Ciphers | ||
1190 | # | ||
1191 | # CONFIG_CRYPTO_AES is not set | ||
1192 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1193 | # CONFIG_CRYPTO_ARC4 is not set | ||
1194 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1195 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1196 | # CONFIG_CRYPTO_CAST5 is not set | ||
1197 | # CONFIG_CRYPTO_CAST6 is not set | ||
1198 | # CONFIG_CRYPTO_DES is not set | ||
1199 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1200 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1201 | # CONFIG_CRYPTO_SALSA20 is not set | ||
1202 | # CONFIG_CRYPTO_SEED is not set | ||
1203 | # CONFIG_CRYPTO_SERPENT is not set | ||
1204 | # CONFIG_CRYPTO_TEA is not set | ||
1205 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1206 | |||
1207 | # | ||
1208 | # Compression | ||
1209 | # | ||
1210 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1211 | # CONFIG_CRYPTO_LZO is not set | ||
1212 | CONFIG_CRYPTO_HW=y | ||
1213 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
1214 | |||
1215 | # | ||
1216 | # Library routines | ||
1217 | # | ||
1218 | CONFIG_BITREVERSE=y | ||
1219 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1220 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1221 | # CONFIG_CRC_CCITT is not set | ||
1222 | # CONFIG_CRC16 is not set | ||
1223 | # CONFIG_CRC_T10DIF is not set | ||
1224 | # CONFIG_CRC_ITU_T is not set | ||
1225 | CONFIG_CRC32=y | ||
1226 | # CONFIG_CRC7 is not set | ||
1227 | # CONFIG_LIBCRC32C is not set | ||
1228 | CONFIG_ZLIB_INFLATE=y | ||
1229 | CONFIG_ZLIB_DEFLATE=y | ||
1230 | CONFIG_PLIST=y | ||
1231 | CONFIG_HAS_IOMEM=y | ||
1232 | CONFIG_HAS_IOPORT=y | ||
1233 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/acs5k_tiny_defconfig b/arch/arm/configs/acs5k_tiny_defconfig new file mode 100644 index 000000000000..8e3d084afd78 --- /dev/null +++ b/arch/arm/configs/acs5k_tiny_defconfig | |||
@@ -0,0 +1,941 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.27-simtec-micrel1 | ||
4 | # Tue Jan 6 13:23:07 2009 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | # CONFIG_GENERIC_TIME is not set | ||
10 | # CONFIG_GENERIC_CLOCKEVENTS is not set | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
16 | CONFIG_LOCKDEP_SUPPORT=y | ||
17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
23 | CONFIG_GENERIC_HWEIGHT=y | ||
24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
25 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
26 | CONFIG_ZONE_DMA=y | ||
27 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
28 | CONFIG_VECTORS_BASE=0xffff0000 | ||
29 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
30 | |||
31 | # | ||
32 | # General setup | ||
33 | # | ||
34 | CONFIG_EXPERIMENTAL=y | ||
35 | CONFIG_BROKEN_ON_SMP=y | ||
36 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
37 | CONFIG_LOCALVERSION="" | ||
38 | CONFIG_LOCALVERSION_AUTO=y | ||
39 | # CONFIG_SWAP is not set | ||
40 | CONFIG_SYSVIPC=y | ||
41 | CONFIG_SYSVIPC_SYSCTL=y | ||
42 | CONFIG_POSIX_MQUEUE=y | ||
43 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
44 | # CONFIG_TASKSTATS is not set | ||
45 | # CONFIG_AUDIT is not set | ||
46 | # CONFIG_IKCONFIG is not set | ||
47 | CONFIG_LOG_BUF_SHIFT=14 | ||
48 | # CONFIG_CGROUPS is not set | ||
49 | # CONFIG_GROUP_SCHED is not set | ||
50 | CONFIG_SYSFS_DEPRECATED=y | ||
51 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
52 | # CONFIG_RELAY is not set | ||
53 | CONFIG_NAMESPACES=y | ||
54 | # CONFIG_UTS_NS is not set | ||
55 | # CONFIG_IPC_NS is not set | ||
56 | # CONFIG_USER_NS is not set | ||
57 | # CONFIG_PID_NS is not set | ||
58 | # CONFIG_BLK_DEV_INITRD is not set | ||
59 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
60 | CONFIG_SYSCTL=y | ||
61 | # CONFIG_EMBEDDED is not set | ||
62 | CONFIG_UID16=y | ||
63 | CONFIG_SYSCTL_SYSCALL=y | ||
64 | CONFIG_KALLSYMS=y | ||
65 | # CONFIG_KALLSYMS_ALL is not set | ||
66 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
67 | CONFIG_HOTPLUG=y | ||
68 | CONFIG_PRINTK=y | ||
69 | CONFIG_BUG=y | ||
70 | CONFIG_ELF_CORE=y | ||
71 | CONFIG_COMPAT_BRK=y | ||
72 | CONFIG_BASE_FULL=y | ||
73 | CONFIG_FUTEX=y | ||
74 | CONFIG_ANON_INODES=y | ||
75 | CONFIG_EPOLL=y | ||
76 | CONFIG_SIGNALFD=y | ||
77 | CONFIG_TIMERFD=y | ||
78 | CONFIG_EVENTFD=y | ||
79 | CONFIG_SHMEM=y | ||
80 | CONFIG_VM_EVENT_COUNTERS=y | ||
81 | CONFIG_SLAB=y | ||
82 | # CONFIG_SLUB is not set | ||
83 | # CONFIG_SLOB is not set | ||
84 | # CONFIG_PROFILING is not set | ||
85 | # CONFIG_MARKERS is not set | ||
86 | CONFIG_HAVE_OPROFILE=y | ||
87 | # CONFIG_KPROBES is not set | ||
88 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
89 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
90 | CONFIG_HAVE_KPROBES=y | ||
91 | CONFIG_HAVE_KRETPROBES=y | ||
92 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
93 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
94 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
95 | # CONFIG_HAVE_CLK is not set | ||
96 | CONFIG_PROC_PAGE_MONITOR=y | ||
97 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
98 | CONFIG_SLABINFO=y | ||
99 | CONFIG_RT_MUTEXES=y | ||
100 | # CONFIG_TINY_SHMEM is not set | ||
101 | CONFIG_BASE_SMALL=0 | ||
102 | CONFIG_MODULES=y | ||
103 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
104 | CONFIG_MODULE_UNLOAD=y | ||
105 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
106 | # CONFIG_MODVERSIONS is not set | ||
107 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
108 | CONFIG_KMOD=y | ||
109 | CONFIG_BLOCK=y | ||
110 | # CONFIG_LBD is not set | ||
111 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
112 | # CONFIG_LSF is not set | ||
113 | # CONFIG_BLK_DEV_BSG is not set | ||
114 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
115 | |||
116 | # | ||
117 | # IO Schedulers | ||
118 | # | ||
119 | CONFIG_IOSCHED_NOOP=y | ||
120 | CONFIG_IOSCHED_AS=y | ||
121 | # CONFIG_IOSCHED_DEADLINE is not set | ||
122 | # CONFIG_IOSCHED_CFQ is not set | ||
123 | CONFIG_DEFAULT_AS=y | ||
124 | # CONFIG_DEFAULT_DEADLINE is not set | ||
125 | # CONFIG_DEFAULT_CFQ is not set | ||
126 | # CONFIG_DEFAULT_NOOP is not set | ||
127 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
128 | CONFIG_CLASSIC_RCU=y | ||
129 | |||
130 | # | ||
131 | # System Type | ||
132 | # | ||
133 | # CONFIG_ARCH_AAEC2000 is not set | ||
134 | # CONFIG_ARCH_INTEGRATOR is not set | ||
135 | # CONFIG_ARCH_REALVIEW is not set | ||
136 | # CONFIG_ARCH_VERSATILE is not set | ||
137 | # CONFIG_ARCH_AT91 is not set | ||
138 | # CONFIG_ARCH_CLPS7500 is not set | ||
139 | # CONFIG_ARCH_CLPS711X is not set | ||
140 | # CONFIG_ARCH_EBSA110 is not set | ||
141 | # CONFIG_ARCH_EP93XX is not set | ||
142 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
143 | # CONFIG_ARCH_NETX is not set | ||
144 | # CONFIG_ARCH_H720X is not set | ||
145 | # CONFIG_ARCH_IMX is not set | ||
146 | # CONFIG_ARCH_IOP13XX is not set | ||
147 | # CONFIG_ARCH_IOP32X is not set | ||
148 | # CONFIG_ARCH_IOP33X is not set | ||
149 | # CONFIG_ARCH_IXP23XX is not set | ||
150 | # CONFIG_ARCH_IXP2000 is not set | ||
151 | # CONFIG_ARCH_IXP4XX is not set | ||
152 | # CONFIG_ARCH_L7200 is not set | ||
153 | # CONFIG_ARCH_KIRKWOOD is not set | ||
154 | CONFIG_ARCH_KS8695=y | ||
155 | # CONFIG_ARCH_NS9XXX is not set | ||
156 | # CONFIG_ARCH_LOKI is not set | ||
157 | # CONFIG_ARCH_MV78XX0 is not set | ||
158 | # CONFIG_ARCH_MXC is not set | ||
159 | # CONFIG_ARCH_ORION5X is not set | ||
160 | # CONFIG_ARCH_PNX4008 is not set | ||
161 | # CONFIG_ARCH_PXA is not set | ||
162 | # CONFIG_ARCH_RPC is not set | ||
163 | # CONFIG_ARCH_SA1100 is not set | ||
164 | # CONFIG_ARCH_S3C2410 is not set | ||
165 | # CONFIG_ARCH_SHARK is not set | ||
166 | # CONFIG_ARCH_LH7A40X is not set | ||
167 | # CONFIG_ARCH_DAVINCI is not set | ||
168 | # CONFIG_ARCH_OMAP is not set | ||
169 | # CONFIG_ARCH_MSM7X00A is not set | ||
170 | |||
171 | # | ||
172 | # Boot options | ||
173 | # | ||
174 | |||
175 | # | ||
176 | # Power management | ||
177 | # | ||
178 | |||
179 | # | ||
180 | # Kendin/Micrel KS8695 Implementations | ||
181 | # | ||
182 | # CONFIG_MACH_KS8695 is not set | ||
183 | # CONFIG_MACH_DSM320 is not set | ||
184 | CONFIG_MACH_ACS5K=y | ||
185 | |||
186 | # | ||
187 | # Processor Type | ||
188 | # | ||
189 | CONFIG_CPU_32=y | ||
190 | CONFIG_CPU_ARM922T=y | ||
191 | CONFIG_CPU_32v4T=y | ||
192 | CONFIG_CPU_ABRT_EV4T=y | ||
193 | CONFIG_CPU_PABRT_NOIFAR=y | ||
194 | CONFIG_CPU_CACHE_V4WT=y | ||
195 | CONFIG_CPU_CACHE_VIVT=y | ||
196 | CONFIG_CPU_COPY_V4WB=y | ||
197 | CONFIG_CPU_TLB_V4WBI=y | ||
198 | CONFIG_CPU_CP15=y | ||
199 | CONFIG_CPU_CP15_MMU=y | ||
200 | |||
201 | # | ||
202 | # Processor Features | ||
203 | # | ||
204 | # CONFIG_ARM_THUMB is not set | ||
205 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
206 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
207 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
208 | # CONFIG_OUTER_CACHE is not set | ||
209 | |||
210 | # | ||
211 | # Bus support | ||
212 | # | ||
213 | # CONFIG_PCI is not set | ||
214 | # CONFIG_PCI_SYSCALL is not set | ||
215 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
216 | # CONFIG_PCCARD is not set | ||
217 | |||
218 | # | ||
219 | # Kernel Features | ||
220 | # | ||
221 | # CONFIG_TICK_ONESHOT is not set | ||
222 | # CONFIG_PREEMPT is not set | ||
223 | CONFIG_HZ=100 | ||
224 | CONFIG_AEABI=y | ||
225 | CONFIG_OABI_COMPAT=y | ||
226 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
227 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
228 | CONFIG_SELECT_MEMORY_MODEL=y | ||
229 | CONFIG_FLATMEM_MANUAL=y | ||
230 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
231 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
232 | CONFIG_FLATMEM=y | ||
233 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
234 | # CONFIG_SPARSEMEM_STATIC is not set | ||
235 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
236 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
237 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
238 | # CONFIG_RESOURCES_64BIT is not set | ||
239 | CONFIG_ZONE_DMA_FLAG=1 | ||
240 | CONFIG_BOUNCE=y | ||
241 | CONFIG_VIRT_TO_BUS=y | ||
242 | # CONFIG_LEDS is not set | ||
243 | CONFIG_ALIGNMENT_TRAP=y | ||
244 | |||
245 | # | ||
246 | # Boot options | ||
247 | # | ||
248 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
249 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
250 | CONFIG_CMDLINE="console=ttyAM0,115200 init=/bin/sh" | ||
251 | # CONFIG_XIP_KERNEL is not set | ||
252 | # CONFIG_KEXEC is not set | ||
253 | |||
254 | # | ||
255 | # Floating point emulation | ||
256 | # | ||
257 | |||
258 | # | ||
259 | # At least one emulation must be selected | ||
260 | # | ||
261 | CONFIG_FPE_NWFPE=y | ||
262 | # CONFIG_FPE_NWFPE_XP is not set | ||
263 | # CONFIG_FPE_FASTFPE is not set | ||
264 | |||
265 | # | ||
266 | # Userspace binary formats | ||
267 | # | ||
268 | CONFIG_BINFMT_ELF=y | ||
269 | # CONFIG_BINFMT_AOUT is not set | ||
270 | # CONFIG_BINFMT_MISC is not set | ||
271 | |||
272 | # | ||
273 | # Power management options | ||
274 | # | ||
275 | # CONFIG_PM is not set | ||
276 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
277 | CONFIG_NET=y | ||
278 | |||
279 | # | ||
280 | # Networking options | ||
281 | # | ||
282 | CONFIG_PACKET=y | ||
283 | # CONFIG_PACKET_MMAP is not set | ||
284 | CONFIG_UNIX=y | ||
285 | # CONFIG_NET_KEY is not set | ||
286 | CONFIG_INET=y | ||
287 | # CONFIG_IP_MULTICAST is not set | ||
288 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
289 | CONFIG_IP_FIB_HASH=y | ||
290 | # CONFIG_IP_PNP is not set | ||
291 | # CONFIG_NET_IPIP is not set | ||
292 | # CONFIG_NET_IPGRE is not set | ||
293 | # CONFIG_ARPD is not set | ||
294 | # CONFIG_SYN_COOKIES is not set | ||
295 | # CONFIG_INET_AH is not set | ||
296 | # CONFIG_INET_ESP is not set | ||
297 | # CONFIG_INET_IPCOMP is not set | ||
298 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
299 | # CONFIG_INET_TUNNEL is not set | ||
300 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
301 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
302 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
303 | # CONFIG_INET_LRO is not set | ||
304 | CONFIG_INET_DIAG=y | ||
305 | CONFIG_INET_TCP_DIAG=y | ||
306 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
307 | CONFIG_TCP_CONG_CUBIC=y | ||
308 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
309 | # CONFIG_TCP_MD5SIG is not set | ||
310 | # CONFIG_IPV6 is not set | ||
311 | # CONFIG_NETWORK_SECMARK is not set | ||
312 | # CONFIG_NETFILTER is not set | ||
313 | # CONFIG_IP_DCCP is not set | ||
314 | # CONFIG_IP_SCTP is not set | ||
315 | # CONFIG_TIPC is not set | ||
316 | # CONFIG_ATM is not set | ||
317 | # CONFIG_BRIDGE is not set | ||
318 | # CONFIG_VLAN_8021Q is not set | ||
319 | # CONFIG_DECNET is not set | ||
320 | # CONFIG_LLC2 is not set | ||
321 | # CONFIG_IPX is not set | ||
322 | # CONFIG_ATALK is not set | ||
323 | # CONFIG_X25 is not set | ||
324 | # CONFIG_LAPB is not set | ||
325 | # CONFIG_ECONET is not set | ||
326 | # CONFIG_WAN_ROUTER is not set | ||
327 | # CONFIG_NET_SCHED is not set | ||
328 | |||
329 | # | ||
330 | # Network testing | ||
331 | # | ||
332 | # CONFIG_NET_PKTGEN is not set | ||
333 | # CONFIG_HAMRADIO is not set | ||
334 | # CONFIG_CAN is not set | ||
335 | # CONFIG_IRDA is not set | ||
336 | # CONFIG_BT is not set | ||
337 | # CONFIG_AF_RXRPC is not set | ||
338 | |||
339 | # | ||
340 | # Wireless | ||
341 | # | ||
342 | # CONFIG_CFG80211 is not set | ||
343 | # CONFIG_WIRELESS_EXT is not set | ||
344 | # CONFIG_MAC80211 is not set | ||
345 | # CONFIG_IEEE80211 is not set | ||
346 | # CONFIG_RFKILL is not set | ||
347 | # CONFIG_NET_9P is not set | ||
348 | |||
349 | # | ||
350 | # Device Drivers | ||
351 | # | ||
352 | |||
353 | # | ||
354 | # Generic Driver Options | ||
355 | # | ||
356 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
357 | CONFIG_STANDALONE=y | ||
358 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
359 | CONFIG_FW_LOADER=y | ||
360 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
361 | CONFIG_EXTRA_FIRMWARE="" | ||
362 | # CONFIG_DEBUG_DRIVER is not set | ||
363 | # CONFIG_DEBUG_DEVRES is not set | ||
364 | # CONFIG_SYS_HYPERVISOR is not set | ||
365 | # CONFIG_CONNECTOR is not set | ||
366 | CONFIG_MTD=y | ||
367 | # CONFIG_MTD_DEBUG is not set | ||
368 | CONFIG_MTD_CONCAT=y | ||
369 | CONFIG_MTD_PARTITIONS=y | ||
370 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
371 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
372 | # CONFIG_MTD_AFS_PARTS is not set | ||
373 | # CONFIG_MTD_AR7_PARTS is not set | ||
374 | |||
375 | # | ||
376 | # User Modules And Translation Layers | ||
377 | # | ||
378 | CONFIG_MTD_CHAR=y | ||
379 | CONFIG_MTD_BLKDEVS=y | ||
380 | CONFIG_MTD_BLOCK=y | ||
381 | # CONFIG_FTL is not set | ||
382 | # CONFIG_NFTL is not set | ||
383 | # CONFIG_INFTL is not set | ||
384 | # CONFIG_RFD_FTL is not set | ||
385 | # CONFIG_SSFDC is not set | ||
386 | # CONFIG_MTD_OOPS is not set | ||
387 | |||
388 | # | ||
389 | # RAM/ROM/Flash chip drivers | ||
390 | # | ||
391 | CONFIG_MTD_CFI=y | ||
392 | CONFIG_MTD_JEDECPROBE=y | ||
393 | CONFIG_MTD_GEN_PROBE=y | ||
394 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
395 | CONFIG_MTD_CFI_NOSWAP=y | ||
396 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
397 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
398 | # CONFIG_MTD_CFI_GEOMETRY is not set | ||
399 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
400 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
401 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
402 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
403 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
404 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
405 | CONFIG_MTD_CFI_I1=y | ||
406 | CONFIG_MTD_CFI_I2=y | ||
407 | # CONFIG_MTD_CFI_I4 is not set | ||
408 | # CONFIG_MTD_CFI_I8 is not set | ||
409 | # CONFIG_MTD_OTP is not set | ||
410 | CONFIG_MTD_CFI_INTELEXT=y | ||
411 | CONFIG_MTD_CFI_AMDSTD=y | ||
412 | # CONFIG_MTD_CFI_STAA is not set | ||
413 | CONFIG_MTD_CFI_UTIL=y | ||
414 | # CONFIG_MTD_RAM is not set | ||
415 | # CONFIG_MTD_ROM is not set | ||
416 | # CONFIG_MTD_ABSENT is not set | ||
417 | |||
418 | # | ||
419 | # Mapping drivers for chip access | ||
420 | # | ||
421 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
422 | CONFIG_MTD_PHYSMAP=y | ||
423 | CONFIG_MTD_PHYSMAP_START=0x8000000 | ||
424 | CONFIG_MTD_PHYSMAP_LEN=0 | ||
425 | CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | ||
426 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
427 | # CONFIG_MTD_IMPA7 is not set | ||
428 | # CONFIG_MTD_PLATRAM is not set | ||
429 | |||
430 | # | ||
431 | # Self-contained MTD device drivers | ||
432 | # | ||
433 | # CONFIG_MTD_SLRAM is not set | ||
434 | # CONFIG_MTD_PHRAM is not set | ||
435 | # CONFIG_MTD_MTDRAM is not set | ||
436 | # CONFIG_MTD_BLOCK2MTD is not set | ||
437 | |||
438 | # | ||
439 | # Disk-On-Chip Device Drivers | ||
440 | # | ||
441 | # CONFIG_MTD_DOC2000 is not set | ||
442 | # CONFIG_MTD_DOC2001 is not set | ||
443 | # CONFIG_MTD_DOC2001PLUS is not set | ||
444 | # CONFIG_MTD_NAND is not set | ||
445 | # CONFIG_MTD_ONENAND is not set | ||
446 | |||
447 | # | ||
448 | # UBI - Unsorted block images | ||
449 | # | ||
450 | # CONFIG_MTD_UBI is not set | ||
451 | # CONFIG_PARPORT is not set | ||
452 | # CONFIG_BLK_DEV is not set | ||
453 | # CONFIG_MISC_DEVICES is not set | ||
454 | CONFIG_HAVE_IDE=y | ||
455 | # CONFIG_IDE is not set | ||
456 | |||
457 | # | ||
458 | # SCSI device support | ||
459 | # | ||
460 | # CONFIG_RAID_ATTRS is not set | ||
461 | # CONFIG_SCSI is not set | ||
462 | # CONFIG_SCSI_DMA is not set | ||
463 | # CONFIG_SCSI_NETLINK is not set | ||
464 | # CONFIG_ATA is not set | ||
465 | # CONFIG_MD is not set | ||
466 | CONFIG_NETDEVICES=y | ||
467 | # CONFIG_DUMMY is not set | ||
468 | # CONFIG_BONDING is not set | ||
469 | # CONFIG_MACVLAN is not set | ||
470 | # CONFIG_EQUALIZER is not set | ||
471 | # CONFIG_TUN is not set | ||
472 | # CONFIG_VETH is not set | ||
473 | # CONFIG_PHYLIB is not set | ||
474 | CONFIG_NET_ETHERNET=y | ||
475 | CONFIG_MII=y | ||
476 | CONFIG_ARM_KS8695_ETHER=y | ||
477 | # CONFIG_AX88796 is not set | ||
478 | # CONFIG_SMC91X is not set | ||
479 | # CONFIG_DM9000 is not set | ||
480 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
481 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
482 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
483 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
484 | # CONFIG_B44 is not set | ||
485 | # CONFIG_NETDEV_1000 is not set | ||
486 | # CONFIG_NETDEV_10000 is not set | ||
487 | |||
488 | # | ||
489 | # Wireless LAN | ||
490 | # | ||
491 | # CONFIG_WLAN_PRE80211 is not set | ||
492 | CONFIG_WLAN_80211=y | ||
493 | # CONFIG_LIBERTAS is not set | ||
494 | # CONFIG_IWLWIFI_LEDS is not set | ||
495 | # CONFIG_HOSTAP is not set | ||
496 | # CONFIG_WAN is not set | ||
497 | # CONFIG_PPP is not set | ||
498 | # CONFIG_SLIP is not set | ||
499 | # CONFIG_NETCONSOLE is not set | ||
500 | # CONFIG_NETPOLL is not set | ||
501 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
502 | # CONFIG_ISDN is not set | ||
503 | |||
504 | # | ||
505 | # Input device support | ||
506 | # | ||
507 | CONFIG_INPUT=y | ||
508 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
509 | # CONFIG_INPUT_POLLDEV is not set | ||
510 | |||
511 | # | ||
512 | # Userland interfaces | ||
513 | # | ||
514 | CONFIG_INPUT_MOUSEDEV=y | ||
515 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
516 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
517 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
518 | # CONFIG_INPUT_JOYDEV is not set | ||
519 | # CONFIG_INPUT_EVDEV is not set | ||
520 | # CONFIG_INPUT_EVBUG is not set | ||
521 | |||
522 | # | ||
523 | # Input Device Drivers | ||
524 | # | ||
525 | # CONFIG_INPUT_KEYBOARD is not set | ||
526 | # CONFIG_INPUT_MOUSE is not set | ||
527 | # CONFIG_INPUT_JOYSTICK is not set | ||
528 | # CONFIG_INPUT_TABLET is not set | ||
529 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
530 | # CONFIG_INPUT_MISC is not set | ||
531 | |||
532 | # | ||
533 | # Hardware I/O ports | ||
534 | # | ||
535 | # CONFIG_SERIO is not set | ||
536 | # CONFIG_GAMEPORT is not set | ||
537 | |||
538 | # | ||
539 | # Character devices | ||
540 | # | ||
541 | CONFIG_VT=y | ||
542 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
543 | CONFIG_VT_CONSOLE=y | ||
544 | CONFIG_HW_CONSOLE=y | ||
545 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
546 | CONFIG_DEVKMEM=y | ||
547 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
548 | |||
549 | # | ||
550 | # Serial drivers | ||
551 | # | ||
552 | # CONFIG_SERIAL_8250 is not set | ||
553 | |||
554 | # | ||
555 | # Non-8250 serial port support | ||
556 | # | ||
557 | CONFIG_SERIAL_KS8695=y | ||
558 | CONFIG_SERIAL_KS8695_CONSOLE=y | ||
559 | CONFIG_SERIAL_CORE=y | ||
560 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
561 | CONFIG_UNIX98_PTYS=y | ||
562 | CONFIG_LEGACY_PTYS=y | ||
563 | CONFIG_LEGACY_PTY_COUNT=256 | ||
564 | # CONFIG_IPMI_HANDLER is not set | ||
565 | # CONFIG_HW_RANDOM is not set | ||
566 | # CONFIG_NVRAM is not set | ||
567 | # CONFIG_R3964 is not set | ||
568 | # CONFIG_RAW_DRIVER is not set | ||
569 | # CONFIG_TCG_TPM is not set | ||
570 | CONFIG_ACS5KCAN=y | ||
571 | CONFIG_I2C=y | ||
572 | CONFIG_I2C_BOARDINFO=y | ||
573 | CONFIG_I2C_CHARDEV=y | ||
574 | CONFIG_I2C_HELPER_AUTO=y | ||
575 | CONFIG_I2C_ALGOBIT=y | ||
576 | |||
577 | # | ||
578 | # I2C Hardware Bus support | ||
579 | # | ||
580 | |||
581 | # | ||
582 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
583 | # | ||
584 | CONFIG_I2C_GPIO=y | ||
585 | # CONFIG_I2C_OCORES is not set | ||
586 | # CONFIG_I2C_SIMTEC is not set | ||
587 | |||
588 | # | ||
589 | # External I2C/SMBus adapter drivers | ||
590 | # | ||
591 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
592 | # CONFIG_I2C_TAOS_EVM is not set | ||
593 | |||
594 | # | ||
595 | # Other I2C/SMBus bus drivers | ||
596 | # | ||
597 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
598 | # CONFIG_I2C_STUB is not set | ||
599 | |||
600 | # | ||
601 | # Miscellaneous I2C Chip support | ||
602 | # | ||
603 | # CONFIG_DS1682 is not set | ||
604 | # CONFIG_AT24 is not set | ||
605 | # CONFIG_SENSORS_EEPROM is not set | ||
606 | # CONFIG_SENSORS_PCF8574 is not set | ||
607 | # CONFIG_PCF8575 is not set | ||
608 | # CONFIG_SENSORS_PCF8591 is not set | ||
609 | # CONFIG_TPS65010 is not set | ||
610 | # CONFIG_SENSORS_MAX6875 is not set | ||
611 | # CONFIG_SENSORS_TSL2550 is not set | ||
612 | # CONFIG_I2C_DEBUG_CORE is not set | ||
613 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
614 | # CONFIG_I2C_DEBUG_BUS is not set | ||
615 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
616 | # CONFIG_SPI is not set | ||
617 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
618 | CONFIG_GPIOLIB=y | ||
619 | # CONFIG_DEBUG_GPIO is not set | ||
620 | CONFIG_GPIO_SYSFS=y | ||
621 | |||
622 | # | ||
623 | # I2C GPIO expanders: | ||
624 | # | ||
625 | # CONFIG_GPIO_MAX732X is not set | ||
626 | CONFIG_GPIO_PCA953X=y | ||
627 | # CONFIG_GPIO_PCF857X is not set | ||
628 | |||
629 | # | ||
630 | # PCI GPIO expanders: | ||
631 | # | ||
632 | |||
633 | # | ||
634 | # SPI GPIO expanders: | ||
635 | # | ||
636 | # CONFIG_W1 is not set | ||
637 | # CONFIG_POWER_SUPPLY is not set | ||
638 | # CONFIG_HWMON is not set | ||
639 | CONFIG_WATCHDOG=y | ||
640 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
641 | |||
642 | # | ||
643 | # Watchdog Device Drivers | ||
644 | # | ||
645 | # CONFIG_SOFT_WATCHDOG is not set | ||
646 | CONFIG_KS8695_WATCHDOG=y | ||
647 | |||
648 | # | ||
649 | # Sonics Silicon Backplane | ||
650 | # | ||
651 | CONFIG_SSB_POSSIBLE=y | ||
652 | # CONFIG_SSB is not set | ||
653 | |||
654 | # | ||
655 | # Multifunction device drivers | ||
656 | # | ||
657 | # CONFIG_MFD_CORE is not set | ||
658 | # CONFIG_MFD_SM501 is not set | ||
659 | # CONFIG_MFD_ASIC3 is not set | ||
660 | # CONFIG_HTC_EGPIO is not set | ||
661 | # CONFIG_HTC_PASIC3 is not set | ||
662 | # CONFIG_MFD_TMIO is not set | ||
663 | # CONFIG_MFD_T7L66XB is not set | ||
664 | # CONFIG_MFD_TC6387XB is not set | ||
665 | # CONFIG_MFD_TC6393XB is not set | ||
666 | |||
667 | # | ||
668 | # Multimedia devices | ||
669 | # | ||
670 | |||
671 | # | ||
672 | # Multimedia core support | ||
673 | # | ||
674 | # CONFIG_VIDEO_DEV is not set | ||
675 | # CONFIG_DVB_CORE is not set | ||
676 | # CONFIG_VIDEO_MEDIA is not set | ||
677 | |||
678 | # | ||
679 | # Multimedia drivers | ||
680 | # | ||
681 | # CONFIG_DAB is not set | ||
682 | |||
683 | # | ||
684 | # Graphics support | ||
685 | # | ||
686 | # CONFIG_VGASTATE is not set | ||
687 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
688 | # CONFIG_FB is not set | ||
689 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
690 | |||
691 | # | ||
692 | # Display device support | ||
693 | # | ||
694 | # CONFIG_DISPLAY_SUPPORT is not set | ||
695 | |||
696 | # | ||
697 | # Console display driver support | ||
698 | # | ||
699 | # CONFIG_VGA_CONSOLE is not set | ||
700 | CONFIG_DUMMY_CONSOLE=y | ||
701 | # CONFIG_SOUND is not set | ||
702 | # CONFIG_HID_SUPPORT is not set | ||
703 | # CONFIG_USB_SUPPORT is not set | ||
704 | # CONFIG_MMC is not set | ||
705 | # CONFIG_NEW_LEDS is not set | ||
706 | CONFIG_RTC_LIB=y | ||
707 | CONFIG_RTC_CLASS=y | ||
708 | CONFIG_RTC_HCTOSYS=y | ||
709 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
710 | # CONFIG_RTC_DEBUG is not set | ||
711 | |||
712 | # | ||
713 | # RTC interfaces | ||
714 | # | ||
715 | CONFIG_RTC_INTF_SYSFS=y | ||
716 | CONFIG_RTC_INTF_PROC=y | ||
717 | CONFIG_RTC_INTF_DEV=y | ||
718 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
719 | # CONFIG_RTC_DRV_TEST is not set | ||
720 | |||
721 | # | ||
722 | # I2C RTC drivers | ||
723 | # | ||
724 | # CONFIG_RTC_DRV_DS1307 is not set | ||
725 | # CONFIG_RTC_DRV_DS1374 is not set | ||
726 | # CONFIG_RTC_DRV_DS1672 is not set | ||
727 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
728 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
729 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
730 | # CONFIG_RTC_DRV_X1205 is not set | ||
731 | CONFIG_RTC_DRV_PCF8563=y | ||
732 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
733 | # CONFIG_RTC_DRV_M41T80 is not set | ||
734 | # CONFIG_RTC_DRV_S35390A is not set | ||
735 | # CONFIG_RTC_DRV_FM3130 is not set | ||
736 | |||
737 | # | ||
738 | # SPI RTC drivers | ||
739 | # | ||
740 | |||
741 | # | ||
742 | # Platform RTC drivers | ||
743 | # | ||
744 | # CONFIG_RTC_DRV_CMOS is not set | ||
745 | # CONFIG_RTC_DRV_DS1511 is not set | ||
746 | # CONFIG_RTC_DRV_DS1553 is not set | ||
747 | # CONFIG_RTC_DRV_DS1742 is not set | ||
748 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
749 | # CONFIG_RTC_DRV_M48T86 is not set | ||
750 | # CONFIG_RTC_DRV_M48T59 is not set | ||
751 | # CONFIG_RTC_DRV_V3020 is not set | ||
752 | |||
753 | # | ||
754 | # on-CPU RTC drivers | ||
755 | # | ||
756 | # CONFIG_DMADEVICES is not set | ||
757 | |||
758 | # | ||
759 | # Voltage and Current regulators | ||
760 | # | ||
761 | # CONFIG_REGULATOR is not set | ||
762 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
763 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
764 | # CONFIG_REGULATOR_BQ24022 is not set | ||
765 | # CONFIG_UIO is not set | ||
766 | |||
767 | # | ||
768 | # File systems | ||
769 | # | ||
770 | # CONFIG_EXT2_FS is not set | ||
771 | # CONFIG_EXT3_FS is not set | ||
772 | # CONFIG_EXT4DEV_FS is not set | ||
773 | # CONFIG_REISERFS_FS is not set | ||
774 | # CONFIG_JFS_FS is not set | ||
775 | # CONFIG_FS_POSIX_ACL is not set | ||
776 | # CONFIG_XFS_FS is not set | ||
777 | # CONFIG_OCFS2_FS is not set | ||
778 | CONFIG_DNOTIFY=y | ||
779 | CONFIG_INOTIFY=y | ||
780 | CONFIG_INOTIFY_USER=y | ||
781 | # CONFIG_QUOTA is not set | ||
782 | # CONFIG_AUTOFS_FS is not set | ||
783 | # CONFIG_AUTOFS4_FS is not set | ||
784 | # CONFIG_FUSE_FS is not set | ||
785 | |||
786 | # | ||
787 | # CD-ROM/DVD Filesystems | ||
788 | # | ||
789 | # CONFIG_ISO9660_FS is not set | ||
790 | # CONFIG_UDF_FS is not set | ||
791 | |||
792 | # | ||
793 | # DOS/FAT/NT Filesystems | ||
794 | # | ||
795 | # CONFIG_MSDOS_FS is not set | ||
796 | # CONFIG_VFAT_FS is not set | ||
797 | # CONFIG_NTFS_FS is not set | ||
798 | |||
799 | # | ||
800 | # Pseudo filesystems | ||
801 | # | ||
802 | CONFIG_PROC_FS=y | ||
803 | CONFIG_PROC_SYSCTL=y | ||
804 | CONFIG_SYSFS=y | ||
805 | CONFIG_TMPFS=y | ||
806 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
807 | # CONFIG_HUGETLB_PAGE is not set | ||
808 | # CONFIG_CONFIGFS_FS is not set | ||
809 | |||
810 | # | ||
811 | # Miscellaneous filesystems | ||
812 | # | ||
813 | # CONFIG_ADFS_FS is not set | ||
814 | # CONFIG_AFFS_FS is not set | ||
815 | # CONFIG_HFS_FS is not set | ||
816 | # CONFIG_HFSPLUS_FS is not set | ||
817 | # CONFIG_BEFS_FS is not set | ||
818 | # CONFIG_BFS_FS is not set | ||
819 | # CONFIG_EFS_FS is not set | ||
820 | CONFIG_JFFS2_FS=y | ||
821 | CONFIG_JFFS2_FS_DEBUG=0 | ||
822 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
823 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
824 | CONFIG_JFFS2_SUMMARY=y | ||
825 | # CONFIG_JFFS2_FS_XATTR is not set | ||
826 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
827 | CONFIG_JFFS2_ZLIB=y | ||
828 | # CONFIG_JFFS2_LZO is not set | ||
829 | CONFIG_JFFS2_RTIME=y | ||
830 | CONFIG_JFFS2_RUBIN=y | ||
831 | # CONFIG_JFFS2_CMODE_NONE is not set | ||
832 | CONFIG_JFFS2_CMODE_PRIORITY=y | ||
833 | # CONFIG_JFFS2_CMODE_SIZE is not set | ||
834 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
835 | # CONFIG_CRAMFS is not set | ||
836 | CONFIG_SQUASHFS=y | ||
837 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
838 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
839 | # CONFIG_VXFS_FS is not set | ||
840 | # CONFIG_MINIX_FS is not set | ||
841 | # CONFIG_OMFS_FS is not set | ||
842 | # CONFIG_HPFS_FS is not set | ||
843 | # CONFIG_QNX4FS_FS is not set | ||
844 | # CONFIG_ROMFS_FS is not set | ||
845 | # CONFIG_SYSV_FS is not set | ||
846 | # CONFIG_UFS_FS is not set | ||
847 | # CONFIG_NETWORK_FILESYSTEMS is not set | ||
848 | |||
849 | # | ||
850 | # Partition Types | ||
851 | # | ||
852 | # CONFIG_PARTITION_ADVANCED is not set | ||
853 | CONFIG_MSDOS_PARTITION=y | ||
854 | # CONFIG_NLS is not set | ||
855 | # CONFIG_DLM is not set | ||
856 | |||
857 | # | ||
858 | # Kernel hacking | ||
859 | # | ||
860 | # CONFIG_PRINTK_TIME is not set | ||
861 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
862 | CONFIG_ENABLE_MUST_CHECK=y | ||
863 | CONFIG_FRAME_WARN=1024 | ||
864 | # CONFIG_MAGIC_SYSRQ is not set | ||
865 | # CONFIG_UNUSED_SYMBOLS is not set | ||
866 | # CONFIG_DEBUG_FS is not set | ||
867 | # CONFIG_HEADERS_CHECK is not set | ||
868 | CONFIG_DEBUG_KERNEL=y | ||
869 | # CONFIG_DEBUG_SHIRQ is not set | ||
870 | CONFIG_DETECT_SOFTLOCKUP=y | ||
871 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
872 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
873 | CONFIG_SCHED_DEBUG=y | ||
874 | # CONFIG_SCHEDSTATS is not set | ||
875 | # CONFIG_TIMER_STATS is not set | ||
876 | # CONFIG_DEBUG_OBJECTS is not set | ||
877 | # CONFIG_DEBUG_SLAB is not set | ||
878 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
879 | # CONFIG_RT_MUTEX_TESTER is not set | ||
880 | # CONFIG_DEBUG_SPINLOCK is not set | ||
881 | CONFIG_DEBUG_MUTEXES=y | ||
882 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
883 | # CONFIG_PROVE_LOCKING is not set | ||
884 | # CONFIG_LOCK_STAT is not set | ||
885 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
886 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
887 | # CONFIG_DEBUG_KOBJECT is not set | ||
888 | CONFIG_DEBUG_BUGVERBOSE=y | ||
889 | # CONFIG_DEBUG_INFO is not set | ||
890 | # CONFIG_DEBUG_VM is not set | ||
891 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
892 | CONFIG_DEBUG_MEMORY_INIT=y | ||
893 | # CONFIG_DEBUG_LIST is not set | ||
894 | # CONFIG_DEBUG_SG is not set | ||
895 | CONFIG_FRAME_POINTER=y | ||
896 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
897 | # CONFIG_RCU_TORTURE_TEST is not set | ||
898 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
899 | # CONFIG_FAULT_INJECTION is not set | ||
900 | # CONFIG_LATENCYTOP is not set | ||
901 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
902 | CONFIG_HAVE_FTRACE=y | ||
903 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
904 | # CONFIG_FTRACE is not set | ||
905 | # CONFIG_SCHED_TRACER is not set | ||
906 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
907 | # CONFIG_SAMPLES is not set | ||
908 | CONFIG_HAVE_ARCH_KGDB=y | ||
909 | # CONFIG_KGDB is not set | ||
910 | CONFIG_DEBUG_USER=y | ||
911 | # CONFIG_DEBUG_ERRORS is not set | ||
912 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
913 | # CONFIG_DEBUG_LL is not set | ||
914 | |||
915 | # | ||
916 | # Security options | ||
917 | # | ||
918 | # CONFIG_KEYS is not set | ||
919 | # CONFIG_SECURITY is not set | ||
920 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
921 | # CONFIG_CRYPTO is not set | ||
922 | |||
923 | # | ||
924 | # Library routines | ||
925 | # | ||
926 | CONFIG_BITREVERSE=y | ||
927 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
928 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
929 | # CONFIG_CRC_CCITT is not set | ||
930 | # CONFIG_CRC16 is not set | ||
931 | # CONFIG_CRC_T10DIF is not set | ||
932 | # CONFIG_CRC_ITU_T is not set | ||
933 | CONFIG_CRC32=y | ||
934 | # CONFIG_CRC7 is not set | ||
935 | # CONFIG_LIBCRC32C is not set | ||
936 | CONFIG_ZLIB_INFLATE=y | ||
937 | CONFIG_ZLIB_DEFLATE=y | ||
938 | CONFIG_PLIST=y | ||
939 | CONFIG_HAS_IOMEM=y | ||
940 | CONFIG_HAS_IOPORT=y | ||
941 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/assabet_defconfig b/arch/arm/configs/assabet_defconfig index b1cd331aaecf..c66dd399e426 100644 --- a/arch/arm/configs/assabet_defconfig +++ b/arch/arm/configs/assabet_defconfig | |||
@@ -89,7 +89,6 @@ CONFIG_SA1100_ASSABET=y | |||
89 | # CONFIG_SA1100_COLLIE is not set | 89 | # CONFIG_SA1100_COLLIE is not set |
90 | # CONFIG_SA1100_H3100 is not set | 90 | # CONFIG_SA1100_H3100 is not set |
91 | # CONFIG_SA1100_H3600 is not set | 91 | # CONFIG_SA1100_H3600 is not set |
92 | # CONFIG_SA1100_H3800 is not set | ||
93 | # CONFIG_SA1100_BADGE4 is not set | 92 | # CONFIG_SA1100_BADGE4 is not set |
94 | # CONFIG_SA1100_JORNADA720 is not set | 93 | # CONFIG_SA1100_JORNADA720 is not set |
95 | # CONFIG_SA1100_HACKKIT is not set | 94 | # CONFIG_SA1100_HACKKIT is not set |
diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig index 80222feb7dad..f264846218a2 100644 --- a/arch/arm/configs/badge4_defconfig +++ b/arch/arm/configs/badge4_defconfig | |||
@@ -91,7 +91,6 @@ CONFIG_ARCH_SA1100=y | |||
91 | # CONFIG_SA1100_COLLIE is not set | 91 | # CONFIG_SA1100_COLLIE is not set |
92 | # CONFIG_SA1100_H3100 is not set | 92 | # CONFIG_SA1100_H3100 is not set |
93 | # CONFIG_SA1100_H3600 is not set | 93 | # CONFIG_SA1100_H3600 is not set |
94 | # CONFIG_SA1100_H3800 is not set | ||
95 | CONFIG_SA1100_BADGE4=y | 94 | CONFIG_SA1100_BADGE4=y |
96 | # CONFIG_SA1100_JORNADA720 is not set | 95 | # CONFIG_SA1100_JORNADA720 is not set |
97 | # CONFIG_SA1100_HACKKIT is not set | 96 | # CONFIG_SA1100_HACKKIT is not set |
diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig index ee130b528bd4..2b4c0668b1b4 100644 --- a/arch/arm/configs/cerfcube_defconfig +++ b/arch/arm/configs/cerfcube_defconfig | |||
@@ -93,7 +93,6 @@ CONFIG_SA1100_CERF_FLASH_16MB=y | |||
93 | # CONFIG_SA1100_COLLIE is not set | 93 | # CONFIG_SA1100_COLLIE is not set |
94 | # CONFIG_SA1100_H3100 is not set | 94 | # CONFIG_SA1100_H3100 is not set |
95 | # CONFIG_SA1100_H3600 is not set | 95 | # CONFIG_SA1100_H3600 is not set |
96 | # CONFIG_SA1100_H3800 is not set | ||
97 | # CONFIG_SA1100_BADGE4 is not set | 96 | # CONFIG_SA1100_BADGE4 is not set |
98 | # CONFIG_SA1100_JORNADA720 is not set | 97 | # CONFIG_SA1100_JORNADA720 is not set |
99 | # CONFIG_SA1100_HACKKIT is not set | 98 | # CONFIG_SA1100_HACKKIT is not set |
diff --git a/arch/arm/configs/xm_x2xx_defconfig b/arch/arm/configs/cm_x2xx_defconfig index 1039f366bf8d..797b790cba78 100644 --- a/arch/arm/configs/xm_x2xx_defconfig +++ b/arch/arm/configs/cm_x2xx_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc8 | 3 | # Linux kernel version: 2.6.29-rc2 |
4 | # Sun Oct 5 11:05:36 2008 | 4 | # Sun Feb 1 16:31:36 2009 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
@@ -22,7 +22,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
23 | CONFIG_GENERIC_HWEIGHT=y | 23 | CONFIG_GENERIC_HWEIGHT=y |
24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
25 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
26 | CONFIG_ZONE_DMA=y | 25 | CONFIG_ZONE_DMA=y |
27 | CONFIG_ARCH_MTD_XIP=y | 26 | CONFIG_ARCH_MTD_XIP=y |
28 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 27 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
@@ -47,12 +46,12 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
47 | CONFIG_IKCONFIG=y | 46 | CONFIG_IKCONFIG=y |
48 | CONFIG_IKCONFIG_PROC=y | 47 | CONFIG_IKCONFIG_PROC=y |
49 | CONFIG_LOG_BUF_SHIFT=14 | 48 | CONFIG_LOG_BUF_SHIFT=14 |
50 | # CONFIG_CGROUPS is not set | ||
51 | CONFIG_GROUP_SCHED=y | 49 | CONFIG_GROUP_SCHED=y |
52 | CONFIG_FAIR_GROUP_SCHED=y | 50 | CONFIG_FAIR_GROUP_SCHED=y |
53 | # CONFIG_RT_GROUP_SCHED is not set | 51 | # CONFIG_RT_GROUP_SCHED is not set |
54 | CONFIG_USER_SCHED=y | 52 | CONFIG_USER_SCHED=y |
55 | # CONFIG_CGROUP_SCHED is not set | 53 | # CONFIG_CGROUP_SCHED is not set |
54 | # CONFIG_CGROUPS is not set | ||
56 | CONFIG_SYSFS_DEPRECATED=y | 55 | CONFIG_SYSFS_DEPRECATED=y |
57 | CONFIG_SYSFS_DEPRECATED_V2=y | 56 | CONFIG_SYSFS_DEPRECATED_V2=y |
58 | # CONFIG_RELAY is not set | 57 | # CONFIG_RELAY is not set |
@@ -80,27 +79,21 @@ CONFIG_SIGNALFD=y | |||
80 | CONFIG_TIMERFD=y | 79 | CONFIG_TIMERFD=y |
81 | CONFIG_EVENTFD=y | 80 | CONFIG_EVENTFD=y |
82 | CONFIG_SHMEM=y | 81 | CONFIG_SHMEM=y |
82 | CONFIG_AIO=y | ||
83 | # CONFIG_VM_EVENT_COUNTERS is not set | 83 | # CONFIG_VM_EVENT_COUNTERS is not set |
84 | CONFIG_PCI_QUIRKS=y | ||
84 | # CONFIG_SLUB_DEBUG is not set | 85 | # CONFIG_SLUB_DEBUG is not set |
85 | # CONFIG_SLAB is not set | 86 | # CONFIG_SLAB is not set |
86 | CONFIG_SLUB=y | 87 | CONFIG_SLUB=y |
87 | # CONFIG_SLOB is not set | 88 | # CONFIG_SLOB is not set |
88 | # CONFIG_PROFILING is not set | 89 | # CONFIG_PROFILING is not set |
89 | # CONFIG_MARKERS is not set | ||
90 | CONFIG_HAVE_OPROFILE=y | 90 | CONFIG_HAVE_OPROFILE=y |
91 | # CONFIG_KPROBES is not set | 91 | # CONFIG_KPROBES is not set |
92 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
93 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
94 | CONFIG_HAVE_KPROBES=y | 92 | CONFIG_HAVE_KPROBES=y |
95 | CONFIG_HAVE_KRETPROBES=y | 93 | CONFIG_HAVE_KRETPROBES=y |
96 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
97 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
98 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
99 | CONFIG_HAVE_CLK=y | 94 | CONFIG_HAVE_CLK=y |
100 | # CONFIG_PROC_PAGE_MONITOR is not set | ||
101 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | 95 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
102 | CONFIG_RT_MUTEXES=y | 96 | CONFIG_RT_MUTEXES=y |
103 | # CONFIG_TINY_SHMEM is not set | ||
104 | CONFIG_BASE_SMALL=0 | 97 | CONFIG_BASE_SMALL=0 |
105 | CONFIG_MODULES=y | 98 | CONFIG_MODULES=y |
106 | # CONFIG_MODULE_FORCE_LOAD is not set | 99 | # CONFIG_MODULE_FORCE_LOAD is not set |
@@ -108,11 +101,9 @@ CONFIG_MODULE_UNLOAD=y | |||
108 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 101 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
109 | # CONFIG_MODVERSIONS is not set | 102 | # CONFIG_MODVERSIONS is not set |
110 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 103 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
111 | CONFIG_KMOD=y | ||
112 | CONFIG_BLOCK=y | 104 | CONFIG_BLOCK=y |
113 | # CONFIG_LBD is not set | 105 | # CONFIG_LBD is not set |
114 | # CONFIG_BLK_DEV_IO_TRACE is not set | 106 | # CONFIG_BLK_DEV_IO_TRACE is not set |
115 | # CONFIG_LSF is not set | ||
116 | # CONFIG_BLK_DEV_BSG is not set | 107 | # CONFIG_BLK_DEV_BSG is not set |
117 | # CONFIG_BLK_DEV_INTEGRITY is not set | 108 | # CONFIG_BLK_DEV_INTEGRITY is not set |
118 | 109 | ||
@@ -129,6 +120,11 @@ CONFIG_DEFAULT_CFQ=y | |||
129 | # CONFIG_DEFAULT_NOOP is not set | 120 | # CONFIG_DEFAULT_NOOP is not set |
130 | CONFIG_DEFAULT_IOSCHED="cfq" | 121 | CONFIG_DEFAULT_IOSCHED="cfq" |
131 | CONFIG_CLASSIC_RCU=y | 122 | CONFIG_CLASSIC_RCU=y |
123 | # CONFIG_TREE_RCU is not set | ||
124 | # CONFIG_PREEMPT_RCU is not set | ||
125 | # CONFIG_TREE_RCU_TRACE is not set | ||
126 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
127 | CONFIG_FREEZER=y | ||
132 | 128 | ||
133 | # | 129 | # |
134 | # System Type | 130 | # System Type |
@@ -138,7 +134,6 @@ CONFIG_CLASSIC_RCU=y | |||
138 | # CONFIG_ARCH_REALVIEW is not set | 134 | # CONFIG_ARCH_REALVIEW is not set |
139 | # CONFIG_ARCH_VERSATILE is not set | 135 | # CONFIG_ARCH_VERSATILE is not set |
140 | # CONFIG_ARCH_AT91 is not set | 136 | # CONFIG_ARCH_AT91 is not set |
141 | # CONFIG_ARCH_CLPS7500 is not set | ||
142 | # CONFIG_ARCH_CLPS711X is not set | 137 | # CONFIG_ARCH_CLPS711X is not set |
143 | # CONFIG_ARCH_EBSA110 is not set | 138 | # CONFIG_ARCH_EBSA110 is not set |
144 | # CONFIG_ARCH_EP93XX is not set | 139 | # CONFIG_ARCH_EP93XX is not set |
@@ -165,17 +160,19 @@ CONFIG_ARCH_PXA=y | |||
165 | # CONFIG_ARCH_RPC is not set | 160 | # CONFIG_ARCH_RPC is not set |
166 | # CONFIG_ARCH_SA1100 is not set | 161 | # CONFIG_ARCH_SA1100 is not set |
167 | # CONFIG_ARCH_S3C2410 is not set | 162 | # CONFIG_ARCH_S3C2410 is not set |
163 | # CONFIG_ARCH_S3C64XX is not set | ||
168 | # CONFIG_ARCH_SHARK is not set | 164 | # CONFIG_ARCH_SHARK is not set |
169 | # CONFIG_ARCH_LH7A40X is not set | 165 | # CONFIG_ARCH_LH7A40X is not set |
170 | # CONFIG_ARCH_DAVINCI is not set | 166 | # CONFIG_ARCH_DAVINCI is not set |
171 | # CONFIG_ARCH_OMAP is not set | 167 | # CONFIG_ARCH_OMAP is not set |
172 | # CONFIG_ARCH_MSM7X00A is not set | 168 | # CONFIG_ARCH_MSM is not set |
173 | CONFIG_DMABOUNCE=y | 169 | # CONFIG_ARCH_W90X900 is not set |
174 | 170 | ||
175 | # | 171 | # |
176 | # Intel PXA2xx/PXA3xx Implementations | 172 | # Intel PXA2xx/PXA3xx Implementations |
177 | # | 173 | # |
178 | # CONFIG_ARCH_GUMSTIX is not set | 174 | # CONFIG_ARCH_GUMSTIX is not set |
175 | # CONFIG_MACH_INTELMOTE2 is not set | ||
179 | # CONFIG_ARCH_LUBBOCK is not set | 176 | # CONFIG_ARCH_LUBBOCK is not set |
180 | # CONFIG_MACH_LOGICPD_PXA270 is not set | 177 | # CONFIG_MACH_LOGICPD_PXA270 is not set |
181 | # CONFIG_MACH_MAINSTONE is not set | 178 | # CONFIG_MACH_MAINSTONE is not set |
@@ -185,7 +182,9 @@ CONFIG_DMABOUNCE=y | |||
185 | # CONFIG_ARCH_VIPER is not set | 182 | # CONFIG_ARCH_VIPER is not set |
186 | # CONFIG_ARCH_PXA_ESERIES is not set | 183 | # CONFIG_ARCH_PXA_ESERIES is not set |
187 | # CONFIG_TRIZEPS_PXA is not set | 184 | # CONFIG_TRIZEPS_PXA is not set |
188 | CONFIG_MACH_EM_X270=y | 185 | # CONFIG_MACH_H5000 is not set |
186 | # CONFIG_MACH_EM_X270 is not set | ||
187 | # CONFIG_MACH_EXEDA is not set | ||
189 | # CONFIG_MACH_COLIBRI is not set | 188 | # CONFIG_MACH_COLIBRI is not set |
190 | # CONFIG_MACH_ZYLONITE is not set | 189 | # CONFIG_MACH_ZYLONITE is not set |
191 | # CONFIG_MACH_LITTLETON is not set | 190 | # CONFIG_MACH_LITTLETON is not set |
@@ -204,14 +203,6 @@ CONFIG_PXA_SSP=y | |||
204 | # CONFIG_PXA_PWM is not set | 203 | # CONFIG_PXA_PWM is not set |
205 | 204 | ||
206 | # | 205 | # |
207 | # Boot options | ||
208 | # | ||
209 | |||
210 | # | ||
211 | # Power management | ||
212 | # | ||
213 | |||
214 | # | ||
215 | # Processor Type | 206 | # Processor Type |
216 | # | 207 | # |
217 | CONFIG_CPU_32=y | 208 | CONFIG_CPU_32=y |
@@ -232,6 +223,8 @@ CONFIG_ARM_THUMB=y | |||
232 | # CONFIG_OUTER_CACHE is not set | 223 | # CONFIG_OUTER_CACHE is not set |
233 | CONFIG_IWMMXT=y | 224 | CONFIG_IWMMXT=y |
234 | CONFIG_XSCALE_PMU=y | 225 | CONFIG_XSCALE_PMU=y |
226 | CONFIG_DMABOUNCE=y | ||
227 | CONFIG_COMMON_CLKDEV=y | ||
235 | 228 | ||
236 | # | 229 | # |
237 | # Bus support | 230 | # Bus support |
@@ -242,6 +235,7 @@ CONFIG_PCI_HOST_ITE8152=y | |||
242 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
243 | CONFIG_PCI_LEGACY=y | 236 | CONFIG_PCI_LEGACY=y |
244 | # CONFIG_PCI_DEBUG is not set | 237 | # CONFIG_PCI_DEBUG is not set |
238 | # CONFIG_PCI_STUB is not set | ||
245 | CONFIG_PCCARD=m | 239 | CONFIG_PCCARD=m |
246 | # CONFIG_PCMCIA_DEBUG is not set | 240 | # CONFIG_PCMCIA_DEBUG is not set |
247 | CONFIG_PCMCIA=m | 241 | CONFIG_PCMCIA=m |
@@ -287,14 +281,13 @@ CONFIG_FLATMEM_MANUAL=y | |||
287 | # CONFIG_SPARSEMEM_MANUAL is not set | 281 | # CONFIG_SPARSEMEM_MANUAL is not set |
288 | CONFIG_FLATMEM=y | 282 | CONFIG_FLATMEM=y |
289 | CONFIG_FLAT_NODE_MEM_MAP=y | 283 | CONFIG_FLAT_NODE_MEM_MAP=y |
290 | # CONFIG_SPARSEMEM_STATIC is not set | ||
291 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
292 | CONFIG_PAGEFLAGS_EXTENDED=y | 284 | CONFIG_PAGEFLAGS_EXTENDED=y |
293 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 285 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
294 | # CONFIG_RESOURCES_64BIT is not set | 286 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
295 | CONFIG_ZONE_DMA_FLAG=1 | 287 | CONFIG_ZONE_DMA_FLAG=1 |
296 | CONFIG_BOUNCE=y | 288 | CONFIG_BOUNCE=y |
297 | CONFIG_VIRT_TO_BUS=y | 289 | CONFIG_VIRT_TO_BUS=y |
290 | CONFIG_UNEVICTABLE_LRU=y | ||
298 | CONFIG_ALIGNMENT_TRAP=y | 291 | CONFIG_ALIGNMENT_TRAP=y |
299 | 292 | ||
300 | # | 293 | # |
@@ -327,6 +320,8 @@ CONFIG_FPE_NWFPE=y | |||
327 | # Userspace binary formats | 320 | # Userspace binary formats |
328 | # | 321 | # |
329 | CONFIG_BINFMT_ELF=y | 322 | CONFIG_BINFMT_ELF=y |
323 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
324 | CONFIG_HAVE_AOUT=y | ||
330 | # CONFIG_BINFMT_AOUT is not set | 325 | # CONFIG_BINFMT_AOUT is not set |
331 | # CONFIG_BINFMT_MISC is not set | 326 | # CONFIG_BINFMT_MISC is not set |
332 | 327 | ||
@@ -345,6 +340,7 @@ CONFIG_NET=y | |||
345 | # | 340 | # |
346 | # Networking options | 341 | # Networking options |
347 | # | 342 | # |
343 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
348 | CONFIG_PACKET=y | 344 | CONFIG_PACKET=y |
349 | CONFIG_PACKET_MMAP=y | 345 | CONFIG_PACKET_MMAP=y |
350 | CONFIG_UNIX=y | 346 | CONFIG_UNIX=y |
@@ -389,6 +385,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
389 | # CONFIG_TIPC is not set | 385 | # CONFIG_TIPC is not set |
390 | # CONFIG_ATM is not set | 386 | # CONFIG_ATM is not set |
391 | # CONFIG_BRIDGE is not set | 387 | # CONFIG_BRIDGE is not set |
388 | # CONFIG_NET_DSA is not set | ||
392 | # CONFIG_VLAN_8021Q is not set | 389 | # CONFIG_VLAN_8021Q is not set |
393 | # CONFIG_DECNET is not set | 390 | # CONFIG_DECNET is not set |
394 | # CONFIG_LLC2 is not set | 391 | # CONFIG_LLC2 is not set |
@@ -399,6 +396,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
399 | # CONFIG_ECONET is not set | 396 | # CONFIG_ECONET is not set |
400 | # CONFIG_WAN_ROUTER is not set | 397 | # CONFIG_WAN_ROUTER is not set |
401 | # CONFIG_NET_SCHED is not set | 398 | # CONFIG_NET_SCHED is not set |
399 | # CONFIG_DCB is not set | ||
402 | 400 | ||
403 | # | 401 | # |
404 | # Network testing | 402 | # Network testing |
@@ -420,8 +418,6 @@ CONFIG_BT_HIDP=m | |||
420 | # | 418 | # |
421 | # Bluetooth device drivers | 419 | # Bluetooth device drivers |
422 | # | 420 | # |
423 | CONFIG_BT_HCIUSB=m | ||
424 | CONFIG_BT_HCIUSB_SCO=y | ||
425 | # CONFIG_BT_HCIBTUSB is not set | 421 | # CONFIG_BT_HCIBTUSB is not set |
426 | # CONFIG_BT_HCIBTSDIO is not set | 422 | # CONFIG_BT_HCIBTSDIO is not set |
427 | # CONFIG_BT_HCIUART is not set | 423 | # CONFIG_BT_HCIUART is not set |
@@ -434,15 +430,15 @@ CONFIG_BT_HCIUSB_SCO=y | |||
434 | # CONFIG_BT_HCIBTUART is not set | 430 | # CONFIG_BT_HCIBTUART is not set |
435 | # CONFIG_BT_HCIVHCI is not set | 431 | # CONFIG_BT_HCIVHCI is not set |
436 | # CONFIG_AF_RXRPC is not set | 432 | # CONFIG_AF_RXRPC is not set |
437 | 433 | # CONFIG_PHONET is not set | |
438 | # | 434 | CONFIG_WIRELESS=y |
439 | # Wireless | ||
440 | # | ||
441 | # CONFIG_CFG80211 is not set | 435 | # CONFIG_CFG80211 is not set |
436 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
442 | CONFIG_WIRELESS_EXT=y | 437 | CONFIG_WIRELESS_EXT=y |
443 | CONFIG_WIRELESS_EXT_SYSFS=y | 438 | CONFIG_WIRELESS_EXT_SYSFS=y |
439 | CONFIG_LIB80211=m | ||
444 | # CONFIG_MAC80211 is not set | 440 | # CONFIG_MAC80211 is not set |
445 | # CONFIG_IEEE80211 is not set | 441 | # CONFIG_WIMAX is not set |
446 | # CONFIG_RFKILL is not set | 442 | # CONFIG_RFKILL is not set |
447 | # CONFIG_NET_9P is not set | 443 | # CONFIG_NET_9P is not set |
448 | 444 | ||
@@ -467,6 +463,7 @@ CONFIG_MTD=y | |||
467 | # CONFIG_MTD_DEBUG is not set | 463 | # CONFIG_MTD_DEBUG is not set |
468 | # CONFIG_MTD_CONCAT is not set | 464 | # CONFIG_MTD_CONCAT is not set |
469 | CONFIG_MTD_PARTITIONS=y | 465 | CONFIG_MTD_PARTITIONS=y |
466 | # CONFIG_MTD_TESTS is not set | ||
470 | # CONFIG_MTD_REDBOOT_PARTS is not set | 467 | # CONFIG_MTD_REDBOOT_PARTS is not set |
471 | CONFIG_MTD_CMDLINE_PARTS=y | 468 | CONFIG_MTD_CMDLINE_PARTS=y |
472 | # CONFIG_MTD_AFS_PARTS is not set | 469 | # CONFIG_MTD_AFS_PARTS is not set |
@@ -521,9 +518,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
521 | # | 518 | # |
522 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 519 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
523 | CONFIG_MTD_PHYSMAP=y | 520 | CONFIG_MTD_PHYSMAP=y |
524 | CONFIG_MTD_PHYSMAP_START=0x0 | 521 | # CONFIG_MTD_PHYSMAP_COMPAT is not set |
525 | CONFIG_MTD_PHYSMAP_LEN=0x400000 | ||
526 | CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | ||
527 | CONFIG_MTD_PXA2XX=y | 522 | CONFIG_MTD_PXA2XX=y |
528 | # CONFIG_MTD_ARM_INTEGRATOR is not set | 523 | # CONFIG_MTD_ARM_INTEGRATOR is not set |
529 | # CONFIG_MTD_IMPA7 is not set | 524 | # CONFIG_MTD_IMPA7 is not set |
@@ -535,6 +530,8 @@ CONFIG_MTD_PXA2XX=y | |||
535 | # Self-contained MTD device drivers | 530 | # Self-contained MTD device drivers |
536 | # | 531 | # |
537 | # CONFIG_MTD_PMC551 is not set | 532 | # CONFIG_MTD_PMC551 is not set |
533 | # CONFIG_MTD_DATAFLASH is not set | ||
534 | # CONFIG_MTD_M25P80 is not set | ||
538 | # CONFIG_MTD_SLRAM is not set | 535 | # CONFIG_MTD_SLRAM is not set |
539 | # CONFIG_MTD_PHRAM is not set | 536 | # CONFIG_MTD_PHRAM is not set |
540 | # CONFIG_MTD_MTDRAM is not set | 537 | # CONFIG_MTD_MTDRAM is not set |
@@ -563,6 +560,12 @@ CONFIG_MTD_NAND_PLATFORM=y | |||
563 | # CONFIG_MTD_ONENAND is not set | 560 | # CONFIG_MTD_ONENAND is not set |
564 | 561 | ||
565 | # | 562 | # |
563 | # LPDDR flash memory drivers | ||
564 | # | ||
565 | # CONFIG_MTD_LPDDR is not set | ||
566 | # CONFIG_MTD_QINFO_PROBE is not set | ||
567 | |||
568 | # | ||
566 | # UBI - Unsorted block images | 569 | # UBI - Unsorted block images |
567 | # | 570 | # |
568 | # CONFIG_MTD_UBI is not set | 571 | # CONFIG_MTD_UBI is not set |
@@ -642,6 +645,8 @@ CONFIG_SCSI_LOWLEVEL=y | |||
642 | # CONFIG_MEGARAID_LEGACY is not set | 645 | # CONFIG_MEGARAID_LEGACY is not set |
643 | # CONFIG_MEGARAID_SAS is not set | 646 | # CONFIG_MEGARAID_SAS is not set |
644 | # CONFIG_SCSI_HPTIOP is not set | 647 | # CONFIG_SCSI_HPTIOP is not set |
648 | # CONFIG_LIBFC is not set | ||
649 | # CONFIG_FCOE is not set | ||
645 | # CONFIG_SCSI_DMX3191D is not set | 650 | # CONFIG_SCSI_DMX3191D is not set |
646 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 651 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
647 | # CONFIG_SCSI_IPS is not set | 652 | # CONFIG_SCSI_IPS is not set |
@@ -756,26 +761,30 @@ CONFIG_MII=y | |||
756 | CONFIG_DM9000=y | 761 | CONFIG_DM9000=y |
757 | CONFIG_DM9000_DEBUGLEVEL=1 | 762 | CONFIG_DM9000_DEBUGLEVEL=1 |
758 | # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set | 763 | # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set |
764 | # CONFIG_ENC28J60 is not set | ||
759 | # CONFIG_SMC911X is not set | 765 | # CONFIG_SMC911X is not set |
766 | # CONFIG_SMSC911X is not set | ||
760 | # CONFIG_NET_TULIP is not set | 767 | # CONFIG_NET_TULIP is not set |
761 | # CONFIG_HP100 is not set | 768 | # CONFIG_HP100 is not set |
762 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 769 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
763 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 770 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
764 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 771 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
765 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 772 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
773 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
774 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
775 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
766 | CONFIG_NET_PCI=y | 776 | CONFIG_NET_PCI=y |
767 | # CONFIG_PCNET32 is not set | 777 | # CONFIG_PCNET32 is not set |
768 | # CONFIG_AMD8111_ETH is not set | 778 | # CONFIG_AMD8111_ETH is not set |
769 | # CONFIG_ADAPTEC_STARFIRE is not set | 779 | # CONFIG_ADAPTEC_STARFIRE is not set |
770 | # CONFIG_B44 is not set | 780 | # CONFIG_B44 is not set |
771 | # CONFIG_FORCEDETH is not set | 781 | # CONFIG_FORCEDETH is not set |
772 | # CONFIG_EEPRO100 is not set | ||
773 | # CONFIG_E100 is not set | 782 | # CONFIG_E100 is not set |
774 | # CONFIG_FEALNX is not set | 783 | # CONFIG_FEALNX is not set |
775 | # CONFIG_NATSEMI is not set | 784 | # CONFIG_NATSEMI is not set |
776 | # CONFIG_NE2K_PCI is not set | 785 | # CONFIG_NE2K_PCI is not set |
777 | # CONFIG_8139CP is not set | 786 | # CONFIG_8139CP is not set |
778 | CONFIG_8139TOO=y | 787 | CONFIG_8139TOO=m |
779 | # CONFIG_8139TOO_PIO is not set | 788 | # CONFIG_8139TOO_PIO is not set |
780 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 789 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
781 | # CONFIG_8139TOO_8129 is not set | 790 | # CONFIG_8139TOO_8129 is not set |
@@ -783,10 +792,12 @@ CONFIG_8139TOO=y | |||
783 | # CONFIG_R6040 is not set | 792 | # CONFIG_R6040 is not set |
784 | # CONFIG_SIS900 is not set | 793 | # CONFIG_SIS900 is not set |
785 | # CONFIG_EPIC100 is not set | 794 | # CONFIG_EPIC100 is not set |
795 | # CONFIG_SMSC9420 is not set | ||
786 | # CONFIG_SUNDANCE is not set | 796 | # CONFIG_SUNDANCE is not set |
787 | # CONFIG_TLAN is not set | 797 | # CONFIG_TLAN is not set |
788 | # CONFIG_VIA_RHINE is not set | 798 | # CONFIG_VIA_RHINE is not set |
789 | # CONFIG_SC92031 is not set | 799 | # CONFIG_SC92031 is not set |
800 | # CONFIG_ATL2 is not set | ||
790 | # CONFIG_NETDEV_1000 is not set | 801 | # CONFIG_NETDEV_1000 is not set |
791 | # CONFIG_NETDEV_10000 is not set | 802 | # CONFIG_NETDEV_10000 is not set |
792 | # CONFIG_TR is not set | 803 | # CONFIG_TR is not set |
@@ -797,8 +808,6 @@ CONFIG_8139TOO=y | |||
797 | # CONFIG_WLAN_PRE80211 is not set | 808 | # CONFIG_WLAN_PRE80211 is not set |
798 | CONFIG_WLAN_80211=y | 809 | CONFIG_WLAN_80211=y |
799 | # CONFIG_PCMCIA_RAYCS is not set | 810 | # CONFIG_PCMCIA_RAYCS is not set |
800 | # CONFIG_IPW2100 is not set | ||
801 | # CONFIG_IPW2200 is not set | ||
802 | CONFIG_LIBERTAS=m | 811 | CONFIG_LIBERTAS=m |
803 | # CONFIG_LIBERTAS_USB is not set | 812 | # CONFIG_LIBERTAS_USB is not set |
804 | # CONFIG_LIBERTAS_CS is not set | 813 | # CONFIG_LIBERTAS_CS is not set |
@@ -811,10 +820,16 @@ CONFIG_LIBERTAS_SDIO=m | |||
811 | # CONFIG_PRISM54 is not set | 820 | # CONFIG_PRISM54 is not set |
812 | # CONFIG_USB_ZD1201 is not set | 821 | # CONFIG_USB_ZD1201 is not set |
813 | # CONFIG_USB_NET_RNDIS_WLAN is not set | 822 | # CONFIG_USB_NET_RNDIS_WLAN is not set |
823 | # CONFIG_IPW2100 is not set | ||
824 | # CONFIG_IPW2200 is not set | ||
814 | # CONFIG_IWLWIFI_LEDS is not set | 825 | # CONFIG_IWLWIFI_LEDS is not set |
815 | # CONFIG_HOSTAP is not set | 826 | # CONFIG_HOSTAP is not set |
816 | 827 | ||
817 | # | 828 | # |
829 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
830 | # | ||
831 | |||
832 | # | ||
818 | # USB Network Adapters | 833 | # USB Network Adapters |
819 | # | 834 | # |
820 | # CONFIG_USB_CATC is not set | 835 | # CONFIG_USB_CATC is not set |
@@ -879,22 +894,22 @@ CONFIG_KEYBOARD_PXA27x=m | |||
879 | # CONFIG_INPUT_JOYSTICK is not set | 894 | # CONFIG_INPUT_JOYSTICK is not set |
880 | # CONFIG_INPUT_TABLET is not set | 895 | # CONFIG_INPUT_TABLET is not set |
881 | CONFIG_INPUT_TOUCHSCREEN=y | 896 | CONFIG_INPUT_TOUCHSCREEN=y |
897 | # CONFIG_TOUCHSCREEN_ADS7846 is not set | ||
882 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | 898 | # CONFIG_TOUCHSCREEN_FUJITSU is not set |
883 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 899 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
884 | # CONFIG_TOUCHSCREEN_ELO is not set | 900 | # CONFIG_TOUCHSCREEN_ELO is not set |
901 | # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set | ||
885 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 902 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
886 | # CONFIG_TOUCHSCREEN_INEXIO is not set | 903 | # CONFIG_TOUCHSCREEN_INEXIO is not set |
887 | # CONFIG_TOUCHSCREEN_MK712 is not set | 904 | # CONFIG_TOUCHSCREEN_MK712 is not set |
888 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | 905 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set |
889 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | 906 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set |
890 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | 907 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
891 | CONFIG_TOUCHSCREEN_WM97XX=m | 908 | CONFIG_TOUCHSCREEN_UCB1400=m |
892 | # CONFIG_TOUCHSCREEN_WM9705 is not set | 909 | # CONFIG_TOUCHSCREEN_WM97XX is not set |
893 | CONFIG_TOUCHSCREEN_WM9712=y | ||
894 | # CONFIG_TOUCHSCREEN_WM9713 is not set | ||
895 | # CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set | ||
896 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | 910 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set |
897 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | 911 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set |
912 | # CONFIG_TOUCHSCREEN_TSC2007 is not set | ||
898 | # CONFIG_INPUT_MISC is not set | 913 | # CONFIG_INPUT_MISC is not set |
899 | 914 | ||
900 | # | 915 | # |
@@ -933,6 +948,7 @@ CONFIG_SERIAL_CORE=y | |||
933 | CONFIG_SERIAL_CORE_CONSOLE=y | 948 | CONFIG_SERIAL_CORE_CONSOLE=y |
934 | # CONFIG_SERIAL_JSM is not set | 949 | # CONFIG_SERIAL_JSM is not set |
935 | CONFIG_UNIX98_PTYS=y | 950 | CONFIG_UNIX98_PTYS=y |
951 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
936 | CONFIG_LEGACY_PTYS=y | 952 | CONFIG_LEGACY_PTYS=y |
937 | CONFIG_LEGACY_PTY_COUNT=16 | 953 | CONFIG_LEGACY_PTY_COUNT=16 |
938 | # CONFIG_IPMI_HANDLER is not set | 954 | # CONFIG_IPMI_HANDLER is not set |
@@ -1009,26 +1025,45 @@ CONFIG_I2C_PXA=y | |||
1009 | # Miscellaneous I2C Chip support | 1025 | # Miscellaneous I2C Chip support |
1010 | # | 1026 | # |
1011 | # CONFIG_DS1682 is not set | 1027 | # CONFIG_DS1682 is not set |
1012 | # CONFIG_EEPROM_AT24 is not set | 1028 | # CONFIG_AT24 is not set |
1013 | # CONFIG_EEPROM_LEGACY is not set | 1029 | # CONFIG_SENSORS_EEPROM is not set |
1014 | # CONFIG_SENSORS_PCF8574 is not set | 1030 | # CONFIG_SENSORS_PCF8574 is not set |
1015 | # CONFIG_PCF8575 is not set | 1031 | # CONFIG_PCF8575 is not set |
1016 | # CONFIG_SENSORS_PCA9539 is not set | 1032 | # CONFIG_SENSORS_PCA9539 is not set |
1017 | # CONFIG_SENSORS_PCF8591 is not set | 1033 | # CONFIG_SENSORS_PCF8591 is not set |
1018 | # CONFIG_TPS65010 is not set | ||
1019 | # CONFIG_SENSORS_MAX6875 is not set | 1034 | # CONFIG_SENSORS_MAX6875 is not set |
1020 | # CONFIG_SENSORS_TSL2550 is not set | 1035 | # CONFIG_SENSORS_TSL2550 is not set |
1021 | # CONFIG_I2C_DEBUG_CORE is not set | 1036 | # CONFIG_I2C_DEBUG_CORE is not set |
1022 | # CONFIG_I2C_DEBUG_ALGO is not set | 1037 | # CONFIG_I2C_DEBUG_ALGO is not set |
1023 | # CONFIG_I2C_DEBUG_BUS is not set | 1038 | # CONFIG_I2C_DEBUG_BUS is not set |
1024 | # CONFIG_I2C_DEBUG_CHIP is not set | 1039 | # CONFIG_I2C_DEBUG_CHIP is not set |
1025 | # CONFIG_SPI is not set | 1040 | CONFIG_SPI=y |
1041 | # CONFIG_SPI_DEBUG is not set | ||
1042 | CONFIG_SPI_MASTER=y | ||
1043 | |||
1044 | # | ||
1045 | # SPI Master Controller Drivers | ||
1046 | # | ||
1047 | # CONFIG_SPI_BITBANG is not set | ||
1048 | # CONFIG_SPI_GPIO is not set | ||
1049 | CONFIG_SPI_PXA2XX=m | ||
1050 | |||
1051 | # | ||
1052 | # SPI Protocol Masters | ||
1053 | # | ||
1054 | # CONFIG_SPI_AT25 is not set | ||
1055 | # CONFIG_SPI_SPIDEV is not set | ||
1056 | # CONFIG_SPI_TLE62X0 is not set | ||
1026 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 1057 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |
1027 | CONFIG_GPIOLIB=y | 1058 | CONFIG_GPIOLIB=y |
1028 | # CONFIG_DEBUG_GPIO is not set | 1059 | # CONFIG_DEBUG_GPIO is not set |
1029 | # CONFIG_GPIO_SYSFS is not set | 1060 | # CONFIG_GPIO_SYSFS is not set |
1030 | 1061 | ||
1031 | # | 1062 | # |
1063 | # Memory mapped GPIO expanders: | ||
1064 | # | ||
1065 | |||
1066 | # | ||
1032 | # I2C GPIO expanders: | 1067 | # I2C GPIO expanders: |
1033 | # | 1068 | # |
1034 | # CONFIG_GPIO_MAX732X is not set | 1069 | # CONFIG_GPIO_MAX732X is not set |
@@ -1043,17 +1078,19 @@ CONFIG_GPIOLIB=y | |||
1043 | # | 1078 | # |
1044 | # SPI GPIO expanders: | 1079 | # SPI GPIO expanders: |
1045 | # | 1080 | # |
1081 | # CONFIG_GPIO_MAX7301 is not set | ||
1082 | # CONFIG_GPIO_MCP23S08 is not set | ||
1046 | # CONFIG_W1 is not set | 1083 | # CONFIG_W1 is not set |
1047 | # CONFIG_POWER_SUPPLY is not set | 1084 | # CONFIG_POWER_SUPPLY is not set |
1048 | # CONFIG_HWMON is not set | 1085 | # CONFIG_HWMON is not set |
1049 | # CONFIG_THERMAL is not set | 1086 | # CONFIG_THERMAL is not set |
1050 | # CONFIG_THERMAL_HWMON is not set | 1087 | # CONFIG_THERMAL_HWMON is not set |
1051 | # CONFIG_WATCHDOG is not set | 1088 | # CONFIG_WATCHDOG is not set |
1089 | CONFIG_SSB_POSSIBLE=y | ||
1052 | 1090 | ||
1053 | # | 1091 | # |
1054 | # Sonics Silicon Backplane | 1092 | # Sonics Silicon Backplane |
1055 | # | 1093 | # |
1056 | CONFIG_SSB_POSSIBLE=y | ||
1057 | # CONFIG_SSB is not set | 1094 | # CONFIG_SSB is not set |
1058 | 1095 | ||
1059 | # | 1096 | # |
@@ -1064,11 +1101,17 @@ CONFIG_SSB_POSSIBLE=y | |||
1064 | # CONFIG_MFD_ASIC3 is not set | 1101 | # CONFIG_MFD_ASIC3 is not set |
1065 | # CONFIG_HTC_EGPIO is not set | 1102 | # CONFIG_HTC_EGPIO is not set |
1066 | # CONFIG_HTC_PASIC3 is not set | 1103 | # CONFIG_HTC_PASIC3 is not set |
1067 | # CONFIG_UCB1400_CORE is not set | 1104 | CONFIG_UCB1400_CORE=m |
1105 | # CONFIG_TPS65010 is not set | ||
1106 | # CONFIG_TWL4030_CORE is not set | ||
1068 | # CONFIG_MFD_TMIO is not set | 1107 | # CONFIG_MFD_TMIO is not set |
1069 | # CONFIG_MFD_T7L66XB is not set | 1108 | # CONFIG_MFD_T7L66XB is not set |
1070 | # CONFIG_MFD_TC6387XB is not set | 1109 | # CONFIG_MFD_TC6387XB is not set |
1071 | # CONFIG_MFD_TC6393XB is not set | 1110 | # CONFIG_MFD_TC6393XB is not set |
1111 | # CONFIG_PMIC_DA903X is not set | ||
1112 | # CONFIG_MFD_WM8400 is not set | ||
1113 | # CONFIG_MFD_WM8350_I2C is not set | ||
1114 | # CONFIG_MFD_PCF50633 is not set | ||
1072 | 1115 | ||
1073 | # | 1116 | # |
1074 | # Multimedia devices | 1117 | # Multimedia devices |
@@ -1077,13 +1120,117 @@ CONFIG_SSB_POSSIBLE=y | |||
1077 | # | 1120 | # |
1078 | # Multimedia core support | 1121 | # Multimedia core support |
1079 | # | 1122 | # |
1080 | # CONFIG_VIDEO_DEV is not set | 1123 | CONFIG_VIDEO_DEV=m |
1124 | CONFIG_VIDEO_V4L2_COMMON=m | ||
1125 | # CONFIG_VIDEO_ALLOW_V4L1 is not set | ||
1126 | CONFIG_VIDEO_V4L1_COMPAT=y | ||
1081 | # CONFIG_DVB_CORE is not set | 1127 | # CONFIG_DVB_CORE is not set |
1082 | # CONFIG_VIDEO_MEDIA is not set | 1128 | CONFIG_VIDEO_MEDIA=m |
1083 | 1129 | ||
1084 | # | 1130 | # |
1085 | # Multimedia drivers | 1131 | # Multimedia drivers |
1086 | # | 1132 | # |
1133 | # CONFIG_MEDIA_ATTACH is not set | ||
1134 | CONFIG_MEDIA_TUNER=m | ||
1135 | CONFIG_MEDIA_TUNER_CUSTOMIZE=y | ||
1136 | # CONFIG_MEDIA_TUNER_SIMPLE is not set | ||
1137 | # CONFIG_MEDIA_TUNER_TDA8290 is not set | ||
1138 | # CONFIG_MEDIA_TUNER_TDA827X is not set | ||
1139 | # CONFIG_MEDIA_TUNER_TDA18271 is not set | ||
1140 | # CONFIG_MEDIA_TUNER_TDA9887 is not set | ||
1141 | # CONFIG_MEDIA_TUNER_TEA5761 is not set | ||
1142 | # CONFIG_MEDIA_TUNER_TEA5767 is not set | ||
1143 | # CONFIG_MEDIA_TUNER_MT20XX is not set | ||
1144 | # CONFIG_MEDIA_TUNER_MT2060 is not set | ||
1145 | # CONFIG_MEDIA_TUNER_MT2266 is not set | ||
1146 | # CONFIG_MEDIA_TUNER_MT2131 is not set | ||
1147 | # CONFIG_MEDIA_TUNER_QT1010 is not set | ||
1148 | # CONFIG_MEDIA_TUNER_XC2028 is not set | ||
1149 | # CONFIG_MEDIA_TUNER_XC5000 is not set | ||
1150 | # CONFIG_MEDIA_TUNER_MXL5005S is not set | ||
1151 | # CONFIG_MEDIA_TUNER_MXL5007T is not set | ||
1152 | CONFIG_VIDEO_V4L2=m | ||
1153 | CONFIG_VIDEOBUF_GEN=m | ||
1154 | CONFIG_VIDEOBUF_DMA_SG=m | ||
1155 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | ||
1156 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
1157 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
1158 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set | ||
1159 | |||
1160 | # | ||
1161 | # Encoders/decoders and other helper chips | ||
1162 | # | ||
1163 | |||
1164 | # | ||
1165 | # Audio decoders | ||
1166 | # | ||
1167 | # CONFIG_VIDEO_TVAUDIO is not set | ||
1168 | # CONFIG_VIDEO_TDA7432 is not set | ||
1169 | # CONFIG_VIDEO_TDA9840 is not set | ||
1170 | # CONFIG_VIDEO_TDA9875 is not set | ||
1171 | # CONFIG_VIDEO_TEA6415C is not set | ||
1172 | # CONFIG_VIDEO_TEA6420 is not set | ||
1173 | # CONFIG_VIDEO_MSP3400 is not set | ||
1174 | # CONFIG_VIDEO_CS5345 is not set | ||
1175 | # CONFIG_VIDEO_CS53L32A is not set | ||
1176 | # CONFIG_VIDEO_M52790 is not set | ||
1177 | # CONFIG_VIDEO_TLV320AIC23B is not set | ||
1178 | # CONFIG_VIDEO_WM8775 is not set | ||
1179 | # CONFIG_VIDEO_WM8739 is not set | ||
1180 | # CONFIG_VIDEO_VP27SMPX is not set | ||
1181 | |||
1182 | # | ||
1183 | # Video decoders | ||
1184 | # | ||
1185 | # CONFIG_VIDEO_OV7670 is not set | ||
1186 | # CONFIG_VIDEO_TCM825X is not set | ||
1187 | # CONFIG_VIDEO_SAA711X is not set | ||
1188 | # CONFIG_VIDEO_SAA717X is not set | ||
1189 | # CONFIG_VIDEO_TVP514X is not set | ||
1190 | # CONFIG_VIDEO_TVP5150 is not set | ||
1191 | |||
1192 | # | ||
1193 | # Video and audio decoders | ||
1194 | # | ||
1195 | # CONFIG_VIDEO_CX25840 is not set | ||
1196 | |||
1197 | # | ||
1198 | # MPEG video encoders | ||
1199 | # | ||
1200 | # CONFIG_VIDEO_CX2341X is not set | ||
1201 | |||
1202 | # | ||
1203 | # Video encoders | ||
1204 | # | ||
1205 | # CONFIG_VIDEO_SAA7127 is not set | ||
1206 | |||
1207 | # | ||
1208 | # Video improvement chips | ||
1209 | # | ||
1210 | # CONFIG_VIDEO_UPD64031A is not set | ||
1211 | # CONFIG_VIDEO_UPD64083 is not set | ||
1212 | # CONFIG_VIDEO_VIVI is not set | ||
1213 | # CONFIG_VIDEO_BT848 is not set | ||
1214 | # CONFIG_VIDEO_SAA5246A is not set | ||
1215 | # CONFIG_VIDEO_SAA5249 is not set | ||
1216 | # CONFIG_VIDEO_SAA7134 is not set | ||
1217 | # CONFIG_VIDEO_HEXIUM_ORION is not set | ||
1218 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set | ||
1219 | # CONFIG_VIDEO_CX88 is not set | ||
1220 | # CONFIG_VIDEO_IVTV is not set | ||
1221 | # CONFIG_VIDEO_CAFE_CCIC is not set | ||
1222 | CONFIG_SOC_CAMERA=m | ||
1223 | # CONFIG_SOC_CAMERA_MT9M001 is not set | ||
1224 | CONFIG_SOC_CAMERA_MT9M111=m | ||
1225 | # CONFIG_SOC_CAMERA_MT9T031 is not set | ||
1226 | # CONFIG_SOC_CAMERA_MT9V022 is not set | ||
1227 | # CONFIG_SOC_CAMERA_TW9910 is not set | ||
1228 | # CONFIG_SOC_CAMERA_PLATFORM is not set | ||
1229 | # CONFIG_SOC_CAMERA_OV772X is not set | ||
1230 | CONFIG_VIDEO_PXA27x=m | ||
1231 | # CONFIG_VIDEO_SH_MOBILE_CEU is not set | ||
1232 | # CONFIG_V4L_USB_DRIVERS is not set | ||
1233 | # CONFIG_RADIO_ADAPTERS is not set | ||
1087 | # CONFIG_DAB is not set | 1234 | # CONFIG_DAB is not set |
1088 | 1235 | ||
1089 | # | 1236 | # |
@@ -1095,6 +1242,7 @@ CONFIG_SSB_POSSIBLE=y | |||
1095 | CONFIG_FB=y | 1242 | CONFIG_FB=y |
1096 | # CONFIG_FIRMWARE_EDID is not set | 1243 | # CONFIG_FIRMWARE_EDID is not set |
1097 | # CONFIG_FB_DDC is not set | 1244 | # CONFIG_FB_DDC is not set |
1245 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
1098 | CONFIG_FB_CFB_FILLRECT=y | 1246 | CONFIG_FB_CFB_FILLRECT=y |
1099 | CONFIG_FB_CFB_COPYAREA=y | 1247 | CONFIG_FB_CFB_COPYAREA=y |
1100 | CONFIG_FB_CFB_IMAGEBLIT=y | 1248 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -1128,6 +1276,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1128 | # CONFIG_FB_S3 is not set | 1276 | # CONFIG_FB_S3 is not set |
1129 | # CONFIG_FB_SAVAGE is not set | 1277 | # CONFIG_FB_SAVAGE is not set |
1130 | # CONFIG_FB_SIS is not set | 1278 | # CONFIG_FB_SIS is not set |
1279 | # CONFIG_FB_VIA is not set | ||
1131 | # CONFIG_FB_NEOMAGIC is not set | 1280 | # CONFIG_FB_NEOMAGIC is not set |
1132 | # CONFIG_FB_KYRO is not set | 1281 | # CONFIG_FB_KYRO is not set |
1133 | # CONFIG_FB_3DFX is not set | 1282 | # CONFIG_FB_3DFX is not set |
@@ -1138,13 +1287,17 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1138 | # CONFIG_FB_PM3 is not set | 1287 | # CONFIG_FB_PM3 is not set |
1139 | # CONFIG_FB_CARMINE is not set | 1288 | # CONFIG_FB_CARMINE is not set |
1140 | CONFIG_FB_PXA=y | 1289 | CONFIG_FB_PXA=y |
1290 | # CONFIG_FB_PXA_OVERLAY is not set | ||
1141 | # CONFIG_FB_PXA_SMARTPANEL is not set | 1291 | # CONFIG_FB_PXA_SMARTPANEL is not set |
1142 | CONFIG_FB_PXA_PARAMETERS=y | 1292 | CONFIG_FB_PXA_PARAMETERS=y |
1143 | CONFIG_FB_MBX=m | 1293 | CONFIG_FB_MBX=m |
1144 | # CONFIG_FB_W100 is not set | 1294 | # CONFIG_FB_W100 is not set |
1145 | # CONFIG_FB_VIRTUAL is not set | 1295 | # CONFIG_FB_VIRTUAL is not set |
1146 | # CONFIG_FB_METRONOME is not set | 1296 | # CONFIG_FB_METRONOME is not set |
1147 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1297 | # CONFIG_FB_MB862XX is not set |
1298 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
1299 | # CONFIG_LCD_CLASS_DEVICE is not set | ||
1300 | # CONFIG_BACKLIGHT_CLASS_DEVICE is not set | ||
1148 | 1301 | ||
1149 | # | 1302 | # |
1150 | # Display device support | 1303 | # Display device support |
@@ -1167,6 +1320,7 @@ CONFIG_LOGO_LINUX_MONO=y | |||
1167 | CONFIG_LOGO_LINUX_VGA16=y | 1320 | CONFIG_LOGO_LINUX_VGA16=y |
1168 | CONFIG_LOGO_LINUX_CLUT224=y | 1321 | CONFIG_LOGO_LINUX_CLUT224=y |
1169 | CONFIG_SOUND=m | 1322 | CONFIG_SOUND=m |
1323 | CONFIG_SOUND_OSS_CORE=y | ||
1170 | CONFIG_SND=m | 1324 | CONFIG_SND=m |
1171 | CONFIG_SND_TIMER=m | 1325 | CONFIG_SND_TIMER=m |
1172 | CONFIG_SND_PCM=m | 1326 | CONFIG_SND_PCM=m |
@@ -1182,81 +1336,16 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1182 | # CONFIG_SND_DEBUG is not set | 1336 | # CONFIG_SND_DEBUG is not set |
1183 | CONFIG_SND_VMASTER=y | 1337 | CONFIG_SND_VMASTER=y |
1184 | CONFIG_SND_AC97_CODEC=m | 1338 | CONFIG_SND_AC97_CODEC=m |
1185 | CONFIG_SND_DRIVERS=y | 1339 | # CONFIG_SND_DRIVERS is not set |
1186 | # CONFIG_SND_DUMMY is not set | 1340 | # CONFIG_SND_PCI is not set |
1187 | # CONFIG_SND_MTPAV is not set | ||
1188 | # CONFIG_SND_SERIAL_U16550 is not set | ||
1189 | # CONFIG_SND_MPU401 is not set | ||
1190 | # CONFIG_SND_AC97_POWER_SAVE is not set | ||
1191 | CONFIG_SND_PCI=y | ||
1192 | # CONFIG_SND_AD1889 is not set | ||
1193 | # CONFIG_SND_ALS300 is not set | ||
1194 | # CONFIG_SND_ALI5451 is not set | ||
1195 | # CONFIG_SND_ATIIXP is not set | ||
1196 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
1197 | # CONFIG_SND_AU8810 is not set | ||
1198 | # CONFIG_SND_AU8820 is not set | ||
1199 | # CONFIG_SND_AU8830 is not set | ||
1200 | # CONFIG_SND_AW2 is not set | ||
1201 | # CONFIG_SND_AZT3328 is not set | ||
1202 | # CONFIG_SND_BT87X is not set | ||
1203 | # CONFIG_SND_CA0106 is not set | ||
1204 | # CONFIG_SND_CMIPCI is not set | ||
1205 | # CONFIG_SND_OXYGEN is not set | ||
1206 | # CONFIG_SND_CS4281 is not set | ||
1207 | # CONFIG_SND_CS46XX is not set | ||
1208 | # CONFIG_SND_DARLA20 is not set | ||
1209 | # CONFIG_SND_GINA20 is not set | ||
1210 | # CONFIG_SND_LAYLA20 is not set | ||
1211 | # CONFIG_SND_DARLA24 is not set | ||
1212 | # CONFIG_SND_GINA24 is not set | ||
1213 | # CONFIG_SND_LAYLA24 is not set | ||
1214 | # CONFIG_SND_MONA is not set | ||
1215 | # CONFIG_SND_MIA is not set | ||
1216 | # CONFIG_SND_ECHO3G is not set | ||
1217 | # CONFIG_SND_INDIGO is not set | ||
1218 | # CONFIG_SND_INDIGOIO is not set | ||
1219 | # CONFIG_SND_INDIGODJ is not set | ||
1220 | # CONFIG_SND_EMU10K1 is not set | ||
1221 | # CONFIG_SND_EMU10K1X is not set | ||
1222 | # CONFIG_SND_ENS1370 is not set | ||
1223 | # CONFIG_SND_ENS1371 is not set | ||
1224 | # CONFIG_SND_ES1938 is not set | ||
1225 | # CONFIG_SND_ES1968 is not set | ||
1226 | # CONFIG_SND_FM801 is not set | ||
1227 | # CONFIG_SND_HDA_INTEL is not set | ||
1228 | # CONFIG_SND_HDSP is not set | ||
1229 | # CONFIG_SND_HDSPM is not set | ||
1230 | # CONFIG_SND_HIFIER is not set | ||
1231 | # CONFIG_SND_ICE1712 is not set | ||
1232 | # CONFIG_SND_ICE1724 is not set | ||
1233 | # CONFIG_SND_INTEL8X0 is not set | ||
1234 | # CONFIG_SND_INTEL8X0M is not set | ||
1235 | # CONFIG_SND_KORG1212 is not set | ||
1236 | # CONFIG_SND_MAESTRO3 is not set | ||
1237 | # CONFIG_SND_MIXART is not set | ||
1238 | # CONFIG_SND_NM256 is not set | ||
1239 | # CONFIG_SND_PCXHR is not set | ||
1240 | # CONFIG_SND_RIPTIDE is not set | ||
1241 | # CONFIG_SND_RME32 is not set | ||
1242 | # CONFIG_SND_RME96 is not set | ||
1243 | # CONFIG_SND_RME9652 is not set | ||
1244 | # CONFIG_SND_SONICVIBES is not set | ||
1245 | # CONFIG_SND_TRIDENT is not set | ||
1246 | # CONFIG_SND_VIA82XX is not set | ||
1247 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
1248 | # CONFIG_SND_VIRTUOSO is not set | ||
1249 | # CONFIG_SND_VX222 is not set | ||
1250 | # CONFIG_SND_YMFPCI is not set | ||
1251 | CONFIG_SND_ARM=y | 1341 | CONFIG_SND_ARM=y |
1252 | CONFIG_SND_PXA2XX_PCM=m | 1342 | CONFIG_SND_PXA2XX_PCM=m |
1343 | CONFIG_SND_PXA2XX_LIB=m | ||
1344 | CONFIG_SND_PXA2XX_LIB_AC97=y | ||
1253 | CONFIG_SND_PXA2XX_AC97=m | 1345 | CONFIG_SND_PXA2XX_AC97=m |
1254 | CONFIG_SND_USB=y | 1346 | # CONFIG_SND_SPI is not set |
1255 | # CONFIG_SND_USB_AUDIO is not set | 1347 | # CONFIG_SND_USB is not set |
1256 | # CONFIG_SND_USB_CAIAQ is not set | 1348 | # CONFIG_SND_PCMCIA is not set |
1257 | CONFIG_SND_PCMCIA=y | ||
1258 | # CONFIG_SND_VXPOCKET is not set | ||
1259 | # CONFIG_SND_PDAUDIOCF is not set | ||
1260 | # CONFIG_SND_SOC is not set | 1349 | # CONFIG_SND_SOC is not set |
1261 | # CONFIG_SOUND_PRIME is not set | 1350 | # CONFIG_SOUND_PRIME is not set |
1262 | CONFIG_AC97_BUS=m | 1351 | CONFIG_AC97_BUS=m |
@@ -1269,9 +1358,37 @@ CONFIG_HID_DEBUG=y | |||
1269 | # USB Input Devices | 1358 | # USB Input Devices |
1270 | # | 1359 | # |
1271 | CONFIG_USB_HID=y | 1360 | CONFIG_USB_HID=y |
1272 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1361 | # CONFIG_HID_PID is not set |
1273 | # CONFIG_HID_FF is not set | ||
1274 | # CONFIG_USB_HIDDEV is not set | 1362 | # CONFIG_USB_HIDDEV is not set |
1363 | |||
1364 | # | ||
1365 | # Special HID drivers | ||
1366 | # | ||
1367 | CONFIG_HID_COMPAT=y | ||
1368 | CONFIG_HID_A4TECH=y | ||
1369 | CONFIG_HID_APPLE=y | ||
1370 | CONFIG_HID_BELKIN=y | ||
1371 | CONFIG_HID_CHERRY=y | ||
1372 | CONFIG_HID_CHICONY=y | ||
1373 | CONFIG_HID_CYPRESS=y | ||
1374 | CONFIG_HID_EZKEY=y | ||
1375 | CONFIG_HID_GYRATION=y | ||
1376 | CONFIG_HID_LOGITECH=y | ||
1377 | # CONFIG_LOGITECH_FF is not set | ||
1378 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
1379 | CONFIG_HID_MICROSOFT=y | ||
1380 | CONFIG_HID_MONTEREY=y | ||
1381 | # CONFIG_HID_NTRIG is not set | ||
1382 | CONFIG_HID_PANTHERLORD=y | ||
1383 | # CONFIG_PANTHERLORD_FF is not set | ||
1384 | CONFIG_HID_PETALYNX=y | ||
1385 | CONFIG_HID_SAMSUNG=y | ||
1386 | CONFIG_HID_SONY=y | ||
1387 | CONFIG_HID_SUNPLUS=y | ||
1388 | # CONFIG_GREENASIA_FF is not set | ||
1389 | # CONFIG_HID_TOPSEED is not set | ||
1390 | # CONFIG_THRUSTMASTER_FF is not set | ||
1391 | # CONFIG_ZEROPLUS_FF is not set | ||
1275 | CONFIG_USB_SUPPORT=y | 1392 | CONFIG_USB_SUPPORT=y |
1276 | CONFIG_USB_ARCH_HAS_HCD=y | 1393 | CONFIG_USB_ARCH_HAS_HCD=y |
1277 | CONFIG_USB_ARCH_HAS_OHCI=y | 1394 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1291,12 +1408,15 @@ CONFIG_USB_DEVICEFS=y | |||
1291 | # CONFIG_USB_OTG_WHITELIST is not set | 1408 | # CONFIG_USB_OTG_WHITELIST is not set |
1292 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1409 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1293 | CONFIG_USB_MON=y | 1410 | CONFIG_USB_MON=y |
1411 | # CONFIG_USB_WUSB is not set | ||
1412 | # CONFIG_USB_WUSB_CBAF is not set | ||
1294 | 1413 | ||
1295 | # | 1414 | # |
1296 | # USB Host Controller Drivers | 1415 | # USB Host Controller Drivers |
1297 | # | 1416 | # |
1298 | # CONFIG_USB_C67X00_HCD is not set | 1417 | # CONFIG_USB_C67X00_HCD is not set |
1299 | # CONFIG_USB_EHCI_HCD is not set | 1418 | # CONFIG_USB_EHCI_HCD is not set |
1419 | # CONFIG_USB_OXU210HP_HCD is not set | ||
1300 | # CONFIG_USB_ISP116X_HCD is not set | 1420 | # CONFIG_USB_ISP116X_HCD is not set |
1301 | # CONFIG_USB_ISP1760_HCD is not set | 1421 | # CONFIG_USB_ISP1760_HCD is not set |
1302 | CONFIG_USB_OHCI_HCD=y | 1422 | CONFIG_USB_OHCI_HCD=y |
@@ -1306,6 +1426,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1306 | # CONFIG_USB_UHCI_HCD is not set | 1426 | # CONFIG_USB_UHCI_HCD is not set |
1307 | # CONFIG_USB_SL811_HCD is not set | 1427 | # CONFIG_USB_SL811_HCD is not set |
1308 | # CONFIG_USB_R8A66597_HCD is not set | 1428 | # CONFIG_USB_R8A66597_HCD is not set |
1429 | # CONFIG_USB_WHCI_HCD is not set | ||
1430 | # CONFIG_USB_HWA_HCD is not set | ||
1309 | # CONFIG_USB_MUSB_HDRC is not set | 1431 | # CONFIG_USB_MUSB_HDRC is not set |
1310 | 1432 | ||
1311 | # | 1433 | # |
@@ -1314,20 +1436,20 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1314 | # CONFIG_USB_ACM is not set | 1436 | # CONFIG_USB_ACM is not set |
1315 | # CONFIG_USB_PRINTER is not set | 1437 | # CONFIG_USB_PRINTER is not set |
1316 | # CONFIG_USB_WDM is not set | 1438 | # CONFIG_USB_WDM is not set |
1439 | # CONFIG_USB_TMC is not set | ||
1317 | 1440 | ||
1318 | # | 1441 | # |
1319 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1442 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
1320 | # | 1443 | # |
1321 | 1444 | ||
1322 | # | 1445 | # |
1323 | # may also be needed; see USB_STORAGE Help for more information | 1446 | # see USB_STORAGE Help for more information |
1324 | # | 1447 | # |
1325 | CONFIG_USB_STORAGE=y | 1448 | CONFIG_USB_STORAGE=y |
1326 | # CONFIG_USB_STORAGE_DEBUG is not set | 1449 | # CONFIG_USB_STORAGE_DEBUG is not set |
1327 | # CONFIG_USB_STORAGE_DATAFAB is not set | 1450 | # CONFIG_USB_STORAGE_DATAFAB is not set |
1328 | # CONFIG_USB_STORAGE_FREECOM is not set | 1451 | # CONFIG_USB_STORAGE_FREECOM is not set |
1329 | # CONFIG_USB_STORAGE_ISD200 is not set | 1452 | # CONFIG_USB_STORAGE_ISD200 is not set |
1330 | # CONFIG_USB_STORAGE_DPCM is not set | ||
1331 | # CONFIG_USB_STORAGE_USBAT is not set | 1453 | # CONFIG_USB_STORAGE_USBAT is not set |
1332 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1454 | # CONFIG_USB_STORAGE_SDDR09 is not set |
1333 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1455 | # CONFIG_USB_STORAGE_SDDR55 is not set |
@@ -1355,6 +1477,7 @@ CONFIG_USB_STORAGE=y | |||
1355 | # CONFIG_USB_EMI62 is not set | 1477 | # CONFIG_USB_EMI62 is not set |
1356 | # CONFIG_USB_EMI26 is not set | 1478 | # CONFIG_USB_EMI26 is not set |
1357 | # CONFIG_USB_ADUTUX is not set | 1479 | # CONFIG_USB_ADUTUX is not set |
1480 | # CONFIG_USB_SEVSEG is not set | ||
1358 | # CONFIG_USB_RIO500 is not set | 1481 | # CONFIG_USB_RIO500 is not set |
1359 | # CONFIG_USB_LEGOTOWER is not set | 1482 | # CONFIG_USB_LEGOTOWER is not set |
1360 | # CONFIG_USB_LCD is not set | 1483 | # CONFIG_USB_LCD is not set |
@@ -1371,13 +1494,20 @@ CONFIG_USB_STORAGE=y | |||
1371 | # CONFIG_USB_IOWARRIOR is not set | 1494 | # CONFIG_USB_IOWARRIOR is not set |
1372 | # CONFIG_USB_TEST is not set | 1495 | # CONFIG_USB_TEST is not set |
1373 | # CONFIG_USB_ISIGHTFW is not set | 1496 | # CONFIG_USB_ISIGHTFW is not set |
1497 | # CONFIG_USB_VST is not set | ||
1374 | # CONFIG_USB_GADGET is not set | 1498 | # CONFIG_USB_GADGET is not set |
1499 | |||
1500 | # | ||
1501 | # OTG and related infrastructure | ||
1502 | # | ||
1503 | # CONFIG_USB_GPIO_VBUS is not set | ||
1504 | # CONFIG_UWB is not set | ||
1375 | CONFIG_MMC=m | 1505 | CONFIG_MMC=m |
1376 | # CONFIG_MMC_DEBUG is not set | 1506 | # CONFIG_MMC_DEBUG is not set |
1377 | # CONFIG_MMC_UNSAFE_RESUME is not set | 1507 | # CONFIG_MMC_UNSAFE_RESUME is not set |
1378 | 1508 | ||
1379 | # | 1509 | # |
1380 | # MMC/SD Card Drivers | 1510 | # MMC/SD/SDIO Card Drivers |
1381 | # | 1511 | # |
1382 | CONFIG_MMC_BLOCK=m | 1512 | CONFIG_MMC_BLOCK=m |
1383 | CONFIG_MMC_BLOCK_BOUNCE=y | 1513 | CONFIG_MMC_BLOCK_BOUNCE=y |
@@ -1385,11 +1515,12 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
1385 | # CONFIG_MMC_TEST is not set | 1515 | # CONFIG_MMC_TEST is not set |
1386 | 1516 | ||
1387 | # | 1517 | # |
1388 | # MMC/SD Host Controller Drivers | 1518 | # MMC/SD/SDIO Host Controller Drivers |
1389 | # | 1519 | # |
1390 | CONFIG_MMC_PXA=m | 1520 | CONFIG_MMC_PXA=m |
1391 | # CONFIG_MMC_SDHCI is not set | 1521 | # CONFIG_MMC_SDHCI is not set |
1392 | # CONFIG_MMC_TIFM_SD is not set | 1522 | # CONFIG_MMC_TIFM_SD is not set |
1523 | # CONFIG_MMC_SPI is not set | ||
1393 | # CONFIG_MMC_SDRICOH_CS is not set | 1524 | # CONFIG_MMC_SDRICOH_CS is not set |
1394 | # CONFIG_MEMSTICK is not set | 1525 | # CONFIG_MEMSTICK is not set |
1395 | # CONFIG_ACCESSIBILITY is not set | 1526 | # CONFIG_ACCESSIBILITY is not set |
@@ -1400,8 +1531,7 @@ CONFIG_LEDS_CLASS=y | |||
1400 | # LED drivers | 1531 | # LED drivers |
1401 | # | 1532 | # |
1402 | # CONFIG_LEDS_PCA9532 is not set | 1533 | # CONFIG_LEDS_PCA9532 is not set |
1403 | # CONFIG_LEDS_GPIO is not set | 1534 | CONFIG_LEDS_GPIO=m |
1404 | CONFIG_LEDS_CM_X270=y | ||
1405 | # CONFIG_LEDS_PCA955X is not set | 1535 | # CONFIG_LEDS_PCA955X is not set |
1406 | 1536 | ||
1407 | # | 1537 | # |
@@ -1410,6 +1540,7 @@ CONFIG_LEDS_CM_X270=y | |||
1410 | CONFIG_LEDS_TRIGGERS=y | 1540 | CONFIG_LEDS_TRIGGERS=y |
1411 | # CONFIG_LEDS_TRIGGER_TIMER is not set | 1541 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
1412 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 1542 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
1543 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
1413 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | 1544 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set |
1414 | CONFIG_RTC_LIB=y | 1545 | CONFIG_RTC_LIB=y |
1415 | CONFIG_RTC_CLASS=y | 1546 | CONFIG_RTC_CLASS=y |
@@ -1441,37 +1572,43 @@ CONFIG_RTC_INTF_DEV=y | |||
1441 | # CONFIG_RTC_DRV_M41T80 is not set | 1572 | # CONFIG_RTC_DRV_M41T80 is not set |
1442 | # CONFIG_RTC_DRV_S35390A is not set | 1573 | # CONFIG_RTC_DRV_S35390A is not set |
1443 | # CONFIG_RTC_DRV_FM3130 is not set | 1574 | # CONFIG_RTC_DRV_FM3130 is not set |
1575 | # CONFIG_RTC_DRV_RX8581 is not set | ||
1444 | 1576 | ||
1445 | # | 1577 | # |
1446 | # SPI RTC drivers | 1578 | # SPI RTC drivers |
1447 | # | 1579 | # |
1580 | # CONFIG_RTC_DRV_M41T94 is not set | ||
1581 | # CONFIG_RTC_DRV_DS1305 is not set | ||
1582 | # CONFIG_RTC_DRV_DS1390 is not set | ||
1583 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
1584 | # CONFIG_RTC_DRV_R9701 is not set | ||
1585 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
1586 | # CONFIG_RTC_DRV_DS3234 is not set | ||
1448 | 1587 | ||
1449 | # | 1588 | # |
1450 | # Platform RTC drivers | 1589 | # Platform RTC drivers |
1451 | # | 1590 | # |
1452 | # CONFIG_RTC_DRV_CMOS is not set | 1591 | # CONFIG_RTC_DRV_CMOS is not set |
1592 | # CONFIG_RTC_DRV_DS1286 is not set | ||
1453 | # CONFIG_RTC_DRV_DS1511 is not set | 1593 | # CONFIG_RTC_DRV_DS1511 is not set |
1454 | # CONFIG_RTC_DRV_DS1553 is not set | 1594 | # CONFIG_RTC_DRV_DS1553 is not set |
1455 | # CONFIG_RTC_DRV_DS1742 is not set | 1595 | # CONFIG_RTC_DRV_DS1742 is not set |
1456 | # CONFIG_RTC_DRV_STK17TA8 is not set | 1596 | # CONFIG_RTC_DRV_STK17TA8 is not set |
1457 | # CONFIG_RTC_DRV_M48T86 is not set | 1597 | # CONFIG_RTC_DRV_M48T86 is not set |
1598 | # CONFIG_RTC_DRV_M48T35 is not set | ||
1458 | # CONFIG_RTC_DRV_M48T59 is not set | 1599 | # CONFIG_RTC_DRV_M48T59 is not set |
1600 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
1459 | CONFIG_RTC_DRV_V3020=y | 1601 | CONFIG_RTC_DRV_V3020=y |
1460 | 1602 | ||
1461 | # | 1603 | # |
1462 | # on-CPU RTC drivers | 1604 | # on-CPU RTC drivers |
1463 | # | 1605 | # |
1464 | CONFIG_RTC_DRV_SA1100=y | 1606 | CONFIG_RTC_DRV_SA1100=y |
1607 | # CONFIG_RTC_DRV_PXA is not set | ||
1465 | # CONFIG_DMADEVICES is not set | 1608 | # CONFIG_DMADEVICES is not set |
1466 | |||
1467 | # | ||
1468 | # Voltage and Current regulators | ||
1469 | # | ||
1470 | # CONFIG_REGULATOR is not set | 1609 | # CONFIG_REGULATOR is not set |
1471 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
1472 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
1473 | # CONFIG_REGULATOR_BQ24022 is not set | ||
1474 | # CONFIG_UIO is not set | 1610 | # CONFIG_UIO is not set |
1611 | # CONFIG_STAGING is not set | ||
1475 | 1612 | ||
1476 | # | 1613 | # |
1477 | # File systems | 1614 | # File systems |
@@ -1483,14 +1620,16 @@ CONFIG_EXT3_FS=y | |||
1483 | CONFIG_EXT3_FS_XATTR=y | 1620 | CONFIG_EXT3_FS_XATTR=y |
1484 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1621 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
1485 | # CONFIG_EXT3_FS_SECURITY is not set | 1622 | # CONFIG_EXT3_FS_SECURITY is not set |
1486 | # CONFIG_EXT4DEV_FS is not set | 1623 | # CONFIG_EXT4_FS is not set |
1487 | CONFIG_JBD=y | 1624 | CONFIG_JBD=y |
1488 | CONFIG_FS_MBCACHE=y | 1625 | CONFIG_FS_MBCACHE=y |
1489 | # CONFIG_REISERFS_FS is not set | 1626 | # CONFIG_REISERFS_FS is not set |
1490 | # CONFIG_JFS_FS is not set | 1627 | # CONFIG_JFS_FS is not set |
1491 | # CONFIG_FS_POSIX_ACL is not set | 1628 | # CONFIG_FS_POSIX_ACL is not set |
1629 | CONFIG_FILE_LOCKING=y | ||
1492 | # CONFIG_XFS_FS is not set | 1630 | # CONFIG_XFS_FS is not set |
1493 | # CONFIG_OCFS2_FS is not set | 1631 | # CONFIG_OCFS2_FS is not set |
1632 | # CONFIG_BTRFS_FS is not set | ||
1494 | CONFIG_DNOTIFY=y | 1633 | CONFIG_DNOTIFY=y |
1495 | CONFIG_INOTIFY=y | 1634 | CONFIG_INOTIFY=y |
1496 | CONFIG_INOTIFY_USER=y | 1635 | CONFIG_INOTIFY_USER=y |
@@ -1520,15 +1659,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1520 | # | 1659 | # |
1521 | CONFIG_PROC_FS=y | 1660 | CONFIG_PROC_FS=y |
1522 | CONFIG_PROC_SYSCTL=y | 1661 | CONFIG_PROC_SYSCTL=y |
1662 | # CONFIG_PROC_PAGE_MONITOR is not set | ||
1523 | CONFIG_SYSFS=y | 1663 | CONFIG_SYSFS=y |
1524 | CONFIG_TMPFS=y | 1664 | CONFIG_TMPFS=y |
1525 | # CONFIG_TMPFS_POSIX_ACL is not set | 1665 | # CONFIG_TMPFS_POSIX_ACL is not set |
1526 | # CONFIG_HUGETLB_PAGE is not set | 1666 | # CONFIG_HUGETLB_PAGE is not set |
1527 | # CONFIG_CONFIGFS_FS is not set | 1667 | # CONFIG_CONFIGFS_FS is not set |
1528 | 1668 | CONFIG_MISC_FILESYSTEMS=y | |
1529 | # | ||
1530 | # Miscellaneous filesystems | ||
1531 | # | ||
1532 | # CONFIG_ADFS_FS is not set | 1669 | # CONFIG_ADFS_FS is not set |
1533 | # CONFIG_AFFS_FS is not set | 1670 | # CONFIG_AFFS_FS is not set |
1534 | # CONFIG_HFS_FS is not set | 1671 | # CONFIG_HFS_FS is not set |
@@ -1548,6 +1685,7 @@ CONFIG_JFFS2_ZLIB=y | |||
1548 | CONFIG_JFFS2_RTIME=y | 1685 | CONFIG_JFFS2_RTIME=y |
1549 | # CONFIG_JFFS2_RUBIN is not set | 1686 | # CONFIG_JFFS2_RUBIN is not set |
1550 | # CONFIG_CRAMFS is not set | 1687 | # CONFIG_CRAMFS is not set |
1688 | # CONFIG_SQUASHFS is not set | ||
1551 | # CONFIG_VXFS_FS is not set | 1689 | # CONFIG_VXFS_FS is not set |
1552 | # CONFIG_MINIX_FS is not set | 1690 | # CONFIG_MINIX_FS is not set |
1553 | # CONFIG_OMFS_FS is not set | 1691 | # CONFIG_OMFS_FS is not set |
@@ -1567,6 +1705,7 @@ CONFIG_LOCKD=y | |||
1567 | CONFIG_LOCKD_V4=y | 1705 | CONFIG_LOCKD_V4=y |
1568 | CONFIG_NFS_COMMON=y | 1706 | CONFIG_NFS_COMMON=y |
1569 | CONFIG_SUNRPC=y | 1707 | CONFIG_SUNRPC=y |
1708 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
1570 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1709 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1571 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1710 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1572 | # CONFIG_SMB_FS is not set | 1711 | # CONFIG_SMB_FS is not set |
@@ -1678,19 +1817,29 @@ CONFIG_DEBUG_KERNEL=y | |||
1678 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1817 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1679 | # CONFIG_DEBUG_LIST is not set | 1818 | # CONFIG_DEBUG_LIST is not set |
1680 | # CONFIG_DEBUG_SG is not set | 1819 | # CONFIG_DEBUG_SG is not set |
1820 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
1681 | CONFIG_FRAME_POINTER=y | 1821 | CONFIG_FRAME_POINTER=y |
1682 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1822 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1683 | # CONFIG_RCU_TORTURE_TEST is not set | 1823 | # CONFIG_RCU_TORTURE_TEST is not set |
1824 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1684 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1825 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1826 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1685 | # CONFIG_FAULT_INJECTION is not set | 1827 | # CONFIG_FAULT_INJECTION is not set |
1686 | # CONFIG_LATENCYTOP is not set | 1828 | # CONFIG_LATENCYTOP is not set |
1687 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1829 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
1688 | CONFIG_HAVE_FTRACE=y | 1830 | CONFIG_HAVE_FUNCTION_TRACER=y |
1689 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1831 | |
1690 | # CONFIG_FTRACE is not set | 1832 | # |
1833 | # Tracers | ||
1834 | # | ||
1835 | # CONFIG_FUNCTION_TRACER is not set | ||
1691 | # CONFIG_IRQSOFF_TRACER is not set | 1836 | # CONFIG_IRQSOFF_TRACER is not set |
1692 | # CONFIG_SCHED_TRACER is not set | 1837 | # CONFIG_SCHED_TRACER is not set |
1693 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1838 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
1839 | # CONFIG_BOOT_TRACER is not set | ||
1840 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1841 | # CONFIG_STACK_TRACER is not set | ||
1842 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1694 | # CONFIG_SAMPLES is not set | 1843 | # CONFIG_SAMPLES is not set |
1695 | CONFIG_HAVE_ARCH_KGDB=y | 1844 | CONFIG_HAVE_ARCH_KGDB=y |
1696 | # CONFIG_KGDB is not set | 1845 | # CONFIG_KGDB is not set |
@@ -1705,13 +1854,16 @@ CONFIG_DEBUG_LL=y | |||
1705 | # | 1854 | # |
1706 | # CONFIG_KEYS is not set | 1855 | # CONFIG_KEYS is not set |
1707 | # CONFIG_SECURITY is not set | 1856 | # CONFIG_SECURITY is not set |
1857 | # CONFIG_SECURITYFS is not set | ||
1708 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1858 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1709 | CONFIG_CRYPTO=y | 1859 | CONFIG_CRYPTO=y |
1710 | 1860 | ||
1711 | # | 1861 | # |
1712 | # Crypto core or helper | 1862 | # Crypto core or helper |
1713 | # | 1863 | # |
1864 | # CONFIG_CRYPTO_FIPS is not set | ||
1714 | # CONFIG_CRYPTO_MANAGER is not set | 1865 | # CONFIG_CRYPTO_MANAGER is not set |
1866 | # CONFIG_CRYPTO_MANAGER2 is not set | ||
1715 | # CONFIG_CRYPTO_GF128MUL is not set | 1867 | # CONFIG_CRYPTO_GF128MUL is not set |
1716 | # CONFIG_CRYPTO_NULL is not set | 1868 | # CONFIG_CRYPTO_NULL is not set |
1717 | # CONFIG_CRYPTO_CRYPTD is not set | 1869 | # CONFIG_CRYPTO_CRYPTD is not set |
@@ -1783,14 +1935,18 @@ CONFIG_CRYPTO=y | |||
1783 | # | 1935 | # |
1784 | # CONFIG_CRYPTO_DEFLATE is not set | 1936 | # CONFIG_CRYPTO_DEFLATE is not set |
1785 | # CONFIG_CRYPTO_LZO is not set | 1937 | # CONFIG_CRYPTO_LZO is not set |
1938 | |||
1939 | # | ||
1940 | # Random Number Generation | ||
1941 | # | ||
1942 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1786 | # CONFIG_CRYPTO_HW is not set | 1943 | # CONFIG_CRYPTO_HW is not set |
1787 | 1944 | ||
1788 | # | 1945 | # |
1789 | # Library routines | 1946 | # Library routines |
1790 | # | 1947 | # |
1791 | CONFIG_BITREVERSE=y | 1948 | CONFIG_BITREVERSE=y |
1792 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1949 | CONFIG_GENERIC_FIND_LAST_BIT=y |
1793 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
1794 | CONFIG_CRC_CCITT=m | 1950 | CONFIG_CRC_CCITT=m |
1795 | # CONFIG_CRC16 is not set | 1951 | # CONFIG_CRC16 is not set |
1796 | # CONFIG_CRC_T10DIF is not set | 1952 | # CONFIG_CRC_T10DIF is not set |
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig index f7622e658163..1aa62249031b 100644 --- a/arch/arm/configs/collie_defconfig +++ b/arch/arm/configs/collie_defconfig | |||
@@ -113,7 +113,6 @@ CONFIG_ARCH_SA1100=y | |||
113 | CONFIG_SA1100_COLLIE=y | 113 | CONFIG_SA1100_COLLIE=y |
114 | # CONFIG_SA1100_H3100 is not set | 114 | # CONFIG_SA1100_H3100 is not set |
115 | # CONFIG_SA1100_H3600 is not set | 115 | # CONFIG_SA1100_H3600 is not set |
116 | # CONFIG_SA1100_H3800 is not set | ||
117 | # CONFIG_SA1100_BADGE4 is not set | 116 | # CONFIG_SA1100_BADGE4 is not set |
118 | # CONFIG_SA1100_JORNADA720 is not set | 117 | # CONFIG_SA1100_JORNADA720 is not set |
119 | # CONFIG_SA1100_HACKKIT is not set | 118 | # CONFIG_SA1100_HACKKIT is not set |
diff --git a/arch/arm/configs/em_x270_defconfig b/arch/arm/configs/em_x270_defconfig new file mode 100644 index 000000000000..e9955b786c80 --- /dev/null +++ b/arch/arm/configs/em_x270_defconfig | |||
@@ -0,0 +1,1741 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.29-rc2 | ||
4 | # Sun Feb 1 16:43:31 2009 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
16 | CONFIG_LOCKDEP_SUPPORT=y | ||
17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
23 | CONFIG_GENERIC_HWEIGHT=y | ||
24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
25 | CONFIG_ARCH_MTD_XIP=y | ||
26 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
27 | CONFIG_VECTORS_BASE=0xffff0000 | ||
28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
29 | |||
30 | # | ||
31 | # General setup | ||
32 | # | ||
33 | CONFIG_EXPERIMENTAL=y | ||
34 | CONFIG_BROKEN_ON_SMP=y | ||
35 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
36 | CONFIG_LOCALVERSION="" | ||
37 | # CONFIG_LOCALVERSION_AUTO is not set | ||
38 | CONFIG_SWAP=y | ||
39 | CONFIG_SYSVIPC=y | ||
40 | CONFIG_SYSVIPC_SYSCTL=y | ||
41 | # CONFIG_POSIX_MQUEUE is not set | ||
42 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
43 | # CONFIG_TASKSTATS is not set | ||
44 | # CONFIG_AUDIT is not set | ||
45 | CONFIG_IKCONFIG=y | ||
46 | CONFIG_IKCONFIG_PROC=y | ||
47 | CONFIG_LOG_BUF_SHIFT=14 | ||
48 | CONFIG_GROUP_SCHED=y | ||
49 | CONFIG_FAIR_GROUP_SCHED=y | ||
50 | # CONFIG_RT_GROUP_SCHED is not set | ||
51 | CONFIG_USER_SCHED=y | ||
52 | # CONFIG_CGROUP_SCHED is not set | ||
53 | # CONFIG_CGROUPS is not set | ||
54 | CONFIG_SYSFS_DEPRECATED=y | ||
55 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
56 | # CONFIG_RELAY is not set | ||
57 | # CONFIG_NAMESPACES is not set | ||
58 | CONFIG_BLK_DEV_INITRD=y | ||
59 | CONFIG_INITRAMFS_SOURCE="" | ||
60 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
61 | CONFIG_SYSCTL=y | ||
62 | CONFIG_EMBEDDED=y | ||
63 | CONFIG_UID16=y | ||
64 | CONFIG_SYSCTL_SYSCALL=y | ||
65 | CONFIG_KALLSYMS=y | ||
66 | # CONFIG_KALLSYMS_ALL is not set | ||
67 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
68 | CONFIG_HOTPLUG=y | ||
69 | CONFIG_PRINTK=y | ||
70 | CONFIG_BUG=y | ||
71 | CONFIG_ELF_CORE=y | ||
72 | # CONFIG_COMPAT_BRK is not set | ||
73 | CONFIG_BASE_FULL=y | ||
74 | CONFIG_FUTEX=y | ||
75 | CONFIG_ANON_INODES=y | ||
76 | CONFIG_EPOLL=y | ||
77 | CONFIG_SIGNALFD=y | ||
78 | CONFIG_TIMERFD=y | ||
79 | CONFIG_EVENTFD=y | ||
80 | CONFIG_SHMEM=y | ||
81 | CONFIG_AIO=y | ||
82 | # CONFIG_VM_EVENT_COUNTERS is not set | ||
83 | # CONFIG_SLUB_DEBUG is not set | ||
84 | # CONFIG_SLAB is not set | ||
85 | CONFIG_SLUB=y | ||
86 | # CONFIG_SLOB is not set | ||
87 | # CONFIG_PROFILING is not set | ||
88 | CONFIG_HAVE_OPROFILE=y | ||
89 | # CONFIG_KPROBES is not set | ||
90 | CONFIG_HAVE_KPROBES=y | ||
91 | CONFIG_HAVE_KRETPROBES=y | ||
92 | CONFIG_HAVE_CLK=y | ||
93 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
94 | CONFIG_RT_MUTEXES=y | ||
95 | CONFIG_BASE_SMALL=0 | ||
96 | CONFIG_MODULES=y | ||
97 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
98 | CONFIG_MODULE_UNLOAD=y | ||
99 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
100 | # CONFIG_MODVERSIONS is not set | ||
101 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
102 | CONFIG_BLOCK=y | ||
103 | # CONFIG_LBD is not set | ||
104 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
105 | # CONFIG_BLK_DEV_BSG is not set | ||
106 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
107 | |||
108 | # | ||
109 | # IO Schedulers | ||
110 | # | ||
111 | CONFIG_IOSCHED_NOOP=y | ||
112 | CONFIG_IOSCHED_AS=y | ||
113 | CONFIG_IOSCHED_DEADLINE=y | ||
114 | CONFIG_IOSCHED_CFQ=y | ||
115 | # CONFIG_DEFAULT_AS is not set | ||
116 | # CONFIG_DEFAULT_DEADLINE is not set | ||
117 | CONFIG_DEFAULT_CFQ=y | ||
118 | # CONFIG_DEFAULT_NOOP is not set | ||
119 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
120 | CONFIG_CLASSIC_RCU=y | ||
121 | # CONFIG_TREE_RCU is not set | ||
122 | # CONFIG_PREEMPT_RCU is not set | ||
123 | # CONFIG_TREE_RCU_TRACE is not set | ||
124 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
125 | CONFIG_FREEZER=y | ||
126 | |||
127 | # | ||
128 | # System Type | ||
129 | # | ||
130 | # CONFIG_ARCH_AAEC2000 is not set | ||
131 | # CONFIG_ARCH_INTEGRATOR is not set | ||
132 | # CONFIG_ARCH_REALVIEW is not set | ||
133 | # CONFIG_ARCH_VERSATILE is not set | ||
134 | # CONFIG_ARCH_AT91 is not set | ||
135 | # CONFIG_ARCH_CLPS711X is not set | ||
136 | # CONFIG_ARCH_EBSA110 is not set | ||
137 | # CONFIG_ARCH_EP93XX is not set | ||
138 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
139 | # CONFIG_ARCH_NETX is not set | ||
140 | # CONFIG_ARCH_H720X is not set | ||
141 | # CONFIG_ARCH_IMX is not set | ||
142 | # CONFIG_ARCH_IOP13XX is not set | ||
143 | # CONFIG_ARCH_IOP32X is not set | ||
144 | # CONFIG_ARCH_IOP33X is not set | ||
145 | # CONFIG_ARCH_IXP23XX is not set | ||
146 | # CONFIG_ARCH_IXP2000 is not set | ||
147 | # CONFIG_ARCH_IXP4XX is not set | ||
148 | # CONFIG_ARCH_L7200 is not set | ||
149 | # CONFIG_ARCH_KIRKWOOD is not set | ||
150 | # CONFIG_ARCH_KS8695 is not set | ||
151 | # CONFIG_ARCH_NS9XXX is not set | ||
152 | # CONFIG_ARCH_LOKI is not set | ||
153 | # CONFIG_ARCH_MV78XX0 is not set | ||
154 | # CONFIG_ARCH_MXC is not set | ||
155 | # CONFIG_ARCH_ORION5X is not set | ||
156 | # CONFIG_ARCH_PNX4008 is not set | ||
157 | CONFIG_ARCH_PXA=y | ||
158 | # CONFIG_ARCH_RPC is not set | ||
159 | # CONFIG_ARCH_SA1100 is not set | ||
160 | # CONFIG_ARCH_S3C2410 is not set | ||
161 | # CONFIG_ARCH_S3C64XX is not set | ||
162 | # CONFIG_ARCH_SHARK is not set | ||
163 | # CONFIG_ARCH_LH7A40X is not set | ||
164 | # CONFIG_ARCH_DAVINCI is not set | ||
165 | # CONFIG_ARCH_OMAP is not set | ||
166 | # CONFIG_ARCH_MSM is not set | ||
167 | # CONFIG_ARCH_W90X900 is not set | ||
168 | |||
169 | # | ||
170 | # Intel PXA2xx/PXA3xx Implementations | ||
171 | # | ||
172 | # CONFIG_ARCH_GUMSTIX is not set | ||
173 | # CONFIG_MACH_INTELMOTE2 is not set | ||
174 | # CONFIG_ARCH_LUBBOCK is not set | ||
175 | # CONFIG_MACH_LOGICPD_PXA270 is not set | ||
176 | # CONFIG_MACH_MAINSTONE is not set | ||
177 | # CONFIG_MACH_MP900C is not set | ||
178 | # CONFIG_ARCH_PXA_IDP is not set | ||
179 | # CONFIG_PXA_SHARPSL is not set | ||
180 | # CONFIG_ARCH_VIPER is not set | ||
181 | # CONFIG_ARCH_PXA_ESERIES is not set | ||
182 | # CONFIG_TRIZEPS_PXA is not set | ||
183 | # CONFIG_MACH_H5000 is not set | ||
184 | CONFIG_MACH_EM_X270=y | ||
185 | CONFIG_MACH_EXEDA=y | ||
186 | # CONFIG_MACH_COLIBRI is not set | ||
187 | # CONFIG_MACH_ZYLONITE is not set | ||
188 | # CONFIG_MACH_LITTLETON is not set | ||
189 | # CONFIG_MACH_TAVOREVB is not set | ||
190 | # CONFIG_MACH_SAAR is not set | ||
191 | # CONFIG_MACH_ARMCORE is not set | ||
192 | # CONFIG_MACH_CM_X300 is not set | ||
193 | # CONFIG_MACH_MAGICIAN is not set | ||
194 | # CONFIG_MACH_MIOA701 is not set | ||
195 | # CONFIG_MACH_PCM027 is not set | ||
196 | # CONFIG_ARCH_PXA_PALM is not set | ||
197 | # CONFIG_PXA_EZX is not set | ||
198 | CONFIG_PXA27x=y | ||
199 | CONFIG_PXA_SSP=y | ||
200 | # CONFIG_PXA_PWM is not set | ||
201 | |||
202 | # | ||
203 | # Processor Type | ||
204 | # | ||
205 | CONFIG_CPU_32=y | ||
206 | CONFIG_CPU_XSCALE=y | ||
207 | CONFIG_CPU_32v5=y | ||
208 | CONFIG_CPU_ABRT_EV5T=y | ||
209 | CONFIG_CPU_PABRT_NOIFAR=y | ||
210 | CONFIG_CPU_CACHE_VIVT=y | ||
211 | CONFIG_CPU_TLB_V4WBI=y | ||
212 | CONFIG_CPU_CP15=y | ||
213 | CONFIG_CPU_CP15_MMU=y | ||
214 | |||
215 | # | ||
216 | # Processor Features | ||
217 | # | ||
218 | CONFIG_ARM_THUMB=y | ||
219 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
220 | # CONFIG_OUTER_CACHE is not set | ||
221 | CONFIG_IWMMXT=y | ||
222 | CONFIG_XSCALE_PMU=y | ||
223 | CONFIG_COMMON_CLKDEV=y | ||
224 | |||
225 | # | ||
226 | # Bus support | ||
227 | # | ||
228 | # CONFIG_PCI_SYSCALL is not set | ||
229 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
230 | # CONFIG_PCCARD is not set | ||
231 | |||
232 | # | ||
233 | # Kernel Features | ||
234 | # | ||
235 | CONFIG_TICK_ONESHOT=y | ||
236 | CONFIG_NO_HZ=y | ||
237 | # CONFIG_HIGH_RES_TIMERS is not set | ||
238 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
239 | CONFIG_VMSPLIT_3G=y | ||
240 | # CONFIG_VMSPLIT_2G is not set | ||
241 | # CONFIG_VMSPLIT_1G is not set | ||
242 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
243 | # CONFIG_PREEMPT is not set | ||
244 | CONFIG_HZ=100 | ||
245 | CONFIG_AEABI=y | ||
246 | CONFIG_OABI_COMPAT=y | ||
247 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
248 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | ||
249 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | ||
250 | CONFIG_SELECT_MEMORY_MODEL=y | ||
251 | CONFIG_FLATMEM_MANUAL=y | ||
252 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
253 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
254 | CONFIG_FLATMEM=y | ||
255 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
256 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
257 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
258 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
259 | CONFIG_ZONE_DMA_FLAG=0 | ||
260 | CONFIG_VIRT_TO_BUS=y | ||
261 | CONFIG_UNEVICTABLE_LRU=y | ||
262 | CONFIG_ALIGNMENT_TRAP=y | ||
263 | |||
264 | # | ||
265 | # Boot options | ||
266 | # | ||
267 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
268 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
269 | CONFIG_CMDLINE="root=1f03 mem=32M" | ||
270 | # CONFIG_XIP_KERNEL is not set | ||
271 | # CONFIG_KEXEC is not set | ||
272 | |||
273 | # | ||
274 | # CPU Power Management | ||
275 | # | ||
276 | CONFIG_CPU_FREQ=y | ||
277 | CONFIG_CPU_FREQ_TABLE=y | ||
278 | # CONFIG_CPU_FREQ_DEBUG is not set | ||
279 | CONFIG_CPU_FREQ_STAT=y | ||
280 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | ||
281 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | ||
282 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
283 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | ||
284 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
285 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
286 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | ||
287 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | ||
288 | CONFIG_CPU_FREQ_GOV_USERSPACE=m | ||
289 | # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set | ||
290 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set | ||
291 | # CONFIG_CPU_IDLE is not set | ||
292 | |||
293 | # | ||
294 | # Floating point emulation | ||
295 | # | ||
296 | |||
297 | # | ||
298 | # At least one emulation must be selected | ||
299 | # | ||
300 | CONFIG_FPE_NWFPE=y | ||
301 | # CONFIG_FPE_NWFPE_XP is not set | ||
302 | # CONFIG_FPE_FASTFPE is not set | ||
303 | |||
304 | # | ||
305 | # Userspace binary formats | ||
306 | # | ||
307 | CONFIG_BINFMT_ELF=y | ||
308 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
309 | CONFIG_HAVE_AOUT=y | ||
310 | # CONFIG_BINFMT_AOUT is not set | ||
311 | # CONFIG_BINFMT_MISC is not set | ||
312 | |||
313 | # | ||
314 | # Power management options | ||
315 | # | ||
316 | CONFIG_PM=y | ||
317 | # CONFIG_PM_DEBUG is not set | ||
318 | CONFIG_PM_SLEEP=y | ||
319 | CONFIG_SUSPEND=y | ||
320 | CONFIG_SUSPEND_FREEZER=y | ||
321 | CONFIG_APM_EMULATION=y | ||
322 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
323 | CONFIG_NET=y | ||
324 | |||
325 | # | ||
326 | # Networking options | ||
327 | # | ||
328 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
329 | CONFIG_PACKET=y | ||
330 | CONFIG_PACKET_MMAP=y | ||
331 | CONFIG_UNIX=y | ||
332 | CONFIG_XFRM=y | ||
333 | # CONFIG_XFRM_USER is not set | ||
334 | # CONFIG_XFRM_SUB_POLICY is not set | ||
335 | # CONFIG_XFRM_MIGRATE is not set | ||
336 | # CONFIG_XFRM_STATISTICS is not set | ||
337 | # CONFIG_NET_KEY is not set | ||
338 | CONFIG_INET=y | ||
339 | CONFIG_IP_MULTICAST=y | ||
340 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
341 | CONFIG_IP_FIB_HASH=y | ||
342 | CONFIG_IP_PNP=y | ||
343 | CONFIG_IP_PNP_DHCP=y | ||
344 | CONFIG_IP_PNP_BOOTP=y | ||
345 | # CONFIG_IP_PNP_RARP is not set | ||
346 | # CONFIG_NET_IPIP is not set | ||
347 | # CONFIG_NET_IPGRE is not set | ||
348 | # CONFIG_IP_MROUTE is not set | ||
349 | # CONFIG_ARPD is not set | ||
350 | # CONFIG_SYN_COOKIES is not set | ||
351 | # CONFIG_INET_AH is not set | ||
352 | # CONFIG_INET_ESP is not set | ||
353 | # CONFIG_INET_IPCOMP is not set | ||
354 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
355 | # CONFIG_INET_TUNNEL is not set | ||
356 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
357 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
358 | CONFIG_INET_XFRM_MODE_BEET=y | ||
359 | # CONFIG_INET_LRO is not set | ||
360 | # CONFIG_INET_DIAG is not set | ||
361 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
362 | CONFIG_TCP_CONG_CUBIC=y | ||
363 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
364 | # CONFIG_TCP_MD5SIG is not set | ||
365 | # CONFIG_IPV6 is not set | ||
366 | # CONFIG_NETWORK_SECMARK is not set | ||
367 | # CONFIG_NETFILTER is not set | ||
368 | # CONFIG_IP_DCCP is not set | ||
369 | # CONFIG_IP_SCTP is not set | ||
370 | # CONFIG_TIPC is not set | ||
371 | # CONFIG_ATM is not set | ||
372 | # CONFIG_BRIDGE is not set | ||
373 | # CONFIG_NET_DSA is not set | ||
374 | # CONFIG_VLAN_8021Q is not set | ||
375 | # CONFIG_DECNET is not set | ||
376 | # CONFIG_LLC2 is not set | ||
377 | # CONFIG_IPX is not set | ||
378 | # CONFIG_ATALK is not set | ||
379 | # CONFIG_X25 is not set | ||
380 | # CONFIG_LAPB is not set | ||
381 | # CONFIG_ECONET is not set | ||
382 | # CONFIG_WAN_ROUTER is not set | ||
383 | # CONFIG_NET_SCHED is not set | ||
384 | # CONFIG_DCB is not set | ||
385 | |||
386 | # | ||
387 | # Network testing | ||
388 | # | ||
389 | # CONFIG_NET_PKTGEN is not set | ||
390 | # CONFIG_HAMRADIO is not set | ||
391 | # CONFIG_CAN is not set | ||
392 | # CONFIG_IRDA is not set | ||
393 | CONFIG_BT=m | ||
394 | CONFIG_BT_L2CAP=m | ||
395 | CONFIG_BT_SCO=m | ||
396 | CONFIG_BT_RFCOMM=m | ||
397 | # CONFIG_BT_RFCOMM_TTY is not set | ||
398 | CONFIG_BT_BNEP=m | ||
399 | # CONFIG_BT_BNEP_MC_FILTER is not set | ||
400 | # CONFIG_BT_BNEP_PROTO_FILTER is not set | ||
401 | CONFIG_BT_HIDP=m | ||
402 | |||
403 | # | ||
404 | # Bluetooth device drivers | ||
405 | # | ||
406 | CONFIG_BT_HCIBTUSB=m | ||
407 | # CONFIG_BT_HCIBTSDIO is not set | ||
408 | # CONFIG_BT_HCIUART is not set | ||
409 | # CONFIG_BT_HCIBCM203X is not set | ||
410 | # CONFIG_BT_HCIBPA10X is not set | ||
411 | # CONFIG_BT_HCIBFUSB is not set | ||
412 | # CONFIG_BT_HCIVHCI is not set | ||
413 | # CONFIG_AF_RXRPC is not set | ||
414 | # CONFIG_PHONET is not set | ||
415 | CONFIG_WIRELESS=y | ||
416 | # CONFIG_CFG80211 is not set | ||
417 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
418 | CONFIG_WIRELESS_EXT=y | ||
419 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
420 | CONFIG_LIB80211=m | ||
421 | # CONFIG_MAC80211 is not set | ||
422 | # CONFIG_WIMAX is not set | ||
423 | # CONFIG_RFKILL is not set | ||
424 | # CONFIG_NET_9P is not set | ||
425 | |||
426 | # | ||
427 | # Device Drivers | ||
428 | # | ||
429 | |||
430 | # | ||
431 | # Generic Driver Options | ||
432 | # | ||
433 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
434 | CONFIG_STANDALONE=y | ||
435 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
436 | CONFIG_FW_LOADER=m | ||
437 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
438 | CONFIG_EXTRA_FIRMWARE="" | ||
439 | # CONFIG_DEBUG_DRIVER is not set | ||
440 | # CONFIG_DEBUG_DEVRES is not set | ||
441 | # CONFIG_SYS_HYPERVISOR is not set | ||
442 | # CONFIG_CONNECTOR is not set | ||
443 | CONFIG_MTD=y | ||
444 | # CONFIG_MTD_DEBUG is not set | ||
445 | # CONFIG_MTD_CONCAT is not set | ||
446 | CONFIG_MTD_PARTITIONS=y | ||
447 | # CONFIG_MTD_TESTS is not set | ||
448 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
449 | CONFIG_MTD_CMDLINE_PARTS=y | ||
450 | # CONFIG_MTD_AFS_PARTS is not set | ||
451 | # CONFIG_MTD_AR7_PARTS is not set | ||
452 | |||
453 | # | ||
454 | # User Modules And Translation Layers | ||
455 | # | ||
456 | CONFIG_MTD_CHAR=y | ||
457 | CONFIG_MTD_BLKDEVS=y | ||
458 | CONFIG_MTD_BLOCK=y | ||
459 | # CONFIG_FTL is not set | ||
460 | # CONFIG_NFTL is not set | ||
461 | # CONFIG_INFTL is not set | ||
462 | # CONFIG_RFD_FTL is not set | ||
463 | # CONFIG_SSFDC is not set | ||
464 | # CONFIG_MTD_OOPS is not set | ||
465 | |||
466 | # | ||
467 | # RAM/ROM/Flash chip drivers | ||
468 | # | ||
469 | CONFIG_MTD_CFI=y | ||
470 | CONFIG_MTD_JEDECPROBE=y | ||
471 | CONFIG_MTD_GEN_PROBE=y | ||
472 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
473 | CONFIG_MTD_CFI_NOSWAP=y | ||
474 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
475 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
476 | # CONFIG_MTD_CFI_GEOMETRY is not set | ||
477 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
478 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
479 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
480 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
481 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
482 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
483 | CONFIG_MTD_CFI_I1=y | ||
484 | CONFIG_MTD_CFI_I2=y | ||
485 | # CONFIG_MTD_CFI_I4 is not set | ||
486 | # CONFIG_MTD_CFI_I8 is not set | ||
487 | # CONFIG_MTD_OTP is not set | ||
488 | CONFIG_MTD_CFI_INTELEXT=y | ||
489 | CONFIG_MTD_CFI_AMDSTD=y | ||
490 | CONFIG_MTD_CFI_STAA=y | ||
491 | CONFIG_MTD_CFI_UTIL=y | ||
492 | # CONFIG_MTD_RAM is not set | ||
493 | # CONFIG_MTD_ROM is not set | ||
494 | # CONFIG_MTD_ABSENT is not set | ||
495 | # CONFIG_MTD_XIP is not set | ||
496 | |||
497 | # | ||
498 | # Mapping drivers for chip access | ||
499 | # | ||
500 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
501 | CONFIG_MTD_PHYSMAP=y | ||
502 | # CONFIG_MTD_PHYSMAP_COMPAT is not set | ||
503 | CONFIG_MTD_PXA2XX=y | ||
504 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
505 | # CONFIG_MTD_IMPA7 is not set | ||
506 | # CONFIG_MTD_SHARP_SL is not set | ||
507 | # CONFIG_MTD_PLATRAM is not set | ||
508 | |||
509 | # | ||
510 | # Self-contained MTD device drivers | ||
511 | # | ||
512 | # CONFIG_MTD_DATAFLASH is not set | ||
513 | # CONFIG_MTD_M25P80 is not set | ||
514 | # CONFIG_MTD_SLRAM is not set | ||
515 | # CONFIG_MTD_PHRAM is not set | ||
516 | # CONFIG_MTD_MTDRAM is not set | ||
517 | # CONFIG_MTD_BLOCK2MTD is not set | ||
518 | |||
519 | # | ||
520 | # Disk-On-Chip Device Drivers | ||
521 | # | ||
522 | # CONFIG_MTD_DOC2000 is not set | ||
523 | # CONFIG_MTD_DOC2001 is not set | ||
524 | # CONFIG_MTD_DOC2001PLUS is not set | ||
525 | CONFIG_MTD_NAND=y | ||
526 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
527 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
528 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
529 | # CONFIG_MTD_NAND_H1900 is not set | ||
530 | # CONFIG_MTD_NAND_GPIO is not set | ||
531 | CONFIG_MTD_NAND_IDS=y | ||
532 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
533 | # CONFIG_MTD_NAND_SHARPSL is not set | ||
534 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
535 | CONFIG_MTD_NAND_PLATFORM=y | ||
536 | # CONFIG_MTD_ALAUDA is not set | ||
537 | # CONFIG_MTD_ONENAND is not set | ||
538 | |||
539 | # | ||
540 | # LPDDR flash memory drivers | ||
541 | # | ||
542 | # CONFIG_MTD_LPDDR is not set | ||
543 | # CONFIG_MTD_QINFO_PROBE is not set | ||
544 | |||
545 | # | ||
546 | # UBI - Unsorted block images | ||
547 | # | ||
548 | # CONFIG_MTD_UBI is not set | ||
549 | # CONFIG_PARPORT is not set | ||
550 | CONFIG_BLK_DEV=y | ||
551 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
552 | CONFIG_BLK_DEV_LOOP=y | ||
553 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
554 | # CONFIG_BLK_DEV_NBD is not set | ||
555 | # CONFIG_BLK_DEV_UB is not set | ||
556 | CONFIG_BLK_DEV_RAM=y | ||
557 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
558 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
559 | # CONFIG_BLK_DEV_XIP is not set | ||
560 | # CONFIG_CDROM_PKTCDVD is not set | ||
561 | # CONFIG_ATA_OVER_ETH is not set | ||
562 | # CONFIG_MISC_DEVICES is not set | ||
563 | CONFIG_HAVE_IDE=y | ||
564 | # CONFIG_IDE is not set | ||
565 | |||
566 | # | ||
567 | # SCSI device support | ||
568 | # | ||
569 | # CONFIG_RAID_ATTRS is not set | ||
570 | CONFIG_SCSI=y | ||
571 | CONFIG_SCSI_DMA=y | ||
572 | # CONFIG_SCSI_TGT is not set | ||
573 | # CONFIG_SCSI_NETLINK is not set | ||
574 | CONFIG_SCSI_PROC_FS=y | ||
575 | |||
576 | # | ||
577 | # SCSI support type (disk, tape, CD-ROM) | ||
578 | # | ||
579 | CONFIG_BLK_DEV_SD=y | ||
580 | # CONFIG_CHR_DEV_ST is not set | ||
581 | # CONFIG_CHR_DEV_OSST is not set | ||
582 | # CONFIG_BLK_DEV_SR is not set | ||
583 | # CONFIG_CHR_DEV_SG is not set | ||
584 | # CONFIG_CHR_DEV_SCH is not set | ||
585 | |||
586 | # | ||
587 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
588 | # | ||
589 | # CONFIG_SCSI_MULTI_LUN is not set | ||
590 | # CONFIG_SCSI_CONSTANTS is not set | ||
591 | # CONFIG_SCSI_LOGGING is not set | ||
592 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
593 | CONFIG_SCSI_WAIT_SCAN=m | ||
594 | |||
595 | # | ||
596 | # SCSI Transports | ||
597 | # | ||
598 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
599 | # CONFIG_SCSI_FC_ATTRS is not set | ||
600 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
601 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
602 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
603 | # CONFIG_SCSI_LOWLEVEL is not set | ||
604 | # CONFIG_SCSI_DH is not set | ||
605 | # CONFIG_ATA is not set | ||
606 | # CONFIG_MD is not set | ||
607 | CONFIG_NETDEVICES=y | ||
608 | # CONFIG_DUMMY is not set | ||
609 | # CONFIG_BONDING is not set | ||
610 | # CONFIG_MACVLAN is not set | ||
611 | # CONFIG_EQUALIZER is not set | ||
612 | # CONFIG_TUN is not set | ||
613 | # CONFIG_VETH is not set | ||
614 | # CONFIG_PHYLIB is not set | ||
615 | CONFIG_NET_ETHERNET=y | ||
616 | CONFIG_MII=y | ||
617 | # CONFIG_AX88796 is not set | ||
618 | # CONFIG_SMC91X is not set | ||
619 | CONFIG_DM9000=y | ||
620 | CONFIG_DM9000_DEBUGLEVEL=1 | ||
621 | # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set | ||
622 | # CONFIG_ENC28J60 is not set | ||
623 | # CONFIG_SMC911X is not set | ||
624 | # CONFIG_SMSC911X is not set | ||
625 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
626 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
627 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
628 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
629 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
630 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
631 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
632 | # CONFIG_B44 is not set | ||
633 | # CONFIG_NETDEV_1000 is not set | ||
634 | # CONFIG_NETDEV_10000 is not set | ||
635 | |||
636 | # | ||
637 | # Wireless LAN | ||
638 | # | ||
639 | # CONFIG_WLAN_PRE80211 is not set | ||
640 | CONFIG_WLAN_80211=y | ||
641 | CONFIG_LIBERTAS=m | ||
642 | # CONFIG_LIBERTAS_USB is not set | ||
643 | CONFIG_LIBERTAS_SDIO=m | ||
644 | # CONFIG_LIBERTAS_DEBUG is not set | ||
645 | # CONFIG_USB_ZD1201 is not set | ||
646 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
647 | # CONFIG_IWLWIFI_LEDS is not set | ||
648 | # CONFIG_HOSTAP is not set | ||
649 | |||
650 | # | ||
651 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
652 | # | ||
653 | |||
654 | # | ||
655 | # USB Network Adapters | ||
656 | # | ||
657 | # CONFIG_USB_CATC is not set | ||
658 | # CONFIG_USB_KAWETH is not set | ||
659 | # CONFIG_USB_PEGASUS is not set | ||
660 | # CONFIG_USB_RTL8150 is not set | ||
661 | # CONFIG_USB_USBNET is not set | ||
662 | # CONFIG_WAN is not set | ||
663 | CONFIG_PPP=m | ||
664 | CONFIG_PPP_MULTILINK=y | ||
665 | CONFIG_PPP_FILTER=y | ||
666 | CONFIG_PPP_ASYNC=m | ||
667 | # CONFIG_PPP_SYNC_TTY is not set | ||
668 | CONFIG_PPP_DEFLATE=m | ||
669 | CONFIG_PPP_BSDCOMP=m | ||
670 | # CONFIG_PPP_MPPE is not set | ||
671 | # CONFIG_PPPOE is not set | ||
672 | # CONFIG_PPPOL2TP is not set | ||
673 | # CONFIG_SLIP is not set | ||
674 | CONFIG_SLHC=m | ||
675 | # CONFIG_NETCONSOLE is not set | ||
676 | # CONFIG_NETPOLL is not set | ||
677 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
678 | # CONFIG_ISDN is not set | ||
679 | |||
680 | # | ||
681 | # Input device support | ||
682 | # | ||
683 | CONFIG_INPUT=y | ||
684 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
685 | # CONFIG_INPUT_POLLDEV is not set | ||
686 | |||
687 | # | ||
688 | # Userland interfaces | ||
689 | # | ||
690 | CONFIG_INPUT_MOUSEDEV=y | ||
691 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
692 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
693 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
694 | # CONFIG_INPUT_JOYDEV is not set | ||
695 | CONFIG_INPUT_EVDEV=y | ||
696 | # CONFIG_INPUT_EVBUG is not set | ||
697 | CONFIG_INPUT_APMPOWER=y | ||
698 | |||
699 | # | ||
700 | # Input Device Drivers | ||
701 | # | ||
702 | CONFIG_INPUT_KEYBOARD=y | ||
703 | CONFIG_KEYBOARD_ATKBD=y | ||
704 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
705 | # CONFIG_KEYBOARD_LKKBD is not set | ||
706 | # CONFIG_KEYBOARD_XTKBD is not set | ||
707 | # CONFIG_KEYBOARD_NEWTON is not set | ||
708 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
709 | CONFIG_KEYBOARD_PXA27x=y | ||
710 | CONFIG_KEYBOARD_GPIO=y | ||
711 | # CONFIG_INPUT_MOUSE is not set | ||
712 | # CONFIG_INPUT_JOYSTICK is not set | ||
713 | # CONFIG_INPUT_TABLET is not set | ||
714 | CONFIG_INPUT_TOUCHSCREEN=y | ||
715 | # CONFIG_TOUCHSCREEN_ADS7846 is not set | ||
716 | # CONFIG_TOUCHSCREEN_DA9034 is not set | ||
717 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
718 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
719 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
720 | # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set | ||
721 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
722 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
723 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
724 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
725 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
726 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
727 | CONFIG_TOUCHSCREEN_WM97XX=m | ||
728 | # CONFIG_TOUCHSCREEN_WM9705 is not set | ||
729 | CONFIG_TOUCHSCREEN_WM9712=y | ||
730 | # CONFIG_TOUCHSCREEN_WM9713 is not set | ||
731 | # CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set | ||
732 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
733 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
734 | # CONFIG_TOUCHSCREEN_TSC2007 is not set | ||
735 | # CONFIG_INPUT_MISC is not set | ||
736 | |||
737 | # | ||
738 | # Hardware I/O ports | ||
739 | # | ||
740 | CONFIG_SERIO=y | ||
741 | # CONFIG_SERIO_SERPORT is not set | ||
742 | CONFIG_SERIO_LIBPS2=y | ||
743 | # CONFIG_SERIO_RAW is not set | ||
744 | # CONFIG_GAMEPORT is not set | ||
745 | |||
746 | # | ||
747 | # Character devices | ||
748 | # | ||
749 | CONFIG_VT=y | ||
750 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
751 | CONFIG_VT_CONSOLE=y | ||
752 | CONFIG_HW_CONSOLE=y | ||
753 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
754 | CONFIG_DEVKMEM=y | ||
755 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
756 | |||
757 | # | ||
758 | # Serial drivers | ||
759 | # | ||
760 | # CONFIG_SERIAL_8250 is not set | ||
761 | |||
762 | # | ||
763 | # Non-8250 serial port support | ||
764 | # | ||
765 | CONFIG_SERIAL_PXA=y | ||
766 | CONFIG_SERIAL_PXA_CONSOLE=y | ||
767 | CONFIG_SERIAL_CORE=y | ||
768 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
769 | CONFIG_UNIX98_PTYS=y | ||
770 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
771 | CONFIG_LEGACY_PTYS=y | ||
772 | CONFIG_LEGACY_PTY_COUNT=16 | ||
773 | # CONFIG_IPMI_HANDLER is not set | ||
774 | # CONFIG_HW_RANDOM is not set | ||
775 | # CONFIG_NVRAM is not set | ||
776 | # CONFIG_R3964 is not set | ||
777 | # CONFIG_RAW_DRIVER is not set | ||
778 | # CONFIG_TCG_TPM is not set | ||
779 | CONFIG_I2C=y | ||
780 | CONFIG_I2C_BOARDINFO=y | ||
781 | CONFIG_I2C_CHARDEV=m | ||
782 | CONFIG_I2C_HELPER_AUTO=y | ||
783 | |||
784 | # | ||
785 | # I2C Hardware Bus support | ||
786 | # | ||
787 | |||
788 | # | ||
789 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
790 | # | ||
791 | # CONFIG_I2C_GPIO is not set | ||
792 | # CONFIG_I2C_OCORES is not set | ||
793 | CONFIG_I2C_PXA=y | ||
794 | # CONFIG_I2C_PXA_SLAVE is not set | ||
795 | # CONFIG_I2C_SIMTEC is not set | ||
796 | |||
797 | # | ||
798 | # External I2C/SMBus adapter drivers | ||
799 | # | ||
800 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
801 | # CONFIG_I2C_TAOS_EVM is not set | ||
802 | # CONFIG_I2C_TINY_USB is not set | ||
803 | |||
804 | # | ||
805 | # Other I2C/SMBus bus drivers | ||
806 | # | ||
807 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
808 | # CONFIG_I2C_STUB is not set | ||
809 | |||
810 | # | ||
811 | # Miscellaneous I2C Chip support | ||
812 | # | ||
813 | # CONFIG_DS1682 is not set | ||
814 | # CONFIG_EEPROM_AT24 is not set | ||
815 | # CONFIG_EEPROM_LEGACY is not set | ||
816 | # CONFIG_SENSORS_PCF8574 is not set | ||
817 | # CONFIG_PCF8575 is not set | ||
818 | # CONFIG_SENSORS_PCA9539 is not set | ||
819 | # CONFIG_SENSORS_PCF8591 is not set | ||
820 | # CONFIG_SENSORS_MAX6875 is not set | ||
821 | # CONFIG_SENSORS_TSL2550 is not set | ||
822 | # CONFIG_I2C_DEBUG_CORE is not set | ||
823 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
824 | # CONFIG_I2C_DEBUG_BUS is not set | ||
825 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
826 | CONFIG_SPI=y | ||
827 | # CONFIG_SPI_DEBUG is not set | ||
828 | CONFIG_SPI_MASTER=y | ||
829 | |||
830 | # | ||
831 | # SPI Master Controller Drivers | ||
832 | # | ||
833 | # CONFIG_SPI_BITBANG is not set | ||
834 | # CONFIG_SPI_GPIO is not set | ||
835 | CONFIG_SPI_PXA2XX=y | ||
836 | |||
837 | # | ||
838 | # SPI Protocol Masters | ||
839 | # | ||
840 | # CONFIG_SPI_AT25 is not set | ||
841 | # CONFIG_SPI_SPIDEV is not set | ||
842 | # CONFIG_SPI_TLE62X0 is not set | ||
843 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
844 | CONFIG_GPIOLIB=y | ||
845 | # CONFIG_DEBUG_GPIO is not set | ||
846 | # CONFIG_GPIO_SYSFS is not set | ||
847 | |||
848 | # | ||
849 | # Memory mapped GPIO expanders: | ||
850 | # | ||
851 | |||
852 | # | ||
853 | # I2C GPIO expanders: | ||
854 | # | ||
855 | # CONFIG_GPIO_MAX732X is not set | ||
856 | # CONFIG_GPIO_PCA953X is not set | ||
857 | # CONFIG_GPIO_PCF857X is not set | ||
858 | |||
859 | # | ||
860 | # PCI GPIO expanders: | ||
861 | # | ||
862 | |||
863 | # | ||
864 | # SPI GPIO expanders: | ||
865 | # | ||
866 | # CONFIG_GPIO_MAX7301 is not set | ||
867 | # CONFIG_GPIO_MCP23S08 is not set | ||
868 | # CONFIG_W1 is not set | ||
869 | CONFIG_POWER_SUPPLY=y | ||
870 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
871 | # CONFIG_PDA_POWER is not set | ||
872 | # CONFIG_APM_POWER is not set | ||
873 | # CONFIG_BATTERY_DS2760 is not set | ||
874 | # CONFIG_BATTERY_BQ27x00 is not set | ||
875 | CONFIG_BATTERY_DA9030=y | ||
876 | # CONFIG_HWMON is not set | ||
877 | # CONFIG_THERMAL is not set | ||
878 | # CONFIG_THERMAL_HWMON is not set | ||
879 | # CONFIG_WATCHDOG is not set | ||
880 | CONFIG_SSB_POSSIBLE=y | ||
881 | |||
882 | # | ||
883 | # Sonics Silicon Backplane | ||
884 | # | ||
885 | # CONFIG_SSB is not set | ||
886 | |||
887 | # | ||
888 | # Multifunction device drivers | ||
889 | # | ||
890 | # CONFIG_MFD_CORE is not set | ||
891 | # CONFIG_MFD_SM501 is not set | ||
892 | # CONFIG_MFD_ASIC3 is not set | ||
893 | # CONFIG_HTC_EGPIO is not set | ||
894 | # CONFIG_HTC_PASIC3 is not set | ||
895 | # CONFIG_UCB1400_CORE is not set | ||
896 | # CONFIG_TPS65010 is not set | ||
897 | # CONFIG_TWL4030_CORE is not set | ||
898 | # CONFIG_MFD_TMIO is not set | ||
899 | # CONFIG_MFD_T7L66XB is not set | ||
900 | # CONFIG_MFD_TC6387XB is not set | ||
901 | # CONFIG_MFD_TC6393XB is not set | ||
902 | CONFIG_PMIC_DA903X=y | ||
903 | # CONFIG_MFD_WM8400 is not set | ||
904 | # CONFIG_MFD_WM8350_I2C is not set | ||
905 | # CONFIG_MFD_PCF50633 is not set | ||
906 | |||
907 | # | ||
908 | # Multimedia devices | ||
909 | # | ||
910 | |||
911 | # | ||
912 | # Multimedia core support | ||
913 | # | ||
914 | CONFIG_VIDEO_DEV=m | ||
915 | CONFIG_VIDEO_V4L2_COMMON=m | ||
916 | # CONFIG_VIDEO_ALLOW_V4L1 is not set | ||
917 | CONFIG_VIDEO_V4L1_COMPAT=y | ||
918 | # CONFIG_DVB_CORE is not set | ||
919 | CONFIG_VIDEO_MEDIA=m | ||
920 | |||
921 | # | ||
922 | # Multimedia drivers | ||
923 | # | ||
924 | # CONFIG_MEDIA_ATTACH is not set | ||
925 | CONFIG_MEDIA_TUNER=m | ||
926 | CONFIG_MEDIA_TUNER_CUSTOMIZE=y | ||
927 | # CONFIG_MEDIA_TUNER_SIMPLE is not set | ||
928 | # CONFIG_MEDIA_TUNER_TDA8290 is not set | ||
929 | # CONFIG_MEDIA_TUNER_TDA827X is not set | ||
930 | # CONFIG_MEDIA_TUNER_TDA18271 is not set | ||
931 | # CONFIG_MEDIA_TUNER_TDA9887 is not set | ||
932 | # CONFIG_MEDIA_TUNER_TEA5761 is not set | ||
933 | # CONFIG_MEDIA_TUNER_TEA5767 is not set | ||
934 | # CONFIG_MEDIA_TUNER_MT20XX is not set | ||
935 | # CONFIG_MEDIA_TUNER_MT2060 is not set | ||
936 | # CONFIG_MEDIA_TUNER_MT2266 is not set | ||
937 | # CONFIG_MEDIA_TUNER_MT2131 is not set | ||
938 | # CONFIG_MEDIA_TUNER_QT1010 is not set | ||
939 | # CONFIG_MEDIA_TUNER_XC2028 is not set | ||
940 | # CONFIG_MEDIA_TUNER_XC5000 is not set | ||
941 | # CONFIG_MEDIA_TUNER_MXL5005S is not set | ||
942 | # CONFIG_MEDIA_TUNER_MXL5007T is not set | ||
943 | CONFIG_VIDEO_V4L2=m | ||
944 | CONFIG_VIDEOBUF_GEN=m | ||
945 | CONFIG_VIDEOBUF_DMA_SG=m | ||
946 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | ||
947 | # CONFIG_VIDEO_ADV_DEBUG is not set | ||
948 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | ||
949 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set | ||
950 | |||
951 | # | ||
952 | # Encoders/decoders and other helper chips | ||
953 | # | ||
954 | |||
955 | # | ||
956 | # Audio decoders | ||
957 | # | ||
958 | # CONFIG_VIDEO_TVAUDIO is not set | ||
959 | # CONFIG_VIDEO_TDA7432 is not set | ||
960 | # CONFIG_VIDEO_TDA9840 is not set | ||
961 | # CONFIG_VIDEO_TDA9875 is not set | ||
962 | # CONFIG_VIDEO_TEA6415C is not set | ||
963 | # CONFIG_VIDEO_TEA6420 is not set | ||
964 | # CONFIG_VIDEO_MSP3400 is not set | ||
965 | # CONFIG_VIDEO_CS5345 is not set | ||
966 | # CONFIG_VIDEO_CS53L32A is not set | ||
967 | # CONFIG_VIDEO_M52790 is not set | ||
968 | # CONFIG_VIDEO_TLV320AIC23B is not set | ||
969 | # CONFIG_VIDEO_WM8775 is not set | ||
970 | # CONFIG_VIDEO_WM8739 is not set | ||
971 | # CONFIG_VIDEO_VP27SMPX is not set | ||
972 | |||
973 | # | ||
974 | # Video decoders | ||
975 | # | ||
976 | # CONFIG_VIDEO_OV7670 is not set | ||
977 | # CONFIG_VIDEO_TCM825X is not set | ||
978 | # CONFIG_VIDEO_SAA711X is not set | ||
979 | # CONFIG_VIDEO_SAA717X is not set | ||
980 | # CONFIG_VIDEO_TVP514X is not set | ||
981 | # CONFIG_VIDEO_TVP5150 is not set | ||
982 | |||
983 | # | ||
984 | # Video and audio decoders | ||
985 | # | ||
986 | # CONFIG_VIDEO_CX25840 is not set | ||
987 | |||
988 | # | ||
989 | # MPEG video encoders | ||
990 | # | ||
991 | # CONFIG_VIDEO_CX2341X is not set | ||
992 | |||
993 | # | ||
994 | # Video encoders | ||
995 | # | ||
996 | # CONFIG_VIDEO_SAA7127 is not set | ||
997 | |||
998 | # | ||
999 | # Video improvement chips | ||
1000 | # | ||
1001 | # CONFIG_VIDEO_UPD64031A is not set | ||
1002 | # CONFIG_VIDEO_UPD64083 is not set | ||
1003 | # CONFIG_VIDEO_VIVI is not set | ||
1004 | # CONFIG_VIDEO_SAA5246A is not set | ||
1005 | # CONFIG_VIDEO_SAA5249 is not set | ||
1006 | CONFIG_SOC_CAMERA=m | ||
1007 | # CONFIG_SOC_CAMERA_MT9M001 is not set | ||
1008 | CONFIG_SOC_CAMERA_MT9M111=m | ||
1009 | # CONFIG_SOC_CAMERA_MT9T031 is not set | ||
1010 | # CONFIG_SOC_CAMERA_MT9V022 is not set | ||
1011 | # CONFIG_SOC_CAMERA_TW9910 is not set | ||
1012 | # CONFIG_SOC_CAMERA_PLATFORM is not set | ||
1013 | # CONFIG_SOC_CAMERA_OV772X is not set | ||
1014 | CONFIG_VIDEO_PXA27x=m | ||
1015 | # CONFIG_VIDEO_SH_MOBILE_CEU is not set | ||
1016 | # CONFIG_V4L_USB_DRIVERS is not set | ||
1017 | # CONFIG_RADIO_ADAPTERS is not set | ||
1018 | # CONFIG_DAB is not set | ||
1019 | |||
1020 | # | ||
1021 | # Graphics support | ||
1022 | # | ||
1023 | # CONFIG_VGASTATE is not set | ||
1024 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
1025 | CONFIG_FB=y | ||
1026 | # CONFIG_FIRMWARE_EDID is not set | ||
1027 | # CONFIG_FB_DDC is not set | ||
1028 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
1029 | CONFIG_FB_CFB_FILLRECT=y | ||
1030 | CONFIG_FB_CFB_COPYAREA=y | ||
1031 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
1032 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
1033 | # CONFIG_FB_SYS_FILLRECT is not set | ||
1034 | # CONFIG_FB_SYS_COPYAREA is not set | ||
1035 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
1036 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
1037 | # CONFIG_FB_SYS_FOPS is not set | ||
1038 | # CONFIG_FB_SVGALIB is not set | ||
1039 | # CONFIG_FB_MACMODES is not set | ||
1040 | # CONFIG_FB_BACKLIGHT is not set | ||
1041 | # CONFIG_FB_MODE_HELPERS is not set | ||
1042 | # CONFIG_FB_TILEBLITTING is not set | ||
1043 | |||
1044 | # | ||
1045 | # Frame buffer hardware drivers | ||
1046 | # | ||
1047 | # CONFIG_FB_S1D13XXX is not set | ||
1048 | CONFIG_FB_PXA=y | ||
1049 | # CONFIG_FB_PXA_OVERLAY is not set | ||
1050 | # CONFIG_FB_PXA_SMARTPANEL is not set | ||
1051 | CONFIG_FB_PXA_PARAMETERS=y | ||
1052 | CONFIG_FB_MBX=m | ||
1053 | # CONFIG_FB_MBX_DEBUG is not set | ||
1054 | # CONFIG_FB_W100 is not set | ||
1055 | # CONFIG_FB_VIRTUAL is not set | ||
1056 | # CONFIG_FB_METRONOME is not set | ||
1057 | # CONFIG_FB_MB862XX is not set | ||
1058 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
1059 | CONFIG_LCD_CLASS_DEVICE=y | ||
1060 | # CONFIG_LCD_LTV350QV is not set | ||
1061 | # CONFIG_LCD_ILI9320 is not set | ||
1062 | CONFIG_LCD_TDO24M=y | ||
1063 | # CONFIG_LCD_VGG2432A4 is not set | ||
1064 | # CONFIG_LCD_PLATFORM is not set | ||
1065 | CONFIG_BACKLIGHT_CLASS_DEVICE=m | ||
1066 | # CONFIG_BACKLIGHT_GENERIC is not set | ||
1067 | CONFIG_BACKLIGHT_DA903X=m | ||
1068 | |||
1069 | # | ||
1070 | # Display device support | ||
1071 | # | ||
1072 | # CONFIG_DISPLAY_SUPPORT is not set | ||
1073 | |||
1074 | # | ||
1075 | # Console display driver support | ||
1076 | # | ||
1077 | # CONFIG_VGA_CONSOLE is not set | ||
1078 | CONFIG_DUMMY_CONSOLE=y | ||
1079 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
1080 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
1081 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
1082 | # CONFIG_FONTS is not set | ||
1083 | CONFIG_FONT_8x8=y | ||
1084 | CONFIG_FONT_8x16=y | ||
1085 | CONFIG_LOGO=y | ||
1086 | CONFIG_LOGO_LINUX_MONO=y | ||
1087 | CONFIG_LOGO_LINUX_VGA16=y | ||
1088 | CONFIG_LOGO_LINUX_CLUT224=y | ||
1089 | CONFIG_SOUND=m | ||
1090 | CONFIG_SOUND_OSS_CORE=y | ||
1091 | CONFIG_SND=m | ||
1092 | CONFIG_SND_TIMER=m | ||
1093 | CONFIG_SND_PCM=m | ||
1094 | # CONFIG_SND_SEQUENCER is not set | ||
1095 | CONFIG_SND_OSSEMUL=y | ||
1096 | CONFIG_SND_MIXER_OSS=m | ||
1097 | CONFIG_SND_PCM_OSS=m | ||
1098 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
1099 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
1100 | CONFIG_SND_SUPPORT_OLD_API=y | ||
1101 | CONFIG_SND_VERBOSE_PROCFS=y | ||
1102 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
1103 | # CONFIG_SND_DEBUG is not set | ||
1104 | CONFIG_SND_VMASTER=y | ||
1105 | CONFIG_SND_AC97_CODEC=m | ||
1106 | # CONFIG_SND_DRIVERS is not set | ||
1107 | CONFIG_SND_ARM=y | ||
1108 | CONFIG_SND_PXA2XX_LIB=m | ||
1109 | CONFIG_SND_PXA2XX_LIB_AC97=y | ||
1110 | # CONFIG_SND_PXA2XX_AC97 is not set | ||
1111 | # CONFIG_SND_SPI is not set | ||
1112 | # CONFIG_SND_USB is not set | ||
1113 | CONFIG_SND_SOC=m | ||
1114 | CONFIG_SND_SOC_AC97_BUS=y | ||
1115 | CONFIG_SND_PXA2XX_SOC=m | ||
1116 | CONFIG_SND_PXA2XX_SOC_AC97=m | ||
1117 | CONFIG_SND_PXA2XX_SOC_EM_X270=m | ||
1118 | CONFIG_SND_SOC_I2C_AND_SPI=m | ||
1119 | # CONFIG_SND_SOC_ALL_CODECS is not set | ||
1120 | CONFIG_SND_SOC_WM9712=m | ||
1121 | # CONFIG_SOUND_PRIME is not set | ||
1122 | CONFIG_AC97_BUS=m | ||
1123 | CONFIG_HID_SUPPORT=y | ||
1124 | CONFIG_HID=y | ||
1125 | CONFIG_HID_DEBUG=y | ||
1126 | # CONFIG_HIDRAW is not set | ||
1127 | |||
1128 | # | ||
1129 | # USB Input Devices | ||
1130 | # | ||
1131 | CONFIG_USB_HID=y | ||
1132 | # CONFIG_HID_PID is not set | ||
1133 | # CONFIG_USB_HIDDEV is not set | ||
1134 | |||
1135 | # | ||
1136 | # Special HID drivers | ||
1137 | # | ||
1138 | CONFIG_HID_COMPAT=y | ||
1139 | CONFIG_HID_A4TECH=y | ||
1140 | CONFIG_HID_APPLE=y | ||
1141 | CONFIG_HID_BELKIN=y | ||
1142 | CONFIG_HID_CHERRY=y | ||
1143 | CONFIG_HID_CHICONY=y | ||
1144 | CONFIG_HID_CYPRESS=y | ||
1145 | CONFIG_HID_EZKEY=y | ||
1146 | CONFIG_HID_GYRATION=y | ||
1147 | CONFIG_HID_LOGITECH=y | ||
1148 | # CONFIG_LOGITECH_FF is not set | ||
1149 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
1150 | CONFIG_HID_MICROSOFT=y | ||
1151 | CONFIG_HID_MONTEREY=y | ||
1152 | # CONFIG_HID_NTRIG is not set | ||
1153 | CONFIG_HID_PANTHERLORD=y | ||
1154 | # CONFIG_PANTHERLORD_FF is not set | ||
1155 | CONFIG_HID_PETALYNX=y | ||
1156 | CONFIG_HID_SAMSUNG=y | ||
1157 | CONFIG_HID_SONY=y | ||
1158 | CONFIG_HID_SUNPLUS=y | ||
1159 | # CONFIG_GREENASIA_FF is not set | ||
1160 | # CONFIG_HID_TOPSEED is not set | ||
1161 | # CONFIG_THRUSTMASTER_FF is not set | ||
1162 | # CONFIG_ZEROPLUS_FF is not set | ||
1163 | CONFIG_USB_SUPPORT=y | ||
1164 | CONFIG_USB_ARCH_HAS_HCD=y | ||
1165 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
1166 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
1167 | CONFIG_USB=y | ||
1168 | # CONFIG_USB_DEBUG is not set | ||
1169 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
1170 | |||
1171 | # | ||
1172 | # Miscellaneous USB options | ||
1173 | # | ||
1174 | CONFIG_USB_DEVICEFS=y | ||
1175 | # CONFIG_USB_DEVICE_CLASS is not set | ||
1176 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
1177 | # CONFIG_USB_SUSPEND is not set | ||
1178 | # CONFIG_USB_OTG is not set | ||
1179 | # CONFIG_USB_OTG_WHITELIST is not set | ||
1180 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
1181 | CONFIG_USB_MON=y | ||
1182 | # CONFIG_USB_WUSB is not set | ||
1183 | # CONFIG_USB_WUSB_CBAF is not set | ||
1184 | |||
1185 | # | ||
1186 | # USB Host Controller Drivers | ||
1187 | # | ||
1188 | # CONFIG_USB_C67X00_HCD is not set | ||
1189 | # CONFIG_USB_OXU210HP_HCD is not set | ||
1190 | # CONFIG_USB_ISP116X_HCD is not set | ||
1191 | CONFIG_USB_OHCI_HCD=y | ||
1192 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
1193 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
1194 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
1195 | # CONFIG_USB_SL811_HCD is not set | ||
1196 | # CONFIG_USB_R8A66597_HCD is not set | ||
1197 | # CONFIG_USB_HWA_HCD is not set | ||
1198 | # CONFIG_USB_MUSB_HDRC is not set | ||
1199 | |||
1200 | # | ||
1201 | # USB Device Class drivers | ||
1202 | # | ||
1203 | # CONFIG_USB_ACM is not set | ||
1204 | # CONFIG_USB_PRINTER is not set | ||
1205 | # CONFIG_USB_WDM is not set | ||
1206 | # CONFIG_USB_TMC is not set | ||
1207 | |||
1208 | # | ||
1209 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | ||
1210 | # | ||
1211 | |||
1212 | # | ||
1213 | # see USB_STORAGE Help for more information | ||
1214 | # | ||
1215 | CONFIG_USB_STORAGE=y | ||
1216 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
1217 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
1218 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
1219 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
1220 | # CONFIG_USB_STORAGE_USBAT is not set | ||
1221 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
1222 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
1223 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
1224 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
1225 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
1226 | # CONFIG_USB_STORAGE_KARMA is not set | ||
1227 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
1228 | # CONFIG_USB_LIBUSUAL is not set | ||
1229 | |||
1230 | # | ||
1231 | # USB Imaging devices | ||
1232 | # | ||
1233 | # CONFIG_USB_MDC800 is not set | ||
1234 | # CONFIG_USB_MICROTEK is not set | ||
1235 | |||
1236 | # | ||
1237 | # USB port drivers | ||
1238 | # | ||
1239 | # CONFIG_USB_SERIAL is not set | ||
1240 | |||
1241 | # | ||
1242 | # USB Miscellaneous drivers | ||
1243 | # | ||
1244 | # CONFIG_USB_EMI62 is not set | ||
1245 | # CONFIG_USB_EMI26 is not set | ||
1246 | # CONFIG_USB_ADUTUX is not set | ||
1247 | # CONFIG_USB_SEVSEG is not set | ||
1248 | # CONFIG_USB_RIO500 is not set | ||
1249 | # CONFIG_USB_LEGOTOWER is not set | ||
1250 | # CONFIG_USB_LCD is not set | ||
1251 | # CONFIG_USB_BERRY_CHARGE is not set | ||
1252 | # CONFIG_USB_LED is not set | ||
1253 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
1254 | # CONFIG_USB_CYTHERM is not set | ||
1255 | # CONFIG_USB_PHIDGET is not set | ||
1256 | # CONFIG_USB_IDMOUSE is not set | ||
1257 | # CONFIG_USB_FTDI_ELAN is not set | ||
1258 | # CONFIG_USB_APPLEDISPLAY is not set | ||
1259 | # CONFIG_USB_LD is not set | ||
1260 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
1261 | # CONFIG_USB_IOWARRIOR is not set | ||
1262 | # CONFIG_USB_TEST is not set | ||
1263 | # CONFIG_USB_ISIGHTFW is not set | ||
1264 | # CONFIG_USB_VST is not set | ||
1265 | # CONFIG_USB_GADGET is not set | ||
1266 | |||
1267 | # | ||
1268 | # OTG and related infrastructure | ||
1269 | # | ||
1270 | # CONFIG_USB_GPIO_VBUS is not set | ||
1271 | CONFIG_MMC=m | ||
1272 | # CONFIG_MMC_DEBUG is not set | ||
1273 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
1274 | |||
1275 | # | ||
1276 | # MMC/SD/SDIO Card Drivers | ||
1277 | # | ||
1278 | CONFIG_MMC_BLOCK=m | ||
1279 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
1280 | # CONFIG_SDIO_UART is not set | ||
1281 | # CONFIG_MMC_TEST is not set | ||
1282 | |||
1283 | # | ||
1284 | # MMC/SD/SDIO Host Controller Drivers | ||
1285 | # | ||
1286 | CONFIG_MMC_PXA=m | ||
1287 | # CONFIG_MMC_SDHCI is not set | ||
1288 | # CONFIG_MMC_SPI is not set | ||
1289 | # CONFIG_MEMSTICK is not set | ||
1290 | # CONFIG_ACCESSIBILITY is not set | ||
1291 | CONFIG_NEW_LEDS=y | ||
1292 | CONFIG_LEDS_CLASS=y | ||
1293 | |||
1294 | # | ||
1295 | # LED drivers | ||
1296 | # | ||
1297 | # CONFIG_LEDS_PCA9532 is not set | ||
1298 | # CONFIG_LEDS_GPIO is not set | ||
1299 | # CONFIG_LEDS_PCA955X is not set | ||
1300 | CONFIG_LEDS_DA903X=y | ||
1301 | |||
1302 | # | ||
1303 | # LED Triggers | ||
1304 | # | ||
1305 | CONFIG_LEDS_TRIGGERS=y | ||
1306 | # CONFIG_LEDS_TRIGGER_TIMER is not set | ||
1307 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
1308 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
1309 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
1310 | CONFIG_RTC_LIB=y | ||
1311 | CONFIG_RTC_CLASS=y | ||
1312 | CONFIG_RTC_HCTOSYS=y | ||
1313 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
1314 | # CONFIG_RTC_DEBUG is not set | ||
1315 | |||
1316 | # | ||
1317 | # RTC interfaces | ||
1318 | # | ||
1319 | CONFIG_RTC_INTF_SYSFS=y | ||
1320 | CONFIG_RTC_INTF_PROC=y | ||
1321 | CONFIG_RTC_INTF_DEV=y | ||
1322 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
1323 | # CONFIG_RTC_DRV_TEST is not set | ||
1324 | |||
1325 | # | ||
1326 | # I2C RTC drivers | ||
1327 | # | ||
1328 | # CONFIG_RTC_DRV_DS1307 is not set | ||
1329 | # CONFIG_RTC_DRV_DS1374 is not set | ||
1330 | # CONFIG_RTC_DRV_DS1672 is not set | ||
1331 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
1332 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
1333 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
1334 | # CONFIG_RTC_DRV_X1205 is not set | ||
1335 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
1336 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
1337 | # CONFIG_RTC_DRV_M41T80 is not set | ||
1338 | # CONFIG_RTC_DRV_S35390A is not set | ||
1339 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1340 | # CONFIG_RTC_DRV_RX8581 is not set | ||
1341 | |||
1342 | # | ||
1343 | # SPI RTC drivers | ||
1344 | # | ||
1345 | # CONFIG_RTC_DRV_M41T94 is not set | ||
1346 | # CONFIG_RTC_DRV_DS1305 is not set | ||
1347 | # CONFIG_RTC_DRV_DS1390 is not set | ||
1348 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
1349 | # CONFIG_RTC_DRV_R9701 is not set | ||
1350 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
1351 | # CONFIG_RTC_DRV_DS3234 is not set | ||
1352 | |||
1353 | # | ||
1354 | # Platform RTC drivers | ||
1355 | # | ||
1356 | # CONFIG_RTC_DRV_CMOS is not set | ||
1357 | # CONFIG_RTC_DRV_DS1286 is not set | ||
1358 | # CONFIG_RTC_DRV_DS1511 is not set | ||
1359 | # CONFIG_RTC_DRV_DS1553 is not set | ||
1360 | # CONFIG_RTC_DRV_DS1742 is not set | ||
1361 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
1362 | # CONFIG_RTC_DRV_M48T86 is not set | ||
1363 | # CONFIG_RTC_DRV_M48T35 is not set | ||
1364 | # CONFIG_RTC_DRV_M48T59 is not set | ||
1365 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
1366 | CONFIG_RTC_DRV_V3020=y | ||
1367 | |||
1368 | # | ||
1369 | # on-CPU RTC drivers | ||
1370 | # | ||
1371 | CONFIG_RTC_DRV_SA1100=y | ||
1372 | # CONFIG_RTC_DRV_PXA is not set | ||
1373 | # CONFIG_DMADEVICES is not set | ||
1374 | CONFIG_REGULATOR=y | ||
1375 | # CONFIG_REGULATOR_DEBUG is not set | ||
1376 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
1377 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
1378 | # CONFIG_REGULATOR_BQ24022 is not set | ||
1379 | CONFIG_REGULATOR_DA903X=y | ||
1380 | # CONFIG_UIO is not set | ||
1381 | # CONFIG_STAGING is not set | ||
1382 | |||
1383 | # | ||
1384 | # File systems | ||
1385 | # | ||
1386 | CONFIG_EXT2_FS=y | ||
1387 | # CONFIG_EXT2_FS_XATTR is not set | ||
1388 | # CONFIG_EXT2_FS_XIP is not set | ||
1389 | CONFIG_EXT3_FS=y | ||
1390 | CONFIG_EXT3_FS_XATTR=y | ||
1391 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
1392 | # CONFIG_EXT3_FS_SECURITY is not set | ||
1393 | # CONFIG_EXT4_FS is not set | ||
1394 | CONFIG_JBD=y | ||
1395 | # CONFIG_JBD_DEBUG is not set | ||
1396 | CONFIG_FS_MBCACHE=y | ||
1397 | # CONFIG_REISERFS_FS is not set | ||
1398 | # CONFIG_JFS_FS is not set | ||
1399 | # CONFIG_FS_POSIX_ACL is not set | ||
1400 | CONFIG_FILE_LOCKING=y | ||
1401 | # CONFIG_XFS_FS is not set | ||
1402 | # CONFIG_OCFS2_FS is not set | ||
1403 | # CONFIG_BTRFS_FS is not set | ||
1404 | CONFIG_DNOTIFY=y | ||
1405 | CONFIG_INOTIFY=y | ||
1406 | CONFIG_INOTIFY_USER=y | ||
1407 | # CONFIG_QUOTA is not set | ||
1408 | # CONFIG_AUTOFS_FS is not set | ||
1409 | # CONFIG_AUTOFS4_FS is not set | ||
1410 | # CONFIG_FUSE_FS is not set | ||
1411 | |||
1412 | # | ||
1413 | # CD-ROM/DVD Filesystems | ||
1414 | # | ||
1415 | # CONFIG_ISO9660_FS is not set | ||
1416 | # CONFIG_UDF_FS is not set | ||
1417 | |||
1418 | # | ||
1419 | # DOS/FAT/NT Filesystems | ||
1420 | # | ||
1421 | CONFIG_FAT_FS=m | ||
1422 | # CONFIG_MSDOS_FS is not set | ||
1423 | CONFIG_VFAT_FS=m | ||
1424 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
1425 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
1426 | # CONFIG_NTFS_FS is not set | ||
1427 | |||
1428 | # | ||
1429 | # Pseudo filesystems | ||
1430 | # | ||
1431 | CONFIG_PROC_FS=y | ||
1432 | CONFIG_PROC_SYSCTL=y | ||
1433 | # CONFIG_PROC_PAGE_MONITOR is not set | ||
1434 | CONFIG_SYSFS=y | ||
1435 | CONFIG_TMPFS=y | ||
1436 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
1437 | # CONFIG_HUGETLB_PAGE is not set | ||
1438 | # CONFIG_CONFIGFS_FS is not set | ||
1439 | CONFIG_MISC_FILESYSTEMS=y | ||
1440 | # CONFIG_ADFS_FS is not set | ||
1441 | # CONFIG_AFFS_FS is not set | ||
1442 | # CONFIG_HFS_FS is not set | ||
1443 | # CONFIG_HFSPLUS_FS is not set | ||
1444 | # CONFIG_BEFS_FS is not set | ||
1445 | # CONFIG_BFS_FS is not set | ||
1446 | # CONFIG_EFS_FS is not set | ||
1447 | CONFIG_JFFS2_FS=y | ||
1448 | CONFIG_JFFS2_FS_DEBUG=0 | ||
1449 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
1450 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
1451 | CONFIG_JFFS2_SUMMARY=y | ||
1452 | # CONFIG_JFFS2_FS_XATTR is not set | ||
1453 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
1454 | CONFIG_JFFS2_ZLIB=y | ||
1455 | # CONFIG_JFFS2_LZO is not set | ||
1456 | CONFIG_JFFS2_RTIME=y | ||
1457 | # CONFIG_JFFS2_RUBIN is not set | ||
1458 | # CONFIG_CRAMFS is not set | ||
1459 | # CONFIG_SQUASHFS is not set | ||
1460 | # CONFIG_VXFS_FS is not set | ||
1461 | # CONFIG_MINIX_FS is not set | ||
1462 | # CONFIG_OMFS_FS is not set | ||
1463 | # CONFIG_HPFS_FS is not set | ||
1464 | # CONFIG_QNX4FS_FS is not set | ||
1465 | # CONFIG_ROMFS_FS is not set | ||
1466 | # CONFIG_SYSV_FS is not set | ||
1467 | # CONFIG_UFS_FS is not set | ||
1468 | CONFIG_NETWORK_FILESYSTEMS=y | ||
1469 | CONFIG_NFS_FS=y | ||
1470 | CONFIG_NFS_V3=y | ||
1471 | # CONFIG_NFS_V3_ACL is not set | ||
1472 | # CONFIG_NFS_V4 is not set | ||
1473 | CONFIG_ROOT_NFS=y | ||
1474 | # CONFIG_NFSD is not set | ||
1475 | CONFIG_LOCKD=y | ||
1476 | CONFIG_LOCKD_V4=y | ||
1477 | CONFIG_NFS_COMMON=y | ||
1478 | CONFIG_SUNRPC=y | ||
1479 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
1480 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1481 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1482 | # CONFIG_SMB_FS is not set | ||
1483 | CONFIG_CIFS=m | ||
1484 | # CONFIG_CIFS_STATS is not set | ||
1485 | # CONFIG_CIFS_WEAK_PW_HASH is not set | ||
1486 | # CONFIG_CIFS_XATTR is not set | ||
1487 | # CONFIG_CIFS_DEBUG2 is not set | ||
1488 | # CONFIG_CIFS_EXPERIMENTAL is not set | ||
1489 | # CONFIG_NCP_FS is not set | ||
1490 | # CONFIG_CODA_FS is not set | ||
1491 | # CONFIG_AFS_FS is not set | ||
1492 | |||
1493 | # | ||
1494 | # Partition Types | ||
1495 | # | ||
1496 | CONFIG_PARTITION_ADVANCED=y | ||
1497 | # CONFIG_ACORN_PARTITION is not set | ||
1498 | # CONFIG_OSF_PARTITION is not set | ||
1499 | # CONFIG_AMIGA_PARTITION is not set | ||
1500 | # CONFIG_ATARI_PARTITION is not set | ||
1501 | # CONFIG_MAC_PARTITION is not set | ||
1502 | CONFIG_MSDOS_PARTITION=y | ||
1503 | # CONFIG_BSD_DISKLABEL is not set | ||
1504 | # CONFIG_MINIX_SUBPARTITION is not set | ||
1505 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
1506 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
1507 | # CONFIG_LDM_PARTITION is not set | ||
1508 | # CONFIG_SGI_PARTITION is not set | ||
1509 | # CONFIG_ULTRIX_PARTITION is not set | ||
1510 | # CONFIG_SUN_PARTITION is not set | ||
1511 | # CONFIG_KARMA_PARTITION is not set | ||
1512 | # CONFIG_EFI_PARTITION is not set | ||
1513 | # CONFIG_SYSV68_PARTITION is not set | ||
1514 | CONFIG_NLS=m | ||
1515 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1516 | CONFIG_NLS_CODEPAGE_437=m | ||
1517 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1518 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1519 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1520 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1521 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1522 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1523 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1524 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1525 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1526 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1527 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1528 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1529 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1530 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1531 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1532 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1533 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1534 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1535 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1536 | # CONFIG_NLS_ISO8859_8 is not set | ||
1537 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1538 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1539 | # CONFIG_NLS_ASCII is not set | ||
1540 | CONFIG_NLS_ISO8859_1=m | ||
1541 | # CONFIG_NLS_ISO8859_2 is not set | ||
1542 | # CONFIG_NLS_ISO8859_3 is not set | ||
1543 | # CONFIG_NLS_ISO8859_4 is not set | ||
1544 | # CONFIG_NLS_ISO8859_5 is not set | ||
1545 | # CONFIG_NLS_ISO8859_6 is not set | ||
1546 | # CONFIG_NLS_ISO8859_7 is not set | ||
1547 | # CONFIG_NLS_ISO8859_9 is not set | ||
1548 | # CONFIG_NLS_ISO8859_13 is not set | ||
1549 | # CONFIG_NLS_ISO8859_14 is not set | ||
1550 | # CONFIG_NLS_ISO8859_15 is not set | ||
1551 | # CONFIG_NLS_KOI8_R is not set | ||
1552 | # CONFIG_NLS_KOI8_U is not set | ||
1553 | CONFIG_NLS_UTF8=m | ||
1554 | # CONFIG_DLM is not set | ||
1555 | |||
1556 | # | ||
1557 | # Kernel hacking | ||
1558 | # | ||
1559 | # CONFIG_PRINTK_TIME is not set | ||
1560 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1561 | CONFIG_ENABLE_MUST_CHECK=y | ||
1562 | CONFIG_FRAME_WARN=0 | ||
1563 | # CONFIG_MAGIC_SYSRQ is not set | ||
1564 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1565 | CONFIG_DEBUG_FS=y | ||
1566 | # CONFIG_HEADERS_CHECK is not set | ||
1567 | CONFIG_DEBUG_KERNEL=y | ||
1568 | # CONFIG_DEBUG_SHIRQ is not set | ||
1569 | # CONFIG_DETECT_SOFTLOCKUP is not set | ||
1570 | # CONFIG_SCHED_DEBUG is not set | ||
1571 | # CONFIG_SCHEDSTATS is not set | ||
1572 | # CONFIG_TIMER_STATS is not set | ||
1573 | # CONFIG_DEBUG_OBJECTS is not set | ||
1574 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1575 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1576 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1577 | # CONFIG_DEBUG_MUTEXES is not set | ||
1578 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1579 | # CONFIG_PROVE_LOCKING is not set | ||
1580 | # CONFIG_LOCK_STAT is not set | ||
1581 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1582 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1583 | # CONFIG_DEBUG_KOBJECT is not set | ||
1584 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
1585 | # CONFIG_DEBUG_INFO is not set | ||
1586 | # CONFIG_DEBUG_VM is not set | ||
1587 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1588 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1589 | # CONFIG_DEBUG_LIST is not set | ||
1590 | # CONFIG_DEBUG_SG is not set | ||
1591 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
1592 | CONFIG_FRAME_POINTER=y | ||
1593 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1594 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1595 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1596 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1597 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1598 | # CONFIG_FAULT_INJECTION is not set | ||
1599 | # CONFIG_LATENCYTOP is not set | ||
1600 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1601 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1602 | |||
1603 | # | ||
1604 | # Tracers | ||
1605 | # | ||
1606 | # CONFIG_FUNCTION_TRACER is not set | ||
1607 | # CONFIG_IRQSOFF_TRACER is not set | ||
1608 | # CONFIG_SCHED_TRACER is not set | ||
1609 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1610 | # CONFIG_BOOT_TRACER is not set | ||
1611 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1612 | # CONFIG_STACK_TRACER is not set | ||
1613 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1614 | # CONFIG_SAMPLES is not set | ||
1615 | CONFIG_HAVE_ARCH_KGDB=y | ||
1616 | # CONFIG_KGDB is not set | ||
1617 | CONFIG_DEBUG_USER=y | ||
1618 | CONFIG_DEBUG_ERRORS=y | ||
1619 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
1620 | CONFIG_DEBUG_LL=y | ||
1621 | # CONFIG_DEBUG_ICEDCC is not set | ||
1622 | |||
1623 | # | ||
1624 | # Security options | ||
1625 | # | ||
1626 | # CONFIG_KEYS is not set | ||
1627 | # CONFIG_SECURITY is not set | ||
1628 | # CONFIG_SECURITYFS is not set | ||
1629 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
1630 | CONFIG_CRYPTO=y | ||
1631 | |||
1632 | # | ||
1633 | # Crypto core or helper | ||
1634 | # | ||
1635 | # CONFIG_CRYPTO_FIPS is not set | ||
1636 | CONFIG_CRYPTO_ALGAPI=m | ||
1637 | CONFIG_CRYPTO_ALGAPI2=m | ||
1638 | CONFIG_CRYPTO_AEAD2=m | ||
1639 | CONFIG_CRYPTO_BLKCIPHER=m | ||
1640 | CONFIG_CRYPTO_BLKCIPHER2=m | ||
1641 | CONFIG_CRYPTO_HASH=m | ||
1642 | CONFIG_CRYPTO_HASH2=m | ||
1643 | CONFIG_CRYPTO_RNG2=m | ||
1644 | CONFIG_CRYPTO_MANAGER=m | ||
1645 | CONFIG_CRYPTO_MANAGER2=m | ||
1646 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1647 | # CONFIG_CRYPTO_NULL is not set | ||
1648 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1649 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1650 | # CONFIG_CRYPTO_TEST is not set | ||
1651 | |||
1652 | # | ||
1653 | # Authenticated Encryption with Associated Data | ||
1654 | # | ||
1655 | # CONFIG_CRYPTO_CCM is not set | ||
1656 | # CONFIG_CRYPTO_GCM is not set | ||
1657 | # CONFIG_CRYPTO_SEQIV is not set | ||
1658 | |||
1659 | # | ||
1660 | # Block modes | ||
1661 | # | ||
1662 | # CONFIG_CRYPTO_CBC is not set | ||
1663 | # CONFIG_CRYPTO_CTR is not set | ||
1664 | # CONFIG_CRYPTO_CTS is not set | ||
1665 | CONFIG_CRYPTO_ECB=m | ||
1666 | # CONFIG_CRYPTO_LRW is not set | ||
1667 | # CONFIG_CRYPTO_PCBC is not set | ||
1668 | # CONFIG_CRYPTO_XTS is not set | ||
1669 | |||
1670 | # | ||
1671 | # Hash modes | ||
1672 | # | ||
1673 | # CONFIG_CRYPTO_HMAC is not set | ||
1674 | # CONFIG_CRYPTO_XCBC is not set | ||
1675 | |||
1676 | # | ||
1677 | # Digest | ||
1678 | # | ||
1679 | # CONFIG_CRYPTO_CRC32C is not set | ||
1680 | # CONFIG_CRYPTO_MD4 is not set | ||
1681 | # CONFIG_CRYPTO_MD5 is not set | ||
1682 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1683 | # CONFIG_CRYPTO_RMD128 is not set | ||
1684 | # CONFIG_CRYPTO_RMD160 is not set | ||
1685 | # CONFIG_CRYPTO_RMD256 is not set | ||
1686 | # CONFIG_CRYPTO_RMD320 is not set | ||
1687 | # CONFIG_CRYPTO_SHA1 is not set | ||
1688 | # CONFIG_CRYPTO_SHA256 is not set | ||
1689 | # CONFIG_CRYPTO_SHA512 is not set | ||
1690 | # CONFIG_CRYPTO_TGR192 is not set | ||
1691 | # CONFIG_CRYPTO_WP512 is not set | ||
1692 | |||
1693 | # | ||
1694 | # Ciphers | ||
1695 | # | ||
1696 | CONFIG_CRYPTO_AES=m | ||
1697 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1698 | CONFIG_CRYPTO_ARC4=m | ||
1699 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1700 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1701 | # CONFIG_CRYPTO_CAST5 is not set | ||
1702 | # CONFIG_CRYPTO_CAST6 is not set | ||
1703 | # CONFIG_CRYPTO_DES is not set | ||
1704 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1705 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1706 | # CONFIG_CRYPTO_SALSA20 is not set | ||
1707 | # CONFIG_CRYPTO_SEED is not set | ||
1708 | # CONFIG_CRYPTO_SERPENT is not set | ||
1709 | # CONFIG_CRYPTO_TEA is not set | ||
1710 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1711 | |||
1712 | # | ||
1713 | # Compression | ||
1714 | # | ||
1715 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1716 | # CONFIG_CRYPTO_LZO is not set | ||
1717 | |||
1718 | # | ||
1719 | # Random Number Generation | ||
1720 | # | ||
1721 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1722 | # CONFIG_CRYPTO_HW is not set | ||
1723 | |||
1724 | # | ||
1725 | # Library routines | ||
1726 | # | ||
1727 | CONFIG_BITREVERSE=y | ||
1728 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
1729 | CONFIG_CRC_CCITT=m | ||
1730 | # CONFIG_CRC16 is not set | ||
1731 | # CONFIG_CRC_T10DIF is not set | ||
1732 | # CONFIG_CRC_ITU_T is not set | ||
1733 | CONFIG_CRC32=y | ||
1734 | # CONFIG_CRC7 is not set | ||
1735 | # CONFIG_LIBCRC32C is not set | ||
1736 | CONFIG_ZLIB_INFLATE=y | ||
1737 | CONFIG_ZLIB_DEFLATE=y | ||
1738 | CONFIG_PLIST=y | ||
1739 | CONFIG_HAS_IOMEM=y | ||
1740 | CONFIG_HAS_IOPORT=y | ||
1741 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig index 8f986e9f1c62..f2e16fd0a6bb 100644 --- a/arch/arm/configs/h3600_defconfig +++ b/arch/arm/configs/h3600_defconfig | |||
@@ -90,7 +90,6 @@ CONFIG_ARCH_SA1100=y | |||
90 | # CONFIG_SA1100_COLLIE is not set | 90 | # CONFIG_SA1100_COLLIE is not set |
91 | # CONFIG_SA1100_H3100 is not set | 91 | # CONFIG_SA1100_H3100 is not set |
92 | CONFIG_SA1100_H3600=y | 92 | CONFIG_SA1100_H3600=y |
93 | # CONFIG_SA1100_H3800 is not set | ||
94 | CONFIG_SA1100_H3XXX=y | 93 | CONFIG_SA1100_H3XXX=y |
95 | # CONFIG_SA1100_BADGE4 is not set | 94 | # CONFIG_SA1100_BADGE4 is not set |
96 | # CONFIG_SA1100_JORNADA720 is not set | 95 | # CONFIG_SA1100_JORNADA720 is not set |
diff --git a/arch/arm/configs/hackkit_defconfig b/arch/arm/configs/hackkit_defconfig index 1c8fb89a6730..db0708d5cbea 100644 --- a/arch/arm/configs/hackkit_defconfig +++ b/arch/arm/configs/hackkit_defconfig | |||
@@ -91,7 +91,6 @@ CONFIG_ARCH_SA1100=y | |||
91 | # CONFIG_SA1100_COLLIE is not set | 91 | # CONFIG_SA1100_COLLIE is not set |
92 | # CONFIG_SA1100_H3100 is not set | 92 | # CONFIG_SA1100_H3100 is not set |
93 | # CONFIG_SA1100_H3600 is not set | 93 | # CONFIG_SA1100_H3600 is not set |
94 | # CONFIG_SA1100_H3800 is not set | ||
95 | # CONFIG_SA1100_BADGE4 is not set | 94 | # CONFIG_SA1100_BADGE4 is not set |
96 | # CONFIG_SA1100_JORNADA720 is not set | 95 | # CONFIG_SA1100_JORNADA720 is not set |
97 | CONFIG_SA1100_HACKKIT=y | 96 | CONFIG_SA1100_HACKKIT=y |
diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig index 81fadafae02d..f3074e49f2fa 100644 --- a/arch/arm/configs/jornada720_defconfig +++ b/arch/arm/configs/jornada720_defconfig | |||
@@ -178,7 +178,6 @@ CONFIG_DMABOUNCE=y | |||
178 | # CONFIG_SA1100_COLLIE is not set | 178 | # CONFIG_SA1100_COLLIE is not set |
179 | # CONFIG_SA1100_H3100 is not set | 179 | # CONFIG_SA1100_H3100 is not set |
180 | # CONFIG_SA1100_H3600 is not set | 180 | # CONFIG_SA1100_H3600 is not set |
181 | # CONFIG_SA1100_H3800 is not set | ||
182 | # CONFIG_SA1100_BADGE4 is not set | 181 | # CONFIG_SA1100_BADGE4 is not set |
183 | CONFIG_SA1100_JORNADA720=y | 182 | CONFIG_SA1100_JORNADA720=y |
184 | CONFIG_SA1100_JORNADA720_SSP=y | 183 | CONFIG_SA1100_JORNADA720_SSP=y |
diff --git a/arch/arm/configs/lart_defconfig b/arch/arm/configs/lart_defconfig index a1cc34f25602..56ae56899d2e 100644 --- a/arch/arm/configs/lart_defconfig +++ b/arch/arm/configs/lart_defconfig | |||
@@ -87,7 +87,6 @@ CONFIG_ARCH_SA1100=y | |||
87 | # CONFIG_SA1100_COLLIE is not set | 87 | # CONFIG_SA1100_COLLIE is not set |
88 | # CONFIG_SA1100_H3100 is not set | 88 | # CONFIG_SA1100_H3100 is not set |
89 | # CONFIG_SA1100_H3600 is not set | 89 | # CONFIG_SA1100_H3600 is not set |
90 | # CONFIG_SA1100_H3800 is not set | ||
91 | # CONFIG_SA1100_BADGE4 is not set | 90 | # CONFIG_SA1100_BADGE4 is not set |
92 | # CONFIG_SA1100_JORNADA720 is not set | 91 | # CONFIG_SA1100_JORNADA720 is not set |
93 | # CONFIG_SA1100_HACKKIT is not set | 92 | # CONFIG_SA1100_HACKKIT is not set |
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index 73ba62b71063..82428c2f234c 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig | |||
@@ -1,9 +1,10 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.24-rc6 | 3 | # Linux kernel version: 2.6.29-rc3 |
4 | # Sun Dec 30 13:02:54 2007 | 4 | # Fri Jan 30 12:42:03 2009 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_HAVE_PWM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 8 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
8 | CONFIG_GENERIC_GPIO=y | 9 | CONFIG_GENERIC_GPIO=y |
9 | CONFIG_GENERIC_TIME=y | 10 | CONFIG_GENERIC_TIME=y |
@@ -12,6 +13,7 @@ CONFIG_MMU=y | |||
12 | # CONFIG_NO_IOPORT is not set | 13 | # CONFIG_NO_IOPORT is not set |
13 | CONFIG_GENERIC_HARDIRQS=y | 14 | CONFIG_GENERIC_HARDIRQS=y |
14 | CONFIG_STACKTRACE_SUPPORT=y | 15 | CONFIG_STACKTRACE_SUPPORT=y |
16 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | 17 | CONFIG_LOCKDEP_SUPPORT=y |
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 18 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
17 | CONFIG_HARDIRQS_SW_RESEND=y | 19 | CONFIG_HARDIRQS_SW_RESEND=y |
@@ -21,8 +23,8 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 23 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
22 | CONFIG_GENERIC_HWEIGHT=y | 24 | CONFIG_GENERIC_HWEIGHT=y |
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 25 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_ARCH_MTD_XIP=y | 26 | CONFIG_ARCH_MTD_XIP=y |
27 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
26 | CONFIG_VECTORS_BASE=0xffff0000 | 28 | CONFIG_VECTORS_BASE=0xffff0000 |
27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 29 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
28 | 30 | ||
@@ -41,16 +43,24 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
41 | # CONFIG_POSIX_MQUEUE is not set | 43 | # CONFIG_POSIX_MQUEUE is not set |
42 | # CONFIG_BSD_PROCESS_ACCT is not set | 44 | # CONFIG_BSD_PROCESS_ACCT is not set |
43 | # CONFIG_TASKSTATS is not set | 45 | # CONFIG_TASKSTATS is not set |
44 | # CONFIG_USER_NS is not set | ||
45 | # CONFIG_PID_NS is not set | ||
46 | # CONFIG_AUDIT is not set | 46 | # CONFIG_AUDIT is not set |
47 | |||
48 | # | ||
49 | # RCU Subsystem | ||
50 | # | ||
51 | CONFIG_CLASSIC_RCU=y | ||
52 | # CONFIG_TREE_RCU is not set | ||
53 | # CONFIG_PREEMPT_RCU is not set | ||
54 | # CONFIG_TREE_RCU_TRACE is not set | ||
55 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
47 | CONFIG_IKCONFIG=y | 56 | CONFIG_IKCONFIG=y |
48 | CONFIG_IKCONFIG_PROC=y | 57 | CONFIG_IKCONFIG_PROC=y |
49 | CONFIG_LOG_BUF_SHIFT=16 | 58 | CONFIG_LOG_BUF_SHIFT=16 |
59 | # CONFIG_GROUP_SCHED is not set | ||
50 | # CONFIG_CGROUPS is not set | 60 | # CONFIG_CGROUPS is not set |
51 | # CONFIG_FAIR_GROUP_SCHED is not set | 61 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
52 | # CONFIG_SYSFS_DEPRECATED is not set | ||
53 | # CONFIG_RELAY is not set | 62 | # CONFIG_RELAY is not set |
63 | # CONFIG_NAMESPACES is not set | ||
54 | CONFIG_BLK_DEV_INITRD=y | 64 | CONFIG_BLK_DEV_INITRD=y |
55 | CONFIG_INITRAMFS_SOURCE="" | 65 | CONFIG_INITRAMFS_SOURCE="" |
56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 66 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -65,31 +75,41 @@ CONFIG_HOTPLUG=y | |||
65 | CONFIG_PRINTK=y | 75 | CONFIG_PRINTK=y |
66 | CONFIG_BUG=y | 76 | CONFIG_BUG=y |
67 | CONFIG_ELF_CORE=y | 77 | CONFIG_ELF_CORE=y |
78 | CONFIG_COMPAT_BRK=y | ||
68 | CONFIG_BASE_FULL=y | 79 | CONFIG_BASE_FULL=y |
69 | CONFIG_FUTEX=y | 80 | CONFIG_FUTEX=y |
70 | CONFIG_ANON_INODES=y | 81 | CONFIG_ANON_INODES=y |
71 | CONFIG_EPOLL=y | 82 | CONFIG_EPOLL=y |
72 | CONFIG_SIGNALFD=y | 83 | CONFIG_SIGNALFD=y |
84 | CONFIG_TIMERFD=y | ||
73 | CONFIG_EVENTFD=y | 85 | CONFIG_EVENTFD=y |
74 | CONFIG_SHMEM=y | 86 | CONFIG_SHMEM=y |
87 | CONFIG_AIO=y | ||
75 | CONFIG_VM_EVENT_COUNTERS=y | 88 | CONFIG_VM_EVENT_COUNTERS=y |
76 | CONFIG_SLAB=y | 89 | CONFIG_SLAB=y |
77 | # CONFIG_SLUB is not set | 90 | # CONFIG_SLUB is not set |
78 | # CONFIG_SLOB is not set | 91 | # CONFIG_SLOB is not set |
92 | # CONFIG_PROFILING is not set | ||
93 | CONFIG_HAVE_OPROFILE=y | ||
94 | # CONFIG_KPROBES is not set | ||
95 | CONFIG_HAVE_KPROBES=y | ||
96 | CONFIG_HAVE_KRETPROBES=y | ||
97 | CONFIG_HAVE_CLK=y | ||
98 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
99 | CONFIG_SLABINFO=y | ||
79 | CONFIG_RT_MUTEXES=y | 100 | CONFIG_RT_MUTEXES=y |
80 | # CONFIG_TINY_SHMEM is not set | ||
81 | CONFIG_BASE_SMALL=0 | 101 | CONFIG_BASE_SMALL=0 |
82 | CONFIG_MODULES=y | 102 | CONFIG_MODULES=y |
103 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
83 | CONFIG_MODULE_UNLOAD=y | 104 | CONFIG_MODULE_UNLOAD=y |
84 | CONFIG_MODULE_FORCE_UNLOAD=y | 105 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
85 | # CONFIG_MODVERSIONS is not set | 106 | # CONFIG_MODVERSIONS is not set |
86 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 107 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
87 | CONFIG_KMOD=y | ||
88 | CONFIG_BLOCK=y | 108 | CONFIG_BLOCK=y |
89 | # CONFIG_LBD is not set | 109 | # CONFIG_LBD is not set |
90 | # CONFIG_BLK_DEV_IO_TRACE is not set | 110 | # CONFIG_BLK_DEV_IO_TRACE is not set |
91 | # CONFIG_LSF is not set | ||
92 | # CONFIG_BLK_DEV_BSG is not set | 111 | # CONFIG_BLK_DEV_BSG is not set |
112 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
93 | 113 | ||
94 | # | 114 | # |
95 | # IO Schedulers | 115 | # IO Schedulers |
@@ -103,8 +123,7 @@ CONFIG_IOSCHED_NOOP=y | |||
103 | # CONFIG_DEFAULT_CFQ is not set | 123 | # CONFIG_DEFAULT_CFQ is not set |
104 | CONFIG_DEFAULT_NOOP=y | 124 | CONFIG_DEFAULT_NOOP=y |
105 | CONFIG_DEFAULT_IOSCHED="noop" | 125 | CONFIG_DEFAULT_IOSCHED="noop" |
106 | CONFIG_CLASSIC_RCU=y | 126 | CONFIG_FREEZER=y |
107 | # CONFIG_PREEMPT_RCU is not set | ||
108 | 127 | ||
109 | # | 128 | # |
110 | # System Type | 129 | # System Type |
@@ -114,9 +133,7 @@ CONFIG_CLASSIC_RCU=y | |||
114 | # CONFIG_ARCH_REALVIEW is not set | 133 | # CONFIG_ARCH_REALVIEW is not set |
115 | # CONFIG_ARCH_VERSATILE is not set | 134 | # CONFIG_ARCH_VERSATILE is not set |
116 | # CONFIG_ARCH_AT91 is not set | 135 | # CONFIG_ARCH_AT91 is not set |
117 | # CONFIG_ARCH_CLPS7500 is not set | ||
118 | # CONFIG_ARCH_CLPS711X is not set | 136 | # CONFIG_ARCH_CLPS711X is not set |
119 | # CONFIG_ARCH_CO285 is not set | ||
120 | # CONFIG_ARCH_EBSA110 is not set | 137 | # CONFIG_ARCH_EBSA110 is not set |
121 | # CONFIG_ARCH_EP93XX is not set | 138 | # CONFIG_ARCH_EP93XX is not set |
122 | # CONFIG_ARCH_FOOTBRIDGE is not set | 139 | # CONFIG_ARCH_FOOTBRIDGE is not set |
@@ -130,41 +147,58 @@ CONFIG_CLASSIC_RCU=y | |||
130 | # CONFIG_ARCH_IXP2000 is not set | 147 | # CONFIG_ARCH_IXP2000 is not set |
131 | # CONFIG_ARCH_IXP4XX is not set | 148 | # CONFIG_ARCH_IXP4XX is not set |
132 | # CONFIG_ARCH_L7200 is not set | 149 | # CONFIG_ARCH_L7200 is not set |
150 | # CONFIG_ARCH_KIRKWOOD is not set | ||
133 | # CONFIG_ARCH_KS8695 is not set | 151 | # CONFIG_ARCH_KS8695 is not set |
134 | # CONFIG_ARCH_NS9XXX is not set | 152 | # CONFIG_ARCH_NS9XXX is not set |
153 | # CONFIG_ARCH_LOKI is not set | ||
154 | # CONFIG_ARCH_MV78XX0 is not set | ||
135 | # CONFIG_ARCH_MXC is not set | 155 | # CONFIG_ARCH_MXC is not set |
156 | # CONFIG_ARCH_ORION5X is not set | ||
136 | # CONFIG_ARCH_PNX4008 is not set | 157 | # CONFIG_ARCH_PNX4008 is not set |
137 | CONFIG_ARCH_PXA=y | 158 | CONFIG_ARCH_PXA=y |
138 | # CONFIG_ARCH_RPC is not set | 159 | # CONFIG_ARCH_RPC is not set |
139 | # CONFIG_ARCH_SA1100 is not set | 160 | # CONFIG_ARCH_SA1100 is not set |
140 | # CONFIG_ARCH_S3C2410 is not set | 161 | # CONFIG_ARCH_S3C2410 is not set |
162 | # CONFIG_ARCH_S3C64XX is not set | ||
141 | # CONFIG_ARCH_SHARK is not set | 163 | # CONFIG_ARCH_SHARK is not set |
142 | # CONFIG_ARCH_LH7A40X is not set | 164 | # CONFIG_ARCH_LH7A40X is not set |
143 | # CONFIG_ARCH_DAVINCI is not set | 165 | # CONFIG_ARCH_DAVINCI is not set |
144 | # CONFIG_ARCH_OMAP is not set | 166 | # CONFIG_ARCH_OMAP is not set |
167 | # CONFIG_ARCH_MSM is not set | ||
168 | # CONFIG_ARCH_W90X900 is not set | ||
145 | 169 | ||
146 | # | 170 | # |
147 | # Intel PXA2xx/PXA3xx Implementations | 171 | # Intel PXA2xx/PXA3xx Implementations |
148 | # | 172 | # |
173 | # CONFIG_ARCH_GUMSTIX is not set | ||
174 | # CONFIG_MACH_INTELMOTE2 is not set | ||
149 | # CONFIG_ARCH_LUBBOCK is not set | 175 | # CONFIG_ARCH_LUBBOCK is not set |
150 | # CONFIG_MACH_LOGICPD_PXA270 is not set | 176 | # CONFIG_MACH_LOGICPD_PXA270 is not set |
151 | # CONFIG_MACH_MAINSTONE is not set | 177 | # CONFIG_MACH_MAINSTONE is not set |
178 | # CONFIG_MACH_MP900C is not set | ||
152 | # CONFIG_ARCH_PXA_IDP is not set | 179 | # CONFIG_ARCH_PXA_IDP is not set |
153 | # CONFIG_PXA_SHARPSL is not set | 180 | # CONFIG_PXA_SHARPSL is not set |
154 | # CONFIG_MACH_TRIZEPS4 is not set | 181 | # CONFIG_ARCH_VIPER is not set |
182 | # CONFIG_ARCH_PXA_ESERIES is not set | ||
183 | # CONFIG_TRIZEPS_PXA is not set | ||
184 | # CONFIG_MACH_H5000 is not set | ||
155 | # CONFIG_MACH_EM_X270 is not set | 185 | # CONFIG_MACH_EM_X270 is not set |
186 | # CONFIG_MACH_COLIBRI is not set | ||
156 | # CONFIG_MACH_ZYLONITE is not set | 187 | # CONFIG_MACH_ZYLONITE is not set |
188 | # CONFIG_MACH_LITTLETON is not set | ||
189 | # CONFIG_MACH_TAVOREVB is not set | ||
190 | # CONFIG_MACH_SAAR is not set | ||
157 | # CONFIG_MACH_ARMCORE is not set | 191 | # CONFIG_MACH_ARMCORE is not set |
192 | # CONFIG_MACH_CM_X300 is not set | ||
158 | CONFIG_MACH_MAGICIAN=y | 193 | CONFIG_MACH_MAGICIAN=y |
194 | # CONFIG_MACH_MIOA701 is not set | ||
195 | # CONFIG_MACH_PCM027 is not set | ||
196 | # CONFIG_ARCH_PXA_PALM is not set | ||
197 | # CONFIG_PXA_EZX is not set | ||
159 | CONFIG_PXA27x=y | 198 | CONFIG_PXA27x=y |
160 | 199 | CONFIG_PXA_SSP=y | |
161 | # | 200 | CONFIG_PXA_PWM=y |
162 | # Boot options | 201 | CONFIG_PXA_HAVE_BOARD_IRQS=y |
163 | # | ||
164 | |||
165 | # | ||
166 | # Power management | ||
167 | # | ||
168 | 202 | ||
169 | # | 203 | # |
170 | # Processor Type | 204 | # Processor Type |
@@ -173,6 +207,7 @@ CONFIG_CPU_32=y | |||
173 | CONFIG_CPU_XSCALE=y | 207 | CONFIG_CPU_XSCALE=y |
174 | CONFIG_CPU_32v5=y | 208 | CONFIG_CPU_32v5=y |
175 | CONFIG_CPU_ABRT_EV5T=y | 209 | CONFIG_CPU_ABRT_EV5T=y |
210 | CONFIG_CPU_PABRT_NOIFAR=y | ||
176 | CONFIG_CPU_CACHE_VIVT=y | 211 | CONFIG_CPU_CACHE_VIVT=y |
177 | CONFIG_CPU_TLB_V4WBI=y | 212 | CONFIG_CPU_TLB_V4WBI=y |
178 | CONFIG_CPU_CP15=y | 213 | CONFIG_CPU_CP15=y |
@@ -186,6 +221,7 @@ CONFIG_ARM_THUMB=y | |||
186 | # CONFIG_OUTER_CACHE is not set | 221 | # CONFIG_OUTER_CACHE is not set |
187 | CONFIG_IWMMXT=y | 222 | CONFIG_IWMMXT=y |
188 | CONFIG_XSCALE_PMU=y | 223 | CONFIG_XSCALE_PMU=y |
224 | CONFIG_COMMON_CLKDEV=y | ||
189 | 225 | ||
190 | # | 226 | # |
191 | # Bus support | 227 | # Bus support |
@@ -197,28 +233,33 @@ CONFIG_XSCALE_PMU=y | |||
197 | # | 233 | # |
198 | # Kernel Features | 234 | # Kernel Features |
199 | # | 235 | # |
200 | # CONFIG_TICK_ONESHOT is not set | 236 | CONFIG_TICK_ONESHOT=y |
201 | # CONFIG_NO_HZ is not set | 237 | CONFIG_NO_HZ=y |
202 | # CONFIG_HIGH_RES_TIMERS is not set | 238 | # CONFIG_HIGH_RES_TIMERS is not set |
203 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 239 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
240 | CONFIG_VMSPLIT_3G=y | ||
241 | # CONFIG_VMSPLIT_2G is not set | ||
242 | # CONFIG_VMSPLIT_1G is not set | ||
243 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
204 | CONFIG_PREEMPT=y | 244 | CONFIG_PREEMPT=y |
205 | CONFIG_HZ=100 | 245 | CONFIG_HZ=100 |
206 | CONFIG_AEABI=y | 246 | CONFIG_AEABI=y |
207 | CONFIG_OABI_COMPAT=y | 247 | CONFIG_OABI_COMPAT=y |
208 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 248 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y |
249 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | ||
250 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | ||
209 | CONFIG_SELECT_MEMORY_MODEL=y | 251 | CONFIG_SELECT_MEMORY_MODEL=y |
210 | CONFIG_FLATMEM_MANUAL=y | 252 | CONFIG_FLATMEM_MANUAL=y |
211 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 253 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
212 | # CONFIG_SPARSEMEM_MANUAL is not set | 254 | # CONFIG_SPARSEMEM_MANUAL is not set |
213 | CONFIG_FLATMEM=y | 255 | CONFIG_FLATMEM=y |
214 | CONFIG_FLAT_NODE_MEM_MAP=y | 256 | CONFIG_FLAT_NODE_MEM_MAP=y |
215 | # CONFIG_SPARSEMEM_STATIC is not set | 257 | CONFIG_PAGEFLAGS_EXTENDED=y |
216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
217 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 258 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
218 | # CONFIG_RESOURCES_64BIT is not set | 259 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
219 | CONFIG_ZONE_DMA_FLAG=1 | 260 | CONFIG_ZONE_DMA_FLAG=0 |
220 | CONFIG_BOUNCE=y | ||
221 | CONFIG_VIRT_TO_BUS=y | 261 | CONFIG_VIRT_TO_BUS=y |
262 | CONFIG_UNEVICTABLE_LRU=y | ||
222 | CONFIG_ALIGNMENT_TRAP=y | 263 | CONFIG_ALIGNMENT_TRAP=y |
223 | 264 | ||
224 | # | 265 | # |
@@ -229,9 +270,10 @@ CONFIG_ZBOOT_ROM_BSS=0x0 | |||
229 | CONFIG_CMDLINE="keepinitrd" | 270 | CONFIG_CMDLINE="keepinitrd" |
230 | # CONFIG_XIP_KERNEL is not set | 271 | # CONFIG_XIP_KERNEL is not set |
231 | CONFIG_KEXEC=y | 272 | CONFIG_KEXEC=y |
273 | CONFIG_ATAGS_PROC=y | ||
232 | 274 | ||
233 | # | 275 | # |
234 | # CPU Frequency scaling | 276 | # CPU Power Management |
235 | # | 277 | # |
236 | CONFIG_CPU_FREQ=y | 278 | CONFIG_CPU_FREQ=y |
237 | CONFIG_CPU_FREQ_TABLE=y | 279 | CONFIG_CPU_FREQ_TABLE=y |
@@ -239,6 +281,7 @@ CONFIG_CPU_FREQ_TABLE=y | |||
239 | CONFIG_CPU_FREQ_STAT=y | 281 | CONFIG_CPU_FREQ_STAT=y |
240 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 282 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
241 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 283 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
284 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
242 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 285 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
243 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 286 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
244 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 287 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
@@ -247,6 +290,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | |||
247 | # CONFIG_CPU_FREQ_GOV_USERSPACE is not set | 290 | # CONFIG_CPU_FREQ_GOV_USERSPACE is not set |
248 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | 291 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
249 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set | 292 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set |
293 | # CONFIG_CPU_IDLE is not set | ||
250 | 294 | ||
251 | # | 295 | # |
252 | # Floating point emulation | 296 | # Floating point emulation |
@@ -263,6 +307,8 @@ CONFIG_FPE_NWFPE=y | |||
263 | # Userspace binary formats | 307 | # Userspace binary formats |
264 | # | 308 | # |
265 | CONFIG_BINFMT_ELF=y | 309 | CONFIG_BINFMT_ELF=y |
310 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
311 | CONFIG_HAVE_AOUT=y | ||
266 | # CONFIG_BINFMT_AOUT is not set | 312 | # CONFIG_BINFMT_AOUT is not set |
267 | # CONFIG_BINFMT_MISC is not set | 313 | # CONFIG_BINFMT_MISC is not set |
268 | 314 | ||
@@ -270,21 +316,18 @@ CONFIG_BINFMT_ELF=y | |||
270 | # Power management options | 316 | # Power management options |
271 | # | 317 | # |
272 | CONFIG_PM=y | 318 | CONFIG_PM=y |
273 | # CONFIG_PM_LEGACY is not set | ||
274 | # CONFIG_PM_DEBUG is not set | 319 | # CONFIG_PM_DEBUG is not set |
275 | CONFIG_PM_SLEEP=y | 320 | CONFIG_PM_SLEEP=y |
276 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
277 | CONFIG_SUSPEND=y | 321 | CONFIG_SUSPEND=y |
278 | CONFIG_APM_EMULATION=y | 322 | CONFIG_SUSPEND_FREEZER=y |
279 | 323 | # CONFIG_APM_EMULATION is not set | |
280 | # | 324 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
281 | # Networking | ||
282 | # | ||
283 | CONFIG_NET=y | 325 | CONFIG_NET=y |
284 | 326 | ||
285 | # | 327 | # |
286 | # Networking options | 328 | # Networking options |
287 | # | 329 | # |
330 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
288 | CONFIG_PACKET=y | 331 | CONFIG_PACKET=y |
289 | CONFIG_PACKET_MMAP=y | 332 | CONFIG_PACKET_MMAP=y |
290 | CONFIG_UNIX=y | 333 | CONFIG_UNIX=y |
@@ -316,33 +359,15 @@ CONFIG_IP_PNP=y | |||
316 | CONFIG_TCP_CONG_CUBIC=y | 359 | CONFIG_TCP_CONG_CUBIC=y |
317 | CONFIG_DEFAULT_TCP_CONG="cubic" | 360 | CONFIG_DEFAULT_TCP_CONG="cubic" |
318 | # CONFIG_TCP_MD5SIG is not set | 361 | # CONFIG_TCP_MD5SIG is not set |
319 | # CONFIG_IP_VS is not set | ||
320 | # CONFIG_IPV6 is not set | 362 | # CONFIG_IPV6 is not set |
321 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
322 | # CONFIG_INET6_TUNNEL is not set | ||
323 | # CONFIG_NETWORK_SECMARK is not set | 363 | # CONFIG_NETWORK_SECMARK is not set |
324 | CONFIG_NETFILTER=y | 364 | # CONFIG_NETFILTER is not set |
325 | # CONFIG_NETFILTER_DEBUG is not set | ||
326 | |||
327 | # | ||
328 | # Core Netfilter Configuration | ||
329 | # | ||
330 | # CONFIG_NETFILTER_NETLINK is not set | ||
331 | # CONFIG_NF_CONNTRACK_ENABLED is not set | ||
332 | # CONFIG_NF_CONNTRACK is not set | ||
333 | # CONFIG_NETFILTER_XTABLES is not set | ||
334 | |||
335 | # | ||
336 | # IP: Netfilter Configuration | ||
337 | # | ||
338 | # CONFIG_IP_NF_QUEUE is not set | ||
339 | # CONFIG_IP_NF_IPTABLES is not set | ||
340 | # CONFIG_IP_NF_ARPTABLES is not set | ||
341 | # CONFIG_IP_DCCP is not set | 365 | # CONFIG_IP_DCCP is not set |
342 | # CONFIG_IP_SCTP is not set | 366 | # CONFIG_IP_SCTP is not set |
343 | # CONFIG_TIPC is not set | 367 | # CONFIG_TIPC is not set |
344 | # CONFIG_ATM is not set | 368 | # CONFIG_ATM is not set |
345 | # CONFIG_BRIDGE is not set | 369 | # CONFIG_BRIDGE is not set |
370 | # CONFIG_NET_DSA is not set | ||
346 | # CONFIG_VLAN_8021Q is not set | 371 | # CONFIG_VLAN_8021Q is not set |
347 | # CONFIG_DECNET is not set | 372 | # CONFIG_DECNET is not set |
348 | # CONFIG_LLC2 is not set | 373 | # CONFIG_LLC2 is not set |
@@ -353,6 +378,7 @@ CONFIG_NETFILTER=y | |||
353 | # CONFIG_ECONET is not set | 378 | # CONFIG_ECONET is not set |
354 | # CONFIG_WAN_ROUTER is not set | 379 | # CONFIG_WAN_ROUTER is not set |
355 | # CONFIG_NET_SCHED is not set | 380 | # CONFIG_NET_SCHED is not set |
381 | # CONFIG_DCB is not set | ||
356 | 382 | ||
357 | # | 383 | # |
358 | # Network testing | 384 | # Network testing |
@@ -390,20 +416,17 @@ CONFIG_IRTTY_SIR=m | |||
390 | # Dongle support | 416 | # Dongle support |
391 | # | 417 | # |
392 | # CONFIG_DONGLE is not set | 418 | # CONFIG_DONGLE is not set |
393 | 419 | # CONFIG_KINGSUN_DONGLE is not set | |
394 | # | 420 | # CONFIG_KSDAZZLE_DONGLE is not set |
395 | # Old SIR device drivers | 421 | # CONFIG_KS959_DONGLE is not set |
396 | # | ||
397 | # CONFIG_IRPORT_SIR is not set | ||
398 | |||
399 | # | ||
400 | # Old Serial dongle support | ||
401 | # | ||
402 | 422 | ||
403 | # | 423 | # |
404 | # FIR device drivers | 424 | # FIR device drivers |
405 | # | 425 | # |
426 | # CONFIG_USB_IRDA is not set | ||
427 | # CONFIG_SIGMATEL_FIR is not set | ||
406 | CONFIG_PXA_FICP=m | 428 | CONFIG_PXA_FICP=m |
429 | # CONFIG_MCS_FIR is not set | ||
407 | CONFIG_BT=m | 430 | CONFIG_BT=m |
408 | CONFIG_BT_L2CAP=m | 431 | CONFIG_BT_L2CAP=m |
409 | CONFIG_BT_SCO=m | 432 | CONFIG_BT_SCO=m |
@@ -417,17 +440,17 @@ CONFIG_BT_HIDP=m | |||
417 | # | 440 | # |
418 | # Bluetooth device drivers | 441 | # Bluetooth device drivers |
419 | # | 442 | # |
443 | CONFIG_BT_HCIBTUSB=m | ||
444 | # CONFIG_BT_HCIBTSDIO is not set | ||
420 | # CONFIG_BT_HCIUART is not set | 445 | # CONFIG_BT_HCIUART is not set |
446 | # CONFIG_BT_HCIBCM203X is not set | ||
447 | # CONFIG_BT_HCIBPA10X is not set | ||
448 | # CONFIG_BT_HCIBFUSB is not set | ||
421 | # CONFIG_BT_HCIVHCI is not set | 449 | # CONFIG_BT_HCIVHCI is not set |
422 | # CONFIG_AF_RXRPC is not set | 450 | # CONFIG_AF_RXRPC is not set |
423 | 451 | # CONFIG_PHONET is not set | |
424 | # | 452 | # CONFIG_WIRELESS is not set |
425 | # Wireless | 453 | # CONFIG_WIMAX is not set |
426 | # | ||
427 | # CONFIG_CFG80211 is not set | ||
428 | # CONFIG_WIRELESS_EXT is not set | ||
429 | # CONFIG_MAC80211 is not set | ||
430 | # CONFIG_IEEE80211 is not set | ||
431 | # CONFIG_RFKILL is not set | 454 | # CONFIG_RFKILL is not set |
432 | # CONFIG_NET_9P is not set | 455 | # CONFIG_NET_9P is not set |
433 | 456 | ||
@@ -442,25 +465,28 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
442 | CONFIG_STANDALONE=y | 465 | CONFIG_STANDALONE=y |
443 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 466 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
444 | CONFIG_FW_LOADER=y | 467 | CONFIG_FW_LOADER=y |
468 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
469 | CONFIG_EXTRA_FIRMWARE="" | ||
445 | # CONFIG_DEBUG_DRIVER is not set | 470 | # CONFIG_DEBUG_DRIVER is not set |
446 | # CONFIG_DEBUG_DEVRES is not set | 471 | # CONFIG_DEBUG_DEVRES is not set |
447 | # CONFIG_SYS_HYPERVISOR is not set | 472 | # CONFIG_SYS_HYPERVISOR is not set |
448 | # CONFIG_CONNECTOR is not set | 473 | # CONFIG_CONNECTOR is not set |
449 | CONFIG_MTD=y | 474 | CONFIG_MTD=y |
450 | CONFIG_MTD_DEBUG=y | 475 | # CONFIG_MTD_DEBUG is not set |
451 | CONFIG_MTD_DEBUG_VERBOSE=0 | ||
452 | # CONFIG_MTD_CONCAT is not set | 476 | # CONFIG_MTD_CONCAT is not set |
453 | CONFIG_MTD_PARTITIONS=y | 477 | CONFIG_MTD_PARTITIONS=y |
478 | # CONFIG_MTD_TESTS is not set | ||
454 | # CONFIG_MTD_REDBOOT_PARTS is not set | 479 | # CONFIG_MTD_REDBOOT_PARTS is not set |
455 | CONFIG_MTD_CMDLINE_PARTS=y | 480 | CONFIG_MTD_CMDLINE_PARTS=y |
456 | # CONFIG_MTD_AFS_PARTS is not set | 481 | # CONFIG_MTD_AFS_PARTS is not set |
482 | # CONFIG_MTD_AR7_PARTS is not set | ||
457 | 483 | ||
458 | # | 484 | # |
459 | # User Modules And Translation Layers | 485 | # User Modules And Translation Layers |
460 | # | 486 | # |
461 | CONFIG_MTD_CHAR=m | 487 | CONFIG_MTD_CHAR=y |
462 | CONFIG_MTD_BLKDEVS=m | 488 | CONFIG_MTD_BLKDEVS=y |
463 | CONFIG_MTD_BLOCK=m | 489 | CONFIG_MTD_BLOCK=y |
464 | # CONFIG_FTL is not set | 490 | # CONFIG_FTL is not set |
465 | # CONFIG_NFTL is not set | 491 | # CONFIG_NFTL is not set |
466 | # CONFIG_INFTL is not set | 492 | # CONFIG_INFTL is not set |
@@ -473,6 +499,7 @@ CONFIG_MTD_BLOCK=m | |||
473 | # | 499 | # |
474 | CONFIG_MTD_CFI=y | 500 | CONFIG_MTD_CFI=y |
475 | # CONFIG_MTD_JEDECPROBE is not set | 501 | # CONFIG_MTD_JEDECPROBE is not set |
502 | CONFIG_MTD_GEN_PROBE=y | ||
476 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | 503 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set |
477 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | 504 | CONFIG_MTD_MAP_BANK_WIDTH_1=y |
478 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | 505 | CONFIG_MTD_MAP_BANK_WIDTH_2=y |
@@ -487,6 +514,7 @@ CONFIG_MTD_CFI_I2=y | |||
487 | CONFIG_MTD_CFI_INTELEXT=y | 514 | CONFIG_MTD_CFI_INTELEXT=y |
488 | # CONFIG_MTD_CFI_AMDSTD is not set | 515 | # CONFIG_MTD_CFI_AMDSTD is not set |
489 | # CONFIG_MTD_CFI_STAA is not set | 516 | # CONFIG_MTD_CFI_STAA is not set |
517 | CONFIG_MTD_CFI_UTIL=y | ||
490 | # CONFIG_MTD_RAM is not set | 518 | # CONFIG_MTD_RAM is not set |
491 | # CONFIG_MTD_ROM is not set | 519 | # CONFIG_MTD_ROM is not set |
492 | # CONFIG_MTD_ABSENT is not set | 520 | # CONFIG_MTD_ABSENT is not set |
@@ -497,9 +525,7 @@ CONFIG_MTD_CFI_INTELEXT=y | |||
497 | # | 525 | # |
498 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 526 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
499 | CONFIG_MTD_PHYSMAP=y | 527 | CONFIG_MTD_PHYSMAP=y |
500 | CONFIG_MTD_PHYSMAP_START=0x00000000 | 528 | # CONFIG_MTD_PHYSMAP_COMPAT is not set |
501 | CONFIG_MTD_PHYSMAP_LEN=0x04000000 | ||
502 | CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | ||
503 | # CONFIG_MTD_PXA2XX is not set | 529 | # CONFIG_MTD_PXA2XX is not set |
504 | # CONFIG_MTD_ARM_INTEGRATOR is not set | 530 | # CONFIG_MTD_ARM_INTEGRATOR is not set |
505 | # CONFIG_MTD_SHARP_SL is not set | 531 | # CONFIG_MTD_SHARP_SL is not set |
@@ -523,6 +549,12 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | |||
523 | # CONFIG_MTD_ONENAND is not set | 549 | # CONFIG_MTD_ONENAND is not set |
524 | 550 | ||
525 | # | 551 | # |
552 | # LPDDR flash memory drivers | ||
553 | # | ||
554 | # CONFIG_MTD_LPDDR is not set | ||
555 | # CONFIG_MTD_QINFO_PROBE is not set | ||
556 | |||
557 | # | ||
526 | # UBI - Unsorted block images | 558 | # UBI - Unsorted block images |
527 | # | 559 | # |
528 | # CONFIG_MTD_UBI is not set | 560 | # CONFIG_MTD_UBI is not set |
@@ -531,10 +563,12 @@ CONFIG_BLK_DEV=y | |||
531 | # CONFIG_BLK_DEV_COW_COMMON is not set | 563 | # CONFIG_BLK_DEV_COW_COMMON is not set |
532 | # CONFIG_BLK_DEV_LOOP is not set | 564 | # CONFIG_BLK_DEV_LOOP is not set |
533 | # CONFIG_BLK_DEV_NBD is not set | 565 | # CONFIG_BLK_DEV_NBD is not set |
566 | # CONFIG_BLK_DEV_UB is not set | ||
534 | # CONFIG_BLK_DEV_RAM is not set | 567 | # CONFIG_BLK_DEV_RAM is not set |
535 | # CONFIG_CDROM_PKTCDVD is not set | 568 | # CONFIG_CDROM_PKTCDVD is not set |
536 | # CONFIG_ATA_OVER_ETH is not set | 569 | # CONFIG_ATA_OVER_ETH is not set |
537 | # CONFIG_MISC_DEVICES is not set | 570 | # CONFIG_MISC_DEVICES is not set |
571 | CONFIG_HAVE_IDE=y | ||
538 | # CONFIG_IDE is not set | 572 | # CONFIG_IDE is not set |
539 | 573 | ||
540 | # | 574 | # |
@@ -547,7 +581,6 @@ CONFIG_BLK_DEV=y | |||
547 | # CONFIG_ATA is not set | 581 | # CONFIG_ATA is not set |
548 | # CONFIG_MD is not set | 582 | # CONFIG_MD is not set |
549 | CONFIG_NETDEVICES=y | 583 | CONFIG_NETDEVICES=y |
550 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
551 | # CONFIG_DUMMY is not set | 584 | # CONFIG_DUMMY is not set |
552 | # CONFIG_BONDING is not set | 585 | # CONFIG_BONDING is not set |
553 | # CONFIG_MACVLAN is not set | 586 | # CONFIG_MACVLAN is not set |
@@ -563,6 +596,20 @@ CONFIG_NETDEVICES=y | |||
563 | # | 596 | # |
564 | # CONFIG_WLAN_PRE80211 is not set | 597 | # CONFIG_WLAN_PRE80211 is not set |
565 | # CONFIG_WLAN_80211 is not set | 598 | # CONFIG_WLAN_80211 is not set |
599 | # CONFIG_IWLWIFI_LEDS is not set | ||
600 | |||
601 | # | ||
602 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
603 | # | ||
604 | |||
605 | # | ||
606 | # USB Network Adapters | ||
607 | # | ||
608 | # CONFIG_USB_CATC is not set | ||
609 | # CONFIG_USB_KAWETH is not set | ||
610 | # CONFIG_USB_PEGASUS is not set | ||
611 | # CONFIG_USB_RTL8150 is not set | ||
612 | # CONFIG_USB_USBNET is not set | ||
566 | # CONFIG_WAN is not set | 613 | # CONFIG_WAN is not set |
567 | CONFIG_PPP=m | 614 | CONFIG_PPP=m |
568 | # CONFIG_PPP_MULTILINK is not set | 615 | # CONFIG_PPP_MULTILINK is not set |
@@ -612,7 +659,26 @@ CONFIG_KEYBOARD_GPIO=y | |||
612 | # CONFIG_INPUT_JOYSTICK is not set | 659 | # CONFIG_INPUT_JOYSTICK is not set |
613 | # CONFIG_INPUT_TABLET is not set | 660 | # CONFIG_INPUT_TABLET is not set |
614 | CONFIG_INPUT_TOUCHSCREEN=y | 661 | CONFIG_INPUT_TOUCHSCREEN=y |
662 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
663 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
664 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
665 | # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set | ||
666 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
667 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
668 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
669 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
670 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
671 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
672 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
673 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
674 | # CONFIG_TOUCHSCREEN_TSC2007 is not set | ||
615 | CONFIG_INPUT_MISC=y | 675 | CONFIG_INPUT_MISC=y |
676 | # CONFIG_INPUT_ATI_REMOTE is not set | ||
677 | # CONFIG_INPUT_ATI_REMOTE2 is not set | ||
678 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set | ||
679 | # CONFIG_INPUT_POWERMATE is not set | ||
680 | # CONFIG_INPUT_YEALINK is not set | ||
681 | # CONFIG_INPUT_CM109 is not set | ||
616 | CONFIG_INPUT_UINPUT=m | 682 | CONFIG_INPUT_UINPUT=m |
617 | 683 | ||
618 | # | 684 | # |
@@ -625,9 +691,11 @@ CONFIG_INPUT_UINPUT=m | |||
625 | # Character devices | 691 | # Character devices |
626 | # | 692 | # |
627 | CONFIG_VT=y | 693 | CONFIG_VT=y |
694 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
628 | CONFIG_VT_CONSOLE=y | 695 | CONFIG_VT_CONSOLE=y |
629 | CONFIG_HW_CONSOLE=y | 696 | CONFIG_HW_CONSOLE=y |
630 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 697 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
698 | # CONFIG_DEVKMEM is not set | ||
631 | # CONFIG_SERIAL_NONSTANDARD is not set | 699 | # CONFIG_SERIAL_NONSTANDARD is not set |
632 | 700 | ||
633 | # | 701 | # |
@@ -642,6 +710,7 @@ CONFIG_SERIAL_PXA=y | |||
642 | # CONFIG_SERIAL_PXA_CONSOLE is not set | 710 | # CONFIG_SERIAL_PXA_CONSOLE is not set |
643 | CONFIG_SERIAL_CORE=y | 711 | CONFIG_SERIAL_CORE=y |
644 | CONFIG_UNIX98_PTYS=y | 712 | CONFIG_UNIX98_PTYS=y |
713 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
645 | # CONFIG_LEGACY_PTYS is not set | 714 | # CONFIG_LEGACY_PTYS is not set |
646 | # CONFIG_IPMI_HANDLER is not set | 715 | # CONFIG_IPMI_HANDLER is not set |
647 | # CONFIG_HW_RANDOM is not set | 716 | # CONFIG_HW_RANDOM is not set |
@@ -649,37 +718,45 @@ CONFIG_UNIX98_PTYS=y | |||
649 | # CONFIG_R3964 is not set | 718 | # CONFIG_R3964 is not set |
650 | # CONFIG_RAW_DRIVER is not set | 719 | # CONFIG_RAW_DRIVER is not set |
651 | # CONFIG_TCG_TPM is not set | 720 | # CONFIG_TCG_TPM is not set |
652 | CONFIG_I2C=m | 721 | CONFIG_I2C=y |
653 | CONFIG_I2C_BOARDINFO=y | 722 | CONFIG_I2C_BOARDINFO=y |
654 | CONFIG_I2C_CHARDEV=m | 723 | CONFIG_I2C_CHARDEV=m |
724 | CONFIG_I2C_HELPER_AUTO=y | ||
655 | 725 | ||
656 | # | 726 | # |
657 | # I2C Algorithms | 727 | # I2C Hardware Bus support |
658 | # | 728 | # |
659 | # CONFIG_I2C_ALGOBIT is not set | ||
660 | # CONFIG_I2C_ALGOPCF is not set | ||
661 | # CONFIG_I2C_ALGOPCA is not set | ||
662 | 729 | ||
663 | # | 730 | # |
664 | # I2C Hardware Bus support | 731 | # I2C system bus drivers (mostly embedded / system-on-chip) |
665 | # | 732 | # |
666 | # CONFIG_I2C_GPIO is not set | 733 | # CONFIG_I2C_GPIO is not set |
667 | CONFIG_I2C_PXA=m | ||
668 | # CONFIG_I2C_PXA_SLAVE is not set | ||
669 | # CONFIG_I2C_OCORES is not set | 734 | # CONFIG_I2C_OCORES is not set |
670 | # CONFIG_I2C_PARPORT_LIGHT is not set | 735 | CONFIG_I2C_PXA=y |
736 | # CONFIG_I2C_PXA_SLAVE is not set | ||
671 | # CONFIG_I2C_SIMTEC is not set | 737 | # CONFIG_I2C_SIMTEC is not set |
738 | |||
739 | # | ||
740 | # External I2C/SMBus adapter drivers | ||
741 | # | ||
742 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
672 | # CONFIG_I2C_TAOS_EVM is not set | 743 | # CONFIG_I2C_TAOS_EVM is not set |
744 | # CONFIG_I2C_TINY_USB is not set | ||
745 | |||
746 | # | ||
747 | # Other I2C/SMBus bus drivers | ||
748 | # | ||
749 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
673 | # CONFIG_I2C_STUB is not set | 750 | # CONFIG_I2C_STUB is not set |
674 | 751 | ||
675 | # | 752 | # |
676 | # Miscellaneous I2C Chip support | 753 | # Miscellaneous I2C Chip support |
677 | # | 754 | # |
678 | # CONFIG_SENSORS_DS1337 is not set | ||
679 | # CONFIG_SENSORS_DS1374 is not set | ||
680 | # CONFIG_DS1682 is not set | 755 | # CONFIG_DS1682 is not set |
756 | # CONFIG_AT24 is not set | ||
681 | # CONFIG_EEPROM_LEGACY is not set | 757 | # CONFIG_EEPROM_LEGACY is not set |
682 | # CONFIG_SENSORS_PCF8574 is not set | 758 | # CONFIG_SENSORS_PCF8574 is not set |
759 | # CONFIG_PCF8575 is not set | ||
683 | # CONFIG_SENSORS_PCA9539 is not set | 760 | # CONFIG_SENSORS_PCA9539 is not set |
684 | # CONFIG_SENSORS_PCF8591 is not set | 761 | # CONFIG_SENSORS_PCF8591 is not set |
685 | # CONFIG_SENSORS_MAX6875 is not set | 762 | # CONFIG_SENSORS_MAX6875 is not set |
@@ -688,19 +765,39 @@ CONFIG_I2C_PXA=m | |||
688 | # CONFIG_I2C_DEBUG_ALGO is not set | 765 | # CONFIG_I2C_DEBUG_ALGO is not set |
689 | # CONFIG_I2C_DEBUG_BUS is not set | 766 | # CONFIG_I2C_DEBUG_BUS is not set |
690 | # CONFIG_I2C_DEBUG_CHIP is not set | 767 | # CONFIG_I2C_DEBUG_CHIP is not set |
768 | # CONFIG_SPI is not set | ||
769 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
770 | CONFIG_GPIOLIB=y | ||
771 | # CONFIG_DEBUG_GPIO is not set | ||
772 | # CONFIG_GPIO_SYSFS is not set | ||
691 | 773 | ||
692 | # | 774 | # |
693 | # SPI support | 775 | # Memory mapped GPIO expanders: |
776 | # | ||
777 | |||
778 | # | ||
779 | # I2C GPIO expanders: | ||
780 | # | ||
781 | # CONFIG_GPIO_MAX732X is not set | ||
782 | # CONFIG_GPIO_PCA953X is not set | ||
783 | # CONFIG_GPIO_PCF857X is not set | ||
784 | |||
785 | # | ||
786 | # PCI GPIO expanders: | ||
787 | # | ||
788 | |||
789 | # | ||
790 | # SPI GPIO expanders: | ||
694 | # | 791 | # |
695 | # CONFIG_SPI is not set | ||
696 | # CONFIG_SPI_MASTER is not set | ||
697 | CONFIG_W1=y | 792 | CONFIG_W1=y |
698 | 793 | ||
699 | # | 794 | # |
700 | # 1-wire Bus Masters | 795 | # 1-wire Bus Masters |
701 | # | 796 | # |
797 | # CONFIG_W1_MASTER_DS2490 is not set | ||
702 | # CONFIG_W1_MASTER_DS2482 is not set | 798 | # CONFIG_W1_MASTER_DS2482 is not set |
703 | CONFIG_W1_MASTER_DS1WM=y | 799 | CONFIG_W1_MASTER_DS1WM=y |
800 | # CONFIG_W1_MASTER_GPIO is not set | ||
704 | 801 | ||
705 | # | 802 | # |
706 | # 1-wire Slaves | 803 | # 1-wire Slaves |
@@ -709,32 +806,56 @@ CONFIG_W1_MASTER_DS1WM=y | |||
709 | # CONFIG_W1_SLAVE_SMEM is not set | 806 | # CONFIG_W1_SLAVE_SMEM is not set |
710 | # CONFIG_W1_SLAVE_DS2433 is not set | 807 | # CONFIG_W1_SLAVE_DS2433 is not set |
711 | CONFIG_W1_SLAVE_DS2760=y | 808 | CONFIG_W1_SLAVE_DS2760=y |
809 | # CONFIG_W1_SLAVE_BQ27000 is not set | ||
712 | CONFIG_POWER_SUPPLY=y | 810 | CONFIG_POWER_SUPPLY=y |
713 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 811 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
714 | CONFIG_PDA_POWER=y | 812 | CONFIG_PDA_POWER=y |
715 | # CONFIG_APM_POWER is not set | ||
716 | CONFIG_BATTERY_DS2760=y | 813 | CONFIG_BATTERY_DS2760=y |
814 | # CONFIG_BATTERY_BQ27x00 is not set | ||
717 | # CONFIG_HWMON is not set | 815 | # CONFIG_HWMON is not set |
816 | # CONFIG_THERMAL is not set | ||
817 | # CONFIG_THERMAL_HWMON is not set | ||
718 | # CONFIG_WATCHDOG is not set | 818 | # CONFIG_WATCHDOG is not set |
819 | CONFIG_SSB_POSSIBLE=y | ||
719 | 820 | ||
720 | # | 821 | # |
721 | # Sonics Silicon Backplane | 822 | # Sonics Silicon Backplane |
722 | # | 823 | # |
723 | CONFIG_SSB_POSSIBLE=y | ||
724 | # CONFIG_SSB is not set | 824 | # CONFIG_SSB is not set |
725 | 825 | ||
726 | # | 826 | # |
727 | # Multifunction device drivers | 827 | # Multifunction device drivers |
728 | # | 828 | # |
829 | # CONFIG_MFD_CORE is not set | ||
729 | # CONFIG_MFD_SM501 is not set | 830 | # CONFIG_MFD_SM501 is not set |
831 | # CONFIG_MFD_ASIC3 is not set | ||
730 | CONFIG_HTC_EGPIO=y | 832 | CONFIG_HTC_EGPIO=y |
731 | CONFIG_HTC_PASIC3=y | 833 | CONFIG_HTC_PASIC3=y |
834 | # CONFIG_TPS65010 is not set | ||
835 | # CONFIG_TWL4030_CORE is not set | ||
836 | # CONFIG_MFD_TMIO is not set | ||
837 | # CONFIG_MFD_T7L66XB is not set | ||
838 | # CONFIG_MFD_TC6387XB is not set | ||
839 | # CONFIG_MFD_TC6393XB is not set | ||
840 | # CONFIG_PMIC_DA903X is not set | ||
841 | # CONFIG_MFD_WM8400 is not set | ||
842 | # CONFIG_MFD_WM8350_I2C is not set | ||
843 | # CONFIG_MFD_PCF50633 is not set | ||
732 | 844 | ||
733 | # | 845 | # |
734 | # Multimedia devices | 846 | # Multimedia devices |
735 | # | 847 | # |
848 | |||
849 | # | ||
850 | # Multimedia core support | ||
851 | # | ||
736 | # CONFIG_VIDEO_DEV is not set | 852 | # CONFIG_VIDEO_DEV is not set |
737 | # CONFIG_DVB_CORE is not set | 853 | # CONFIG_DVB_CORE is not set |
854 | # CONFIG_VIDEO_MEDIA is not set | ||
855 | |||
856 | # | ||
857 | # Multimedia drivers | ||
858 | # | ||
738 | # CONFIG_DAB is not set | 859 | # CONFIG_DAB is not set |
739 | 860 | ||
740 | # | 861 | # |
@@ -745,6 +866,7 @@ CONFIG_HTC_PASIC3=y | |||
745 | CONFIG_FB=y | 866 | CONFIG_FB=y |
746 | # CONFIG_FIRMWARE_EDID is not set | 867 | # CONFIG_FIRMWARE_EDID is not set |
747 | # CONFIG_FB_DDC is not set | 868 | # CONFIG_FB_DDC is not set |
869 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
748 | CONFIG_FB_CFB_FILLRECT=y | 870 | CONFIG_FB_CFB_FILLRECT=y |
749 | CONFIG_FB_CFB_COPYAREA=y | 871 | CONFIG_FB_CFB_COPYAREA=y |
750 | CONFIG_FB_CFB_IMAGEBLIT=y | 872 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -752,8 +874,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
752 | # CONFIG_FB_SYS_FILLRECT is not set | 874 | # CONFIG_FB_SYS_FILLRECT is not set |
753 | # CONFIG_FB_SYS_COPYAREA is not set | 875 | # CONFIG_FB_SYS_COPYAREA is not set |
754 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 876 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
877 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
755 | # CONFIG_FB_SYS_FOPS is not set | 878 | # CONFIG_FB_SYS_FOPS is not set |
756 | CONFIG_FB_DEFERRED_IO=y | ||
757 | # CONFIG_FB_SVGALIB is not set | 879 | # CONFIG_FB_SVGALIB is not set |
758 | # CONFIG_FB_MACMODES is not set | 880 | # CONFIG_FB_MACMODES is not set |
759 | # CONFIG_FB_BACKLIGHT is not set | 881 | # CONFIG_FB_BACKLIGHT is not set |
@@ -765,13 +887,21 @@ CONFIG_FB_DEFERRED_IO=y | |||
765 | # | 887 | # |
766 | # CONFIG_FB_S1D13XXX is not set | 888 | # CONFIG_FB_S1D13XXX is not set |
767 | CONFIG_FB_PXA=y | 889 | CONFIG_FB_PXA=y |
890 | CONFIG_FB_PXA_OVERLAY=y | ||
891 | # CONFIG_FB_PXA_SMARTPANEL is not set | ||
768 | # CONFIG_FB_PXA_PARAMETERS is not set | 892 | # CONFIG_FB_PXA_PARAMETERS is not set |
769 | # CONFIG_FB_MBX is not set | 893 | # CONFIG_FB_MBX is not set |
894 | # CONFIG_FB_W100 is not set | ||
770 | # CONFIG_FB_VIRTUAL is not set | 895 | # CONFIG_FB_VIRTUAL is not set |
896 | # CONFIG_FB_METRONOME is not set | ||
897 | # CONFIG_FB_MB862XX is not set | ||
771 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 898 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
772 | CONFIG_LCD_CLASS_DEVICE=y | 899 | CONFIG_LCD_CLASS_DEVICE=y |
900 | # CONFIG_LCD_ILI9320 is not set | ||
901 | # CONFIG_LCD_PLATFORM is not set | ||
773 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 902 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
774 | CONFIG_BACKLIGHT_CORGI=y | 903 | # CONFIG_BACKLIGHT_GENERIC is not set |
904 | CONFIG_BACKLIGHT_PWM=y | ||
775 | 905 | ||
776 | # | 906 | # |
777 | # Display device support | 907 | # Display device support |
@@ -802,15 +932,8 @@ CONFIG_FONT_MINI_4x6=y | |||
802 | # CONFIG_FONT_SUN12x22 is not set | 932 | # CONFIG_FONT_SUN12x22 is not set |
803 | # CONFIG_FONT_10x18 is not set | 933 | # CONFIG_FONT_10x18 is not set |
804 | # CONFIG_LOGO is not set | 934 | # CONFIG_LOGO is not set |
805 | |||
806 | # | ||
807 | # Sound | ||
808 | # | ||
809 | CONFIG_SOUND=y | 935 | CONFIG_SOUND=y |
810 | 936 | CONFIG_SOUND_OSS_CORE=y | |
811 | # | ||
812 | # Advanced Linux Sound Architecture | ||
813 | # | ||
814 | CONFIG_SND=m | 937 | CONFIG_SND=m |
815 | CONFIG_SND_TIMER=m | 938 | CONFIG_SND_TIMER=m |
816 | CONFIG_SND_PCM=m | 939 | CONFIG_SND_PCM=m |
@@ -824,53 +947,185 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
824 | CONFIG_SND_VERBOSE_PROCFS=y | 947 | CONFIG_SND_VERBOSE_PROCFS=y |
825 | # CONFIG_SND_VERBOSE_PRINTK is not set | 948 | # CONFIG_SND_VERBOSE_PRINTK is not set |
826 | # CONFIG_SND_DEBUG is not set | 949 | # CONFIG_SND_DEBUG is not set |
827 | 950 | CONFIG_SND_DRIVERS=y | |
828 | # | ||
829 | # Generic devices | ||
830 | # | ||
831 | # CONFIG_SND_DUMMY is not set | 951 | # CONFIG_SND_DUMMY is not set |
832 | # CONFIG_SND_MTPAV is not set | 952 | # CONFIG_SND_MTPAV is not set |
833 | # CONFIG_SND_SERIAL_U16550 is not set | 953 | # CONFIG_SND_SERIAL_U16550 is not set |
834 | # CONFIG_SND_MPU401 is not set | 954 | # CONFIG_SND_MPU401 is not set |
835 | 955 | # CONFIG_SND_ARM is not set | |
836 | # | 956 | CONFIG_SND_PXA2XX_LIB=m |
837 | # ALSA ARM devices | 957 | # CONFIG_SND_USB is not set |
838 | # | ||
839 | # CONFIG_SND_PXA2XX_AC97 is not set | ||
840 | |||
841 | # | ||
842 | # System on Chip audio support | ||
843 | # | ||
844 | CONFIG_SND_SOC=m | 958 | CONFIG_SND_SOC=m |
845 | CONFIG_SND_PXA2XX_SOC=m | 959 | CONFIG_SND_PXA2XX_SOC=m |
846 | 960 | CONFIG_SND_SOC_I2C_AND_SPI=m | |
847 | # | 961 | # CONFIG_SND_SOC_ALL_CODECS is not set |
848 | # SoC Audio support for SuperH | ||
849 | # | ||
850 | |||
851 | # | ||
852 | # Open Sound System | ||
853 | # | ||
854 | # CONFIG_SOUND_PRIME is not set | 962 | # CONFIG_SOUND_PRIME is not set |
855 | # CONFIG_HID_SUPPORT is not set | 963 | # CONFIG_HID_SUPPORT is not set |
856 | CONFIG_HID=m | 964 | CONFIG_HID=m |
857 | # CONFIG_USB_SUPPORT is not set | 965 | CONFIG_USB_SUPPORT=y |
966 | CONFIG_USB_ARCH_HAS_HCD=y | ||
967 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
968 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
969 | CONFIG_USB=y | ||
970 | # CONFIG_USB_DEBUG is not set | ||
971 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
972 | |||
973 | # | ||
974 | # Miscellaneous USB options | ||
975 | # | ||
976 | # CONFIG_USB_DEVICEFS is not set | ||
977 | # CONFIG_USB_DEVICE_CLASS is not set | ||
978 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
979 | # CONFIG_USB_SUSPEND is not set | ||
980 | # CONFIG_USB_OTG is not set | ||
981 | # CONFIG_USB_OTG_WHITELIST is not set | ||
982 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
983 | CONFIG_USB_MON=m | ||
984 | # CONFIG_USB_WUSB is not set | ||
985 | # CONFIG_USB_WUSB_CBAF is not set | ||
986 | |||
987 | # | ||
988 | # USB Host Controller Drivers | ||
989 | # | ||
990 | # CONFIG_USB_C67X00_HCD is not set | ||
991 | # CONFIG_USB_OXU210HP_HCD is not set | ||
992 | # CONFIG_USB_ISP116X_HCD is not set | ||
993 | CONFIG_USB_OHCI_HCD=y | ||
994 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
995 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
996 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
997 | # CONFIG_USB_SL811_HCD is not set | ||
998 | # CONFIG_USB_R8A66597_HCD is not set | ||
999 | # CONFIG_USB_HWA_HCD is not set | ||
1000 | # CONFIG_USB_MUSB_HDRC is not set | ||
1001 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
1002 | |||
1003 | # | ||
1004 | # USB Device Class drivers | ||
1005 | # | ||
1006 | # CONFIG_USB_ACM is not set | ||
1007 | # CONFIG_USB_PRINTER is not set | ||
1008 | # CONFIG_USB_WDM is not set | ||
1009 | # CONFIG_USB_TMC is not set | ||
1010 | |||
1011 | # | ||
1012 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; | ||
1013 | # | ||
1014 | |||
1015 | # | ||
1016 | # see USB_STORAGE Help for more information | ||
1017 | # | ||
1018 | # CONFIG_USB_LIBUSUAL is not set | ||
1019 | |||
1020 | # | ||
1021 | # USB Imaging devices | ||
1022 | # | ||
1023 | # CONFIG_USB_MDC800 is not set | ||
1024 | |||
1025 | # | ||
1026 | # USB port drivers | ||
1027 | # | ||
1028 | # CONFIG_USB_SERIAL is not set | ||
1029 | |||
1030 | # | ||
1031 | # USB Miscellaneous drivers | ||
1032 | # | ||
1033 | # CONFIG_USB_EMI62 is not set | ||
1034 | # CONFIG_USB_EMI26 is not set | ||
1035 | # CONFIG_USB_ADUTUX is not set | ||
1036 | # CONFIG_USB_SEVSEG is not set | ||
1037 | # CONFIG_USB_RIO500 is not set | ||
1038 | # CONFIG_USB_LEGOTOWER is not set | ||
1039 | # CONFIG_USB_LCD is not set | ||
1040 | # CONFIG_USB_BERRY_CHARGE is not set | ||
1041 | # CONFIG_USB_LED is not set | ||
1042 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
1043 | # CONFIG_USB_CYTHERM is not set | ||
1044 | # CONFIG_USB_PHIDGET is not set | ||
1045 | # CONFIG_USB_IDMOUSE is not set | ||
1046 | # CONFIG_USB_FTDI_ELAN is not set | ||
1047 | # CONFIG_USB_APPLEDISPLAY is not set | ||
1048 | # CONFIG_USB_LD is not set | ||
1049 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
1050 | # CONFIG_USB_IOWARRIOR is not set | ||
1051 | # CONFIG_USB_ISIGHTFW is not set | ||
1052 | # CONFIG_USB_VST is not set | ||
1053 | CONFIG_USB_GADGET=y | ||
1054 | # CONFIG_USB_GADGET_DEBUG is not set | ||
1055 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
1056 | CONFIG_USB_GADGET_VBUS_DRAW=500 | ||
1057 | CONFIG_USB_GADGET_SELECTED=y | ||
1058 | # CONFIG_USB_GADGET_AT91 is not set | ||
1059 | # CONFIG_USB_GADGET_ATMEL_USBA is not set | ||
1060 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
1061 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
1062 | # CONFIG_USB_GADGET_OMAP is not set | ||
1063 | # CONFIG_USB_GADGET_PXA25X is not set | ||
1064 | CONFIG_USB_GADGET_PXA27X=y | ||
1065 | CONFIG_USB_PXA27X=y | ||
1066 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
1067 | # CONFIG_USB_GADGET_IMX is not set | ||
1068 | # CONFIG_USB_GADGET_M66592 is not set | ||
1069 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
1070 | # CONFIG_USB_GADGET_FSL_QE is not set | ||
1071 | # CONFIG_USB_GADGET_CI13XXX is not set | ||
1072 | # CONFIG_USB_GADGET_NET2280 is not set | ||
1073 | # CONFIG_USB_GADGET_GOKU is not set | ||
1074 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
1075 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
1076 | # CONFIG_USB_ZERO is not set | ||
1077 | CONFIG_USB_ETH=m | ||
1078 | # CONFIG_USB_ETH_RNDIS is not set | ||
1079 | CONFIG_USB_GADGETFS=m | ||
1080 | CONFIG_USB_FILE_STORAGE=m | ||
1081 | # CONFIG_USB_FILE_STORAGE_TEST is not set | ||
1082 | CONFIG_USB_G_SERIAL=m | ||
1083 | # CONFIG_USB_MIDI_GADGET is not set | ||
1084 | # CONFIG_USB_G_PRINTER is not set | ||
1085 | CONFIG_USB_CDC_COMPOSITE=m | ||
1086 | |||
1087 | # | ||
1088 | # OTG and related infrastructure | ||
1089 | # | ||
1090 | CONFIG_USB_OTG_UTILS=y | ||
1091 | CONFIG_USB_GPIO_VBUS=y | ||
858 | CONFIG_MMC=y | 1092 | CONFIG_MMC=y |
859 | # CONFIG_MMC_DEBUG is not set | 1093 | # CONFIG_MMC_DEBUG is not set |
860 | # CONFIG_MMC_UNSAFE_RESUME is not set | 1094 | # CONFIG_MMC_UNSAFE_RESUME is not set |
861 | 1095 | ||
862 | # | 1096 | # |
863 | # MMC/SD Card Drivers | 1097 | # MMC/SD/SDIO Card Drivers |
864 | # | 1098 | # |
865 | CONFIG_MMC_BLOCK=y | 1099 | CONFIG_MMC_BLOCK=y |
866 | CONFIG_MMC_BLOCK_BOUNCE=y | 1100 | CONFIG_MMC_BLOCK_BOUNCE=y |
867 | CONFIG_SDIO_UART=m | 1101 | CONFIG_SDIO_UART=m |
1102 | # CONFIG_MMC_TEST is not set | ||
868 | 1103 | ||
869 | # | 1104 | # |
870 | # MMC/SD Host Controller Drivers | 1105 | # MMC/SD/SDIO Host Controller Drivers |
871 | # | 1106 | # |
872 | CONFIG_MMC_PXA=y | 1107 | CONFIG_MMC_PXA=y |
1108 | # CONFIG_MMC_SDHCI is not set | ||
1109 | # CONFIG_MEMSTICK is not set | ||
1110 | # CONFIG_ACCESSIBILITY is not set | ||
873 | CONFIG_NEW_LEDS=y | 1111 | CONFIG_NEW_LEDS=y |
1112 | CONFIG_LEDS_CLASS=y | ||
1113 | |||
1114 | # | ||
1115 | # LED drivers | ||
1116 | # | ||
1117 | # CONFIG_LEDS_PCA9532 is not set | ||
1118 | CONFIG_LEDS_GPIO=y | ||
1119 | # CONFIG_LEDS_PCA955X is not set | ||
1120 | |||
1121 | # | ||
1122 | # LED Triggers | ||
1123 | # | ||
1124 | CONFIG_LEDS_TRIGGERS=y | ||
1125 | # CONFIG_LEDS_TRIGGER_TIMER is not set | ||
1126 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | ||
1127 | CONFIG_LEDS_TRIGGER_BACKLIGHT=y | ||
1128 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
874 | CONFIG_RTC_LIB=y | 1129 | CONFIG_RTC_LIB=y |
875 | CONFIG_RTC_CLASS=y | 1130 | CONFIG_RTC_CLASS=y |
876 | CONFIG_RTC_HCTOSYS=y | 1131 | CONFIG_RTC_HCTOSYS=y |
@@ -899,6 +1154,9 @@ CONFIG_RTC_INTF_DEV=y | |||
899 | # CONFIG_RTC_DRV_PCF8563 is not set | 1154 | # CONFIG_RTC_DRV_PCF8563 is not set |
900 | # CONFIG_RTC_DRV_PCF8583 is not set | 1155 | # CONFIG_RTC_DRV_PCF8583 is not set |
901 | # CONFIG_RTC_DRV_M41T80 is not set | 1156 | # CONFIG_RTC_DRV_M41T80 is not set |
1157 | # CONFIG_RTC_DRV_S35390A is not set | ||
1158 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1159 | # CONFIG_RTC_DRV_RX8581 is not set | ||
902 | 1160 | ||
903 | # | 1161 | # |
904 | # SPI RTC drivers | 1162 | # SPI RTC drivers |
@@ -908,17 +1166,26 @@ CONFIG_RTC_INTF_DEV=y | |||
908 | # Platform RTC drivers | 1166 | # Platform RTC drivers |
909 | # | 1167 | # |
910 | # CONFIG_RTC_DRV_CMOS is not set | 1168 | # CONFIG_RTC_DRV_CMOS is not set |
1169 | # CONFIG_RTC_DRV_DS1286 is not set | ||
1170 | # CONFIG_RTC_DRV_DS1511 is not set | ||
911 | # CONFIG_RTC_DRV_DS1553 is not set | 1171 | # CONFIG_RTC_DRV_DS1553 is not set |
912 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
913 | # CONFIG_RTC_DRV_DS1742 is not set | 1172 | # CONFIG_RTC_DRV_DS1742 is not set |
1173 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
914 | # CONFIG_RTC_DRV_M48T86 is not set | 1174 | # CONFIG_RTC_DRV_M48T86 is not set |
1175 | # CONFIG_RTC_DRV_M48T35 is not set | ||
915 | # CONFIG_RTC_DRV_M48T59 is not set | 1176 | # CONFIG_RTC_DRV_M48T59 is not set |
1177 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
916 | # CONFIG_RTC_DRV_V3020 is not set | 1178 | # CONFIG_RTC_DRV_V3020 is not set |
917 | 1179 | ||
918 | # | 1180 | # |
919 | # on-CPU RTC drivers | 1181 | # on-CPU RTC drivers |
920 | # | 1182 | # |
921 | CONFIG_RTC_DRV_SA1100=y | 1183 | CONFIG_RTC_DRV_SA1100=y |
1184 | # CONFIG_RTC_DRV_PXA is not set | ||
1185 | # CONFIG_DMADEVICES is not set | ||
1186 | # CONFIG_REGULATOR is not set | ||
1187 | # CONFIG_UIO is not set | ||
1188 | # CONFIG_STAGING is not set | ||
922 | 1189 | ||
923 | # | 1190 | # |
924 | # File systems | 1191 | # File systems |
@@ -927,19 +1194,18 @@ CONFIG_EXT2_FS=y | |||
927 | # CONFIG_EXT2_FS_XATTR is not set | 1194 | # CONFIG_EXT2_FS_XATTR is not set |
928 | # CONFIG_EXT2_FS_XIP is not set | 1195 | # CONFIG_EXT2_FS_XIP is not set |
929 | # CONFIG_EXT3_FS is not set | 1196 | # CONFIG_EXT3_FS is not set |
930 | # CONFIG_EXT4DEV_FS is not set | 1197 | # CONFIG_EXT4_FS is not set |
931 | # CONFIG_REISERFS_FS is not set | 1198 | # CONFIG_REISERFS_FS is not set |
932 | # CONFIG_JFS_FS is not set | 1199 | # CONFIG_JFS_FS is not set |
933 | # CONFIG_FS_POSIX_ACL is not set | 1200 | # CONFIG_FS_POSIX_ACL is not set |
1201 | CONFIG_FILE_LOCKING=y | ||
934 | # CONFIG_XFS_FS is not set | 1202 | # CONFIG_XFS_FS is not set |
935 | # CONFIG_GFS2_FS is not set | ||
936 | # CONFIG_OCFS2_FS is not set | 1203 | # CONFIG_OCFS2_FS is not set |
937 | # CONFIG_MINIX_FS is not set | 1204 | # CONFIG_BTRFS_FS is not set |
938 | # CONFIG_ROMFS_FS is not set | 1205 | CONFIG_DNOTIFY=y |
939 | CONFIG_INOTIFY=y | 1206 | CONFIG_INOTIFY=y |
940 | CONFIG_INOTIFY_USER=y | 1207 | CONFIG_INOTIFY_USER=y |
941 | # CONFIG_QUOTA is not set | 1208 | # CONFIG_QUOTA is not set |
942 | CONFIG_DNOTIFY=y | ||
943 | # CONFIG_AUTOFS_FS is not set | 1209 | # CONFIG_AUTOFS_FS is not set |
944 | # CONFIG_AUTOFS4_FS is not set | 1210 | # CONFIG_AUTOFS4_FS is not set |
945 | # CONFIG_FUSE_FS is not set | 1211 | # CONFIG_FUSE_FS is not set |
@@ -965,15 +1231,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
965 | # | 1231 | # |
966 | CONFIG_PROC_FS=y | 1232 | CONFIG_PROC_FS=y |
967 | CONFIG_PROC_SYSCTL=y | 1233 | CONFIG_PROC_SYSCTL=y |
1234 | CONFIG_PROC_PAGE_MONITOR=y | ||
968 | CONFIG_SYSFS=y | 1235 | CONFIG_SYSFS=y |
969 | CONFIG_TMPFS=y | 1236 | CONFIG_TMPFS=y |
970 | # CONFIG_TMPFS_POSIX_ACL is not set | 1237 | # CONFIG_TMPFS_POSIX_ACL is not set |
971 | # CONFIG_HUGETLB_PAGE is not set | 1238 | # CONFIG_HUGETLB_PAGE is not set |
972 | # CONFIG_CONFIGFS_FS is not set | 1239 | # CONFIG_CONFIGFS_FS is not set |
973 | 1240 | CONFIG_MISC_FILESYSTEMS=y | |
974 | # | ||
975 | # Miscellaneous filesystems | ||
976 | # | ||
977 | # CONFIG_ADFS_FS is not set | 1241 | # CONFIG_ADFS_FS is not set |
978 | # CONFIG_AFFS_FS is not set | 1242 | # CONFIG_AFFS_FS is not set |
979 | # CONFIG_HFS_FS is not set | 1243 | # CONFIG_HFS_FS is not set |
@@ -997,9 +1261,13 @@ CONFIG_JFFS2_CMODE_PRIORITY=y | |||
997 | # CONFIG_JFFS2_CMODE_SIZE is not set | 1261 | # CONFIG_JFFS2_CMODE_SIZE is not set |
998 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | 1262 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set |
999 | # CONFIG_CRAMFS is not set | 1263 | # CONFIG_CRAMFS is not set |
1264 | # CONFIG_SQUASHFS is not set | ||
1000 | # CONFIG_VXFS_FS is not set | 1265 | # CONFIG_VXFS_FS is not set |
1266 | # CONFIG_MINIX_FS is not set | ||
1267 | # CONFIG_OMFS_FS is not set | ||
1001 | # CONFIG_HPFS_FS is not set | 1268 | # CONFIG_HPFS_FS is not set |
1002 | # CONFIG_QNX4FS_FS is not set | 1269 | # CONFIG_QNX4FS_FS is not set |
1270 | # CONFIG_ROMFS_FS is not set | ||
1003 | # CONFIG_SYSV_FS is not set | 1271 | # CONFIG_SYSV_FS is not set |
1004 | # CONFIG_UFS_FS is not set | 1272 | # CONFIG_UFS_FS is not set |
1005 | CONFIG_NETWORK_FILESYSTEMS=y | 1273 | CONFIG_NETWORK_FILESYSTEMS=y |
@@ -1007,14 +1275,13 @@ CONFIG_NFS_FS=y | |||
1007 | CONFIG_NFS_V3=y | 1275 | CONFIG_NFS_V3=y |
1008 | # CONFIG_NFS_V3_ACL is not set | 1276 | # CONFIG_NFS_V3_ACL is not set |
1009 | # CONFIG_NFS_V4 is not set | 1277 | # CONFIG_NFS_V4 is not set |
1010 | # CONFIG_NFS_DIRECTIO is not set | ||
1011 | # CONFIG_NFSD is not set | ||
1012 | CONFIG_ROOT_NFS=y | 1278 | CONFIG_ROOT_NFS=y |
1279 | # CONFIG_NFSD is not set | ||
1013 | CONFIG_LOCKD=y | 1280 | CONFIG_LOCKD=y |
1014 | CONFIG_LOCKD_V4=y | 1281 | CONFIG_LOCKD_V4=y |
1015 | CONFIG_NFS_COMMON=y | 1282 | CONFIG_NFS_COMMON=y |
1016 | CONFIG_SUNRPC=y | 1283 | CONFIG_SUNRPC=y |
1017 | # CONFIG_SUNRPC_BIND34 is not set | 1284 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
1018 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1285 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1019 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1286 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1020 | # CONFIG_SMB_FS is not set | 1287 | # CONFIG_SMB_FS is not set |
@@ -1076,6 +1343,7 @@ CONFIG_NLS_UTF8=y | |||
1076 | CONFIG_PRINTK_TIME=y | 1343 | CONFIG_PRINTK_TIME=y |
1077 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1344 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1078 | CONFIG_ENABLE_MUST_CHECK=y | 1345 | CONFIG_ENABLE_MUST_CHECK=y |
1346 | CONFIG_FRAME_WARN=1024 | ||
1079 | # CONFIG_MAGIC_SYSRQ is not set | 1347 | # CONFIG_MAGIC_SYSRQ is not set |
1080 | # CONFIG_UNUSED_SYMBOLS is not set | 1348 | # CONFIG_UNUSED_SYMBOLS is not set |
1081 | # CONFIG_DEBUG_FS is not set | 1349 | # CONFIG_DEBUG_FS is not set |
@@ -1083,15 +1351,18 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1083 | CONFIG_DEBUG_KERNEL=y | 1351 | CONFIG_DEBUG_KERNEL=y |
1084 | # CONFIG_DEBUG_SHIRQ is not set | 1352 | # CONFIG_DEBUG_SHIRQ is not set |
1085 | CONFIG_DETECT_SOFTLOCKUP=y | 1353 | CONFIG_DETECT_SOFTLOCKUP=y |
1354 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1355 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1086 | # CONFIG_SCHED_DEBUG is not set | 1356 | # CONFIG_SCHED_DEBUG is not set |
1087 | # CONFIG_SCHEDSTATS is not set | 1357 | # CONFIG_SCHEDSTATS is not set |
1088 | CONFIG_TIMER_STATS=y | 1358 | CONFIG_TIMER_STATS=y |
1359 | # CONFIG_DEBUG_OBJECTS is not set | ||
1089 | # CONFIG_DEBUG_SLAB is not set | 1360 | # CONFIG_DEBUG_SLAB is not set |
1090 | CONFIG_DEBUG_PREEMPT=y | 1361 | # CONFIG_DEBUG_PREEMPT is not set |
1091 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1362 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1092 | # CONFIG_RT_MUTEX_TESTER is not set | 1363 | # CONFIG_RT_MUTEX_TESTER is not set |
1093 | # CONFIG_DEBUG_SPINLOCK is not set | 1364 | # CONFIG_DEBUG_SPINLOCK is not set |
1094 | CONFIG_DEBUG_MUTEXES=y | 1365 | # CONFIG_DEBUG_MUTEXES is not set |
1095 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 1366 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
1096 | # CONFIG_PROVE_LOCKING is not set | 1367 | # CONFIG_PROVE_LOCKING is not set |
1097 | # CONFIG_LOCK_STAT is not set | 1368 | # CONFIG_LOCK_STAT is not set |
@@ -1100,17 +1371,41 @@ CONFIG_DEBUG_MUTEXES=y | |||
1100 | # CONFIG_DEBUG_KOBJECT is not set | 1371 | # CONFIG_DEBUG_KOBJECT is not set |
1101 | CONFIG_DEBUG_BUGVERBOSE=y | 1372 | CONFIG_DEBUG_BUGVERBOSE=y |
1102 | # CONFIG_DEBUG_INFO is not set | 1373 | # CONFIG_DEBUG_INFO is not set |
1103 | CONFIG_DEBUG_VM=y | 1374 | # CONFIG_DEBUG_VM is not set |
1375 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1376 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1104 | # CONFIG_DEBUG_LIST is not set | 1377 | # CONFIG_DEBUG_LIST is not set |
1105 | # CONFIG_DEBUG_SG is not set | 1378 | # CONFIG_DEBUG_SG is not set |
1379 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
1106 | CONFIG_FRAME_POINTER=y | 1380 | CONFIG_FRAME_POINTER=y |
1107 | CONFIG_FORCED_INLINING=y | ||
1108 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1381 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1109 | # CONFIG_RCU_TORTURE_TEST is not set | 1382 | # CONFIG_RCU_TORTURE_TEST is not set |
1383 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1384 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1385 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1110 | # CONFIG_FAULT_INJECTION is not set | 1386 | # CONFIG_FAULT_INJECTION is not set |
1387 | # CONFIG_LATENCYTOP is not set | ||
1388 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
1389 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1390 | |||
1391 | # | ||
1392 | # Tracers | ||
1393 | # | ||
1394 | # CONFIG_FUNCTION_TRACER is not set | ||
1395 | # CONFIG_IRQSOFF_TRACER is not set | ||
1396 | # CONFIG_PREEMPT_TRACER is not set | ||
1397 | # CONFIG_SCHED_TRACER is not set | ||
1398 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1399 | # CONFIG_BOOT_TRACER is not set | ||
1400 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1401 | # CONFIG_STACK_TRACER is not set | ||
1402 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1111 | # CONFIG_SAMPLES is not set | 1403 | # CONFIG_SAMPLES is not set |
1404 | CONFIG_HAVE_ARCH_KGDB=y | ||
1405 | # CONFIG_KGDB is not set | ||
1112 | CONFIG_DEBUG_USER=y | 1406 | CONFIG_DEBUG_USER=y |
1113 | CONFIG_DEBUG_ERRORS=y | 1407 | CONFIG_DEBUG_ERRORS=y |
1408 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
1114 | CONFIG_DEBUG_LL=y | 1409 | CONFIG_DEBUG_LL=y |
1115 | # CONFIG_DEBUG_ICEDCC is not set | 1410 | # CONFIG_DEBUG_ICEDCC is not set |
1116 | 1411 | ||
@@ -1119,55 +1414,110 @@ CONFIG_DEBUG_LL=y | |||
1119 | # | 1414 | # |
1120 | # CONFIG_KEYS is not set | 1415 | # CONFIG_KEYS is not set |
1121 | # CONFIG_SECURITY is not set | 1416 | # CONFIG_SECURITY is not set |
1417 | # CONFIG_SECURITYFS is not set | ||
1122 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1418 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1123 | CONFIG_CRYPTO=y | 1419 | CONFIG_CRYPTO=y |
1420 | |||
1421 | # | ||
1422 | # Crypto core or helper | ||
1423 | # | ||
1424 | # CONFIG_CRYPTO_FIPS is not set | ||
1124 | CONFIG_CRYPTO_ALGAPI=m | 1425 | CONFIG_CRYPTO_ALGAPI=m |
1426 | CONFIG_CRYPTO_ALGAPI2=m | ||
1427 | CONFIG_CRYPTO_AEAD2=m | ||
1125 | CONFIG_CRYPTO_BLKCIPHER=m | 1428 | CONFIG_CRYPTO_BLKCIPHER=m |
1429 | CONFIG_CRYPTO_BLKCIPHER2=m | ||
1430 | CONFIG_CRYPTO_HASH=m | ||
1431 | CONFIG_CRYPTO_HASH2=m | ||
1432 | CONFIG_CRYPTO_RNG2=m | ||
1126 | CONFIG_CRYPTO_MANAGER=m | 1433 | CONFIG_CRYPTO_MANAGER=m |
1434 | CONFIG_CRYPTO_MANAGER2=m | ||
1435 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1436 | # CONFIG_CRYPTO_NULL is not set | ||
1437 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1438 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1439 | # CONFIG_CRYPTO_TEST is not set | ||
1440 | |||
1441 | # | ||
1442 | # Authenticated Encryption with Associated Data | ||
1443 | # | ||
1444 | # CONFIG_CRYPTO_CCM is not set | ||
1445 | # CONFIG_CRYPTO_GCM is not set | ||
1446 | # CONFIG_CRYPTO_SEQIV is not set | ||
1447 | |||
1448 | # | ||
1449 | # Block modes | ||
1450 | # | ||
1451 | # CONFIG_CRYPTO_CBC is not set | ||
1452 | # CONFIG_CRYPTO_CTR is not set | ||
1453 | # CONFIG_CRYPTO_CTS is not set | ||
1454 | CONFIG_CRYPTO_ECB=m | ||
1455 | # CONFIG_CRYPTO_LRW is not set | ||
1456 | # CONFIG_CRYPTO_PCBC is not set | ||
1457 | # CONFIG_CRYPTO_XTS is not set | ||
1458 | |||
1459 | # | ||
1460 | # Hash modes | ||
1461 | # | ||
1127 | # CONFIG_CRYPTO_HMAC is not set | 1462 | # CONFIG_CRYPTO_HMAC is not set |
1128 | # CONFIG_CRYPTO_XCBC is not set | 1463 | # CONFIG_CRYPTO_XCBC is not set |
1129 | # CONFIG_CRYPTO_NULL is not set | 1464 | |
1465 | # | ||
1466 | # Digest | ||
1467 | # | ||
1468 | # CONFIG_CRYPTO_CRC32C is not set | ||
1130 | # CONFIG_CRYPTO_MD4 is not set | 1469 | # CONFIG_CRYPTO_MD4 is not set |
1131 | # CONFIG_CRYPTO_MD5 is not set | 1470 | # CONFIG_CRYPTO_MD5 is not set |
1471 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1472 | # CONFIG_CRYPTO_RMD128 is not set | ||
1473 | # CONFIG_CRYPTO_RMD160 is not set | ||
1474 | # CONFIG_CRYPTO_RMD256 is not set | ||
1475 | # CONFIG_CRYPTO_RMD320 is not set | ||
1132 | CONFIG_CRYPTO_SHA1=m | 1476 | CONFIG_CRYPTO_SHA1=m |
1133 | # CONFIG_CRYPTO_SHA256 is not set | 1477 | # CONFIG_CRYPTO_SHA256 is not set |
1134 | # CONFIG_CRYPTO_SHA512 is not set | 1478 | # CONFIG_CRYPTO_SHA512 is not set |
1135 | # CONFIG_CRYPTO_WP512 is not set | ||
1136 | # CONFIG_CRYPTO_TGR192 is not set | 1479 | # CONFIG_CRYPTO_TGR192 is not set |
1137 | # CONFIG_CRYPTO_GF128MUL is not set | 1480 | # CONFIG_CRYPTO_WP512 is not set |
1138 | CONFIG_CRYPTO_ECB=m | 1481 | |
1139 | # CONFIG_CRYPTO_CBC is not set | 1482 | # |
1140 | CONFIG_CRYPTO_PCBC=m | 1483 | # Ciphers |
1141 | # CONFIG_CRYPTO_LRW is not set | 1484 | # |
1142 | # CONFIG_CRYPTO_XTS is not set | ||
1143 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1144 | # CONFIG_CRYPTO_DES is not set | ||
1145 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1146 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1147 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1148 | # CONFIG_CRYPTO_SERPENT is not set | ||
1149 | # CONFIG_CRYPTO_AES is not set | 1485 | # CONFIG_CRYPTO_AES is not set |
1486 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1487 | CONFIG_CRYPTO_ARC4=m | ||
1488 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1489 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1150 | # CONFIG_CRYPTO_CAST5 is not set | 1490 | # CONFIG_CRYPTO_CAST5 is not set |
1151 | # CONFIG_CRYPTO_CAST6 is not set | 1491 | # CONFIG_CRYPTO_CAST6 is not set |
1152 | # CONFIG_CRYPTO_TEA is not set | 1492 | # CONFIG_CRYPTO_DES is not set |
1153 | CONFIG_CRYPTO_ARC4=m | 1493 | # CONFIG_CRYPTO_FCRYPT is not set |
1154 | # CONFIG_CRYPTO_KHAZAD is not set | 1494 | # CONFIG_CRYPTO_KHAZAD is not set |
1155 | # CONFIG_CRYPTO_ANUBIS is not set | 1495 | # CONFIG_CRYPTO_SALSA20 is not set |
1156 | # CONFIG_CRYPTO_SEED is not set | 1496 | # CONFIG_CRYPTO_SEED is not set |
1497 | # CONFIG_CRYPTO_SERPENT is not set | ||
1498 | # CONFIG_CRYPTO_TEA is not set | ||
1499 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1500 | |||
1501 | # | ||
1502 | # Compression | ||
1503 | # | ||
1157 | # CONFIG_CRYPTO_DEFLATE is not set | 1504 | # CONFIG_CRYPTO_DEFLATE is not set |
1158 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1505 | # CONFIG_CRYPTO_LZO is not set |
1159 | # CONFIG_CRYPTO_CRC32C is not set | 1506 | |
1160 | # CONFIG_CRYPTO_CAMELLIA is not set | 1507 | # |
1161 | # CONFIG_CRYPTO_TEST is not set | 1508 | # Random Number Generation |
1162 | # CONFIG_CRYPTO_AUTHENC is not set | 1509 | # |
1510 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1163 | # CONFIG_CRYPTO_HW is not set | 1511 | # CONFIG_CRYPTO_HW is not set |
1164 | 1512 | ||
1165 | # | 1513 | # |
1166 | # Library routines | 1514 | # Library routines |
1167 | # | 1515 | # |
1168 | CONFIG_BITREVERSE=y | 1516 | CONFIG_BITREVERSE=y |
1517 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
1169 | CONFIG_CRC_CCITT=y | 1518 | CONFIG_CRC_CCITT=y |
1170 | # CONFIG_CRC16 is not set | 1519 | # CONFIG_CRC16 is not set |
1520 | # CONFIG_CRC_T10DIF is not set | ||
1171 | # CONFIG_CRC_ITU_T is not set | 1521 | # CONFIG_CRC_ITU_T is not set |
1172 | CONFIG_CRC32=y | 1522 | CONFIG_CRC32=y |
1173 | # CONFIG_CRC7 is not set | 1523 | # CONFIG_CRC7 is not set |
diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig index d81ea219c934..36cd62edd05c 100644 --- a/arch/arm/configs/neponset_defconfig +++ b/arch/arm/configs/neponset_defconfig | |||
@@ -91,7 +91,6 @@ CONFIG_ASSABET_NEPONSET=y | |||
91 | # CONFIG_SA1100_COLLIE is not set | 91 | # CONFIG_SA1100_COLLIE is not set |
92 | # CONFIG_SA1100_H3100 is not set | 92 | # CONFIG_SA1100_H3100 is not set |
93 | # CONFIG_SA1100_H3600 is not set | 93 | # CONFIG_SA1100_H3600 is not set |
94 | # CONFIG_SA1100_H3800 is not set | ||
95 | # CONFIG_SA1100_BADGE4 is not set | 94 | # CONFIG_SA1100_BADGE4 is not set |
96 | # CONFIG_SA1100_JORNADA720 is not set | 95 | # CONFIG_SA1100_JORNADA720 is not set |
97 | # CONFIG_SA1100_HACKKIT is not set | 96 | # CONFIG_SA1100_HACKKIT is not set |
diff --git a/arch/arm/configs/pleb_defconfig b/arch/arm/configs/pleb_defconfig index a6b47ea8e465..f2d2dda25949 100644 --- a/arch/arm/configs/pleb_defconfig +++ b/arch/arm/configs/pleb_defconfig | |||
@@ -88,7 +88,6 @@ CONFIG_ARCH_SA1100=y | |||
88 | # CONFIG_SA1100_COLLIE is not set | 88 | # CONFIG_SA1100_COLLIE is not set |
89 | # CONFIG_SA1100_H3100 is not set | 89 | # CONFIG_SA1100_H3100 is not set |
90 | # CONFIG_SA1100_H3600 is not set | 90 | # CONFIG_SA1100_H3600 is not set |
91 | # CONFIG_SA1100_H3800 is not set | ||
92 | # CONFIG_SA1100_BADGE4 is not set | 91 | # CONFIG_SA1100_BADGE4 is not set |
93 | # CONFIG_SA1100_JORNADA720 is not set | 92 | # CONFIG_SA1100_JORNADA720 is not set |
94 | # CONFIG_SA1100_HACKKIT is not set | 93 | # CONFIG_SA1100_HACKKIT is not set |
diff --git a/arch/arm/configs/shannon_defconfig b/arch/arm/configs/shannon_defconfig index d052c8f80515..984f7096a533 100644 --- a/arch/arm/configs/shannon_defconfig +++ b/arch/arm/configs/shannon_defconfig | |||
@@ -87,7 +87,6 @@ CONFIG_ARCH_SA1100=y | |||
87 | # CONFIG_SA1100_COLLIE is not set | 87 | # CONFIG_SA1100_COLLIE is not set |
88 | # CONFIG_SA1100_H3100 is not set | 88 | # CONFIG_SA1100_H3100 is not set |
89 | # CONFIG_SA1100_H3600 is not set | 89 | # CONFIG_SA1100_H3600 is not set |
90 | # CONFIG_SA1100_H3800 is not set | ||
91 | # CONFIG_SA1100_BADGE4 is not set | 90 | # CONFIG_SA1100_BADGE4 is not set |
92 | # CONFIG_SA1100_JORNADA720 is not set | 91 | # CONFIG_SA1100_JORNADA720 is not set |
93 | # CONFIG_SA1100_HACKKIT is not set | 92 | # CONFIG_SA1100_HACKKIT is not set |
diff --git a/arch/arm/configs/shark_defconfig b/arch/arm/configs/shark_defconfig index 9b6561d119af..90235bf7a1de 100644 --- a/arch/arm/configs/shark_defconfig +++ b/arch/arm/configs/shark_defconfig | |||
@@ -1,88 +1,174 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.12-git3 | 3 | # Linux kernel version: 2.6.28-git6 |
4 | # Sat Jul 16 15:21:47 2005 | 4 | # Thu Jan 8 17:14:47 2009 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | # CONFIG_GENERIC_GPIO is not set | ||
9 | # CONFIG_GENERIC_TIME is not set | ||
10 | # CONFIG_GENERIC_CLOCKEVENTS is not set | ||
7 | CONFIG_MMU=y | 11 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | 12 | # CONFIG_NO_IOPORT is not set |
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
16 | CONFIG_LOCKDEP_SUPPORT=y | ||
17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
23 | CONFIG_GENERIC_HWEIGHT=y | ||
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
25 | CONFIG_ZONE_DMA=y | ||
26 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
27 | CONFIG_VECTORS_BASE=0xffff0000 | ||
28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
11 | 29 | ||
12 | # | 30 | # |
13 | # Code maturity level options | 31 | # General setup |
14 | # | 32 | # |
15 | CONFIG_EXPERIMENTAL=y | 33 | CONFIG_EXPERIMENTAL=y |
16 | CONFIG_CLEAN_COMPILE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 34 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 35 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
19 | |||
20 | # | ||
21 | # General setup | ||
22 | # | ||
23 | CONFIG_LOCALVERSION="" | 36 | CONFIG_LOCALVERSION="" |
37 | # CONFIG_LOCALVERSION_AUTO is not set | ||
24 | CONFIG_SWAP=y | 38 | CONFIG_SWAP=y |
25 | CONFIG_SYSVIPC=y | 39 | CONFIG_SYSVIPC=y |
40 | CONFIG_SYSVIPC_SYSCTL=y | ||
26 | # CONFIG_POSIX_MQUEUE is not set | 41 | # CONFIG_POSIX_MQUEUE is not set |
27 | # CONFIG_BSD_PROCESS_ACCT is not set | 42 | # CONFIG_BSD_PROCESS_ACCT is not set |
28 | CONFIG_SYSCTL=y | 43 | # CONFIG_TASKSTATS is not set |
29 | # CONFIG_AUDIT is not set | 44 | # CONFIG_AUDIT is not set |
30 | # CONFIG_HOTPLUG is not set | ||
31 | CONFIG_KOBJECT_UEVENT=y | ||
32 | # CONFIG_IKCONFIG is not set | 45 | # CONFIG_IKCONFIG is not set |
46 | CONFIG_LOG_BUF_SHIFT=14 | ||
47 | # CONFIG_CGROUPS is not set | ||
48 | CONFIG_GROUP_SCHED=y | ||
49 | CONFIG_FAIR_GROUP_SCHED=y | ||
50 | # CONFIG_RT_GROUP_SCHED is not set | ||
51 | CONFIG_USER_SCHED=y | ||
52 | # CONFIG_CGROUP_SCHED is not set | ||
53 | CONFIG_SYSFS_DEPRECATED=y | ||
54 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
55 | # CONFIG_RELAY is not set | ||
56 | CONFIG_NAMESPACES=y | ||
57 | # CONFIG_UTS_NS is not set | ||
58 | # CONFIG_IPC_NS is not set | ||
59 | # CONFIG_USER_NS is not set | ||
60 | # CONFIG_PID_NS is not set | ||
61 | # CONFIG_BLK_DEV_INITRD is not set | ||
62 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
63 | CONFIG_SYSCTL=y | ||
33 | # CONFIG_EMBEDDED is not set | 64 | # CONFIG_EMBEDDED is not set |
65 | CONFIG_UID16=y | ||
66 | CONFIG_SYSCTL_SYSCALL=y | ||
34 | CONFIG_KALLSYMS=y | 67 | CONFIG_KALLSYMS=y |
35 | # CONFIG_KALLSYMS_ALL is not set | 68 | # CONFIG_KALLSYMS_ALL is not set |
36 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 69 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
70 | CONFIG_HOTPLUG=y | ||
37 | CONFIG_PRINTK=y | 71 | CONFIG_PRINTK=y |
38 | CONFIG_BUG=y | 72 | CONFIG_BUG=y |
73 | CONFIG_ELF_CORE=y | ||
74 | CONFIG_COMPAT_BRK=y | ||
39 | CONFIG_BASE_FULL=y | 75 | CONFIG_BASE_FULL=y |
40 | CONFIG_FUTEX=y | 76 | CONFIG_FUTEX=y |
77 | CONFIG_ANON_INODES=y | ||
41 | CONFIG_EPOLL=y | 78 | CONFIG_EPOLL=y |
42 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 79 | CONFIG_SIGNALFD=y |
80 | CONFIG_TIMERFD=y | ||
81 | CONFIG_EVENTFD=y | ||
43 | CONFIG_SHMEM=y | 82 | CONFIG_SHMEM=y |
44 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 83 | CONFIG_AIO=y |
45 | CONFIG_CC_ALIGN_LABELS=0 | 84 | CONFIG_VM_EVENT_COUNTERS=y |
46 | CONFIG_CC_ALIGN_LOOPS=0 | 85 | CONFIG_PCI_QUIRKS=y |
47 | CONFIG_CC_ALIGN_JUMPS=0 | 86 | CONFIG_SLAB=y |
87 | # CONFIG_SLUB is not set | ||
88 | # CONFIG_SLOB is not set | ||
89 | # CONFIG_PROFILING is not set | ||
90 | CONFIG_HAVE_OPROFILE=y | ||
91 | # CONFIG_KPROBES is not set | ||
92 | CONFIG_HAVE_KPROBES=y | ||
93 | CONFIG_HAVE_KRETPROBES=y | ||
94 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
95 | CONFIG_SLABINFO=y | ||
96 | CONFIG_RT_MUTEXES=y | ||
48 | # CONFIG_TINY_SHMEM is not set | 97 | # CONFIG_TINY_SHMEM is not set |
49 | CONFIG_BASE_SMALL=0 | 98 | CONFIG_BASE_SMALL=0 |
50 | |||
51 | # | ||
52 | # Loadable module support | ||
53 | # | ||
54 | CONFIG_MODULES=y | 99 | CONFIG_MODULES=y |
100 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
55 | CONFIG_MODULE_UNLOAD=y | 101 | CONFIG_MODULE_UNLOAD=y |
56 | CONFIG_MODULE_FORCE_UNLOAD=y | 102 | CONFIG_MODULE_FORCE_UNLOAD=y |
57 | CONFIG_OBSOLETE_MODPARM=y | ||
58 | # CONFIG_MODVERSIONS is not set | 103 | # CONFIG_MODVERSIONS is not set |
59 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 104 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
60 | CONFIG_KMOD=y | 105 | CONFIG_KMOD=y |
106 | CONFIG_BLOCK=y | ||
107 | # CONFIG_LBD is not set | ||
108 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
109 | # CONFIG_BLK_DEV_BSG is not set | ||
110 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
111 | |||
112 | # | ||
113 | # IO Schedulers | ||
114 | # | ||
115 | CONFIG_IOSCHED_NOOP=y | ||
116 | CONFIG_IOSCHED_AS=y | ||
117 | CONFIG_IOSCHED_DEADLINE=y | ||
118 | CONFIG_IOSCHED_CFQ=y | ||
119 | # CONFIG_DEFAULT_AS is not set | ||
120 | # CONFIG_DEFAULT_DEADLINE is not set | ||
121 | CONFIG_DEFAULT_CFQ=y | ||
122 | # CONFIG_DEFAULT_NOOP is not set | ||
123 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
124 | CONFIG_CLASSIC_RCU=y | ||
125 | # CONFIG_TREE_RCU is not set | ||
126 | # CONFIG_PREEMPT_RCU is not set | ||
127 | # CONFIG_TREE_RCU_TRACE is not set | ||
128 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
129 | # CONFIG_FREEZER is not set | ||
61 | 130 | ||
62 | # | 131 | # |
63 | # System Type | 132 | # System Type |
64 | # | 133 | # |
65 | # CONFIG_ARCH_CLPS7500 is not set | 134 | # CONFIG_ARCH_AAEC2000 is not set |
135 | # CONFIG_ARCH_INTEGRATOR is not set | ||
136 | # CONFIG_ARCH_REALVIEW is not set | ||
137 | # CONFIG_ARCH_VERSATILE is not set | ||
138 | # CONFIG_ARCH_AT91 is not set | ||
66 | # CONFIG_ARCH_CLPS711X is not set | 139 | # CONFIG_ARCH_CLPS711X is not set |
67 | # CONFIG_ARCH_CO285 is not set | ||
68 | # CONFIG_ARCH_EBSA110 is not set | 140 | # CONFIG_ARCH_EBSA110 is not set |
141 | # CONFIG_ARCH_EP93XX is not set | ||
69 | # CONFIG_ARCH_FOOTBRIDGE is not set | 142 | # CONFIG_ARCH_FOOTBRIDGE is not set |
70 | # CONFIG_ARCH_INTEGRATOR is not set | 143 | # CONFIG_ARCH_NETX is not set |
71 | # CONFIG_ARCH_IOP3XX is not set | 144 | # CONFIG_ARCH_H720X is not set |
72 | # CONFIG_ARCH_IXP4XX is not set | 145 | # CONFIG_ARCH_IMX is not set |
146 | # CONFIG_ARCH_IOP13XX is not set | ||
147 | # CONFIG_ARCH_IOP32X is not set | ||
148 | # CONFIG_ARCH_IOP33X is not set | ||
149 | # CONFIG_ARCH_IXP23XX is not set | ||
73 | # CONFIG_ARCH_IXP2000 is not set | 150 | # CONFIG_ARCH_IXP2000 is not set |
151 | # CONFIG_ARCH_IXP4XX is not set | ||
74 | # CONFIG_ARCH_L7200 is not set | 152 | # CONFIG_ARCH_L7200 is not set |
153 | # CONFIG_ARCH_KIRKWOOD is not set | ||
154 | # CONFIG_ARCH_KS8695 is not set | ||
155 | # CONFIG_ARCH_NS9XXX is not set | ||
156 | # CONFIG_ARCH_LOKI is not set | ||
157 | # CONFIG_ARCH_MV78XX0 is not set | ||
158 | # CONFIG_ARCH_MXC is not set | ||
159 | # CONFIG_ARCH_ORION5X is not set | ||
160 | # CONFIG_ARCH_PNX4008 is not set | ||
75 | # CONFIG_ARCH_PXA is not set | 161 | # CONFIG_ARCH_PXA is not set |
76 | # CONFIG_ARCH_RPC is not set | 162 | # CONFIG_ARCH_RPC is not set |
77 | # CONFIG_ARCH_SA1100 is not set | 163 | # CONFIG_ARCH_SA1100 is not set |
78 | # CONFIG_ARCH_S3C2410 is not set | 164 | # CONFIG_ARCH_S3C2410 is not set |
165 | # CONFIG_ARCH_S3C64XX is not set | ||
79 | CONFIG_ARCH_SHARK=y | 166 | CONFIG_ARCH_SHARK=y |
80 | # CONFIG_ARCH_LH7A40X is not set | 167 | # CONFIG_ARCH_LH7A40X is not set |
168 | # CONFIG_ARCH_DAVINCI is not set | ||
81 | # CONFIG_ARCH_OMAP is not set | 169 | # CONFIG_ARCH_OMAP is not set |
82 | # CONFIG_ARCH_VERSATILE is not set | 170 | # CONFIG_ARCH_MSM is not set |
83 | # CONFIG_ARCH_IMX is not set | 171 | # CONFIG_ARCH_W90X900 is not set |
84 | # CONFIG_ARCH_H720X is not set | ||
85 | # CONFIG_ARCH_AAEC2000 is not set | ||
86 | 172 | ||
87 | # | 173 | # |
88 | # Processor Type | 174 | # Processor Type |
@@ -91,14 +177,20 @@ CONFIG_CPU_32=y | |||
91 | CONFIG_CPU_SA110=y | 177 | CONFIG_CPU_SA110=y |
92 | CONFIG_CPU_32v4=y | 178 | CONFIG_CPU_32v4=y |
93 | CONFIG_CPU_ABRT_EV4=y | 179 | CONFIG_CPU_ABRT_EV4=y |
180 | CONFIG_CPU_PABRT_NOIFAR=y | ||
94 | CONFIG_CPU_CACHE_V4WB=y | 181 | CONFIG_CPU_CACHE_V4WB=y |
95 | CONFIG_CPU_CACHE_VIVT=y | 182 | CONFIG_CPU_CACHE_VIVT=y |
96 | CONFIG_CPU_COPY_V4WB=y | 183 | CONFIG_CPU_COPY_V4WB=y |
97 | CONFIG_CPU_TLB_V4WB=y | 184 | CONFIG_CPU_TLB_V4WB=y |
185 | CONFIG_CPU_CP15=y | ||
186 | CONFIG_CPU_CP15_MMU=y | ||
98 | 187 | ||
99 | # | 188 | # |
100 | # Processor Features | 189 | # Processor Features |
101 | # | 190 | # |
191 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
192 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
193 | # CONFIG_OUTER_CACHE is not set | ||
102 | 194 | ||
103 | # | 195 | # |
104 | # Bus support | 196 | # Bus support |
@@ -107,22 +199,40 @@ CONFIG_ISA=y | |||
107 | CONFIG_ISA_DMA=y | 199 | CONFIG_ISA_DMA=y |
108 | CONFIG_ISA_DMA_API=y | 200 | CONFIG_ISA_DMA_API=y |
109 | CONFIG_PCI=y | 201 | CONFIG_PCI=y |
202 | CONFIG_PCI_SYSCALL=y | ||
110 | CONFIG_PCI_HOST_VIA82C505=y | 203 | CONFIG_PCI_HOST_VIA82C505=y |
111 | CONFIG_PCI_LEGACY_PROC=y | 204 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
112 | # CONFIG_PCI_NAMES is not set | 205 | CONFIG_PCI_LEGACY=y |
113 | # CONFIG_PCI_DEBUG is not set | 206 | # CONFIG_PCI_DEBUG is not set |
114 | |||
115 | # | ||
116 | # PCCARD (PCMCIA/CardBus) support | ||
117 | # | ||
118 | # CONFIG_PCCARD is not set | 207 | # CONFIG_PCCARD is not set |
119 | 208 | ||
120 | # | 209 | # |
121 | # Kernel Features | 210 | # Kernel Features |
122 | # | 211 | # |
123 | # CONFIG_SMP is not set | 212 | CONFIG_VMSPLIT_3G=y |
213 | # CONFIG_VMSPLIT_2G is not set | ||
214 | # CONFIG_VMSPLIT_1G is not set | ||
215 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
124 | # CONFIG_PREEMPT is not set | 216 | # CONFIG_PREEMPT is not set |
125 | # CONFIG_DISCONTIGMEM is not set | 217 | CONFIG_HZ=100 |
218 | # CONFIG_AEABI is not set | ||
219 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
220 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | ||
221 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | ||
222 | CONFIG_SELECT_MEMORY_MODEL=y | ||
223 | CONFIG_FLATMEM_MANUAL=y | ||
224 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
225 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
226 | CONFIG_FLATMEM=y | ||
227 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
228 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
229 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
230 | # CONFIG_RESOURCES_64BIT is not set | ||
231 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
232 | CONFIG_ZONE_DMA_FLAG=1 | ||
233 | CONFIG_BOUNCE=y | ||
234 | CONFIG_VIRT_TO_BUS=y | ||
235 | CONFIG_UNEVICTABLE_LRU=y | ||
126 | CONFIG_LEDS=y | 236 | CONFIG_LEDS=y |
127 | CONFIG_LEDS_TIMER=y | 237 | CONFIG_LEDS_TIMER=y |
128 | # CONFIG_LEDS_CPU is not set | 238 | # CONFIG_LEDS_CPU is not set |
@@ -135,6 +245,12 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 | |||
135 | CONFIG_ZBOOT_ROM_BSS=0x0 | 245 | CONFIG_ZBOOT_ROM_BSS=0x0 |
136 | CONFIG_CMDLINE="" | 246 | CONFIG_CMDLINE="" |
137 | # CONFIG_XIP_KERNEL is not set | 247 | # CONFIG_XIP_KERNEL is not set |
248 | # CONFIG_KEXEC is not set | ||
249 | |||
250 | # | ||
251 | # CPU Power Management | ||
252 | # | ||
253 | # CONFIG_CPU_IDLE is not set | ||
138 | 254 | ||
139 | # | 255 | # |
140 | # Floating point emulation | 256 | # Floating point emulation |
@@ -143,13 +259,16 @@ CONFIG_CMDLINE="" | |||
143 | # | 259 | # |
144 | # At least one emulation must be selected | 260 | # At least one emulation must be selected |
145 | # | 261 | # |
146 | # CONFIG_FPE_NWFPE is not set | 262 | CONFIG_FPE_NWFPE=y |
147 | CONFIG_FPE_FASTFPE=y | 263 | # CONFIG_FPE_NWFPE_XP is not set |
264 | # CONFIG_FPE_FASTFPE is not set | ||
148 | 265 | ||
149 | # | 266 | # |
150 | # Userspace binary formats | 267 | # Userspace binary formats |
151 | # | 268 | # |
152 | CONFIG_BINFMT_ELF=y | 269 | CONFIG_BINFMT_ELF=y |
270 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
271 | CONFIG_HAVE_AOUT=y | ||
153 | # CONFIG_BINFMT_AOUT is not set | 272 | # CONFIG_BINFMT_AOUT is not set |
154 | # CONFIG_BINFMT_MISC is not set | 273 | # CONFIG_BINFMT_MISC is not set |
155 | # CONFIG_ARTHUR is not set | 274 | # CONFIG_ARTHUR is not set |
@@ -158,44 +277,104 @@ CONFIG_BINFMT_ELF=y | |||
158 | # Power management options | 277 | # Power management options |
159 | # | 278 | # |
160 | # CONFIG_PM is not set | 279 | # CONFIG_PM is not set |
280 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
281 | CONFIG_NET=y | ||
161 | 282 | ||
162 | # | 283 | # |
163 | # Device Drivers | 284 | # Networking options |
164 | # | 285 | # |
286 | # CONFIG_NET_NS is not set | ||
287 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
288 | CONFIG_PACKET=y | ||
289 | # CONFIG_PACKET_MMAP is not set | ||
290 | CONFIG_UNIX=y | ||
291 | # CONFIG_NET_KEY is not set | ||
292 | CONFIG_INET=y | ||
293 | # CONFIG_IP_MULTICAST is not set | ||
294 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
295 | CONFIG_IP_FIB_HASH=y | ||
296 | # CONFIG_IP_PNP is not set | ||
297 | # CONFIG_NET_IPIP is not set | ||
298 | # CONFIG_NET_IPGRE is not set | ||
299 | # CONFIG_ARPD is not set | ||
300 | # CONFIG_SYN_COOKIES is not set | ||
301 | # CONFIG_INET_AH is not set | ||
302 | # CONFIG_INET_ESP is not set | ||
303 | # CONFIG_INET_IPCOMP is not set | ||
304 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
305 | # CONFIG_INET_TUNNEL is not set | ||
306 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
307 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
308 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
309 | # CONFIG_INET_LRO is not set | ||
310 | # CONFIG_INET_DIAG is not set | ||
311 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
312 | CONFIG_TCP_CONG_CUBIC=y | ||
313 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
314 | # CONFIG_TCP_MD5SIG is not set | ||
315 | # CONFIG_IPV6 is not set | ||
316 | # CONFIG_NETWORK_SECMARK is not set | ||
317 | # CONFIG_NETFILTER is not set | ||
318 | # CONFIG_IP_DCCP is not set | ||
319 | # CONFIG_IP_SCTP is not set | ||
320 | # CONFIG_TIPC is not set | ||
321 | # CONFIG_ATM is not set | ||
322 | # CONFIG_BRIDGE is not set | ||
323 | # CONFIG_NET_DSA is not set | ||
324 | # CONFIG_VLAN_8021Q is not set | ||
325 | # CONFIG_DECNET is not set | ||
326 | # CONFIG_LLC2 is not set | ||
327 | # CONFIG_IPX is not set | ||
328 | # CONFIG_ATALK is not set | ||
329 | # CONFIG_X25 is not set | ||
330 | # CONFIG_LAPB is not set | ||
331 | # CONFIG_ECONET is not set | ||
332 | # CONFIG_WAN_ROUTER is not set | ||
333 | # CONFIG_NET_SCHED is not set | ||
334 | # CONFIG_DCB is not set | ||
165 | 335 | ||
166 | # | 336 | # |
167 | # Generic Driver Options | 337 | # Network testing |
168 | # | 338 | # |
169 | # CONFIG_STANDALONE is not set | 339 | # CONFIG_NET_PKTGEN is not set |
170 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 340 | # CONFIG_HAMRADIO is not set |
171 | # CONFIG_FW_LOADER is not set | 341 | # CONFIG_CAN is not set |
172 | # CONFIG_DEBUG_DRIVER is not set | 342 | # CONFIG_IRDA is not set |
343 | # CONFIG_BT is not set | ||
344 | # CONFIG_AF_RXRPC is not set | ||
345 | # CONFIG_PHONET is not set | ||
346 | # CONFIG_WIRELESS is not set | ||
347 | # CONFIG_RFKILL is not set | ||
348 | # CONFIG_NET_9P is not set | ||
173 | 349 | ||
174 | # | 350 | # |
175 | # Memory Technology Devices (MTD) | 351 | # Device Drivers |
176 | # | 352 | # |
177 | # CONFIG_MTD is not set | ||
178 | 353 | ||
179 | # | 354 | # |
180 | # Parallel port support | 355 | # Generic Driver Options |
181 | # | 356 | # |
357 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
358 | # CONFIG_STANDALONE is not set | ||
359 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
360 | CONFIG_FW_LOADER=y | ||
361 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
362 | CONFIG_EXTRA_FIRMWARE="" | ||
363 | # CONFIG_DEBUG_DRIVER is not set | ||
364 | # CONFIG_DEBUG_DEVRES is not set | ||
365 | # CONFIG_SYS_HYPERVISOR is not set | ||
366 | # CONFIG_CONNECTOR is not set | ||
367 | # CONFIG_MTD is not set | ||
182 | CONFIG_PARPORT=m | 368 | CONFIG_PARPORT=m |
183 | CONFIG_PARPORT_PC=m | 369 | CONFIG_PARPORT_PC=m |
184 | # CONFIG_PARPORT_SERIAL is not set | 370 | # CONFIG_PARPORT_SERIAL is not set |
185 | # CONFIG_PARPORT_PC_FIFO is not set | 371 | # CONFIG_PARPORT_PC_FIFO is not set |
186 | # CONFIG_PARPORT_PC_SUPERIO is not set | 372 | # CONFIG_PARPORT_PC_SUPERIO is not set |
187 | # CONFIG_PARPORT_ARC is not set | ||
188 | # CONFIG_PARPORT_GSC is not set | 373 | # CONFIG_PARPORT_GSC is not set |
374 | # CONFIG_PARPORT_AX88796 is not set | ||
189 | # CONFIG_PARPORT_1284 is not set | 375 | # CONFIG_PARPORT_1284 is not set |
190 | |||
191 | # | ||
192 | # Plug and Play support | ||
193 | # | ||
194 | # CONFIG_PNP is not set | 376 | # CONFIG_PNP is not set |
195 | 377 | CONFIG_BLK_DEV=y | |
196 | # | ||
197 | # Block devices | ||
198 | # | ||
199 | # CONFIG_BLK_DEV_XD is not set | 378 | # CONFIG_BLK_DEV_XD is not set |
200 | # CONFIG_PARIDE is not set | 379 | # CONFIG_PARIDE is not set |
201 | # CONFIG_BLK_CPQ_DA is not set | 380 | # CONFIG_BLK_CPQ_DA is not set |
@@ -210,52 +389,78 @@ CONFIG_BLK_DEV_LOOP=y | |||
210 | CONFIG_BLK_DEV_RAM=y | 389 | CONFIG_BLK_DEV_RAM=y |
211 | CONFIG_BLK_DEV_RAM_COUNT=16 | 390 | CONFIG_BLK_DEV_RAM_COUNT=16 |
212 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 391 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
213 | # CONFIG_BLK_DEV_INITRD is not set | 392 | # CONFIG_BLK_DEV_XIP is not set |
214 | CONFIG_INITRAMFS_SOURCE="" | ||
215 | # CONFIG_CDROM_PKTCDVD is not set | 393 | # CONFIG_CDROM_PKTCDVD is not set |
216 | |||
217 | # | ||
218 | # IO Schedulers | ||
219 | # | ||
220 | CONFIG_IOSCHED_NOOP=y | ||
221 | CONFIG_IOSCHED_AS=y | ||
222 | CONFIG_IOSCHED_DEADLINE=y | ||
223 | CONFIG_IOSCHED_CFQ=y | ||
224 | # CONFIG_ATA_OVER_ETH is not set | 394 | # CONFIG_ATA_OVER_ETH is not set |
225 | 395 | # CONFIG_BLK_DEV_HD is not set | |
226 | # | 396 | CONFIG_MISC_DEVICES=y |
227 | # ATA/ATAPI/MFM/RLL support | 397 | # CONFIG_PHANTOM is not set |
228 | # | 398 | # CONFIG_EEPROM_93CX6 is not set |
399 | # CONFIG_SGI_IOC4 is not set | ||
400 | # CONFIG_TIFM_CORE is not set | ||
401 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
402 | # CONFIG_HP_ILO is not set | ||
403 | # CONFIG_C2PORT is not set | ||
404 | CONFIG_HAVE_IDE=y | ||
229 | CONFIG_IDE=y | 405 | CONFIG_IDE=y |
230 | CONFIG_BLK_DEV_IDE=y | ||
231 | 406 | ||
232 | # | 407 | # |
233 | # Please see Documentation/ide.txt for help/info on IDE drives | 408 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
234 | # | 409 | # |
410 | CONFIG_IDE_ATAPI=y | ||
235 | # CONFIG_BLK_DEV_IDE_SATA is not set | 411 | # CONFIG_BLK_DEV_IDE_SATA is not set |
236 | CONFIG_BLK_DEV_IDEDISK=y | 412 | CONFIG_IDE_GD=y |
237 | # CONFIG_IDEDISK_MULTI_MODE is not set | 413 | CONFIG_IDE_GD_ATA=y |
414 | # CONFIG_IDE_GD_ATAPI is not set | ||
238 | CONFIG_BLK_DEV_IDECD=m | 415 | CONFIG_BLK_DEV_IDECD=m |
416 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
239 | # CONFIG_BLK_DEV_IDETAPE is not set | 417 | # CONFIG_BLK_DEV_IDETAPE is not set |
240 | CONFIG_BLK_DEV_IDEFLOPPY=y | ||
241 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
242 | # CONFIG_IDE_TASK_IOCTL is not set | 418 | # CONFIG_IDE_TASK_IOCTL is not set |
419 | CONFIG_IDE_PROC_FS=y | ||
243 | 420 | ||
244 | # | 421 | # |
245 | # IDE chipset support/bugfixes | 422 | # IDE chipset support/bugfixes |
246 | # | 423 | # |
247 | CONFIG_IDE_GENERIC=y | 424 | # CONFIG_BLK_DEV_PLATFORM is not set |
248 | # CONFIG_BLK_DEV_IDEPCI is not set | 425 | |
426 | # | ||
427 | # PCI IDE chipsets support | ||
428 | # | ||
429 | # CONFIG_BLK_DEV_GENERIC is not set | ||
430 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
431 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
432 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
433 | # CONFIG_BLK_DEV_CMD64X is not set | ||
434 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
435 | # CONFIG_BLK_DEV_CS5520 is not set | ||
436 | # CONFIG_BLK_DEV_CS5530 is not set | ||
437 | # CONFIG_BLK_DEV_HPT366 is not set | ||
438 | # CONFIG_BLK_DEV_JMICRON is not set | ||
439 | # CONFIG_BLK_DEV_SC1200 is not set | ||
440 | # CONFIG_BLK_DEV_PIIX is not set | ||
441 | # CONFIG_BLK_DEV_IT8213 is not set | ||
442 | # CONFIG_BLK_DEV_IT821X is not set | ||
443 | # CONFIG_BLK_DEV_NS87415 is not set | ||
444 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
445 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
446 | # CONFIG_BLK_DEV_SVWKS is not set | ||
447 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
448 | # CONFIG_BLK_DEV_SL82C105 is not set | ||
449 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
450 | # CONFIG_BLK_DEV_TRM290 is not set | ||
451 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
452 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
249 | CONFIG_IDE_ARM=y | 453 | CONFIG_IDE_ARM=y |
250 | # CONFIG_IDE_CHIPSETS is not set | ||
251 | # CONFIG_BLK_DEV_IDEDMA is not set | 454 | # CONFIG_BLK_DEV_IDEDMA is not set |
252 | # CONFIG_IDEDMA_AUTO is not set | ||
253 | # CONFIG_BLK_DEV_HD is not set | ||
254 | 455 | ||
255 | # | 456 | # |
256 | # SCSI device support | 457 | # SCSI device support |
257 | # | 458 | # |
459 | # CONFIG_RAID_ATTRS is not set | ||
258 | CONFIG_SCSI=m | 460 | CONFIG_SCSI=m |
461 | CONFIG_SCSI_DMA=y | ||
462 | # CONFIG_SCSI_TGT is not set | ||
463 | # CONFIG_SCSI_NETLINK is not set | ||
259 | CONFIG_SCSI_PROC_FS=y | 464 | CONFIG_SCSI_PROC_FS=y |
260 | 465 | ||
261 | # | 466 | # |
@@ -275,17 +480,20 @@ CONFIG_CHR_DEV_SG=m | |||
275 | # CONFIG_SCSI_MULTI_LUN is not set | 480 | # CONFIG_SCSI_MULTI_LUN is not set |
276 | # CONFIG_SCSI_CONSTANTS is not set | 481 | # CONFIG_SCSI_CONSTANTS is not set |
277 | # CONFIG_SCSI_LOGGING is not set | 482 | # CONFIG_SCSI_LOGGING is not set |
483 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
484 | CONFIG_SCSI_WAIT_SCAN=m | ||
278 | 485 | ||
279 | # | 486 | # |
280 | # SCSI Transport Attributes | 487 | # SCSI Transports |
281 | # | 488 | # |
282 | # CONFIG_SCSI_SPI_ATTRS is not set | 489 | # CONFIG_SCSI_SPI_ATTRS is not set |
283 | # CONFIG_SCSI_FC_ATTRS is not set | 490 | # CONFIG_SCSI_FC_ATTRS is not set |
284 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 491 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
285 | 492 | # CONFIG_SCSI_SAS_LIBSAS is not set | |
286 | # | 493 | # CONFIG_SCSI_SRP_ATTRS is not set |
287 | # SCSI low-level drivers | 494 | CONFIG_SCSI_LOWLEVEL=y |
288 | # | 495 | # CONFIG_ISCSI_TCP is not set |
496 | # CONFIG_SCSI_CXGB3_ISCSI is not set | ||
289 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 497 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
290 | # CONFIG_SCSI_3W_9XXX is not set | 498 | # CONFIG_SCSI_3W_9XXX is not set |
291 | # CONFIG_SCSI_7000FASST is not set | 499 | # CONFIG_SCSI_7000FASST is not set |
@@ -296,12 +504,18 @@ CONFIG_CHR_DEV_SG=m | |||
296 | # CONFIG_SCSI_AIC7XXX is not set | 504 | # CONFIG_SCSI_AIC7XXX is not set |
297 | # CONFIG_SCSI_AIC7XXX_OLD is not set | 505 | # CONFIG_SCSI_AIC7XXX_OLD is not set |
298 | # CONFIG_SCSI_AIC79XX is not set | 506 | # CONFIG_SCSI_AIC79XX is not set |
507 | # CONFIG_SCSI_AIC94XX is not set | ||
299 | # CONFIG_SCSI_DPT_I2O is not set | 508 | # CONFIG_SCSI_DPT_I2O is not set |
509 | # CONFIG_SCSI_ADVANSYS is not set | ||
300 | # CONFIG_SCSI_IN2000 is not set | 510 | # CONFIG_SCSI_IN2000 is not set |
511 | # CONFIG_SCSI_ARCMSR is not set | ||
301 | # CONFIG_MEGARAID_NEWGEN is not set | 512 | # CONFIG_MEGARAID_NEWGEN is not set |
302 | # CONFIG_MEGARAID_LEGACY is not set | 513 | # CONFIG_MEGARAID_LEGACY is not set |
303 | # CONFIG_SCSI_SATA is not set | 514 | # CONFIG_MEGARAID_SAS is not set |
515 | # CONFIG_SCSI_HPTIOP is not set | ||
304 | # CONFIG_SCSI_BUSLOGIC is not set | 516 | # CONFIG_SCSI_BUSLOGIC is not set |
517 | # CONFIG_LIBFC is not set | ||
518 | # CONFIG_FCOE is not set | ||
305 | # CONFIG_SCSI_DMX3191D is not set | 519 | # CONFIG_SCSI_DMX3191D is not set |
306 | # CONFIG_SCSI_DTC3280 is not set | 520 | # CONFIG_SCSI_DTC3280 is not set |
307 | # CONFIG_SCSI_EATA is not set | 521 | # CONFIG_SCSI_EATA is not set |
@@ -314,20 +528,15 @@ CONFIG_CHR_DEV_SG=m | |||
314 | # CONFIG_SCSI_INIA100 is not set | 528 | # CONFIG_SCSI_INIA100 is not set |
315 | # CONFIG_SCSI_PPA is not set | 529 | # CONFIG_SCSI_PPA is not set |
316 | # CONFIG_SCSI_IMM is not set | 530 | # CONFIG_SCSI_IMM is not set |
531 | # CONFIG_SCSI_MVSAS is not set | ||
317 | # CONFIG_SCSI_NCR53C406A is not set | 532 | # CONFIG_SCSI_NCR53C406A is not set |
533 | # CONFIG_SCSI_STEX is not set | ||
318 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 534 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
319 | # CONFIG_SCSI_IPR is not set | ||
320 | # CONFIG_SCSI_PAS16 is not set | 535 | # CONFIG_SCSI_PAS16 is not set |
321 | # CONFIG_SCSI_PSI240I is not set | ||
322 | # CONFIG_SCSI_QLOGIC_FAS is not set | 536 | # CONFIG_SCSI_QLOGIC_FAS is not set |
323 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
324 | # CONFIG_SCSI_QLOGIC_1280 is not set | 537 | # CONFIG_SCSI_QLOGIC_1280 is not set |
325 | CONFIG_SCSI_QLA2XXX=m | 538 | # CONFIG_SCSI_QLA_FC is not set |
326 | # CONFIG_SCSI_QLA21XX is not set | 539 | # CONFIG_SCSI_QLA_ISCSI is not set |
327 | # CONFIG_SCSI_QLA22XX is not set | ||
328 | # CONFIG_SCSI_QLA2300 is not set | ||
329 | # CONFIG_SCSI_QLA2322 is not set | ||
330 | # CONFIG_SCSI_QLA6312 is not set | ||
331 | # CONFIG_SCSI_LPFC is not set | 540 | # CONFIG_SCSI_LPFC is not set |
332 | # CONFIG_SCSI_SYM53C416 is not set | 541 | # CONFIG_SCSI_SYM53C416 is not set |
333 | # CONFIG_SCSI_DC395x is not set | 542 | # CONFIG_SCSI_DC395x is not set |
@@ -336,123 +545,57 @@ CONFIG_SCSI_QLA2XXX=m | |||
336 | # CONFIG_SCSI_U14_34F is not set | 545 | # CONFIG_SCSI_U14_34F is not set |
337 | # CONFIG_SCSI_NSP32 is not set | 546 | # CONFIG_SCSI_NSP32 is not set |
338 | # CONFIG_SCSI_DEBUG is not set | 547 | # CONFIG_SCSI_DEBUG is not set |
339 | 548 | # CONFIG_SCSI_SRP is not set | |
340 | # | 549 | # CONFIG_SCSI_DH is not set |
341 | # Multi-device support (RAID and LVM) | 550 | # CONFIG_ATA is not set |
342 | # | ||
343 | # CONFIG_MD is not set | 551 | # CONFIG_MD is not set |
344 | |||
345 | # | ||
346 | # Fusion MPT device support | ||
347 | # | ||
348 | # CONFIG_FUSION is not set | 552 | # CONFIG_FUSION is not set |
349 | # CONFIG_FUSION_SPI is not set | ||
350 | # CONFIG_FUSION_FC is not set | ||
351 | 553 | ||
352 | # | 554 | # |
353 | # IEEE 1394 (FireWire) support | 555 | # IEEE 1394 (FireWire) support |
354 | # | 556 | # |
355 | # CONFIG_IEEE1394 is not set | ||
356 | 557 | ||
357 | # | 558 | # |
358 | # I2O device support | 559 | # Enable only one of the two stacks, unless you know what you are doing |
359 | # | 560 | # |
561 | # CONFIG_FIREWIRE is not set | ||
562 | # CONFIG_IEEE1394 is not set | ||
360 | # CONFIG_I2O is not set | 563 | # CONFIG_I2O is not set |
361 | |||
362 | # | ||
363 | # Networking support | ||
364 | # | ||
365 | CONFIG_NET=y | ||
366 | |||
367 | # | ||
368 | # Networking options | ||
369 | # | ||
370 | CONFIG_PACKET=y | ||
371 | # CONFIG_PACKET_MMAP is not set | ||
372 | CONFIG_UNIX=y | ||
373 | # CONFIG_NET_KEY is not set | ||
374 | CONFIG_INET=y | ||
375 | # CONFIG_IP_MULTICAST is not set | ||
376 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
377 | # CONFIG_IP_PNP is not set | ||
378 | # CONFIG_NET_IPIP is not set | ||
379 | # CONFIG_NET_IPGRE is not set | ||
380 | # CONFIG_ARPD is not set | ||
381 | # CONFIG_SYN_COOKIES is not set | ||
382 | # CONFIG_INET_AH is not set | ||
383 | # CONFIG_INET_ESP is not set | ||
384 | # CONFIG_INET_IPCOMP is not set | ||
385 | # CONFIG_INET_TUNNEL is not set | ||
386 | CONFIG_IP_TCPDIAG=y | ||
387 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
388 | # CONFIG_IPV6 is not set | ||
389 | # CONFIG_NETFILTER is not set | ||
390 | |||
391 | # | ||
392 | # SCTP Configuration (EXPERIMENTAL) | ||
393 | # | ||
394 | # CONFIG_IP_SCTP is not set | ||
395 | # CONFIG_ATM is not set | ||
396 | # CONFIG_BRIDGE is not set | ||
397 | # CONFIG_VLAN_8021Q is not set | ||
398 | # CONFIG_DECNET is not set | ||
399 | # CONFIG_LLC2 is not set | ||
400 | # CONFIG_IPX is not set | ||
401 | # CONFIG_ATALK is not set | ||
402 | # CONFIG_X25 is not set | ||
403 | # CONFIG_LAPB is not set | ||
404 | # CONFIG_NET_DIVERT is not set | ||
405 | # CONFIG_ECONET is not set | ||
406 | # CONFIG_WAN_ROUTER is not set | ||
407 | |||
408 | # | ||
409 | # QoS and/or fair queueing | ||
410 | # | ||
411 | # CONFIG_NET_SCHED is not set | ||
412 | # CONFIG_NET_CLS_ROUTE is not set | ||
413 | |||
414 | # | ||
415 | # Network testing | ||
416 | # | ||
417 | # CONFIG_NET_PKTGEN is not set | ||
418 | # CONFIG_NETPOLL is not set | ||
419 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
420 | # CONFIG_HAMRADIO is not set | ||
421 | # CONFIG_IRDA is not set | ||
422 | # CONFIG_BT is not set | ||
423 | CONFIG_NETDEVICES=y | 564 | CONFIG_NETDEVICES=y |
424 | # CONFIG_DUMMY is not set | 565 | # CONFIG_DUMMY is not set |
425 | # CONFIG_BONDING is not set | 566 | # CONFIG_BONDING is not set |
567 | # CONFIG_MACVLAN is not set | ||
426 | # CONFIG_EQUALIZER is not set | 568 | # CONFIG_EQUALIZER is not set |
427 | # CONFIG_TUN is not set | 569 | # CONFIG_TUN is not set |
428 | 570 | # CONFIG_VETH is not set | |
429 | # | ||
430 | # ARCnet devices | ||
431 | # | ||
432 | # CONFIG_ARCNET is not set | 571 | # CONFIG_ARCNET is not set |
433 | 572 | # CONFIG_PHYLIB is not set | |
434 | # | ||
435 | # Ethernet (10 or 100Mbit) | ||
436 | # | ||
437 | CONFIG_NET_ETHERNET=y | 573 | CONFIG_NET_ETHERNET=y |
438 | # CONFIG_MII is not set | 574 | # CONFIG_MII is not set |
575 | # CONFIG_AX88796 is not set | ||
439 | # CONFIG_HAPPYMEAL is not set | 576 | # CONFIG_HAPPYMEAL is not set |
440 | # CONFIG_SUNGEM is not set | 577 | # CONFIG_SUNGEM is not set |
578 | # CONFIG_CASSINI is not set | ||
441 | # CONFIG_NET_VENDOR_3COM is not set | 579 | # CONFIG_NET_VENDOR_3COM is not set |
442 | # CONFIG_LANCE is not set | 580 | # CONFIG_LANCE is not set |
443 | # CONFIG_NET_VENDOR_SMC is not set | 581 | # CONFIG_NET_VENDOR_SMC is not set |
444 | # CONFIG_SMC91X is not set | 582 | # CONFIG_SMC91X is not set |
445 | # CONFIG_DM9000 is not set | 583 | # CONFIG_DM9000 is not set |
584 | # CONFIG_SMC911X is not set | ||
585 | # CONFIG_SMSC911X is not set | ||
446 | # CONFIG_NET_VENDOR_RACAL is not set | 586 | # CONFIG_NET_VENDOR_RACAL is not set |
447 | |||
448 | # | ||
449 | # Tulip family network device support | ||
450 | # | ||
451 | # CONFIG_NET_TULIP is not set | 587 | # CONFIG_NET_TULIP is not set |
452 | # CONFIG_AT1700 is not set | 588 | # CONFIG_AT1700 is not set |
453 | # CONFIG_DEPCA is not set | 589 | # CONFIG_DEPCA is not set |
454 | # CONFIG_HP100 is not set | 590 | # CONFIG_HP100 is not set |
455 | # CONFIG_NET_ISA is not set | 591 | # CONFIG_NET_ISA is not set |
592 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
593 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
594 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
595 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
596 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
597 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
598 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
456 | CONFIG_NET_PCI=y | 599 | CONFIG_NET_PCI=y |
457 | # CONFIG_PCNET32 is not set | 600 | # CONFIG_PCNET32 is not set |
458 | # CONFIG_AMD8111_ETH is not set | 601 | # CONFIG_AMD8111_ETH is not set |
@@ -462,56 +605,69 @@ CONFIG_NET_PCI=y | |||
462 | # CONFIG_B44 is not set | 605 | # CONFIG_B44 is not set |
463 | # CONFIG_FORCEDETH is not set | 606 | # CONFIG_FORCEDETH is not set |
464 | CONFIG_CS89x0=y | 607 | CONFIG_CS89x0=y |
465 | # CONFIG_DGRS is not set | 608 | CONFIG_CS89x0_NOEEPROM=y |
466 | # CONFIG_EEPRO100 is not set | ||
467 | # CONFIG_E100 is not set | 609 | # CONFIG_E100 is not set |
468 | # CONFIG_FEALNX is not set | 610 | # CONFIG_FEALNX is not set |
469 | # CONFIG_NATSEMI is not set | 611 | # CONFIG_NATSEMI is not set |
470 | # CONFIG_NE2K_PCI is not set | 612 | # CONFIG_NE2K_PCI is not set |
471 | # CONFIG_8139CP is not set | 613 | # CONFIG_8139CP is not set |
472 | # CONFIG_8139TOO is not set | 614 | # CONFIG_8139TOO is not set |
615 | # CONFIG_R6040 is not set | ||
473 | # CONFIG_SIS900 is not set | 616 | # CONFIG_SIS900 is not set |
474 | # CONFIG_EPIC100 is not set | 617 | # CONFIG_EPIC100 is not set |
618 | # CONFIG_SMSC9420 is not set | ||
475 | # CONFIG_SUNDANCE is not set | 619 | # CONFIG_SUNDANCE is not set |
476 | # CONFIG_TLAN is not set | 620 | # CONFIG_TLAN is not set |
477 | # CONFIG_VIA_RHINE is not set | 621 | # CONFIG_VIA_RHINE is not set |
622 | # CONFIG_SC92031 is not set | ||
478 | # CONFIG_NET_POCKET is not set | 623 | # CONFIG_NET_POCKET is not set |
479 | 624 | # CONFIG_ATL2 is not set | |
480 | # | 625 | CONFIG_NETDEV_1000=y |
481 | # Ethernet (1000 Mbit) | ||
482 | # | ||
483 | # CONFIG_ACENIC is not set | 626 | # CONFIG_ACENIC is not set |
484 | # CONFIG_DL2K is not set | 627 | # CONFIG_DL2K is not set |
485 | # CONFIG_E1000 is not set | 628 | # CONFIG_E1000 is not set |
629 | # CONFIG_E1000E is not set | ||
630 | # CONFIG_IP1000 is not set | ||
631 | # CONFIG_IGB is not set | ||
486 | # CONFIG_NS83820 is not set | 632 | # CONFIG_NS83820 is not set |
487 | # CONFIG_HAMACHI is not set | 633 | # CONFIG_HAMACHI is not set |
488 | # CONFIG_YELLOWFIN is not set | 634 | # CONFIG_YELLOWFIN is not set |
489 | # CONFIG_R8169 is not set | 635 | # CONFIG_R8169 is not set |
636 | # CONFIG_SIS190 is not set | ||
490 | # CONFIG_SKGE is not set | 637 | # CONFIG_SKGE is not set |
491 | # CONFIG_SK98LIN is not set | 638 | # CONFIG_SKY2 is not set |
492 | # CONFIG_VIA_VELOCITY is not set | 639 | # CONFIG_VIA_VELOCITY is not set |
493 | # CONFIG_TIGON3 is not set | 640 | # CONFIG_TIGON3 is not set |
494 | # CONFIG_BNX2 is not set | 641 | # CONFIG_BNX2 is not set |
495 | 642 | # CONFIG_QLA3XXX is not set | |
496 | # | 643 | # CONFIG_ATL1 is not set |
497 | # Ethernet (10000 Mbit) | 644 | # CONFIG_ATL1E is not set |
498 | # | 645 | # CONFIG_JME is not set |
646 | CONFIG_NETDEV_10000=y | ||
647 | # CONFIG_CHELSIO_T1 is not set | ||
648 | CONFIG_CHELSIO_T3_DEPENDS=y | ||
649 | # CONFIG_CHELSIO_T3 is not set | ||
650 | # CONFIG_ENIC is not set | ||
651 | # CONFIG_IXGBE is not set | ||
499 | # CONFIG_IXGB is not set | 652 | # CONFIG_IXGB is not set |
500 | # CONFIG_S2IO is not set | 653 | # CONFIG_S2IO is not set |
501 | 654 | # CONFIG_MYRI10GE is not set | |
502 | # | 655 | # CONFIG_NETXEN_NIC is not set |
503 | # Token Ring devices | 656 | # CONFIG_NIU is not set |
504 | # | 657 | # CONFIG_MLX4_EN is not set |
658 | # CONFIG_MLX4_CORE is not set | ||
659 | # CONFIG_TEHUTI is not set | ||
660 | # CONFIG_BNX2X is not set | ||
661 | # CONFIG_QLGE is not set | ||
662 | # CONFIG_SFC is not set | ||
505 | # CONFIG_TR is not set | 663 | # CONFIG_TR is not set |
506 | 664 | ||
507 | # | 665 | # |
508 | # Wireless LAN (non-hamradio) | 666 | # Wireless LAN |
509 | # | ||
510 | # CONFIG_NET_RADIO is not set | ||
511 | |||
512 | # | ||
513 | # Wan interfaces | ||
514 | # | 667 | # |
668 | # CONFIG_WLAN_PRE80211 is not set | ||
669 | # CONFIG_WLAN_80211 is not set | ||
670 | # CONFIG_IWLWIFI_LEDS is not set | ||
515 | # CONFIG_WAN is not set | 671 | # CONFIG_WAN is not set |
516 | # CONFIG_FDDI is not set | 672 | # CONFIG_FDDI is not set |
517 | # CONFIG_HIPPI is not set | 673 | # CONFIG_HIPPI is not set |
@@ -519,18 +675,17 @@ CONFIG_CS89x0=y | |||
519 | # CONFIG_PPP is not set | 675 | # CONFIG_PPP is not set |
520 | # CONFIG_SLIP is not set | 676 | # CONFIG_SLIP is not set |
521 | # CONFIG_NET_FC is not set | 677 | # CONFIG_NET_FC is not set |
522 | # CONFIG_SHAPER is not set | ||
523 | # CONFIG_NETCONSOLE is not set | 678 | # CONFIG_NETCONSOLE is not set |
524 | 679 | # CONFIG_NETPOLL is not set | |
525 | # | 680 | # CONFIG_NET_POLL_CONTROLLER is not set |
526 | # ISDN subsystem | ||
527 | # | ||
528 | # CONFIG_ISDN is not set | 681 | # CONFIG_ISDN is not set |
529 | 682 | ||
530 | # | 683 | # |
531 | # Input device support | 684 | # Input device support |
532 | # | 685 | # |
533 | CONFIG_INPUT=y | 686 | CONFIG_INPUT=y |
687 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
688 | # CONFIG_INPUT_POLLDEV is not set | ||
534 | 689 | ||
535 | # | 690 | # |
536 | # Userland interfaces | 691 | # Userland interfaces |
@@ -540,7 +695,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
540 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 695 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
541 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 696 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
542 | # CONFIG_INPUT_JOYDEV is not set | 697 | # CONFIG_INPUT_JOYDEV is not set |
543 | # CONFIG_INPUT_TSDEV is not set | ||
544 | # CONFIG_INPUT_EVDEV is not set | 698 | # CONFIG_INPUT_EVDEV is not set |
545 | # CONFIG_INPUT_EVBUG is not set | 699 | # CONFIG_INPUT_EVBUG is not set |
546 | 700 | ||
@@ -553,14 +707,25 @@ CONFIG_KEYBOARD_ATKBD=y | |||
553 | # CONFIG_KEYBOARD_LKKBD is not set | 707 | # CONFIG_KEYBOARD_LKKBD is not set |
554 | # CONFIG_KEYBOARD_XTKBD is not set | 708 | # CONFIG_KEYBOARD_XTKBD is not set |
555 | # CONFIG_KEYBOARD_NEWTON is not set | 709 | # CONFIG_KEYBOARD_NEWTON is not set |
710 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
556 | CONFIG_INPUT_MOUSE=y | 711 | CONFIG_INPUT_MOUSE=y |
557 | CONFIG_MOUSE_PS2=y | 712 | CONFIG_MOUSE_PS2=y |
713 | CONFIG_MOUSE_PS2_ALPS=y | ||
714 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
715 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
716 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
717 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
718 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
719 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
558 | # CONFIG_MOUSE_SERIAL is not set | 720 | # CONFIG_MOUSE_SERIAL is not set |
721 | # CONFIG_MOUSE_APPLETOUCH is not set | ||
722 | # CONFIG_MOUSE_BCM5974 is not set | ||
559 | # CONFIG_MOUSE_INPORT is not set | 723 | # CONFIG_MOUSE_INPORT is not set |
560 | # CONFIG_MOUSE_LOGIBM is not set | 724 | # CONFIG_MOUSE_LOGIBM is not set |
561 | # CONFIG_MOUSE_PC110PAD is not set | 725 | # CONFIG_MOUSE_PC110PAD is not set |
562 | # CONFIG_MOUSE_VSXXXAA is not set | 726 | # CONFIG_MOUSE_VSXXXAA is not set |
563 | # CONFIG_INPUT_JOYSTICK is not set | 727 | # CONFIG_INPUT_JOYSTICK is not set |
728 | # CONFIG_INPUT_TABLET is not set | ||
564 | # CONFIG_INPUT_TOUCHSCREEN is not set | 729 | # CONFIG_INPUT_TOUCHSCREEN is not set |
565 | # CONFIG_INPUT_MISC is not set | 730 | # CONFIG_INPUT_MISC is not set |
566 | 731 | ||
@@ -580,16 +745,22 @@ CONFIG_SERIO_LIBPS2=y | |||
580 | # Character devices | 745 | # Character devices |
581 | # | 746 | # |
582 | CONFIG_VT=y | 747 | CONFIG_VT=y |
748 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
583 | CONFIG_VT_CONSOLE=y | 749 | CONFIG_VT_CONSOLE=y |
584 | CONFIG_HW_CONSOLE=y | 750 | CONFIG_HW_CONSOLE=y |
751 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
752 | CONFIG_DEVKMEM=y | ||
585 | # CONFIG_SERIAL_NONSTANDARD is not set | 753 | # CONFIG_SERIAL_NONSTANDARD is not set |
754 | # CONFIG_NOZOMI is not set | ||
586 | 755 | ||
587 | # | 756 | # |
588 | # Serial drivers | 757 | # Serial drivers |
589 | # | 758 | # |
590 | CONFIG_SERIAL_8250=y | 759 | CONFIG_SERIAL_8250=y |
591 | CONFIG_SERIAL_8250_CONSOLE=y | 760 | CONFIG_SERIAL_8250_CONSOLE=y |
761 | CONFIG_SERIAL_8250_PCI=y | ||
592 | CONFIG_SERIAL_8250_NR_UARTS=4 | 762 | CONFIG_SERIAL_8250_NR_UARTS=4 |
763 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
593 | # CONFIG_SERIAL_8250_EXTENDED is not set | 764 | # CONFIG_SERIAL_8250_EXTENDED is not set |
594 | 765 | ||
595 | # | 766 | # |
@@ -599,90 +770,122 @@ CONFIG_SERIAL_CORE=y | |||
599 | CONFIG_SERIAL_CORE_CONSOLE=y | 770 | CONFIG_SERIAL_CORE_CONSOLE=y |
600 | # CONFIG_SERIAL_JSM is not set | 771 | # CONFIG_SERIAL_JSM is not set |
601 | CONFIG_UNIX98_PTYS=y | 772 | CONFIG_UNIX98_PTYS=y |
773 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
602 | CONFIG_LEGACY_PTYS=y | 774 | CONFIG_LEGACY_PTYS=y |
603 | CONFIG_LEGACY_PTY_COUNT=256 | 775 | CONFIG_LEGACY_PTY_COUNT=256 |
604 | CONFIG_PRINTER=m | 776 | CONFIG_PRINTER=m |
605 | # CONFIG_LP_CONSOLE is not set | 777 | # CONFIG_LP_CONSOLE is not set |
606 | # CONFIG_PPDEV is not set | 778 | # CONFIG_PPDEV is not set |
607 | # CONFIG_TIPAR is not set | ||
608 | |||
609 | # | ||
610 | # IPMI | ||
611 | # | ||
612 | # CONFIG_IPMI_HANDLER is not set | 779 | # CONFIG_IPMI_HANDLER is not set |
613 | 780 | CONFIG_HW_RANDOM=m | |
614 | # | ||
615 | # Watchdog Cards | ||
616 | # | ||
617 | # CONFIG_WATCHDOG is not set | ||
618 | # CONFIG_NVRAM is not set | 781 | # CONFIG_NVRAM is not set |
619 | CONFIG_RTC=y | ||
620 | # CONFIG_DTLK is not set | 782 | # CONFIG_DTLK is not set |
621 | # CONFIG_R3964 is not set | 783 | # CONFIG_R3964 is not set |
622 | # CONFIG_APPLICOM is not set | 784 | # CONFIG_APPLICOM is not set |
623 | |||
624 | # | ||
625 | # Ftape, the floppy tape device driver | ||
626 | # | ||
627 | # CONFIG_DRM is not set | ||
628 | # CONFIG_RAW_DRIVER is not set | 785 | # CONFIG_RAW_DRIVER is not set |
786 | # CONFIG_TCG_TPM is not set | ||
787 | CONFIG_DEVPORT=y | ||
788 | # CONFIG_I2C is not set | ||
789 | # CONFIG_SPI is not set | ||
790 | # CONFIG_W1 is not set | ||
791 | # CONFIG_POWER_SUPPLY is not set | ||
792 | # CONFIG_HWMON is not set | ||
793 | # CONFIG_THERMAL is not set | ||
794 | # CONFIG_THERMAL_HWMON is not set | ||
795 | # CONFIG_WATCHDOG is not set | ||
796 | CONFIG_SSB_POSSIBLE=y | ||
629 | 797 | ||
630 | # | 798 | # |
631 | # TPM devices | 799 | # Sonics Silicon Backplane |
632 | # | 800 | # |
633 | # CONFIG_TCG_TPM is not set | 801 | # CONFIG_SSB is not set |
634 | 802 | ||
635 | # | 803 | # |
636 | # I2C support | 804 | # Multifunction device drivers |
637 | # | 805 | # |
638 | # CONFIG_I2C is not set | 806 | # CONFIG_MFD_CORE is not set |
807 | # CONFIG_MFD_SM501 is not set | ||
808 | # CONFIG_HTC_PASIC3 is not set | ||
809 | # CONFIG_MFD_TMIO is not set | ||
639 | 810 | ||
640 | # | 811 | # |
641 | # Misc devices | 812 | # Multimedia devices |
642 | # | 813 | # |
643 | 814 | ||
644 | # | 815 | # |
645 | # Multimedia devices | 816 | # Multimedia core support |
646 | # | 817 | # |
647 | # CONFIG_VIDEO_DEV is not set | 818 | # CONFIG_VIDEO_DEV is not set |
819 | # CONFIG_DVB_CORE is not set | ||
820 | # CONFIG_VIDEO_MEDIA is not set | ||
648 | 821 | ||
649 | # | 822 | # |
650 | # Digital Video Broadcasting Devices | 823 | # Multimedia drivers |
651 | # | 824 | # |
652 | # CONFIG_DVB is not set | 825 | # CONFIG_DAB is not set |
653 | 826 | ||
654 | # | 827 | # |
655 | # Graphics support | 828 | # Graphics support |
656 | # | 829 | # |
830 | # CONFIG_DRM is not set | ||
831 | # CONFIG_VGASTATE is not set | ||
832 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
657 | CONFIG_FB=y | 833 | CONFIG_FB=y |
834 | # CONFIG_FIRMWARE_EDID is not set | ||
835 | # CONFIG_FB_DDC is not set | ||
836 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
658 | CONFIG_FB_CFB_FILLRECT=y | 837 | CONFIG_FB_CFB_FILLRECT=y |
659 | CONFIG_FB_CFB_COPYAREA=y | 838 | CONFIG_FB_CFB_COPYAREA=y |
660 | CONFIG_FB_CFB_IMAGEBLIT=y | 839 | CONFIG_FB_CFB_IMAGEBLIT=y |
661 | CONFIG_FB_SOFT_CURSOR=y | 840 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
841 | # CONFIG_FB_SYS_FILLRECT is not set | ||
842 | # CONFIG_FB_SYS_COPYAREA is not set | ||
843 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
844 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
845 | # CONFIG_FB_SYS_FOPS is not set | ||
846 | # CONFIG_FB_SVGALIB is not set | ||
662 | # CONFIG_FB_MACMODES is not set | 847 | # CONFIG_FB_MACMODES is not set |
848 | # CONFIG_FB_BACKLIGHT is not set | ||
663 | # CONFIG_FB_MODE_HELPERS is not set | 849 | # CONFIG_FB_MODE_HELPERS is not set |
664 | # CONFIG_FB_TILEBLITTING is not set | 850 | # CONFIG_FB_TILEBLITTING is not set |
851 | |||
852 | # | ||
853 | # Frame buffer hardware drivers | ||
854 | # | ||
665 | # CONFIG_FB_CIRRUS is not set | 855 | # CONFIG_FB_CIRRUS is not set |
666 | # CONFIG_FB_PM2 is not set | 856 | # CONFIG_FB_PM2 is not set |
667 | CONFIG_FB_CYBER2000=y | 857 | CONFIG_FB_CYBER2000=y |
668 | # CONFIG_FB_ASILIANT is not set | 858 | # CONFIG_FB_ASILIANT is not set |
669 | # CONFIG_FB_IMSTT is not set | 859 | # CONFIG_FB_IMSTT is not set |
860 | # CONFIG_FB_S1D13XXX is not set | ||
670 | # CONFIG_FB_NVIDIA is not set | 861 | # CONFIG_FB_NVIDIA is not set |
671 | # CONFIG_FB_RIVA is not set | 862 | # CONFIG_FB_RIVA is not set |
672 | # CONFIG_FB_MATROX is not set | 863 | # CONFIG_FB_MATROX is not set |
673 | # CONFIG_FB_RADEON_OLD is not set | ||
674 | # CONFIG_FB_RADEON is not set | 864 | # CONFIG_FB_RADEON is not set |
675 | # CONFIG_FB_ATY128 is not set | 865 | # CONFIG_FB_ATY128 is not set |
676 | # CONFIG_FB_ATY is not set | 866 | # CONFIG_FB_ATY is not set |
867 | # CONFIG_FB_S3 is not set | ||
677 | # CONFIG_FB_SAVAGE is not set | 868 | # CONFIG_FB_SAVAGE is not set |
678 | # CONFIG_FB_SIS is not set | 869 | # CONFIG_FB_SIS is not set |
870 | # CONFIG_FB_VIA is not set | ||
679 | # CONFIG_FB_NEOMAGIC is not set | 871 | # CONFIG_FB_NEOMAGIC is not set |
680 | # CONFIG_FB_KYRO is not set | 872 | # CONFIG_FB_KYRO is not set |
681 | # CONFIG_FB_3DFX is not set | 873 | # CONFIG_FB_3DFX is not set |
682 | # CONFIG_FB_VOODOO1 is not set | 874 | # CONFIG_FB_VOODOO1 is not set |
875 | # CONFIG_FB_VT8623 is not set | ||
683 | # CONFIG_FB_TRIDENT is not set | 876 | # CONFIG_FB_TRIDENT is not set |
684 | # CONFIG_FB_S1D13XXX is not set | 877 | # CONFIG_FB_ARK is not set |
878 | # CONFIG_FB_PM3 is not set | ||
879 | # CONFIG_FB_CARMINE is not set | ||
685 | # CONFIG_FB_VIRTUAL is not set | 880 | # CONFIG_FB_VIRTUAL is not set |
881 | # CONFIG_FB_METRONOME is not set | ||
882 | # CONFIG_FB_MB862XX is not set | ||
883 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
884 | |||
885 | # | ||
886 | # Display device support | ||
887 | # | ||
888 | # CONFIG_DISPLAY_SUPPORT is not set | ||
686 | 889 | ||
687 | # | 890 | # |
688 | # Console display driver support | 891 | # Console display driver support |
@@ -691,126 +894,132 @@ CONFIG_FB_CYBER2000=y | |||
691 | # CONFIG_MDA_CONSOLE is not set | 894 | # CONFIG_MDA_CONSOLE is not set |
692 | CONFIG_DUMMY_CONSOLE=y | 895 | CONFIG_DUMMY_CONSOLE=y |
693 | CONFIG_FRAMEBUFFER_CONSOLE=y | 896 | CONFIG_FRAMEBUFFER_CONSOLE=y |
897 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
898 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
694 | # CONFIG_FONTS is not set | 899 | # CONFIG_FONTS is not set |
695 | CONFIG_FONT_8x8=y | 900 | CONFIG_FONT_8x8=y |
696 | CONFIG_FONT_8x16=y | 901 | CONFIG_FONT_8x16=y |
697 | |||
698 | # | ||
699 | # Logo configuration | ||
700 | # | ||
701 | CONFIG_LOGO=y | 902 | CONFIG_LOGO=y |
702 | # CONFIG_LOGO_LINUX_MONO is not set | 903 | # CONFIG_LOGO_LINUX_MONO is not set |
703 | # CONFIG_LOGO_LINUX_VGA16 is not set | 904 | # CONFIG_LOGO_LINUX_VGA16 is not set |
704 | CONFIG_LOGO_LINUX_CLUT224=y | 905 | CONFIG_LOGO_LINUX_CLUT224=y |
705 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
706 | |||
707 | # | ||
708 | # Sound | ||
709 | # | ||
710 | CONFIG_SOUND=m | 906 | CONFIG_SOUND=m |
711 | 907 | CONFIG_SOUND_OSS_CORE=y | |
712 | # | ||
713 | # Advanced Linux Sound Architecture | ||
714 | # | ||
715 | # CONFIG_SND is not set | 908 | # CONFIG_SND is not set |
716 | |||
717 | # | ||
718 | # Open Sound System | ||
719 | # | ||
720 | CONFIG_SOUND_PRIME=m | 909 | CONFIG_SOUND_PRIME=m |
721 | # CONFIG_SOUND_BT878 is not set | ||
722 | # CONFIG_SOUND_CMPCI is not set | ||
723 | # CONFIG_SOUND_EMU10K1 is not set | ||
724 | # CONFIG_SOUND_FUSION is not set | ||
725 | # CONFIG_SOUND_CS4281 is not set | ||
726 | # CONFIG_SOUND_ES1370 is not set | ||
727 | # CONFIG_SOUND_ES1371 is not set | ||
728 | # CONFIG_SOUND_ESSSOLO1 is not set | ||
729 | # CONFIG_SOUND_MAESTRO is not set | ||
730 | # CONFIG_SOUND_MAESTRO3 is not set | ||
731 | # CONFIG_SOUND_ICH is not set | ||
732 | # CONFIG_SOUND_SONICVIBES is not set | ||
733 | # CONFIG_SOUND_TRIDENT is not set | ||
734 | # CONFIG_SOUND_MSNDCLAS is not set | 910 | # CONFIG_SOUND_MSNDCLAS is not set |
735 | # CONFIG_SOUND_MSNDPIN is not set | 911 | # CONFIG_SOUND_MSNDPIN is not set |
736 | # CONFIG_SOUND_VIA82CXXX is not set | ||
737 | CONFIG_SOUND_OSS=m | 912 | CONFIG_SOUND_OSS=m |
738 | # CONFIG_SOUND_TRACEINIT is not set | 913 | # CONFIG_SOUND_TRACEINIT is not set |
739 | # CONFIG_SOUND_DMAP is not set | 914 | # CONFIG_SOUND_DMAP is not set |
740 | # CONFIG_SOUND_AD1816 is not set | ||
741 | # CONFIG_SOUND_AD1889 is not set | ||
742 | # CONFIG_SOUND_SGALAXY is not set | ||
743 | CONFIG_SOUND_ADLIB=m | ||
744 | # CONFIG_SOUND_ACI_MIXER is not set | ||
745 | # CONFIG_SOUND_CS4232 is not set | ||
746 | # CONFIG_SOUND_SSCAPE is not set | 915 | # CONFIG_SOUND_SSCAPE is not set |
747 | # CONFIG_SOUND_GUS is not set | ||
748 | # CONFIG_SOUND_VMIDI is not set | 916 | # CONFIG_SOUND_VMIDI is not set |
749 | # CONFIG_SOUND_TRIX is not set | 917 | # CONFIG_SOUND_TRIX is not set |
750 | # CONFIG_SOUND_MSS is not set | 918 | # CONFIG_SOUND_MSS is not set |
751 | # CONFIG_SOUND_MPU401 is not set | 919 | # CONFIG_SOUND_MPU401 is not set |
752 | # CONFIG_SOUND_NM256 is not set | ||
753 | # CONFIG_SOUND_MAD16 is not set | ||
754 | # CONFIG_SOUND_PAS is not set | 920 | # CONFIG_SOUND_PAS is not set |
755 | # CONFIG_SOUND_PSS is not set | 921 | # CONFIG_SOUND_PSS is not set |
756 | CONFIG_SOUND_SB=m | 922 | CONFIG_SOUND_SB=m |
757 | # CONFIG_SOUND_AWE32_SYNTH is not set | ||
758 | # CONFIG_SOUND_WAVEFRONT is not set | ||
759 | # CONFIG_SOUND_MAUI is not set | ||
760 | # CONFIG_SOUND_YM3812 is not set | 923 | # CONFIG_SOUND_YM3812 is not set |
761 | # CONFIG_SOUND_OPL3SA1 is not set | ||
762 | # CONFIG_SOUND_OPL3SA2 is not set | ||
763 | # CONFIG_SOUND_YMFPCI is not set | ||
764 | # CONFIG_SOUND_UART6850 is not set | 924 | # CONFIG_SOUND_UART6850 is not set |
765 | # CONFIG_SOUND_AEDSP16 is not set | 925 | # CONFIG_SOUND_AEDSP16 is not set |
766 | # CONFIG_SOUND_KAHLUA is not set | 926 | # CONFIG_SOUND_KAHLUA is not set |
767 | # CONFIG_SOUND_ALI5455 is not set | 927 | CONFIG_HID_SUPPORT=y |
768 | # CONFIG_SOUND_FORTE is not set | 928 | CONFIG_HID=y |
769 | # CONFIG_SOUND_RME96XX is not set | 929 | # CONFIG_HID_DEBUG is not set |
770 | # CONFIG_SOUND_AD1980 is not set | 930 | # CONFIG_HIDRAW is not set |
931 | # CONFIG_HID_PID is not set | ||
771 | 932 | ||
772 | # | 933 | # |
773 | # USB support | 934 | # Special HID drivers |
774 | # | 935 | # |
936 | CONFIG_HID_COMPAT=y | ||
937 | CONFIG_USB_SUPPORT=y | ||
775 | CONFIG_USB_ARCH_HAS_HCD=y | 938 | CONFIG_USB_ARCH_HAS_HCD=y |
776 | CONFIG_USB_ARCH_HAS_OHCI=y | 939 | CONFIG_USB_ARCH_HAS_OHCI=y |
940 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
777 | # CONFIG_USB is not set | 941 | # CONFIG_USB is not set |
778 | 942 | ||
779 | # | 943 | # |
780 | # USB Gadget Support | 944 | # Enable Host or Gadget support to see Inventra options |
781 | # | 945 | # |
782 | # CONFIG_USB_GADGET is not set | ||
783 | 946 | ||
784 | # | 947 | # |
785 | # MMC/SD Card support | 948 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
786 | # | 949 | # |
950 | # CONFIG_USB_GADGET is not set | ||
951 | # CONFIG_UWB is not set | ||
787 | # CONFIG_MMC is not set | 952 | # CONFIG_MMC is not set |
953 | # CONFIG_MEMSTICK is not set | ||
954 | # CONFIG_ACCESSIBILITY is not set | ||
955 | # CONFIG_NEW_LEDS is not set | ||
956 | CONFIG_RTC_LIB=y | ||
957 | CONFIG_RTC_CLASS=y | ||
958 | CONFIG_RTC_HCTOSYS=y | ||
959 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
960 | # CONFIG_RTC_DEBUG is not set | ||
961 | |||
962 | # | ||
963 | # RTC interfaces | ||
964 | # | ||
965 | CONFIG_RTC_INTF_SYSFS=y | ||
966 | CONFIG_RTC_INTF_PROC=y | ||
967 | CONFIG_RTC_INTF_DEV=y | ||
968 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
969 | # CONFIG_RTC_DRV_TEST is not set | ||
970 | |||
971 | # | ||
972 | # SPI RTC drivers | ||
973 | # | ||
974 | |||
975 | # | ||
976 | # Platform RTC drivers | ||
977 | # | ||
978 | CONFIG_RTC_DRV_CMOS=y | ||
979 | # CONFIG_RTC_DRV_DS1286 is not set | ||
980 | # CONFIG_RTC_DRV_DS1511 is not set | ||
981 | # CONFIG_RTC_DRV_DS1553 is not set | ||
982 | # CONFIG_RTC_DRV_DS1742 is not set | ||
983 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
984 | # CONFIG_RTC_DRV_M48T86 is not set | ||
985 | # CONFIG_RTC_DRV_M48T35 is not set | ||
986 | # CONFIG_RTC_DRV_M48T59 is not set | ||
987 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
988 | # CONFIG_RTC_DRV_V3020 is not set | ||
989 | |||
990 | # | ||
991 | # on-CPU RTC drivers | ||
992 | # | ||
993 | # CONFIG_DMADEVICES is not set | ||
994 | # CONFIG_AUXDISPLAY is not set | ||
995 | # CONFIG_REGULATOR is not set | ||
996 | # CONFIG_UIO is not set | ||
788 | 997 | ||
789 | # | 998 | # |
790 | # File systems | 999 | # File systems |
791 | # | 1000 | # |
792 | CONFIG_EXT2_FS=y | 1001 | CONFIG_EXT2_FS=y |
793 | # CONFIG_EXT2_FS_XATTR is not set | 1002 | # CONFIG_EXT2_FS_XATTR is not set |
1003 | # CONFIG_EXT2_FS_XIP is not set | ||
794 | CONFIG_EXT3_FS=y | 1004 | CONFIG_EXT3_FS=y |
795 | CONFIG_EXT3_FS_XATTR=y | 1005 | CONFIG_EXT3_FS_XATTR=y |
796 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1006 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
797 | # CONFIG_EXT3_FS_SECURITY is not set | 1007 | # CONFIG_EXT3_FS_SECURITY is not set |
1008 | # CONFIG_EXT4_FS is not set | ||
798 | CONFIG_JBD=y | 1009 | CONFIG_JBD=y |
799 | # CONFIG_JBD_DEBUG is not set | ||
800 | CONFIG_FS_MBCACHE=y | 1010 | CONFIG_FS_MBCACHE=y |
801 | # CONFIG_REISERFS_FS is not set | 1011 | # CONFIG_REISERFS_FS is not set |
802 | # CONFIG_JFS_FS is not set | 1012 | # CONFIG_JFS_FS is not set |
803 | 1013 | # CONFIG_FS_POSIX_ACL is not set | |
804 | # | 1014 | CONFIG_FILE_LOCKING=y |
805 | # XFS support | ||
806 | # | ||
807 | # CONFIG_XFS_FS is not set | 1015 | # CONFIG_XFS_FS is not set |
808 | # CONFIG_MINIX_FS is not set | 1016 | # CONFIG_OCFS2_FS is not set |
809 | # CONFIG_ROMFS_FS is not set | ||
810 | # CONFIG_QUOTA is not set | ||
811 | CONFIG_DNOTIFY=y | 1017 | CONFIG_DNOTIFY=y |
1018 | # CONFIG_INOTIFY is not set | ||
1019 | # CONFIG_QUOTA is not set | ||
812 | # CONFIG_AUTOFS_FS is not set | 1020 | # CONFIG_AUTOFS_FS is not set |
813 | # CONFIG_AUTOFS4_FS is not set | 1021 | # CONFIG_AUTOFS4_FS is not set |
1022 | # CONFIG_FUSE_FS is not set | ||
814 | 1023 | ||
815 | # | 1024 | # |
816 | # CD-ROM/DVD Filesystems | 1025 | # CD-ROM/DVD Filesystems |
@@ -834,14 +1043,12 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
834 | # Pseudo filesystems | 1043 | # Pseudo filesystems |
835 | # | 1044 | # |
836 | CONFIG_PROC_FS=y | 1045 | CONFIG_PROC_FS=y |
1046 | CONFIG_PROC_SYSCTL=y | ||
1047 | CONFIG_PROC_PAGE_MONITOR=y | ||
837 | CONFIG_SYSFS=y | 1048 | CONFIG_SYSFS=y |
838 | CONFIG_DEVFS_FS=y | ||
839 | CONFIG_DEVFS_MOUNT=y | ||
840 | # CONFIG_DEVFS_DEBUG is not set | ||
841 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
842 | # CONFIG_TMPFS is not set | 1049 | # CONFIG_TMPFS is not set |
843 | # CONFIG_HUGETLB_PAGE is not set | 1050 | # CONFIG_HUGETLB_PAGE is not set |
844 | CONFIG_RAMFS=y | 1051 | # CONFIG_CONFIGFS_FS is not set |
845 | 1052 | ||
846 | # | 1053 | # |
847 | # Miscellaneous filesystems | 1054 | # Miscellaneous filesystems |
@@ -855,22 +1062,27 @@ CONFIG_RAMFS=y | |||
855 | # CONFIG_EFS_FS is not set | 1062 | # CONFIG_EFS_FS is not set |
856 | # CONFIG_CRAMFS is not set | 1063 | # CONFIG_CRAMFS is not set |
857 | # CONFIG_VXFS_FS is not set | 1064 | # CONFIG_VXFS_FS is not set |
1065 | # CONFIG_MINIX_FS is not set | ||
1066 | # CONFIG_OMFS_FS is not set | ||
858 | # CONFIG_HPFS_FS is not set | 1067 | # CONFIG_HPFS_FS is not set |
859 | # CONFIG_QNX4FS_FS is not set | 1068 | # CONFIG_QNX4FS_FS is not set |
1069 | # CONFIG_ROMFS_FS is not set | ||
860 | # CONFIG_SYSV_FS is not set | 1070 | # CONFIG_SYSV_FS is not set |
861 | # CONFIG_UFS_FS is not set | 1071 | # CONFIG_UFS_FS is not set |
862 | 1072 | CONFIG_NETWORK_FILESYSTEMS=y | |
863 | # | 1073 | CONFIG_NFS_FS=y |
864 | # Network File Systems | ||
865 | # | ||
866 | CONFIG_NFS_FS=m | ||
867 | CONFIG_NFS_V3=y | 1074 | CONFIG_NFS_V3=y |
1075 | # CONFIG_NFS_V3_ACL is not set | ||
868 | # CONFIG_NFS_V4 is not set | 1076 | # CONFIG_NFS_V4 is not set |
869 | # CONFIG_NFS_DIRECTIO is not set | 1077 | CONFIG_NFSD=m |
870 | # CONFIG_NFSD is not set | 1078 | # CONFIG_NFSD_V3 is not set |
871 | CONFIG_LOCKD=m | 1079 | # CONFIG_NFSD_V4 is not set |
1080 | CONFIG_LOCKD=y | ||
872 | CONFIG_LOCKD_V4=y | 1081 | CONFIG_LOCKD_V4=y |
873 | CONFIG_SUNRPC=m | 1082 | CONFIG_EXPORTFS=m |
1083 | CONFIG_NFS_COMMON=y | ||
1084 | CONFIG_SUNRPC=y | ||
1085 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
874 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1086 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
875 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1087 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
876 | # CONFIG_SMB_FS is not set | 1088 | # CONFIG_SMB_FS is not set |
@@ -897,11 +1109,9 @@ CONFIG_MSDOS_PARTITION=y | |||
897 | # CONFIG_SGI_PARTITION is not set | 1109 | # CONFIG_SGI_PARTITION is not set |
898 | # CONFIG_ULTRIX_PARTITION is not set | 1110 | # CONFIG_ULTRIX_PARTITION is not set |
899 | # CONFIG_SUN_PARTITION is not set | 1111 | # CONFIG_SUN_PARTITION is not set |
1112 | # CONFIG_KARMA_PARTITION is not set | ||
900 | # CONFIG_EFI_PARTITION is not set | 1113 | # CONFIG_EFI_PARTITION is not set |
901 | 1114 | # CONFIG_SYSV68_PARTITION is not set | |
902 | # | ||
903 | # Native Language Support | ||
904 | # | ||
905 | CONFIG_NLS=m | 1115 | CONFIG_NLS=m |
906 | CONFIG_NLS_DEFAULT="iso8859-1" | 1116 | CONFIG_NLS_DEFAULT="iso8859-1" |
907 | CONFIG_NLS_CODEPAGE_437=m | 1117 | CONFIG_NLS_CODEPAGE_437=m |
@@ -942,30 +1152,74 @@ CONFIG_NLS_ISO8859_1=m | |||
942 | # CONFIG_NLS_KOI8_R is not set | 1152 | # CONFIG_NLS_KOI8_R is not set |
943 | # CONFIG_NLS_KOI8_U is not set | 1153 | # CONFIG_NLS_KOI8_U is not set |
944 | # CONFIG_NLS_UTF8 is not set | 1154 | # CONFIG_NLS_UTF8 is not set |
945 | 1155 | # CONFIG_DLM is not set | |
946 | # | ||
947 | # Profiling support | ||
948 | # | ||
949 | # CONFIG_PROFILING is not set | ||
950 | 1156 | ||
951 | # | 1157 | # |
952 | # Kernel hacking | 1158 | # Kernel hacking |
953 | # | 1159 | # |
954 | # CONFIG_PRINTK_TIME is not set | 1160 | # CONFIG_PRINTK_TIME is not set |
955 | CONFIG_DEBUG_KERNEL=y | 1161 | # CONFIG_ENABLE_WARN_DEPRECATED is not set |
1162 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
1163 | CONFIG_FRAME_WARN=1024 | ||
956 | # CONFIG_MAGIC_SYSRQ is not set | 1164 | # CONFIG_MAGIC_SYSRQ is not set |
957 | CONFIG_LOG_BUF_SHIFT=14 | 1165 | # CONFIG_UNUSED_SYMBOLS is not set |
1166 | # CONFIG_DEBUG_FS is not set | ||
1167 | # CONFIG_HEADERS_CHECK is not set | ||
1168 | CONFIG_DEBUG_KERNEL=y | ||
1169 | # CONFIG_DEBUG_SHIRQ is not set | ||
1170 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1171 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1172 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1173 | # CONFIG_SCHED_DEBUG is not set | ||
958 | # CONFIG_SCHEDSTATS is not set | 1174 | # CONFIG_SCHEDSTATS is not set |
1175 | # CONFIG_TIMER_STATS is not set | ||
1176 | # CONFIG_DEBUG_OBJECTS is not set | ||
959 | # CONFIG_DEBUG_SLAB is not set | 1177 | # CONFIG_DEBUG_SLAB is not set |
1178 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1179 | # CONFIG_RT_MUTEX_TESTER is not set | ||
960 | # CONFIG_DEBUG_SPINLOCK is not set | 1180 | # CONFIG_DEBUG_SPINLOCK is not set |
1181 | # CONFIG_DEBUG_MUTEXES is not set | ||
1182 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1183 | # CONFIG_PROVE_LOCKING is not set | ||
1184 | # CONFIG_LOCK_STAT is not set | ||
961 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1185 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1186 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
962 | # CONFIG_DEBUG_KOBJECT is not set | 1187 | # CONFIG_DEBUG_KOBJECT is not set |
963 | CONFIG_DEBUG_BUGVERBOSE=y | 1188 | CONFIG_DEBUG_BUGVERBOSE=y |
964 | # CONFIG_DEBUG_INFO is not set | 1189 | # CONFIG_DEBUG_INFO is not set |
965 | # CONFIG_DEBUG_FS is not set | 1190 | # CONFIG_DEBUG_VM is not set |
1191 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1192 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1193 | # CONFIG_DEBUG_LIST is not set | ||
1194 | # CONFIG_DEBUG_SG is not set | ||
1195 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
966 | CONFIG_FRAME_POINTER=y | 1196 | CONFIG_FRAME_POINTER=y |
1197 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1198 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1199 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1200 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1201 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1202 | # CONFIG_FAULT_INJECTION is not set | ||
1203 | # CONFIG_LATENCYTOP is not set | ||
1204 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
1205 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1206 | |||
1207 | # | ||
1208 | # Tracers | ||
1209 | # | ||
1210 | # CONFIG_FUNCTION_TRACER is not set | ||
1211 | # CONFIG_SCHED_TRACER is not set | ||
1212 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1213 | # CONFIG_BOOT_TRACER is not set | ||
1214 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
1215 | # CONFIG_STACK_TRACER is not set | ||
1216 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
1217 | # CONFIG_SAMPLES is not set | ||
1218 | CONFIG_HAVE_ARCH_KGDB=y | ||
1219 | # CONFIG_KGDB is not set | ||
967 | CONFIG_DEBUG_USER=y | 1220 | CONFIG_DEBUG_USER=y |
968 | # CONFIG_DEBUG_ERRORS is not set | 1221 | # CONFIG_DEBUG_ERRORS is not set |
1222 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
969 | # CONFIG_DEBUG_LL is not set | 1223 | # CONFIG_DEBUG_LL is not set |
970 | 1224 | ||
971 | # | 1225 | # |
@@ -973,19 +1227,23 @@ CONFIG_DEBUG_USER=y | |||
973 | # | 1227 | # |
974 | # CONFIG_KEYS is not set | 1228 | # CONFIG_KEYS is not set |
975 | # CONFIG_SECURITY is not set | 1229 | # CONFIG_SECURITY is not set |
976 | 1230 | # CONFIG_SECURITYFS is not set | |
977 | # | 1231 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
978 | # Cryptographic options | ||
979 | # | ||
980 | # CONFIG_CRYPTO is not set | 1232 | # CONFIG_CRYPTO is not set |
981 | 1233 | ||
982 | # | 1234 | # |
983 | # Hardware crypto devices | ||
984 | # | ||
985 | |||
986 | # | ||
987 | # Library routines | 1235 | # Library routines |
988 | # | 1236 | # |
1237 | CONFIG_BITREVERSE=y | ||
1238 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
989 | # CONFIG_CRC_CCITT is not set | 1239 | # CONFIG_CRC_CCITT is not set |
1240 | # CONFIG_CRC16 is not set | ||
1241 | # CONFIG_CRC_T10DIF is not set | ||
1242 | # CONFIG_CRC_ITU_T is not set | ||
990 | CONFIG_CRC32=y | 1243 | CONFIG_CRC32=y |
1244 | # CONFIG_CRC7 is not set | ||
991 | # CONFIG_LIBCRC32C is not set | 1245 | # CONFIG_LIBCRC32C is not set |
1246 | CONFIG_PLIST=y | ||
1247 | CONFIG_HAS_IOMEM=y | ||
1248 | CONFIG_HAS_IOPORT=y | ||
1249 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/simpad_defconfig b/arch/arm/configs/simpad_defconfig index 03f783e696b3..685d2b513206 100644 --- a/arch/arm/configs/simpad_defconfig +++ b/arch/arm/configs/simpad_defconfig | |||
@@ -89,7 +89,6 @@ CONFIG_ARCH_SA1100=y | |||
89 | # CONFIG_SA1100_COLLIE is not set | 89 | # CONFIG_SA1100_COLLIE is not set |
90 | # CONFIG_SA1100_H3100 is not set | 90 | # CONFIG_SA1100_H3100 is not set |
91 | # CONFIG_SA1100_H3600 is not set | 91 | # CONFIG_SA1100_H3600 is not set |
92 | # CONFIG_SA1100_H3800 is not set | ||
93 | # CONFIG_SA1100_BADGE4 is not set | 92 | # CONFIG_SA1100_BADGE4 is not set |
94 | # CONFIG_SA1100_JORNADA720 is not set | 93 | # CONFIG_SA1100_JORNADA720 is not set |
95 | # CONFIG_SA1100_HACKKIT is not set | 94 | # CONFIG_SA1100_HACKKIT is not set |
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index df5638f3643a..7edf3536df24 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h | |||
@@ -19,21 +19,17 @@ | |||
19 | #include <asm/system.h> | 19 | #include <asm/system.h> |
20 | #include <asm/scatterlist.h> | 20 | #include <asm/scatterlist.h> |
21 | 21 | ||
22 | typedef unsigned int dmach_t; | ||
23 | |||
24 | #include <mach/isa-dma.h> | 22 | #include <mach/isa-dma.h> |
25 | 23 | ||
26 | /* | 24 | /* |
27 | * DMA modes | 25 | * The DMA modes reflect the settings for the ISA DMA controller |
28 | */ | 26 | */ |
29 | typedef unsigned int dmamode_t; | 27 | #define DMA_MODE_MASK 0xcc |
30 | |||
31 | #define DMA_MODE_MASK 3 | ||
32 | 28 | ||
33 | #define DMA_MODE_READ 0 | 29 | #define DMA_MODE_READ 0x44 |
34 | #define DMA_MODE_WRITE 1 | 30 | #define DMA_MODE_WRITE 0x48 |
35 | #define DMA_MODE_CASCADE 2 | 31 | #define DMA_MODE_CASCADE 0xc0 |
36 | #define DMA_AUTOINIT 4 | 32 | #define DMA_AUTOINIT 0x10 |
37 | 33 | ||
38 | extern spinlock_t dma_spin_lock; | 34 | extern spinlock_t dma_spin_lock; |
39 | 35 | ||
@@ -52,44 +48,44 @@ static inline void release_dma_lock(unsigned long flags) | |||
52 | /* Clear the 'DMA Pointer Flip Flop'. | 48 | /* Clear the 'DMA Pointer Flip Flop'. |
53 | * Write 0 for LSB/MSB, 1 for MSB/LSB access. | 49 | * Write 0 for LSB/MSB, 1 for MSB/LSB access. |
54 | */ | 50 | */ |
55 | #define clear_dma_ff(channel) | 51 | #define clear_dma_ff(chan) |
56 | 52 | ||
57 | /* Set only the page register bits of the transfer address. | 53 | /* Set only the page register bits of the transfer address. |
58 | * | 54 | * |
59 | * NOTE: This is an architecture specific function, and should | 55 | * NOTE: This is an architecture specific function, and should |
60 | * be hidden from the drivers | 56 | * be hidden from the drivers |
61 | */ | 57 | */ |
62 | extern void set_dma_page(dmach_t channel, char pagenr); | 58 | extern void set_dma_page(unsigned int chan, char pagenr); |
63 | 59 | ||
64 | /* Request a DMA channel | 60 | /* Request a DMA channel |
65 | * | 61 | * |
66 | * Some architectures may need to do allocate an interrupt | 62 | * Some architectures may need to do allocate an interrupt |
67 | */ | 63 | */ |
68 | extern int request_dma(dmach_t channel, const char * device_id); | 64 | extern int request_dma(unsigned int chan, const char * device_id); |
69 | 65 | ||
70 | /* Free a DMA channel | 66 | /* Free a DMA channel |
71 | * | 67 | * |
72 | * Some architectures may need to do free an interrupt | 68 | * Some architectures may need to do free an interrupt |
73 | */ | 69 | */ |
74 | extern void free_dma(dmach_t channel); | 70 | extern void free_dma(unsigned int chan); |
75 | 71 | ||
76 | /* Enable DMA for this channel | 72 | /* Enable DMA for this channel |
77 | * | 73 | * |
78 | * On some architectures, this may have other side effects like | 74 | * On some architectures, this may have other side effects like |
79 | * enabling an interrupt and setting the DMA registers. | 75 | * enabling an interrupt and setting the DMA registers. |
80 | */ | 76 | */ |
81 | extern void enable_dma(dmach_t channel); | 77 | extern void enable_dma(unsigned int chan); |
82 | 78 | ||
83 | /* Disable DMA for this channel | 79 | /* Disable DMA for this channel |
84 | * | 80 | * |
85 | * On some architectures, this may have other side effects like | 81 | * On some architectures, this may have other side effects like |
86 | * disabling an interrupt or whatever. | 82 | * disabling an interrupt or whatever. |
87 | */ | 83 | */ |
88 | extern void disable_dma(dmach_t channel); | 84 | extern void disable_dma(unsigned int chan); |
89 | 85 | ||
90 | /* Test whether the specified channel has an active DMA transfer | 86 | /* Test whether the specified channel has an active DMA transfer |
91 | */ | 87 | */ |
92 | extern int dma_channel_active(dmach_t channel); | 88 | extern int dma_channel_active(unsigned int chan); |
93 | 89 | ||
94 | /* Set the DMA scatter gather list for this channel | 90 | /* Set the DMA scatter gather list for this channel |
95 | * | 91 | * |
@@ -97,7 +93,7 @@ extern int dma_channel_active(dmach_t channel); | |||
97 | * especially since some DMA architectures don't update the | 93 | * especially since some DMA architectures don't update the |
98 | * DMA address immediately, but defer it to the enable_dma(). | 94 | * DMA address immediately, but defer it to the enable_dma(). |
99 | */ | 95 | */ |
100 | extern void set_dma_sg(dmach_t channel, struct scatterlist *sg, int nr_sg); | 96 | extern void set_dma_sg(unsigned int chan, struct scatterlist *sg, int nr_sg); |
101 | 97 | ||
102 | /* Set the DMA address for this channel | 98 | /* Set the DMA address for this channel |
103 | * | 99 | * |
@@ -105,9 +101,9 @@ extern void set_dma_sg(dmach_t channel, struct scatterlist *sg, int nr_sg); | |||
105 | * especially since some DMA architectures don't update the | 101 | * especially since some DMA architectures don't update the |
106 | * DMA address immediately, but defer it to the enable_dma(). | 102 | * DMA address immediately, but defer it to the enable_dma(). |
107 | */ | 103 | */ |
108 | extern void __set_dma_addr(dmach_t channel, void *addr); | 104 | extern void __set_dma_addr(unsigned int chan, void *addr); |
109 | #define set_dma_addr(channel, addr) \ | 105 | #define set_dma_addr(chan, addr) \ |
110 | __set_dma_addr(channel, bus_to_virt(addr)) | 106 | __set_dma_addr(chan, bus_to_virt(addr)) |
111 | 107 | ||
112 | /* Set the DMA byte count for this channel | 108 | /* Set the DMA byte count for this channel |
113 | * | 109 | * |
@@ -115,7 +111,7 @@ extern void __set_dma_addr(dmach_t channel, void *addr); | |||
115 | * especially since some DMA architectures don't update the | 111 | * especially since some DMA architectures don't update the |
116 | * DMA count immediately, but defer it to the enable_dma(). | 112 | * DMA count immediately, but defer it to the enable_dma(). |
117 | */ | 113 | */ |
118 | extern void set_dma_count(dmach_t channel, unsigned long count); | 114 | extern void set_dma_count(unsigned int chan, unsigned long count); |
119 | 115 | ||
120 | /* Set the transfer direction for this channel | 116 | /* Set the transfer direction for this channel |
121 | * | 117 | * |
@@ -124,11 +120,11 @@ extern void set_dma_count(dmach_t channel, unsigned long count); | |||
124 | * DMA transfer direction immediately, but defer it to the | 120 | * DMA transfer direction immediately, but defer it to the |
125 | * enable_dma(). | 121 | * enable_dma(). |
126 | */ | 122 | */ |
127 | extern void set_dma_mode(dmach_t channel, dmamode_t mode); | 123 | extern void set_dma_mode(unsigned int chan, unsigned int mode); |
128 | 124 | ||
129 | /* Set the transfer speed for this channel | 125 | /* Set the transfer speed for this channel |
130 | */ | 126 | */ |
131 | extern void set_dma_speed(dmach_t channel, int cycle_ns); | 127 | extern void set_dma_speed(unsigned int chan, int cycle_ns); |
132 | 128 | ||
133 | /* Get DMA residue count. After a DMA transfer, this | 129 | /* Get DMA residue count. After a DMA transfer, this |
134 | * should return zero. Reading this while a DMA transfer is | 130 | * should return zero. Reading this while a DMA transfer is |
@@ -136,7 +132,7 @@ extern void set_dma_speed(dmach_t channel, int cycle_ns); | |||
136 | * If called before the channel has been used, it may return 1. | 132 | * If called before the channel has been used, it may return 1. |
137 | * Otherwise, it returns the number of _bytes_ left to transfer. | 133 | * Otherwise, it returns the number of _bytes_ left to transfer. |
138 | */ | 134 | */ |
139 | extern int get_dma_residue(dmach_t channel); | 135 | extern int get_dma_residue(unsigned int chan); |
140 | 136 | ||
141 | #ifndef NO_DMA | 137 | #ifndef NO_DMA |
142 | #define NO_DMA 255 | 138 | #define NO_DMA 255 |
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index a58378c343b9..def8eac6e89d 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h | |||
@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t; | |||
50 | #define R_ARM_ABS32 2 | 50 | #define R_ARM_ABS32 2 |
51 | #define R_ARM_CALL 28 | 51 | #define R_ARM_CALL 28 |
52 | #define R_ARM_JUMP24 29 | 52 | #define R_ARM_JUMP24 29 |
53 | #define R_ARM_PREL31 42 | ||
53 | 54 | ||
54 | /* | 55 | /* |
55 | * These are used to set parameters in the core dumps. | 56 | * These are used to set parameters in the core dumps. |
diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h index bda489f9f017..f7bd52b1c365 100644 --- a/arch/arm/include/asm/hwcap.h +++ b/arch/arm/include/asm/hwcap.h | |||
@@ -17,6 +17,8 @@ | |||
17 | #define HWCAP_CRUNCH 1024 | 17 | #define HWCAP_CRUNCH 1024 |
18 | #define HWCAP_THUMBEE 2048 | 18 | #define HWCAP_THUMBEE 2048 |
19 | #define HWCAP_NEON 4096 | 19 | #define HWCAP_NEON 4096 |
20 | #define HWCAP_VFPv3 8192 | ||
21 | #define HWCAP_VFPv3D16 16384 | ||
20 | 22 | ||
21 | #if defined(__KERNEL__) && !defined(__ASSEMBLY__) | 23 | #if defined(__KERNEL__) && !defined(__ASSEMBLY__) |
22 | /* | 24 | /* |
diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h index fc7278ea7146..9e614a18e680 100644 --- a/arch/arm/include/asm/mach/dma.h +++ b/arch/arm/include/asm/mach/dma.h | |||
@@ -15,13 +15,13 @@ struct dma_struct; | |||
15 | typedef struct dma_struct dma_t; | 15 | typedef struct dma_struct dma_t; |
16 | 16 | ||
17 | struct dma_ops { | 17 | struct dma_ops { |
18 | int (*request)(dmach_t, dma_t *); /* optional */ | 18 | int (*request)(unsigned int, dma_t *); /* optional */ |
19 | void (*free)(dmach_t, dma_t *); /* optional */ | 19 | void (*free)(unsigned int, dma_t *); /* optional */ |
20 | void (*enable)(dmach_t, dma_t *); /* mandatory */ | 20 | void (*enable)(unsigned int, dma_t *); /* mandatory */ |
21 | void (*disable)(dmach_t, dma_t *); /* mandatory */ | 21 | void (*disable)(unsigned int, dma_t *); /* mandatory */ |
22 | int (*residue)(dmach_t, dma_t *); /* optional */ | 22 | int (*residue)(unsigned int, dma_t *); /* optional */ |
23 | int (*setspeed)(dmach_t, dma_t *, int); /* optional */ | 23 | int (*setspeed)(unsigned int, dma_t *, int); /* optional */ |
24 | char *type; | 24 | const char *type; |
25 | }; | 25 | }; |
26 | 26 | ||
27 | struct dma_struct { | 27 | struct dma_struct { |
@@ -34,24 +34,21 @@ struct dma_struct { | |||
34 | unsigned int active:1; /* Transfer active */ | 34 | unsigned int active:1; /* Transfer active */ |
35 | unsigned int invalid:1; /* Address/Count changed */ | 35 | unsigned int invalid:1; /* Address/Count changed */ |
36 | 36 | ||
37 | dmamode_t dma_mode; /* DMA mode */ | 37 | unsigned int dma_mode; /* DMA mode */ |
38 | int speed; /* DMA speed */ | 38 | int speed; /* DMA speed */ |
39 | 39 | ||
40 | unsigned int lock; /* Device is allocated */ | 40 | unsigned int lock; /* Device is allocated */ |
41 | const char *device_id; /* Device name */ | 41 | const char *device_id; /* Device name */ |
42 | 42 | ||
43 | unsigned int dma_base; /* Controller base address */ | 43 | const struct dma_ops *d_ops; |
44 | int dma_irq; /* Controller IRQ */ | ||
45 | struct scatterlist cur_sg; /* Current controller buffer */ | ||
46 | unsigned int state; | ||
47 | |||
48 | struct dma_ops *d_ops; | ||
49 | }; | 44 | }; |
50 | 45 | ||
51 | /* Prototype: void arch_dma_init(dma) | 46 | /* |
52 | * Purpose : Initialise architecture specific DMA | 47 | * isa_dma_add - add an ISA-style DMA channel |
53 | * Params : dma - pointer to array of DMA structures | ||
54 | */ | 48 | */ |
55 | extern void arch_dma_init(dma_t *dma); | 49 | extern int isa_dma_add(unsigned int, dma_t *dma); |
56 | 50 | ||
57 | extern void isa_init_dma(dma_t *dma); | 51 | /* |
52 | * Add the ISA DMA controller. Always takes channels 0-7. | ||
53 | */ | ||
54 | extern void isa_init_dma(void); | ||
diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h index 39d949b63e80..58cf91f38e6f 100644 --- a/arch/arm/include/asm/mach/map.h +++ b/arch/arm/include/asm/mach/map.h | |||
@@ -26,6 +26,7 @@ struct map_desc { | |||
26 | #define MT_HIGH_VECTORS 8 | 26 | #define MT_HIGH_VECTORS 8 |
27 | #define MT_MEMORY 9 | 27 | #define MT_MEMORY 9 |
28 | #define MT_ROM 10 | 28 | #define MT_ROM 10 |
29 | #define MT_MEMORY_NONCACHED 11 | ||
29 | 30 | ||
30 | #ifdef CONFIG_MMU | 31 | #ifdef CONFIG_MMU |
31 | extern void iotable_init(struct map_desc *, int); | 32 | extern void iotable_init(struct map_desc *, int); |
diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h index 24b168dc31a3..e4dfa69abb68 100644 --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h | |||
@@ -1,15 +1,27 @@ | |||
1 | #ifndef _ASM_ARM_MODULE_H | 1 | #ifndef _ASM_ARM_MODULE_H |
2 | #define _ASM_ARM_MODULE_H | 2 | #define _ASM_ARM_MODULE_H |
3 | 3 | ||
4 | struct mod_arch_specific | ||
5 | { | ||
6 | int foo; | ||
7 | }; | ||
8 | |||
9 | #define Elf_Shdr Elf32_Shdr | 4 | #define Elf_Shdr Elf32_Shdr |
10 | #define Elf_Sym Elf32_Sym | 5 | #define Elf_Sym Elf32_Sym |
11 | #define Elf_Ehdr Elf32_Ehdr | 6 | #define Elf_Ehdr Elf32_Ehdr |
12 | 7 | ||
8 | struct unwind_table; | ||
9 | |||
10 | struct mod_arch_specific | ||
11 | { | ||
12 | #ifdef CONFIG_ARM_UNWIND | ||
13 | Elf_Shdr *unw_sec_init; | ||
14 | Elf_Shdr *unw_sec_devinit; | ||
15 | Elf_Shdr *unw_sec_core; | ||
16 | Elf_Shdr *sec_init_text; | ||
17 | Elf_Shdr *sec_devinit_text; | ||
18 | Elf_Shdr *sec_core_text; | ||
19 | struct unwind_table *unwind_init; | ||
20 | struct unwind_table *unwind_devinit; | ||
21 | struct unwind_table *unwind_core; | ||
22 | #endif | ||
23 | }; | ||
24 | |||
13 | /* | 25 | /* |
14 | * Include the ARM architecture version. | 26 | * Include the ARM architecture version. |
15 | */ | 27 | */ |
diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h index 73192618f1c2..236a06b9b7ce 100644 --- a/arch/arm/include/asm/ptrace.h +++ b/arch/arm/include/asm/ptrace.h | |||
@@ -27,6 +27,8 @@ | |||
27 | /* PTRACE_SYSCALL is 24 */ | 27 | /* PTRACE_SYSCALL is 24 */ |
28 | #define PTRACE_GETCRUNCHREGS 25 | 28 | #define PTRACE_GETCRUNCHREGS 25 |
29 | #define PTRACE_SETCRUNCHREGS 26 | 29 | #define PTRACE_SETCRUNCHREGS 26 |
30 | #define PTRACE_GETVFPREGS 27 | ||
31 | #define PTRACE_SETVFPREGS 28 | ||
30 | 32 | ||
31 | /* | 33 | /* |
32 | * PSR bits | 34 | * PSR bits |
diff --git a/arch/arm/include/asm/stacktrace.h b/arch/arm/include/asm/stacktrace.h new file mode 100644 index 000000000000..4d0a16441b29 --- /dev/null +++ b/arch/arm/include/asm/stacktrace.h | |||
@@ -0,0 +1,15 @@ | |||
1 | #ifndef __ASM_STACKTRACE_H | ||
2 | #define __ASM_STACKTRACE_H | ||
3 | |||
4 | struct stackframe { | ||
5 | unsigned long fp; | ||
6 | unsigned long sp; | ||
7 | unsigned long lr; | ||
8 | unsigned long pc; | ||
9 | }; | ||
10 | |||
11 | extern int unwind_frame(struct stackframe *frame); | ||
12 | extern void walk_stackframe(struct stackframe *frame, | ||
13 | int (*fn)(struct stackframe *, void *), void *data); | ||
14 | |||
15 | #endif /* __ASM_STACKTRACE_H */ | ||
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index 68b9ec82a37f..4f8848260ee2 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h | |||
@@ -99,6 +99,8 @@ static inline struct thread_info *current_thread_info(void) | |||
99 | 99 | ||
100 | #define thread_saved_pc(tsk) \ | 100 | #define thread_saved_pc(tsk) \ |
101 | ((unsigned long)(task_thread_info(tsk)->cpu_context.pc)) | 101 | ((unsigned long)(task_thread_info(tsk)->cpu_context.pc)) |
102 | #define thread_saved_sp(tsk) \ | ||
103 | ((unsigned long)(task_thread_info(tsk)->cpu_context.sp)) | ||
102 | #define thread_saved_fp(tsk) \ | 104 | #define thread_saved_fp(tsk) \ |
103 | ((unsigned long)(task_thread_info(tsk)->cpu_context.fp)) | 105 | ((unsigned long)(task_thread_info(tsk)->cpu_context.fp)) |
104 | 106 | ||
@@ -113,6 +115,8 @@ extern void iwmmxt_task_restore(struct thread_info *, void *); | |||
113 | extern void iwmmxt_task_release(struct thread_info *); | 115 | extern void iwmmxt_task_release(struct thread_info *); |
114 | extern void iwmmxt_task_switch(struct thread_info *); | 116 | extern void iwmmxt_task_switch(struct thread_info *); |
115 | 117 | ||
118 | extern void vfp_sync_state(struct thread_info *thread); | ||
119 | |||
116 | #endif | 120 | #endif |
117 | 121 | ||
118 | /* | 122 | /* |
diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h index aa399aec568e..491960bf4260 100644 --- a/arch/arm/include/asm/traps.h +++ b/arch/arm/include/asm/traps.h | |||
@@ -25,5 +25,6 @@ static inline int in_exception_text(unsigned long ptr) | |||
25 | } | 25 | } |
26 | 26 | ||
27 | extern void __init early_trap_init(void); | 27 | extern void __init early_trap_init(void); |
28 | extern void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame); | ||
28 | 29 | ||
29 | #endif | 30 | #endif |
diff --git a/arch/arm/include/asm/unwind.h b/arch/arm/include/asm/unwind.h new file mode 100644 index 000000000000..a5edf421005c --- /dev/null +++ b/arch/arm/include/asm/unwind.h | |||
@@ -0,0 +1,69 @@ | |||
1 | /* | ||
2 | * arch/arm/include/asm/unwind.h | ||
3 | * | ||
4 | * Copyright (C) 2008 ARM Limited | ||
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 | * 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 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
18 | */ | ||
19 | |||
20 | #ifndef __ASM_UNWIND_H | ||
21 | #define __ASM_UNWIND_H | ||
22 | |||
23 | #ifndef __ASSEMBLY__ | ||
24 | |||
25 | /* Unwind reason code according the the ARM EABI documents */ | ||
26 | enum unwind_reason_code { | ||
27 | URC_OK = 0, /* operation completed successfully */ | ||
28 | URC_CONTINUE_UNWIND = 8, | ||
29 | URC_FAILURE = 9 /* unspecified failure of some kind */ | ||
30 | }; | ||
31 | |||
32 | struct unwind_idx { | ||
33 | unsigned long addr; | ||
34 | unsigned long insn; | ||
35 | }; | ||
36 | |||
37 | struct unwind_table { | ||
38 | struct list_head list; | ||
39 | struct unwind_idx *start; | ||
40 | struct unwind_idx *stop; | ||
41 | unsigned long begin_addr; | ||
42 | unsigned long end_addr; | ||
43 | }; | ||
44 | |||
45 | extern struct unwind_table *unwind_table_add(unsigned long start, | ||
46 | unsigned long size, | ||
47 | unsigned long text_addr, | ||
48 | unsigned long text_size); | ||
49 | extern void unwind_table_del(struct unwind_table *tab); | ||
50 | extern void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk); | ||
51 | |||
52 | #ifdef CONFIG_ARM_UNWIND | ||
53 | extern int __init unwind_init(void); | ||
54 | #else | ||
55 | static inline int __init unwind_init(void) | ||
56 | { | ||
57 | return 0; | ||
58 | } | ||
59 | #endif | ||
60 | |||
61 | #endif /* !__ASSEMBLY__ */ | ||
62 | |||
63 | #ifdef CONFIG_ARM_UNWIND | ||
64 | #define UNWIND(code...) code | ||
65 | #else | ||
66 | #define UNWIND(code...) | ||
67 | #endif | ||
68 | |||
69 | #endif /* __ASM_UNWIND_H */ | ||
diff --git a/arch/arm/include/asm/user.h b/arch/arm/include/asm/user.h index 825c1e7c582d..df95e050f9dd 100644 --- a/arch/arm/include/asm/user.h +++ b/arch/arm/include/asm/user.h | |||
@@ -81,4 +81,13 @@ struct user{ | |||
81 | #define HOST_TEXT_START_ADDR (u.start_code) | 81 | #define HOST_TEXT_START_ADDR (u.start_code) |
82 | #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) | 82 | #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) |
83 | 83 | ||
84 | /* | ||
85 | * User specific VFP registers. If only VFPv2 is present, registers 16 to 31 | ||
86 | * are ignored by the ptrace system call. | ||
87 | */ | ||
88 | struct user_vfp { | ||
89 | unsigned long long fpregs[32]; | ||
90 | unsigned long fpscr; | ||
91 | }; | ||
92 | |||
84 | #endif /* _ARM_USER_H */ | 93 | #endif /* _ARM_USER_H */ |
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 4305345987d3..ca60d335e8fa 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
@@ -29,6 +29,7 @@ obj-$(CONFIG_ATAGS_PROC) += atags.o | |||
29 | obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o | 29 | obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o |
30 | obj-$(CONFIG_ARM_THUMBEE) += thumbee.o | 30 | obj-$(CONFIG_ARM_THUMBEE) += thumbee.o |
31 | obj-$(CONFIG_KGDB) += kgdb.o | 31 | obj-$(CONFIG_KGDB) += kgdb.o |
32 | obj-$(CONFIG_ARM_UNWIND) += unwind.o | ||
32 | 33 | ||
33 | obj-$(CONFIG_CRUNCH) += crunch.o crunch-bits.o | 34 | obj-$(CONFIG_CRUNCH) += crunch.o crunch-bits.o |
34 | AFLAGS_crunch-bits.o := -Wa,-mcpu=ep9312 | 35 | AFLAGS_crunch-bits.o := -Wa,-mcpu=ep9312 |
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index f53c58290543..b121b6053cce 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
@@ -49,6 +49,33 @@ | |||
49 | 1002: | 49 | 1002: |
50 | .endm | 50 | .endm |
51 | 51 | ||
52 | #elif defined(CONFIG_CPU_XSCALE) | ||
53 | |||
54 | .macro addruart, rx | ||
55 | .endm | ||
56 | |||
57 | .macro senduart, rd, rx | ||
58 | mcr p14, 0, \rd, c8, c0, 0 | ||
59 | .endm | ||
60 | |||
61 | .macro busyuart, rd, rx | ||
62 | 1001: | ||
63 | mrc p14, 0, \rx, c14, c0, 0 | ||
64 | tst \rx, #0x10000000 | ||
65 | beq 1001b | ||
66 | .endm | ||
67 | |||
68 | .macro waituart, rd, rx | ||
69 | mov \rd, #0x10000000 | ||
70 | 1001: | ||
71 | subs \rd, \rd, #1 | ||
72 | bmi 1002f | ||
73 | mrc p14, 0, \rx, c14, c0, 0 | ||
74 | tst \rx, #0x10000000 | ||
75 | bne 1001b | ||
76 | 1002: | ||
77 | .endm | ||
78 | |||
52 | #else | 79 | #else |
53 | 80 | ||
54 | .macro addruart, rx | 81 | .macro addruart, rx |
diff --git a/arch/arm/kernel/dma-isa.c b/arch/arm/kernel/dma-isa.c index 4a3a50495c60..0e88e46fc732 100644 --- a/arch/arm/kernel/dma-isa.c +++ b/arch/arm/kernel/dma-isa.c | |||
@@ -24,11 +24,6 @@ | |||
24 | #include <asm/dma.h> | 24 | #include <asm/dma.h> |
25 | #include <asm/mach/dma.h> | 25 | #include <asm/mach/dma.h> |
26 | 26 | ||
27 | #define ISA_DMA_MODE_READ 0x44 | ||
28 | #define ISA_DMA_MODE_WRITE 0x48 | ||
29 | #define ISA_DMA_MODE_CASCADE 0xc0 | ||
30 | #define ISA_DMA_AUTOINIT 0x10 | ||
31 | |||
32 | #define ISA_DMA_MASK 0 | 27 | #define ISA_DMA_MASK 0 |
33 | #define ISA_DMA_MODE 1 | 28 | #define ISA_DMA_MODE 1 |
34 | #define ISA_DMA_CLRFF 2 | 29 | #define ISA_DMA_CLRFF 2 |
@@ -49,38 +44,35 @@ static unsigned int isa_dma_port[8][7] = { | |||
49 | { 0xd4, 0xd6, 0xd8, 0x48a, 0x08a, 0xcc, 0xce } | 44 | { 0xd4, 0xd6, 0xd8, 0x48a, 0x08a, 0xcc, 0xce } |
50 | }; | 45 | }; |
51 | 46 | ||
52 | static int isa_get_dma_residue(dmach_t channel, dma_t *dma) | 47 | static int isa_get_dma_residue(unsigned int chan, dma_t *dma) |
53 | { | 48 | { |
54 | unsigned int io_port = isa_dma_port[channel][ISA_DMA_COUNT]; | 49 | unsigned int io_port = isa_dma_port[chan][ISA_DMA_COUNT]; |
55 | int count; | 50 | int count; |
56 | 51 | ||
57 | count = 1 + inb(io_port); | 52 | count = 1 + inb(io_port); |
58 | count |= inb(io_port) << 8; | 53 | count |= inb(io_port) << 8; |
59 | 54 | ||
60 | return channel < 4 ? count : (count << 1); | 55 | return chan < 4 ? count : (count << 1); |
61 | } | 56 | } |
62 | 57 | ||
63 | static void isa_enable_dma(dmach_t channel, dma_t *dma) | 58 | static void isa_enable_dma(unsigned int chan, dma_t *dma) |
64 | { | 59 | { |
65 | if (dma->invalid) { | 60 | if (dma->invalid) { |
66 | unsigned long address, length; | 61 | unsigned long address, length; |
67 | unsigned int mode; | 62 | unsigned int mode; |
68 | enum dma_data_direction direction; | 63 | enum dma_data_direction direction; |
69 | 64 | ||
70 | mode = channel & 3; | 65 | mode = (chan & 3) | dma->dma_mode; |
71 | switch (dma->dma_mode & DMA_MODE_MASK) { | 66 | switch (dma->dma_mode & DMA_MODE_MASK) { |
72 | case DMA_MODE_READ: | 67 | case DMA_MODE_READ: |
73 | mode |= ISA_DMA_MODE_READ; | ||
74 | direction = DMA_FROM_DEVICE; | 68 | direction = DMA_FROM_DEVICE; |
75 | break; | 69 | break; |
76 | 70 | ||
77 | case DMA_MODE_WRITE: | 71 | case DMA_MODE_WRITE: |
78 | mode |= ISA_DMA_MODE_WRITE; | ||
79 | direction = DMA_TO_DEVICE; | 72 | direction = DMA_TO_DEVICE; |
80 | break; | 73 | break; |
81 | 74 | ||
82 | case DMA_MODE_CASCADE: | 75 | case DMA_MODE_CASCADE: |
83 | mode |= ISA_DMA_MODE_CASCADE; | ||
84 | direction = DMA_BIDIRECTIONAL; | 76 | direction = DMA_BIDIRECTIONAL; |
85 | break; | 77 | break; |
86 | 78 | ||
@@ -105,34 +97,31 @@ static void isa_enable_dma(dmach_t channel, dma_t *dma) | |||
105 | address = dma->buf.dma_address; | 97 | address = dma->buf.dma_address; |
106 | length = dma->buf.length - 1; | 98 | length = dma->buf.length - 1; |
107 | 99 | ||
108 | outb(address >> 16, isa_dma_port[channel][ISA_DMA_PGLO]); | 100 | outb(address >> 16, isa_dma_port[chan][ISA_DMA_PGLO]); |
109 | outb(address >> 24, isa_dma_port[channel][ISA_DMA_PGHI]); | 101 | outb(address >> 24, isa_dma_port[chan][ISA_DMA_PGHI]); |
110 | 102 | ||
111 | if (channel >= 4) { | 103 | if (chan >= 4) { |
112 | address >>= 1; | 104 | address >>= 1; |
113 | length >>= 1; | 105 | length >>= 1; |
114 | } | 106 | } |
115 | 107 | ||
116 | outb(0, isa_dma_port[channel][ISA_DMA_CLRFF]); | 108 | outb(0, isa_dma_port[chan][ISA_DMA_CLRFF]); |
117 | |||
118 | outb(address, isa_dma_port[channel][ISA_DMA_ADDR]); | ||
119 | outb(address >> 8, isa_dma_port[channel][ISA_DMA_ADDR]); | ||
120 | 109 | ||
121 | outb(length, isa_dma_port[channel][ISA_DMA_COUNT]); | 110 | outb(address, isa_dma_port[chan][ISA_DMA_ADDR]); |
122 | outb(length >> 8, isa_dma_port[channel][ISA_DMA_COUNT]); | 111 | outb(address >> 8, isa_dma_port[chan][ISA_DMA_ADDR]); |
123 | 112 | ||
124 | if (dma->dma_mode & DMA_AUTOINIT) | 113 | outb(length, isa_dma_port[chan][ISA_DMA_COUNT]); |
125 | mode |= ISA_DMA_AUTOINIT; | 114 | outb(length >> 8, isa_dma_port[chan][ISA_DMA_COUNT]); |
126 | 115 | ||
127 | outb(mode, isa_dma_port[channel][ISA_DMA_MODE]); | 116 | outb(mode, isa_dma_port[chan][ISA_DMA_MODE]); |
128 | dma->invalid = 0; | 117 | dma->invalid = 0; |
129 | } | 118 | } |
130 | outb(channel & 3, isa_dma_port[channel][ISA_DMA_MASK]); | 119 | outb(chan & 3, isa_dma_port[chan][ISA_DMA_MASK]); |
131 | } | 120 | } |
132 | 121 | ||
133 | static void isa_disable_dma(dmach_t channel, dma_t *dma) | 122 | static void isa_disable_dma(unsigned int chan, dma_t *dma) |
134 | { | 123 | { |
135 | outb(channel | 4, isa_dma_port[channel][ISA_DMA_MASK]); | 124 | outb(chan | 4, isa_dma_port[chan][ISA_DMA_MASK]); |
136 | } | 125 | } |
137 | 126 | ||
138 | static struct dma_ops isa_dma_ops = { | 127 | static struct dma_ops isa_dma_ops = { |
@@ -160,7 +149,12 @@ static struct resource dma_resources[] = { { | |||
160 | .end = 0x048f | 149 | .end = 0x048f |
161 | } }; | 150 | } }; |
162 | 151 | ||
163 | void __init isa_init_dma(dma_t *dma) | 152 | static dma_t isa_dma[8]; |
153 | |||
154 | /* | ||
155 | * ISA DMA always starts at channel 0 | ||
156 | */ | ||
157 | void __init isa_init_dma(void) | ||
164 | { | 158 | { |
165 | /* | 159 | /* |
166 | * Try to autodetect presence of an ISA DMA controller. | 160 | * Try to autodetect presence of an ISA DMA controller. |
@@ -178,11 +172,11 @@ void __init isa_init_dma(dma_t *dma) | |||
178 | outb(0xaa, 0x00); | 172 | outb(0xaa, 0x00); |
179 | 173 | ||
180 | if (inb(0) == 0x55 && inb(0) == 0xaa) { | 174 | if (inb(0) == 0x55 && inb(0) == 0xaa) { |
181 | int channel, i; | 175 | unsigned int chan, i; |
182 | 176 | ||
183 | for (channel = 0; channel < 8; channel++) { | 177 | for (chan = 0; chan < 8; chan++) { |
184 | dma[channel].d_ops = &isa_dma_ops; | 178 | isa_dma[chan].d_ops = &isa_dma_ops; |
185 | isa_disable_dma(channel, NULL); | 179 | isa_disable_dma(chan, NULL); |
186 | } | 180 | } |
187 | 181 | ||
188 | outb(0x40, 0x0b); | 182 | outb(0x40, 0x0b); |
@@ -217,5 +211,12 @@ void __init isa_init_dma(dma_t *dma) | |||
217 | 211 | ||
218 | for (i = 0; i < ARRAY_SIZE(dma_resources); i++) | 212 | for (i = 0; i < ARRAY_SIZE(dma_resources); i++) |
219 | request_resource(&ioport_resource, dma_resources + i); | 213 | request_resource(&ioport_resource, dma_resources + i); |
214 | |||
215 | for (chan = 0; chan < 8; chan++) { | ||
216 | int ret = isa_dma_add(chan, &isa_dma[chan]); | ||
217 | if (ret) | ||
218 | printk(KERN_ERR "ISADMA%u: unable to register: %d\n", | ||
219 | chan, ret); | ||
220 | } | ||
220 | } | 221 | } |
221 | } | 222 | } |
diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c index d006085ed7e7..7d5b9fb01e71 100644 --- a/arch/arm/kernel/dma.c +++ b/arch/arm/kernel/dma.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
18 | #include <linux/scatterlist.h> | ||
18 | 19 | ||
19 | #include <asm/dma.h> | 20 | #include <asm/dma.h> |
20 | 21 | ||
@@ -23,19 +24,40 @@ | |||
23 | DEFINE_SPINLOCK(dma_spin_lock); | 24 | DEFINE_SPINLOCK(dma_spin_lock); |
24 | EXPORT_SYMBOL(dma_spin_lock); | 25 | EXPORT_SYMBOL(dma_spin_lock); |
25 | 26 | ||
26 | static dma_t dma_chan[MAX_DMA_CHANNELS]; | 27 | static dma_t *dma_chan[MAX_DMA_CHANNELS]; |
28 | |||
29 | static inline dma_t *dma_channel(unsigned int chan) | ||
30 | { | ||
31 | if (chan >= MAX_DMA_CHANNELS) | ||
32 | return NULL; | ||
33 | |||
34 | return dma_chan[chan]; | ||
35 | } | ||
36 | |||
37 | int __init isa_dma_add(unsigned int chan, dma_t *dma) | ||
38 | { | ||
39 | if (!dma->d_ops) | ||
40 | return -EINVAL; | ||
41 | |||
42 | sg_init_table(&dma->buf, 1); | ||
43 | |||
44 | if (dma_chan[chan]) | ||
45 | return -EBUSY; | ||
46 | dma_chan[chan] = dma; | ||
47 | return 0; | ||
48 | } | ||
27 | 49 | ||
28 | /* | 50 | /* |
29 | * Request DMA channel | 51 | * Request DMA channel |
30 | * | 52 | * |
31 | * On certain platforms, we have to allocate an interrupt as well... | 53 | * On certain platforms, we have to allocate an interrupt as well... |
32 | */ | 54 | */ |
33 | int request_dma(dmach_t channel, const char *device_id) | 55 | int request_dma(unsigned int chan, const char *device_id) |
34 | { | 56 | { |
35 | dma_t *dma = dma_chan + channel; | 57 | dma_t *dma = dma_channel(chan); |
36 | int ret; | 58 | int ret; |
37 | 59 | ||
38 | if (channel >= MAX_DMA_CHANNELS || !dma->d_ops) | 60 | if (!dma) |
39 | goto bad_dma; | 61 | goto bad_dma; |
40 | 62 | ||
41 | if (xchg(&dma->lock, 1) != 0) | 63 | if (xchg(&dma->lock, 1) != 0) |
@@ -47,7 +69,7 @@ int request_dma(dmach_t channel, const char *device_id) | |||
47 | 69 | ||
48 | ret = 0; | 70 | ret = 0; |
49 | if (dma->d_ops->request) | 71 | if (dma->d_ops->request) |
50 | ret = dma->d_ops->request(channel, dma); | 72 | ret = dma->d_ops->request(chan, dma); |
51 | 73 | ||
52 | if (ret) | 74 | if (ret) |
53 | xchg(&dma->lock, 0); | 75 | xchg(&dma->lock, 0); |
@@ -55,7 +77,7 @@ int request_dma(dmach_t channel, const char *device_id) | |||
55 | return ret; | 77 | return ret; |
56 | 78 | ||
57 | bad_dma: | 79 | bad_dma: |
58 | printk(KERN_ERR "dma: trying to allocate DMA%d\n", channel); | 80 | printk(KERN_ERR "dma: trying to allocate DMA%d\n", chan); |
59 | return -EINVAL; | 81 | return -EINVAL; |
60 | 82 | ||
61 | busy: | 83 | busy: |
@@ -68,42 +90,42 @@ EXPORT_SYMBOL(request_dma); | |||
68 | * | 90 | * |
69 | * On certain platforms, we have to free interrupt as well... | 91 | * On certain platforms, we have to free interrupt as well... |
70 | */ | 92 | */ |
71 | void free_dma(dmach_t channel) | 93 | void free_dma(unsigned int chan) |
72 | { | 94 | { |
73 | dma_t *dma = dma_chan + channel; | 95 | dma_t *dma = dma_channel(chan); |
74 | 96 | ||
75 | if (channel >= MAX_DMA_CHANNELS || !dma->d_ops) | 97 | if (!dma) |
76 | goto bad_dma; | 98 | goto bad_dma; |
77 | 99 | ||
78 | if (dma->active) { | 100 | if (dma->active) { |
79 | printk(KERN_ERR "dma%d: freeing active DMA\n", channel); | 101 | printk(KERN_ERR "dma%d: freeing active DMA\n", chan); |
80 | dma->d_ops->disable(channel, dma); | 102 | dma->d_ops->disable(chan, dma); |
81 | dma->active = 0; | 103 | dma->active = 0; |
82 | } | 104 | } |
83 | 105 | ||
84 | if (xchg(&dma->lock, 0) != 0) { | 106 | if (xchg(&dma->lock, 0) != 0) { |
85 | if (dma->d_ops->free) | 107 | if (dma->d_ops->free) |
86 | dma->d_ops->free(channel, dma); | 108 | dma->d_ops->free(chan, dma); |
87 | return; | 109 | return; |
88 | } | 110 | } |
89 | 111 | ||
90 | printk(KERN_ERR "dma%d: trying to free free DMA\n", channel); | 112 | printk(KERN_ERR "dma%d: trying to free free DMA\n", chan); |
91 | return; | 113 | return; |
92 | 114 | ||
93 | bad_dma: | 115 | bad_dma: |
94 | printk(KERN_ERR "dma: trying to free DMA%d\n", channel); | 116 | printk(KERN_ERR "dma: trying to free DMA%d\n", chan); |
95 | } | 117 | } |
96 | EXPORT_SYMBOL(free_dma); | 118 | EXPORT_SYMBOL(free_dma); |
97 | 119 | ||
98 | /* Set DMA Scatter-Gather list | 120 | /* Set DMA Scatter-Gather list |
99 | */ | 121 | */ |
100 | void set_dma_sg (dmach_t channel, struct scatterlist *sg, int nr_sg) | 122 | void set_dma_sg (unsigned int chan, struct scatterlist *sg, int nr_sg) |
101 | { | 123 | { |
102 | dma_t *dma = dma_chan + channel; | 124 | dma_t *dma = dma_channel(chan); |
103 | 125 | ||
104 | if (dma->active) | 126 | if (dma->active) |
105 | printk(KERN_ERR "dma%d: altering DMA SG while " | 127 | printk(KERN_ERR "dma%d: altering DMA SG while " |
106 | "DMA active\n", channel); | 128 | "DMA active\n", chan); |
107 | 129 | ||
108 | dma->sg = sg; | 130 | dma->sg = sg; |
109 | dma->sgcount = nr_sg; | 131 | dma->sgcount = nr_sg; |
@@ -115,13 +137,13 @@ EXPORT_SYMBOL(set_dma_sg); | |||
115 | * | 137 | * |
116 | * Copy address to the structure, and set the invalid bit | 138 | * Copy address to the structure, and set the invalid bit |
117 | */ | 139 | */ |
118 | void __set_dma_addr (dmach_t channel, void *addr) | 140 | void __set_dma_addr (unsigned int chan, void *addr) |
119 | { | 141 | { |
120 | dma_t *dma = dma_chan + channel; | 142 | dma_t *dma = dma_channel(chan); |
121 | 143 | ||
122 | if (dma->active) | 144 | if (dma->active) |
123 | printk(KERN_ERR "dma%d: altering DMA address while " | 145 | printk(KERN_ERR "dma%d: altering DMA address while " |
124 | "DMA active\n", channel); | 146 | "DMA active\n", chan); |
125 | 147 | ||
126 | dma->sg = NULL; | 148 | dma->sg = NULL; |
127 | dma->addr = addr; | 149 | dma->addr = addr; |
@@ -133,13 +155,13 @@ EXPORT_SYMBOL(__set_dma_addr); | |||
133 | * | 155 | * |
134 | * Copy address to the structure, and set the invalid bit | 156 | * Copy address to the structure, and set the invalid bit |
135 | */ | 157 | */ |
136 | void set_dma_count (dmach_t channel, unsigned long count) | 158 | void set_dma_count (unsigned int chan, unsigned long count) |
137 | { | 159 | { |
138 | dma_t *dma = dma_chan + channel; | 160 | dma_t *dma = dma_channel(chan); |
139 | 161 | ||
140 | if (dma->active) | 162 | if (dma->active) |
141 | printk(KERN_ERR "dma%d: altering DMA count while " | 163 | printk(KERN_ERR "dma%d: altering DMA count while " |
142 | "DMA active\n", channel); | 164 | "DMA active\n", chan); |
143 | 165 | ||
144 | dma->sg = NULL; | 166 | dma->sg = NULL; |
145 | dma->count = count; | 167 | dma->count = count; |
@@ -149,13 +171,13 @@ EXPORT_SYMBOL(set_dma_count); | |||
149 | 171 | ||
150 | /* Set DMA direction mode | 172 | /* Set DMA direction mode |
151 | */ | 173 | */ |
152 | void set_dma_mode (dmach_t channel, dmamode_t mode) | 174 | void set_dma_mode (unsigned int chan, unsigned int mode) |
153 | { | 175 | { |
154 | dma_t *dma = dma_chan + channel; | 176 | dma_t *dma = dma_channel(chan); |
155 | 177 | ||
156 | if (dma->active) | 178 | if (dma->active) |
157 | printk(KERN_ERR "dma%d: altering DMA mode while " | 179 | printk(KERN_ERR "dma%d: altering DMA mode while " |
158 | "DMA active\n", channel); | 180 | "DMA active\n", chan); |
159 | 181 | ||
160 | dma->dma_mode = mode; | 182 | dma->dma_mode = mode; |
161 | dma->invalid = 1; | 183 | dma->invalid = 1; |
@@ -164,42 +186,42 @@ EXPORT_SYMBOL(set_dma_mode); | |||
164 | 186 | ||
165 | /* Enable DMA channel | 187 | /* Enable DMA channel |
166 | */ | 188 | */ |
167 | void enable_dma (dmach_t channel) | 189 | void enable_dma (unsigned int chan) |
168 | { | 190 | { |
169 | dma_t *dma = dma_chan + channel; | 191 | dma_t *dma = dma_channel(chan); |
170 | 192 | ||
171 | if (!dma->lock) | 193 | if (!dma->lock) |
172 | goto free_dma; | 194 | goto free_dma; |
173 | 195 | ||
174 | if (dma->active == 0) { | 196 | if (dma->active == 0) { |
175 | dma->active = 1; | 197 | dma->active = 1; |
176 | dma->d_ops->enable(channel, dma); | 198 | dma->d_ops->enable(chan, dma); |
177 | } | 199 | } |
178 | return; | 200 | return; |
179 | 201 | ||
180 | free_dma: | 202 | free_dma: |
181 | printk(KERN_ERR "dma%d: trying to enable free DMA\n", channel); | 203 | printk(KERN_ERR "dma%d: trying to enable free DMA\n", chan); |
182 | BUG(); | 204 | BUG(); |
183 | } | 205 | } |
184 | EXPORT_SYMBOL(enable_dma); | 206 | EXPORT_SYMBOL(enable_dma); |
185 | 207 | ||
186 | /* Disable DMA channel | 208 | /* Disable DMA channel |
187 | */ | 209 | */ |
188 | void disable_dma (dmach_t channel) | 210 | void disable_dma (unsigned int chan) |
189 | { | 211 | { |
190 | dma_t *dma = dma_chan + channel; | 212 | dma_t *dma = dma_channel(chan); |
191 | 213 | ||
192 | if (!dma->lock) | 214 | if (!dma->lock) |
193 | goto free_dma; | 215 | goto free_dma; |
194 | 216 | ||
195 | if (dma->active == 1) { | 217 | if (dma->active == 1) { |
196 | dma->active = 0; | 218 | dma->active = 0; |
197 | dma->d_ops->disable(channel, dma); | 219 | dma->d_ops->disable(chan, dma); |
198 | } | 220 | } |
199 | return; | 221 | return; |
200 | 222 | ||
201 | free_dma: | 223 | free_dma: |
202 | printk(KERN_ERR "dma%d: trying to disable free DMA\n", channel); | 224 | printk(KERN_ERR "dma%d: trying to disable free DMA\n", chan); |
203 | BUG(); | 225 | BUG(); |
204 | } | 226 | } |
205 | EXPORT_SYMBOL(disable_dma); | 227 | EXPORT_SYMBOL(disable_dma); |
@@ -207,45 +229,38 @@ EXPORT_SYMBOL(disable_dma); | |||
207 | /* | 229 | /* |
208 | * Is the specified DMA channel active? | 230 | * Is the specified DMA channel active? |
209 | */ | 231 | */ |
210 | int dma_channel_active(dmach_t channel) | 232 | int dma_channel_active(unsigned int chan) |
211 | { | 233 | { |
212 | return dma_chan[channel].active; | 234 | dma_t *dma = dma_channel(chan); |
235 | return dma->active; | ||
213 | } | 236 | } |
214 | EXPORT_SYMBOL(dma_channel_active); | 237 | EXPORT_SYMBOL(dma_channel_active); |
215 | 238 | ||
216 | void set_dma_page(dmach_t channel, char pagenr) | 239 | void set_dma_page(unsigned int chan, char pagenr) |
217 | { | 240 | { |
218 | printk(KERN_ERR "dma%d: trying to set_dma_page\n", channel); | 241 | printk(KERN_ERR "dma%d: trying to set_dma_page\n", chan); |
219 | } | 242 | } |
220 | EXPORT_SYMBOL(set_dma_page); | 243 | EXPORT_SYMBOL(set_dma_page); |
221 | 244 | ||
222 | void set_dma_speed(dmach_t channel, int cycle_ns) | 245 | void set_dma_speed(unsigned int chan, int cycle_ns) |
223 | { | 246 | { |
224 | dma_t *dma = dma_chan + channel; | 247 | dma_t *dma = dma_channel(chan); |
225 | int ret = 0; | 248 | int ret = 0; |
226 | 249 | ||
227 | if (dma->d_ops->setspeed) | 250 | if (dma->d_ops->setspeed) |
228 | ret = dma->d_ops->setspeed(channel, dma, cycle_ns); | 251 | ret = dma->d_ops->setspeed(chan, dma, cycle_ns); |
229 | dma->speed = ret; | 252 | dma->speed = ret; |
230 | } | 253 | } |
231 | EXPORT_SYMBOL(set_dma_speed); | 254 | EXPORT_SYMBOL(set_dma_speed); |
232 | 255 | ||
233 | int get_dma_residue(dmach_t channel) | 256 | int get_dma_residue(unsigned int chan) |
234 | { | 257 | { |
235 | dma_t *dma = dma_chan + channel; | 258 | dma_t *dma = dma_channel(chan); |
236 | int ret = 0; | 259 | int ret = 0; |
237 | 260 | ||
238 | if (dma->d_ops->residue) | 261 | if (dma->d_ops->residue) |
239 | ret = dma->d_ops->residue(channel, dma); | 262 | ret = dma->d_ops->residue(chan, dma); |
240 | 263 | ||
241 | return ret; | 264 | return ret; |
242 | } | 265 | } |
243 | EXPORT_SYMBOL(get_dma_residue); | 266 | EXPORT_SYMBOL(get_dma_residue); |
244 | |||
245 | static int __init init_dma(void) | ||
246 | { | ||
247 | arch_dma_init(dma_chan); | ||
248 | return 0; | ||
249 | } | ||
250 | |||
251 | core_initcall(init_dma); | ||
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 85040cfeb5e5..d662a2f1fd85 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <asm/vfpmacros.h> | 20 | #include <asm/vfpmacros.h> |
21 | #include <mach/entry-macro.S> | 21 | #include <mach/entry-macro.S> |
22 | #include <asm/thread_notify.h> | 22 | #include <asm/thread_notify.h> |
23 | #include <asm/unwind.h> | ||
23 | 24 | ||
24 | #include "entry-header.S" | 25 | #include "entry-header.S" |
25 | 26 | ||
@@ -123,6 +124,8 @@ ENDPROC(__und_invalid) | |||
123 | #endif | 124 | #endif |
124 | 125 | ||
125 | .macro svc_entry, stack_hole=0 | 126 | .macro svc_entry, stack_hole=0 |
127 | UNWIND(.fnstart ) | ||
128 | UNWIND(.save {r0 - pc} ) | ||
126 | sub sp, sp, #(S_FRAME_SIZE + \stack_hole) | 129 | sub sp, sp, #(S_FRAME_SIZE + \stack_hole) |
127 | SPFIX( tst sp, #4 ) | 130 | SPFIX( tst sp, #4 ) |
128 | SPFIX( bicne sp, sp, #4 ) | 131 | SPFIX( bicne sp, sp, #4 ) |
@@ -196,6 +199,7 @@ __dabt_svc: | |||
196 | ldr r0, [sp, #S_PSR] | 199 | ldr r0, [sp, #S_PSR] |
197 | msr spsr_cxsf, r0 | 200 | msr spsr_cxsf, r0 |
198 | ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr | 201 | ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr |
202 | UNWIND(.fnend ) | ||
199 | ENDPROC(__dabt_svc) | 203 | ENDPROC(__dabt_svc) |
200 | 204 | ||
201 | .align 5 | 205 | .align 5 |
@@ -228,6 +232,7 @@ __irq_svc: | |||
228 | bleq trace_hardirqs_on | 232 | bleq trace_hardirqs_on |
229 | #endif | 233 | #endif |
230 | ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr | 234 | ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr |
235 | UNWIND(.fnend ) | ||
231 | ENDPROC(__irq_svc) | 236 | ENDPROC(__irq_svc) |
232 | 237 | ||
233 | .ltorg | 238 | .ltorg |
@@ -278,6 +283,7 @@ __und_svc: | |||
278 | ldr lr, [sp, #S_PSR] @ Get SVC cpsr | 283 | ldr lr, [sp, #S_PSR] @ Get SVC cpsr |
279 | msr spsr_cxsf, lr | 284 | msr spsr_cxsf, lr |
280 | ldmia sp, {r0 - pc}^ @ Restore SVC registers | 285 | ldmia sp, {r0 - pc}^ @ Restore SVC registers |
286 | UNWIND(.fnend ) | ||
281 | ENDPROC(__und_svc) | 287 | ENDPROC(__und_svc) |
282 | 288 | ||
283 | .align 5 | 289 | .align 5 |
@@ -320,6 +326,7 @@ __pabt_svc: | |||
320 | ldr r0, [sp, #S_PSR] | 326 | ldr r0, [sp, #S_PSR] |
321 | msr spsr_cxsf, r0 | 327 | msr spsr_cxsf, r0 |
322 | ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr | 328 | ldmia sp, {r0 - pc}^ @ load r0 - pc, cpsr |
329 | UNWIND(.fnend ) | ||
323 | ENDPROC(__pabt_svc) | 330 | ENDPROC(__pabt_svc) |
324 | 331 | ||
325 | .align 5 | 332 | .align 5 |
@@ -343,6 +350,8 @@ ENDPROC(__pabt_svc) | |||
343 | #endif | 350 | #endif |
344 | 351 | ||
345 | .macro usr_entry | 352 | .macro usr_entry |
353 | UNWIND(.fnstart ) | ||
354 | UNWIND(.cantunwind ) @ don't unwind the user space | ||
346 | sub sp, sp, #S_FRAME_SIZE | 355 | sub sp, sp, #S_FRAME_SIZE |
347 | stmib sp, {r1 - r12} | 356 | stmib sp, {r1 - r12} |
348 | 357 | ||
@@ -420,6 +429,7 @@ __dabt_usr: | |||
420 | mov r2, sp | 429 | mov r2, sp |
421 | adr lr, ret_from_exception | 430 | adr lr, ret_from_exception |
422 | b do_DataAbort | 431 | b do_DataAbort |
432 | UNWIND(.fnend ) | ||
423 | ENDPROC(__dabt_usr) | 433 | ENDPROC(__dabt_usr) |
424 | 434 | ||
425 | .align 5 | 435 | .align 5 |
@@ -450,6 +460,7 @@ __irq_usr: | |||
450 | 460 | ||
451 | mov why, #0 | 461 | mov why, #0 |
452 | b ret_to_user | 462 | b ret_to_user |
463 | UNWIND(.fnend ) | ||
453 | ENDPROC(__irq_usr) | 464 | ENDPROC(__irq_usr) |
454 | 465 | ||
455 | .ltorg | 466 | .ltorg |
@@ -484,6 +495,7 @@ __und_usr: | |||
484 | #else | 495 | #else |
485 | b __und_usr_unknown | 496 | b __und_usr_unknown |
486 | #endif | 497 | #endif |
498 | UNWIND(.fnend ) | ||
487 | ENDPROC(__und_usr) | 499 | ENDPROC(__und_usr) |
488 | 500 | ||
489 | @ | 501 | @ |
@@ -671,14 +683,18 @@ __pabt_usr: | |||
671 | enable_irq @ Enable interrupts | 683 | enable_irq @ Enable interrupts |
672 | mov r1, sp @ regs | 684 | mov r1, sp @ regs |
673 | bl do_PrefetchAbort @ call abort handler | 685 | bl do_PrefetchAbort @ call abort handler |
686 | UNWIND(.fnend ) | ||
674 | /* fall through */ | 687 | /* fall through */ |
675 | /* | 688 | /* |
676 | * This is the return code to user mode for abort handlers | 689 | * This is the return code to user mode for abort handlers |
677 | */ | 690 | */ |
678 | ENTRY(ret_from_exception) | 691 | ENTRY(ret_from_exception) |
692 | UNWIND(.fnstart ) | ||
693 | UNWIND(.cantunwind ) | ||
679 | get_thread_info tsk | 694 | get_thread_info tsk |
680 | mov why, #0 | 695 | mov why, #0 |
681 | b ret_to_user | 696 | b ret_to_user |
697 | UNWIND(.fnend ) | ||
682 | ENDPROC(__pabt_usr) | 698 | ENDPROC(__pabt_usr) |
683 | ENDPROC(ret_from_exception) | 699 | ENDPROC(ret_from_exception) |
684 | 700 | ||
@@ -688,6 +704,8 @@ ENDPROC(ret_from_exception) | |||
688 | * previous and next are guaranteed not to be the same. | 704 | * previous and next are guaranteed not to be the same. |
689 | */ | 705 | */ |
690 | ENTRY(__switch_to) | 706 | ENTRY(__switch_to) |
707 | UNWIND(.fnstart ) | ||
708 | UNWIND(.cantunwind ) | ||
691 | add ip, r1, #TI_CPU_SAVE | 709 | add ip, r1, #TI_CPU_SAVE |
692 | ldr r3, [r2, #TI_TP_VALUE] | 710 | ldr r3, [r2, #TI_TP_VALUE] |
693 | stmia ip!, {r4 - sl, fp, sp, lr} @ Store most regs on stack | 711 | stmia ip!, {r4 - sl, fp, sp, lr} @ Store most regs on stack |
@@ -717,6 +735,7 @@ ENTRY(__switch_to) | |||
717 | bl atomic_notifier_call_chain | 735 | bl atomic_notifier_call_chain |
718 | mov r0, r5 | 736 | mov r0, r5 |
719 | ldmia r4, {r4 - sl, fp, sp, pc} @ Load all regs saved previously | 737 | ldmia r4, {r4 - sl, fp, sp, pc} @ Load all regs saved previously |
738 | UNWIND(.fnend ) | ||
720 | ENDPROC(__switch_to) | 739 | ENDPROC(__switch_to) |
721 | 740 | ||
722 | __INIT | 741 | __INIT |
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 49a6ba926c2b..b8c1f1411440 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <asm/unistd.h> | 11 | #include <asm/unistd.h> |
12 | #include <asm/ftrace.h> | 12 | #include <asm/ftrace.h> |
13 | #include <mach/entry-macro.S> | 13 | #include <mach/entry-macro.S> |
14 | #include <asm/unwind.h> | ||
14 | 15 | ||
15 | #include "entry-header.S" | 16 | #include "entry-header.S" |
16 | 17 | ||
@@ -22,6 +23,8 @@ | |||
22 | * stack. | 23 | * stack. |
23 | */ | 24 | */ |
24 | ret_fast_syscall: | 25 | ret_fast_syscall: |
26 | UNWIND(.fnstart ) | ||
27 | UNWIND(.cantunwind ) | ||
25 | disable_irq @ disable interrupts | 28 | disable_irq @ disable interrupts |
26 | ldr r1, [tsk, #TI_FLAGS] | 29 | ldr r1, [tsk, #TI_FLAGS] |
27 | tst r1, #_TIF_WORK_MASK | 30 | tst r1, #_TIF_WORK_MASK |
@@ -38,6 +41,7 @@ ret_fast_syscall: | |||
38 | mov r0, r0 | 41 | mov r0, r0 |
39 | add sp, sp, #S_FRAME_SIZE - S_PC | 42 | add sp, sp, #S_FRAME_SIZE - S_PC |
40 | movs pc, lr @ return & move spsr_svc into cpsr | 43 | movs pc, lr @ return & move spsr_svc into cpsr |
44 | UNWIND(.fnend ) | ||
41 | 45 | ||
42 | /* | 46 | /* |
43 | * Ok, we need to do extra processing, enter the slow path. | 47 | * Ok, we need to do extra processing, enter the slow path. |
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index dab48f27263f..13dbd5bf5cc2 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <asm/pgtable.h> | 23 | #include <asm/pgtable.h> |
24 | #include <asm/sections.h> | 24 | #include <asm/sections.h> |
25 | #include <asm/unwind.h> | ||
25 | 26 | ||
26 | #ifdef CONFIG_XIP_KERNEL | 27 | #ifdef CONFIG_XIP_KERNEL |
27 | /* | 28 | /* |
@@ -66,6 +67,24 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, | |||
66 | char *secstrings, | 67 | char *secstrings, |
67 | struct module *mod) | 68 | struct module *mod) |
68 | { | 69 | { |
70 | #ifdef CONFIG_ARM_UNWIND | ||
71 | Elf_Shdr *s, *sechdrs_end = sechdrs + hdr->e_shnum; | ||
72 | |||
73 | for (s = sechdrs; s < sechdrs_end; s++) { | ||
74 | if (strcmp(".ARM.exidx.init.text", secstrings + s->sh_name) == 0) | ||
75 | mod->arch.unw_sec_init = s; | ||
76 | else if (strcmp(".ARM.exidx.devinit.text", secstrings + s->sh_name) == 0) | ||
77 | mod->arch.unw_sec_devinit = s; | ||
78 | else if (strcmp(".ARM.exidx", secstrings + s->sh_name) == 0) | ||
79 | mod->arch.unw_sec_core = s; | ||
80 | else if (strcmp(".init.text", secstrings + s->sh_name) == 0) | ||
81 | mod->arch.sec_init_text = s; | ||
82 | else if (strcmp(".devinit.text", secstrings + s->sh_name) == 0) | ||
83 | mod->arch.sec_devinit_text = s; | ||
84 | else if (strcmp(".text", secstrings + s->sh_name) == 0) | ||
85 | mod->arch.sec_core_text = s; | ||
86 | } | ||
87 | #endif | ||
69 | return 0; | 88 | return 0; |
70 | } | 89 | } |
71 | 90 | ||
@@ -104,6 +123,10 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, | |||
104 | loc = dstsec->sh_addr + rel->r_offset; | 123 | loc = dstsec->sh_addr + rel->r_offset; |
105 | 124 | ||
106 | switch (ELF32_R_TYPE(rel->r_info)) { | 125 | switch (ELF32_R_TYPE(rel->r_info)) { |
126 | case R_ARM_NONE: | ||
127 | /* ignore */ | ||
128 | break; | ||
129 | |||
107 | case R_ARM_ABS32: | 130 | case R_ARM_ABS32: |
108 | *(u32 *)loc += sym->st_value; | 131 | *(u32 *)loc += sym->st_value; |
109 | break; | 132 | break; |
@@ -132,6 +155,11 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, | |||
132 | *(u32 *)loc |= offset & 0x00ffffff; | 155 | *(u32 *)loc |= offset & 0x00ffffff; |
133 | break; | 156 | break; |
134 | 157 | ||
158 | case R_ARM_PREL31: | ||
159 | offset = *(u32 *)loc + sym->st_value - loc; | ||
160 | *(u32 *)loc = offset & 0x7fffffff; | ||
161 | break; | ||
162 | |||
135 | default: | 163 | default: |
136 | printk(KERN_ERR "%s: unknown relocation: %u\n", | 164 | printk(KERN_ERR "%s: unknown relocation: %u\n", |
137 | module->name, ELF32_R_TYPE(rel->r_info)); | 165 | module->name, ELF32_R_TYPE(rel->r_info)); |
@@ -150,14 +178,50 @@ apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, | |||
150 | return -ENOEXEC; | 178 | return -ENOEXEC; |
151 | } | 179 | } |
152 | 180 | ||
181 | #ifdef CONFIG_ARM_UNWIND | ||
182 | static void register_unwind_tables(struct module *mod) | ||
183 | { | ||
184 | if (mod->arch.unw_sec_init && mod->arch.sec_init_text) | ||
185 | mod->arch.unwind_init = | ||
186 | unwind_table_add(mod->arch.unw_sec_init->sh_addr, | ||
187 | mod->arch.unw_sec_init->sh_size, | ||
188 | mod->arch.sec_init_text->sh_addr, | ||
189 | mod->arch.sec_init_text->sh_size); | ||
190 | if (mod->arch.unw_sec_devinit && mod->arch.sec_devinit_text) | ||
191 | mod->arch.unwind_devinit = | ||
192 | unwind_table_add(mod->arch.unw_sec_devinit->sh_addr, | ||
193 | mod->arch.unw_sec_devinit->sh_size, | ||
194 | mod->arch.sec_devinit_text->sh_addr, | ||
195 | mod->arch.sec_devinit_text->sh_size); | ||
196 | if (mod->arch.unw_sec_core && mod->arch.sec_core_text) | ||
197 | mod->arch.unwind_core = | ||
198 | unwind_table_add(mod->arch.unw_sec_core->sh_addr, | ||
199 | mod->arch.unw_sec_core->sh_size, | ||
200 | mod->arch.sec_core_text->sh_addr, | ||
201 | mod->arch.sec_core_text->sh_size); | ||
202 | } | ||
203 | |||
204 | static void unregister_unwind_tables(struct module *mod) | ||
205 | { | ||
206 | unwind_table_del(mod->arch.unwind_init); | ||
207 | unwind_table_del(mod->arch.unwind_devinit); | ||
208 | unwind_table_del(mod->arch.unwind_core); | ||
209 | } | ||
210 | #else | ||
211 | static inline void register_unwind_tables(struct module *mod) { } | ||
212 | static inline void unregister_unwind_tables(struct module *mod) { } | ||
213 | #endif | ||
214 | |||
153 | int | 215 | int |
154 | module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs, | 216 | module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs, |
155 | struct module *module) | 217 | struct module *module) |
156 | { | 218 | { |
219 | register_unwind_tables(module); | ||
157 | return 0; | 220 | return 0; |
158 | } | 221 | } |
159 | 222 | ||
160 | void | 223 | void |
161 | module_arch_cleanup(struct module *mod) | 224 | module_arch_cleanup(struct module *mod) |
162 | { | 225 | { |
226 | unregister_unwind_tables(mod); | ||
163 | } | 227 | } |
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index d3ea6fa89521..af377c73d90b 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <asm/processor.h> | 34 | #include <asm/processor.h> |
35 | #include <asm/system.h> | 35 | #include <asm/system.h> |
36 | #include <asm/thread_notify.h> | 36 | #include <asm/thread_notify.h> |
37 | #include <asm/stacktrace.h> | ||
37 | #include <asm/mach/time.h> | 38 | #include <asm/mach/time.h> |
38 | 39 | ||
39 | static const char *processor_modes[] = { | 40 | static const char *processor_modes[] = { |
@@ -372,23 +373,21 @@ EXPORT_SYMBOL(kernel_thread); | |||
372 | 373 | ||
373 | unsigned long get_wchan(struct task_struct *p) | 374 | unsigned long get_wchan(struct task_struct *p) |
374 | { | 375 | { |
375 | unsigned long fp, lr; | 376 | struct stackframe frame; |
376 | unsigned long stack_start, stack_end; | ||
377 | int count = 0; | 377 | int count = 0; |
378 | if (!p || p == current || p->state == TASK_RUNNING) | 378 | if (!p || p == current || p->state == TASK_RUNNING) |
379 | return 0; | 379 | return 0; |
380 | 380 | ||
381 | stack_start = (unsigned long)end_of_stack(p); | 381 | frame.fp = thread_saved_fp(p); |
382 | stack_end = (unsigned long)task_stack_page(p) + THREAD_SIZE; | 382 | frame.sp = thread_saved_sp(p); |
383 | 383 | frame.lr = 0; /* recovered from the stack */ | |
384 | fp = thread_saved_fp(p); | 384 | frame.pc = thread_saved_pc(p); |
385 | do { | 385 | do { |
386 | if (fp < stack_start || fp > stack_end) | 386 | int ret = unwind_frame(&frame); |
387 | if (ret < 0) | ||
387 | return 0; | 388 | return 0; |
388 | lr = ((unsigned long *)fp)[-1]; | 389 | if (!in_sched_functions(frame.pc)) |
389 | if (!in_sched_functions(lr)) | 390 | return frame.pc; |
390 | return lr; | ||
391 | fp = *(unsigned long *) (fp - 12); | ||
392 | } while (count ++ < 16); | 391 | } while (count ++ < 16); |
393 | return 0; | 392 | return 0; |
394 | } | 393 | } |
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index df653ea59250..89882a1d0187 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c | |||
@@ -653,6 +653,54 @@ static int ptrace_setcrunchregs(struct task_struct *tsk, void __user *ufp) | |||
653 | } | 653 | } |
654 | #endif | 654 | #endif |
655 | 655 | ||
656 | #ifdef CONFIG_VFP | ||
657 | /* | ||
658 | * Get the child VFP state. | ||
659 | */ | ||
660 | static int ptrace_getvfpregs(struct task_struct *tsk, void __user *data) | ||
661 | { | ||
662 | struct thread_info *thread = task_thread_info(tsk); | ||
663 | union vfp_state *vfp = &thread->vfpstate; | ||
664 | struct user_vfp __user *ufp = data; | ||
665 | |||
666 | vfp_sync_state(thread); | ||
667 | |||
668 | /* copy the floating point registers */ | ||
669 | if (copy_to_user(&ufp->fpregs, &vfp->hard.fpregs, | ||
670 | sizeof(vfp->hard.fpregs))) | ||
671 | return -EFAULT; | ||
672 | |||
673 | /* copy the status and control register */ | ||
674 | if (put_user(vfp->hard.fpscr, &ufp->fpscr)) | ||
675 | return -EFAULT; | ||
676 | |||
677 | return 0; | ||
678 | } | ||
679 | |||
680 | /* | ||
681 | * Set the child VFP state. | ||
682 | */ | ||
683 | static int ptrace_setvfpregs(struct task_struct *tsk, void __user *data) | ||
684 | { | ||
685 | struct thread_info *thread = task_thread_info(tsk); | ||
686 | union vfp_state *vfp = &thread->vfpstate; | ||
687 | struct user_vfp __user *ufp = data; | ||
688 | |||
689 | vfp_sync_state(thread); | ||
690 | |||
691 | /* copy the floating point registers */ | ||
692 | if (copy_from_user(&vfp->hard.fpregs, &ufp->fpregs, | ||
693 | sizeof(vfp->hard.fpregs))) | ||
694 | return -EFAULT; | ||
695 | |||
696 | /* copy the status and control register */ | ||
697 | if (get_user(vfp->hard.fpscr, &ufp->fpscr)) | ||
698 | return -EFAULT; | ||
699 | |||
700 | return 0; | ||
701 | } | ||
702 | #endif | ||
703 | |||
656 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) | 704 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) |
657 | { | 705 | { |
658 | int ret; | 706 | int ret; |
@@ -775,6 +823,16 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
775 | break; | 823 | break; |
776 | #endif | 824 | #endif |
777 | 825 | ||
826 | #ifdef CONFIG_VFP | ||
827 | case PTRACE_GETVFPREGS: | ||
828 | ret = ptrace_getvfpregs(child, (void __user *)data); | ||
829 | break; | ||
830 | |||
831 | case PTRACE_SETVFPREGS: | ||
832 | ret = ptrace_setvfpregs(child, (void __user *)data); | ||
833 | break; | ||
834 | #endif | ||
835 | |||
778 | default: | 836 | default: |
779 | ret = ptrace_request(child, request, addr, data); | 837 | ret = ptrace_request(child, request, addr, data); |
780 | break; | 838 | break; |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 68d6494c0389..bc5e4128f9f3 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <asm/mach/irq.h> | 40 | #include <asm/mach/irq.h> |
41 | #include <asm/mach/time.h> | 41 | #include <asm/mach/time.h> |
42 | #include <asm/traps.h> | 42 | #include <asm/traps.h> |
43 | #include <asm/unwind.h> | ||
43 | 44 | ||
44 | #include "compat.h" | 45 | #include "compat.h" |
45 | #include "atags.h" | 46 | #include "atags.h" |
@@ -685,6 +686,8 @@ void __init setup_arch(char **cmdline_p) | |||
685 | struct machine_desc *mdesc; | 686 | struct machine_desc *mdesc; |
686 | char *from = default_command_line; | 687 | char *from = default_command_line; |
687 | 688 | ||
689 | unwind_init(); | ||
690 | |||
688 | setup_processor(); | 691 | setup_processor(); |
689 | mdesc = setup_machine(machine_arch_type); | 692 | mdesc = setup_machine(machine_arch_type); |
690 | machine_name = mdesc->name; | 693 | machine_name = mdesc->name; |
@@ -780,6 +783,8 @@ static const char *hwcap_str[] = { | |||
780 | "crunch", | 783 | "crunch", |
781 | "thumbee", | 784 | "thumbee", |
782 | "neon", | 785 | "neon", |
786 | "vfpv3", | ||
787 | "vfpv3d16", | ||
783 | NULL | 788 | NULL |
784 | }; | 789 | }; |
785 | 790 | ||
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 55fa7ff96a3e..7801aac3c043 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
@@ -93,6 +93,7 @@ int __cpuinit __cpu_up(unsigned int cpu) | |||
93 | pmd = pmd_offset(pgd + pgd_index(PHYS_OFFSET), PHYS_OFFSET); | 93 | pmd = pmd_offset(pgd + pgd_index(PHYS_OFFSET), PHYS_OFFSET); |
94 | *pmd = __pmd((PHYS_OFFSET & PGDIR_MASK) | | 94 | *pmd = __pmd((PHYS_OFFSET & PGDIR_MASK) | |
95 | PMD_TYPE_SECT | PMD_SECT_AP_WRITE); | 95 | PMD_TYPE_SECT | PMD_SECT_AP_WRITE); |
96 | flush_pmd_entry(pmd); | ||
96 | 97 | ||
97 | /* | 98 | /* |
98 | * We need to tell the secondary core where to find | 99 | * We need to tell the secondary core where to find |
@@ -130,6 +131,7 @@ int __cpuinit __cpu_up(unsigned int cpu) | |||
130 | secondary_data.pgdir = 0; | 131 | secondary_data.pgdir = 0; |
131 | 132 | ||
132 | *pmd = __pmd(0); | 133 | *pmd = __pmd(0); |
134 | clean_pmd_entry(pmd); | ||
133 | pgd_free(&init_mm, pgd); | 135 | pgd_free(&init_mm, pgd); |
134 | 136 | ||
135 | if (ret) { | 137 | if (ret) { |
diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index fc650f64df43..9f444e5cc165 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c | |||
@@ -2,35 +2,60 @@ | |||
2 | #include <linux/sched.h> | 2 | #include <linux/sched.h> |
3 | #include <linux/stacktrace.h> | 3 | #include <linux/stacktrace.h> |
4 | 4 | ||
5 | #include "stacktrace.h" | 5 | #include <asm/stacktrace.h> |
6 | 6 | ||
7 | int walk_stackframe(unsigned long fp, unsigned long low, unsigned long high, | 7 | #if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) |
8 | int (*fn)(struct stackframe *, void *), void *data) | 8 | /* |
9 | * Unwind the current stack frame and store the new register values in the | ||
10 | * structure passed as argument. Unwinding is equivalent to a function return, | ||
11 | * hence the new PC value rather than LR should be used for backtrace. | ||
12 | * | ||
13 | * With framepointer enabled, a simple function prologue looks like this: | ||
14 | * mov ip, sp | ||
15 | * stmdb sp!, {fp, ip, lr, pc} | ||
16 | * sub fp, ip, #4 | ||
17 | * | ||
18 | * A simple function epilogue looks like this: | ||
19 | * ldm sp, {fp, sp, pc} | ||
20 | * | ||
21 | * Note that with framepointer enabled, even the leaf functions have the same | ||
22 | * prologue and epilogue, therefore we can ignore the LR value in this case. | ||
23 | */ | ||
24 | int unwind_frame(struct stackframe *frame) | ||
9 | { | 25 | { |
10 | struct stackframe *frame; | 26 | unsigned long high, low; |
11 | 27 | unsigned long fp = frame->fp; | |
12 | do { | ||
13 | /* | ||
14 | * Check current frame pointer is within bounds | ||
15 | */ | ||
16 | if (fp < (low + 12) || fp + 4 >= high) | ||
17 | break; | ||
18 | 28 | ||
19 | frame = (struct stackframe *)(fp - 12); | 29 | /* only go to a higher address on the stack */ |
30 | low = frame->sp; | ||
31 | high = ALIGN(low, THREAD_SIZE) + THREAD_SIZE; | ||
20 | 32 | ||
21 | if (fn(frame, data)) | 33 | /* check current frame pointer is within bounds */ |
22 | break; | 34 | if (fp < (low + 12) || fp + 4 >= high) |
35 | return -EINVAL; | ||
23 | 36 | ||
24 | /* | 37 | /* restore the registers from the stack frame */ |
25 | * Update the low bound - the next frame must always | 38 | frame->fp = *(unsigned long *)(fp - 12); |
26 | * be at a higher address than the current frame. | 39 | frame->sp = *(unsigned long *)(fp - 8); |
27 | */ | 40 | frame->pc = *(unsigned long *)(fp - 4); |
28 | low = fp + 4; | ||
29 | fp = frame->fp; | ||
30 | } while (fp); | ||
31 | 41 | ||
32 | return 0; | 42 | return 0; |
33 | } | 43 | } |
44 | #endif | ||
45 | |||
46 | void walk_stackframe(struct stackframe *frame, | ||
47 | int (*fn)(struct stackframe *, void *), void *data) | ||
48 | { | ||
49 | while (1) { | ||
50 | int ret; | ||
51 | |||
52 | if (fn(frame, data)) | ||
53 | break; | ||
54 | ret = unwind_frame(frame); | ||
55 | if (ret < 0) | ||
56 | break; | ||
57 | } | ||
58 | } | ||
34 | EXPORT_SYMBOL(walk_stackframe); | 59 | EXPORT_SYMBOL(walk_stackframe); |
35 | 60 | ||
36 | #ifdef CONFIG_STACKTRACE | 61 | #ifdef CONFIG_STACKTRACE |
@@ -44,7 +69,7 @@ static int save_trace(struct stackframe *frame, void *d) | |||
44 | { | 69 | { |
45 | struct stack_trace_data *data = d; | 70 | struct stack_trace_data *data = d; |
46 | struct stack_trace *trace = data->trace; | 71 | struct stack_trace *trace = data->trace; |
47 | unsigned long addr = frame->lr; | 72 | unsigned long addr = frame->pc; |
48 | 73 | ||
49 | if (data->no_sched_functions && in_sched_functions(addr)) | 74 | if (data->no_sched_functions && in_sched_functions(addr)) |
50 | return 0; | 75 | return 0; |
@@ -61,11 +86,10 @@ static int save_trace(struct stackframe *frame, void *d) | |||
61 | void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) | 86 | void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) |
62 | { | 87 | { |
63 | struct stack_trace_data data; | 88 | struct stack_trace_data data; |
64 | unsigned long fp, base; | 89 | struct stackframe frame; |
65 | 90 | ||
66 | data.trace = trace; | 91 | data.trace = trace; |
67 | data.skip = trace->skip; | 92 | data.skip = trace->skip; |
68 | base = (unsigned long)task_stack_page(tsk); | ||
69 | 93 | ||
70 | if (tsk != current) { | 94 | if (tsk != current) { |
71 | #ifdef CONFIG_SMP | 95 | #ifdef CONFIG_SMP |
@@ -76,14 +100,22 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) | |||
76 | BUG(); | 100 | BUG(); |
77 | #else | 101 | #else |
78 | data.no_sched_functions = 1; | 102 | data.no_sched_functions = 1; |
79 | fp = thread_saved_fp(tsk); | 103 | frame.fp = thread_saved_fp(tsk); |
104 | frame.sp = thread_saved_sp(tsk); | ||
105 | frame.lr = 0; /* recovered from the stack */ | ||
106 | frame.pc = thread_saved_pc(tsk); | ||
80 | #endif | 107 | #endif |
81 | } else { | 108 | } else { |
109 | register unsigned long current_sp asm ("sp"); | ||
110 | |||
82 | data.no_sched_functions = 0; | 111 | data.no_sched_functions = 0; |
83 | asm("mov %0, fp" : "=r" (fp)); | 112 | frame.fp = (unsigned long)__builtin_frame_address(0); |
113 | frame.sp = current_sp; | ||
114 | frame.lr = (unsigned long)__builtin_return_address(0); | ||
115 | frame.pc = (unsigned long)save_stack_trace_tsk; | ||
84 | } | 116 | } |
85 | 117 | ||
86 | walk_stackframe(fp, base, base + THREAD_SIZE, save_trace, &data); | 118 | walk_stackframe(&frame, save_trace, &data); |
87 | if (trace->nr_entries < trace->max_entries) | 119 | if (trace->nr_entries < trace->max_entries) |
88 | trace->entries[trace->nr_entries++] = ULONG_MAX; | 120 | trace->entries[trace->nr_entries++] = ULONG_MAX; |
89 | } | 121 | } |
diff --git a/arch/arm/kernel/stacktrace.h b/arch/arm/kernel/stacktrace.h deleted file mode 100644 index e9fd20cb5662..000000000000 --- a/arch/arm/kernel/stacktrace.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | struct stackframe { | ||
2 | unsigned long fp; | ||
3 | unsigned long sp; | ||
4 | unsigned long lr; | ||
5 | unsigned long pc; | ||
6 | }; | ||
7 | |||
8 | int walk_stackframe(unsigned long fp, unsigned long low, unsigned long high, | ||
9 | int (*fn)(struct stackframe *, void *), void *data); | ||
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index c68b44aa88d2..4cdc4a0bd02d 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
@@ -33,6 +33,7 @@ | |||
33 | 33 | ||
34 | #include <asm/leds.h> | 34 | #include <asm/leds.h> |
35 | #include <asm/thread_info.h> | 35 | #include <asm/thread_info.h> |
36 | #include <asm/stacktrace.h> | ||
36 | #include <asm/mach/time.h> | 37 | #include <asm/mach/time.h> |
37 | 38 | ||
38 | /* | 39 | /* |
@@ -55,14 +56,22 @@ EXPORT_SYMBOL(rtc_lock); | |||
55 | #ifdef CONFIG_SMP | 56 | #ifdef CONFIG_SMP |
56 | unsigned long profile_pc(struct pt_regs *regs) | 57 | unsigned long profile_pc(struct pt_regs *regs) |
57 | { | 58 | { |
58 | unsigned long fp, pc = instruction_pointer(regs); | 59 | struct stackframe frame; |
59 | 60 | ||
60 | if (in_lock_functions(pc)) { | 61 | if (!in_lock_functions(regs->ARM_pc)) |
61 | fp = regs->ARM_fp; | 62 | return regs->ARM_pc; |
62 | pc = ((unsigned long *)fp)[-1]; | 63 | |
63 | } | 64 | frame.fp = regs->ARM_fp; |
65 | frame.sp = regs->ARM_sp; | ||
66 | frame.lr = regs->ARM_lr; | ||
67 | frame.pc = regs->ARM_pc; | ||
68 | do { | ||
69 | int ret = unwind_frame(&frame); | ||
70 | if (ret < 0) | ||
71 | return 0; | ||
72 | } while (in_lock_functions(frame.pc)); | ||
64 | 73 | ||
65 | return pc; | 74 | return frame.pc; |
66 | } | 75 | } |
67 | EXPORT_SYMBOL(profile_pc); | 76 | EXPORT_SYMBOL(profile_pc); |
68 | #endif | 77 | #endif |
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 79abc4ddc0cf..57eb0f6f6005 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <asm/system.h> | 27 | #include <asm/system.h> |
28 | #include <asm/unistd.h> | 28 | #include <asm/unistd.h> |
29 | #include <asm/traps.h> | 29 | #include <asm/traps.h> |
30 | #include <asm/unwind.h> | ||
30 | 31 | ||
31 | #include "ptrace.h" | 32 | #include "ptrace.h" |
32 | #include "signal.h" | 33 | #include "signal.h" |
@@ -61,6 +62,7 @@ void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long | |||
61 | dump_mem("Exception stack", frame + 4, frame + 4 + sizeof(struct pt_regs)); | 62 | dump_mem("Exception stack", frame + 4, frame + 4 + sizeof(struct pt_regs)); |
62 | } | 63 | } |
63 | 64 | ||
65 | #ifndef CONFIG_ARM_UNWIND | ||
64 | /* | 66 | /* |
65 | * Stack pointers should always be within the kernels view of | 67 | * Stack pointers should always be within the kernels view of |
66 | * physical memory. If it is not there, then we can't dump | 68 | * physical memory. If it is not there, then we can't dump |
@@ -74,6 +76,7 @@ static int verify_stack(unsigned long sp) | |||
74 | 76 | ||
75 | return 0; | 77 | return 0; |
76 | } | 78 | } |
79 | #endif | ||
77 | 80 | ||
78 | /* | 81 | /* |
79 | * Dump out the contents of some memory nicely... | 82 | * Dump out the contents of some memory nicely... |
@@ -150,13 +153,33 @@ static void dump_instr(struct pt_regs *regs) | |||
150 | set_fs(fs); | 153 | set_fs(fs); |
151 | } | 154 | } |
152 | 155 | ||
156 | #ifdef CONFIG_ARM_UNWIND | ||
157 | static inline void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) | ||
158 | { | ||
159 | unwind_backtrace(regs, tsk); | ||
160 | } | ||
161 | #else | ||
153 | static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) | 162 | static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) |
154 | { | 163 | { |
155 | unsigned int fp; | 164 | unsigned int fp, mode; |
156 | int ok = 1; | 165 | int ok = 1; |
157 | 166 | ||
158 | printk("Backtrace: "); | 167 | printk("Backtrace: "); |
159 | fp = regs->ARM_fp; | 168 | |
169 | if (!tsk) | ||
170 | tsk = current; | ||
171 | |||
172 | if (regs) { | ||
173 | fp = regs->ARM_fp; | ||
174 | mode = processor_mode(regs); | ||
175 | } else if (tsk != current) { | ||
176 | fp = thread_saved_fp(tsk); | ||
177 | mode = 0x10; | ||
178 | } else { | ||
179 | asm("mov %0, fp" : "=r" (fp) : : "cc"); | ||
180 | mode = 0x10; | ||
181 | } | ||
182 | |||
160 | if (!fp) { | 183 | if (!fp) { |
161 | printk("no frame pointer"); | 184 | printk("no frame pointer"); |
162 | ok = 0; | 185 | ok = 0; |
@@ -168,29 +191,20 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) | |||
168 | printk("\n"); | 191 | printk("\n"); |
169 | 192 | ||
170 | if (ok) | 193 | if (ok) |
171 | c_backtrace(fp, processor_mode(regs)); | 194 | c_backtrace(fp, mode); |
172 | } | 195 | } |
196 | #endif | ||
173 | 197 | ||
174 | void dump_stack(void) | 198 | void dump_stack(void) |
175 | { | 199 | { |
176 | __backtrace(); | 200 | dump_backtrace(NULL, NULL); |
177 | } | 201 | } |
178 | 202 | ||
179 | EXPORT_SYMBOL(dump_stack); | 203 | EXPORT_SYMBOL(dump_stack); |
180 | 204 | ||
181 | void show_stack(struct task_struct *tsk, unsigned long *sp) | 205 | void show_stack(struct task_struct *tsk, unsigned long *sp) |
182 | { | 206 | { |
183 | unsigned long fp; | 207 | dump_backtrace(NULL, tsk); |
184 | |||
185 | if (!tsk) | ||
186 | tsk = current; | ||
187 | |||
188 | if (tsk != current) | ||
189 | fp = thread_saved_fp(tsk); | ||
190 | else | ||
191 | asm("mov %0, fp" : "=r" (fp) : : "cc"); | ||
192 | |||
193 | c_backtrace(fp, 0x10); | ||
194 | barrier(); | 208 | barrier(); |
195 | } | 209 | } |
196 | 210 | ||
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c new file mode 100644 index 000000000000..1dedc2c7ff49 --- /dev/null +++ b/arch/arm/kernel/unwind.c | |||
@@ -0,0 +1,434 @@ | |||
1 | /* | ||
2 | * arch/arm/kernel/unwind.c | ||
3 | * | ||
4 | * Copyright (C) 2008 ARM Limited | ||
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 | * 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 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
18 | * | ||
19 | * | ||
20 | * Stack unwinding support for ARM | ||
21 | * | ||
22 | * An ARM EABI version of gcc is required to generate the unwind | ||
23 | * tables. For information about the structure of the unwind tables, | ||
24 | * see "Exception Handling ABI for the ARM Architecture" at: | ||
25 | * | ||
26 | * http://infocenter.arm.com/help/topic/com.arm.doc.subset.swdev.abi/index.html | ||
27 | */ | ||
28 | |||
29 | #include <linux/kernel.h> | ||
30 | #include <linux/init.h> | ||
31 | #include <linux/module.h> | ||
32 | #include <linux/sched.h> | ||
33 | #include <linux/slab.h> | ||
34 | #include <linux/spinlock.h> | ||
35 | #include <linux/list.h> | ||
36 | |||
37 | #include <asm/stacktrace.h> | ||
38 | #include <asm/traps.h> | ||
39 | #include <asm/unwind.h> | ||
40 | |||
41 | /* Dummy functions to avoid linker complaints */ | ||
42 | void __aeabi_unwind_cpp_pr0(void) | ||
43 | { | ||
44 | }; | ||
45 | EXPORT_SYMBOL(__aeabi_unwind_cpp_pr0); | ||
46 | |||
47 | void __aeabi_unwind_cpp_pr1(void) | ||
48 | { | ||
49 | }; | ||
50 | EXPORT_SYMBOL(__aeabi_unwind_cpp_pr1); | ||
51 | |||
52 | void __aeabi_unwind_cpp_pr2(void) | ||
53 | { | ||
54 | }; | ||
55 | EXPORT_SYMBOL(__aeabi_unwind_cpp_pr2); | ||
56 | |||
57 | struct unwind_ctrl_block { | ||
58 | unsigned long vrs[16]; /* virtual register set */ | ||
59 | unsigned long *insn; /* pointer to the current instructions word */ | ||
60 | int entries; /* number of entries left to interpret */ | ||
61 | int byte; /* current byte number in the instructions word */ | ||
62 | }; | ||
63 | |||
64 | enum regs { | ||
65 | FP = 11, | ||
66 | SP = 13, | ||
67 | LR = 14, | ||
68 | PC = 15 | ||
69 | }; | ||
70 | |||
71 | extern struct unwind_idx __start_unwind_idx[]; | ||
72 | extern struct unwind_idx __stop_unwind_idx[]; | ||
73 | |||
74 | static DEFINE_SPINLOCK(unwind_lock); | ||
75 | static LIST_HEAD(unwind_tables); | ||
76 | |||
77 | /* Convert a prel31 symbol to an absolute address */ | ||
78 | #define prel31_to_addr(ptr) \ | ||
79 | ({ \ | ||
80 | /* sign-extend to 32 bits */ \ | ||
81 | long offset = (((long)*(ptr)) << 1) >> 1; \ | ||
82 | (unsigned long)(ptr) + offset; \ | ||
83 | }) | ||
84 | |||
85 | /* | ||
86 | * Binary search in the unwind index. The entries entries are | ||
87 | * guaranteed to be sorted in ascending order by the linker. | ||
88 | */ | ||
89 | static struct unwind_idx *search_index(unsigned long addr, | ||
90 | struct unwind_idx *first, | ||
91 | struct unwind_idx *last) | ||
92 | { | ||
93 | pr_debug("%s(%08lx, %p, %p)\n", __func__, addr, first, last); | ||
94 | |||
95 | if (addr < first->addr) { | ||
96 | pr_warning("unwind: Unknown symbol address %08lx\n", addr); | ||
97 | return NULL; | ||
98 | } else if (addr >= last->addr) | ||
99 | return last; | ||
100 | |||
101 | while (first < last - 1) { | ||
102 | struct unwind_idx *mid = first + ((last - first + 1) >> 1); | ||
103 | |||
104 | if (addr < mid->addr) | ||
105 | last = mid; | ||
106 | else | ||
107 | first = mid; | ||
108 | } | ||
109 | |||
110 | return first; | ||
111 | } | ||
112 | |||
113 | static struct unwind_idx *unwind_find_idx(unsigned long addr) | ||
114 | { | ||
115 | struct unwind_idx *idx = NULL; | ||
116 | unsigned long flags; | ||
117 | |||
118 | pr_debug("%s(%08lx)\n", __func__, addr); | ||
119 | |||
120 | if (core_kernel_text(addr)) | ||
121 | /* main unwind table */ | ||
122 | idx = search_index(addr, __start_unwind_idx, | ||
123 | __stop_unwind_idx - 1); | ||
124 | else { | ||
125 | /* module unwind tables */ | ||
126 | struct unwind_table *table; | ||
127 | |||
128 | spin_lock_irqsave(&unwind_lock, flags); | ||
129 | list_for_each_entry(table, &unwind_tables, list) { | ||
130 | if (addr >= table->begin_addr && | ||
131 | addr < table->end_addr) { | ||
132 | idx = search_index(addr, table->start, | ||
133 | table->stop - 1); | ||
134 | break; | ||
135 | } | ||
136 | } | ||
137 | spin_unlock_irqrestore(&unwind_lock, flags); | ||
138 | } | ||
139 | |||
140 | pr_debug("%s: idx = %p\n", __func__, idx); | ||
141 | return idx; | ||
142 | } | ||
143 | |||
144 | static unsigned long unwind_get_byte(struct unwind_ctrl_block *ctrl) | ||
145 | { | ||
146 | unsigned long ret; | ||
147 | |||
148 | if (ctrl->entries <= 0) { | ||
149 | pr_warning("unwind: Corrupt unwind table\n"); | ||
150 | return 0; | ||
151 | } | ||
152 | |||
153 | ret = (*ctrl->insn >> (ctrl->byte * 8)) & 0xff; | ||
154 | |||
155 | if (ctrl->byte == 0) { | ||
156 | ctrl->insn++; | ||
157 | ctrl->entries--; | ||
158 | ctrl->byte = 3; | ||
159 | } else | ||
160 | ctrl->byte--; | ||
161 | |||
162 | return ret; | ||
163 | } | ||
164 | |||
165 | /* | ||
166 | * Execute the current unwind instruction. | ||
167 | */ | ||
168 | static int unwind_exec_insn(struct unwind_ctrl_block *ctrl) | ||
169 | { | ||
170 | unsigned long insn = unwind_get_byte(ctrl); | ||
171 | |||
172 | pr_debug("%s: insn = %08lx\n", __func__, insn); | ||
173 | |||
174 | if ((insn & 0xc0) == 0x00) | ||
175 | ctrl->vrs[SP] += ((insn & 0x3f) << 2) + 4; | ||
176 | else if ((insn & 0xc0) == 0x40) | ||
177 | ctrl->vrs[SP] -= ((insn & 0x3f) << 2) + 4; | ||
178 | else if ((insn & 0xf0) == 0x80) { | ||
179 | unsigned long mask; | ||
180 | unsigned long *vsp = (unsigned long *)ctrl->vrs[SP]; | ||
181 | int load_sp, reg = 4; | ||
182 | |||
183 | insn = (insn << 8) | unwind_get_byte(ctrl); | ||
184 | mask = insn & 0x0fff; | ||
185 | if (mask == 0) { | ||
186 | pr_warning("unwind: 'Refuse to unwind' instruction %04lx\n", | ||
187 | insn); | ||
188 | return -URC_FAILURE; | ||
189 | } | ||
190 | |||
191 | /* pop R4-R15 according to mask */ | ||
192 | load_sp = mask & (1 << (13 - 4)); | ||
193 | while (mask) { | ||
194 | if (mask & 1) | ||
195 | ctrl->vrs[reg] = *vsp++; | ||
196 | mask >>= 1; | ||
197 | reg++; | ||
198 | } | ||
199 | if (!load_sp) | ||
200 | ctrl->vrs[SP] = (unsigned long)vsp; | ||
201 | } else if ((insn & 0xf0) == 0x90 && | ||
202 | (insn & 0x0d) != 0x0d) | ||
203 | ctrl->vrs[SP] = ctrl->vrs[insn & 0x0f]; | ||
204 | else if ((insn & 0xf0) == 0xa0) { | ||
205 | unsigned long *vsp = (unsigned long *)ctrl->vrs[SP]; | ||
206 | int reg; | ||
207 | |||
208 | /* pop R4-R[4+bbb] */ | ||
209 | for (reg = 4; reg <= 4 + (insn & 7); reg++) | ||
210 | ctrl->vrs[reg] = *vsp++; | ||
211 | if (insn & 0x80) | ||
212 | ctrl->vrs[14] = *vsp++; | ||
213 | ctrl->vrs[SP] = (unsigned long)vsp; | ||
214 | } else if (insn == 0xb0) { | ||
215 | ctrl->vrs[PC] = ctrl->vrs[LR]; | ||
216 | /* no further processing */ | ||
217 | ctrl->entries = 0; | ||
218 | } else if (insn == 0xb1) { | ||
219 | unsigned long mask = unwind_get_byte(ctrl); | ||
220 | unsigned long *vsp = (unsigned long *)ctrl->vrs[SP]; | ||
221 | int reg = 0; | ||
222 | |||
223 | if (mask == 0 || mask & 0xf0) { | ||
224 | pr_warning("unwind: Spare encoding %04lx\n", | ||
225 | (insn << 8) | mask); | ||
226 | return -URC_FAILURE; | ||
227 | } | ||
228 | |||
229 | /* pop R0-R3 according to mask */ | ||
230 | while (mask) { | ||
231 | if (mask & 1) | ||
232 | ctrl->vrs[reg] = *vsp++; | ||
233 | mask >>= 1; | ||
234 | reg++; | ||
235 | } | ||
236 | ctrl->vrs[SP] = (unsigned long)vsp; | ||
237 | } else if (insn == 0xb2) { | ||
238 | unsigned long uleb128 = unwind_get_byte(ctrl); | ||
239 | |||
240 | ctrl->vrs[SP] += 0x204 + (uleb128 << 2); | ||
241 | } else { | ||
242 | pr_warning("unwind: Unhandled instruction %02lx\n", insn); | ||
243 | return -URC_FAILURE; | ||
244 | } | ||
245 | |||
246 | pr_debug("%s: fp = %08lx sp = %08lx lr = %08lx pc = %08lx\n", __func__, | ||
247 | ctrl->vrs[FP], ctrl->vrs[SP], ctrl->vrs[LR], ctrl->vrs[PC]); | ||
248 | |||
249 | return URC_OK; | ||
250 | } | ||
251 | |||
252 | /* | ||
253 | * Unwind a single frame starting with *sp for the symbol at *pc. It | ||
254 | * updates the *pc and *sp with the new values. | ||
255 | */ | ||
256 | int unwind_frame(struct stackframe *frame) | ||
257 | { | ||
258 | unsigned long high, low; | ||
259 | struct unwind_idx *idx; | ||
260 | struct unwind_ctrl_block ctrl; | ||
261 | |||
262 | /* only go to a higher address on the stack */ | ||
263 | low = frame->sp; | ||
264 | high = ALIGN(low, THREAD_SIZE) + THREAD_SIZE; | ||
265 | |||
266 | pr_debug("%s(pc = %08lx lr = %08lx sp = %08lx)\n", __func__, | ||
267 | frame->pc, frame->lr, frame->sp); | ||
268 | |||
269 | if (!kernel_text_address(frame->pc)) | ||
270 | return -URC_FAILURE; | ||
271 | |||
272 | idx = unwind_find_idx(frame->pc); | ||
273 | if (!idx) { | ||
274 | pr_warning("unwind: Index not found %08lx\n", frame->pc); | ||
275 | return -URC_FAILURE; | ||
276 | } | ||
277 | |||
278 | ctrl.vrs[FP] = frame->fp; | ||
279 | ctrl.vrs[SP] = frame->sp; | ||
280 | ctrl.vrs[LR] = frame->lr; | ||
281 | ctrl.vrs[PC] = 0; | ||
282 | |||
283 | if (idx->insn == 1) | ||
284 | /* can't unwind */ | ||
285 | return -URC_FAILURE; | ||
286 | else if ((idx->insn & 0x80000000) == 0) | ||
287 | /* prel31 to the unwind table */ | ||
288 | ctrl.insn = (unsigned long *)prel31_to_addr(&idx->insn); | ||
289 | else if ((idx->insn & 0xff000000) == 0x80000000) | ||
290 | /* only personality routine 0 supported in the index */ | ||
291 | ctrl.insn = &idx->insn; | ||
292 | else { | ||
293 | pr_warning("unwind: Unsupported personality routine %08lx in the index at %p\n", | ||
294 | idx->insn, idx); | ||
295 | return -URC_FAILURE; | ||
296 | } | ||
297 | |||
298 | /* check the personality routine */ | ||
299 | if ((*ctrl.insn & 0xff000000) == 0x80000000) { | ||
300 | ctrl.byte = 2; | ||
301 | ctrl.entries = 1; | ||
302 | } else if ((*ctrl.insn & 0xff000000) == 0x81000000) { | ||
303 | ctrl.byte = 1; | ||
304 | ctrl.entries = 1 + ((*ctrl.insn & 0x00ff0000) >> 16); | ||
305 | } else { | ||
306 | pr_warning("unwind: Unsupported personality routine %08lx at %p\n", | ||
307 | *ctrl.insn, ctrl.insn); | ||
308 | return -URC_FAILURE; | ||
309 | } | ||
310 | |||
311 | while (ctrl.entries > 0) { | ||
312 | int urc; | ||
313 | |||
314 | if (ctrl.vrs[SP] < low || ctrl.vrs[SP] >= high) | ||
315 | return -URC_FAILURE; | ||
316 | urc = unwind_exec_insn(&ctrl); | ||
317 | if (urc < 0) | ||
318 | return urc; | ||
319 | } | ||
320 | |||
321 | if (ctrl.vrs[PC] == 0) | ||
322 | ctrl.vrs[PC] = ctrl.vrs[LR]; | ||
323 | |||
324 | frame->fp = ctrl.vrs[FP]; | ||
325 | frame->sp = ctrl.vrs[SP]; | ||
326 | frame->lr = ctrl.vrs[LR]; | ||
327 | frame->pc = ctrl.vrs[PC]; | ||
328 | |||
329 | return URC_OK; | ||
330 | } | ||
331 | |||
332 | void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk) | ||
333 | { | ||
334 | struct stackframe frame; | ||
335 | unsigned long high, low; | ||
336 | register unsigned long current_sp asm ("sp"); | ||
337 | |||
338 | pr_debug("%s(regs = %p tsk = %p)\n", __func__, regs, tsk); | ||
339 | |||
340 | if (!tsk) | ||
341 | tsk = current; | ||
342 | |||
343 | if (regs) { | ||
344 | frame.fp = regs->ARM_fp; | ||
345 | frame.sp = regs->ARM_sp; | ||
346 | frame.lr = regs->ARM_lr; | ||
347 | frame.pc = regs->ARM_pc; | ||
348 | } else if (tsk == current) { | ||
349 | frame.fp = (unsigned long)__builtin_frame_address(0); | ||
350 | frame.sp = current_sp; | ||
351 | frame.lr = (unsigned long)__builtin_return_address(0); | ||
352 | frame.pc = (unsigned long)unwind_backtrace; | ||
353 | } else { | ||
354 | /* task blocked in __switch_to */ | ||
355 | frame.fp = thread_saved_fp(tsk); | ||
356 | frame.sp = thread_saved_sp(tsk); | ||
357 | /* | ||
358 | * The function calling __switch_to cannot be a leaf function | ||
359 | * so LR is recovered from the stack. | ||
360 | */ | ||
361 | frame.lr = 0; | ||
362 | frame.pc = thread_saved_pc(tsk); | ||
363 | } | ||
364 | |||
365 | low = frame.sp & ~(THREAD_SIZE - 1); | ||
366 | high = low + THREAD_SIZE; | ||
367 | |||
368 | while (1) { | ||
369 | int urc; | ||
370 | unsigned long where = frame.pc; | ||
371 | |||
372 | urc = unwind_frame(&frame); | ||
373 | if (urc < 0) | ||
374 | break; | ||
375 | dump_backtrace_entry(where, frame.pc, frame.sp - 4); | ||
376 | } | ||
377 | } | ||
378 | |||
379 | struct unwind_table *unwind_table_add(unsigned long start, unsigned long size, | ||
380 | unsigned long text_addr, | ||
381 | unsigned long text_size) | ||
382 | { | ||
383 | unsigned long flags; | ||
384 | struct unwind_idx *idx; | ||
385 | struct unwind_table *tab = kmalloc(sizeof(*tab), GFP_KERNEL); | ||
386 | |||
387 | pr_debug("%s(%08lx, %08lx, %08lx, %08lx)\n", __func__, start, size, | ||
388 | text_addr, text_size); | ||
389 | |||
390 | if (!tab) | ||
391 | return tab; | ||
392 | |||
393 | tab->start = (struct unwind_idx *)start; | ||
394 | tab->stop = (struct unwind_idx *)(start + size); | ||
395 | tab->begin_addr = text_addr; | ||
396 | tab->end_addr = text_addr + text_size; | ||
397 | |||
398 | /* Convert the symbol addresses to absolute values */ | ||
399 | for (idx = tab->start; idx < tab->stop; idx++) | ||
400 | idx->addr = prel31_to_addr(&idx->addr); | ||
401 | |||
402 | spin_lock_irqsave(&unwind_lock, flags); | ||
403 | list_add_tail(&tab->list, &unwind_tables); | ||
404 | spin_unlock_irqrestore(&unwind_lock, flags); | ||
405 | |||
406 | return tab; | ||
407 | } | ||
408 | |||
409 | void unwind_table_del(struct unwind_table *tab) | ||
410 | { | ||
411 | unsigned long flags; | ||
412 | |||
413 | if (!tab) | ||
414 | return; | ||
415 | |||
416 | spin_lock_irqsave(&unwind_lock, flags); | ||
417 | list_del(&tab->list); | ||
418 | spin_unlock_irqrestore(&unwind_lock, flags); | ||
419 | |||
420 | kfree(tab); | ||
421 | } | ||
422 | |||
423 | int __init unwind_init(void) | ||
424 | { | ||
425 | struct unwind_idx *idx; | ||
426 | |||
427 | /* Convert the symbol addresses to absolute values */ | ||
428 | for (idx = __start_unwind_idx; idx < __stop_unwind_idx; idx++) | ||
429 | idx->addr = prel31_to_addr(&idx->addr); | ||
430 | |||
431 | pr_debug("unwind: ARM stack unwinding initialised\n"); | ||
432 | |||
433 | return 0; | ||
434 | } | ||
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 00216071eaf7..5f664599c945 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
@@ -80,6 +80,8 @@ SECTIONS | |||
80 | EXIT_TEXT | 80 | EXIT_TEXT |
81 | EXIT_DATA | 81 | EXIT_DATA |
82 | *(.exitcall.exit) | 82 | *(.exitcall.exit) |
83 | *(.ARM.exidx.exit.text) | ||
84 | *(.ARM.extab.exit.text) | ||
83 | #ifndef CONFIG_MMU | 85 | #ifndef CONFIG_MMU |
84 | *(.fixup) | 86 | *(.fixup) |
85 | *(__ex_table) | 87 | *(__ex_table) |
@@ -110,6 +112,23 @@ SECTIONS | |||
110 | 112 | ||
111 | _etext = .; /* End of text and rodata section */ | 113 | _etext = .; /* End of text and rodata section */ |
112 | 114 | ||
115 | #ifdef CONFIG_ARM_UNWIND | ||
116 | /* | ||
117 | * Stack unwinding tables | ||
118 | */ | ||
119 | . = ALIGN(8); | ||
120 | .ARM.unwind_idx : { | ||
121 | __start_unwind_idx = .; | ||
122 | *(.ARM.exidx*) | ||
123 | __stop_unwind_idx = .; | ||
124 | } | ||
125 | .ARM.unwind_tab : { | ||
126 | __start_unwind_tab = .; | ||
127 | *(.ARM.extab*) | ||
128 | __stop_unwind_tab = .; | ||
129 | } | ||
130 | #endif | ||
131 | |||
113 | #ifdef CONFIG_XIP_KERNEL | 132 | #ifdef CONFIG_XIP_KERNEL |
114 | __data_loc = ALIGN(4); /* location in binary */ | 133 | __data_loc = ALIGN(4); /* location in binary */ |
115 | . = PAGE_OFFSET + TEXT_OFFSET; | 134 | . = PAGE_OFFSET + TEXT_OFFSET; |
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index 81439fe6fb3d..438efbb17482 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
@@ -238,6 +238,10 @@ static void __init ek_board_init(void) | |||
238 | at91_add_device_i2c(NULL, 0); | 238 | at91_add_device_i2c(NULL, 0); |
239 | /* LEDs */ | 239 | /* LEDs */ |
240 | at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); | 240 | at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); |
241 | /* PCK0 provides MCLK to the WM8731 */ | ||
242 | at91_set_B_periph(AT91_PIN_PC1, 0); | ||
243 | /* SSC (for WM8731) */ | ||
244 | at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX); | ||
241 | } | 245 | } |
242 | 246 | ||
243 | MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") | 247 | MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") |
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 7b9ce7a336b0..b5daf7f5e011 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h | |||
@@ -47,9 +47,6 @@ extern void at91_irq_resume(void); | |||
47 | #define AT91RM9200_BGA 4 /* AT91RM9200 BGA package has 4 banks */ | 47 | #define AT91RM9200_BGA 4 /* AT91RM9200 BGA package has 4 banks */ |
48 | 48 | ||
49 | struct at91_gpio_bank { | 49 | struct at91_gpio_bank { |
50 | unsigned chipbase; /* bank's first GPIO number */ | ||
51 | void __iomem *regbase; /* base of register bank */ | ||
52 | struct at91_gpio_bank *next; /* bank sharing same IRQ/clock/... */ | ||
53 | unsigned short id; /* peripheral ID */ | 50 | unsigned short id; /* peripheral ID */ |
54 | unsigned long offset; /* offset from system peripheral base */ | 51 | unsigned long offset; /* offset from system peripheral base */ |
55 | struct clk *clock; /* associated clock */ | 52 | struct clk *clock; /* associated clock */ |
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c index 2f7d4977dce9..f2236f0e101f 100644 --- a/arch/arm/mach-at91/gpio.c +++ b/arch/arm/mach-at91/gpio.c | |||
@@ -24,19 +24,59 @@ | |||
24 | #include <mach/at91_pio.h> | 24 | #include <mach/at91_pio.h> |
25 | #include <mach/gpio.h> | 25 | #include <mach/gpio.h> |
26 | 26 | ||
27 | #include <asm/gpio.h> | ||
28 | |||
27 | #include "generic.h" | 29 | #include "generic.h" |
28 | 30 | ||
31 | struct at91_gpio_chip { | ||
32 | struct gpio_chip chip; | ||
33 | struct at91_gpio_chip *next; /* Bank sharing same clock */ | ||
34 | struct at91_gpio_bank *bank; /* Bank definition */ | ||
35 | void __iomem *regbase; /* Base of register bank */ | ||
36 | }; | ||
29 | 37 | ||
30 | static struct at91_gpio_bank *gpio; | 38 | #define to_at91_gpio_chip(c) container_of(c, struct at91_gpio_chip, chip) |
31 | static int gpio_banks; | 39 | |
40 | static void at91_gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip); | ||
41 | static void at91_gpiolib_set(struct gpio_chip *chip, unsigned offset, int val); | ||
42 | static int at91_gpiolib_get(struct gpio_chip *chip, unsigned offset); | ||
43 | static int at91_gpiolib_direction_output(struct gpio_chip *chip, | ||
44 | unsigned offset, int val); | ||
45 | static int at91_gpiolib_direction_input(struct gpio_chip *chip, | ||
46 | unsigned offset); | ||
47 | static int at91_gpiolib_request(struct gpio_chip *chip, unsigned offset); | ||
48 | |||
49 | #define AT91_GPIO_CHIP(name, base_gpio, nr_gpio) \ | ||
50 | { \ | ||
51 | .chip = { \ | ||
52 | .label = name, \ | ||
53 | .request = at91_gpiolib_request, \ | ||
54 | .direction_input = at91_gpiolib_direction_input, \ | ||
55 | .direction_output = at91_gpiolib_direction_output, \ | ||
56 | .get = at91_gpiolib_get, \ | ||
57 | .set = at91_gpiolib_set, \ | ||
58 | .dbg_show = at91_gpiolib_dbg_show, \ | ||
59 | .base = base_gpio, \ | ||
60 | .ngpio = nr_gpio, \ | ||
61 | }, \ | ||
62 | } | ||
63 | |||
64 | static struct at91_gpio_chip gpio_chip[] = { | ||
65 | AT91_GPIO_CHIP("A", 0x00 + PIN_BASE, 32), | ||
66 | AT91_GPIO_CHIP("B", 0x20 + PIN_BASE, 32), | ||
67 | AT91_GPIO_CHIP("C", 0x40 + PIN_BASE, 32), | ||
68 | AT91_GPIO_CHIP("D", 0x60 + PIN_BASE, 32), | ||
69 | AT91_GPIO_CHIP("E", 0x80 + PIN_BASE, 32), | ||
70 | }; | ||
32 | 71 | ||
72 | static int gpio_banks; | ||
33 | 73 | ||
34 | static inline void __iomem *pin_to_controller(unsigned pin) | 74 | static inline void __iomem *pin_to_controller(unsigned pin) |
35 | { | 75 | { |
36 | pin -= PIN_BASE; | 76 | pin -= PIN_BASE; |
37 | pin /= 32; | 77 | pin /= 32; |
38 | if (likely(pin < gpio_banks)) | 78 | if (likely(pin < gpio_banks)) |
39 | return gpio[pin].regbase; | 79 | return gpio_chip[pin].regbase; |
40 | 80 | ||
41 | return NULL; | 81 | return NULL; |
42 | } | 82 | } |
@@ -197,39 +237,6 @@ int __init_or_module at91_set_multi_drive(unsigned pin, int is_on) | |||
197 | } | 237 | } |
198 | EXPORT_SYMBOL(at91_set_multi_drive); | 238 | EXPORT_SYMBOL(at91_set_multi_drive); |
199 | 239 | ||
200 | /*--------------------------------------------------------------------------*/ | ||
201 | |||
202 | /* new-style GPIO calls; these expect at91_set_GPIO_periph to have been | ||
203 | * called, and maybe at91_set_multi_drive() for putout pins. | ||
204 | */ | ||
205 | |||
206 | int gpio_direction_input(unsigned pin) | ||
207 | { | ||
208 | void __iomem *pio = pin_to_controller(pin); | ||
209 | unsigned mask = pin_to_mask(pin); | ||
210 | |||
211 | if (!pio || !(__raw_readl(pio + PIO_PSR) & mask)) | ||
212 | return -EINVAL; | ||
213 | __raw_writel(mask, pio + PIO_ODR); | ||
214 | return 0; | ||
215 | } | ||
216 | EXPORT_SYMBOL(gpio_direction_input); | ||
217 | |||
218 | int gpio_direction_output(unsigned pin, int value) | ||
219 | { | ||
220 | void __iomem *pio = pin_to_controller(pin); | ||
221 | unsigned mask = pin_to_mask(pin); | ||
222 | |||
223 | if (!pio || !(__raw_readl(pio + PIO_PSR) & mask)) | ||
224 | return -EINVAL; | ||
225 | __raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR)); | ||
226 | __raw_writel(mask, pio + PIO_OER); | ||
227 | return 0; | ||
228 | } | ||
229 | EXPORT_SYMBOL(gpio_direction_output); | ||
230 | |||
231 | /*--------------------------------------------------------------------------*/ | ||
232 | |||
233 | /* | 240 | /* |
234 | * assuming the pin is muxed as a gpio output, set its value. | 241 | * assuming the pin is muxed as a gpio output, set its value. |
235 | */ | 242 | */ |
@@ -282,7 +289,7 @@ static int gpio_irq_set_wake(unsigned pin, unsigned state) | |||
282 | else | 289 | else |
283 | wakeups[bank] &= ~mask; | 290 | wakeups[bank] &= ~mask; |
284 | 291 | ||
285 | set_irq_wake(gpio[bank].id, state); | 292 | set_irq_wake(gpio_chip[bank].bank->id, state); |
286 | 293 | ||
287 | return 0; | 294 | return 0; |
288 | } | 295 | } |
@@ -292,14 +299,14 @@ void at91_gpio_suspend(void) | |||
292 | int i; | 299 | int i; |
293 | 300 | ||
294 | for (i = 0; i < gpio_banks; i++) { | 301 | for (i = 0; i < gpio_banks; i++) { |
295 | void __iomem *pio = gpio[i].regbase; | 302 | void __iomem *pio = gpio_chip[i].regbase; |
296 | 303 | ||
297 | backups[i] = __raw_readl(pio + PIO_IMR); | 304 | backups[i] = __raw_readl(pio + PIO_IMR); |
298 | __raw_writel(backups[i], pio + PIO_IDR); | 305 | __raw_writel(backups[i], pio + PIO_IDR); |
299 | __raw_writel(wakeups[i], pio + PIO_IER); | 306 | __raw_writel(wakeups[i], pio + PIO_IER); |
300 | 307 | ||
301 | if (!wakeups[i]) | 308 | if (!wakeups[i]) |
302 | clk_disable(gpio[i].clock); | 309 | clk_disable(gpio_chip[i].bank->clock); |
303 | else { | 310 | else { |
304 | #ifdef CONFIG_PM_DEBUG | 311 | #ifdef CONFIG_PM_DEBUG |
305 | printk(KERN_DEBUG "GPIO-%c may wake for %08x\n", 'A'+i, wakeups[i]); | 312 | printk(KERN_DEBUG "GPIO-%c may wake for %08x\n", 'A'+i, wakeups[i]); |
@@ -313,10 +320,10 @@ void at91_gpio_resume(void) | |||
313 | int i; | 320 | int i; |
314 | 321 | ||
315 | for (i = 0; i < gpio_banks; i++) { | 322 | for (i = 0; i < gpio_banks; i++) { |
316 | void __iomem *pio = gpio[i].regbase; | 323 | void __iomem *pio = gpio_chip[i].regbase; |
317 | 324 | ||
318 | if (!wakeups[i]) | 325 | if (!wakeups[i]) |
319 | clk_enable(gpio[i].clock); | 326 | clk_enable(gpio_chip[i].bank->clock); |
320 | 327 | ||
321 | __raw_writel(wakeups[i], pio + PIO_IDR); | 328 | __raw_writel(wakeups[i], pio + PIO_IDR); |
322 | __raw_writel(backups[i], pio + PIO_IER); | 329 | __raw_writel(backups[i], pio + PIO_IER); |
@@ -380,12 +387,12 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) | |||
380 | { | 387 | { |
381 | unsigned pin; | 388 | unsigned pin; |
382 | struct irq_desc *gpio; | 389 | struct irq_desc *gpio; |
383 | struct at91_gpio_bank *bank; | 390 | struct at91_gpio_chip *at91_gpio; |
384 | void __iomem *pio; | 391 | void __iomem *pio; |
385 | u32 isr; | 392 | u32 isr; |
386 | 393 | ||
387 | bank = get_irq_chip_data(irq); | 394 | at91_gpio = get_irq_chip_data(irq); |
388 | pio = bank->regbase; | 395 | pio = at91_gpio->regbase; |
389 | 396 | ||
390 | /* temporarily mask (level sensitive) parent IRQ */ | 397 | /* temporarily mask (level sensitive) parent IRQ */ |
391 | desc->chip->ack(irq); | 398 | desc->chip->ack(irq); |
@@ -396,14 +403,14 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) | |||
396 | */ | 403 | */ |
397 | isr = __raw_readl(pio + PIO_ISR) & __raw_readl(pio + PIO_IMR); | 404 | isr = __raw_readl(pio + PIO_ISR) & __raw_readl(pio + PIO_IMR); |
398 | if (!isr) { | 405 | if (!isr) { |
399 | if (!bank->next) | 406 | if (!at91_gpio->next) |
400 | break; | 407 | break; |
401 | bank = bank->next; | 408 | at91_gpio = at91_gpio->next; |
402 | pio = bank->regbase; | 409 | pio = at91_gpio->regbase; |
403 | continue; | 410 | continue; |
404 | } | 411 | } |
405 | 412 | ||
406 | pin = bank->chipbase; | 413 | pin = at91_gpio->chip.base; |
407 | gpio = &irq_desc[pin]; | 414 | gpio = &irq_desc[pin]; |
408 | 415 | ||
409 | while (isr) { | 416 | while (isr) { |
@@ -502,17 +509,17 @@ static struct lock_class_key gpio_lock_class; | |||
502 | void __init at91_gpio_irq_setup(void) | 509 | void __init at91_gpio_irq_setup(void) |
503 | { | 510 | { |
504 | unsigned pioc, pin; | 511 | unsigned pioc, pin; |
505 | struct at91_gpio_bank *this, *prev; | 512 | struct at91_gpio_chip *this, *prev; |
506 | 513 | ||
507 | for (pioc = 0, pin = PIN_BASE, this = gpio, prev = NULL; | 514 | for (pioc = 0, pin = PIN_BASE, this = gpio_chip, prev = NULL; |
508 | pioc++ < gpio_banks; | 515 | pioc++ < gpio_banks; |
509 | prev = this, this++) { | 516 | prev = this, this++) { |
510 | unsigned id = this->id; | 517 | unsigned id = this->bank->id; |
511 | unsigned i; | 518 | unsigned i; |
512 | 519 | ||
513 | __raw_writel(~0, this->regbase + PIO_IDR); | 520 | __raw_writel(~0, this->regbase + PIO_IDR); |
514 | 521 | ||
515 | for (i = 0, pin = this->chipbase; i < 32; i++, pin++) { | 522 | for (i = 0, pin = this->chip.base; i < 32; i++, pin++) { |
516 | lockdep_set_class(&irq_desc[pin].lock, &gpio_lock_class); | 523 | lockdep_set_class(&irq_desc[pin].lock, &gpio_lock_class); |
517 | 524 | ||
518 | /* | 525 | /* |
@@ -537,32 +544,117 @@ void __init at91_gpio_irq_setup(void) | |||
537 | pr_info("AT91: %d gpio irqs in %d banks\n", pin - PIN_BASE, gpio_banks); | 544 | pr_info("AT91: %d gpio irqs in %d banks\n", pin - PIN_BASE, gpio_banks); |
538 | } | 545 | } |
539 | 546 | ||
547 | /* gpiolib support */ | ||
548 | static int at91_gpiolib_direction_input(struct gpio_chip *chip, | ||
549 | unsigned offset) | ||
550 | { | ||
551 | struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip); | ||
552 | void __iomem *pio = at91_gpio->regbase; | ||
553 | unsigned mask = 1 << offset; | ||
554 | |||
555 | __raw_writel(mask, pio + PIO_ODR); | ||
556 | return 0; | ||
557 | } | ||
558 | |||
559 | static int at91_gpiolib_direction_output(struct gpio_chip *chip, | ||
560 | unsigned offset, int val) | ||
561 | { | ||
562 | struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip); | ||
563 | void __iomem *pio = at91_gpio->regbase; | ||
564 | unsigned mask = 1 << offset; | ||
565 | |||
566 | __raw_writel(mask, pio + (val ? PIO_SODR : PIO_CODR)); | ||
567 | __raw_writel(mask, pio + PIO_OER); | ||
568 | return 0; | ||
569 | } | ||
570 | |||
571 | static int at91_gpiolib_get(struct gpio_chip *chip, unsigned offset) | ||
572 | { | ||
573 | struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip); | ||
574 | void __iomem *pio = at91_gpio->regbase; | ||
575 | unsigned mask = 1 << offset; | ||
576 | u32 pdsr; | ||
577 | |||
578 | pdsr = __raw_readl(pio + PIO_PDSR); | ||
579 | return (pdsr & mask) != 0; | ||
580 | } | ||
581 | |||
582 | static void at91_gpiolib_set(struct gpio_chip *chip, unsigned offset, int val) | ||
583 | { | ||
584 | struct at91_gpio_chip *at91_gpio = to_at91_gpio_chip(chip); | ||
585 | void __iomem *pio = at91_gpio->regbase; | ||
586 | unsigned mask = 1 << offset; | ||
587 | |||
588 | __raw_writel(mask, pio + (val ? PIO_SODR : PIO_CODR)); | ||
589 | } | ||
590 | |||
591 | static int at91_gpiolib_request(struct gpio_chip *chip, unsigned offset) | ||
592 | { | ||
593 | unsigned pin = chip->base + offset; | ||
594 | void __iomem *pio = pin_to_controller(pin); | ||
595 | unsigned mask = pin_to_mask(pin); | ||
596 | |||
597 | /* Cannot request GPIOs that are in alternate function mode */ | ||
598 | if (!(__raw_readl(pio + PIO_PSR) & mask)) | ||
599 | return -EPERM; | ||
600 | |||
601 | return 0; | ||
602 | } | ||
603 | |||
604 | static void at91_gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip) | ||
605 | { | ||
606 | int i; | ||
607 | |||
608 | for (i = 0; i < chip->ngpio; i++) { | ||
609 | unsigned pin = chip->base + i; | ||
610 | void __iomem *pio = pin_to_controller(pin); | ||
611 | unsigned mask = pin_to_mask(pin); | ||
612 | const char *gpio_label; | ||
613 | |||
614 | gpio_label = gpiochip_is_requested(chip, i); | ||
615 | if (gpio_label) { | ||
616 | seq_printf(s, "[%s] GPIO%s%d: ", | ||
617 | gpio_label, chip->label, i); | ||
618 | if (__raw_readl(pio + PIO_PSR) & mask) | ||
619 | seq_printf(s, "[gpio] %s\n", | ||
620 | at91_get_gpio_value(pin) ? | ||
621 | "set" : "clear"); | ||
622 | else | ||
623 | seq_printf(s, "[periph %s]\n", | ||
624 | __raw_readl(pio + PIO_ABSR) & | ||
625 | mask ? "B" : "A"); | ||
626 | } | ||
627 | } | ||
628 | } | ||
629 | |||
540 | /* | 630 | /* |
541 | * Called from the processor-specific init to enable GPIO pin support. | 631 | * Called from the processor-specific init to enable GPIO pin support. |
542 | */ | 632 | */ |
543 | void __init at91_gpio_init(struct at91_gpio_bank *data, int nr_banks) | 633 | void __init at91_gpio_init(struct at91_gpio_bank *data, int nr_banks) |
544 | { | 634 | { |
545 | unsigned i; | 635 | unsigned i; |
546 | struct at91_gpio_bank *last; | 636 | struct at91_gpio_chip *at91_gpio, *last = NULL; |
547 | 637 | ||
548 | BUG_ON(nr_banks > MAX_GPIO_BANKS); | 638 | BUG_ON(nr_banks > MAX_GPIO_BANKS); |
549 | 639 | ||
550 | gpio = data; | ||
551 | gpio_banks = nr_banks; | 640 | gpio_banks = nr_banks; |
552 | 641 | ||
553 | for (i = 0, last = NULL; i < nr_banks; i++, last = data, data++) { | 642 | for (i = 0; i < nr_banks; i++) { |
554 | data->chipbase = PIN_BASE + i * 32; | 643 | at91_gpio = &gpio_chip[i]; |
555 | data->regbase = data->offset + (void __iomem *)AT91_VA_BASE_SYS; | 644 | |
645 | at91_gpio->bank = &data[i]; | ||
646 | at91_gpio->chip.base = PIN_BASE + i * 32; | ||
647 | at91_gpio->regbase = at91_gpio->bank->offset + | ||
648 | (void __iomem *)AT91_VA_BASE_SYS; | ||
556 | 649 | ||
557 | /* enable PIO controller's clock */ | 650 | /* enable PIO controller's clock */ |
558 | clk_enable(data->clock); | 651 | clk_enable(at91_gpio->bank->clock); |
559 | 652 | ||
560 | /* | 653 | /* AT91SAM9263_ID_PIOCDE groups PIOC, PIOD, PIOE */ |
561 | * Some processors share peripheral ID between multiple GPIO banks. | 654 | if (last && last->bank->id == at91_gpio->bank->id) |
562 | * SAM9263 (PIOC, PIOD, PIOE) | 655 | last->next = at91_gpio; |
563 | * CAP9 (PIOA, PIOB, PIOC, PIOD) | 656 | last = at91_gpio; |
564 | */ | 657 | |
565 | if (last && last->id == data->id) | 658 | gpiochip_add(&at91_gpio->chip); |
566 | last->next = data; | ||
567 | } | 659 | } |
568 | } | 660 | } |
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h index bffa6741a751..04c91e31c9c5 100644 --- a/arch/arm/mach-at91/include/mach/gpio.h +++ b/arch/arm/mach-at91/include/mach/gpio.h | |||
@@ -213,32 +213,12 @@ extern void at91_gpio_resume(void); | |||
213 | */ | 213 | */ |
214 | 214 | ||
215 | #include <asm/errno.h> | 215 | #include <asm/errno.h> |
216 | |||
217 | static inline int gpio_request(unsigned gpio, const char *label) | ||
218 | { | ||
219 | return 0; | ||
220 | } | ||
221 | |||
222 | static inline void gpio_free(unsigned gpio) | ||
223 | { | ||
224 | might_sleep(); | ||
225 | } | ||
226 | |||
227 | extern int gpio_direction_input(unsigned gpio); | ||
228 | extern int gpio_direction_output(unsigned gpio, int value); | ||
229 | |||
230 | static inline int gpio_get_value(unsigned gpio) | ||
231 | { | ||
232 | return at91_get_gpio_value(gpio); | ||
233 | } | ||
234 | |||
235 | static inline void gpio_set_value(unsigned gpio, int value) | ||
236 | { | ||
237 | at91_set_gpio_value(gpio, value); | ||
238 | } | ||
239 | |||
240 | #include <asm-generic/gpio.h> /* cansleep wrappers */ | 216 | #include <asm-generic/gpio.h> /* cansleep wrappers */ |
241 | 217 | ||
218 | #define gpio_get_value __gpio_get_value | ||
219 | #define gpio_set_value __gpio_set_value | ||
220 | #define gpio_cansleep __gpio_cansleep | ||
221 | |||
242 | static inline int gpio_to_irq(unsigned gpio) | 222 | static inline int gpio_to_irq(unsigned gpio) |
243 | { | 223 | { |
244 | return gpio; | 224 | return gpio; |
diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile index 944e42d51646..9522e205b73f 100644 --- a/arch/arm/mach-ep93xx/Makefile +++ b/arch/arm/mach-ep93xx/Makefile | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
3 | # | 3 | # |
4 | obj-y := core.o clock.o gpio.o | 4 | obj-y := core.o clock.o dma-m2p.o gpio.o |
5 | obj-m := | 5 | obj-m := |
6 | obj-n := | 6 | obj-n := |
7 | obj- := | 7 | obj- := |
diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index 96049283a10a..e8ebeaea6c48 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c | |||
@@ -41,6 +41,56 @@ static struct clk clk_usb_host = { | |||
41 | .enable_mask = EP93XX_SYSCON_CLOCK_USH_EN, | 41 | .enable_mask = EP93XX_SYSCON_CLOCK_USH_EN, |
42 | }; | 42 | }; |
43 | 43 | ||
44 | /* DMA Clocks */ | ||
45 | static struct clk clk_m2p0 = { | ||
46 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
47 | .enable_mask = 0x00020000, | ||
48 | }; | ||
49 | static struct clk clk_m2p1 = { | ||
50 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
51 | .enable_mask = 0x00010000, | ||
52 | }; | ||
53 | static struct clk clk_m2p2 = { | ||
54 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
55 | .enable_mask = 0x00080000, | ||
56 | }; | ||
57 | static struct clk clk_m2p3 = { | ||
58 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
59 | .enable_mask = 0x00040000, | ||
60 | }; | ||
61 | static struct clk clk_m2p4 = { | ||
62 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
63 | .enable_mask = 0x00200000, | ||
64 | }; | ||
65 | static struct clk clk_m2p5 = { | ||
66 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
67 | .enable_mask = 0x00100000, | ||
68 | }; | ||
69 | static struct clk clk_m2p6 = { | ||
70 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
71 | .enable_mask = 0x00800000, | ||
72 | }; | ||
73 | static struct clk clk_m2p7 = { | ||
74 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
75 | .enable_mask = 0x00400000, | ||
76 | }; | ||
77 | static struct clk clk_m2p8 = { | ||
78 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
79 | .enable_mask = 0x02000000, | ||
80 | }; | ||
81 | static struct clk clk_m2p9 = { | ||
82 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
83 | .enable_mask = 0x01000000, | ||
84 | }; | ||
85 | static struct clk clk_m2m0 = { | ||
86 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
87 | .enable_mask = 0x04000000, | ||
88 | }; | ||
89 | static struct clk clk_m2m1 = { | ||
90 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | ||
91 | .enable_mask = 0x08000000, | ||
92 | }; | ||
93 | |||
44 | #define INIT_CK(dev,con,ck) \ | 94 | #define INIT_CK(dev,con,ck) \ |
45 | { .dev_id = dev, .con_id = con, .clk = ck } | 95 | { .dev_id = dev, .con_id = con, .clk = ck } |
46 | 96 | ||
@@ -54,6 +104,18 @@ static struct clk_lookup clocks[] = { | |||
54 | INIT_CK(NULL, "pclk", &clk_p), | 104 | INIT_CK(NULL, "pclk", &clk_p), |
55 | INIT_CK(NULL, "pll2", &clk_pll2), | 105 | INIT_CK(NULL, "pll2", &clk_pll2), |
56 | INIT_CK(NULL, "usb_host", &clk_usb_host), | 106 | INIT_CK(NULL, "usb_host", &clk_usb_host), |
107 | INIT_CK(NULL, "m2p0", &clk_m2p0), | ||
108 | INIT_CK(NULL, "m2p1", &clk_m2p1), | ||
109 | INIT_CK(NULL, "m2p2", &clk_m2p2), | ||
110 | INIT_CK(NULL, "m2p3", &clk_m2p3), | ||
111 | INIT_CK(NULL, "m2p4", &clk_m2p4), | ||
112 | INIT_CK(NULL, "m2p5", &clk_m2p5), | ||
113 | INIT_CK(NULL, "m2p6", &clk_m2p6), | ||
114 | INIT_CK(NULL, "m2p7", &clk_m2p7), | ||
115 | INIT_CK(NULL, "m2p8", &clk_m2p8), | ||
116 | INIT_CK(NULL, "m2p9", &clk_m2p9), | ||
117 | INIT_CK(NULL, "m2m0", &clk_m2m0), | ||
118 | INIT_CK(NULL, "m2m1", &clk_m2m1), | ||
57 | }; | 119 | }; |
58 | 120 | ||
59 | 121 | ||
@@ -110,6 +172,22 @@ static unsigned long calc_pll_rate(u32 config_word) | |||
110 | return (unsigned long)rate; | 172 | return (unsigned long)rate; |
111 | } | 173 | } |
112 | 174 | ||
175 | static void __init ep93xx_dma_clock_init(void) | ||
176 | { | ||
177 | clk_m2p0.rate = clk_h.rate; | ||
178 | clk_m2p1.rate = clk_h.rate; | ||
179 | clk_m2p2.rate = clk_h.rate; | ||
180 | clk_m2p3.rate = clk_h.rate; | ||
181 | clk_m2p4.rate = clk_h.rate; | ||
182 | clk_m2p5.rate = clk_h.rate; | ||
183 | clk_m2p6.rate = clk_h.rate; | ||
184 | clk_m2p7.rate = clk_h.rate; | ||
185 | clk_m2p8.rate = clk_h.rate; | ||
186 | clk_m2p9.rate = clk_h.rate; | ||
187 | clk_m2m0.rate = clk_h.rate; | ||
188 | clk_m2m1.rate = clk_h.rate; | ||
189 | } | ||
190 | |||
113 | static int __init ep93xx_clock_init(void) | 191 | static int __init ep93xx_clock_init(void) |
114 | { | 192 | { |
115 | u32 value; | 193 | u32 value; |
@@ -124,6 +202,7 @@ static int __init ep93xx_clock_init(void) | |||
124 | clk_f.rate = clk_pll1.rate / fclk_divisors[(value >> 25) & 0x7]; | 202 | clk_f.rate = clk_pll1.rate / fclk_divisors[(value >> 25) & 0x7]; |
125 | clk_h.rate = clk_pll1.rate / hclk_divisors[(value >> 20) & 0x7]; | 203 | clk_h.rate = clk_pll1.rate / hclk_divisors[(value >> 20) & 0x7]; |
126 | clk_p.rate = clk_h.rate / pclk_divisors[(value >> 18) & 0x3]; | 204 | clk_p.rate = clk_h.rate / pclk_divisors[(value >> 18) & 0x3]; |
205 | ep93xx_dma_clock_init(); | ||
127 | 206 | ||
128 | value = __raw_readl(EP93XX_SYSCON_CLOCK_SET2); | 207 | value = __raw_readl(EP93XX_SYSCON_CLOCK_SET2); |
129 | if (!(value & 0x00080000)) { /* PLL2 bypassed? */ | 208 | if (!(value & 0x00080000)) { /* PLL2 bypassed? */ |
diff --git a/arch/arm/mach-ep93xx/dma-m2p.c b/arch/arm/mach-ep93xx/dma-m2p.c new file mode 100644 index 000000000000..a2df5bb7dff0 --- /dev/null +++ b/arch/arm/mach-ep93xx/dma-m2p.c | |||
@@ -0,0 +1,408 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-ep93xx/dma-m2p.c | ||
3 | * M2P DMA handling for Cirrus EP93xx chips. | ||
4 | * | ||
5 | * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> | ||
6 | * Copyright (C) 2006 Applied Data Systems | ||
7 | * | ||
8 | * Copyright (C) 2009 Ryan Mallon <ryan@bluewatersys.com> | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License as published by | ||
12 | * the Free Software Foundation; either version 2 of the License, or (at | ||
13 | * your option) any later version. | ||
14 | */ | ||
15 | |||
16 | /* | ||
17 | * On the EP93xx chip the following peripherals my be allocated to the 10 | ||
18 | * Memory to Internal Peripheral (M2P) channels (5 transmit + 5 receive). | ||
19 | * | ||
20 | * I2S contains 3 Tx and 3 Rx DMA Channels | ||
21 | * AAC contains 3 Tx and 3 Rx DMA Channels | ||
22 | * UART1 contains 1 Tx and 1 Rx DMA Channels | ||
23 | * UART2 contains 1 Tx and 1 Rx DMA Channels | ||
24 | * UART3 contains 1 Tx and 1 Rx DMA Channels | ||
25 | * IrDA contains 1 Tx and 1 Rx DMA Channels | ||
26 | * | ||
27 | * SSP and IDE use the Memory to Memory (M2M) channels and are not covered | ||
28 | * with this implementation. | ||
29 | */ | ||
30 | |||
31 | #include <linux/kernel.h> | ||
32 | #include <linux/clk.h> | ||
33 | #include <linux/err.h> | ||
34 | #include <linux/interrupt.h> | ||
35 | #include <linux/module.h> | ||
36 | |||
37 | #include <mach/dma.h> | ||
38 | #include <mach/hardware.h> | ||
39 | |||
40 | #define M2P_CONTROL 0x00 | ||
41 | #define M2P_CONTROL_STALL_IRQ_EN (1 << 0) | ||
42 | #define M2P_CONTROL_NFB_IRQ_EN (1 << 1) | ||
43 | #define M2P_CONTROL_ERROR_IRQ_EN (1 << 3) | ||
44 | #define M2P_CONTROL_ENABLE (1 << 4) | ||
45 | #define M2P_INTERRUPT 0x04 | ||
46 | #define M2P_INTERRUPT_STALL (1 << 0) | ||
47 | #define M2P_INTERRUPT_NFB (1 << 1) | ||
48 | #define M2P_INTERRUPT_ERROR (1 << 3) | ||
49 | #define M2P_PPALLOC 0x08 | ||
50 | #define M2P_STATUS 0x0c | ||
51 | #define M2P_REMAIN 0x14 | ||
52 | #define M2P_MAXCNT0 0x20 | ||
53 | #define M2P_BASE0 0x24 | ||
54 | #define M2P_MAXCNT1 0x30 | ||
55 | #define M2P_BASE1 0x34 | ||
56 | |||
57 | #define STATE_IDLE 0 /* Channel is inactive. */ | ||
58 | #define STATE_STALL 1 /* Channel is active, no buffers pending. */ | ||
59 | #define STATE_ON 2 /* Channel is active, one buffer pending. */ | ||
60 | #define STATE_NEXT 3 /* Channel is active, two buffers pending. */ | ||
61 | |||
62 | struct m2p_channel { | ||
63 | char *name; | ||
64 | void __iomem *base; | ||
65 | int irq; | ||
66 | |||
67 | struct clk *clk; | ||
68 | spinlock_t lock; | ||
69 | |||
70 | void *client; | ||
71 | unsigned next_slot:1; | ||
72 | struct ep93xx_dma_buffer *buffer_xfer; | ||
73 | struct ep93xx_dma_buffer *buffer_next; | ||
74 | struct list_head buffers_pending; | ||
75 | }; | ||
76 | |||
77 | static struct m2p_channel m2p_rx[] = { | ||
78 | {"m2p1", EP93XX_DMA_BASE + 0x0040, IRQ_EP93XX_DMAM2P1}, | ||
79 | {"m2p3", EP93XX_DMA_BASE + 0x00c0, IRQ_EP93XX_DMAM2P3}, | ||
80 | {"m2p5", EP93XX_DMA_BASE + 0x0200, IRQ_EP93XX_DMAM2P5}, | ||
81 | {"m2p7", EP93XX_DMA_BASE + 0x0280, IRQ_EP93XX_DMAM2P7}, | ||
82 | {"m2p9", EP93XX_DMA_BASE + 0x0300, IRQ_EP93XX_DMAM2P9}, | ||
83 | {NULL}, | ||
84 | }; | ||
85 | |||
86 | static struct m2p_channel m2p_tx[] = { | ||
87 | {"m2p0", EP93XX_DMA_BASE + 0x0000, IRQ_EP93XX_DMAM2P0}, | ||
88 | {"m2p2", EP93XX_DMA_BASE + 0x0080, IRQ_EP93XX_DMAM2P2}, | ||
89 | {"m2p4", EP93XX_DMA_BASE + 0x0240, IRQ_EP93XX_DMAM2P4}, | ||
90 | {"m2p6", EP93XX_DMA_BASE + 0x02c0, IRQ_EP93XX_DMAM2P6}, | ||
91 | {"m2p8", EP93XX_DMA_BASE + 0x0340, IRQ_EP93XX_DMAM2P8}, | ||
92 | {NULL}, | ||
93 | }; | ||
94 | |||
95 | static void feed_buf(struct m2p_channel *ch, struct ep93xx_dma_buffer *buf) | ||
96 | { | ||
97 | if (ch->next_slot == 0) { | ||
98 | writel(buf->size, ch->base + M2P_MAXCNT0); | ||
99 | writel(buf->bus_addr, ch->base + M2P_BASE0); | ||
100 | } else { | ||
101 | writel(buf->size, ch->base + M2P_MAXCNT1); | ||
102 | writel(buf->bus_addr, ch->base + M2P_BASE1); | ||
103 | } | ||
104 | ch->next_slot ^= 1; | ||
105 | } | ||
106 | |||
107 | static void choose_buffer_xfer(struct m2p_channel *ch) | ||
108 | { | ||
109 | struct ep93xx_dma_buffer *buf; | ||
110 | |||
111 | ch->buffer_xfer = NULL; | ||
112 | if (!list_empty(&ch->buffers_pending)) { | ||
113 | buf = list_entry(ch->buffers_pending.next, | ||
114 | struct ep93xx_dma_buffer, list); | ||
115 | list_del(&buf->list); | ||
116 | feed_buf(ch, buf); | ||
117 | ch->buffer_xfer = buf; | ||
118 | } | ||
119 | } | ||
120 | |||
121 | static void choose_buffer_next(struct m2p_channel *ch) | ||
122 | { | ||
123 | struct ep93xx_dma_buffer *buf; | ||
124 | |||
125 | ch->buffer_next = NULL; | ||
126 | if (!list_empty(&ch->buffers_pending)) { | ||
127 | buf = list_entry(ch->buffers_pending.next, | ||
128 | struct ep93xx_dma_buffer, list); | ||
129 | list_del(&buf->list); | ||
130 | feed_buf(ch, buf); | ||
131 | ch->buffer_next = buf; | ||
132 | } | ||
133 | } | ||
134 | |||
135 | static inline void m2p_set_control(struct m2p_channel *ch, u32 v) | ||
136 | { | ||
137 | /* | ||
138 | * The control register must be read immediately after being written so | ||
139 | * that the internal state machine is correctly updated. See the ep93xx | ||
140 | * users' guide for details. | ||
141 | */ | ||
142 | writel(v, ch->base + M2P_CONTROL); | ||
143 | readl(ch->base + M2P_CONTROL); | ||
144 | } | ||
145 | |||
146 | static inline int m2p_channel_state(struct m2p_channel *ch) | ||
147 | { | ||
148 | return (readl(ch->base + M2P_STATUS) >> 4) & 0x3; | ||
149 | } | ||
150 | |||
151 | static irqreturn_t m2p_irq(int irq, void *dev_id) | ||
152 | { | ||
153 | struct m2p_channel *ch = dev_id; | ||
154 | struct ep93xx_dma_m2p_client *cl; | ||
155 | u32 irq_status, v; | ||
156 | int error = 0; | ||
157 | |||
158 | cl = ch->client; | ||
159 | |||
160 | spin_lock(&ch->lock); | ||
161 | irq_status = readl(ch->base + M2P_INTERRUPT); | ||
162 | |||
163 | if (irq_status & M2P_INTERRUPT_ERROR) { | ||
164 | writel(M2P_INTERRUPT_ERROR, ch->base + M2P_INTERRUPT); | ||
165 | error = 1; | ||
166 | } | ||
167 | |||
168 | if ((irq_status & (M2P_INTERRUPT_STALL | M2P_INTERRUPT_NFB)) == 0) { | ||
169 | spin_unlock(&ch->lock); | ||
170 | return IRQ_NONE; | ||
171 | } | ||
172 | |||
173 | switch (m2p_channel_state(ch)) { | ||
174 | case STATE_IDLE: | ||
175 | pr_crit("m2p_irq: dma interrupt without a dma buffer\n"); | ||
176 | BUG(); | ||
177 | break; | ||
178 | |||
179 | case STATE_STALL: | ||
180 | cl->buffer_finished(cl->cookie, ch->buffer_xfer, 0, error); | ||
181 | if (ch->buffer_next != NULL) { | ||
182 | cl->buffer_finished(cl->cookie, ch->buffer_next, | ||
183 | 0, error); | ||
184 | } | ||
185 | choose_buffer_xfer(ch); | ||
186 | choose_buffer_next(ch); | ||
187 | if (ch->buffer_xfer != NULL) | ||
188 | cl->buffer_started(cl->cookie, ch->buffer_xfer); | ||
189 | break; | ||
190 | |||
191 | case STATE_ON: | ||
192 | cl->buffer_finished(cl->cookie, ch->buffer_xfer, 0, error); | ||
193 | ch->buffer_xfer = ch->buffer_next; | ||
194 | choose_buffer_next(ch); | ||
195 | cl->buffer_started(cl->cookie, ch->buffer_xfer); | ||
196 | break; | ||
197 | |||
198 | case STATE_NEXT: | ||
199 | pr_crit("m2p_irq: dma interrupt while next\n"); | ||
200 | BUG(); | ||
201 | break; | ||
202 | } | ||
203 | |||
204 | v = readl(ch->base + M2P_CONTROL) & ~(M2P_CONTROL_STALL_IRQ_EN | | ||
205 | M2P_CONTROL_NFB_IRQ_EN); | ||
206 | if (ch->buffer_xfer != NULL) | ||
207 | v |= M2P_CONTROL_STALL_IRQ_EN; | ||
208 | if (ch->buffer_next != NULL) | ||
209 | v |= M2P_CONTROL_NFB_IRQ_EN; | ||
210 | m2p_set_control(ch, v); | ||
211 | |||
212 | spin_unlock(&ch->lock); | ||
213 | return IRQ_HANDLED; | ||
214 | } | ||
215 | |||
216 | static struct m2p_channel *find_free_channel(struct ep93xx_dma_m2p_client *cl) | ||
217 | { | ||
218 | struct m2p_channel *ch; | ||
219 | int i; | ||
220 | |||
221 | if (cl->flags & EP93XX_DMA_M2P_RX) | ||
222 | ch = m2p_rx; | ||
223 | else | ||
224 | ch = m2p_tx; | ||
225 | |||
226 | for (i = 0; ch[i].base; i++) { | ||
227 | struct ep93xx_dma_m2p_client *client; | ||
228 | |||
229 | client = ch[i].client; | ||
230 | if (client != NULL) { | ||
231 | int port; | ||
232 | |||
233 | port = cl->flags & EP93XX_DMA_M2P_PORT_MASK; | ||
234 | if (port == (client->flags & | ||
235 | EP93XX_DMA_M2P_PORT_MASK)) { | ||
236 | pr_warning("DMA channel already used by %s\n", | ||
237 | cl->name ? : "unknown client"); | ||
238 | return ERR_PTR(-EBUSY); | ||
239 | } | ||
240 | } | ||
241 | } | ||
242 | |||
243 | for (i = 0; ch[i].base; i++) { | ||
244 | if (ch[i].client == NULL) | ||
245 | return ch + i; | ||
246 | } | ||
247 | |||
248 | pr_warning("No free DMA channel for %s\n", | ||
249 | cl->name ? : "unknown client"); | ||
250 | return ERR_PTR(-ENODEV); | ||
251 | } | ||
252 | |||
253 | static void channel_enable(struct m2p_channel *ch) | ||
254 | { | ||
255 | struct ep93xx_dma_m2p_client *cl = ch->client; | ||
256 | u32 v; | ||
257 | |||
258 | clk_enable(ch->clk); | ||
259 | |||
260 | v = cl->flags & EP93XX_DMA_M2P_PORT_MASK; | ||
261 | writel(v, ch->base + M2P_PPALLOC); | ||
262 | |||
263 | v = cl->flags & EP93XX_DMA_M2P_ERROR_MASK; | ||
264 | v |= M2P_CONTROL_ENABLE | M2P_CONTROL_ERROR_IRQ_EN; | ||
265 | m2p_set_control(ch, v); | ||
266 | } | ||
267 | |||
268 | static void channel_disable(struct m2p_channel *ch) | ||
269 | { | ||
270 | u32 v; | ||
271 | |||
272 | v = readl(ch->base + M2P_CONTROL); | ||
273 | v &= ~(M2P_CONTROL_STALL_IRQ_EN | M2P_CONTROL_NFB_IRQ_EN); | ||
274 | m2p_set_control(ch, v); | ||
275 | |||
276 | while (m2p_channel_state(ch) == STATE_ON) | ||
277 | cpu_relax(); | ||
278 | |||
279 | m2p_set_control(ch, 0x0); | ||
280 | |||
281 | while (m2p_channel_state(ch) == STATE_STALL) | ||
282 | cpu_relax(); | ||
283 | |||
284 | clk_disable(ch->clk); | ||
285 | } | ||
286 | |||
287 | int ep93xx_dma_m2p_client_register(struct ep93xx_dma_m2p_client *cl) | ||
288 | { | ||
289 | struct m2p_channel *ch; | ||
290 | int err; | ||
291 | |||
292 | ch = find_free_channel(cl); | ||
293 | if (IS_ERR(ch)) | ||
294 | return PTR_ERR(ch); | ||
295 | |||
296 | err = request_irq(ch->irq, m2p_irq, 0, cl->name ? : "dma-m2p", ch); | ||
297 | if (err) | ||
298 | return err; | ||
299 | |||
300 | ch->client = cl; | ||
301 | ch->next_slot = 0; | ||
302 | ch->buffer_xfer = NULL; | ||
303 | ch->buffer_next = NULL; | ||
304 | INIT_LIST_HEAD(&ch->buffers_pending); | ||
305 | |||
306 | cl->channel = ch; | ||
307 | |||
308 | channel_enable(ch); | ||
309 | |||
310 | return 0; | ||
311 | } | ||
312 | EXPORT_SYMBOL_GPL(ep93xx_dma_m2p_client_register); | ||
313 | |||
314 | void ep93xx_dma_m2p_client_unregister(struct ep93xx_dma_m2p_client *cl) | ||
315 | { | ||
316 | struct m2p_channel *ch = cl->channel; | ||
317 | |||
318 | channel_disable(ch); | ||
319 | free_irq(ch->irq, ch); | ||
320 | ch->client = NULL; | ||
321 | } | ||
322 | EXPORT_SYMBOL_GPL(ep93xx_dma_m2p_client_unregister); | ||
323 | |||
324 | void ep93xx_dma_m2p_submit(struct ep93xx_dma_m2p_client *cl, | ||
325 | struct ep93xx_dma_buffer *buf) | ||
326 | { | ||
327 | struct m2p_channel *ch = cl->channel; | ||
328 | unsigned long flags; | ||
329 | u32 v; | ||
330 | |||
331 | spin_lock_irqsave(&ch->lock, flags); | ||
332 | v = readl(ch->base + M2P_CONTROL); | ||
333 | if (ch->buffer_xfer == NULL) { | ||
334 | ch->buffer_xfer = buf; | ||
335 | feed_buf(ch, buf); | ||
336 | cl->buffer_started(cl->cookie, buf); | ||
337 | |||
338 | v |= M2P_CONTROL_STALL_IRQ_EN; | ||
339 | m2p_set_control(ch, v); | ||
340 | |||
341 | } else if (ch->buffer_next == NULL) { | ||
342 | ch->buffer_next = buf; | ||
343 | feed_buf(ch, buf); | ||
344 | |||
345 | v |= M2P_CONTROL_NFB_IRQ_EN; | ||
346 | m2p_set_control(ch, v); | ||
347 | } else { | ||
348 | list_add_tail(&buf->list, &ch->buffers_pending); | ||
349 | } | ||
350 | spin_unlock_irqrestore(&ch->lock, flags); | ||
351 | } | ||
352 | EXPORT_SYMBOL_GPL(ep93xx_dma_m2p_submit); | ||
353 | |||
354 | void ep93xx_dma_m2p_submit_recursive(struct ep93xx_dma_m2p_client *cl, | ||
355 | struct ep93xx_dma_buffer *buf) | ||
356 | { | ||
357 | struct m2p_channel *ch = cl->channel; | ||
358 | |||
359 | list_add_tail(&buf->list, &ch->buffers_pending); | ||
360 | } | ||
361 | EXPORT_SYMBOL_GPL(ep93xx_dma_m2p_submit_recursive); | ||
362 | |||
363 | void ep93xx_dma_m2p_flush(struct ep93xx_dma_m2p_client *cl) | ||
364 | { | ||
365 | struct m2p_channel *ch = cl->channel; | ||
366 | |||
367 | channel_disable(ch); | ||
368 | ch->next_slot = 0; | ||
369 | ch->buffer_xfer = NULL; | ||
370 | ch->buffer_next = NULL; | ||
371 | INIT_LIST_HEAD(&ch->buffers_pending); | ||
372 | channel_enable(ch); | ||
373 | } | ||
374 | EXPORT_SYMBOL_GPL(ep93xx_dma_m2p_flush); | ||
375 | |||
376 | static int init_channel(struct m2p_channel *ch) | ||
377 | { | ||
378 | ch->clk = clk_get(NULL, ch->name); | ||
379 | if (IS_ERR(ch->clk)) | ||
380 | return PTR_ERR(ch->clk); | ||
381 | |||
382 | spin_lock_init(&ch->lock); | ||
383 | ch->client = NULL; | ||
384 | |||
385 | return 0; | ||
386 | } | ||
387 | |||
388 | static int __init ep93xx_dma_m2p_init(void) | ||
389 | { | ||
390 | int i; | ||
391 | int ret; | ||
392 | |||
393 | for (i = 0; m2p_rx[i].base; i++) { | ||
394 | ret = init_channel(m2p_rx + i); | ||
395 | if (ret) | ||
396 | return ret; | ||
397 | } | ||
398 | |||
399 | for (i = 0; m2p_tx[i].base; i++) { | ||
400 | ret = init_channel(m2p_tx + i); | ||
401 | if (ret) | ||
402 | return ret; | ||
403 | } | ||
404 | |||
405 | pr_info("M2P DMA subsystem initialized\n"); | ||
406 | return 0; | ||
407 | } | ||
408 | arch_initcall(ep93xx_dma_m2p_init); | ||
diff --git a/arch/arm/mach-ep93xx/edb9307a.c b/arch/arm/mach-ep93xx/edb9307a.c index 5b5c22b681be..6171167d3315 100644 --- a/arch/arm/mach-ep93xx/edb9307a.c +++ b/arch/arm/mach-ep93xx/edb9307a.c | |||
@@ -48,12 +48,24 @@ static struct ep93xx_eth_data edb9307a_eth_data = { | |||
48 | .phy_id = 1, | 48 | .phy_id = 1, |
49 | }; | 49 | }; |
50 | 50 | ||
51 | static struct i2c_board_info __initdata edb9307a_i2c_data[] = { | ||
52 | { | ||
53 | /* On-board battery backed RTC */ | ||
54 | I2C_BOARD_INFO("isl1208", 0x6f), | ||
55 | }, | ||
56 | /* | ||
57 | * The I2C signals are also routed to the Expansion Connector (J4) | ||
58 | */ | ||
59 | }; | ||
60 | |||
51 | static void __init edb9307a_init_machine(void) | 61 | static void __init edb9307a_init_machine(void) |
52 | { | 62 | { |
53 | ep93xx_init_devices(); | 63 | ep93xx_init_devices(); |
54 | platform_device_register(&edb9307a_flash); | 64 | platform_device_register(&edb9307a_flash); |
55 | 65 | ||
56 | ep93xx_register_eth(&edb9307a_eth_data, 1); | 66 | ep93xx_register_eth(&edb9307a_eth_data, 1); |
67 | |||
68 | ep93xx_init_i2c(edb9307a_i2c_data, ARRAY_SIZE(edb9307a_i2c_data)); | ||
57 | } | 69 | } |
58 | 70 | ||
59 | MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board") | 71 | MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board") |
diff --git a/arch/arm/mach-ep93xx/include/mach/dma.h b/arch/arm/mach-ep93xx/include/mach/dma.h new file mode 100644 index 000000000000..ef6bd9d13148 --- /dev/null +++ b/arch/arm/mach-ep93xx/include/mach/dma.h | |||
@@ -0,0 +1,52 @@ | |||
1 | #ifndef __ASM_ARCH_DMA_H | ||
2 | #define __ASM_ARCH_DMA_H | ||
3 | |||
4 | #include <linux/list.h> | ||
5 | #include <linux/types.h> | ||
6 | |||
7 | struct ep93xx_dma_buffer { | ||
8 | struct list_head list; | ||
9 | u32 bus_addr; | ||
10 | u16 size; | ||
11 | }; | ||
12 | |||
13 | struct ep93xx_dma_m2p_client { | ||
14 | char *name; | ||
15 | u8 flags; | ||
16 | void *cookie; | ||
17 | void (*buffer_started)(void *cookie, | ||
18 | struct ep93xx_dma_buffer *buf); | ||
19 | void (*buffer_finished)(void *cookie, | ||
20 | struct ep93xx_dma_buffer *buf, | ||
21 | int bytes, int error); | ||
22 | |||
23 | /* Internal to the DMA code. */ | ||
24 | void *channel; | ||
25 | }; | ||
26 | |||
27 | #define EP93XX_DMA_M2P_PORT_I2S1 0x00 | ||
28 | #define EP93XX_DMA_M2P_PORT_I2S2 0x01 | ||
29 | #define EP93XX_DMA_M2P_PORT_AAC1 0x02 | ||
30 | #define EP93XX_DMA_M2P_PORT_AAC2 0x03 | ||
31 | #define EP93XX_DMA_M2P_PORT_AAC3 0x04 | ||
32 | #define EP93XX_DMA_M2P_PORT_I2S3 0x05 | ||
33 | #define EP93XX_DMA_M2P_PORT_UART1 0x06 | ||
34 | #define EP93XX_DMA_M2P_PORT_UART2 0x07 | ||
35 | #define EP93XX_DMA_M2P_PORT_UART3 0x08 | ||
36 | #define EP93XX_DMA_M2P_PORT_IRDA 0x09 | ||
37 | #define EP93XX_DMA_M2P_PORT_MASK 0x0f | ||
38 | #define EP93XX_DMA_M2P_TX 0x00 | ||
39 | #define EP93XX_DMA_M2P_RX 0x10 | ||
40 | #define EP93XX_DMA_M2P_ABORT_ON_ERROR 0x20 | ||
41 | #define EP93XX_DMA_M2P_IGNORE_ERROR 0x40 | ||
42 | #define EP93XX_DMA_M2P_ERROR_MASK 0x60 | ||
43 | |||
44 | int ep93xx_dma_m2p_client_register(struct ep93xx_dma_m2p_client *m2p); | ||
45 | void ep93xx_dma_m2p_client_unregister(struct ep93xx_dma_m2p_client *m2p); | ||
46 | void ep93xx_dma_m2p_submit(struct ep93xx_dma_m2p_client *m2p, | ||
47 | struct ep93xx_dma_buffer *buf); | ||
48 | void ep93xx_dma_m2p_submit_recursive(struct ep93xx_dma_m2p_client *m2p, | ||
49 | struct ep93xx_dma_buffer *buf); | ||
50 | void ep93xx_dma_m2p_flush(struct ep93xx_dma_m2p_client *m2p); | ||
51 | |||
52 | #endif /* __ASM_ARCH_DMA_H */ | ||
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h index 22d6c9a6e4ca..f66be12b856e 100644 --- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | |||
@@ -58,7 +58,8 @@ | |||
58 | 58 | ||
59 | 59 | ||
60 | /* AHB peripherals */ | 60 | /* AHB peripherals */ |
61 | #define EP93XX_DMA_BASE (EP93XX_AHB_VIRT_BASE + 0x00000000) | 61 | #define EP93XX_DMA_BASE ((void __iomem *) \ |
62 | (EP93XX_AHB_VIRT_BASE + 0x00000000)) | ||
62 | 63 | ||
63 | #define EP93XX_ETHERNET_BASE (EP93XX_AHB_VIRT_BASE + 0x00010000) | 64 | #define EP93XX_ETHERNET_BASE (EP93XX_AHB_VIRT_BASE + 0x00010000) |
64 | #define EP93XX_ETHERNET_PHYS_BASE (EP93XX_AHB_PHYS_BASE + 0x00010000) | 65 | #define EP93XX_ETHERNET_PHYS_BASE (EP93XX_AHB_PHYS_BASE + 0x00010000) |
diff --git a/arch/arm/mach-footbridge/dma.c b/arch/arm/mach-footbridge/dma.c index 4f3506346969..e2e0df8bcee2 100644 --- a/arch/arm/mach-footbridge/dma.c +++ b/arch/arm/mach-footbridge/dma.c | |||
@@ -21,16 +21,16 @@ | |||
21 | #include <asm/hardware/dec21285.h> | 21 | #include <asm/hardware/dec21285.h> |
22 | 22 | ||
23 | #if 0 | 23 | #if 0 |
24 | static int fb_dma_request(dmach_t channel, dma_t *dma) | 24 | static int fb_dma_request(unsigned int chan, dma_t *dma) |
25 | { | 25 | { |
26 | return -EINVAL; | 26 | return -EINVAL; |
27 | } | 27 | } |
28 | 28 | ||
29 | static void fb_dma_enable(dmach_t channel, dma_t *dma) | 29 | static void fb_dma_enable(unsigned int chan, dma_t *dma) |
30 | { | 30 | { |
31 | } | 31 | } |
32 | 32 | ||
33 | static void fb_dma_disable(dmach_t channel, dma_t *dma) | 33 | static void fb_dma_disable(unsigned int chan, dma_t *dma) |
34 | { | 34 | { |
35 | } | 35 | } |
36 | 36 | ||
@@ -42,7 +42,7 @@ static struct dma_ops fb_dma_ops = { | |||
42 | }; | 42 | }; |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | void __init arch_dma_init(dma_t *dma) | 45 | static int __init fb_dma_init(void) |
46 | { | 46 | { |
47 | #if 0 | 47 | #if 0 |
48 | dma[_DC21285_DMA(0)].d_ops = &fb_dma_ops; | 48 | dma[_DC21285_DMA(0)].d_ops = &fb_dma_ops; |
@@ -50,6 +50,8 @@ void __init arch_dma_init(dma_t *dma) | |||
50 | #endif | 50 | #endif |
51 | #ifdef CONFIG_ISA_DMA | 51 | #ifdef CONFIG_ISA_DMA |
52 | if (footbridge_cfn_mode()) | 52 | if (footbridge_cfn_mode()) |
53 | isa_init_dma(dma + _ISA_DMA(0)); | 53 | isa_init_dma(); |
54 | #endif | 54 | #endif |
55 | return 0; | ||
55 | } | 56 | } |
57 | core_initcall(fb_dma_init); | ||
diff --git a/arch/arm/mach-ks8695/Kconfig b/arch/arm/mach-ks8695/Kconfig index 2754daabda55..fe0c82e30b2d 100644 --- a/arch/arm/mach-ks8695/Kconfig +++ b/arch/arm/mach-ks8695/Kconfig | |||
@@ -14,6 +14,12 @@ config MACH_DSM320 | |||
14 | Say 'Y' here if you want your kernel to run on the D-Link | 14 | Say 'Y' here if you want your kernel to run on the D-Link |
15 | DSM-320 Wireless Media Player. | 15 | DSM-320 Wireless Media Player. |
16 | 16 | ||
17 | config MACH_ACS5K | ||
18 | bool "Brivo Systems LLC, ACS-5000 Master board" | ||
19 | help | ||
20 | say 'Y' here if you want your kernel to run on the Brivo | ||
21 | Systems LLC, ACS-5000 Master board. | ||
22 | |||
17 | endmenu | 23 | endmenu |
18 | 24 | ||
19 | endif | 25 | endif |
diff --git a/arch/arm/mach-ks8695/Makefile b/arch/arm/mach-ks8695/Makefile index f735d2cc0294..7e3e8160ed30 100644 --- a/arch/arm/mach-ks8695/Makefile +++ b/arch/arm/mach-ks8695/Makefile | |||
@@ -17,3 +17,4 @@ obj-$(CONFIG_LEDS) += leds.o | |||
17 | # Board-specific support | 17 | # Board-specific support |
18 | obj-$(CONFIG_MACH_KS8695) += board-micrel.o | 18 | obj-$(CONFIG_MACH_KS8695) += board-micrel.o |
19 | obj-$(CONFIG_MACH_DSM320) += board-dsm320.o | 19 | obj-$(CONFIG_MACH_DSM320) += board-dsm320.o |
20 | obj-$(CONFIG_MACH_ACS5K) += board-acs5k.o | ||
diff --git a/arch/arm/mach-ks8695/board-acs5k.c b/arch/arm/mach-ks8695/board-acs5k.c new file mode 100644 index 000000000000..9e3e5a640ad2 --- /dev/null +++ b/arch/arm/mach-ks8695/board-acs5k.c | |||
@@ -0,0 +1,233 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-ks8695/board-acs5k.c | ||
3 | * | ||
4 | * Brivo Systems LLC, ACS-5000 Master Board | ||
5 | * | ||
6 | * Copyright 2008 Simtec Electronics | ||
7 | * Daniel Silverstone <dsilvers@simtec.co.uk> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #include <linux/kernel.h> | ||
15 | #include <linux/types.h> | ||
16 | #include <linux/interrupt.h> | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/platform_device.h> | ||
19 | |||
20 | #include <linux/i2c.h> | ||
21 | #include <linux/i2c-algo-bit.h> | ||
22 | #include <linux/i2c-gpio.h> | ||
23 | #include <linux/i2c/pca953x.h> | ||
24 | |||
25 | #include <linux/mtd/mtd.h> | ||
26 | #include <linux/mtd/map.h> | ||
27 | #include <linux/mtd/physmap.h> | ||
28 | #include <linux/mtd/partitions.h> | ||
29 | |||
30 | #include <asm/mach-types.h> | ||
31 | |||
32 | #include <asm/mach/arch.h> | ||
33 | #include <asm/mach/map.h> | ||
34 | #include <asm/mach/irq.h> | ||
35 | |||
36 | #include <mach/devices.h> | ||
37 | #include <mach/gpio.h> | ||
38 | |||
39 | #include "generic.h" | ||
40 | |||
41 | static struct i2c_gpio_platform_data acs5k_i2c_device_platdata = { | ||
42 | .sda_pin = 4, | ||
43 | .scl_pin = 5, | ||
44 | .udelay = 10, | ||
45 | }; | ||
46 | |||
47 | static struct platform_device acs5k_i2c_device = { | ||
48 | .name = "i2c-gpio", | ||
49 | .id = -1, | ||
50 | .num_resources = 0, | ||
51 | .resource = NULL, | ||
52 | .dev = { | ||
53 | .platform_data = &acs5k_i2c_device_platdata, | ||
54 | }, | ||
55 | }; | ||
56 | |||
57 | static int acs5k_pca9555_setup(struct i2c_client *client, | ||
58 | unsigned gpio_base, unsigned ngpio, | ||
59 | void *context) | ||
60 | { | ||
61 | static int acs5k_gpio_value[] = { | ||
62 | -1, -1, -1, -1, -1, -1, -1, 0, 1, 1, -1, 0, 1, 0, -1, -1 | ||
63 | }; | ||
64 | int n; | ||
65 | |||
66 | for (n = 0; n < ARRAY_SIZE(acs5k_gpio_value); ++n) { | ||
67 | gpio_request(gpio_base + n, "ACS-5000 GPIO Expander"); | ||
68 | if (acs5k_gpio_value[n] < 0) | ||
69 | gpio_direction_input(gpio_base + n); | ||
70 | else | ||
71 | gpio_direction_output(gpio_base + n, | ||
72 | acs5k_gpio_value[n]); | ||
73 | gpio_export(gpio_base + n, 0); /* Export, direction locked down */ | ||
74 | } | ||
75 | |||
76 | return 0; | ||
77 | } | ||
78 | |||
79 | static struct pca953x_platform_data acs5k_i2c_pca9555_platdata = { | ||
80 | .gpio_base = 16, /* Start directly after the CPU's GPIO */ | ||
81 | .invert = 0, /* Do not invert */ | ||
82 | .setup = acs5k_pca9555_setup, | ||
83 | }; | ||
84 | |||
85 | static struct i2c_board_info acs5k_i2c_devs[] __initdata = { | ||
86 | { | ||
87 | I2C_BOARD_INFO("pcf8563", 0x51), | ||
88 | }, | ||
89 | { | ||
90 | I2C_BOARD_INFO("pca9555", 0x20), | ||
91 | .platform_data = &acs5k_i2c_pca9555_platdata, | ||
92 | }, | ||
93 | }; | ||
94 | |||
95 | static void __devinit acs5k_i2c_init(void) | ||
96 | { | ||
97 | /* The gpio interface */ | ||
98 | platform_device_register(&acs5k_i2c_device); | ||
99 | /* I2C devices */ | ||
100 | i2c_register_board_info(0, acs5k_i2c_devs, | ||
101 | ARRAY_SIZE(acs5k_i2c_devs)); | ||
102 | } | ||
103 | |||
104 | static struct mtd_partition acs5k_nor_partitions[] = { | ||
105 | [0] = { | ||
106 | .name = "Boot Agent and config", | ||
107 | .size = SZ_256K, | ||
108 | .offset = 0, | ||
109 | .mask_flags = MTD_WRITEABLE, | ||
110 | }, | ||
111 | [1] = { | ||
112 | .name = "Kernel", | ||
113 | .size = SZ_1M, | ||
114 | .offset = SZ_256K, | ||
115 | }, | ||
116 | [2] = { | ||
117 | .name = "SquashFS1", | ||
118 | .size = SZ_2M, | ||
119 | .offset = SZ_256K + SZ_1M, | ||
120 | }, | ||
121 | [3] = { | ||
122 | .name = "SquashFS2", | ||
123 | .size = SZ_4M + SZ_2M, | ||
124 | .offset = SZ_256K + SZ_1M + SZ_2M, | ||
125 | }, | ||
126 | [4] = { | ||
127 | .name = "Data", | ||
128 | .size = SZ_16M + SZ_4M + SZ_2M + SZ_512K, /* 22.5 MB */ | ||
129 | .offset = SZ_256K + SZ_8M + SZ_1M, | ||
130 | } | ||
131 | }; | ||
132 | |||
133 | static struct physmap_flash_data acs5k_nor_pdata = { | ||
134 | .width = 4, | ||
135 | .nr_parts = ARRAY_SIZE(acs5k_nor_partitions), | ||
136 | .parts = acs5k_nor_partitions, | ||
137 | }; | ||
138 | |||
139 | static struct resource acs5k_nor_resource[] = { | ||
140 | [0] = { | ||
141 | .start = SZ_32M, /* We expect the bootloader to map | ||
142 | * the flash here. | ||
143 | */ | ||
144 | .end = SZ_32M + SZ_16M - 1, | ||
145 | .flags = IORESOURCE_MEM, | ||
146 | }, | ||
147 | [1] = { | ||
148 | .start = SZ_32M + SZ_16M, | ||
149 | .end = SZ_32M + SZ_32M - SZ_256K - 1, | ||
150 | .flags = IORESOURCE_MEM, | ||
151 | } | ||
152 | }; | ||
153 | |||
154 | static struct platform_device acs5k_device_nor = { | ||
155 | .name = "physmap-flash", | ||
156 | .id = -1, | ||
157 | .num_resources = ARRAY_SIZE(acs5k_nor_resource), | ||
158 | .resource = acs5k_nor_resource, | ||
159 | .dev = { | ||
160 | .platform_data = &acs5k_nor_pdata, | ||
161 | }, | ||
162 | }; | ||
163 | |||
164 | static void __init acs5k_register_nor(void) | ||
165 | { | ||
166 | int ret; | ||
167 | |||
168 | if (acs5k_nor_partitions[0].mask_flags == 0) | ||
169 | printk(KERN_WARNING "Warning: Unprotecting bootloader and configuration partition\n"); | ||
170 | |||
171 | ret = platform_device_register(&acs5k_device_nor); | ||
172 | if (ret < 0) | ||
173 | printk(KERN_ERR "failed to register physmap-flash device\n"); | ||
174 | } | ||
175 | |||
176 | static int __init acs5k_protection_setup(char *s) | ||
177 | { | ||
178 | /* We can't allocate anything here but we should be able | ||
179 | * to trivially parse s and decide if we can protect the | ||
180 | * bootloader partition or not | ||
181 | */ | ||
182 | if (strcmp(s, "no") == 0) | ||
183 | acs5k_nor_partitions[0].mask_flags = 0; | ||
184 | |||
185 | return 1; | ||
186 | } | ||
187 | |||
188 | __setup("protect_bootloader=", acs5k_protection_setup); | ||
189 | |||
190 | static void __init acs5k_init_gpio(void) | ||
191 | { | ||
192 | int i; | ||
193 | |||
194 | ks8695_register_gpios(); | ||
195 | for (i = 0; i < 4; ++i) | ||
196 | gpio_request(i, "ACS5K IRQ"); | ||
197 | gpio_request(7, "ACS5K KS_FRDY"); | ||
198 | for (i = 8; i < 16; ++i) | ||
199 | gpio_request(i, "ACS5K Unused"); | ||
200 | |||
201 | gpio_request(3, "ACS5K CAN Control"); | ||
202 | gpio_request(6, "ACS5K Heartbeat"); | ||
203 | gpio_direction_output(3, 1); /* Default CAN_RESET high */ | ||
204 | gpio_direction_output(6, 0); /* Default KS8695_ACTIVE low */ | ||
205 | gpio_export(3, 0); /* export CAN_RESET as output only */ | ||
206 | gpio_export(6, 0); /* export KS8695_ACTIVE as output only */ | ||
207 | } | ||
208 | |||
209 | static void __init acs5k_init(void) | ||
210 | { | ||
211 | acs5k_init_gpio(); | ||
212 | |||
213 | /* Network device */ | ||
214 | ks8695_add_device_lan(); /* eth0 = LAN */ | ||
215 | ks8695_add_device_wan(); /* ethX = WAN */ | ||
216 | |||
217 | /* NOR devices */ | ||
218 | acs5k_register_nor(); | ||
219 | |||
220 | /* I2C bus */ | ||
221 | acs5k_i2c_init(); | ||
222 | } | ||
223 | |||
224 | MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board") | ||
225 | /* Maintainer: Simtec Electronics. */ | ||
226 | .phys_io = KS8695_IO_PA, | ||
227 | .io_pg_offst = (KS8695_IO_VA >> 18) & 0xfffc, | ||
228 | .boot_params = KS8695_SDRAM_PA + 0x100, | ||
229 | .map_io = ks8695_map_io, | ||
230 | .init_irq = ks8695_init_irq, | ||
231 | .init_machine = acs5k_init, | ||
232 | .timer = &ks8695_timer, | ||
233 | MACHINE_END | ||
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 8eea7306f29b..33214c1e0607 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -40,6 +40,9 @@ choice | |||
40 | config GUMSTIX_AM200EPD | 40 | config GUMSTIX_AM200EPD |
41 | bool "Enable AM200EPD board support" | 41 | bool "Enable AM200EPD board support" |
42 | 42 | ||
43 | config GUMSTIX_AM300EPD | ||
44 | bool "Enable AM300EPD board support" | ||
45 | |||
43 | endchoice | 46 | endchoice |
44 | 47 | ||
45 | config MACH_INTELMOTE2 | 48 | config MACH_INTELMOTE2 |
@@ -254,6 +257,10 @@ config MACH_EM_X270 | |||
254 | bool "CompuLab EM-x270 platform" | 257 | bool "CompuLab EM-x270 platform" |
255 | select PXA27x | 258 | select PXA27x |
256 | 259 | ||
260 | config MACH_EXEDA | ||
261 | bool "CompuLab eXeda platform" | ||
262 | select PXA27x | ||
263 | |||
257 | config MACH_COLIBRI | 264 | config MACH_COLIBRI |
258 | bool "Toradex Colibri PX27x" | 265 | bool "Toradex Colibri PX27x" |
259 | select PXA27x | 266 | select PXA27x |
@@ -295,8 +302,15 @@ config MACH_MAGICIAN | |||
295 | bool "Enable HTC Magician Support" | 302 | bool "Enable HTC Magician Support" |
296 | select PXA27x | 303 | select PXA27x |
297 | select IWMMXT | 304 | select IWMMXT |
305 | select PXA_SSP | ||
306 | select HAVE_PWM | ||
298 | select PXA_HAVE_BOARD_IRQS | 307 | select PXA_HAVE_BOARD_IRQS |
299 | 308 | ||
309 | config MACH_HIMALAYA | ||
310 | bool "HTC Himalaya Support" | ||
311 | select CPU_PXA26x | ||
312 | select FB_W100 | ||
313 | |||
300 | config MACH_MIOA701 | 314 | config MACH_MIOA701 |
301 | bool "Mitac Mio A701 Support" | 315 | bool "Mitac Mio A701 Support" |
302 | select PXA27x | 316 | select PXA27x |
@@ -319,6 +333,16 @@ config ARCH_PXA_PALM | |||
319 | bool "PXA based Palm PDAs" | 333 | bool "PXA based Palm PDAs" |
320 | select HAVE_PWM | 334 | select HAVE_PWM |
321 | 335 | ||
336 | config MACH_PALMT5 | ||
337 | bool "Palm Tungsten|T5" | ||
338 | default y | ||
339 | depends on ARCH_PXA_PALM | ||
340 | select PXA27x | ||
341 | select IWMMXT | ||
342 | help | ||
343 | Say Y here if you intend to run this kernel on a Palm Tungsten|T5 | ||
344 | handheld computer. | ||
345 | |||
322 | config MACH_PALMTX | 346 | config MACH_PALMTX |
323 | bool "Palm T|X" | 347 | bool "Palm T|X" |
324 | default y | 348 | default y |
@@ -339,6 +363,16 @@ config MACH_PALMZ72 | |||
339 | Say Y here if you intend to run this kernel on Palm Zire 72 | 363 | Say Y here if you intend to run this kernel on Palm Zire 72 |
340 | handheld computer. | 364 | handheld computer. |
341 | 365 | ||
366 | config MACH_PALMLD | ||
367 | bool "Palm LifeDrive" | ||
368 | default y | ||
369 | depends on ARCH_PXA_PALM | ||
370 | select PXA27x | ||
371 | select IWMMXT | ||
372 | help | ||
373 | Say Y here if you intend to run this kernel on a Palm LifeDrive | ||
374 | handheld computer. | ||
375 | |||
342 | config MACH_PCM990_BASEBOARD | 376 | config MACH_PCM990_BASEBOARD |
343 | bool "PHYTEC PCM-990 development board" | 377 | bool "PHYTEC PCM-990 development board" |
344 | select HAVE_PWM | 378 | select HAVE_PWM |
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 7b28bb561d63..361fcfa7531a 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
@@ -28,6 +28,7 @@ obj-$(CONFIG_CPU_PXA930) += pxa930.o | |||
28 | # Specific board support | 28 | # Specific board support |
29 | obj-$(CONFIG_ARCH_GUMSTIX) += gumstix.o | 29 | obj-$(CONFIG_ARCH_GUMSTIX) += gumstix.o |
30 | obj-$(CONFIG_GUMSTIX_AM200EPD) += am200epd.o | 30 | obj-$(CONFIG_GUMSTIX_AM200EPD) += am200epd.o |
31 | obj-$(CONFIG_GUMSTIX_AM300EPD) += am300epd.o | ||
31 | obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o | 32 | obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o |
32 | obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o | 33 | obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o |
33 | obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o | 34 | obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o |
@@ -45,6 +46,7 @@ obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o | |||
45 | obj-$(CONFIG_MACH_TOSA) += tosa.o | 46 | obj-$(CONFIG_MACH_TOSA) += tosa.o |
46 | obj-$(CONFIG_MACH_EM_X270) += em-x270.o | 47 | obj-$(CONFIG_MACH_EM_X270) += em-x270.o |
47 | obj-$(CONFIG_MACH_MAGICIAN) += magician.o | 48 | obj-$(CONFIG_MACH_MAGICIAN) += magician.o |
49 | obj-$(CONFIG_MACH_HIMALAYA) += himalaya.o | ||
48 | obj-$(CONFIG_MACH_MIOA701) += mioa701.o mioa701_bootresume.o | 50 | obj-$(CONFIG_MACH_MIOA701) += mioa701.o mioa701_bootresume.o |
49 | obj-$(CONFIG_ARCH_PXA_ESERIES) += eseries.o | 51 | obj-$(CONFIG_ARCH_PXA_ESERIES) += eseries.o |
50 | obj-$(CONFIG_MACH_E330) += e330.o | 52 | obj-$(CONFIG_MACH_E330) += e330.o |
@@ -53,7 +55,9 @@ obj-$(CONFIG_MACH_E740) += e740.o | |||
53 | obj-$(CONFIG_MACH_E750) += e750.o | 55 | obj-$(CONFIG_MACH_E750) += e750.o |
54 | obj-$(CONFIG_MACH_E400) += e400.o | 56 | obj-$(CONFIG_MACH_E400) += e400.o |
55 | obj-$(CONFIG_MACH_E800) += e800.o | 57 | obj-$(CONFIG_MACH_E800) += e800.o |
58 | obj-$(CONFIG_MACH_PALMT5) += palmt5.o | ||
56 | obj-$(CONFIG_MACH_PALMTX) += palmtx.o | 59 | obj-$(CONFIG_MACH_PALMTX) += palmtx.o |
60 | obj-$(CONFIG_MACH_PALMLD) += palmld.o | ||
57 | obj-$(CONFIG_MACH_PALMZ72) += palmz72.o | 61 | obj-$(CONFIG_MACH_PALMZ72) += palmz72.o |
58 | obj-$(CONFIG_ARCH_VIPER) += viper.o | 62 | obj-$(CONFIG_ARCH_VIPER) += viper.o |
59 | 63 | ||
diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c index 77ee80e5e47b..3499fada73ae 100644 --- a/arch/arm/mach-pxa/am200epd.c +++ b/arch/arm/mach-pxa/am200epd.c | |||
@@ -30,8 +30,8 @@ | |||
30 | #include <linux/irq.h> | 30 | #include <linux/irq.h> |
31 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |
32 | 32 | ||
33 | #include <mach/pxa25x.h> | ||
33 | #include <mach/gumstix.h> | 34 | #include <mach/gumstix.h> |
34 | #include <mach/mfp-pxa25x.h> | ||
35 | #include <mach/pxafb.h> | 35 | #include <mach/pxafb.h> |
36 | 36 | ||
37 | #include "generic.h" | 37 | #include "generic.h" |
diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c new file mode 100644 index 000000000000..4bd10a17332e --- /dev/null +++ b/arch/arm/mach-pxa/am300epd.c | |||
@@ -0,0 +1,295 @@ | |||
1 | /* | ||
2 | * am300epd.c -- Platform device for AM300 EPD kit | ||
3 | * | ||
4 | * Copyright (C) 2008, Jaya Kumar | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file COPYING in the main directory of this archive for | ||
8 | * more details. | ||
9 | * | ||
10 | * This work was made possible by help and equipment support from E-Ink | ||
11 | * Corporation. http://support.eink.com/community | ||
12 | * | ||
13 | * This driver is written to be used with the Broadsheet display controller. | ||
14 | * on the AM300 EPD prototype kit/development kit with an E-Ink 800x600 | ||
15 | * Vizplex EPD on a Gumstix board using the Broadsheet interface board. | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #include <linux/module.h> | ||
20 | #include <linux/kernel.h> | ||
21 | #include <linux/errno.h> | ||
22 | #include <linux/string.h> | ||
23 | #include <linux/delay.h> | ||
24 | #include <linux/interrupt.h> | ||
25 | #include <linux/fb.h> | ||
26 | #include <linux/init.h> | ||
27 | #include <linux/platform_device.h> | ||
28 | #include <linux/irq.h> | ||
29 | #include <linux/gpio.h> | ||
30 | |||
31 | #include <mach/gumstix.h> | ||
32 | #include <mach/mfp-pxa25x.h> | ||
33 | #include <mach/pxafb.h> | ||
34 | |||
35 | #include "generic.h" | ||
36 | |||
37 | #include <video/broadsheetfb.h> | ||
38 | |||
39 | static unsigned int panel_type = 6; | ||
40 | static struct platform_device *am300_device; | ||
41 | static struct broadsheet_board am300_board; | ||
42 | |||
43 | static unsigned long am300_pin_config[] __initdata = { | ||
44 | GPIO16_GPIO, | ||
45 | GPIO17_GPIO, | ||
46 | GPIO32_GPIO, | ||
47 | GPIO48_GPIO, | ||
48 | GPIO49_GPIO, | ||
49 | GPIO51_GPIO, | ||
50 | GPIO74_GPIO, | ||
51 | GPIO75_GPIO, | ||
52 | GPIO76_GPIO, | ||
53 | GPIO77_GPIO, | ||
54 | |||
55 | /* this is the 16-bit hdb bus 58-73 */ | ||
56 | GPIO58_GPIO, | ||
57 | GPIO59_GPIO, | ||
58 | GPIO60_GPIO, | ||
59 | GPIO61_GPIO, | ||
60 | |||
61 | GPIO62_GPIO, | ||
62 | GPIO63_GPIO, | ||
63 | GPIO64_GPIO, | ||
64 | GPIO65_GPIO, | ||
65 | |||
66 | GPIO66_GPIO, | ||
67 | GPIO67_GPIO, | ||
68 | GPIO68_GPIO, | ||
69 | GPIO69_GPIO, | ||
70 | |||
71 | GPIO70_GPIO, | ||
72 | GPIO71_GPIO, | ||
73 | GPIO72_GPIO, | ||
74 | GPIO73_GPIO, | ||
75 | }; | ||
76 | |||
77 | /* register offsets for gpio control */ | ||
78 | #define PWR_GPIO_PIN 16 | ||
79 | #define CFG_GPIO_PIN 17 | ||
80 | #define RDY_GPIO_PIN 32 | ||
81 | #define DC_GPIO_PIN 48 | ||
82 | #define RST_GPIO_PIN 49 | ||
83 | #define LED_GPIO_PIN 51 | ||
84 | #define RD_GPIO_PIN 74 | ||
85 | #define WR_GPIO_PIN 75 | ||
86 | #define CS_GPIO_PIN 76 | ||
87 | #define IRQ_GPIO_PIN 77 | ||
88 | |||
89 | /* hdb bus */ | ||
90 | #define DB0_GPIO_PIN 58 | ||
91 | #define DB15_GPIO_PIN 73 | ||
92 | |||
93 | static int gpios[] = { PWR_GPIO_PIN, CFG_GPIO_PIN, RDY_GPIO_PIN, DC_GPIO_PIN, | ||
94 | RST_GPIO_PIN, RD_GPIO_PIN, WR_GPIO_PIN, CS_GPIO_PIN, | ||
95 | IRQ_GPIO_PIN, LED_GPIO_PIN }; | ||
96 | static char *gpio_names[] = { "PWR", "CFG", "RDY", "DC", "RST", "RD", "WR", | ||
97 | "CS", "IRQ", "LED" }; | ||
98 | |||
99 | static int am300_wait_event(struct broadsheetfb_par *par) | ||
100 | { | ||
101 | /* todo: improve err recovery */ | ||
102 | wait_event(par->waitq, gpio_get_value(RDY_GPIO_PIN)); | ||
103 | return 0; | ||
104 | } | ||
105 | |||
106 | static int am300_init_gpio_regs(struct broadsheetfb_par *par) | ||
107 | { | ||
108 | int i; | ||
109 | int err; | ||
110 | char dbname[8]; | ||
111 | |||
112 | for (i = 0; i < ARRAY_SIZE(gpios); i++) { | ||
113 | err = gpio_request(gpios[i], gpio_names[i]); | ||
114 | if (err) { | ||
115 | dev_err(&am300_device->dev, "failed requesting " | ||
116 | "gpio %s, err=%d\n", gpio_names[i], err); | ||
117 | goto err_req_gpio; | ||
118 | } | ||
119 | } | ||
120 | |||
121 | /* we also need to take care of the hdb bus */ | ||
122 | for (i = DB0_GPIO_PIN; i <= DB15_GPIO_PIN; i++) { | ||
123 | sprintf(dbname, "DB%d", i); | ||
124 | err = gpio_request(i, dbname); | ||
125 | if (err) { | ||
126 | dev_err(&am300_device->dev, "failed requesting " | ||
127 | "gpio %d, err=%d\n", i, err); | ||
128 | while (i >= DB0_GPIO_PIN) | ||
129 | gpio_free(i--); | ||
130 | i = ARRAY_SIZE(gpios) - 1; | ||
131 | goto err_req_gpio; | ||
132 | } | ||
133 | } | ||
134 | |||
135 | /* setup the outputs and init values */ | ||
136 | gpio_direction_output(PWR_GPIO_PIN, 0); | ||
137 | gpio_direction_output(CFG_GPIO_PIN, 1); | ||
138 | gpio_direction_output(DC_GPIO_PIN, 0); | ||
139 | gpio_direction_output(RD_GPIO_PIN, 1); | ||
140 | gpio_direction_output(WR_GPIO_PIN, 1); | ||
141 | gpio_direction_output(CS_GPIO_PIN, 1); | ||
142 | gpio_direction_output(RST_GPIO_PIN, 0); | ||
143 | |||
144 | /* setup the inputs */ | ||
145 | gpio_direction_input(RDY_GPIO_PIN); | ||
146 | gpio_direction_input(IRQ_GPIO_PIN); | ||
147 | |||
148 | /* start the hdb bus as an input */ | ||
149 | for (i = DB0_GPIO_PIN; i <= DB15_GPIO_PIN; i++) | ||
150 | gpio_direction_output(i, 0); | ||
151 | |||
152 | /* go into command mode */ | ||
153 | gpio_set_value(CFG_GPIO_PIN, 1); | ||
154 | gpio_set_value(RST_GPIO_PIN, 0); | ||
155 | msleep(10); | ||
156 | gpio_set_value(RST_GPIO_PIN, 1); | ||
157 | msleep(10); | ||
158 | am300_wait_event(par); | ||
159 | |||
160 | return 0; | ||
161 | |||
162 | err_req_gpio: | ||
163 | while (i > 0) | ||
164 | gpio_free(gpios[i--]); | ||
165 | |||
166 | return err; | ||
167 | } | ||
168 | |||
169 | static int am300_init_board(struct broadsheetfb_par *par) | ||
170 | { | ||
171 | return am300_init_gpio_regs(par); | ||
172 | } | ||
173 | |||
174 | static void am300_cleanup(struct broadsheetfb_par *par) | ||
175 | { | ||
176 | int i; | ||
177 | |||
178 | free_irq(IRQ_GPIO(RDY_GPIO_PIN), par); | ||
179 | |||
180 | for (i = 0; i < ARRAY_SIZE(gpios); i++) | ||
181 | gpio_free(gpios[i]); | ||
182 | |||
183 | for (i = DB0_GPIO_PIN; i <= DB15_GPIO_PIN; i++) | ||
184 | gpio_free(i); | ||
185 | |||
186 | } | ||
187 | |||
188 | static u16 am300_get_hdb(struct broadsheetfb_par *par) | ||
189 | { | ||
190 | u16 res = 0; | ||
191 | int i; | ||
192 | |||
193 | for (i = 0; i <= (DB15_GPIO_PIN - DB0_GPIO_PIN) ; i++) | ||
194 | res |= (gpio_get_value(DB0_GPIO_PIN + i)) ? (1 << i) : 0; | ||
195 | |||
196 | return res; | ||
197 | } | ||
198 | |||
199 | static void am300_set_hdb(struct broadsheetfb_par *par, u16 data) | ||
200 | { | ||
201 | int i; | ||
202 | |||
203 | for (i = 0; i <= (DB15_GPIO_PIN - DB0_GPIO_PIN) ; i++) | ||
204 | gpio_set_value(DB0_GPIO_PIN + i, (data >> i) & 0x01); | ||
205 | } | ||
206 | |||
207 | |||
208 | static void am300_set_ctl(struct broadsheetfb_par *par, unsigned char bit, | ||
209 | u8 state) | ||
210 | { | ||
211 | switch (bit) { | ||
212 | case BS_CS: | ||
213 | gpio_set_value(CS_GPIO_PIN, state); | ||
214 | break; | ||
215 | case BS_DC: | ||
216 | gpio_set_value(DC_GPIO_PIN, state); | ||
217 | break; | ||
218 | case BS_WR: | ||
219 | gpio_set_value(WR_GPIO_PIN, state); | ||
220 | break; | ||
221 | } | ||
222 | } | ||
223 | |||
224 | static int am300_get_panel_type(void) | ||
225 | { | ||
226 | return panel_type; | ||
227 | } | ||
228 | |||
229 | static irqreturn_t am300_handle_irq(int irq, void *dev_id) | ||
230 | { | ||
231 | struct broadsheetfb_par *par = dev_id; | ||
232 | |||
233 | wake_up(&par->waitq); | ||
234 | return IRQ_HANDLED; | ||
235 | } | ||
236 | |||
237 | static int am300_setup_irq(struct fb_info *info) | ||
238 | { | ||
239 | int ret; | ||
240 | struct broadsheetfb_par *par = info->par; | ||
241 | |||
242 | ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am300_handle_irq, | ||
243 | IRQF_DISABLED|IRQF_TRIGGER_RISING, | ||
244 | "AM300", par); | ||
245 | if (ret) | ||
246 | dev_err(&am300_device->dev, "request_irq failed: %d\n", ret); | ||
247 | |||
248 | return ret; | ||
249 | } | ||
250 | |||
251 | static struct broadsheet_board am300_board = { | ||
252 | .owner = THIS_MODULE, | ||
253 | .init = am300_init_board, | ||
254 | .cleanup = am300_cleanup, | ||
255 | .set_hdb = am300_set_hdb, | ||
256 | .get_hdb = am300_get_hdb, | ||
257 | .set_ctl = am300_set_ctl, | ||
258 | .wait_for_rdy = am300_wait_event, | ||
259 | .get_panel_type = am300_get_panel_type, | ||
260 | .setup_irq = am300_setup_irq, | ||
261 | }; | ||
262 | |||
263 | int __init am300_init(void) | ||
264 | { | ||
265 | int ret; | ||
266 | |||
267 | pxa2xx_mfp_config(ARRAY_AND_SIZE(am300_pin_config)); | ||
268 | |||
269 | /* request our platform independent driver */ | ||
270 | request_module("broadsheetfb"); | ||
271 | |||
272 | am300_device = platform_device_alloc("broadsheetfb", -1); | ||
273 | if (!am300_device) | ||
274 | return -ENOMEM; | ||
275 | |||
276 | /* the am300_board that will be seen by broadsheetfb is a copy */ | ||
277 | platform_device_add_data(am300_device, &am300_board, | ||
278 | sizeof(am300_board)); | ||
279 | |||
280 | ret = platform_device_add(am300_device); | ||
281 | |||
282 | if (ret) { | ||
283 | platform_device_put(am300_device); | ||
284 | return ret; | ||
285 | } | ||
286 | |||
287 | return 0; | ||
288 | } | ||
289 | |||
290 | module_param(panel_type, uint, 0); | ||
291 | MODULE_PARM_DESC(panel_type, "Select the panel type: 6, 8, 97"); | ||
292 | |||
293 | MODULE_DESCRIPTION("board driver for am300 epd kit"); | ||
294 | MODULE_AUTHOR("Jaya Kumar"); | ||
295 | MODULE_LICENSE("GPL"); | ||
diff --git a/arch/arm/mach-pxa/cm-x255.c b/arch/arm/mach-pxa/cm-x255.c index 83a4cdf08176..253fd76142d6 100644 --- a/arch/arm/mach-pxa/cm-x255.c +++ b/arch/arm/mach-pxa/cm-x255.c | |||
@@ -22,10 +22,8 @@ | |||
22 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
23 | #include <asm/mach/map.h> | 23 | #include <asm/mach/map.h> |
24 | 24 | ||
25 | #include <mach/pxa2xx-regs.h> | 25 | #include <mach/pxa25x.h> |
26 | #include <mach/mfp-pxa25x.h> | ||
27 | #include <mach/pxa2xx_spi.h> | 26 | #include <mach/pxa2xx_spi.h> |
28 | #include <mach/bitfield.h> | ||
29 | 27 | ||
30 | #include "generic.h" | 28 | #include "generic.h" |
31 | 29 | ||
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index df83b97f303f..34576ba5f5fd 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/rtc-v3020.h> | 17 | #include <linux/rtc-v3020.h> |
18 | #include <video/mbxfb.h> | 18 | #include <video/mbxfb.h> |
19 | 19 | ||
20 | #include <mach/mfp-pxa27x.h> | 20 | #include <mach/pxa27x.h> |
21 | #include <mach/ohci.h> | 21 | #include <mach/ohci.h> |
22 | #include <mach/mmc.h> | 22 | #include <mach/mmc.h> |
23 | 23 | ||
diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c index 3156b25f6e9d..7873fa3d8fa4 100644 --- a/arch/arm/mach-pxa/cm-x2xx-pci.c +++ b/arch/arm/mach-pxa/cm-x2xx-pci.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
23 | 23 | ||
24 | #include <asm/mach/pci.h> | 24 | #include <asm/mach/pci.h> |
25 | #include <mach/pxa-regs.h> | ||
26 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
27 | 26 | ||
28 | #include <asm/hardware/it8152.h> | 27 | #include <asm/hardware/it8152.h> |
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index d99fd9e4d888..117b5435f8d5 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/arch/arm/mach-pxa/cm-x2xx.c | |||
@@ -22,8 +22,6 @@ | |||
22 | #include <asm/mach/map.h> | 22 | #include <asm/mach/map.h> |
23 | 23 | ||
24 | #include <mach/pxa2xx-regs.h> | 24 | #include <mach/pxa2xx-regs.h> |
25 | #include <mach/mfp-pxa27x.h> | ||
26 | #include <mach/pxa-regs.h> | ||
27 | #include <mach/audio.h> | 25 | #include <mach/audio.h> |
28 | #include <mach/pxafb.h> | 26 | #include <mach/pxafb.h> |
29 | 27 | ||
@@ -96,7 +94,7 @@ static struct resource cmx270_dm9000_resource[] = { | |||
96 | }; | 94 | }; |
97 | 95 | ||
98 | static struct dm9000_plat_data cmx270_dm9000_platdata = { | 96 | static struct dm9000_plat_data cmx270_dm9000_platdata = { |
99 | .flags = DM9000_PLATF_32BITONLY, | 97 | .flags = DM9000_PLATF_32BITONLY | DM9000_PLATF_NO_EEPROM, |
100 | }; | 98 | }; |
101 | 99 | ||
102 | static struct platform_device cmx2xx_dm9000_device = { | 100 | static struct platform_device cmx2xx_dm9000_device = { |
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index ff0c577cd1ac..a9f48b1cb54a 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
@@ -28,9 +28,7 @@ | |||
28 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
29 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
30 | 30 | ||
31 | #include <mach/mfp-pxa300.h> | 31 | #include <mach/pxa300.h> |
32 | |||
33 | #include <mach/hardware.h> | ||
34 | #include <mach/pxafb.h> | 32 | #include <mach/pxafb.h> |
35 | #include <mach/mmc.h> | 33 | #include <mach/mmc.h> |
36 | #include <mach/ohci.h> | 34 | #include <mach/ohci.h> |
@@ -162,7 +160,7 @@ static struct resource dm9000_resources[] = { | |||
162 | }; | 160 | }; |
163 | 161 | ||
164 | static struct dm9000_plat_data cm_x300_dm9000_platdata = { | 162 | static struct dm9000_plat_data cm_x300_dm9000_platdata = { |
165 | .flags = DM9000_PLATF_16BITONLY, | 163 | .flags = DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM, |
166 | }; | 164 | }; |
167 | 165 | ||
168 | static struct platform_device dm9000_device = { | 166 | static struct platform_device dm9000_device = { |
diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c index e8473624427e..26493ae2889e 100644 --- a/arch/arm/mach-pxa/colibri.c +++ b/arch/arm/mach-pxa/colibri.c | |||
@@ -28,8 +28,8 @@ | |||
28 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
29 | #include <asm/mach/irq.h> | 29 | #include <asm/mach/irq.h> |
30 | #include <asm/mach/flash.h> | 30 | #include <asm/mach/flash.h> |
31 | #include <mach/pxa-regs.h> | 31 | |
32 | #include <mach/mfp-pxa27x.h> | 32 | #include <mach/pxa27x.h> |
33 | #include <mach/colibri.h> | 33 | #include <mach/colibri.h> |
34 | 34 | ||
35 | #include "generic.h" | 35 | #include "generic.h" |
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index a8d91b6c136b..3b89e5010fb3 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
@@ -41,9 +41,7 @@ | |||
41 | #include <asm/mach/map.h> | 41 | #include <asm/mach/map.h> |
42 | #include <asm/mach/irq.h> | 42 | #include <asm/mach/irq.h> |
43 | 43 | ||
44 | #include <mach/pxa-regs.h> | 44 | #include <mach/pxa25x.h> |
45 | #include <mach/pxa2xx-regs.h> | ||
46 | #include <mach/mfp-pxa25x.h> | ||
47 | #include <mach/i2c.h> | 45 | #include <mach/i2c.h> |
48 | #include <mach/irda.h> | 46 | #include <mach/irda.h> |
49 | #include <mach/mmc.h> | 47 | #include <mach/mmc.h> |
diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c index 411607bc1fc2..d9b96319d498 100644 --- a/arch/arm/mach-pxa/corgi_lcd.c +++ b/arch/arm/mach-pxa/corgi_lcd.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/string.h> | 22 | #include <linux/string.h> |
23 | #include <mach/corgi.h> | 23 | #include <mach/corgi.h> |
24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
25 | #include <mach/pxa-regs.h> | ||
26 | #include <mach/sharpsl.h> | 25 | #include <mach/sharpsl.h> |
27 | #include <mach/spitz.h> | 26 | #include <mach/spitz.h> |
28 | #include <asm/hardware/scoop.h> | 27 | #include <asm/hardware/scoop.h> |
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index e35259032813..7f04b3a761d1 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <mach/sharpsl.h> | 25 | #include <mach/sharpsl.h> |
26 | #include <mach/corgi.h> | 26 | #include <mach/corgi.h> |
27 | #include <mach/pxa-regs.h> | ||
28 | #include <mach/pxa2xx-regs.h> | 27 | #include <mach/pxa2xx-regs.h> |
29 | #include <mach/pxa2xx-gpio.h> | 28 | #include <mach/pxa2xx-gpio.h> |
30 | #include "sharpsl.h" | 29 | #include "sharpsl.h" |
diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c index 8e2f2215c4ba..a5ee70735e04 100644 --- a/arch/arm/mach-pxa/corgi_ssp.c +++ b/arch/arm/mach-pxa/corgi_ssp.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
21 | 21 | ||
22 | #include <mach/ssp.h> | 22 | #include <mach/ssp.h> |
23 | #include <mach/pxa-regs.h> | ||
24 | #include <mach/pxa2xx-gpio.h> | 23 | #include <mach/pxa2xx-gpio.h> |
25 | #include <mach/regs-ssp.h> | 24 | #include <mach/regs-ssp.h> |
26 | #include "sharpsl.h" | 25 | #include "sharpsl.h" |
diff --git a/arch/arm/mach-pxa/cpufreq-pxa2xx.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c index 771dd4eac935..083a1d851d49 100644 --- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c +++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c | |||
@@ -37,8 +37,6 @@ | |||
37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
38 | #include <linux/cpufreq.h> | 38 | #include <linux/cpufreq.h> |
39 | 39 | ||
40 | #include <mach/hardware.h> | ||
41 | #include <mach/pxa-regs.h> | ||
42 | #include <mach/pxa2xx-regs.h> | 40 | #include <mach/pxa2xx-regs.h> |
43 | 41 | ||
44 | #ifdef DEBUG | 42 | #ifdef DEBUG |
diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c index 968c8309ec37..67f34a8d8e60 100644 --- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c +++ b/arch/arm/mach-pxa/cpufreq-pxa3xx.c | |||
@@ -15,8 +15,6 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/cpufreq.h> | 16 | #include <linux/cpufreq.h> |
17 | 17 | ||
18 | #include <mach/hardware.h> | ||
19 | #include <mach/pxa-regs.h> | ||
20 | #include <mach/pxa3xx-regs.h> | 18 | #include <mach/pxa3xx-regs.h> |
21 | 19 | ||
22 | #include "generic.h" | 20 | #include "generic.h" |
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index e16f8e3d58d3..d245e59c51b1 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
@@ -4,7 +4,6 @@ | |||
4 | #include <linux/platform_device.h> | 4 | #include <linux/platform_device.h> |
5 | #include <linux/dma-mapping.h> | 5 | #include <linux/dma-mapping.h> |
6 | 6 | ||
7 | #include <mach/pxa-regs.h> | ||
8 | #include <mach/udc.h> | 7 | #include <mach/udc.h> |
9 | #include <mach/pxafb.h> | 8 | #include <mach/pxafb.h> |
10 | #include <mach/mmc.h> | 9 | #include <mach/mmc.h> |
diff --git a/arch/arm/mach-pxa/dma.c b/arch/arm/mach-pxa/dma.c index 7de17fc5d54b..01217e01f7d2 100644 --- a/arch/arm/mach-pxa/dma.c +++ b/arch/arm/mach-pxa/dma.c | |||
@@ -23,8 +23,6 @@ | |||
23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
24 | #include <mach/dma.h> | 24 | #include <mach/dma.h> |
25 | 25 | ||
26 | #include <mach/pxa-regs.h> | ||
27 | |||
28 | struct dma_channel { | 26 | struct dma_channel { |
29 | char *name; | 27 | char *name; |
30 | pxa_dma_prio prio; | 28 | pxa_dma_prio prio; |
@@ -113,7 +111,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id) | |||
113 | return IRQ_HANDLED; | 111 | return IRQ_HANDLED; |
114 | } | 112 | } |
115 | 113 | ||
116 | int __init pxa_init_dma(int num_ch) | 114 | int __init pxa_init_dma(int irq, int num_ch) |
117 | { | 115 | { |
118 | int i, ret; | 116 | int i, ret; |
119 | 117 | ||
@@ -131,7 +129,7 @@ int __init pxa_init_dma(int num_ch) | |||
131 | dma_channels[i].prio = min((i & 0xf) >> 2, DMA_PRIO_LOW); | 129 | dma_channels[i].prio = min((i & 0xf) >> 2, DMA_PRIO_LOW); |
132 | } | 130 | } |
133 | 131 | ||
134 | ret = request_irq(IRQ_DMA, dma_irq_handler, IRQF_DISABLED, "DMA", NULL); | 132 | ret = request_irq(irq, dma_irq_handler, IRQF_DISABLED, "DMA", NULL); |
135 | if (ret) { | 133 | if (ret) { |
136 | printk (KERN_CRIT "Wow! Can't register IRQ for DMA\n"); | 134 | printk (KERN_CRIT "Wow! Can't register IRQ for DMA\n"); |
137 | kfree(dma_channels); | 135 | kfree(dma_channels); |
diff --git a/arch/arm/mach-pxa/e330.c b/arch/arm/mach-pxa/e330.c index 1bd7f740427c..74d3f8987c5c 100644 --- a/arch/arm/mach-pxa/e330.c +++ b/arch/arm/mach-pxa/e330.c | |||
@@ -20,9 +20,7 @@ | |||
20 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
21 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
22 | 22 | ||
23 | #include <mach/mfp-pxa25x.h> | 23 | #include <mach/pxa25x.h> |
24 | #include <mach/hardware.h> | ||
25 | #include <mach/pxa-regs.h> | ||
26 | #include <mach/eseries-gpio.h> | 24 | #include <mach/eseries-gpio.h> |
27 | #include <mach/udc.h> | 25 | #include <mach/udc.h> |
28 | 26 | ||
diff --git a/arch/arm/mach-pxa/e350.c b/arch/arm/mach-pxa/e350.c index edcd9d5ce545..080036272131 100644 --- a/arch/arm/mach-pxa/e350.c +++ b/arch/arm/mach-pxa/e350.c | |||
@@ -21,9 +21,7 @@ | |||
21 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
22 | 22 | ||
23 | #include <mach/irqs.h> | 23 | #include <mach/irqs.h> |
24 | #include <mach/mfp-pxa25x.h> | 24 | #include <mach/pxa25x.h> |
25 | #include <mach/pxa-regs.h> | ||
26 | #include <mach/hardware.h> | ||
27 | #include <mach/eseries-gpio.h> | 25 | #include <mach/eseries-gpio.h> |
28 | #include <mach/udc.h> | 26 | #include <mach/udc.h> |
29 | 27 | ||
diff --git a/arch/arm/mach-pxa/e400.c b/arch/arm/mach-pxa/e400.c index 77bb8e2c48c0..ed9c0c3f64a2 100644 --- a/arch/arm/mach-pxa/e400.c +++ b/arch/arm/mach-pxa/e400.c | |||
@@ -22,9 +22,7 @@ | |||
22 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
24 | 24 | ||
25 | #include <mach/mfp-pxa25x.h> | 25 | #include <mach/pxa25x.h> |
26 | #include <mach/pxa-regs.h> | ||
27 | #include <mach/hardware.h> | ||
28 | #include <mach/eseries-gpio.h> | 26 | #include <mach/eseries-gpio.h> |
29 | #include <mach/pxafb.h> | 27 | #include <mach/pxafb.h> |
30 | #include <mach/udc.h> | 28 | #include <mach/udc.h> |
diff --git a/arch/arm/mach-pxa/e740.c b/arch/arm/mach-pxa/e740.c index 6d48e00f4f0b..e0c3aaf1ecb3 100644 --- a/arch/arm/mach-pxa/e740.c +++ b/arch/arm/mach-pxa/e740.c | |||
@@ -24,9 +24,7 @@ | |||
24 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
25 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
26 | 26 | ||
27 | #include <mach/mfp-pxa25x.h> | 27 | #include <mach/pxa25x.h> |
28 | #include <mach/pxa-regs.h> | ||
29 | #include <mach/hardware.h> | ||
30 | #include <mach/eseries-gpio.h> | 28 | #include <mach/eseries-gpio.h> |
31 | #include <mach/udc.h> | 29 | #include <mach/udc.h> |
32 | #include <mach/irda.h> | 30 | #include <mach/irda.h> |
diff --git a/arch/arm/mach-pxa/e750.c b/arch/arm/mach-pxa/e750.c index be1ab8edb973..84b050f1a996 100644 --- a/arch/arm/mach-pxa/e750.c +++ b/arch/arm/mach-pxa/e750.c | |||
@@ -23,9 +23,7 @@ | |||
23 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
24 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
25 | 25 | ||
26 | #include <mach/mfp-pxa25x.h> | 26 | #include <mach/pxa25x.h> |
27 | #include <mach/pxa-regs.h> | ||
28 | #include <mach/hardware.h> | ||
29 | #include <mach/eseries-gpio.h> | 27 | #include <mach/eseries-gpio.h> |
30 | #include <mach/udc.h> | 28 | #include <mach/udc.h> |
31 | #include <mach/irda.h> | 29 | #include <mach/irda.h> |
diff --git a/arch/arm/mach-pxa/e800.c b/arch/arm/mach-pxa/e800.c index cc9b1293e866..f8924f6ca544 100644 --- a/arch/arm/mach-pxa/e800.c +++ b/arch/arm/mach-pxa/e800.c | |||
@@ -23,9 +23,7 @@ | |||
23 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
24 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
25 | 25 | ||
26 | #include <mach/mfp-pxa25x.h> | 26 | #include <mach/pxa25x.h> |
27 | #include <mach/pxa-regs.h> | ||
28 | #include <mach/hardware.h> | ||
29 | #include <mach/eseries-gpio.h> | 27 | #include <mach/eseries-gpio.h> |
30 | #include <mach/udc.h> | 28 | #include <mach/udc.h> |
31 | #include <mach/irqs.h> | 29 | #include <mach/irqs.h> |
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index f5ed8038ede5..920dfb8d36da 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -11,40 +11,63 @@ | |||
11 | 11 | ||
12 | #include <linux/irq.h> | 12 | #include <linux/irq.h> |
13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
14 | #include <linux/delay.h> | ||
14 | 15 | ||
15 | #include <linux/dm9000.h> | 16 | #include <linux/dm9000.h> |
16 | #include <linux/rtc-v3020.h> | 17 | #include <linux/rtc-v3020.h> |
17 | #include <linux/mtd/nand.h> | 18 | #include <linux/mtd/nand.h> |
18 | #include <linux/mtd/partitions.h> | 19 | #include <linux/mtd/partitions.h> |
20 | #include <linux/mtd/physmap.h> | ||
19 | #include <linux/input.h> | 21 | #include <linux/input.h> |
20 | #include <linux/gpio_keys.h> | 22 | #include <linux/gpio_keys.h> |
21 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
24 | #include <linux/mfd/da903x.h> | ||
25 | #include <linux/regulator/machine.h> | ||
26 | #include <linux/spi/spi.h> | ||
27 | #include <linux/spi/tdo24m.h> | ||
28 | #include <linux/power_supply.h> | ||
29 | #include <linux/apm-emulation.h> | ||
30 | |||
31 | #include <media/soc_camera.h> | ||
22 | 32 | ||
23 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
24 | #include <asm/mach/arch.h> | 34 | #include <asm/mach/arch.h> |
25 | 35 | ||
26 | #include <mach/mfp-pxa27x.h> | 36 | #include <mach/pxa27x.h> |
27 | #include <mach/pxa-regs.h> | ||
28 | #include <mach/pxa27x-udc.h> | 37 | #include <mach/pxa27x-udc.h> |
29 | #include <mach/audio.h> | 38 | #include <mach/audio.h> |
30 | #include <mach/pxafb.h> | 39 | #include <mach/pxafb.h> |
31 | #include <mach/ohci.h> | 40 | #include <mach/ohci.h> |
32 | #include <mach/mmc.h> | 41 | #include <mach/mmc.h> |
33 | #include <mach/pxa27x_keypad.h> | 42 | #include <mach/pxa27x_keypad.h> |
43 | #include <mach/i2c.h> | ||
44 | #include <mach/camera.h> | ||
45 | #include <mach/pxa2xx_spi.h> | ||
34 | 46 | ||
35 | #include "generic.h" | 47 | #include "generic.h" |
48 | #include "devices.h" | ||
36 | 49 | ||
37 | /* GPIO IRQ usage */ | 50 | /* EM-X270 specific GPIOs */ |
38 | #define GPIO41_ETHIRQ (41) | ||
39 | #define GPIO13_MMC_CD (13) | 51 | #define GPIO13_MMC_CD (13) |
52 | #define GPIO95_MMC_WP (95) | ||
53 | #define GPIO56_NAND_RB (56) | ||
54 | |||
55 | /* eXeda specific GPIOs */ | ||
56 | #define GPIO114_MMC_CD (114) | ||
57 | #define GPIO20_NAND_RB (20) | ||
58 | #define GPIO38_SD_PWEN (38) | ||
59 | |||
60 | /* common GPIOs */ | ||
61 | #define GPIO11_NAND_CS (11) | ||
62 | #define GPIO93_CAM_RESET (93) | ||
63 | #define GPIO41_ETHIRQ (41) | ||
40 | #define EM_X270_ETHIRQ IRQ_GPIO(GPIO41_ETHIRQ) | 64 | #define EM_X270_ETHIRQ IRQ_GPIO(GPIO41_ETHIRQ) |
41 | #define EM_X270_MMC_CD IRQ_GPIO(GPIO13_MMC_CD) | ||
42 | 65 | ||
43 | /* NAND control GPIOs */ | 66 | static int mmc_cd; |
44 | #define GPIO11_NAND_CS (11) | 67 | static int nand_rb; |
45 | #define GPIO56_NAND_RB (56) | 68 | static int dm9000_flags; |
46 | 69 | ||
47 | static unsigned long em_x270_pin_config[] = { | 70 | static unsigned long common_pin_config[] = { |
48 | /* AC'97 */ | 71 | /* AC'97 */ |
49 | GPIO28_AC97_BITCLK, | 72 | GPIO28_AC97_BITCLK, |
50 | GPIO29_AC97_SDATA_IN_0, | 73 | GPIO29_AC97_SDATA_IN_0, |
@@ -150,21 +173,32 @@ static unsigned long em_x270_pin_config[] = { | |||
150 | GPIO18_RDY, | 173 | GPIO18_RDY, |
151 | 174 | ||
152 | /* GPIO */ | 175 | /* GPIO */ |
153 | GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH, | 176 | GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH, /* sleep/resume button */ |
154 | 177 | ||
155 | /* power controls */ | 178 | /* power controls */ |
156 | GPIO20_GPIO | MFP_LPM_DRIVE_LOW, /* GPRS_PWEN */ | 179 | GPIO20_GPIO | MFP_LPM_DRIVE_LOW, /* GPRS_PWEN */ |
180 | GPIO93_GPIO | MFP_LPM_DRIVE_LOW, /* Camera reset */ | ||
157 | GPIO115_GPIO | MFP_LPM_DRIVE_LOW, /* WLAN_PWEN */ | 181 | GPIO115_GPIO | MFP_LPM_DRIVE_LOW, /* WLAN_PWEN */ |
158 | 182 | ||
159 | /* NAND controls */ | 183 | /* NAND controls */ |
160 | GPIO11_GPIO | MFP_LPM_DRIVE_HIGH, /* NAND CE# */ | 184 | GPIO11_GPIO | MFP_LPM_DRIVE_HIGH, /* NAND CE# */ |
161 | GPIO56_GPIO, /* NAND Ready/Busy */ | ||
162 | 185 | ||
163 | /* interrupts */ | 186 | /* interrupts */ |
164 | GPIO13_GPIO, /* MMC card detect */ | ||
165 | GPIO41_GPIO, /* DM9000 interrupt */ | 187 | GPIO41_GPIO, /* DM9000 interrupt */ |
166 | }; | 188 | }; |
167 | 189 | ||
190 | static unsigned long em_x270_pin_config[] = { | ||
191 | GPIO13_GPIO, /* MMC card detect */ | ||
192 | GPIO56_GPIO, /* NAND Ready/Busy */ | ||
193 | GPIO95_GPIO, /* MMC Write protect */ | ||
194 | }; | ||
195 | |||
196 | static unsigned long exeda_pin_config[] = { | ||
197 | GPIO20_GPIO, /* NAND Ready/Busy */ | ||
198 | GPIO38_GPIO | MFP_LPM_DRIVE_LOW, /* SD slot power */ | ||
199 | GPIO114_GPIO, /* MMC card detect */ | ||
200 | }; | ||
201 | |||
168 | #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) | 202 | #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) |
169 | static struct resource em_x270_dm9000_resource[] = { | 203 | static struct resource em_x270_dm9000_resource[] = { |
170 | [0] = { | 204 | [0] = { |
@@ -185,7 +219,7 @@ static struct resource em_x270_dm9000_resource[] = { | |||
185 | }; | 219 | }; |
186 | 220 | ||
187 | static struct dm9000_plat_data em_x270_dm9000_platdata = { | 221 | static struct dm9000_plat_data em_x270_dm9000_platdata = { |
188 | .flags = DM9000_PLATF_32BITONLY, | 222 | .flags = DM9000_PLATF_NO_EEPROM, |
189 | }; | 223 | }; |
190 | 224 | ||
191 | static struct platform_device em_x270_dm9000 = { | 225 | static struct platform_device em_x270_dm9000 = { |
@@ -200,6 +234,7 @@ static struct platform_device em_x270_dm9000 = { | |||
200 | 234 | ||
201 | static void __init em_x270_init_dm9000(void) | 235 | static void __init em_x270_init_dm9000(void) |
202 | { | 236 | { |
237 | em_x270_dm9000_platdata.flags |= dm9000_flags; | ||
203 | platform_device_register(&em_x270_dm9000); | 238 | platform_device_register(&em_x270_dm9000); |
204 | } | 239 | } |
205 | #else | 240 | #else |
@@ -289,7 +324,7 @@ static int em_x270_nand_device_ready(struct mtd_info *mtd) | |||
289 | { | 324 | { |
290 | dsb(); | 325 | dsb(); |
291 | 326 | ||
292 | return gpio_get_value(GPIO56_NAND_RB); | 327 | return gpio_get_value(nand_rb); |
293 | } | 328 | } |
294 | 329 | ||
295 | static struct mtd_partition em_x270_partition_info[] = { | 330 | static struct mtd_partition em_x270_partition_info[] = { |
@@ -354,14 +389,14 @@ static void __init em_x270_init_nand(void) | |||
354 | 389 | ||
355 | gpio_direction_output(GPIO11_NAND_CS, 1); | 390 | gpio_direction_output(GPIO11_NAND_CS, 1); |
356 | 391 | ||
357 | err = gpio_request(GPIO56_NAND_RB, "NAND R/B"); | 392 | err = gpio_request(nand_rb, "NAND R/B"); |
358 | if (err) { | 393 | if (err) { |
359 | pr_warning("EM-X270: failed to request NAND R/B gpio\n"); | 394 | pr_warning("EM-X270: failed to request NAND R/B gpio\n"); |
360 | gpio_free(GPIO11_NAND_CS); | 395 | gpio_free(GPIO11_NAND_CS); |
361 | return; | 396 | return; |
362 | } | 397 | } |
363 | 398 | ||
364 | gpio_direction_input(GPIO56_NAND_RB); | 399 | gpio_direction_input(nand_rb); |
365 | 400 | ||
366 | platform_device_register(&em_x270_nand); | 401 | platform_device_register(&em_x270_nand); |
367 | } | 402 | } |
@@ -369,6 +404,61 @@ static void __init em_x270_init_nand(void) | |||
369 | static inline void em_x270_init_nand(void) {} | 404 | static inline void em_x270_init_nand(void) {} |
370 | #endif | 405 | #endif |
371 | 406 | ||
407 | #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) | ||
408 | static struct mtd_partition em_x270_nor_parts[] = { | ||
409 | { | ||
410 | .name = "Bootloader", | ||
411 | .offset = 0x00000000, | ||
412 | .size = 0x00050000, | ||
413 | .mask_flags = MTD_WRITEABLE /* force read-only */ | ||
414 | }, { | ||
415 | .name = "Environment", | ||
416 | .offset = 0x00050000, | ||
417 | .size = 0x00010000, | ||
418 | }, { | ||
419 | .name = "Reserved", | ||
420 | .offset = 0x00060000, | ||
421 | .size = 0x00050000, | ||
422 | .mask_flags = MTD_WRITEABLE /* force read-only */ | ||
423 | }, { | ||
424 | .name = "Splashscreen", | ||
425 | .offset = 0x000b0000, | ||
426 | .size = 0x00050000, | ||
427 | } | ||
428 | }; | ||
429 | |||
430 | static struct physmap_flash_data em_x270_nor_data[] = { | ||
431 | [0] = { | ||
432 | .width = 2, | ||
433 | .parts = em_x270_nor_parts, | ||
434 | .nr_parts = ARRAY_SIZE(em_x270_nor_parts), | ||
435 | }, | ||
436 | }; | ||
437 | |||
438 | static struct resource em_x270_nor_flash_resource = { | ||
439 | .start = PXA_CS0_PHYS, | ||
440 | .end = PXA_CS0_PHYS + SZ_1M - 1, | ||
441 | .flags = IORESOURCE_MEM, | ||
442 | }; | ||
443 | |||
444 | static struct platform_device em_x270_physmap_flash = { | ||
445 | .name = "physmap-flash", | ||
446 | .id = 0, | ||
447 | .num_resources = 1, | ||
448 | .resource = &em_x270_nor_flash_resource, | ||
449 | .dev = { | ||
450 | .platform_data = &em_x270_nor_data, | ||
451 | }, | ||
452 | }; | ||
453 | |||
454 | static void __init em_x270_init_nor(void) | ||
455 | { | ||
456 | platform_device_register(&em_x270_physmap_flash); | ||
457 | } | ||
458 | #else | ||
459 | static inline void em_x270_init_nor(void) {} | ||
460 | #endif | ||
461 | |||
372 | /* PXA27x OHCI controller setup */ | 462 | /* PXA27x OHCI controller setup */ |
373 | #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) | 463 | #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) |
374 | static int em_x270_ohci_init(struct device *dev) | 464 | static int em_x270_ohci_init(struct device *dev) |
@@ -395,40 +485,93 @@ static inline void em_x270_init_ohci(void) {} | |||
395 | 485 | ||
396 | /* MCI controller setup */ | 486 | /* MCI controller setup */ |
397 | #if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE) | 487 | #if defined(CONFIG_MMC) || defined(CONFIG_MMC_MODULE) |
488 | static struct regulator *em_x270_sdio_ldo; | ||
489 | |||
398 | static int em_x270_mci_init(struct device *dev, | 490 | static int em_x270_mci_init(struct device *dev, |
399 | irq_handler_t em_x270_detect_int, | 491 | irq_handler_t em_x270_detect_int, |
400 | void *data) | 492 | void *data) |
401 | { | 493 | { |
402 | int err = request_irq(EM_X270_MMC_CD, em_x270_detect_int, | 494 | int err; |
403 | IRQF_DISABLED | IRQF_TRIGGER_FALLING, | 495 | |
496 | em_x270_sdio_ldo = regulator_get(dev, "vcc sdio"); | ||
497 | if (IS_ERR(em_x270_sdio_ldo)) { | ||
498 | dev_err(dev, "can't request SDIO power supply: %ld\n", | ||
499 | PTR_ERR(em_x270_sdio_ldo)); | ||
500 | return PTR_ERR(em_x270_sdio_ldo); | ||
501 | } | ||
502 | |||
503 | err = request_irq(gpio_to_irq(mmc_cd), em_x270_detect_int, | ||
504 | IRQF_DISABLED | IRQF_TRIGGER_RISING | | ||
505 | IRQF_TRIGGER_FALLING, | ||
404 | "MMC card detect", data); | 506 | "MMC card detect", data); |
405 | if (err) { | 507 | if (err) { |
406 | printk(KERN_ERR "%s: can't request MMC card detect IRQ: %d\n", | 508 | dev_err(dev, "can't request MMC card detect IRQ: %d\n", err); |
407 | __func__, err); | 509 | goto err_irq; |
408 | return err; | 510 | } |
511 | |||
512 | if (machine_is_em_x270()) { | ||
513 | err = gpio_request(GPIO95_MMC_WP, "MMC WP"); | ||
514 | if (err) { | ||
515 | dev_err(dev, "can't request MMC write protect: %d\n", | ||
516 | err); | ||
517 | goto err_gpio_wp; | ||
518 | } | ||
519 | gpio_direction_input(GPIO95_MMC_WP); | ||
520 | } else { | ||
521 | err = gpio_request(GPIO38_SD_PWEN, "sdio power"); | ||
522 | if (err) { | ||
523 | dev_err(dev, "can't request MMC power control : %d\n", | ||
524 | err); | ||
525 | goto err_gpio_wp; | ||
526 | } | ||
527 | gpio_direction_output(GPIO38_SD_PWEN, 1); | ||
409 | } | 528 | } |
410 | 529 | ||
411 | return 0; | 530 | return 0; |
531 | |||
532 | err_gpio_wp: | ||
533 | free_irq(gpio_to_irq(mmc_cd), data); | ||
534 | err_irq: | ||
535 | regulator_put(em_x270_sdio_ldo); | ||
536 | |||
537 | return err; | ||
412 | } | 538 | } |
413 | 539 | ||
414 | static void em_x270_mci_setpower(struct device *dev, unsigned int vdd) | 540 | static void em_x270_mci_setpower(struct device *dev, unsigned int vdd) |
415 | { | 541 | { |
416 | /* | 542 | struct pxamci_platform_data* p_d = dev->platform_data; |
417 | FIXME: current hardware implementation does not allow to | 543 | |
418 | enable/disable MMC power. This will be fixed in next HW releases, | 544 | if ((1 << vdd) & p_d->ocr_mask) { |
419 | and we'll need to add implmentation here. | 545 | int vdd_uV = (2000 + (vdd - __ffs(MMC_VDD_20_21)) * 100) * 1000; |
420 | */ | 546 | |
421 | return; | 547 | regulator_set_voltage(em_x270_sdio_ldo, vdd_uV, vdd_uV); |
548 | regulator_enable(em_x270_sdio_ldo); | ||
549 | } else { | ||
550 | regulator_disable(em_x270_sdio_ldo); | ||
551 | } | ||
422 | } | 552 | } |
423 | 553 | ||
424 | static void em_x270_mci_exit(struct device *dev, void *data) | 554 | static void em_x270_mci_exit(struct device *dev, void *data) |
425 | { | 555 | { |
426 | int irq = gpio_to_irq(GPIO13_MMC_CD); | 556 | free_irq(gpio_to_irq(mmc_cd), data); |
427 | free_irq(irq, data); | 557 | regulator_put(em_x270_sdio_ldo); |
558 | |||
559 | if (machine_is_em_x270()) | ||
560 | gpio_free(GPIO95_MMC_WP); | ||
561 | else | ||
562 | gpio_free(GPIO38_SD_PWEN); | ||
563 | } | ||
564 | |||
565 | static int em_x270_mci_get_ro(struct device *dev) | ||
566 | { | ||
567 | return gpio_get_value(GPIO95_MMC_WP); | ||
428 | } | 568 | } |
429 | 569 | ||
430 | static struct pxamci_platform_data em_x270_mci_platform_data = { | 570 | static struct pxamci_platform_data em_x270_mci_platform_data = { |
431 | .ocr_mask = MMC_VDD_28_29|MMC_VDD_29_30|MMC_VDD_30_31, | 571 | .ocr_mask = MMC_VDD_20_21|MMC_VDD_21_22|MMC_VDD_22_23| |
572 | MMC_VDD_24_25|MMC_VDD_25_26|MMC_VDD_26_27| | ||
573 | MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30| | ||
574 | MMC_VDD_30_31|MMC_VDD_31_32, | ||
432 | .init = em_x270_mci_init, | 575 | .init = em_x270_mci_init, |
433 | .setpower = em_x270_mci_setpower, | 576 | .setpower = em_x270_mci_setpower, |
434 | .exit = em_x270_mci_exit, | 577 | .exit = em_x270_mci_exit, |
@@ -436,33 +579,53 @@ static struct pxamci_platform_data em_x270_mci_platform_data = { | |||
436 | 579 | ||
437 | static void __init em_x270_init_mmc(void) | 580 | static void __init em_x270_init_mmc(void) |
438 | { | 581 | { |
582 | if (machine_is_em_x270()) | ||
583 | em_x270_mci_platform_data.get_ro = em_x270_mci_get_ro; | ||
584 | |||
585 | em_x270_mci_platform_data.detect_delay = msecs_to_jiffies(250); | ||
439 | pxa_set_mci_info(&em_x270_mci_platform_data); | 586 | pxa_set_mci_info(&em_x270_mci_platform_data); |
440 | } | 587 | } |
441 | #else | 588 | #else |
442 | static inline void em_x270_init_mmc(void) {} | 589 | static inline void em_x270_init_mmc(void) {} |
443 | #endif | 590 | #endif |
444 | 591 | ||
445 | /* LCD 480x640 */ | 592 | /* LCD */ |
446 | #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) | 593 | #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) |
447 | static struct pxafb_mode_info em_x270_lcd_mode = { | 594 | static struct pxafb_mode_info em_x270_lcd_modes[] = { |
448 | .pixclock = 50000, | 595 | [0] = { |
449 | .bpp = 16, | 596 | .pixclock = 38250, |
450 | .xres = 480, | 597 | .bpp = 16, |
451 | .yres = 640, | 598 | .xres = 480, |
452 | .hsync_len = 8, | 599 | .yres = 640, |
453 | .vsync_len = 2, | 600 | .hsync_len = 8, |
454 | .left_margin = 8, | 601 | .vsync_len = 2, |
455 | .upper_margin = 0, | 602 | .left_margin = 8, |
456 | .right_margin = 24, | 603 | .upper_margin = 2, |
457 | .lower_margin = 4, | 604 | .right_margin = 24, |
458 | .cmap_greyscale = 0, | 605 | .lower_margin = 4, |
606 | .sync = 0, | ||
607 | }, | ||
608 | [1] = { | ||
609 | .pixclock = 153800, | ||
610 | .bpp = 16, | ||
611 | .xres = 240, | ||
612 | .yres = 320, | ||
613 | .hsync_len = 8, | ||
614 | .vsync_len = 2, | ||
615 | .left_margin = 8, | ||
616 | .upper_margin = 2, | ||
617 | .right_margin = 88, | ||
618 | .lower_margin = 2, | ||
619 | .sync = 0, | ||
620 | }, | ||
459 | }; | 621 | }; |
460 | 622 | ||
461 | static struct pxafb_mach_info em_x270_lcd = { | 623 | static struct pxafb_mach_info em_x270_lcd = { |
462 | .modes = &em_x270_lcd_mode, | 624 | .modes = em_x270_lcd_modes, |
463 | .num_modes = 1, | 625 | .num_modes = 2, |
464 | .lcd_conn = LCD_COLOR_TFT_16BPP, | 626 | .lcd_conn = LCD_COLOR_TFT_16BPP, |
465 | }; | 627 | }; |
628 | |||
466 | static void __init em_x270_init_lcd(void) | 629 | static void __init em_x270_init_lcd(void) |
467 | { | 630 | { |
468 | set_pxa_fb_info(&em_x270_lcd); | 631 | set_pxa_fb_info(&em_x270_lcd); |
@@ -471,6 +634,40 @@ static void __init em_x270_init_lcd(void) | |||
471 | static inline void em_x270_init_lcd(void) {} | 634 | static inline void em_x270_init_lcd(void) {} |
472 | #endif | 635 | #endif |
473 | 636 | ||
637 | #if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE) | ||
638 | static struct pxa2xx_spi_master em_x270_spi_info = { | ||
639 | .num_chipselect = 1, | ||
640 | }; | ||
641 | |||
642 | static struct pxa2xx_spi_chip em_x270_tdo24m_chip = { | ||
643 | .rx_threshold = 1, | ||
644 | .tx_threshold = 1, | ||
645 | }; | ||
646 | |||
647 | static struct tdo24m_platform_data em_x270_tdo24m_pdata = { | ||
648 | .model = TDO35S, | ||
649 | }; | ||
650 | |||
651 | static struct spi_board_info em_x270_spi_devices[] __initdata = { | ||
652 | { | ||
653 | .modalias = "tdo24m", | ||
654 | .max_speed_hz = 1000000, | ||
655 | .bus_num = 1, | ||
656 | .chip_select = 0, | ||
657 | .controller_data = &em_x270_tdo24m_chip, | ||
658 | .platform_data = &em_x270_tdo24m_pdata, | ||
659 | }, | ||
660 | }; | ||
661 | |||
662 | static void __init em_x270_init_spi(void) | ||
663 | { | ||
664 | pxa2xx_set_spi_info(1, &em_x270_spi_info); | ||
665 | spi_register_board_info(ARRAY_AND_SIZE(em_x270_spi_devices)); | ||
666 | } | ||
667 | #else | ||
668 | static inline void em_x270_init_spi(void) {} | ||
669 | #endif | ||
670 | |||
474 | #if defined(CONFIG_SND_PXA2XX_AC97) || defined(CONFIG_SND_PXA2XX_AC97_MODULE) | 671 | #if defined(CONFIG_SND_PXA2XX_AC97) || defined(CONFIG_SND_PXA2XX_AC97_MODULE) |
475 | static void __init em_x270_init_ac97(void) | 672 | static void __init em_x270_init_ac97(void) |
476 | { | 673 | { |
@@ -481,23 +678,76 @@ static inline void em_x270_init_ac97(void) {} | |||
481 | #endif | 678 | #endif |
482 | 679 | ||
483 | #if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE) | 680 | #if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE) |
484 | static unsigned int em_x270_matrix_keys[] = { | 681 | static unsigned int em_x270_module_matrix_keys[] = { |
485 | KEY(0, 0, KEY_A), KEY(1, 0, KEY_UP), KEY(2, 1, KEY_B), | 682 | KEY(0, 0, KEY_A), KEY(1, 0, KEY_UP), KEY(2, 1, KEY_B), |
486 | KEY(0, 2, KEY_LEFT), KEY(1, 1, KEY_ENTER), KEY(2, 0, KEY_RIGHT), | 683 | KEY(0, 2, KEY_LEFT), KEY(1, 1, KEY_ENTER), KEY(2, 0, KEY_RIGHT), |
487 | KEY(0, 1, KEY_C), KEY(1, 2, KEY_DOWN), KEY(2, 2, KEY_D), | 684 | KEY(0, 1, KEY_C), KEY(1, 2, KEY_DOWN), KEY(2, 2, KEY_D), |
488 | }; | 685 | }; |
489 | 686 | ||
490 | struct pxa27x_keypad_platform_data em_x270_keypad_info = { | 687 | struct pxa27x_keypad_platform_data em_x270_module_keypad_info = { |
491 | /* code map for the matrix keys */ | 688 | /* code map for the matrix keys */ |
492 | .matrix_key_rows = 3, | 689 | .matrix_key_rows = 3, |
493 | .matrix_key_cols = 3, | 690 | .matrix_key_cols = 3, |
494 | .matrix_key_map = em_x270_matrix_keys, | 691 | .matrix_key_map = em_x270_module_matrix_keys, |
495 | .matrix_key_map_size = ARRAY_SIZE(em_x270_matrix_keys), | 692 | .matrix_key_map_size = ARRAY_SIZE(em_x270_module_matrix_keys), |
693 | }; | ||
694 | |||
695 | static unsigned int em_x270_exeda_matrix_keys[] = { | ||
696 | KEY(0, 0, KEY_RIGHTSHIFT), KEY(0, 1, KEY_RIGHTCTRL), | ||
697 | KEY(0, 2, KEY_RIGHTALT), KEY(0, 3, KEY_SPACE), | ||
698 | KEY(0, 4, KEY_LEFTALT), KEY(0, 5, KEY_LEFTCTRL), | ||
699 | KEY(0, 6, KEY_ENTER), KEY(0, 7, KEY_SLASH), | ||
700 | |||
701 | KEY(1, 0, KEY_DOT), KEY(1, 1, KEY_M), | ||
702 | KEY(1, 2, KEY_N), KEY(1, 3, KEY_B), | ||
703 | KEY(1, 4, KEY_V), KEY(1, 5, KEY_C), | ||
704 | KEY(1, 6, KEY_X), KEY(1, 7, KEY_Z), | ||
705 | |||
706 | KEY(2, 0, KEY_LEFTSHIFT), KEY(2, 1, KEY_SEMICOLON), | ||
707 | KEY(2, 2, KEY_L), KEY(2, 3, KEY_K), | ||
708 | KEY(2, 4, KEY_J), KEY(2, 5, KEY_H), | ||
709 | KEY(2, 6, KEY_G), KEY(2, 7, KEY_F), | ||
710 | |||
711 | KEY(3, 0, KEY_D), KEY(3, 1, KEY_S), | ||
712 | KEY(3, 2, KEY_A), KEY(3, 3, KEY_TAB), | ||
713 | KEY(3, 4, KEY_BACKSPACE), KEY(3, 5, KEY_P), | ||
714 | KEY(3, 6, KEY_O), KEY(3, 7, KEY_I), | ||
715 | |||
716 | KEY(4, 0, KEY_U), KEY(4, 1, KEY_Y), | ||
717 | KEY(4, 2, KEY_T), KEY(4, 3, KEY_R), | ||
718 | KEY(4, 4, KEY_E), KEY(4, 5, KEY_W), | ||
719 | KEY(4, 6, KEY_Q), KEY(4, 7, KEY_MINUS), | ||
720 | |||
721 | KEY(5, 0, KEY_0), KEY(5, 1, KEY_9), | ||
722 | KEY(5, 2, KEY_8), KEY(5, 3, KEY_7), | ||
723 | KEY(5, 4, KEY_6), KEY(5, 5, KEY_5), | ||
724 | KEY(5, 6, KEY_4), KEY(5, 7, KEY_3), | ||
725 | |||
726 | KEY(6, 0, KEY_2), KEY(6, 1, KEY_1), | ||
727 | KEY(6, 2, KEY_ENTER), KEY(6, 3, KEY_END), | ||
728 | KEY(6, 4, KEY_DOWN), KEY(6, 5, KEY_UP), | ||
729 | KEY(6, 6, KEY_MENU), KEY(6, 7, KEY_F1), | ||
730 | |||
731 | KEY(7, 0, KEY_LEFT), KEY(7, 1, KEY_RIGHT), | ||
732 | KEY(7, 2, KEY_BACK), KEY(7, 3, KEY_HOME), | ||
733 | KEY(7, 4, 0), KEY(7, 5, 0), | ||
734 | KEY(7, 6, 0), KEY(7, 7, 0), | ||
735 | }; | ||
736 | |||
737 | struct pxa27x_keypad_platform_data em_x270_exeda_keypad_info = { | ||
738 | /* code map for the matrix keys */ | ||
739 | .matrix_key_rows = 8, | ||
740 | .matrix_key_cols = 8, | ||
741 | .matrix_key_map = em_x270_exeda_matrix_keys, | ||
742 | .matrix_key_map_size = ARRAY_SIZE(em_x270_exeda_matrix_keys), | ||
496 | }; | 743 | }; |
497 | 744 | ||
498 | static void __init em_x270_init_keypad(void) | 745 | static void __init em_x270_init_keypad(void) |
499 | { | 746 | { |
500 | pxa_set_keypad_info(&em_x270_keypad_info); | 747 | if (machine_is_em_x270()) |
748 | pxa_set_keypad_info(&em_x270_module_keypad_info); | ||
749 | else | ||
750 | pxa_set_keypad_info(&em_x270_exeda_keypad_info); | ||
501 | } | 751 | } |
502 | #else | 752 | #else |
503 | static inline void em_x270_init_keypad(void) {} | 753 | static inline void em_x270_init_keypad(void) {} |
@@ -535,19 +785,264 @@ static void __init em_x270_init_gpio_keys(void) | |||
535 | static inline void em_x270_init_gpio_keys(void) {} | 785 | static inline void em_x270_init_gpio_keys(void) {} |
536 | #endif | 786 | #endif |
537 | 787 | ||
538 | static void __init em_x270_init(void) | 788 | /* Quick Capture Interface and sensor setup */ |
789 | #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE) | ||
790 | static struct regulator *em_x270_camera_ldo; | ||
791 | |||
792 | static int em_x270_sensor_init(struct device *dev) | ||
539 | { | 793 | { |
794 | int ret; | ||
795 | |||
796 | ret = gpio_request(GPIO93_CAM_RESET, "camera reset"); | ||
797 | if (ret) | ||
798 | return ret; | ||
799 | |||
800 | gpio_direction_output(GPIO93_CAM_RESET, 0); | ||
801 | |||
802 | em_x270_camera_ldo = regulator_get(NULL, "vcc cam"); | ||
803 | if (em_x270_camera_ldo == NULL) { | ||
804 | gpio_free(GPIO93_CAM_RESET); | ||
805 | return -ENODEV; | ||
806 | } | ||
807 | |||
808 | ret = regulator_enable(em_x270_camera_ldo); | ||
809 | if (ret) { | ||
810 | regulator_put(em_x270_camera_ldo); | ||
811 | gpio_free(GPIO93_CAM_RESET); | ||
812 | return ret; | ||
813 | } | ||
814 | |||
815 | gpio_set_value(GPIO93_CAM_RESET, 1); | ||
816 | |||
817 | return 0; | ||
818 | } | ||
819 | |||
820 | struct pxacamera_platform_data em_x270_camera_platform_data = { | ||
821 | .init = em_x270_sensor_init, | ||
822 | .flags = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | | ||
823 | PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN, | ||
824 | .mclk_10khz = 2600, | ||
825 | }; | ||
826 | |||
827 | static int em_x270_sensor_power(struct device *dev, int on) | ||
828 | { | ||
829 | int ret; | ||
830 | int is_on = regulator_is_enabled(em_x270_camera_ldo); | ||
831 | |||
832 | if (on == is_on) | ||
833 | return 0; | ||
834 | |||
835 | gpio_set_value(GPIO93_CAM_RESET, !on); | ||
836 | |||
837 | if (on) | ||
838 | ret = regulator_enable(em_x270_camera_ldo); | ||
839 | else | ||
840 | ret = regulator_disable(em_x270_camera_ldo); | ||
841 | |||
842 | if (ret) | ||
843 | return ret; | ||
844 | |||
845 | gpio_set_value(GPIO93_CAM_RESET, on); | ||
846 | |||
847 | return 0; | ||
848 | } | ||
849 | |||
850 | static struct soc_camera_link iclink = { | ||
851 | .bus_id = 0, | ||
852 | .power = em_x270_sensor_power, | ||
853 | }; | ||
854 | |||
855 | static struct i2c_board_info em_x270_i2c_cam_info[] = { | ||
856 | { | ||
857 | I2C_BOARD_INFO("mt9m111", 0x48), | ||
858 | .platform_data = &iclink, | ||
859 | }, | ||
860 | }; | ||
861 | |||
862 | static struct i2c_pxa_platform_data em_x270_i2c_info = { | ||
863 | .fast_mode = 1, | ||
864 | }; | ||
865 | |||
866 | static void __init em_x270_init_camera(void) | ||
867 | { | ||
868 | pxa_set_i2c_info(&em_x270_i2c_info); | ||
869 | i2c_register_board_info(0, ARRAY_AND_SIZE(em_x270_i2c_cam_info)); | ||
870 | pxa_set_camera_info(&em_x270_camera_platform_data); | ||
871 | } | ||
872 | #else | ||
873 | static inline void em_x270_init_camera(void) {} | ||
874 | #endif | ||
875 | |||
876 | /* DA9030 related initializations */ | ||
877 | #define REGULATOR_CONSUMER(_name, _dev, _supply) \ | ||
878 | static struct regulator_consumer_supply _name##_consumers[] = { \ | ||
879 | { \ | ||
880 | .dev = _dev, \ | ||
881 | .supply = _supply, \ | ||
882 | }, \ | ||
883 | } | ||
884 | |||
885 | REGULATOR_CONSUMER(ldo3, NULL, "vcc gps"); | ||
886 | REGULATOR_CONSUMER(ldo5, NULL, "vcc cam"); | ||
887 | REGULATOR_CONSUMER(ldo10, &pxa_device_mci.dev, "vcc sdio"); | ||
888 | REGULATOR_CONSUMER(ldo12, NULL, "vcc usb"); | ||
889 | REGULATOR_CONSUMER(ldo19, NULL, "vcc gprs"); | ||
890 | |||
891 | #define REGULATOR_INIT(_ldo, _min_uV, _max_uV, _ops_mask) \ | ||
892 | static struct regulator_init_data _ldo##_data = { \ | ||
893 | .constraints = { \ | ||
894 | .min_uV = _min_uV, \ | ||
895 | .max_uV = _max_uV, \ | ||
896 | .state_mem = { \ | ||
897 | .enabled = 0, \ | ||
898 | }, \ | ||
899 | .valid_ops_mask = _ops_mask, \ | ||
900 | }, \ | ||
901 | .num_consumer_supplies = ARRAY_SIZE(_ldo##_consumers), \ | ||
902 | .consumer_supplies = _ldo##_consumers, \ | ||
903 | }; | ||
904 | |||
905 | REGULATOR_INIT(ldo3, 3200000, 3200000, REGULATOR_CHANGE_STATUS); | ||
906 | REGULATOR_INIT(ldo5, 3000000, 3000000, REGULATOR_CHANGE_STATUS); | ||
907 | REGULATOR_INIT(ldo10, 2000000, 3200000, | ||
908 | REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE); | ||
909 | REGULATOR_INIT(ldo12, 3000000, 3000000, REGULATOR_CHANGE_STATUS); | ||
910 | REGULATOR_INIT(ldo19, 3200000, 3200000, REGULATOR_CHANGE_STATUS); | ||
911 | |||
912 | struct led_info em_x270_led_info = { | ||
913 | .name = "em-x270:orange", | ||
914 | .default_trigger = "battery-charging-or-full", | ||
915 | }; | ||
916 | |||
917 | struct power_supply_info em_x270_psy_info = { | ||
918 | .name = "LP555597P6H-FPS", | ||
919 | .technology = POWER_SUPPLY_TECHNOLOGY_LIPO, | ||
920 | .voltage_max_design = 4200000, | ||
921 | .voltage_min_design = 3000000, | ||
922 | .use_for_apm = 1, | ||
923 | }; | ||
924 | |||
925 | static void em_x270_battery_low(void) | ||
926 | { | ||
927 | apm_queue_event(APM_LOW_BATTERY); | ||
928 | } | ||
929 | |||
930 | static void em_x270_battery_critical(void) | ||
931 | { | ||
932 | apm_queue_event(APM_CRITICAL_SUSPEND); | ||
933 | } | ||
934 | |||
935 | struct da9030_battery_info em_x270_batterty_info = { | ||
936 | .battery_info = &em_x270_psy_info, | ||
937 | |||
938 | .charge_milliamp = 1000, | ||
939 | .charge_millivolt = 4200, | ||
940 | |||
941 | .vbat_low = 3600, | ||
942 | .vbat_crit = 3400, | ||
943 | .vbat_charge_start = 4100, | ||
944 | .vbat_charge_stop = 4200, | ||
945 | .vbat_charge_restart = 4000, | ||
946 | |||
947 | .vcharge_min = 3200, | ||
948 | .vcharge_max = 5500, | ||
949 | |||
950 | .tbat_low = 197, | ||
951 | .tbat_high = 78, | ||
952 | .tbat_restart = 100, | ||
953 | |||
954 | .batmon_interval = 0, | ||
955 | |||
956 | .battery_low = em_x270_battery_low, | ||
957 | .battery_critical = em_x270_battery_critical, | ||
958 | }; | ||
959 | |||
960 | #define DA9030_SUBDEV(_name, _id, _pdata) \ | ||
961 | { \ | ||
962 | .name = "da903x-" #_name, \ | ||
963 | .id = DA9030_ID_##_id, \ | ||
964 | .platform_data = _pdata, \ | ||
965 | } | ||
966 | |||
967 | #define DA9030_LDO(num) DA9030_SUBDEV(regulator, LDO##num, &ldo##num##_data) | ||
968 | |||
969 | struct da903x_subdev_info em_x270_da9030_subdevs[] = { | ||
970 | DA9030_LDO(3), | ||
971 | DA9030_LDO(5), | ||
972 | DA9030_LDO(10), | ||
973 | DA9030_LDO(12), | ||
974 | DA9030_LDO(19), | ||
975 | |||
976 | DA9030_SUBDEV(led, LED_PC, &em_x270_led_info), | ||
977 | DA9030_SUBDEV(backlight, WLED, &em_x270_led_info), | ||
978 | DA9030_SUBDEV(battery, BAT, &em_x270_batterty_info), | ||
979 | }; | ||
980 | |||
981 | static struct da903x_platform_data em_x270_da9030_info = { | ||
982 | .num_subdevs = ARRAY_SIZE(em_x270_da9030_subdevs), | ||
983 | .subdevs = em_x270_da9030_subdevs, | ||
984 | }; | ||
985 | |||
986 | static struct i2c_board_info em_x270_i2c_pmic_info = { | ||
987 | I2C_BOARD_INFO("da9030", 0x49), | ||
988 | .irq = IRQ_GPIO(0), | ||
989 | .platform_data = &em_x270_da9030_info, | ||
990 | }; | ||
991 | |||
992 | static struct i2c_pxa_platform_data em_x270_pwr_i2c_info = { | ||
993 | .use_pio = 1, | ||
994 | }; | ||
995 | |||
996 | static void __init em_x270_init_da9030(void) | ||
997 | { | ||
998 | pxa27x_set_i2c_power_info(&em_x270_pwr_i2c_info); | ||
999 | i2c_register_board_info(1, &em_x270_i2c_pmic_info, 1); | ||
1000 | } | ||
1001 | |||
1002 | static void __init em_x270_module_init(void) | ||
1003 | { | ||
1004 | pr_info("%s\n", __func__); | ||
540 | pxa2xx_mfp_config(ARRAY_AND_SIZE(em_x270_pin_config)); | 1005 | pxa2xx_mfp_config(ARRAY_AND_SIZE(em_x270_pin_config)); |
541 | 1006 | ||
1007 | mmc_cd = GPIO13_MMC_CD; | ||
1008 | nand_rb = GPIO56_NAND_RB; | ||
1009 | dm9000_flags = DM9000_PLATF_32BITONLY; | ||
1010 | } | ||
1011 | |||
1012 | static void __init em_x270_exeda_init(void) | ||
1013 | { | ||
1014 | pr_info("%s\n", __func__); | ||
1015 | pxa2xx_mfp_config(ARRAY_AND_SIZE(exeda_pin_config)); | ||
1016 | |||
1017 | mmc_cd = GPIO114_MMC_CD; | ||
1018 | nand_rb = GPIO20_NAND_RB; | ||
1019 | dm9000_flags = DM9000_PLATF_16BITONLY; | ||
1020 | } | ||
1021 | |||
1022 | static void __init em_x270_init(void) | ||
1023 | { | ||
1024 | pxa2xx_mfp_config(ARRAY_AND_SIZE(common_pin_config)); | ||
1025 | |||
1026 | if (machine_is_em_x270()) | ||
1027 | em_x270_module_init(); | ||
1028 | else if (machine_is_exeda()) | ||
1029 | em_x270_exeda_init(); | ||
1030 | else | ||
1031 | panic("Unsupported machine: %d\n", machine_arch_type); | ||
1032 | |||
1033 | em_x270_init_da9030(); | ||
542 | em_x270_init_dm9000(); | 1034 | em_x270_init_dm9000(); |
543 | em_x270_init_rtc(); | 1035 | em_x270_init_rtc(); |
544 | em_x270_init_nand(); | 1036 | em_x270_init_nand(); |
1037 | em_x270_init_nor(); | ||
545 | em_x270_init_lcd(); | 1038 | em_x270_init_lcd(); |
546 | em_x270_init_mmc(); | 1039 | em_x270_init_mmc(); |
547 | em_x270_init_ohci(); | 1040 | em_x270_init_ohci(); |
548 | em_x270_init_keypad(); | 1041 | em_x270_init_keypad(); |
549 | em_x270_init_gpio_keys(); | 1042 | em_x270_init_gpio_keys(); |
550 | em_x270_init_ac97(); | 1043 | em_x270_init_ac97(); |
1044 | em_x270_init_camera(); | ||
1045 | em_x270_init_spi(); | ||
551 | } | 1046 | } |
552 | 1047 | ||
553 | MACHINE_START(EM_X270, "Compulab EM-X270") | 1048 | MACHINE_START(EM_X270, "Compulab EM-X270") |
@@ -559,3 +1054,13 @@ MACHINE_START(EM_X270, "Compulab EM-X270") | |||
559 | .timer = &pxa_timer, | 1054 | .timer = &pxa_timer, |
560 | .init_machine = em_x270_init, | 1055 | .init_machine = em_x270_init, |
561 | MACHINE_END | 1056 | MACHINE_END |
1057 | |||
1058 | MACHINE_START(EXEDA, "Compulab eXeda") | ||
1059 | .boot_params = 0xa0000100, | ||
1060 | .phys_io = 0x40000000, | ||
1061 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | ||
1062 | .map_io = pxa_map_io, | ||
1063 | .init_irq = pxa27x_init_irq, | ||
1064 | .timer = &pxa_timer, | ||
1065 | .init_machine = em_x270_init, | ||
1066 | MACHINE_END | ||
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index dfce7d5b659e..c60dadf847a6 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c | |||
@@ -20,8 +20,7 @@ | |||
20 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
21 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
22 | 22 | ||
23 | #include <mach/mfp-pxa25x.h> | 23 | #include <mach/pxa25x.h> |
24 | #include <mach/hardware.h> | ||
25 | #include <mach/eseries-gpio.h> | 24 | #include <mach/eseries-gpio.h> |
26 | #include <mach/udc.h> | 25 | #include <mach/udc.h> |
27 | #include <mach/irda.h> | 26 | #include <mach/irda.h> |
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c index df5f822f3b6c..92ba16e1b6fc 100644 --- a/arch/arm/mach-pxa/ezx.c +++ b/arch/arm/mach-pxa/ezx.c | |||
@@ -19,18 +19,16 @@ | |||
19 | #include <linux/input.h> | 19 | #include <linux/input.h> |
20 | 20 | ||
21 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
22 | #include <asm/mach-types.h> | ||
23 | #include <asm/mach/arch.h> | ||
24 | |||
25 | #include <mach/pxa27x.h> | ||
22 | #include <mach/pxafb.h> | 26 | #include <mach/pxafb.h> |
23 | #include <mach/ohci.h> | 27 | #include <mach/ohci.h> |
24 | #include <mach/i2c.h> | 28 | #include <mach/i2c.h> |
25 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
26 | #include <mach/pxa27x_keypad.h> | 30 | #include <mach/pxa27x_keypad.h> |
27 | 31 | ||
28 | #include <mach/mfp-pxa27x.h> | ||
29 | #include <mach/pxa-regs.h> | ||
30 | #include <mach/pxa2xx-regs.h> | ||
31 | #include <asm/mach-types.h> | ||
32 | #include <asm/mach/arch.h> | ||
33 | |||
34 | #include "devices.h" | 32 | #include "devices.h" |
35 | #include "generic.h" | 33 | #include "generic.h" |
36 | 34 | ||
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 0ccc91c92c44..3126a35aa002 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -26,8 +26,9 @@ | |||
26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
27 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
28 | 28 | ||
29 | #include <mach/pxa-regs.h> | ||
30 | #include <mach/reset.h> | 29 | #include <mach/reset.h> |
30 | #include <mach/gpio.h> | ||
31 | #include <mach/pxa2xx-gpio.h> | ||
31 | 32 | ||
32 | #include "generic.h" | 33 | #include "generic.h" |
33 | 34 | ||
@@ -127,3 +128,33 @@ void __init pxa_map_io(void) | |||
127 | iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc)); | 128 | iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc)); |
128 | get_clk_frequency_khz(1); | 129 | get_clk_frequency_khz(1); |
129 | } | 130 | } |
131 | |||
132 | /* | ||
133 | * Configure pins for GPIO or other functions | ||
134 | */ | ||
135 | int pxa_gpio_mode(int gpio_mode) | ||
136 | { | ||
137 | unsigned long flags; | ||
138 | int gpio = gpio_mode & GPIO_MD_MASK_NR; | ||
139 | int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8; | ||
140 | int gafr; | ||
141 | |||
142 | if (gpio > pxa_last_gpio) | ||
143 | return -EINVAL; | ||
144 | |||
145 | local_irq_save(flags); | ||
146 | if (gpio_mode & GPIO_DFLT_LOW) | ||
147 | GPCR(gpio) = GPIO_bit(gpio); | ||
148 | else if (gpio_mode & GPIO_DFLT_HIGH) | ||
149 | GPSR(gpio) = GPIO_bit(gpio); | ||
150 | if (gpio_mode & GPIO_MD_MASK_DIR) | ||
151 | GPDR(gpio) |= GPIO_bit(gpio); | ||
152 | else | ||
153 | GPDR(gpio) &= ~GPIO_bit(gpio); | ||
154 | gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2)); | ||
155 | GAFR(gpio) = gafr | (fn << (((gpio) & 0xf)*2)); | ||
156 | local_irq_restore(flags); | ||
157 | |||
158 | return 0; | ||
159 | } | ||
160 | EXPORT_SYMBOL(pxa_gpio_mode); | ||
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index dc876a8e6668..3465268ca716 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h | |||
@@ -9,20 +9,17 @@ | |||
9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | typedef int (*set_wake_t)(unsigned int, unsigned int); | ||
13 | |||
14 | struct sys_timer; | 12 | struct sys_timer; |
15 | 13 | ||
16 | extern struct sys_timer pxa_timer; | 14 | extern struct sys_timer pxa_timer; |
17 | extern void __init pxa_init_irq(int irq_nr, set_wake_t fn); | 15 | extern void __init pxa_init_irq(int irq_nr, |
18 | extern void __init pxa_init_gpio(int gpio_nr, set_wake_t fn); | 16 | int (*set_wake)(unsigned int, unsigned int)); |
19 | extern void __init pxa25x_init_irq(void); | 17 | extern void __init pxa25x_init_irq(void); |
20 | extern void __init pxa27x_init_irq(void); | 18 | extern void __init pxa27x_init_irq(void); |
21 | extern void __init pxa3xx_init_irq(void); | 19 | extern void __init pxa3xx_init_irq(void); |
22 | extern void __init pxa_map_io(void); | 20 | extern void __init pxa_map_io(void); |
23 | 21 | ||
24 | extern unsigned int get_clk_frequency_khz(int info); | 22 | extern unsigned int get_clk_frequency_khz(int info); |
25 | extern int pxa_last_gpio; | ||
26 | 23 | ||
27 | #define SET_BANK(__nr,__start,__size) \ | 24 | #define SET_BANK(__nr,__start,__size) \ |
28 | mi->bank[__nr].start = (__start), \ | 25 | mi->bank[__nr].start = (__start), \ |
diff --git a/arch/arm/mach-pxa/gpio.c b/arch/arm/mach-pxa/gpio.c index 5fec1e479cb3..7c2267036bf1 100644 --- a/arch/arm/mach-pxa/gpio.c +++ b/arch/arm/mach-pxa/gpio.c | |||
@@ -13,22 +13,34 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/module.h> | ||
17 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
18 | #include <linux/sysdev.h> | ||
19 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/sysdev.h> | ||
19 | #include <linux/bootmem.h> | ||
20 | |||
21 | #include <mach/gpio.h> | ||
20 | 22 | ||
21 | #include <asm/gpio.h> | 23 | int pxa_last_gpio; |
22 | #include <mach/hardware.h> | ||
23 | #include <mach/pxa-regs.h> | ||
24 | #include <mach/pxa2xx-gpio.h> | ||
25 | 24 | ||
26 | #include "generic.h" | 25 | /* |
26 | * We handle the GPIOs by banks, each bank covers up to 32 GPIOs with | ||
27 | * one set of registers. The register offsets are organized below: | ||
28 | * | ||
29 | * GPLR GPDR GPSR GPCR GRER GFER GEDR | ||
30 | * BANK 0 - 0x0000 0x000C 0x0018 0x0024 0x0030 0x003C 0x0048 | ||
31 | * BANK 1 - 0x0004 0x0010 0x001C 0x0028 0x0034 0x0040 0x004C | ||
32 | * BANK 2 - 0x0008 0x0014 0x0020 0x002C 0x0038 0x0044 0x0050 | ||
33 | * | ||
34 | * BANK 3 - 0x0100 0x010C 0x0118 0x0124 0x0130 0x013C 0x0148 | ||
35 | * BANK 4 - 0x0104 0x0110 0x011C 0x0128 0x0134 0x0140 0x014C | ||
36 | * BANK 5 - 0x0108 0x0114 0x0120 0x012C 0x0138 0x0144 0x0150 | ||
37 | * | ||
38 | * NOTE: | ||
39 | * BANK 3 is only available on PXA27x and later processors. | ||
40 | * BANK 4 and 5 are only available on PXA935 | ||
41 | */ | ||
27 | 42 | ||
28 | #define GPIO0_BASE ((void __iomem *)io_p2v(0x40E00000)) | 43 | #define GPIO_BANK(n) (GPIO_REGS_VIRT + BANK_OFF(n)) |
29 | #define GPIO1_BASE ((void __iomem *)io_p2v(0x40E00004)) | ||
30 | #define GPIO2_BASE ((void __iomem *)io_p2v(0x40E00008)) | ||
31 | #define GPIO3_BASE ((void __iomem *)io_p2v(0x40E00100)) | ||
32 | 44 | ||
33 | #define GPLR_OFFSET 0x00 | 45 | #define GPLR_OFFSET 0x00 |
34 | #define GPDR_OFFSET 0x0C | 46 | #define GPDR_OFFSET 0x0C |
@@ -40,195 +52,138 @@ | |||
40 | 52 | ||
41 | struct pxa_gpio_chip { | 53 | struct pxa_gpio_chip { |
42 | struct gpio_chip chip; | 54 | struct gpio_chip chip; |
43 | void __iomem *regbase; | 55 | void __iomem *regbase; |
56 | char label[10]; | ||
57 | |||
58 | unsigned long irq_mask; | ||
59 | unsigned long irq_edge_rise; | ||
60 | unsigned long irq_edge_fall; | ||
61 | |||
62 | #ifdef CONFIG_PM | ||
63 | unsigned long saved_gplr; | ||
64 | unsigned long saved_gpdr; | ||
65 | unsigned long saved_grer; | ||
66 | unsigned long saved_gfer; | ||
67 | #endif | ||
44 | }; | 68 | }; |
45 | 69 | ||
46 | int pxa_last_gpio; | 70 | static DEFINE_SPINLOCK(gpio_lock); |
71 | static struct pxa_gpio_chip *pxa_gpio_chips; | ||
47 | 72 | ||
48 | #ifdef CONFIG_CPU_PXA26x | 73 | #define for_each_gpio_chip(i, c) \ |
49 | /* GPIO86/87/88/89 on PXA26x have their direction bits in GPDR2 inverted, | 74 | for (i = 0, c = &pxa_gpio_chips[0]; i <= pxa_last_gpio; i += 32, c++) |
50 | * as well as their Alternate Function value being '1' for GPIO in GAFRx. | 75 | |
51 | */ | 76 | static inline void __iomem *gpio_chip_base(struct gpio_chip *c) |
52 | static int __gpio_is_inverted(unsigned gpio) | ||
53 | { | 77 | { |
54 | return cpu_is_pxa25x() && gpio > 85; | 78 | return container_of(c, struct pxa_gpio_chip, chip)->regbase; |
55 | } | 79 | } |
56 | #else | ||
57 | #define __gpio_is_inverted(gpio) (0) | ||
58 | #endif | ||
59 | 80 | ||
60 | /* | 81 | static inline struct pxa_gpio_chip *gpio_to_chip(unsigned gpio) |
61 | * Configure pins for GPIO or other functions | ||
62 | */ | ||
63 | int pxa_gpio_mode(int gpio_mode) | ||
64 | { | 82 | { |
65 | unsigned long flags; | 83 | return &pxa_gpio_chips[gpio_to_bank(gpio)]; |
66 | int gpio = gpio_mode & GPIO_MD_MASK_NR; | ||
67 | int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8; | ||
68 | int gafr; | ||
69 | |||
70 | if (gpio > pxa_last_gpio) | ||
71 | return -EINVAL; | ||
72 | |||
73 | local_irq_save(flags); | ||
74 | if (gpio_mode & GPIO_DFLT_LOW) | ||
75 | GPCR(gpio) = GPIO_bit(gpio); | ||
76 | else if (gpio_mode & GPIO_DFLT_HIGH) | ||
77 | GPSR(gpio) = GPIO_bit(gpio); | ||
78 | if (gpio_mode & GPIO_MD_MASK_DIR) | ||
79 | GPDR(gpio) |= GPIO_bit(gpio); | ||
80 | else | ||
81 | GPDR(gpio) &= ~GPIO_bit(gpio); | ||
82 | gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2)); | ||
83 | GAFR(gpio) = gafr | (fn << (((gpio) & 0xf)*2)); | ||
84 | local_irq_restore(flags); | ||
85 | |||
86 | return 0; | ||
87 | } | 84 | } |
88 | EXPORT_SYMBOL(pxa_gpio_mode); | ||
89 | 85 | ||
90 | static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | 86 | static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset) |
91 | { | 87 | { |
92 | unsigned long flags; | 88 | void __iomem *base = gpio_chip_base(chip); |
93 | u32 mask = 1 << offset; | 89 | uint32_t value, mask = 1 << offset; |
94 | u32 value; | 90 | unsigned long flags; |
95 | struct pxa_gpio_chip *pxa; | 91 | |
96 | void __iomem *gpdr; | 92 | spin_lock_irqsave(&gpio_lock, flags); |
97 | 93 | ||
98 | pxa = container_of(chip, struct pxa_gpio_chip, chip); | 94 | value = __raw_readl(base + GPDR_OFFSET); |
99 | gpdr = pxa->regbase + GPDR_OFFSET; | ||
100 | local_irq_save(flags); | ||
101 | value = __raw_readl(gpdr); | ||
102 | if (__gpio_is_inverted(chip->base + offset)) | 95 | if (__gpio_is_inverted(chip->base + offset)) |
103 | value |= mask; | 96 | value |= mask; |
104 | else | 97 | else |
105 | value &= ~mask; | 98 | value &= ~mask; |
106 | __raw_writel(value, gpdr); | 99 | __raw_writel(value, base + GPDR_OFFSET); |
107 | local_irq_restore(flags); | ||
108 | 100 | ||
101 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
109 | return 0; | 102 | return 0; |
110 | } | 103 | } |
111 | 104 | ||
112 | static int pxa_gpio_direction_output(struct gpio_chip *chip, | 105 | static int pxa_gpio_direction_output(struct gpio_chip *chip, |
113 | unsigned offset, int value) | 106 | unsigned offset, int value) |
114 | { | 107 | { |
115 | unsigned long flags; | 108 | void __iomem *base = gpio_chip_base(chip); |
116 | u32 mask = 1 << offset; | 109 | uint32_t tmp, mask = 1 << offset; |
117 | u32 tmp; | 110 | unsigned long flags; |
118 | struct pxa_gpio_chip *pxa; | 111 | |
119 | void __iomem *gpdr; | 112 | __raw_writel(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET)); |
120 | 113 | ||
121 | pxa = container_of(chip, struct pxa_gpio_chip, chip); | 114 | spin_lock_irqsave(&gpio_lock, flags); |
122 | __raw_writel(mask, | 115 | |
123 | pxa->regbase + (value ? GPSR_OFFSET : GPCR_OFFSET)); | 116 | tmp = __raw_readl(base + GPDR_OFFSET); |
124 | gpdr = pxa->regbase + GPDR_OFFSET; | ||
125 | local_irq_save(flags); | ||
126 | tmp = __raw_readl(gpdr); | ||
127 | if (__gpio_is_inverted(chip->base + offset)) | 117 | if (__gpio_is_inverted(chip->base + offset)) |
128 | tmp &= ~mask; | 118 | tmp &= ~mask; |
129 | else | 119 | else |
130 | tmp |= mask; | 120 | tmp |= mask; |
131 | __raw_writel(tmp, gpdr); | 121 | __raw_writel(tmp, base + GPDR_OFFSET); |
132 | local_irq_restore(flags); | ||
133 | 122 | ||
123 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
134 | return 0; | 124 | return 0; |
135 | } | 125 | } |
136 | 126 | ||
137 | /* | ||
138 | * Return GPIO level | ||
139 | */ | ||
140 | static int pxa_gpio_get(struct gpio_chip *chip, unsigned offset) | 127 | static int pxa_gpio_get(struct gpio_chip *chip, unsigned offset) |
141 | { | 128 | { |
142 | u32 mask = 1 << offset; | 129 | return __raw_readl(gpio_chip_base(chip) + GPLR_OFFSET) & (1 << offset); |
143 | struct pxa_gpio_chip *pxa; | ||
144 | |||
145 | pxa = container_of(chip, struct pxa_gpio_chip, chip); | ||
146 | return __raw_readl(pxa->regbase + GPLR_OFFSET) & mask; | ||
147 | } | 130 | } |
148 | 131 | ||
149 | /* | ||
150 | * Set output GPIO level | ||
151 | */ | ||
152 | static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value) | 132 | static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value) |
153 | { | 133 | { |
154 | u32 mask = 1 << offset; | 134 | __raw_writel(1 << offset, gpio_chip_base(chip) + |
155 | struct pxa_gpio_chip *pxa; | 135 | (value ? GPSR_OFFSET : GPCR_OFFSET)); |
156 | |||
157 | pxa = container_of(chip, struct pxa_gpio_chip, chip); | ||
158 | |||
159 | if (value) | ||
160 | __raw_writel(mask, pxa->regbase + GPSR_OFFSET); | ||
161 | else | ||
162 | __raw_writel(mask, pxa->regbase + GPCR_OFFSET); | ||
163 | } | 136 | } |
164 | 137 | ||
165 | #define GPIO_CHIP(_n) \ | 138 | static int __init pxa_init_gpio_chip(int gpio_end) |
166 | [_n] = { \ | 139 | { |
167 | .regbase = GPIO##_n##_BASE, \ | 140 | int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1; |
168 | .chip = { \ | 141 | struct pxa_gpio_chip *chips; |
169 | .label = "gpio-" #_n, \ | 142 | |
170 | .direction_input = pxa_gpio_direction_input, \ | 143 | /* this is early, we have to use bootmem allocator, and we really |
171 | .direction_output = pxa_gpio_direction_output, \ | 144 | * want this to be allocated dynamically for different 'gpio_end' |
172 | .get = pxa_gpio_get, \ | 145 | */ |
173 | .set = pxa_gpio_set, \ | 146 | chips = alloc_bootmem_low(nbanks * sizeof(struct pxa_gpio_chip)); |
174 | .base = (_n) * 32, \ | 147 | if (chips == NULL) { |
175 | .ngpio = 32, \ | 148 | pr_err("%s: failed to allocate GPIO chips\n", __func__); |
176 | }, \ | 149 | return -ENOMEM; |
177 | } | 150 | } |
178 | 151 | ||
179 | static struct pxa_gpio_chip pxa_gpio_chip[] = { | 152 | for (i = 0, gpio = 0; i < nbanks; i++, gpio += 32) { |
180 | GPIO_CHIP(0), | 153 | struct gpio_chip *c = &chips[i].chip; |
181 | GPIO_CHIP(1), | ||
182 | GPIO_CHIP(2), | ||
183 | #if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) | ||
184 | GPIO_CHIP(3), | ||
185 | #endif | ||
186 | }; | ||
187 | 154 | ||
188 | /* | 155 | sprintf(chips[i].label, "gpio-%d", i); |
189 | * PXA GPIO edge detection for IRQs: | 156 | chips[i].regbase = (void __iomem *)GPIO_BANK(i); |
190 | * IRQs are generated on Falling-Edge, Rising-Edge, or both. | ||
191 | * Use this instead of directly setting GRER/GFER. | ||
192 | */ | ||
193 | 157 | ||
194 | static unsigned long GPIO_IRQ_rising_edge[4]; | 158 | c->base = gpio; |
195 | static unsigned long GPIO_IRQ_falling_edge[4]; | 159 | c->label = chips[i].label; |
196 | static unsigned long GPIO_IRQ_mask[4]; | ||
197 | 160 | ||
198 | /* | 161 | c->direction_input = pxa_gpio_direction_input; |
199 | * On PXA25x and PXA27x, GAFRx and GPDRx together decide the alternate | 162 | c->direction_output = pxa_gpio_direction_output; |
200 | * function of a GPIO, and GPDRx cannot be altered once configured. It | 163 | c->get = pxa_gpio_get; |
201 | * is attributed as "occupied" here (I know this terminology isn't | 164 | c->set = pxa_gpio_set; |
202 | * accurate, you are welcome to propose a better one :-) | ||
203 | */ | ||
204 | static int __gpio_is_occupied(unsigned gpio) | ||
205 | { | ||
206 | if (cpu_is_pxa27x() || cpu_is_pxa25x()) { | ||
207 | int af = (GAFR(gpio) >> ((gpio & 0xf) * 2)) & 0x3; | ||
208 | int dir = GPDR(gpio) & GPIO_bit(gpio); | ||
209 | |||
210 | if (__gpio_is_inverted(gpio)) | ||
211 | return af != 1 || dir == 0; | ||
212 | else | ||
213 | return af != 0 || dir != 0; | ||
214 | } | ||
215 | 165 | ||
166 | /* number of GPIOs on last bank may be less than 32 */ | ||
167 | c->ngpio = (gpio + 31 > gpio_end) ? (gpio_end - gpio + 1) : 32; | ||
168 | gpiochip_add(c); | ||
169 | } | ||
170 | pxa_gpio_chips = chips; | ||
216 | return 0; | 171 | return 0; |
217 | } | 172 | } |
218 | 173 | ||
219 | static int pxa_gpio_irq_type(unsigned int irq, unsigned int type) | 174 | static int pxa_gpio_irq_type(unsigned int irq, unsigned int type) |
220 | { | 175 | { |
221 | int gpio, idx; | 176 | struct pxa_gpio_chip *c; |
177 | int gpio = irq_to_gpio(irq); | ||
178 | unsigned long gpdr, mask = GPIO_bit(gpio); | ||
222 | 179 | ||
223 | gpio = IRQ_TO_GPIO(irq); | 180 | c = gpio_to_chip(gpio); |
224 | idx = gpio >> 5; | ||
225 | 181 | ||
226 | if (type == IRQ_TYPE_PROBE) { | 182 | if (type == IRQ_TYPE_PROBE) { |
227 | /* Don't mess with enabled GPIOs using preconfigured edges or | 183 | /* Don't mess with enabled GPIOs using preconfigured edges or |
228 | * GPIOs set to alternate function or to output during probe | 184 | * GPIOs set to alternate function or to output during probe |
229 | */ | 185 | */ |
230 | if ((GPIO_IRQ_rising_edge[idx] & GPIO_bit(gpio)) || | 186 | if ((c->irq_edge_rise | c->irq_edge_fall) & GPIO_bit(gpio)) |
231 | (GPIO_IRQ_falling_edge[idx] & GPIO_bit(gpio))) | ||
232 | return 0; | 187 | return 0; |
233 | 188 | ||
234 | if (__gpio_is_occupied(gpio)) | 189 | if (__gpio_is_occupied(gpio)) |
@@ -237,23 +192,25 @@ static int pxa_gpio_irq_type(unsigned int irq, unsigned int type) | |||
237 | type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING; | 192 | type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING; |
238 | } | 193 | } |
239 | 194 | ||
195 | gpdr = __raw_readl(c->regbase + GPDR_OFFSET); | ||
196 | |||
240 | if (__gpio_is_inverted(gpio)) | 197 | if (__gpio_is_inverted(gpio)) |
241 | GPDR(gpio) |= GPIO_bit(gpio); | 198 | __raw_writel(gpdr | mask, c->regbase + GPDR_OFFSET); |
242 | else | 199 | else |
243 | GPDR(gpio) &= ~GPIO_bit(gpio); | 200 | __raw_writel(gpdr & ~mask, c->regbase + GPDR_OFFSET); |
244 | 201 | ||
245 | if (type & IRQ_TYPE_EDGE_RISING) | 202 | if (type & IRQ_TYPE_EDGE_RISING) |
246 | __set_bit(gpio, GPIO_IRQ_rising_edge); | 203 | c->irq_edge_rise |= mask; |
247 | else | 204 | else |
248 | __clear_bit(gpio, GPIO_IRQ_rising_edge); | 205 | c->irq_edge_rise &= ~mask; |
249 | 206 | ||
250 | if (type & IRQ_TYPE_EDGE_FALLING) | 207 | if (type & IRQ_TYPE_EDGE_FALLING) |
251 | __set_bit(gpio, GPIO_IRQ_falling_edge); | 208 | c->irq_edge_fall |= mask; |
252 | else | 209 | else |
253 | __clear_bit(gpio, GPIO_IRQ_falling_edge); | 210 | c->irq_edge_fall &= ~mask; |
254 | 211 | ||
255 | GRER(gpio) = GPIO_IRQ_rising_edge[idx] & GPIO_IRQ_mask[idx]; | 212 | __raw_writel(c->irq_edge_rise & c->irq_mask, c->regbase + GRER_OFFSET); |
256 | GFER(gpio) = GPIO_IRQ_falling_edge[idx] & GPIO_IRQ_mask[idx]; | 213 | __raw_writel(c->irq_edge_fall & c->irq_mask, c->regbase + GFER_OFFSET); |
257 | 214 | ||
258 | pr_debug("%s: IRQ%d (GPIO%d) - edge%s%s\n", __func__, irq, gpio, | 215 | pr_debug("%s: IRQ%d (GPIO%d) - edge%s%s\n", __func__, irq, gpio, |
259 | ((type & IRQ_TYPE_EDGE_RISING) ? " rising" : ""), | 216 | ((type & IRQ_TYPE_EDGE_RISING) ? " rising" : ""), |
@@ -261,87 +218,62 @@ static int pxa_gpio_irq_type(unsigned int irq, unsigned int type) | |||
261 | return 0; | 218 | return 0; |
262 | } | 219 | } |
263 | 220 | ||
264 | /* | ||
265 | * GPIO IRQs must be acknowledged. This is for GPIO 0 and 1. | ||
266 | */ | ||
267 | |||
268 | static void pxa_ack_low_gpio(unsigned int irq) | ||
269 | { | ||
270 | GEDR0 = (1 << (irq - IRQ_GPIO0)); | ||
271 | } | ||
272 | |||
273 | static void pxa_mask_low_gpio(unsigned int irq) | ||
274 | { | ||
275 | ICMR &= ~(1 << (irq - PXA_IRQ(0))); | ||
276 | } | ||
277 | |||
278 | static void pxa_unmask_low_gpio(unsigned int irq) | ||
279 | { | ||
280 | ICMR |= 1 << (irq - PXA_IRQ(0)); | ||
281 | } | ||
282 | |||
283 | static struct irq_chip pxa_low_gpio_chip = { | ||
284 | .name = "GPIO-l", | ||
285 | .ack = pxa_ack_low_gpio, | ||
286 | .mask = pxa_mask_low_gpio, | ||
287 | .unmask = pxa_unmask_low_gpio, | ||
288 | .set_type = pxa_gpio_irq_type, | ||
289 | }; | ||
290 | |||
291 | /* | ||
292 | * Demux handler for GPIO>=2 edge detect interrupts | ||
293 | */ | ||
294 | |||
295 | #define GEDR_BITS (sizeof(gedr) * BITS_PER_BYTE) | ||
296 | |||
297 | static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc) | 221 | static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc) |
298 | { | 222 | { |
299 | int loop, bit, n; | 223 | struct pxa_gpio_chip *c; |
300 | unsigned long gedr[4]; | 224 | int loop, gpio, gpio_base, n; |
225 | unsigned long gedr; | ||
301 | 226 | ||
302 | do { | 227 | do { |
303 | gedr[0] = GEDR0 & GPIO_IRQ_mask[0] & ~3; | ||
304 | gedr[1] = GEDR1 & GPIO_IRQ_mask[1]; | ||
305 | gedr[2] = GEDR2 & GPIO_IRQ_mask[2]; | ||
306 | gedr[3] = GEDR3 & GPIO_IRQ_mask[3]; | ||
307 | |||
308 | GEDR0 = gedr[0]; GEDR1 = gedr[1]; | ||
309 | GEDR2 = gedr[2]; GEDR3 = gedr[3]; | ||
310 | |||
311 | loop = 0; | 228 | loop = 0; |
312 | bit = find_first_bit(gedr, GEDR_BITS); | 229 | for_each_gpio_chip(gpio, c) { |
313 | while (bit < GEDR_BITS) { | 230 | gpio_base = c->chip.base; |
314 | loop = 1; | 231 | |
232 | gedr = __raw_readl(c->regbase + GEDR_OFFSET); | ||
233 | gedr = gedr & c->irq_mask; | ||
234 | __raw_writel(gedr, c->regbase + GEDR_OFFSET); | ||
315 | 235 | ||
316 | n = PXA_GPIO_IRQ_BASE + bit; | 236 | n = find_first_bit(&gedr, BITS_PER_LONG); |
317 | generic_handle_irq(n); | 237 | while (n < BITS_PER_LONG) { |
238 | loop = 1; | ||
318 | 239 | ||
319 | bit = find_next_bit(gedr, GEDR_BITS, bit + 1); | 240 | generic_handle_irq(gpio_to_irq(gpio_base + n)); |
241 | n = find_next_bit(&gedr, BITS_PER_LONG, n + 1); | ||
242 | } | ||
320 | } | 243 | } |
321 | } while (loop); | 244 | } while (loop); |
322 | } | 245 | } |
323 | 246 | ||
324 | static void pxa_ack_muxed_gpio(unsigned int irq) | 247 | static void pxa_ack_muxed_gpio(unsigned int irq) |
325 | { | 248 | { |
326 | int gpio = irq - IRQ_GPIO(2) + 2; | 249 | int gpio = irq_to_gpio(irq); |
327 | GEDR(gpio) = GPIO_bit(gpio); | 250 | struct pxa_gpio_chip *c = gpio_to_chip(gpio); |
251 | |||
252 | __raw_writel(GPIO_bit(gpio), c->regbase + GEDR_OFFSET); | ||
328 | } | 253 | } |
329 | 254 | ||
330 | static void pxa_mask_muxed_gpio(unsigned int irq) | 255 | static void pxa_mask_muxed_gpio(unsigned int irq) |
331 | { | 256 | { |
332 | int gpio = irq - IRQ_GPIO(2) + 2; | 257 | int gpio = irq_to_gpio(irq); |
333 | __clear_bit(gpio, GPIO_IRQ_mask); | 258 | struct pxa_gpio_chip *c = gpio_to_chip(gpio); |
334 | GRER(gpio) &= ~GPIO_bit(gpio); | 259 | uint32_t grer, gfer; |
335 | GFER(gpio) &= ~GPIO_bit(gpio); | 260 | |
261 | c->irq_mask &= ~GPIO_bit(gpio); | ||
262 | |||
263 | grer = __raw_readl(c->regbase + GRER_OFFSET) & ~GPIO_bit(gpio); | ||
264 | gfer = __raw_readl(c->regbase + GFER_OFFSET) & ~GPIO_bit(gpio); | ||
265 | __raw_writel(grer, c->regbase + GRER_OFFSET); | ||
266 | __raw_writel(gfer, c->regbase + GFER_OFFSET); | ||
336 | } | 267 | } |
337 | 268 | ||
338 | static void pxa_unmask_muxed_gpio(unsigned int irq) | 269 | static void pxa_unmask_muxed_gpio(unsigned int irq) |
339 | { | 270 | { |
340 | int gpio = irq - IRQ_GPIO(2) + 2; | 271 | int gpio = irq_to_gpio(irq); |
341 | int idx = gpio >> 5; | 272 | struct pxa_gpio_chip *c = gpio_to_chip(gpio); |
342 | __set_bit(gpio, GPIO_IRQ_mask); | 273 | |
343 | GRER(gpio) = GPIO_IRQ_rising_edge[idx] & GPIO_IRQ_mask[idx]; | 274 | c->irq_mask |= GPIO_bit(gpio); |
344 | GFER(gpio) = GPIO_IRQ_falling_edge[idx] & GPIO_IRQ_mask[idx]; | 275 | __raw_writel(c->irq_edge_rise & c->irq_mask, c->regbase + GRER_OFFSET); |
276 | __raw_writel(c->irq_edge_fall & c->irq_mask, c->regbase + GFER_OFFSET); | ||
345 | } | 277 | } |
346 | 278 | ||
347 | static struct irq_chip pxa_muxed_gpio_chip = { | 279 | static struct irq_chip pxa_muxed_gpio_chip = { |
@@ -352,85 +284,65 @@ static struct irq_chip pxa_muxed_gpio_chip = { | |||
352 | .set_type = pxa_gpio_irq_type, | 284 | .set_type = pxa_gpio_irq_type, |
353 | }; | 285 | }; |
354 | 286 | ||
355 | void __init pxa_init_gpio(int gpio_nr, set_wake_t fn) | 287 | void __init pxa_init_gpio(int mux_irq, int start, int end, set_wake_t fn) |
356 | { | 288 | { |
357 | int irq, i, gpio; | 289 | struct pxa_gpio_chip *c; |
358 | 290 | int gpio, irq; | |
359 | pxa_last_gpio = gpio_nr - 1; | ||
360 | 291 | ||
361 | /* clear all GPIO edge detects */ | 292 | pxa_last_gpio = end; |
362 | for (i = 0; i < gpio_nr; i += 32) { | ||
363 | GFER(i) = 0; | ||
364 | GRER(i) = 0; | ||
365 | GEDR(i) = GEDR(i); | ||
366 | } | ||
367 | 293 | ||
368 | /* GPIO 0 and 1 must have their mask bit always set */ | 294 | /* Initialize GPIO chips */ |
369 | GPIO_IRQ_mask[0] = 3; | 295 | pxa_init_gpio_chip(end); |
370 | 296 | ||
371 | for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) { | 297 | /* clear all GPIO edge detects */ |
372 | set_irq_chip(irq, &pxa_low_gpio_chip); | 298 | for_each_gpio_chip(gpio, c) { |
373 | set_irq_handler(irq, handle_edge_irq); | 299 | __raw_writel(0, c->regbase + GFER_OFFSET); |
374 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | 300 | __raw_writel(0, c->regbase + GRER_OFFSET); |
301 | __raw_writel(~0,c->regbase + GEDR_OFFSET); | ||
375 | } | 302 | } |
376 | 303 | ||
377 | for (irq = IRQ_GPIO(2); irq < IRQ_GPIO(gpio_nr); irq++) { | 304 | for (irq = gpio_to_irq(start); irq <= gpio_to_irq(end); irq++) { |
378 | set_irq_chip(irq, &pxa_muxed_gpio_chip); | 305 | set_irq_chip(irq, &pxa_muxed_gpio_chip); |
379 | set_irq_handler(irq, handle_edge_irq); | 306 | set_irq_handler(irq, handle_edge_irq); |
380 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | 307 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
381 | } | 308 | } |
382 | 309 | ||
383 | /* Install handler for GPIO>=2 edge detect interrupts */ | 310 | /* Install handler for GPIO>=2 edge detect interrupts */ |
384 | set_irq_chained_handler(IRQ_GPIO_2_x, pxa_gpio_demux_handler); | 311 | set_irq_chained_handler(mux_irq, pxa_gpio_demux_handler); |
385 | |||
386 | pxa_low_gpio_chip.set_wake = fn; | ||
387 | pxa_muxed_gpio_chip.set_wake = fn; | 312 | pxa_muxed_gpio_chip.set_wake = fn; |
388 | |||
389 | /* add a GPIO chip for each register bank. | ||
390 | * the last PXA25x register only contains 21 GPIOs | ||
391 | */ | ||
392 | for (gpio = 0, i = 0; gpio < gpio_nr; gpio += 32, i++) { | ||
393 | if (gpio + 32 > gpio_nr) | ||
394 | pxa_gpio_chip[i].chip.ngpio = gpio_nr - gpio; | ||
395 | gpiochip_add(&pxa_gpio_chip[i].chip); | ||
396 | } | ||
397 | } | 313 | } |
398 | 314 | ||
399 | #ifdef CONFIG_PM | 315 | #ifdef CONFIG_PM |
400 | |||
401 | static unsigned long saved_gplr[4]; | ||
402 | static unsigned long saved_gpdr[4]; | ||
403 | static unsigned long saved_grer[4]; | ||
404 | static unsigned long saved_gfer[4]; | ||
405 | |||
406 | static int pxa_gpio_suspend(struct sys_device *dev, pm_message_t state) | 316 | static int pxa_gpio_suspend(struct sys_device *dev, pm_message_t state) |
407 | { | 317 | { |
408 | int i, gpio; | 318 | struct pxa_gpio_chip *c; |
319 | int gpio; | ||
409 | 320 | ||
410 | for (gpio = 0, i = 0; gpio < pxa_last_gpio; gpio += 32, i++) { | 321 | for_each_gpio_chip(gpio, c) { |
411 | saved_gplr[i] = GPLR(gpio); | 322 | c->saved_gplr = __raw_readl(c->regbase + GPLR_OFFSET); |
412 | saved_gpdr[i] = GPDR(gpio); | 323 | c->saved_gpdr = __raw_readl(c->regbase + GPDR_OFFSET); |
413 | saved_grer[i] = GRER(gpio); | 324 | c->saved_grer = __raw_readl(c->regbase + GRER_OFFSET); |
414 | saved_gfer[i] = GFER(gpio); | 325 | c->saved_gfer = __raw_readl(c->regbase + GFER_OFFSET); |
415 | 326 | ||
416 | /* Clear GPIO transition detect bits */ | 327 | /* Clear GPIO transition detect bits */ |
417 | GEDR(gpio) = GEDR(gpio); | 328 | __raw_writel(0xffffffff, c->regbase + GEDR_OFFSET); |
418 | } | 329 | } |
419 | return 0; | 330 | return 0; |
420 | } | 331 | } |
421 | 332 | ||
422 | static int pxa_gpio_resume(struct sys_device *dev) | 333 | static int pxa_gpio_resume(struct sys_device *dev) |
423 | { | 334 | { |
424 | int i, gpio; | 335 | struct pxa_gpio_chip *c; |
336 | int gpio; | ||
425 | 337 | ||
426 | for (gpio = 0, i = 0; gpio < pxa_last_gpio; gpio += 32, i++) { | 338 | for_each_gpio_chip(gpio, c) { |
427 | /* restore level with set/clear */ | 339 | /* restore level with set/clear */ |
428 | GPSR(gpio) = saved_gplr[i]; | 340 | __raw_writel( c->saved_gplr, c->regbase + GPSR_OFFSET); |
429 | GPCR(gpio) = ~saved_gplr[i]; | 341 | __raw_writel(~c->saved_gplr, c->regbase + GPCR_OFFSET); |
430 | 342 | ||
431 | GRER(gpio) = saved_grer[i]; | 343 | __raw_writel(c->saved_grer, c->regbase + GRER_OFFSET); |
432 | GFER(gpio) = saved_gfer[i]; | 344 | __raw_writel(c->saved_gfer, c->regbase + GFER_OFFSET); |
433 | GPDR(gpio) = saved_gpdr[i]; | 345 | __raw_writel(c->saved_gpdr, c->regbase + GPDR_OFFSET); |
434 | } | 346 | } |
435 | return 0; | 347 | return 0; |
436 | } | 348 | } |
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c index e296ce11658c..ca9912ea78d9 100644 --- a/arch/arm/mach-pxa/gumstix.c +++ b/arch/arm/mach-pxa/gumstix.c | |||
@@ -38,14 +38,12 @@ | |||
38 | #include <asm/mach/map.h> | 38 | #include <asm/mach/map.h> |
39 | #include <asm/mach/irq.h> | 39 | #include <asm/mach/irq.h> |
40 | #include <asm/mach/flash.h> | 40 | #include <asm/mach/flash.h> |
41 | |||
42 | #include <mach/pxa25x.h> | ||
41 | #include <mach/mmc.h> | 43 | #include <mach/mmc.h> |
42 | #include <mach/udc.h> | 44 | #include <mach/udc.h> |
43 | #include <mach/gumstix.h> | 45 | #include <mach/gumstix.h> |
44 | 46 | ||
45 | #include <mach/pxa-regs.h> | ||
46 | #include <mach/pxa2xx-regs.h> | ||
47 | #include <mach/mfp-pxa25x.h> | ||
48 | |||
49 | #include "generic.h" | 47 | #include "generic.h" |
50 | 48 | ||
51 | static struct resource flash_resource = { | 49 | static struct resource flash_resource = { |
@@ -191,6 +189,11 @@ int __attribute__((weak)) am200_init(void) | |||
191 | return 0; | 189 | return 0; |
192 | } | 190 | } |
193 | 191 | ||
192 | int __attribute__((weak)) am300_init(void) | ||
193 | { | ||
194 | return 0; | ||
195 | } | ||
196 | |||
194 | static void __init carrier_board_init(void) | 197 | static void __init carrier_board_init(void) |
195 | { | 198 | { |
196 | /* | 199 | /* |
@@ -198,6 +201,7 @@ static void __init carrier_board_init(void) | |||
198 | * they cannot be detected programatically | 201 | * they cannot be detected programatically |
199 | */ | 202 | */ |
200 | am200_init(); | 203 | am200_init(); |
204 | am300_init(); | ||
201 | } | 205 | } |
202 | 206 | ||
203 | static void __init gumstix_init(void) | 207 | static void __init gumstix_init(void) |
diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c index da6e4422c0f3..6a197fb5c095 100644 --- a/arch/arm/mach-pxa/h5000.c +++ b/arch/arm/mach-pxa/h5000.c | |||
@@ -24,14 +24,15 @@ | |||
24 | #include <linux/mtd/mtd.h> | 24 | #include <linux/mtd/mtd.h> |
25 | #include <linux/mtd/partitions.h> | 25 | #include <linux/mtd/partitions.h> |
26 | #include <linux/mtd/physmap.h> | 26 | #include <linux/mtd/physmap.h> |
27 | |||
27 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
28 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
29 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
31 | |||
32 | #include <mach/pxa25x.h> | ||
30 | #include <mach/h5000.h> | 33 | #include <mach/h5000.h> |
31 | #include <mach/pxa-regs.h> | ||
32 | #include <mach/pxa2xx-regs.h> | ||
33 | #include <mach/mfp-pxa25x.h> | ||
34 | #include <mach/udc.h> | 34 | #include <mach/udc.h> |
35 | |||
35 | #include "generic.h" | 36 | #include "generic.h" |
36 | 37 | ||
37 | /* | 38 | /* |
diff --git a/arch/arm/mach-pxa/himalaya.c b/arch/arm/mach-pxa/himalaya.c new file mode 100644 index 000000000000..cea99fe65b97 --- /dev/null +++ b/arch/arm/mach-pxa/himalaya.c | |||
@@ -0,0 +1,166 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/mach-pxa/himalaya.c | ||
3 | * | ||
4 | * Hardware definitions for the HTC Himalaya | ||
5 | * | ||
6 | * Based on 2.6.21-hh20's himalaya.c and himalaya_lcd.c | ||
7 | * | ||
8 | * Copyright (c) 2008 Zbynek Michl <Zbynek.Michl@seznam.cz> | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #include <linux/kernel.h> | ||
16 | #include <linux/init.h> | ||
17 | #include <linux/device.h> | ||
18 | #include <linux/fb.h> | ||
19 | #include <linux/platform_device.h> | ||
20 | |||
21 | #include <video/w100fb.h> | ||
22 | |||
23 | #include <asm/setup.h> | ||
24 | #include <asm/mach-types.h> | ||
25 | #include <asm/mach/arch.h> | ||
26 | |||
27 | #include <mach/mfp-pxa25x.h> | ||
28 | #include <mach/hardware.h> | ||
29 | |||
30 | #include "generic.h" | ||
31 | |||
32 | /* ---------------------- Himalaya LCD definitions -------------------- */ | ||
33 | |||
34 | static struct w100_gen_regs himalaya_lcd_regs = { | ||
35 | .lcd_format = 0x00000003, | ||
36 | .lcdd_cntl1 = 0x00000000, | ||
37 | .lcdd_cntl2 = 0x0003ffff, | ||
38 | .genlcd_cntl1 = 0x00fff003, | ||
39 | .genlcd_cntl2 = 0x00000003, | ||
40 | .genlcd_cntl3 = 0x000102aa, | ||
41 | }; | ||
42 | |||
43 | static struct w100_mode himalaya4_lcd_mode = { | ||
44 | .xres = 240, | ||
45 | .yres = 320, | ||
46 | .left_margin = 0, | ||
47 | .right_margin = 31, | ||
48 | .upper_margin = 15, | ||
49 | .lower_margin = 0, | ||
50 | .crtc_ss = 0x80150014, | ||
51 | .crtc_ls = 0xa0fb00f7, | ||
52 | .crtc_gs = 0xc0080007, | ||
53 | .crtc_vpos_gs = 0x00080007, | ||
54 | .crtc_rev = 0x0000000a, | ||
55 | .crtc_dclk = 0x81700030, | ||
56 | .crtc_gclk = 0x8015010f, | ||
57 | .crtc_goe = 0x00000000, | ||
58 | .pll_freq = 80, | ||
59 | .pixclk_divider = 15, | ||
60 | .pixclk_divider_rotated = 15, | ||
61 | .pixclk_src = CLK_SRC_PLL, | ||
62 | .sysclk_divider = 0, | ||
63 | .sysclk_src = CLK_SRC_PLL, | ||
64 | }; | ||
65 | |||
66 | static struct w100_mode himalaya6_lcd_mode = { | ||
67 | .xres = 240, | ||
68 | .yres = 320, | ||
69 | .left_margin = 9, | ||
70 | .right_margin = 8, | ||
71 | .upper_margin = 5, | ||
72 | .lower_margin = 4, | ||
73 | .crtc_ss = 0x80150014, | ||
74 | .crtc_ls = 0xa0fb00f7, | ||
75 | .crtc_gs = 0xc0080007, | ||
76 | .crtc_vpos_gs = 0x00080007, | ||
77 | .crtc_rev = 0x0000000a, | ||
78 | .crtc_dclk = 0xa1700030, | ||
79 | .crtc_gclk = 0x8015010f, | ||
80 | .crtc_goe = 0x00000000, | ||
81 | .pll_freq = 95, | ||
82 | .pixclk_divider = 0xb, | ||
83 | .pixclk_divider_rotated = 4, | ||
84 | .pixclk_src = CLK_SRC_PLL, | ||
85 | .sysclk_divider = 1, | ||
86 | .sysclk_src = CLK_SRC_PLL, | ||
87 | }; | ||
88 | |||
89 | static struct w100_gpio_regs himalaya_w100_gpio_info = { | ||
90 | .init_data1 = 0xffff0000, /* GPIO_DATA */ | ||
91 | .gpio_dir1 = 0x00000000, /* GPIO_CNTL1 */ | ||
92 | .gpio_oe1 = 0x003c0000, /* GPIO_CNTL2 */ | ||
93 | .init_data2 = 0x00000000, /* GPIO_DATA2 */ | ||
94 | .gpio_dir2 = 0x00000000, /* GPIO_CNTL3 */ | ||
95 | .gpio_oe2 = 0x00000000, /* GPIO_CNTL4 */ | ||
96 | }; | ||
97 | |||
98 | static struct w100fb_mach_info himalaya_fb_info = { | ||
99 | .num_modes = 1, | ||
100 | .regs = &himalaya_lcd_regs, | ||
101 | .gpio = &himalaya_w100_gpio_info, | ||
102 | .xtal_freq = 16000000, | ||
103 | }; | ||
104 | |||
105 | static struct resource himalaya_fb_resources[] = { | ||
106 | [0] = { | ||
107 | .start = 0x08000000, | ||
108 | .end = 0x08ffffff, | ||
109 | .flags = IORESOURCE_MEM, | ||
110 | }, | ||
111 | }; | ||
112 | |||
113 | static struct platform_device himalaya_fb_device = { | ||
114 | .name = "w100fb", | ||
115 | .id = -1, | ||
116 | .dev = { | ||
117 | .platform_data = &himalaya_fb_info, | ||
118 | }, | ||
119 | .num_resources = ARRAY_SIZE(himalaya_fb_resources), | ||
120 | .resource = himalaya_fb_resources, | ||
121 | }; | ||
122 | |||
123 | /* ----------------------------------------------------------------------- */ | ||
124 | |||
125 | static struct platform_device *devices[] __initdata = { | ||
126 | &himalaya_fb_device, | ||
127 | }; | ||
128 | |||
129 | static void __init himalaya_lcd_init(void) | ||
130 | { | ||
131 | int himalaya_boardid; | ||
132 | |||
133 | himalaya_boardid = 0x4; /* hardcoded (detection needs ASIC3 functions) */ | ||
134 | printk(KERN_INFO "himalaya LCD Driver init. boardid=%d\n", | ||
135 | himalaya_boardid); | ||
136 | |||
137 | switch (himalaya_boardid) { | ||
138 | case 0x4: | ||
139 | himalaya_fb_info.modelist = &himalaya4_lcd_mode; | ||
140 | break; | ||
141 | case 0x6: | ||
142 | himalaya_fb_info.modelist = &himalaya6_lcd_mode; | ||
143 | break; | ||
144 | default: | ||
145 | printk(KERN_INFO "himalaya lcd_init: unknown boardid=%d. Using 0x4\n", | ||
146 | himalaya_boardid); | ||
147 | himalaya_fb_info.modelist = &himalaya4_lcd_mode; | ||
148 | } | ||
149 | } | ||
150 | |||
151 | static void __init himalaya_init(void) | ||
152 | { | ||
153 | himalaya_lcd_init(); | ||
154 | platform_add_devices(devices, ARRAY_SIZE(devices)); | ||
155 | } | ||
156 | |||
157 | |||
158 | MACHINE_START(HIMALAYA, "HTC Himalaya") | ||
159 | .phys_io = 0x40000000, | ||
160 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | ||
161 | .boot_params = 0xa0000100, | ||
162 | .map_io = pxa_map_io, | ||
163 | .init_irq = pxa25x_init_irq, | ||
164 | .init_machine = himalaya_init, | ||
165 | .timer = &pxa_timer, | ||
166 | MACHINE_END | ||
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c index 013b15baa034..b6243b59d9be 100644 --- a/arch/arm/mach-pxa/idp.c +++ b/arch/arm/mach-pxa/idp.c | |||
@@ -31,8 +31,7 @@ | |||
31 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
32 | #include <asm/mach/map.h> | 32 | #include <asm/mach/map.h> |
33 | 33 | ||
34 | #include <mach/pxa-regs.h> | 34 | #include <mach/pxa25x.h> |
35 | #include <mach/mfp-pxa25x.h> | ||
36 | #include <mach/idp.h> | 35 | #include <mach/idp.h> |
37 | #include <mach/pxafb.h> | 36 | #include <mach/pxafb.h> |
38 | #include <mach/bitfield.h> | 37 | #include <mach/bitfield.h> |
diff --git a/arch/arm/mach-pxa/imote2.c b/arch/arm/mach-pxa/imote2.c index 364c5e271330..2121309b2474 100644 --- a/arch/arm/mach-pxa/imote2.c +++ b/arch/arm/mach-pxa/imote2.c | |||
@@ -28,11 +28,8 @@ | |||
28 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
29 | #include <asm/mach/flash.h> | 29 | #include <asm/mach/flash.h> |
30 | 30 | ||
31 | #include <mach/pxa27x.h> | ||
31 | #include <mach/i2c.h> | 32 | #include <mach/i2c.h> |
32 | #include <mach/pxa-regs.h> | ||
33 | #include <mach/pxa2xx-regs.h> | ||
34 | #include <mach/mfp-pxa27x.h> | ||
35 | #include <mach/regs-ssp.h> | ||
36 | #include <mach/udc.h> | 33 | #include <mach/udc.h> |
37 | #include <mach/mmc.h> | 34 | #include <mach/mmc.h> |
38 | #include <mach/pxa2xx_spi.h> | 35 | #include <mach/pxa2xx_spi.h> |
diff --git a/arch/arm/mach-pxa/include/mach/dma.h b/arch/arm/mach-pxa/include/mach/dma.h index 7804637a6df3..b0812f59d3f8 100644 --- a/arch/arm/mach-pxa/include/mach/dma.h +++ b/arch/arm/mach-pxa/include/mach/dma.h | |||
@@ -12,6 +12,62 @@ | |||
12 | #ifndef __ASM_ARCH_DMA_H | 12 | #ifndef __ASM_ARCH_DMA_H |
13 | #define __ASM_ARCH_DMA_H | 13 | #define __ASM_ARCH_DMA_H |
14 | 14 | ||
15 | #include <mach/hardware.h> | ||
16 | |||
17 | /* DMA Controller Registers Definitions */ | ||
18 | #define DMAC_REGS_VIRT io_p2v(0x40000000) | ||
19 | #define DMAC_REG(x) (*((volatile u32 *)(DMAC_REGS_VIRT + (x)))) | ||
20 | |||
21 | #define DCSR(n) DMAC_REG((n) << 2) | ||
22 | #define DALGN DMAC_REG(0x00a0) /* DMA Alignment Register */ | ||
23 | #define DINT DMAC_REG(0x00f0) /* DMA Interrupt Register */ | ||
24 | #define DDADR(n) DMAC_REG(0x0200 + ((n) << 4)) | ||
25 | #define DSADR(n) DMAC_REG(0x0204 + ((n) << 4)) | ||
26 | #define DTADR(n) DMAC_REG(0x0208 + ((n) << 4)) | ||
27 | #define DCMD(n) DMAC_REG(0x020c + ((n) << 4)) | ||
28 | #define DRCMR(n) DMAC_REG((((n) < 64) ? 0x0100 : 0x1100) + \ | ||
29 | (((n) & 0x3f) << 2)) | ||
30 | |||
31 | #define DCSR_RUN (1 << 31) /* Run Bit (read / write) */ | ||
32 | #define DCSR_NODESC (1 << 30) /* No-Descriptor Fetch (read / write) */ | ||
33 | #define DCSR_STOPIRQEN (1 << 29) /* Stop Interrupt Enable (read / write) */ | ||
34 | #define DCSR_REQPEND (1 << 8) /* Request Pending (read-only) */ | ||
35 | #define DCSR_STOPSTATE (1 << 3) /* Stop State (read-only) */ | ||
36 | #define DCSR_ENDINTR (1 << 2) /* End Interrupt (read / write) */ | ||
37 | #define DCSR_STARTINTR (1 << 1) /* Start Interrupt (read / write) */ | ||
38 | #define DCSR_BUSERR (1 << 0) /* Bus Error Interrupt (read / write) */ | ||
39 | |||
40 | #if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) | ||
41 | #define DCSR_EORIRQEN (1 << 28) /* End of Receive Interrupt Enable (R/W) */ | ||
42 | #define DCSR_EORJMPEN (1 << 27) /* Jump to next descriptor on EOR */ | ||
43 | #define DCSR_EORSTOPEN (1 << 26) /* STOP on an EOR */ | ||
44 | #define DCSR_SETCMPST (1 << 25) /* Set Descriptor Compare Status */ | ||
45 | #define DCSR_CLRCMPST (1 << 24) /* Clear Descriptor Compare Status */ | ||
46 | #define DCSR_CMPST (1 << 10) /* The Descriptor Compare Status */ | ||
47 | #define DCSR_EORINTR (1 << 9) /* The end of Receive */ | ||
48 | #endif | ||
49 | |||
50 | #define DRCMR_MAPVLD (1 << 7) /* Map Valid (read / write) */ | ||
51 | #define DRCMR_CHLNUM 0x1f /* mask for Channel Number (read / write) */ | ||
52 | |||
53 | #define DDADR_DESCADDR 0xfffffff0 /* Address of next descriptor (mask) */ | ||
54 | #define DDADR_STOP (1 << 0) /* Stop (read / write) */ | ||
55 | |||
56 | #define DCMD_INCSRCADDR (1 << 31) /* Source Address Increment Setting. */ | ||
57 | #define DCMD_INCTRGADDR (1 << 30) /* Target Address Increment Setting. */ | ||
58 | #define DCMD_FLOWSRC (1 << 29) /* Flow Control by the source. */ | ||
59 | #define DCMD_FLOWTRG (1 << 28) /* Flow Control by the target. */ | ||
60 | #define DCMD_STARTIRQEN (1 << 22) /* Start Interrupt Enable */ | ||
61 | #define DCMD_ENDIRQEN (1 << 21) /* End Interrupt Enable */ | ||
62 | #define DCMD_ENDIAN (1 << 18) /* Device Endian-ness. */ | ||
63 | #define DCMD_BURST8 (1 << 16) /* 8 byte burst */ | ||
64 | #define DCMD_BURST16 (2 << 16) /* 16 byte burst */ | ||
65 | #define DCMD_BURST32 (3 << 16) /* 32 byte burst */ | ||
66 | #define DCMD_WIDTH1 (1 << 14) /* 1 byte width */ | ||
67 | #define DCMD_WIDTH2 (2 << 14) /* 2 byte width (HalfWord) */ | ||
68 | #define DCMD_WIDTH4 (3 << 14) /* 4 byte width (Word) */ | ||
69 | #define DCMD_LENGTH 0x01fff /* length mask (max = 8K - 1) */ | ||
70 | |||
15 | /* | 71 | /* |
16 | * Descriptor structure for PXA's DMA engine | 72 | * Descriptor structure for PXA's DMA engine |
17 | * Note: this structure must always be aligned to a 16-byte boundary. | 73 | * Note: this structure must always be aligned to a 16-byte boundary. |
@@ -34,7 +90,7 @@ typedef enum { | |||
34 | * DMA registration | 90 | * DMA registration |
35 | */ | 91 | */ |
36 | 92 | ||
37 | int __init pxa_init_dma(int num_ch); | 93 | int __init pxa_init_dma(int irq, int num_ch); |
38 | 94 | ||
39 | int pxa_request_dma (char *name, | 95 | int pxa_request_dma (char *name, |
40 | pxa_dma_prio prio, | 96 | pxa_dma_prio prio, |
diff --git a/arch/arm/mach-pxa/include/mach/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h index 2c538d8c362d..406fa102cb40 100644 --- a/arch/arm/mach-pxa/include/mach/gpio.h +++ b/arch/arm/mach-pxa/include/mach/gpio.h | |||
@@ -24,16 +24,87 @@ | |||
24 | #ifndef __ASM_ARCH_PXA_GPIO_H | 24 | #ifndef __ASM_ARCH_PXA_GPIO_H |
25 | #define __ASM_ARCH_PXA_GPIO_H | 25 | #define __ASM_ARCH_PXA_GPIO_H |
26 | 26 | ||
27 | #include <mach/pxa-regs.h> | 27 | #include <mach/irqs.h> |
28 | #include <asm/irq.h> | ||
29 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
30 | |||
31 | #include <asm-generic/gpio.h> | 29 | #include <asm-generic/gpio.h> |
32 | 30 | ||
31 | #define GPIO_REGS_VIRT io_p2v(0x40E00000) | ||
32 | |||
33 | #define BANK_OFF(n) (((n) > 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2)) | ||
34 | #define GPIO_REG(x) (*(volatile u32 *)(GPIO_REGS_VIRT + (x))) | ||
35 | |||
36 | /* GPIO Pin Level Registers */ | ||
37 | #define GPLR0 GPIO_REG(BANK_OFF(0) + 0x00) | ||
38 | #define GPLR1 GPIO_REG(BANK_OFF(1) + 0x00) | ||
39 | #define GPLR2 GPIO_REG(BANK_OFF(2) + 0x00) | ||
40 | #define GPLR3 GPIO_REG(BANK_OFF(3) + 0x00) | ||
41 | |||
42 | /* GPIO Pin Direction Registers */ | ||
43 | #define GPDR0 GPIO_REG(BANK_OFF(0) + 0x0c) | ||
44 | #define GPDR1 GPIO_REG(BANK_OFF(1) + 0x0c) | ||
45 | #define GPDR2 GPIO_REG(BANK_OFF(2) + 0x0c) | ||
46 | #define GPDR3 GPIO_REG(BANK_OFF(3) + 0x0c) | ||
47 | |||
48 | /* GPIO Pin Output Set Registers */ | ||
49 | #define GPSR0 GPIO_REG(BANK_OFF(0) + 0x18) | ||
50 | #define GPSR1 GPIO_REG(BANK_OFF(1) + 0x18) | ||
51 | #define GPSR2 GPIO_REG(BANK_OFF(2) + 0x18) | ||
52 | #define GPSR3 GPIO_REG(BANK_OFF(3) + 0x18) | ||
53 | |||
54 | /* GPIO Pin Output Clear Registers */ | ||
55 | #define GPCR0 GPIO_REG(BANK_OFF(0) + 0x24) | ||
56 | #define GPCR1 GPIO_REG(BANK_OFF(1) + 0x24) | ||
57 | #define GPCR2 GPIO_REG(BANK_OFF(2) + 0x24) | ||
58 | #define GPCR3 GPIO_REG(BANK_OFF(3) + 0x24) | ||
59 | |||
60 | /* GPIO Rising Edge Detect Registers */ | ||
61 | #define GRER0 GPIO_REG(BANK_OFF(0) + 0x30) | ||
62 | #define GRER1 GPIO_REG(BANK_OFF(1) + 0x30) | ||
63 | #define GRER2 GPIO_REG(BANK_OFF(2) + 0x30) | ||
64 | #define GRER3 GPIO_REG(BANK_OFF(3) + 0x30) | ||
65 | |||
66 | /* GPIO Falling Edge Detect Registers */ | ||
67 | #define GFER0 GPIO_REG(BANK_OFF(0) + 0x3c) | ||
68 | #define GFER1 GPIO_REG(BANK_OFF(1) + 0x3c) | ||
69 | #define GFER2 GPIO_REG(BANK_OFF(2) + 0x3c) | ||
70 | #define GFER3 GPIO_REG(BANK_OFF(3) + 0x3c) | ||
71 | |||
72 | /* GPIO Edge Detect Status Registers */ | ||
73 | #define GEDR0 GPIO_REG(BANK_OFF(0) + 0x48) | ||
74 | #define GEDR1 GPIO_REG(BANK_OFF(1) + 0x48) | ||
75 | #define GEDR2 GPIO_REG(BANK_OFF(2) + 0x48) | ||
76 | #define GEDR3 GPIO_REG(BANK_OFF(3) + 0x48) | ||
77 | |||
78 | /* GPIO Alternate Function Select Registers */ | ||
79 | #define GAFR0_L GPIO_REG(0x0054) | ||
80 | #define GAFR0_U GPIO_REG(0x0058) | ||
81 | #define GAFR1_L GPIO_REG(0x005C) | ||
82 | #define GAFR1_U GPIO_REG(0x0060) | ||
83 | #define GAFR2_L GPIO_REG(0x0064) | ||
84 | #define GAFR2_U GPIO_REG(0x0068) | ||
85 | #define GAFR3_L GPIO_REG(0x006C) | ||
86 | #define GAFR3_U GPIO_REG(0x0070) | ||
87 | |||
88 | /* More handy macros. The argument is a literal GPIO number. */ | ||
89 | |||
90 | #define GPIO_bit(x) (1 << ((x) & 0x1f)) | ||
91 | |||
92 | #define GPLR(x) GPIO_REG(BANK_OFF((x) >> 5) + 0x00) | ||
93 | #define GPDR(x) GPIO_REG(BANK_OFF((x) >> 5) + 0x0c) | ||
94 | #define GPSR(x) GPIO_REG(BANK_OFF((x) >> 5) + 0x18) | ||
95 | #define GPCR(x) GPIO_REG(BANK_OFF((x) >> 5) + 0x24) | ||
96 | #define GRER(x) GPIO_REG(BANK_OFF((x) >> 5) + 0x30) | ||
97 | #define GFER(x) GPIO_REG(BANK_OFF((x) >> 5) + 0x3c) | ||
98 | #define GEDR(x) GPIO_REG(BANK_OFF((x) >> 5) + 0x48) | ||
99 | #define GAFR(x) GPIO_REG(0x54 + (((x) & 0x70) >> 2)) | ||
100 | |||
33 | 101 | ||
34 | /* NOTE: some PXAs have fewer on-chip GPIOs (like PXA255, with 85). | 102 | /* NOTE: some PXAs have fewer on-chip GPIOs (like PXA255, with 85). |
35 | * Those cases currently cause holes in the GPIO number space. | 103 | * Those cases currently cause holes in the GPIO number space, the |
104 | * actual number of the last GPIO is recorded by 'pxa_last_gpio'. | ||
36 | */ | 105 | */ |
106 | extern int pxa_last_gpio; | ||
107 | |||
37 | #define NR_BUILTIN_GPIO 128 | 108 | #define NR_BUILTIN_GPIO 128 |
38 | 109 | ||
39 | static inline int gpio_get_value(unsigned gpio) | 110 | static inline int gpio_get_value(unsigned gpio) |
@@ -56,10 +127,45 @@ static inline void gpio_set_value(unsigned gpio, int value) | |||
56 | } | 127 | } |
57 | } | 128 | } |
58 | 129 | ||
59 | #define gpio_cansleep __gpio_cansleep | 130 | #define gpio_cansleep __gpio_cansleep |
60 | 131 | #define gpio_to_bank(gpio) ((gpio) >> 5) | |
61 | #define gpio_to_irq(gpio) IRQ_GPIO(gpio) | 132 | #define gpio_to_irq(gpio) IRQ_GPIO(gpio) |
62 | #define irq_to_gpio(irq) IRQ_TO_GPIO(irq) | 133 | #define irq_to_gpio(irq) IRQ_TO_GPIO(irq) |
63 | 134 | ||
64 | 135 | ||
136 | #ifdef CONFIG_CPU_PXA26x | ||
137 | /* GPIO86/87/88/89 on PXA26x have their direction bits in GPDR2 inverted, | ||
138 | * as well as their Alternate Function value being '1' for GPIO in GAFRx. | ||
139 | */ | ||
140 | static inline int __gpio_is_inverted(unsigned gpio) | ||
141 | { | ||
142 | return cpu_is_pxa25x() && gpio > 85; | ||
143 | } | ||
144 | #else | ||
145 | static inline int __gpio_is_inverted(unsigned gpio) { return 0; } | ||
146 | #endif | ||
147 | |||
148 | /* | ||
149 | * On PXA25x and PXA27x, GAFRx and GPDRx together decide the alternate | ||
150 | * function of a GPIO, and GPDRx cannot be altered once configured. It | ||
151 | * is attributed as "occupied" here (I know this terminology isn't | ||
152 | * accurate, you are welcome to propose a better one :-) | ||
153 | */ | ||
154 | static inline int __gpio_is_occupied(unsigned gpio) | ||
155 | { | ||
156 | if (cpu_is_pxa27x() || cpu_is_pxa25x()) { | ||
157 | int af = (GAFR(gpio) >> ((gpio & 0xf) * 2)) & 0x3; | ||
158 | int dir = GPDR(gpio) & GPIO_bit(gpio); | ||
159 | |||
160 | if (__gpio_is_inverted(gpio)) | ||
161 | return af != 1 || dir == 0; | ||
162 | else | ||
163 | return af != 0 || dir != 0; | ||
164 | } else | ||
165 | return GPDR(gpio) & GPIO_bit(gpio); | ||
166 | } | ||
167 | |||
168 | typedef int (*set_wake_t)(unsigned int irq, unsigned int on); | ||
169 | |||
170 | extern void pxa_init_gpio(int mux_irq, int start, int end, set_wake_t fn); | ||
65 | #endif | 171 | #endif |
diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h index 099f54a41de4..06abd4160607 100644 --- a/arch/arm/mach-pxa/include/mach/gumstix.h +++ b/arch/arm/mach-pxa/include/mach/gumstix.h | |||
@@ -97,4 +97,5 @@ has detected a cable insertion; driven low otherwise. */ | |||
97 | 97 | ||
98 | /* for expansion boards that can't be programatically detected */ | 98 | /* for expansion boards that can't be programatically detected */ |
99 | extern int am200_init(void); | 99 | extern int am200_init(void); |
100 | extern int am300_init(void); | ||
100 | 101 | ||
diff --git a/arch/arm/mach-pxa/include/mach/lubbock.h b/arch/arm/mach-pxa/include/mach/lubbock.h index 4cb24154a5a8..751b74811d0f 100644 --- a/arch/arm/mach-pxa/include/mach/lubbock.h +++ b/arch/arm/mach-pxa/include/mach/lubbock.h | |||
@@ -25,7 +25,6 @@ | |||
25 | 25 | ||
26 | /* FPGA register virtual addresses */ | 26 | /* FPGA register virtual addresses */ |
27 | #define LUB_WHOAMI __LUB_REG(LUBBOCK_FPGA_PHYS + 0x000) | 27 | #define LUB_WHOAMI __LUB_REG(LUBBOCK_FPGA_PHYS + 0x000) |
28 | #define LUB_HEXLED __LUB_REG(LUBBOCK_FPGA_PHYS + 0x010) | ||
29 | #define LUB_DISC_BLNK_LED __LUB_REG(LUBBOCK_FPGA_PHYS + 0x040) | 28 | #define LUB_DISC_BLNK_LED __LUB_REG(LUBBOCK_FPGA_PHYS + 0x040) |
30 | #define LUB_CONF_SWITCHES __LUB_REG(LUBBOCK_FPGA_PHYS + 0x050) | 29 | #define LUB_CONF_SWITCHES __LUB_REG(LUBBOCK_FPGA_PHYS + 0x050) |
31 | #define LUB_USER_SWITCHES __LUB_REG(LUBBOCK_FPGA_PHYS + 0x060) | 30 | #define LUB_USER_SWITCHES __LUB_REG(LUBBOCK_FPGA_PHYS + 0x060) |
diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h index 38d68d99f585..82a399f3f9f2 100644 --- a/arch/arm/mach-pxa/include/mach/magician.h +++ b/arch/arm/mach-pxa/include/mach/magician.h | |||
@@ -69,7 +69,7 @@ | |||
69 | #define IRQ_MAGICIAN_SD (IRQ_BOARD_START + 0) | 69 | #define IRQ_MAGICIAN_SD (IRQ_BOARD_START + 0) |
70 | #define IRQ_MAGICIAN_EP (IRQ_BOARD_START + 1) | 70 | #define IRQ_MAGICIAN_EP (IRQ_BOARD_START + 1) |
71 | #define IRQ_MAGICIAN_BT (IRQ_BOARD_START + 2) | 71 | #define IRQ_MAGICIAN_BT (IRQ_BOARD_START + 2) |
72 | #define IRQ_MAGICIAN_AC (IRQ_BOARD_START + 3) | 72 | #define IRQ_MAGICIAN_VBUS (IRQ_BOARD_START + 3) |
73 | 73 | ||
74 | /* | 74 | /* |
75 | * CPLD EGPIOs | 75 | * CPLD EGPIOs |
diff --git a/arch/arm/mach-pxa/include/mach/mtd-xip.h b/arch/arm/mach-pxa/include/mach/mtd-xip.h index cfca8155be72..297387ec3618 100644 --- a/arch/arm/mach-pxa/include/mach/mtd-xip.h +++ b/arch/arm/mach-pxa/include/mach/mtd-xip.h | |||
@@ -15,8 +15,8 @@ | |||
15 | #ifndef __ARCH_PXA_MTD_XIP_H__ | 15 | #ifndef __ARCH_PXA_MTD_XIP_H__ |
16 | #define __ARCH_PXA_MTD_XIP_H__ | 16 | #define __ARCH_PXA_MTD_XIP_H__ |
17 | 17 | ||
18 | #include <mach/hardware.h> | 18 | #include <mach/regs-ost.h> |
19 | #include <mach/pxa-regs.h> | 19 | #include <mach/regs-intc.h> |
20 | 20 | ||
21 | #define xip_irqpending() (ICIP & ICMR) | 21 | #define xip_irqpending() (ICIP & ICMR) |
22 | 22 | ||
diff --git a/arch/arm/mach-pxa/include/mach/palmld.h b/arch/arm/mach-pxa/include/mach/palmld.h new file mode 100644 index 000000000000..7c295a48d784 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/palmld.h | |||
@@ -0,0 +1,109 @@ | |||
1 | /* | ||
2 | * GPIOs and interrupts for Palm LifeDrive Handheld Computer | ||
3 | * | ||
4 | * Authors: Alex Osborne <ato@meshy.org> | ||
5 | * Marek Vasut <marek.vasut@gmail.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | */ | ||
12 | |||
13 | #ifndef _INCLUDE_PALMLD_H_ | ||
14 | #define _INCLUDE_PALMLD_H_ | ||
15 | |||
16 | /** HERE ARE GPIOs **/ | ||
17 | |||
18 | /* GPIOs */ | ||
19 | #define GPIO_NR_PALMLD_GPIO_RESET 1 | ||
20 | #define GPIO_NR_PALMLD_POWER_DETECT 4 | ||
21 | #define GPIO_NR_PALMLD_HOTSYNC_BUTTON_N 10 | ||
22 | #define GPIO_NR_PALMLD_POWER_SWITCH 12 | ||
23 | #define GPIO_NR_PALMLD_EARPHONE_DETECT 13 | ||
24 | #define GPIO_NR_PALMLD_LOCK_SWITCH 15 | ||
25 | |||
26 | /* SD/MMC */ | ||
27 | #define GPIO_NR_PALMLD_SD_DETECT_N 14 | ||
28 | #define GPIO_NR_PALMLD_SD_POWER 114 | ||
29 | #define GPIO_NR_PALMLD_SD_READONLY 116 | ||
30 | |||
31 | /* TOUCHSCREEN */ | ||
32 | #define GPIO_NR_PALMLD_WM9712_IRQ 27 | ||
33 | |||
34 | /* IRDA */ | ||
35 | #define GPIO_NR_PALMLD_IR_DISABLE 108 | ||
36 | |||
37 | /* LCD/BACKLIGHT */ | ||
38 | #define GPIO_NR_PALMLD_BL_POWER 19 | ||
39 | #define GPIO_NR_PALMLD_LCD_POWER 96 | ||
40 | |||
41 | /* LCD BORDER */ | ||
42 | #define GPIO_NR_PALMLD_BORDER_SWITCH 21 | ||
43 | #define GPIO_NR_PALMLD_BORDER_SELECT 22 | ||
44 | |||
45 | /* BLUETOOTH */ | ||
46 | #define GPIO_NR_PALMLD_BT_POWER 17 | ||
47 | #define GPIO_NR_PALMLD_BT_RESET 83 | ||
48 | |||
49 | /* PCMCIA (WiFi) */ | ||
50 | #define GPIO_NR_PALMLD_PCMCIA_READY 38 | ||
51 | #define GPIO_NR_PALMLD_PCMCIA_POWER 36 | ||
52 | #define GPIO_NR_PALMLD_PCMCIA_RESET 81 | ||
53 | |||
54 | /* LEDs */ | ||
55 | #define GPIO_NR_PALMLD_LED_GREEN 52 | ||
56 | #define GPIO_NR_PALMLD_LED_AMBER 94 | ||
57 | |||
58 | /* IDE */ | ||
59 | #define GPIO_NR_PALMLD_IDE_IRQ 95 | ||
60 | #define GPIO_NR_PALMLD_IDE_RESET 98 | ||
61 | #define GPIO_NR_PALMLD_IDE_PWEN 115 | ||
62 | |||
63 | /* USB */ | ||
64 | #define GPIO_NR_PALMLD_USB_DETECT_N 3 | ||
65 | #define GPIO_NR_PALMLD_USB_READY 86 | ||
66 | #define GPIO_NR_PALMLD_USB_RESET 88 | ||
67 | #define GPIO_NR_PALMLD_USB_INT 106 | ||
68 | #define GPIO_NR_PALMLD_USB_POWER 118 | ||
69 | /* 20, 53 and 86 are usb related too */ | ||
70 | |||
71 | /* INTERRUPTS */ | ||
72 | #define IRQ_GPIO_PALMLD_GPIO_RESET IRQ_GPIO(GPIO_NR_PALMLD_GPIO_RESET) | ||
73 | #define IRQ_GPIO_PALMLD_SD_DETECT_N IRQ_GPIO(GPIO_NR_PALMLD_SD_DETECT_N) | ||
74 | #define IRQ_GPIO_PALMLD_WM9712_IRQ IRQ_GPIO(GPIO_NR_PALMLD_WM9712_IRQ) | ||
75 | #define IRQ_GPIO_PALMLD_IDE_IRQ IRQ_GPIO(GPIO_NR_PALMLD_IDE_IRQ) | ||
76 | |||
77 | |||
78 | /** HERE ARE INIT VALUES **/ | ||
79 | |||
80 | /* IO mappings */ | ||
81 | #define PALMLD_USB_PHYS PXA_CS2_PHYS | ||
82 | #define PALMLD_USB_VIRT 0xf0000000 | ||
83 | #define PALMLD_USB_SIZE 0x00100000 | ||
84 | |||
85 | #define PALMLD_IDE_PHYS 0x20000000 | ||
86 | #define PALMLD_IDE_VIRT 0xf1000000 | ||
87 | #define PALMLD_IDE_SIZE 0x00100000 | ||
88 | |||
89 | #define PALMLD_PHYS_IO_START 0x40000000 | ||
90 | |||
91 | /* BATTERY */ | ||
92 | #define PALMLD_BAT_MAX_VOLTAGE 4000 /* 4.00V maximum voltage */ | ||
93 | #define PALMLD_BAT_MIN_VOLTAGE 3550 /* 3.55V critical voltage */ | ||
94 | #define PALMLD_BAT_MAX_CURRENT 0 /* unknokn */ | ||
95 | #define PALMLD_BAT_MIN_CURRENT 0 /* unknown */ | ||
96 | #define PALMLD_BAT_MAX_CHARGE 1 /* unknown */ | ||
97 | #define PALMLD_BAT_MIN_CHARGE 1 /* unknown */ | ||
98 | #define PALMLD_MAX_LIFE_MINS 240 /* on-life in minutes */ | ||
99 | |||
100 | #define PALMLD_BAT_MEASURE_DELAY (HZ * 1) | ||
101 | |||
102 | /* BACKLIGHT */ | ||
103 | #define PALMLD_MAX_INTENSITY 0xFE | ||
104 | #define PALMLD_DEFAULT_INTENSITY 0x7E | ||
105 | #define PALMLD_LIMIT_MASK 0x7F | ||
106 | #define PALMLD_PRESCALER 0x3F | ||
107 | #define PALMLD_PERIOD_NS 3500 | ||
108 | |||
109 | #endif | ||
diff --git a/arch/arm/mach-pxa/include/mach/palmt5.h b/arch/arm/mach-pxa/include/mach/palmt5.h new file mode 100644 index 000000000000..94db2881f048 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/palmt5.h | |||
@@ -0,0 +1,84 @@ | |||
1 | /* | ||
2 | * GPIOs and interrupts for Palm Tungsten|T5 Handheld Computer | ||
3 | * | ||
4 | * Authors: Ales Snuparek <snuparek@atlas.cz> | ||
5 | * Marek Vasut <marek.vasut@gmail.com> | ||
6 | * Justin Kendrick <twilightsentry@gmail.com> | ||
7 | * RichardT5 <richard_t5@users.sourceforge.net> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | * | ||
13 | */ | ||
14 | |||
15 | #ifndef _INCLUDE_PALMT5_H_ | ||
16 | #define _INCLUDE_PALMT5_H_ | ||
17 | |||
18 | /** HERE ARE GPIOs **/ | ||
19 | |||
20 | /* GPIOs */ | ||
21 | #define GPIO_NR_PALMT5_GPIO_RESET 1 | ||
22 | |||
23 | #define GPIO_NR_PALMT5_POWER_DETECT 90 | ||
24 | #define GPIO_NR_PALMT5_HOTSYNC_BUTTON_N 10 | ||
25 | #define GPIO_NR_PALMT5_EARPHONE_DETECT 107 | ||
26 | |||
27 | /* SD/MMC */ | ||
28 | #define GPIO_NR_PALMT5_SD_DETECT_N 14 | ||
29 | #define GPIO_NR_PALMT5_SD_POWER 114 | ||
30 | #define GPIO_NR_PALMT5_SD_READONLY 115 | ||
31 | |||
32 | /* TOUCHSCREEN */ | ||
33 | #define GPIO_NR_PALMT5_WM9712_IRQ 27 | ||
34 | |||
35 | /* IRDA - disable GPIO connected to SD pin of tranceiver (TFBS4710?) ? */ | ||
36 | #define GPIO_NR_PALMT5_IR_DISABLE 40 | ||
37 | |||
38 | /* USB */ | ||
39 | #define GPIO_NR_PALMT5_USB_DETECT_N 15 | ||
40 | #define GPIO_NR_PALMT5_USB_POWER 95 | ||
41 | #define GPIO_NR_PALMT5_USB_PULLUP 93 | ||
42 | |||
43 | /* LCD/BACKLIGHT */ | ||
44 | #define GPIO_NR_PALMT5_BL_POWER 84 | ||
45 | #define GPIO_NR_PALMT5_LCD_POWER 96 | ||
46 | |||
47 | /* BLUETOOTH */ | ||
48 | #define GPIO_NR_PALMT5_BT_POWER 17 | ||
49 | #define GPIO_NR_PALMT5_BT_RESET 83 | ||
50 | |||
51 | /* INTERRUPTS */ | ||
52 | #define IRQ_GPIO_PALMT5_SD_DETECT_N IRQ_GPIO(GPIO_NR_PALMT5_SD_DETECT_N) | ||
53 | #define IRQ_GPIO_PALMT5_WM9712_IRQ IRQ_GPIO(GPIO_NR_PALMT5_WM9712_IRQ) | ||
54 | #define IRQ_GPIO_PALMT5_USB_DETECT IRQ_GPIO(GPIO_NR_PALMT5_USB_DETECT) | ||
55 | #define IRQ_GPIO_PALMT5_GPIO_RESET IRQ_GPIO(GPIO_NR_PALMT5_GPIO_RESET) | ||
56 | |||
57 | /** HERE ARE INIT VALUES **/ | ||
58 | |||
59 | /* Various addresses */ | ||
60 | #define PALMT5_PHYS_RAM_START 0xa0000000 | ||
61 | #define PALMT5_PHYS_IO_START 0x40000000 | ||
62 | |||
63 | /* TOUCHSCREEN */ | ||
64 | #define AC97_LINK_FRAME 21 | ||
65 | |||
66 | /* BATTERY */ | ||
67 | #define PALMT5_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ | ||
68 | #define PALMT5_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ | ||
69 | #define PALMT5_BAT_MAX_CURRENT 0 /* unknokn */ | ||
70 | #define PALMT5_BAT_MIN_CURRENT 0 /* unknown */ | ||
71 | #define PALMT5_BAT_MAX_CHARGE 1 /* unknown */ | ||
72 | #define PALMT5_BAT_MIN_CHARGE 1 /* unknown */ | ||
73 | #define PALMT5_MAX_LIFE_MINS 360 /* on-life in minutes */ | ||
74 | |||
75 | #define PALMT5_BAT_MEASURE_DELAY (HZ * 1) | ||
76 | |||
77 | /* BACKLIGHT */ | ||
78 | #define PALMT5_MAX_INTENSITY 0xFE | ||
79 | #define PALMT5_DEFAULT_INTENSITY 0x7E | ||
80 | #define PALMT5_LIMIT_MASK 0x7F | ||
81 | #define PALMT5_PRESCALER 0x3F | ||
82 | #define PALMT5_PERIOD_NS 3500 | ||
83 | |||
84 | #endif | ||
diff --git a/arch/arm/mach-pxa/include/mach/pm.h b/arch/arm/mach-pxa/include/mach/pm.h index 83342469acac..a6eeef8a075f 100644 --- a/arch/arm/mach-pxa/include/mach/pm.h +++ b/arch/arm/mach-pxa/include/mach/pm.h | |||
@@ -27,3 +27,13 @@ extern void pxa27x_cpu_suspend(unsigned int); | |||
27 | extern void pxa_cpu_resume(void); | 27 | extern void pxa_cpu_resume(void); |
28 | 28 | ||
29 | extern int pxa_pm_enter(suspend_state_t state); | 29 | extern int pxa_pm_enter(suspend_state_t state); |
30 | |||
31 | /* NOTE: this is for PM debugging on Lubbock, it's really a big | ||
32 | * ugly, but let's keep the crap minimum here, instead of direct | ||
33 | * accessing the LUBBOCK CPLD registers in arch/arm/mach-pxa/pm.c | ||
34 | */ | ||
35 | #ifdef CONFIG_ARCH_LUBBOCK | ||
36 | extern void lubbock_set_hexled(uint32_t value); | ||
37 | #else | ||
38 | #define lubbock_set_hexled(x) | ||
39 | #endif | ||
diff --git a/arch/arm/mach-pxa/include/mach/pxa-regs.h b/arch/arm/mach-pxa/include/mach/pxa-regs.h deleted file mode 100644 index 31d615aa7723..000000000000 --- a/arch/arm/mach-pxa/include/mach/pxa-regs.h +++ /dev/null | |||
@@ -1,263 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-pxa/include/mach/pxa-regs.h | ||
3 | * | ||
4 | * Author: Nicolas Pitre | ||
5 | * Created: Jun 15, 2001 | ||
6 | * Copyright: MontaVista Software Inc. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #ifndef __PXA_REGS_H | ||
14 | #define __PXA_REGS_H | ||
15 | |||
16 | #include <mach/hardware.h> | ||
17 | |||
18 | /* | ||
19 | * PXA Chip selects | ||
20 | */ | ||
21 | |||
22 | #define PXA_CS0_PHYS 0x00000000 | ||
23 | #define PXA_CS1_PHYS 0x04000000 | ||
24 | #define PXA_CS2_PHYS 0x08000000 | ||
25 | #define PXA_CS3_PHYS 0x0C000000 | ||
26 | #define PXA_CS4_PHYS 0x10000000 | ||
27 | #define PXA_CS5_PHYS 0x14000000 | ||
28 | |||
29 | |||
30 | /* | ||
31 | * Personal Computer Memory Card International Association (PCMCIA) sockets | ||
32 | */ | ||
33 | |||
34 | #define PCMCIAPrtSp 0x04000000 /* PCMCIA Partition Space [byte] */ | ||
35 | #define PCMCIASp (4*PCMCIAPrtSp) /* PCMCIA Space [byte] */ | ||
36 | #define PCMCIAIOSp PCMCIAPrtSp /* PCMCIA I/O Space [byte] */ | ||
37 | #define PCMCIAAttrSp PCMCIAPrtSp /* PCMCIA Attribute Space [byte] */ | ||
38 | #define PCMCIAMemSp PCMCIAPrtSp /* PCMCIA Memory Space [byte] */ | ||
39 | |||
40 | #define PCMCIA0Sp PCMCIASp /* PCMCIA 0 Space [byte] */ | ||
41 | #define PCMCIA0IOSp PCMCIAIOSp /* PCMCIA 0 I/O Space [byte] */ | ||
42 | #define PCMCIA0AttrSp PCMCIAAttrSp /* PCMCIA 0 Attribute Space [byte] */ | ||
43 | #define PCMCIA0MemSp PCMCIAMemSp /* PCMCIA 0 Memory Space [byte] */ | ||
44 | |||
45 | #define PCMCIA1Sp PCMCIASp /* PCMCIA 1 Space [byte] */ | ||
46 | #define PCMCIA1IOSp PCMCIAIOSp /* PCMCIA 1 I/O Space [byte] */ | ||
47 | #define PCMCIA1AttrSp PCMCIAAttrSp /* PCMCIA 1 Attribute Space [byte] */ | ||
48 | #define PCMCIA1MemSp PCMCIAMemSp /* PCMCIA 1 Memory Space [byte] */ | ||
49 | |||
50 | #define _PCMCIA(Nb) /* PCMCIA [0..1] */ \ | ||
51 | (0x20000000 + (Nb)*PCMCIASp) | ||
52 | #define _PCMCIAIO(Nb) _PCMCIA (Nb) /* PCMCIA I/O [0..1] */ | ||
53 | #define _PCMCIAAttr(Nb) /* PCMCIA Attribute [0..1] */ \ | ||
54 | (_PCMCIA (Nb) + 2*PCMCIAPrtSp) | ||
55 | #define _PCMCIAMem(Nb) /* PCMCIA Memory [0..1] */ \ | ||
56 | (_PCMCIA (Nb) + 3*PCMCIAPrtSp) | ||
57 | |||
58 | #define _PCMCIA0 _PCMCIA (0) /* PCMCIA 0 */ | ||
59 | #define _PCMCIA0IO _PCMCIAIO (0) /* PCMCIA 0 I/O */ | ||
60 | #define _PCMCIA0Attr _PCMCIAAttr (0) /* PCMCIA 0 Attribute */ | ||
61 | #define _PCMCIA0Mem _PCMCIAMem (0) /* PCMCIA 0 Memory */ | ||
62 | |||
63 | #define _PCMCIA1 _PCMCIA (1) /* PCMCIA 1 */ | ||
64 | #define _PCMCIA1IO _PCMCIAIO (1) /* PCMCIA 1 I/O */ | ||
65 | #define _PCMCIA1Attr _PCMCIAAttr (1) /* PCMCIA 1 Attribute */ | ||
66 | #define _PCMCIA1Mem _PCMCIAMem (1) /* PCMCIA 1 Memory */ | ||
67 | |||
68 | |||
69 | |||
70 | /* | ||
71 | * DMA Controller | ||
72 | */ | ||
73 | #define DCSR(x) __REG2(0x40000000, (x) << 2) | ||
74 | |||
75 | #define DCSR_RUN (1 << 31) /* Run Bit (read / write) */ | ||
76 | #define DCSR_NODESC (1 << 30) /* No-Descriptor Fetch (read / write) */ | ||
77 | #define DCSR_STOPIRQEN (1 << 29) /* Stop Interrupt Enable (read / write) */ | ||
78 | #define DCSR_REQPEND (1 << 8) /* Request Pending (read-only) */ | ||
79 | #define DCSR_STOPSTATE (1 << 3) /* Stop State (read-only) */ | ||
80 | #define DCSR_ENDINTR (1 << 2) /* End Interrupt (read / write) */ | ||
81 | #define DCSR_STARTINTR (1 << 1) /* Start Interrupt (read / write) */ | ||
82 | #define DCSR_BUSERR (1 << 0) /* Bus Error Interrupt (read / write) */ | ||
83 | |||
84 | #if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) | ||
85 | #define DCSR_EORIRQEN (1 << 28) /* End of Receive Interrupt Enable (R/W) */ | ||
86 | #define DCSR_EORJMPEN (1 << 27) /* Jump to next descriptor on EOR */ | ||
87 | #define DCSR_EORSTOPEN (1 << 26) /* STOP on an EOR */ | ||
88 | #define DCSR_SETCMPST (1 << 25) /* Set Descriptor Compare Status */ | ||
89 | #define DCSR_CLRCMPST (1 << 24) /* Clear Descriptor Compare Status */ | ||
90 | #define DCSR_CMPST (1 << 10) /* The Descriptor Compare Status */ | ||
91 | #define DCSR_EORINTR (1 << 9) /* The end of Receive */ | ||
92 | #endif | ||
93 | |||
94 | #define DALGN __REG(0x400000a0) /* DMA Alignment Register */ | ||
95 | #define DINT __REG(0x400000f0) /* DMA Interrupt Register */ | ||
96 | |||
97 | #define DRCMR(n) (*(((n) < 64) ? \ | ||
98 | &__REG2(0x40000100, ((n) & 0x3f) << 2) : \ | ||
99 | &__REG2(0x40001100, ((n) & 0x3f) << 2))) | ||
100 | |||
101 | #define DRCMR_MAPVLD (1 << 7) /* Map Valid (read / write) */ | ||
102 | #define DRCMR_CHLNUM 0x1f /* mask for Channel Number (read / write) */ | ||
103 | |||
104 | #define DDADR(x) __REG2(0x40000200, (x) << 4) | ||
105 | #define DSADR(x) __REG2(0x40000204, (x) << 4) | ||
106 | #define DTADR(x) __REG2(0x40000208, (x) << 4) | ||
107 | #define DCMD(x) __REG2(0x4000020c, (x) << 4) | ||
108 | |||
109 | #define DDADR_DESCADDR 0xfffffff0 /* Address of next descriptor (mask) */ | ||
110 | #define DDADR_STOP (1 << 0) /* Stop (read / write) */ | ||
111 | |||
112 | #define DCMD_INCSRCADDR (1 << 31) /* Source Address Increment Setting. */ | ||
113 | #define DCMD_INCTRGADDR (1 << 30) /* Target Address Increment Setting. */ | ||
114 | #define DCMD_FLOWSRC (1 << 29) /* Flow Control by the source. */ | ||
115 | #define DCMD_FLOWTRG (1 << 28) /* Flow Control by the target. */ | ||
116 | #define DCMD_STARTIRQEN (1 << 22) /* Start Interrupt Enable */ | ||
117 | #define DCMD_ENDIRQEN (1 << 21) /* End Interrupt Enable */ | ||
118 | #define DCMD_ENDIAN (1 << 18) /* Device Endian-ness. */ | ||
119 | #define DCMD_BURST8 (1 << 16) /* 8 byte burst */ | ||
120 | #define DCMD_BURST16 (2 << 16) /* 16 byte burst */ | ||
121 | #define DCMD_BURST32 (3 << 16) /* 32 byte burst */ | ||
122 | #define DCMD_WIDTH1 (1 << 14) /* 1 byte width */ | ||
123 | #define DCMD_WIDTH2 (2 << 14) /* 2 byte width (HalfWord) */ | ||
124 | #define DCMD_WIDTH4 (3 << 14) /* 4 byte width (Word) */ | ||
125 | #define DCMD_LENGTH 0x01fff /* length mask (max = 8K - 1) */ | ||
126 | |||
127 | /* | ||
128 | * Real Time Clock | ||
129 | */ | ||
130 | |||
131 | #define RCNR __REG(0x40900000) /* RTC Count Register */ | ||
132 | #define RTAR __REG(0x40900004) /* RTC Alarm Register */ | ||
133 | #define RTSR __REG(0x40900008) /* RTC Status Register */ | ||
134 | #define RTTR __REG(0x4090000C) /* RTC Timer Trim Register */ | ||
135 | #define PIAR __REG(0x40900038) /* Periodic Interrupt Alarm Register */ | ||
136 | |||
137 | #define RTSR_PICE (1 << 15) /* Periodic interrupt count enable */ | ||
138 | #define RTSR_PIALE (1 << 14) /* Periodic interrupt Alarm enable */ | ||
139 | #define RTSR_HZE (1 << 3) /* HZ interrupt enable */ | ||
140 | #define RTSR_ALE (1 << 2) /* RTC alarm interrupt enable */ | ||
141 | #define RTSR_HZ (1 << 1) /* HZ rising-edge detected */ | ||
142 | #define RTSR_AL (1 << 0) /* RTC alarm detected */ | ||
143 | |||
144 | |||
145 | /* | ||
146 | * OS Timer & Match Registers | ||
147 | */ | ||
148 | |||
149 | #define OSMR0 __REG(0x40A00000) /* */ | ||
150 | #define OSMR1 __REG(0x40A00004) /* */ | ||
151 | #define OSMR2 __REG(0x40A00008) /* */ | ||
152 | #define OSMR3 __REG(0x40A0000C) /* */ | ||
153 | #define OSMR4 __REG(0x40A00080) /* */ | ||
154 | #define OSCR __REG(0x40A00010) /* OS Timer Counter Register */ | ||
155 | #define OSCR4 __REG(0x40A00040) /* OS Timer Counter Register */ | ||
156 | #define OMCR4 __REG(0x40A000C0) /* */ | ||
157 | #define OSSR __REG(0x40A00014) /* OS Timer Status Register */ | ||
158 | #define OWER __REG(0x40A00018) /* OS Timer Watchdog Enable Register */ | ||
159 | #define OIER __REG(0x40A0001C) /* OS Timer Interrupt Enable Register */ | ||
160 | |||
161 | #define OSSR_M3 (1 << 3) /* Match status channel 3 */ | ||
162 | #define OSSR_M2 (1 << 2) /* Match status channel 2 */ | ||
163 | #define OSSR_M1 (1 << 1) /* Match status channel 1 */ | ||
164 | #define OSSR_M0 (1 << 0) /* Match status channel 0 */ | ||
165 | |||
166 | #define OWER_WME (1 << 0) /* Watchdog Match Enable */ | ||
167 | |||
168 | #define OIER_E3 (1 << 3) /* Interrupt enable channel 3 */ | ||
169 | #define OIER_E2 (1 << 2) /* Interrupt enable channel 2 */ | ||
170 | #define OIER_E1 (1 << 1) /* Interrupt enable channel 1 */ | ||
171 | #define OIER_E0 (1 << 0) /* Interrupt enable channel 0 */ | ||
172 | |||
173 | |||
174 | /* | ||
175 | * Interrupt Controller | ||
176 | */ | ||
177 | |||
178 | #define ICIP __REG(0x40D00000) /* Interrupt Controller IRQ Pending Register */ | ||
179 | #define ICMR __REG(0x40D00004) /* Interrupt Controller Mask Register */ | ||
180 | #define ICLR __REG(0x40D00008) /* Interrupt Controller Level Register */ | ||
181 | #define ICFP __REG(0x40D0000C) /* Interrupt Controller FIQ Pending Register */ | ||
182 | #define ICPR __REG(0x40D00010) /* Interrupt Controller Pending Register */ | ||
183 | #define ICCR __REG(0x40D00014) /* Interrupt Controller Control Register */ | ||
184 | |||
185 | #define ICIP2 __REG(0x40D0009C) /* Interrupt Controller IRQ Pending Register 2 */ | ||
186 | #define ICMR2 __REG(0x40D000A0) /* Interrupt Controller Mask Register 2 */ | ||
187 | #define ICLR2 __REG(0x40D000A4) /* Interrupt Controller Level Register 2 */ | ||
188 | #define ICFP2 __REG(0x40D000A8) /* Interrupt Controller FIQ Pending Register 2 */ | ||
189 | #define ICPR2 __REG(0x40D000AC) /* Interrupt Controller Pending Register 2 */ | ||
190 | |||
191 | /* | ||
192 | * General Purpose I/O | ||
193 | */ | ||
194 | |||
195 | #define GPLR0 __REG(0x40E00000) /* GPIO Pin-Level Register GPIO<31:0> */ | ||
196 | #define GPLR1 __REG(0x40E00004) /* GPIO Pin-Level Register GPIO<63:32> */ | ||
197 | #define GPLR2 __REG(0x40E00008) /* GPIO Pin-Level Register GPIO<80:64> */ | ||
198 | |||
199 | #define GPDR0 __REG(0x40E0000C) /* GPIO Pin Direction Register GPIO<31:0> */ | ||
200 | #define GPDR1 __REG(0x40E00010) /* GPIO Pin Direction Register GPIO<63:32> */ | ||
201 | #define GPDR2 __REG(0x40E00014) /* GPIO Pin Direction Register GPIO<80:64> */ | ||
202 | |||
203 | #define GPSR0 __REG(0x40E00018) /* GPIO Pin Output Set Register GPIO<31:0> */ | ||
204 | #define GPSR1 __REG(0x40E0001C) /* GPIO Pin Output Set Register GPIO<63:32> */ | ||
205 | #define GPSR2 __REG(0x40E00020) /* GPIO Pin Output Set Register GPIO<80:64> */ | ||
206 | |||
207 | #define GPCR0 __REG(0x40E00024) /* GPIO Pin Output Clear Register GPIO<31:0> */ | ||
208 | #define GPCR1 __REG(0x40E00028) /* GPIO Pin Output Clear Register GPIO <63:32> */ | ||
209 | #define GPCR2 __REG(0x40E0002C) /* GPIO Pin Output Clear Register GPIO <80:64> */ | ||
210 | |||
211 | #define GRER0 __REG(0x40E00030) /* GPIO Rising-Edge Detect Register GPIO<31:0> */ | ||
212 | #define GRER1 __REG(0x40E00034) /* GPIO Rising-Edge Detect Register GPIO<63:32> */ | ||
213 | #define GRER2 __REG(0x40E00038) /* GPIO Rising-Edge Detect Register GPIO<80:64> */ | ||
214 | |||
215 | #define GFER0 __REG(0x40E0003C) /* GPIO Falling-Edge Detect Register GPIO<31:0> */ | ||
216 | #define GFER1 __REG(0x40E00040) /* GPIO Falling-Edge Detect Register GPIO<63:32> */ | ||
217 | #define GFER2 __REG(0x40E00044) /* GPIO Falling-Edge Detect Register GPIO<80:64> */ | ||
218 | |||
219 | #define GEDR0 __REG(0x40E00048) /* GPIO Edge Detect Status Register GPIO<31:0> */ | ||
220 | #define GEDR1 __REG(0x40E0004C) /* GPIO Edge Detect Status Register GPIO<63:32> */ | ||
221 | #define GEDR2 __REG(0x40E00050) /* GPIO Edge Detect Status Register GPIO<80:64> */ | ||
222 | |||
223 | #define GAFR0_L __REG(0x40E00054) /* GPIO Alternate Function Select Register GPIO<15:0> */ | ||
224 | #define GAFR0_U __REG(0x40E00058) /* GPIO Alternate Function Select Register GPIO<31:16> */ | ||
225 | #define GAFR1_L __REG(0x40E0005C) /* GPIO Alternate Function Select Register GPIO<47:32> */ | ||
226 | #define GAFR1_U __REG(0x40E00060) /* GPIO Alternate Function Select Register GPIO<63:48> */ | ||
227 | #define GAFR2_L __REG(0x40E00064) /* GPIO Alternate Function Select Register GPIO<79:64> */ | ||
228 | #define GAFR2_U __REG(0x40E00068) /* GPIO Alternate Function Select Register GPIO<95-80> */ | ||
229 | #define GAFR3_L __REG(0x40E0006C) /* GPIO Alternate Function Select Register GPIO<111:96> */ | ||
230 | #define GAFR3_U __REG(0x40E00070) /* GPIO Alternate Function Select Register GPIO<127:112> */ | ||
231 | |||
232 | #define GPLR3 __REG(0x40E00100) /* GPIO Pin-Level Register GPIO<127:96> */ | ||
233 | #define GPDR3 __REG(0x40E0010C) /* GPIO Pin Direction Register GPIO<127:96> */ | ||
234 | #define GPSR3 __REG(0x40E00118) /* GPIO Pin Output Set Register GPIO<127:96> */ | ||
235 | #define GPCR3 __REG(0x40E00124) /* GPIO Pin Output Clear Register GPIO<127:96> */ | ||
236 | #define GRER3 __REG(0x40E00130) /* GPIO Rising-Edge Detect Register GPIO<127:96> */ | ||
237 | #define GFER3 __REG(0x40E0013C) /* GPIO Falling-Edge Detect Register GPIO<127:96> */ | ||
238 | #define GEDR3 __REG(0x40E00148) /* GPIO Edge Detect Status Register GPIO<127:96> */ | ||
239 | |||
240 | /* More handy macros. The argument is a literal GPIO number. */ | ||
241 | |||
242 | #define GPIO_bit(x) (1 << ((x) & 0x1f)) | ||
243 | |||
244 | #define _GPLR(x) __REG2(0x40E00000, ((x) & 0x60) >> 3) | ||
245 | #define _GPDR(x) __REG2(0x40E0000C, ((x) & 0x60) >> 3) | ||
246 | #define _GPSR(x) __REG2(0x40E00018, ((x) & 0x60) >> 3) | ||
247 | #define _GPCR(x) __REG2(0x40E00024, ((x) & 0x60) >> 3) | ||
248 | #define _GRER(x) __REG2(0x40E00030, ((x) & 0x60) >> 3) | ||
249 | #define _GFER(x) __REG2(0x40E0003C, ((x) & 0x60) >> 3) | ||
250 | #define _GEDR(x) __REG2(0x40E00048, ((x) & 0x60) >> 3) | ||
251 | #define _GAFR(x) __REG2(0x40E00054, ((x) & 0x70) >> 2) | ||
252 | |||
253 | #define GPLR(x) (*((((x) & 0x7f) < 96) ? &_GPLR(x) : &GPLR3)) | ||
254 | #define GPDR(x) (*((((x) & 0x7f) < 96) ? &_GPDR(x) : &GPDR3)) | ||
255 | #define GPSR(x) (*((((x) & 0x7f) < 96) ? &_GPSR(x) : &GPSR3)) | ||
256 | #define GPCR(x) (*((((x) & 0x7f) < 96) ? &_GPCR(x) : &GPCR3)) | ||
257 | #define GRER(x) (*((((x) & 0x7f) < 96) ? &_GRER(x) : &GRER3)) | ||
258 | #define GFER(x) (*((((x) & 0x7f) < 96) ? &_GFER(x) : &GFER3)) | ||
259 | #define GEDR(x) (*((((x) & 0x7f) < 96) ? &_GEDR(x) : &GEDR3)) | ||
260 | #define GAFR(x) (*((((x) & 0x7f) < 96) ? &_GAFR(x) : \ | ||
261 | ((((x) & 0x7f) < 112) ? &GAFR3_L : &GAFR3_U))) | ||
262 | |||
263 | #endif | ||
diff --git a/arch/arm/mach-pxa/include/mach/pxa25x.h b/arch/arm/mach-pxa/include/mach/pxa25x.h new file mode 100644 index 000000000000..508c3ba1f4d0 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pxa25x.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef __MACH_PXA25x_H | ||
2 | #define __MACH_PXA25x_H | ||
3 | |||
4 | #include <mach/hardware.h> | ||
5 | #include <mach/pxa2xx-regs.h> | ||
6 | #include <mach/mfp-pxa25x.h> | ||
7 | |||
8 | #endif /* __MACH_PXA25x_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/pxa27x.h b/arch/arm/mach-pxa/include/mach/pxa27x.h new file mode 100644 index 000000000000..6876e16c2970 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pxa27x.h | |||
@@ -0,0 +1,19 @@ | |||
1 | #ifndef __MACH_PXA27x_H | ||
2 | #define __MACH_PXA27x_H | ||
3 | |||
4 | #include <mach/hardware.h> | ||
5 | #include <mach/pxa2xx-regs.h> | ||
6 | #include <mach/mfp-pxa27x.h> | ||
7 | |||
8 | #define ARB_CNTRL __REG(0x48000048) /* Arbiter Control Register */ | ||
9 | |||
10 | #define ARB_DMA_SLV_PARK (1<<31) /* Be parked with DMA slave when idle */ | ||
11 | #define ARB_CI_PARK (1<<30) /* Be parked with Camera Interface when idle */ | ||
12 | #define ARB_EX_MEM_PARK (1<<29) /* Be parked with external MEMC when idle */ | ||
13 | #define ARB_INT_MEM_PARK (1<<28) /* Be parked with internal MEMC when idle */ | ||
14 | #define ARB_USB_PARK (1<<27) /* Be parked with USB when idle */ | ||
15 | #define ARB_LCD_PARK (1<<26) /* Be parked with LCD when idle */ | ||
16 | #define ARB_DMA_PARK (1<<25) /* Be parked with DMA when idle */ | ||
17 | #define ARB_CORE_PARK (1<<24) /* Be parked with core when idle */ | ||
18 | #define ARB_LOCK_FLAG (1<<23) /* Only Locking masters gain access to the bus */ | ||
19 | #endif /* __MACH_PXA27x_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h b/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h index d83393e25273..1209c44aa6f1 100644 --- a/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h +++ b/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h | |||
@@ -3,6 +3,8 @@ | |||
3 | 3 | ||
4 | #warning Please use mfp-pxa2[57]x.h instead of pxa2xx-gpio.h | 4 | #warning Please use mfp-pxa2[57]x.h instead of pxa2xx-gpio.h |
5 | 5 | ||
6 | #include <mach/gpio.h> | ||
7 | |||
6 | /* GPIO alternate function assignments */ | 8 | /* GPIO alternate function assignments */ |
7 | 9 | ||
8 | #define GPIO1_RST 1 /* reset */ | 10 | #define GPIO1_RST 1 /* reset */ |
diff --git a/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h index 77102d695cc7..4fcddd9cab76 100644 --- a/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | |||
@@ -14,6 +14,19 @@ | |||
14 | #ifndef __PXA2XX_REGS_H | 14 | #ifndef __PXA2XX_REGS_H |
15 | #define __PXA2XX_REGS_H | 15 | #define __PXA2XX_REGS_H |
16 | 16 | ||
17 | #include <mach/hardware.h> | ||
18 | |||
19 | /* | ||
20 | * PXA Chip selects | ||
21 | */ | ||
22 | |||
23 | #define PXA_CS0_PHYS 0x00000000 | ||
24 | #define PXA_CS1_PHYS 0x04000000 | ||
25 | #define PXA_CS2_PHYS 0x08000000 | ||
26 | #define PXA_CS3_PHYS 0x0C000000 | ||
27 | #define PXA_CS4_PHYS 0x10000000 | ||
28 | #define PXA_CS5_PHYS 0x14000000 | ||
29 | |||
17 | /* | 30 | /* |
18 | * Memory controller | 31 | * Memory controller |
19 | */ | 32 | */ |
@@ -69,24 +82,6 @@ | |||
69 | #define MDREFR_K0RUN (1 << 13) /* SDCLK0 Run Control/Status */ | 82 | #define MDREFR_K0RUN (1 << 13) /* SDCLK0 Run Control/Status */ |
70 | #define MDREFR_E0PIN (1 << 12) /* SDCKE0 Level Control/Status */ | 83 | #define MDREFR_E0PIN (1 << 12) /* SDCKE0 Level Control/Status */ |
71 | 84 | ||
72 | |||
73 | #ifdef CONFIG_PXA27x | ||
74 | |||
75 | #define ARB_CNTRL __REG(0x48000048) /* Arbiter Control Register */ | ||
76 | |||
77 | #define ARB_DMA_SLV_PARK (1<<31) /* Be parked with DMA slave when idle */ | ||
78 | #define ARB_CI_PARK (1<<30) /* Be parked with Camera Interface when idle */ | ||
79 | #define ARB_EX_MEM_PARK (1<<29) /* Be parked with external MEMC when idle */ | ||
80 | #define ARB_INT_MEM_PARK (1<<28) /* Be parked with internal MEMC when idle */ | ||
81 | #define ARB_USB_PARK (1<<27) /* Be parked with USB when idle */ | ||
82 | #define ARB_LCD_PARK (1<<26) /* Be parked with LCD when idle */ | ||
83 | #define ARB_DMA_PARK (1<<25) /* Be parked with DMA when idle */ | ||
84 | #define ARB_CORE_PARK (1<<24) /* Be parked with core when idle */ | ||
85 | #define ARB_LOCK_FLAG (1<<23) /* Only Locking masters gain access to the bus */ | ||
86 | |||
87 | #endif | ||
88 | |||
89 | |||
90 | /* | 85 | /* |
91 | * Power Manager | 86 | * Power Manager |
92 | */ | 87 | */ |
diff --git a/arch/arm/mach-pxa/include/mach/pxa300.h b/arch/arm/mach-pxa/include/mach/pxa300.h new file mode 100644 index 000000000000..2f33076c9e48 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pxa300.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef __MACH_PXA300_H | ||
2 | #define __MACH_PXA300_H | ||
3 | |||
4 | #include <mach/hardware.h> | ||
5 | #include <mach/pxa3xx-regs.h> | ||
6 | #include <mach/mfp-pxa300.h> | ||
7 | |||
8 | #endif /* __MACH_PXA300_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/pxa320.h b/arch/arm/mach-pxa/include/mach/pxa320.h new file mode 100644 index 000000000000..cab78e903273 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pxa320.h | |||
@@ -0,0 +1,9 @@ | |||
1 | #ifndef __MACH_PXA320_H | ||
2 | #define __MACH_PXA320_H | ||
3 | |||
4 | #include <mach/hardware.h> | ||
5 | #include <mach/pxa3xx-regs.h> | ||
6 | #include <mach/mfp-pxa320.h> | ||
7 | |||
8 | #endif /* __MACH_PXA320_H */ | ||
9 | |||
diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h index bcf3fb2c4b3a..7d1a059b3d43 100644 --- a/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | |||
@@ -13,6 +13,17 @@ | |||
13 | #ifndef __ASM_ARCH_PXA3XX_REGS_H | 13 | #ifndef __ASM_ARCH_PXA3XX_REGS_H |
14 | #define __ASM_ARCH_PXA3XX_REGS_H | 14 | #define __ASM_ARCH_PXA3XX_REGS_H |
15 | 15 | ||
16 | #include <mach/hardware.h> | ||
17 | |||
18 | /* | ||
19 | * Static Chip Selects | ||
20 | */ | ||
21 | |||
22 | #define PXA300_CS0_PHYS (0x00000000) /* PXA300/PXA310 _only_ */ | ||
23 | #define PXA300_CS1_PHYS (0x30000000) /* PXA300/PXA310 _only_ */ | ||
24 | #define PXA3xx_CS2_PHYS (0x10000000) | ||
25 | #define PXA3xx_CS3_PHYS (0x14000000) | ||
26 | |||
16 | /* | 27 | /* |
17 | * Oscillator Configuration Register (OSCC) | 28 | * Oscillator Configuration Register (OSCC) |
18 | */ | 29 | */ |
diff --git a/arch/arm/mach-pxa/include/mach/pxa930.h b/arch/arm/mach-pxa/include/mach/pxa930.h new file mode 100644 index 000000000000..d45f76a9b54d --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/pxa930.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef __MACH_PXA930_H | ||
2 | #define __MACH_PXA930_H | ||
3 | |||
4 | #include <mach/hardware.h> | ||
5 | #include <mach/pxa3xx-regs.h> | ||
6 | #include <mach/mfp-pxa930.h> | ||
7 | |||
8 | #endif /* __MACH_PXA930_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/regs-intc.h b/arch/arm/mach-pxa/include/mach/regs-intc.h new file mode 100644 index 000000000000..ad23e74b762f --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/regs-intc.h | |||
@@ -0,0 +1,23 @@ | |||
1 | #ifndef __ASM_MACH_REGS_INTC_H | ||
2 | #define __ASM_MACH_REGS_INTC_H | ||
3 | |||
4 | #include <mach/hardware.h> | ||
5 | |||
6 | /* | ||
7 | * Interrupt Controller | ||
8 | */ | ||
9 | |||
10 | #define ICIP __REG(0x40D00000) /* Interrupt Controller IRQ Pending Register */ | ||
11 | #define ICMR __REG(0x40D00004) /* Interrupt Controller Mask Register */ | ||
12 | #define ICLR __REG(0x40D00008) /* Interrupt Controller Level Register */ | ||
13 | #define ICFP __REG(0x40D0000C) /* Interrupt Controller FIQ Pending Register */ | ||
14 | #define ICPR __REG(0x40D00010) /* Interrupt Controller Pending Register */ | ||
15 | #define ICCR __REG(0x40D00014) /* Interrupt Controller Control Register */ | ||
16 | |||
17 | #define ICIP2 __REG(0x40D0009C) /* Interrupt Controller IRQ Pending Register 2 */ | ||
18 | #define ICMR2 __REG(0x40D000A0) /* Interrupt Controller Mask Register 2 */ | ||
19 | #define ICLR2 __REG(0x40D000A4) /* Interrupt Controller Level Register 2 */ | ||
20 | #define ICFP2 __REG(0x40D000A8) /* Interrupt Controller FIQ Pending Register 2 */ | ||
21 | #define ICPR2 __REG(0x40D000AC) /* Interrupt Controller Pending Register 2 */ | ||
22 | |||
23 | #endif /* __ASM_MACH_REGS_INTC_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/regs-ost.h b/arch/arm/mach-pxa/include/mach/regs-ost.h new file mode 100644 index 000000000000..a3e5f86ef67e --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/regs-ost.h | |||
@@ -0,0 +1,34 @@ | |||
1 | #ifndef __ASM_MACH_REGS_OST_H | ||
2 | #define __ASM_MACH_REGS_OST_H | ||
3 | |||
4 | #include <mach/hardware.h> | ||
5 | |||
6 | /* | ||
7 | * OS Timer & Match Registers | ||
8 | */ | ||
9 | |||
10 | #define OSMR0 __REG(0x40A00000) /* */ | ||
11 | #define OSMR1 __REG(0x40A00004) /* */ | ||
12 | #define OSMR2 __REG(0x40A00008) /* */ | ||
13 | #define OSMR3 __REG(0x40A0000C) /* */ | ||
14 | #define OSMR4 __REG(0x40A00080) /* */ | ||
15 | #define OSCR __REG(0x40A00010) /* OS Timer Counter Register */ | ||
16 | #define OSCR4 __REG(0x40A00040) /* OS Timer Counter Register */ | ||
17 | #define OMCR4 __REG(0x40A000C0) /* */ | ||
18 | #define OSSR __REG(0x40A00014) /* OS Timer Status Register */ | ||
19 | #define OWER __REG(0x40A00018) /* OS Timer Watchdog Enable Register */ | ||
20 | #define OIER __REG(0x40A0001C) /* OS Timer Interrupt Enable Register */ | ||
21 | |||
22 | #define OSSR_M3 (1 << 3) /* Match status channel 3 */ | ||
23 | #define OSSR_M2 (1 << 2) /* Match status channel 2 */ | ||
24 | #define OSSR_M1 (1 << 1) /* Match status channel 1 */ | ||
25 | #define OSSR_M0 (1 << 0) /* Match status channel 0 */ | ||
26 | |||
27 | #define OWER_WME (1 << 0) /* Watchdog Match Enable */ | ||
28 | |||
29 | #define OIER_E3 (1 << 3) /* Interrupt enable channel 3 */ | ||
30 | #define OIER_E2 (1 << 2) /* Interrupt enable channel 2 */ | ||
31 | #define OIER_E1 (1 << 1) /* Interrupt enable channel 1 */ | ||
32 | #define OIER_E0 (1 << 0) /* Interrupt enable channel 0 */ | ||
33 | |||
34 | #endif /* __ASM_MACH_REGS_OST_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/regs-rtc.h b/arch/arm/mach-pxa/include/mach/regs-rtc.h new file mode 100644 index 000000000000..f0e4a589bbe1 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/regs-rtc.h | |||
@@ -0,0 +1,23 @@ | |||
1 | #ifndef __ASM_MACH_REGS_RTC_H | ||
2 | #define __ASM_MACH_REGS_RTC_H | ||
3 | |||
4 | #include <mach/hardware.h> | ||
5 | |||
6 | /* | ||
7 | * Real Time Clock | ||
8 | */ | ||
9 | |||
10 | #define RCNR __REG(0x40900000) /* RTC Count Register */ | ||
11 | #define RTAR __REG(0x40900004) /* RTC Alarm Register */ | ||
12 | #define RTSR __REG(0x40900008) /* RTC Status Register */ | ||
13 | #define RTTR __REG(0x4090000C) /* RTC Timer Trim Register */ | ||
14 | #define PIAR __REG(0x40900038) /* Periodic Interrupt Alarm Register */ | ||
15 | |||
16 | #define RTSR_PICE (1 << 15) /* Periodic interrupt count enable */ | ||
17 | #define RTSR_PIALE (1 << 14) /* Periodic interrupt Alarm enable */ | ||
18 | #define RTSR_HZE (1 << 3) /* HZ interrupt enable */ | ||
19 | #define RTSR_ALE (1 << 2) /* RTC alarm interrupt enable */ | ||
20 | #define RTSR_HZ (1 << 1) /* HZ rising-edge detected */ | ||
21 | #define RTSR_AL (1 << 0) /* RTC alarm detected */ | ||
22 | |||
23 | #endif /* __ASM_MACH_REGS_RTC_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/regs-ssp.h b/arch/arm/mach-pxa/include/mach/regs-ssp.h index cf31986f6f05..8152be683881 100644 --- a/arch/arm/mach-pxa/include/mach/regs-ssp.h +++ b/arch/arm/mach-pxa/include/mach/regs-ssp.h | |||
@@ -37,7 +37,6 @@ | |||
37 | #if defined(CONFIG_PXA25x) | 37 | #if defined(CONFIG_PXA25x) |
38 | #define SSCR0_SCR (0x0000ff00) /* Serial Clock Rate (mask) */ | 38 | #define SSCR0_SCR (0x0000ff00) /* Serial Clock Rate (mask) */ |
39 | #define SSCR0_SerClkDiv(x) ((((x) - 2)/2) << 8) /* Divisor [2..512] */ | 39 | #define SSCR0_SerClkDiv(x) ((((x) - 2)/2) << 8) /* Divisor [2..512] */ |
40 | |||
41 | #elif defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) | 40 | #elif defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) |
42 | #define SSCR0_SCR (0x000fff00) /* Serial Clock Rate (mask) */ | 41 | #define SSCR0_SCR (0x000fff00) /* Serial Clock Rate (mask) */ |
43 | #define SSCR0_SerClkDiv(x) (((x) - 1) << 8) /* Divisor [1..4096] */ | 42 | #define SSCR0_SerClkDiv(x) (((x) - 1) << 8) /* Divisor [1..4096] */ |
diff --git a/arch/arm/mach-pxa/include/mach/system.h b/arch/arm/mach-pxa/include/mach/system.h index 0f381e692999..0a587c4ec709 100644 --- a/arch/arm/mach-pxa/include/mach/system.h +++ b/arch/arm/mach-pxa/include/mach/system.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <asm/proc-fns.h> | 13 | #include <asm/proc-fns.h> |
14 | #include "hardware.h" | 14 | #include "hardware.h" |
15 | #include "pxa2xx-regs.h" | 15 | #include "pxa2xx-regs.h" |
16 | #include "pxa-regs.h" | ||
17 | 16 | ||
18 | static inline void arch_idle(void) | 17 | static inline void arch_idle(void) |
19 | { | 18 | { |
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index fa69c3a6a38e..f6e0300e4f64 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c | |||
@@ -20,7 +20,8 @@ | |||
20 | #include <mach/hardware.h> | 20 | #include <mach/hardware.h> |
21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
22 | #include <asm/mach/irq.h> | 22 | #include <asm/mach/irq.h> |
23 | #include <mach/pxa-regs.h> | 23 | #include <mach/gpio.h> |
24 | #include <mach/regs-intc.h> | ||
24 | 25 | ||
25 | #include "generic.h" | 26 | #include "generic.h" |
26 | 27 | ||
@@ -51,6 +52,72 @@ static struct irq_chip pxa_internal_irq_chip = { | |||
51 | .unmask = pxa_unmask_irq, | 52 | .unmask = pxa_unmask_irq, |
52 | }; | 53 | }; |
53 | 54 | ||
55 | /* | ||
56 | * GPIO IRQs for GPIO 0 and 1 | ||
57 | */ | ||
58 | static int pxa_set_low_gpio_type(unsigned int irq, unsigned int type) | ||
59 | { | ||
60 | int gpio = irq - IRQ_GPIO0; | ||
61 | |||
62 | if (__gpio_is_occupied(gpio)) { | ||
63 | pr_err("%s failed: GPIO is configured\n", __func__); | ||
64 | return -EINVAL; | ||
65 | } | ||
66 | |||
67 | if (type & IRQ_TYPE_EDGE_RISING) | ||
68 | GRER0 |= GPIO_bit(gpio); | ||
69 | else | ||
70 | GRER0 &= ~GPIO_bit(gpio); | ||
71 | |||
72 | if (type & IRQ_TYPE_EDGE_FALLING) | ||
73 | GFER0 |= GPIO_bit(gpio); | ||
74 | else | ||
75 | GFER0 &= ~GPIO_bit(gpio); | ||
76 | |||
77 | return 0; | ||
78 | } | ||
79 | |||
80 | static void pxa_ack_low_gpio(unsigned int irq) | ||
81 | { | ||
82 | GEDR0 = (1 << (irq - IRQ_GPIO0)); | ||
83 | } | ||
84 | |||
85 | static void pxa_mask_low_gpio(unsigned int irq) | ||
86 | { | ||
87 | ICMR &= ~(1 << (irq - PXA_IRQ(0))); | ||
88 | } | ||
89 | |||
90 | static void pxa_unmask_low_gpio(unsigned int irq) | ||
91 | { | ||
92 | ICMR |= 1 << (irq - PXA_IRQ(0)); | ||
93 | } | ||
94 | |||
95 | static struct irq_chip pxa_low_gpio_chip = { | ||
96 | .name = "GPIO-l", | ||
97 | .ack = pxa_ack_low_gpio, | ||
98 | .mask = pxa_mask_low_gpio, | ||
99 | .unmask = pxa_unmask_low_gpio, | ||
100 | .set_type = pxa_set_low_gpio_type, | ||
101 | }; | ||
102 | |||
103 | static void __init pxa_init_low_gpio_irq(set_wake_t fn) | ||
104 | { | ||
105 | int irq; | ||
106 | |||
107 | /* clear edge detection on GPIO 0 and 1 */ | ||
108 | GFER0 &= ~0x3; | ||
109 | GRER0 &= ~0x3; | ||
110 | GEDR0 = 0x3; | ||
111 | |||
112 | for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) { | ||
113 | set_irq_chip(irq, &pxa_low_gpio_chip); | ||
114 | set_irq_handler(irq, handle_edge_irq); | ||
115 | set_irq_flags(irq, IRQF_VALID); | ||
116 | } | ||
117 | |||
118 | pxa_low_gpio_chip.set_wake = fn; | ||
119 | } | ||
120 | |||
54 | void __init pxa_init_irq(int irq_nr, set_wake_t fn) | 121 | void __init pxa_init_irq(int irq_nr, set_wake_t fn) |
55 | { | 122 | { |
56 | int irq; | 123 | int irq; |
@@ -72,6 +139,7 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn) | |||
72 | } | 139 | } |
73 | 140 | ||
74 | pxa_internal_irq_chip.set_wake = fn; | 141 | pxa_internal_irq_chip.set_wake = fn; |
142 | pxa_init_low_gpio_irq(fn); | ||
75 | } | 143 | } |
76 | 144 | ||
77 | #ifdef CONFIG_PM | 145 | #ifdef CONFIG_PM |
diff --git a/arch/arm/mach-pxa/leds-idp.c b/arch/arm/mach-pxa/leds-idp.c index 18b20d469410..8b9c17142d5a 100644 --- a/arch/arm/mach-pxa/leds-idp.c +++ b/arch/arm/mach-pxa/leds-idp.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <asm/leds.h> | 18 | #include <asm/leds.h> |
19 | #include <asm/system.h> | 19 | #include <asm/system.h> |
20 | 20 | ||
21 | #include <mach/pxa-regs.h> | 21 | #include <mach/pxa25x.h> |
22 | #include <mach/idp.h> | 22 | #include <mach/idp.h> |
23 | 23 | ||
24 | #include "leds.h" | 24 | #include "leds.h" |
diff --git a/arch/arm/mach-pxa/leds-lubbock.c b/arch/arm/mach-pxa/leds-lubbock.c index 1a258029c33c..e26d5efe1969 100644 --- a/arch/arm/mach-pxa/leds-lubbock.c +++ b/arch/arm/mach-pxa/leds-lubbock.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <mach/hardware.h> | 16 | #include <mach/hardware.h> |
17 | #include <asm/leds.h> | 17 | #include <asm/leds.h> |
18 | #include <asm/system.h> | 18 | #include <asm/system.h> |
19 | #include <mach/pxa-regs.h> | 19 | #include <mach/pxa25x.h> |
20 | #include <mach/lubbock.h> | 20 | #include <mach/lubbock.h> |
21 | 21 | ||
22 | #include "leds.h" | 22 | #include "leds.h" |
diff --git a/arch/arm/mach-pxa/leds-mainstone.c b/arch/arm/mach-pxa/leds-mainstone.c index 95e06b849634..db4af5eee8b2 100644 --- a/arch/arm/mach-pxa/leds-mainstone.c +++ b/arch/arm/mach-pxa/leds-mainstone.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <asm/leds.h> | 16 | #include <asm/leds.h> |
17 | #include <asm/system.h> | 17 | #include <asm/system.h> |
18 | 18 | ||
19 | #include <mach/pxa-regs.h> | 19 | #include <mach/pxa27x.h> |
20 | #include <mach/mainstone.h> | 20 | #include <mach/mainstone.h> |
21 | 21 | ||
22 | #include "leds.h" | 22 | #include "leds.h" |
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c index 31da7f3c06f6..e13f6a81c223 100644 --- a/arch/arm/mach-pxa/littleton.c +++ b/arch/arm/mach-pxa/littleton.c | |||
@@ -39,8 +39,7 @@ | |||
39 | #include <asm/mach/map.h> | 39 | #include <asm/mach/map.h> |
40 | #include <asm/mach/irq.h> | 40 | #include <asm/mach/irq.h> |
41 | 41 | ||
42 | #include <mach/pxa-regs.h> | 42 | #include <mach/pxa300.h> |
43 | #include <mach/mfp-pxa300.h> | ||
44 | #include <mach/pxafb.h> | 43 | #include <mach/pxafb.h> |
45 | #include <mach/ssp.h> | 44 | #include <mach/ssp.h> |
46 | #include <mach/pxa2xx_spi.h> | 45 | #include <mach/pxa2xx_spi.h> |
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c index de3f67daaacf..d64395f26a3e 100644 --- a/arch/arm/mach-pxa/lpd270.c +++ b/arch/arm/mach-pxa/lpd270.c | |||
@@ -38,9 +38,8 @@ | |||
38 | #include <asm/mach/irq.h> | 38 | #include <asm/mach/irq.h> |
39 | #include <asm/mach/flash.h> | 39 | #include <asm/mach/flash.h> |
40 | 40 | ||
41 | #include <mach/pxa-regs.h> | 41 | #include <mach/pxa27x.h> |
42 | #include <mach/pxa2xx-regs.h> | 42 | #include <mach/gpio.h> |
43 | #include <mach/mfp-pxa27x.h> | ||
44 | #include <mach/lpd270.h> | 43 | #include <mach/lpd270.h> |
45 | #include <mach/audio.h> | 44 | #include <mach/audio.h> |
46 | #include <mach/pxafb.h> | 45 | #include <mach/pxafb.h> |
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index bff704354c1a..f04c8333dff7 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
@@ -41,15 +41,15 @@ | |||
41 | 41 | ||
42 | #include <asm/hardware/sa1111.h> | 42 | #include <asm/hardware/sa1111.h> |
43 | 43 | ||
44 | #include <mach/pxa-regs.h> | 44 | #include <mach/pxa25x.h> |
45 | #include <mach/pxa2xx-regs.h> | 45 | #include <mach/gpio.h> |
46 | #include <mach/mfp-pxa25x.h> | ||
47 | #include <mach/audio.h> | 46 | #include <mach/audio.h> |
48 | #include <mach/lubbock.h> | 47 | #include <mach/lubbock.h> |
49 | #include <mach/udc.h> | 48 | #include <mach/udc.h> |
50 | #include <mach/irda.h> | 49 | #include <mach/irda.h> |
51 | #include <mach/pxafb.h> | 50 | #include <mach/pxafb.h> |
52 | #include <mach/mmc.h> | 51 | #include <mach/mmc.h> |
52 | #include <mach/pm.h> | ||
53 | 53 | ||
54 | #include "generic.h" | 54 | #include "generic.h" |
55 | #include "clock.h" | 55 | #include "clock.h" |
@@ -113,8 +113,14 @@ static unsigned long lubbock_pin_config[] __initdata = { | |||
113 | GPIO1_GPIO | WAKEUP_ON_EDGE_RISE, | 113 | GPIO1_GPIO | WAKEUP_ON_EDGE_RISE, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | #define LUB_HEXLED __LUB_REG(LUBBOCK_FPGA_PHYS + 0x010) | ||
116 | #define LUB_MISC_WR __LUB_REG(LUBBOCK_FPGA_PHYS + 0x080) | 117 | #define LUB_MISC_WR __LUB_REG(LUBBOCK_FPGA_PHYS + 0x080) |
117 | 118 | ||
119 | void lubbock_set_hexled(uint32_t value) | ||
120 | { | ||
121 | LUB_HEXLED = value; | ||
122 | } | ||
123 | |||
118 | void lubbock_set_misc_wr(unsigned int mask, unsigned int set) | 124 | void lubbock_set_misc_wr(unsigned int mask, unsigned int set) |
119 | { | 125 | { |
120 | unsigned long flags; | 126 | unsigned long flags; |
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 21b821e1a60d..d46b36746be2 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
@@ -25,14 +25,14 @@ | |||
25 | #include <linux/mtd/physmap.h> | 25 | #include <linux/mtd/physmap.h> |
26 | #include <linux/pda_power.h> | 26 | #include <linux/pda_power.h> |
27 | #include <linux/pwm_backlight.h> | 27 | #include <linux/pwm_backlight.h> |
28 | #include <linux/usb/gpio_vbus.h> | ||
28 | 29 | ||
29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
30 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
31 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
33 | |||
34 | #include <mach/pxa27x.h> | ||
32 | #include <mach/magician.h> | 35 | #include <mach/magician.h> |
33 | #include <mach/mfp-pxa27x.h> | ||
34 | #include <mach/pxa-regs.h> | ||
35 | #include <mach/pxa2xx-regs.h> | ||
36 | #include <mach/pxafb.h> | 36 | #include <mach/pxafb.h> |
37 | #include <mach/i2c.h> | 37 | #include <mach/i2c.h> |
38 | #include <mach/mmc.h> | 38 | #include <mach/mmc.h> |
@@ -66,6 +66,11 @@ static unsigned long magician_pin_config[] __initdata = { | |||
66 | GPIO31_I2S_SYNC, | 66 | GPIO31_I2S_SYNC, |
67 | GPIO113_I2S_SYSCLK, | 67 | GPIO113_I2S_SYSCLK, |
68 | 68 | ||
69 | /* SSP 1 */ | ||
70 | GPIO23_SSP1_SCLK, | ||
71 | GPIO24_SSP1_SFRM, | ||
72 | GPIO25_SSP1_TXD, | ||
73 | |||
69 | /* SSP 2 */ | 74 | /* SSP 2 */ |
70 | GPIO19_SSP2_SCLK, | 75 | GPIO19_SSP2_SCLK, |
71 | GPIO14_SSP2_SFRM, | 76 | GPIO14_SSP2_SFRM, |
@@ -148,22 +153,31 @@ static struct pxaficp_platform_data magician_ficp_info = { | |||
148 | * GPIO Keys | 153 | * GPIO Keys |
149 | */ | 154 | */ |
150 | 155 | ||
156 | #define INIT_KEY(_code, _gpio, _desc) \ | ||
157 | { \ | ||
158 | .code = KEY_##_code, \ | ||
159 | .gpio = _gpio, \ | ||
160 | .desc = _desc, \ | ||
161 | .type = EV_KEY, \ | ||
162 | .wakeup = 1, \ | ||
163 | } | ||
164 | |||
151 | static struct gpio_keys_button magician_button_table[] = { | 165 | static struct gpio_keys_button magician_button_table[] = { |
152 | {KEY_POWER, GPIO0_MAGICIAN_KEY_POWER, 0, "Power button"}, | 166 | INIT_KEY(POWER, GPIO0_MAGICIAN_KEY_POWER, "Power button"), |
153 | {KEY_ESC, GPIO37_MAGICIAN_KEY_HANGUP, 0, "Hangup button"}, | 167 | INIT_KEY(ESC, GPIO37_MAGICIAN_KEY_HANGUP, "Hangup button"), |
154 | {KEY_F10, GPIO38_MAGICIAN_KEY_CONTACTS, 0, "Contacts button"}, | 168 | INIT_KEY(F10, GPIO38_MAGICIAN_KEY_CONTACTS, "Contacts button"), |
155 | {KEY_CALENDAR, GPIO90_MAGICIAN_KEY_CALENDAR, 0, "Calendar button"}, | 169 | INIT_KEY(CALENDAR, GPIO90_MAGICIAN_KEY_CALENDAR, "Calendar button"), |
156 | {KEY_CAMERA, GPIO91_MAGICIAN_KEY_CAMERA, 0, "Camera button"}, | 170 | INIT_KEY(CAMERA, GPIO91_MAGICIAN_KEY_CAMERA, "Camera button"), |
157 | {KEY_UP, GPIO93_MAGICIAN_KEY_UP, 0, "Up button"}, | 171 | INIT_KEY(UP, GPIO93_MAGICIAN_KEY_UP, "Up button"), |
158 | {KEY_DOWN, GPIO94_MAGICIAN_KEY_DOWN, 0, "Down button"}, | 172 | INIT_KEY(DOWN, GPIO94_MAGICIAN_KEY_DOWN, "Down button"), |
159 | {KEY_LEFT, GPIO95_MAGICIAN_KEY_LEFT, 0, "Left button"}, | 173 | INIT_KEY(LEFT, GPIO95_MAGICIAN_KEY_LEFT, "Left button"), |
160 | {KEY_RIGHT, GPIO96_MAGICIAN_KEY_RIGHT, 0, "Right button"}, | 174 | INIT_KEY(RIGHT, GPIO96_MAGICIAN_KEY_RIGHT, "Right button"), |
161 | {KEY_KPENTER, GPIO97_MAGICIAN_KEY_ENTER, 0, "Action button"}, | 175 | INIT_KEY(KPENTER, GPIO97_MAGICIAN_KEY_ENTER, "Action button"), |
162 | {KEY_RECORD, GPIO98_MAGICIAN_KEY_RECORD, 0, "Record button"}, | 176 | INIT_KEY(RECORD, GPIO98_MAGICIAN_KEY_RECORD, "Record button"), |
163 | {KEY_VOLUMEUP, GPIO100_MAGICIAN_KEY_VOL_UP, 0, "Volume up"}, | 177 | INIT_KEY(VOLUMEUP, GPIO100_MAGICIAN_KEY_VOL_UP, "Volume up"), |
164 | {KEY_VOLUMEDOWN, GPIO101_MAGICIAN_KEY_VOL_DOWN, 0, "Volume down"}, | 178 | INIT_KEY(VOLUMEDOWN, GPIO101_MAGICIAN_KEY_VOL_DOWN, "Volume down"), |
165 | {KEY_PHONE, GPIO102_MAGICIAN_KEY_PHONE, 0, "Phone button"}, | 179 | INIT_KEY(PHONE, GPIO102_MAGICIAN_KEY_PHONE, "Phone button"), |
166 | {KEY_PLAY, GPIO99_MAGICIAN_HEADPHONE_IN, 0, "Headset button"}, | 180 | INIT_KEY(PLAY, GPIO99_MAGICIAN_HEADPHONE_IN, "Headset button"), |
167 | }; | 181 | }; |
168 | 182 | ||
169 | static struct gpio_keys_platform_data gpio_keys_data = { | 183 | static struct gpio_keys_platform_data gpio_keys_data = { |
@@ -189,7 +203,7 @@ static struct platform_device gpio_keys = { | |||
189 | static struct resource egpio_resources[] = { | 203 | static struct resource egpio_resources[] = { |
190 | [0] = { | 204 | [0] = { |
191 | .start = PXA_CS3_PHYS, | 205 | .start = PXA_CS3_PHYS, |
192 | .end = PXA_CS3_PHYS + 0x20, | 206 | .end = PXA_CS3_PHYS + 0x20 - 1, |
193 | .flags = IORESOURCE_MEM, | 207 | .flags = IORESOURCE_MEM, |
194 | }, | 208 | }, |
195 | [1] = { | 209 | [1] = { |
@@ -420,7 +434,7 @@ static struct gpio_led gpio_leds[] = { | |||
420 | }, | 434 | }, |
421 | { | 435 | { |
422 | .name = "magician::phone_bl", | 436 | .name = "magician::phone_bl", |
423 | .default_trigger = "none", | 437 | .default_trigger = "backlight", |
424 | .gpio = GPIO103_MAGICIAN_LED_KP, | 438 | .gpio = GPIO103_MAGICIAN_LED_KP, |
425 | }, | 439 | }, |
426 | }; | 440 | }; |
@@ -468,8 +482,6 @@ static struct pasic3_led pasic3_leds[] = { | |||
468 | }, | 482 | }, |
469 | }; | 483 | }; |
470 | 484 | ||
471 | static struct platform_device pasic3; | ||
472 | |||
473 | static struct pasic3_leds_machinfo pasic3_leds_info = { | 485 | static struct pasic3_leds_machinfo pasic3_leds_info = { |
474 | .num_leds = ARRAY_SIZE(pasic3_leds), | 486 | .num_leds = ARRAY_SIZE(pasic3_leds), |
475 | .power_gpio = EGPIO_MAGICIAN_LED_POWER, | 487 | .power_gpio = EGPIO_MAGICIAN_LED_POWER, |
@@ -511,6 +523,31 @@ static struct platform_device pasic3 = { | |||
511 | }; | 523 | }; |
512 | 524 | ||
513 | /* | 525 | /* |
526 | * USB "Transceiver" | ||
527 | */ | ||
528 | |||
529 | static struct resource gpio_vbus_resource = { | ||
530 | .flags = IORESOURCE_IRQ, | ||
531 | .start = IRQ_MAGICIAN_VBUS, | ||
532 | .end = IRQ_MAGICIAN_VBUS, | ||
533 | }; | ||
534 | |||
535 | static struct gpio_vbus_mach_info gpio_vbus_info = { | ||
536 | .gpio_pullup = GPIO27_MAGICIAN_USBC_PUEN, | ||
537 | .gpio_vbus = EGPIO_MAGICIAN_CABLE_STATE_USB, | ||
538 | }; | ||
539 | |||
540 | static struct platform_device gpio_vbus = { | ||
541 | .name = "gpio-vbus", | ||
542 | .id = -1, | ||
543 | .num_resources = 1, | ||
544 | .resource = &gpio_vbus_resource, | ||
545 | .dev = { | ||
546 | .platform_data = &gpio_vbus_info, | ||
547 | }, | ||
548 | }; | ||
549 | |||
550 | /* | ||
514 | * External power | 551 | * External power |
515 | */ | 552 | */ |
516 | 553 | ||
@@ -586,15 +623,17 @@ static struct pda_power_pdata power_supply_info = { | |||
586 | static struct resource power_supply_resources[] = { | 623 | static struct resource power_supply_resources[] = { |
587 | [0] = { | 624 | [0] = { |
588 | .name = "ac", | 625 | .name = "ac", |
589 | .flags = IORESOURCE_IRQ, | 626 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | |
590 | .start = IRQ_MAGICIAN_AC, | 627 | IORESOURCE_IRQ_LOWEDGE, |
591 | .end = IRQ_MAGICIAN_AC, | 628 | .start = IRQ_MAGICIAN_VBUS, |
629 | .end = IRQ_MAGICIAN_VBUS, | ||
592 | }, | 630 | }, |
593 | [1] = { | 631 | [1] = { |
594 | .name = "usb", | 632 | .name = "usb", |
595 | .flags = IORESOURCE_IRQ, | 633 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | |
596 | .start = IRQ_MAGICIAN_AC, | 634 | IORESOURCE_IRQ_LOWEDGE, |
597 | .end = IRQ_MAGICIAN_AC, | 635 | .start = IRQ_MAGICIAN_VBUS, |
636 | .end = IRQ_MAGICIAN_VBUS, | ||
598 | }, | 637 | }, |
599 | }; | 638 | }; |
600 | 639 | ||
@@ -688,11 +727,9 @@ static void magician_set_vpp(struct map_info *map, int vpp) | |||
688 | gpio_set_value(EGPIO_MAGICIAN_FLASH_VPP, vpp); | 727 | gpio_set_value(EGPIO_MAGICIAN_FLASH_VPP, vpp); |
689 | } | 728 | } |
690 | 729 | ||
691 | #define PXA_CS_SIZE 0x04000000 | ||
692 | |||
693 | static struct resource strataflash_resource = { | 730 | static struct resource strataflash_resource = { |
694 | .start = PXA_CS0_PHYS, | 731 | .start = PXA_CS0_PHYS, |
695 | .end = PXA_CS0_PHYS + PXA_CS_SIZE - 1, | 732 | .end = PXA_CS0_PHYS + SZ_64M - 1, |
696 | .flags = IORESOURCE_MEM, | 733 | .flags = IORESOURCE_MEM, |
697 | }; | 734 | }; |
698 | 735 | ||
@@ -720,6 +757,7 @@ static struct platform_device *devices[] __initdata = { | |||
720 | &egpio, | 757 | &egpio, |
721 | &backlight, | 758 | &backlight, |
722 | &pasic3, | 759 | &pasic3, |
760 | &gpio_vbus, | ||
723 | &power_supply, | 761 | &power_supply, |
724 | &strataflash, | 762 | &strataflash, |
725 | &leds_gpio, | 763 | &leds_gpio, |
@@ -743,6 +781,7 @@ static void __init magician_init(void) | |||
743 | gpio_direction_output(GPIO83_MAGICIAN_nIR_EN, 1); | 781 | gpio_direction_output(GPIO83_MAGICIAN_nIR_EN, 1); |
744 | pxa_set_ficp_info(&magician_ficp_info); | 782 | pxa_set_ficp_info(&magician_ficp_info); |
745 | } | 783 | } |
784 | pxa27x_set_i2c_power_info(NULL); | ||
746 | pxa_set_i2c_info(NULL); | 785 | pxa_set_i2c_info(NULL); |
747 | pxa_set_mci_info(&magician_mci_info); | 786 | pxa_set_mci_info(&magician_mci_info); |
748 | pxa_set_ohci_info(&magician_ohci_info); | 787 | pxa_set_ohci_info(&magician_ohci_info); |
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 5f224968043c..a6c8429e975f 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
@@ -41,9 +41,8 @@ | |||
41 | #include <asm/mach/irq.h> | 41 | #include <asm/mach/irq.h> |
42 | #include <asm/mach/flash.h> | 42 | #include <asm/mach/flash.h> |
43 | 43 | ||
44 | #include <mach/pxa-regs.h> | 44 | #include <mach/pxa27x.h> |
45 | #include <mach/pxa2xx-regs.h> | 45 | #include <mach/gpio.h> |
46 | #include <mach/mfp-pxa27x.h> | ||
47 | #include <mach/mainstone.h> | 46 | #include <mach/mainstone.h> |
48 | #include <mach/audio.h> | 47 | #include <mach/audio.h> |
49 | #include <mach/pxafb.h> | 48 | #include <mach/pxafb.h> |
diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c index 33626de8cbf6..7ffb91d64c39 100644 --- a/arch/arm/mach-pxa/mfp-pxa2xx.c +++ b/arch/arm/mach-pxa/mfp-pxa2xx.c | |||
@@ -18,15 +18,12 @@ | |||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/sysdev.h> | 19 | #include <linux/sysdev.h> |
20 | 20 | ||
21 | #include <mach/hardware.h> | 21 | #include <mach/gpio.h> |
22 | #include <mach/pxa-regs.h> | ||
23 | #include <mach/pxa2xx-regs.h> | 22 | #include <mach/pxa2xx-regs.h> |
24 | #include <mach/mfp-pxa2xx.h> | 23 | #include <mach/mfp-pxa2xx.h> |
25 | 24 | ||
26 | #include "generic.h" | 25 | #include "generic.h" |
27 | 26 | ||
28 | #define gpio_to_bank(gpio) ((gpio) >> 5) | ||
29 | |||
30 | #define PGSR(x) __REG2(0x40F00020, (x) << 2) | 27 | #define PGSR(x) __REG2(0x40F00020, (x) << 2) |
31 | #define __GAFR(u, x) __REG2((u) ? 0x40E00058 : 0x40E00054, (x) << 3) | 28 | #define __GAFR(u, x) __REG2((u) ? 0x40E00058 : 0x40E00054, (x) << 3) |
32 | #define GAFR_L(x) __GAFR(0, x) | 29 | #define GAFR_L(x) __GAFR(0, x) |
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 2b427e015b6f..e77c95ca67f0 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -39,10 +39,11 @@ | |||
39 | 39 | ||
40 | #include <asm/mach-types.h> | 40 | #include <asm/mach-types.h> |
41 | #include <asm/mach/arch.h> | 41 | #include <asm/mach/arch.h> |
42 | #include <mach/mfp-pxa27x.h> | 42 | |
43 | #include <mach/pxa27x.h> | ||
44 | #include <mach/regs-rtc.h> | ||
43 | #include <mach/pxa27x_keypad.h> | 45 | #include <mach/pxa27x_keypad.h> |
44 | #include <mach/pxafb.h> | 46 | #include <mach/pxafb.h> |
45 | #include <mach/pxa2xx-regs.h> | ||
46 | #include <mach/mmc.h> | 47 | #include <mach/mmc.h> |
47 | #include <mach/udc.h> | 48 | #include <mach/udc.h> |
48 | #include <mach/pxa27x-udc.h> | 49 | #include <mach/pxa27x-udc.h> |
diff --git a/arch/arm/mach-pxa/mp900.c b/arch/arm/mach-pxa/mp900.c index 8a73814126b1..a65713ce019e 100644 --- a/arch/arm/mach-pxa/mp900.c +++ b/arch/arm/mach-pxa/mp900.c | |||
@@ -19,10 +19,10 @@ | |||
19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
20 | #include <linux/usb/isp116x.h> | 20 | #include <linux/usb/isp116x.h> |
21 | 21 | ||
22 | #include <mach/hardware.h> | ||
23 | #include <mach/pxa-regs.h> | ||
24 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
25 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
24 | |||
25 | #include <mach/pxa25x.h> | ||
26 | #include "generic.h" | 26 | #include "generic.h" |
27 | 27 | ||
28 | static void isp116x_pfm_delay(struct device *dev, int delay) | 28 | static void isp116x_pfm_delay(struct device *dev, int delay) |
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c new file mode 100644 index 000000000000..8587477a9bb7 --- /dev/null +++ b/arch/arm/mach-pxa/palmld.c | |||
@@ -0,0 +1,565 @@ | |||
1 | /* | ||
2 | * Hardware definitions for Palm LifeDrive | ||
3 | * | ||
4 | * Author: Marek Vasut <marek.vasut@gmail.com> | ||
5 | * | ||
6 | * Based on work of: | ||
7 | * Alex Osborne <ato@meshy.org> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | * | ||
13 | * (find more info at www.hackndev.com) | ||
14 | * | ||
15 | */ | ||
16 | |||
17 | #include <linux/platform_device.h> | ||
18 | #include <linux/delay.h> | ||
19 | #include <linux/irq.h> | ||
20 | #include <linux/gpio_keys.h> | ||
21 | #include <linux/input.h> | ||
22 | #include <linux/pda_power.h> | ||
23 | #include <linux/pwm_backlight.h> | ||
24 | #include <linux/gpio.h> | ||
25 | #include <linux/wm97xx_batt.h> | ||
26 | #include <linux/power_supply.h> | ||
27 | |||
28 | #include <asm/mach-types.h> | ||
29 | #include <asm/mach/arch.h> | ||
30 | #include <asm/mach/map.h> | ||
31 | |||
32 | #include <mach/pxa27x.h> | ||
33 | #include <mach/audio.h> | ||
34 | #include <mach/palmld.h> | ||
35 | #include <mach/mmc.h> | ||
36 | #include <mach/pxafb.h> | ||
37 | #include <mach/irda.h> | ||
38 | #include <mach/pxa27x_keypad.h> | ||
39 | #include <mach/palmasoc.h> | ||
40 | |||
41 | #include "generic.h" | ||
42 | #include "devices.h" | ||
43 | |||
44 | /****************************************************************************** | ||
45 | * Pin configuration | ||
46 | ******************************************************************************/ | ||
47 | static unsigned long palmld_pin_config[] __initdata = { | ||
48 | /* MMC */ | ||
49 | GPIO32_MMC_CLK, | ||
50 | GPIO92_MMC_DAT_0, | ||
51 | GPIO109_MMC_DAT_1, | ||
52 | GPIO110_MMC_DAT_2, | ||
53 | GPIO111_MMC_DAT_3, | ||
54 | GPIO112_MMC_CMD, | ||
55 | GPIO14_GPIO, /* SD detect */ | ||
56 | GPIO114_GPIO, /* SD power */ | ||
57 | GPIO116_GPIO, /* SD r/o switch */ | ||
58 | |||
59 | /* AC97 */ | ||
60 | GPIO28_AC97_BITCLK, | ||
61 | GPIO29_AC97_SDATA_IN_0, | ||
62 | GPIO30_AC97_SDATA_OUT, | ||
63 | GPIO31_AC97_SYNC, | ||
64 | |||
65 | /* IrDA */ | ||
66 | GPIO108_GPIO, /* ir disable */ | ||
67 | GPIO46_FICP_RXD, | ||
68 | GPIO47_FICP_TXD, | ||
69 | |||
70 | /* MATRIX KEYPAD */ | ||
71 | GPIO100_KP_MKIN_0, | ||
72 | GPIO101_KP_MKIN_1, | ||
73 | GPIO102_KP_MKIN_2, | ||
74 | GPIO97_KP_MKIN_3, | ||
75 | GPIO103_KP_MKOUT_0, | ||
76 | GPIO104_KP_MKOUT_1, | ||
77 | GPIO105_KP_MKOUT_2, | ||
78 | |||
79 | /* LCD */ | ||
80 | GPIO58_LCD_LDD_0, | ||
81 | GPIO59_LCD_LDD_1, | ||
82 | GPIO60_LCD_LDD_2, | ||
83 | GPIO61_LCD_LDD_3, | ||
84 | GPIO62_LCD_LDD_4, | ||
85 | GPIO63_LCD_LDD_5, | ||
86 | GPIO64_LCD_LDD_6, | ||
87 | GPIO65_LCD_LDD_7, | ||
88 | GPIO66_LCD_LDD_8, | ||
89 | GPIO67_LCD_LDD_9, | ||
90 | GPIO68_LCD_LDD_10, | ||
91 | GPIO69_LCD_LDD_11, | ||
92 | GPIO70_LCD_LDD_12, | ||
93 | GPIO71_LCD_LDD_13, | ||
94 | GPIO72_LCD_LDD_14, | ||
95 | GPIO73_LCD_LDD_15, | ||
96 | GPIO74_LCD_FCLK, | ||
97 | GPIO75_LCD_LCLK, | ||
98 | GPIO76_LCD_PCLK, | ||
99 | GPIO77_LCD_BIAS, | ||
100 | |||
101 | /* PWM */ | ||
102 | GPIO16_PWM0_OUT, | ||
103 | |||
104 | /* GPIO KEYS */ | ||
105 | GPIO10_GPIO, /* hotsync button */ | ||
106 | GPIO12_GPIO, /* power switch */ | ||
107 | GPIO15_GPIO, /* lock switch */ | ||
108 | |||
109 | /* LEDs */ | ||
110 | GPIO52_GPIO, /* green led */ | ||
111 | GPIO94_GPIO, /* orange led */ | ||
112 | |||
113 | /* PCMCIA */ | ||
114 | GPIO48_nPOE, | ||
115 | GPIO49_nPWE, | ||
116 | GPIO50_nPIOR, | ||
117 | GPIO51_nPIOW, | ||
118 | GPIO85_nPCE_1, | ||
119 | GPIO54_nPCE_2, | ||
120 | GPIO79_PSKTSEL, | ||
121 | GPIO55_nPREG, | ||
122 | GPIO56_nPWAIT, | ||
123 | GPIO57_nIOIS16, | ||
124 | GPIO36_GPIO, /* wifi power */ | ||
125 | GPIO38_GPIO, /* wifi ready */ | ||
126 | GPIO81_GPIO, /* wifi reset */ | ||
127 | |||
128 | /* HDD */ | ||
129 | GPIO95_GPIO, /* HDD irq */ | ||
130 | GPIO115_GPIO, /* HDD power */ | ||
131 | |||
132 | /* MISC */ | ||
133 | GPIO13_GPIO, /* earphone detect */ | ||
134 | }; | ||
135 | |||
136 | /****************************************************************************** | ||
137 | * SD/MMC card controller | ||
138 | ******************************************************************************/ | ||
139 | static int palmld_mci_init(struct device *dev, irq_handler_t palmld_detect_int, | ||
140 | void *data) | ||
141 | { | ||
142 | int err = 0; | ||
143 | |||
144 | /* Setup an interrupt for detecting card insert/remove events */ | ||
145 | err = gpio_request(GPIO_NR_PALMLD_SD_DETECT_N, "SD IRQ"); | ||
146 | if (err) | ||
147 | goto err; | ||
148 | err = gpio_direction_input(GPIO_NR_PALMLD_SD_DETECT_N); | ||
149 | if (err) | ||
150 | goto err2; | ||
151 | err = request_irq(gpio_to_irq(GPIO_NR_PALMLD_SD_DETECT_N), | ||
152 | palmld_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM | | ||
153 | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, | ||
154 | "SD/MMC card detect", data); | ||
155 | if (err) { | ||
156 | printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n", | ||
157 | __func__); | ||
158 | goto err2; | ||
159 | } | ||
160 | |||
161 | err = gpio_request(GPIO_NR_PALMLD_SD_POWER, "SD_POWER"); | ||
162 | if (err) | ||
163 | goto err3; | ||
164 | err = gpio_direction_output(GPIO_NR_PALMLD_SD_POWER, 0); | ||
165 | if (err) | ||
166 | goto err4; | ||
167 | |||
168 | err = gpio_request(GPIO_NR_PALMLD_SD_READONLY, "SD_READONLY"); | ||
169 | if (err) | ||
170 | goto err4; | ||
171 | err = gpio_direction_input(GPIO_NR_PALMLD_SD_READONLY); | ||
172 | if (err) | ||
173 | goto err5; | ||
174 | |||
175 | printk(KERN_DEBUG "%s: irq registered\n", __func__); | ||
176 | |||
177 | return 0; | ||
178 | |||
179 | err5: | ||
180 | gpio_free(GPIO_NR_PALMLD_SD_READONLY); | ||
181 | err4: | ||
182 | gpio_free(GPIO_NR_PALMLD_SD_POWER); | ||
183 | err3: | ||
184 | free_irq(gpio_to_irq(GPIO_NR_PALMLD_SD_DETECT_N), data); | ||
185 | err2: | ||
186 | gpio_free(GPIO_NR_PALMLD_SD_DETECT_N); | ||
187 | err: | ||
188 | return err; | ||
189 | } | ||
190 | |||
191 | static void palmld_mci_exit(struct device *dev, void *data) | ||
192 | { | ||
193 | gpio_free(GPIO_NR_PALMLD_SD_READONLY); | ||
194 | gpio_free(GPIO_NR_PALMLD_SD_POWER); | ||
195 | free_irq(gpio_to_irq(GPIO_NR_PALMLD_SD_DETECT_N), data); | ||
196 | gpio_free(GPIO_NR_PALMLD_SD_DETECT_N); | ||
197 | } | ||
198 | |||
199 | static void palmld_mci_power(struct device *dev, unsigned int vdd) | ||
200 | { | ||
201 | struct pxamci_platform_data *p_d = dev->platform_data; | ||
202 | gpio_set_value(GPIO_NR_PALMLD_SD_POWER, p_d->ocr_mask & (1 << vdd)); | ||
203 | } | ||
204 | |||
205 | static int palmld_mci_get_ro(struct device *dev) | ||
206 | { | ||
207 | return gpio_get_value(GPIO_NR_PALMLD_SD_READONLY); | ||
208 | } | ||
209 | |||
210 | static struct pxamci_platform_data palmld_mci_platform_data = { | ||
211 | .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, | ||
212 | .setpower = palmld_mci_power, | ||
213 | .get_ro = palmld_mci_get_ro, | ||
214 | .init = palmld_mci_init, | ||
215 | .exit = palmld_mci_exit, | ||
216 | }; | ||
217 | |||
218 | /****************************************************************************** | ||
219 | * GPIO keyboard | ||
220 | ******************************************************************************/ | ||
221 | static unsigned int palmld_matrix_keys[] = { | ||
222 | KEY(0, 1, KEY_F2), | ||
223 | KEY(0, 2, KEY_UP), | ||
224 | |||
225 | KEY(1, 0, KEY_F3), | ||
226 | KEY(1, 1, KEY_F4), | ||
227 | KEY(1, 2, KEY_RIGHT), | ||
228 | |||
229 | KEY(2, 0, KEY_F1), | ||
230 | KEY(2, 1, KEY_F5), | ||
231 | KEY(2, 2, KEY_DOWN), | ||
232 | |||
233 | KEY(3, 0, KEY_F6), | ||
234 | KEY(3, 1, KEY_ENTER), | ||
235 | KEY(3, 2, KEY_LEFT), | ||
236 | }; | ||
237 | |||
238 | static struct pxa27x_keypad_platform_data palmld_keypad_platform_data = { | ||
239 | .matrix_key_rows = 4, | ||
240 | .matrix_key_cols = 3, | ||
241 | .matrix_key_map = palmld_matrix_keys, | ||
242 | .matrix_key_map_size = ARRAY_SIZE(palmld_matrix_keys), | ||
243 | |||
244 | .debounce_interval = 30, | ||
245 | }; | ||
246 | |||
247 | /****************************************************************************** | ||
248 | * GPIO keys | ||
249 | ******************************************************************************/ | ||
250 | static struct gpio_keys_button palmld_pxa_buttons[] = { | ||
251 | {KEY_F8, GPIO_NR_PALMLD_HOTSYNC_BUTTON_N, 1, "HotSync Button" }, | ||
252 | {KEY_F9, GPIO_NR_PALMLD_LOCK_SWITCH, 0, "Lock Switch" }, | ||
253 | {KEY_POWER, GPIO_NR_PALMLD_POWER_SWITCH, 0, "Power Switch" }, | ||
254 | }; | ||
255 | |||
256 | static struct gpio_keys_platform_data palmld_pxa_keys_data = { | ||
257 | .buttons = palmld_pxa_buttons, | ||
258 | .nbuttons = ARRAY_SIZE(palmld_pxa_buttons), | ||
259 | }; | ||
260 | |||
261 | static struct platform_device palmld_pxa_keys = { | ||
262 | .name = "gpio-keys", | ||
263 | .id = -1, | ||
264 | .dev = { | ||
265 | .platform_data = &palmld_pxa_keys_data, | ||
266 | }, | ||
267 | }; | ||
268 | |||
269 | /****************************************************************************** | ||
270 | * Backlight | ||
271 | ******************************************************************************/ | ||
272 | static int palmld_backlight_init(struct device *dev) | ||
273 | { | ||
274 | int ret; | ||
275 | |||
276 | ret = gpio_request(GPIO_NR_PALMLD_BL_POWER, "BL POWER"); | ||
277 | if (ret) | ||
278 | goto err; | ||
279 | ret = gpio_direction_output(GPIO_NR_PALMLD_BL_POWER, 0); | ||
280 | if (ret) | ||
281 | goto err2; | ||
282 | ret = gpio_request(GPIO_NR_PALMLD_LCD_POWER, "LCD POWER"); | ||
283 | if (ret) | ||
284 | goto err2; | ||
285 | ret = gpio_direction_output(GPIO_NR_PALMLD_LCD_POWER, 0); | ||
286 | if (ret) | ||
287 | goto err3; | ||
288 | |||
289 | return 0; | ||
290 | err3: | ||
291 | gpio_free(GPIO_NR_PALMLD_LCD_POWER); | ||
292 | err2: | ||
293 | gpio_free(GPIO_NR_PALMLD_BL_POWER); | ||
294 | err: | ||
295 | return ret; | ||
296 | } | ||
297 | |||
298 | static int palmld_backlight_notify(int brightness) | ||
299 | { | ||
300 | gpio_set_value(GPIO_NR_PALMLD_BL_POWER, brightness); | ||
301 | gpio_set_value(GPIO_NR_PALMLD_LCD_POWER, brightness); | ||
302 | return brightness; | ||
303 | } | ||
304 | |||
305 | static void palmld_backlight_exit(struct device *dev) | ||
306 | { | ||
307 | gpio_free(GPIO_NR_PALMLD_BL_POWER); | ||
308 | gpio_free(GPIO_NR_PALMLD_LCD_POWER); | ||
309 | } | ||
310 | |||
311 | static struct platform_pwm_backlight_data palmld_backlight_data = { | ||
312 | .pwm_id = 0, | ||
313 | .max_brightness = PALMLD_MAX_INTENSITY, | ||
314 | .dft_brightness = PALMLD_MAX_INTENSITY, | ||
315 | .pwm_period_ns = PALMLD_PERIOD_NS, | ||
316 | .init = palmld_backlight_init, | ||
317 | .notify = palmld_backlight_notify, | ||
318 | .exit = palmld_backlight_exit, | ||
319 | }; | ||
320 | |||
321 | static struct platform_device palmld_backlight = { | ||
322 | .name = "pwm-backlight", | ||
323 | .dev = { | ||
324 | .parent = &pxa27x_device_pwm0.dev, | ||
325 | .platform_data = &palmld_backlight_data, | ||
326 | }, | ||
327 | }; | ||
328 | |||
329 | /****************************************************************************** | ||
330 | * IrDA | ||
331 | ******************************************************************************/ | ||
332 | static int palmld_irda_startup(struct device *dev) | ||
333 | { | ||
334 | int err; | ||
335 | err = gpio_request(GPIO_NR_PALMLD_IR_DISABLE, "IR DISABLE"); | ||
336 | if (err) | ||
337 | goto err; | ||
338 | err = gpio_direction_output(GPIO_NR_PALMLD_IR_DISABLE, 1); | ||
339 | if (err) | ||
340 | gpio_free(GPIO_NR_PALMLD_IR_DISABLE); | ||
341 | err: | ||
342 | return err; | ||
343 | } | ||
344 | |||
345 | static void palmld_irda_shutdown(struct device *dev) | ||
346 | { | ||
347 | gpio_free(GPIO_NR_PALMLD_IR_DISABLE); | ||
348 | } | ||
349 | |||
350 | static void palmld_irda_transceiver_mode(struct device *dev, int mode) | ||
351 | { | ||
352 | gpio_set_value(GPIO_NR_PALMLD_IR_DISABLE, mode & IR_OFF); | ||
353 | pxa2xx_transceiver_mode(dev, mode); | ||
354 | } | ||
355 | |||
356 | static struct pxaficp_platform_data palmld_ficp_platform_data = { | ||
357 | .startup = palmld_irda_startup, | ||
358 | .shutdown = palmld_irda_shutdown, | ||
359 | .transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF, | ||
360 | .transceiver_mode = palmld_irda_transceiver_mode, | ||
361 | }; | ||
362 | |||
363 | /****************************************************************************** | ||
364 | * LEDs | ||
365 | ******************************************************************************/ | ||
366 | struct gpio_led gpio_leds[] = { | ||
367 | { | ||
368 | .name = "palmld:green:led", | ||
369 | .default_trigger = "none", | ||
370 | .gpio = GPIO_NR_PALMLD_LED_GREEN, | ||
371 | }, { | ||
372 | .name = "palmld:amber:led", | ||
373 | .default_trigger = "none", | ||
374 | .gpio = GPIO_NR_PALMLD_LED_AMBER, | ||
375 | }, | ||
376 | }; | ||
377 | |||
378 | static struct gpio_led_platform_data gpio_led_info = { | ||
379 | .leds = gpio_leds, | ||
380 | .num_leds = ARRAY_SIZE(gpio_leds), | ||
381 | }; | ||
382 | |||
383 | static struct platform_device palmld_leds = { | ||
384 | .name = "leds-gpio", | ||
385 | .id = -1, | ||
386 | .dev = { | ||
387 | .platform_data = &gpio_led_info, | ||
388 | } | ||
389 | }; | ||
390 | |||
391 | /****************************************************************************** | ||
392 | * Power supply | ||
393 | ******************************************************************************/ | ||
394 | static int power_supply_init(struct device *dev) | ||
395 | { | ||
396 | int ret; | ||
397 | |||
398 | ret = gpio_request(GPIO_NR_PALMLD_POWER_DETECT, "CABLE_STATE_AC"); | ||
399 | if (ret) | ||
400 | goto err1; | ||
401 | ret = gpio_direction_input(GPIO_NR_PALMLD_POWER_DETECT); | ||
402 | if (ret) | ||
403 | goto err2; | ||
404 | |||
405 | ret = gpio_request(GPIO_NR_PALMLD_USB_DETECT_N, "CABLE_STATE_USB"); | ||
406 | if (ret) | ||
407 | goto err2; | ||
408 | ret = gpio_direction_input(GPIO_NR_PALMLD_USB_DETECT_N); | ||
409 | if (ret) | ||
410 | goto err3; | ||
411 | |||
412 | return 0; | ||
413 | |||
414 | err3: | ||
415 | gpio_free(GPIO_NR_PALMLD_USB_DETECT_N); | ||
416 | err2: | ||
417 | gpio_free(GPIO_NR_PALMLD_POWER_DETECT); | ||
418 | err1: | ||
419 | return ret; | ||
420 | } | ||
421 | |||
422 | static int palmld_is_ac_online(void) | ||
423 | { | ||
424 | return gpio_get_value(GPIO_NR_PALMLD_POWER_DETECT); | ||
425 | } | ||
426 | |||
427 | static int palmld_is_usb_online(void) | ||
428 | { | ||
429 | return !gpio_get_value(GPIO_NR_PALMLD_USB_DETECT_N); | ||
430 | } | ||
431 | |||
432 | static void power_supply_exit(struct device *dev) | ||
433 | { | ||
434 | gpio_free(GPIO_NR_PALMLD_USB_DETECT_N); | ||
435 | gpio_free(GPIO_NR_PALMLD_POWER_DETECT); | ||
436 | } | ||
437 | |||
438 | static char *palmld_supplicants[] = { | ||
439 | "main-battery", | ||
440 | }; | ||
441 | |||
442 | static struct pda_power_pdata power_supply_info = { | ||
443 | .init = power_supply_init, | ||
444 | .is_ac_online = palmld_is_ac_online, | ||
445 | .is_usb_online = palmld_is_usb_online, | ||
446 | .exit = power_supply_exit, | ||
447 | .supplied_to = palmld_supplicants, | ||
448 | .num_supplicants = ARRAY_SIZE(palmld_supplicants), | ||
449 | }; | ||
450 | |||
451 | static struct platform_device power_supply = { | ||
452 | .name = "pda-power", | ||
453 | .id = -1, | ||
454 | .dev = { | ||
455 | .platform_data = &power_supply_info, | ||
456 | }, | ||
457 | }; | ||
458 | |||
459 | /****************************************************************************** | ||
460 | * WM97xx battery | ||
461 | ******************************************************************************/ | ||
462 | static struct wm97xx_batt_info wm97xx_batt_pdata = { | ||
463 | .batt_aux = WM97XX_AUX_ID3, | ||
464 | .temp_aux = WM97XX_AUX_ID2, | ||
465 | .charge_gpio = -1, | ||
466 | .max_voltage = PALMLD_BAT_MAX_VOLTAGE, | ||
467 | .min_voltage = PALMLD_BAT_MIN_VOLTAGE, | ||
468 | .batt_mult = 1000, | ||
469 | .batt_div = 414, | ||
470 | .temp_mult = 1, | ||
471 | .temp_div = 1, | ||
472 | .batt_tech = POWER_SUPPLY_TECHNOLOGY_LIPO, | ||
473 | .batt_name = "main-batt", | ||
474 | }; | ||
475 | |||
476 | /****************************************************************************** | ||
477 | * aSoC audio | ||
478 | ******************************************************************************/ | ||
479 | static struct palm27x_asoc_info palm27x_asoc_pdata = { | ||
480 | .jack_gpio = GPIO_NR_PALMLD_EARPHONE_DETECT, | ||
481 | }; | ||
482 | |||
483 | /****************************************************************************** | ||
484 | * Framebuffer | ||
485 | ******************************************************************************/ | ||
486 | static struct pxafb_mode_info palmld_lcd_modes[] = { | ||
487 | { | ||
488 | .pixclock = 57692, | ||
489 | .xres = 320, | ||
490 | .yres = 480, | ||
491 | .bpp = 16, | ||
492 | |||
493 | .left_margin = 32, | ||
494 | .right_margin = 1, | ||
495 | .upper_margin = 7, | ||
496 | .lower_margin = 1, | ||
497 | |||
498 | .hsync_len = 4, | ||
499 | .vsync_len = 1, | ||
500 | }, | ||
501 | }; | ||
502 | |||
503 | static struct pxafb_mach_info palmld_lcd_screen = { | ||
504 | .modes = palmld_lcd_modes, | ||
505 | .num_modes = ARRAY_SIZE(palmld_lcd_modes), | ||
506 | .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL, | ||
507 | }; | ||
508 | |||
509 | /****************************************************************************** | ||
510 | * Machine init | ||
511 | ******************************************************************************/ | ||
512 | static struct platform_device *devices[] __initdata = { | ||
513 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | ||
514 | &palmld_pxa_keys, | ||
515 | #endif | ||
516 | &palmld_backlight, | ||
517 | &palmld_leds, | ||
518 | &power_supply, | ||
519 | }; | ||
520 | |||
521 | static struct map_desc palmld_io_desc[] __initdata = { | ||
522 | { | ||
523 | .virtual = PALMLD_IDE_VIRT, | ||
524 | .pfn = __phys_to_pfn(PALMLD_IDE_PHYS), | ||
525 | .length = PALMLD_IDE_SIZE, | ||
526 | .type = MT_DEVICE | ||
527 | }, | ||
528 | { | ||
529 | .virtual = PALMLD_USB_VIRT, | ||
530 | .pfn = __phys_to_pfn(PALMLD_USB_PHYS), | ||
531 | .length = PALMLD_USB_SIZE, | ||
532 | .type = MT_DEVICE | ||
533 | }, | ||
534 | }; | ||
535 | |||
536 | static void __init palmld_map_io(void) | ||
537 | { | ||
538 | pxa_map_io(); | ||
539 | iotable_init(palmld_io_desc, ARRAY_SIZE(palmld_io_desc)); | ||
540 | } | ||
541 | |||
542 | static void __init palmld_init(void) | ||
543 | { | ||
544 | pxa2xx_mfp_config(ARRAY_AND_SIZE(palmld_pin_config)); | ||
545 | |||
546 | set_pxa_fb_info(&palmld_lcd_screen); | ||
547 | pxa_set_mci_info(&palmld_mci_platform_data); | ||
548 | pxa_set_ac97_info(NULL); | ||
549 | pxa_set_ficp_info(&palmld_ficp_platform_data); | ||
550 | pxa_set_keypad_info(&palmld_keypad_platform_data); | ||
551 | wm97xx_bat_set_pdata(&wm97xx_batt_pdata); | ||
552 | palm27x_asoc_set_pdata(&palm27x_asoc_pdata); | ||
553 | |||
554 | platform_add_devices(devices, ARRAY_SIZE(devices)); | ||
555 | } | ||
556 | |||
557 | MACHINE_START(PALMLD, "Palm LifeDrive") | ||
558 | .phys_io = PALMLD_PHYS_IO_START, | ||
559 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | ||
560 | .boot_params = 0xa0000100, | ||
561 | .map_io = palmld_map_io, | ||
562 | .init_irq = pxa27x_init_irq, | ||
563 | .timer = &pxa_timer, | ||
564 | .init_machine = palmld_init | ||
565 | MACHINE_END | ||
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c new file mode 100644 index 000000000000..9521c7b33492 --- /dev/null +++ b/arch/arm/mach-pxa/palmt5.c | |||
@@ -0,0 +1,496 @@ | |||
1 | /* | ||
2 | * Hardware definitions for Palm Tungsten|T5 | ||
3 | * | ||
4 | * Author: Marek Vasut <marek.vasut@gmail.com> | ||
5 | * | ||
6 | * Based on work of: | ||
7 | * Ales Snuparek <snuparek@atlas.cz> | ||
8 | * Justin Kendrick <twilightsentry@gmail.com> | ||
9 | * RichardT5 <richard_t5@users.sourceforge.net> | ||
10 | * | ||
11 | * This program is free software; you can redistribute it and/or modify | ||
12 | * it under the terms of the GNU General Public License version 2 as | ||
13 | * published by the Free Software Foundation. | ||
14 | * | ||
15 | * (find more info at www.hackndev.com) | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #include <linux/platform_device.h> | ||
20 | #include <linux/delay.h> | ||
21 | #include <linux/irq.h> | ||
22 | #include <linux/gpio_keys.h> | ||
23 | #include <linux/input.h> | ||
24 | #include <linux/pda_power.h> | ||
25 | #include <linux/pwm_backlight.h> | ||
26 | #include <linux/gpio.h> | ||
27 | #include <linux/wm97xx_batt.h> | ||
28 | #include <linux/power_supply.h> | ||
29 | |||
30 | #include <asm/mach-types.h> | ||
31 | #include <asm/mach/arch.h> | ||
32 | #include <asm/mach/map.h> | ||
33 | |||
34 | #include <mach/pxa27x.h> | ||
35 | #include <mach/audio.h> | ||
36 | #include <mach/palmt5.h> | ||
37 | #include <mach/mmc.h> | ||
38 | #include <mach/pxafb.h> | ||
39 | #include <mach/irda.h> | ||
40 | #include <mach/pxa27x_keypad.h> | ||
41 | #include <mach/udc.h> | ||
42 | #include <mach/palmasoc.h> | ||
43 | |||
44 | #include "generic.h" | ||
45 | #include "devices.h" | ||
46 | |||
47 | /****************************************************************************** | ||
48 | * Pin configuration | ||
49 | ******************************************************************************/ | ||
50 | static unsigned long palmt5_pin_config[] __initdata = { | ||
51 | /* MMC */ | ||
52 | GPIO32_MMC_CLK, | ||
53 | GPIO92_MMC_DAT_0, | ||
54 | GPIO109_MMC_DAT_1, | ||
55 | GPIO110_MMC_DAT_2, | ||
56 | GPIO111_MMC_DAT_3, | ||
57 | GPIO112_MMC_CMD, | ||
58 | GPIO14_GPIO, /* SD detect */ | ||
59 | GPIO114_GPIO, /* SD power */ | ||
60 | GPIO115_GPIO, /* SD r/o switch */ | ||
61 | |||
62 | /* AC97 */ | ||
63 | GPIO28_AC97_BITCLK, | ||
64 | GPIO29_AC97_SDATA_IN_0, | ||
65 | GPIO30_AC97_SDATA_OUT, | ||
66 | GPIO31_AC97_SYNC, | ||
67 | |||
68 | /* IrDA */ | ||
69 | GPIO40_GPIO, /* ir disable */ | ||
70 | GPIO46_FICP_RXD, | ||
71 | GPIO47_FICP_TXD, | ||
72 | |||
73 | /* USB */ | ||
74 | GPIO15_GPIO, /* usb detect */ | ||
75 | GPIO95_GPIO, /* usb power */ | ||
76 | |||
77 | /* MATRIX KEYPAD */ | ||
78 | GPIO100_KP_MKIN_0, | ||
79 | GPIO101_KP_MKIN_1, | ||
80 | GPIO102_KP_MKIN_2, | ||
81 | GPIO97_KP_MKIN_3, | ||
82 | GPIO103_KP_MKOUT_0, | ||
83 | GPIO104_KP_MKOUT_1, | ||
84 | GPIO105_KP_MKOUT_2, | ||
85 | |||
86 | /* LCD */ | ||
87 | GPIO58_LCD_LDD_0, | ||
88 | GPIO59_LCD_LDD_1, | ||
89 | GPIO60_LCD_LDD_2, | ||
90 | GPIO61_LCD_LDD_3, | ||
91 | GPIO62_LCD_LDD_4, | ||
92 | GPIO63_LCD_LDD_5, | ||
93 | GPIO64_LCD_LDD_6, | ||
94 | GPIO65_LCD_LDD_7, | ||
95 | GPIO66_LCD_LDD_8, | ||
96 | GPIO67_LCD_LDD_9, | ||
97 | GPIO68_LCD_LDD_10, | ||
98 | GPIO69_LCD_LDD_11, | ||
99 | GPIO70_LCD_LDD_12, | ||
100 | GPIO71_LCD_LDD_13, | ||
101 | GPIO72_LCD_LDD_14, | ||
102 | GPIO73_LCD_LDD_15, | ||
103 | GPIO74_LCD_FCLK, | ||
104 | GPIO75_LCD_LCLK, | ||
105 | GPIO76_LCD_PCLK, | ||
106 | GPIO77_LCD_BIAS, | ||
107 | |||
108 | /* PWM */ | ||
109 | GPIO16_PWM0_OUT, | ||
110 | |||
111 | /* MISC */ | ||
112 | GPIO10_GPIO, /* hotsync button */ | ||
113 | GPIO90_GPIO, /* power detect */ | ||
114 | GPIO107_GPIO, /* earphone detect */ | ||
115 | }; | ||
116 | |||
117 | /****************************************************************************** | ||
118 | * SD/MMC card controller | ||
119 | ******************************************************************************/ | ||
120 | static int palmt5_mci_init(struct device *dev, irq_handler_t palmt5_detect_int, | ||
121 | void *data) | ||
122 | { | ||
123 | int err = 0; | ||
124 | |||
125 | /* Setup an interrupt for detecting card insert/remove events */ | ||
126 | err = gpio_request(GPIO_NR_PALMT5_SD_DETECT_N, "SD IRQ"); | ||
127 | if (err) | ||
128 | goto err; | ||
129 | err = gpio_direction_input(GPIO_NR_PALMT5_SD_DETECT_N); | ||
130 | if (err) | ||
131 | goto err2; | ||
132 | err = request_irq(gpio_to_irq(GPIO_NR_PALMT5_SD_DETECT_N), | ||
133 | palmt5_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM | | ||
134 | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, | ||
135 | "SD/MMC card detect", data); | ||
136 | if (err) { | ||
137 | printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n", | ||
138 | __func__); | ||
139 | goto err2; | ||
140 | } | ||
141 | |||
142 | err = gpio_request(GPIO_NR_PALMT5_SD_POWER, "SD_POWER"); | ||
143 | if (err) | ||
144 | goto err3; | ||
145 | err = gpio_direction_output(GPIO_NR_PALMT5_SD_POWER, 0); | ||
146 | if (err) | ||
147 | goto err4; | ||
148 | |||
149 | err = gpio_request(GPIO_NR_PALMT5_SD_READONLY, "SD_READONLY"); | ||
150 | if (err) | ||
151 | goto err4; | ||
152 | err = gpio_direction_input(GPIO_NR_PALMT5_SD_READONLY); | ||
153 | if (err) | ||
154 | goto err5; | ||
155 | |||
156 | printk(KERN_DEBUG "%s: irq registered\n", __func__); | ||
157 | |||
158 | return 0; | ||
159 | |||
160 | err5: | ||
161 | gpio_free(GPIO_NR_PALMT5_SD_READONLY); | ||
162 | err4: | ||
163 | gpio_free(GPIO_NR_PALMT5_SD_POWER); | ||
164 | err3: | ||
165 | free_irq(gpio_to_irq(GPIO_NR_PALMT5_SD_DETECT_N), data); | ||
166 | err2: | ||
167 | gpio_free(GPIO_NR_PALMT5_SD_DETECT_N); | ||
168 | err: | ||
169 | return err; | ||
170 | } | ||
171 | |||
172 | static void palmt5_mci_exit(struct device *dev, void *data) | ||
173 | { | ||
174 | gpio_free(GPIO_NR_PALMT5_SD_READONLY); | ||
175 | gpio_free(GPIO_NR_PALMT5_SD_POWER); | ||
176 | free_irq(IRQ_GPIO_PALMT5_SD_DETECT_N, data); | ||
177 | gpio_free(GPIO_NR_PALMT5_SD_DETECT_N); | ||
178 | } | ||
179 | |||
180 | static void palmt5_mci_power(struct device *dev, unsigned int vdd) | ||
181 | { | ||
182 | struct pxamci_platform_data *p_d = dev->platform_data; | ||
183 | gpio_set_value(GPIO_NR_PALMT5_SD_POWER, p_d->ocr_mask & (1 << vdd)); | ||
184 | } | ||
185 | |||
186 | static int palmt5_mci_get_ro(struct device *dev) | ||
187 | { | ||
188 | return gpio_get_value(GPIO_NR_PALMT5_SD_READONLY); | ||
189 | } | ||
190 | |||
191 | static struct pxamci_platform_data palmt5_mci_platform_data = { | ||
192 | .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, | ||
193 | .setpower = palmt5_mci_power, | ||
194 | .get_ro = palmt5_mci_get_ro, | ||
195 | .init = palmt5_mci_init, | ||
196 | .exit = palmt5_mci_exit, | ||
197 | }; | ||
198 | |||
199 | /****************************************************************************** | ||
200 | * GPIO keyboard | ||
201 | ******************************************************************************/ | ||
202 | static unsigned int palmt5_matrix_keys[] = { | ||
203 | KEY(0, 0, KEY_POWER), | ||
204 | KEY(0, 1, KEY_F1), | ||
205 | KEY(0, 2, KEY_ENTER), | ||
206 | |||
207 | KEY(1, 0, KEY_F2), | ||
208 | KEY(1, 1, KEY_F3), | ||
209 | KEY(1, 2, KEY_F4), | ||
210 | |||
211 | KEY(2, 0, KEY_UP), | ||
212 | KEY(2, 2, KEY_DOWN), | ||
213 | |||
214 | KEY(3, 0, KEY_RIGHT), | ||
215 | KEY(3, 2, KEY_LEFT), | ||
216 | }; | ||
217 | |||
218 | static struct pxa27x_keypad_platform_data palmt5_keypad_platform_data = { | ||
219 | .matrix_key_rows = 4, | ||
220 | .matrix_key_cols = 3, | ||
221 | .matrix_key_map = palmt5_matrix_keys, | ||
222 | .matrix_key_map_size = ARRAY_SIZE(palmt5_matrix_keys), | ||
223 | |||
224 | .debounce_interval = 30, | ||
225 | }; | ||
226 | |||
227 | /****************************************************************************** | ||
228 | * GPIO keys | ||
229 | ******************************************************************************/ | ||
230 | static struct gpio_keys_button palmt5_pxa_buttons[] = { | ||
231 | {KEY_F8, GPIO_NR_PALMT5_HOTSYNC_BUTTON_N, 1, "HotSync Button" }, | ||
232 | }; | ||
233 | |||
234 | static struct gpio_keys_platform_data palmt5_pxa_keys_data = { | ||
235 | .buttons = palmt5_pxa_buttons, | ||
236 | .nbuttons = ARRAY_SIZE(palmt5_pxa_buttons), | ||
237 | }; | ||
238 | |||
239 | static struct platform_device palmt5_pxa_keys = { | ||
240 | .name = "gpio-keys", | ||
241 | .id = -1, | ||
242 | .dev = { | ||
243 | .platform_data = &palmt5_pxa_keys_data, | ||
244 | }, | ||
245 | }; | ||
246 | |||
247 | /****************************************************************************** | ||
248 | * Backlight | ||
249 | ******************************************************************************/ | ||
250 | static int palmt5_backlight_init(struct device *dev) | ||
251 | { | ||
252 | int ret; | ||
253 | |||
254 | ret = gpio_request(GPIO_NR_PALMT5_BL_POWER, "BL POWER"); | ||
255 | if (ret) | ||
256 | goto err; | ||
257 | ret = gpio_direction_output(GPIO_NR_PALMT5_BL_POWER, 0); | ||
258 | if (ret) | ||
259 | goto err2; | ||
260 | ret = gpio_request(GPIO_NR_PALMT5_LCD_POWER, "LCD POWER"); | ||
261 | if (ret) | ||
262 | goto err2; | ||
263 | ret = gpio_direction_output(GPIO_NR_PALMT5_LCD_POWER, 0); | ||
264 | if (ret) | ||
265 | goto err3; | ||
266 | |||
267 | return 0; | ||
268 | err3: | ||
269 | gpio_free(GPIO_NR_PALMT5_LCD_POWER); | ||
270 | err2: | ||
271 | gpio_free(GPIO_NR_PALMT5_BL_POWER); | ||
272 | err: | ||
273 | return ret; | ||
274 | } | ||
275 | |||
276 | static int palmt5_backlight_notify(int brightness) | ||
277 | { | ||
278 | gpio_set_value(GPIO_NR_PALMT5_BL_POWER, brightness); | ||
279 | gpio_set_value(GPIO_NR_PALMT5_LCD_POWER, brightness); | ||
280 | return brightness; | ||
281 | } | ||
282 | |||
283 | static void palmt5_backlight_exit(struct device *dev) | ||
284 | { | ||
285 | gpio_free(GPIO_NR_PALMT5_BL_POWER); | ||
286 | gpio_free(GPIO_NR_PALMT5_LCD_POWER); | ||
287 | } | ||
288 | |||
289 | static struct platform_pwm_backlight_data palmt5_backlight_data = { | ||
290 | .pwm_id = 0, | ||
291 | .max_brightness = PALMT5_MAX_INTENSITY, | ||
292 | .dft_brightness = PALMT5_MAX_INTENSITY, | ||
293 | .pwm_period_ns = PALMT5_PERIOD_NS, | ||
294 | .init = palmt5_backlight_init, | ||
295 | .notify = palmt5_backlight_notify, | ||
296 | .exit = palmt5_backlight_exit, | ||
297 | }; | ||
298 | |||
299 | static struct platform_device palmt5_backlight = { | ||
300 | .name = "pwm-backlight", | ||
301 | .dev = { | ||
302 | .parent = &pxa27x_device_pwm0.dev, | ||
303 | .platform_data = &palmt5_backlight_data, | ||
304 | }, | ||
305 | }; | ||
306 | |||
307 | /****************************************************************************** | ||
308 | * IrDA | ||
309 | ******************************************************************************/ | ||
310 | static int palmt5_irda_startup(struct device *dev) | ||
311 | { | ||
312 | int err; | ||
313 | err = gpio_request(GPIO_NR_PALMT5_IR_DISABLE, "IR DISABLE"); | ||
314 | if (err) | ||
315 | goto err; | ||
316 | err = gpio_direction_output(GPIO_NR_PALMT5_IR_DISABLE, 1); | ||
317 | if (err) | ||
318 | gpio_free(GPIO_NR_PALMT5_IR_DISABLE); | ||
319 | err: | ||
320 | return err; | ||
321 | } | ||
322 | |||
323 | static void palmt5_irda_shutdown(struct device *dev) | ||
324 | { | ||
325 | gpio_free(GPIO_NR_PALMT5_IR_DISABLE); | ||
326 | } | ||
327 | |||
328 | static void palmt5_irda_transceiver_mode(struct device *dev, int mode) | ||
329 | { | ||
330 | gpio_set_value(GPIO_NR_PALMT5_IR_DISABLE, mode & IR_OFF); | ||
331 | pxa2xx_transceiver_mode(dev, mode); | ||
332 | } | ||
333 | |||
334 | static struct pxaficp_platform_data palmt5_ficp_platform_data = { | ||
335 | .startup = palmt5_irda_startup, | ||
336 | .shutdown = palmt5_irda_shutdown, | ||
337 | .transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF, | ||
338 | .transceiver_mode = palmt5_irda_transceiver_mode, | ||
339 | }; | ||
340 | |||
341 | /****************************************************************************** | ||
342 | * UDC | ||
343 | ******************************************************************************/ | ||
344 | static struct pxa2xx_udc_mach_info palmt5_udc_info __initdata = { | ||
345 | .gpio_vbus = GPIO_NR_PALMT5_USB_DETECT_N, | ||
346 | .gpio_vbus_inverted = 1, | ||
347 | .gpio_pullup = GPIO_NR_PALMT5_USB_POWER, | ||
348 | .gpio_pullup_inverted = 0, | ||
349 | }; | ||
350 | |||
351 | /****************************************************************************** | ||
352 | * Power supply | ||
353 | ******************************************************************************/ | ||
354 | static int power_supply_init(struct device *dev) | ||
355 | { | ||
356 | int ret; | ||
357 | |||
358 | ret = gpio_request(GPIO_NR_PALMT5_POWER_DETECT, "CABLE_STATE_AC"); | ||
359 | if (ret) | ||
360 | goto err1; | ||
361 | ret = gpio_direction_input(GPIO_NR_PALMT5_POWER_DETECT); | ||
362 | if (ret) | ||
363 | goto err2; | ||
364 | |||
365 | return 0; | ||
366 | err2: | ||
367 | gpio_free(GPIO_NR_PALMT5_POWER_DETECT); | ||
368 | err1: | ||
369 | return ret; | ||
370 | } | ||
371 | |||
372 | static int palmt5_is_ac_online(void) | ||
373 | { | ||
374 | return gpio_get_value(GPIO_NR_PALMT5_POWER_DETECT); | ||
375 | } | ||
376 | |||
377 | static void power_supply_exit(struct device *dev) | ||
378 | { | ||
379 | gpio_free(GPIO_NR_PALMT5_POWER_DETECT); | ||
380 | } | ||
381 | |||
382 | static char *palmt5_supplicants[] = { | ||
383 | "main-battery", | ||
384 | }; | ||
385 | |||
386 | static struct pda_power_pdata power_supply_info = { | ||
387 | .init = power_supply_init, | ||
388 | .is_ac_online = palmt5_is_ac_online, | ||
389 | .exit = power_supply_exit, | ||
390 | .supplied_to = palmt5_supplicants, | ||
391 | .num_supplicants = ARRAY_SIZE(palmt5_supplicants), | ||
392 | }; | ||
393 | |||
394 | static struct platform_device power_supply = { | ||
395 | .name = "pda-power", | ||
396 | .id = -1, | ||
397 | .dev = { | ||
398 | .platform_data = &power_supply_info, | ||
399 | }, | ||
400 | }; | ||
401 | |||
402 | /****************************************************************************** | ||
403 | * WM97xx battery | ||
404 | ******************************************************************************/ | ||
405 | static struct wm97xx_batt_info wm97xx_batt_pdata = { | ||
406 | .batt_aux = WM97XX_AUX_ID3, | ||
407 | .temp_aux = WM97XX_AUX_ID2, | ||
408 | .charge_gpio = -1, | ||
409 | .max_voltage = PALMT5_BAT_MAX_VOLTAGE, | ||
410 | .min_voltage = PALMT5_BAT_MIN_VOLTAGE, | ||
411 | .batt_mult = 1000, | ||
412 | .batt_div = 414, | ||
413 | .temp_mult = 1, | ||
414 | .temp_div = 1, | ||
415 | .batt_tech = POWER_SUPPLY_TECHNOLOGY_LIPO, | ||
416 | .batt_name = "main-batt", | ||
417 | }; | ||
418 | |||
419 | /****************************************************************************** | ||
420 | * aSoC audio | ||
421 | ******************************************************************************/ | ||
422 | static struct palm27x_asoc_info palm27x_asoc_pdata = { | ||
423 | .jack_gpio = GPIO_NR_PALMT5_EARPHONE_DETECT, | ||
424 | }; | ||
425 | |||
426 | /****************************************************************************** | ||
427 | * Framebuffer | ||
428 | ******************************************************************************/ | ||
429 | static struct pxafb_mode_info palmt5_lcd_modes[] = { | ||
430 | { | ||
431 | .pixclock = 57692, | ||
432 | .xres = 320, | ||
433 | .yres = 480, | ||
434 | .bpp = 16, | ||
435 | |||
436 | .left_margin = 32, | ||
437 | .right_margin = 1, | ||
438 | .upper_margin = 7, | ||
439 | .lower_margin = 1, | ||
440 | |||
441 | .hsync_len = 4, | ||
442 | .vsync_len = 1, | ||
443 | }, | ||
444 | }; | ||
445 | |||
446 | static struct pxafb_mach_info palmt5_lcd_screen = { | ||
447 | .modes = palmt5_lcd_modes, | ||
448 | .num_modes = ARRAY_SIZE(palmt5_lcd_modes), | ||
449 | .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL, | ||
450 | }; | ||
451 | |||
452 | /****************************************************************************** | ||
453 | * Machine init | ||
454 | ******************************************************************************/ | ||
455 | static struct platform_device *devices[] __initdata = { | ||
456 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | ||
457 | &palmt5_pxa_keys, | ||
458 | #endif | ||
459 | &palmt5_backlight, | ||
460 | &power_supply, | ||
461 | }; | ||
462 | |||
463 | /* setup udc GPIOs initial state */ | ||
464 | static void __init palmt5_udc_init(void) | ||
465 | { | ||
466 | if (!gpio_request(GPIO_NR_PALMT5_USB_POWER, "UDC Vbus")) { | ||
467 | gpio_direction_output(GPIO_NR_PALMT5_USB_POWER, 1); | ||
468 | gpio_free(GPIO_NR_PALMT5_USB_POWER); | ||
469 | } | ||
470 | } | ||
471 | |||
472 | static void __init palmt5_init(void) | ||
473 | { | ||
474 | pxa2xx_mfp_config(ARRAY_AND_SIZE(palmt5_pin_config)); | ||
475 | |||
476 | set_pxa_fb_info(&palmt5_lcd_screen); | ||
477 | pxa_set_mci_info(&palmt5_mci_platform_data); | ||
478 | palmt5_udc_init(); | ||
479 | pxa_set_udc_info(&palmt5_udc_info); | ||
480 | pxa_set_ac97_info(NULL); | ||
481 | pxa_set_ficp_info(&palmt5_ficp_platform_data); | ||
482 | pxa_set_keypad_info(&palmt5_keypad_platform_data); | ||
483 | wm97xx_bat_set_pdata(&wm97xx_batt_pdata); | ||
484 | palm27x_asoc_set_pdata(&palm27x_asoc_pdata); | ||
485 | platform_add_devices(devices, ARRAY_SIZE(devices)); | ||
486 | } | ||
487 | |||
488 | MACHINE_START(PALMT5, "Palm Tungsten|T5") | ||
489 | .phys_io = PALMT5_PHYS_IO_START, | ||
490 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | ||
491 | .boot_params = 0xa0000100, | ||
492 | .map_io = pxa_map_io, | ||
493 | .init_irq = pxa27x_init_irq, | ||
494 | .timer = &pxa_timer, | ||
495 | .init_machine = palmt5_init | ||
496 | MACHINE_END | ||
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index a9d94f5dbec4..b490c0924619 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
@@ -32,12 +32,11 @@ | |||
32 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
33 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
34 | 34 | ||
35 | #include <mach/pxa27x.h> | ||
35 | #include <mach/audio.h> | 36 | #include <mach/audio.h> |
36 | #include <mach/palmtx.h> | 37 | #include <mach/palmtx.h> |
37 | #include <mach/mmc.h> | 38 | #include <mach/mmc.h> |
38 | #include <mach/pxafb.h> | 39 | #include <mach/pxafb.h> |
39 | #include <mach/pxa-regs.h> | ||
40 | #include <mach/mfp-pxa27x.h> | ||
41 | #include <mach/irda.h> | 40 | #include <mach/irda.h> |
42 | #include <mach/pxa27x_keypad.h> | 41 | #include <mach/pxa27x_keypad.h> |
43 | #include <mach/udc.h> | 42 | #include <mach/udc.h> |
diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c index 2f730da3bba8..b88eb4dd2c84 100644 --- a/arch/arm/mach-pxa/palmz72.c +++ b/arch/arm/mach-pxa/palmz72.c | |||
@@ -33,13 +33,11 @@ | |||
33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
35 | 35 | ||
36 | #include <mach/pxa27x.h> | ||
36 | #include <mach/audio.h> | 37 | #include <mach/audio.h> |
37 | #include <mach/palmz72.h> | 38 | #include <mach/palmz72.h> |
38 | #include <mach/mmc.h> | 39 | #include <mach/mmc.h> |
39 | #include <mach/pxafb.h> | 40 | #include <mach/pxafb.h> |
40 | #include <mach/pxa-regs.h> | ||
41 | #include <mach/pxa2xx-regs.h> | ||
42 | #include <mach/mfp-pxa27x.h> | ||
43 | #include <mach/irda.h> | 41 | #include <mach/irda.h> |
44 | #include <mach/pxa27x_keypad.h> | 42 | #include <mach/pxa27x_keypad.h> |
45 | #include <mach/udc.h> | 43 | #include <mach/udc.h> |
diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c index 36135a02fdc7..6abfa2979c61 100644 --- a/arch/arm/mach-pxa/pcm027.c +++ b/arch/arm/mach-pxa/pcm027.c | |||
@@ -29,10 +29,7 @@ | |||
29 | 29 | ||
30 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
31 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
32 | #include <mach/hardware.h> | 32 | #include <mach/pxa27x.h> |
33 | #include <mach/pxa-regs.h> | ||
34 | #include <mach/mfp-pxa27x.h> | ||
35 | #include <mach/pxa2xx-regs.h> | ||
36 | #include <mach/pxa2xx_spi.h> | 33 | #include <mach/pxa2xx_spi.h> |
37 | #include <mach/pcm027.h> | 34 | #include <mach/pcm027.h> |
38 | #include "generic.h" | 35 | #include "generic.h" |
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index 34841c72815f..f46698e20c1f 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c | |||
@@ -31,13 +31,12 @@ | |||
31 | #include <mach/i2c.h> | 31 | #include <mach/i2c.h> |
32 | #include <mach/camera.h> | 32 | #include <mach/camera.h> |
33 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
34 | #include <mach/pxa-regs.h> | 34 | #include <mach/pxa27x.h> |
35 | #include <mach/audio.h> | 35 | #include <mach/audio.h> |
36 | #include <mach/mmc.h> | 36 | #include <mach/mmc.h> |
37 | #include <mach/ohci.h> | 37 | #include <mach/ohci.h> |
38 | #include <mach/pcm990_baseboard.h> | 38 | #include <mach/pcm990_baseboard.h> |
39 | #include <mach/pxafb.h> | 39 | #include <mach/pxafb.h> |
40 | #include <mach/mfp-pxa27x.h> | ||
41 | 40 | ||
42 | #include "devices.h" | 41 | #include "devices.h" |
43 | #include "generic.h" | 42 | #include "generic.h" |
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index 164eb0bb6321..884b174c8ead 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c | |||
@@ -14,15 +14,8 @@ | |||
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <linux/suspend.h> | 15 | #include <linux/suspend.h> |
16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
17 | #include <linux/time.h> | ||
18 | 17 | ||
19 | #include <mach/hardware.h> | ||
20 | #include <asm/memory.h> | ||
21 | #include <asm/system.h> | ||
22 | #include <mach/pm.h> | 18 | #include <mach/pm.h> |
23 | #include <mach/pxa-regs.h> | ||
24 | #include <mach/lubbock.h> | ||
25 | #include <asm/mach/time.h> | ||
26 | 19 | ||
27 | struct pxa_cpu_pm_fns *pxa_cpu_pm_fns; | 20 | struct pxa_cpu_pm_fns *pxa_cpu_pm_fns; |
28 | static unsigned long *sleep_save; | 21 | static unsigned long *sleep_save; |
@@ -57,9 +50,9 @@ int pxa_pm_enter(suspend_state_t state) | |||
57 | 50 | ||
58 | /* if invalid, display message and wait for a hardware reset */ | 51 | /* if invalid, display message and wait for a hardware reset */ |
59 | if (checksum != sleep_save_checksum) { | 52 | if (checksum != sleep_save_checksum) { |
60 | #ifdef CONFIG_ARCH_LUBBOCK | 53 | |
61 | LUB_HEXLED = 0xbadbadc5; | 54 | lubbock_set_hexled(0xbadbadc5); |
62 | #endif | 55 | |
63 | while (1) | 56 | while (1) |
64 | pxa_cpu_pm_fns->enter(state); | 57 | pxa_cpu_pm_fns->enter(state); |
65 | } | 58 | } |
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index f9093beba752..572ddec2b3e6 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
@@ -36,9 +36,7 @@ | |||
36 | #include <asm/mach/map.h> | 36 | #include <asm/mach/map.h> |
37 | #include <asm/mach/irq.h> | 37 | #include <asm/mach/irq.h> |
38 | 38 | ||
39 | #include <mach/pxa-regs.h> | 39 | #include <mach/pxa25x.h> |
40 | #include <mach/pxa2xx-regs.h> | ||
41 | #include <mach/mfp-pxa25x.h> | ||
42 | #include <mach/mmc.h> | 40 | #include <mach/mmc.h> |
43 | #include <mach/udc.h> | 41 | #include <mach/udc.h> |
44 | #include <mach/i2c.h> | 42 | #include <mach/i2c.h> |
diff --git a/arch/arm/mach-pxa/pwm.c b/arch/arm/mach-pxa/pwm.c index 3ca7ffc6904b..fcdd374437a8 100644 --- a/arch/arm/mach-pxa/pwm.c +++ b/arch/arm/mach-pxa/pwm.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/pwm.h> | 20 | #include <linux/pwm.h> |
21 | 21 | ||
22 | #include <asm/div64.h> | 22 | #include <asm/div64.h> |
23 | #include <mach/pxa-regs.h> | ||
24 | 23 | ||
25 | /* PWM registers and bits definitions */ | 24 | /* PWM registers and bits definitions */ |
26 | #define PWMCR (0x00) | 25 | #define PWMCR (0x00) |
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 6c57522e2469..77c2693cfeef 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -25,9 +25,8 @@ | |||
25 | 25 | ||
26 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
27 | #include <mach/irqs.h> | 27 | #include <mach/irqs.h> |
28 | #include <mach/pxa-regs.h> | 28 | #include <mach/gpio.h> |
29 | #include <mach/pxa2xx-regs.h> | 29 | #include <mach/pxa25x.h> |
30 | #include <mach/mfp-pxa25x.h> | ||
31 | #include <mach/reset.h> | 30 | #include <mach/reset.h> |
32 | #include <mach/pm.h> | 31 | #include <mach/pm.h> |
33 | #include <mach/dma.h> | 32 | #include <mach/dma.h> |
@@ -310,14 +309,14 @@ set_pwer: | |||
310 | void __init pxa25x_init_irq(void) | 309 | void __init pxa25x_init_irq(void) |
311 | { | 310 | { |
312 | pxa_init_irq(32, pxa25x_set_wake); | 311 | pxa_init_irq(32, pxa25x_set_wake); |
313 | pxa_init_gpio(85, pxa25x_set_wake); | 312 | pxa_init_gpio(IRQ_GPIO_2_x, 2, 84, pxa25x_set_wake); |
314 | } | 313 | } |
315 | 314 | ||
316 | #ifdef CONFIG_CPU_PXA26x | 315 | #ifdef CONFIG_CPU_PXA26x |
317 | void __init pxa26x_init_irq(void) | 316 | void __init pxa26x_init_irq(void) |
318 | { | 317 | { |
319 | pxa_init_irq(32, pxa25x_set_wake); | 318 | pxa_init_irq(32, pxa25x_set_wake); |
320 | pxa_init_gpio(90, pxa25x_set_wake); | 319 | pxa_init_gpio(IRQ_GPIO_2_x, 2, 89, pxa25x_set_wake); |
321 | } | 320 | } |
322 | #endif | 321 | #endif |
323 | 322 | ||
@@ -355,7 +354,7 @@ static int __init pxa25x_init(void) | |||
355 | 354 | ||
356 | clks_register(pxa25x_clkregs, ARRAY_SIZE(pxa25x_clkregs)); | 355 | clks_register(pxa25x_clkregs, ARRAY_SIZE(pxa25x_clkregs)); |
357 | 356 | ||
358 | if ((ret = pxa_init_dma(16))) | 357 | if ((ret = pxa_init_dma(IRQ_DMA, 16))) |
359 | return ret; | 358 | return ret; |
360 | 359 | ||
361 | pxa25x_init_pm(); | 360 | pxa25x_init_pm(); |
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 411bec54fdc4..a425ec71e657 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -21,9 +21,8 @@ | |||
21 | #include <mach/hardware.h> | 21 | #include <mach/hardware.h> |
22 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
23 | #include <mach/irqs.h> | 23 | #include <mach/irqs.h> |
24 | #include <mach/pxa-regs.h> | 24 | #include <mach/gpio.h> |
25 | #include <mach/pxa2xx-regs.h> | 25 | #include <mach/pxa27x.h> |
26 | #include <mach/mfp-pxa27x.h> | ||
27 | #include <mach/reset.h> | 26 | #include <mach/reset.h> |
28 | #include <mach/ohci.h> | 27 | #include <mach/ohci.h> |
29 | #include <mach/pm.h> | 28 | #include <mach/pm.h> |
@@ -332,7 +331,7 @@ static int pxa27x_set_wake(unsigned int irq, unsigned int on) | |||
332 | void __init pxa27x_init_irq(void) | 331 | void __init pxa27x_init_irq(void) |
333 | { | 332 | { |
334 | pxa_init_irq(34, pxa27x_set_wake); | 333 | pxa_init_irq(34, pxa27x_set_wake); |
335 | pxa_init_gpio(121, pxa27x_set_wake); | 334 | pxa_init_gpio(IRQ_GPIO_2_x, 2, 120, pxa27x_set_wake); |
336 | } | 335 | } |
337 | 336 | ||
338 | /* | 337 | /* |
@@ -381,7 +380,7 @@ static int __init pxa27x_init(void) | |||
381 | 380 | ||
382 | clks_register(pxa27x_clkregs, ARRAY_SIZE(pxa27x_clkregs)); | 381 | clks_register(pxa27x_clkregs, ARRAY_SIZE(pxa27x_clkregs)); |
383 | 382 | ||
384 | if ((ret = pxa_init_dma(32))) | 383 | if ((ret = pxa_init_dma(IRQ_DMA, 32))) |
385 | return ret; | 384 | return ret; |
386 | 385 | ||
387 | pxa27x_init_pm(); | 386 | pxa27x_init_pm(); |
diff --git a/arch/arm/mach-pxa/pxa2xx.c b/arch/arm/mach-pxa/pxa2xx.c index 73d04d81c75a..2f3394f85917 100644 --- a/arch/arm/mach-pxa/pxa2xx.c +++ b/arch/arm/mach-pxa/pxa2xx.c | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #include <mach/hardware.h> | 17 | #include <mach/hardware.h> |
18 | #include <mach/pxa2xx-regs.h> | 18 | #include <mach/pxa2xx-regs.h> |
19 | #include <mach/mfp-pxa2xx.h> | ||
20 | #include <mach/mfp-pxa25x.h> | 19 | #include <mach/mfp-pxa25x.h> |
21 | #include <mach/reset.h> | 20 | #include <mach/reset.h> |
22 | #include <mach/irda.h> | 21 | #include <mach/irda.h> |
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c index 83fb609b6eb7..37bb12d13ca2 100644 --- a/arch/arm/mach-pxa/pxa300.c +++ b/arch/arm/mach-pxa/pxa300.c | |||
@@ -17,9 +17,7 @@ | |||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | 19 | ||
20 | #include <mach/hardware.h> | 20 | #include <mach/pxa300.h> |
21 | #include <mach/pxa3xx-regs.h> | ||
22 | #include <mach/mfp-pxa300.h> | ||
23 | 21 | ||
24 | #include "generic.h" | 22 | #include "generic.h" |
25 | #include "devices.h" | 23 | #include "devices.h" |
diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c index 36f066196fa2..e708f4e0ecaf 100644 --- a/arch/arm/mach-pxa/pxa320.c +++ b/arch/arm/mach-pxa/pxa320.c | |||
@@ -17,10 +17,7 @@ | |||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | 19 | ||
20 | #include <mach/hardware.h> | 20 | #include <mach/pxa320.h> |
21 | #include <mach/mfp.h> | ||
22 | #include <mach/pxa3xx-regs.h> | ||
23 | #include <mach/mfp-pxa320.h> | ||
24 | 21 | ||
25 | #include "generic.h" | 22 | #include "generic.h" |
26 | #include "devices.h" | 23 | #include "devices.h" |
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 490893824e78..b02d4544dc95 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/sysdev.h> | 23 | #include <linux/sysdev.h> |
24 | 24 | ||
25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <mach/gpio.h> | ||
26 | #include <mach/pxa3xx-regs.h> | 27 | #include <mach/pxa3xx-regs.h> |
27 | #include <mach/reset.h> | 28 | #include <mach/reset.h> |
28 | #include <mach/ohci.h> | 29 | #include <mach/ohci.h> |
@@ -538,7 +539,7 @@ void __init pxa3xx_init_irq(void) | |||
538 | __asm__ __volatile__("mcr p15, 0, %0, c15, c1, 0\n": :"r"(value)); | 539 | __asm__ __volatile__("mcr p15, 0, %0, c15, c1, 0\n": :"r"(value)); |
539 | 540 | ||
540 | pxa_init_irq(56, pxa3xx_set_wake); | 541 | pxa_init_irq(56, pxa3xx_set_wake); |
541 | pxa_init_gpio(128, NULL); | 542 | pxa_init_gpio(IRQ_GPIO_2_x, 2, 127, NULL); |
542 | } | 543 | } |
543 | 544 | ||
544 | /* | 545 | /* |
@@ -594,7 +595,7 @@ static int __init pxa3xx_init(void) | |||
594 | 595 | ||
595 | clks_register(pxa3xx_clkregs, ARRAY_SIZE(pxa3xx_clkregs)); | 596 | clks_register(pxa3xx_clkregs, ARRAY_SIZE(pxa3xx_clkregs)); |
596 | 597 | ||
597 | if ((ret = pxa_init_dma(32))) | 598 | if ((ret = pxa_init_dma(IRQ_DMA, 32))) |
598 | return ret; | 599 | return ret; |
599 | 600 | ||
600 | pxa3xx_init_pm(); | 601 | pxa3xx_init_pm(); |
diff --git a/arch/arm/mach-pxa/pxa930.c b/arch/arm/mach-pxa/pxa930.c index 13e6bfdfff60..f15dfa55f27f 100644 --- a/arch/arm/mach-pxa/pxa930.c +++ b/arch/arm/mach-pxa/pxa930.c | |||
@@ -16,8 +16,7 @@ | |||
16 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
18 | 18 | ||
19 | #include <mach/hardware.h> | 19 | #include <mach/pxa930.h> |
20 | #include <mach/mfp-pxa930.h> | ||
21 | 20 | ||
22 | static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = { | 21 | static struct pxa3xx_mfp_addr_map pxa930_mfp_addr_map[] __initdata = { |
23 | 22 | ||
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index 00b2dc2a1074..867c95c09618 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <linux/io.h> | 10 | #include <linux/io.h> |
11 | #include <asm/proc-fns.h> | 11 | #include <asm/proc-fns.h> |
12 | 12 | ||
13 | #include <mach/pxa-regs.h> | 13 | #include <mach/regs-ost.h> |
14 | #include <mach/reset.h> | 14 | #include <mach/reset.h> |
15 | 15 | ||
16 | unsigned int reset_status; | 16 | unsigned int reset_status; |
diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c index 5d02a7325586..ff8239991430 100644 --- a/arch/arm/mach-pxa/saar.c +++ b/arch/arm/mach-pxa/saar.c | |||
@@ -25,11 +25,9 @@ | |||
25 | 25 | ||
26 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
27 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
28 | #include <mach/hardware.h> | 28 | |
29 | #include <mach/pxa3xx-regs.h> | 29 | #include <mach/pxa930.h> |
30 | #include <mach/mfp-pxa930.h> | ||
31 | #include <mach/i2c.h> | 30 | #include <mach/i2c.h> |
32 | #include <mach/regs-lcd.h> | ||
33 | #include <mach/pxafb.h> | 31 | #include <mach/pxafb.h> |
34 | 32 | ||
35 | #include "devices.h" | 33 | #include "devices.h" |
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index f0845c1b001c..16b4ec67e3b6 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
27 | #include <mach/pm.h> | 27 | #include <mach/pm.h> |
28 | #include <mach/pxa-regs.h> | ||
29 | #include <mach/pxa2xx-gpio.h> | 28 | #include <mach/pxa2xx-gpio.h> |
30 | #include <mach/sharpsl.h> | 29 | #include <mach/sharpsl.h> |
31 | #include "sharpsl.h" | 30 | #include "sharpsl.h" |
diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S index a62c8375eb53..2ed95f369cfc 100644 --- a/arch/arm/mach-pxa/sleep.S +++ b/arch/arm/mach-pxa/sleep.S | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <asm/assembler.h> | 15 | #include <asm/assembler.h> |
16 | #include <mach/hardware.h> | 16 | #include <mach/hardware.h> |
17 | 17 | ||
18 | #include <mach/pxa-regs.h> | ||
19 | #include <mach/pxa2xx-regs.h> | 18 | #include <mach/pxa2xx-regs.h> |
20 | 19 | ||
21 | #define MDREFR_KDIV 0x200a4000 // all banks | 20 | #define MDREFR_KDIV 0x200a4000 // all banks |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 6d447c9ce8ab..f697c492b2ab 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -44,9 +44,7 @@ | |||
44 | #include <asm/mach/map.h> | 44 | #include <asm/mach/map.h> |
45 | #include <asm/mach/irq.h> | 45 | #include <asm/mach/irq.h> |
46 | 46 | ||
47 | #include <mach/pxa-regs.h> | 47 | #include <mach/pxa27x.h> |
48 | #include <mach/pxa2xx-regs.h> | ||
49 | #include <mach/mfp-pxa27x.h> | ||
50 | #include <mach/pxa27x-udc.h> | 48 | #include <mach/pxa27x-udc.h> |
51 | #include <mach/reset.h> | 49 | #include <mach/reset.h> |
52 | #include <mach/i2c.h> | 50 | #include <mach/i2c.h> |
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 072e77cfe5a3..2e4490562c9e 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <mach/sharpsl.h> | 25 | #include <mach/sharpsl.h> |
26 | #include <mach/spitz.h> | 26 | #include <mach/spitz.h> |
27 | #include <mach/pxa-regs.h> | ||
28 | #include <mach/pxa2xx-regs.h> | 27 | #include <mach/pxa2xx-regs.h> |
29 | #include <mach/pxa2xx-gpio.h> | 28 | #include <mach/pxa2xx-gpio.h> |
30 | #include "sharpsl.h" | 29 | #include "sharpsl.h" |
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c index 6f42004db3ed..965e38c6bafe 100644 --- a/arch/arm/mach-pxa/ssp.c +++ b/arch/arm/mach-pxa/ssp.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
34 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
35 | #include <mach/ssp.h> | 35 | #include <mach/ssp.h> |
36 | #include <mach/pxa-regs.h> | ||
37 | #include <mach/regs-ssp.h> | 36 | #include <mach/regs-ssp.h> |
38 | 37 | ||
39 | #define TIMEOUT 100000 | 38 | #define TIMEOUT 100000 |
diff --git a/arch/arm/mach-pxa/standby.S b/arch/arm/mach-pxa/standby.S index f3821cfda72f..29f5f5c180b7 100644 --- a/arch/arm/mach-pxa/standby.S +++ b/arch/arm/mach-pxa/standby.S | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
14 | #include <mach/hardware.h> | 14 | #include <mach/hardware.h> |
15 | 15 | ||
16 | #include <mach/pxa-regs.h> | ||
17 | #include <mach/pxa2xx-regs.h> | 16 | #include <mach/pxa2xx-regs.h> |
18 | 17 | ||
19 | .text | 18 | .text |
diff --git a/arch/arm/mach-pxa/tavorevb.c b/arch/arm/mach-pxa/tavorevb.c index 58ef08a5224b..b75353a2ec75 100644 --- a/arch/arm/mach-pxa/tavorevb.c +++ b/arch/arm/mach-pxa/tavorevb.c | |||
@@ -22,9 +22,8 @@ | |||
22 | 22 | ||
23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
24 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
25 | #include <mach/hardware.h> | 25 | |
26 | #include <mach/pxa3xx-regs.h> | 26 | #include <mach/pxa930.h> |
27 | #include <mach/mfp-pxa930.h> | ||
28 | #include <mach/pxafb.h> | 27 | #include <mach/pxafb.h> |
29 | #include <mach/pxa27x_keypad.h> | 28 | #include <mach/pxa27x_keypad.h> |
30 | 29 | ||
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index 95656a72268d..8eb3830fbb0b 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
@@ -22,8 +22,7 @@ | |||
22 | #include <asm/div64.h> | 22 | #include <asm/div64.h> |
23 | #include <asm/mach/irq.h> | 23 | #include <asm/mach/irq.h> |
24 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
25 | #include <mach/hardware.h> | 25 | #include <mach/regs-ost.h> |
26 | #include <mach/pxa-regs.h> | ||
27 | 26 | ||
28 | /* | 27 | /* |
29 | * This is PXA's sched_clock implementation. This has a resolution | 28 | * This is PXA's sched_clock implementation. This has a resolution |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 3332e5d0356c..66b13802c99d 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
@@ -36,8 +36,8 @@ | |||
36 | 36 | ||
37 | #include <asm/setup.h> | 37 | #include <asm/setup.h> |
38 | #include <asm/mach-types.h> | 38 | #include <asm/mach-types.h> |
39 | #include <mach/pxa2xx-regs.h> | 39 | |
40 | #include <mach/mfp-pxa25x.h> | 40 | #include <mach/pxa25x.h> |
41 | #include <mach/reset.h> | 41 | #include <mach/reset.h> |
42 | #include <mach/irda.h> | 42 | #include <mach/irda.h> |
43 | #include <mach/i2c.h> | 43 | #include <mach/i2c.h> |
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index a72e3add743c..f79c9cb70ae4 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c | |||
@@ -39,10 +39,7 @@ | |||
39 | #include <asm/mach/irq.h> | 39 | #include <asm/mach/irq.h> |
40 | #include <asm/mach/flash.h> | 40 | #include <asm/mach/flash.h> |
41 | 41 | ||
42 | #include <mach/hardware.h> | 42 | #include <mach/pxa27x.h> |
43 | #include <mach/pxa-regs.h> | ||
44 | #include <mach/pxa2xx-regs.h> | ||
45 | #include <mach/mfp-pxa27x.h> | ||
46 | #include <mach/pxa2xx_spi.h> | 43 | #include <mach/pxa2xx_spi.h> |
47 | #include <mach/trizeps4.h> | 44 | #include <mach/trizeps4.h> |
48 | #include <mach/audio.h> | 45 | #include <mach/audio.h> |
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index 4b3120dbc049..0e65344e9f53 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c | |||
@@ -42,12 +42,9 @@ | |||
42 | #include <linux/mtd/partitions.h> | 42 | #include <linux/mtd/partitions.h> |
43 | #include <linux/mtd/physmap.h> | 43 | #include <linux/mtd/physmap.h> |
44 | 44 | ||
45 | #include <mach/pxa-regs.h> | 45 | #include <mach/pxa25x.h> |
46 | #include <mach/pxa2xx-regs.h> | ||
47 | #include <mach/bitfield.h> | ||
48 | #include <mach/audio.h> | 46 | #include <mach/audio.h> |
49 | #include <mach/pxafb.h> | 47 | #include <mach/pxafb.h> |
50 | #include <mach/mfp-pxa25x.h> | ||
51 | #include <mach/i2c.h> | 48 | #include <mach/i2c.h> |
52 | #include <mach/viper.h> | 49 | #include <mach/viper.h> |
53 | 50 | ||
@@ -956,7 +953,7 @@ static struct map_desc viper_io_desc[] __initdata = { | |||
956 | }, | 953 | }, |
957 | { | 954 | { |
958 | .virtual = VIPER_PC104IO_BASE, | 955 | .virtual = VIPER_PC104IO_BASE, |
959 | .pfn = __phys_to_pfn(_PCMCIA1IO), | 956 | .pfn = __phys_to_pfn(0x30000000), |
960 | .length = 0x00800000, | 957 | .length = 0x00800000, |
961 | .type = MT_DEVICE, | 958 | .type = MT_DEVICE, |
962 | }, | 959 | }, |
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index 46538885a58a..c1f73205d078 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c | |||
@@ -18,9 +18,9 @@ | |||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
20 | #include <linux/i2c/pca953x.h> | 20 | #include <linux/i2c/pca953x.h> |
21 | #include <linux/gpio.h> | ||
21 | 22 | ||
22 | #include <asm/gpio.h> | 23 | #include <mach/pxa300.h> |
23 | #include <mach/mfp-pxa300.h> | ||
24 | #include <mach/i2c.h> | 24 | #include <mach/i2c.h> |
25 | #include <mach/zylonite.h> | 25 | #include <mach/zylonite.h> |
26 | 26 | ||
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index 28e4e623780b..4e1c488c6906 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
20 | 20 | ||
21 | #include <mach/mfp-pxa320.h> | 21 | #include <mach/pxa320.h> |
22 | #include <mach/zylonite.h> | 22 | #include <mach/zylonite.h> |
23 | 23 | ||
24 | #include "generic.h" | 24 | #include "generic.h" |
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig index ad911854eb4c..b6ec10627776 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig | |||
@@ -35,6 +35,7 @@ config MACH_REALVIEW_PB11MP | |||
35 | bool "Support RealView/PB11MPCore platform" | 35 | bool "Support RealView/PB11MPCore platform" |
36 | select CPU_V6 | 36 | select CPU_V6 |
37 | select ARM_GIC | 37 | select ARM_GIC |
38 | select HAVE_PATA_PLATFORM | ||
38 | help | 39 | help |
39 | Include support for the ARM(R) RealView MPCore Platform Baseboard. | 40 | Include support for the ARM(R) RealView MPCore Platform Baseboard. |
40 | PB11MPCore is a platform with an on-board ARM11MPCore and has | 41 | PB11MPCore is a platform with an on-board ARM11MPCore and has |
@@ -51,6 +52,7 @@ config MACH_REALVIEW_PBA8 | |||
51 | bool "Support RealView/PB-A8 platform" | 52 | bool "Support RealView/PB-A8 platform" |
52 | select CPU_V7 | 53 | select CPU_V7 |
53 | select ARM_GIC | 54 | select ARM_GIC |
55 | select HAVE_PATA_PLATFORM | ||
54 | help | 56 | help |
55 | Include support for the ARM(R) RealView Cortex-A8 Platform Baseboard. | 57 | Include support for the ARM(R) RealView Cortex-A8 Platform Baseboard. |
56 | PB-A8 is a platform with an on-board Cortex-A8 and has support for | 58 | PB-A8 is a platform with an on-board Cortex-A8 and has support for |
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index bd2aa4f16141..d6766685cfc7 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/clockchips.h> | 29 | #include <linux/clockchips.h> |
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | #include <linux/smc911x.h> | 31 | #include <linux/smc911x.h> |
32 | #include <linux/ata_platform.h> | ||
32 | 33 | ||
33 | #include <asm/clkdev.h> | 34 | #include <asm/clkdev.h> |
34 | #include <asm/system.h> | 35 | #include <asm/system.h> |
@@ -150,6 +151,44 @@ int realview_eth_register(const char *name, struct resource *res) | |||
150 | return platform_device_register(&realview_eth_device); | 151 | return platform_device_register(&realview_eth_device); |
151 | } | 152 | } |
152 | 153 | ||
154 | struct platform_device realview_usb_device = { | ||
155 | .name = "isp1760", | ||
156 | .num_resources = 2, | ||
157 | }; | ||
158 | |||
159 | int realview_usb_register(struct resource *res) | ||
160 | { | ||
161 | realview_usb_device.resource = res; | ||
162 | return platform_device_register(&realview_usb_device); | ||
163 | } | ||
164 | |||
165 | static struct pata_platform_info pata_platform_data = { | ||
166 | .ioport_shift = 1, | ||
167 | }; | ||
168 | |||
169 | static struct resource pata_resources[] = { | ||
170 | [0] = { | ||
171 | .start = REALVIEW_CF_BASE, | ||
172 | .end = REALVIEW_CF_BASE + 0xff, | ||
173 | .flags = IORESOURCE_MEM, | ||
174 | }, | ||
175 | [1] = { | ||
176 | .start = REALVIEW_CF_BASE + 0x100, | ||
177 | .end = REALVIEW_CF_BASE + SZ_4K - 1, | ||
178 | .flags = IORESOURCE_MEM, | ||
179 | }, | ||
180 | }; | ||
181 | |||
182 | struct platform_device realview_cf_device = { | ||
183 | .name = "pata_platform", | ||
184 | .id = -1, | ||
185 | .num_resources = ARRAY_SIZE(pata_resources), | ||
186 | .resource = pata_resources, | ||
187 | .dev = { | ||
188 | .platform_data = &pata_platform_data, | ||
189 | }, | ||
190 | }; | ||
191 | |||
153 | static struct resource realview_i2c_resource = { | 192 | static struct resource realview_i2c_resource = { |
154 | .start = REALVIEW_I2C_BASE, | 193 | .start = REALVIEW_I2C_BASE, |
155 | .end = REALVIEW_I2C_BASE + SZ_4K - 1, | 194 | .end = REALVIEW_I2C_BASE + SZ_4K - 1, |
@@ -158,11 +197,25 @@ static struct resource realview_i2c_resource = { | |||
158 | 197 | ||
159 | struct platform_device realview_i2c_device = { | 198 | struct platform_device realview_i2c_device = { |
160 | .name = "versatile-i2c", | 199 | .name = "versatile-i2c", |
161 | .id = -1, | 200 | .id = 0, |
162 | .num_resources = 1, | 201 | .num_resources = 1, |
163 | .resource = &realview_i2c_resource, | 202 | .resource = &realview_i2c_resource, |
164 | }; | 203 | }; |
165 | 204 | ||
205 | static struct i2c_board_info realview_i2c_board_info[] = { | ||
206 | { | ||
207 | I2C_BOARD_INFO("rtc-ds1307", 0xd0 >> 1), | ||
208 | .type = "ds1338", | ||
209 | }, | ||
210 | }; | ||
211 | |||
212 | static int __init realview_i2c_init(void) | ||
213 | { | ||
214 | return i2c_register_board_info(0, realview_i2c_board_info, | ||
215 | ARRAY_SIZE(realview_i2c_board_info)); | ||
216 | } | ||
217 | arch_initcall(realview_i2c_init); | ||
218 | |||
166 | #define REALVIEW_SYSMCI (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_MCI_OFFSET) | 219 | #define REALVIEW_SYSMCI (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_MCI_OFFSET) |
167 | 220 | ||
168 | static unsigned int realview_mmc_status(struct device *dev) | 221 | static unsigned int realview_mmc_status(struct device *dev) |
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h index 44269b162d49..21c08637683b 100644 --- a/arch/arm/mach-realview/core.h +++ b/arch/arm/mach-realview/core.h | |||
@@ -45,6 +45,7 @@ static struct amba_device name##_device = { \ | |||
45 | } | 45 | } |
46 | 46 | ||
47 | extern struct platform_device realview_flash_device; | 47 | extern struct platform_device realview_flash_device; |
48 | extern struct platform_device realview_cf_device; | ||
48 | extern struct platform_device realview_i2c_device; | 49 | extern struct platform_device realview_i2c_device; |
49 | extern struct mmc_platform_data realview_mmc0_plat_data; | 50 | extern struct mmc_platform_data realview_mmc0_plat_data; |
50 | extern struct mmc_platform_data realview_mmc1_plat_data; | 51 | extern struct mmc_platform_data realview_mmc1_plat_data; |
@@ -62,5 +63,6 @@ extern void realview_leds_event(led_event_t ledevt); | |||
62 | extern void realview_timer_init(unsigned int timer_irq); | 63 | extern void realview_timer_init(unsigned int timer_irq); |
63 | extern int realview_flash_register(struct resource *res, u32 num); | 64 | extern int realview_flash_register(struct resource *res, u32 num); |
64 | extern int realview_eth_register(const char *name, struct resource *res); | 65 | extern int realview_eth_register(const char *name, struct resource *res); |
66 | extern int realview_usb_register(struct resource *res); | ||
65 | 67 | ||
66 | #endif | 68 | #endif |
diff --git a/arch/arm/mach-realview/include/mach/board-pba8.h b/arch/arm/mach-realview/include/mach/board-pba8.h index c8bed8f58bab..307f97b16e5b 100644 --- a/arch/arm/mach-realview/include/mach/board-pba8.h +++ b/arch/arm/mach-realview/include/mach/board-pba8.h | |||
@@ -45,8 +45,6 @@ | |||
45 | #define REALVIEW_PBA8_DMC_BASE 0x100E0000 /* DMC configuration */ | 45 | #define REALVIEW_PBA8_DMC_BASE 0x100E0000 /* DMC configuration */ |
46 | #define REALVIEW_PBA8_SMC_BASE 0x100E1000 /* SMC configuration */ | 46 | #define REALVIEW_PBA8_SMC_BASE 0x100E1000 /* SMC configuration */ |
47 | #define REALVIEW_PBA8_CAN_BASE 0x100E2000 /* CAN bus */ | 47 | #define REALVIEW_PBA8_CAN_BASE 0x100E2000 /* CAN bus */ |
48 | #define REALVIEW_PBA8_CF_BASE 0x18000000 /* Compact flash */ | ||
49 | #define REALVIEW_PBA8_CF_MEM_BASE 0x18003000 /* SMC for Compact flash */ | ||
50 | #define REALVIEW_PBA8_GIC_CPU_BASE 0x1E000000 /* Generic interrupt controller CPU interface */ | 48 | #define REALVIEW_PBA8_GIC_CPU_BASE 0x1E000000 /* Generic interrupt controller CPU interface */ |
51 | #define REALVIEW_PBA8_FLASH0_BASE 0x40000000 | 49 | #define REALVIEW_PBA8_FLASH0_BASE 0x40000000 |
52 | #define REALVIEW_PBA8_FLASH0_SIZE SZ_64M | 50 | #define REALVIEW_PBA8_FLASH0_SIZE SZ_64M |
diff --git a/arch/arm/mach-realview/include/mach/platform.h b/arch/arm/mach-realview/include/mach/platform.h index 793a3a332712..c8f50835fed2 100644 --- a/arch/arm/mach-realview/include/mach/platform.h +++ b/arch/arm/mach-realview/include/mach/platform.h | |||
@@ -204,6 +204,12 @@ | |||
204 | #define REALVIEW_LT_BASE 0x80000000 /* Logic Tile expansion */ | 204 | #define REALVIEW_LT_BASE 0x80000000 /* Logic Tile expansion */ |
205 | 205 | ||
206 | /* | 206 | /* |
207 | * CompactFlash | ||
208 | */ | ||
209 | #define REALVIEW_CF_BASE 0x18000000 /* CompactFlash */ | ||
210 | #define REALVIEW_CF_MEM_BASE 0x18003000 /* SMC for CompactFlash */ | ||
211 | |||
212 | /* | ||
207 | * Disk on Chip | 213 | * Disk on Chip |
208 | */ | 214 | */ |
209 | #define REALVIEW_DOC_BASE 0x2C000000 | 215 | #define REALVIEW_DOC_BASE 0x2C000000 |
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index bed39ed97613..c20fbef122b3 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
@@ -264,6 +264,19 @@ static int eth_device_register(void) | |||
264 | return realview_eth_register(name, realview_eb_eth_resources); | 264 | return realview_eth_register(name, realview_eb_eth_resources); |
265 | } | 265 | } |
266 | 266 | ||
267 | static struct resource realview_eb_isp1761_resources[] = { | ||
268 | [0] = { | ||
269 | .start = REALVIEW_EB_USB_BASE, | ||
270 | .end = REALVIEW_EB_USB_BASE + SZ_128K - 1, | ||
271 | .flags = IORESOURCE_MEM, | ||
272 | }, | ||
273 | [1] = { | ||
274 | .start = IRQ_EB_USB, | ||
275 | .end = IRQ_EB_USB, | ||
276 | .flags = IORESOURCE_IRQ, | ||
277 | }, | ||
278 | }; | ||
279 | |||
267 | static void __init gic_init_irq(void) | 280 | static void __init gic_init_irq(void) |
268 | { | 281 | { |
269 | if (core_tile_eb11mp() || core_tile_a9mp()) { | 282 | if (core_tile_eb11mp() || core_tile_a9mp()) { |
@@ -323,6 +336,8 @@ static void realview_eb11mp_fixup(void) | |||
323 | /* platform devices */ | 336 | /* platform devices */ |
324 | realview_eb_eth_resources[1].start = IRQ_EB11MP_ETH; | 337 | realview_eb_eth_resources[1].start = IRQ_EB11MP_ETH; |
325 | realview_eb_eth_resources[1].end = IRQ_EB11MP_ETH; | 338 | realview_eb_eth_resources[1].end = IRQ_EB11MP_ETH; |
339 | realview_eb_isp1761_resources[1].start = IRQ_EB11MP_USB; | ||
340 | realview_eb_isp1761_resources[1].end = IRQ_EB11MP_USB; | ||
326 | } | 341 | } |
327 | 342 | ||
328 | static void __init realview_eb_timer_init(void) | 343 | static void __init realview_eb_timer_init(void) |
@@ -366,6 +381,7 @@ static void __init realview_eb_init(void) | |||
366 | realview_flash_register(&realview_eb_flash_resource, 1); | 381 | realview_flash_register(&realview_eb_flash_resource, 1); |
367 | platform_device_register(&realview_i2c_device); | 382 | platform_device_register(&realview_i2c_device); |
368 | eth_device_register(); | 383 | eth_device_register(); |
384 | realview_usb_register(realview_eb_isp1761_resources); | ||
369 | 385 | ||
370 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { | 386 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { |
371 | struct amba_device *d = amba_devs[i]; | 387 | struct amba_device *d = amba_devs[i]; |
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c index 8f0683c22140..a64b84a7a3df 100644 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c | |||
@@ -222,6 +222,19 @@ static struct resource realview_pb1176_smsc911x_resources[] = { | |||
222 | }, | 222 | }, |
223 | }; | 223 | }; |
224 | 224 | ||
225 | static struct resource realview_pb1176_isp1761_resources[] = { | ||
226 | [0] = { | ||
227 | .start = REALVIEW_PB1176_USB_BASE, | ||
228 | .end = REALVIEW_PB1176_USB_BASE + SZ_128K - 1, | ||
229 | .flags = IORESOURCE_MEM, | ||
230 | }, | ||
231 | [1] = { | ||
232 | .start = IRQ_PB1176_USB, | ||
233 | .end = IRQ_PB1176_USB, | ||
234 | .flags = IORESOURCE_IRQ, | ||
235 | }, | ||
236 | }; | ||
237 | |||
225 | static void __init gic_init_irq(void) | 238 | static void __init gic_init_irq(void) |
226 | { | 239 | { |
227 | /* ARM1176 DevChip GIC, primary */ | 240 | /* ARM1176 DevChip GIC, primary */ |
@@ -260,6 +273,8 @@ static void __init realview_pb1176_init(void) | |||
260 | 273 | ||
261 | realview_flash_register(&realview_pb1176_flash_resource, 1); | 274 | realview_flash_register(&realview_pb1176_flash_resource, 1); |
262 | realview_eth_register(NULL, realview_pb1176_smsc911x_resources); | 275 | realview_eth_register(NULL, realview_pb1176_smsc911x_resources); |
276 | platform_device_register(&realview_i2c_device); | ||
277 | realview_usb_register(realview_pb1176_isp1761_resources); | ||
263 | 278 | ||
264 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { | 279 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { |
265 | struct amba_device *d = amba_devs[i]; | 280 | struct amba_device *d = amba_devs[i]; |
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index 3ebdb2dadd6f..ea1e60eca359 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
@@ -230,31 +230,19 @@ static struct resource realview_pb11mp_smsc911x_resources[] = { | |||
230 | }, | 230 | }, |
231 | }; | 231 | }; |
232 | 232 | ||
233 | struct resource realview_pb11mp_cf_resources[] = { | 233 | static struct resource realview_pb11mp_isp1761_resources[] = { |
234 | [0] = { | 234 | [0] = { |
235 | .start = REALVIEW_PB11MP_CF_BASE, | 235 | .start = REALVIEW_PB11MP_USB_BASE, |
236 | .end = REALVIEW_PB11MP_CF_BASE + SZ_4K - 1, | 236 | .end = REALVIEW_PB11MP_USB_BASE + SZ_128K - 1, |
237 | .flags = IORESOURCE_MEM, | 237 | .flags = IORESOURCE_MEM, |
238 | }, | 238 | }, |
239 | [1] = { | 239 | [1] = { |
240 | .start = REALVIEW_PB11MP_CF_MEM_BASE, | 240 | .start = IRQ_TC11MP_USB, |
241 | .end = REALVIEW_PB11MP_CF_MEM_BASE + SZ_4K - 1, | 241 | .end = IRQ_TC11MP_USB, |
242 | .flags = IORESOURCE_MEM, | ||
243 | }, | ||
244 | [2] = { | ||
245 | .start = -1, /* FIXME: Find correct irq */ | ||
246 | .end = -1, | ||
247 | .flags = IORESOURCE_IRQ, | 242 | .flags = IORESOURCE_IRQ, |
248 | }, | 243 | }, |
249 | }; | 244 | }; |
250 | 245 | ||
251 | struct platform_device realview_pb11mp_cf_device = { | ||
252 | .name = "compactflash", | ||
253 | .id = 0, | ||
254 | .num_resources = ARRAY_SIZE(realview_pb11mp_cf_resources), | ||
255 | .resource = realview_pb11mp_cf_resources, | ||
256 | }; | ||
257 | |||
258 | static void __init gic_init_irq(void) | 246 | static void __init gic_init_irq(void) |
259 | { | 247 | { |
260 | unsigned int pldctrl; | 248 | unsigned int pldctrl; |
@@ -308,7 +296,8 @@ static void __init realview_pb11mp_init(void) | |||
308 | ARRAY_SIZE(realview_pb11mp_flash_resource)); | 296 | ARRAY_SIZE(realview_pb11mp_flash_resource)); |
309 | realview_eth_register(NULL, realview_pb11mp_smsc911x_resources); | 297 | realview_eth_register(NULL, realview_pb11mp_smsc911x_resources); |
310 | platform_device_register(&realview_i2c_device); | 298 | platform_device_register(&realview_i2c_device); |
311 | platform_device_register(&realview_pb11mp_cf_device); | 299 | platform_device_register(&realview_cf_device); |
300 | realview_usb_register(realview_pb11mp_isp1761_resources); | ||
312 | 301 | ||
313 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { | 302 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { |
314 | struct amba_device *d = amba_devs[i]; | 303 | struct amba_device *d = amba_devs[i]; |
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index 34c94435d2d8..d6ac1eb86576 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c | |||
@@ -221,31 +221,19 @@ static struct resource realview_pba8_smsc911x_resources[] = { | |||
221 | }, | 221 | }, |
222 | }; | 222 | }; |
223 | 223 | ||
224 | struct resource realview_pba8_cf_resources[] = { | 224 | static struct resource realview_pba8_isp1761_resources[] = { |
225 | [0] = { | 225 | [0] = { |
226 | .start = REALVIEW_PBA8_CF_BASE, | 226 | .start = REALVIEW_PBA8_USB_BASE, |
227 | .end = REALVIEW_PBA8_CF_BASE + SZ_4K - 1, | 227 | .end = REALVIEW_PBA8_USB_BASE + SZ_128K - 1, |
228 | .flags = IORESOURCE_MEM, | 228 | .flags = IORESOURCE_MEM, |
229 | }, | 229 | }, |
230 | [1] = { | 230 | [1] = { |
231 | .start = REALVIEW_PBA8_CF_MEM_BASE, | 231 | .start = IRQ_PBA8_USB, |
232 | .end = REALVIEW_PBA8_CF_MEM_BASE + SZ_4K - 1, | 232 | .end = IRQ_PBA8_USB, |
233 | .flags = IORESOURCE_MEM, | ||
234 | }, | ||
235 | [2] = { | ||
236 | .start = -1, /* FIXME: Find correct irq */ | ||
237 | .end = -1, | ||
238 | .flags = IORESOURCE_IRQ, | 233 | .flags = IORESOURCE_IRQ, |
239 | }, | 234 | }, |
240 | }; | 235 | }; |
241 | 236 | ||
242 | struct platform_device realview_pba8_cf_device = { | ||
243 | .name = "compactflash", | ||
244 | .id = 0, | ||
245 | .num_resources = ARRAY_SIZE(realview_pba8_cf_resources), | ||
246 | .resource = realview_pba8_cf_resources, | ||
247 | }; | ||
248 | |||
249 | static void __init gic_init_irq(void) | 237 | static void __init gic_init_irq(void) |
250 | { | 238 | { |
251 | /* ARM PB-A8 on-board GIC */ | 239 | /* ARM PB-A8 on-board GIC */ |
@@ -276,7 +264,8 @@ static void __init realview_pba8_init(void) | |||
276 | ARRAY_SIZE(realview_pba8_flash_resource)); | 264 | ARRAY_SIZE(realview_pba8_flash_resource)); |
277 | realview_eth_register(NULL, realview_pba8_smsc911x_resources); | 265 | realview_eth_register(NULL, realview_pba8_smsc911x_resources); |
278 | platform_device_register(&realview_i2c_device); | 266 | platform_device_register(&realview_i2c_device); |
279 | platform_device_register(&realview_pba8_cf_device); | 267 | platform_device_register(&realview_cf_device); |
268 | realview_usb_register(realview_pba8_isp1761_resources); | ||
280 | 269 | ||
281 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { | 270 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { |
282 | struct amba_device *d = amba_devs[i]; | 271 | struct amba_device *d = amba_devs[i]; |
diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c index 7958a30f8932..c47d974d52bd 100644 --- a/arch/arm/mach-rpc/dma.c +++ b/arch/arm/mach-rpc/dma.c | |||
@@ -26,6 +26,16 @@ | |||
26 | #include <asm/mach/dma.h> | 26 | #include <asm/mach/dma.h> |
27 | #include <asm/hardware/iomd.h> | 27 | #include <asm/hardware/iomd.h> |
28 | 28 | ||
29 | struct iomd_dma { | ||
30 | struct dma_struct dma; | ||
31 | unsigned int state; | ||
32 | unsigned long base; /* Controller base address */ | ||
33 | int irq; /* Controller IRQ */ | ||
34 | struct scatterlist cur_sg; /* Current controller buffer */ | ||
35 | dma_addr_t dma_addr; | ||
36 | unsigned int dma_len; | ||
37 | }; | ||
38 | |||
29 | #if 0 | 39 | #if 0 |
30 | typedef enum { | 40 | typedef enum { |
31 | dma_size_8 = 1, | 41 | dma_size_8 = 1, |
@@ -44,15 +54,15 @@ typedef enum { | |||
44 | #define CR (IOMD_IO0CR - IOMD_IO0CURA) | 54 | #define CR (IOMD_IO0CR - IOMD_IO0CURA) |
45 | #define ST (IOMD_IO0ST - IOMD_IO0CURA) | 55 | #define ST (IOMD_IO0ST - IOMD_IO0CURA) |
46 | 56 | ||
47 | static void iomd_get_next_sg(struct scatterlist *sg, dma_t *dma) | 57 | static void iomd_get_next_sg(struct scatterlist *sg, struct iomd_dma *idma) |
48 | { | 58 | { |
49 | unsigned long end, offset, flags = 0; | 59 | unsigned long end, offset, flags = 0; |
50 | 60 | ||
51 | if (dma->sg) { | 61 | if (idma->dma.sg) { |
52 | sg->dma_address = dma->sg->dma_address; | 62 | sg->dma_address = idma->dma_addr; |
53 | offset = sg->dma_address & ~PAGE_MASK; | 63 | offset = sg->dma_address & ~PAGE_MASK; |
54 | 64 | ||
55 | end = offset + dma->sg->length; | 65 | end = offset + idma->dma_len; |
56 | 66 | ||
57 | if (end > PAGE_SIZE) | 67 | if (end > PAGE_SIZE) |
58 | end = PAGE_SIZE; | 68 | end = PAGE_SIZE; |
@@ -62,15 +72,17 @@ static void iomd_get_next_sg(struct scatterlist *sg, dma_t *dma) | |||
62 | 72 | ||
63 | sg->length = end - TRANSFER_SIZE; | 73 | sg->length = end - TRANSFER_SIZE; |
64 | 74 | ||
65 | dma->sg->length -= end - offset; | 75 | idma->dma_len -= end - offset; |
66 | dma->sg->dma_address += end - offset; | 76 | idma->dma_addr += end - offset; |
67 | 77 | ||
68 | if (dma->sg->length == 0) { | 78 | if (idma->dma_len == 0) { |
69 | if (dma->sgcount > 1) { | 79 | if (idma->dma.sgcount > 1) { |
70 | dma->sg++; | 80 | idma->dma.sg = sg_next(idma->dma.sg); |
71 | dma->sgcount--; | 81 | idma->dma_addr = idma->dma.sg->dma_address; |
82 | idma->dma_len = idma->dma.sg->length; | ||
83 | idma->dma.sgcount--; | ||
72 | } else { | 84 | } else { |
73 | dma->sg = NULL; | 85 | idma->dma.sg = NULL; |
74 | flags |= DMA_END_S; | 86 | flags |= DMA_END_S; |
75 | } | 87 | } |
76 | } | 88 | } |
@@ -85,8 +97,8 @@ static void iomd_get_next_sg(struct scatterlist *sg, dma_t *dma) | |||
85 | 97 | ||
86 | static irqreturn_t iomd_dma_handle(int irq, void *dev_id) | 98 | static irqreturn_t iomd_dma_handle(int irq, void *dev_id) |
87 | { | 99 | { |
88 | dma_t *dma = (dma_t *)dev_id; | 100 | struct iomd_dma *idma = dev_id; |
89 | unsigned long base = dma->dma_base; | 101 | unsigned long base = idma->base; |
90 | 102 | ||
91 | do { | 103 | do { |
92 | unsigned int status; | 104 | unsigned int status; |
@@ -95,93 +107,99 @@ static irqreturn_t iomd_dma_handle(int irq, void *dev_id) | |||
95 | if (!(status & DMA_ST_INT)) | 107 | if (!(status & DMA_ST_INT)) |
96 | return IRQ_HANDLED; | 108 | return IRQ_HANDLED; |
97 | 109 | ||
98 | if ((dma->state ^ status) & DMA_ST_AB) | 110 | if ((idma->state ^ status) & DMA_ST_AB) |
99 | iomd_get_next_sg(&dma->cur_sg, dma); | 111 | iomd_get_next_sg(&idma->cur_sg, idma); |
100 | 112 | ||
101 | switch (status & (DMA_ST_OFL | DMA_ST_AB)) { | 113 | switch (status & (DMA_ST_OFL | DMA_ST_AB)) { |
102 | case DMA_ST_OFL: /* OIA */ | 114 | case DMA_ST_OFL: /* OIA */ |
103 | case DMA_ST_AB: /* .IB */ | 115 | case DMA_ST_AB: /* .IB */ |
104 | iomd_writel(dma->cur_sg.dma_address, base + CURA); | 116 | iomd_writel(idma->cur_sg.dma_address, base + CURA); |
105 | iomd_writel(dma->cur_sg.length, base + ENDA); | 117 | iomd_writel(idma->cur_sg.length, base + ENDA); |
106 | dma->state = DMA_ST_AB; | 118 | idma->state = DMA_ST_AB; |
107 | break; | 119 | break; |
108 | 120 | ||
109 | case DMA_ST_OFL | DMA_ST_AB: /* OIB */ | 121 | case DMA_ST_OFL | DMA_ST_AB: /* OIB */ |
110 | case 0: /* .IA */ | 122 | case 0: /* .IA */ |
111 | iomd_writel(dma->cur_sg.dma_address, base + CURB); | 123 | iomd_writel(idma->cur_sg.dma_address, base + CURB); |
112 | iomd_writel(dma->cur_sg.length, base + ENDB); | 124 | iomd_writel(idma->cur_sg.length, base + ENDB); |
113 | dma->state = 0; | 125 | idma->state = 0; |
114 | break; | 126 | break; |
115 | } | 127 | } |
116 | 128 | ||
117 | if (status & DMA_ST_OFL && | 129 | if (status & DMA_ST_OFL && |
118 | dma->cur_sg.length == (DMA_END_S|DMA_END_L)) | 130 | idma->cur_sg.length == (DMA_END_S|DMA_END_L)) |
119 | break; | 131 | break; |
120 | } while (1); | 132 | } while (1); |
121 | 133 | ||
122 | dma->state = ~DMA_ST_AB; | 134 | idma->state = ~DMA_ST_AB; |
123 | disable_irq(irq); | 135 | disable_irq(irq); |
124 | 136 | ||
125 | return IRQ_HANDLED; | 137 | return IRQ_HANDLED; |
126 | } | 138 | } |
127 | 139 | ||
128 | static int iomd_request_dma(dmach_t channel, dma_t *dma) | 140 | static int iomd_request_dma(unsigned int chan, dma_t *dma) |
129 | { | 141 | { |
130 | return request_irq(dma->dma_irq, iomd_dma_handle, | 142 | struct iomd_dma *idma = container_of(dma, struct iomd_dma, dma); |
131 | IRQF_DISABLED, dma->device_id, dma); | 143 | |
144 | return request_irq(idma->irq, iomd_dma_handle, | ||
145 | IRQF_DISABLED, idma->dma.device_id, idma); | ||
132 | } | 146 | } |
133 | 147 | ||
134 | static void iomd_free_dma(dmach_t channel, dma_t *dma) | 148 | static void iomd_free_dma(unsigned int chan, dma_t *dma) |
135 | { | 149 | { |
136 | free_irq(dma->dma_irq, dma); | 150 | struct iomd_dma *idma = container_of(dma, struct iomd_dma, dma); |
151 | |||
152 | free_irq(idma->irq, idma); | ||
137 | } | 153 | } |
138 | 154 | ||
139 | static void iomd_enable_dma(dmach_t channel, dma_t *dma) | 155 | static void iomd_enable_dma(unsigned int chan, dma_t *dma) |
140 | { | 156 | { |
141 | unsigned long dma_base = dma->dma_base; | 157 | struct iomd_dma *idma = container_of(dma, struct iomd_dma, dma); |
158 | unsigned long dma_base = idma->base; | ||
142 | unsigned int ctrl = TRANSFER_SIZE | DMA_CR_E; | 159 | unsigned int ctrl = TRANSFER_SIZE | DMA_CR_E; |
143 | 160 | ||
144 | if (dma->invalid) { | 161 | if (idma->dma.invalid) { |
145 | dma->invalid = 0; | 162 | idma->dma.invalid = 0; |
146 | 163 | ||
147 | /* | 164 | /* |
148 | * Cope with ISA-style drivers which expect cache | 165 | * Cope with ISA-style drivers which expect cache |
149 | * coherence. | 166 | * coherence. |
150 | */ | 167 | */ |
151 | if (!dma->sg) { | 168 | if (!idma->dma.sg) { |
152 | dma->sg = &dma->buf; | 169 | idma->dma.sg = &idma->dma.buf; |
153 | dma->sgcount = 1; | 170 | idma->dma.sgcount = 1; |
154 | dma->buf.length = dma->count; | 171 | idma->dma.buf.length = idma->dma.count; |
155 | dma->buf.dma_address = dma_map_single(NULL, | 172 | idma->dma.buf.dma_address = dma_map_single(NULL, |
156 | dma->addr, dma->count, | 173 | idma->dma.addr, idma->dma.count, |
157 | dma->dma_mode == DMA_MODE_READ ? | 174 | idma->dma.dma_mode == DMA_MODE_READ ? |
158 | DMA_FROM_DEVICE : DMA_TO_DEVICE); | 175 | DMA_FROM_DEVICE : DMA_TO_DEVICE); |
159 | } | 176 | } |
160 | 177 | ||
161 | iomd_writeb(DMA_CR_C, dma_base + CR); | 178 | iomd_writeb(DMA_CR_C, dma_base + CR); |
162 | dma->state = DMA_ST_AB; | 179 | idma->state = DMA_ST_AB; |
163 | } | 180 | } |
164 | 181 | ||
165 | if (dma->dma_mode == DMA_MODE_READ) | 182 | if (idma->dma.dma_mode == DMA_MODE_READ) |
166 | ctrl |= DMA_CR_D; | 183 | ctrl |= DMA_CR_D; |
167 | 184 | ||
168 | iomd_writeb(ctrl, dma_base + CR); | 185 | iomd_writeb(ctrl, dma_base + CR); |
169 | enable_irq(dma->dma_irq); | 186 | enable_irq(idma->irq); |
170 | } | 187 | } |
171 | 188 | ||
172 | static void iomd_disable_dma(dmach_t channel, dma_t *dma) | 189 | static void iomd_disable_dma(unsigned int chan, dma_t *dma) |
173 | { | 190 | { |
174 | unsigned long dma_base = dma->dma_base; | 191 | struct iomd_dma *idma = container_of(dma, struct iomd_dma, dma); |
192 | unsigned long dma_base = idma->base; | ||
175 | unsigned long flags; | 193 | unsigned long flags; |
176 | 194 | ||
177 | local_irq_save(flags); | 195 | local_irq_save(flags); |
178 | if (dma->state != ~DMA_ST_AB) | 196 | if (idma->state != ~DMA_ST_AB) |
179 | disable_irq(dma->dma_irq); | 197 | disable_irq(idma->irq); |
180 | iomd_writeb(0, dma_base + CR); | 198 | iomd_writeb(0, dma_base + CR); |
181 | local_irq_restore(flags); | 199 | local_irq_restore(flags); |
182 | } | 200 | } |
183 | 201 | ||
184 | static int iomd_set_dma_speed(dmach_t channel, dma_t *dma, int cycle) | 202 | static int iomd_set_dma_speed(unsigned int chan, dma_t *dma, int cycle) |
185 | { | 203 | { |
186 | int tcr, speed; | 204 | int tcr, speed; |
187 | 205 | ||
@@ -197,7 +215,7 @@ static int iomd_set_dma_speed(dmach_t channel, dma_t *dma, int cycle) | |||
197 | tcr = iomd_readb(IOMD_DMATCR); | 215 | tcr = iomd_readb(IOMD_DMATCR); |
198 | speed &= 3; | 216 | speed &= 3; |
199 | 217 | ||
200 | switch (channel) { | 218 | switch (chan) { |
201 | case DMA_0: | 219 | case DMA_0: |
202 | tcr = (tcr & ~0x03) | speed; | 220 | tcr = (tcr & ~0x03) | speed; |
203 | break; | 221 | break; |
@@ -236,16 +254,22 @@ static struct fiq_handler fh = { | |||
236 | .name = "floppydma" | 254 | .name = "floppydma" |
237 | }; | 255 | }; |
238 | 256 | ||
239 | static void floppy_enable_dma(dmach_t channel, dma_t *dma) | 257 | struct floppy_dma { |
258 | struct dma_struct dma; | ||
259 | unsigned int fiq; | ||
260 | }; | ||
261 | |||
262 | static void floppy_enable_dma(unsigned int chan, dma_t *dma) | ||
240 | { | 263 | { |
264 | struct floppy_dma *fdma = container_of(dma, struct floppy_dma, dma); | ||
241 | void *fiqhandler_start; | 265 | void *fiqhandler_start; |
242 | unsigned int fiqhandler_length; | 266 | unsigned int fiqhandler_length; |
243 | struct pt_regs regs; | 267 | struct pt_regs regs; |
244 | 268 | ||
245 | if (dma->sg) | 269 | if (fdma->dma.sg) |
246 | BUG(); | 270 | BUG(); |
247 | 271 | ||
248 | if (dma->dma_mode == DMA_MODE_READ) { | 272 | if (fdma->dma.dma_mode == DMA_MODE_READ) { |
249 | extern unsigned char floppy_fiqin_start, floppy_fiqin_end; | 273 | extern unsigned char floppy_fiqin_start, floppy_fiqin_end; |
250 | fiqhandler_start = &floppy_fiqin_start; | 274 | fiqhandler_start = &floppy_fiqin_start; |
251 | fiqhandler_length = &floppy_fiqin_end - &floppy_fiqin_start; | 275 | fiqhandler_length = &floppy_fiqin_end - &floppy_fiqin_start; |
@@ -255,8 +279,8 @@ static void floppy_enable_dma(dmach_t channel, dma_t *dma) | |||
255 | fiqhandler_length = &floppy_fiqout_end - &floppy_fiqout_start; | 279 | fiqhandler_length = &floppy_fiqout_end - &floppy_fiqout_start; |
256 | } | 280 | } |
257 | 281 | ||
258 | regs.ARM_r9 = dma->count; | 282 | regs.ARM_r9 = fdma->dma.count; |
259 | regs.ARM_r10 = (unsigned long)dma->addr; | 283 | regs.ARM_r10 = (unsigned long)fdma->dma.addr; |
260 | regs.ARM_fp = (unsigned long)FLOPPYDMA_BASE; | 284 | regs.ARM_fp = (unsigned long)FLOPPYDMA_BASE; |
261 | 285 | ||
262 | if (claim_fiq(&fh)) { | 286 | if (claim_fiq(&fh)) { |
@@ -266,16 +290,17 @@ static void floppy_enable_dma(dmach_t channel, dma_t *dma) | |||
266 | 290 | ||
267 | set_fiq_handler(fiqhandler_start, fiqhandler_length); | 291 | set_fiq_handler(fiqhandler_start, fiqhandler_length); |
268 | set_fiq_regs(®s); | 292 | set_fiq_regs(®s); |
269 | enable_fiq(dma->dma_irq); | 293 | enable_fiq(fdma->fiq); |
270 | } | 294 | } |
271 | 295 | ||
272 | static void floppy_disable_dma(dmach_t channel, dma_t *dma) | 296 | static void floppy_disable_dma(unsigned int chan, dma_t *dma) |
273 | { | 297 | { |
274 | disable_fiq(dma->dma_irq); | 298 | struct floppy_dma *fdma = container_of(dma, struct floppy_dma, dma); |
299 | disable_fiq(fdma->fiq); | ||
275 | release_fiq(&fh); | 300 | release_fiq(&fh); |
276 | } | 301 | } |
277 | 302 | ||
278 | static int floppy_get_residue(dmach_t channel, dma_t *dma) | 303 | static int floppy_get_residue(unsigned int chan, dma_t *dma) |
279 | { | 304 | { |
280 | struct pt_regs regs; | 305 | struct pt_regs regs; |
281 | get_fiq_regs(®s); | 306 | get_fiq_regs(®s); |
@@ -292,7 +317,7 @@ static struct dma_ops floppy_dma_ops = { | |||
292 | /* | 317 | /* |
293 | * This is virtual DMA - we don't need anything here. | 318 | * This is virtual DMA - we don't need anything here. |
294 | */ | 319 | */ |
295 | static void sound_enable_disable_dma(dmach_t channel, dma_t *dma) | 320 | static void sound_enable_disable_dma(unsigned int chan, dma_t *dma) |
296 | { | 321 | { |
297 | } | 322 | } |
298 | 323 | ||
@@ -302,8 +327,24 @@ static struct dma_ops sound_dma_ops = { | |||
302 | .disable = sound_enable_disable_dma, | 327 | .disable = sound_enable_disable_dma, |
303 | }; | 328 | }; |
304 | 329 | ||
305 | void __init arch_dma_init(dma_t *dma) | 330 | static struct iomd_dma iomd_dma[6]; |
331 | |||
332 | static struct floppy_dma floppy_dma = { | ||
333 | .dma = { | ||
334 | .d_ops = &floppy_dma_ops, | ||
335 | }, | ||
336 | .fiq = FIQ_FLOPPYDATA, | ||
337 | }; | ||
338 | |||
339 | static dma_t sound_dma = { | ||
340 | .d_ops = &sound_dma_ops, | ||
341 | }; | ||
342 | |||
343 | static int __init rpc_dma_init(void) | ||
306 | { | 344 | { |
345 | unsigned int i; | ||
346 | int ret; | ||
347 | |||
307 | iomd_writeb(0, IOMD_IO0CR); | 348 | iomd_writeb(0, IOMD_IO0CR); |
308 | iomd_writeb(0, IOMD_IO1CR); | 349 | iomd_writeb(0, IOMD_IO1CR); |
309 | iomd_writeb(0, IOMD_IO2CR); | 350 | iomd_writeb(0, IOMD_IO2CR); |
@@ -311,31 +352,39 @@ void __init arch_dma_init(dma_t *dma) | |||
311 | 352 | ||
312 | iomd_writeb(0xa0, IOMD_DMATCR); | 353 | iomd_writeb(0xa0, IOMD_DMATCR); |
313 | 354 | ||
314 | dma[DMA_0].dma_base = IOMD_IO0CURA; | ||
315 | dma[DMA_0].dma_irq = IRQ_DMA0; | ||
316 | dma[DMA_0].d_ops = &iomd_dma_ops; | ||
317 | dma[DMA_1].dma_base = IOMD_IO1CURA; | ||
318 | dma[DMA_1].dma_irq = IRQ_DMA1; | ||
319 | dma[DMA_1].d_ops = &iomd_dma_ops; | ||
320 | dma[DMA_2].dma_base = IOMD_IO2CURA; | ||
321 | dma[DMA_2].dma_irq = IRQ_DMA2; | ||
322 | dma[DMA_2].d_ops = &iomd_dma_ops; | ||
323 | dma[DMA_3].dma_base = IOMD_IO3CURA; | ||
324 | dma[DMA_3].dma_irq = IRQ_DMA3; | ||
325 | dma[DMA_3].d_ops = &iomd_dma_ops; | ||
326 | dma[DMA_S0].dma_base = IOMD_SD0CURA; | ||
327 | dma[DMA_S0].dma_irq = IRQ_DMAS0; | ||
328 | dma[DMA_S0].d_ops = &iomd_dma_ops; | ||
329 | dma[DMA_S1].dma_base = IOMD_SD1CURA; | ||
330 | dma[DMA_S1].dma_irq = IRQ_DMAS1; | ||
331 | dma[DMA_S1].d_ops = &iomd_dma_ops; | ||
332 | dma[DMA_VIRTUAL_FLOPPY].dma_irq = FIQ_FLOPPYDATA; | ||
333 | dma[DMA_VIRTUAL_FLOPPY].d_ops = &floppy_dma_ops; | ||
334 | dma[DMA_VIRTUAL_SOUND].d_ops = &sound_dma_ops; | ||
335 | |||
336 | /* | 355 | /* |
337 | * Setup DMA channels 2,3 to be for podules | 356 | * Setup DMA channels 2,3 to be for podules |
338 | * and channels 0,1 for internal devices | 357 | * and channels 0,1 for internal devices |
339 | */ | 358 | */ |
340 | iomd_writeb(DMA_EXT_IO3|DMA_EXT_IO2, IOMD_DMAEXT); | 359 | iomd_writeb(DMA_EXT_IO3|DMA_EXT_IO2, IOMD_DMAEXT); |
360 | |||
361 | iomd_dma[DMA_0].base = IOMD_IO0CURA; | ||
362 | iomd_dma[DMA_0].irq = IRQ_DMA0; | ||
363 | iomd_dma[DMA_1].base = IOMD_IO1CURA; | ||
364 | iomd_dma[DMA_1].irq = IRQ_DMA1; | ||
365 | iomd_dma[DMA_2].base = IOMD_IO2CURA; | ||
366 | iomd_dma[DMA_2].irq = IRQ_DMA2; | ||
367 | iomd_dma[DMA_3].base = IOMD_IO3CURA; | ||
368 | iomd_dma[DMA_3].irq = IRQ_DMA3; | ||
369 | iomd_dma[DMA_S0].base = IOMD_SD0CURA; | ||
370 | iomd_dma[DMA_S0].irq = IRQ_DMAS0; | ||
371 | iomd_dma[DMA_S1].base = IOMD_SD1CURA; | ||
372 | iomd_dma[DMA_S1].irq = IRQ_DMAS1; | ||
373 | |||
374 | for (i = DMA_0; i <= DMA_S1; i++) { | ||
375 | iomd_dma[i].dma.d_ops = &iomd_dma_ops; | ||
376 | |||
377 | ret = isa_dma_add(i, &iomd_dma[i].dma); | ||
378 | if (ret) | ||
379 | printk("IOMDDMA%u: unable to register: %d\n", i, ret); | ||
380 | } | ||
381 | |||
382 | ret = isa_dma_add(DMA_VIRTUAL_FLOPPY, &floppy_dma.dma); | ||
383 | if (ret) | ||
384 | printk("IOMDFLOPPY: unable to register: %d\n", ret); | ||
385 | ret = isa_dma_add(DMA_VIRTUAL_SOUND, &sound_dma); | ||
386 | if (ret) | ||
387 | printk("IOMDSOUND: unable to register: %d\n", ret); | ||
388 | return 0; | ||
341 | } | 389 | } |
390 | core_initcall(rpc_dma_init); | ||
diff --git a/arch/arm/mach-rpc/include/mach/isa-dma.h b/arch/arm/mach-rpc/include/mach/isa-dma.h index bad720548587..67bfc6719c34 100644 --- a/arch/arm/mach-rpc/include/mach/isa-dma.h +++ b/arch/arm/mach-rpc/include/mach/isa-dma.h | |||
@@ -23,5 +23,7 @@ | |||
23 | 23 | ||
24 | #define DMA_FLOPPY DMA_VIRTUAL_FLOPPY | 24 | #define DMA_FLOPPY DMA_VIRTUAL_FLOPPY |
25 | 25 | ||
26 | #define IOMD_DMA_BOUNDARY (PAGE_SIZE - 1) | ||
27 | |||
26 | #endif /* _ASM_ARCH_DMA_H */ | 28 | #endif /* _ASM_ARCH_DMA_H */ |
27 | 29 | ||
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig index f99d9013905f..bfc38e315187 100644 --- a/arch/arm/mach-sa1100/Kconfig +++ b/arch/arm/mach-sa1100/Kconfig | |||
@@ -71,19 +71,9 @@ config SA1100_H3600 | |||
71 | <http://www.handhelds.org/Compaq/index.html#iPAQ_H3600> | 71 | <http://www.handhelds.org/Compaq/index.html#iPAQ_H3600> |
72 | <http://www.compaq.com/products/handhelds/pocketpc/> | 72 | <http://www.compaq.com/products/handhelds/pocketpc/> |
73 | 73 | ||
74 | config SA1100_H3800 | ||
75 | bool "Compaq iPAQ H3800" | ||
76 | help | ||
77 | Say Y here if you intend to run this kernel on the Compaq iPAQ H3800 | ||
78 | series handheld computer. Information about this machine and the | ||
79 | Linux port to this machine can be found at: | ||
80 | |||
81 | <http://www.handhelds.org/Compaq/index.html#iPAQ_H3800> | ||
82 | <http://www.compaq.com/products/handhelds/pocketpc/> | ||
83 | |||
84 | config SA1100_H3XXX | 74 | config SA1100_H3XXX |
85 | bool | 75 | bool |
86 | depends on SA1100_H3100 || SA1100_H3600 || SA1100_H3800 | 76 | depends on SA1100_H3100 || SA1100_H3600 |
87 | default y | 77 | default y |
88 | 78 | ||
89 | config SA1100_BADGE4 | 79 | config SA1100_BADGE4 |
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index af25a78d705d..b9aaa45c6ca4 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
@@ -42,14 +42,7 @@ | |||
42 | #include <asm/mach/serial_sa1100.h> | 42 | #include <asm/mach/serial_sa1100.h> |
43 | 43 | ||
44 | #include <mach/h3600.h> | 44 | #include <mach/h3600.h> |
45 | |||
46 | #if defined (CONFIG_SA1100_H3600) || defined (CONFIG_SA1100_H3100) | ||
47 | #include <mach/h3600_gpio.h> | 45 | #include <mach/h3600_gpio.h> |
48 | #endif | ||
49 | |||
50 | #ifdef CONFIG_SA1100_H3800 | ||
51 | #include <mach/h3600_asic.h> | ||
52 | #endif | ||
53 | 46 | ||
54 | #include "generic.h" | 47 | #include "generic.h" |
55 | 48 | ||
@@ -519,388 +512,3 @@ MACHINE_END | |||
519 | 512 | ||
520 | #endif /* CONFIG_SA1100_H3600 */ | 513 | #endif /* CONFIG_SA1100_H3600 */ |
521 | 514 | ||
522 | #ifdef CONFIG_SA1100_H3800 | ||
523 | |||
524 | #define SET_ASIC1(x) \ | ||
525 | do {if (setp) { H3800_ASIC1_GPIO_OUT |= (x); } else { H3800_ASIC1_GPIO_OUT &= ~(x); }} while(0) | ||
526 | |||
527 | #define SET_ASIC2(x) \ | ||
528 | do {if (setp) { H3800_ASIC2_GPIOPIOD |= (x); } else { H3800_ASIC2_GPIOPIOD &= ~(x); }} while(0) | ||
529 | |||
530 | #define CLEAR_ASIC1(x) \ | ||
531 | do {if (setp) { H3800_ASIC1_GPIO_OUT &= ~(x); } else { H3800_ASIC1_GPIO_OUT |= (x); }} while(0) | ||
532 | |||
533 | #define CLEAR_ASIC2(x) \ | ||
534 | do {if (setp) { H3800_ASIC2_GPIOPIOD &= ~(x); } else { H3800_ASIC2_GPIOPIOD |= (x); }} while(0) | ||
535 | |||
536 | |||
537 | /* | ||
538 | On screen enable, we get | ||
539 | |||
540 | h3800_video_power_on(1) | ||
541 | LCD controller starts | ||
542 | h3800_video_lcd_enable(1) | ||
543 | |||
544 | On screen disable, we get | ||
545 | |||
546 | h3800_video_lcd_enable(0) | ||
547 | LCD controller stops | ||
548 | h3800_video_power_on(0) | ||
549 | */ | ||
550 | |||
551 | |||
552 | static void h3800_video_power_on(int setp) | ||
553 | { | ||
554 | if (setp) { | ||
555 | H3800_ASIC1_GPIO_OUT |= GPIO1_LCD_ON; | ||
556 | msleep(30); | ||
557 | H3800_ASIC1_GPIO_OUT |= GPIO1_VGL_ON; | ||
558 | msleep(5); | ||
559 | H3800_ASIC1_GPIO_OUT |= GPIO1_VGH_ON; | ||
560 | msleep(50); | ||
561 | H3800_ASIC1_GPIO_OUT |= GPIO1_LCD_5V_ON; | ||
562 | msleep(5); | ||
563 | } else { | ||
564 | msleep(5); | ||
565 | H3800_ASIC1_GPIO_OUT &= ~GPIO1_LCD_5V_ON; | ||
566 | msleep(50); | ||
567 | H3800_ASIC1_GPIO_OUT &= ~GPIO1_VGL_ON; | ||
568 | msleep(5); | ||
569 | H3800_ASIC1_GPIO_OUT &= ~GPIO1_VGH_ON; | ||
570 | msleep(100); | ||
571 | H3800_ASIC1_GPIO_OUT &= ~GPIO1_LCD_ON; | ||
572 | } | ||
573 | } | ||
574 | |||
575 | static void h3800_video_lcd_enable(int setp) | ||
576 | { | ||
577 | if (setp) { | ||
578 | msleep(17); // Wait one from before turning on | ||
579 | H3800_ASIC1_GPIO_OUT |= GPIO1_LCD_PCI; | ||
580 | } else { | ||
581 | H3800_ASIC1_GPIO_OUT &= ~GPIO1_LCD_PCI; | ||
582 | msleep(30); // Wait before turning off | ||
583 | } | ||
584 | } | ||
585 | |||
586 | |||
587 | static void h3800_control_egpio(enum ipaq_egpio_type x, int setp) | ||
588 | { | ||
589 | switch (x) { | ||
590 | case IPAQ_EGPIO_LCD_POWER: | ||
591 | h3800_video_power_on(setp); | ||
592 | break; | ||
593 | case IPAQ_EGPIO_LCD_ENABLE: | ||
594 | h3800_video_lcd_enable(setp); | ||
595 | break; | ||
596 | case IPAQ_EGPIO_CODEC_NRESET: | ||
597 | case IPAQ_EGPIO_AUDIO_ON: | ||
598 | case IPAQ_EGPIO_QMUTE: | ||
599 | printk("%s: error - should not be called\n", __func__); | ||
600 | break; | ||
601 | case IPAQ_EGPIO_OPT_NVRAM_ON: | ||
602 | SET_ASIC2(GPIO2_OPT_ON_NVRAM); | ||
603 | break; | ||
604 | case IPAQ_EGPIO_OPT_ON: | ||
605 | SET_ASIC2(GPIO2_OPT_ON); | ||
606 | break; | ||
607 | case IPAQ_EGPIO_CARD_RESET: | ||
608 | SET_ASIC2(GPIO2_OPT_PCM_RESET); | ||
609 | break; | ||
610 | case IPAQ_EGPIO_OPT_RESET: | ||
611 | SET_ASIC2(GPIO2_OPT_RESET); | ||
612 | break; | ||
613 | case IPAQ_EGPIO_IR_ON: | ||
614 | CLEAR_ASIC1(GPIO1_IR_ON_N); | ||
615 | break; | ||
616 | case IPAQ_EGPIO_IR_FSEL: | ||
617 | break; | ||
618 | case IPAQ_EGPIO_RS232_ON: | ||
619 | SET_ASIC1(GPIO1_RS232_ON); | ||
620 | break; | ||
621 | case IPAQ_EGPIO_VPP_ON: | ||
622 | H3800_ASIC2_FlashWP_VPP_ON = setp; | ||
623 | break; | ||
624 | } | ||
625 | } | ||
626 | |||
627 | static unsigned long h3800_read_egpio(void) | ||
628 | { | ||
629 | return H3800_ASIC1_GPIO_OUT | (H3800_ASIC2_GPIOPIOD << 16); | ||
630 | } | ||
631 | |||
632 | /* We need to fix ASIC2 GPIO over suspend/resume. At the moment, | ||
633 | it doesn't appear that ASIC1 GPIO has the same problem */ | ||
634 | |||
635 | static int h3800_pm_callback(int req) | ||
636 | { | ||
637 | static u16 asic1_data; | ||
638 | static u16 asic2_data; | ||
639 | int result = 0; | ||
640 | |||
641 | printk("%s %d\n", __func__, req); | ||
642 | |||
643 | switch (req) { | ||
644 | case PM_RESUME: | ||
645 | MSC2 = (MSC2 & 0x0000ffff) | 0xE4510000; /* Set MSC2 correctly */ | ||
646 | |||
647 | H3800_ASIC2_GPIOPIOD = asic2_data; | ||
648 | H3800_ASIC2_GPIODIR = GPIO2_PEN_IRQ | ||
649 | | GPIO2_SD_DETECT | ||
650 | | GPIO2_EAR_IN_N | ||
651 | | GPIO2_USB_DETECT_N | ||
652 | | GPIO2_SD_CON_SLT; | ||
653 | |||
654 | H3800_ASIC1_GPIO_OUT = asic1_data; | ||
655 | |||
656 | if (ipaq_model_ops.pm_callback_aux) | ||
657 | result = ipaq_model_ops.pm_callback_aux(req); | ||
658 | break; | ||
659 | |||
660 | case PM_SUSPEND: | ||
661 | if (ipaq_model_ops.pm_callback_aux && | ||
662 | ((result = ipaq_model_ops.pm_callback_aux(req)) != 0)) | ||
663 | return result; | ||
664 | |||
665 | asic1_data = H3800_ASIC1_GPIO_OUT; | ||
666 | asic2_data = H3800_ASIC2_GPIOPIOD; | ||
667 | break; | ||
668 | default: | ||
669 | printk("%s: unrecognized PM callback\n", __func__); | ||
670 | break; | ||
671 | } | ||
672 | return result; | ||
673 | } | ||
674 | |||
675 | static struct ipaq_model_ops h3800_model_ops __initdata = { | ||
676 | .generic_name = "3800", | ||
677 | .control = h3800_control_egpio, | ||
678 | .read = h3800_read_egpio, | ||
679 | .pm_callback = h3800_pm_callback | ||
680 | }; | ||
681 | |||
682 | #define MAX_ASIC_ISR_LOOPS 20 | ||
683 | |||
684 | /* The order of these is important - see #include <mach/irqs.h> */ | ||
685 | static u32 kpio_irq_mask[] = { | ||
686 | KPIO_KEY_ALL, | ||
687 | KPIO_SPI_INT, | ||
688 | KPIO_OWM_INT, | ||
689 | KPIO_ADC_INT, | ||
690 | KPIO_UART_0_INT, | ||
691 | KPIO_UART_1_INT, | ||
692 | KPIO_TIMER_0_INT, | ||
693 | KPIO_TIMER_1_INT, | ||
694 | KPIO_TIMER_2_INT | ||
695 | }; | ||
696 | |||
697 | static u32 gpio_irq_mask[] = { | ||
698 | GPIO2_PEN_IRQ, | ||
699 | GPIO2_SD_DETECT, | ||
700 | GPIO2_EAR_IN_N, | ||
701 | GPIO2_USB_DETECT_N, | ||
702 | GPIO2_SD_CON_SLT, | ||
703 | }; | ||
704 | |||
705 | static void h3800_IRQ_demux(unsigned int irq, struct irq_desc *desc) | ||
706 | { | ||
707 | int i; | ||
708 | |||
709 | if (0) printk("%s: interrupt received\n", __func__); | ||
710 | |||
711 | desc->chip->ack(irq); | ||
712 | |||
713 | for (i = 0; i < MAX_ASIC_ISR_LOOPS && (GPLR & GPIO_H3800_ASIC); i++) { | ||
714 | u32 irq; | ||
715 | int j; | ||
716 | |||
717 | /* KPIO */ | ||
718 | irq = H3800_ASIC2_KPIINTFLAG; | ||
719 | if (0) printk("%s KPIO 0x%08X\n", __func__, irq); | ||
720 | for (j = 0; j < H3800_KPIO_IRQ_COUNT; j++) | ||
721 | if (irq & kpio_irq_mask[j]) | ||
722 | handle_edge_irq(H3800_KPIO_IRQ_COUNT + j, irq_desc + H3800_KPIO_IRQ_COUNT + j); | ||
723 | |||
724 | /* GPIO2 */ | ||
725 | irq = H3800_ASIC2_GPIINTFLAG; | ||
726 | if (0) printk("%s GPIO 0x%08X\n", __func__, irq); | ||
727 | for (j = 0; j < H3800_GPIO_IRQ_COUNT; j++) | ||
728 | if (irq & gpio_irq_mask[j]) | ||
729 | handle_edge_irq(H3800_GPIO_IRQ_COUNT + j, irq_desc + H3800_GPIO_IRQ_COUNT + j); | ||
730 | } | ||
731 | |||
732 | if (i >= MAX_ASIC_ISR_LOOPS) | ||
733 | printk("%s: interrupt processing overrun\n", __func__); | ||
734 | |||
735 | /* For level-based interrupts */ | ||
736 | desc->chip->unmask(irq); | ||
737 | |||
738 | } | ||
739 | |||
740 | static struct irqaction h3800_irq = { | ||
741 | .name = "h3800_asic", | ||
742 | .handler = h3800_IRQ_demux, | ||
743 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, | ||
744 | }; | ||
745 | |||
746 | u32 kpio_int_shadow = 0; | ||
747 | |||
748 | |||
749 | /* mask_ack <- IRQ is first serviced. | ||
750 | mask <- IRQ is disabled. | ||
751 | unmask <- IRQ is enabled | ||
752 | |||
753 | The INTCLR registers are poorly documented. I believe that writing | ||
754 | a "1" to the register clears the specific interrupt, but the documentation | ||
755 | indicates writing a "0" clears the interrupt. In any case, they shouldn't | ||
756 | be read (that's the INTFLAG register) | ||
757 | */ | ||
758 | |||
759 | static void h3800_mask_ack_kpio_irq(unsigned int irq) | ||
760 | { | ||
761 | u32 mask = kpio_irq_mask[irq - H3800_KPIO_IRQ_START]; | ||
762 | kpio_int_shadow &= ~mask; | ||
763 | H3800_ASIC2_KPIINTSTAT = kpio_int_shadow; | ||
764 | H3800_ASIC2_KPIINTCLR = mask; | ||
765 | } | ||
766 | |||
767 | static void h3800_mask_kpio_irq(unsigned int irq) | ||
768 | { | ||
769 | u32 mask = kpio_irq_mask[irq - H3800_KPIO_IRQ_START]; | ||
770 | kpio_int_shadow &= ~mask; | ||
771 | H3800_ASIC2_KPIINTSTAT = kpio_int_shadow; | ||
772 | } | ||
773 | |||
774 | static void h3800_unmask_kpio_irq(unsigned int irq) | ||
775 | { | ||
776 | u32 mask = kpio_irq_mask[irq - H3800_KPIO_IRQ_START]; | ||
777 | kpio_int_shadow |= mask; | ||
778 | H3800_ASIC2_KPIINTSTAT = kpio_int_shadow; | ||
779 | } | ||
780 | |||
781 | static void h3800_mask_ack_gpio_irq(unsigned int irq) | ||
782 | { | ||
783 | u32 mask = gpio_irq_mask[irq - H3800_GPIO_IRQ_START]; | ||
784 | H3800_ASIC2_GPIINTSTAT &= ~mask; | ||
785 | H3800_ASIC2_GPIINTCLR = mask; | ||
786 | } | ||
787 | |||
788 | static void h3800_mask_gpio_irq(unsigned int irq) | ||
789 | { | ||
790 | u32 mask = gpio_irq_mask[irq - H3800_GPIO_IRQ_START]; | ||
791 | H3800_ASIC2_GPIINTSTAT &= ~mask; | ||
792 | } | ||
793 | |||
794 | static void h3800_unmask_gpio_irq(unsigned int irq) | ||
795 | { | ||
796 | u32 mask = gpio_irq_mask[irq - H3800_GPIO_IRQ_START]; | ||
797 | H3800_ASIC2_GPIINTSTAT |= mask; | ||
798 | } | ||
799 | |||
800 | static void __init h3800_init_irq(void) | ||
801 | { | ||
802 | int i; | ||
803 | |||
804 | /* Initialize standard IRQs */ | ||
805 | sa1100_init_irq(); | ||
806 | |||
807 | /* Disable all IRQs and set up clock */ | ||
808 | H3800_ASIC2_KPIINTSTAT = 0; /* Disable all interrupts */ | ||
809 | H3800_ASIC2_GPIINTSTAT = 0; | ||
810 | |||
811 | H3800_ASIC2_KPIINTCLR = 0; /* Clear all KPIO interrupts */ | ||
812 | H3800_ASIC2_GPIINTCLR = 0; /* Clear all GPIO interrupts */ | ||
813 | |||
814 | // H3800_ASIC2_KPIINTCLR = 0xffff; /* Clear all KPIO interrupts */ | ||
815 | // H3800_ASIC2_GPIINTCLR = 0xffff; /* Clear all GPIO interrupts */ | ||
816 | |||
817 | H3800_ASIC2_CLOCK_Enable |= ASIC2_CLOCK_EX0; /* 32 kHZ crystal on */ | ||
818 | H3800_ASIC2_INTR_ClockPrescale |= ASIC2_INTCPS_SET; | ||
819 | H3800_ASIC2_INTR_ClockPrescale = ASIC2_INTCPS_CPS(0x0e) | ASIC2_INTCPS_SET; | ||
820 | H3800_ASIC2_INTR_TimerSet = 1; | ||
821 | |||
822 | #if 0 | ||
823 | for (i = 0; i < H3800_KPIO_IRQ_COUNT; i++) { | ||
824 | int irq = i + H3800_KPIO_IRQ_START; | ||
825 | irq_desc[irq].valid = 1; | ||
826 | irq_desc[irq].probe_ok = 1; | ||
827 | set_irq_chip(irq, &h3800_kpio_irqchip); | ||
828 | } | ||
829 | |||
830 | for (i = 0; i < H3800_GPIO_IRQ_COUNT; i++) { | ||
831 | int irq = i + H3800_GPIO_IRQ_START; | ||
832 | irq_desc[irq].valid = 1; | ||
833 | irq_desc[irq].probe_ok = 1; | ||
834 | set_irq_chip(irq, &h3800_gpio_irqchip); | ||
835 | } | ||
836 | #endif | ||
837 | set_irq_type(IRQ_GPIO_H3800_ASIC, IRQ_TYPE_EDGE_RISING); | ||
838 | set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux); | ||
839 | } | ||
840 | |||
841 | |||
842 | #define ASIC1_OUTPUTS 0x7fff /* First 15 bits are used */ | ||
843 | |||
844 | static void __init h3800_map_io(void) | ||
845 | { | ||
846 | h3xxx_map_io(); | ||
847 | |||
848 | /* Add wakeup on AC plug/unplug */ | ||
849 | PWER |= PWER_GPIO12; | ||
850 | |||
851 | /* Initialize h3800-specific values here */ | ||
852 | GPCR = 0x0fffffff; /* All outputs are set low by default */ | ||
853 | GAFR = GPIO_H3800_CLK_OUT | | ||
854 | GPIO_LDD15 | GPIO_LDD14 | GPIO_LDD13 | GPIO_LDD12 | | ||
855 | GPIO_LDD11 | GPIO_LDD10 | GPIO_LDD9 | GPIO_LDD8; | ||
856 | GPDR = GPIO_H3800_CLK_OUT | | ||
857 | GPIO_H3600_COM_RTS | GPIO_H3600_L3_CLOCK | | ||
858 | GPIO_H3600_L3_MODE | GPIO_H3600_L3_DATA | | ||
859 | GPIO_LDD15 | GPIO_LDD14 | GPIO_LDD13 | GPIO_LDD12 | | ||
860 | GPIO_LDD11 | GPIO_LDD10 | GPIO_LDD9 | GPIO_LDD8; | ||
861 | TUCR = TUCR_3_6864MHz; /* Seems to be used only for the Bluetooth UART */ | ||
862 | |||
863 | /* Fix the memory bus */ | ||
864 | MSC2 = (MSC2 & 0x0000ffff) | 0xE4510000; | ||
865 | |||
866 | /* Set up ASIC #1 */ | ||
867 | H3800_ASIC1_GPIO_DIR = ASIC1_OUTPUTS; /* All outputs */ | ||
868 | H3800_ASIC1_GPIO_MASK = ASIC1_OUTPUTS; /* No interrupts */ | ||
869 | H3800_ASIC1_GPIO_SLEEP_MASK = ASIC1_OUTPUTS; | ||
870 | H3800_ASIC1_GPIO_SLEEP_DIR = ASIC1_OUTPUTS; | ||
871 | H3800_ASIC1_GPIO_SLEEP_OUT = GPIO1_EAR_ON_N; | ||
872 | H3800_ASIC1_GPIO_BATT_FAULT_DIR = ASIC1_OUTPUTS; | ||
873 | H3800_ASIC1_GPIO_BATT_FAULT_OUT = GPIO1_EAR_ON_N; | ||
874 | |||
875 | H3800_ASIC1_GPIO_OUT = GPIO1_IR_ON_N | ||
876 | | GPIO1_RS232_ON | ||
877 | | GPIO1_EAR_ON_N; | ||
878 | |||
879 | /* Set up ASIC #2 */ | ||
880 | H3800_ASIC2_GPIOPIOD = GPIO2_IN_Y1_N | GPIO2_IN_X1_N; | ||
881 | H3800_ASIC2_GPOBFSTAT = GPIO2_IN_Y1_N | GPIO2_IN_X1_N; | ||
882 | |||
883 | H3800_ASIC2_GPIODIR = GPIO2_PEN_IRQ | ||
884 | | GPIO2_SD_DETECT | ||
885 | | GPIO2_EAR_IN_N | ||
886 | | GPIO2_USB_DETECT_N | ||
887 | | GPIO2_SD_CON_SLT; | ||
888 | |||
889 | /* TODO : Set sleep states & battery fault states */ | ||
890 | |||
891 | /* Clear VPP Enable */ | ||
892 | H3800_ASIC2_FlashWP_VPP_ON = 0; | ||
893 | ipaq_model_ops = h3800_model_ops; | ||
894 | } | ||
895 | |||
896 | MACHINE_START(H3800, "Compaq iPAQ H3800") | ||
897 | .phys_io = 0x80000000, | ||
898 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, | ||
899 | .boot_params = 0xc0000100, | ||
900 | .map_io = h3800_map_io, | ||
901 | .init_irq = h3800_init_irq, | ||
902 | .timer = &sa1100_timer, | ||
903 | .init_machine = h3xxx_mach_init, | ||
904 | MACHINE_END | ||
905 | |||
906 | #endif /* CONFIG_SA1100_H3800 */ | ||
diff --git a/arch/arm/mach-sa1100/include/mach/h3600.h b/arch/arm/mach-sa1100/include/mach/h3600.h index 9cc47fddb335..e692ab3dd79f 100644 --- a/arch/arm/mach-sa1100/include/mach/h3600.h +++ b/arch/arm/mach-sa1100/include/mach/h3600.h | |||
@@ -29,7 +29,7 @@ typedef int __bitwise pm_request_t; | |||
29 | #define PM_RESUME ((__force pm_request_t) 2) /* enter D0 */ | 29 | #define PM_RESUME ((__force pm_request_t) 2) /* enter D0 */ |
30 | 30 | ||
31 | /* generalized support for H3xxx series Compaq Pocket PC's */ | 31 | /* generalized support for H3xxx series Compaq Pocket PC's */ |
32 | #define machine_is_h3xxx() (machine_is_h3100() || machine_is_h3600() || machine_is_h3800()) | 32 | #define machine_is_h3xxx() (machine_is_h3100() || machine_is_h3600()) |
33 | 33 | ||
34 | /* Physical memory regions corresponding to chip selects */ | 34 | /* Physical memory regions corresponding to chip selects */ |
35 | #define H3600_EGPIO_PHYS (SA1100_CS5_PHYS + 0x01000000) | 35 | #define H3600_EGPIO_PHYS (SA1100_CS5_PHYS + 0x01000000) |
diff --git a/arch/arm/mach-sa1100/include/mach/h3600_gpio.h b/arch/arm/mach-sa1100/include/mach/h3600_gpio.h index 62b0b7879685..a36ca76d018b 100644 --- a/arch/arm/mach-sa1100/include/mach/h3600_gpio.h +++ b/arch/arm/mach-sa1100/include/mach/h3600_gpio.h | |||
@@ -48,22 +48,11 @@ | |||
48 | #define GPIO_H3600_OPT_LOCK GPIO_GPIO (22) | 48 | #define GPIO_H3600_OPT_LOCK GPIO_GPIO (22) |
49 | #define GPIO_H3600_OPT_DET GPIO_GPIO (27) | 49 | #define GPIO_H3600_OPT_DET GPIO_GPIO (27) |
50 | 50 | ||
51 | /* H3800 specific pins */ | ||
52 | #define GPIO_H3800_AC_IN GPIO_GPIO (12) | ||
53 | #define GPIO_H3800_COM_DSR GPIO_GPIO (13) | ||
54 | #define GPIO_H3800_MMC_INT GPIO_GPIO (18) | ||
55 | #define GPIO_H3800_NOPT_IND GPIO_GPIO (20) /* Almost exactly the same as GPIO_H3600_OPT_DET */ | ||
56 | #define GPIO_H3800_OPT_BAT_FAULT GPIO_GPIO (22) | ||
57 | #define GPIO_H3800_CLK_OUT GPIO_GPIO (27) | ||
58 | |||
59 | /****************************************************/ | 51 | /****************************************************/ |
60 | 52 | ||
61 | #define IRQ_GPIO_H3600_ACTION_BUTTON IRQ_GPIO18 | 53 | #define IRQ_GPIO_H3600_ACTION_BUTTON IRQ_GPIO18 |
62 | #define IRQ_GPIO_H3600_OPT_DET IRQ_GPIO27 | 54 | #define IRQ_GPIO_H3600_OPT_DET IRQ_GPIO27 |
63 | 55 | ||
64 | #define IRQ_GPIO_H3800_MMC_INT IRQ_GPIO18 | ||
65 | #define IRQ_GPIO_H3800_NOPT_IND IRQ_GPIO20 /* almost same as OPT_DET */ | ||
66 | |||
67 | /* H3100 / 3600 EGPIO pins */ | 56 | /* H3100 / 3600 EGPIO pins */ |
68 | #define EGPIO_H3600_VPP_ON (1 << 0) | 57 | #define EGPIO_H3600_VPP_ON (1 << 0) |
69 | #define EGPIO_H3600_CARD_RESET (1 << 1) /* reset the attached pcmcia/compactflash card. active high. */ | 58 | #define EGPIO_H3600_CARD_RESET (1 << 1) /* reset the attached pcmcia/compactflash card. active high. */ |
@@ -84,457 +73,5 @@ | |||
84 | #define EGPIO_H3600_LCD_5V_ON (1 << 14) /* enable 5V to LCD. active high. */ | 73 | #define EGPIO_H3600_LCD_5V_ON (1 << 14) /* enable 5V to LCD. active high. */ |
85 | #define EGPIO_H3600_LVDD_ON (1 << 15) /* enable 9V and -6.5V to LCD. */ | 74 | #define EGPIO_H3600_LVDD_ON (1 << 15) /* enable 9V and -6.5V to LCD. */ |
86 | 75 | ||
87 | /********************* H3800, ASIC #2 ********************/ | ||
88 | |||
89 | #define _H3800_ASIC2_Base (H3600_EGPIO_VIRT) | ||
90 | #define H3800_ASIC2_OFFSET(s,x,y) \ | ||
91 | (*((volatile s *) (_H3800_ASIC2_Base + _H3800_ASIC2_ ## x ## _Base + _H3800_ASIC2_ ## x ## _ ## y))) | ||
92 | #define H3800_ASIC2_NOFFSET(s,x,n,y) \ | ||
93 | (*((volatile s *) (_H3800_ASIC2_Base + _H3800_ASIC2_ ## x ## _ ## n ## _Base + _H3800_ASIC2_ ## x ## _ ## y))) | ||
94 | |||
95 | #define _H3800_ASIC2_GPIO_Base 0x0000 | ||
96 | #define _H3800_ASIC2_GPIO_Direction 0x0000 /* R/W, 16 bits 1:input, 0:output */ | ||
97 | #define _H3800_ASIC2_GPIO_InterruptType 0x0004 /* R/W, 12 bits 1:edge, 0:level */ | ||
98 | #define _H3800_ASIC2_GPIO_InterruptEdgeType 0x0008 /* R/W, 12 bits 1:rising, 0:falling */ | ||
99 | #define _H3800_ASIC2_GPIO_InterruptLevelType 0x000C /* R/W, 12 bits 1:high, 0:low */ | ||
100 | #define _H3800_ASIC2_GPIO_InterruptClear 0x0010 /* W, 12 bits */ | ||
101 | #define _H3800_ASIC2_GPIO_InterruptFlag 0x0010 /* R, 12 bits - reads int status */ | ||
102 | #define _H3800_ASIC2_GPIO_Data 0x0014 /* R/W, 16 bits */ | ||
103 | #define _H3800_ASIC2_GPIO_BattFaultOut 0x0018 /* R/W, 16 bit - sets level on batt fault */ | ||
104 | #define _H3800_ASIC2_GPIO_InterruptEnable 0x001c /* R/W, 12 bits 1:enable interrupt */ | ||
105 | #define _H3800_ASIC2_GPIO_Alternate 0x003c /* R/W, 12+1 bits - set alternate functions */ | ||
106 | |||
107 | #define H3800_ASIC2_GPIO_Direction H3800_ASIC2_OFFSET( u16, GPIO, Direction ) | ||
108 | #define H3800_ASIC2_GPIO_InterruptType H3800_ASIC2_OFFSET( u16, GPIO, InterruptType ) | ||
109 | #define H3800_ASIC2_GPIO_InterruptEdgeType H3800_ASIC2_OFFSET( u16, GPIO, InterruptEdgeType ) | ||
110 | #define H3800_ASIC2_GPIO_InterruptLevelType H3800_ASIC2_OFFSET( u16, GPIO, InterruptLevelType ) | ||
111 | #define H3800_ASIC2_GPIO_InterruptClear H3800_ASIC2_OFFSET( u16, GPIO, InterruptClear ) | ||
112 | #define H3800_ASIC2_GPIO_InterruptFlag H3800_ASIC2_OFFSET( u16, GPIO, InterruptFlag ) | ||
113 | #define H3800_ASIC2_GPIO_Data H3800_ASIC2_OFFSET( u16, GPIO, Data ) | ||
114 | #define H3800_ASIC2_GPIO_BattFaultOut H3800_ASIC2_OFFSET( u16, GPIO, BattFaultOut ) | ||
115 | #define H3800_ASIC2_GPIO_InterruptEnable H3800_ASIC2_OFFSET( u16, GPIO, InterruptEnable ) | ||
116 | #define H3800_ASIC2_GPIO_Alternate H3800_ASIC2_OFFSET( u16, GPIO, Alternate ) | ||
117 | |||
118 | #define GPIO_H3800_ASIC2_IN_Y1_N (1 << 0) /* Output: Touchscreen Y1 */ | ||
119 | #define GPIO_H3800_ASIC2_IN_X0 (1 << 1) /* Output: Touchscreen X0 */ | ||
120 | #define GPIO_H3800_ASIC2_IN_Y0 (1 << 2) /* Output: Touchscreen Y0 */ | ||
121 | #define GPIO_H3800_ASIC2_IN_X1_N (1 << 3) /* Output: Touchscreen X1 */ | ||
122 | #define GPIO_H3800_ASIC2_BT_RST (1 << 4) /* Output: Bluetooth reset */ | ||
123 | #define GPIO_H3800_ASIC2_PEN_IRQ (1 << 5) /* Input : Pen down */ | ||
124 | #define GPIO_H3800_ASIC2_SD_DETECT (1 << 6) /* Input : SD detect */ | ||
125 | #define GPIO_H3800_ASIC2_EAR_IN_N (1 << 7) /* Input : Audio jack plug inserted */ | ||
126 | #define GPIO_H3800_ASIC2_OPT_PCM_RESET (1 << 8) /* Output: */ | ||
127 | #define GPIO_H3800_ASIC2_OPT_RESET (1 << 9) /* Output: */ | ||
128 | #define GPIO_H3800_ASIC2_USB_DETECT_N (1 << 10) /* Input : */ | ||
129 | #define GPIO_H3800_ASIC2_SD_CON_SLT (1 << 11) /* Input : */ | ||
130 | |||
131 | #define _H3800_ASIC2_KPIO_Base 0x0200 | ||
132 | #define _H3800_ASIC2_KPIO_Direction 0x0000 /* R/W, 12 bits 1:input, 0:output */ | ||
133 | #define _H3800_ASIC2_KPIO_InterruptType 0x0004 /* R/W, 12 bits 1:edge, 0:level */ | ||
134 | #define _H3800_ASIC2_KPIO_InterruptEdgeType 0x0008 /* R/W, 12 bits 1:rising, 0:falling */ | ||
135 | #define _H3800_ASIC2_KPIO_InterruptLevelType 0x000C /* R/W, 12 bits 1:high, 0:low */ | ||
136 | #define _H3800_ASIC2_KPIO_InterruptClear 0x0010 /* W, 20 bits - 8 special */ | ||
137 | #define _H3800_ASIC2_KPIO_InterruptFlag 0x0010 /* R, 20 bits - 8 special - reads int status */ | ||
138 | #define _H3800_ASIC2_KPIO_Data 0x0014 /* R/W, 16 bits */ | ||
139 | #define _H3800_ASIC2_KPIO_BattFaultOut 0x0018 /* R/W, 16 bit - sets level on batt fault */ | ||
140 | #define _H3800_ASIC2_KPIO_InterruptEnable 0x001c /* R/W, 20 bits - 8 special */ | ||
141 | #define _H3800_ASIC2_KPIO_Alternate 0x003c /* R/W, 6 bits */ | ||
142 | |||
143 | #define H3800_ASIC2_KPIO_Direction H3800_ASIC2_OFFSET( u16, KPIO, Direction ) | ||
144 | #define H3800_ASIC2_KPIO_InterruptType H3800_ASIC2_OFFSET( u16, KPIO, InterruptType ) | ||
145 | #define H3800_ASIC2_KPIO_InterruptEdgeType H3800_ASIC2_OFFSET( u16, KPIO, InterruptEdgeType ) | ||
146 | #define H3800_ASIC2_KPIO_InterruptLevelType H3800_ASIC2_OFFSET( u16, KPIO, InterruptLevelType ) | ||
147 | #define H3800_ASIC2_KPIO_InterruptClear H3800_ASIC2_OFFSET( u32, KPIO, InterruptClear ) | ||
148 | #define H3800_ASIC2_KPIO_InterruptFlag H3800_ASIC2_OFFSET( u32, KPIO, InterruptFlag ) | ||
149 | #define H3800_ASIC2_KPIO_Data H3800_ASIC2_OFFSET( u16, KPIO, Data ) | ||
150 | #define H3800_ASIC2_KPIO_BattFaultOut H3800_ASIC2_OFFSET( u16, KPIO, BattFaultOut ) | ||
151 | #define H3800_ASIC2_KPIO_InterruptEnable H3800_ASIC2_OFFSET( u32, KPIO, InterruptEnable ) | ||
152 | #define H3800_ASIC2_KPIO_Alternate H3800_ASIC2_OFFSET( u16, KPIO, Alternate ) | ||
153 | |||
154 | #define H3800_ASIC2_KPIO_SPI_INT ( 1 << 16 ) | ||
155 | #define H3800_ASIC2_KPIO_OWM_INT ( 1 << 17 ) | ||
156 | #define H3800_ASIC2_KPIO_ADC_INT ( 1 << 18 ) | ||
157 | #define H3800_ASIC2_KPIO_UART_0_INT ( 1 << 19 ) | ||
158 | #define H3800_ASIC2_KPIO_UART_1_INT ( 1 << 20 ) | ||
159 | #define H3800_ASIC2_KPIO_TIMER_0_INT ( 1 << 21 ) | ||
160 | #define H3800_ASIC2_KPIO_TIMER_1_INT ( 1 << 22 ) | ||
161 | #define H3800_ASIC2_KPIO_TIMER_2_INT ( 1 << 23 ) | ||
162 | |||
163 | #define KPIO_H3800_ASIC2_RECORD_BTN_N (1 << 0) /* Record button */ | ||
164 | #define KPIO_H3800_ASIC2_KEY_5W1_N (1 << 1) /* Keypad */ | ||
165 | #define KPIO_H3800_ASIC2_KEY_5W2_N (1 << 2) /* */ | ||
166 | #define KPIO_H3800_ASIC2_KEY_5W3_N (1 << 3) /* */ | ||
167 | #define KPIO_H3800_ASIC2_KEY_5W4_N (1 << 4) /* */ | ||
168 | #define KPIO_H3800_ASIC2_KEY_5W5_N (1 << 5) /* */ | ||
169 | #define KPIO_H3800_ASIC2_KEY_LEFT_N (1 << 6) /* */ | ||
170 | #define KPIO_H3800_ASIC2_KEY_RIGHT_N (1 << 7) /* */ | ||
171 | #define KPIO_H3800_ASIC2_KEY_AP1_N (1 << 8) /* Old "Calendar" */ | ||
172 | #define KPIO_H3800_ASIC2_KEY_AP2_N (1 << 9) /* Old "Schedule" */ | ||
173 | #define KPIO_H3800_ASIC2_KEY_AP3_N (1 << 10) /* Old "Q" */ | ||
174 | #define KPIO_H3800_ASIC2_KEY_AP4_N (1 << 11) /* Old "Undo" */ | ||
175 | |||
176 | /* Alternate KPIO functions (set by default) */ | ||
177 | #define KPIO_ALT_H3800_ASIC2_KEY_5W1_N (1 << 1) /* Action key */ | ||
178 | #define KPIO_ALT_H3800_ASIC2_KEY_5W2_N (1 << 2) /* J1 of keypad input */ | ||
179 | #define KPIO_ALT_H3800_ASIC2_KEY_5W3_N (1 << 3) /* J2 of keypad input */ | ||
180 | #define KPIO_ALT_H3800_ASIC2_KEY_5W4_N (1 << 4) /* J3 of keypad input */ | ||
181 | #define KPIO_ALT_H3800_ASIC2_KEY_5W5_N (1 << 5) /* J4 of keypad input */ | ||
182 | |||
183 | #define _H3800_ASIC2_SPI_Base 0x0400 | ||
184 | #define _H3800_ASIC2_SPI_Control 0x0000 /* R/W 8 bits */ | ||
185 | #define _H3800_ASIC2_SPI_Data 0x0004 /* R/W 8 bits */ | ||
186 | #define _H3800_ASIC2_SPI_ChipSelectDisabled 0x0008 /* W 8 bits */ | ||
187 | |||
188 | #define H3800_ASIC2_SPI_Control H3800_ASIC2_OFFSET( u8, SPI, Control ) | ||
189 | #define H3800_ASIC2_SPI_Data H3800_ASIC2_OFFSET( u8, SPI, Data ) | ||
190 | #define H3800_ASIC2_SPI_ChipSelectDisabled H3800_ASIC2_OFFSET( u8, SPI, ChipSelectDisabled ) | ||
191 | |||
192 | #define _H3800_ASIC2_PWM_0_Base 0x0600 | ||
193 | #define _H3800_ASIC2_PWM_1_Base 0x0700 | ||
194 | #define _H3800_ASIC2_PWM_TimeBase 0x0000 /* R/W 6 bits */ | ||
195 | #define _H3800_ASIC2_PWM_PeriodTime 0x0004 /* R/W 12 bits */ | ||
196 | #define _H3800_ASIC2_PWM_DutyTime 0x0008 /* R/W 12 bits */ | ||
197 | |||
198 | #define H3800_ASIC2_PWM_0_TimeBase H3800_ASIC2_NOFFSET( u8, PWM, 0, TimeBase ) | ||
199 | #define H3800_ASIC2_PWM_0_PeriodTime H3800_ASIC2_NOFFSET( u16, PWM, 0, PeriodTime ) | ||
200 | #define H3800_ASIC2_PWM_0_DutyTime H3800_ASIC2_NOFFSET( u16, PWM, 0, DutyTime ) | ||
201 | |||
202 | #define H3800_ASIC2_PWM_1_TimeBase H3800_ASIC2_NOFFSET( u8, PWM, 1, TimeBase ) | ||
203 | #define H3800_ASIC2_PWM_1_PeriodTime H3800_ASIC2_NOFFSET( u16, PWM, 1, PeriodTime ) | ||
204 | #define H3800_ASIC2_PWM_1_DutyTime H3800_ASIC2_NOFFSET( u16, PWM, 1, DutyTime ) | ||
205 | |||
206 | #define H3800_ASIC2_PWM_TIMEBASE_MASK 0xf /* Low 4 bits sets time base, max = 8 */ | ||
207 | #define H3800_ASIC2_PWM_TIMEBASE_ENABLE ( 1 << 4 ) /* Enable clock */ | ||
208 | #define H3800_ASIC2_PWM_TIMEBASE_CLEAR ( 1 << 5 ) /* Clear the PWM */ | ||
209 | |||
210 | #define _H3800_ASIC2_LED_0_Base 0x0800 | ||
211 | #define _H3800_ASIC2_LED_1_Base 0x0880 | ||
212 | #define _H3800_ASIC2_LED_2_Base 0x0900 | ||
213 | #define _H3800_ASIC2_LED_TimeBase 0x0000 /* R/W 7 bits */ | ||
214 | #define _H3800_ASIC2_LED_PeriodTime 0x0004 /* R/W 12 bits */ | ||
215 | #define _H3800_ASIC2_LED_DutyTime 0x0008 /* R/W 12 bits */ | ||
216 | #define _H3800_ASIC2_LED_AutoStopCount 0x000c /* R/W 16 bits */ | ||
217 | |||
218 | #define H3800_ASIC2_LED_0_TimeBase H3800_ASIC2_NOFFSET( u8, LED, 0, TimeBase ) | ||
219 | #define H3800_ASIC2_LED_0_PeriodTime H3800_ASIC2_NOFFSET( u16, LED, 0, PeriodTime ) | ||
220 | #define H3800_ASIC2_LED_0_DutyTime H3800_ASIC2_NOFFSET( u16, LED, 0, DutyTime ) | ||
221 | #define H3800_ASIC2_LED_0_AutoStopClock H3800_ASIC2_NOFFSET( u16, LED, 0, AutoStopClock ) | ||
222 | |||
223 | #define H3800_ASIC2_LED_1_TimeBase H3800_ASIC2_NOFFSET( u8, LED, 1, TimeBase ) | ||
224 | #define H3800_ASIC2_LED_1_PeriodTime H3800_ASIC2_NOFFSET( u16, LED, 1, PeriodTime ) | ||
225 | #define H3800_ASIC2_LED_1_DutyTime H3800_ASIC2_NOFFSET( u16, LED, 1, DutyTime ) | ||
226 | #define H3800_ASIC2_LED_1_AutoStopClock H3800_ASIC2_NOFFSET( u16, LED, 1, AutoStopClock ) | ||
227 | |||
228 | #define H3800_ASIC2_LED_2_TimeBase H3800_ASIC2_NOFFSET( u8, LED, 2, TimeBase ) | ||
229 | #define H3800_ASIC2_LED_2_PeriodTime H3800_ASIC2_NOFFSET( u16, LED, 2, PeriodTime ) | ||
230 | #define H3800_ASIC2_LED_2_DutyTime H3800_ASIC2_NOFFSET( u16, LED, 2, DutyTime ) | ||
231 | #define H3800_ASIC2_LED_2_AutoStopClock H3800_ASIC2_NOFFSET( u16, LED, 2, AutoStopClock ) | ||
232 | |||
233 | #define H3800_ASIC2_LED_TIMEBASE_MASK 0x0f /* Low 4 bits sets time base, max = 13 */ | ||
234 | #define H3800_ASIC2_LED_TIMEBASE_BLINK ( 1 << 4 ) /* Enable blinking */ | ||
235 | #define H3800_ASIC2_LED_TIMEBASE_AUTOSTOP ( 1 << 5 ) | ||
236 | #define H3800_ASIC2_LED_TIMEBASE_ALWAYS ( 1 << 6 ) /* Enable blink always */ | ||
237 | |||
238 | #define _H3800_ASIC2_UART_0_Base 0x0A00 | ||
239 | #define _H3800_ASIC2_UART_1_Base 0x0C00 | ||
240 | #define _H3800_ASIC2_UART_Receive 0x0000 /* R 8 bits */ | ||
241 | #define _H3800_ASIC2_UART_Transmit 0x0000 /* W 8 bits */ | ||
242 | #define _H3800_ASIC2_UART_IntEnable 0x0004 /* R/W 8 bits */ | ||
243 | #define _H3800_ASIC2_UART_IntVerify 0x0008 /* R/W 8 bits */ | ||
244 | #define _H3800_ASIC2_UART_FIFOControl 0x000c /* R/W 8 bits */ | ||
245 | #define _H3800_ASIC2_UART_LineControl 0x0010 /* R/W 8 bits */ | ||
246 | #define _H3800_ASIC2_UART_ModemStatus 0x0014 /* R/W 8 bits */ | ||
247 | #define _H3800_ASIC2_UART_LineStatus 0x0018 /* R/W 8 bits */ | ||
248 | #define _H3800_ASIC2_UART_ScratchPad 0x001c /* R/W 8 bits */ | ||
249 | #define _H3800_ASIC2_UART_DivisorLatchL 0x0020 /* R/W 8 bits */ | ||
250 | #define _H3800_ASIC2_UART_DivisorLatchH 0x0024 /* R/W 8 bits */ | ||
251 | |||
252 | #define H3800_ASIC2_UART_0_Receive H3800_ASIC2_NOFFSET( u8, UART, 0, Receive ) | ||
253 | #define H3800_ASIC2_UART_0_Transmit H3800_ASIC2_NOFFSET( u8, UART, 0, Transmit ) | ||
254 | #define H3800_ASIC2_UART_0_IntEnable H3800_ASIC2_NOFFSET( u8, UART, 0, IntEnable ) | ||
255 | #define H3800_ASIC2_UART_0_IntVerify H3800_ASIC2_NOFFSET( u8, UART, 0, IntVerify ) | ||
256 | #define H3800_ASIC2_UART_0_FIFOControl H3800_ASIC2_NOFFSET( u8, UART, 0, FIFOControl ) | ||
257 | #define H3800_ASIC2_UART_0_LineControl H3800_ASIC2_NOFFSET( u8, UART, 0, LineControl ) | ||
258 | #define H3800_ASIC2_UART_0_ModemStatus H3800_ASIC2_NOFFSET( u8, UART, 0, ModemStatus ) | ||
259 | #define H3800_ASIC2_UART_0_LineStatus H3800_ASIC2_NOFFSET( u8, UART, 0, LineStatus ) | ||
260 | #define H3800_ASIC2_UART_0_ScratchPad H3800_ASIC2_NOFFSET( u8, UART, 0, ScratchPad ) | ||
261 | #define H3800_ASIC2_UART_0_DivisorLatchL H3800_ASIC2_NOFFSET( u8, UART, 0, DivisorLatchL ) | ||
262 | #define H3800_ASIC2_UART_0_DivisorLatchH H3800_ASIC2_NOFFSET( u8, UART, 0, DivisorLatchH ) | ||
263 | |||
264 | #define H3800_ASIC2_UART_1_Receive H3800_ASIC2_NOFFSET( u8, UART, 1, Receive ) | ||
265 | #define H3800_ASIC2_UART_1_Transmit H3800_ASIC2_NOFFSET( u8, UART, 1, Transmit ) | ||
266 | #define H3800_ASIC2_UART_1_IntEnable H3800_ASIC2_NOFFSET( u8, UART, 1, IntEnable ) | ||
267 | #define H3800_ASIC2_UART_1_IntVerify H3800_ASIC2_NOFFSET( u8, UART, 1, IntVerify ) | ||
268 | #define H3800_ASIC2_UART_1_FIFOControl H3800_ASIC2_NOFFSET( u8, UART, 1, FIFOControl ) | ||
269 | #define H3800_ASIC2_UART_1_LineControl H3800_ASIC2_NOFFSET( u8, UART, 1, LineControl ) | ||
270 | #define H3800_ASIC2_UART_1_ModemStatus H3800_ASIC2_NOFFSET( u8, UART, 1, ModemStatus ) | ||
271 | #define H3800_ASIC2_UART_1_LineStatus H3800_ASIC2_NOFFSET( u8, UART, 1, LineStatus ) | ||
272 | #define H3800_ASIC2_UART_1_ScratchPad H3800_ASIC2_NOFFSET( u8, UART, 1, ScratchPad ) | ||
273 | #define H3800_ASIC2_UART_1_DivisorLatchL H3800_ASIC2_NOFFSET( u8, UART, 1, DivisorLatchL ) | ||
274 | #define H3800_ASIC2_UART_1_DivisorLatchH H3800_ASIC2_NOFFSET( u8, UART, 1, DivisorLatchH ) | ||
275 | |||
276 | #define _H3800_ASIC2_TIMER_Base 0x0E00 | ||
277 | #define _H3800_ASIC2_TIMER_Command 0x0000 /* R/W 8 bits */ | ||
278 | |||
279 | #define H3800_ASIC2_TIMER_Command H3800_ASIC2_OFFSET( u8, Timer, Command ) | ||
280 | |||
281 | #define H3800_ASIC2_TIMER_GAT_0 ( 1 << 0 ) /* Gate enable, counter 0 */ | ||
282 | #define H3800_ASIC2_TIMER_GAT_1 ( 1 << 1 ) /* Gate enable, counter 1 */ | ||
283 | #define H3800_ASIC2_TIMER_GAT_2 ( 1 << 2 ) /* Gate enable, counter 2 */ | ||
284 | #define H3800_ASIC2_TIMER_CLK_0 ( 1 << 3 ) /* Clock enable, counter 0 */ | ||
285 | #define H3800_ASIC2_TIMER_CLK_1 ( 1 << 4 ) /* Clock enable, counter 1 */ | ||
286 | #define H3800_ASIC2_TIMER_CLK_2 ( 1 << 5 ) /* Clock enable, counter 2 */ | ||
287 | #define H3800_ASIC2_TIMER_MODE_0 ( 1 << 6 ) /* Mode 0 enable, counter 0 */ | ||
288 | #define H3800_ASIC2_TIMER_MODE_1 ( 1 << 7 ) /* Mode 0 enable, counter 1 */ | ||
289 | |||
290 | #define _H3800_ASIC2_CLOCK_Base 0x1000 | ||
291 | #define _H3800_ASIC2_CLOCK_Enable 0x0000 /* R/W 18 bits */ | ||
292 | |||
293 | #define H3800_ASIC2_CLOCK_Enable H3800_ASIC2_OFFSET( u32, CLOCK, Enable ) | ||
294 | |||
295 | #define H3800_ASIC2_CLOCK_AUDIO_1 0x0001 /* Enable 4.1 MHz clock for 8Khz and 4khz sample rate */ | ||
296 | #define H3800_ASIC2_CLOCK_AUDIO_2 0x0002 /* Enable 12.3 MHz clock for 48Khz and 32khz sample rate */ | ||
297 | #define H3800_ASIC2_CLOCK_AUDIO_3 0x0004 /* Enable 5.6 MHz clock for 11 kHZ sample rate */ | ||
298 | #define H3800_ASIC2_CLOCK_AUDIO_4 0x0008 /* Enable 11.289 MHz clock for 44 and 22 kHz sample rate */ | ||
299 | #define H3800_ASIC2_CLOCK_ADC ( 1 << 4 ) /* 1.024 MHz clock to ADC */ | ||
300 | #define H3800_ASIC2_CLOCK_SPI ( 1 << 5 ) /* 4.096 MHz clock to SPI */ | ||
301 | #define H3800_ASIC2_CLOCK_OWM ( 1 << 6 ) /* 4.096 MHz clock to OWM */ | ||
302 | #define H3800_ASIC2_CLOCK_PWM ( 1 << 7 ) /* 2.048 MHz clock to PWM */ | ||
303 | #define H3800_ASIC2_CLOCK_UART_1 ( 1 << 8 ) /* 24.576 MHz clock to UART1 (turn off bit 16) */ | ||
304 | #define H3800_ASIC2_CLOCK_UART_0 ( 1 << 9 ) /* 24.576 MHz clock to UART0 (turn off bit 17) */ | ||
305 | #define H3800_ASIC2_CLOCK_SD_1 ( 1 << 10 ) /* 16.934 MHz to SD */ | ||
306 | #define H3800_ASIC2_CLOCK_SD_2 ( 2 << 10 ) /* 24.576 MHz to SD */ | ||
307 | #define H3800_ASIC2_CLOCK_SD_3 ( 3 << 10 ) /* 33.869 MHz to SD */ | ||
308 | #define H3800_ASIC2_CLOCK_SD_4 ( 4 << 10 ) /* 49.152 MHz to SD */ | ||
309 | #define H3800_ASIC2_CLOCK_EX0 ( 1 << 13 ) /* Enable 32.768 kHz crystal */ | ||
310 | #define H3800_ASIC2_CLOCK_EX1 ( 1 << 14 ) /* Enable 24.576 MHz crystal */ | ||
311 | #define H3800_ASIC2_CLOCK_EX2 ( 1 << 15 ) /* Enable 33.869 MHz crystal */ | ||
312 | #define H3800_ASIC2_CLOCK_SLOW_UART_1 ( 1 << 16 ) /* Enable 3.686 MHz to UART1 (turn off bit 8) */ | ||
313 | #define H3800_ASIC2_CLOCK_SLOW_UART_0 ( 1 << 17 ) /* Enable 3.686 MHz to UART0 (turn off bit 9) */ | ||
314 | |||
315 | #define _H3800_ASIC2_ADC_Base 0x1200 | ||
316 | #define _H3800_ASIC2_ADC_Multiplexer 0x0000 /* R/W 4 bits - low 3 bits set channel */ | ||
317 | #define _H3800_ASIC2_ADC_ControlStatus 0x0004 /* R/W 8 bits */ | ||
318 | #define _H3800_ASIC2_ADC_Data 0x0008 /* R 10 bits */ | ||
319 | |||
320 | #define H3800_ASIC2_ADC_Multiplexer H3800_ASIC2_OFFSET( u8, ADC, Multiplexer ) | ||
321 | #define H3800_ASIC2_ADC_ControlStatus H3800_ASIC2_OFFSET( u8, ADC, ControlStatus ) | ||
322 | #define H3800_ASIC2_ADC_Data H3800_ASIC2_OFFSET( u16, ADC, Data ) | ||
323 | |||
324 | #define H3600_ASIC2_ADC_MUX_CHANNEL_MASK 0x07 /* Low 3 bits sets channel. max = 4 */ | ||
325 | #define H3600_ASIC2_ADC_MUX_CLKEN ( 1 << 3 ) /* Enable clock */ | ||
326 | |||
327 | #define H3600_ASIC2_ADC_CSR_ADPS_MASK 0x0f /* Low 4 bits sets prescale, max = 8 */ | ||
328 | #define H3600_ASIC2_ADC_CSR_FREE_RUN ( 1 << 4 ) | ||
329 | #define H3600_ASIC2_ADC_CSR_INT_ENABLE ( 1 << 5 ) | ||
330 | #define H3600_ASIC2_ADC_CSR_START ( 1 << 6 ) /* Set to start conversion. Goes to 0 when done */ | ||
331 | #define H3600_ASIC2_ADC_CSR_ENABLE ( 1 << 7 ) /* 1:power up ADC, 0:power down */ | ||
332 | |||
333 | |||
334 | #define _H3800_ASIC2_INTR_Base 0x1600 | ||
335 | #define _H3800_ASIC2_INTR_MaskAndFlag 0x0000 /* R/(W) 8bits */ | ||
336 | #define _H3800_ASIC2_INTR_ClockPrescale 0x0004 /* R/(W) 5bits */ | ||
337 | #define _H3800_ASIC2_INTR_TimerSet 0x0008 /* R/(W) 8bits */ | ||
338 | |||
339 | #define H3800_ASIC2_INTR_MaskAndFlag H3800_ASIC2_OFFSET( u8, INTR, MaskAndFlag ) | ||
340 | #define H3800_ASIC2_INTR_ClockPrescale H3800_ASIC2_OFFSET( u8, INTR, ClockPrescale ) | ||
341 | #define H3800_ASIC2_INTR_TimerSet H3800_ASIC2_OFFSET( u8, INTR, TimerSet ) | ||
342 | |||
343 | #define H3800_ASIC2_INTR_GLOBAL_MASK ( 1 << 0 ) /* Global interrupt mask */ | ||
344 | #define H3800_ASIC2_INTR_POWER_ON_RESET ( 1 << 1 ) /* 01: Power on reset (bits 1 & 2 ) */ | ||
345 | #define H3800_ASIC2_INTR_EXTERNAL_RESET ( 2 << 1 ) /* 10: External reset (bits 1 & 2 ) */ | ||
346 | #define H3800_ASIC2_INTR_MASK_UART_0 ( 1 << 4 ) | ||
347 | #define H3800_ASIC2_INTR_MASK_UART_1 ( 1 << 5 ) | ||
348 | #define H3800_ASIC2_INTR_MASK_TIMER ( 1 << 6 ) | ||
349 | #define H3800_ASIC2_INTR_MASK_OWM ( 1 << 7 ) | ||
350 | |||
351 | #define H3800_ASIC2_INTR_CLOCK_PRESCALE 0x0f /* 4 bits, max 14 */ | ||
352 | #define H3800_ASIC2_INTR_SET ( 1 << 4 ) /* Time base enable */ | ||
353 | |||
354 | |||
355 | #define _H3800_ASIC2_OWM_Base 0x1800 | ||
356 | #define _H3800_ASIC2_OWM_Command 0x0000 /* R/W 4 bits command register */ | ||
357 | #define _H3800_ASIC2_OWM_Data 0x0004 /* R/W 8 bits, transmit / receive buffer */ | ||
358 | #define _H3800_ASIC2_OWM_Interrupt 0x0008 /* R/W Command register */ | ||
359 | #define _H3800_ASIC2_OWM_InterruptEnable 0x000c /* R/W Command register */ | ||
360 | #define _H3800_ASIC2_OWM_ClockDivisor 0x0010 /* R/W 5 bits of divisor and pre-scale */ | ||
361 | |||
362 | #define H3800_ASIC2_OWM_Command H3800_ASIC2_OFFSET( u8, OWM, Command ) | ||
363 | #define H3800_ASIC2_OWM_Data H3800_ASIC2_OFFSET( u8, OWM, Data ) | ||
364 | #define H3800_ASIC2_OWM_Interrupt H3800_ASIC2_OFFSET( u8, OWM, Interrupt ) | ||
365 | #define H3800_ASIC2_OWM_InterruptEnable H3800_ASIC2_OFFSET( u8, OWM, InterruptEnable ) | ||
366 | #define H3800_ASIC2_OWM_ClockDivisor H3800_ASIC2_OFFSET( u8, OWM, ClockDivisor ) | ||
367 | |||
368 | #define H3800_ASIC2_OWM_CMD_ONE_WIRE_RESET ( 1 << 0 ) /* Set to force reset on 1-wire bus */ | ||
369 | #define H3800_ASIC2_OWM_CMD_SRA ( 1 << 1 ) /* Set to switch to Search ROM accelerator mode */ | ||
370 | #define H3800_ASIC2_OWM_CMD_DQ_OUTPUT ( 1 << 2 ) /* Write only - forces bus low */ | ||
371 | #define H3800_ASIC2_OWM_CMD_DQ_INPUT ( 1 << 3 ) /* Read only - reflects state of bus */ | ||
372 | |||
373 | #define H3800_ASIC2_OWM_INT_PD ( 1 << 0 ) /* Presence detect */ | ||
374 | #define H3800_ASIC2_OWM_INT_PDR ( 1 << 1 ) /* Presence detect result */ | ||
375 | #define H3800_ASIC2_OWM_INT_TBE ( 1 << 2 ) /* Transmit buffer empty */ | ||
376 | #define H3800_ASIC2_OWM_INT_TEMT ( 1 << 3 ) /* Transmit shift register empty */ | ||
377 | #define H3800_ASIC2_OWM_INT_RBF ( 1 << 4 ) /* Receive buffer full */ | ||
378 | |||
379 | #define H3800_ASIC2_OWM_INTEN_EPD ( 1 << 0 ) /* Enable receive buffer full interrupt */ | ||
380 | #define H3800_ASIC2_OWM_INTEN_IAS ( 1 << 1 ) /* Enable transmit shift register empty interrupt */ | ||
381 | #define H3800_ASIC2_OWM_INTEN_ETBE ( 1 << 2 ) /* Enable transmit buffer empty interrupt */ | ||
382 | #define H3800_ASIC2_OWM_INTEN_ETMT ( 1 << 3 ) /* INTR active state */ | ||
383 | #define H3800_ASIC2_OWM_INTEN_ERBF ( 1 << 4 ) /* Enable presence detect interrupt */ | ||
384 | |||
385 | #define _H3800_ASIC2_FlashCtl_Base 0x1A00 | ||
386 | |||
387 | /****************************************************/ | ||
388 | /* H3800, ASIC #1 | ||
389 | * This ASIC is accesed through ASIC #2, and | ||
390 | * mapped into the 1c00 - 1f00 region | ||
391 | */ | ||
392 | |||
393 | #define H3800_ASIC1_OFFSET(s,x,y) \ | ||
394 | (*((volatile s *) (_H3800_ASIC2_Base + _H3800_ASIC1_ ## x ## _Base + (_H3800_ASIC1_ ## x ## _ ## y << 1)))) | ||
395 | |||
396 | #define _H3800_ASIC1_MMC_Base 0x1c00 | ||
397 | |||
398 | #define _H3800_ASIC1_MMC_StartStopClock 0x00 /* R/W 8bit */ | ||
399 | #define _H3800_ASIC1_MMC_Status 0x02 /* R See below, default 0x0040 */ | ||
400 | #define _H3800_ASIC1_MMC_ClockRate 0x04 /* R/W 8bit, low 3 bits are clock divisor */ | ||
401 | #define _H3800_ASIC1_MMC_SPIRegister 0x08 /* R/W 8bit, see below */ | ||
402 | #define _H3800_ASIC1_MMC_CmdDataCont 0x0a /* R/W 8bit, write to start MMC adapter */ | ||
403 | #define _H3800_ASIC1_MMC_ResponseTimeout 0x0c /* R/W 8bit, clocks before response timeout */ | ||
404 | #define _H3800_ASIC1_MMC_ReadTimeout 0x0e /* R/W 16bit, clocks before received data timeout */ | ||
405 | #define _H3800_ASIC1_MMC_BlockLength 0x10 /* R/W 10bit */ | ||
406 | #define _H3800_ASIC1_MMC_NumOfBlocks 0x12 /* R/W 16bit, in block mode, number of blocks */ | ||
407 | #define _H3800_ASIC1_MMC_InterruptMask 0x1a /* R/W 8bit */ | ||
408 | #define _H3800_ASIC1_MMC_CommandNumber 0x1c /* R/W 6 bits */ | ||
409 | #define _H3800_ASIC1_MMC_ArgumentH 0x1e /* R/W 16 bits */ | ||
410 | #define _H3800_ASIC1_MMC_ArgumentL 0x20 /* R/W 16 bits */ | ||
411 | #define _H3800_ASIC1_MMC_ResFifo 0x22 /* R 8 x 16 bits - contains response FIFO */ | ||
412 | #define _H3800_ASIC1_MMC_BufferPartFull 0x28 /* R/W 8 bits */ | ||
413 | |||
414 | #define H3800_ASIC1_MMC_StartStopClock H3800_ASIC1_OFFSET( u8, MMC, StartStopClock ) | ||
415 | #define H3800_ASIC1_MMC_Status H3800_ASIC1_OFFSET( u16, MMC, Status ) | ||
416 | #define H3800_ASIC1_MMC_ClockRate H3800_ASIC1_OFFSET( u8, MMC, ClockRate ) | ||
417 | #define H3800_ASIC1_MMC_SPIRegister H3800_ASIC1_OFFSET( u8, MMC, SPIRegister ) | ||
418 | #define H3800_ASIC1_MMC_CmdDataCont H3800_ASIC1_OFFSET( u8, MMC, CmdDataCont ) | ||
419 | #define H3800_ASIC1_MMC_ResponseTimeout H3800_ASIC1_OFFSET( u8, MMC, ResponseTimeout ) | ||
420 | #define H3800_ASIC1_MMC_ReadTimeout H3800_ASIC1_OFFSET( u16, MMC, ReadTimeout ) | ||
421 | #define H3800_ASIC1_MMC_BlockLength H3800_ASIC1_OFFSET( u16, MMC, BlockLength ) | ||
422 | #define H3800_ASIC1_MMC_NumOfBlocks H3800_ASIC1_OFFSET( u16, MMC, NumOfBlocks ) | ||
423 | #define H3800_ASIC1_MMC_InterruptMask H3800_ASIC1_OFFSET( u8, MMC, InterruptMask ) | ||
424 | #define H3800_ASIC1_MMC_CommandNumber H3800_ASIC1_OFFSET( u8, MMC, CommandNumber ) | ||
425 | #define H3800_ASIC1_MMC_ArgumentH H3800_ASIC1_OFFSET( u16, MMC, ArgumentH ) | ||
426 | #define H3800_ASIC1_MMC_ArgumentL H3800_ASIC1_OFFSET( u16, MMC, ArgumentL ) | ||
427 | #define H3800_ASIC1_MMC_ResFifo H3800_ASIC1_OFFSET( u16, MMC, ResFifo ) | ||
428 | #define H3800_ASIC1_MMC_BufferPartFull H3800_ASIC1_OFFSET( u8, MMC, BufferPartFull ) | ||
429 | |||
430 | #define H3800_ASIC1_MMC_STOP_CLOCK (1 << 0) /* Write to "StartStopClock" register */ | ||
431 | #define H3800_ASIC1_MMC_START_CLOCK (1 << 1) | ||
432 | |||
433 | #define H3800_ASIC1_MMC_STATUS_READ_TIMEOUT (1 << 0) | ||
434 | #define H3800_ASIC1_MMC_STATUS_RESPONSE_TIMEOUT (1 << 1) | ||
435 | #define H3800_ASIC1_MMC_STATUS_CRC_WRITE_ERROR (1 << 2) | ||
436 | #define H3800_ASIC1_MMC_STATUS_CRC_READ_ERROR (1 << 3) | ||
437 | #define H3800_ASIC1_MMC_STATUS_SPI_READ_ERROR (1 << 4) /* SPI data token error received */ | ||
438 | #define H3800_ASIC1_MMC_STATUS_CRC_RESPONSE_ERROR (1 << 5) | ||
439 | #define H3800_ASIC1_MMC_STATUS_FIFO_EMPTY (1 << 6) | ||
440 | #define H3800_ASIC1_MMC_STATUS_FIFO_FULL (1 << 7) | ||
441 | #define H3800_ASIC1_MMC_STATUS_CLOCK_ENABLE (1 << 8) /* MultiMediaCard clock stopped */ | ||
442 | #define H3800_ASIC1_MMC_STATUS_DATA_TRANSFER_DONE (1 << 11) /* Write operation, indicates transfer finished */ | ||
443 | #define H3800_ASIC1_MMC_STATUS_END_PROGRAM (1 << 12) /* End write and read operations */ | ||
444 | #define H3800_ASIC1_MMC_STATUS_END_COMMAND_RESPONSE (1 << 13) /* End command response */ | ||
445 | |||
446 | #define H3800_ASIC1_MMC_SPI_REG_SPI_ENABLE (1 << 0) /* Enables SPI mode */ | ||
447 | #define H3800_ASIC1_MMC_SPI_REG_CRC_ON (1 << 1) /* 1:turn on CRC */ | ||
448 | #define H3800_ASIC1_MMC_SPI_REG_SPI_CS_ENABLE (1 << 2) /* 1:turn on SPI CS */ | ||
449 | #define H3800_ASIC1_MMC_SPI_REG_CS_ADDRESS_MASK 0x38 /* Bits 3,4,5 are the SPI CS relative address */ | ||
450 | |||
451 | #define H3800_ASIC1_MMC_CMD_DATA_CONT_FORMAT_NO_RESPONSE 0x00 | ||
452 | #define H3800_ASIC1_MMC_CMD_DATA_CONT_FORMAT_R1 0x01 | ||
453 | #define H3800_ASIC1_MMC_CMD_DATA_CONT_FORMAT_R2 0x02 | ||
454 | #define H3800_ASIC1_MMC_CMD_DATA_CONT_FORMAT_R3 0x03 | ||
455 | #define H3800_ASIC1_MMC_CMD_DATA_CONT_DATA_ENABLE (1 << 2) /* This command contains a data transfer */ | ||
456 | #define H3800_ASIC1_MMC_CMD_DATA_CONT_WRITE (1 << 3) /* This data transfer is a write */ | ||
457 | #define H3800_ASIC1_MMC_CMD_DATA_CONT_STREAM_MODE (1 << 4) /* This data transfer is in stream mode */ | ||
458 | #define H3800_ASIC1_MMC_CMD_DATA_CONT_BUSY_BIT (1 << 5) /* Busy signal expected after current cmd */ | ||
459 | #define H3800_ASIC1_MMC_CMD_DATA_CONT_INITIALIZE (1 << 6) /* Enables the 80 bits for initializing card */ | ||
460 | |||
461 | #define H3800_ASIC1_MMC_INT_MASK_DATA_TRANSFER_DONE (1 << 0) | ||
462 | #define H3800_ASIC1_MMC_INT_MASK_PROGRAM_DONE (1 << 1) | ||
463 | #define H3800_ASIC1_MMC_INT_MASK_END_COMMAND_RESPONSE (1 << 2) | ||
464 | #define H3800_ASIC1_MMC_INT_MASK_BUFFER_READY (1 << 3) | ||
465 | |||
466 | #define H3800_ASIC1_MMC_BUFFER_PART_FULL (1 << 0) | ||
467 | |||
468 | /********* GPIO **********/ | ||
469 | |||
470 | #define _H3800_ASIC1_GPIO_Base 0x1e00 | ||
471 | |||
472 | #define _H3800_ASIC1_GPIO_Mask 0x30 /* R/W 0:don't mask, 1:mask interrupt */ | ||
473 | #define _H3800_ASIC1_GPIO_Direction 0x32 /* R/W 0:input, 1:output */ | ||
474 | #define _H3800_ASIC1_GPIO_Out 0x34 /* R/W 0:output low, 1:output high */ | ||
475 | #define _H3800_ASIC1_GPIO_TriggerType 0x36 /* R/W 0:level, 1:edge */ | ||
476 | #define _H3800_ASIC1_GPIO_EdgeTrigger 0x38 /* R/W 0:falling, 1:rising */ | ||
477 | #define _H3800_ASIC1_GPIO_LevelTrigger 0x3A /* R/W 0:low, 1:high level detect */ | ||
478 | #define _H3800_ASIC1_GPIO_LevelStatus 0x3C /* R/W 0:none, 1:detect */ | ||
479 | #define _H3800_ASIC1_GPIO_EdgeStatus 0x3E /* R/W 0:none, 1:detect */ | ||
480 | #define _H3800_ASIC1_GPIO_State 0x40 /* R See masks below (default 0) */ | ||
481 | #define _H3800_ASIC1_GPIO_Reset 0x42 /* R/W See masks below (default 0x04) */ | ||
482 | #define _H3800_ASIC1_GPIO_SleepMask 0x44 /* R/W 0:don't mask, 1:mask trigger in sleep mode */ | ||
483 | #define _H3800_ASIC1_GPIO_SleepDir 0x46 /* R/W direction 0:input, 1:output in sleep mode */ | ||
484 | #define _H3800_ASIC1_GPIO_SleepOut 0x48 /* R/W level 0:low, 1:high in sleep mode */ | ||
485 | #define _H3800_ASIC1_GPIO_Status 0x4A /* R Pin status */ | ||
486 | #define _H3800_ASIC1_GPIO_BattFaultDir 0x4C /* R/W direction 0:input, 1:output in batt_fault */ | ||
487 | #define _H3800_ASIC1_GPIO_BattFaultOut 0x4E /* R/W level 0:low, 1:high in batt_fault */ | ||
488 | |||
489 | #define H3800_ASIC1_GPIO_Mask H3800_ASIC1_OFFSET( u16, GPIO, Mask ) | ||
490 | #define H3800_ASIC1_GPIO_Direction H3800_ASIC1_OFFSET( u16, GPIO, Direction ) | ||
491 | #define H3800_ASIC1_GPIO_Out H3800_ASIC1_OFFSET( u16, GPIO, Out ) | ||
492 | #define H3800_ASIC1_GPIO_TriggerType H3800_ASIC1_OFFSET( u16, GPIO, TriggerType ) | ||
493 | #define H3800_ASIC1_GPIO_EdgeTrigger H3800_ASIC1_OFFSET( u16, GPIO, EdgeTrigger ) | ||
494 | #define H3800_ASIC1_GPIO_LevelTrigger H3800_ASIC1_OFFSET( u16, GPIO, LevelTrigger ) | ||
495 | #define H3800_ASIC1_GPIO_LevelStatus H3800_ASIC1_OFFSET( u16, GPIO, LevelStatus ) | ||
496 | #define H3800_ASIC1_GPIO_EdgeStatus H3800_ASIC1_OFFSET( u16, GPIO, EdgeStatus ) | ||
497 | #define H3800_ASIC1_GPIO_State H3800_ASIC1_OFFSET( u8, GPIO, State ) | ||
498 | #define H3800_ASIC1_GPIO_Reset H3800_ASIC1_OFFSET( u8, GPIO, Reset ) | ||
499 | #define H3800_ASIC1_GPIO_SleepMask H3800_ASIC1_OFFSET( u16, GPIO, SleepMask ) | ||
500 | #define H3800_ASIC1_GPIO_SleepDir H3800_ASIC1_OFFSET( u16, GPIO, SleepDir ) | ||
501 | #define H3800_ASIC1_GPIO_SleepOut H3800_ASIC1_OFFSET( u16, GPIO, SleepOut ) | ||
502 | #define H3800_ASIC1_GPIO_Status H3800_ASIC1_OFFSET( u16, GPIO, Status ) | ||
503 | #define H3800_ASIC1_GPIO_BattFaultDir H3800_ASIC1_OFFSET( u16, GPIO, BattFaultDir ) | ||
504 | #define H3800_ASIC1_GPIO_BattFaultOut H3800_ASIC1_OFFSET( u16, GPIO, BattFaultOut ) | ||
505 | |||
506 | #define H3800_ASIC1_GPIO_STATE_MASK (1 << 0) | ||
507 | #define H3800_ASIC1_GPIO_STATE_DIRECTION (1 << 1) | ||
508 | #define H3800_ASIC1_GPIO_STATE_OUT (1 << 2) | ||
509 | #define H3800_ASIC1_GPIO_STATE_TRIGGER_TYPE (1 << 3) | ||
510 | #define H3800_ASIC1_GPIO_STATE_EDGE_TRIGGER (1 << 4) | ||
511 | #define H3800_ASIC1_GPIO_STATE_LEVEL_TRIGGER (1 << 5) | ||
512 | |||
513 | #define H3800_ASIC1_GPIO_RESET_SOFTWARE (1 << 0) | ||
514 | #define H3800_ASIC1_GPIO_RESET_AUTO_SLEEP (1 << 1) | ||
515 | #define H3800_ASIC1_GPIO_RESET_FIRST_PWR_ON (1 << 2) | ||
516 | |||
517 | /* These are all outputs */ | ||
518 | #define GPIO_H3800_ASIC1_IR_ON_N (1 << 0) /* Apply power to the IR Module */ | ||
519 | #define GPIO_H3800_ASIC1_SD_PWR_ON (1 << 1) /* Secure Digital power on */ | ||
520 | #define GPIO_H3800_ASIC1_RS232_ON (1 << 2) /* Turn on power to the RS232 chip ? */ | ||
521 | #define GPIO_H3800_ASIC1_PULSE_GEN (1 << 3) /* Goes to speaker / earphone */ | ||
522 | #define GPIO_H3800_ASIC1_CH_TIMER (1 << 4) /* */ | ||
523 | #define GPIO_H3800_ASIC1_LCD_5V_ON (1 << 5) /* Enables LCD_5V */ | ||
524 | #define GPIO_H3800_ASIC1_LCD_ON (1 << 6) /* Enables LCD_3V */ | ||
525 | #define GPIO_H3800_ASIC1_LCD_PCI (1 << 7) /* Connects to PDWN on LCD controller */ | ||
526 | #define GPIO_H3800_ASIC1_VGH_ON (1 << 8) /* Drives VGH on the LCD (+9??) */ | ||
527 | #define GPIO_H3800_ASIC1_VGL_ON (1 << 9) /* Drivers VGL on the LCD (-6??) */ | ||
528 | #define GPIO_H3800_ASIC1_FL_PWR_ON (1 << 10) /* Frontlight power on */ | ||
529 | #define GPIO_H3800_ASIC1_BT_PWR_ON (1 << 11) /* Bluetooth power on */ | ||
530 | #define GPIO_H3800_ASIC1_SPK_ON (1 << 12) /* */ | ||
531 | #define GPIO_H3800_ASIC1_EAR_ON_N (1 << 13) /* */ | ||
532 | #define GPIO_H3800_ASIC1_AUD_PWR_ON (1 << 14) /* */ | ||
533 | |||
534 | /* Write enable for the flash */ | ||
535 | |||
536 | #define _H3800_ASIC1_FlashWP_Base 0x1F00 | ||
537 | #define _H3800_ASIC1_FlashWP_VPP_ON 0x00 /* R 1: write, 0: protect */ | ||
538 | #define H3800_ASIC1_FlashWP_VPP_ON H3800_ASIC1_OFFSET( u8, FlashWP, VPP_ON ) | ||
539 | 76 | ||
540 | #endif /* _INCLUDE_H3600_GPIO_H_ */ | 77 | #endif /* _INCLUDE_H3600_GPIO_H_ */ |
diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h index 0cb36609b3ac..ae81f80b0cf9 100644 --- a/arch/arm/mach-sa1100/include/mach/irqs.h +++ b/arch/arm/mach-sa1100/include/mach/irqs.h | |||
@@ -153,8 +153,6 @@ | |||
153 | */ | 153 | */ |
154 | #ifdef CONFIG_SA1111 | 154 | #ifdef CONFIG_SA1111 |
155 | #define NR_IRQS (IRQ_S1_BVD1_STSCHG + 1) | 155 | #define NR_IRQS (IRQ_S1_BVD1_STSCHG + 1) |
156 | #elif defined(CONFIG_SA1100_H3800) | ||
157 | #define NR_IRQS (IRQ_BOARD_END) | ||
158 | #elif defined(CONFIG_SHARP_LOCOMO) | 156 | #elif defined(CONFIG_SHARP_LOCOMO) |
159 | #define NR_IRQS (IRQ_LOCOMO_SPI_TEND + 1) | 157 | #define NR_IRQS (IRQ_LOCOMO_SPI_TEND + 1) |
160 | #else | 158 | #else |
@@ -175,23 +173,3 @@ | |||
175 | #define IRQ_LOCOMO_LT_BASE (IRQ_BOARD_START + 2) | 173 | #define IRQ_LOCOMO_LT_BASE (IRQ_BOARD_START + 2) |
176 | #define IRQ_LOCOMO_SPI_BASE (IRQ_BOARD_START + 3) | 174 | #define IRQ_LOCOMO_SPI_BASE (IRQ_BOARD_START + 3) |
177 | 175 | ||
178 | /* H3800-specific IRQs (CONFIG_SA1100_H3800) */ | ||
179 | #define H3800_KPIO_IRQ_START (IRQ_BOARD_START) | ||
180 | #define IRQ_H3800_KEY (IRQ_BOARD_START + 0) | ||
181 | #define IRQ_H3800_SPI (IRQ_BOARD_START + 1) | ||
182 | #define IRQ_H3800_OWM (IRQ_BOARD_START + 2) | ||
183 | #define IRQ_H3800_ADC (IRQ_BOARD_START + 3) | ||
184 | #define IRQ_H3800_UART_0 (IRQ_BOARD_START + 4) | ||
185 | #define IRQ_H3800_UART_1 (IRQ_BOARD_START + 5) | ||
186 | #define IRQ_H3800_TIMER_0 (IRQ_BOARD_START + 6) | ||
187 | #define IRQ_H3800_TIMER_1 (IRQ_BOARD_START + 7) | ||
188 | #define IRQ_H3800_TIMER_2 (IRQ_BOARD_START + 8) | ||
189 | #define H3800_KPIO_IRQ_COUNT 9 | ||
190 | |||
191 | #define H3800_GPIO_IRQ_START (IRQ_BOARD_START + 9) | ||
192 | #define IRQ_H3800_PEN (IRQ_BOARD_START + 9) | ||
193 | #define IRQ_H3800_SD_DETECT (IRQ_BOARD_START + 10) | ||
194 | #define IRQ_H3800_EAR_IN (IRQ_BOARD_START + 11) | ||
195 | #define IRQ_H3800_USB_DETECT (IRQ_BOARD_START + 12) | ||
196 | #define IRQ_H3800_SD_CON_SLT (IRQ_BOARD_START + 13) | ||
197 | #define H3800_GPIO_IRQ_COUNT 5 | ||
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index 81848aa96424..fd776bb666cd 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c | |||
@@ -226,12 +226,22 @@ static struct platform_device jornada_ssp_device = { | |||
226 | .id = -1, | 226 | .id = -1, |
227 | }; | 227 | }; |
228 | 228 | ||
229 | static struct platform_device jornada_kbd_device = { | ||
230 | .name = "jornada720_kbd", | ||
231 | .id = -1, | ||
232 | }; | ||
233 | |||
234 | static struct platform_device jornada_ts_device = { | ||
235 | .name = "jornada_ts", | ||
236 | .id = -1, | ||
237 | }; | ||
238 | |||
229 | static struct platform_device *devices[] __initdata = { | 239 | static struct platform_device *devices[] __initdata = { |
230 | &sa1111_device, | 240 | &sa1111_device, |
231 | #ifdef CONFIG_SA1100_JORNADA720_SSP | ||
232 | &jornada_ssp_device, | 241 | &jornada_ssp_device, |
233 | #endif | ||
234 | &s1d13xxxfb_device, | 242 | &s1d13xxxfb_device, |
243 | &jornada_kbd_device, | ||
244 | &jornada_ts_device, | ||
235 | }; | 245 | }; |
236 | 246 | ||
237 | static int __init jornada720_init(void) | 247 | static int __init jornada720_init(void) |
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index a23fd3d0163a..4f3a26512599 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c | |||
@@ -16,12 +16,28 @@ | |||
16 | #include <asm/leds.h> | 16 | #include <asm/leds.h> |
17 | #include <asm/param.h> | 17 | #include <asm/param.h> |
18 | 18 | ||
19 | #include <mach/hardware.h> | ||
20 | |||
21 | #include <asm/mach/map.h> | 19 | #include <asm/mach/map.h> |
22 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
23 | #include <asm/mach/time.h> | 21 | #include <asm/mach/time.h> |
24 | 22 | ||
23 | #define IO_BASE 0xe0000000 | ||
24 | #define IO_SIZE 0x08000000 | ||
25 | #define IO_START 0x40000000 | ||
26 | #define ROMCARD_SIZE 0x08000000 | ||
27 | #define ROMCARD_START 0x10000000 | ||
28 | |||
29 | void arch_reset(char mode) | ||
30 | { | ||
31 | short temp; | ||
32 | local_irq_disable(); | ||
33 | /* Reset the Machine via pc[3] of the sequoia chipset */ | ||
34 | outw(0x09,0x24); | ||
35 | temp=inw(0x26); | ||
36 | temp = temp | (1<<3) | (1<<10); | ||
37 | outw(0x09,0x24); | ||
38 | outw(temp,0x26); | ||
39 | } | ||
40 | |||
25 | static struct plat_serial8250_port serial_platform_data[] = { | 41 | static struct plat_serial8250_port serial_platform_data[] = { |
26 | { | 42 | { |
27 | .iobase = 0x3f8, | 43 | .iobase = 0x3f8, |
@@ -50,14 +66,38 @@ static struct platform_device serial_device = { | |||
50 | }, | 66 | }, |
51 | }; | 67 | }; |
52 | 68 | ||
69 | static struct resource rtc_resources[] = { | ||
70 | [0] = { | ||
71 | .start = 0x70, | ||
72 | .end = 0x73, | ||
73 | .flags = IORESOURCE_IO, | ||
74 | }, | ||
75 | [1] = { | ||
76 | .start = IRQ_ISA_RTC_ALARM, | ||
77 | .end = IRQ_ISA_RTC_ALARM, | ||
78 | .flags = IORESOURCE_IRQ, | ||
79 | } | ||
80 | }; | ||
81 | |||
82 | static struct platform_device rtc_device = { | ||
83 | .name = "rtc_cmos", | ||
84 | .id = -1, | ||
85 | .resource = rtc_resources, | ||
86 | .num_resources = ARRAY_SIZE(rtc_resources), | ||
87 | }; | ||
88 | |||
53 | static int __init shark_init(void) | 89 | static int __init shark_init(void) |
54 | { | 90 | { |
55 | int ret; | 91 | int ret; |
56 | 92 | ||
57 | if (machine_is_shark()) | 93 | if (machine_is_shark()) |
94 | { | ||
95 | ret = platform_device_register(&rtc_device); | ||
96 | if (ret) printk(KERN_ERR "Unable to register RTC device: %d\n", ret); | ||
58 | ret = platform_device_register(&serial_device); | 97 | ret = platform_device_register(&serial_device); |
59 | 98 | if (ret) printk(KERN_ERR "Unable to register Serial device: %d\n", ret); | |
60 | return ret; | 99 | } |
100 | return 0; | ||
61 | } | 101 | } |
62 | 102 | ||
63 | arch_initcall(shark_init); | 103 | arch_initcall(shark_init); |
diff --git a/arch/arm/mach-shark/dma.c b/arch/arm/mach-shark/dma.c index 6774b8d5d13d..10b5b8b3272a 100644 --- a/arch/arm/mach-shark/dma.c +++ b/arch/arm/mach-shark/dma.c | |||
@@ -13,9 +13,11 @@ | |||
13 | #include <asm/dma.h> | 13 | #include <asm/dma.h> |
14 | #include <asm/mach/dma.h> | 14 | #include <asm/mach/dma.h> |
15 | 15 | ||
16 | void __init arch_dma_init(dma_t *dma) | 16 | static int __init shark_dma_init(void) |
17 | { | 17 | { |
18 | #ifdef CONFIG_ISA_DMA | 18 | #ifdef CONFIG_ISA_DMA |
19 | isa_init_dma(dma); | 19 | isa_init_dma(); |
20 | #endif | 20 | #endif |
21 | return 0; | ||
21 | } | 22 | } |
23 | core_initcall(shark_dma_init); | ||
diff --git a/arch/arm/mach-shark/include/mach/debug-macro.S b/arch/arm/mach-shark/include/mach/debug-macro.S index 0836cb78b29a..f97a7626bd58 100644 --- a/arch/arm/mach-shark/include/mach/debug-macro.S +++ b/arch/arm/mach-shark/include/mach/debug-macro.S | |||
@@ -27,5 +27,3 @@ | |||
27 | bne 1001b | 27 | bne 1001b |
28 | .endm | 28 | .endm |
29 | 29 | ||
30 | .macro waituart,rd,rx | ||
31 | .endm | ||
diff --git a/arch/arm/mach-shark/include/mach/framebuffer.h b/arch/arm/mach-shark/include/mach/framebuffer.h new file mode 100644 index 000000000000..84a5bf6e5ba3 --- /dev/null +++ b/arch/arm/mach-shark/include/mach/framebuffer.h | |||
@@ -0,0 +1,16 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-shark/include/mach/framebuffer.h | ||
3 | * | ||
4 | * by Alexander Schulz | ||
5 | * | ||
6 | */ | ||
7 | |||
8 | #ifndef __ASM_ARCH_FRAMEBUFFER_H | ||
9 | #define __ASM_ARCH_FRAMEBUFFER_H | ||
10 | |||
11 | /* defines for the Framebuffer */ | ||
12 | #define FB_START 0x06000000 | ||
13 | #define FB_SIZE 0x01000000 | ||
14 | |||
15 | #endif | ||
16 | |||
diff --git a/arch/arm/mach-shark/include/mach/hardware.h b/arch/arm/mach-shark/include/mach/hardware.h index 01bf76099ce5..94d84b27a0cb 100644 --- a/arch/arm/mach-shark/include/mach/hardware.h +++ b/arch/arm/mach-shark/include/mach/hardware.h | |||
@@ -10,35 +10,8 @@ | |||
10 | #ifndef __ASM_ARCH_HARDWARE_H | 10 | #ifndef __ASM_ARCH_HARDWARE_H |
11 | #define __ASM_ARCH_HARDWARE_H | 11 | #define __ASM_ARCH_HARDWARE_H |
12 | 12 | ||
13 | #ifndef __ASSEMBLY__ | ||
14 | |||
15 | /* | ||
16 | * Mapping areas | ||
17 | */ | ||
18 | #define IO_BASE 0xe0000000 | ||
19 | |||
20 | #else | ||
21 | |||
22 | #define IO_BASE 0 | ||
23 | |||
24 | #endif | ||
25 | |||
26 | #define IO_SIZE 0x08000000 | ||
27 | #define IO_START 0x40000000 | ||
28 | #define ROMCARD_SIZE 0x08000000 | ||
29 | #define ROMCARD_START 0x10000000 | ||
30 | |||
31 | |||
32 | /* defines for the Framebuffer */ | ||
33 | #define FB_START 0x06000000 | ||
34 | #define FB_SIZE 0x01000000 | ||
35 | |||
36 | #define UNCACHEABLE_ADDR 0xdf010000 | 13 | #define UNCACHEABLE_ADDR 0xdf010000 |
37 | 14 | ||
38 | #define SEQUOIA_LED_GREEN (1<<6) | ||
39 | #define SEQUOIA_LED_AMBER (1<<5) | ||
40 | #define SEQUOIA_LED_BACK (1<<7) | ||
41 | |||
42 | #define pcibios_assign_all_busses() 1 | 15 | #define pcibios_assign_all_busses() 1 |
43 | 16 | ||
44 | #define PCIBIOS_MIN_IO 0x6000 | 17 | #define PCIBIOS_MIN_IO 0x6000 |
diff --git a/arch/arm/mach-shark/include/mach/io.h b/arch/arm/mach-shark/include/mach/io.h index c5cee829fc87..9ccbcecc430b 100644 --- a/arch/arm/mach-shark/include/mach/io.h +++ b/arch/arm/mach-shark/include/mach/io.h | |||
@@ -11,10 +11,10 @@ | |||
11 | #ifndef __ASM_ARM_ARCH_IO_H | 11 | #ifndef __ASM_ARM_ARCH_IO_H |
12 | #define __ASM_ARM_ARCH_IO_H | 12 | #define __ASM_ARM_ARCH_IO_H |
13 | 13 | ||
14 | #define PCIO_BASE 0xe0000000 | 14 | #define IO_SPACE_LIMIT 0xffffffff |
15 | #define IO_SPACE_LIMIT 0xffffffff | ||
16 | 15 | ||
17 | #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) | 16 | #define __io(a) ((void __iomem *)(0xe0000000 + (a))) |
18 | #define __mem_pci(addr) (addr) | 17 | |
18 | #define __mem_pci(addr) (addr) | ||
19 | 19 | ||
20 | #endif | 20 | #endif |
diff --git a/arch/arm/mach-shark/include/mach/irqs.h b/arch/arm/mach-shark/include/mach/irqs.h index 0586acd7cdd5..c8e8a4e1f61a 100644 --- a/arch/arm/mach-shark/include/mach/irqs.h +++ b/arch/arm/mach-shark/include/mach/irqs.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #define NR_IRQS 16 | 7 | #define NR_IRQS 16 |
8 | 8 | ||
9 | #define IRQ_ISA_KEYBOARD 1 | 9 | #define IRQ_ISA_KEYBOARD 1 |
10 | #define RTC_IRQ 8 | 10 | #define IRQ_ISA_RTC_ALARM 8 |
11 | #define I8042_KBD_IRQ 1 | 11 | #define I8042_KBD_IRQ 1 |
12 | #define I8042_AUX_IRQ 12 | 12 | #define I8042_AUX_IRQ 12 |
13 | #define IRQ_HARDDISK 14 | 13 | #define IRQ_HARDDISK 14 |
diff --git a/arch/arm/mach-shark/include/mach/isa-dma.h b/arch/arm/mach-shark/include/mach/isa-dma.h index 864298ff3927..96c43b8f8dda 100644 --- a/arch/arm/mach-shark/include/mach/isa-dma.h +++ b/arch/arm/mach-shark/include/mach/isa-dma.h | |||
@@ -6,10 +6,6 @@ | |||
6 | #ifndef __ASM_ARCH_DMA_H | 6 | #ifndef __ASM_ARCH_DMA_H |
7 | #define __ASM_ARCH_DMA_H | 7 | #define __ASM_ARCH_DMA_H |
8 | 8 | ||
9 | /* Use only the lowest 4MB, nothing else works. | ||
10 | * The rest is not DMAable. See dev / .properties | ||
11 | * in OpenFirmware. | ||
12 | */ | ||
13 | #define MAX_DMA_CHANNELS 8 | 9 | #define MAX_DMA_CHANNELS 8 |
14 | #define DMA_ISA_CASCADE 4 | 10 | #define DMA_ISA_CASCADE 4 |
15 | 11 | ||
diff --git a/arch/arm/mach-shark/include/mach/memory.h b/arch/arm/mach-shark/include/mach/memory.h index c5ab038925d6..3053e5b7f168 100644 --- a/arch/arm/mach-shark/include/mach/memory.h +++ b/arch/arm/mach-shark/include/mach/memory.h | |||
@@ -23,6 +23,7 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig | |||
23 | { | 23 | { |
24 | if (node != 0) return; | 24 | if (node != 0) return; |
25 | /* Only the first 4 MB (=1024 Pages) are usable for DMA */ | 25 | /* Only the first 4 MB (=1024 Pages) are usable for DMA */ |
26 | /* See dev / -> .properties in OpenFirmware. */ | ||
26 | zone_size[1] = zone_size[0] - 1024; | 27 | zone_size[1] = zone_size[0] - 1024; |
27 | zone_size[0] = 1024; | 28 | zone_size[0] = 1024; |
28 | zhole_size[1] = zhole_size[0]; | 29 | zhole_size[1] = zhole_size[0]; |
diff --git a/arch/arm/mach-shark/include/mach/system.h b/arch/arm/mach-shark/include/mach/system.h index e45bd734a03e..0752ca29971a 100644 --- a/arch/arm/mach-shark/include/mach/system.h +++ b/arch/arm/mach-shark/include/mach/system.h | |||
@@ -6,20 +6,8 @@ | |||
6 | #ifndef __ASM_ARCH_SYSTEM_H | 6 | #ifndef __ASM_ARCH_SYSTEM_H |
7 | #define __ASM_ARCH_SYSTEM_H | 7 | #define __ASM_ARCH_SYSTEM_H |
8 | 8 | ||
9 | #include <linux/io.h> | 9 | /* Found in arch/mach-shark/core.c */ |
10 | 10 | extern void arch_reset(char mode); | |
11 | static void arch_reset(char mode) | ||
12 | { | ||
13 | short temp; | ||
14 | local_irq_disable(); | ||
15 | /* Reset the Machine via pc[3] of the sequoia chipset */ | ||
16 | outw(0x09,0x24); | ||
17 | temp=inw(0x26); | ||
18 | temp = temp | (1<<3) | (1<<10); | ||
19 | outw(0x09,0x24); | ||
20 | outw(temp,0x26); | ||
21 | |||
22 | } | ||
23 | 11 | ||
24 | static inline void arch_idle(void) | 12 | static inline void arch_idle(void) |
25 | { | 13 | { |
diff --git a/arch/arm/mach-shark/include/mach/uncompress.h b/arch/arm/mach-shark/include/mach/uncompress.h index 3725e1633418..22ccab4c3c5e 100644 --- a/arch/arm/mach-shark/include/mach/uncompress.h +++ b/arch/arm/mach-shark/include/mach/uncompress.h | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | static inline void putc(int c) | 12 | static inline void putc(int c) |
13 | { | 13 | { |
14 | int t; | 14 | volatile int t; |
15 | 15 | ||
16 | SERIAL_BASE[0] = c; | 16 | SERIAL_BASE[0] = c; |
17 | t=0x10000; | 17 | t=0x10000; |
diff --git a/arch/arm/mach-shark/leds.c b/arch/arm/mach-shark/leds.c index 8bd8d6bb4d92..c9e32de4adf9 100644 --- a/arch/arm/mach-shark/leds.c +++ b/arch/arm/mach-shark/leds.c | |||
@@ -22,12 +22,16 @@ | |||
22 | #include <linux/ioport.h> | 22 | #include <linux/ioport.h> |
23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
24 | 24 | ||
25 | #include <mach/hardware.h> | ||
26 | #include <asm/leds.h> | 25 | #include <asm/leds.h> |
27 | #include <asm/system.h> | 26 | #include <asm/system.h> |
28 | 27 | ||
29 | #define LED_STATE_ENABLED 1 | 28 | #define LED_STATE_ENABLED 1 |
30 | #define LED_STATE_CLAIMED 2 | 29 | #define LED_STATE_CLAIMED 2 |
30 | |||
31 | #define SEQUOIA_LED_GREEN (1<<6) | ||
32 | #define SEQUOIA_LED_AMBER (1<<5) | ||
33 | #define SEQUOIA_LED_BACK (1<<7) | ||
34 | |||
31 | static char led_state; | 35 | static char led_state; |
32 | static short hw_led_state; | 36 | static short hw_led_state; |
33 | static short saved_state; | 37 | static short saved_state; |
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 1c43494f5c42..565776680d8c 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
@@ -335,11 +335,25 @@ static struct resource versatile_i2c_resource = { | |||
335 | 335 | ||
336 | static struct platform_device versatile_i2c_device = { | 336 | static struct platform_device versatile_i2c_device = { |
337 | .name = "versatile-i2c", | 337 | .name = "versatile-i2c", |
338 | .id = -1, | 338 | .id = 0, |
339 | .num_resources = 1, | 339 | .num_resources = 1, |
340 | .resource = &versatile_i2c_resource, | 340 | .resource = &versatile_i2c_resource, |
341 | }; | 341 | }; |
342 | 342 | ||
343 | static struct i2c_board_info versatile_i2c_board_info[] = { | ||
344 | { | ||
345 | I2C_BOARD_INFO("rtc-ds1307", 0xd0 >> 1), | ||
346 | .type = "ds1338", | ||
347 | }, | ||
348 | }; | ||
349 | |||
350 | static int __init versatile_i2c_init(void) | ||
351 | { | ||
352 | return i2c_register_board_info(0, versatile_i2c_board_info, | ||
353 | ARRAY_SIZE(versatile_i2c_board_info)); | ||
354 | } | ||
355 | arch_initcall(versatile_i2c_init); | ||
356 | |||
343 | #define VERSATILE_SYSMCI (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_MCI_OFFSET) | 357 | #define VERSATILE_SYSMCI (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_MCI_OFFSET) |
344 | 358 | ||
345 | unsigned int mmc_status(struct device *dev) | 359 | unsigned int mmc_status(struct device *dev) |
diff --git a/arch/arm/mach-w90x900/cpu.h b/arch/arm/mach-w90x900/cpu.h index 40ff40845df0..de29ddcb9459 100644 --- a/arch/arm/mach-w90x900/cpu.h +++ b/arch/arm/mach-w90x900/cpu.h | |||
@@ -43,35 +43,16 @@ extern void w90p910_init_io(struct map_desc *mach_desc, int size); | |||
43 | extern void w90p910_init_uarts(struct w90x900_uartcfg *cfg, int no); | 43 | extern void w90p910_init_uarts(struct w90x900_uartcfg *cfg, int no); |
44 | extern void w90p910_init_clocks(int xtal); | 44 | extern void w90p910_init_clocks(int xtal); |
45 | extern void w90p910_map_io(struct map_desc *mach_desc, int size); | 45 | extern void w90p910_map_io(struct map_desc *mach_desc, int size); |
46 | extern struct platform_device w90p910_serial_device; | ||
46 | extern struct sys_timer w90x900_timer; | 47 | extern struct sys_timer w90x900_timer; |
47 | 48 | ||
48 | #define W90X900_RES(name) \ | 49 | #define W90X900_8250PORT(name) \ |
49 | struct resource w90x900_##name##_resource[] = { \ | 50 | { \ |
50 | [0] = { \ | 51 | .membase = name##_BA, \ |
51 | .start = name##_PA, \ | 52 | .mapbase = name##_PA, \ |
52 | .end = name##_PA + 0x0ff, \ | 53 | .irq = IRQ_##name, \ |
53 | .flags = IORESOURCE_MEM, \ | 54 | .uartclk = 11313600, \ |
54 | }, \ | 55 | .regshift = 2, \ |
55 | [1] = { \ | 56 | .iotype = UPIO_MEM, \ |
56 | .start = IRQ_##name, \ | 57 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, \ |
57 | .end = IRQ_##name, \ | ||
58 | .flags = IORESOURCE_IRQ, \ | ||
59 | } \ | ||
60 | } | ||
61 | |||
62 | #define W90X900_DEVICE(devname, regname, devid, platdevname) \ | ||
63 | struct platform_device w90x900_##devname = { \ | ||
64 | .name = platdevname, \ | ||
65 | .id = devid, \ | ||
66 | .num_resources = ARRAY_SIZE(w90x900_##regname##_resource), \ | ||
67 | .resource = w90x900_##regname##_resource, \ | ||
68 | } | ||
69 | |||
70 | #define W90X900_UARTCFG(port, flag, uc, ulc, ufc) \ | ||
71 | { \ | ||
72 | .hwport = port, \ | ||
73 | .flags = flag, \ | ||
74 | .ucon = uc, \ | ||
75 | .ulcon = ulc, \ | ||
76 | .ufcon = ufc, \ | ||
77 | } | 58 | } |
diff --git a/arch/arm/mach-w90x900/mach-w90p910evb.c b/arch/arm/mach-w90x900/mach-w90p910evb.c index 9ebc93f48530..726ff6798a56 100644 --- a/arch/arm/mach-w90x900/mach-w90p910evb.c +++ b/arch/arm/mach-w90x900/mach-w90p910evb.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/timer.h> | 22 | #include <linux/timer.h> |
23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/mtd/physmap.h> | ||
25 | 26 | ||
26 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
27 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
@@ -32,28 +33,67 @@ | |||
32 | #include <mach/map.h> | 33 | #include <mach/map.h> |
33 | 34 | ||
34 | #include "cpu.h" | 35 | #include "cpu.h" |
36 | /*w90p910 evb norflash driver data */ | ||
35 | 37 | ||
36 | static struct map_desc w90p910_iodesc[] __initdata = { | 38 | #define W90P910_FLASH_BASE 0xA0000000 |
39 | #define W90P910_FLASH_SIZE 0x400000 | ||
40 | |||
41 | static struct mtd_partition w90p910_flash_partitions[] = { | ||
42 | { | ||
43 | .name = "NOR Partition 1 for kernel (960K)", | ||
44 | .size = 0xF0000, | ||
45 | .offset = 0x10000, | ||
46 | }, | ||
47 | { | ||
48 | .name = "NOR Partition 2 for image (1M)", | ||
49 | .size = 0x100000, | ||
50 | .offset = 0x100000, | ||
51 | }, | ||
52 | { | ||
53 | .name = "NOR Partition 3 for user (2M)", | ||
54 | .size = 0x200000, | ||
55 | .offset = 0x00200000, | ||
56 | } | ||
37 | }; | 57 | }; |
38 | 58 | ||
39 | static struct w90x900_uartcfg w90p910_uartcfgs[] = { | 59 | static struct physmap_flash_data w90p910_flash_data = { |
40 | W90X900_UARTCFG(0, 0, 0, 0, 0), | 60 | .width = 2, |
41 | W90X900_UARTCFG(1, 0, 0, 0, 0), | 61 | .parts = w90p910_flash_partitions, |
42 | W90X900_UARTCFG(2, 0, 0, 0, 0), | 62 | .nr_parts = ARRAY_SIZE(w90p910_flash_partitions), |
43 | W90X900_UARTCFG(3, 0, 0, 0, 0), | 63 | }; |
44 | W90X900_UARTCFG(4, 0, 0, 0, 0), | 64 | |
65 | static struct resource w90p910_flash_resources[] = { | ||
66 | { | ||
67 | .start = W90P910_FLASH_BASE, | ||
68 | .end = W90P910_FLASH_BASE + W90P910_FLASH_SIZE - 1, | ||
69 | .flags = IORESOURCE_MEM, | ||
70 | } | ||
71 | }; | ||
72 | |||
73 | static struct platform_device w90p910_flash_device = { | ||
74 | .name = "physmap-flash", | ||
75 | .id = 0, | ||
76 | .dev = { | ||
77 | .platform_data = &w90p910_flash_data, | ||
78 | }, | ||
79 | .resource = w90p910_flash_resources, | ||
80 | .num_resources = ARRAY_SIZE(w90p910_flash_resources), | ||
81 | }; | ||
82 | |||
83 | static struct map_desc w90p910_iodesc[] __initdata = { | ||
45 | }; | 84 | }; |
46 | 85 | ||
47 | /*Here should be your evb resourse,such as LCD*/ | 86 | /*Here should be your evb resourse,such as LCD*/ |
48 | 87 | ||
49 | static struct platform_device *w90p910evb_dev[] __initdata = { | 88 | static struct platform_device *w90p910evb_dev[] __initdata = { |
89 | &w90p910_serial_device, | ||
90 | &w90p910_flash_device, | ||
50 | }; | 91 | }; |
51 | 92 | ||
52 | static void __init w90p910evb_map_io(void) | 93 | static void __init w90p910evb_map_io(void) |
53 | { | 94 | { |
54 | w90p910_map_io(w90p910_iodesc, ARRAY_SIZE(w90p910_iodesc)); | 95 | w90p910_map_io(w90p910_iodesc, ARRAY_SIZE(w90p910_iodesc)); |
55 | w90p910_init_clocks(0); | 96 | w90p910_init_clocks(0); |
56 | w90p910_init_uarts(w90p910_uartcfgs, ARRAY_SIZE(w90p910_uartcfgs)); | ||
57 | } | 97 | } |
58 | 98 | ||
59 | static void __init w90p910evb_init(void) | 99 | static void __init w90p910evb_init(void) |
diff --git a/arch/arm/mach-w90x900/w90p910.c b/arch/arm/mach-w90x900/w90p910.c index aa783bc94310..2bcbaa681b99 100644 --- a/arch/arm/mach-w90x900/w90p910.c +++ b/arch/arm/mach-w90x900/w90p910.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
28 | #include <linux/serial_8250.h> | ||
28 | 29 | ||
29 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
30 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
@@ -36,12 +37,6 @@ | |||
36 | 37 | ||
37 | #include "cpu.h" | 38 | #include "cpu.h" |
38 | 39 | ||
39 | /*W90P910 has five uarts*/ | ||
40 | |||
41 | #define MAX_UART_COUNT 5 | ||
42 | static int uart_count; | ||
43 | static struct platform_device *uart_devs[MAX_UART_COUNT-1]; | ||
44 | |||
45 | /* Initial IO mappings */ | 40 | /* Initial IO mappings */ |
46 | 41 | ||
47 | static struct map_desc w90p910_iodesc[] __initdata = { | 42 | static struct map_desc w90p910_iodesc[] __initdata = { |
@@ -53,48 +48,19 @@ static struct map_desc w90p910_iodesc[] __initdata = { | |||
53 | /*IODESC_ENT(LCD),*/ | 48 | /*IODESC_ENT(LCD),*/ |
54 | }; | 49 | }; |
55 | 50 | ||
56 | /*Init the dev resource*/ | 51 | /* Initial serial platform data */ |
57 | |||
58 | static W90X900_RES(UART0); | ||
59 | static W90X900_RES(UART1); | ||
60 | static W90X900_RES(UART2); | ||
61 | static W90X900_RES(UART3); | ||
62 | static W90X900_RES(UART4); | ||
63 | static W90X900_DEVICE(uart0, UART0, 0, "w90x900-uart"); | ||
64 | static W90X900_DEVICE(uart1, UART1, 1, "w90x900-uart"); | ||
65 | static W90X900_DEVICE(uart2, UART2, 2, "w90x900-uart"); | ||
66 | static W90X900_DEVICE(uart3, UART3, 3, "w90x900-uart"); | ||
67 | static W90X900_DEVICE(uart4, UART4, 4, "w90x900-uart"); | ||
68 | |||
69 | static struct platform_device *uart_devices[] __initdata = { | ||
70 | &w90x900_uart0, | ||
71 | &w90x900_uart1, | ||
72 | &w90x900_uart2, | ||
73 | &w90x900_uart3, | ||
74 | &w90x900_uart4 | ||
75 | }; | ||
76 | 52 | ||
77 | /*Init W90P910 uart device*/ | 53 | struct plat_serial8250_port w90p910_uart_data[] = { |
54 | W90X900_8250PORT(UART0), | ||
55 | }; | ||
78 | 56 | ||
79 | void __init w90p910_init_uarts(struct w90x900_uartcfg *cfg, int no) | 57 | struct platform_device w90p910_serial_device = { |
80 | { | 58 | .name = "serial8250", |
81 | struct platform_device *platdev; | 59 | .id = PLAT8250_DEV_PLATFORM, |
82 | int uart, uartdev; | 60 | .dev = { |
83 | 61 | .platform_data = w90p910_uart_data, | |
84 | /*By min() to judge count of uart be used indeed*/ | 62 | }, |
85 | 63 | }; | |
86 | uartdev = ARRAY_SIZE(uart_devices); | ||
87 | no = min(uartdev, no); | ||
88 | |||
89 | for (uart = 0; uart < no; uart++, cfg++) { | ||
90 | if (cfg->hwport != uart) | ||
91 | printk(KERN_ERR "w90x900_uartcfg[%d] error\n", uart); | ||
92 | platdev = uart_devices[cfg->hwport]; | ||
93 | uart_devs[uart] = platdev; | ||
94 | platdev->dev.platform_data = cfg; | ||
95 | } | ||
96 | uart_count = uart; | ||
97 | } | ||
98 | 64 | ||
99 | /*Init W90P910 evb io*/ | 65 | /*Init W90P910 evb io*/ |
100 | 66 | ||
@@ -122,13 +88,6 @@ static int __init w90p910_init_cpu(void) | |||
122 | 88 | ||
123 | static int __init w90x900_arch_init(void) | 89 | static int __init w90x900_arch_init(void) |
124 | { | 90 | { |
125 | int ret; | 91 | return w90p910_init_cpu(); |
126 | |||
127 | ret = w90p910_init_cpu(); | ||
128 | if (ret != 0) | ||
129 | return ret; | ||
130 | |||
131 | return platform_add_devices(uart_devs, uart_count); | ||
132 | |||
133 | } | 92 | } |
134 | arch_initcall(w90x900_arch_init); | 93 | arch_initcall(w90x900_arch_init); |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index d4d082c5c2d4..8c6fc5a6237e 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -243,6 +243,10 @@ static struct mem_type mem_types[] = { | |||
243 | .prot_sect = PMD_TYPE_SECT, | 243 | .prot_sect = PMD_TYPE_SECT, |
244 | .domain = DOMAIN_KERNEL, | 244 | .domain = DOMAIN_KERNEL, |
245 | }, | 245 | }, |
246 | [MT_MEMORY_NONCACHED] = { | ||
247 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE, | ||
248 | .domain = DOMAIN_KERNEL, | ||
249 | }, | ||
246 | }; | 250 | }; |
247 | 251 | ||
248 | const struct mem_type *get_mem_type(unsigned int type) | 252 | const struct mem_type *get_mem_type(unsigned int type) |
@@ -406,9 +410,28 @@ static void __init build_mem_type_table(void) | |||
406 | kern_pgprot |= L_PTE_SHARED; | 410 | kern_pgprot |= L_PTE_SHARED; |
407 | vecs_pgprot |= L_PTE_SHARED; | 411 | vecs_pgprot |= L_PTE_SHARED; |
408 | mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S; | 412 | mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S; |
413 | mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S; | ||
409 | #endif | 414 | #endif |
410 | } | 415 | } |
411 | 416 | ||
417 | /* | ||
418 | * Non-cacheable Normal - intended for memory areas that must | ||
419 | * not cause dirty cache line writebacks when used | ||
420 | */ | ||
421 | if (cpu_arch >= CPU_ARCH_ARMv6) { | ||
422 | if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) { | ||
423 | /* Non-cacheable Normal is XCB = 001 */ | ||
424 | mem_types[MT_MEMORY_NONCACHED].prot_sect |= | ||
425 | PMD_SECT_BUFFERED; | ||
426 | } else { | ||
427 | /* For both ARMv6 and non-TEX-remapping ARMv7 */ | ||
428 | mem_types[MT_MEMORY_NONCACHED].prot_sect |= | ||
429 | PMD_SECT_TEX(1); | ||
430 | } | ||
431 | } else { | ||
432 | mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE; | ||
433 | } | ||
434 | |||
412 | for (i = 0; i < 16; i++) { | 435 | for (i = 0; i < 16; i++) { |
413 | unsigned long v = pgprot_val(protection_map[i]); | 436 | unsigned long v = pgprot_val(protection_map[i]); |
414 | protection_map[i] = __pgprot(v | user_pgprot); | 437 | protection_map[i] = __pgprot(v | user_pgprot); |
diff --git a/arch/arm/oprofile/backtrace.c b/arch/arm/oprofile/backtrace.c index cefc21c2eee4..d805a52b5032 100644 --- a/arch/arm/oprofile/backtrace.c +++ b/arch/arm/oprofile/backtrace.c | |||
@@ -18,15 +18,14 @@ | |||
18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
19 | #include <linux/uaccess.h> | 19 | #include <linux/uaccess.h> |
20 | #include <asm/ptrace.h> | 20 | #include <asm/ptrace.h> |
21 | 21 | #include <asm/stacktrace.h> | |
22 | #include "../kernel/stacktrace.h" | ||
23 | 22 | ||
24 | static int report_trace(struct stackframe *frame, void *d) | 23 | static int report_trace(struct stackframe *frame, void *d) |
25 | { | 24 | { |
26 | unsigned int *depth = d; | 25 | unsigned int *depth = d; |
27 | 26 | ||
28 | if (*depth) { | 27 | if (*depth) { |
29 | oprofile_add_trace(frame->lr); | 28 | oprofile_add_trace(frame->pc); |
30 | (*depth)--; | 29 | (*depth)--; |
31 | } | 30 | } |
32 | 31 | ||
@@ -70,9 +69,12 @@ void arm_backtrace(struct pt_regs * const regs, unsigned int depth) | |||
70 | struct frame_tail *tail = ((struct frame_tail *) regs->ARM_fp) - 1; | 69 | struct frame_tail *tail = ((struct frame_tail *) regs->ARM_fp) - 1; |
71 | 70 | ||
72 | if (!user_mode(regs)) { | 71 | if (!user_mode(regs)) { |
73 | unsigned long base = ((unsigned long)regs) & ~(THREAD_SIZE - 1); | 72 | struct stackframe frame; |
74 | walk_stackframe(regs->ARM_fp, base, base + THREAD_SIZE, | 73 | frame.fp = regs->ARM_fp; |
75 | report_trace, &depth); | 74 | frame.sp = regs->ARM_sp; |
75 | frame.lr = regs->ARM_lr; | ||
76 | frame.pc = regs->ARM_pc; | ||
77 | walk_stackframe(&frame, report_trace, &depth); | ||
76 | return; | 78 | return; |
77 | } | 79 | } |
78 | 80 | ||
diff --git a/arch/arm/plat-mxc/dma-mx1-mx2.c b/arch/arm/plat-mxc/dma-mx1-mx2.c index 1d64287c3078..e364a5ed10f1 100644 --- a/arch/arm/plat-mxc/dma-mx1-mx2.c +++ b/arch/arm/plat-mxc/dma-mx1-mx2.c | |||
@@ -113,7 +113,7 @@ struct imx_dma_channel { | |||
113 | void (*err_handler) (int, void *, int errcode); | 113 | void (*err_handler) (int, void *, int errcode); |
114 | void (*prog_handler) (int, void *, struct scatterlist *); | 114 | void (*prog_handler) (int, void *, struct scatterlist *); |
115 | void *data; | 115 | void *data; |
116 | unsigned int dma_mode; | 116 | unsigned int dma_mode; |
117 | struct scatterlist *sg; | 117 | struct scatterlist *sg; |
118 | unsigned int resbytes; | 118 | unsigned int resbytes; |
119 | int dma_num; | 119 | int dma_num; |
diff --git a/arch/arm/plat-s3c/include/plat/uncompress.h b/arch/arm/plat-s3c/include/plat/uncompress.h index 6061de87f225..dc66a477f62e 100644 --- a/arch/arm/plat-s3c/include/plat/uncompress.h +++ b/arch/arm/plat-s3c/include/plat/uncompress.h | |||
@@ -90,7 +90,10 @@ static inline void flush(void) | |||
90 | { | 90 | { |
91 | } | 91 | } |
92 | 92 | ||
93 | #define __raw_writel(d,ad) do { *((volatile unsigned int *)(ad)) = (d); } while(0) | 93 | #define __raw_writel(d, ad) \ |
94 | do { \ | ||
95 | *((volatile unsigned int __force *)(ad)) = (d); \ | ||
96 | } while (0) | ||
94 | 97 | ||
95 | /* CONFIG_S3C_BOOT_WATCHDOG | 98 | /* CONFIG_S3C_BOOT_WATCHDOG |
96 | * | 99 | * |
diff --git a/arch/arm/vfp/vfp.h b/arch/arm/vfp/vfp.h index 8de86e4feada..c8c98dd44ad4 100644 --- a/arch/arm/vfp/vfp.h +++ b/arch/arm/vfp/vfp.h | |||
@@ -377,6 +377,4 @@ struct op { | |||
377 | u32 flags; | 377 | u32 flags; |
378 | }; | 378 | }; |
379 | 379 | ||
380 | #if defined(CONFIG_SMP) || defined(CONFIG_PM) | ||
381 | extern void vfp_save_state(void *location, u32 fpexc); | 380 | extern void vfp_save_state(void *location, u32 fpexc); |
382 | #endif | ||
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S index c92a08bd6a86..a5a4e57763c3 100644 --- a/arch/arm/vfp/vfphw.S +++ b/arch/arm/vfp/vfphw.S | |||
@@ -172,7 +172,6 @@ process_exception: | |||
172 | @ retry the faulted instruction | 172 | @ retry the faulted instruction |
173 | ENDPROC(vfp_support_entry) | 173 | ENDPROC(vfp_support_entry) |
174 | 174 | ||
175 | #if defined(CONFIG_SMP) || defined(CONFIG_PM) | ||
176 | ENTRY(vfp_save_state) | 175 | ENTRY(vfp_save_state) |
177 | @ Save the current VFP state | 176 | @ Save the current VFP state |
178 | @ r0 - save location | 177 | @ r0 - save location |
@@ -190,7 +189,6 @@ ENTRY(vfp_save_state) | |||
190 | stmia r0, {r1, r2, r3, r12} @ save FPEXC, FPSCR, FPINST, FPINST2 | 189 | stmia r0, {r1, r2, r3, r12} @ save FPEXC, FPSCR, FPINST, FPINST2 |
191 | mov pc, lr | 190 | mov pc, lr |
192 | ENDPROC(vfp_save_state) | 191 | ENDPROC(vfp_save_state) |
193 | #endif | ||
194 | 192 | ||
195 | last_VFP_context_address: | 193 | last_VFP_context_address: |
196 | .word last_VFP_context | 194 | .word last_VFP_context |
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 9f476a1be2ca..75457b30d813 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c | |||
@@ -377,6 +377,55 @@ static void vfp_pm_init(void) | |||
377 | static inline void vfp_pm_init(void) { } | 377 | static inline void vfp_pm_init(void) { } |
378 | #endif /* CONFIG_PM */ | 378 | #endif /* CONFIG_PM */ |
379 | 379 | ||
380 | /* | ||
381 | * Synchronise the hardware VFP state of a thread other than current with the | ||
382 | * saved one. This function is used by the ptrace mechanism. | ||
383 | */ | ||
384 | #ifdef CONFIG_SMP | ||
385 | void vfp_sync_state(struct thread_info *thread) | ||
386 | { | ||
387 | /* | ||
388 | * On SMP systems, the VFP state is automatically saved at every | ||
389 | * context switch. We mark the thread VFP state as belonging to a | ||
390 | * non-existent CPU so that the saved one will be reloaded when | ||
391 | * needed. | ||
392 | */ | ||
393 | thread->vfpstate.hard.cpu = NR_CPUS; | ||
394 | } | ||
395 | #else | ||
396 | void vfp_sync_state(struct thread_info *thread) | ||
397 | { | ||
398 | unsigned int cpu = get_cpu(); | ||
399 | u32 fpexc = fmrx(FPEXC); | ||
400 | |||
401 | /* | ||
402 | * If VFP is enabled, the previous state was already saved and | ||
403 | * last_VFP_context updated. | ||
404 | */ | ||
405 | if (fpexc & FPEXC_EN) | ||
406 | goto out; | ||
407 | |||
408 | if (!last_VFP_context[cpu]) | ||
409 | goto out; | ||
410 | |||
411 | /* | ||
412 | * Save the last VFP state on this CPU. | ||
413 | */ | ||
414 | fmxr(FPEXC, fpexc | FPEXC_EN); | ||
415 | vfp_save_state(last_VFP_context[cpu], fpexc); | ||
416 | fmxr(FPEXC, fpexc); | ||
417 | |||
418 | /* | ||
419 | * Set the context to NULL to force a reload the next time the thread | ||
420 | * uses the VFP. | ||
421 | */ | ||
422 | last_VFP_context[cpu] = NULL; | ||
423 | |||
424 | out: | ||
425 | put_cpu(); | ||
426 | } | ||
427 | #endif | ||
428 | |||
380 | #include <linux/smp.h> | 429 | #include <linux/smp.h> |
381 | 430 | ||
382 | /* | 431 | /* |
@@ -427,6 +476,18 @@ static int __init vfp_init(void) | |||
427 | * in place; report VFP support to userspace. | 476 | * in place; report VFP support to userspace. |
428 | */ | 477 | */ |
429 | elf_hwcap |= HWCAP_VFP; | 478 | elf_hwcap |= HWCAP_VFP; |
479 | #ifdef CONFIG_VFPv3 | ||
480 | if (VFP_arch >= 3) { | ||
481 | elf_hwcap |= HWCAP_VFPv3; | ||
482 | |||
483 | /* | ||
484 | * Check for VFPv3 D16. CPUs in this configuration | ||
485 | * only have 16 x 64bit registers. | ||
486 | */ | ||
487 | if (((fmrx(MVFR0) & MVFR0_A_SIMD_MASK)) == 1) | ||
488 | elf_hwcap |= HWCAP_VFPv3D16; | ||
489 | } | ||
490 | #endif | ||
430 | #ifdef CONFIG_NEON | 491 | #ifdef CONFIG_NEON |
431 | /* | 492 | /* |
432 | * Check for the presence of the Advanced SIMD | 493 | * Check for the presence of the Advanced SIMD |
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c index cf9e9848f8b5..d7bc925c524d 100644 --- a/drivers/ata/pata_icside.c +++ b/drivers/ata/pata_icside.c | |||
@@ -45,8 +45,6 @@ static const struct portinfo pata_icside_portinfo_v6_2 = { | |||
45 | .stepping = 6, | 45 | .stepping = 6, |
46 | }; | 46 | }; |
47 | 47 | ||
48 | #define PATA_ICSIDE_MAX_SG 128 | ||
49 | |||
50 | struct pata_icside_state { | 48 | struct pata_icside_state { |
51 | void __iomem *irq_port; | 49 | void __iomem *irq_port; |
52 | void __iomem *ioc_base; | 50 | void __iomem *ioc_base; |
@@ -57,7 +55,6 @@ struct pata_icside_state { | |||
57 | u8 disabled; | 55 | u8 disabled; |
58 | unsigned int speed[ATA_MAX_DEVICES]; | 56 | unsigned int speed[ATA_MAX_DEVICES]; |
59 | } port[2]; | 57 | } port[2]; |
60 | struct scatterlist sg[PATA_ICSIDE_MAX_SG]; | ||
61 | }; | 58 | }; |
62 | 59 | ||
63 | struct pata_icside_info { | 60 | struct pata_icside_info { |
@@ -222,9 +219,7 @@ static void pata_icside_bmdma_setup(struct ata_queued_cmd *qc) | |||
222 | { | 219 | { |
223 | struct ata_port *ap = qc->ap; | 220 | struct ata_port *ap = qc->ap; |
224 | struct pata_icside_state *state = ap->host->private_data; | 221 | struct pata_icside_state *state = ap->host->private_data; |
225 | struct scatterlist *sg, *rsg = state->sg; | ||
226 | unsigned int write = qc->tf.flags & ATA_TFLAG_WRITE; | 222 | unsigned int write = qc->tf.flags & ATA_TFLAG_WRITE; |
227 | unsigned int si; | ||
228 | 223 | ||
229 | /* | 224 | /* |
230 | * We are simplex; BUG if we try to fiddle with DMA | 225 | * We are simplex; BUG if we try to fiddle with DMA |
@@ -233,20 +228,12 @@ static void pata_icside_bmdma_setup(struct ata_queued_cmd *qc) | |||
233 | BUG_ON(dma_channel_active(state->dma)); | 228 | BUG_ON(dma_channel_active(state->dma)); |
234 | 229 | ||
235 | /* | 230 | /* |
236 | * Copy ATAs scattered sg list into a contiguous array of sg | ||
237 | */ | ||
238 | for_each_sg(qc->sg, sg, qc->n_elem, si) { | ||
239 | memcpy(rsg, sg, sizeof(*sg)); | ||
240 | rsg++; | ||
241 | } | ||
242 | |||
243 | /* | ||
244 | * Route the DMA signals to the correct interface | 231 | * Route the DMA signals to the correct interface |
245 | */ | 232 | */ |
246 | writeb(state->port[ap->port_no].port_sel, state->ioc_base); | 233 | writeb(state->port[ap->port_no].port_sel, state->ioc_base); |
247 | 234 | ||
248 | set_dma_speed(state->dma, state->port[ap->port_no].speed[qc->dev->devno]); | 235 | set_dma_speed(state->dma, state->port[ap->port_no].speed[qc->dev->devno]); |
249 | set_dma_sg(state->dma, state->sg, rsg - state->sg); | 236 | set_dma_sg(state->dma, qc->sg, qc->n_elem); |
250 | set_dma_mode(state->dma, write ? DMA_MODE_WRITE : DMA_MODE_READ); | 237 | set_dma_mode(state->dma, write ? DMA_MODE_WRITE : DMA_MODE_READ); |
251 | 238 | ||
252 | /* issue r/w command */ | 239 | /* issue r/w command */ |
@@ -306,8 +293,8 @@ static int icside_dma_init(struct pata_icside_info *info) | |||
306 | 293 | ||
307 | static struct scsi_host_template pata_icside_sht = { | 294 | static struct scsi_host_template pata_icside_sht = { |
308 | ATA_BASE_SHT(DRV_NAME), | 295 | ATA_BASE_SHT(DRV_NAME), |
309 | .sg_tablesize = PATA_ICSIDE_MAX_SG, | 296 | .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, |
310 | .dma_boundary = ~0, /* no dma boundaries */ | 297 | .dma_boundary = IOMD_DMA_BOUNDARY, |
311 | }; | 298 | }; |
312 | 299 | ||
313 | static void pata_icside_postreset(struct ata_link *link, unsigned int *classes) | 300 | static void pata_icside_postreset(struct ata_link *link, unsigned int *classes) |
diff --git a/drivers/i2c/busses/i2c-versatile.c b/drivers/i2c/busses/i2c-versatile.c index 4678babd3ce6..fede619ba227 100644 --- a/drivers/i2c/busses/i2c-versatile.c +++ b/drivers/i2c/busses/i2c-versatile.c | |||
@@ -102,7 +102,13 @@ static int i2c_versatile_probe(struct platform_device *dev) | |||
102 | i2c->algo = i2c_versatile_algo; | 102 | i2c->algo = i2c_versatile_algo; |
103 | i2c->algo.data = i2c; | 103 | i2c->algo.data = i2c; |
104 | 104 | ||
105 | ret = i2c_bit_add_bus(&i2c->adap); | 105 | if (dev->id >= 0) { |
106 | /* static bus numbering */ | ||
107 | i2c->adap.nr = dev->id; | ||
108 | ret = i2c_bit_add_numbered_bus(&i2c->adap); | ||
109 | } else | ||
110 | /* dynamic bus numbering */ | ||
111 | ret = i2c_bit_add_bus(&i2c->adap); | ||
106 | if (ret >= 0) { | 112 | if (ret >= 0) { |
107 | platform_set_drvdata(dev, i2c); | 113 | platform_set_drvdata(dev, i2c); |
108 | return 0; | 114 | return 0; |
@@ -146,7 +152,7 @@ static void __exit i2c_versatile_exit(void) | |||
146 | platform_driver_unregister(&i2c_versatile_driver); | 152 | platform_driver_unregister(&i2c_versatile_driver); |
147 | } | 153 | } |
148 | 154 | ||
149 | module_init(i2c_versatile_init); | 155 | subsys_initcall(i2c_versatile_init); |
150 | module_exit(i2c_versatile_exit); | 156 | module_exit(i2c_versatile_exit); |
151 | 157 | ||
152 | MODULE_DESCRIPTION("ARM Versatile I2C bus driver"); | 158 | MODULE_DESCRIPTION("ARM Versatile I2C bus driver"); |
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c index abb04c82c622..634af6a8e6b3 100644 --- a/drivers/input/keyboard/corgikbd.c +++ b/drivers/input/keyboard/corgikbd.c | |||
@@ -21,8 +21,6 @@ | |||
21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
22 | 22 | ||
23 | #include <mach/corgi.h> | 23 | #include <mach/corgi.h> |
24 | #include <mach/hardware.h> | ||
25 | #include <mach/pxa-regs.h> | ||
26 | #include <mach/pxa2xx-gpio.h> | 24 | #include <mach/pxa2xx-gpio.h> |
27 | #include <asm/hardware/scoop.h> | 25 | #include <asm/hardware/scoop.h> |
28 | 26 | ||
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c index 9d1781a618e9..13967422658c 100644 --- a/drivers/input/keyboard/spitzkbd.c +++ b/drivers/input/keyboard/spitzkbd.c | |||
@@ -21,8 +21,6 @@ | |||
21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
22 | 22 | ||
23 | #include <mach/spitz.h> | 23 | #include <mach/spitz.h> |
24 | #include <mach/hardware.h> | ||
25 | #include <mach/pxa-regs.h> | ||
26 | #include <mach/pxa2xx-gpio.h> | 24 | #include <mach/pxa2xx-gpio.h> |
27 | 25 | ||
28 | #define KB_ROWS 7 | 26 | #define KB_ROWS 7 |
diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c index 3fb51b54fe61..94a1919d439d 100644 --- a/drivers/input/touchscreen/corgi_ts.c +++ b/drivers/input/touchscreen/corgi_ts.c | |||
@@ -21,7 +21,6 @@ | |||
21 | 21 | ||
22 | #include <mach/sharpsl.h> | 22 | #include <mach/sharpsl.h> |
23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
24 | #include <mach/pxa-regs.h> | ||
25 | #include <mach/pxa2xx-gpio.h> | 24 | #include <mach/pxa2xx-gpio.h> |
26 | 25 | ||
27 | 26 | ||
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 07c334f25aae..0c4ce58c53d5 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/videodev2.h> | 35 | #include <linux/videodev2.h> |
36 | 36 | ||
37 | #include <mach/dma.h> | 37 | #include <mach/dma.h> |
38 | #include <mach/pxa-regs.h> | ||
39 | #include <mach/camera.h> | 38 | #include <mach/camera.h> |
40 | 39 | ||
41 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) | 40 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) |
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 2909bbc8ad00..a663429b3d55 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
@@ -490,7 +490,7 @@ static void mmci_check_status(unsigned long data) | |||
490 | mod_timer(&host->timer, jiffies + HZ); | 490 | mod_timer(&host->timer, jiffies + HZ); |
491 | } | 491 | } |
492 | 492 | ||
493 | static int mmci_probe(struct amba_device *dev, void *id) | 493 | static int __devinit mmci_probe(struct amba_device *dev, void *id) |
494 | { | 494 | { |
495 | struct mmc_platform_data *plat = dev->dev.platform_data; | 495 | struct mmc_platform_data *plat = dev->dev.platform_data; |
496 | struct mmci_host *host; | 496 | struct mmci_host *host; |
@@ -633,7 +633,7 @@ static int mmci_probe(struct amba_device *dev, void *id) | |||
633 | return ret; | 633 | return ret; |
634 | } | 634 | } |
635 | 635 | ||
636 | static int mmci_remove(struct amba_device *dev) | 636 | static int __devexit mmci_remove(struct amba_device *dev) |
637 | { | 637 | { |
638 | struct mmc_host *mmc = amba_get_drvdata(dev); | 638 | struct mmc_host *mmc = amba_get_drvdata(dev); |
639 | 639 | ||
@@ -730,7 +730,7 @@ static struct amba_driver mmci_driver = { | |||
730 | .name = DRIVER_NAME, | 730 | .name = DRIVER_NAME, |
731 | }, | 731 | }, |
732 | .probe = mmci_probe, | 732 | .probe = mmci_probe, |
733 | .remove = mmci_remove, | 733 | .remove = __devexit_p(mmci_remove), |
734 | .suspend = mmci_suspend, | 734 | .suspend = mmci_suspend, |
735 | .resume = mmci_resume, | 735 | .resume = mmci_resume, |
736 | .id_table = mmci_ids, | 736 | .id_table = mmci_ids, |
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 9702ad3774cf..430095725f9f 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
@@ -30,9 +30,8 @@ | |||
30 | 30 | ||
31 | #include <asm/sizes.h> | 31 | #include <asm/sizes.h> |
32 | 32 | ||
33 | #include <mach/dma.h> | ||
34 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
35 | #include <mach/pxa-regs.h> | 34 | #include <mach/dma.h> |
36 | #include <mach/mmc.h> | 35 | #include <mach/mmc.h> |
37 | 36 | ||
38 | #include "pxamci.h" | 37 | #include "pxamci.h" |
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c index fa129c09bca8..10081e656a6f 100644 --- a/drivers/mtd/nand/cmx270_nand.c +++ b/drivers/mtd/nand/cmx270_nand.c | |||
@@ -26,8 +26,7 @@ | |||
26 | #include <asm/irq.h> | 26 | #include <asm/irq.h> |
27 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
28 | 28 | ||
29 | #include <mach/hardware.h> | 29 | #include <mach/pxa2xx-regs.h> |
30 | #include <mach/pxa-regs.h> | ||
31 | 30 | ||
32 | #define GPIO_NAND_CS (11) | 31 | #define GPIO_NAND_CS (11) |
33 | #define GPIO_NAND_RB (89) | 32 | #define GPIO_NAND_RB (89) |
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index cc55cbc2b308..61b69cc40009 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
23 | 23 | ||
24 | #include <mach/dma.h> | 24 | #include <mach/dma.h> |
25 | #include <mach/pxa-regs.h> | ||
26 | #include <mach/pxa3xx_nand.h> | 25 | #include <mach/pxa3xx_nand.h> |
27 | 26 | ||
28 | #define CHIP_DELAY_TIMEOUT (2 * HZ/10) | 27 | #define CHIP_DELAY_TIMEOUT (2 * HZ/10) |
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index 31794c2363ec..e775338b525f 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c | |||
@@ -24,9 +24,8 @@ | |||
24 | 24 | ||
25 | #include <mach/dma.h> | 25 | #include <mach/dma.h> |
26 | #include <mach/irda.h> | 26 | #include <mach/irda.h> |
27 | #include <mach/hardware.h> | ||
28 | #include <mach/pxa-regs.h> | ||
29 | #include <mach/regs-uart.h> | 27 | #include <mach/regs-uart.h> |
28 | #include <mach/regs-ost.h> | ||
30 | 29 | ||
31 | #define FICP __REG(0x40800000) /* Start of FICP area */ | 30 | #define FICP __REG(0x40800000) /* Start of FICP area */ |
32 | #define ICCR0 __REG(0x40800000) /* ICP Control Register 0 */ | 31 | #define ICCR0 __REG(0x40800000) /* ICP Control Register 0 */ |
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index a45952e72018..8140f7cb4d85 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h | |||
@@ -236,8 +236,7 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg, | |||
236 | * Use a DMA for RX and TX packets. | 236 | * Use a DMA for RX and TX packets. |
237 | */ | 237 | */ |
238 | #include <linux/dma-mapping.h> | 238 | #include <linux/dma-mapping.h> |
239 | #include <asm/dma.h> | 239 | #include <mach/dma.h> |
240 | #include <mach/pxa-regs.h> | ||
241 | 240 | ||
242 | static dma_addr_t rx_dmabuf, tx_dmabuf; | 241 | static dma_addr_t rx_dmabuf, tx_dmabuf; |
243 | static int rx_dmalen, tx_dmalen; | 242 | static int rx_dmalen, tx_dmalen; |
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index c4ccd121bc9c..4d689b59c58c 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -494,8 +494,6 @@ struct smc_local { | |||
494 | */ | 494 | */ |
495 | #include <linux/dma-mapping.h> | 495 | #include <linux/dma-mapping.h> |
496 | #include <mach/dma.h> | 496 | #include <mach/dma.h> |
497 | #include <mach/hardware.h> | ||
498 | #include <mach/pxa-regs.h> | ||
499 | 497 | ||
500 | #ifdef SMC_insl | 498 | #ifdef SMC_insl |
501 | #undef SMC_insl | 499 | #undef SMC_insl |
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index bb9ddb9532e3..16f84aab6ab3 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
30 | #include <asm/system.h> | 30 | #include <asm/system.h> |
31 | #include <mach/pxa-regs.h> | ||
32 | #include <mach/pxa2xx-regs.h> | 31 | #include <mach/pxa2xx-regs.h> |
33 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
34 | 33 | ||
@@ -39,6 +38,44 @@ | |||
39 | #include "soc_common.h" | 38 | #include "soc_common.h" |
40 | #include "pxa2xx_base.h" | 39 | #include "pxa2xx_base.h" |
41 | 40 | ||
41 | /* | ||
42 | * Personal Computer Memory Card International Association (PCMCIA) sockets | ||
43 | */ | ||
44 | |||
45 | #define PCMCIAPrtSp 0x04000000 /* PCMCIA Partition Space [byte] */ | ||
46 | #define PCMCIASp (4*PCMCIAPrtSp) /* PCMCIA Space [byte] */ | ||
47 | #define PCMCIAIOSp PCMCIAPrtSp /* PCMCIA I/O Space [byte] */ | ||
48 | #define PCMCIAAttrSp PCMCIAPrtSp /* PCMCIA Attribute Space [byte] */ | ||
49 | #define PCMCIAMemSp PCMCIAPrtSp /* PCMCIA Memory Space [byte] */ | ||
50 | |||
51 | #define PCMCIA0Sp PCMCIASp /* PCMCIA 0 Space [byte] */ | ||
52 | #define PCMCIA0IOSp PCMCIAIOSp /* PCMCIA 0 I/O Space [byte] */ | ||
53 | #define PCMCIA0AttrSp PCMCIAAttrSp /* PCMCIA 0 Attribute Space [byte] */ | ||
54 | #define PCMCIA0MemSp PCMCIAMemSp /* PCMCIA 0 Memory Space [byte] */ | ||
55 | |||
56 | #define PCMCIA1Sp PCMCIASp /* PCMCIA 1 Space [byte] */ | ||
57 | #define PCMCIA1IOSp PCMCIAIOSp /* PCMCIA 1 I/O Space [byte] */ | ||
58 | #define PCMCIA1AttrSp PCMCIAAttrSp /* PCMCIA 1 Attribute Space [byte] */ | ||
59 | #define PCMCIA1MemSp PCMCIAMemSp /* PCMCIA 1 Memory Space [byte] */ | ||
60 | |||
61 | #define _PCMCIA(Nb) /* PCMCIA [0..1] */ \ | ||
62 | (0x20000000 + (Nb) * PCMCIASp) | ||
63 | #define _PCMCIAIO(Nb) _PCMCIA(Nb) /* PCMCIA I/O [0..1] */ | ||
64 | #define _PCMCIAAttr(Nb) /* PCMCIA Attribute [0..1] */ \ | ||
65 | (_PCMCIA(Nb) + 2 * PCMCIAPrtSp) | ||
66 | #define _PCMCIAMem(Nb) /* PCMCIA Memory [0..1] */ \ | ||
67 | (_PCMCIA(Nb) + 3 * PCMCIAPrtSp) | ||
68 | |||
69 | #define _PCMCIA0 _PCMCIA(0) /* PCMCIA 0 */ | ||
70 | #define _PCMCIA0IO _PCMCIAIO(0) /* PCMCIA 0 I/O */ | ||
71 | #define _PCMCIA0Attr _PCMCIAAttr(0) /* PCMCIA 0 Attribute */ | ||
72 | #define _PCMCIA0Mem _PCMCIAMem(0) /* PCMCIA 0 Memory */ | ||
73 | |||
74 | #define _PCMCIA1 _PCMCIA(1) /* PCMCIA 1 */ | ||
75 | #define _PCMCIA1IO _PCMCIAIO(1) /* PCMCIA 1 I/O */ | ||
76 | #define _PCMCIA1Attr _PCMCIAAttr(1) /* PCMCIA 1 Attribute */ | ||
77 | #define _PCMCIA1Mem _PCMCIAMem(1) /* PCMCIA 1 Memory */ | ||
78 | |||
42 | 79 | ||
43 | #define MCXX_SETUP_MASK (0x7f) | 80 | #define MCXX_SETUP_MASK (0x7f) |
44 | #define MCXX_ASST_MASK (0x1f) | 81 | #define MCXX_ASST_MASK (0x1f) |
@@ -183,23 +220,67 @@ static void pxa2xx_configure_sockets(struct device *dev) | |||
183 | MECR &= ~MECR_NOS; | 220 | MECR &= ~MECR_NOS; |
184 | } | 221 | } |
185 | 222 | ||
223 | static const char *skt_names[] = { | ||
224 | "PCMCIA socket 0", | ||
225 | "PCMCIA socket 1", | ||
226 | }; | ||
227 | |||
228 | #define SKT_DEV_INFO_SIZE(n) \ | ||
229 | (sizeof(struct skt_dev_info) + (n)*sizeof(struct soc_pcmcia_socket)) | ||
230 | |||
186 | int __pxa2xx_drv_pcmcia_probe(struct device *dev) | 231 | int __pxa2xx_drv_pcmcia_probe(struct device *dev) |
187 | { | 232 | { |
188 | int ret; | 233 | int i, ret; |
189 | struct pcmcia_low_level *ops; | 234 | struct pcmcia_low_level *ops; |
235 | struct skt_dev_info *sinfo; | ||
236 | struct soc_pcmcia_socket *skt; | ||
190 | 237 | ||
191 | if (!dev || !dev->platform_data) | 238 | if (!dev || !dev->platform_data) |
192 | return -ENODEV; | 239 | return -ENODEV; |
193 | 240 | ||
194 | ops = (struct pcmcia_low_level *)dev->platform_data; | 241 | ops = (struct pcmcia_low_level *)dev->platform_data; |
195 | 242 | ||
243 | sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL); | ||
244 | if (!sinfo) | ||
245 | return -ENOMEM; | ||
246 | |||
247 | sinfo->nskt = ops->nr; | ||
248 | |||
249 | /* Initialize processor specific parameters */ | ||
250 | for (i = 0; i < ops->nr; i++) { | ||
251 | skt = &sinfo->skt[i]; | ||
252 | |||
253 | skt->nr = i; | ||
254 | skt->irq = NO_IRQ; | ||
255 | |||
256 | skt->res_skt.start = _PCMCIA(skt->nr); | ||
257 | skt->res_skt.end = _PCMCIA(skt->nr) + PCMCIASp - 1; | ||
258 | skt->res_skt.name = skt_names[skt->nr]; | ||
259 | skt->res_skt.flags = IORESOURCE_MEM; | ||
260 | |||
261 | skt->res_io.start = _PCMCIAIO(skt->nr); | ||
262 | skt->res_io.end = _PCMCIAIO(skt->nr) + PCMCIAIOSp - 1; | ||
263 | skt->res_io.name = "io"; | ||
264 | skt->res_io.flags = IORESOURCE_MEM | IORESOURCE_BUSY; | ||
265 | |||
266 | skt->res_mem.start = _PCMCIAMem(skt->nr); | ||
267 | skt->res_mem.end = _PCMCIAMem(skt->nr) + PCMCIAMemSp - 1; | ||
268 | skt->res_mem.name = "memory"; | ||
269 | skt->res_mem.flags = IORESOURCE_MEM; | ||
270 | |||
271 | skt->res_attr.start = _PCMCIAAttr(skt->nr); | ||
272 | skt->res_attr.end = _PCMCIAAttr(skt->nr) + PCMCIAAttrSp - 1; | ||
273 | skt->res_attr.name = "attribute"; | ||
274 | skt->res_attr.flags = IORESOURCE_MEM; | ||
275 | } | ||
276 | |||
196 | /* Provide our PXA2xx specific timing routines. */ | 277 | /* Provide our PXA2xx specific timing routines. */ |
197 | ops->set_timing = pxa2xx_pcmcia_set_timing; | 278 | ops->set_timing = pxa2xx_pcmcia_set_timing; |
198 | #ifdef CONFIG_CPU_FREQ | 279 | #ifdef CONFIG_CPU_FREQ |
199 | ops->frequency_change = pxa2xx_pcmcia_frequency_change; | 280 | ops->frequency_change = pxa2xx_pcmcia_frequency_change; |
200 | #endif | 281 | #endif |
201 | 282 | ||
202 | ret = soc_common_drv_pcmcia_probe(dev, ops, ops->first, ops->nr); | 283 | ret = soc_common_drv_pcmcia_probe(dev, ops, sinfo); |
203 | 284 | ||
204 | if (!ret) | 285 | if (!ret) |
205 | pxa2xx_configure_sockets(dev); | 286 | pxa2xx_configure_sockets(dev); |
diff --git a/drivers/pcmcia/pxa2xx_cm_x255.c b/drivers/pcmcia/pxa2xx_cm_x255.c index 7c8bcb476622..4ed64d8e95e7 100644 --- a/drivers/pcmcia/pxa2xx_cm_x255.c +++ b/drivers/pcmcia/pxa2xx_cm_x255.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
17 | 17 | ||
18 | #include <asm/mach-types.h> | 18 | #include <asm/mach-types.h> |
19 | #include <mach/pxa-regs.h> | ||
20 | 19 | ||
21 | #include "soc_common.h" | 20 | #include "soc_common.h" |
22 | 21 | ||
diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c index 6c3aac377126..a7b943d01e34 100644 --- a/drivers/pcmcia/pxa2xx_cm_x270.c +++ b/drivers/pcmcia/pxa2xx_cm_x270.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
17 | 17 | ||
18 | #include <asm/mach-types.h> | 18 | #include <asm/mach-types.h> |
19 | #include <mach/pxa-regs.h> | ||
20 | 19 | ||
21 | #include "soc_common.h" | 20 | #include "soc_common.h" |
22 | 21 | ||
diff --git a/drivers/pcmcia/pxa2xx_e740.c b/drivers/pcmcia/pxa2xx_e740.c index f663a011bf4a..d09c0dc4a31a 100644 --- a/drivers/pcmcia/pxa2xx_e740.c +++ b/drivers/pcmcia/pxa2xx_e740.c | |||
@@ -16,8 +16,6 @@ | |||
16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
18 | 18 | ||
19 | #include <mach/hardware.h> | ||
20 | #include <mach/pxa-regs.h> | ||
21 | #include <mach/eseries-gpio.h> | 19 | #include <mach/eseries-gpio.h> |
22 | 20 | ||
23 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c index 37ec55df086e..6cbb1b1f7cfd 100644 --- a/drivers/pcmcia/pxa2xx_lubbock.c +++ b/drivers/pcmcia/pxa2xx_lubbock.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
25 | #include <asm/hardware/sa1111.h> | 25 | #include <asm/hardware/sa1111.h> |
26 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
27 | #include <mach/pxa-regs.h> | ||
28 | #include <mach/lubbock.h> | 27 | #include <mach/lubbock.h> |
29 | 28 | ||
30 | #include "sa1111_generic.h" | 29 | #include "sa1111_generic.h" |
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c index 877001db4916..1138551ba8f6 100644 --- a/drivers/pcmcia/pxa2xx_mainstone.c +++ b/drivers/pcmcia/pxa2xx_mainstone.c | |||
@@ -21,11 +21,10 @@ | |||
21 | 21 | ||
22 | #include <pcmcia/ss.h> | 22 | #include <pcmcia/ss.h> |
23 | 23 | ||
24 | #include <mach/hardware.h> | ||
25 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
26 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
27 | 26 | ||
28 | #include <mach/pxa-regs.h> | 27 | #include <mach/pxa2xx-regs.h> |
29 | #include <mach/mainstone.h> | 28 | #include <mach/mainstone.h> |
30 | 29 | ||
31 | #include "soc_common.h" | 30 | #include "soc_common.h" |
diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c index 36c7a0b324d2..e0e5cb339b4a 100644 --- a/drivers/pcmcia/pxa2xx_trizeps4.c +++ b/drivers/pcmcia/pxa2xx_trizeps4.c | |||
@@ -22,8 +22,7 @@ | |||
22 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
23 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
24 | 24 | ||
25 | #include <mach/hardware.h> | 25 | #include <mach/pxa2xx-regs.h> |
26 | #include <mach/pxa-regs.h> | ||
27 | #include <mach/trizeps4.h> | 26 | #include <mach/trizeps4.h> |
28 | 27 | ||
29 | #include "soc_common.h" | 28 | #include "soc_common.h" |
diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c index dd10481be7bf..17871360fe99 100644 --- a/drivers/pcmcia/pxa2xx_viper.c +++ b/drivers/pcmcia/pxa2xx_viper.c | |||
@@ -26,7 +26,6 @@ | |||
26 | 26 | ||
27 | #include <asm/irq.h> | 27 | #include <asm/irq.h> |
28 | 28 | ||
29 | #include <mach/pxa-regs.h> | ||
30 | #include <mach/viper.h> | 29 | #include <mach/viper.h> |
31 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
32 | 31 | ||
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index 7cb1273202cc..810ac492a8c9 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c | |||
@@ -163,9 +163,55 @@ sa1100_pcmcia_show_timing(struct soc_pcmcia_socket *skt, char *buf) | |||
163 | return p - buf; | 163 | return p - buf; |
164 | } | 164 | } |
165 | 165 | ||
166 | static const char *skt_names[] = { | ||
167 | "PCMCIA socket 0", | ||
168 | "PCMCIA socket 1", | ||
169 | }; | ||
170 | |||
171 | #define SKT_DEV_INFO_SIZE(n) \ | ||
172 | (sizeof(struct skt_dev_info) + (n)*sizeof(struct soc_pcmcia_socket)) | ||
173 | |||
166 | int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, | 174 | int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, |
167 | int first, int nr) | 175 | int first, int nr) |
168 | { | 176 | { |
177 | struct skt_dev_info *sinfo; | ||
178 | struct soc_pcmcia_socket *skt; | ||
179 | int i; | ||
180 | |||
181 | sinfo = kzalloc(SKT_DEV_INFO_SIZE(nr), GFP_KERNEL); | ||
182 | if (!sinfo) | ||
183 | return -ENOMEM; | ||
184 | |||
185 | sinfo->nskt = nr; | ||
186 | |||
187 | /* Initiliaze processor specific parameters */ | ||
188 | for (i = 0; i < nr; i++) { | ||
189 | skt = &sinfo->skt[i]; | ||
190 | |||
191 | skt->nr = first + i; | ||
192 | skt->irq = NO_IRQ; | ||
193 | |||
194 | skt->res_skt.start = _PCMCIA(skt->nr); | ||
195 | skt->res_skt.end = _PCMCIA(skt->nr) + PCMCIASp - 1; | ||
196 | skt->res_skt.name = skt_names[skt->nr]; | ||
197 | skt->res_skt.flags = IORESOURCE_MEM; | ||
198 | |||
199 | skt->res_io.start = _PCMCIAIO(skt->nr); | ||
200 | skt->res_io.end = _PCMCIAIO(skt->nr) + PCMCIAIOSp - 1; | ||
201 | skt->res_io.name = "io"; | ||
202 | skt->res_io.flags = IORESOURCE_MEM | IORESOURCE_BUSY; | ||
203 | |||
204 | skt->res_mem.start = _PCMCIAMem(skt->nr); | ||
205 | skt->res_mem.end = _PCMCIAMem(skt->nr) + PCMCIAMemSp - 1; | ||
206 | skt->res_mem.name = "memory"; | ||
207 | skt->res_mem.flags = IORESOURCE_MEM; | ||
208 | |||
209 | skt->res_attr.start = _PCMCIAAttr(skt->nr); | ||
210 | skt->res_attr.end = _PCMCIAAttr(skt->nr) + PCMCIAAttrSp - 1; | ||
211 | skt->res_attr.name = "attribute"; | ||
212 | skt->res_attr.flags = IORESOURCE_MEM; | ||
213 | } | ||
214 | |||
169 | /* | 215 | /* |
170 | * set default MECR calculation if the board specific | 216 | * set default MECR calculation if the board specific |
171 | * code did not specify one... | 217 | * code did not specify one... |
@@ -180,7 +226,7 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, | |||
180 | ops->frequency_change = sa1100_pcmcia_frequency_change; | 226 | ops->frequency_change = sa1100_pcmcia_frequency_change; |
181 | #endif | 227 | #endif |
182 | 228 | ||
183 | return soc_common_drv_pcmcia_probe(dev, ops, first, nr); | 229 | return soc_common_drv_pcmcia_probe(dev, ops, sinfo); |
184 | } | 230 | } |
185 | EXPORT_SYMBOL(sa11xx_drv_pcmcia_probe); | 231 | EXPORT_SYMBOL(sa11xx_drv_pcmcia_probe); |
186 | 232 | ||
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index f49ac6666153..163cf98e2386 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c | |||
@@ -49,11 +49,6 @@ | |||
49 | 49 | ||
50 | #include "soc_common.h" | 50 | #include "soc_common.h" |
51 | 51 | ||
52 | /* FIXME: platform dependent resource declaration has to move out of this file */ | ||
53 | #ifdef CONFIG_ARCH_PXA | ||
54 | #include <mach/pxa-regs.h> | ||
55 | #endif | ||
56 | |||
57 | #ifdef CONFIG_PCMCIA_DEBUG | 52 | #ifdef CONFIG_PCMCIA_DEBUG |
58 | 53 | ||
59 | static int pc_debug; | 54 | static int pc_debug; |
@@ -581,19 +576,6 @@ EXPORT_SYMBOL(soc_pcmcia_enable_irqs); | |||
581 | LIST_HEAD(soc_pcmcia_sockets); | 576 | LIST_HEAD(soc_pcmcia_sockets); |
582 | static DEFINE_MUTEX(soc_pcmcia_sockets_lock); | 577 | static DEFINE_MUTEX(soc_pcmcia_sockets_lock); |
583 | 578 | ||
584 | static const char *skt_names[] = { | ||
585 | "PCMCIA socket 0", | ||
586 | "PCMCIA socket 1", | ||
587 | }; | ||
588 | |||
589 | struct skt_dev_info { | ||
590 | int nskt; | ||
591 | struct soc_pcmcia_socket skt[0]; | ||
592 | }; | ||
593 | |||
594 | #define SKT_DEV_INFO_SIZE(n) \ | ||
595 | (sizeof(struct skt_dev_info) + (n)*sizeof(struct soc_pcmcia_socket)) | ||
596 | |||
597 | #ifdef CONFIG_CPU_FREQ | 579 | #ifdef CONFIG_CPU_FREQ |
598 | static int | 580 | static int |
599 | soc_pcmcia_notifier(struct notifier_block *nb, unsigned long val, void *data) | 581 | soc_pcmcia_notifier(struct notifier_block *nb, unsigned long val, void *data) |
@@ -637,26 +619,18 @@ static int soc_pcmcia_cpufreq_register(void) { return 0; } | |||
637 | static void soc_pcmcia_cpufreq_unregister(void) {} | 619 | static void soc_pcmcia_cpufreq_unregister(void) {} |
638 | #endif | 620 | #endif |
639 | 621 | ||
640 | int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr) | 622 | int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, |
623 | struct skt_dev_info *sinfo) | ||
641 | { | 624 | { |
642 | struct skt_dev_info *sinfo; | ||
643 | struct soc_pcmcia_socket *skt; | 625 | struct soc_pcmcia_socket *skt; |
644 | int ret, i; | 626 | int ret, i; |
645 | 627 | ||
646 | mutex_lock(&soc_pcmcia_sockets_lock); | 628 | mutex_lock(&soc_pcmcia_sockets_lock); |
647 | 629 | ||
648 | sinfo = kzalloc(SKT_DEV_INFO_SIZE(nr), GFP_KERNEL); | ||
649 | if (!sinfo) { | ||
650 | ret = -ENOMEM; | ||
651 | goto out; | ||
652 | } | ||
653 | |||
654 | sinfo->nskt = nr; | ||
655 | |||
656 | /* | 630 | /* |
657 | * Initialise the per-socket structure. | 631 | * Initialise the per-socket structure. |
658 | */ | 632 | */ |
659 | for (i = 0; i < nr; i++) { | 633 | for (i = 0; i < sinfo->nskt; i++) { |
660 | skt = &sinfo->skt[i]; | 634 | skt = &sinfo->skt[i]; |
661 | 635 | ||
662 | skt->socket.ops = &soc_common_pcmcia_operations; | 636 | skt->socket.ops = &soc_common_pcmcia_operations; |
@@ -668,43 +642,21 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops | |||
668 | skt->poll_timer.data = (unsigned long)skt; | 642 | skt->poll_timer.data = (unsigned long)skt; |
669 | skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD; | 643 | skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD; |
670 | 644 | ||
671 | skt->nr = first + i; | ||
672 | skt->irq = NO_IRQ; | ||
673 | skt->dev = dev; | 645 | skt->dev = dev; |
674 | skt->ops = ops; | 646 | skt->ops = ops; |
675 | 647 | ||
676 | skt->res_skt.start = _PCMCIA(skt->nr); | ||
677 | skt->res_skt.end = _PCMCIA(skt->nr) + PCMCIASp - 1; | ||
678 | skt->res_skt.name = skt_names[skt->nr]; | ||
679 | skt->res_skt.flags = IORESOURCE_MEM; | ||
680 | |||
681 | ret = request_resource(&iomem_resource, &skt->res_skt); | 648 | ret = request_resource(&iomem_resource, &skt->res_skt); |
682 | if (ret) | 649 | if (ret) |
683 | goto out_err_1; | 650 | goto out_err_1; |
684 | 651 | ||
685 | skt->res_io.start = _PCMCIAIO(skt->nr); | ||
686 | skt->res_io.end = _PCMCIAIO(skt->nr) + PCMCIAIOSp - 1; | ||
687 | skt->res_io.name = "io"; | ||
688 | skt->res_io.flags = IORESOURCE_MEM | IORESOURCE_BUSY; | ||
689 | |||
690 | ret = request_resource(&skt->res_skt, &skt->res_io); | 652 | ret = request_resource(&skt->res_skt, &skt->res_io); |
691 | if (ret) | 653 | if (ret) |
692 | goto out_err_2; | 654 | goto out_err_2; |
693 | 655 | ||
694 | skt->res_mem.start = _PCMCIAMem(skt->nr); | ||
695 | skt->res_mem.end = _PCMCIAMem(skt->nr) + PCMCIAMemSp - 1; | ||
696 | skt->res_mem.name = "memory"; | ||
697 | skt->res_mem.flags = IORESOURCE_MEM; | ||
698 | |||
699 | ret = request_resource(&skt->res_skt, &skt->res_mem); | 656 | ret = request_resource(&skt->res_skt, &skt->res_mem); |
700 | if (ret) | 657 | if (ret) |
701 | goto out_err_3; | 658 | goto out_err_3; |
702 | 659 | ||
703 | skt->res_attr.start = _PCMCIAAttr(skt->nr); | ||
704 | skt->res_attr.end = _PCMCIAAttr(skt->nr) + PCMCIAAttrSp - 1; | ||
705 | skt->res_attr.name = "attribute"; | ||
706 | skt->res_attr.flags = IORESOURCE_MEM; | ||
707 | |||
708 | ret = request_resource(&skt->res_skt, &skt->res_attr); | 660 | ret = request_resource(&skt->res_skt, &skt->res_attr); |
709 | if (ret) | 661 | if (ret) |
710 | goto out_err_4; | 662 | goto out_err_4; |
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h index 38c67375f363..290e143839ee 100644 --- a/drivers/pcmcia/soc_common.h +++ b/drivers/pcmcia/soc_common.h | |||
@@ -58,6 +58,11 @@ struct soc_pcmcia_socket { | |||
58 | struct list_head node; | 58 | struct list_head node; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | struct skt_dev_info { | ||
62 | int nskt; | ||
63 | struct soc_pcmcia_socket skt[0]; | ||
64 | }; | ||
65 | |||
61 | struct pcmcia_state { | 66 | struct pcmcia_state { |
62 | unsigned detect: 1, | 67 | unsigned detect: 1, |
63 | ready: 1, | 68 | ready: 1, |
@@ -132,7 +137,7 @@ extern void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *, struct soc_ | |||
132 | 137 | ||
133 | extern struct list_head soc_pcmcia_sockets; | 138 | extern struct list_head soc_pcmcia_sockets; |
134 | 139 | ||
135 | extern int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr); | 140 | extern int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, struct skt_dev_info *sinfo); |
136 | extern int soc_common_drv_pcmcia_remove(struct device *dev); | 141 | extern int soc_common_drv_pcmcia_remove(struct device *dev); |
137 | 142 | ||
138 | 143 | ||
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index d26a5f82aaba..4f247e4dd3f9 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
@@ -35,7 +35,8 @@ | |||
35 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
36 | 36 | ||
37 | #ifdef CONFIG_ARCH_PXA | 37 | #ifdef CONFIG_ARCH_PXA |
38 | #include <mach/pxa-regs.h> | 38 | #include <mach/regs-rtc.h> |
39 | #include <mach/regs-ost.h> | ||
39 | #endif | 40 | #endif |
40 | 41 | ||
41 | #define RTC_DEF_DIVIDER 32768 - 1 | 42 | #define RTC_DEF_DIVIDER 32768 - 1 |
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c index 68a64123af8f..8ee01b907332 100644 --- a/drivers/scsi/arm/cumana_2.c +++ b/drivers/scsi/arm/cumana_2.c | |||
@@ -390,7 +390,8 @@ static struct scsi_host_template cumanascsi2_template = { | |||
390 | .eh_abort_handler = fas216_eh_abort, | 390 | .eh_abort_handler = fas216_eh_abort, |
391 | .can_queue = 1, | 391 | .can_queue = 1, |
392 | .this_id = 7, | 392 | .this_id = 7, |
393 | .sg_tablesize = SG_ALL, | 393 | .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, |
394 | .dma_boundary = IOMD_DMA_BOUNDARY, | ||
394 | .cmd_per_lun = 1, | 395 | .cmd_per_lun = 1, |
395 | .use_clustering = DISABLE_CLUSTERING, | 396 | .use_clustering = DISABLE_CLUSTERING, |
396 | .proc_name = "cumanascsi2", | 397 | .proc_name = "cumanascsi2", |
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c index bb2477b3fb0b..d8435132f461 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c | |||
@@ -508,7 +508,8 @@ static struct scsi_host_template eesox_template = { | |||
508 | .eh_abort_handler = fas216_eh_abort, | 508 | .eh_abort_handler = fas216_eh_abort, |
509 | .can_queue = 1, | 509 | .can_queue = 1, |
510 | .this_id = 7, | 510 | .this_id = 7, |
511 | .sg_tablesize = SG_ALL, | 511 | .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, |
512 | .dma_boundary = IOMD_DMA_BOUNDARY, | ||
512 | .cmd_per_lun = 1, | 513 | .cmd_per_lun = 1, |
513 | .use_clustering = DISABLE_CLUSTERING, | 514 | .use_clustering = DISABLE_CLUSTERING, |
514 | .proc_name = "eesox", | 515 | .proc_name = "eesox", |
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index d9a546d1917c..e2297b4c1b9e 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c | |||
@@ -302,7 +302,8 @@ static struct scsi_host_template powertecscsi_template = { | |||
302 | 302 | ||
303 | .can_queue = 8, | 303 | .can_queue = 8, |
304 | .this_id = 7, | 304 | .this_id = 7, |
305 | .sg_tablesize = SG_ALL, | 305 | .sg_tablesize = SCSI_MAX_SG_CHAIN_SEGMENTS, |
306 | .dma_boundary = IOMD_DMA_BOUNDARY, | ||
306 | .cmd_per_lun = 2, | 307 | .cmd_per_lun = 2, |
307 | .use_clustering = ENABLE_CLUSTERING, | 308 | .use_clustering = ENABLE_CLUSTERING, |
308 | .proc_name = "powertec", | 309 | .proc_name = "powertec", |
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index f6e3b86bb0be..a48a8a13d87b 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
@@ -43,13 +43,7 @@ | |||
43 | #include <linux/tty_flip.h> | 43 | #include <linux/tty_flip.h> |
44 | #include <linux/serial_core.h> | 44 | #include <linux/serial_core.h> |
45 | #include <linux/clk.h> | 45 | #include <linux/clk.h> |
46 | 46 | #include <linux/io.h> | |
47 | #include <asm/io.h> | ||
48 | #include <mach/hardware.h> | ||
49 | #include <asm/irq.h> | ||
50 | #include <mach/pxa-regs.h> | ||
51 | #include <mach/regs-uart.h> | ||
52 | |||
53 | 47 | ||
54 | struct uart_pxa_port { | 48 | struct uart_pxa_port { |
55 | struct uart_port port; | 49 | struct uart_port port; |
@@ -491,7 +485,7 @@ serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios, | |||
491 | * Ensure the port will be enabled. | 485 | * Ensure the port will be enabled. |
492 | * This is required especially for serial console. | 486 | * This is required especially for serial console. |
493 | */ | 487 | */ |
494 | up->ier |= IER_UUE; | 488 | up->ier |= UART_IER_UUE; |
495 | 489 | ||
496 | /* | 490 | /* |
497 | * Update the per-port timeout. | 491 | * Update the per-port timeout. |
@@ -784,19 +778,15 @@ static int serial_pxa_probe(struct platform_device *dev) | |||
784 | sport->port.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; | 778 | sport->port.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; |
785 | sport->port.uartclk = clk_get_rate(sport->clk); | 779 | sport->port.uartclk = clk_get_rate(sport->clk); |
786 | 780 | ||
787 | /* | 781 | switch (dev->id) { |
788 | * Is it worth keeping this? | 782 | case 0: sport->name = "FFUART"; break; |
789 | */ | 783 | case 1: sport->name = "BTUART"; break; |
790 | if (mmres->start == __PREG(FFUART)) | 784 | case 2: sport->name = "STUART"; break; |
791 | sport->name = "FFUART"; | 785 | case 3: sport->name = "HWUART"; break; |
792 | else if (mmres->start == __PREG(BTUART)) | 786 | default: |
793 | sport->name = "BTUART"; | ||
794 | else if (mmres->start == __PREG(STUART)) | ||
795 | sport->name = "STUART"; | ||
796 | else if (mmres->start == __PREG(HWUART)) | ||
797 | sport->name = "HWUART"; | ||
798 | else | ||
799 | sport->name = "???"; | 787 | sport->name = "???"; |
788 | break; | ||
789 | } | ||
800 | 790 | ||
801 | sport->port.membase = ioremap(mmres->start, mmres->end - mmres->start + 1); | 791 | sport->port.membase = ioremap(mmres->start, mmres->end - mmres->start + 1); |
802 | if (!sport->port.membase) { | 792 | if (!sport->port.membase) { |
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index d0fc4ca2f656..d22fac27219a 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
@@ -34,8 +34,6 @@ | |||
34 | #include <asm/delay.h> | 34 | #include <asm/delay.h> |
35 | 35 | ||
36 | #include <mach/dma.h> | 36 | #include <mach/dma.h> |
37 | #include <mach/hardware.h> | ||
38 | #include <mach/pxa-regs.h> | ||
39 | #include <mach/regs-ssp.h> | 37 | #include <mach/regs-ssp.h> |
40 | #include <mach/ssp.h> | 38 | #include <mach/ssp.h> |
41 | #include <mach/pxa2xx_spi.h> | 39 | #include <mach/pxa2xx_spi.h> |
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index fb3055f084b5..7cf74f8c2db1 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c | |||
@@ -28,8 +28,6 @@ | |||
28 | #include <linux/signal.h> | 28 | #include <linux/signal.h> |
29 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
30 | 30 | ||
31 | #include <mach/hardware.h> | ||
32 | |||
33 | static struct clk *usb_host_clock; | 31 | static struct clk *usb_host_clock; |
34 | 32 | ||
35 | static void ep93xx_start_hc(struct device *dev) | 33 | static void ep93xx_start_hc(struct device *dev) |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 967ac3d359a6..330204a61ea8 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -2131,6 +2131,20 @@ config FB_MX3 | |||
2131 | far only synchronous displays are supported. If you plan to use | 2131 | far only synchronous displays are supported. If you plan to use |
2132 | an LCD display with your i.MX31 system, say Y here. | 2132 | an LCD display with your i.MX31 system, say Y here. |
2133 | 2133 | ||
2134 | config FB_BROADSHEET | ||
2135 | tristate "E-Ink Broadsheet/Epson S1D13521 controller support" | ||
2136 | depends on FB | ||
2137 | select FB_SYS_FILLRECT | ||
2138 | select FB_SYS_COPYAREA | ||
2139 | select FB_SYS_IMAGEBLIT | ||
2140 | select FB_SYS_FOPS | ||
2141 | select FB_DEFERRED_IO | ||
2142 | help | ||
2143 | This driver implements support for the E-Ink Broadsheet | ||
2144 | controller. The release name for this device was Epson S1D13521 | ||
2145 | and could also have been called by other names when coupled with | ||
2146 | a bridge adapter. | ||
2147 | |||
2134 | source "drivers/video/omap/Kconfig" | 2148 | source "drivers/video/omap/Kconfig" |
2135 | 2149 | ||
2136 | source "drivers/video/backlight/Kconfig" | 2150 | source "drivers/video/backlight/Kconfig" |
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 2a998ca6181d..edd5a85c1eb5 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile | |||
@@ -106,6 +106,7 @@ obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o | |||
106 | obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o | 106 | obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o |
107 | obj-$(CONFIG_FB_MAXINE) += maxinefb.o | 107 | obj-$(CONFIG_FB_MAXINE) += maxinefb.o |
108 | obj-$(CONFIG_FB_METRONOME) += metronomefb.o | 108 | obj-$(CONFIG_FB_METRONOME) += metronomefb.o |
109 | obj-$(CONFIG_FB_BROADSHEET) += broadsheetfb.o | ||
109 | obj-$(CONFIG_FB_S1D13XXX) += s1d13xxxfb.o | 110 | obj-$(CONFIG_FB_S1D13XXX) += s1d13xxxfb.o |
110 | obj-$(CONFIG_FB_SH7760) += sh7760fb.o | 111 | obj-$(CONFIG_FB_SH7760) += sh7760fb.o |
111 | obj-$(CONFIG_FB_IMX) += imxfb.o | 112 | obj-$(CONFIG_FB_IMX) += imxfb.o |
diff --git a/drivers/video/broadsheetfb.c b/drivers/video/broadsheetfb.c new file mode 100644 index 000000000000..509cb92e8731 --- /dev/null +++ b/drivers/video/broadsheetfb.c | |||
@@ -0,0 +1,568 @@ | |||
1 | /* | ||
2 | * broadsheetfb.c -- FB driver for E-Ink Broadsheet controller | ||
3 | * | ||
4 | * Copyright (C) 2008, Jaya Kumar | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file COPYING in the main directory of this archive for | ||
8 | * more details. | ||
9 | * | ||
10 | * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven. | ||
11 | * | ||
12 | * This driver is written to be used with the Broadsheet display controller. | ||
13 | * | ||
14 | * It is intended to be architecture independent. A board specific driver | ||
15 | * must be used to perform all the physical IO interactions. | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #include <linux/module.h> | ||
20 | #include <linux/kernel.h> | ||
21 | #include <linux/errno.h> | ||
22 | #include <linux/string.h> | ||
23 | #include <linux/mm.h> | ||
24 | #include <linux/slab.h> | ||
25 | #include <linux/vmalloc.h> | ||
26 | #include <linux/delay.h> | ||
27 | #include <linux/interrupt.h> | ||
28 | #include <linux/fb.h> | ||
29 | #include <linux/init.h> | ||
30 | #include <linux/platform_device.h> | ||
31 | #include <linux/list.h> | ||
32 | #include <linux/uaccess.h> | ||
33 | |||
34 | #include <video/broadsheetfb.h> | ||
35 | |||
36 | /* Display specific information */ | ||
37 | #define DPY_W 800 | ||
38 | #define DPY_H 600 | ||
39 | |||
40 | static struct fb_fix_screeninfo broadsheetfb_fix __devinitdata = { | ||
41 | .id = "broadsheetfb", | ||
42 | .type = FB_TYPE_PACKED_PIXELS, | ||
43 | .visual = FB_VISUAL_STATIC_PSEUDOCOLOR, | ||
44 | .xpanstep = 0, | ||
45 | .ypanstep = 0, | ||
46 | .ywrapstep = 0, | ||
47 | .line_length = DPY_W, | ||
48 | .accel = FB_ACCEL_NONE, | ||
49 | }; | ||
50 | |||
51 | static struct fb_var_screeninfo broadsheetfb_var __devinitdata = { | ||
52 | .xres = DPY_W, | ||
53 | .yres = DPY_H, | ||
54 | .xres_virtual = DPY_W, | ||
55 | .yres_virtual = DPY_H, | ||
56 | .bits_per_pixel = 8, | ||
57 | .grayscale = 1, | ||
58 | .red = { 0, 4, 0 }, | ||
59 | .green = { 0, 4, 0 }, | ||
60 | .blue = { 0, 4, 0 }, | ||
61 | .transp = { 0, 0, 0 }, | ||
62 | }; | ||
63 | |||
64 | /* main broadsheetfb functions */ | ||
65 | static void broadsheet_issue_data(struct broadsheetfb_par *par, u16 data) | ||
66 | { | ||
67 | par->board->set_ctl(par, BS_WR, 0); | ||
68 | par->board->set_hdb(par, data); | ||
69 | par->board->set_ctl(par, BS_WR, 1); | ||
70 | } | ||
71 | |||
72 | static void broadsheet_issue_cmd(struct broadsheetfb_par *par, u16 data) | ||
73 | { | ||
74 | par->board->set_ctl(par, BS_DC, 0); | ||
75 | broadsheet_issue_data(par, data); | ||
76 | } | ||
77 | |||
78 | static void broadsheet_send_command(struct broadsheetfb_par *par, u16 data) | ||
79 | { | ||
80 | par->board->wait_for_rdy(par); | ||
81 | |||
82 | par->board->set_ctl(par, BS_CS, 0); | ||
83 | broadsheet_issue_cmd(par, data); | ||
84 | par->board->set_ctl(par, BS_DC, 1); | ||
85 | par->board->set_ctl(par, BS_CS, 1); | ||
86 | } | ||
87 | |||
88 | static void broadsheet_send_cmdargs(struct broadsheetfb_par *par, u16 cmd, | ||
89 | int argc, u16 *argv) | ||
90 | { | ||
91 | int i; | ||
92 | |||
93 | par->board->wait_for_rdy(par); | ||
94 | |||
95 | par->board->set_ctl(par, BS_CS, 0); | ||
96 | broadsheet_issue_cmd(par, cmd); | ||
97 | par->board->set_ctl(par, BS_DC, 1); | ||
98 | |||
99 | for (i = 0; i < argc; i++) | ||
100 | broadsheet_issue_data(par, argv[i]); | ||
101 | par->board->set_ctl(par, BS_CS, 1); | ||
102 | } | ||
103 | |||
104 | static void broadsheet_burst_write(struct broadsheetfb_par *par, int size, | ||
105 | u16 *data) | ||
106 | { | ||
107 | int i; | ||
108 | u16 tmp; | ||
109 | |||
110 | par->board->set_ctl(par, BS_CS, 0); | ||
111 | par->board->set_ctl(par, BS_DC, 1); | ||
112 | |||
113 | for (i = 0; i < size; i++) { | ||
114 | par->board->set_ctl(par, BS_WR, 0); | ||
115 | tmp = (data[i] & 0x0F) << 4; | ||
116 | tmp |= (data[i] & 0x0F00) << 4; | ||
117 | par->board->set_hdb(par, tmp); | ||
118 | par->board->set_ctl(par, BS_WR, 1); | ||
119 | } | ||
120 | |||
121 | par->board->set_ctl(par, BS_CS, 1); | ||
122 | } | ||
123 | |||
124 | static u16 broadsheet_get_data(struct broadsheetfb_par *par) | ||
125 | { | ||
126 | u16 res; | ||
127 | /* wait for ready to go hi. (lo is busy) */ | ||
128 | par->board->wait_for_rdy(par); | ||
129 | |||
130 | /* cs lo, dc lo for cmd, we lo for each data, db as usual */ | ||
131 | par->board->set_ctl(par, BS_DC, 1); | ||
132 | par->board->set_ctl(par, BS_CS, 0); | ||
133 | par->board->set_ctl(par, BS_WR, 0); | ||
134 | |||
135 | res = par->board->get_hdb(par); | ||
136 | |||
137 | /* strobe wr */ | ||
138 | par->board->set_ctl(par, BS_WR, 1); | ||
139 | par->board->set_ctl(par, BS_CS, 1); | ||
140 | |||
141 | return res; | ||
142 | } | ||
143 | |||
144 | static void broadsheet_write_reg(struct broadsheetfb_par *par, u16 reg, | ||
145 | u16 data) | ||
146 | { | ||
147 | /* wait for ready to go hi. (lo is busy) */ | ||
148 | par->board->wait_for_rdy(par); | ||
149 | |||
150 | /* cs lo, dc lo for cmd, we lo for each data, db as usual */ | ||
151 | par->board->set_ctl(par, BS_CS, 0); | ||
152 | |||
153 | broadsheet_issue_cmd(par, BS_CMD_WR_REG); | ||
154 | |||
155 | par->board->set_ctl(par, BS_DC, 1); | ||
156 | |||
157 | broadsheet_issue_data(par, reg); | ||
158 | broadsheet_issue_data(par, data); | ||
159 | |||
160 | par->board->set_ctl(par, BS_CS, 1); | ||
161 | } | ||
162 | |||
163 | static u16 broadsheet_read_reg(struct broadsheetfb_par *par, u16 reg) | ||
164 | { | ||
165 | broadsheet_send_command(par, reg); | ||
166 | msleep(100); | ||
167 | return broadsheet_get_data(par); | ||
168 | } | ||
169 | |||
170 | static void __devinit broadsheet_init_display(struct broadsheetfb_par *par) | ||
171 | { | ||
172 | u16 args[5]; | ||
173 | |||
174 | args[0] = DPY_W; | ||
175 | args[1] = DPY_H; | ||
176 | args[2] = (100 | (1 << 8) | (1 << 9)); /* sdcfg */ | ||
177 | args[3] = 2; /* gdrv cfg */ | ||
178 | args[4] = (4 | (1 << 7)); /* lut index format */ | ||
179 | broadsheet_send_cmdargs(par, BS_CMD_INIT_DSPE_CFG, 5, args); | ||
180 | |||
181 | /* did the controller really set it? */ | ||
182 | broadsheet_send_cmdargs(par, BS_CMD_INIT_DSPE_CFG, 5, args); | ||
183 | |||
184 | args[0] = 4; /* fsync len */ | ||
185 | args[1] = (10 << 8) | 4; /* fend/fbegin len */ | ||
186 | args[2] = 10; /* line sync len */ | ||
187 | args[3] = (100 << 8) | 4; /* line end/begin len */ | ||
188 | args[4] = 6; /* pixel clock cfg */ | ||
189 | broadsheet_send_cmdargs(par, BS_CMD_INIT_DSPE_TMG, 5, args); | ||
190 | |||
191 | /* setup waveform */ | ||
192 | args[0] = 0x886; | ||
193 | args[1] = 0; | ||
194 | broadsheet_send_cmdargs(par, BS_CMD_RD_WFM_INFO, 2, args); | ||
195 | |||
196 | broadsheet_send_command(par, BS_CMD_UPD_GDRV_CLR); | ||
197 | |||
198 | broadsheet_send_command(par, BS_CMD_WAIT_DSPE_TRG); | ||
199 | |||
200 | broadsheet_write_reg(par, 0x330, 0x84); | ||
201 | |||
202 | broadsheet_send_command(par, BS_CMD_WAIT_DSPE_TRG); | ||
203 | |||
204 | args[0] = (0x3 << 4); | ||
205 | broadsheet_send_cmdargs(par, BS_CMD_LD_IMG, 1, args); | ||
206 | |||
207 | args[0] = 0x154; | ||
208 | broadsheet_send_cmdargs(par, BS_CMD_WR_REG, 1, args); | ||
209 | |||
210 | broadsheet_burst_write(par, DPY_W*DPY_H/2, | ||
211 | (u16 *) par->info->screen_base); | ||
212 | |||
213 | broadsheet_send_command(par, BS_CMD_LD_IMG_END); | ||
214 | |||
215 | args[0] = 0x4300; | ||
216 | broadsheet_send_cmdargs(par, BS_CMD_UPD_FULL, 1, args); | ||
217 | |||
218 | broadsheet_send_command(par, BS_CMD_WAIT_DSPE_TRG); | ||
219 | |||
220 | broadsheet_send_command(par, BS_CMD_WAIT_DSPE_FREND); | ||
221 | |||
222 | par->board->wait_for_rdy(par); | ||
223 | } | ||
224 | |||
225 | static void __devinit broadsheet_init(struct broadsheetfb_par *par) | ||
226 | { | ||
227 | broadsheet_send_command(par, BS_CMD_INIT_SYS_RUN); | ||
228 | /* the controller needs a second */ | ||
229 | msleep(1000); | ||
230 | broadsheet_init_display(par); | ||
231 | } | ||
232 | |||
233 | static void broadsheetfb_dpy_update_pages(struct broadsheetfb_par *par, | ||
234 | u16 y1, u16 y2) | ||
235 | { | ||
236 | u16 args[5]; | ||
237 | unsigned char *buf = (unsigned char *)par->info->screen_base; | ||
238 | |||
239 | /* y1 must be a multiple of 4 so drop the lower bits */ | ||
240 | y1 &= 0xFFFC; | ||
241 | /* y2 must be a multiple of 4 , but - 1 so up the lower bits */ | ||
242 | y2 |= 0x0003; | ||
243 | |||
244 | args[0] = 0x3 << 4; | ||
245 | args[1] = 0; | ||
246 | args[2] = y1; | ||
247 | args[3] = cpu_to_le16(par->info->var.xres); | ||
248 | args[4] = y2; | ||
249 | broadsheet_send_cmdargs(par, BS_CMD_LD_IMG_AREA, 5, args); | ||
250 | |||
251 | args[0] = 0x154; | ||
252 | broadsheet_send_cmdargs(par, BS_CMD_WR_REG, 1, args); | ||
253 | |||
254 | buf += y1 * par->info->var.xres; | ||
255 | broadsheet_burst_write(par, ((1 + y2 - y1) * par->info->var.xres)/2, | ||
256 | (u16 *) buf); | ||
257 | |||
258 | broadsheet_send_command(par, BS_CMD_LD_IMG_END); | ||
259 | |||
260 | args[0] = 0x4300; | ||
261 | broadsheet_send_cmdargs(par, BS_CMD_UPD_FULL, 1, args); | ||
262 | |||
263 | broadsheet_send_command(par, BS_CMD_WAIT_DSPE_TRG); | ||
264 | |||
265 | broadsheet_send_command(par, BS_CMD_WAIT_DSPE_FREND); | ||
266 | |||
267 | par->board->wait_for_rdy(par); | ||
268 | |||
269 | } | ||
270 | |||
271 | static void broadsheetfb_dpy_update(struct broadsheetfb_par *par) | ||
272 | { | ||
273 | u16 args[5]; | ||
274 | |||
275 | args[0] = 0x3 << 4; | ||
276 | broadsheet_send_cmdargs(par, BS_CMD_LD_IMG, 1, args); | ||
277 | |||
278 | args[0] = 0x154; | ||
279 | broadsheet_send_cmdargs(par, BS_CMD_WR_REG, 1, args); | ||
280 | broadsheet_burst_write(par, DPY_W*DPY_H/2, | ||
281 | (u16 *) par->info->screen_base); | ||
282 | |||
283 | broadsheet_send_command(par, BS_CMD_LD_IMG_END); | ||
284 | |||
285 | args[0] = 0x4300; | ||
286 | broadsheet_send_cmdargs(par, BS_CMD_UPD_FULL, 1, args); | ||
287 | |||
288 | broadsheet_send_command(par, BS_CMD_WAIT_DSPE_TRG); | ||
289 | |||
290 | broadsheet_send_command(par, BS_CMD_WAIT_DSPE_FREND); | ||
291 | |||
292 | par->board->wait_for_rdy(par); | ||
293 | |||
294 | } | ||
295 | |||
296 | /* this is called back from the deferred io workqueue */ | ||
297 | static void broadsheetfb_dpy_deferred_io(struct fb_info *info, | ||
298 | struct list_head *pagelist) | ||
299 | { | ||
300 | u16 y1 = 0, h = 0; | ||
301 | int prev_index = -1; | ||
302 | struct page *cur; | ||
303 | struct fb_deferred_io *fbdefio = info->fbdefio; | ||
304 | int h_inc; | ||
305 | u16 yres = info->var.yres; | ||
306 | u16 xres = info->var.xres; | ||
307 | |||
308 | /* height increment is fixed per page */ | ||
309 | h_inc = DIV_ROUND_UP(PAGE_SIZE , xres); | ||
310 | |||
311 | /* walk the written page list and swizzle the data */ | ||
312 | list_for_each_entry(cur, &fbdefio->pagelist, lru) { | ||
313 | if (prev_index < 0) { | ||
314 | /* just starting so assign first page */ | ||
315 | y1 = (cur->index << PAGE_SHIFT) / xres; | ||
316 | h = h_inc; | ||
317 | } else if ((prev_index + 1) == cur->index) { | ||
318 | /* this page is consecutive so increase our height */ | ||
319 | h += h_inc; | ||
320 | } else { | ||
321 | /* page not consecutive, issue previous update first */ | ||
322 | broadsheetfb_dpy_update_pages(info->par, y1, y1 + h); | ||
323 | /* start over with our non consecutive page */ | ||
324 | y1 = (cur->index << PAGE_SHIFT) / xres; | ||
325 | h = h_inc; | ||
326 | } | ||
327 | prev_index = cur->index; | ||
328 | } | ||
329 | |||
330 | /* if we still have any pages to update we do so now */ | ||
331 | if (h >= yres) { | ||
332 | /* its a full screen update, just do it */ | ||
333 | broadsheetfb_dpy_update(info->par); | ||
334 | } else { | ||
335 | broadsheetfb_dpy_update_pages(info->par, y1, | ||
336 | min((u16) (y1 + h), yres)); | ||
337 | } | ||
338 | } | ||
339 | |||
340 | static void broadsheetfb_fillrect(struct fb_info *info, | ||
341 | const struct fb_fillrect *rect) | ||
342 | { | ||
343 | struct broadsheetfb_par *par = info->par; | ||
344 | |||
345 | sys_fillrect(info, rect); | ||
346 | |||
347 | broadsheetfb_dpy_update(par); | ||
348 | } | ||
349 | |||
350 | static void broadsheetfb_copyarea(struct fb_info *info, | ||
351 | const struct fb_copyarea *area) | ||
352 | { | ||
353 | struct broadsheetfb_par *par = info->par; | ||
354 | |||
355 | sys_copyarea(info, area); | ||
356 | |||
357 | broadsheetfb_dpy_update(par); | ||
358 | } | ||
359 | |||
360 | static void broadsheetfb_imageblit(struct fb_info *info, | ||
361 | const struct fb_image *image) | ||
362 | { | ||
363 | struct broadsheetfb_par *par = info->par; | ||
364 | |||
365 | sys_imageblit(info, image); | ||
366 | |||
367 | broadsheetfb_dpy_update(par); | ||
368 | } | ||
369 | |||
370 | /* | ||
371 | * this is the slow path from userspace. they can seek and write to | ||
372 | * the fb. it's inefficient to do anything less than a full screen draw | ||
373 | */ | ||
374 | static ssize_t broadsheetfb_write(struct fb_info *info, const char __user *buf, | ||
375 | size_t count, loff_t *ppos) | ||
376 | { | ||
377 | struct broadsheetfb_par *par = info->par; | ||
378 | unsigned long p = *ppos; | ||
379 | void *dst; | ||
380 | int err = 0; | ||
381 | unsigned long total_size; | ||
382 | |||
383 | if (info->state != FBINFO_STATE_RUNNING) | ||
384 | return -EPERM; | ||
385 | |||
386 | total_size = info->fix.smem_len; | ||
387 | |||
388 | if (p > total_size) | ||
389 | return -EFBIG; | ||
390 | |||
391 | if (count > total_size) { | ||
392 | err = -EFBIG; | ||
393 | count = total_size; | ||
394 | } | ||
395 | |||
396 | if (count + p > total_size) { | ||
397 | if (!err) | ||
398 | err = -ENOSPC; | ||
399 | |||
400 | count = total_size - p; | ||
401 | } | ||
402 | |||
403 | dst = (void *)(info->screen_base + p); | ||
404 | |||
405 | if (copy_from_user(dst, buf, count)) | ||
406 | err = -EFAULT; | ||
407 | |||
408 | if (!err) | ||
409 | *ppos += count; | ||
410 | |||
411 | broadsheetfb_dpy_update(par); | ||
412 | |||
413 | return (err) ? err : count; | ||
414 | } | ||
415 | |||
416 | static struct fb_ops broadsheetfb_ops = { | ||
417 | .owner = THIS_MODULE, | ||
418 | .fb_read = fb_sys_read, | ||
419 | .fb_write = broadsheetfb_write, | ||
420 | .fb_fillrect = broadsheetfb_fillrect, | ||
421 | .fb_copyarea = broadsheetfb_copyarea, | ||
422 | .fb_imageblit = broadsheetfb_imageblit, | ||
423 | }; | ||
424 | |||
425 | static struct fb_deferred_io broadsheetfb_defio = { | ||
426 | .delay = HZ/4, | ||
427 | .deferred_io = broadsheetfb_dpy_deferred_io, | ||
428 | }; | ||
429 | |||
430 | static int __devinit broadsheetfb_probe(struct platform_device *dev) | ||
431 | { | ||
432 | struct fb_info *info; | ||
433 | struct broadsheet_board *board; | ||
434 | int retval = -ENOMEM; | ||
435 | int videomemorysize; | ||
436 | unsigned char *videomemory; | ||
437 | struct broadsheetfb_par *par; | ||
438 | int i; | ||
439 | |||
440 | /* pick up board specific routines */ | ||
441 | board = dev->dev.platform_data; | ||
442 | if (!board) | ||
443 | return -EINVAL; | ||
444 | |||
445 | /* try to count device specific driver, if can't, platform recalls */ | ||
446 | if (!try_module_get(board->owner)) | ||
447 | return -ENODEV; | ||
448 | |||
449 | info = framebuffer_alloc(sizeof(struct broadsheetfb_par), &dev->dev); | ||
450 | if (!info) | ||
451 | goto err; | ||
452 | |||
453 | videomemorysize = (DPY_W*DPY_H); | ||
454 | videomemory = vmalloc(videomemorysize); | ||
455 | if (!videomemory) | ||
456 | goto err_fb_rel; | ||
457 | |||
458 | memset(videomemory, 0, videomemorysize); | ||
459 | |||
460 | info->screen_base = (char *)videomemory; | ||
461 | info->fbops = &broadsheetfb_ops; | ||
462 | |||
463 | info->var = broadsheetfb_var; | ||
464 | info->fix = broadsheetfb_fix; | ||
465 | info->fix.smem_len = videomemorysize; | ||
466 | par = info->par; | ||
467 | par->info = info; | ||
468 | par->board = board; | ||
469 | par->write_reg = broadsheet_write_reg; | ||
470 | par->read_reg = broadsheet_read_reg; | ||
471 | init_waitqueue_head(&par->waitq); | ||
472 | |||
473 | info->flags = FBINFO_FLAG_DEFAULT; | ||
474 | |||
475 | info->fbdefio = &broadsheetfb_defio; | ||
476 | fb_deferred_io_init(info); | ||
477 | |||
478 | retval = fb_alloc_cmap(&info->cmap, 16, 0); | ||
479 | if (retval < 0) { | ||
480 | dev_err(&dev->dev, "Failed to allocate colormap\n"); | ||
481 | goto err_vfree; | ||
482 | } | ||
483 | |||
484 | /* set cmap */ | ||
485 | for (i = 0; i < 16; i++) | ||
486 | info->cmap.red[i] = (((2*i)+1)*(0xFFFF))/32; | ||
487 | memcpy(info->cmap.green, info->cmap.red, sizeof(u16)*16); | ||
488 | memcpy(info->cmap.blue, info->cmap.red, sizeof(u16)*16); | ||
489 | |||
490 | retval = par->board->setup_irq(info); | ||
491 | if (retval < 0) | ||
492 | goto err_cmap; | ||
493 | |||
494 | /* this inits the dpy */ | ||
495 | retval = board->init(par); | ||
496 | if (retval < 0) | ||
497 | goto err_free_irq; | ||
498 | |||
499 | broadsheet_init(par); | ||
500 | |||
501 | retval = register_framebuffer(info); | ||
502 | if (retval < 0) | ||
503 | goto err_free_irq; | ||
504 | platform_set_drvdata(dev, info); | ||
505 | |||
506 | printk(KERN_INFO | ||
507 | "fb%d: Broadsheet frame buffer, using %dK of video memory\n", | ||
508 | info->node, videomemorysize >> 10); | ||
509 | |||
510 | |||
511 | return 0; | ||
512 | |||
513 | err_free_irq: | ||
514 | board->cleanup(par); | ||
515 | err_cmap: | ||
516 | fb_dealloc_cmap(&info->cmap); | ||
517 | err_vfree: | ||
518 | vfree(videomemory); | ||
519 | err_fb_rel: | ||
520 | framebuffer_release(info); | ||
521 | err: | ||
522 | module_put(board->owner); | ||
523 | return retval; | ||
524 | |||
525 | } | ||
526 | |||
527 | static int __devexit broadsheetfb_remove(struct platform_device *dev) | ||
528 | { | ||
529 | struct fb_info *info = platform_get_drvdata(dev); | ||
530 | |||
531 | if (info) { | ||
532 | struct broadsheetfb_par *par = info->par; | ||
533 | unregister_framebuffer(info); | ||
534 | fb_deferred_io_cleanup(info); | ||
535 | par->board->cleanup(par); | ||
536 | fb_dealloc_cmap(&info->cmap); | ||
537 | vfree((void *)info->screen_base); | ||
538 | module_put(par->board->owner); | ||
539 | framebuffer_release(info); | ||
540 | } | ||
541 | return 0; | ||
542 | } | ||
543 | |||
544 | static struct platform_driver broadsheetfb_driver = { | ||
545 | .probe = broadsheetfb_probe, | ||
546 | .remove = broadsheetfb_remove, | ||
547 | .driver = { | ||
548 | .owner = THIS_MODULE, | ||
549 | .name = "broadsheetfb", | ||
550 | }, | ||
551 | }; | ||
552 | |||
553 | static int __init broadsheetfb_init(void) | ||
554 | { | ||
555 | return platform_driver_register(&broadsheetfb_driver); | ||
556 | } | ||
557 | |||
558 | static void __exit broadsheetfb_exit(void) | ||
559 | { | ||
560 | platform_driver_unregister(&broadsheetfb_driver); | ||
561 | } | ||
562 | |||
563 | module_init(broadsheetfb_init); | ||
564 | module_exit(broadsheetfb_exit); | ||
565 | |||
566 | MODULE_DESCRIPTION("fbdev driver for Broadsheet controller"); | ||
567 | MODULE_AUTHOR("Jaya Kumar"); | ||
568 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index 7a9e42e3a9a9..51b373657aa2 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c | |||
@@ -1425,7 +1425,7 @@ static void cyberpro_common_resume(struct cfb_info *cfb) | |||
1425 | 1425 | ||
1426 | #ifdef CONFIG_ARCH_SHARK | 1426 | #ifdef CONFIG_ARCH_SHARK |
1427 | 1427 | ||
1428 | #include <mach/hardware.h> | 1428 | #include <mach/framebuffer.h> |
1429 | 1429 | ||
1430 | static int __devinit cyberpro_vl_probe(void) | 1430 | static int __devinit cyberpro_vl_probe(void) |
1431 | { | 1431 | { |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 2552b9f325ee..07b371b4b072 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -59,7 +59,6 @@ | |||
59 | #include <asm/io.h> | 59 | #include <asm/io.h> |
60 | #include <asm/irq.h> | 60 | #include <asm/irq.h> |
61 | #include <asm/div64.h> | 61 | #include <asm/div64.h> |
62 | #include <mach/pxa-regs.h> | ||
63 | #include <mach/bitfield.h> | 62 | #include <mach/bitfield.h> |
64 | #include <mach/pxafb.h> | 63 | #include <mach/pxafb.h> |
65 | 64 | ||
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index 79cf0b1976aa..b0b4513ba537 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -1017,6 +1017,10 @@ static int s3c2410fb_resume(struct platform_device *dev) | |||
1017 | 1017 | ||
1018 | s3c2410fb_init_registers(fbinfo); | 1018 | s3c2410fb_init_registers(fbinfo); |
1019 | 1019 | ||
1020 | /* re-activate our display after resume */ | ||
1021 | s3c2410fb_activate_var(fbinfo); | ||
1022 | s3c2410fb_blank(FB_BLANK_UNBLANK, fbinfo); | ||
1023 | |||
1020 | return 0; | 1024 | return 0; |
1021 | } | 1025 | } |
1022 | 1026 | ||
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 076f946fa0f5..022d07abbf99 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
@@ -251,22 +251,6 @@ static struct sa1100fb_mach_info pal_info __initdata = { | |||
251 | #endif | 251 | #endif |
252 | #endif | 252 | #endif |
253 | 253 | ||
254 | #ifdef CONFIG_SA1100_H3800 | ||
255 | static struct sa1100fb_mach_info h3800_info __initdata = { | ||
256 | .pixclock = 174757, .bpp = 16, | ||
257 | .xres = 320, .yres = 240, | ||
258 | |||
259 | .hsync_len = 3, .vsync_len = 3, | ||
260 | .left_margin = 12, .upper_margin = 10, | ||
261 | .right_margin = 17, .lower_margin = 1, | ||
262 | |||
263 | .cmap_static = 1, | ||
264 | |||
265 | .lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Act, | ||
266 | .lccr3 = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2), | ||
267 | }; | ||
268 | #endif | ||
269 | |||
270 | #ifdef CONFIG_SA1100_H3600 | 254 | #ifdef CONFIG_SA1100_H3600 |
271 | static struct sa1100fb_mach_info h3600_info __initdata = { | 255 | static struct sa1100fb_mach_info h3600_info __initdata = { |
272 | .pixclock = 174757, .bpp = 16, | 256 | .pixclock = 174757, .bpp = 16, |
@@ -432,11 +416,6 @@ sa1100fb_get_machine_info(struct sa1100fb_info *fbi) | |||
432 | fbi->rgb[RGB_16] = &h3600_rgb_16; | 416 | fbi->rgb[RGB_16] = &h3600_rgb_16; |
433 | } | 417 | } |
434 | #endif | 418 | #endif |
435 | #ifdef CONFIG_SA1100_H3800 | ||
436 | if (machine_is_h3800()) { | ||
437 | inf = &h3800_info; | ||
438 | } | ||
439 | #endif | ||
440 | #ifdef CONFIG_SA1100_COLLIE | 419 | #ifdef CONFIG_SA1100_COLLIE |
441 | if (machine_is_collie()) { | 420 | if (machine_is_collie()) { |
442 | inf = &collie_info; | 421 | inf = &collie_info; |
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index e19b45794717..4b84f296d30c 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/timex.h> | 30 | #include <linux/timex.h> |
31 | 31 | ||
32 | #ifdef CONFIG_ARCH_PXA | 32 | #ifdef CONFIG_ARCH_PXA |
33 | #include <mach/pxa-regs.h> | 33 | #include <mach/regs-ost.h> |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #include <mach/reset.h> | 36 | #include <mach/reset.h> |
diff --git a/include/video/broadsheetfb.h b/include/video/broadsheetfb.h new file mode 100644 index 000000000000..a758534c0272 --- /dev/null +++ b/include/video/broadsheetfb.h | |||
@@ -0,0 +1,59 @@ | |||
1 | /* | ||
2 | * broadsheetfb.h - definitions for the broadsheet framebuffer driver | ||
3 | * | ||
4 | * Copyright (C) 2008 by Jaya Kumar | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file COPYING in the main directory of this archive for | ||
8 | * more details. | ||
9 | * | ||
10 | */ | ||
11 | |||
12 | #ifndef _LINUX_BROADSHEETFB_H_ | ||
13 | #define _LINUX_BROADSHEETFB_H_ | ||
14 | |||
15 | /* Broadsheet command defines */ | ||
16 | #define BS_CMD_INIT_SYS_RUN 0x06 | ||
17 | #define BS_CMD_INIT_DSPE_CFG 0x09 | ||
18 | #define BS_CMD_INIT_DSPE_TMG 0x0A | ||
19 | #define BS_CMD_INIT_ROTMODE 0x0B | ||
20 | #define BS_CMD_RD_REG 0x10 | ||
21 | #define BS_CMD_WR_REG 0x11 | ||
22 | #define BS_CMD_LD_IMG 0x20 | ||
23 | #define BS_CMD_LD_IMG_AREA 0x22 | ||
24 | #define BS_CMD_LD_IMG_END 0x23 | ||
25 | #define BS_CMD_WAIT_DSPE_TRG 0x28 | ||
26 | #define BS_CMD_WAIT_DSPE_FREND 0x29 | ||
27 | #define BS_CMD_RD_WFM_INFO 0x30 | ||
28 | #define BS_CMD_UPD_INIT 0x32 | ||
29 | #define BS_CMD_UPD_FULL 0x33 | ||
30 | #define BS_CMD_UPD_GDRV_CLR 0x37 | ||
31 | |||
32 | /* Broadsheet pin interface specific defines */ | ||
33 | #define BS_CS 0x01 | ||
34 | #define BS_DC 0x02 | ||
35 | #define BS_WR 0x03 | ||
36 | |||
37 | /* struct used by broadsheet. board specific stuff comes from *board */ | ||
38 | struct broadsheetfb_par { | ||
39 | struct fb_info *info; | ||
40 | struct broadsheet_board *board; | ||
41 | void (*write_reg)(struct broadsheetfb_par *, u16 reg, u16 val); | ||
42 | u16 (*read_reg)(struct broadsheetfb_par *, u16 reg); | ||
43 | wait_queue_head_t waitq; | ||
44 | }; | ||
45 | |||
46 | /* board specific routines */ | ||
47 | struct broadsheet_board { | ||
48 | struct module *owner; | ||
49 | int (*init)(struct broadsheetfb_par *); | ||
50 | int (*wait_for_rdy)(struct broadsheetfb_par *); | ||
51 | void (*set_ctl)(struct broadsheetfb_par *, unsigned char, u8); | ||
52 | void (*set_hdb)(struct broadsheetfb_par *, u16); | ||
53 | u16 (*get_hdb)(struct broadsheetfb_par *); | ||
54 | void (*cleanup)(struct broadsheetfb_par *); | ||
55 | int (*get_panel_type)(void); | ||
56 | int (*setup_irq)(struct fb_info *); | ||
57 | }; | ||
58 | |||
59 | #endif | ||
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 1bcf9cd4baa0..c536b37a11cc 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -402,7 +402,7 @@ config LOCKDEP | |||
402 | bool | 402 | bool |
403 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT | 403 | depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT |
404 | select STACKTRACE | 404 | select STACKTRACE |
405 | select FRAME_POINTER if !X86 && !MIPS && !PPC | 405 | select FRAME_POINTER if !X86 && !MIPS && !PPC && !ARM_UNWIND |
406 | select KALLSYMS | 406 | select KALLSYMS |
407 | select KALLSYMS_ALL | 407 | select KALLSYMS_ALL |
408 | 408 | ||
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 35afd0c33be5..718d06640dd4 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <sound/pxa2xx-lib.h> | 21 | #include <sound/pxa2xx-lib.h> |
22 | 22 | ||
23 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
24 | #include <mach/hardware.h> | ||
25 | #include <mach/regs-ac97.h> | 24 | #include <mach/regs-ac97.h> |
26 | #include <mach/pxa2xx-gpio.h> | 25 | #include <mach/pxa2xx-gpio.h> |
27 | #include <mach/audio.h> | 26 | #include <mach/audio.h> |
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 85cf591d4e11..ccec48fc8e3f 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
@@ -20,8 +20,6 @@ | |||
20 | #include <sound/initval.h> | 20 | #include <sound/initval.h> |
21 | #include <sound/pxa2xx-lib.h> | 21 | #include <sound/pxa2xx-lib.h> |
22 | 22 | ||
23 | #include <mach/hardware.h> | ||
24 | #include <mach/pxa-regs.h> | ||
25 | #include <mach/regs-ac97.h> | 23 | #include <mach/regs-ac97.h> |
26 | #include <mach/audio.h> | 24 | #include <mach/audio.h> |
27 | 25 | ||
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index 75a0d746fb60..108b643229ba 100644 --- a/sound/arm/pxa2xx-pcm-lib.c +++ b/sound/arm/pxa2xx-pcm-lib.c | |||
@@ -12,8 +12,7 @@ | |||
12 | #include <sound/pcm_params.h> | 12 | #include <sound/pcm_params.h> |
13 | #include <sound/pxa2xx-lib.h> | 13 | #include <sound/pxa2xx-lib.h> |
14 | 14 | ||
15 | #include <asm/dma.h> | 15 | #include <mach/dma.h> |
16 | #include <mach/pxa-regs.h> | ||
17 | 16 | ||
18 | #include "pxa2xx-pcm.h" | 17 | #include "pxa2xx-pcm.h" |
19 | 18 | ||
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 1ba25a559524..ec930667feff 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include <sound/soc-dapm.h> | 25 | #include <sound/soc-dapm.h> |
26 | 26 | ||
27 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
28 | #include <mach/pxa-regs.h> | ||
29 | #include <mach/hardware.h> | ||
30 | #include <mach/corgi.h> | 28 | #include <mach/corgi.h> |
31 | #include <mach/audio.h> | 29 | #include <mach/audio.h> |
32 | 30 | ||
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c index 2e3386dfa0f0..ac294c797b7d 100644 --- a/sound/soc/pxa/e800_wm9712.c +++ b/sound/soc/pxa/e800_wm9712.c | |||
@@ -21,8 +21,6 @@ | |||
21 | #include <sound/soc-dapm.h> | 21 | #include <sound/soc-dapm.h> |
22 | 22 | ||
23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
24 | #include <mach/pxa-regs.h> | ||
25 | #include <mach/hardware.h> | ||
26 | #include <mach/audio.h> | 24 | #include <mach/audio.h> |
27 | 25 | ||
28 | #include "../codecs/wm9712.h" | 26 | #include "../codecs/wm9712.h" |
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index fe4a729ea648..949be9c2a01b 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c | |||
@@ -29,8 +29,6 @@ | |||
29 | #include <sound/soc-dapm.h> | 29 | #include <sound/soc-dapm.h> |
30 | 30 | ||
31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
32 | #include <mach/pxa-regs.h> | ||
33 | #include <mach/hardware.h> | ||
34 | #include <mach/audio.h> | 32 | #include <mach/audio.h> |
35 | 33 | ||
36 | #include "../codecs/wm9712.h" | 34 | #include "../codecs/wm9712.h" |
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 6e9827189fff..cad2c4c0ac95 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -26,8 +26,6 @@ | |||
26 | 26 | ||
27 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
28 | #include <asm/hardware/locomo.h> | 28 | #include <asm/hardware/locomo.h> |
29 | #include <mach/pxa-regs.h> | ||
30 | #include <mach/hardware.h> | ||
31 | #include <mach/poodle.h> | 29 | #include <mach/poodle.h> |
32 | #include <mach/audio.h> | 30 | #include <mach/audio.h> |
33 | 31 | ||
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 73cb6b4c2f2d..1dfdf66fb1f3 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <sound/pxa2xx-lib.h> | 29 | #include <sound/pxa2xx-lib.h> |
30 | 30 | ||
31 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
32 | #include <mach/pxa-regs.h> | 32 | #include <mach/dma.h> |
33 | #include <mach/regs-ssp.h> | 33 | #include <mach/regs-ssp.h> |
34 | #include <mach/audio.h> | 34 | #include <mach/audio.h> |
35 | #include <mach/ssp.h> | 35 | #include <mach/ssp.h> |
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 812c2b4d3e07..a4a655f7e304 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c | |||
@@ -20,8 +20,8 @@ | |||
20 | #include <sound/pxa2xx-lib.h> | 20 | #include <sound/pxa2xx-lib.h> |
21 | 21 | ||
22 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
23 | #include <mach/pxa-regs.h> | ||
24 | #include <mach/regs-ac97.h> | 23 | #include <mach/regs-ac97.h> |
24 | #include <mach/dma.h> | ||
25 | 25 | ||
26 | #include "pxa2xx-pcm.h" | 26 | #include "pxa2xx-pcm.h" |
27 | #include "pxa2xx-ac97.h" | 27 | #include "pxa2xx-ac97.h" |
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 517991fb1099..223de890259e 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <sound/pxa2xx-lib.h> | 24 | #include <sound/pxa2xx-lib.h> |
25 | 25 | ||
26 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
27 | #include <mach/pxa-regs.h> | 27 | #include <mach/dma.h> |
28 | #include <mach/pxa2xx-gpio.h> | 28 | #include <mach/pxa2xx-gpio.h> |
29 | #include <mach/audio.h> | 29 | #include <mach/audio.h> |
30 | 30 | ||
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index a3b9e6bdf979..de8778fa8729 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
@@ -26,8 +26,6 @@ | |||
26 | #include <sound/soc-dapm.h> | 26 | #include <sound/soc-dapm.h> |
27 | 27 | ||
28 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
29 | #include <mach/pxa-regs.h> | ||
30 | #include <mach/hardware.h> | ||
31 | #include <mach/spitz.h> | 29 | #include <mach/spitz.h> |
32 | #include "../codecs/wm8750.h" | 30 | #include "../codecs/wm8750.h" |
33 | #include "pxa2xx-pcm.h" | 31 | #include "pxa2xx-pcm.h" |
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index c77194f74c9b..050223d04e54 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
@@ -30,8 +30,6 @@ | |||
30 | 30 | ||
31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
32 | #include <mach/tosa.h> | 32 | #include <mach/tosa.h> |
33 | #include <mach/pxa-regs.h> | ||
34 | #include <mach/hardware.h> | ||
35 | #include <mach/audio.h> | 33 | #include <mach/audio.h> |
36 | 34 | ||
37 | #include "../codecs/wm9712.h" | 35 | #include "../codecs/wm9712.h" |