diff options
756 files changed, 15568 insertions, 8241 deletions
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt index b8e86460046e..b462bb149543 100644 --- a/Documentation/DMA-API.txt +++ b/Documentation/DMA-API.txt | |||
| @@ -316,12 +316,10 @@ reduce current DMA mapping usage or delay and try again later). | |||
| 316 | pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, | 316 | pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, |
| 317 | int nents, int direction) | 317 | int nents, int direction) |
| 318 | 318 | ||
| 319 | Maps a scatter gather list from the block layer. | ||
| 320 | |||
| 321 | Returns: the number of physical segments mapped (this may be shorter | 319 | Returns: the number of physical segments mapped (this may be shorter |
| 322 | than <nents> passed in if the block layer determines that some | 320 | than <nents> passed in if some elements of the scatter/gather list are |
| 323 | elements of the scatter/gather list are physically adjacent and thus | 321 | physically or virtually adjacent and an IOMMU maps them with a single |
| 324 | may be mapped with a single entry). | 322 | entry). |
| 325 | 323 | ||
| 326 | Please note that the sg cannot be mapped again if it has been mapped once. | 324 | Please note that the sg cannot be mapped again if it has been mapped once. |
| 327 | The mapping process is allowed to destroy information in the sg. | 325 | The mapping process is allowed to destroy information in the sg. |
diff --git a/Documentation/cpu-freq/user-guide.txt b/Documentation/cpu-freq/user-guide.txt index 6c442d8426b5..4f3f3840320e 100644 --- a/Documentation/cpu-freq/user-guide.txt +++ b/Documentation/cpu-freq/user-guide.txt | |||
| @@ -23,6 +23,7 @@ Contents: | |||
| 23 | 1.3 sparc64 | 23 | 1.3 sparc64 |
| 24 | 1.4 ppc | 24 | 1.4 ppc |
| 25 | 1.5 SuperH | 25 | 1.5 SuperH |
| 26 | 1.6 Blackfin | ||
| 26 | 27 | ||
| 27 | 2. "Policy" / "Governor"? | 28 | 2. "Policy" / "Governor"? |
| 28 | 2.1 Policy | 29 | 2.1 Policy |
| @@ -97,6 +98,17 @@ The following SuperH processors are supported by cpufreq: | |||
| 97 | SH-3 | 98 | SH-3 |
| 98 | SH-4 | 99 | SH-4 |
| 99 | 100 | ||
| 101 | 1.6 Blackfin | ||
| 102 | ------------ | ||
| 103 | |||
| 104 | The following Blackfin processors are supported by cpufreq: | ||
| 105 | |||
| 106 | BF522, BF523, BF524, BF525, BF526, BF527, Rev 0.1 or higher | ||
| 107 | BF531, BF532, BF533, Rev 0.3 or higher | ||
| 108 | BF534, BF536, BF537, Rev 0.2 or higher | ||
| 109 | BF561, Rev 0.3 or higher | ||
| 110 | BF542, BF544, BF547, BF548, BF549, Rev 0.1 or higher | ||
| 111 | |||
| 100 | 112 | ||
| 101 | 2. "Policy" / "Governor" ? | 113 | 2. "Policy" / "Governor" ? |
| 102 | ========================== | 114 | ========================== |
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt index 4340cc825796..67310fbbb7df 100644 --- a/Documentation/filesystems/ocfs2.txt +++ b/Documentation/filesystems/ocfs2.txt | |||
| @@ -28,10 +28,7 @@ Manish Singh <manish.singh@oracle.com> | |||
| 28 | Caveats | 28 | Caveats |
| 29 | ======= | 29 | ======= |
| 30 | Features which OCFS2 does not support yet: | 30 | Features which OCFS2 does not support yet: |
| 31 | - extended attributes | ||
| 32 | - quotas | 31 | - quotas |
| 33 | - cluster aware flock | ||
| 34 | - cluster aware lockf | ||
| 35 | - Directory change notification (F_NOTIFY) | 32 | - Directory change notification (F_NOTIFY) |
| 36 | - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease) | 33 | - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease) |
| 37 | - POSIX ACLs | 34 | - POSIX ACLs |
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index bcceb99b81dd..bb1b0dd3bfcb 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
| @@ -44,6 +44,7 @@ Table of Contents | |||
| 44 | 2.14 /proc/<pid>/io - Display the IO accounting fields | 44 | 2.14 /proc/<pid>/io - Display the IO accounting fields |
| 45 | 2.15 /proc/<pid>/coredump_filter - Core dump filtering settings | 45 | 2.15 /proc/<pid>/coredump_filter - Core dump filtering settings |
| 46 | 2.16 /proc/<pid>/mountinfo - Information about mounts | 46 | 2.16 /proc/<pid>/mountinfo - Information about mounts |
| 47 | 2.17 /proc/sys/fs/epoll - Configuration options for the epoll interface | ||
| 47 | 48 | ||
| 48 | ------------------------------------------------------------------------------ | 49 | ------------------------------------------------------------------------------ |
| 49 | Preface | 50 | Preface |
| @@ -2483,4 +2484,30 @@ For more information on mount propagation see: | |||
| 2483 | 2484 | ||
| 2484 | Documentation/filesystems/sharedsubtree.txt | 2485 | Documentation/filesystems/sharedsubtree.txt |
| 2485 | 2486 | ||
| 2487 | 2.17 /proc/sys/fs/epoll - Configuration options for the epoll interface | ||
| 2488 | -------------------------------------------------------- | ||
| 2489 | |||
| 2490 | This directory contains configuration options for the epoll(7) interface. | ||
| 2491 | |||
| 2492 | max_user_instances | ||
| 2493 | ------------------ | ||
| 2494 | |||
| 2495 | This is the maximum number of epoll file descriptors that a single user can | ||
| 2496 | have open at a given time. The default value is 128, and should be enough | ||
| 2497 | for normal users. | ||
| 2498 | |||
| 2499 | max_user_watches | ||
| 2500 | ---------------- | ||
| 2501 | |||
| 2502 | Every epoll file descriptor can store a number of files to be monitored | ||
| 2503 | for event readiness. Each one of these monitored files constitutes a "watch". | ||
| 2504 | This configuration option sets the maximum number of "watches" that are | ||
| 2505 | allowed for each user. | ||
| 2506 | Each "watch" costs roughly 90 bytes on a 32bit kernel, and roughly 160 bytes | ||
| 2507 | on a 64bit one. | ||
| 2508 | The current default value for max_user_watches is the 1/32 of the available | ||
| 2509 | low memory, divided for the "watch" cost in bytes. | ||
| 2510 | |||
| 2511 | |||
| 2486 | ------------------------------------------------------------------------------ | 2512 | ------------------------------------------------------------------------------ |
| 2513 | |||
diff --git a/Documentation/filesystems/ramfs-rootfs-initramfs.txt b/Documentation/filesystems/ramfs-rootfs-initramfs.txt index 62fe9b1e0890..a8273d5fad20 100644 --- a/Documentation/filesystems/ramfs-rootfs-initramfs.txt +++ b/Documentation/filesystems/ramfs-rootfs-initramfs.txt | |||
| @@ -130,12 +130,12 @@ The 2.6 kernel build process always creates a gzipped cpio format initramfs | |||
| 130 | archive and links it into the resulting kernel binary. By default, this | 130 | archive and links it into the resulting kernel binary. By default, this |
| 131 | archive is empty (consuming 134 bytes on x86). | 131 | archive is empty (consuming 134 bytes on x86). |
| 132 | 132 | ||
| 133 | The config option CONFIG_INITRAMFS_SOURCE (for some reason buried under | 133 | The config option CONFIG_INITRAMFS_SOURCE (in General Setup in menuconfig, |
| 134 | devices->block devices in menuconfig, and living in usr/Kconfig) can be used | 134 | and living in usr/Kconfig) can be used to specify a source for the |
| 135 | to specify a source for the initramfs archive, which will automatically be | 135 | initramfs archive, which will automatically be incorporated into the |
| 136 | incorporated into the resulting binary. This option can point to an existing | 136 | resulting binary. This option can point to an existing gzipped cpio |
| 137 | gzipped cpio archive, a directory containing files to be archived, or a text | 137 | archive, a directory containing files to be archived, or a text file |
| 138 | file specification such as the following example: | 138 | specification such as the following example: |
| 139 | 139 | ||
| 140 | dir /dev 755 0 0 | 140 | dir /dev 755 0 0 |
| 141 | nod /dev/console 644 0 0 c 5 1 | 141 | nod /dev/console 644 0 0 c 5 1 |
diff --git a/Documentation/input/input-programming.txt b/Documentation/input/input-programming.txt index 81905e81585e..7f8b9d97bc47 100644 --- a/Documentation/input/input-programming.txt +++ b/Documentation/input/input-programming.txt | |||
| @@ -20,10 +20,11 @@ pressed or released a BUTTON_IRQ happens. The driver could look like: | |||
| 20 | 20 | ||
| 21 | static struct input_dev *button_dev; | 21 | static struct input_dev *button_dev; |
| 22 | 22 | ||
| 23 | static void button_interrupt(int irq, void *dummy, struct pt_regs *fp) | 23 | static irqreturn_t button_interrupt(int irq, void *dummy) |
| 24 | { | 24 | { |
| 25 | input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1); | 25 | input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1); |
| 26 | input_sync(button_dev); | 26 | input_sync(button_dev); |
| 27 | return IRQ_HANDLED; | ||
| 27 | } | 28 | } |
| 28 | 29 | ||
| 29 | static int __init button_init(void) | 30 | static int __init button_init(void) |
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index e0e54a27fc10..3cd2ad958176 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -1072,10 +1072,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1072 | ref Reference board | 1072 | ref Reference board |
| 1073 | dell-m4-1 Dell desktops | 1073 | dell-m4-1 Dell desktops |
| 1074 | dell-m4-2 Dell desktops | 1074 | dell-m4-2 Dell desktops |
| 1075 | dell-m4-3 Dell desktops | ||
| 1075 | 1076 | ||
| 1076 | STAC92HD73* | 1077 | STAC92HD73* |
| 1077 | ref Reference board | 1078 | ref Reference board |
| 1078 | dell-m6 Dell desktops | 1079 | dell-m6-amic Dell desktops/laptops with analog mics |
| 1080 | dell-m6-dmic Dell desktops/laptops with digital mics | ||
| 1081 | dell-m6 Dell desktops/laptops with both type of mics | ||
| 1079 | 1082 | ||
| 1080 | STAC9872 | 1083 | STAC9872 |
| 1081 | vaio Setup for VAIO FE550G/SZ110 | 1084 | vaio Setup for VAIO FE550G/SZ110 |
diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary index 8bae2f018d34..0f5122eb282b 100644 --- a/Documentation/spi/spi-summary +++ b/Documentation/spi/spi-summary | |||
| @@ -215,7 +215,7 @@ So for example arch/.../mach-*/board-*.c files might have code like: | |||
| 215 | /* if your mach-* infrastructure doesn't support kernels that can | 215 | /* if your mach-* infrastructure doesn't support kernels that can |
| 216 | * run on multiple boards, pdata wouldn't benefit from "__init". | 216 | * run on multiple boards, pdata wouldn't benefit from "__init". |
| 217 | */ | 217 | */ |
| 218 | static struct mysoc_spi_data __init pdata = { ... }; | 218 | static struct mysoc_spi_data __initdata pdata = { ... }; |
| 219 | 219 | ||
| 220 | static __init board_init(void) | 220 | static __init board_init(void) |
| 221 | { | 221 | { |
diff --git a/Documentation/tracers/mmiotrace.txt b/Documentation/tracers/mmiotrace.txt index 5bbbe2096223..cde23b4a12a1 100644 --- a/Documentation/tracers/mmiotrace.txt +++ b/Documentation/tracers/mmiotrace.txt | |||
| @@ -37,7 +37,7 @@ $ echo mmiotrace > /debug/tracing/current_tracer | |||
| 37 | $ cat /debug/tracing/trace_pipe > mydump.txt & | 37 | $ cat /debug/tracing/trace_pipe > mydump.txt & |
| 38 | Start X or whatever. | 38 | Start X or whatever. |
| 39 | $ echo "X is up" > /debug/tracing/trace_marker | 39 | $ echo "X is up" > /debug/tracing/trace_marker |
| 40 | $ echo none > /debug/tracing/current_tracer | 40 | $ echo nop > /debug/tracing/current_tracer |
| 41 | Check for lost events. | 41 | Check for lost events. |
| 42 | 42 | ||
| 43 | 43 | ||
| @@ -66,7 +66,7 @@ which action. It is recommended to place descriptive markers about what you | |||
| 66 | do. | 66 | do. |
| 67 | 67 | ||
| 68 | Shut down mmiotrace (requires root privileges): | 68 | Shut down mmiotrace (requires root privileges): |
| 69 | $ echo none > /debug/tracing/current_tracer | 69 | $ echo nop > /debug/tracing/current_tracer |
| 70 | The 'cat' process exits. If it does not, kill it by issuing 'fg' command and | 70 | The 'cat' process exits. If it does not, kill it by issuing 'fg' command and |
| 71 | pressing ctrl+c. | 71 | pressing ctrl+c. |
| 72 | 72 | ||
| @@ -81,7 +81,9 @@ are: | |||
| 81 | $ cat /debug/tracing/trace_entries | 81 | $ cat /debug/tracing/trace_entries |
| 82 | gives you a number. Approximately double this number and write it back, for | 82 | gives you a number. Approximately double this number and write it back, for |
| 83 | instance: | 83 | instance: |
| 84 | $ echo 0 > /debug/tracing/tracing_enabled | ||
| 84 | $ echo 128000 > /debug/tracing/trace_entries | 85 | $ echo 128000 > /debug/tracing/trace_entries |
| 86 | $ echo 1 > /debug/tracing/tracing_enabled | ||
| 85 | Then start again from the top. | 87 | Then start again from the top. |
| 86 | 88 | ||
| 87 | If you are doing a trace for a driver project, e.g. Nouveau, you should also | 89 | If you are doing a trace for a driver project, e.g. Nouveau, you should also |
| @@ -1,8 +1,8 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 28 | 3 | SUBLEVEL = 28 |
| 4 | EXTRAVERSION = -rc6 | 4 | EXTRAVERSION = -rc7 |
| 5 | NAME = Killer Bat of Doom | 5 | NAME = Erotic Pickled Herring |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| 8 | # To see a list of typical targets execute "make help" | 8 | # To see a list of typical targets execute "make help" |
diff --git a/arch/Kconfig b/arch/Kconfig index 8977d99987cb..471e72dbaf8b 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -79,8 +79,6 @@ config HAVE_KRETPROBES | |||
| 79 | # task_pt_regs() in asm/processor.h or asm/ptrace.h | 79 | # task_pt_regs() in asm/processor.h or asm/ptrace.h |
| 80 | # arch_has_single_step() if there is hardware single-step support | 80 | # arch_has_single_step() if there is hardware single-step support |
| 81 | # arch_has_block_step() if there is hardware block-step support | 81 | # arch_has_block_step() if there is hardware block-step support |
| 82 | # arch_ptrace() and not #define __ARCH_SYS_PTRACE | ||
| 83 | # compat_arch_ptrace() and #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
| 84 | # asm/syscall.h supplying asm-generic/syscall.h interface | 82 | # asm/syscall.h supplying asm-generic/syscall.h interface |
| 85 | # linux/regset.h user_regset interfaces | 83 | # linux/regset.h user_regset interfaces |
| 86 | # CORE_DUMP_USE_REGSET #define'd in linux/elf.h | 84 | # CORE_DUMP_USE_REGSET #define'd in linux/elf.h |
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 5cf45fc51343..ff8cb638472e 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c | |||
| @@ -338,7 +338,7 @@ common_swizzle(struct pci_dev *dev, u8 *pinp) | |||
| 338 | return PCI_SLOT(dev->devfn); | 338 | return PCI_SLOT(dev->devfn); |
| 339 | } | 339 | } |
| 340 | 340 | ||
| 341 | void __devinit | 341 | void |
| 342 | pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, | 342 | pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, |
| 343 | struct resource *res) | 343 | struct resource *res) |
| 344 | { | 344 | { |
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index e657c45d91d2..cf7da10097bb 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c | |||
| @@ -121,7 +121,7 @@ wait_boot_cpu_to_stop(int cpuid) | |||
| 121 | /* | 121 | /* |
| 122 | * Where secondaries begin a life of C. | 122 | * Where secondaries begin a life of C. |
| 123 | */ | 123 | */ |
| 124 | void __init | 124 | void __cpuinit |
| 125 | smp_callin(void) | 125 | smp_callin(void) |
| 126 | { | 126 | { |
| 127 | int cpuid = hard_smp_processor_id(); | 127 | int cpuid = hard_smp_processor_id(); |
| @@ -198,7 +198,7 @@ wait_for_txrdy (unsigned long cpumask) | |||
| 198 | * Send a message to a secondary's console. "START" is one such | 198 | * Send a message to a secondary's console. "START" is one such |
| 199 | * interesting message. ;-) | 199 | * interesting message. ;-) |
| 200 | */ | 200 | */ |
| 201 | static void __init | 201 | static void __cpuinit |
| 202 | send_secondary_console_msg(char *str, int cpuid) | 202 | send_secondary_console_msg(char *str, int cpuid) |
| 203 | { | 203 | { |
| 204 | struct percpu_struct *cpu; | 204 | struct percpu_struct *cpu; |
| @@ -289,7 +289,7 @@ recv_secondary_console_msg(void) | |||
| 289 | /* | 289 | /* |
| 290 | * Convince the console to have a secondary cpu begin execution. | 290 | * Convince the console to have a secondary cpu begin execution. |
| 291 | */ | 291 | */ |
| 292 | static int __init | 292 | static int __cpuinit |
| 293 | secondary_cpu_start(int cpuid, struct task_struct *idle) | 293 | secondary_cpu_start(int cpuid, struct task_struct *idle) |
| 294 | { | 294 | { |
| 295 | struct percpu_struct *cpu; | 295 | struct percpu_struct *cpu; |
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index c778779007fc..cefc5a355ef9 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | static int opDEC_fix; | 32 | static int opDEC_fix; |
| 33 | 33 | ||
| 34 | static void __init | 34 | static void __cpuinit |
| 35 | opDEC_check(void) | 35 | opDEC_check(void) |
| 36 | { | 36 | { |
| 37 | __asm__ __volatile__ ( | 37 | __asm__ __volatile__ ( |
| @@ -1072,7 +1072,7 @@ give_sigbus: | |||
| 1072 | return; | 1072 | return; |
| 1073 | } | 1073 | } |
| 1074 | 1074 | ||
| 1075 | void __init | 1075 | void __cpuinit |
| 1076 | trap_init(void) | 1076 | trap_init(void) |
| 1077 | { | 1077 | { |
| 1078 | /* Tell PAL-code what global pointer we want in the kernel. */ | 1078 | /* Tell PAL-code what global pointer we want in the kernel. */ |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6fe71af3c3e6..d953ed95701e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -201,6 +201,7 @@ choice | |||
| 201 | 201 | ||
| 202 | config ARCH_AAEC2000 | 202 | config ARCH_AAEC2000 |
| 203 | bool "Agilent AAEC-2000 based" | 203 | bool "Agilent AAEC-2000 based" |
| 204 | select CPU_ARM920T | ||
| 204 | select ARM_AMBA | 205 | select ARM_AMBA |
| 205 | select HAVE_CLK | 206 | select HAVE_CLK |
| 206 | help | 207 | help |
| @@ -246,22 +247,15 @@ config ARCH_AT91 | |||
| 246 | This enables support for systems based on the Atmel AT91RM9200, | 247 | This enables support for systems based on the Atmel AT91RM9200, |
| 247 | AT91SAM9 and AT91CAP9 processors. | 248 | AT91SAM9 and AT91CAP9 processors. |
| 248 | 249 | ||
| 249 | config ARCH_CLPS7500 | ||
| 250 | bool "Cirrus CL-PS7500FE" | ||
| 251 | select TIMER_ACORN | ||
| 252 | select ISA | ||
| 253 | select NO_IOPORT | ||
| 254 | select ARCH_SPARSEMEM_ENABLE | ||
| 255 | help | ||
| 256 | Support for the Cirrus Logic PS7500FE system-on-a-chip. | ||
| 257 | |||
| 258 | config ARCH_CLPS711X | 250 | config ARCH_CLPS711X |
| 259 | bool "Cirrus Logic CLPS711x/EP721x-based" | 251 | bool "Cirrus Logic CLPS711x/EP721x-based" |
| 252 | select CPU_ARM720T | ||
| 260 | help | 253 | help |
| 261 | Support for Cirrus Logic 711x/721x based boards. | 254 | Support for Cirrus Logic 711x/721x based boards. |
| 262 | 255 | ||
| 263 | config ARCH_EBSA110 | 256 | config ARCH_EBSA110 |
| 264 | bool "EBSA-110" | 257 | bool "EBSA-110" |
| 258 | select CPU_SA110 | ||
| 265 | select ISA | 259 | select ISA |
| 266 | select NO_IOPORT | 260 | select NO_IOPORT |
| 267 | help | 261 | help |
| @@ -272,16 +266,19 @@ config ARCH_EBSA110 | |||
| 272 | 266 | ||
| 273 | config ARCH_EP93XX | 267 | config ARCH_EP93XX |
| 274 | bool "EP93xx-based" | 268 | bool "EP93xx-based" |
| 269 | select CPU_ARM920T | ||
| 275 | select ARM_AMBA | 270 | select ARM_AMBA |
| 276 | select ARM_VIC | 271 | select ARM_VIC |
| 277 | select GENERIC_GPIO | 272 | select GENERIC_GPIO |
| 278 | select HAVE_CLK | 273 | select HAVE_CLK |
| 274 | select COMMON_CLKDEV | ||
| 279 | select ARCH_REQUIRE_GPIOLIB | 275 | select ARCH_REQUIRE_GPIOLIB |
| 280 | help | 276 | help |
| 281 | This enables support for the Cirrus EP93xx series of CPUs. | 277 | This enables support for the Cirrus EP93xx series of CPUs. |
| 282 | 278 | ||
| 283 | config ARCH_FOOTBRIDGE | 279 | config ARCH_FOOTBRIDGE |
| 284 | bool "FootBridge" | 280 | bool "FootBridge" |
| 281 | select CPU_SA110 | ||
| 285 | select FOOTBRIDGE | 282 | select FOOTBRIDGE |
| 286 | help | 283 | help |
| 287 | Support for systems based on the DC21285 companion chip | 284 | Support for systems based on the DC21285 companion chip |
| @@ -289,18 +286,21 @@ config ARCH_FOOTBRIDGE | |||
| 289 | 286 | ||
| 290 | config ARCH_NETX | 287 | config ARCH_NETX |
| 291 | bool "Hilscher NetX based" | 288 | bool "Hilscher NetX based" |
| 289 | select CPU_ARM926T | ||
| 292 | select ARM_VIC | 290 | select ARM_VIC |
| 293 | help | 291 | help |
| 294 | This enables support for systems based on the Hilscher NetX Soc | 292 | This enables support for systems based on the Hilscher NetX Soc |
| 295 | 293 | ||
| 296 | config ARCH_H720X | 294 | config ARCH_H720X |
| 297 | bool "Hynix HMS720x-based" | 295 | bool "Hynix HMS720x-based" |
| 296 | select CPU_ARM720T | ||
| 298 | select ISA_DMA_API | 297 | select ISA_DMA_API |
| 299 | help | 298 | help |
| 300 | This enables support for systems based on the Hynix HMS720x | 299 | This enables support for systems based on the Hynix HMS720x |
| 301 | 300 | ||
| 302 | config ARCH_IMX | 301 | config ARCH_IMX |
| 303 | bool "IMX" | 302 | bool "IMX" |
| 303 | select CPU_ARM920T | ||
| 304 | select GENERIC_GPIO | 304 | select GENERIC_GPIO |
| 305 | select GENERIC_TIME | 305 | select GENERIC_TIME |
| 306 | select GENERIC_CLOCKEVENTS | 306 | select GENERIC_CLOCKEVENTS |
| @@ -310,6 +310,7 @@ config ARCH_IMX | |||
| 310 | config ARCH_IOP13XX | 310 | config ARCH_IOP13XX |
| 311 | bool "IOP13xx-based" | 311 | bool "IOP13xx-based" |
| 312 | depends on MMU | 312 | depends on MMU |
| 313 | select CPU_XSC3 | ||
| 313 | select PLAT_IOP | 314 | select PLAT_IOP |
| 314 | select PCI | 315 | select PCI |
| 315 | select ARCH_SUPPORTS_MSI | 316 | select ARCH_SUPPORTS_MSI |
| @@ -320,6 +321,7 @@ config ARCH_IOP13XX | |||
| 320 | config ARCH_IOP32X | 321 | config ARCH_IOP32X |
| 321 | bool "IOP32x-based" | 322 | bool "IOP32x-based" |
| 322 | depends on MMU | 323 | depends on MMU |
| 324 | select CPU_XSCALE | ||
| 323 | select PLAT_IOP | 325 | select PLAT_IOP |
| 324 | select PCI | 326 | select PCI |
| 325 | select GENERIC_GPIO | 327 | select GENERIC_GPIO |
| @@ -331,6 +333,7 @@ config ARCH_IOP32X | |||
| 331 | config ARCH_IOP33X | 333 | config ARCH_IOP33X |
| 332 | bool "IOP33x-based" | 334 | bool "IOP33x-based" |
| 333 | depends on MMU | 335 | depends on MMU |
| 336 | select CPU_XSCALE | ||
| 334 | select PLAT_IOP | 337 | select PLAT_IOP |
| 335 | select PCI | 338 | select PCI |
| 336 | select GENERIC_GPIO | 339 | select GENERIC_GPIO |
| @@ -341,6 +344,7 @@ config ARCH_IOP33X | |||
| 341 | config ARCH_IXP23XX | 344 | config ARCH_IXP23XX |
| 342 | bool "IXP23XX-based" | 345 | bool "IXP23XX-based" |
| 343 | depends on MMU | 346 | depends on MMU |
| 347 | select CPU_XSC3 | ||
| 344 | select PCI | 348 | select PCI |
| 345 | help | 349 | help |
| 346 | Support for Intel's IXP23xx (XScale) family of processors. | 350 | Support for Intel's IXP23xx (XScale) family of processors. |
| @@ -348,6 +352,7 @@ config ARCH_IXP23XX | |||
| 348 | config ARCH_IXP2000 | 352 | config ARCH_IXP2000 |
| 349 | bool "IXP2400/2800-based" | 353 | bool "IXP2400/2800-based" |
| 350 | depends on MMU | 354 | depends on MMU |
| 355 | select CPU_XSCALE | ||
| 351 | select PCI | 356 | select PCI |
| 352 | help | 357 | help |
| 353 | Support for Intel's IXP2400/2800 (XScale) family of processors. | 358 | Support for Intel's IXP2400/2800 (XScale) family of processors. |
| @@ -355,6 +360,7 @@ config ARCH_IXP2000 | |||
| 355 | config ARCH_IXP4XX | 360 | config ARCH_IXP4XX |
| 356 | bool "IXP4xx-based" | 361 | bool "IXP4xx-based" |
| 357 | depends on MMU | 362 | depends on MMU |
| 363 | select CPU_XSCALE | ||
| 358 | select GENERIC_GPIO | 364 | select GENERIC_GPIO |
| 359 | select GENERIC_TIME | 365 | select GENERIC_TIME |
| 360 | select GENERIC_CLOCKEVENTS | 366 | select GENERIC_CLOCKEVENTS |
| @@ -364,6 +370,7 @@ config ARCH_IXP4XX | |||
| 364 | 370 | ||
| 365 | config ARCH_L7200 | 371 | config ARCH_L7200 |
| 366 | bool "LinkUp-L7200" | 372 | bool "LinkUp-L7200" |
| 373 | select CPU_ARM720T | ||
| 367 | select FIQ | 374 | select FIQ |
| 368 | help | 375 | help |
| 369 | Say Y here if you intend to run this kernel on a LinkUp Systems | 376 | Say Y here if you intend to run this kernel on a LinkUp Systems |
| @@ -377,6 +384,7 @@ config ARCH_L7200 | |||
| 377 | 384 | ||
| 378 | config ARCH_KIRKWOOD | 385 | config ARCH_KIRKWOOD |
| 379 | bool "Marvell Kirkwood" | 386 | bool "Marvell Kirkwood" |
| 387 | select CPU_FEROCEON | ||
| 380 | select PCI | 388 | select PCI |
| 381 | select GENERIC_TIME | 389 | select GENERIC_TIME |
| 382 | select GENERIC_CLOCKEVENTS | 390 | select GENERIC_CLOCKEVENTS |
| @@ -387,13 +395,16 @@ config ARCH_KIRKWOOD | |||
| 387 | 395 | ||
| 388 | config ARCH_KS8695 | 396 | config ARCH_KS8695 |
| 389 | bool "Micrel/Kendin KS8695" | 397 | bool "Micrel/Kendin KS8695" |
| 398 | select CPU_ARM922T | ||
| 390 | select GENERIC_GPIO | 399 | select GENERIC_GPIO |
| 400 | select ARCH_REQUIRE_GPIOLIB | ||
| 391 | help | 401 | help |
| 392 | Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based | 402 | Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based |
| 393 | System-on-Chip devices. | 403 | System-on-Chip devices. |
| 394 | 404 | ||
| 395 | config ARCH_NS9XXX | 405 | config ARCH_NS9XXX |
| 396 | bool "NetSilicon NS9xxx" | 406 | bool "NetSilicon NS9xxx" |
| 407 | select CPU_ARM926T | ||
| 397 | select GENERIC_GPIO | 408 | select GENERIC_GPIO |
| 398 | select GENERIC_TIME | 409 | select GENERIC_TIME |
| 399 | select GENERIC_CLOCKEVENTS | 410 | select GENERIC_CLOCKEVENTS |
| @@ -406,6 +417,7 @@ config ARCH_NS9XXX | |||
| 406 | 417 | ||
| 407 | config ARCH_LOKI | 418 | config ARCH_LOKI |
| 408 | bool "Marvell Loki (88RC8480)" | 419 | bool "Marvell Loki (88RC8480)" |
| 420 | select CPU_FEROCEON | ||
| 409 | select GENERIC_TIME | 421 | select GENERIC_TIME |
| 410 | select GENERIC_CLOCKEVENTS | 422 | select GENERIC_CLOCKEVENTS |
| 411 | select PLAT_ORION | 423 | select PLAT_ORION |
| @@ -414,6 +426,7 @@ config ARCH_LOKI | |||
| 414 | 426 | ||
| 415 | config ARCH_MV78XX0 | 427 | config ARCH_MV78XX0 |
| 416 | bool "Marvell MV78xx0" | 428 | bool "Marvell MV78xx0" |
| 429 | select CPU_FEROCEON | ||
| 417 | select PCI | 430 | select PCI |
| 418 | select GENERIC_TIME | 431 | select GENERIC_TIME |
| 419 | select GENERIC_CLOCKEVENTS | 432 | select GENERIC_CLOCKEVENTS |
| @@ -435,6 +448,7 @@ config ARCH_MXC | |||
| 435 | config ARCH_ORION5X | 448 | config ARCH_ORION5X |
| 436 | bool "Marvell Orion" | 449 | bool "Marvell Orion" |
| 437 | depends on MMU | 450 | depends on MMU |
| 451 | select CPU_FEROCEON | ||
| 438 | select PCI | 452 | select PCI |
| 439 | select GENERIC_GPIO | 453 | select GENERIC_GPIO |
| 440 | select GENERIC_TIME | 454 | select GENERIC_TIME |
| @@ -447,6 +461,7 @@ config ARCH_ORION5X | |||
| 447 | 461 | ||
| 448 | config ARCH_PNX4008 | 462 | config ARCH_PNX4008 |
| 449 | bool "Philips Nexperia PNX4008 Mobile" | 463 | bool "Philips Nexperia PNX4008 Mobile" |
| 464 | select CPU_ARM926T | ||
| 450 | select HAVE_CLK | 465 | select HAVE_CLK |
| 451 | help | 466 | help |
| 452 | This enables support for Philips PNX4008 mobile platform. | 467 | This enables support for Philips PNX4008 mobile platform. |
| @@ -481,6 +496,7 @@ config ARCH_RPC | |||
| 481 | 496 | ||
| 482 | config ARCH_SA1100 | 497 | config ARCH_SA1100 |
| 483 | bool "SA1100-based" | 498 | bool "SA1100-based" |
| 499 | select CPU_SA1100 | ||
| 484 | select ISA | 500 | select ISA |
| 485 | select ARCH_SPARSEMEM_ENABLE | 501 | select ARCH_SPARSEMEM_ENABLE |
| 486 | select ARCH_MTD_XIP | 502 | select ARCH_MTD_XIP |
| @@ -504,6 +520,7 @@ config ARCH_S3C2410 | |||
| 504 | 520 | ||
| 505 | config ARCH_SHARK | 521 | config ARCH_SHARK |
| 506 | bool "Shark" | 522 | bool "Shark" |
| 523 | select CPU_SA110 | ||
| 507 | select ISA | 524 | select ISA |
| 508 | select ISA_DMA | 525 | select ISA_DMA |
| 509 | select ZONE_DMA | 526 | select ZONE_DMA |
| @@ -514,6 +531,7 @@ config ARCH_SHARK | |||
| 514 | 531 | ||
| 515 | config ARCH_LH7A40X | 532 | config ARCH_LH7A40X |
| 516 | bool "Sharp LH7A40X" | 533 | bool "Sharp LH7A40X" |
| 534 | select CPU_ARM922T | ||
| 517 | select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM | 535 | select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM |
| 518 | select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM | 536 | select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM |
| 519 | help | 537 | help |
| @@ -524,6 +542,7 @@ config ARCH_LH7A40X | |||
| 524 | 542 | ||
| 525 | config ARCH_DAVINCI | 543 | config ARCH_DAVINCI |
| 526 | bool "TI DaVinci" | 544 | bool "TI DaVinci" |
| 545 | select CPU_ARM926T | ||
| 527 | select GENERIC_TIME | 546 | select GENERIC_TIME |
| 528 | select GENERIC_CLOCKEVENTS | 547 | select GENERIC_CLOCKEVENTS |
| 529 | select GENERIC_GPIO | 548 | select GENERIC_GPIO |
| @@ -545,6 +564,7 @@ config ARCH_OMAP | |||
| 545 | 564 | ||
| 546 | config ARCH_MSM | 565 | config ARCH_MSM |
| 547 | bool "Qualcomm MSM" | 566 | bool "Qualcomm MSM" |
| 567 | select CPU_V6 | ||
| 548 | select GENERIC_TIME | 568 | select GENERIC_TIME |
| 549 | select GENERIC_CLOCKEVENTS | 569 | select GENERIC_CLOCKEVENTS |
| 550 | help | 570 | help |
| @@ -553,6 +573,13 @@ config ARCH_MSM | |||
| 553 | interface to the ARM9 modem processor which runs the baseband stack | 573 | interface to the ARM9 modem processor which runs the baseband stack |
| 554 | and controls some vital subsystems (clock and power control, etc). | 574 | and controls some vital subsystems (clock and power control, etc). |
| 555 | 575 | ||
| 576 | config ARCH_W90X900 | ||
| 577 | bool "Nuvoton W90X900 CPU" | ||
| 578 | select CPU_ARM926T | ||
| 579 | help | ||
| 580 | Support for Nuvoton (Winbond logic dept.) ARM9 processor,You | ||
| 581 | can login www.mcuos.com or www.nuvoton.com to know more. | ||
| 582 | |||
| 556 | endchoice | 583 | endchoice |
| 557 | 584 | ||
| 558 | source "arch/arm/mach-clps711x/Kconfig" | 585 | source "arch/arm/mach-clps711x/Kconfig" |
| @@ -631,6 +658,8 @@ source "arch/arm/mach-ks8695/Kconfig" | |||
| 631 | 658 | ||
| 632 | source "arch/arm/mach-msm/Kconfig" | 659 | source "arch/arm/mach-msm/Kconfig" |
| 633 | 660 | ||
| 661 | source "arch/arm/mach-w90x900/Kconfig" | ||
| 662 | |||
| 634 | # Definitions to make life easier | 663 | # Definitions to make life easier |
| 635 | config ARCH_ACORN | 664 | config ARCH_ACORN |
| 636 | bool | 665 | bool |
| @@ -785,7 +814,7 @@ config HOTPLUG_CPU | |||
| 785 | 814 | ||
| 786 | config LOCAL_TIMERS | 815 | config LOCAL_TIMERS |
| 787 | bool "Use local timer interrupts" | 816 | bool "Use local timer interrupts" |
| 788 | depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP) | 817 | depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP) |
| 789 | default y | 818 | default y |
| 790 | help | 819 | help |
| 791 | Enable support for local timers on SMP platforms, rather then the | 820 | Enable support for local timers on SMP platforms, rather then the |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index bd6e28115ebb..260864f3f010 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -76,6 +76,7 @@ tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 | |||
| 76 | tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 | 76 | tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 |
| 77 | tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale | 77 | tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale |
| 78 | tune-$(CONFIG_CPU_XSC3) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale | 78 | tune-$(CONFIG_CPU_XSC3) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale |
| 79 | tune-$(CONFIG_CPU_FEROCEON) :=$(call cc-option,-mtune=marvell-f,-mtune=xscale) | ||
| 79 | tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) | 80 | tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) |
| 80 | 81 | ||
| 81 | ifeq ($(CONFIG_AEABI),y) | 82 | ifeq ($(CONFIG_AEABI),y) |
| @@ -96,7 +97,6 @@ textofs-y := 0x00008000 | |||
| 96 | 97 | ||
| 97 | machine-$(CONFIG_ARCH_RPC) := rpc | 98 | machine-$(CONFIG_ARCH_RPC) := rpc |
| 98 | machine-$(CONFIG_ARCH_EBSA110) := ebsa110 | 99 | machine-$(CONFIG_ARCH_EBSA110) := ebsa110 |
| 99 | machine-$(CONFIG_ARCH_CLPS7500) := clps7500 | ||
| 100 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 100 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |
| 101 | machine-$(CONFIG_ARCH_SHARK) := shark | 101 | machine-$(CONFIG_ARCH_SHARK) := shark |
| 102 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 102 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
| @@ -144,6 +144,7 @@ endif | |||
| 144 | machine-$(CONFIG_ARCH_MSM) := msm | 144 | machine-$(CONFIG_ARCH_MSM) := msm |
| 145 | machine-$(CONFIG_ARCH_LOKI) := loki | 145 | machine-$(CONFIG_ARCH_LOKI) := loki |
| 146 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 146 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |
| 147 | machine-$(CONFIG_ARCH_W90X900) := w90x900 | ||
| 147 | 148 | ||
| 148 | ifeq ($(CONFIG_ARCH_EBSA110),y) | 149 | ifeq ($(CONFIG_ARCH_EBSA110),y) |
| 149 | # This is what happens if you forget the IOCS16 line. | 150 | # This is what happens if you forget the IOCS16 line. |
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index c47f2a3f8f8f..fbe5eef1f6c9 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile | |||
| @@ -23,10 +23,6 @@ ifeq ($(CONFIG_ARCH_L7200),y) | |||
| 23 | OBJS += head-l7200.o | 23 | OBJS += head-l7200.o |
| 24 | endif | 24 | endif |
| 25 | 25 | ||
| 26 | ifeq ($(CONFIG_ARCH_CLPS7500),y) | ||
| 27 | HEAD = head-clps7500.o | ||
| 28 | endif | ||
| 29 | |||
| 30 | ifeq ($(CONFIG_ARCH_P720T),y) | 26 | ifeq ($(CONFIG_ARCH_P720T),y) |
| 31 | # Borrow this code from SA1100 | 27 | # Borrow this code from SA1100 |
| 32 | OBJS += head-sa1100.o | 28 | OBJS += head-sa1100.o |
diff --git a/arch/arm/boot/compressed/head-clps7500.S b/arch/arm/boot/compressed/head-clps7500.S deleted file mode 100644 index 4f3c78ac30a0..000000000000 --- a/arch/arm/boot/compressed/head-clps7500.S +++ /dev/null | |||
| @@ -1,86 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/boot/compressed/head-clps7500.S | ||
| 3 | * | ||
| 4 | * Copyright (C) 1999, 2000, 2001 Nexus Electronics Ltd | ||
| 5 | */ | ||
| 6 | |||
| 7 | |||
| 8 | /* There are three different ways the kernel can be | ||
| 9 | booted on a 7500 system: from Angel (loaded in RAM), from | ||
| 10 | 16-bit ROM or from 32-bit Flash. Luckily, a single kernel | ||
| 11 | image does for them all. */ | ||
| 12 | /* This branch is taken if the CPU memory width matches the | ||
| 13 | actual device in use. The default at power on is 16 bits | ||
| 14 | so we must be prepared for a mismatch. */ | ||
| 15 | .section ".start", "ax" | ||
| 16 | 2: | ||
| 17 | b 1f | ||
| 18 | .word 0xffff | ||
| 19 | .word 0xb632 @ mov r11, #0x03200000 | ||
| 20 | .word 0xe3a0 | ||
| 21 | .word 0x0000 @ mov r0, #0 | ||
| 22 | .word 0xe3a0 | ||
| 23 | .word 0x0080 @ strb r0, [r11, #0x80] | ||
| 24 | .word 0xe5cb | ||
| 25 | .word 0xf000 @ mov pc, #0 | ||
| 26 | .word 0xe3a0 | ||
| 27 | 1: | ||
| 28 | adr r1, 2b | ||
| 29 | teq r1, #0 | ||
| 30 | bne .Langel | ||
| 31 | /* This is a direct-from-ROM boot. Copy the kernel into | ||
| 32 | RAM and run it there. */ | ||
| 33 | mov r0, #0x30 | ||
| 34 | mcr p15, 0, r0, c1, c0, 0 | ||
| 35 | mov r0, #0x13 | ||
| 36 | msr cpsr_cxsf, r0 | ||
| 37 | mov r12, #0x03000000 @ point to LEDs | ||
| 38 | orr r12, r12, #0x00020000 | ||
| 39 | orr r12, r12, #0xba00 | ||
| 40 | mov r0, #0x5500 | ||
| 41 | str r0, [r12] | ||
| 42 | mov r0, #0x10000000 | ||
| 43 | orr r0, r0, #0x8000 | ||
| 44 | mov r4, r0 | ||
| 45 | ldr r2, =_end | ||
| 46 | 2: | ||
| 47 | ldr r3, [r1], #4 | ||
| 48 | str r3, [r0], #4 | ||
| 49 | teq r0, r2 | ||
| 50 | bne 2b | ||
| 51 | mov r0, #0xff00 | ||
| 52 | str r0, [r12] | ||
| 53 | 1: | ||
| 54 | mov r12, #0x03000000 @ point to LEDs | ||
| 55 | orr r12, r12, #0x00020000 | ||
| 56 | orr r12, r12, #0xba00 | ||
| 57 | mov r0, #0xfe00 | ||
| 58 | str r0, [r12] | ||
| 59 | |||
| 60 | adr lr, 1f | ||
| 61 | mov r0, #0 | ||
| 62 | mov r1, #14 /* MACH_TYPE_CLPS7500 */ | ||
| 63 | mov pc, lr | ||
| 64 | .Langel: | ||
| 65 | #ifdef CONFIG_ANGELBOOT | ||
| 66 | /* Call Angel to switch into SVC mode. */ | ||
| 67 | mov r0, #0x17 | ||
| 68 | swi 0x123456 | ||
| 69 | #endif | ||
| 70 | /* Ensure all interrupts are off and MMU disabled */ | ||
| 71 | mrs r0, cpsr | ||
| 72 | orr r0, r0, #0xc0 | ||
| 73 | msr cpsr_cxsf, r0 | ||
| 74 | |||
| 75 | adr lr, 1b | ||
| 76 | orr lr, lr, #0x10000000 | ||
| 77 | mov r0, #0x30 @ MMU off | ||
| 78 | mcr p15, 0, r0, c1, c0, 0 | ||
| 79 | mov r0, r0 | ||
| 80 | mov pc, lr | ||
| 81 | |||
| 82 | .ltorg | ||
| 83 | |||
| 84 | 1: | ||
| 85 | /* And the rest */ | ||
| 86 | #include "head.S" | ||
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 84a1e0496a3c..77d614232d81 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -624,6 +624,12 @@ proc_types: | |||
| 624 | b __armv4_mmu_cache_off | 624 | b __armv4_mmu_cache_off |
| 625 | b __armv4_mmu_cache_flush | 625 | b __armv4_mmu_cache_flush |
| 626 | 626 | ||
| 627 | .word 0x56056930 | ||
| 628 | .word 0xff0ffff0 @ PXA935 | ||
| 629 | b __armv4_mmu_cache_on | ||
| 630 | b __armv4_mmu_cache_off | ||
| 631 | b __armv4_mmu_cache_flush | ||
| 632 | |||
| 627 | .word 0x56050000 @ Feroceon | 633 | .word 0x56050000 @ Feroceon |
| 628 | .word 0xff0f0000 | 634 | .word 0xff0f0000 |
| 629 | b __armv4_mmu_cache_on | 635 | b __armv4_mmu_cache_on |
| @@ -717,6 +723,9 @@ __armv7_mmu_cache_off: | |||
| 717 | bl __armv7_mmu_cache_flush | 723 | bl __armv7_mmu_cache_flush |
| 718 | mov r0, #0 | 724 | mov r0, #0 |
| 719 | mcr p15, 0, r0, c8, c7, 0 @ invalidate whole TLB | 725 | mcr p15, 0, r0, c8, c7, 0 @ invalidate whole TLB |
| 726 | mcr p15, 0, r0, c7, c5, 6 @ invalidate BTC | ||
| 727 | mcr p15, 0, r0, c7, c10, 4 @ DSB | ||
| 728 | mcr p15, 0, r0, c7, c5, 4 @ ISB | ||
| 720 | mov pc, r12 | 729 | mov pc, r12 |
| 721 | 730 | ||
| 722 | __arm6_mmu_cache_off: | 731 | __arm6_mmu_cache_off: |
| @@ -778,12 +787,13 @@ __armv6_mmu_cache_flush: | |||
| 778 | __armv7_mmu_cache_flush: | 787 | __armv7_mmu_cache_flush: |
| 779 | mrc p15, 0, r10, c0, c1, 5 @ read ID_MMFR1 | 788 | mrc p15, 0, r10, c0, c1, 5 @ read ID_MMFR1 |
| 780 | tst r10, #0xf << 16 @ hierarchical cache (ARMv7) | 789 | tst r10, #0xf << 16 @ hierarchical cache (ARMv7) |
| 781 | beq hierarchical | ||
| 782 | mov r10, #0 | 790 | mov r10, #0 |
| 791 | beq hierarchical | ||
| 783 | mcr p15, 0, r10, c7, c14, 0 @ clean+invalidate D | 792 | mcr p15, 0, r10, c7, c14, 0 @ clean+invalidate D |
| 784 | b iflush | 793 | b iflush |
| 785 | hierarchical: | 794 | hierarchical: |
| 786 | stmfd sp!, {r0-r5, r7, r9-r11} | 795 | mcr p15, 0, r10, c7, c10, 5 @ DMB |
| 796 | stmfd sp!, {r0-r5, r7, r9, r11} | ||
| 787 | mrc p15, 1, r0, c0, c0, 1 @ read clidr | 797 | mrc p15, 1, r0, c0, c0, 1 @ read clidr |
| 788 | ands r3, r0, #0x7000000 @ extract loc from clidr | 798 | ands r3, r0, #0x7000000 @ extract loc from clidr |
| 789 | mov r3, r3, lsr #23 @ left align loc bit field | 799 | mov r3, r3, lsr #23 @ left align loc bit field |
| @@ -820,12 +830,14 @@ skip: | |||
| 820 | cmp r3, r10 | 830 | cmp r3, r10 |
| 821 | bgt loop1 | 831 | bgt loop1 |
| 822 | finished: | 832 | finished: |
| 833 | ldmfd sp!, {r0-r5, r7, r9, r11} | ||
| 823 | mov r10, #0 @ swith back to cache level 0 | 834 | mov r10, #0 @ swith back to cache level 0 |
| 824 | mcr p15, 2, r10, c0, c0, 0 @ select current cache level in cssr | 835 | mcr p15, 2, r10, c0, c0, 0 @ select current cache level in cssr |
| 825 | ldmfd sp!, {r0-r5, r7, r9-r11} | ||
| 826 | iflush: | 836 | iflush: |
| 837 | mcr p15, 0, r10, c7, c10, 4 @ DSB | ||
| 827 | mcr p15, 0, r10, c7, c5, 0 @ invalidate I+BTB | 838 | mcr p15, 0, r10, c7, c5, 0 @ invalidate I+BTB |
| 828 | mcr p15, 0, r10, c7, c10, 4 @ drain WB | 839 | mcr p15, 0, r10, c7, c10, 4 @ DSB |
| 840 | mcr p15, 0, r10, c7, c5, 4 @ ISB | ||
| 829 | mov pc, lr | 841 | mov pc, lr |
| 830 | 842 | ||
| 831 | __armv5tej_mmu_cache_flush: | 843 | __armv5tej_mmu_cache_flush: |
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 65ce8fff29db..3fc08413fff0 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c | |||
| @@ -86,6 +86,8 @@ static void putstr(const char *ptr) | |||
| 86 | 86 | ||
| 87 | #define __ptr_t void * | 87 | #define __ptr_t void * |
| 88 | 88 | ||
| 89 | #define memzero(s,n) __memzero(s,n) | ||
| 90 | |||
| 89 | /* | 91 | /* |
| 90 | * Optimised C version of memzero for the ARM. | 92 | * Optimised C version of memzero for the ARM. |
| 91 | */ | 93 | */ |
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 7c6b4b99a2df..2293f0ce061e 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c | |||
| @@ -1108,6 +1108,7 @@ void locomo_frontlight_set(struct locomo_dev *dev, int duty, int vr, int bpwf) | |||
| 1108 | locomo_writel(bpwf | LOCOMO_ALC_EN, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS); | 1108 | locomo_writel(bpwf | LOCOMO_ALC_EN, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS); |
| 1109 | spin_unlock_irqrestore(&lchip->lock, flags); | 1109 | spin_unlock_irqrestore(&lchip->lock, flags); |
| 1110 | } | 1110 | } |
| 1111 | EXPORT_SYMBOL(locomo_frontlight_set); | ||
| 1111 | 1112 | ||
| 1112 | /* | 1113 | /* |
| 1113 | * LoCoMo "Register Access Bus." | 1114 | * LoCoMo "Register Access Bus." |
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index f3af0b593eb0..98765438048d 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig | |||
| @@ -179,7 +179,7 @@ CONFIG_MACH_HUSKY=y | |||
| 179 | # CONFIG_MACH_AKITA is not set | 179 | # CONFIG_MACH_AKITA is not set |
| 180 | # CONFIG_MACH_SPITZ is not set | 180 | # CONFIG_MACH_SPITZ is not set |
| 181 | # CONFIG_MACH_BORZOI is not set | 181 | # CONFIG_MACH_BORZOI is not set |
| 182 | CONFIG_MACH_TOSA=y | 182 | # CONFIG_MACH_TOSA is not set |
| 183 | # CONFIG_ARCH_VIPER is not set | 183 | # CONFIG_ARCH_VIPER is not set |
| 184 | # CONFIG_ARCH_PXA_ESERIES is not set | 184 | # CONFIG_ARCH_PXA_ESERIES is not set |
| 185 | # CONFIG_TRIZEPS_PXA is not set | 185 | # CONFIG_TRIZEPS_PXA is not set |
diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig new file mode 100644 index 000000000000..649baa370495 --- /dev/null +++ b/arch/arm/configs/h5000_defconfig | |||
| @@ -0,0 +1,996 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.27-rc6 | ||
| 4 | # Tue Sep 16 16:13:48 2008 | ||
| 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_SUPPORTS_AOUT=y | ||
| 26 | CONFIG_ZONE_DMA=y | ||
| 27 | CONFIG_ARCH_MTD_XIP=y | ||
| 28 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 29 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 30 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 31 | |||
| 32 | # | ||
| 33 | # General setup | ||
| 34 | # | ||
| 35 | CONFIG_EXPERIMENTAL=y | ||
| 36 | CONFIG_BROKEN_ON_SMP=y | ||
| 37 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 38 | CONFIG_LOCALVERSION="" | ||
| 39 | CONFIG_LOCALVERSION_AUTO=y | ||
| 40 | CONFIG_SWAP=y | ||
| 41 | CONFIG_SYSVIPC=y | ||
| 42 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 43 | # CONFIG_POSIX_MQUEUE is not set | ||
| 44 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 45 | # CONFIG_TASKSTATS is not set | ||
| 46 | # CONFIG_AUDIT is not set | ||
| 47 | CONFIG_IKCONFIG=y | ||
| 48 | CONFIG_IKCONFIG_PROC=y | ||
| 49 | CONFIG_LOG_BUF_SHIFT=16 | ||
| 50 | # CONFIG_CGROUPS is not set | ||
| 51 | CONFIG_GROUP_SCHED=y | ||
| 52 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 53 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 54 | CONFIG_USER_SCHED=y | ||
| 55 | # CONFIG_CGROUP_SCHED is not set | ||
| 56 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 57 | # CONFIG_RELAY is not set | ||
| 58 | # CONFIG_NAMESPACES is not set | ||
| 59 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 60 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 61 | CONFIG_SYSCTL=y | ||
| 62 | CONFIG_EMBEDDED=y | ||
| 63 | # CONFIG_UID16 is not set | ||
| 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=y | ||
| 97 | # CONFIG_PROC_PAGE_MONITOR is not set | ||
| 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=y | ||
| 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=y | ||
| 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 is not set | ||
| 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=y | ||
| 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 | # Intel PXA2xx/PXA3xx Implementations | ||
| 174 | # | ||
| 175 | # CONFIG_ARCH_GUMSTIX is not set | ||
| 176 | # CONFIG_ARCH_LUBBOCK is not set | ||
| 177 | # CONFIG_MACH_LOGICPD_PXA270 is not set | ||
| 178 | # CONFIG_MACH_MAINSTONE is not set | ||
| 179 | # CONFIG_ARCH_PXA_IDP is not set | ||
| 180 | # CONFIG_PXA_SHARPSL is not set | ||
| 181 | # CONFIG_ARCH_PXA_ESERIES is not set | ||
| 182 | CONFIG_MACH_H5000=y | ||
| 183 | # CONFIG_MACH_TRIZEPS4 is not set | ||
| 184 | # CONFIG_MACH_EM_X270 is not set | ||
| 185 | # CONFIG_MACH_COLIBRI is not set | ||
| 186 | # CONFIG_MACH_ZYLONITE is not set | ||
| 187 | # CONFIG_MACH_LITTLETON is not set | ||
| 188 | # CONFIG_MACH_TAVOREVB is not set | ||
| 189 | # CONFIG_MACH_SAAR is not set | ||
| 190 | # CONFIG_MACH_ARMCORE is not set | ||
| 191 | # CONFIG_MACH_MAGICIAN is not set | ||
| 192 | # CONFIG_MACH_PCM027 is not set | ||
| 193 | # CONFIG_ARCH_PXA_PALM is not set | ||
| 194 | # CONFIG_PXA_EZX is not set | ||
| 195 | CONFIG_PXA25x=y | ||
| 196 | # CONFIG_PXA_PWM is not set | ||
| 197 | |||
| 198 | # | ||
| 199 | # Boot options | ||
| 200 | # | ||
| 201 | |||
| 202 | # | ||
| 203 | # Power management | ||
| 204 | # | ||
| 205 | |||
| 206 | # | ||
| 207 | # Processor Type | ||
| 208 | # | ||
| 209 | CONFIG_CPU_32=y | ||
| 210 | CONFIG_CPU_XSCALE=y | ||
| 211 | CONFIG_CPU_32v5=y | ||
| 212 | CONFIG_CPU_ABRT_EV5T=y | ||
| 213 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 214 | CONFIG_CPU_CACHE_VIVT=y | ||
| 215 | CONFIG_CPU_TLB_V4WBI=y | ||
| 216 | CONFIG_CPU_CP15=y | ||
| 217 | CONFIG_CPU_CP15_MMU=y | ||
| 218 | |||
| 219 | # | ||
| 220 | # Processor Features | ||
| 221 | # | ||
| 222 | CONFIG_ARM_THUMB=y | ||
| 223 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 224 | # CONFIG_OUTER_CACHE is not set | ||
| 225 | # CONFIG_IWMMXT is not set | ||
| 226 | CONFIG_XSCALE_PMU=y | ||
| 227 | |||
| 228 | # | ||
| 229 | # Bus support | ||
| 230 | # | ||
| 231 | # CONFIG_PCI_SYSCALL is not set | ||
| 232 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 233 | # CONFIG_PCCARD is not set | ||
| 234 | |||
| 235 | # | ||
| 236 | # Kernel Features | ||
| 237 | # | ||
| 238 | CONFIG_TICK_ONESHOT=y | ||
| 239 | # CONFIG_NO_HZ is not set | ||
| 240 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 241 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 242 | # CONFIG_PREEMPT is not set | ||
| 243 | CONFIG_HZ=100 | ||
| 244 | CONFIG_AEABI=y | ||
| 245 | CONFIG_OABI_COMPAT=y | ||
| 246 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
| 247 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 248 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 249 | CONFIG_FLATMEM_MANUAL=y | ||
| 250 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 251 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 252 | CONFIG_FLATMEM=y | ||
| 253 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 254 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 255 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 256 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 257 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 258 | # CONFIG_RESOURCES_64BIT is not set | ||
| 259 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 260 | CONFIG_BOUNCE=y | ||
| 261 | CONFIG_VIRT_TO_BUS=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="keepinitrd" | ||
| 270 | # CONFIG_XIP_KERNEL is not set | ||
| 271 | CONFIG_KEXEC=y | ||
| 272 | CONFIG_ATAGS_PROC=y | ||
| 273 | |||
| 274 | # | ||
| 275 | # CPU Frequency scaling | ||
| 276 | # | ||
| 277 | # CONFIG_CPU_FREQ is not set | ||
| 278 | |||
| 279 | # | ||
| 280 | # Floating point emulation | ||
| 281 | # | ||
| 282 | |||
| 283 | # | ||
| 284 | # At least one emulation must be selected | ||
| 285 | # | ||
| 286 | CONFIG_FPE_NWFPE=y | ||
| 287 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 288 | # CONFIG_FPE_FASTFPE is not set | ||
| 289 | |||
| 290 | # | ||
| 291 | # Userspace binary formats | ||
| 292 | # | ||
| 293 | CONFIG_BINFMT_ELF=y | ||
| 294 | # CONFIG_BINFMT_AOUT is not set | ||
| 295 | # CONFIG_BINFMT_MISC is not set | ||
| 296 | |||
| 297 | # | ||
| 298 | # Power management options | ||
| 299 | # | ||
| 300 | CONFIG_PM=y | ||
| 301 | # CONFIG_PM_DEBUG is not set | ||
| 302 | CONFIG_PM_SLEEP=y | ||
| 303 | CONFIG_SUSPEND=y | ||
| 304 | CONFIG_SUSPEND_FREEZER=y | ||
| 305 | CONFIG_APM_EMULATION=y | ||
| 306 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 307 | CONFIG_NET=y | ||
| 308 | |||
| 309 | # | ||
| 310 | # Networking options | ||
| 311 | # | ||
| 312 | CONFIG_PACKET=y | ||
| 313 | CONFIG_PACKET_MMAP=y | ||
| 314 | CONFIG_UNIX=y | ||
| 315 | # CONFIG_NET_KEY is not set | ||
| 316 | CONFIG_INET=y | ||
| 317 | CONFIG_IP_MULTICAST=y | ||
| 318 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 319 | CONFIG_IP_FIB_HASH=y | ||
| 320 | CONFIG_IP_PNP=y | ||
| 321 | # CONFIG_IP_PNP_DHCP is not set | ||
| 322 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 323 | # CONFIG_IP_PNP_RARP is not set | ||
| 324 | # CONFIG_NET_IPIP is not set | ||
| 325 | # CONFIG_NET_IPGRE is not set | ||
| 326 | # CONFIG_IP_MROUTE is not set | ||
| 327 | # CONFIG_ARPD is not set | ||
| 328 | # CONFIG_SYN_COOKIES is not set | ||
| 329 | # CONFIG_INET_AH is not set | ||
| 330 | # CONFIG_INET_ESP is not set | ||
| 331 | # CONFIG_INET_IPCOMP is not set | ||
| 332 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 333 | # CONFIG_INET_TUNNEL is not set | ||
| 334 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| 335 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| 336 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| 337 | # CONFIG_INET_LRO is not set | ||
| 338 | # CONFIG_INET_DIAG is not set | ||
| 339 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 340 | CONFIG_TCP_CONG_CUBIC=y | ||
| 341 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 342 | # CONFIG_TCP_MD5SIG is not set | ||
| 343 | # CONFIG_IPV6 is not set | ||
| 344 | # CONFIG_NETWORK_SECMARK is not set | ||
| 345 | # CONFIG_NETFILTER is not set | ||
| 346 | # CONFIG_IP_DCCP is not set | ||
| 347 | # CONFIG_IP_SCTP is not set | ||
| 348 | # CONFIG_TIPC is not set | ||
| 349 | # CONFIG_ATM is not set | ||
| 350 | # CONFIG_BRIDGE is not set | ||
| 351 | # CONFIG_VLAN_8021Q is not set | ||
| 352 | # CONFIG_DECNET is not set | ||
| 353 | # CONFIG_LLC2 is not set | ||
| 354 | # CONFIG_IPX is not set | ||
| 355 | # CONFIG_ATALK is not set | ||
| 356 | # CONFIG_X25 is not set | ||
| 357 | # CONFIG_LAPB is not set | ||
| 358 | # CONFIG_ECONET is not set | ||
| 359 | # CONFIG_WAN_ROUTER is not set | ||
| 360 | # CONFIG_NET_SCHED is not set | ||
| 361 | |||
| 362 | # | ||
| 363 | # Network testing | ||
| 364 | # | ||
| 365 | # CONFIG_NET_PKTGEN is not set | ||
| 366 | # CONFIG_HAMRADIO is not set | ||
| 367 | # CONFIG_CAN is not set | ||
| 368 | # CONFIG_IRDA is not set | ||
| 369 | # CONFIG_BT is not set | ||
| 370 | # CONFIG_AF_RXRPC is not set | ||
| 371 | |||
| 372 | # | ||
| 373 | # Wireless | ||
| 374 | # | ||
| 375 | # CONFIG_CFG80211 is not set | ||
| 376 | # CONFIG_WIRELESS_EXT is not set | ||
| 377 | # CONFIG_MAC80211 is not set | ||
| 378 | # CONFIG_IEEE80211 is not set | ||
| 379 | # CONFIG_RFKILL is not set | ||
| 380 | # CONFIG_NET_9P is not set | ||
| 381 | |||
| 382 | # | ||
| 383 | # Device Drivers | ||
| 384 | # | ||
| 385 | |||
| 386 | # | ||
| 387 | # Generic Driver Options | ||
| 388 | # | ||
| 389 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 390 | CONFIG_STANDALONE=y | ||
| 391 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 392 | CONFIG_FW_LOADER=y | ||
| 393 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 394 | CONFIG_EXTRA_FIRMWARE="" | ||
| 395 | # CONFIG_DEBUG_DRIVER is not set | ||
| 396 | # CONFIG_DEBUG_DEVRES is not set | ||
| 397 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 398 | # CONFIG_CONNECTOR is not set | ||
| 399 | CONFIG_MTD=y | ||
| 400 | # CONFIG_MTD_DEBUG is not set | ||
| 401 | # CONFIG_MTD_CONCAT is not set | ||
| 402 | CONFIG_MTD_PARTITIONS=y | ||
| 403 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 404 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 405 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 406 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 407 | |||
| 408 | # | ||
| 409 | # User Modules And Translation Layers | ||
| 410 | # | ||
| 411 | # CONFIG_MTD_CHAR is not set | ||
| 412 | CONFIG_MTD_BLKDEVS=y | ||
| 413 | CONFIG_MTD_BLOCK=y | ||
| 414 | # CONFIG_FTL is not set | ||
| 415 | # CONFIG_NFTL is not set | ||
| 416 | # CONFIG_INFTL is not set | ||
| 417 | # CONFIG_RFD_FTL is not set | ||
| 418 | # CONFIG_SSFDC is not set | ||
| 419 | # CONFIG_MTD_OOPS is not set | ||
| 420 | |||
| 421 | # | ||
| 422 | # RAM/ROM/Flash chip drivers | ||
| 423 | # | ||
| 424 | CONFIG_MTD_CFI=y | ||
| 425 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 426 | CONFIG_MTD_GEN_PROBE=y | ||
| 427 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
| 428 | CONFIG_MTD_CFI_NOSWAP=y | ||
| 429 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
| 430 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
| 431 | CONFIG_MTD_CFI_GEOMETRY=y | ||
| 432 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 433 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 434 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 435 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 436 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 437 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 438 | CONFIG_MTD_CFI_I1=y | ||
| 439 | CONFIG_MTD_CFI_I2=y | ||
| 440 | # CONFIG_MTD_CFI_I4 is not set | ||
| 441 | # CONFIG_MTD_CFI_I8 is not set | ||
| 442 | # CONFIG_MTD_OTP is not set | ||
| 443 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 444 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
| 445 | # CONFIG_MTD_CFI_STAA is not set | ||
| 446 | CONFIG_MTD_CFI_UTIL=y | ||
| 447 | # CONFIG_MTD_RAM is not set | ||
| 448 | # CONFIG_MTD_ROM is not set | ||
| 449 | # CONFIG_MTD_ABSENT is not set | ||
| 450 | # CONFIG_MTD_XIP is not set | ||
| 451 | |||
| 452 | # | ||
| 453 | # Mapping drivers for chip access | ||
| 454 | # | ||
| 455 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 456 | CONFIG_MTD_PHYSMAP=y | ||
| 457 | CONFIG_MTD_PHYSMAP_START=0x8000000 | ||
| 458 | CONFIG_MTD_PHYSMAP_LEN=0x0 | ||
| 459 | CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | ||
| 460 | # CONFIG_MTD_PXA2XX is not set | ||
| 461 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 462 | # CONFIG_MTD_SHARP_SL is not set | ||
| 463 | # CONFIG_MTD_PLATRAM is not set | ||
| 464 | |||
| 465 | # | ||
| 466 | # Self-contained MTD device drivers | ||
| 467 | # | ||
| 468 | # CONFIG_MTD_SLRAM is not set | ||
| 469 | # CONFIG_MTD_PHRAM is not set | ||
| 470 | # CONFIG_MTD_MTDRAM is not set | ||
| 471 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 472 | |||
| 473 | # | ||
| 474 | # Disk-On-Chip Device Drivers | ||
| 475 | # | ||
| 476 | # CONFIG_MTD_DOC2000 is not set | ||
| 477 | # CONFIG_MTD_DOC2001 is not set | ||
| 478 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 479 | # CONFIG_MTD_NAND is not set | ||
| 480 | # CONFIG_MTD_ONENAND is not set | ||
| 481 | |||
| 482 | # | ||
| 483 | # UBI - Unsorted block images | ||
| 484 | # | ||
| 485 | # CONFIG_MTD_UBI is not set | ||
| 486 | # CONFIG_PARPORT is not set | ||
| 487 | CONFIG_BLK_DEV=y | ||
| 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_RAM is not set | ||
| 492 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 493 | # CONFIG_ATA_OVER_ETH is not set | ||
| 494 | CONFIG_MISC_DEVICES=y | ||
| 495 | # CONFIG_EEPROM_93CX6 is not set | ||
| 496 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 497 | CONFIG_HAVE_IDE=y | ||
| 498 | # CONFIG_IDE is not set | ||
| 499 | |||
| 500 | # | ||
| 501 | # SCSI device support | ||
| 502 | # | ||
| 503 | # CONFIG_RAID_ATTRS is not set | ||
| 504 | # CONFIG_SCSI is not set | ||
| 505 | # CONFIG_SCSI_DMA is not set | ||
| 506 | # CONFIG_SCSI_NETLINK is not set | ||
| 507 | # CONFIG_ATA is not set | ||
| 508 | # CONFIG_MD is not set | ||
| 509 | # CONFIG_NETDEVICES is not set | ||
| 510 | # CONFIG_ISDN is not set | ||
| 511 | |||
| 512 | # | ||
| 513 | # Input device support | ||
| 514 | # | ||
| 515 | CONFIG_INPUT=y | ||
| 516 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 517 | # CONFIG_INPUT_POLLDEV is not set | ||
| 518 | |||
| 519 | # | ||
| 520 | # Userland interfaces | ||
| 521 | # | ||
| 522 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 523 | # CONFIG_INPUT_JOYDEV is not set | ||
| 524 | # CONFIG_INPUT_EVDEV is not set | ||
| 525 | # CONFIG_INPUT_EVBUG is not set | ||
| 526 | # CONFIG_INPUT_APMPOWER is not set | ||
| 527 | |||
| 528 | # | ||
| 529 | # Input Device Drivers | ||
| 530 | # | ||
| 531 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 532 | # CONFIG_INPUT_MOUSE is not set | ||
| 533 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 534 | # CONFIG_INPUT_TABLET is not set | ||
| 535 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 536 | # CONFIG_INPUT_MISC is not set | ||
| 537 | |||
| 538 | # | ||
| 539 | # Hardware I/O ports | ||
| 540 | # | ||
| 541 | # CONFIG_SERIO is not set | ||
| 542 | # CONFIG_GAMEPORT is not set | ||
| 543 | |||
| 544 | # | ||
| 545 | # Character devices | ||
| 546 | # | ||
| 547 | CONFIG_VT=y | ||
| 548 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 549 | CONFIG_VT_CONSOLE=y | ||
| 550 | CONFIG_HW_CONSOLE=y | ||
| 551 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 552 | CONFIG_DEVKMEM=y | ||
| 553 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 554 | |||
| 555 | # | ||
| 556 | # Serial drivers | ||
| 557 | # | ||
| 558 | # CONFIG_SERIAL_8250 is not set | ||
| 559 | |||
| 560 | # | ||
| 561 | # Non-8250 serial port support | ||
| 562 | # | ||
| 563 | CONFIG_SERIAL_PXA=y | ||
| 564 | CONFIG_SERIAL_PXA_CONSOLE=y | ||
| 565 | CONFIG_SERIAL_CORE=y | ||
| 566 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 567 | CONFIG_UNIX98_PTYS=y | ||
| 568 | CONFIG_LEGACY_PTYS=y | ||
| 569 | CONFIG_LEGACY_PTY_COUNT=32 | ||
| 570 | # CONFIG_IPMI_HANDLER is not set | ||
| 571 | # CONFIG_HW_RANDOM is not set | ||
| 572 | # CONFIG_NVRAM is not set | ||
| 573 | # CONFIG_R3964 is not set | ||
| 574 | # CONFIG_RAW_DRIVER is not set | ||
| 575 | # CONFIG_TCG_TPM is not set | ||
| 576 | # CONFIG_I2C is not set | ||
| 577 | # CONFIG_SPI is not set | ||
| 578 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
| 579 | CONFIG_GPIOLIB=y | ||
| 580 | # CONFIG_DEBUG_GPIO is not set | ||
| 581 | # CONFIG_GPIO_SYSFS is not set | ||
| 582 | |||
| 583 | # | ||
| 584 | # I2C GPIO expanders: | ||
| 585 | # | ||
| 586 | |||
| 587 | # | ||
| 588 | # PCI GPIO expanders: | ||
| 589 | # | ||
| 590 | |||
| 591 | # | ||
| 592 | # SPI GPIO expanders: | ||
| 593 | # | ||
| 594 | # CONFIG_W1 is not set | ||
| 595 | # CONFIG_POWER_SUPPLY is not set | ||
| 596 | # CONFIG_HWMON is not set | ||
| 597 | # CONFIG_WATCHDOG is not set | ||
| 598 | |||
| 599 | # | ||
| 600 | # Sonics Silicon Backplane | ||
| 601 | # | ||
| 602 | CONFIG_SSB_POSSIBLE=y | ||
| 603 | # CONFIG_SSB is not set | ||
| 604 | |||
| 605 | # | ||
| 606 | # Multifunction device drivers | ||
| 607 | # | ||
| 608 | # CONFIG_MFD_CORE is not set | ||
| 609 | # CONFIG_MFD_SM501 is not set | ||
| 610 | # CONFIG_HTC_EGPIO is not set | ||
| 611 | # CONFIG_HTC_PASIC3 is not set | ||
| 612 | # CONFIG_MFD_TMIO is not set | ||
| 613 | # CONFIG_MFD_T7L66XB is not set | ||
| 614 | # CONFIG_MFD_TC6387XB is not set | ||
| 615 | # CONFIG_MFD_TC6393XB is not set | ||
| 616 | |||
| 617 | # | ||
| 618 | # Multimedia devices | ||
| 619 | # | ||
| 620 | |||
| 621 | # | ||
| 622 | # Multimedia core support | ||
| 623 | # | ||
| 624 | # CONFIG_VIDEO_DEV is not set | ||
| 625 | # CONFIG_DVB_CORE is not set | ||
| 626 | # CONFIG_VIDEO_MEDIA is not set | ||
| 627 | |||
| 628 | # | ||
| 629 | # Multimedia drivers | ||
| 630 | # | ||
| 631 | # CONFIG_DAB is not set | ||
| 632 | |||
| 633 | # | ||
| 634 | # Graphics support | ||
| 635 | # | ||
| 636 | # CONFIG_VGASTATE is not set | ||
| 637 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 638 | # CONFIG_FB is not set | ||
| 639 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 640 | |||
| 641 | # | ||
| 642 | # Display device support | ||
| 643 | # | ||
| 644 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 645 | |||
| 646 | # | ||
| 647 | # Console display driver support | ||
| 648 | # | ||
| 649 | # CONFIG_VGA_CONSOLE is not set | ||
| 650 | CONFIG_DUMMY_CONSOLE=y | ||
| 651 | # CONFIG_SOUND is not set | ||
| 652 | # CONFIG_HID_SUPPORT is not set | ||
| 653 | CONFIG_USB_SUPPORT=y | ||
| 654 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 655 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
| 656 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 657 | # CONFIG_USB is not set | ||
| 658 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 659 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 660 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 661 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 662 | |||
| 663 | # | ||
| 664 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 665 | # | ||
| 666 | CONFIG_USB_GADGET=y | ||
| 667 | # CONFIG_USB_GADGET_DEBUG is not set | ||
| 668 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
| 669 | CONFIG_USB_GADGET_SELECTED=y | ||
| 670 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
| 671 | # CONFIG_USB_GADGET_ATMEL_USBA is not set | ||
| 672 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
| 673 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 674 | CONFIG_USB_GADGET_PXA25X=y | ||
| 675 | CONFIG_USB_PXA25X=y | ||
| 676 | CONFIG_USB_PXA25X_SMALL=y | ||
| 677 | # CONFIG_USB_GADGET_M66592 is not set | ||
| 678 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 679 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 680 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
| 681 | # CONFIG_USB_GADGET_OMAP is not set | ||
| 682 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
| 683 | # CONFIG_USB_GADGET_AT91 is not set | ||
| 684 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
| 685 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
| 686 | # CONFIG_USB_ZERO is not set | ||
| 687 | CONFIG_USB_ETH=y | ||
| 688 | # CONFIG_USB_ETH_RNDIS is not set | ||
| 689 | # CONFIG_USB_GADGETFS is not set | ||
| 690 | # CONFIG_USB_FILE_STORAGE is not set | ||
| 691 | # CONFIG_USB_G_SERIAL is not set | ||
| 692 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 693 | # CONFIG_USB_G_PRINTER is not set | ||
| 694 | # CONFIG_USB_CDC_COMPOSITE is not set | ||
| 695 | # CONFIG_MMC is not set | ||
| 696 | # CONFIG_NEW_LEDS is not set | ||
| 697 | CONFIG_RTC_LIB=y | ||
| 698 | CONFIG_RTC_CLASS=y | ||
| 699 | CONFIG_RTC_HCTOSYS=y | ||
| 700 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 701 | # CONFIG_RTC_DEBUG is not set | ||
| 702 | |||
| 703 | # | ||
| 704 | # RTC interfaces | ||
| 705 | # | ||
| 706 | CONFIG_RTC_INTF_SYSFS=y | ||
| 707 | CONFIG_RTC_INTF_PROC=y | ||
| 708 | CONFIG_RTC_INTF_DEV=y | ||
| 709 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 710 | # CONFIG_RTC_DRV_TEST is not set | ||
| 711 | |||
| 712 | # | ||
| 713 | # SPI RTC drivers | ||
| 714 | # | ||
| 715 | |||
| 716 | # | ||
| 717 | # Platform RTC drivers | ||
| 718 | # | ||
| 719 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 720 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 721 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 722 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 723 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 724 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 725 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 726 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 727 | |||
| 728 | # | ||
| 729 | # on-CPU RTC drivers | ||
| 730 | # | ||
| 731 | CONFIG_RTC_DRV_SA1100=y | ||
| 732 | # CONFIG_DMADEVICES is not set | ||
| 733 | |||
| 734 | # | ||
| 735 | # Voltage and Current regulators | ||
| 736 | # | ||
| 737 | # CONFIG_REGULATOR is not set | ||
| 738 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
| 739 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
| 740 | # CONFIG_REGULATOR_BQ24022 is not set | ||
| 741 | # CONFIG_UIO is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # File systems | ||
| 745 | # | ||
| 746 | CONFIG_EXT2_FS=y | ||
| 747 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 748 | # CONFIG_EXT2_FS_XIP is not set | ||
| 749 | # CONFIG_EXT3_FS is not set | ||
| 750 | # CONFIG_EXT4DEV_FS is not set | ||
| 751 | # CONFIG_REISERFS_FS is not set | ||
| 752 | # CONFIG_JFS_FS is not set | ||
| 753 | # CONFIG_FS_POSIX_ACL is not set | ||
| 754 | # CONFIG_XFS_FS is not set | ||
| 755 | # CONFIG_OCFS2_FS is not set | ||
| 756 | CONFIG_DNOTIFY=y | ||
| 757 | CONFIG_INOTIFY=y | ||
| 758 | CONFIG_INOTIFY_USER=y | ||
| 759 | # CONFIG_QUOTA is not set | ||
| 760 | # CONFIG_AUTOFS_FS is not set | ||
| 761 | # CONFIG_AUTOFS4_FS is not set | ||
| 762 | # CONFIG_FUSE_FS is not set | ||
| 763 | |||
| 764 | # | ||
| 765 | # CD-ROM/DVD Filesystems | ||
| 766 | # | ||
| 767 | # CONFIG_ISO9660_FS is not set | ||
| 768 | # CONFIG_UDF_FS is not set | ||
| 769 | |||
| 770 | # | ||
| 771 | # DOS/FAT/NT Filesystems | ||
| 772 | # | ||
| 773 | # CONFIG_MSDOS_FS is not set | ||
| 774 | # CONFIG_VFAT_FS is not set | ||
| 775 | # CONFIG_NTFS_FS is not set | ||
| 776 | |||
| 777 | # | ||
| 778 | # Pseudo filesystems | ||
| 779 | # | ||
| 780 | CONFIG_PROC_FS=y | ||
| 781 | CONFIG_PROC_SYSCTL=y | ||
| 782 | CONFIG_SYSFS=y | ||
| 783 | CONFIG_TMPFS=y | ||
| 784 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 785 | # CONFIG_HUGETLB_PAGE is not set | ||
| 786 | # CONFIG_CONFIGFS_FS is not set | ||
| 787 | |||
| 788 | # | ||
| 789 | # Miscellaneous filesystems | ||
| 790 | # | ||
| 791 | # CONFIG_ADFS_FS is not set | ||
| 792 | # CONFIG_AFFS_FS is not set | ||
| 793 | # CONFIG_HFS_FS is not set | ||
| 794 | # CONFIG_HFSPLUS_FS is not set | ||
| 795 | # CONFIG_BEFS_FS is not set | ||
| 796 | # CONFIG_BFS_FS is not set | ||
| 797 | # CONFIG_EFS_FS is not set | ||
| 798 | CONFIG_JFFS2_FS=y | ||
| 799 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 800 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 801 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 802 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 803 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 804 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
| 805 | CONFIG_JFFS2_ZLIB=y | ||
| 806 | # CONFIG_JFFS2_LZO is not set | ||
| 807 | CONFIG_JFFS2_RTIME=y | ||
| 808 | # CONFIG_JFFS2_RUBIN is not set | ||
| 809 | # CONFIG_JFFS2_CMODE_NONE is not set | ||
| 810 | CONFIG_JFFS2_CMODE_PRIORITY=y | ||
| 811 | # CONFIG_JFFS2_CMODE_SIZE is not set | ||
| 812 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
| 813 | # CONFIG_CRAMFS is not set | ||
| 814 | # CONFIG_VXFS_FS is not set | ||
| 815 | # CONFIG_MINIX_FS is not set | ||
| 816 | # CONFIG_OMFS_FS is not set | ||
| 817 | # CONFIG_HPFS_FS is not set | ||
| 818 | # CONFIG_QNX4FS_FS is not set | ||
| 819 | # CONFIG_ROMFS_FS is not set | ||
| 820 | # CONFIG_SYSV_FS is not set | ||
| 821 | # CONFIG_UFS_FS is not set | ||
| 822 | # CONFIG_NETWORK_FILESYSTEMS is not set | ||
| 823 | |||
| 824 | # | ||
| 825 | # Partition Types | ||
| 826 | # | ||
| 827 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 828 | CONFIG_MSDOS_PARTITION=y | ||
| 829 | # CONFIG_NLS is not set | ||
| 830 | # CONFIG_DLM is not set | ||
| 831 | |||
| 832 | # | ||
| 833 | # Kernel hacking | ||
| 834 | # | ||
| 835 | CONFIG_PRINTK_TIME=y | ||
| 836 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 837 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 838 | CONFIG_FRAME_WARN=1024 | ||
| 839 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 840 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 841 | # CONFIG_DEBUG_FS is not set | ||
| 842 | # CONFIG_HEADERS_CHECK is not set | ||
| 843 | CONFIG_DEBUG_KERNEL=y | ||
| 844 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 845 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 846 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 847 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 848 | # CONFIG_SCHED_DEBUG is not set | ||
| 849 | # CONFIG_SCHEDSTATS is not set | ||
| 850 | # CONFIG_TIMER_STATS is not set | ||
| 851 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 852 | # CONFIG_DEBUG_SLAB is not set | ||
| 853 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 854 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 855 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 856 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 857 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 858 | # CONFIG_PROVE_LOCKING is not set | ||
| 859 | # CONFIG_LOCK_STAT is not set | ||
| 860 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 861 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 862 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 863 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 864 | # CONFIG_DEBUG_INFO is not set | ||
| 865 | # CONFIG_DEBUG_VM is not set | ||
| 866 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 867 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 868 | # CONFIG_DEBUG_LIST is not set | ||
| 869 | # CONFIG_DEBUG_SG is not set | ||
| 870 | CONFIG_FRAME_POINTER=y | ||
| 871 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 872 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 873 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 874 | # CONFIG_FAULT_INJECTION is not set | ||
| 875 | # CONFIG_LATENCYTOP is not set | ||
| 876 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 877 | CONFIG_HAVE_FTRACE=y | ||
| 878 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 879 | # CONFIG_FTRACE is not set | ||
| 880 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 881 | # CONFIG_SCHED_TRACER is not set | ||
| 882 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 883 | # CONFIG_SAMPLES is not set | ||
| 884 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 885 | # CONFIG_KGDB is not set | ||
| 886 | # CONFIG_DEBUG_USER is not set | ||
| 887 | # CONFIG_DEBUG_ERRORS is not set | ||
| 888 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 889 | # CONFIG_DEBUG_LL is not set | ||
| 890 | |||
| 891 | # | ||
| 892 | # Security options | ||
| 893 | # | ||
| 894 | # CONFIG_KEYS is not set | ||
| 895 | # CONFIG_SECURITY is not set | ||
| 896 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 897 | CONFIG_CRYPTO=y | ||
| 898 | |||
| 899 | # | ||
| 900 | # Crypto core or helper | ||
| 901 | # | ||
| 902 | CONFIG_CRYPTO_ALGAPI=y | ||
| 903 | CONFIG_CRYPTO_HASH=y | ||
| 904 | CONFIG_CRYPTO_MANAGER=y | ||
| 905 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 906 | # CONFIG_CRYPTO_NULL is not set | ||
| 907 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 908 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 909 | # CONFIG_CRYPTO_TEST is not set | ||
| 910 | |||
| 911 | # | ||
| 912 | # Authenticated Encryption with Associated Data | ||
| 913 | # | ||
| 914 | # CONFIG_CRYPTO_CCM is not set | ||
| 915 | # CONFIG_CRYPTO_GCM is not set | ||
| 916 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # Block modes | ||
| 920 | # | ||
| 921 | # CONFIG_CRYPTO_CBC is not set | ||
| 922 | # CONFIG_CRYPTO_CTR is not set | ||
| 923 | # CONFIG_CRYPTO_CTS is not set | ||
| 924 | # CONFIG_CRYPTO_ECB is not set | ||
| 925 | # CONFIG_CRYPTO_LRW is not set | ||
| 926 | # CONFIG_CRYPTO_PCBC is not set | ||
| 927 | # CONFIG_CRYPTO_XTS is not set | ||
| 928 | |||
| 929 | # | ||
| 930 | # Hash modes | ||
| 931 | # | ||
| 932 | CONFIG_CRYPTO_HMAC=y | ||
| 933 | # CONFIG_CRYPTO_XCBC is not set | ||
| 934 | |||
| 935 | # | ||
| 936 | # Digest | ||
| 937 | # | ||
| 938 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 939 | # CONFIG_CRYPTO_MD4 is not set | ||
| 940 | CONFIG_CRYPTO_MD5=y | ||
| 941 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 942 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 943 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 944 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 945 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 946 | CONFIG_CRYPTO_SHA1=y | ||
| 947 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 948 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 949 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 950 | # CONFIG_CRYPTO_WP512 is not set | ||
| 951 | |||
| 952 | # | ||
| 953 | # Ciphers | ||
| 954 | # | ||
| 955 | # CONFIG_CRYPTO_AES is not set | ||
| 956 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 957 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 958 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 959 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 960 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 961 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 962 | CONFIG_CRYPTO_DES=y | ||
| 963 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 964 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 965 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 966 | # CONFIG_CRYPTO_SEED is not set | ||
| 967 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 968 | # CONFIG_CRYPTO_TEA is not set | ||
| 969 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 970 | |||
| 971 | # | ||
| 972 | # Compression | ||
| 973 | # | ||
| 974 | CONFIG_CRYPTO_DEFLATE=y | ||
| 975 | # CONFIG_CRYPTO_LZO is not set | ||
| 976 | # CONFIG_CRYPTO_HW is not set | ||
| 977 | |||
| 978 | # | ||
| 979 | # Library routines | ||
| 980 | # | ||
| 981 | CONFIG_BITREVERSE=y | ||
| 982 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 983 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 984 | CONFIG_CRC_CCITT=y | ||
| 985 | # CONFIG_CRC16 is not set | ||
| 986 | # CONFIG_CRC_T10DIF is not set | ||
| 987 | # CONFIG_CRC_ITU_T is not set | ||
| 988 | CONFIG_CRC32=y | ||
| 989 | # CONFIG_CRC7 is not set | ||
| 990 | # CONFIG_LIBCRC32C is not set | ||
| 991 | CONFIG_ZLIB_INFLATE=y | ||
| 992 | CONFIG_ZLIB_DEFLATE=y | ||
| 993 | CONFIG_PLIST=y | ||
| 994 | CONFIG_HAS_IOMEM=y | ||
| 995 | CONFIG_HAS_IOPORT=y | ||
| 996 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index e3357ba10f1f..ab8b1e0d0dac 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.28-rc7 |
| 4 | # Sun Jun 22 15:51:25 2008 | 4 | # Thu Dec 4 15:27:39 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| 8 | CONFIG_GENERIC_GPIO=y | 8 | # CONFIG_GENERIC_GPIO is not set |
| 9 | CONFIG_GENERIC_TIME=y | 9 | CONFIG_GENERIC_TIME=y |
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | 10 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 11 | CONFIG_MMU=y | 11 | CONFIG_MMU=y |
| @@ -22,8 +22,7 @@ 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 | 25 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 26 | CONFIG_ZONE_DMA=y | ||
| 27 | CONFIG_VECTORS_BASE=0xffff0000 | 26 | CONFIG_VECTORS_BASE=0xffff0000 |
| 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 29 | 28 | ||
| @@ -49,14 +48,17 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
| 49 | # CONFIG_GROUP_SCHED is not set | 48 | # CONFIG_GROUP_SCHED is not set |
| 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 49 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 51 | # CONFIG_RELAY is not set | 50 | # CONFIG_RELAY is not set |
| 52 | # CONFIG_NAMESPACES is not set | 51 | CONFIG_NAMESPACES=y |
| 52 | # CONFIG_UTS_NS is not set | ||
| 53 | # CONFIG_IPC_NS is not set | ||
| 54 | # CONFIG_USER_NS is not set | ||
| 55 | # CONFIG_PID_NS is not set | ||
| 53 | # CONFIG_BLK_DEV_INITRD is not set | 56 | # CONFIG_BLK_DEV_INITRD is not set |
| 54 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 57 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 55 | CONFIG_SYSCTL=y | 58 | CONFIG_SYSCTL=y |
| 56 | CONFIG_EMBEDDED=y | 59 | # CONFIG_EMBEDDED is not set |
| 57 | CONFIG_UID16=y | 60 | CONFIG_UID16=y |
| 58 | CONFIG_SYSCTL_SYSCALL=y | 61 | CONFIG_SYSCTL_SYSCALL=y |
| 59 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 60 | CONFIG_KALLSYMS=y | 62 | CONFIG_KALLSYMS=y |
| 61 | # CONFIG_KALLSYMS_ALL is not set | 63 | # CONFIG_KALLSYMS_ALL is not set |
| 62 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 64 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -73,9 +75,12 @@ CONFIG_SIGNALFD=y | |||
| 73 | CONFIG_TIMERFD=y | 75 | CONFIG_TIMERFD=y |
| 74 | CONFIG_EVENTFD=y | 76 | CONFIG_EVENTFD=y |
| 75 | CONFIG_SHMEM=y | 77 | CONFIG_SHMEM=y |
| 78 | CONFIG_AIO=y | ||
| 76 | CONFIG_VM_EVENT_COUNTERS=y | 79 | CONFIG_VM_EVENT_COUNTERS=y |
| 77 | CONFIG_SLAB=y | 80 | CONFIG_PCI_QUIRKS=y |
| 78 | # CONFIG_SLUB is not set | 81 | CONFIG_SLUB_DEBUG=y |
| 82 | # CONFIG_SLAB is not set | ||
| 83 | CONFIG_SLUB=y | ||
| 79 | # CONFIG_SLOB is not set | 84 | # CONFIG_SLOB is not set |
| 80 | CONFIG_PROFILING=y | 85 | CONFIG_PROFILING=y |
| 81 | # CONFIG_MARKERS is not set | 86 | # CONFIG_MARKERS is not set |
| @@ -85,8 +90,7 @@ CONFIG_KPROBES=y | |||
| 85 | CONFIG_KRETPROBES=y | 90 | CONFIG_KRETPROBES=y |
| 86 | CONFIG_HAVE_KPROBES=y | 91 | CONFIG_HAVE_KPROBES=y |
| 87 | CONFIG_HAVE_KRETPROBES=y | 92 | CONFIG_HAVE_KRETPROBES=y |
| 88 | # CONFIG_HAVE_DMA_ATTRS is not set | 93 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
| 89 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 90 | CONFIG_SLABINFO=y | 94 | CONFIG_SLABINFO=y |
| 91 | CONFIG_RT_MUTEXES=y | 95 | CONFIG_RT_MUTEXES=y |
| 92 | # CONFIG_TINY_SHMEM is not set | 96 | # CONFIG_TINY_SHMEM is not set |
| @@ -97,12 +101,13 @@ CONFIG_MODULE_UNLOAD=y | |||
| 97 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 101 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 98 | # CONFIG_MODVERSIONS is not set | 102 | # CONFIG_MODVERSIONS is not set |
| 99 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 103 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 100 | # CONFIG_KMOD is not set | 104 | CONFIG_KMOD=y |
| 101 | CONFIG_BLOCK=y | 105 | CONFIG_BLOCK=y |
| 102 | # CONFIG_LBD is not set | 106 | # CONFIG_LBD is not set |
| 103 | # CONFIG_BLK_DEV_IO_TRACE is not set | 107 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 104 | # CONFIG_LSF is not set | 108 | # CONFIG_LSF is not set |
| 105 | # CONFIG_BLK_DEV_BSG is not set | 109 | # CONFIG_BLK_DEV_BSG is not set |
| 110 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 106 | 111 | ||
| 107 | # | 112 | # |
| 108 | # IO Schedulers | 113 | # IO Schedulers |
| @@ -117,6 +122,7 @@ CONFIG_DEFAULT_CFQ=y | |||
| 117 | # CONFIG_DEFAULT_NOOP is not set | 122 | # CONFIG_DEFAULT_NOOP is not set |
| 118 | CONFIG_DEFAULT_IOSCHED="cfq" | 123 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 119 | CONFIG_CLASSIC_RCU=y | 124 | CONFIG_CLASSIC_RCU=y |
| 125 | # CONFIG_FREEZER is not set | ||
| 120 | 126 | ||
| 121 | # | 127 | # |
| 122 | # System Type | 128 | # System Type |
| @@ -128,7 +134,6 @@ CONFIG_CLASSIC_RCU=y | |||
| 128 | # CONFIG_ARCH_AT91 is not set | 134 | # CONFIG_ARCH_AT91 is not set |
| 129 | # CONFIG_ARCH_CLPS7500 is not set | 135 | # CONFIG_ARCH_CLPS7500 is not set |
| 130 | # CONFIG_ARCH_CLPS711X is not set | 136 | # CONFIG_ARCH_CLPS711X is not set |
| 131 | # CONFIG_ARCH_CO285 is not set | ||
| 132 | # CONFIG_ARCH_EBSA110 is not set | 137 | # CONFIG_ARCH_EBSA110 is not set |
| 133 | # CONFIG_ARCH_EP93XX is not set | 138 | # CONFIG_ARCH_EP93XX is not set |
| 134 | # CONFIG_ARCH_FOOTBRIDGE is not set | 139 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| @@ -158,7 +163,7 @@ CONFIG_ARCH_KIRKWOOD=y | |||
| 158 | # CONFIG_ARCH_LH7A40X is not set | 163 | # CONFIG_ARCH_LH7A40X is not set |
| 159 | # CONFIG_ARCH_DAVINCI is not set | 164 | # CONFIG_ARCH_DAVINCI is not set |
| 160 | # CONFIG_ARCH_OMAP is not set | 165 | # CONFIG_ARCH_OMAP is not set |
| 161 | # CONFIG_ARCH_MSM7X00A is not set | 166 | # CONFIG_ARCH_MSM is not set |
| 162 | 167 | ||
| 163 | # | 168 | # |
| 164 | # Marvell Kirkwood Implementations | 169 | # Marvell Kirkwood Implementations |
| @@ -199,6 +204,7 @@ CONFIG_ARM_THUMB=y | |||
| 199 | # CONFIG_CPU_DCACHE_DISABLE is not set | 204 | # CONFIG_CPU_DCACHE_DISABLE is not set |
| 200 | CONFIG_OUTER_CACHE=y | 205 | CONFIG_OUTER_CACHE=y |
| 201 | CONFIG_CACHE_FEROCEON_L2=y | 206 | CONFIG_CACHE_FEROCEON_L2=y |
| 207 | # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set | ||
| 202 | 208 | ||
| 203 | # | 209 | # |
| 204 | # Bus support | 210 | # Bus support |
| @@ -217,25 +223,30 @@ CONFIG_TICK_ONESHOT=y | |||
| 217 | CONFIG_NO_HZ=y | 223 | CONFIG_NO_HZ=y |
| 218 | CONFIG_HIGH_RES_TIMERS=y | 224 | CONFIG_HIGH_RES_TIMERS=y |
| 219 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 225 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| 226 | CONFIG_VMSPLIT_3G=y | ||
| 227 | # CONFIG_VMSPLIT_2G is not set | ||
| 228 | # CONFIG_VMSPLIT_1G is not set | ||
| 229 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
| 220 | CONFIG_PREEMPT=y | 230 | CONFIG_PREEMPT=y |
| 221 | CONFIG_HZ=100 | 231 | CONFIG_HZ=100 |
| 222 | CONFIG_AEABI=y | 232 | CONFIG_AEABI=y |
| 223 | # CONFIG_OABI_COMPAT is not set | 233 | # CONFIG_OABI_COMPAT is not set |
| 224 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 234 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y |
| 235 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | ||
| 236 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | ||
| 225 | CONFIG_SELECT_MEMORY_MODEL=y | 237 | CONFIG_SELECT_MEMORY_MODEL=y |
| 226 | CONFIG_FLATMEM_MANUAL=y | 238 | CONFIG_FLATMEM_MANUAL=y |
| 227 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 239 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 228 | # CONFIG_SPARSEMEM_MANUAL is not set | 240 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 229 | CONFIG_FLATMEM=y | 241 | CONFIG_FLATMEM=y |
| 230 | CONFIG_FLAT_NODE_MEM_MAP=y | 242 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 231 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 232 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 233 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 234 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
| 235 | # CONFIG_RESOURCES_64BIT is not set | 245 | # CONFIG_RESOURCES_64BIT is not set |
| 236 | CONFIG_ZONE_DMA_FLAG=1 | 246 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 237 | CONFIG_BOUNCE=y | 247 | CONFIG_ZONE_DMA_FLAG=0 |
| 238 | CONFIG_VIRT_TO_BUS=y | 248 | CONFIG_VIRT_TO_BUS=y |
| 249 | CONFIG_UNEVICTABLE_LRU=y | ||
| 239 | CONFIG_ALIGNMENT_TRAP=y | 250 | CONFIG_ALIGNMENT_TRAP=y |
| 240 | 251 | ||
| 241 | # | 252 | # |
| @@ -248,6 +259,11 @@ CONFIG_CMDLINE="" | |||
| 248 | # CONFIG_KEXEC is not set | 259 | # CONFIG_KEXEC is not set |
| 249 | 260 | ||
| 250 | # | 261 | # |
| 262 | # CPU Power Management | ||
| 263 | # | ||
| 264 | # CONFIG_CPU_IDLE is not set | ||
| 265 | |||
| 266 | # | ||
| 251 | # Floating point emulation | 267 | # Floating point emulation |
| 252 | # | 268 | # |
| 253 | 269 | ||
| @@ -260,6 +276,8 @@ CONFIG_CMDLINE="" | |||
| 260 | # Userspace binary formats | 276 | # Userspace binary formats |
| 261 | # | 277 | # |
| 262 | CONFIG_BINFMT_ELF=y | 278 | CONFIG_BINFMT_ELF=y |
| 279 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 280 | CONFIG_HAVE_AOUT=y | ||
| 263 | # CONFIG_BINFMT_AOUT is not set | 281 | # CONFIG_BINFMT_AOUT is not set |
| 264 | # CONFIG_BINFMT_MISC is not set | 282 | # CONFIG_BINFMT_MISC is not set |
| 265 | 283 | ||
| @@ -268,10 +286,6 @@ CONFIG_BINFMT_ELF=y | |||
| 268 | # | 286 | # |
| 269 | # CONFIG_PM is not set | 287 | # CONFIG_PM is not set |
| 270 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 288 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 271 | |||
| 272 | # | ||
| 273 | # Networking | ||
| 274 | # | ||
| 275 | CONFIG_NET=y | 289 | CONFIG_NET=y |
| 276 | 290 | ||
| 277 | # | 291 | # |
| @@ -322,6 +336,15 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 322 | # CONFIG_TIPC is not set | 336 | # CONFIG_TIPC is not set |
| 323 | # CONFIG_ATM is not set | 337 | # CONFIG_ATM is not set |
| 324 | # CONFIG_BRIDGE is not set | 338 | # CONFIG_BRIDGE is not set |
| 339 | CONFIG_NET_DSA=y | ||
| 340 | # CONFIG_NET_DSA_TAG_DSA is not set | ||
| 341 | CONFIG_NET_DSA_TAG_EDSA=y | ||
| 342 | # CONFIG_NET_DSA_TAG_TRAILER is not set | ||
| 343 | CONFIG_NET_DSA_MV88E6XXX=y | ||
| 344 | # CONFIG_NET_DSA_MV88E6060 is not set | ||
| 345 | # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set | ||
| 346 | # CONFIG_NET_DSA_MV88E6131 is not set | ||
| 347 | CONFIG_NET_DSA_MV88E6123_61_65=y | ||
| 325 | # CONFIG_VLAN_8021Q is not set | 348 | # CONFIG_VLAN_8021Q is not set |
| 326 | # CONFIG_DECNET is not set | 349 | # CONFIG_DECNET is not set |
| 327 | # CONFIG_LLC2 is not set | 350 | # CONFIG_LLC2 is not set |
| @@ -343,12 +366,12 @@ CONFIG_NET_PKTGEN=m | |||
| 343 | # CONFIG_IRDA is not set | 366 | # CONFIG_IRDA is not set |
| 344 | # CONFIG_BT is not set | 367 | # CONFIG_BT is not set |
| 345 | # CONFIG_AF_RXRPC is not set | 368 | # CONFIG_AF_RXRPC is not set |
| 346 | 369 | # CONFIG_PHONET is not set | |
| 347 | # | 370 | CONFIG_WIRELESS=y |
| 348 | # Wireless | ||
| 349 | # | ||
| 350 | # CONFIG_CFG80211 is not set | 371 | # CONFIG_CFG80211 is not set |
| 372 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 351 | CONFIG_WIRELESS_EXT=y | 373 | CONFIG_WIRELESS_EXT=y |
| 374 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 352 | # CONFIG_MAC80211 is not set | 375 | # CONFIG_MAC80211 is not set |
| 353 | # CONFIG_IEEE80211 is not set | 376 | # CONFIG_IEEE80211 is not set |
| 354 | # CONFIG_RFKILL is not set | 377 | # CONFIG_RFKILL is not set |
| @@ -365,6 +388,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 365 | CONFIG_STANDALONE=y | 388 | CONFIG_STANDALONE=y |
| 366 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 389 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 367 | CONFIG_FW_LOADER=y | 390 | CONFIG_FW_LOADER=y |
| 391 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 392 | CONFIG_EXTRA_FIRMWARE="" | ||
| 368 | # CONFIG_DEBUG_DRIVER is not set | 393 | # CONFIG_DEBUG_DRIVER is not set |
| 369 | # CONFIG_DEBUG_DEVRES is not set | 394 | # CONFIG_DEBUG_DEVRES is not set |
| 370 | # CONFIG_SYS_HYPERVISOR is not set | 395 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -453,7 +478,7 @@ CONFIG_M25PXX_USE_FAST_READ=y | |||
| 453 | # CONFIG_MTD_DOC2001 is not set | 478 | # CONFIG_MTD_DOC2001 is not set |
| 454 | # CONFIG_MTD_DOC2001PLUS is not set | 479 | # CONFIG_MTD_DOC2001PLUS is not set |
| 455 | CONFIG_MTD_NAND=y | 480 | CONFIG_MTD_NAND=y |
| 456 | CONFIG_MTD_NAND_VERIFY_WRITE=y | 481 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set |
| 457 | # CONFIG_MTD_NAND_ECC_SMC is not set | 482 | # CONFIG_MTD_NAND_ECC_SMC is not set |
| 458 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 483 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
| 459 | CONFIG_MTD_NAND_IDS=y | 484 | CONFIG_MTD_NAND_IDS=y |
| @@ -561,6 +586,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 561 | # CONFIG_SCSI_NSP32 is not set | 586 | # CONFIG_SCSI_NSP32 is not set |
| 562 | # CONFIG_SCSI_DEBUG is not set | 587 | # CONFIG_SCSI_DEBUG is not set |
| 563 | # CONFIG_SCSI_SRP is not set | 588 | # CONFIG_SCSI_SRP is not set |
| 589 | # CONFIG_SCSI_DH is not set | ||
| 564 | CONFIG_ATA=y | 590 | CONFIG_ATA=y |
| 565 | # CONFIG_ATA_NONSTANDARD is not set | 591 | # CONFIG_ATA_NONSTANDARD is not set |
| 566 | CONFIG_SATA_PMP=y | 592 | CONFIG_SATA_PMP=y |
| @@ -619,7 +645,6 @@ CONFIG_SATA_MV=y | |||
| 619 | # CONFIG_PATA_SIS is not set | 645 | # CONFIG_PATA_SIS is not set |
| 620 | # CONFIG_PATA_VIA is not set | 646 | # CONFIG_PATA_VIA is not set |
| 621 | # CONFIG_PATA_WINBOND is not set | 647 | # CONFIG_PATA_WINBOND is not set |
| 622 | # CONFIG_PATA_PLATFORM is not set | ||
| 623 | # CONFIG_PATA_SCH is not set | 648 | # CONFIG_PATA_SCH is not set |
| 624 | # CONFIG_MD is not set | 649 | # CONFIG_MD is not set |
| 625 | # CONFIG_FUSION is not set | 650 | # CONFIG_FUSION is not set |
| @@ -627,11 +652,14 @@ CONFIG_SATA_MV=y | |||
| 627 | # | 652 | # |
| 628 | # IEEE 1394 (FireWire) support | 653 | # IEEE 1394 (FireWire) support |
| 629 | # | 654 | # |
| 655 | |||
| 656 | # | ||
| 657 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 658 | # | ||
| 630 | # CONFIG_FIREWIRE is not set | 659 | # CONFIG_FIREWIRE is not set |
| 631 | # CONFIG_IEEE1394 is not set | 660 | # CONFIG_IEEE1394 is not set |
| 632 | # CONFIG_I2O is not set | 661 | # CONFIG_I2O is not set |
| 633 | CONFIG_NETDEVICES=y | 662 | CONFIG_NETDEVICES=y |
| 634 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 635 | # CONFIG_DUMMY is not set | 663 | # CONFIG_DUMMY is not set |
| 636 | # CONFIG_BONDING is not set | 664 | # CONFIG_BONDING is not set |
| 637 | # CONFIG_MACVLAN is not set | 665 | # CONFIG_MACVLAN is not set |
| @@ -639,7 +667,23 @@ CONFIG_NETDEVICES=y | |||
| 639 | # CONFIG_TUN is not set | 667 | # CONFIG_TUN is not set |
| 640 | # CONFIG_VETH is not set | 668 | # CONFIG_VETH is not set |
| 641 | # CONFIG_ARCNET is not set | 669 | # CONFIG_ARCNET is not set |
| 642 | # CONFIG_PHYLIB is not set | 670 | CONFIG_PHYLIB=y |
| 671 | |||
| 672 | # | ||
| 673 | # MII PHY device drivers | ||
| 674 | # | ||
| 675 | CONFIG_MARVELL_PHY=y | ||
| 676 | # CONFIG_DAVICOM_PHY is not set | ||
| 677 | # CONFIG_QSEMI_PHY is not set | ||
| 678 | # CONFIG_LXT_PHY is not set | ||
| 679 | # CONFIG_CICADA_PHY is not set | ||
| 680 | # CONFIG_VITESSE_PHY is not set | ||
| 681 | # CONFIG_SMSC_PHY is not set | ||
| 682 | # CONFIG_BROADCOM_PHY is not set | ||
| 683 | # CONFIG_ICPLUS_PHY is not set | ||
| 684 | # CONFIG_REALTEK_PHY is not set | ||
| 685 | # CONFIG_FIXED_PHY is not set | ||
| 686 | # CONFIG_MDIO_BITBANG is not set | ||
| 643 | CONFIG_NET_ETHERNET=y | 687 | CONFIG_NET_ETHERNET=y |
| 644 | CONFIG_MII=y | 688 | CONFIG_MII=y |
| 645 | # CONFIG_AX88796 is not set | 689 | # CONFIG_AX88796 is not set |
| @@ -650,12 +694,16 @@ CONFIG_MII=y | |||
| 650 | # CONFIG_SMC91X is not set | 694 | # CONFIG_SMC91X is not set |
| 651 | # CONFIG_DM9000 is not set | 695 | # CONFIG_DM9000 is not set |
| 652 | # CONFIG_ENC28J60 is not set | 696 | # CONFIG_ENC28J60 is not set |
| 697 | # CONFIG_SMC911X is not set | ||
| 653 | # CONFIG_NET_TULIP is not set | 698 | # CONFIG_NET_TULIP is not set |
| 654 | # CONFIG_HP100 is not set | 699 | # CONFIG_HP100 is not set |
| 655 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 700 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 656 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 701 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 657 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 702 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 658 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 703 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 704 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 705 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 706 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 659 | CONFIG_NET_PCI=y | 707 | CONFIG_NET_PCI=y |
| 660 | # CONFIG_PCNET32 is not set | 708 | # CONFIG_PCNET32 is not set |
| 661 | # CONFIG_AMD8111_ETH is not set | 709 | # CONFIG_AMD8111_ETH is not set |
| @@ -676,14 +724,12 @@ CONFIG_NET_PCI=y | |||
| 676 | # CONFIG_TLAN is not set | 724 | # CONFIG_TLAN is not set |
| 677 | # CONFIG_VIA_RHINE is not set | 725 | # CONFIG_VIA_RHINE is not set |
| 678 | # CONFIG_SC92031 is not set | 726 | # CONFIG_SC92031 is not set |
| 727 | # CONFIG_ATL2 is not set | ||
| 679 | CONFIG_NETDEV_1000=y | 728 | CONFIG_NETDEV_1000=y |
| 680 | # CONFIG_ACENIC is not set | 729 | # CONFIG_ACENIC is not set |
| 681 | # CONFIG_DL2K is not set | 730 | # CONFIG_DL2K is not set |
| 682 | CONFIG_E1000=y | 731 | # CONFIG_E1000 is not set |
| 683 | CONFIG_E1000_NAPI=y | ||
| 684 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 685 | # CONFIG_E1000E is not set | 732 | # CONFIG_E1000E is not set |
| 686 | # CONFIG_E1000E_ENABLED is not set | ||
| 687 | # CONFIG_IP1000 is not set | 733 | # CONFIG_IP1000 is not set |
| 688 | # CONFIG_IGB is not set | 734 | # CONFIG_IGB is not set |
| 689 | # CONFIG_NS83820 is not set | 735 | # CONFIG_NS83820 is not set |
| @@ -699,6 +745,8 @@ CONFIG_E1000_NAPI=y | |||
| 699 | CONFIG_MV643XX_ETH=y | 745 | CONFIG_MV643XX_ETH=y |
| 700 | # CONFIG_QLA3XXX is not set | 746 | # CONFIG_QLA3XXX is not set |
| 701 | # CONFIG_ATL1 is not set | 747 | # CONFIG_ATL1 is not set |
| 748 | # CONFIG_ATL1E is not set | ||
| 749 | # CONFIG_JME is not set | ||
| 702 | # CONFIG_NETDEV_10000 is not set | 750 | # CONFIG_NETDEV_10000 is not set |
| 703 | # CONFIG_TR is not set | 751 | # CONFIG_TR is not set |
| 704 | 752 | ||
| @@ -765,7 +813,11 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 765 | # | 813 | # |
| 766 | # Character devices | 814 | # Character devices |
| 767 | # | 815 | # |
| 768 | # CONFIG_VT is not set | 816 | CONFIG_VT=y |
| 817 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 818 | CONFIG_VT_CONSOLE=y | ||
| 819 | CONFIG_HW_CONSOLE=y | ||
| 820 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 769 | # CONFIG_DEVKMEM is not set | 821 | # CONFIG_DEVKMEM is not set |
| 770 | # CONFIG_SERIAL_NONSTANDARD is not set | 822 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 771 | # CONFIG_NOZOMI is not set | 823 | # CONFIG_NOZOMI is not set |
| @@ -775,7 +827,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 775 | # | 827 | # |
| 776 | CONFIG_SERIAL_8250=y | 828 | CONFIG_SERIAL_8250=y |
| 777 | CONFIG_SERIAL_8250_CONSOLE=y | 829 | CONFIG_SERIAL_8250_CONSOLE=y |
| 778 | # CONFIG_SERIAL_8250_PCI is not set | 830 | CONFIG_SERIAL_8250_PCI=y |
| 779 | CONFIG_SERIAL_8250_NR_UARTS=4 | 831 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 780 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | 832 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 |
| 781 | # CONFIG_SERIAL_8250_EXTENDED is not set | 833 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -800,44 +852,64 @@ CONFIG_DEVPORT=y | |||
| 800 | CONFIG_I2C=y | 852 | CONFIG_I2C=y |
| 801 | CONFIG_I2C_BOARDINFO=y | 853 | CONFIG_I2C_BOARDINFO=y |
| 802 | CONFIG_I2C_CHARDEV=y | 854 | CONFIG_I2C_CHARDEV=y |
| 855 | CONFIG_I2C_HELPER_AUTO=y | ||
| 803 | 856 | ||
| 804 | # | 857 | # |
| 805 | # I2C Hardware Bus support | 858 | # I2C Hardware Bus support |
| 806 | # | 859 | # |
| 860 | |||
| 861 | # | ||
| 862 | # PC SMBus host controller drivers | ||
| 863 | # | ||
| 807 | # CONFIG_I2C_ALI1535 is not set | 864 | # CONFIG_I2C_ALI1535 is not set |
| 808 | # CONFIG_I2C_ALI1563 is not set | 865 | # CONFIG_I2C_ALI1563 is not set |
| 809 | # CONFIG_I2C_ALI15X3 is not set | 866 | # CONFIG_I2C_ALI15X3 is not set |
| 810 | # CONFIG_I2C_AMD756 is not set | 867 | # CONFIG_I2C_AMD756 is not set |
| 811 | # CONFIG_I2C_AMD8111 is not set | 868 | # CONFIG_I2C_AMD8111 is not set |
| 812 | # CONFIG_I2C_GPIO is not set | ||
| 813 | # CONFIG_I2C_I801 is not set | 869 | # CONFIG_I2C_I801 is not set |
| 814 | # CONFIG_I2C_I810 is not set | 870 | # CONFIG_I2C_ISCH is not set |
| 815 | # CONFIG_I2C_PIIX4 is not set | 871 | # CONFIG_I2C_PIIX4 is not set |
| 816 | # CONFIG_I2C_NFORCE2 is not set | 872 | # CONFIG_I2C_NFORCE2 is not set |
| 817 | # CONFIG_I2C_OCORES is not set | ||
| 818 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 819 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 820 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 821 | # CONFIG_I2C_SIMTEC is not set | ||
| 822 | # CONFIG_I2C_SIS5595 is not set | 873 | # CONFIG_I2C_SIS5595 is not set |
| 823 | # CONFIG_I2C_SIS630 is not set | 874 | # CONFIG_I2C_SIS630 is not set |
| 824 | # CONFIG_I2C_SIS96X is not set | 875 | # CONFIG_I2C_SIS96X is not set |
| 825 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 826 | # CONFIG_I2C_STUB is not set | ||
| 827 | # CONFIG_I2C_TINY_USB is not set | ||
| 828 | # CONFIG_I2C_VIA is not set | 876 | # CONFIG_I2C_VIA is not set |
| 829 | # CONFIG_I2C_VIAPRO is not set | 877 | # CONFIG_I2C_VIAPRO is not set |
| 878 | |||
| 879 | # | ||
| 880 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 881 | # | ||
| 882 | CONFIG_I2C_MV64XXX=y | ||
| 883 | # CONFIG_I2C_OCORES is not set | ||
| 884 | # CONFIG_I2C_SIMTEC is not set | ||
| 885 | |||
| 886 | # | ||
| 887 | # External I2C/SMBus adapter drivers | ||
| 888 | # | ||
| 889 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 890 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 891 | # CONFIG_I2C_TINY_USB is not set | ||
| 892 | |||
| 893 | # | ||
| 894 | # Graphics adapter I2C/DDC channel drivers | ||
| 895 | # | ||
| 830 | # CONFIG_I2C_VOODOO3 is not set | 896 | # CONFIG_I2C_VOODOO3 is not set |
| 897 | |||
| 898 | # | ||
| 899 | # Other I2C/SMBus bus drivers | ||
| 900 | # | ||
| 831 | # CONFIG_I2C_PCA_PLATFORM is not set | 901 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 832 | CONFIG_I2C_MV64XXX=y | 902 | # CONFIG_I2C_STUB is not set |
| 833 | 903 | ||
| 834 | # | 904 | # |
| 835 | # Miscellaneous I2C Chip support | 905 | # Miscellaneous I2C Chip support |
| 836 | # | 906 | # |
| 837 | # CONFIG_DS1682 is not set | 907 | # CONFIG_DS1682 is not set |
| 908 | # CONFIG_AT24 is not set | ||
| 838 | # CONFIG_SENSORS_EEPROM is not set | 909 | # CONFIG_SENSORS_EEPROM is not set |
| 839 | # CONFIG_SENSORS_PCF8574 is not set | 910 | # CONFIG_SENSORS_PCF8574 is not set |
| 840 | # CONFIG_PCF8575 is not set | 911 | # CONFIG_PCF8575 is not set |
| 912 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 841 | # CONFIG_SENSORS_PCF8591 is not set | 913 | # CONFIG_SENSORS_PCF8591 is not set |
| 842 | # CONFIG_SENSORS_MAX6875 is not set | 914 | # CONFIG_SENSORS_MAX6875 is not set |
| 843 | # CONFIG_SENSORS_TSL2550 is not set | 915 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -864,20 +936,26 @@ CONFIG_SPI_ORION=y | |||
| 864 | # CONFIG_W1 is not set | 936 | # CONFIG_W1 is not set |
| 865 | # CONFIG_POWER_SUPPLY is not set | 937 | # CONFIG_POWER_SUPPLY is not set |
| 866 | # CONFIG_HWMON is not set | 938 | # CONFIG_HWMON is not set |
| 939 | # CONFIG_THERMAL is not set | ||
| 940 | # CONFIG_THERMAL_HWMON is not set | ||
| 867 | # CONFIG_WATCHDOG is not set | 941 | # CONFIG_WATCHDOG is not set |
| 942 | CONFIG_SSB_POSSIBLE=y | ||
| 868 | 943 | ||
| 869 | # | 944 | # |
| 870 | # Sonics Silicon Backplane | 945 | # Sonics Silicon Backplane |
| 871 | # | 946 | # |
| 872 | CONFIG_SSB_POSSIBLE=y | ||
| 873 | # CONFIG_SSB is not set | 947 | # CONFIG_SSB is not set |
| 874 | 948 | ||
| 875 | # | 949 | # |
| 876 | # Multifunction device drivers | 950 | # Multifunction device drivers |
| 877 | # | 951 | # |
| 952 | # CONFIG_MFD_CORE is not set | ||
| 878 | # CONFIG_MFD_SM501 is not set | 953 | # CONFIG_MFD_SM501 is not set |
| 879 | # CONFIG_MFD_ASIC3 is not set | ||
| 880 | # CONFIG_HTC_PASIC3 is not set | 954 | # CONFIG_HTC_PASIC3 is not set |
| 955 | # CONFIG_MFD_TMIO is not set | ||
| 956 | # CONFIG_PMIC_DA903X is not set | ||
| 957 | # CONFIG_MFD_WM8400 is not set | ||
| 958 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 881 | 959 | ||
| 882 | # | 960 | # |
| 883 | # Multimedia devices | 961 | # Multimedia devices |
| @@ -910,8 +988,10 @@ CONFIG_SSB_POSSIBLE=y | |||
| 910 | # CONFIG_DISPLAY_SUPPORT is not set | 988 | # CONFIG_DISPLAY_SUPPORT is not set |
| 911 | 989 | ||
| 912 | # | 990 | # |
| 913 | # Sound | 991 | # Console display driver support |
| 914 | # | 992 | # |
| 993 | # CONFIG_VGA_CONSOLE is not set | ||
| 994 | CONFIG_DUMMY_CONSOLE=y | ||
| 915 | # CONFIG_SOUND is not set | 995 | # CONFIG_SOUND is not set |
| 916 | CONFIG_HID_SUPPORT=y | 996 | CONFIG_HID_SUPPORT=y |
| 917 | CONFIG_HID=y | 997 | CONFIG_HID=y |
| @@ -922,9 +1002,36 @@ CONFIG_HID=y | |||
| 922 | # USB Input Devices | 1002 | # USB Input Devices |
| 923 | # | 1003 | # |
| 924 | CONFIG_USB_HID=y | 1004 | CONFIG_USB_HID=y |
| 925 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1005 | # CONFIG_HID_PID is not set |
| 926 | # CONFIG_HID_FF is not set | ||
| 927 | # CONFIG_USB_HIDDEV is not set | 1006 | # CONFIG_USB_HIDDEV is not set |
| 1007 | |||
| 1008 | # | ||
| 1009 | # Special HID drivers | ||
| 1010 | # | ||
| 1011 | CONFIG_HID_COMPAT=y | ||
| 1012 | CONFIG_HID_A4TECH=y | ||
| 1013 | CONFIG_HID_APPLE=y | ||
| 1014 | CONFIG_HID_BELKIN=y | ||
| 1015 | CONFIG_HID_BRIGHT=y | ||
| 1016 | CONFIG_HID_CHERRY=y | ||
| 1017 | CONFIG_HID_CHICONY=y | ||
| 1018 | CONFIG_HID_CYPRESS=y | ||
| 1019 | CONFIG_HID_DELL=y | ||
| 1020 | CONFIG_HID_EZKEY=y | ||
| 1021 | CONFIG_HID_GYRATION=y | ||
| 1022 | CONFIG_HID_LOGITECH=y | ||
| 1023 | # CONFIG_LOGITECH_FF is not set | ||
| 1024 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1025 | CONFIG_HID_MICROSOFT=y | ||
| 1026 | CONFIG_HID_MONTEREY=y | ||
| 1027 | CONFIG_HID_PANTHERLORD=y | ||
| 1028 | # CONFIG_PANTHERLORD_FF is not set | ||
| 1029 | CONFIG_HID_PETALYNX=y | ||
| 1030 | CONFIG_HID_SAMSUNG=y | ||
| 1031 | CONFIG_HID_SONY=y | ||
| 1032 | CONFIG_HID_SUNPLUS=y | ||
| 1033 | # CONFIG_THRUSTMASTER_FF is not set | ||
| 1034 | # CONFIG_ZEROPLUS_FF is not set | ||
| 928 | CONFIG_USB_SUPPORT=y | 1035 | CONFIG_USB_SUPPORT=y |
| 929 | CONFIG_USB_ARCH_HAS_HCD=y | 1036 | CONFIG_USB_ARCH_HAS_HCD=y |
| 930 | CONFIG_USB_ARCH_HAS_OHCI=y | 1037 | CONFIG_USB_ARCH_HAS_OHCI=y |
| @@ -940,8 +1047,9 @@ CONFIG_USB_DEVICEFS=y | |||
| 940 | CONFIG_USB_DEVICE_CLASS=y | 1047 | CONFIG_USB_DEVICE_CLASS=y |
| 941 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1048 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 942 | # CONFIG_USB_OTG is not set | 1049 | # CONFIG_USB_OTG is not set |
| 943 | # CONFIG_USB_OTG_WHITELIST is not set | 1050 | # CONFIG_USB_MON is not set |
| 944 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1051 | # CONFIG_USB_WUSB is not set |
| 1052 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 945 | 1053 | ||
| 946 | # | 1054 | # |
| 947 | # USB Host Controller Drivers | 1055 | # USB Host Controller Drivers |
| @@ -956,20 +1064,23 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y | |||
| 956 | # CONFIG_USB_UHCI_HCD is not set | 1064 | # CONFIG_USB_UHCI_HCD is not set |
| 957 | # CONFIG_USB_SL811_HCD is not set | 1065 | # CONFIG_USB_SL811_HCD is not set |
| 958 | # CONFIG_USB_R8A66597_HCD is not set | 1066 | # CONFIG_USB_R8A66597_HCD is not set |
| 1067 | # CONFIG_USB_WHCI_HCD is not set | ||
| 1068 | # CONFIG_USB_HWA_HCD is not set | ||
| 959 | 1069 | ||
| 960 | # | 1070 | # |
| 961 | # USB Device Class drivers | 1071 | # USB Device Class drivers |
| 962 | # | 1072 | # |
| 963 | # CONFIG_USB_ACM is not set | 1073 | # CONFIG_USB_ACM is not set |
| 964 | CONFIG_USB_PRINTER=y | 1074 | CONFIG_USB_PRINTER=m |
| 965 | # CONFIG_USB_WDM is not set | 1075 | # CONFIG_USB_WDM is not set |
| 1076 | # CONFIG_USB_TMC is not set | ||
| 966 | 1077 | ||
| 967 | # | 1078 | # |
| 968 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1079 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
| 969 | # | 1080 | # |
| 970 | 1081 | ||
| 971 | # | 1082 | # |
| 972 | # may also be needed; see USB_STORAGE Help for more information | 1083 | # see USB_STORAGE Help for more information |
| 973 | # | 1084 | # |
| 974 | CONFIG_USB_STORAGE=y | 1085 | CONFIG_USB_STORAGE=y |
| 975 | # CONFIG_USB_STORAGE_DEBUG is not set | 1086 | # CONFIG_USB_STORAGE_DEBUG is not set |
| @@ -992,7 +1103,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 992 | # | 1103 | # |
| 993 | # CONFIG_USB_MDC800 is not set | 1104 | # CONFIG_USB_MDC800 is not set |
| 994 | # CONFIG_USB_MICROTEK is not set | 1105 | # CONFIG_USB_MICROTEK is not set |
| 995 | # CONFIG_USB_MON is not set | ||
| 996 | 1106 | ||
| 997 | # | 1107 | # |
| 998 | # USB port drivers | 1108 | # USB port drivers |
| @@ -1005,7 +1115,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1005 | # CONFIG_USB_EMI62 is not set | 1115 | # CONFIG_USB_EMI62 is not set |
| 1006 | # CONFIG_USB_EMI26 is not set | 1116 | # CONFIG_USB_EMI26 is not set |
| 1007 | # CONFIG_USB_ADUTUX is not set | 1117 | # CONFIG_USB_ADUTUX is not set |
| 1008 | # CONFIG_USB_AUERSWALD is not set | 1118 | # CONFIG_USB_SEVSEG is not set |
| 1009 | # CONFIG_USB_RIO500 is not set | 1119 | # CONFIG_USB_RIO500 is not set |
| 1010 | # CONFIG_USB_LEGOTOWER is not set | 1120 | # CONFIG_USB_LEGOTOWER is not set |
| 1011 | # CONFIG_USB_LCD is not set | 1121 | # CONFIG_USB_LCD is not set |
| @@ -1023,8 +1133,12 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1023 | # CONFIG_USB_IOWARRIOR is not set | 1133 | # CONFIG_USB_IOWARRIOR is not set |
| 1024 | # CONFIG_USB_TEST is not set | 1134 | # CONFIG_USB_TEST is not set |
| 1025 | # CONFIG_USB_ISIGHTFW is not set | 1135 | # CONFIG_USB_ISIGHTFW is not set |
| 1136 | # CONFIG_USB_VST is not set | ||
| 1026 | # CONFIG_USB_GADGET is not set | 1137 | # CONFIG_USB_GADGET is not set |
| 1138 | # CONFIG_UWB is not set | ||
| 1027 | # CONFIG_MMC is not set | 1139 | # CONFIG_MMC is not set |
| 1140 | # CONFIG_MEMSTICK is not set | ||
| 1141 | # CONFIG_ACCESSIBILITY is not set | ||
| 1028 | CONFIG_NEW_LEDS=y | 1142 | CONFIG_NEW_LEDS=y |
| 1029 | # CONFIG_LEDS_CLASS is not set | 1143 | # CONFIG_LEDS_CLASS is not set |
| 1030 | 1144 | ||
| @@ -1038,6 +1152,8 @@ CONFIG_NEW_LEDS=y | |||
| 1038 | # CONFIG_LEDS_TRIGGERS is not set | 1152 | # CONFIG_LEDS_TRIGGERS is not set |
| 1039 | CONFIG_RTC_LIB=y | 1153 | CONFIG_RTC_LIB=y |
| 1040 | CONFIG_RTC_CLASS=y | 1154 | CONFIG_RTC_CLASS=y |
| 1155 | CONFIG_RTC_HCTOSYS=y | ||
| 1156 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 1041 | # CONFIG_RTC_DEBUG is not set | 1157 | # CONFIG_RTC_DEBUG is not set |
| 1042 | 1158 | ||
| 1043 | # | 1159 | # |
| @@ -1056,7 +1172,6 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1056 | # CONFIG_RTC_DRV_DS1374 is not set | 1172 | # CONFIG_RTC_DRV_DS1374 is not set |
| 1057 | # CONFIG_RTC_DRV_DS1672 is not set | 1173 | # CONFIG_RTC_DRV_DS1672 is not set |
| 1058 | # CONFIG_RTC_DRV_MAX6900 is not set | 1174 | # CONFIG_RTC_DRV_MAX6900 is not set |
| 1059 | CONFIG_RTC_DRV_MV=y | ||
| 1060 | # CONFIG_RTC_DRV_RS5C372 is not set | 1175 | # CONFIG_RTC_DRV_RS5C372 is not set |
| 1061 | # CONFIG_RTC_DRV_ISL1208 is not set | 1176 | # CONFIG_RTC_DRV_ISL1208 is not set |
| 1062 | # CONFIG_RTC_DRV_X1205 is not set | 1177 | # CONFIG_RTC_DRV_X1205 is not set |
| @@ -1064,29 +1179,39 @@ CONFIG_RTC_DRV_MV=y | |||
| 1064 | # CONFIG_RTC_DRV_PCF8583 is not set | 1179 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1065 | # CONFIG_RTC_DRV_M41T80 is not set | 1180 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1066 | # CONFIG_RTC_DRV_S35390A is not set | 1181 | # CONFIG_RTC_DRV_S35390A is not set |
| 1182 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1183 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 1067 | 1184 | ||
| 1068 | # | 1185 | # |
| 1069 | # SPI RTC drivers | 1186 | # SPI RTC drivers |
| 1070 | # | 1187 | # |
| 1188 | # CONFIG_RTC_DRV_M41T94 is not set | ||
| 1189 | # CONFIG_RTC_DRV_DS1305 is not set | ||
| 1190 | # CONFIG_RTC_DRV_DS1390 is not set | ||
| 1071 | # CONFIG_RTC_DRV_MAX6902 is not set | 1191 | # CONFIG_RTC_DRV_MAX6902 is not set |
| 1072 | # CONFIG_RTC_DRV_R9701 is not set | 1192 | # CONFIG_RTC_DRV_R9701 is not set |
| 1073 | # CONFIG_RTC_DRV_RS5C348 is not set | 1193 | # CONFIG_RTC_DRV_RS5C348 is not set |
| 1194 | # CONFIG_RTC_DRV_DS3234 is not set | ||
| 1074 | 1195 | ||
| 1075 | # | 1196 | # |
| 1076 | # Platform RTC drivers | 1197 | # Platform RTC drivers |
| 1077 | # | 1198 | # |
| 1078 | # CONFIG_RTC_DRV_CMOS is not set | 1199 | # CONFIG_RTC_DRV_CMOS is not set |
| 1200 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 1079 | # CONFIG_RTC_DRV_DS1511 is not set | 1201 | # CONFIG_RTC_DRV_DS1511 is not set |
| 1080 | # CONFIG_RTC_DRV_DS1553 is not set | 1202 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1081 | # CONFIG_RTC_DRV_DS1742 is not set | 1203 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1082 | # CONFIG_RTC_DRV_STK17TA8 is not set | 1204 | # CONFIG_RTC_DRV_STK17TA8 is not set |
| 1083 | # CONFIG_RTC_DRV_M48T86 is not set | 1205 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1206 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 1084 | # CONFIG_RTC_DRV_M48T59 is not set | 1207 | # CONFIG_RTC_DRV_M48T59 is not set |
| 1208 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 1085 | # CONFIG_RTC_DRV_V3020 is not set | 1209 | # CONFIG_RTC_DRV_V3020 is not set |
| 1086 | 1210 | ||
| 1087 | # | 1211 | # |
| 1088 | # on-CPU RTC drivers | 1212 | # on-CPU RTC drivers |
| 1089 | # | 1213 | # |
| 1214 | CONFIG_RTC_DRV_MV=y | ||
| 1090 | CONFIG_DMADEVICES=y | 1215 | CONFIG_DMADEVICES=y |
| 1091 | 1216 | ||
| 1092 | # | 1217 | # |
| @@ -1099,6 +1224,8 @@ CONFIG_DMA_ENGINE=y | |||
| 1099 | # DMA Clients | 1224 | # DMA Clients |
| 1100 | # | 1225 | # |
| 1101 | # CONFIG_NET_DMA is not set | 1226 | # CONFIG_NET_DMA is not set |
| 1227 | # CONFIG_DMATEST is not set | ||
| 1228 | # CONFIG_REGULATOR is not set | ||
| 1102 | # CONFIG_UIO is not set | 1229 | # CONFIG_UIO is not set |
| 1103 | 1230 | ||
| 1104 | # | 1231 | # |
| @@ -1109,11 +1236,12 @@ CONFIG_EXT2_FS=y | |||
| 1109 | # CONFIG_EXT2_FS_XIP is not set | 1236 | # CONFIG_EXT2_FS_XIP is not set |
| 1110 | CONFIG_EXT3_FS=y | 1237 | CONFIG_EXT3_FS=y |
| 1111 | # CONFIG_EXT3_FS_XATTR is not set | 1238 | # CONFIG_EXT3_FS_XATTR is not set |
| 1112 | # CONFIG_EXT4DEV_FS is not set | 1239 | # CONFIG_EXT4_FS is not set |
| 1113 | CONFIG_JBD=y | 1240 | CONFIG_JBD=y |
| 1114 | # CONFIG_REISERFS_FS is not set | 1241 | # CONFIG_REISERFS_FS is not set |
| 1115 | # CONFIG_JFS_FS is not set | 1242 | # CONFIG_JFS_FS is not set |
| 1116 | # CONFIG_FS_POSIX_ACL is not set | 1243 | # CONFIG_FS_POSIX_ACL is not set |
| 1244 | CONFIG_FILE_LOCKING=y | ||
| 1117 | CONFIG_XFS_FS=y | 1245 | CONFIG_XFS_FS=y |
| 1118 | # CONFIG_XFS_QUOTA is not set | 1246 | # CONFIG_XFS_QUOTA is not set |
| 1119 | # CONFIG_XFS_POSIX_ACL is not set | 1247 | # CONFIG_XFS_POSIX_ACL is not set |
| @@ -1131,7 +1259,7 @@ CONFIG_INOTIFY_USER=y | |||
| 1131 | # | 1259 | # |
| 1132 | # CD-ROM/DVD Filesystems | 1260 | # CD-ROM/DVD Filesystems |
| 1133 | # | 1261 | # |
| 1134 | CONFIG_ISO9660_FS=y | 1262 | CONFIG_ISO9660_FS=m |
| 1135 | CONFIG_JOLIET=y | 1263 | CONFIG_JOLIET=y |
| 1136 | # CONFIG_ZISOFS is not set | 1264 | # CONFIG_ZISOFS is not set |
| 1137 | CONFIG_UDF_FS=m | 1265 | CONFIG_UDF_FS=m |
| @@ -1140,9 +1268,9 @@ CONFIG_UDF_NLS=y | |||
| 1140 | # | 1268 | # |
| 1141 | # DOS/FAT/NT Filesystems | 1269 | # DOS/FAT/NT Filesystems |
| 1142 | # | 1270 | # |
| 1143 | CONFIG_FAT_FS=y | 1271 | CONFIG_FAT_FS=m |
| 1144 | CONFIG_MSDOS_FS=y | 1272 | CONFIG_MSDOS_FS=m |
| 1145 | CONFIG_VFAT_FS=y | 1273 | CONFIG_VFAT_FS=m |
| 1146 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | 1274 | CONFIG_FAT_DEFAULT_CODEPAGE=437 |
| 1147 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | 1275 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" |
| 1148 | # CONFIG_NTFS_FS is not set | 1276 | # CONFIG_NTFS_FS is not set |
| @@ -1152,6 +1280,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1152 | # | 1280 | # |
| 1153 | CONFIG_PROC_FS=y | 1281 | CONFIG_PROC_FS=y |
| 1154 | CONFIG_PROC_SYSCTL=y | 1282 | CONFIG_PROC_SYSCTL=y |
| 1283 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1155 | CONFIG_SYSFS=y | 1284 | CONFIG_SYSFS=y |
| 1156 | CONFIG_TMPFS=y | 1285 | CONFIG_TMPFS=y |
| 1157 | # CONFIG_TMPFS_POSIX_ACL is not set | 1286 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -1182,6 +1311,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1182 | CONFIG_CRAMFS=y | 1311 | CONFIG_CRAMFS=y |
| 1183 | # CONFIG_VXFS_FS is not set | 1312 | # CONFIG_VXFS_FS is not set |
| 1184 | # CONFIG_MINIX_FS is not set | 1313 | # CONFIG_MINIX_FS is not set |
| 1314 | # CONFIG_OMFS_FS is not set | ||
| 1185 | # CONFIG_HPFS_FS is not set | 1315 | # CONFIG_HPFS_FS is not set |
| 1186 | # CONFIG_QNX4FS_FS is not set | 1316 | # CONFIG_QNX4FS_FS is not set |
| 1187 | # CONFIG_ROMFS_FS is not set | 1317 | # CONFIG_ROMFS_FS is not set |
| @@ -1192,13 +1322,13 @@ CONFIG_NFS_FS=y | |||
| 1192 | CONFIG_NFS_V3=y | 1322 | CONFIG_NFS_V3=y |
| 1193 | # CONFIG_NFS_V3_ACL is not set | 1323 | # CONFIG_NFS_V3_ACL is not set |
| 1194 | # CONFIG_NFS_V4 is not set | 1324 | # CONFIG_NFS_V4 is not set |
| 1195 | # CONFIG_NFSD is not set | ||
| 1196 | CONFIG_ROOT_NFS=y | 1325 | CONFIG_ROOT_NFS=y |
| 1326 | # CONFIG_NFSD is not set | ||
| 1197 | CONFIG_LOCKD=y | 1327 | CONFIG_LOCKD=y |
| 1198 | CONFIG_LOCKD_V4=y | 1328 | CONFIG_LOCKD_V4=y |
| 1199 | CONFIG_NFS_COMMON=y | 1329 | CONFIG_NFS_COMMON=y |
| 1200 | CONFIG_SUNRPC=y | 1330 | CONFIG_SUNRPC=y |
| 1201 | # CONFIG_SUNRPC_BIND34 is not set | 1331 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 1202 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1332 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1203 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1333 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1204 | # CONFIG_SMB_FS is not set | 1334 | # CONFIG_SMB_FS is not set |
| @@ -1210,24 +1340,8 @@ CONFIG_SUNRPC=y | |||
| 1210 | # | 1340 | # |
| 1211 | # Partition Types | 1341 | # Partition Types |
| 1212 | # | 1342 | # |
| 1213 | CONFIG_PARTITION_ADVANCED=y | 1343 | # CONFIG_PARTITION_ADVANCED is not set |
| 1214 | # CONFIG_ACORN_PARTITION is not set | ||
| 1215 | # CONFIG_OSF_PARTITION is not set | ||
| 1216 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1217 | # CONFIG_ATARI_PARTITION is not set | ||
| 1218 | # CONFIG_MAC_PARTITION is not set | ||
| 1219 | CONFIG_MSDOS_PARTITION=y | 1344 | CONFIG_MSDOS_PARTITION=y |
| 1220 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1221 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1222 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1223 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1224 | # CONFIG_LDM_PARTITION is not set | ||
| 1225 | # CONFIG_SGI_PARTITION is not set | ||
| 1226 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1227 | # CONFIG_SUN_PARTITION is not set | ||
| 1228 | # CONFIG_KARMA_PARTITION is not set | ||
| 1229 | # CONFIG_EFI_PARTITION is not set | ||
| 1230 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1231 | CONFIG_NLS=y | 1345 | CONFIG_NLS=y |
| 1232 | CONFIG_NLS_DEFAULT="iso8859-1" | 1346 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1233 | CONFIG_NLS_CODEPAGE_437=y | 1347 | CONFIG_NLS_CODEPAGE_437=y |
| @@ -1284,11 +1398,14 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 1284 | CONFIG_DEBUG_KERNEL=y | 1398 | CONFIG_DEBUG_KERNEL=y |
| 1285 | # CONFIG_DEBUG_SHIRQ is not set | 1399 | # CONFIG_DEBUG_SHIRQ is not set |
| 1286 | CONFIG_DETECT_SOFTLOCKUP=y | 1400 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1401 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1402 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1287 | # CONFIG_SCHED_DEBUG is not set | 1403 | # CONFIG_SCHED_DEBUG is not set |
| 1288 | # CONFIG_SCHEDSTATS is not set | 1404 | # CONFIG_SCHEDSTATS is not set |
| 1289 | # CONFIG_TIMER_STATS is not set | 1405 | # CONFIG_TIMER_STATS is not set |
| 1290 | # CONFIG_DEBUG_OBJECTS is not set | 1406 | # CONFIG_DEBUG_OBJECTS is not set |
| 1291 | # CONFIG_DEBUG_SLAB is not set | 1407 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1408 | # CONFIG_SLUB_STATS is not set | ||
| 1292 | # CONFIG_DEBUG_PREEMPT is not set | 1409 | # CONFIG_DEBUG_PREEMPT is not set |
| 1293 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1410 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1294 | # CONFIG_RT_MUTEX_TESTER is not set | 1411 | # CONFIG_RT_MUTEX_TESTER is not set |
| @@ -1300,21 +1417,40 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1300 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1417 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1301 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1418 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1302 | # CONFIG_DEBUG_KOBJECT is not set | 1419 | # CONFIG_DEBUG_KOBJECT is not set |
| 1303 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1420 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1304 | CONFIG_DEBUG_INFO=y | 1421 | CONFIG_DEBUG_INFO=y |
| 1305 | # CONFIG_DEBUG_VM is not set | 1422 | # CONFIG_DEBUG_VM is not set |
| 1306 | # CONFIG_DEBUG_WRITECOUNT is not set | 1423 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1424 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1307 | # CONFIG_DEBUG_LIST is not set | 1425 | # CONFIG_DEBUG_LIST is not set |
| 1308 | # CONFIG_DEBUG_SG is not set | 1426 | # CONFIG_DEBUG_SG is not set |
| 1309 | CONFIG_FRAME_POINTER=y | 1427 | CONFIG_FRAME_POINTER=y |
| 1310 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1428 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1311 | # CONFIG_RCU_TORTURE_TEST is not set | 1429 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1430 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1312 | # CONFIG_KPROBES_SANITY_TEST is not set | 1431 | # CONFIG_KPROBES_SANITY_TEST is not set |
| 1313 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1432 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1433 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1314 | # CONFIG_LKDTM is not set | 1434 | # CONFIG_LKDTM is not set |
| 1315 | # CONFIG_FAULT_INJECTION is not set | 1435 | # CONFIG_FAULT_INJECTION is not set |
| 1316 | # CONFIG_LATENCYTOP is not set | 1436 | # CONFIG_LATENCYTOP is not set |
| 1437 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1438 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1439 | |||
| 1440 | # | ||
| 1441 | # Tracers | ||
| 1442 | # | ||
| 1443 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1444 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 1445 | # CONFIG_PREEMPT_TRACER is not set | ||
| 1446 | # CONFIG_SCHED_TRACER is not set | ||
| 1447 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1448 | # CONFIG_BOOT_TRACER is not set | ||
| 1449 | # CONFIG_STACK_TRACER is not set | ||
| 1450 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1317 | # CONFIG_SAMPLES is not set | 1451 | # CONFIG_SAMPLES is not set |
| 1452 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1453 | # CONFIG_KGDB is not set | ||
| 1318 | CONFIG_DEBUG_USER=y | 1454 | CONFIG_DEBUG_USER=y |
| 1319 | CONFIG_DEBUG_ERRORS=y | 1455 | CONFIG_DEBUG_ERRORS=y |
| 1320 | # CONFIG_DEBUG_STACK_USAGE is not set | 1456 | # CONFIG_DEBUG_STACK_USAGE is not set |
| @@ -1326,6 +1462,7 @@ CONFIG_DEBUG_LL=y | |||
| 1326 | # | 1462 | # |
| 1327 | # CONFIG_KEYS is not set | 1463 | # CONFIG_KEYS is not set |
| 1328 | # CONFIG_SECURITY is not set | 1464 | # CONFIG_SECURITY is not set |
| 1465 | # CONFIG_SECURITYFS is not set | ||
| 1329 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1466 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1330 | CONFIG_ASYNC_CORE=y | 1467 | CONFIG_ASYNC_CORE=y |
| 1331 | CONFIG_CRYPTO=y | 1468 | CONFIG_CRYPTO=y |
| @@ -1333,8 +1470,12 @@ CONFIG_CRYPTO=y | |||
| 1333 | # | 1470 | # |
| 1334 | # Crypto core or helper | 1471 | # Crypto core or helper |
| 1335 | # | 1472 | # |
| 1473 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1336 | CONFIG_CRYPTO_ALGAPI=m | 1474 | CONFIG_CRYPTO_ALGAPI=m |
| 1475 | CONFIG_CRYPTO_AEAD=m | ||
| 1337 | CONFIG_CRYPTO_BLKCIPHER=m | 1476 | CONFIG_CRYPTO_BLKCIPHER=m |
| 1477 | CONFIG_CRYPTO_HASH=m | ||
| 1478 | CONFIG_CRYPTO_RNG=m | ||
| 1338 | CONFIG_CRYPTO_MANAGER=m | 1479 | CONFIG_CRYPTO_MANAGER=m |
| 1339 | # CONFIG_CRYPTO_GF128MUL is not set | 1480 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1340 | # CONFIG_CRYPTO_NULL is not set | 1481 | # CONFIG_CRYPTO_NULL is not set |
| @@ -1373,6 +1514,10 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1373 | # CONFIG_CRYPTO_MD4 is not set | 1514 | # CONFIG_CRYPTO_MD4 is not set |
| 1374 | # CONFIG_CRYPTO_MD5 is not set | 1515 | # CONFIG_CRYPTO_MD5 is not set |
| 1375 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1516 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1517 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1518 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1519 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1520 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1376 | # CONFIG_CRYPTO_SHA1 is not set | 1521 | # CONFIG_CRYPTO_SHA1 is not set |
| 1377 | # CONFIG_CRYPTO_SHA256 is not set | 1522 | # CONFIG_CRYPTO_SHA256 is not set |
| 1378 | # CONFIG_CRYPTO_SHA512 is not set | 1523 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1403,6 +1548,11 @@ CONFIG_CRYPTO_PCBC=m | |||
| 1403 | # | 1548 | # |
| 1404 | # CONFIG_CRYPTO_DEFLATE is not set | 1549 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1405 | # CONFIG_CRYPTO_LZO is not set | 1550 | # CONFIG_CRYPTO_LZO is not set |
| 1551 | |||
| 1552 | # | ||
| 1553 | # Random Number Generation | ||
| 1554 | # | ||
| 1555 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1406 | CONFIG_CRYPTO_HW=y | 1556 | CONFIG_CRYPTO_HW=y |
| 1407 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1557 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1408 | 1558 | ||
| @@ -1410,10 +1560,9 @@ CONFIG_CRYPTO_HW=y | |||
| 1410 | # Library routines | 1560 | # Library routines |
| 1411 | # | 1561 | # |
| 1412 | CONFIG_BITREVERSE=y | 1562 | CONFIG_BITREVERSE=y |
| 1413 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1414 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1415 | CONFIG_CRC_CCITT=y | 1563 | CONFIG_CRC_CCITT=y |
| 1416 | CONFIG_CRC16=y | 1564 | CONFIG_CRC16=y |
| 1565 | # CONFIG_CRC_T10DIF is not set | ||
| 1417 | CONFIG_CRC_ITU_T=m | 1566 | CONFIG_CRC_ITU_T=m |
| 1418 | CONFIG_CRC32=y | 1567 | CONFIG_CRC32=y |
| 1419 | # CONFIG_CRC7 is not set | 1568 | # CONFIG_CRC7 is not set |
diff --git a/arch/arm/configs/ks8695_defconfig b/arch/arm/configs/ks8695_defconfig index 6077f2cb88e4..d25c41bab06c 100644 --- a/arch/arm/configs/ks8695_defconfig +++ b/arch/arm/configs/ks8695_defconfig | |||
| @@ -1,39 +1,67 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.17-rc4 | 3 | # Linux kernel version: 2.6.27-simtec-micrel1 |
| 4 | # Thu May 25 15:42:51 2006 | 4 | # Fri Dec 5 10:30:27 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 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 | ||
| 7 | CONFIG_MMU=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 | ||
| 8 | 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 | ||
| 9 | CONFIG_GENERIC_HWEIGHT=y | 23 | CONFIG_GENERIC_HWEIGHT=y |
| 10 | CONFIG_GENERIC_CALIBRATE_DELAY=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 | ||
| 11 | CONFIG_VECTORS_BASE=0xffff0000 | 28 | CONFIG_VECTORS_BASE=0xffff0000 |
| 29 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 12 | 30 | ||
| 13 | # | 31 | # |
| 14 | # Code maturity level options | 32 | # General setup |
| 15 | # | 33 | # |
| 16 | CONFIG_EXPERIMENTAL=y | 34 | CONFIG_EXPERIMENTAL=y |
| 17 | CONFIG_BROKEN_ON_SMP=y | 35 | CONFIG_BROKEN_ON_SMP=y |
| 18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 36 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 19 | |||
| 20 | # | ||
| 21 | # General setup | ||
| 22 | # | ||
| 23 | CONFIG_LOCALVERSION="" | 37 | CONFIG_LOCALVERSION="" |
| 24 | CONFIG_LOCALVERSION_AUTO=y | 38 | CONFIG_LOCALVERSION_AUTO=y |
| 25 | # CONFIG_SWAP is not set | 39 | # CONFIG_SWAP is not set |
| 26 | CONFIG_SYSVIPC=y | 40 | CONFIG_SYSVIPC=y |
| 41 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 27 | # CONFIG_POSIX_MQUEUE is not set | 42 | # CONFIG_POSIX_MQUEUE is not set |
| 28 | # CONFIG_BSD_PROCESS_ACCT is not set | 43 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 29 | CONFIG_SYSCTL=y | 44 | # CONFIG_TASKSTATS is not set |
| 30 | # CONFIG_AUDIT is not set | 45 | # CONFIG_AUDIT is not set |
| 31 | # CONFIG_IKCONFIG 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 | ||
| 32 | # CONFIG_RELAY is not set | 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 | ||
| 33 | CONFIG_INITRAMFS_SOURCE="" | 59 | CONFIG_INITRAMFS_SOURCE="" |
| 34 | CONFIG_UID16=y | ||
| 35 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 60 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 61 | CONFIG_SYSCTL=y | ||
| 36 | # CONFIG_EMBEDDED is not set | 62 | # CONFIG_EMBEDDED is not set |
| 63 | CONFIG_UID16=y | ||
| 64 | CONFIG_SYSCTL_SYSCALL=y | ||
| 37 | CONFIG_KALLSYMS=y | 65 | CONFIG_KALLSYMS=y |
| 38 | # CONFIG_KALLSYMS_ALL is not set | 66 | # CONFIG_KALLSYMS_ALL is not set |
| 39 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 67 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -41,30 +69,50 @@ CONFIG_HOTPLUG=y | |||
| 41 | CONFIG_PRINTK=y | 69 | CONFIG_PRINTK=y |
| 42 | CONFIG_BUG=y | 70 | CONFIG_BUG=y |
| 43 | CONFIG_ELF_CORE=y | 71 | CONFIG_ELF_CORE=y |
| 72 | CONFIG_COMPAT_BRK=y | ||
| 44 | CONFIG_BASE_FULL=y | 73 | CONFIG_BASE_FULL=y |
| 45 | CONFIG_FUTEX=y | 74 | CONFIG_FUTEX=y |
| 75 | CONFIG_ANON_INODES=y | ||
| 46 | CONFIG_EPOLL=y | 76 | CONFIG_EPOLL=y |
| 77 | CONFIG_SIGNALFD=y | ||
| 78 | CONFIG_TIMERFD=y | ||
| 79 | CONFIG_EVENTFD=y | ||
| 47 | CONFIG_SHMEM=y | 80 | CONFIG_SHMEM=y |
| 81 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 48 | CONFIG_SLAB=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 | ||
| 49 | # CONFIG_TINY_SHMEM is not set | 101 | # CONFIG_TINY_SHMEM is not set |
| 50 | CONFIG_BASE_SMALL=0 | 102 | CONFIG_BASE_SMALL=0 |
| 51 | # CONFIG_SLOB is not set | ||
| 52 | CONFIG_OBSOLETE_INTERMODULE=y | ||
| 53 | |||
| 54 | # | ||
| 55 | # Loadable module support | ||
| 56 | # | ||
| 57 | CONFIG_MODULES=y | 103 | CONFIG_MODULES=y |
| 104 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 58 | CONFIG_MODULE_UNLOAD=y | 105 | CONFIG_MODULE_UNLOAD=y |
| 59 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 106 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 60 | # CONFIG_MODVERSIONS is not set | 107 | # CONFIG_MODVERSIONS is not set |
| 61 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 108 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 62 | CONFIG_KMOD=y | 109 | CONFIG_KMOD=y |
| 63 | 110 | CONFIG_BLOCK=y | |
| 64 | # | 111 | # CONFIG_LBD is not set |
| 65 | # Block layer | ||
| 66 | # | ||
| 67 | # CONFIG_BLK_DEV_IO_TRACE 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 | ||
| 68 | 116 | ||
| 69 | # | 117 | # |
| 70 | # IO Schedulers | 118 | # IO Schedulers |
| @@ -78,60 +126,77 @@ CONFIG_DEFAULT_AS=y | |||
| 78 | # CONFIG_DEFAULT_CFQ is not set | 126 | # CONFIG_DEFAULT_CFQ is not set |
| 79 | # CONFIG_DEFAULT_NOOP is not set | 127 | # CONFIG_DEFAULT_NOOP is not set |
| 80 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 128 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 129 | CONFIG_CLASSIC_RCU=y | ||
| 81 | 130 | ||
| 82 | # | 131 | # |
| 83 | # System Type | 132 | # System Type |
| 84 | # | 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 | ||
| 85 | # CONFIG_ARCH_CLPS7500 is not set | 139 | # CONFIG_ARCH_CLPS7500 is not set |
| 86 | # CONFIG_ARCH_CLPS711X is not set | 140 | # CONFIG_ARCH_CLPS711X is not set |
| 87 | # CONFIG_ARCH_CO285 is not set | ||
| 88 | # CONFIG_ARCH_EBSA110 is not set | 141 | # CONFIG_ARCH_EBSA110 is not set |
| 89 | # CONFIG_ARCH_EP93XX is not set | 142 | # CONFIG_ARCH_EP93XX is not set |
| 90 | # CONFIG_ARCH_FOOTBRIDGE is not set | 143 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| 91 | # CONFIG_ARCH_INTEGRATOR is not set | 144 | # CONFIG_ARCH_NETX is not set |
| 92 | # CONFIG_ARCH_IOP3XX is not set | 145 | # CONFIG_ARCH_H720X is not set |
| 93 | # CONFIG_ARCH_IXP4XX is not set | 146 | # CONFIG_ARCH_IMX is not set |
| 94 | # CONFIG_ARCH_IXP2000 is not set | 147 | # CONFIG_ARCH_IOP13XX is not set |
| 148 | # CONFIG_ARCH_IOP32X is not set | ||
| 149 | # CONFIG_ARCH_IOP33X is not set | ||
| 95 | # CONFIG_ARCH_IXP23XX is not set | 150 | # CONFIG_ARCH_IXP23XX is not set |
| 151 | # CONFIG_ARCH_IXP2000 is not set | ||
| 152 | # CONFIG_ARCH_IXP4XX is not set | ||
| 96 | # CONFIG_ARCH_L7200 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 | ||
| 97 | # CONFIG_ARCH_PXA is not set | 162 | # CONFIG_ARCH_PXA is not set |
| 98 | # CONFIG_ARCH_RPC is not set | 163 | # CONFIG_ARCH_RPC is not set |
| 99 | # CONFIG_ARCH_SA1100 is not set | 164 | # CONFIG_ARCH_SA1100 is not set |
| 100 | # CONFIG_ARCH_S3C2410 is not set | 165 | # CONFIG_ARCH_S3C2410 is not set |
| 101 | # CONFIG_ARCH_SHARK is not set | 166 | # CONFIG_ARCH_SHARK is not set |
| 102 | # CONFIG_ARCH_LH7A40X is not set | 167 | # CONFIG_ARCH_LH7A40X is not set |
| 168 | # CONFIG_ARCH_DAVINCI is not set | ||
| 103 | # CONFIG_ARCH_OMAP is not set | 169 | # CONFIG_ARCH_OMAP is not set |
| 104 | # CONFIG_ARCH_VERSATILE is not set | 170 | # CONFIG_ARCH_MSM7X00A is not set |
| 105 | # CONFIG_ARCH_REALVIEW is not set | 171 | |
| 106 | # CONFIG_ARCH_IMX is not set | 172 | # |
| 107 | # CONFIG_ARCH_H720X is not set | 173 | # Boot options |
| 108 | # CONFIG_ARCH_AAEC2000 is not set | 174 | # |
| 109 | # CONFIG_ARCH_AT91 is not set | 175 | |
| 110 | CONFIG_ARCH_KS8695=y | 176 | # |
| 177 | # Power management | ||
| 178 | # | ||
| 111 | 179 | ||
| 112 | # | 180 | # |
| 113 | # Kendin/Micrel KS8695 Implementations | 181 | # Kendin/Micrel KS8695 Implementations |
| 114 | # | 182 | # |
| 115 | CONFIG_MACH_KS8695=y | 183 | CONFIG_MACH_KS8695=y |
| 116 | # CONFIG_MACH_DSM320 is not set | 184 | CONFIG_MACH_DSM320=y |
| 117 | # CONFIG_MACH_CM4002 is not set | ||
| 118 | # CONFIG_MACH_CM4008 is not set | ||
| 119 | # CONFIG_MACH_CM40xx is not set | ||
| 120 | # CONFIG_MACH_LITE300 is not set | ||
| 121 | # CONFIG_MACH_SE4200 is not set | ||
| 122 | # CONFIG_MACH_MANGA_KS8695 is not set | ||
| 123 | 185 | ||
| 124 | # | 186 | # |
| 125 | # Processor Type | 187 | # Processor Type |
| 126 | # | 188 | # |
| 127 | CONFIG_CPU_32=y | 189 | CONFIG_CPU_32=y |
| 128 | CONFIG_CPU_ARM922T=y | 190 | CONFIG_CPU_ARM922T=y |
| 129 | CONFIG_CPU_32v4=y | 191 | CONFIG_CPU_32v4T=y |
| 130 | CONFIG_CPU_ABRT_EV4T=y | 192 | CONFIG_CPU_ABRT_EV4T=y |
| 193 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 131 | CONFIG_CPU_CACHE_V4WT=y | 194 | CONFIG_CPU_CACHE_V4WT=y |
| 132 | CONFIG_CPU_CACHE_VIVT=y | 195 | CONFIG_CPU_CACHE_VIVT=y |
| 133 | CONFIG_CPU_COPY_V4WB=y | 196 | CONFIG_CPU_COPY_V4WB=y |
| 134 | CONFIG_CPU_TLB_V4WBI=y | 197 | CONFIG_CPU_TLB_V4WBI=y |
| 198 | CONFIG_CPU_CP15=y | ||
| 199 | CONFIG_CPU_CP15_MMU=y | ||
| 135 | 200 | ||
| 136 | # | 201 | # |
| 137 | # Processor Features | 202 | # Processor Features |
| @@ -140,16 +205,16 @@ CONFIG_CPU_TLB_V4WBI=y | |||
| 140 | # CONFIG_CPU_ICACHE_DISABLE is not set | 205 | # CONFIG_CPU_ICACHE_DISABLE is not set |
| 141 | # CONFIG_CPU_DCACHE_DISABLE is not set | 206 | # CONFIG_CPU_DCACHE_DISABLE is not set |
| 142 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | 207 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set |
| 208 | # CONFIG_OUTER_CACHE is not set | ||
| 143 | 209 | ||
| 144 | # | 210 | # |
| 145 | # Bus support | 211 | # Bus support |
| 146 | # | 212 | # |
| 147 | CONFIG_PCI=y | 213 | CONFIG_PCI=y |
| 214 | CONFIG_PCI_SYSCALL=y | ||
| 215 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 216 | CONFIG_PCI_LEGACY=y | ||
| 148 | CONFIG_PCI_DEBUG=y | 217 | CONFIG_PCI_DEBUG=y |
| 149 | |||
| 150 | # | ||
| 151 | # PCCARD (PCMCIA/CardBus) support | ||
| 152 | # | ||
| 153 | CONFIG_PCCARD=y | 218 | CONFIG_PCCARD=y |
| 154 | # CONFIG_PCMCIA_DEBUG is not set | 219 | # CONFIG_PCMCIA_DEBUG is not set |
| 155 | CONFIG_PCMCIA=y | 220 | CONFIG_PCMCIA=y |
| @@ -173,9 +238,12 @@ CONFIG_PCCARD_NONSTATIC=y | |||
| 173 | # | 238 | # |
| 174 | # Kernel Features | 239 | # Kernel Features |
| 175 | # | 240 | # |
| 241 | # CONFIG_TICK_ONESHOT is not set | ||
| 176 | # CONFIG_PREEMPT is not set | 242 | # CONFIG_PREEMPT is not set |
| 177 | CONFIG_HZ=100 | 243 | CONFIG_HZ=100 |
| 178 | # CONFIG_AEABI is not set | 244 | CONFIG_AEABI=y |
| 245 | CONFIG_OABI_COMPAT=y | ||
| 246 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
| 179 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 247 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
| 180 | CONFIG_SELECT_MEMORY_MODEL=y | 248 | CONFIG_SELECT_MEMORY_MODEL=y |
| 181 | CONFIG_FLATMEM_MANUAL=y | 249 | CONFIG_FLATMEM_MANUAL=y |
| @@ -184,7 +252,14 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 184 | CONFIG_FLATMEM=y | 252 | CONFIG_FLATMEM=y |
| 185 | CONFIG_FLAT_NODE_MEM_MAP=y | 253 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 186 | # CONFIG_SPARSEMEM_STATIC is not set | 254 | # CONFIG_SPARSEMEM_STATIC is not set |
| 255 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 256 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 187 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 257 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
| 258 | # CONFIG_RESOURCES_64BIT is not set | ||
| 259 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 260 | CONFIG_BOUNCE=y | ||
| 261 | CONFIG_VIRT_TO_BUS=y | ||
| 262 | # CONFIG_LEDS is not set | ||
| 188 | CONFIG_ALIGNMENT_TRAP=y | 263 | CONFIG_ALIGNMENT_TRAP=y |
| 189 | 264 | ||
| 190 | # | 265 | # |
| @@ -194,6 +269,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 | |||
| 194 | CONFIG_ZBOOT_ROM_BSS=0x0 | 269 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 195 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" | 270 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev/ram0 rw" |
| 196 | # CONFIG_XIP_KERNEL is not set | 271 | # CONFIG_XIP_KERNEL is not set |
| 272 | # CONFIG_KEXEC is not set | ||
| 197 | 273 | ||
| 198 | # | 274 | # |
| 199 | # Floating point emulation | 275 | # Floating point emulation |
| @@ -202,8 +278,7 @@ CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x20410000,3145728 root=/dev | |||
| 202 | # | 278 | # |
| 203 | # At least one emulation must be selected | 279 | # At least one emulation must be selected |
| 204 | # | 280 | # |
| 205 | CONFIG_FPE_NWFPE=y | 281 | # CONFIG_FPE_NWFPE is not set |
| 206 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 207 | # CONFIG_FPE_FASTFPE is not set | 282 | # CONFIG_FPE_FASTFPE is not set |
| 208 | 283 | ||
| 209 | # | 284 | # |
| @@ -212,34 +287,33 @@ CONFIG_FPE_NWFPE=y | |||
| 212 | CONFIG_BINFMT_ELF=y | 287 | CONFIG_BINFMT_ELF=y |
| 213 | # CONFIG_BINFMT_AOUT is not set | 288 | # CONFIG_BINFMT_AOUT is not set |
| 214 | # CONFIG_BINFMT_MISC is not set | 289 | # CONFIG_BINFMT_MISC is not set |
| 215 | # CONFIG_ARTHUR is not set | ||
| 216 | 290 | ||
| 217 | # | 291 | # |
| 218 | # Power management options | 292 | # Power management options |
| 219 | # | 293 | # |
| 220 | # CONFIG_PM is not set | 294 | # CONFIG_PM is not set |
| 221 | # CONFIG_APM is not set | 295 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 222 | |||
| 223 | # | ||
| 224 | # Networking | ||
| 225 | # | ||
| 226 | CONFIG_NET=y | 296 | CONFIG_NET=y |
| 227 | 297 | ||
| 228 | # | 298 | # |
| 229 | # Networking options | 299 | # Networking options |
| 230 | # | 300 | # |
| 231 | # CONFIG_NETDEBUG is not set | ||
| 232 | CONFIG_PACKET=y | 301 | CONFIG_PACKET=y |
| 233 | # CONFIG_PACKET_MMAP is not set | 302 | # CONFIG_PACKET_MMAP is not set |
| 234 | CONFIG_UNIX=y | 303 | CONFIG_UNIX=y |
| 304 | CONFIG_XFRM=y | ||
| 305 | # CONFIG_XFRM_USER is not set | ||
| 306 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 307 | # CONFIG_XFRM_MIGRATE is not set | ||
| 308 | # CONFIG_XFRM_STATISTICS is not set | ||
| 235 | # CONFIG_NET_KEY is not set | 309 | # CONFIG_NET_KEY is not set |
| 236 | CONFIG_INET=y | 310 | CONFIG_INET=y |
| 237 | # CONFIG_IP_MULTICAST is not set | 311 | # CONFIG_IP_MULTICAST is not set |
| 238 | # CONFIG_IP_ADVANCED_ROUTER is not set | 312 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| 239 | CONFIG_IP_FIB_HASH=y | 313 | CONFIG_IP_FIB_HASH=y |
| 240 | CONFIG_IP_PNP=y | 314 | CONFIG_IP_PNP=y |
| 241 | # CONFIG_IP_PNP_DHCP is not set | 315 | CONFIG_IP_PNP_DHCP=y |
| 242 | CONFIG_IP_PNP_BOOTP=y | 316 | # CONFIG_IP_PNP_BOOTP is not set |
| 243 | # CONFIG_IP_PNP_RARP is not set | 317 | # CONFIG_IP_PNP_RARP is not set |
| 244 | # CONFIG_NET_IPIP is not set | 318 | # CONFIG_NET_IPIP is not set |
| 245 | # CONFIG_NET_IPGRE is not set | 319 | # CONFIG_NET_IPGRE is not set |
| @@ -250,28 +324,21 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 250 | # CONFIG_INET_IPCOMP is not set | 324 | # CONFIG_INET_IPCOMP is not set |
| 251 | # CONFIG_INET_XFRM_TUNNEL is not set | 325 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 252 | # CONFIG_INET_TUNNEL is not set | 326 | # CONFIG_INET_TUNNEL is not set |
| 327 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 328 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 329 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 330 | # CONFIG_INET_LRO is not set | ||
| 253 | CONFIG_INET_DIAG=y | 331 | CONFIG_INET_DIAG=y |
| 254 | CONFIG_INET_TCP_DIAG=y | 332 | CONFIG_INET_TCP_DIAG=y |
| 255 | # CONFIG_TCP_CONG_ADVANCED is not set | 333 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 256 | CONFIG_TCP_CONG_BIC=y | 334 | CONFIG_TCP_CONG_CUBIC=y |
| 335 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 336 | # CONFIG_TCP_MD5SIG is not set | ||
| 257 | # CONFIG_IPV6 is not set | 337 | # CONFIG_IPV6 is not set |
| 258 | # CONFIG_INET6_XFRM_TUNNEL is not set | 338 | # CONFIG_NETWORK_SECMARK is not set |
| 259 | # CONFIG_INET6_TUNNEL is not set | ||
| 260 | # CONFIG_NETFILTER is not set | 339 | # CONFIG_NETFILTER is not set |
| 261 | |||
| 262 | # | ||
| 263 | # DCCP Configuration (EXPERIMENTAL) | ||
| 264 | # | ||
| 265 | # CONFIG_IP_DCCP is not set | 340 | # CONFIG_IP_DCCP is not set |
| 266 | |||
| 267 | # | ||
| 268 | # SCTP Configuration (EXPERIMENTAL) | ||
| 269 | # | ||
| 270 | # CONFIG_IP_SCTP is not set | 341 | # CONFIG_IP_SCTP is not set |
| 271 | |||
| 272 | # | ||
| 273 | # TIPC Configuration (EXPERIMENTAL) | ||
| 274 | # | ||
| 275 | # CONFIG_TIPC is not set | 342 | # CONFIG_TIPC is not set |
| 276 | # CONFIG_ATM is not set | 343 | # CONFIG_ATM is not set |
| 277 | # CONFIG_BRIDGE is not set | 344 | # CONFIG_BRIDGE is not set |
| @@ -282,13 +349,8 @@ CONFIG_TCP_CONG_BIC=y | |||
| 282 | # CONFIG_ATALK is not set | 349 | # CONFIG_ATALK is not set |
| 283 | # CONFIG_X25 is not set | 350 | # CONFIG_X25 is not set |
| 284 | # CONFIG_LAPB is not set | 351 | # CONFIG_LAPB is not set |
| 285 | # CONFIG_NET_DIVERT is not set | ||
| 286 | # CONFIG_ECONET is not set | 352 | # CONFIG_ECONET is not set |
| 287 | # CONFIG_WAN_ROUTER is not set | 353 | # CONFIG_WAN_ROUTER is not set |
| 288 | |||
| 289 | # | ||
| 290 | # QoS and/or fair queueing | ||
| 291 | # | ||
| 292 | # CONFIG_NET_SCHED is not set | 354 | # CONFIG_NET_SCHED is not set |
| 293 | 355 | ||
| 294 | # | 356 | # |
| @@ -296,9 +358,21 @@ CONFIG_TCP_CONG_BIC=y | |||
| 296 | # | 358 | # |
| 297 | # CONFIG_NET_PKTGEN is not set | 359 | # CONFIG_NET_PKTGEN is not set |
| 298 | # CONFIG_HAMRADIO is not set | 360 | # CONFIG_HAMRADIO is not set |
| 361 | # CONFIG_CAN is not set | ||
| 299 | # CONFIG_IRDA is not set | 362 | # CONFIG_IRDA is not set |
| 300 | # CONFIG_BT is not set | 363 | # CONFIG_BT is not set |
| 364 | # CONFIG_AF_RXRPC is not set | ||
| 365 | |||
| 366 | # | ||
| 367 | # Wireless | ||
| 368 | # | ||
| 369 | # CONFIG_CFG80211 is not set | ||
| 370 | CONFIG_WIRELESS_EXT=y | ||
| 371 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
| 372 | # CONFIG_MAC80211 is not set | ||
| 301 | # CONFIG_IEEE80211 is not set | 373 | # CONFIG_IEEE80211 is not set |
| 374 | # CONFIG_RFKILL is not set | ||
| 375 | # CONFIG_NET_9P is not set | ||
| 302 | 376 | ||
| 303 | # | 377 | # |
| 304 | # Device Drivers | 378 | # Device Drivers |
| @@ -307,36 +381,40 @@ CONFIG_TCP_CONG_BIC=y | |||
| 307 | # | 381 | # |
| 308 | # Generic Driver Options | 382 | # Generic Driver Options |
| 309 | # | 383 | # |
| 384 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 310 | CONFIG_STANDALONE=y | 385 | CONFIG_STANDALONE=y |
| 311 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 386 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 312 | CONFIG_FW_LOADER=y | 387 | CONFIG_FW_LOADER=y |
| 388 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 389 | CONFIG_EXTRA_FIRMWARE="" | ||
| 313 | # CONFIG_DEBUG_DRIVER is not set | 390 | # CONFIG_DEBUG_DRIVER is not set |
| 314 | 391 | # CONFIG_DEBUG_DEVRES is not set | |
| 315 | # | 392 | # CONFIG_SYS_HYPERVISOR is not set |
| 316 | # Connector - unified userspace <-> kernelspace linker | ||
| 317 | # | ||
| 318 | # CONFIG_CONNECTOR is not set | 393 | # CONFIG_CONNECTOR is not set |
| 319 | |||
| 320 | # | ||
| 321 | # Memory Technology Devices (MTD) | ||
| 322 | # | ||
| 323 | CONFIG_MTD=y | 394 | CONFIG_MTD=y |
| 324 | # CONFIG_MTD_DEBUG is not set | 395 | # CONFIG_MTD_DEBUG is not set |
| 325 | # CONFIG_MTD_CONCAT is not set | 396 | # CONFIG_MTD_CONCAT is not set |
| 326 | CONFIG_MTD_PARTITIONS=y | 397 | CONFIG_MTD_PARTITIONS=y |
| 327 | # CONFIG_MTD_REDBOOT_PARTS is not set | 398 | CONFIG_MTD_REDBOOT_PARTS=y |
| 399 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | ||
| 400 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | ||
| 401 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | ||
| 328 | CONFIG_MTD_CMDLINE_PARTS=y | 402 | CONFIG_MTD_CMDLINE_PARTS=y |
| 329 | # CONFIG_MTD_AFS_PARTS is not set | 403 | # CONFIG_MTD_AFS_PARTS is not set |
| 404 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 330 | 405 | ||
| 331 | # | 406 | # |
| 332 | # User Modules And Translation Layers | 407 | # User Modules And Translation Layers |
| 333 | # | 408 | # |
| 334 | CONFIG_MTD_CHAR=y | 409 | CONFIG_MTD_CHAR=y |
| 410 | CONFIG_MTD_BLKDEVS=y | ||
| 335 | CONFIG_MTD_BLOCK=y | 411 | CONFIG_MTD_BLOCK=y |
| 336 | # CONFIG_FTL is not set | 412 | # CONFIG_FTL is not set |
| 337 | # CONFIG_NFTL is not set | 413 | # CONFIG_NFTL is not set |
| 338 | # CONFIG_INFTL is not set | 414 | # CONFIG_INFTL is not set |
| 339 | # CONFIG_RFD_FTL is not set | 415 | # CONFIG_RFD_FTL is not set |
| 416 | # CONFIG_SSFDC is not set | ||
| 417 | # CONFIG_MTD_OOPS is not set | ||
| 340 | 418 | ||
| 341 | # | 419 | # |
| 342 | # RAM/ROM/Flash chip drivers | 420 | # RAM/ROM/Flash chip drivers |
| @@ -355,22 +433,25 @@ CONFIG_MTD_CFI_I1=y | |||
| 355 | CONFIG_MTD_CFI_I2=y | 433 | CONFIG_MTD_CFI_I2=y |
| 356 | # CONFIG_MTD_CFI_I4 is not set | 434 | # CONFIG_MTD_CFI_I4 is not set |
| 357 | # CONFIG_MTD_CFI_I8 is not set | 435 | # CONFIG_MTD_CFI_I8 is not set |
| 358 | # CONFIG_MTD_CFI_INTELEXT is not set | 436 | CONFIG_MTD_CFI_INTELEXT=y |
| 359 | CONFIG_MTD_CFI_AMDSTD=y | 437 | # CONFIG_MTD_CFI_AMDSTD is not set |
| 360 | # CONFIG_MTD_CFI_STAA is not set | 438 | # CONFIG_MTD_CFI_STAA is not set |
| 361 | CONFIG_MTD_CFI_UTIL=y | 439 | CONFIG_MTD_CFI_UTIL=y |
| 362 | # CONFIG_MTD_RAM is not set | 440 | # CONFIG_MTD_RAM is not set |
| 363 | # CONFIG_MTD_ROM is not set | 441 | # CONFIG_MTD_ROM is not set |
| 364 | # CONFIG_MTD_ABSENT is not set | 442 | # CONFIG_MTD_ABSENT is not set |
| 365 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
| 366 | 443 | ||
| 367 | # | 444 | # |
| 368 | # Mapping drivers for chip access | 445 | # Mapping drivers for chip access |
| 369 | # | 446 | # |
| 370 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 447 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 371 | # CONFIG_MTD_PHYSMAP is not set | 448 | CONFIG_MTD_PHYSMAP=y |
| 449 | CONFIG_MTD_PHYSMAP_START=0x8000000 | ||
| 450 | CONFIG_MTD_PHYSMAP_LEN=0 | ||
| 451 | CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | ||
| 372 | # CONFIG_MTD_ARM_INTEGRATOR is not set | 452 | # CONFIG_MTD_ARM_INTEGRATOR is not set |
| 373 | # CONFIG_MTD_IMPA7 is not set | 453 | # CONFIG_MTD_IMPA7 is not set |
| 454 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
| 374 | # CONFIG_MTD_PLATRAM is not set | 455 | # CONFIG_MTD_PLATRAM is not set |
| 375 | 456 | ||
| 376 | # | 457 | # |
| @@ -388,29 +469,15 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 388 | # CONFIG_MTD_DOC2000 is not set | 469 | # CONFIG_MTD_DOC2000 is not set |
| 389 | # CONFIG_MTD_DOC2001 is not set | 470 | # CONFIG_MTD_DOC2001 is not set |
| 390 | # CONFIG_MTD_DOC2001PLUS is not set | 471 | # CONFIG_MTD_DOC2001PLUS is not set |
| 391 | |||
| 392 | # | ||
| 393 | # NAND Flash Device Drivers | ||
| 394 | # | ||
| 395 | # CONFIG_MTD_NAND is not set | 472 | # CONFIG_MTD_NAND is not set |
| 396 | |||
| 397 | # | ||
| 398 | # OneNAND Flash Device Drivers | ||
| 399 | # | ||
| 400 | # CONFIG_MTD_ONENAND is not set | 473 | # CONFIG_MTD_ONENAND is not set |
| 401 | 474 | ||
| 402 | # | 475 | # |
| 403 | # Parallel port support | 476 | # UBI - Unsorted block images |
| 404 | # | 477 | # |
| 478 | # CONFIG_MTD_UBI is not set | ||
| 405 | # CONFIG_PARPORT is not set | 479 | # CONFIG_PARPORT is not set |
| 406 | 480 | CONFIG_BLK_DEV=y | |
| 407 | # | ||
| 408 | # Plug and Play support | ||
| 409 | # | ||
| 410 | |||
| 411 | # | ||
| 412 | # Block devices | ||
| 413 | # | ||
| 414 | # CONFIG_BLK_CPQ_DA is not set | 481 | # CONFIG_BLK_CPQ_DA is not set |
| 415 | # CONFIG_BLK_CPQ_CISS_DA is not set | 482 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 416 | # CONFIG_BLK_DEV_DAC960 is not set | 483 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -422,13 +489,17 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 422 | CONFIG_BLK_DEV_RAM=y | 489 | CONFIG_BLK_DEV_RAM=y |
| 423 | CONFIG_BLK_DEV_RAM_COUNT=16 | 490 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 424 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 491 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
| 425 | CONFIG_BLK_DEV_INITRD=y | 492 | # CONFIG_BLK_DEV_XIP is not set |
| 426 | # CONFIG_CDROM_PKTCDVD is not set | 493 | # CONFIG_CDROM_PKTCDVD is not set |
| 427 | # CONFIG_ATA_OVER_ETH is not set | 494 | # CONFIG_ATA_OVER_ETH is not set |
| 428 | 495 | CONFIG_MISC_DEVICES=y | |
| 429 | # | 496 | # CONFIG_PHANTOM is not set |
| 430 | # ATA/ATAPI/MFM/RLL support | 497 | # CONFIG_EEPROM_93CX6 is not set |
| 431 | # | 498 | # CONFIG_SGI_IOC4 is not set |
| 499 | # CONFIG_TIFM_CORE is not set | ||
| 500 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 501 | # CONFIG_HP_ILO is not set | ||
| 502 | CONFIG_HAVE_IDE=y | ||
| 432 | # CONFIG_IDE is not set | 503 | # CONFIG_IDE is not set |
| 433 | 504 | ||
| 434 | # | 505 | # |
| @@ -436,127 +507,85 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 436 | # | 507 | # |
| 437 | # CONFIG_RAID_ATTRS is not set | 508 | # CONFIG_RAID_ATTRS is not set |
| 438 | # CONFIG_SCSI is not set | 509 | # CONFIG_SCSI is not set |
| 439 | 510 | # CONFIG_SCSI_DMA is not set | |
| 440 | # | 511 | # CONFIG_SCSI_NETLINK is not set |
| 441 | # Multi-device support (RAID and LVM) | 512 | # CONFIG_ATA is not set |
| 442 | # | ||
| 443 | # CONFIG_MD is not set | 513 | # CONFIG_MD is not set |
| 444 | |||
| 445 | # | ||
| 446 | # Fusion MPT device support | ||
| 447 | # | ||
| 448 | # CONFIG_FUSION is not set | 514 | # CONFIG_FUSION is not set |
| 449 | 515 | ||
| 450 | # | 516 | # |
| 451 | # IEEE 1394 (FireWire) support | 517 | # IEEE 1394 (FireWire) support |
| 452 | # | 518 | # |
| 453 | # CONFIG_IEEE1394 is not set | ||
| 454 | 519 | ||
| 455 | # | 520 | # |
| 456 | # I2O device support | 521 | # Enable only one of the two stacks, unless you know what you are doing |
| 457 | # | 522 | # |
| 523 | # CONFIG_FIREWIRE is not set | ||
| 524 | # CONFIG_IEEE1394 is not set | ||
| 458 | # CONFIG_I2O is not set | 525 | # CONFIG_I2O is not set |
| 459 | |||
| 460 | # | ||
| 461 | # Network device support | ||
| 462 | # | ||
| 463 | CONFIG_NETDEVICES=y | 526 | CONFIG_NETDEVICES=y |
| 464 | # CONFIG_DUMMY is not set | 527 | # CONFIG_DUMMY is not set |
| 465 | # CONFIG_BONDING is not set | 528 | # CONFIG_BONDING is not set |
| 529 | # CONFIG_MACVLAN is not set | ||
| 466 | # CONFIG_EQUALIZER is not set | 530 | # CONFIG_EQUALIZER is not set |
| 467 | # CONFIG_TUN is not set | 531 | # CONFIG_TUN is not set |
| 468 | 532 | # CONFIG_VETH is not set | |
| 469 | # | ||
| 470 | # ARCnet devices | ||
| 471 | # | ||
| 472 | # CONFIG_ARCNET is not set | 533 | # CONFIG_ARCNET is not set |
| 473 | |||
| 474 | # | ||
| 475 | # PHY device support | ||
| 476 | # | ||
| 477 | # CONFIG_PHYLIB is not set | 534 | # CONFIG_PHYLIB is not set |
| 478 | |||
| 479 | # | ||
| 480 | # Ethernet (10 or 100Mbit) | ||
| 481 | # | ||
| 482 | CONFIG_NET_ETHERNET=y | 535 | CONFIG_NET_ETHERNET=y |
| 483 | # CONFIG_MII is not set | 536 | CONFIG_MII=y |
| 484 | CONFIG_ARM_KS8695_ETHER=y | 537 | # CONFIG_AX88796 is not set |
| 485 | # CONFIG_HAPPYMEAL is not set | 538 | # CONFIG_HAPPYMEAL is not set |
| 486 | # CONFIG_SUNGEM is not set | 539 | # CONFIG_SUNGEM is not set |
| 487 | # CONFIG_CASSINI is not set | 540 | # CONFIG_CASSINI is not set |
| 488 | # CONFIG_NET_VENDOR_3COM is not set | 541 | # CONFIG_NET_VENDOR_3COM is not set |
| 489 | # CONFIG_SMC91X is not set | 542 | # CONFIG_SMC91X is not set |
| 490 | # CONFIG_DM9000 is not set | 543 | # CONFIG_DM9000 is not set |
| 491 | |||
| 492 | # | ||
| 493 | # Tulip family network device support | ||
| 494 | # | ||
| 495 | # CONFIG_NET_TULIP is not set | 544 | # CONFIG_NET_TULIP is not set |
| 496 | # CONFIG_HP100 is not set | 545 | # CONFIG_HP100 is not set |
| 546 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 547 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 548 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 549 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 497 | # CONFIG_NET_PCI is not set | 550 | # CONFIG_NET_PCI is not set |
| 498 | 551 | # CONFIG_B44 is not set | |
| 499 | # | 552 | # CONFIG_NETDEV_1000 is not set |
| 500 | # Ethernet (1000 Mbit) | 553 | # CONFIG_NETDEV_10000 is not set |
| 501 | # | ||
| 502 | # CONFIG_ACENIC is not set | ||
| 503 | # CONFIG_DL2K is not set | ||
| 504 | # CONFIG_E1000 is not set | ||
| 505 | # CONFIG_NS83820 is not set | ||
| 506 | # CONFIG_HAMACHI is not set | ||
| 507 | # CONFIG_YELLOWFIN is not set | ||
| 508 | # CONFIG_R8169 is not set | ||
| 509 | # CONFIG_SIS190 is not set | ||
| 510 | # CONFIG_SKGE is not set | ||
| 511 | # CONFIG_SKY2 is not set | ||
| 512 | # CONFIG_SK98LIN is not set | ||
| 513 | # CONFIG_TIGON3 is not set | ||
| 514 | # CONFIG_BNX2 is not set | ||
| 515 | |||
| 516 | # | ||
| 517 | # Ethernet (10000 Mbit) | ||
| 518 | # | ||
| 519 | # CONFIG_CHELSIO_T1 is not set | ||
| 520 | # CONFIG_IXGB is not set | ||
| 521 | # CONFIG_S2IO is not set | ||
| 522 | |||
| 523 | # | ||
| 524 | # Token Ring devices | ||
| 525 | # | ||
| 526 | # CONFIG_TR is not set | 554 | # CONFIG_TR is not set |
| 527 | 555 | ||
| 528 | # | 556 | # |
| 529 | # Wireless LAN (non-hamradio) | 557 | # Wireless LAN |
| 530 | # | 558 | # |
| 531 | # CONFIG_NET_RADIO is not set | 559 | # CONFIG_WLAN_PRE80211 is not set |
| 532 | 560 | CONFIG_WLAN_80211=y | |
| 533 | # | 561 | # CONFIG_PCMCIA_RAYCS is not set |
| 534 | # PCMCIA network device support | 562 | # CONFIG_IPW2100 is not set |
| 535 | # | 563 | # CONFIG_IPW2200 is not set |
| 564 | # CONFIG_LIBERTAS is not set | ||
| 565 | # CONFIG_HERMES is not set | ||
| 566 | # CONFIG_ATMEL is not set | ||
| 567 | # CONFIG_AIRO_CS is not set | ||
| 568 | # CONFIG_PCMCIA_WL3501 is not set | ||
| 569 | CONFIG_PRISM54=m | ||
| 570 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 571 | # CONFIG_HOSTAP is not set | ||
| 536 | # CONFIG_NET_PCMCIA is not set | 572 | # CONFIG_NET_PCMCIA is not set |
| 537 | |||
| 538 | # | ||
| 539 | # Wan interfaces | ||
| 540 | # | ||
| 541 | # CONFIG_WAN is not set | 573 | # CONFIG_WAN is not set |
| 542 | # CONFIG_FDDI is not set | 574 | # CONFIG_FDDI is not set |
| 543 | # CONFIG_HIPPI is not set | 575 | # CONFIG_HIPPI is not set |
| 544 | # CONFIG_PPP is not set | 576 | # CONFIG_PPP is not set |
| 545 | # CONFIG_SLIP is not set | 577 | # CONFIG_SLIP is not set |
| 546 | # CONFIG_SHAPER is not set | ||
| 547 | # CONFIG_NETCONSOLE is not set | 578 | # CONFIG_NETCONSOLE is not set |
| 548 | # CONFIG_NETPOLL is not set | 579 | # CONFIG_NETPOLL is not set |
| 549 | # CONFIG_NET_POLL_CONTROLLER is not set | 580 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 550 | |||
| 551 | # | ||
| 552 | # ISDN subsystem | ||
| 553 | # | ||
| 554 | # CONFIG_ISDN is not set | 581 | # CONFIG_ISDN is not set |
| 555 | 582 | ||
| 556 | # | 583 | # |
| 557 | # Input device support | 584 | # Input device support |
| 558 | # | 585 | # |
| 559 | CONFIG_INPUT=y | 586 | CONFIG_INPUT=y |
| 587 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 588 | # CONFIG_INPUT_POLLDEV is not set | ||
| 560 | 589 | ||
| 561 | # | 590 | # |
| 562 | # Userland interfaces | 591 | # Userland interfaces |
| @@ -566,7 +595,6 @@ CONFIG_INPUT_MOUSEDEV=y | |||
| 566 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 595 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 567 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 596 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 568 | # CONFIG_INPUT_JOYDEV is not set | 597 | # CONFIG_INPUT_JOYDEV is not set |
| 569 | # CONFIG_INPUT_TSDEV is not set | ||
| 570 | # CONFIG_INPUT_EVDEV is not set | 598 | # CONFIG_INPUT_EVDEV is not set |
| 571 | # CONFIG_INPUT_EVBUG is not set | 599 | # CONFIG_INPUT_EVBUG is not set |
| 572 | 600 | ||
| @@ -576,6 +604,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 576 | # CONFIG_INPUT_KEYBOARD is not set | 604 | # CONFIG_INPUT_KEYBOARD is not set |
| 577 | # CONFIG_INPUT_MOUSE is not set | 605 | # CONFIG_INPUT_MOUSE is not set |
| 578 | # CONFIG_INPUT_JOYSTICK is not set | 606 | # CONFIG_INPUT_JOYSTICK is not set |
| 607 | # CONFIG_INPUT_TABLET is not set | ||
| 579 | # CONFIG_INPUT_TOUCHSCREEN is not set | 608 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 580 | # CONFIG_INPUT_MISC is not set | 609 | # CONFIG_INPUT_MISC is not set |
| 581 | 610 | ||
| @@ -589,9 +618,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 589 | # Character devices | 618 | # Character devices |
| 590 | # | 619 | # |
| 591 | CONFIG_VT=y | 620 | CONFIG_VT=y |
| 621 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 592 | CONFIG_VT_CONSOLE=y | 622 | CONFIG_VT_CONSOLE=y |
| 593 | CONFIG_HW_CONSOLE=y | 623 | CONFIG_HW_CONSOLE=y |
| 624 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 625 | CONFIG_DEVKMEM=y | ||
| 594 | # CONFIG_SERIAL_NONSTANDARD is not set | 626 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 627 | # CONFIG_NOZOMI is not set | ||
| 595 | 628 | ||
| 596 | # | 629 | # |
| 597 | # Serial drivers | 630 | # Serial drivers |
| @@ -609,132 +642,113 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 609 | CONFIG_UNIX98_PTYS=y | 642 | CONFIG_UNIX98_PTYS=y |
| 610 | CONFIG_LEGACY_PTYS=y | 643 | CONFIG_LEGACY_PTYS=y |
| 611 | CONFIG_LEGACY_PTY_COUNT=256 | 644 | CONFIG_LEGACY_PTY_COUNT=256 |
| 612 | |||
| 613 | # | ||
| 614 | # IPMI | ||
| 615 | # | ||
| 616 | # CONFIG_IPMI_HANDLER is not set | 645 | # CONFIG_IPMI_HANDLER is not set |
| 617 | 646 | CONFIG_HW_RANDOM=m | |
| 618 | # | ||
| 619 | # Watchdog Cards | ||
| 620 | # | ||
| 621 | # CONFIG_WATCHDOG is not set | ||
| 622 | # CONFIG_NVRAM is not set | 647 | # CONFIG_NVRAM is not set |
| 623 | # CONFIG_DTLK is not set | ||
| 624 | # CONFIG_R3964 is not set | 648 | # CONFIG_R3964 is not set |
| 625 | # CONFIG_APPLICOM is not set | 649 | # CONFIG_APPLICOM is not set |
| 626 | 650 | ||
| 627 | # | 651 | # |
| 628 | # Ftape, the floppy tape device driver | ||
| 629 | # | ||
| 630 | # CONFIG_DRM is not set | ||
| 631 | |||
| 632 | # | ||
| 633 | # PCMCIA character devices | 652 | # PCMCIA character devices |
| 634 | # | 653 | # |
| 635 | # CONFIG_SYNCLINK_CS is not set | 654 | # CONFIG_SYNCLINK_CS is not set |
| 636 | # CONFIG_CARDMAN_4000 is not set | 655 | # CONFIG_CARDMAN_4000 is not set |
| 637 | # CONFIG_CARDMAN_4040 is not set | 656 | # CONFIG_CARDMAN_4040 is not set |
| 657 | # CONFIG_IPWIRELESS is not set | ||
| 638 | # CONFIG_RAW_DRIVER is not set | 658 | # CONFIG_RAW_DRIVER is not set |
| 639 | |||
| 640 | # | ||
| 641 | # TPM devices | ||
| 642 | # | ||
| 643 | # CONFIG_TCG_TPM is not set | 659 | # CONFIG_TCG_TPM is not set |
| 644 | # CONFIG_TELCLOCK is not set | 660 | CONFIG_DEVPORT=y |
| 645 | |||
| 646 | # | ||
| 647 | # I2C support | ||
| 648 | # | ||
| 649 | # CONFIG_I2C is not set | 661 | # CONFIG_I2C is not set |
| 650 | |||
| 651 | # | ||
| 652 | # SPI support | ||
| 653 | # | ||
| 654 | # CONFIG_SPI is not set | 662 | # CONFIG_SPI is not set |
| 655 | # CONFIG_SPI_MASTER is not set | ||
| 656 | |||
| 657 | # | ||
| 658 | # Dallas's 1-wire bus | ||
| 659 | # | ||
| 660 | # CONFIG_W1 is not set | 663 | # CONFIG_W1 is not set |
| 661 | 664 | # CONFIG_POWER_SUPPLY is not set | |
| 662 | # | ||
| 663 | # Hardware Monitoring support | ||
| 664 | # | ||
| 665 | # CONFIG_HWMON is not set | 665 | # CONFIG_HWMON is not set |
| 666 | # CONFIG_HWMON_VID is not set | 666 | # CONFIG_WATCHDOG is not set |
| 667 | |||
| 668 | # | ||
| 669 | # Misc devices | ||
| 670 | # | ||
| 671 | 667 | ||
| 672 | # | 668 | # |
| 673 | # LED devices | 669 | # Sonics Silicon Backplane |
| 674 | # | 670 | # |
| 675 | # CONFIG_NEW_LEDS is not set | 671 | CONFIG_SSB_POSSIBLE=y |
| 672 | # CONFIG_SSB is not set | ||
| 676 | 673 | ||
| 677 | # | 674 | # |
| 678 | # LED drivers | 675 | # Multifunction device drivers |
| 679 | # | 676 | # |
| 677 | # CONFIG_MFD_CORE is not set | ||
| 678 | # CONFIG_MFD_SM501 is not set | ||
| 679 | # CONFIG_HTC_PASIC3 is not set | ||
| 680 | # CONFIG_MFD_TMIO is not set | ||
| 681 | # CONFIG_MFD_T7L66XB is not set | ||
| 682 | # CONFIG_MFD_TC6387XB is not set | ||
| 680 | 683 | ||
| 681 | # | 684 | # |
| 682 | # LED Triggers | 685 | # Multimedia devices |
| 683 | # | 686 | # |
| 684 | 687 | ||
| 685 | # | 688 | # |
| 686 | # Multimedia devices | 689 | # Multimedia core support |
| 687 | # | 690 | # |
| 688 | # CONFIG_VIDEO_DEV is not set | 691 | # CONFIG_VIDEO_DEV is not set |
| 692 | # CONFIG_DVB_CORE is not set | ||
| 693 | # CONFIG_VIDEO_MEDIA is not set | ||
| 689 | 694 | ||
| 690 | # | 695 | # |
| 691 | # Digital Video Broadcasting Devices | 696 | # Multimedia drivers |
| 692 | # | 697 | # |
| 693 | # CONFIG_DVB is not set | 698 | # CONFIG_DAB is not set |
| 694 | 699 | ||
| 695 | # | 700 | # |
| 696 | # Graphics support | 701 | # Graphics support |
| 697 | # | 702 | # |
| 703 | # CONFIG_DRM is not set | ||
| 704 | # CONFIG_VGASTATE is not set | ||
| 705 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 698 | # CONFIG_FB is not set | 706 | # CONFIG_FB is not set |
| 707 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 699 | 708 | ||
| 700 | # | 709 | # |
| 701 | # Console display driver support | 710 | # Display device support |
| 702 | # | 711 | # |
| 703 | # CONFIG_VGA_CONSOLE is not set | 712 | # CONFIG_DISPLAY_SUPPORT is not set |
| 704 | CONFIG_DUMMY_CONSOLE=y | ||
| 705 | 713 | ||
| 706 | # | 714 | # |
| 707 | # Sound | 715 | # Console display driver support |
| 708 | # | 716 | # |
| 717 | # CONFIG_VGA_CONSOLE is not set | ||
| 718 | CONFIG_DUMMY_CONSOLE=y | ||
| 709 | # CONFIG_SOUND is not set | 719 | # CONFIG_SOUND is not set |
| 710 | 720 | CONFIG_HID_SUPPORT=y | |
| 711 | # | 721 | CONFIG_HID=y |
| 712 | # USB support | 722 | CONFIG_HID_DEBUG=y |
| 713 | # | 723 | # CONFIG_HIDRAW is not set |
| 724 | CONFIG_USB_SUPPORT=y | ||
| 714 | CONFIG_USB_ARCH_HAS_HCD=y | 725 | CONFIG_USB_ARCH_HAS_HCD=y |
| 715 | CONFIG_USB_ARCH_HAS_OHCI=y | 726 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 716 | CONFIG_USB_ARCH_HAS_EHCI=y | 727 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 717 | # CONFIG_USB is not set | 728 | # CONFIG_USB is not set |
| 718 | 729 | ||
| 719 | # | 730 | # |
| 720 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 731 | # Enable Host or Gadget support to see Inventra options |
| 721 | # | 732 | # |
| 722 | 733 | ||
| 723 | # | 734 | # |
| 724 | # USB Gadget Support | 735 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 725 | # | 736 | # |
| 726 | # CONFIG_USB_GADGET is not set | 737 | # CONFIG_USB_GADGET is not set |
| 727 | |||
| 728 | # | ||
| 729 | # MMC/SD Card support | ||
| 730 | # | ||
| 731 | # CONFIG_MMC is not set | 738 | # CONFIG_MMC is not set |
| 739 | # CONFIG_NEW_LEDS is not set | ||
| 740 | CONFIG_RTC_LIB=y | ||
| 741 | # CONFIG_RTC_CLASS is not set | ||
| 742 | # CONFIG_DMADEVICES is not set | ||
| 732 | 743 | ||
| 733 | # | 744 | # |
| 734 | # Real Time Clock | 745 | # Voltage and Current regulators |
| 735 | # | 746 | # |
| 736 | CONFIG_RTC_LIB=y | 747 | # CONFIG_REGULATOR is not set |
| 737 | # CONFIG_RTC_CLASS is not set | 748 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set |
| 749 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
| 750 | # CONFIG_REGULATOR_BQ24022 is not set | ||
| 751 | # CONFIG_UIO is not set | ||
| 738 | 752 | ||
| 739 | # | 753 | # |
| 740 | # File systems | 754 | # File systems |
| @@ -743,16 +757,16 @@ CONFIG_EXT2_FS=y | |||
| 743 | # CONFIG_EXT2_FS_XATTR is not set | 757 | # CONFIG_EXT2_FS_XATTR is not set |
| 744 | # CONFIG_EXT2_FS_XIP is not set | 758 | # CONFIG_EXT2_FS_XIP is not set |
| 745 | # CONFIG_EXT3_FS is not set | 759 | # CONFIG_EXT3_FS is not set |
| 760 | # CONFIG_EXT4DEV_FS is not set | ||
| 746 | # CONFIG_REISERFS_FS is not set | 761 | # CONFIG_REISERFS_FS is not set |
| 747 | # CONFIG_JFS_FS is not set | 762 | # CONFIG_JFS_FS is not set |
| 748 | # CONFIG_FS_POSIX_ACL is not set | 763 | # CONFIG_FS_POSIX_ACL is not set |
| 749 | # CONFIG_XFS_FS is not set | 764 | # CONFIG_XFS_FS is not set |
| 750 | # CONFIG_OCFS2_FS is not set | 765 | # CONFIG_OCFS2_FS is not set |
| 751 | # CONFIG_MINIX_FS is not set | 766 | CONFIG_DNOTIFY=y |
| 752 | # CONFIG_ROMFS_FS is not set | ||
| 753 | CONFIG_INOTIFY=y | 767 | CONFIG_INOTIFY=y |
| 768 | CONFIG_INOTIFY_USER=y | ||
| 754 | # CONFIG_QUOTA is not set | 769 | # CONFIG_QUOTA is not set |
| 755 | CONFIG_DNOTIFY=y | ||
| 756 | # CONFIG_AUTOFS_FS is not set | 770 | # CONFIG_AUTOFS_FS is not set |
| 757 | # CONFIG_AUTOFS4_FS is not set | 771 | # CONFIG_AUTOFS4_FS is not set |
| 758 | # CONFIG_FUSE_FS is not set | 772 | # CONFIG_FUSE_FS is not set |
| @@ -774,10 +788,11 @@ CONFIG_DNOTIFY=y | |||
| 774 | # Pseudo filesystems | 788 | # Pseudo filesystems |
| 775 | # | 789 | # |
| 776 | CONFIG_PROC_FS=y | 790 | CONFIG_PROC_FS=y |
| 791 | CONFIG_PROC_SYSCTL=y | ||
| 777 | CONFIG_SYSFS=y | 792 | CONFIG_SYSFS=y |
| 778 | CONFIG_TMPFS=y | 793 | CONFIG_TMPFS=y |
| 794 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 779 | # CONFIG_HUGETLB_PAGE is not set | 795 | # CONFIG_HUGETLB_PAGE is not set |
| 780 | CONFIG_RAMFS=y | ||
| 781 | # CONFIG_CONFIGFS_FS is not set | 796 | # CONFIG_CONFIGFS_FS is not set |
| 782 | 797 | ||
| 783 | # | 798 | # |
| @@ -790,67 +805,113 @@ CONFIG_RAMFS=y | |||
| 790 | # CONFIG_BEFS_FS is not set | 805 | # CONFIG_BEFS_FS is not set |
| 791 | # CONFIG_BFS_FS is not set | 806 | # CONFIG_BFS_FS is not set |
| 792 | # CONFIG_EFS_FS is not set | 807 | # CONFIG_EFS_FS is not set |
| 793 | # CONFIG_JFFS_FS is not set | 808 | CONFIG_JFFS2_FS=y |
| 794 | # CONFIG_JFFS2_FS is not set | 809 | CONFIG_JFFS2_FS_DEBUG=0 |
| 810 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 811 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 812 | CONFIG_JFFS2_SUMMARY=y | ||
| 813 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 814 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
| 815 | CONFIG_JFFS2_ZLIB=y | ||
| 816 | # CONFIG_JFFS2_LZO is not set | ||
| 817 | CONFIG_JFFS2_RTIME=y | ||
| 818 | CONFIG_JFFS2_RUBIN=y | ||
| 819 | # CONFIG_JFFS2_CMODE_NONE is not set | ||
| 820 | CONFIG_JFFS2_CMODE_PRIORITY=y | ||
| 821 | # CONFIG_JFFS2_CMODE_SIZE is not set | ||
| 822 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
| 795 | CONFIG_CRAMFS=y | 823 | CONFIG_CRAMFS=y |
| 796 | # CONFIG_VXFS_FS is not set | 824 | # CONFIG_VXFS_FS is not set |
| 825 | # CONFIG_MINIX_FS is not set | ||
| 826 | # CONFIG_OMFS_FS is not set | ||
| 797 | # CONFIG_HPFS_FS is not set | 827 | # CONFIG_HPFS_FS is not set |
| 798 | # CONFIG_QNX4FS_FS is not set | 828 | # CONFIG_QNX4FS_FS is not set |
| 829 | # CONFIG_ROMFS_FS is not set | ||
| 799 | # CONFIG_SYSV_FS is not set | 830 | # CONFIG_SYSV_FS is not set |
| 800 | # CONFIG_UFS_FS is not set | 831 | # CONFIG_UFS_FS is not set |
| 801 | 832 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 802 | # | 833 | CONFIG_NFS_FS=y |
| 803 | # Network File Systems | 834 | CONFIG_NFS_V3=y |
| 804 | # | 835 | # CONFIG_NFS_V3_ACL is not set |
| 805 | # CONFIG_NFS_FS is not set | 836 | # CONFIG_NFS_V4 is not set |
| 837 | CONFIG_ROOT_NFS=y | ||
| 806 | # CONFIG_NFSD is not set | 838 | # CONFIG_NFSD is not set |
| 839 | CONFIG_LOCKD=y | ||
| 840 | CONFIG_LOCKD_V4=y | ||
| 841 | CONFIG_NFS_COMMON=y | ||
| 842 | CONFIG_SUNRPC=y | ||
| 843 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 844 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 807 | # CONFIG_SMB_FS is not set | 845 | # CONFIG_SMB_FS is not set |
| 808 | # CONFIG_CIFS is not set | 846 | # CONFIG_CIFS is not set |
| 809 | # CONFIG_NCP_FS is not set | 847 | # CONFIG_NCP_FS is not set |
| 810 | # CONFIG_CODA_FS is not set | 848 | # CONFIG_CODA_FS is not set |
| 811 | # CONFIG_AFS_FS is not set | 849 | # CONFIG_AFS_FS is not set |
| 812 | # CONFIG_9P_FS is not set | ||
| 813 | 850 | ||
| 814 | # | 851 | # |
| 815 | # Partition Types | 852 | # Partition Types |
| 816 | # | 853 | # |
| 817 | # CONFIG_PARTITION_ADVANCED is not set | 854 | # CONFIG_PARTITION_ADVANCED is not set |
| 818 | CONFIG_MSDOS_PARTITION=y | 855 | CONFIG_MSDOS_PARTITION=y |
| 819 | |||
| 820 | # | ||
| 821 | # Native Language Support | ||
| 822 | # | ||
| 823 | # CONFIG_NLS is not set | 856 | # CONFIG_NLS is not set |
| 824 | 857 | # CONFIG_DLM is not set | |
| 825 | # | ||
| 826 | # Profiling support | ||
| 827 | # | ||
| 828 | # CONFIG_PROFILING is not set | ||
| 829 | 858 | ||
| 830 | # | 859 | # |
| 831 | # Kernel hacking | 860 | # Kernel hacking |
| 832 | # | 861 | # |
| 833 | # CONFIG_PRINTK_TIME is not set | 862 | # CONFIG_PRINTK_TIME is not set |
| 863 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 864 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 865 | CONFIG_FRAME_WARN=1024 | ||
| 834 | # CONFIG_MAGIC_SYSRQ is not set | 866 | # CONFIG_MAGIC_SYSRQ is not set |
| 867 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 868 | # CONFIG_DEBUG_FS is not set | ||
| 869 | # CONFIG_HEADERS_CHECK is not set | ||
| 835 | CONFIG_DEBUG_KERNEL=y | 870 | CONFIG_DEBUG_KERNEL=y |
| 836 | CONFIG_LOG_BUF_SHIFT=14 | 871 | # CONFIG_DEBUG_SHIRQ is not set |
| 837 | CONFIG_DETECT_SOFTLOCKUP=y | 872 | CONFIG_DETECT_SOFTLOCKUP=y |
| 873 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 874 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 875 | CONFIG_SCHED_DEBUG=y | ||
| 838 | # CONFIG_SCHEDSTATS is not set | 876 | # CONFIG_SCHEDSTATS is not set |
| 877 | # CONFIG_TIMER_STATS is not set | ||
| 878 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 839 | # CONFIG_DEBUG_SLAB is not set | 879 | # CONFIG_DEBUG_SLAB is not set |
| 840 | CONFIG_DEBUG_MUTEXES=y | 880 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 881 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 841 | # CONFIG_DEBUG_SPINLOCK is not set | 882 | # CONFIG_DEBUG_SPINLOCK is not set |
| 883 | CONFIG_DEBUG_MUTEXES=y | ||
| 884 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 885 | # CONFIG_PROVE_LOCKING is not set | ||
| 886 | # CONFIG_LOCK_STAT is not set | ||
| 842 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 887 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 888 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 843 | # CONFIG_DEBUG_KOBJECT is not set | 889 | # CONFIG_DEBUG_KOBJECT is not set |
| 844 | CONFIG_DEBUG_BUGVERBOSE=y | 890 | CONFIG_DEBUG_BUGVERBOSE=y |
| 845 | # CONFIG_DEBUG_INFO is not set | 891 | # CONFIG_DEBUG_INFO is not set |
| 846 | # CONFIG_DEBUG_FS is not set | ||
| 847 | # CONFIG_DEBUG_VM is not set | 892 | # CONFIG_DEBUG_VM is not set |
| 893 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 894 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 895 | # CONFIG_DEBUG_LIST is not set | ||
| 896 | # CONFIG_DEBUG_SG is not set | ||
| 848 | CONFIG_FRAME_POINTER=y | 897 | CONFIG_FRAME_POINTER=y |
| 849 | # CONFIG_UNWIND_INFO is not set | 898 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 850 | CONFIG_FORCED_INLINING=y | ||
| 851 | # CONFIG_RCU_TORTURE_TEST is not set | 899 | # CONFIG_RCU_TORTURE_TEST is not set |
| 900 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 901 | # CONFIG_FAULT_INJECTION is not set | ||
| 902 | # CONFIG_LATENCYTOP is not set | ||
| 903 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 904 | CONFIG_HAVE_FTRACE=y | ||
| 905 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 906 | # CONFIG_FTRACE is not set | ||
| 907 | # CONFIG_SCHED_TRACER is not set | ||
| 908 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 909 | # CONFIG_SAMPLES is not set | ||
| 910 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 911 | # CONFIG_KGDB is not set | ||
| 852 | CONFIG_DEBUG_USER=y | 912 | CONFIG_DEBUG_USER=y |
| 853 | # CONFIG_DEBUG_ERRORS is not set | 913 | # CONFIG_DEBUG_ERRORS is not set |
| 914 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 854 | CONFIG_DEBUG_LL=y | 915 | CONFIG_DEBUG_LL=y |
| 855 | # CONFIG_DEBUG_ICEDCC is not set | 916 | # CONFIG_DEBUG_ICEDCC is not set |
| 856 | 917 | ||
| @@ -859,21 +920,103 @@ CONFIG_DEBUG_LL=y | |||
| 859 | # | 920 | # |
| 860 | # CONFIG_KEYS is not set | 921 | # CONFIG_KEYS is not set |
| 861 | # CONFIG_SECURITY is not set | 922 | # CONFIG_SECURITY is not set |
| 923 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 924 | CONFIG_CRYPTO=y | ||
| 925 | |||
| 926 | # | ||
| 927 | # Crypto core or helper | ||
| 928 | # | ||
| 929 | # CONFIG_CRYPTO_MANAGER is not set | ||
| 930 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 931 | # CONFIG_CRYPTO_NULL is not set | ||
| 932 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 933 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 934 | # CONFIG_CRYPTO_TEST is not set | ||
| 935 | |||
| 936 | # | ||
| 937 | # Authenticated Encryption with Associated Data | ||
| 938 | # | ||
| 939 | # CONFIG_CRYPTO_CCM is not set | ||
| 940 | # CONFIG_CRYPTO_GCM is not set | ||
| 941 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 942 | |||
| 943 | # | ||
| 944 | # Block modes | ||
| 945 | # | ||
| 946 | # CONFIG_CRYPTO_CBC is not set | ||
| 947 | # CONFIG_CRYPTO_CTR is not set | ||
| 948 | # CONFIG_CRYPTO_CTS is not set | ||
| 949 | # CONFIG_CRYPTO_ECB is not set | ||
| 950 | # CONFIG_CRYPTO_LRW is not set | ||
| 951 | # CONFIG_CRYPTO_PCBC is not set | ||
| 952 | # CONFIG_CRYPTO_XTS is not set | ||
| 953 | |||
| 954 | # | ||
| 955 | # Hash modes | ||
| 956 | # | ||
| 957 | # CONFIG_CRYPTO_HMAC is not set | ||
| 958 | # CONFIG_CRYPTO_XCBC is not set | ||
| 959 | |||
| 960 | # | ||
| 961 | # Digest | ||
| 962 | # | ||
| 963 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 964 | # CONFIG_CRYPTO_MD4 is not set | ||
| 965 | # CONFIG_CRYPTO_MD5 is not set | ||
| 966 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 967 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 968 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 969 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 970 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 971 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 972 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 973 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 974 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 975 | # CONFIG_CRYPTO_WP512 is not set | ||
| 862 | 976 | ||
| 863 | # | 977 | # |
| 864 | # Cryptographic options | 978 | # Ciphers |
| 865 | # | 979 | # |
| 866 | # CONFIG_CRYPTO is not set | 980 | # CONFIG_CRYPTO_AES is not set |
| 981 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 982 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 983 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 984 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 985 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 986 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 987 | # CONFIG_CRYPTO_DES is not set | ||
| 988 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 989 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 990 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 991 | # CONFIG_CRYPTO_SEED is not set | ||
| 992 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 993 | # CONFIG_CRYPTO_TEA is not set | ||
| 994 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 867 | 995 | ||
| 868 | # | 996 | # |
| 869 | # Hardware crypto devices | 997 | # Compression |
| 870 | # | 998 | # |
| 999 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1000 | # CONFIG_CRYPTO_LZO is not set | ||
| 1001 | CONFIG_CRYPTO_HW=y | ||
| 1002 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 871 | 1003 | ||
| 872 | # | 1004 | # |
| 873 | # Library routines | 1005 | # Library routines |
| 874 | # | 1006 | # |
| 1007 | CONFIG_BITREVERSE=y | ||
| 1008 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1009 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 875 | # CONFIG_CRC_CCITT is not set | 1010 | # CONFIG_CRC_CCITT is not set |
| 876 | # CONFIG_CRC16 is not set | 1011 | # CONFIG_CRC16 is not set |
| 1012 | # CONFIG_CRC_T10DIF is not set | ||
| 1013 | # CONFIG_CRC_ITU_T is not set | ||
| 877 | CONFIG_CRC32=y | 1014 | CONFIG_CRC32=y |
| 1015 | # CONFIG_CRC7 is not set | ||
| 878 | # CONFIG_LIBCRC32C is not set | 1016 | # CONFIG_LIBCRC32C is not set |
| 879 | CONFIG_ZLIB_INFLATE=y | 1017 | CONFIG_ZLIB_INFLATE=y |
| 1018 | CONFIG_ZLIB_DEFLATE=y | ||
| 1019 | CONFIG_PLIST=y | ||
| 1020 | CONFIG_HAS_IOMEM=y | ||
| 1021 | CONFIG_HAS_IOPORT=y | ||
| 1022 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/neocore926_defconfig b/arch/arm/configs/neocore926_defconfig new file mode 100644 index 000000000000..325f1e105f69 --- /dev/null +++ b/arch/arm/configs/neocore926_defconfig | |||
| @@ -0,0 +1,1302 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.27-rc1 | ||
| 4 | # Tue Jul 29 10:46:54 2008 | ||
| 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_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 is not set | ||
| 39 | # CONFIG_SWAP is not set | ||
| 40 | CONFIG_SYSVIPC=y | ||
| 41 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 42 | # CONFIG_POSIX_MQUEUE is not set | ||
| 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=17 | ||
| 48 | # CONFIG_CGROUPS is not set | ||
| 49 | # CONFIG_GROUP_SCHED is not set | ||
| 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 51 | # CONFIG_RELAY is not set | ||
| 52 | CONFIG_NAMESPACES=y | ||
| 53 | # CONFIG_UTS_NS is not set | ||
| 54 | # CONFIG_IPC_NS is not set | ||
| 55 | # CONFIG_USER_NS is not set | ||
| 56 | # CONFIG_PID_NS is not set | ||
| 57 | CONFIG_BLK_DEV_INITRD=y | ||
| 58 | CONFIG_INITRAMFS_SOURCE="" | ||
| 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_SYSCTL_SYSCALL_CHECK=y | ||
| 65 | CONFIG_KALLSYMS=y | ||
| 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 is not set | ||
| 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_SLUB_DEBUG=y | ||
| 82 | # CONFIG_SLAB is not set | ||
| 83 | CONFIG_SLUB=y | ||
| 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=y | ||
| 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 is not set | ||
| 122 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 123 | # CONFIG_IOSCHED_CFQ is not set | ||
| 124 | # CONFIG_DEFAULT_AS is not set | ||
| 125 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 126 | # CONFIG_DEFAULT_CFQ is not set | ||
| 127 | CONFIG_DEFAULT_NOOP=y | ||
| 128 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 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=y | ||
| 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 is not set | ||
| 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 | # Atmel AT91 System-on-Chip | ||
| 182 | # | ||
| 183 | # CONFIG_ARCH_AT91RM9200 is not set | ||
| 184 | # CONFIG_ARCH_AT91SAM9260 is not set | ||
| 185 | # CONFIG_ARCH_AT91SAM9261 is not set | ||
| 186 | CONFIG_ARCH_AT91SAM9263=y | ||
| 187 | # CONFIG_ARCH_AT91SAM9RL is not set | ||
| 188 | # CONFIG_ARCH_AT91SAM9G20 is not set | ||
| 189 | # CONFIG_ARCH_AT91CAP9 is not set | ||
| 190 | # CONFIG_ARCH_AT91X40 is not set | ||
| 191 | CONFIG_AT91_PMC_UNIT=y | ||
| 192 | |||
| 193 | # | ||
| 194 | # AT91SAM9263 Board Type | ||
| 195 | # | ||
| 196 | # CONFIG_MACH_AT91SAM9263EK is not set | ||
| 197 | # CONFIG_MACH_USB_A9263 is not set | ||
| 198 | CONFIG_MACH_NEOCORE926=y | ||
| 199 | |||
| 200 | # | ||
| 201 | # AT91 Board Options | ||
| 202 | # | ||
| 203 | CONFIG_MTD_AT91_DATAFLASH_CARD=y | ||
| 204 | |||
| 205 | # | ||
| 206 | # AT91 Feature Selections | ||
| 207 | # | ||
| 208 | # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set | ||
| 209 | CONFIG_AT91_TIMER_HZ=100 | ||
| 210 | CONFIG_AT91_EARLY_DBGU=y | ||
| 211 | # CONFIG_AT91_EARLY_USART0 is not set | ||
| 212 | # CONFIG_AT91_EARLY_USART1 is not set | ||
| 213 | # CONFIG_AT91_EARLY_USART2 is not set | ||
| 214 | # CONFIG_AT91_EARLY_USART3 is not set | ||
| 215 | # CONFIG_AT91_EARLY_USART4 is not set | ||
| 216 | # CONFIG_AT91_EARLY_USART5 is not set | ||
| 217 | |||
| 218 | # | ||
| 219 | # Processor Type | ||
| 220 | # | ||
| 221 | CONFIG_CPU_32=y | ||
| 222 | CONFIG_CPU_ARM926T=y | ||
| 223 | CONFIG_CPU_32v5=y | ||
| 224 | CONFIG_CPU_ABRT_EV5TJ=y | ||
| 225 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 226 | CONFIG_CPU_CACHE_VIVT=y | ||
| 227 | CONFIG_CPU_COPY_V4WB=y | ||
| 228 | CONFIG_CPU_TLB_V4WBI=y | ||
| 229 | CONFIG_CPU_CP15=y | ||
| 230 | CONFIG_CPU_CP15_MMU=y | ||
| 231 | |||
| 232 | # | ||
| 233 | # Processor Features | ||
| 234 | # | ||
| 235 | CONFIG_ARM_THUMB=y | ||
| 236 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 237 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 238 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 239 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
| 240 | # CONFIG_OUTER_CACHE is not set | ||
| 241 | |||
| 242 | # | ||
| 243 | # Bus support | ||
| 244 | # | ||
| 245 | # CONFIG_PCI_SYSCALL is not set | ||
| 246 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 247 | # CONFIG_PCCARD is not set | ||
| 248 | |||
| 249 | # | ||
| 250 | # Kernel Features | ||
| 251 | # | ||
| 252 | # CONFIG_TICK_ONESHOT is not set | ||
| 253 | # CONFIG_NO_HZ is not set | ||
| 254 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 255 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 256 | # CONFIG_PREEMPT is not set | ||
| 257 | CONFIG_HZ=100 | ||
| 258 | # CONFIG_AEABI is not set | ||
| 259 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 260 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 261 | CONFIG_FLATMEM_MANUAL=y | ||
| 262 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 263 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 264 | CONFIG_FLATMEM=y | ||
| 265 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 266 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 267 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 268 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 269 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 270 | # CONFIG_RESOURCES_64BIT is not set | ||
| 271 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 272 | CONFIG_BOUNCE=y | ||
| 273 | CONFIG_VIRT_TO_BUS=y | ||
| 274 | # CONFIG_LEDS is not set | ||
| 275 | CONFIG_ALIGNMENT_TRAP=y | ||
| 276 | |||
| 277 | # | ||
| 278 | # Boot options | ||
| 279 | # | ||
| 280 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 281 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 282 | CONFIG_CMDLINE="" | ||
| 283 | # CONFIG_XIP_KERNEL is not set | ||
| 284 | # CONFIG_KEXEC is not set | ||
| 285 | |||
| 286 | # | ||
| 287 | # Floating point emulation | ||
| 288 | # | ||
| 289 | |||
| 290 | # | ||
| 291 | # At least one emulation must be selected | ||
| 292 | # | ||
| 293 | CONFIG_FPE_NWFPE=y | ||
| 294 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 295 | # CONFIG_FPE_FASTFPE is not set | ||
| 296 | # CONFIG_VFP is not set | ||
| 297 | |||
| 298 | # | ||
| 299 | # Userspace binary formats | ||
| 300 | # | ||
| 301 | CONFIG_BINFMT_ELF=y | ||
| 302 | # CONFIG_BINFMT_AOUT is not set | ||
| 303 | # CONFIG_BINFMT_MISC is not set | ||
| 304 | # CONFIG_ARTHUR is not set | ||
| 305 | |||
| 306 | # | ||
| 307 | # Power management options | ||
| 308 | # | ||
| 309 | # CONFIG_PM is not set | ||
| 310 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 311 | |||
| 312 | # | ||
| 313 | # Networking | ||
| 314 | # | ||
| 315 | CONFIG_NET=y | ||
| 316 | |||
| 317 | # | ||
| 318 | # Networking options | ||
| 319 | # | ||
| 320 | CONFIG_PACKET=y | ||
| 321 | # CONFIG_PACKET_MMAP is not set | ||
| 322 | CONFIG_UNIX=y | ||
| 323 | CONFIG_XFRM=y | ||
| 324 | # CONFIG_XFRM_USER is not set | ||
| 325 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 326 | # CONFIG_XFRM_MIGRATE is not set | ||
| 327 | # CONFIG_XFRM_STATISTICS is not set | ||
| 328 | CONFIG_NET_KEY=y | ||
| 329 | # CONFIG_NET_KEY_MIGRATE is not set | ||
| 330 | CONFIG_INET=y | ||
| 331 | # CONFIG_IP_MULTICAST is not set | ||
| 332 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 333 | CONFIG_IP_FIB_HASH=y | ||
| 334 | CONFIG_IP_PNP=y | ||
| 335 | CONFIG_IP_PNP_DHCP=y | ||
| 336 | CONFIG_IP_PNP_BOOTP=y | ||
| 337 | CONFIG_IP_PNP_RARP=y | ||
| 338 | CONFIG_NET_IPIP=y | ||
| 339 | # CONFIG_NET_IPGRE is not set | ||
| 340 | # CONFIG_ARPD is not set | ||
| 341 | # CONFIG_SYN_COOKIES is not set | ||
| 342 | # CONFIG_INET_AH is not set | ||
| 343 | # CONFIG_INET_ESP is not set | ||
| 344 | # CONFIG_INET_IPCOMP is not set | ||
| 345 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 346 | CONFIG_INET_TUNNEL=y | ||
| 347 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 348 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 349 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 350 | # CONFIG_INET_LRO is not set | ||
| 351 | CONFIG_INET_DIAG=y | ||
| 352 | CONFIG_INET_TCP_DIAG=y | ||
| 353 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 354 | CONFIG_TCP_CONG_CUBIC=y | ||
| 355 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 356 | # CONFIG_TCP_MD5SIG is not set | ||
| 357 | CONFIG_IPV6=y | ||
| 358 | # CONFIG_IPV6_PRIVACY is not set | ||
| 359 | # CONFIG_IPV6_ROUTER_PREF is not set | ||
| 360 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
| 361 | # CONFIG_INET6_AH is not set | ||
| 362 | # CONFIG_INET6_ESP is not set | ||
| 363 | # CONFIG_INET6_IPCOMP is not set | ||
| 364 | # CONFIG_IPV6_MIP6 is not set | ||
| 365 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 366 | # CONFIG_INET6_TUNNEL is not set | ||
| 367 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | ||
| 368 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | ||
| 369 | CONFIG_INET6_XFRM_MODE_BEET=y | ||
| 370 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 371 | CONFIG_IPV6_SIT=y | ||
| 372 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 373 | # CONFIG_IPV6_TUNNEL is not set | ||
| 374 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 375 | # CONFIG_IPV6_MROUTE is not set | ||
| 376 | # CONFIG_NETWORK_SECMARK is not set | ||
| 377 | # CONFIG_NETFILTER is not set | ||
| 378 | # CONFIG_IP_DCCP is not set | ||
| 379 | # CONFIG_IP_SCTP is not set | ||
| 380 | # CONFIG_TIPC is not set | ||
| 381 | # CONFIG_ATM is not set | ||
| 382 | # CONFIG_BRIDGE is not set | ||
| 383 | # CONFIG_VLAN_8021Q is not set | ||
| 384 | # CONFIG_DECNET is not set | ||
| 385 | # CONFIG_LLC2 is not set | ||
| 386 | # CONFIG_IPX is not set | ||
| 387 | # CONFIG_ATALK is not set | ||
| 388 | # CONFIG_X25 is not set | ||
| 389 | # CONFIG_LAPB is not set | ||
| 390 | # CONFIG_ECONET is not set | ||
| 391 | # CONFIG_WAN_ROUTER is not set | ||
| 392 | # CONFIG_NET_SCHED is not set | ||
| 393 | |||
| 394 | # | ||
| 395 | # Network testing | ||
| 396 | # | ||
| 397 | # CONFIG_NET_PKTGEN is not set | ||
| 398 | # CONFIG_HAMRADIO is not set | ||
| 399 | # CONFIG_CAN is not set | ||
| 400 | # CONFIG_IRDA is not set | ||
| 401 | # CONFIG_BT is not set | ||
| 402 | # CONFIG_AF_RXRPC is not set | ||
| 403 | |||
| 404 | # | ||
| 405 | # Wireless | ||
| 406 | # | ||
| 407 | # CONFIG_CFG80211 is not set | ||
| 408 | # CONFIG_WIRELESS_EXT is not set | ||
| 409 | # CONFIG_MAC80211 is not set | ||
| 410 | # CONFIG_IEEE80211 is not set | ||
| 411 | # CONFIG_RFKILL is not set | ||
| 412 | # CONFIG_NET_9P is not set | ||
| 413 | |||
| 414 | # | ||
| 415 | # Device Drivers | ||
| 416 | # | ||
| 417 | |||
| 418 | # | ||
| 419 | # Generic Driver Options | ||
| 420 | # | ||
| 421 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 422 | CONFIG_STANDALONE=y | ||
| 423 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | ||
| 424 | CONFIG_FW_LOADER=y | ||
| 425 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 426 | CONFIG_EXTRA_FIRMWARE="" | ||
| 427 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 428 | # CONFIG_CONNECTOR is not set | ||
| 429 | CONFIG_MTD=y | ||
| 430 | # CONFIG_MTD_DEBUG is not set | ||
| 431 | # CONFIG_MTD_CONCAT is not set | ||
| 432 | CONFIG_MTD_PARTITIONS=y | ||
| 433 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 434 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 435 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 436 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 437 | |||
| 438 | # | ||
| 439 | # User Modules And Translation Layers | ||
| 440 | # | ||
| 441 | CONFIG_MTD_CHAR=y | ||
| 442 | CONFIG_MTD_BLKDEVS=y | ||
| 443 | CONFIG_MTD_BLOCK=y | ||
| 444 | # CONFIG_FTL is not set | ||
| 445 | CONFIG_NFTL=y | ||
| 446 | CONFIG_NFTL_RW=y | ||
| 447 | # CONFIG_INFTL is not set | ||
| 448 | # CONFIG_RFD_FTL is not set | ||
| 449 | # CONFIG_SSFDC is not set | ||
| 450 | # CONFIG_MTD_OOPS is not set | ||
| 451 | |||
| 452 | # | ||
| 453 | # RAM/ROM/Flash chip drivers | ||
| 454 | # | ||
| 455 | # CONFIG_MTD_CFI is not set | ||
| 456 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 457 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 458 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 459 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 460 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 461 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 462 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 463 | CONFIG_MTD_CFI_I1=y | ||
| 464 | CONFIG_MTD_CFI_I2=y | ||
| 465 | # CONFIG_MTD_CFI_I4 is not set | ||
| 466 | # CONFIG_MTD_CFI_I8 is not set | ||
| 467 | # CONFIG_MTD_RAM is not set | ||
| 468 | # CONFIG_MTD_ROM is not set | ||
| 469 | # CONFIG_MTD_ABSENT is not set | ||
| 470 | |||
| 471 | # | ||
| 472 | # Mapping drivers for chip access | ||
| 473 | # | ||
| 474 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 475 | # CONFIG_MTD_PLATRAM is not set | ||
| 476 | |||
| 477 | # | ||
| 478 | # Self-contained MTD device drivers | ||
| 479 | # | ||
| 480 | # CONFIG_MTD_DATAFLASH is not set | ||
| 481 | # CONFIG_MTD_M25P80 is not set | ||
| 482 | # CONFIG_MTD_SLRAM is not set | ||
| 483 | # CONFIG_MTD_PHRAM is not set | ||
| 484 | # CONFIG_MTD_MTDRAM is not set | ||
| 485 | CONFIG_MTD_BLOCK2MTD=y | ||
| 486 | |||
| 487 | # | ||
| 488 | # Disk-On-Chip Device Drivers | ||
| 489 | # | ||
| 490 | # CONFIG_MTD_DOC2000 is not set | ||
| 491 | # CONFIG_MTD_DOC2001 is not set | ||
| 492 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 493 | CONFIG_MTD_NAND=y | ||
| 494 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 495 | CONFIG_MTD_NAND_ECC_SMC=y | ||
| 496 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
| 497 | CONFIG_MTD_NAND_IDS=y | ||
| 498 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
| 499 | CONFIG_MTD_NAND_ATMEL=y | ||
| 500 | CONFIG_MTD_NAND_ATMEL_ECC_HW=y | ||
| 501 | # CONFIG_MTD_NAND_ATMEL_ECC_SOFT is not set | ||
| 502 | # CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set | ||
| 503 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
| 504 | CONFIG_MTD_NAND_PLATFORM=y | ||
| 505 | # CONFIG_MTD_ALAUDA is not set | ||
| 506 | # CONFIG_MTD_ONENAND is not set | ||
| 507 | |||
| 508 | # | ||
| 509 | # UBI - Unsorted block images | ||
| 510 | # | ||
| 511 | # CONFIG_MTD_UBI is not set | ||
| 512 | # CONFIG_PARPORT is not set | ||
| 513 | CONFIG_BLK_DEV=y | ||
| 514 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 515 | CONFIG_BLK_DEV_LOOP=y | ||
| 516 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 517 | CONFIG_BLK_DEV_NBD=y | ||
| 518 | # CONFIG_BLK_DEV_UB is not set | ||
| 519 | # CONFIG_BLK_DEV_RAM is not set | ||
| 520 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 521 | # CONFIG_ATA_OVER_ETH is not set | ||
| 522 | CONFIG_MISC_DEVICES=y | ||
| 523 | CONFIG_ATMEL_PWM=y | ||
| 524 | CONFIG_ATMEL_TCLIB=y | ||
| 525 | CONFIG_ATMEL_TCB_CLKSRC=y | ||
| 526 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 | ||
| 527 | # CONFIG_EEPROM_93CX6 is not set | ||
| 528 | # CONFIG_ATMEL_SSC is not set | ||
| 529 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 530 | CONFIG_HAVE_IDE=y | ||
| 531 | # CONFIG_IDE is not set | ||
| 532 | |||
| 533 | # | ||
| 534 | # SCSI device support | ||
| 535 | # | ||
| 536 | # CONFIG_RAID_ATTRS is not set | ||
| 537 | CONFIG_SCSI=y | ||
| 538 | CONFIG_SCSI_DMA=y | ||
| 539 | # CONFIG_SCSI_TGT is not set | ||
| 540 | # CONFIG_SCSI_NETLINK is not set | ||
| 541 | CONFIG_SCSI_PROC_FS=y | ||
| 542 | |||
| 543 | # | ||
| 544 | # SCSI support type (disk, tape, CD-ROM) | ||
| 545 | # | ||
| 546 | # CONFIG_BLK_DEV_SD is not set | ||
| 547 | # CONFIG_CHR_DEV_ST is not set | ||
| 548 | # CONFIG_CHR_DEV_OSST is not set | ||
| 549 | # CONFIG_BLK_DEV_SR is not set | ||
| 550 | CONFIG_CHR_DEV_SG=y | ||
| 551 | # CONFIG_CHR_DEV_SCH is not set | ||
| 552 | |||
| 553 | # | ||
| 554 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 555 | # | ||
| 556 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 557 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 558 | # CONFIG_SCSI_LOGGING is not set | ||
| 559 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 560 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 561 | |||
| 562 | # | ||
| 563 | # SCSI Transports | ||
| 564 | # | ||
| 565 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 566 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 567 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 568 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 569 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 570 | CONFIG_SCSI_LOWLEVEL=y | ||
| 571 | # CONFIG_ISCSI_TCP is not set | ||
| 572 | # CONFIG_SCSI_DEBUG is not set | ||
| 573 | # CONFIG_SCSI_DH is not set | ||
| 574 | # CONFIG_ATA is not set | ||
| 575 | # CONFIG_MD is not set | ||
| 576 | CONFIG_NETDEVICES=y | ||
| 577 | # CONFIG_DUMMY is not set | ||
| 578 | # CONFIG_BONDING is not set | ||
| 579 | # CONFIG_MACVLAN is not set | ||
| 580 | # CONFIG_EQUALIZER is not set | ||
| 581 | # CONFIG_TUN is not set | ||
| 582 | # CONFIG_VETH is not set | ||
| 583 | CONFIG_PHYLIB=y | ||
| 584 | |||
| 585 | # | ||
| 586 | # MII PHY device drivers | ||
| 587 | # | ||
| 588 | # CONFIG_MARVELL_PHY is not set | ||
| 589 | # CONFIG_DAVICOM_PHY is not set | ||
| 590 | # CONFIG_QSEMI_PHY is not set | ||
| 591 | # CONFIG_LXT_PHY is not set | ||
| 592 | # CONFIG_CICADA_PHY is not set | ||
| 593 | # CONFIG_VITESSE_PHY is not set | ||
| 594 | CONFIG_SMSC_PHY=y | ||
| 595 | # CONFIG_BROADCOM_PHY is not set | ||
| 596 | # CONFIG_ICPLUS_PHY is not set | ||
| 597 | # CONFIG_REALTEK_PHY is not set | ||
| 598 | # CONFIG_FIXED_PHY is not set | ||
| 599 | # CONFIG_MDIO_BITBANG is not set | ||
| 600 | CONFIG_NET_ETHERNET=y | ||
| 601 | # CONFIG_MII is not set | ||
| 602 | CONFIG_MACB=y | ||
| 603 | # CONFIG_AX88796 is not set | ||
| 604 | # CONFIG_SMC91X is not set | ||
| 605 | # CONFIG_DM9000 is not set | ||
| 606 | # CONFIG_ENC28J60 is not set | ||
| 607 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 608 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 609 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 610 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 611 | # CONFIG_B44 is not set | ||
| 612 | # CONFIG_NETDEV_1000 is not set | ||
| 613 | # CONFIG_NETDEV_10000 is not set | ||
| 614 | |||
| 615 | # | ||
| 616 | # Wireless LAN | ||
| 617 | # | ||
| 618 | # CONFIG_WLAN_PRE80211 is not set | ||
| 619 | # CONFIG_WLAN_80211 is not set | ||
| 620 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 621 | |||
| 622 | # | ||
| 623 | # USB Network Adapters | ||
| 624 | # | ||
| 625 | # CONFIG_USB_CATC is not set | ||
| 626 | # CONFIG_USB_KAWETH is not set | ||
| 627 | # CONFIG_USB_PEGASUS is not set | ||
| 628 | # CONFIG_USB_RTL8150 is not set | ||
| 629 | # CONFIG_USB_USBNET is not set | ||
| 630 | # CONFIG_WAN is not set | ||
| 631 | # CONFIG_PPP is not set | ||
| 632 | # CONFIG_SLIP is not set | ||
| 633 | # CONFIG_NETCONSOLE is not set | ||
| 634 | # CONFIG_NETPOLL is not set | ||
| 635 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 636 | # CONFIG_ISDN is not set | ||
| 637 | |||
| 638 | # | ||
| 639 | # Input device support | ||
| 640 | # | ||
| 641 | CONFIG_INPUT=y | ||
| 642 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 643 | # CONFIG_INPUT_POLLDEV is not set | ||
| 644 | |||
| 645 | # | ||
| 646 | # Userland interfaces | ||
| 647 | # | ||
| 648 | CONFIG_INPUT_MOUSEDEV=y | ||
| 649 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
| 650 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 651 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 652 | # CONFIG_INPUT_JOYDEV is not set | ||
| 653 | CONFIG_INPUT_EVDEV=y | ||
| 654 | # CONFIG_INPUT_EVBUG is not set | ||
| 655 | |||
| 656 | # | ||
| 657 | # Input Device Drivers | ||
| 658 | # | ||
| 659 | CONFIG_INPUT_KEYBOARD=y | ||
| 660 | CONFIG_KEYBOARD_ATKBD=y | ||
| 661 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 662 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 663 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 664 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 665 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 666 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 667 | CONFIG_INPUT_MOUSE=y | ||
| 668 | CONFIG_MOUSE_PS2=y | ||
| 669 | CONFIG_MOUSE_PS2_ALPS=y | ||
| 670 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
| 671 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
| 672 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 673 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
| 674 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
| 675 | # CONFIG_MOUSE_SERIAL is not set | ||
| 676 | # CONFIG_MOUSE_APPLETOUCH is not set | ||
| 677 | # CONFIG_MOUSE_VSXXXAA is not set | ||
| 678 | # CONFIG_MOUSE_GPIO is not set | ||
| 679 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 680 | # CONFIG_INPUT_TABLET is not set | ||
| 681 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 682 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
| 683 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 684 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 685 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 686 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 687 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
| 688 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 689 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 690 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 691 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 692 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
| 693 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
| 694 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
| 695 | # CONFIG_INPUT_MISC is not set | ||
| 696 | |||
| 697 | # | ||
| 698 | # Hardware I/O ports | ||
| 699 | # | ||
| 700 | CONFIG_SERIO=y | ||
| 701 | CONFIG_SERIO_SERPORT=y | ||
| 702 | CONFIG_SERIO_LIBPS2=y | ||
| 703 | # CONFIG_SERIO_RAW is not set | ||
| 704 | # CONFIG_GAMEPORT is not set | ||
| 705 | |||
| 706 | # | ||
| 707 | # Character devices | ||
| 708 | # | ||
| 709 | CONFIG_VT=y | ||
| 710 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 711 | CONFIG_VT_CONSOLE=y | ||
| 712 | CONFIG_HW_CONSOLE=y | ||
| 713 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
| 714 | # CONFIG_DEVKMEM is not set | ||
| 715 | CONFIG_SERIAL_NONSTANDARD=y | ||
| 716 | # CONFIG_N_HDLC is not set | ||
| 717 | # CONFIG_RISCOM8 is not set | ||
| 718 | # CONFIG_SPECIALIX is not set | ||
| 719 | # CONFIG_RIO is not set | ||
| 720 | # CONFIG_STALDRV is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # Serial drivers | ||
| 724 | # | ||
| 725 | # CONFIG_SERIAL_8250 is not set | ||
| 726 | |||
| 727 | # | ||
| 728 | # Non-8250 serial port support | ||
| 729 | # | ||
| 730 | CONFIG_SERIAL_ATMEL=y | ||
| 731 | CONFIG_SERIAL_ATMEL_CONSOLE=y | ||
| 732 | # CONFIG_SERIAL_ATMEL_PDC is not set | ||
| 733 | # CONFIG_SERIAL_ATMEL_TTYAT is not set | ||
| 734 | CONFIG_SERIAL_CORE=y | ||
| 735 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 736 | CONFIG_UNIX98_PTYS=y | ||
| 737 | CONFIG_LEGACY_PTYS=y | ||
| 738 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 739 | # CONFIG_IPMI_HANDLER is not set | ||
| 740 | # CONFIG_HW_RANDOM is not set | ||
| 741 | # CONFIG_NVRAM is not set | ||
| 742 | # CONFIG_R3964 is not set | ||
| 743 | # CONFIG_RAW_DRIVER is not set | ||
| 744 | # CONFIG_TCG_TPM is not set | ||
| 745 | CONFIG_I2C=y | ||
| 746 | CONFIG_I2C_BOARDINFO=y | ||
| 747 | CONFIG_I2C_CHARDEV=y | ||
| 748 | |||
| 749 | # | ||
| 750 | # I2C Hardware Bus support | ||
| 751 | # | ||
| 752 | |||
| 753 | # | ||
| 754 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 755 | # | ||
| 756 | # CONFIG_I2C_GPIO is not set | ||
| 757 | # CONFIG_I2C_OCORES is not set | ||
| 758 | # CONFIG_I2C_SIMTEC is not set | ||
| 759 | |||
| 760 | # | ||
| 761 | # External I2C/SMBus adapter drivers | ||
| 762 | # | ||
| 763 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 764 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 765 | # CONFIG_I2C_TINY_USB is not set | ||
| 766 | |||
| 767 | # | ||
| 768 | # Other I2C/SMBus bus drivers | ||
| 769 | # | ||
| 770 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 771 | # CONFIG_I2C_STUB is not set | ||
| 772 | |||
| 773 | # | ||
| 774 | # Miscellaneous I2C Chip support | ||
| 775 | # | ||
| 776 | # CONFIG_DS1682 is not set | ||
| 777 | # CONFIG_AT24 is not set | ||
| 778 | # CONFIG_SENSORS_EEPROM is not set | ||
| 779 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 780 | # CONFIG_PCF8575 is not set | ||
| 781 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 782 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 783 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 784 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 785 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 786 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 787 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 788 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 789 | CONFIG_SPI=y | ||
| 790 | CONFIG_SPI_MASTER=y | ||
| 791 | |||
| 792 | # | ||
| 793 | # SPI Master Controller Drivers | ||
| 794 | # | ||
| 795 | CONFIG_SPI_ATMEL=y | ||
| 796 | # CONFIG_SPI_BITBANG is not set | ||
| 797 | |||
| 798 | # | ||
| 799 | # SPI Protocol Masters | ||
| 800 | # | ||
| 801 | # CONFIG_SPI_AT25 is not set | ||
| 802 | # CONFIG_SPI_SPIDEV is not set | ||
| 803 | # CONFIG_SPI_TLE62X0 is not set | ||
| 804 | # CONFIG_W1 is not set | ||
| 805 | # CONFIG_POWER_SUPPLY is not set | ||
| 806 | # CONFIG_HWMON is not set | ||
| 807 | # CONFIG_WATCHDOG is not set | ||
| 808 | |||
| 809 | # | ||
| 810 | # Sonics Silicon Backplane | ||
| 811 | # | ||
| 812 | CONFIG_SSB_POSSIBLE=y | ||
| 813 | # CONFIG_SSB is not set | ||
| 814 | |||
| 815 | # | ||
| 816 | # Multifunction device drivers | ||
| 817 | # | ||
| 818 | # CONFIG_MFD_CORE is not set | ||
| 819 | # CONFIG_MFD_SM501 is not set | ||
| 820 | # CONFIG_HTC_PASIC3 is not set | ||
| 821 | |||
| 822 | # | ||
| 823 | # Multimedia devices | ||
| 824 | # | ||
| 825 | |||
| 826 | # | ||
| 827 | # Multimedia core support | ||
| 828 | # | ||
| 829 | # CONFIG_VIDEO_DEV is not set | ||
| 830 | # CONFIG_DVB_CORE is not set | ||
| 831 | # CONFIG_VIDEO_MEDIA is not set | ||
| 832 | |||
| 833 | # | ||
| 834 | # Multimedia drivers | ||
| 835 | # | ||
| 836 | # CONFIG_DAB is not set | ||
| 837 | |||
| 838 | # | ||
| 839 | # Graphics support | ||
| 840 | # | ||
| 841 | # CONFIG_VGASTATE is not set | ||
| 842 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 843 | CONFIG_FB=y | ||
| 844 | # CONFIG_FIRMWARE_EDID is not set | ||
| 845 | # CONFIG_FB_DDC is not set | ||
| 846 | CONFIG_FB_CFB_FILLRECT=y | ||
| 847 | CONFIG_FB_CFB_COPYAREA=y | ||
| 848 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 849 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 850 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 851 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 852 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 853 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 854 | # CONFIG_FB_SYS_FOPS is not set | ||
| 855 | # CONFIG_FB_SVGALIB is not set | ||
| 856 | # CONFIG_FB_MACMODES is not set | ||
| 857 | # CONFIG_FB_BACKLIGHT is not set | ||
| 858 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 859 | # CONFIG_FB_TILEBLITTING is not set | ||
| 860 | |||
| 861 | # | ||
| 862 | # Frame buffer hardware drivers | ||
| 863 | # | ||
| 864 | # CONFIG_FB_S1D13XXX is not set | ||
| 865 | CONFIG_FB_ATMEL=y | ||
| 866 | # CONFIG_FB_VIRTUAL is not set | ||
| 867 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| 868 | CONFIG_LCD_CLASS_DEVICE=y | ||
| 869 | # CONFIG_LCD_LTV350QV is not set | ||
| 870 | # CONFIG_LCD_ILI9320 is not set | ||
| 871 | # CONFIG_LCD_VGG2432A4 is not set | ||
| 872 | # CONFIG_LCD_PLATFORM is not set | ||
| 873 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 874 | CONFIG_BACKLIGHT_ATMEL_LCDC=y | ||
| 875 | # CONFIG_BACKLIGHT_ATMEL_PWM is not set | ||
| 876 | # CONFIG_BACKLIGHT_CORGI is not set | ||
| 877 | |||
| 878 | # | ||
| 879 | # Display device support | ||
| 880 | # | ||
| 881 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 882 | |||
| 883 | # | ||
| 884 | # Console display driver support | ||
| 885 | # | ||
| 886 | # CONFIG_VGA_CONSOLE is not set | ||
| 887 | CONFIG_DUMMY_CONSOLE=y | ||
| 888 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 889 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||
| 890 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 891 | # CONFIG_FONTS is not set | ||
| 892 | CONFIG_FONT_8x8=y | ||
| 893 | CONFIG_FONT_8x16=y | ||
| 894 | CONFIG_LOGO=y | ||
| 895 | CONFIG_LOGO_LINUX_MONO=y | ||
| 896 | CONFIG_LOGO_LINUX_VGA16=y | ||
| 897 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 898 | # CONFIG_SOUND is not set | ||
| 899 | CONFIG_HID_SUPPORT=y | ||
| 900 | CONFIG_HID=y | ||
| 901 | CONFIG_HID_DEBUG=y | ||
| 902 | # CONFIG_HIDRAW is not set | ||
| 903 | |||
| 904 | # | ||
| 905 | # USB Input Devices | ||
| 906 | # | ||
| 907 | CONFIG_USB_HID=y | ||
| 908 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 909 | # CONFIG_HID_FF is not set | ||
| 910 | # CONFIG_USB_HIDDEV is not set | ||
| 911 | CONFIG_USB_SUPPORT=y | ||
| 912 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 913 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 914 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 915 | CONFIG_USB=y | ||
| 916 | # CONFIG_USB_DEBUG is not set | ||
| 917 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 918 | |||
| 919 | # | ||
| 920 | # Miscellaneous USB options | ||
| 921 | # | ||
| 922 | CONFIG_USB_DEVICEFS=y | ||
| 923 | CONFIG_USB_DEVICE_CLASS=y | ||
| 924 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 925 | # CONFIG_USB_OTG is not set | ||
| 926 | |||
| 927 | # | ||
| 928 | # USB Host Controller Drivers | ||
| 929 | # | ||
| 930 | # CONFIG_USB_C67X00_HCD is not set | ||
| 931 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 932 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 933 | CONFIG_USB_OHCI_HCD=y | ||
| 934 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 935 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 936 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 937 | # CONFIG_USB_SL811_HCD is not set | ||
| 938 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 939 | |||
| 940 | # | ||
| 941 | # USB Device Class drivers | ||
| 942 | # | ||
| 943 | # CONFIG_USB_ACM is not set | ||
| 944 | # CONFIG_USB_PRINTER is not set | ||
| 945 | # CONFIG_USB_WDM is not set | ||
| 946 | |||
| 947 | # | ||
| 948 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 949 | # | ||
| 950 | |||
| 951 | # | ||
| 952 | # may also be needed; see USB_STORAGE Help for more information | ||
| 953 | # | ||
| 954 | CONFIG_USB_STORAGE=y | ||
| 955 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 956 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
| 957 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
| 958 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 959 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 960 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 961 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 962 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 963 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 964 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 965 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 966 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 967 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 968 | # CONFIG_USB_LIBUSUAL is not set | ||
| 969 | |||
| 970 | # | ||
| 971 | # USB Imaging devices | ||
| 972 | # | ||
| 973 | # CONFIG_USB_MDC800 is not set | ||
| 974 | # CONFIG_USB_MICROTEK is not set | ||
| 975 | CONFIG_USB_MON=y | ||
| 976 | |||
| 977 | # | ||
| 978 | # USB port drivers | ||
| 979 | # | ||
| 980 | # CONFIG_USB_SERIAL is not set | ||
| 981 | |||
| 982 | # | ||
| 983 | # USB Miscellaneous drivers | ||
| 984 | # | ||
| 985 | # CONFIG_USB_EMI62 is not set | ||
| 986 | # CONFIG_USB_EMI26 is not set | ||
| 987 | # CONFIG_USB_ADUTUX is not set | ||
| 988 | # CONFIG_USB_AUERSWALD is not set | ||
| 989 | # CONFIG_USB_RIO500 is not set | ||
| 990 | # CONFIG_USB_LEGOTOWER is not set | ||
| 991 | # CONFIG_USB_LCD is not set | ||
| 992 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 993 | # CONFIG_USB_LED is not set | ||
| 994 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 995 | # CONFIG_USB_CYTHERM is not set | ||
| 996 | # CONFIG_USB_PHIDGET is not set | ||
| 997 | # CONFIG_USB_IDMOUSE is not set | ||
| 998 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 999 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1000 | # CONFIG_USB_LD is not set | ||
| 1001 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1002 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1003 | # CONFIG_USB_TEST is not set | ||
| 1004 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1005 | # CONFIG_USB_GADGET is not set | ||
| 1006 | CONFIG_MMC=y | ||
| 1007 | # CONFIG_MMC_DEBUG is not set | ||
| 1008 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 1009 | |||
| 1010 | # | ||
| 1011 | # MMC/SD Card Drivers | ||
| 1012 | # | ||
| 1013 | CONFIG_MMC_BLOCK=y | ||
| 1014 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 1015 | CONFIG_SDIO_UART=y | ||
| 1016 | # CONFIG_MMC_TEST is not set | ||
| 1017 | |||
| 1018 | # | ||
| 1019 | # MMC/SD Host Controller Drivers | ||
| 1020 | # | ||
| 1021 | # CONFIG_MMC_SDHCI is not set | ||
| 1022 | CONFIG_MMC_AT91=y | ||
| 1023 | # CONFIG_MMC_SPI is not set | ||
| 1024 | # CONFIG_NEW_LEDS is not set | ||
| 1025 | CONFIG_RTC_LIB=y | ||
| 1026 | # CONFIG_RTC_CLASS is not set | ||
| 1027 | # CONFIG_DMADEVICES is not set | ||
| 1028 | # CONFIG_UIO is not set | ||
| 1029 | |||
| 1030 | # | ||
| 1031 | # File systems | ||
| 1032 | # | ||
| 1033 | CONFIG_EXT2_FS=y | ||
| 1034 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 1035 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1036 | # CONFIG_EXT3_FS is not set | ||
| 1037 | # CONFIG_EXT4DEV_FS is not set | ||
| 1038 | # CONFIG_REISERFS_FS is not set | ||
| 1039 | # CONFIG_JFS_FS is not set | ||
| 1040 | # CONFIG_FS_POSIX_ACL is not set | ||
| 1041 | # CONFIG_XFS_FS is not set | ||
| 1042 | # CONFIG_OCFS2_FS is not set | ||
| 1043 | # CONFIG_DNOTIFY is not set | ||
| 1044 | # CONFIG_INOTIFY is not set | ||
| 1045 | # CONFIG_QUOTA is not set | ||
| 1046 | CONFIG_AUTOFS_FS=y | ||
| 1047 | # CONFIG_AUTOFS4_FS is not set | ||
| 1048 | # CONFIG_FUSE_FS is not set | ||
| 1049 | |||
| 1050 | # | ||
| 1051 | # CD-ROM/DVD Filesystems | ||
| 1052 | # | ||
| 1053 | # CONFIG_ISO9660_FS is not set | ||
| 1054 | # CONFIG_UDF_FS is not set | ||
| 1055 | |||
| 1056 | # | ||
| 1057 | # DOS/FAT/NT Filesystems | ||
| 1058 | # | ||
| 1059 | CONFIG_FAT_FS=y | ||
| 1060 | # CONFIG_MSDOS_FS is not set | ||
| 1061 | CONFIG_VFAT_FS=y | ||
| 1062 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1063 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1064 | # CONFIG_NTFS_FS is not set | ||
| 1065 | |||
| 1066 | # | ||
| 1067 | # Pseudo filesystems | ||
| 1068 | # | ||
| 1069 | CONFIG_PROC_FS=y | ||
| 1070 | CONFIG_PROC_SYSCTL=y | ||
| 1071 | CONFIG_SYSFS=y | ||
| 1072 | CONFIG_TMPFS=y | ||
| 1073 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1074 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1075 | # CONFIG_CONFIGFS_FS is not set | ||
| 1076 | |||
| 1077 | # | ||
| 1078 | # Miscellaneous filesystems | ||
| 1079 | # | ||
| 1080 | # CONFIG_ADFS_FS is not set | ||
| 1081 | # CONFIG_AFFS_FS is not set | ||
| 1082 | # CONFIG_HFS_FS is not set | ||
| 1083 | # CONFIG_HFSPLUS_FS is not set | ||
| 1084 | # CONFIG_BEFS_FS is not set | ||
| 1085 | # CONFIG_BFS_FS is not set | ||
| 1086 | # CONFIG_EFS_FS is not set | ||
| 1087 | CONFIG_JFFS2_FS=y | ||
| 1088 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 1089 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 1090 | CONFIG_JFFS2_FS_WBUF_VERIFY=y | ||
| 1091 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 1092 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 1093 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 1094 | CONFIG_JFFS2_ZLIB=y | ||
| 1095 | # CONFIG_JFFS2_LZO is not set | ||
| 1096 | CONFIG_JFFS2_RTIME=y | ||
| 1097 | # CONFIG_JFFS2_RUBIN is not set | ||
| 1098 | # CONFIG_CRAMFS is not set | ||
| 1099 | # CONFIG_VXFS_FS is not set | ||
| 1100 | # CONFIG_MINIX_FS is not set | ||
| 1101 | # CONFIG_OMFS_FS is not set | ||
| 1102 | # CONFIG_HPFS_FS is not set | ||
| 1103 | # CONFIG_QNX4FS_FS is not set | ||
| 1104 | # CONFIG_ROMFS_FS is not set | ||
| 1105 | # CONFIG_SYSV_FS is not set | ||
| 1106 | # CONFIG_UFS_FS is not set | ||
| 1107 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 1108 | CONFIG_NFS_FS=y | ||
| 1109 | # CONFIG_NFS_V3 is not set | ||
| 1110 | # CONFIG_NFS_V4 is not set | ||
| 1111 | CONFIG_ROOT_NFS=y | ||
| 1112 | # CONFIG_NFSD is not set | ||
| 1113 | CONFIG_LOCKD=y | ||
| 1114 | CONFIG_NFS_COMMON=y | ||
| 1115 | CONFIG_SUNRPC=y | ||
| 1116 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1117 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1118 | # CONFIG_SMB_FS is not set | ||
| 1119 | # CONFIG_CIFS is not set | ||
| 1120 | # CONFIG_NCP_FS is not set | ||
| 1121 | # CONFIG_CODA_FS is not set | ||
| 1122 | # CONFIG_AFS_FS is not set | ||
| 1123 | |||
| 1124 | # | ||
| 1125 | # Partition Types | ||
| 1126 | # | ||
| 1127 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 1128 | CONFIG_MSDOS_PARTITION=y | ||
| 1129 | CONFIG_NLS=y | ||
| 1130 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1131 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
| 1132 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1133 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1134 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 1135 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1136 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1137 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1138 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1139 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1140 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1141 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1142 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1143 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1144 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1145 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1146 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1147 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1148 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1149 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1150 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1151 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1152 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1153 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1154 | # CONFIG_NLS_ASCII is not set | ||
| 1155 | # CONFIG_NLS_ISO8859_1 is not set | ||
| 1156 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 1157 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1158 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1159 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1160 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1161 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1162 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1163 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1164 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1165 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1166 | # CONFIG_NLS_KOI8_R is not set | ||
| 1167 | # CONFIG_NLS_KOI8_U is not set | ||
| 1168 | # CONFIG_NLS_UTF8 is not set | ||
| 1169 | # CONFIG_DLM is not set | ||
| 1170 | |||
| 1171 | # | ||
| 1172 | # Kernel hacking | ||
| 1173 | # | ||
| 1174 | # CONFIG_PRINTK_TIME is not set | ||
| 1175 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
| 1176 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
| 1177 | CONFIG_FRAME_WARN=1024 | ||
| 1178 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 1179 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1180 | # CONFIG_DEBUG_FS is not set | ||
| 1181 | # CONFIG_HEADERS_CHECK is not set | ||
| 1182 | # CONFIG_DEBUG_KERNEL is not set | ||
| 1183 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 1184 | # CONFIG_SLUB_STATS is not set | ||
| 1185 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1186 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1187 | CONFIG_FRAME_POINTER=y | ||
| 1188 | # CONFIG_LATENCYTOP is not set | ||
| 1189 | CONFIG_HAVE_FTRACE=y | ||
| 1190 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 1191 | # CONFIG_FTRACE is not set | ||
| 1192 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 1193 | # CONFIG_SCHED_TRACER is not set | ||
| 1194 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1195 | # CONFIG_SAMPLES is not set | ||
| 1196 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1197 | # CONFIG_DEBUG_USER is not set | ||
| 1198 | |||
| 1199 | # | ||
| 1200 | # Security options | ||
| 1201 | # | ||
| 1202 | # CONFIG_KEYS is not set | ||
| 1203 | # CONFIG_SECURITY is not set | ||
| 1204 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1205 | CONFIG_CRYPTO=y | ||
| 1206 | |||
| 1207 | # | ||
| 1208 | # Crypto core or helper | ||
| 1209 | # | ||
| 1210 | # CONFIG_CRYPTO_MANAGER is not set | ||
| 1211 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1212 | # CONFIG_CRYPTO_NULL is not set | ||
| 1213 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1214 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1215 | # CONFIG_CRYPTO_TEST is not set | ||
| 1216 | |||
| 1217 | # | ||
| 1218 | # Authenticated Encryption with Associated Data | ||
| 1219 | # | ||
| 1220 | # CONFIG_CRYPTO_CCM is not set | ||
| 1221 | # CONFIG_CRYPTO_GCM is not set | ||
| 1222 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1223 | |||
| 1224 | # | ||
| 1225 | # Block modes | ||
| 1226 | # | ||
| 1227 | # CONFIG_CRYPTO_CBC is not set | ||
| 1228 | # CONFIG_CRYPTO_CTR is not set | ||
| 1229 | # CONFIG_CRYPTO_CTS is not set | ||
| 1230 | # CONFIG_CRYPTO_ECB is not set | ||
| 1231 | # CONFIG_CRYPTO_LRW is not set | ||
| 1232 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1233 | # CONFIG_CRYPTO_XTS is not set | ||
| 1234 | |||
| 1235 | # | ||
| 1236 | # Hash modes | ||
| 1237 | # | ||
| 1238 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1239 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1240 | |||
| 1241 | # | ||
| 1242 | # Digest | ||
| 1243 | # | ||
| 1244 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1245 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1246 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1247 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1248 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1249 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1250 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1251 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1252 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1253 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1254 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1255 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1256 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1257 | |||
| 1258 | # | ||
| 1259 | # Ciphers | ||
| 1260 | # | ||
| 1261 | # CONFIG_CRYPTO_AES is not set | ||
| 1262 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1263 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1264 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1265 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1266 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1267 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1268 | # CONFIG_CRYPTO_DES is not set | ||
| 1269 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1270 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1271 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1272 | # CONFIG_CRYPTO_SEED is not set | ||
| 1273 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1274 | # CONFIG_CRYPTO_TEA is not set | ||
| 1275 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1276 | |||
| 1277 | # | ||
| 1278 | # Compression | ||
| 1279 | # | ||
| 1280 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1281 | # CONFIG_CRYPTO_LZO is not set | ||
| 1282 | # CONFIG_CRYPTO_HW is not set | ||
| 1283 | |||
| 1284 | # | ||
| 1285 | # Library routines | ||
| 1286 | # | ||
| 1287 | CONFIG_BITREVERSE=y | ||
| 1288 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1289 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1290 | # CONFIG_CRC_CCITT is not set | ||
| 1291 | # CONFIG_CRC16 is not set | ||
| 1292 | # CONFIG_CRC_T10DIF is not set | ||
| 1293 | # CONFIG_CRC_ITU_T is not set | ||
| 1294 | CONFIG_CRC32=y | ||
| 1295 | # CONFIG_CRC7 is not set | ||
| 1296 | # CONFIG_LIBCRC32C is not set | ||
| 1297 | CONFIG_ZLIB_INFLATE=y | ||
| 1298 | CONFIG_ZLIB_DEFLATE=y | ||
| 1299 | CONFIG_PLIST=y | ||
| 1300 | CONFIG_HAS_IOMEM=y | ||
| 1301 | CONFIG_HAS_IOPORT=y | ||
| 1302 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig index 0c09b23167ec..cd29824d791c 100644 --- a/arch/arm/configs/realview-smp_defconfig +++ b/arch/arm/configs/realview-smp_defconfig | |||
| @@ -1,84 +1,111 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.19-rc3 | 3 | # Linux kernel version: 2.6.28-rc2 |
| 4 | # Wed Oct 25 14:12:00 2006 | 4 | # Mon Nov 10 14:41:47 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | # CONFIG_GENERIC_TIME is not set | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| 8 | # CONFIG_GENERIC_GPIO is not set | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 8 | CONFIG_MMU=y | 11 | CONFIG_MMU=y |
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 9 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 10 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 11 | CONFIG_HARDIRQS_SW_RESEND=y | 17 | CONFIG_HARDIRQS_SW_RESEND=y |
| 12 | CONFIG_GENERIC_IRQ_PROBE=y | 18 | CONFIG_GENERIC_IRQ_PROBE=y |
| 13 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 14 | CONFIG_GENERIC_HWEIGHT=y | 22 | CONFIG_GENERIC_HWEIGHT=y |
| 15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 24 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 16 | CONFIG_VECTORS_BASE=0xffff0000 | 25 | CONFIG_VECTORS_BASE=0xffff0000 |
| 17 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 18 | 27 | ||
| 19 | # | 28 | # |
| 20 | # Code maturity level options | 29 | # General setup |
| 21 | # | 30 | # |
| 22 | CONFIG_EXPERIMENTAL=y | 31 | CONFIG_EXPERIMENTAL=y |
| 23 | CONFIG_LOCK_KERNEL=y | 32 | CONFIG_LOCK_KERNEL=y |
| 24 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 33 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 25 | |||
| 26 | # | ||
| 27 | # General setup | ||
| 28 | # | ||
| 29 | CONFIG_LOCALVERSION="" | 34 | CONFIG_LOCALVERSION="" |
| 30 | CONFIG_LOCALVERSION_AUTO=y | 35 | CONFIG_LOCALVERSION_AUTO=y |
| 31 | # CONFIG_SWAP is not set | 36 | # CONFIG_SWAP is not set |
| 32 | CONFIG_SYSVIPC=y | 37 | CONFIG_SYSVIPC=y |
| 33 | # CONFIG_IPC_NS is not set | 38 | CONFIG_SYSVIPC_SYSCTL=y |
| 34 | # CONFIG_POSIX_MQUEUE is not set | 39 | # CONFIG_POSIX_MQUEUE is not set |
| 35 | # CONFIG_BSD_PROCESS_ACCT is not set | 40 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 36 | # CONFIG_TASKSTATS is not set | 41 | # CONFIG_TASKSTATS is not set |
| 37 | # CONFIG_UTS_NS is not set | ||
| 38 | # CONFIG_AUDIT is not set | 42 | # CONFIG_AUDIT is not set |
| 39 | # CONFIG_IKCONFIG is not set | 43 | # CONFIG_IKCONFIG is not set |
| 40 | # CONFIG_CPUSETS is not set | 44 | CONFIG_LOG_BUF_SHIFT=14 |
| 45 | # CONFIG_CGROUPS is not set | ||
| 46 | # CONFIG_GROUP_SCHED is not set | ||
| 47 | CONFIG_SYSFS_DEPRECATED=y | ||
| 48 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 41 | # CONFIG_RELAY is not set | 49 | # CONFIG_RELAY is not set |
| 42 | CONFIG_INITRAMFS_SOURCE="" | 50 | CONFIG_NAMESPACES=y |
| 51 | # CONFIG_UTS_NS is not set | ||
| 52 | # CONFIG_IPC_NS is not set | ||
| 53 | # CONFIG_USER_NS is not set | ||
| 54 | # CONFIG_PID_NS is not set | ||
| 55 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 43 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 44 | CONFIG_SYSCTL=y | 57 | CONFIG_SYSCTL=y |
| 45 | # CONFIG_EMBEDDED is not set | 58 | # CONFIG_EMBEDDED is not set |
| 46 | CONFIG_UID16=y | 59 | CONFIG_UID16=y |
| 47 | # CONFIG_SYSCTL_SYSCALL is not set | 60 | CONFIG_SYSCTL_SYSCALL=y |
| 48 | CONFIG_KALLSYMS=y | 61 | CONFIG_KALLSYMS=y |
| 49 | CONFIG_KALLSYMS_ALL=y | 62 | # CONFIG_KALLSYMS_ALL is not set |
| 50 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 51 | CONFIG_HOTPLUG=y | 64 | CONFIG_HOTPLUG=y |
| 52 | CONFIG_PRINTK=y | 65 | CONFIG_PRINTK=y |
| 53 | CONFIG_BUG=y | 66 | CONFIG_BUG=y |
| 54 | CONFIG_ELF_CORE=y | 67 | CONFIG_ELF_CORE=y |
| 68 | CONFIG_COMPAT_BRK=y | ||
| 55 | CONFIG_BASE_FULL=y | 69 | CONFIG_BASE_FULL=y |
| 56 | CONFIG_FUTEX=y | 70 | CONFIG_FUTEX=y |
| 71 | CONFIG_ANON_INODES=y | ||
| 57 | CONFIG_EPOLL=y | 72 | CONFIG_EPOLL=y |
| 73 | CONFIG_SIGNALFD=y | ||
| 74 | CONFIG_TIMERFD=y | ||
| 75 | CONFIG_EVENTFD=y | ||
| 58 | CONFIG_SHMEM=y | 76 | CONFIG_SHMEM=y |
| 59 | CONFIG_SLAB=y | 77 | CONFIG_AIO=y |
| 60 | CONFIG_VM_EVENT_COUNTERS=y | 78 | CONFIG_VM_EVENT_COUNTERS=y |
| 79 | CONFIG_SLAB=y | ||
| 80 | # CONFIG_SLUB is not set | ||
| 81 | # CONFIG_SLOB is not set | ||
| 82 | # CONFIG_PROFILING is not set | ||
| 83 | # CONFIG_MARKERS is not set | ||
| 84 | CONFIG_HAVE_OPROFILE=y | ||
| 85 | # CONFIG_KPROBES is not set | ||
| 86 | CONFIG_HAVE_KPROBES=y | ||
| 87 | CONFIG_HAVE_KRETPROBES=y | ||
| 88 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
| 89 | CONFIG_HAVE_CLK=y | ||
| 90 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 91 | CONFIG_SLABINFO=y | ||
| 61 | CONFIG_RT_MUTEXES=y | 92 | CONFIG_RT_MUTEXES=y |
| 62 | # CONFIG_TINY_SHMEM is not set | 93 | # CONFIG_TINY_SHMEM is not set |
| 63 | CONFIG_BASE_SMALL=0 | 94 | CONFIG_BASE_SMALL=0 |
| 64 | # CONFIG_SLOB is not set | ||
| 65 | |||
| 66 | # | ||
| 67 | # Loadable module support | ||
| 68 | # | ||
| 69 | CONFIG_MODULES=y | 95 | CONFIG_MODULES=y |
| 96 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 70 | CONFIG_MODULE_UNLOAD=y | 97 | CONFIG_MODULE_UNLOAD=y |
| 71 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 72 | # CONFIG_MODVERSIONS is not set | 99 | # CONFIG_MODVERSIONS is not set |
| 73 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 74 | # CONFIG_KMOD is not set | 101 | CONFIG_KMOD=y |
| 75 | CONFIG_STOP_MACHINE=y | 102 | CONFIG_STOP_MACHINE=y |
| 76 | |||
| 77 | # | ||
| 78 | # Block layer | ||
| 79 | # | ||
| 80 | CONFIG_BLOCK=y | 103 | CONFIG_BLOCK=y |
| 104 | # CONFIG_LBD is not set | ||
| 81 | # CONFIG_BLK_DEV_IO_TRACE is not set | 105 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 106 | # CONFIG_LSF is not set | ||
| 107 | # CONFIG_BLK_DEV_BSG is not set | ||
| 108 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 82 | 109 | ||
| 83 | # | 110 | # |
| 84 | # IO Schedulers | 111 | # IO Schedulers |
| @@ -92,6 +119,8 @@ CONFIG_DEFAULT_DEADLINE=y | |||
| 92 | # CONFIG_DEFAULT_CFQ is not set | 119 | # CONFIG_DEFAULT_CFQ is not set |
| 93 | # CONFIG_DEFAULT_NOOP is not set | 120 | # CONFIG_DEFAULT_NOOP is not set |
| 94 | CONFIG_DEFAULT_IOSCHED="deadline" | 121 | CONFIG_DEFAULT_IOSCHED="deadline" |
| 122 | CONFIG_CLASSIC_RCU=y | ||
| 123 | # CONFIG_FREEZER is not set | ||
| 95 | 124 | ||
| 96 | # | 125 | # |
| 97 | # System Type | 126 | # System Type |
| @@ -103,19 +132,26 @@ CONFIG_ARCH_REALVIEW=y | |||
| 103 | # CONFIG_ARCH_AT91 is not set | 132 | # CONFIG_ARCH_AT91 is not set |
| 104 | # CONFIG_ARCH_CLPS7500 is not set | 133 | # CONFIG_ARCH_CLPS7500 is not set |
| 105 | # CONFIG_ARCH_CLPS711X is not set | 134 | # CONFIG_ARCH_CLPS711X is not set |
| 106 | # CONFIG_ARCH_CO285 is not set | ||
| 107 | # CONFIG_ARCH_EBSA110 is not set | 135 | # CONFIG_ARCH_EBSA110 is not set |
| 108 | # CONFIG_ARCH_EP93XX is not set | 136 | # CONFIG_ARCH_EP93XX is not set |
| 109 | # CONFIG_ARCH_FOOTBRIDGE is not set | 137 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| 110 | # CONFIG_ARCH_NETX is not set | 138 | # CONFIG_ARCH_NETX is not set |
| 111 | # CONFIG_ARCH_H720X is not set | 139 | # CONFIG_ARCH_H720X is not set |
| 112 | # CONFIG_ARCH_IMX is not set | 140 | # CONFIG_ARCH_IMX is not set |
| 141 | # CONFIG_ARCH_IOP13XX is not set | ||
| 113 | # CONFIG_ARCH_IOP32X is not set | 142 | # CONFIG_ARCH_IOP32X is not set |
| 114 | # CONFIG_ARCH_IOP33X is not set | 143 | # CONFIG_ARCH_IOP33X is not set |
| 115 | # CONFIG_ARCH_IXP4XX is not set | ||
| 116 | # CONFIG_ARCH_IXP2000 is not set | ||
| 117 | # CONFIG_ARCH_IXP23XX is not set | 144 | # CONFIG_ARCH_IXP23XX is not set |
| 145 | # CONFIG_ARCH_IXP2000 is not set | ||
| 146 | # CONFIG_ARCH_IXP4XX is not set | ||
| 118 | # CONFIG_ARCH_L7200 is not set | 147 | # CONFIG_ARCH_L7200 is not set |
| 148 | # CONFIG_ARCH_KIRKWOOD is not set | ||
| 149 | # CONFIG_ARCH_KS8695 is not set | ||
| 150 | # CONFIG_ARCH_NS9XXX is not set | ||
| 151 | # CONFIG_ARCH_LOKI is not set | ||
| 152 | # CONFIG_ARCH_MV78XX0 is not set | ||
| 153 | # CONFIG_ARCH_MXC is not set | ||
| 154 | # CONFIG_ARCH_ORION5X is not set | ||
| 119 | # CONFIG_ARCH_PNX4008 is not set | 155 | # CONFIG_ARCH_PNX4008 is not set |
| 120 | # CONFIG_ARCH_PXA is not set | 156 | # CONFIG_ARCH_PXA is not set |
| 121 | # CONFIG_ARCH_RPC is not set | 157 | # CONFIG_ARCH_RPC is not set |
| @@ -123,13 +159,29 @@ CONFIG_ARCH_REALVIEW=y | |||
| 123 | # CONFIG_ARCH_S3C2410 is not set | 159 | # CONFIG_ARCH_S3C2410 is not set |
| 124 | # CONFIG_ARCH_SHARK is not set | 160 | # CONFIG_ARCH_SHARK is not set |
| 125 | # CONFIG_ARCH_LH7A40X is not set | 161 | # CONFIG_ARCH_LH7A40X is not set |
| 162 | # CONFIG_ARCH_DAVINCI is not set | ||
| 126 | # CONFIG_ARCH_OMAP is not set | 163 | # CONFIG_ARCH_OMAP is not set |
| 164 | # CONFIG_ARCH_MSM is not set | ||
| 165 | |||
| 166 | # | ||
| 167 | # Boot options | ||
| 168 | # | ||
| 169 | |||
| 170 | # | ||
| 171 | # Power management | ||
| 172 | # | ||
| 127 | 173 | ||
| 128 | # | 174 | # |
| 129 | # RealView platform type | 175 | # RealView platform type |
| 130 | # | 176 | # |
| 131 | CONFIG_MACH_REALVIEW_EB=y | 177 | CONFIG_MACH_REALVIEW_EB=y |
| 132 | CONFIG_REALVIEW_MPCORE=y | 178 | # CONFIG_REALVIEW_EB_A9MP is not set |
| 179 | CONFIG_REALVIEW_EB_ARM11MP=y | ||
| 180 | # CONFIG_REALVIEW_EB_ARM11MP_REVB is not set | ||
| 181 | CONFIG_MACH_REALVIEW_PB11MP=y | ||
| 182 | # CONFIG_MACH_REALVIEW_PB1176 is not set | ||
| 183 | # CONFIG_MACH_REALVIEW_PBA8 is not set | ||
| 184 | CONFIG_REALVIEW_HIGH_PHYS_OFFSET=y | ||
| 133 | 185 | ||
| 134 | # | 186 | # |
| 135 | # Processor Type | 187 | # Processor Type |
| @@ -138,12 +190,15 @@ CONFIG_CPU_32=y | |||
| 138 | # CONFIG_CPU_ARM926T is not set | 190 | # CONFIG_CPU_ARM926T is not set |
| 139 | CONFIG_CPU_V6=y | 191 | CONFIG_CPU_V6=y |
| 140 | CONFIG_CPU_32v6K=y | 192 | CONFIG_CPU_32v6K=y |
| 193 | # CONFIG_CPU_V7 is not set | ||
| 141 | CONFIG_CPU_32v6=y | 194 | CONFIG_CPU_32v6=y |
| 142 | CONFIG_CPU_ABRT_EV6=y | 195 | CONFIG_CPU_ABRT_EV6=y |
| 196 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 143 | CONFIG_CPU_CACHE_V6=y | 197 | CONFIG_CPU_CACHE_V6=y |
| 144 | CONFIG_CPU_CACHE_VIPT=y | 198 | CONFIG_CPU_CACHE_VIPT=y |
| 145 | CONFIG_CPU_COPY_V6=y | 199 | CONFIG_CPU_COPY_V6=y |
| 146 | CONFIG_CPU_TLB_V6=y | 200 | CONFIG_CPU_TLB_V6=y |
| 201 | CONFIG_CPU_HAS_ASID=y | ||
| 147 | CONFIG_CPU_CP15=y | 202 | CONFIG_CPU_CP15=y |
| 148 | CONFIG_CPU_CP15_MMU=y | 203 | CONFIG_CPU_CP15_MMU=y |
| 149 | 204 | ||
| @@ -153,9 +208,10 @@ CONFIG_CPU_CP15_MMU=y | |||
| 153 | CONFIG_ARM_THUMB=y | 208 | CONFIG_ARM_THUMB=y |
| 154 | # CONFIG_CPU_ICACHE_DISABLE is not set | 209 | # CONFIG_CPU_ICACHE_DISABLE is not set |
| 155 | # CONFIG_CPU_DCACHE_DISABLE is not set | 210 | # CONFIG_CPU_DCACHE_DISABLE is not set |
| 156 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 157 | # CONFIG_CPU_BPREDICT_DISABLE is not set | 211 | # CONFIG_CPU_BPREDICT_DISABLE is not set |
| 158 | CONFIG_HAS_TLS_REG=y | 212 | CONFIG_HAS_TLS_REG=y |
| 213 | CONFIG_OUTER_CACHE=y | ||
| 214 | CONFIG_CACHE_L2X0=y | ||
| 159 | CONFIG_ARM_GIC=y | 215 | CONFIG_ARM_GIC=y |
| 160 | CONFIG_ICST307=y | 216 | CONFIG_ICST307=y |
| 161 | 217 | ||
| @@ -163,32 +219,44 @@ CONFIG_ICST307=y | |||
| 163 | # Bus support | 219 | # Bus support |
| 164 | # | 220 | # |
| 165 | CONFIG_ARM_AMBA=y | 221 | CONFIG_ARM_AMBA=y |
| 166 | 222 | # CONFIG_PCI_SYSCALL is not set | |
| 167 | # | 223 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 168 | # PCCARD (PCMCIA/CardBus) support | ||
| 169 | # | ||
| 170 | # CONFIG_PCCARD is not set | 224 | # CONFIG_PCCARD is not set |
| 171 | 225 | ||
| 172 | # | 226 | # |
| 173 | # Kernel Features | 227 | # Kernel Features |
| 174 | # | 228 | # |
| 229 | # CONFIG_NO_HZ is not set | ||
| 230 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 231 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 175 | CONFIG_SMP=y | 232 | CONFIG_SMP=y |
| 233 | CONFIG_VMSPLIT_3G=y | ||
| 234 | # CONFIG_VMSPLIT_2G is not set | ||
| 235 | # CONFIG_VMSPLIT_1G is not set | ||
| 236 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
| 176 | CONFIG_NR_CPUS=4 | 237 | CONFIG_NR_CPUS=4 |
| 177 | CONFIG_HOTPLUG_CPU=y | 238 | CONFIG_HOTPLUG_CPU=y |
| 178 | CONFIG_LOCAL_TIMERS=y | 239 | CONFIG_LOCAL_TIMERS=y |
| 179 | # CONFIG_PREEMPT is not set | 240 | # CONFIG_PREEMPT is not set |
| 180 | CONFIG_HZ=100 | 241 | CONFIG_HZ=100 |
| 181 | # CONFIG_AEABI is not set | 242 | CONFIG_AEABI=y |
| 182 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 243 | CONFIG_OABI_COMPAT=y |
| 244 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
| 245 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | ||
| 246 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | ||
| 183 | CONFIG_SELECT_MEMORY_MODEL=y | 247 | CONFIG_SELECT_MEMORY_MODEL=y |
| 184 | CONFIG_FLATMEM_MANUAL=y | 248 | CONFIG_FLATMEM_MANUAL=y |
| 185 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 249 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 186 | # CONFIG_SPARSEMEM_MANUAL is not set | 250 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 187 | CONFIG_FLATMEM=y | 251 | CONFIG_FLATMEM=y |
| 188 | CONFIG_FLAT_NODE_MEM_MAP=y | 252 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 189 | # CONFIG_SPARSEMEM_STATIC is not set | 253 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 190 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 254 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 191 | # CONFIG_RESOURCES_64BIT is not set | 255 | # CONFIG_RESOURCES_64BIT is not set |
| 256 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 257 | CONFIG_ZONE_DMA_FLAG=0 | ||
| 258 | CONFIG_VIRT_TO_BUS=y | ||
| 259 | CONFIG_UNEVICTABLE_LRU=y | ||
| 192 | CONFIG_ALIGNMENT_TRAP=y | 260 | CONFIG_ALIGNMENT_TRAP=y |
| 193 | 261 | ||
| 194 | # | 262 | # |
| @@ -198,6 +266,12 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 | |||
| 198 | CONFIG_ZBOOT_ROM_BSS=0x0 | 266 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 199 | CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" | 267 | CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" |
| 200 | # CONFIG_XIP_KERNEL is not set | 268 | # CONFIG_XIP_KERNEL is not set |
| 269 | # CONFIG_KEXEC is not set | ||
| 270 | |||
| 271 | # | ||
| 272 | # CPU Power Management | ||
| 273 | # | ||
| 274 | # CONFIG_CPU_IDLE is not set | ||
| 201 | 275 | ||
| 202 | # | 276 | # |
| 203 | # Floating point emulation | 277 | # Floating point emulation |
| @@ -206,8 +280,7 @@ CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=tt | |||
| 206 | # | 280 | # |
| 207 | # At least one emulation must be selected | 281 | # At least one emulation must be selected |
| 208 | # | 282 | # |
| 209 | CONFIG_FPE_NWFPE=y | 283 | # CONFIG_FPE_NWFPE is not set |
| 210 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 211 | # CONFIG_FPE_FASTFPE is not set | 284 | # CONFIG_FPE_FASTFPE is not set |
| 212 | CONFIG_VFP=y | 285 | CONFIG_VFP=y |
| 213 | 286 | ||
| @@ -215,28 +288,29 @@ CONFIG_VFP=y | |||
| 215 | # Userspace binary formats | 288 | # Userspace binary formats |
| 216 | # | 289 | # |
| 217 | CONFIG_BINFMT_ELF=y | 290 | CONFIG_BINFMT_ELF=y |
| 291 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 292 | CONFIG_HAVE_AOUT=y | ||
| 218 | # CONFIG_BINFMT_AOUT is not set | 293 | # CONFIG_BINFMT_AOUT is not set |
| 219 | # CONFIG_BINFMT_MISC is not set | 294 | # CONFIG_BINFMT_MISC is not set |
| 220 | # CONFIG_ARTHUR is not set | ||
| 221 | 295 | ||
| 222 | # | 296 | # |
| 223 | # Power management options | 297 | # Power management options |
| 224 | # | 298 | # |
| 225 | # CONFIG_PM is not set | 299 | # CONFIG_PM is not set |
| 226 | # CONFIG_APM is not set | 300 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 227 | |||
| 228 | # | ||
| 229 | # Networking | ||
| 230 | # | ||
| 231 | CONFIG_NET=y | 301 | CONFIG_NET=y |
| 232 | 302 | ||
| 233 | # | 303 | # |
| 234 | # Networking options | 304 | # Networking options |
| 235 | # | 305 | # |
| 236 | # CONFIG_NETDEBUG is not set | ||
| 237 | CONFIG_PACKET=y | 306 | CONFIG_PACKET=y |
| 238 | # CONFIG_PACKET_MMAP is not set | 307 | # CONFIG_PACKET_MMAP is not set |
| 239 | CONFIG_UNIX=y | 308 | CONFIG_UNIX=y |
| 309 | CONFIG_XFRM=y | ||
| 310 | # CONFIG_XFRM_USER is not set | ||
| 311 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 312 | # CONFIG_XFRM_MIGRATE is not set | ||
| 313 | # CONFIG_XFRM_STATISTICS is not set | ||
| 240 | # CONFIG_NET_KEY is not set | 314 | # CONFIG_NET_KEY is not set |
| 241 | CONFIG_INET=y | 315 | CONFIG_INET=y |
| 242 | # CONFIG_IP_MULTICAST is not set | 316 | # CONFIG_IP_MULTICAST is not set |
| @@ -255,36 +329,25 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 255 | # CONFIG_INET_IPCOMP is not set | 329 | # CONFIG_INET_IPCOMP is not set |
| 256 | # CONFIG_INET_XFRM_TUNNEL is not set | 330 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 257 | # CONFIG_INET_TUNNEL is not set | 331 | # CONFIG_INET_TUNNEL is not set |
| 258 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 332 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 259 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 333 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 260 | # CONFIG_INET_XFRM_MODE_BEET is not set | 334 | CONFIG_INET_XFRM_MODE_BEET=y |
| 335 | # CONFIG_INET_LRO is not set | ||
| 261 | CONFIG_INET_DIAG=y | 336 | CONFIG_INET_DIAG=y |
| 262 | CONFIG_INET_TCP_DIAG=y | 337 | CONFIG_INET_TCP_DIAG=y |
| 263 | # CONFIG_TCP_CONG_ADVANCED is not set | 338 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 264 | CONFIG_TCP_CONG_CUBIC=y | 339 | CONFIG_TCP_CONG_CUBIC=y |
| 265 | CONFIG_DEFAULT_TCP_CONG="cubic" | 340 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 341 | # CONFIG_TCP_MD5SIG is not set | ||
| 266 | # CONFIG_IPV6 is not set | 342 | # CONFIG_IPV6 is not set |
| 267 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 268 | # CONFIG_INET6_TUNNEL is not set | ||
| 269 | # CONFIG_NETWORK_SECMARK is not set | 343 | # CONFIG_NETWORK_SECMARK is not set |
| 270 | # CONFIG_NETFILTER is not set | 344 | # CONFIG_NETFILTER is not set |
| 271 | |||
| 272 | # | ||
| 273 | # DCCP Configuration (EXPERIMENTAL) | ||
| 274 | # | ||
| 275 | # CONFIG_IP_DCCP is not set | 345 | # CONFIG_IP_DCCP is not set |
| 276 | |||
| 277 | # | ||
| 278 | # SCTP Configuration (EXPERIMENTAL) | ||
| 279 | # | ||
| 280 | # CONFIG_IP_SCTP is not set | 346 | # CONFIG_IP_SCTP is not set |
| 281 | |||
| 282 | # | ||
| 283 | # TIPC Configuration (EXPERIMENTAL) | ||
| 284 | # | ||
| 285 | # CONFIG_TIPC is not set | 347 | # CONFIG_TIPC is not set |
| 286 | # CONFIG_ATM is not set | 348 | # CONFIG_ATM is not set |
| 287 | # CONFIG_BRIDGE is not set | 349 | # CONFIG_BRIDGE is not set |
| 350 | # CONFIG_NET_DSA is not set | ||
| 288 | # CONFIG_VLAN_8021Q is not set | 351 | # CONFIG_VLAN_8021Q is not set |
| 289 | # CONFIG_DECNET is not set | 352 | # CONFIG_DECNET is not set |
| 290 | # CONFIG_LLC2 is not set | 353 | # CONFIG_LLC2 is not set |
| @@ -294,10 +357,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 294 | # CONFIG_LAPB is not set | 357 | # CONFIG_LAPB is not set |
| 295 | # CONFIG_ECONET is not set | 358 | # CONFIG_ECONET is not set |
| 296 | # CONFIG_WAN_ROUTER is not set | 359 | # CONFIG_WAN_ROUTER is not set |
| 297 | |||
| 298 | # | ||
| 299 | # QoS and/or fair queueing | ||
| 300 | # | ||
| 301 | # CONFIG_NET_SCHED is not set | 360 | # CONFIG_NET_SCHED is not set |
| 302 | 361 | ||
| 303 | # | 362 | # |
| @@ -305,9 +364,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 305 | # | 364 | # |
| 306 | # CONFIG_NET_PKTGEN is not set | 365 | # CONFIG_NET_PKTGEN is not set |
| 307 | # CONFIG_HAMRADIO is not set | 366 | # CONFIG_HAMRADIO is not set |
| 367 | # CONFIG_CAN is not set | ||
| 308 | # CONFIG_IRDA is not set | 368 | # CONFIG_IRDA is not set |
| 309 | # CONFIG_BT is not set | 369 | # CONFIG_BT is not set |
| 310 | # CONFIG_IEEE80211 is not set | 370 | # CONFIG_AF_RXRPC is not set |
| 371 | # CONFIG_PHONET is not set | ||
| 372 | # CONFIG_WIRELESS is not set | ||
| 373 | # CONFIG_RFKILL is not set | ||
| 374 | # CONFIG_NET_9P is not set | ||
| 311 | 375 | ||
| 312 | # | 376 | # |
| 313 | # Device Drivers | 377 | # Device Drivers |
| @@ -316,38 +380,37 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 316 | # | 380 | # |
| 317 | # Generic Driver Options | 381 | # Generic Driver Options |
| 318 | # | 382 | # |
| 383 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 319 | CONFIG_STANDALONE=y | 384 | CONFIG_STANDALONE=y |
| 320 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 385 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 321 | # CONFIG_FW_LOADER is not set | 386 | CONFIG_FW_LOADER=y |
| 387 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 388 | CONFIG_EXTRA_FIRMWARE="" | ||
| 322 | # CONFIG_DEBUG_DRIVER is not set | 389 | # CONFIG_DEBUG_DRIVER is not set |
| 390 | # CONFIG_DEBUG_DEVRES is not set | ||
| 323 | # CONFIG_SYS_HYPERVISOR is not set | 391 | # CONFIG_SYS_HYPERVISOR is not set |
| 324 | |||
| 325 | # | ||
| 326 | # Connector - unified userspace <-> kernelspace linker | ||
| 327 | # | ||
| 328 | # CONFIG_CONNECTOR is not set | 392 | # CONFIG_CONNECTOR is not set |
| 329 | |||
| 330 | # | ||
| 331 | # Memory Technology Devices (MTD) | ||
| 332 | # | ||
| 333 | CONFIG_MTD=y | 393 | CONFIG_MTD=y |
| 334 | # CONFIG_MTD_DEBUG is not set | 394 | # CONFIG_MTD_DEBUG is not set |
| 335 | # CONFIG_MTD_CONCAT is not set | 395 | CONFIG_MTD_CONCAT=y |
| 336 | CONFIG_MTD_PARTITIONS=y | 396 | CONFIG_MTD_PARTITIONS=y |
| 337 | # CONFIG_MTD_REDBOOT_PARTS is not set | 397 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 338 | CONFIG_MTD_CMDLINE_PARTS=y | 398 | CONFIG_MTD_CMDLINE_PARTS=y |
| 339 | # CONFIG_MTD_AFS_PARTS is not set | 399 | # CONFIG_MTD_AFS_PARTS is not set |
| 400 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 340 | 401 | ||
| 341 | # | 402 | # |
| 342 | # User Modules And Translation Layers | 403 | # User Modules And Translation Layers |
| 343 | # | 404 | # |
| 344 | CONFIG_MTD_CHAR=y | 405 | CONFIG_MTD_CHAR=y |
| 406 | CONFIG_MTD_BLKDEVS=y | ||
| 345 | CONFIG_MTD_BLOCK=y | 407 | CONFIG_MTD_BLOCK=y |
| 346 | # CONFIG_FTL is not set | 408 | # CONFIG_FTL is not set |
| 347 | # CONFIG_NFTL is not set | 409 | # CONFIG_NFTL is not set |
| 348 | # CONFIG_INFTL is not set | 410 | # CONFIG_INFTL is not set |
| 349 | # CONFIG_RFD_FTL is not set | 411 | # CONFIG_RFD_FTL is not set |
| 350 | # CONFIG_SSFDC is not set | 412 | # CONFIG_SSFDC is not set |
| 413 | # CONFIG_MTD_OOPS is not set | ||
| 351 | 414 | ||
| 352 | # | 415 | # |
| 353 | # RAM/ROM/Flash chip drivers | 416 | # RAM/ROM/Flash chip drivers |
| @@ -373,7 +436,6 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 373 | # CONFIG_MTD_RAM is not set | 436 | # CONFIG_MTD_RAM is not set |
| 374 | # CONFIG_MTD_ROM is not set | 437 | # CONFIG_MTD_ROM is not set |
| 375 | # CONFIG_MTD_ABSENT is not set | 438 | # CONFIG_MTD_ABSENT is not set |
| 376 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
| 377 | 439 | ||
| 378 | # | 440 | # |
| 379 | # Mapping drivers for chip access | 441 | # Mapping drivers for chip access |
| @@ -397,115 +459,73 @@ CONFIG_MTD_ARM_INTEGRATOR=y | |||
| 397 | # CONFIG_MTD_DOC2000 is not set | 459 | # CONFIG_MTD_DOC2000 is not set |
| 398 | # CONFIG_MTD_DOC2001 is not set | 460 | # CONFIG_MTD_DOC2001 is not set |
| 399 | # CONFIG_MTD_DOC2001PLUS is not set | 461 | # CONFIG_MTD_DOC2001PLUS is not set |
| 400 | |||
| 401 | # | ||
| 402 | # NAND Flash Device Drivers | ||
| 403 | # | ||
| 404 | # CONFIG_MTD_NAND is not set | 462 | # CONFIG_MTD_NAND is not set |
| 405 | |||
| 406 | # | ||
| 407 | # OneNAND Flash Device Drivers | ||
| 408 | # | ||
| 409 | # CONFIG_MTD_ONENAND is not set | 463 | # CONFIG_MTD_ONENAND is not set |
| 410 | 464 | ||
| 411 | # | 465 | # |
| 412 | # Parallel port support | 466 | # UBI - Unsorted block images |
| 413 | # | 467 | # |
| 468 | # CONFIG_MTD_UBI is not set | ||
| 414 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
| 415 | 470 | CONFIG_BLK_DEV=y | |
| 416 | # | ||
| 417 | # Plug and Play support | ||
| 418 | # | ||
| 419 | |||
| 420 | # | ||
| 421 | # Block devices | ||
| 422 | # | ||
| 423 | # CONFIG_BLK_DEV_COW_COMMON is not set | 471 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 424 | # CONFIG_BLK_DEV_LOOP is not set | 472 | # CONFIG_BLK_DEV_LOOP is not set |
| 425 | # CONFIG_BLK_DEV_NBD is not set | 473 | # CONFIG_BLK_DEV_NBD is not set |
| 426 | # CONFIG_BLK_DEV_RAM is not set | 474 | # CONFIG_BLK_DEV_RAM is not set |
| 427 | CONFIG_BLK_DEV_INITRD=y | ||
| 428 | # CONFIG_CDROM_PKTCDVD is not set | 475 | # CONFIG_CDROM_PKTCDVD is not set |
| 429 | # CONFIG_ATA_OVER_ETH is not set | 476 | # CONFIG_ATA_OVER_ETH is not set |
| 477 | CONFIG_MISC_DEVICES=y | ||
| 478 | # CONFIG_EEPROM_93CX6 is not set | ||
| 479 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 480 | CONFIG_HAVE_IDE=y | ||
| 481 | # CONFIG_IDE is not set | ||
| 430 | 482 | ||
| 431 | # | 483 | # |
| 432 | # SCSI device support | 484 | # SCSI device support |
| 433 | # | 485 | # |
| 434 | # CONFIG_RAID_ATTRS is not set | 486 | # CONFIG_RAID_ATTRS is not set |
| 435 | # CONFIG_SCSI is not set | 487 | # CONFIG_SCSI is not set |
| 488 | # CONFIG_SCSI_DMA is not set | ||
| 436 | # CONFIG_SCSI_NETLINK is not set | 489 | # CONFIG_SCSI_NETLINK is not set |
| 437 | 490 | # CONFIG_ATA is not set | |
| 438 | # | ||
| 439 | # Multi-device support (RAID and LVM) | ||
| 440 | # | ||
| 441 | # CONFIG_MD is not set | 491 | # CONFIG_MD is not set |
| 442 | |||
| 443 | # | ||
| 444 | # Fusion MPT device support | ||
| 445 | # | ||
| 446 | # CONFIG_FUSION is not set | ||
| 447 | |||
| 448 | # | ||
| 449 | # IEEE 1394 (FireWire) support | ||
| 450 | # | ||
| 451 | |||
| 452 | # | ||
| 453 | # I2O device support | ||
| 454 | # | ||
| 455 | |||
| 456 | # | ||
| 457 | # Network device support | ||
| 458 | # | ||
| 459 | CONFIG_NETDEVICES=y | 492 | CONFIG_NETDEVICES=y |
| 460 | # CONFIG_DUMMY is not set | 493 | # CONFIG_DUMMY is not set |
| 461 | # CONFIG_BONDING is not set | 494 | # CONFIG_BONDING is not set |
| 495 | # CONFIG_MACVLAN is not set | ||
| 462 | # CONFIG_EQUALIZER is not set | 496 | # CONFIG_EQUALIZER is not set |
| 463 | # CONFIG_TUN is not set | 497 | # CONFIG_TUN is not set |
| 464 | 498 | # CONFIG_VETH is not set | |
| 465 | # | ||
| 466 | # PHY device support | ||
| 467 | # | ||
| 468 | # CONFIG_PHYLIB is not set | 499 | # CONFIG_PHYLIB is not set |
| 469 | |||
| 470 | # | ||
| 471 | # Ethernet (10 or 100Mbit) | ||
| 472 | # | ||
| 473 | CONFIG_NET_ETHERNET=y | 500 | CONFIG_NET_ETHERNET=y |
| 474 | CONFIG_MII=y | 501 | CONFIG_MII=y |
| 502 | # CONFIG_AX88796 is not set | ||
| 475 | CONFIG_SMC91X=y | 503 | CONFIG_SMC91X=y |
| 476 | # CONFIG_DM9000 is not set | 504 | # CONFIG_DM9000 is not set |
| 477 | 505 | CONFIG_SMC911X=y | |
| 478 | # | 506 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 479 | # Ethernet (1000 Mbit) | 507 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 480 | # | 508 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 481 | 509 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | |
| 482 | # | 510 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set |
| 483 | # Ethernet (10000 Mbit) | 511 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
| 484 | # | 512 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
| 485 | 513 | # CONFIG_B44 is not set | |
| 486 | # | 514 | # CONFIG_NETDEV_1000 is not set |
| 487 | # Token Ring devices | 515 | # CONFIG_NETDEV_10000 is not set |
| 488 | # | 516 | |
| 489 | 517 | # | |
| 490 | # | 518 | # Wireless LAN |
| 491 | # Wireless LAN (non-hamradio) | 519 | # |
| 492 | # | 520 | # CONFIG_WLAN_PRE80211 is not set |
| 493 | # CONFIG_NET_RADIO is not set | 521 | # CONFIG_WLAN_80211 is not set |
| 494 | 522 | # CONFIG_IWLWIFI_LEDS is not set | |
| 495 | # | ||
| 496 | # Wan interfaces | ||
| 497 | # | ||
| 498 | # CONFIG_WAN is not set | 523 | # CONFIG_WAN is not set |
| 499 | # CONFIG_PPP is not set | 524 | # CONFIG_PPP is not set |
| 500 | # CONFIG_SLIP is not set | 525 | # CONFIG_SLIP is not set |
| 501 | # CONFIG_SHAPER is not set | ||
| 502 | # CONFIG_NETCONSOLE is not set | 526 | # CONFIG_NETCONSOLE is not set |
| 503 | # CONFIG_NETPOLL is not set | 527 | # CONFIG_NETPOLL is not set |
| 504 | # CONFIG_NET_POLL_CONTROLLER is not set | 528 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 505 | |||
| 506 | # | ||
| 507 | # ISDN subsystem | ||
| 508 | # | ||
| 509 | # CONFIG_ISDN is not set | 529 | # CONFIG_ISDN is not set |
| 510 | 530 | ||
| 511 | # | 531 | # |
| @@ -513,6 +533,7 @@ CONFIG_SMC91X=y | |||
| 513 | # | 533 | # |
| 514 | CONFIG_INPUT=y | 534 | CONFIG_INPUT=y |
| 515 | # CONFIG_INPUT_FF_MEMLESS is not set | 535 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 536 | # CONFIG_INPUT_POLLDEV is not set | ||
| 516 | 537 | ||
| 517 | # | 538 | # |
| 518 | # Userland interfaces | 539 | # Userland interfaces |
| @@ -522,7 +543,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 522 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 543 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 523 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 544 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 524 | # CONFIG_INPUT_JOYDEV is not set | 545 | # CONFIG_INPUT_JOYDEV is not set |
| 525 | # CONFIG_INPUT_TSDEV is not set | ||
| 526 | # CONFIG_INPUT_EVDEV is not set | 546 | # CONFIG_INPUT_EVDEV is not set |
| 527 | # CONFIG_INPUT_EVBUG is not set | 547 | # CONFIG_INPUT_EVBUG is not set |
| 528 | 548 | ||
| @@ -538,9 +558,16 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 538 | # CONFIG_KEYBOARD_STOWAWAY is not set | 558 | # CONFIG_KEYBOARD_STOWAWAY is not set |
| 539 | CONFIG_INPUT_MOUSE=y | 559 | CONFIG_INPUT_MOUSE=y |
| 540 | CONFIG_MOUSE_PS2=y | 560 | CONFIG_MOUSE_PS2=y |
| 561 | CONFIG_MOUSE_PS2_ALPS=y | ||
| 562 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
| 563 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
| 564 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 565 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
| 566 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
| 541 | # CONFIG_MOUSE_SERIAL is not set | 567 | # CONFIG_MOUSE_SERIAL is not set |
| 542 | # CONFIG_MOUSE_VSXXXAA is not set | 568 | # CONFIG_MOUSE_VSXXXAA is not set |
| 543 | # CONFIG_INPUT_JOYSTICK is not set | 569 | # CONFIG_INPUT_JOYSTICK is not set |
| 570 | # CONFIG_INPUT_TABLET is not set | ||
| 544 | # CONFIG_INPUT_TOUCHSCREEN is not set | 571 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 545 | # CONFIG_INPUT_MISC is not set | 572 | # CONFIG_INPUT_MISC is not set |
| 546 | 573 | ||
| @@ -558,9 +585,11 @@ CONFIG_SERIO_LIBPS2=y | |||
| 558 | # Character devices | 585 | # Character devices |
| 559 | # | 586 | # |
| 560 | CONFIG_VT=y | 587 | CONFIG_VT=y |
| 588 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 561 | CONFIG_VT_CONSOLE=y | 589 | CONFIG_VT_CONSOLE=y |
| 562 | CONFIG_HW_CONSOLE=y | 590 | CONFIG_HW_CONSOLE=y |
| 563 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 591 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 592 | CONFIG_DEVKMEM=y | ||
| 564 | # CONFIG_SERIAL_NONSTANDARD is not set | 593 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 565 | 594 | ||
| 566 | # | 595 | # |
| @@ -579,97 +608,91 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 579 | CONFIG_UNIX98_PTYS=y | 608 | CONFIG_UNIX98_PTYS=y |
| 580 | CONFIG_LEGACY_PTYS=y | 609 | CONFIG_LEGACY_PTYS=y |
| 581 | CONFIG_LEGACY_PTY_COUNT=16 | 610 | CONFIG_LEGACY_PTY_COUNT=16 |
| 582 | |||
| 583 | # | ||
| 584 | # IPMI | ||
| 585 | # | ||
| 586 | # CONFIG_IPMI_HANDLER is not set | 611 | # CONFIG_IPMI_HANDLER is not set |
| 587 | |||
| 588 | # | ||
| 589 | # Watchdog Cards | ||
| 590 | # | ||
| 591 | # CONFIG_WATCHDOG is not set | ||
| 592 | # CONFIG_HW_RANDOM is not set | 612 | # CONFIG_HW_RANDOM is not set |
| 593 | # CONFIG_NVRAM is not set | 613 | # CONFIG_NVRAM is not set |
| 594 | # CONFIG_DTLK is not set | ||
| 595 | # CONFIG_R3964 is not set | 614 | # CONFIG_R3964 is not set |
| 596 | |||
| 597 | # | ||
| 598 | # Ftape, the floppy tape device driver | ||
| 599 | # | ||
| 600 | # CONFIG_RAW_DRIVER is not set | 615 | # CONFIG_RAW_DRIVER is not set |
| 601 | |||
| 602 | # | ||
| 603 | # TPM devices | ||
| 604 | # | ||
| 605 | # CONFIG_TCG_TPM is not set | 616 | # CONFIG_TCG_TPM is not set |
| 606 | |||
| 607 | # | ||
| 608 | # I2C support | ||
| 609 | # | ||
| 610 | # CONFIG_I2C is not set | 617 | # CONFIG_I2C is not set |
| 611 | |||
| 612 | # | ||
| 613 | # SPI support | ||
| 614 | # | ||
| 615 | # CONFIG_SPI is not set | 618 | # CONFIG_SPI is not set |
| 616 | # CONFIG_SPI_MASTER is not set | ||
| 617 | |||
| 618 | # | ||
| 619 | # Dallas's 1-wire bus | ||
| 620 | # | ||
| 621 | # CONFIG_W1 is not set | 619 | # CONFIG_W1 is not set |
| 622 | 620 | # CONFIG_POWER_SUPPLY is not set | |
| 623 | # | ||
| 624 | # Hardware Monitoring support | ||
| 625 | # | ||
| 626 | # CONFIG_HWMON is not set | 621 | # CONFIG_HWMON is not set |
| 627 | # CONFIG_HWMON_VID is not set | 622 | # CONFIG_THERMAL is not set |
| 628 | 623 | # CONFIG_THERMAL_HWMON is not set | |
| 629 | # | 624 | # CONFIG_WATCHDOG is not set |
| 630 | # Misc devices | ||
| 631 | # | ||
| 632 | # CONFIG_SGI_IOC4 is not set | ||
| 633 | # CONFIG_TIFM_CORE is not set | ||
| 634 | 625 | ||
| 635 | # | 626 | # |
| 636 | # LED devices | 627 | # Sonics Silicon Backplane |
| 637 | # | 628 | # |
| 638 | # CONFIG_NEW_LEDS is not set | 629 | CONFIG_SSB_POSSIBLE=y |
| 630 | # CONFIG_SSB is not set | ||
| 639 | 631 | ||
| 640 | # | 632 | # |
| 641 | # LED drivers | 633 | # Multifunction device drivers |
| 642 | # | 634 | # |
| 635 | # CONFIG_MFD_CORE is not set | ||
| 636 | # CONFIG_MFD_SM501 is not set | ||
| 637 | # CONFIG_HTC_PASIC3 is not set | ||
| 638 | # CONFIG_MFD_TMIO is not set | ||
| 639 | # CONFIG_MFD_T7L66XB is not set | ||
| 640 | # CONFIG_MFD_TC6387XB is not set | ||
| 641 | # CONFIG_MFD_WM8400 is not set | ||
| 643 | 642 | ||
| 644 | # | 643 | # |
| 645 | # LED Triggers | 644 | # Multimedia devices |
| 646 | # | 645 | # |
| 647 | 646 | ||
| 648 | # | 647 | # |
| 649 | # Multimedia devices | 648 | # Multimedia core support |
| 650 | # | 649 | # |
| 651 | # CONFIG_VIDEO_DEV is not set | 650 | # CONFIG_VIDEO_DEV is not set |
| 651 | # CONFIG_DVB_CORE is not set | ||
| 652 | # CONFIG_VIDEO_MEDIA is not set | ||
| 652 | 653 | ||
| 653 | # | 654 | # |
| 654 | # Digital Video Broadcasting Devices | 655 | # Multimedia drivers |
| 655 | # | 656 | # |
| 656 | # CONFIG_DVB is not set | 657 | # CONFIG_DAB is not set |
| 657 | 658 | ||
| 658 | # | 659 | # |
| 659 | # Graphics support | 660 | # Graphics support |
| 660 | # | 661 | # |
| 661 | # CONFIG_FIRMWARE_EDID is not set | 662 | # CONFIG_VGASTATE is not set |
| 663 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 662 | CONFIG_FB=y | 664 | CONFIG_FB=y |
| 665 | # CONFIG_FIRMWARE_EDID is not set | ||
| 666 | # CONFIG_FB_DDC is not set | ||
| 667 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 663 | CONFIG_FB_CFB_FILLRECT=y | 668 | CONFIG_FB_CFB_FILLRECT=y |
| 664 | CONFIG_FB_CFB_COPYAREA=y | 669 | CONFIG_FB_CFB_COPYAREA=y |
| 665 | CONFIG_FB_CFB_IMAGEBLIT=y | 670 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 671 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 672 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 673 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 674 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 675 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 676 | # CONFIG_FB_SYS_FOPS is not set | ||
| 677 | # CONFIG_FB_SVGALIB is not set | ||
| 666 | # CONFIG_FB_MACMODES is not set | 678 | # CONFIG_FB_MACMODES is not set |
| 667 | # CONFIG_FB_BACKLIGHT is not set | 679 | # CONFIG_FB_BACKLIGHT is not set |
| 668 | # CONFIG_FB_MODE_HELPERS is not set | 680 | # CONFIG_FB_MODE_HELPERS is not set |
| 669 | # CONFIG_FB_TILEBLITTING is not set | 681 | # CONFIG_FB_TILEBLITTING is not set |
| 682 | |||
| 683 | # | ||
| 684 | # Frame buffer hardware drivers | ||
| 685 | # | ||
| 670 | CONFIG_FB_ARMCLCD=y | 686 | CONFIG_FB_ARMCLCD=y |
| 671 | # CONFIG_FB_S1D13XXX is not set | 687 | # CONFIG_FB_S1D13XXX is not set |
| 672 | # CONFIG_FB_VIRTUAL is not set | 688 | # CONFIG_FB_VIRTUAL is not set |
| 689 | # CONFIG_FB_METRONOME is not set | ||
| 690 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 691 | |||
| 692 | # | ||
| 693 | # Display device support | ||
| 694 | # | ||
| 695 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 673 | 696 | ||
| 674 | # | 697 | # |
| 675 | # Console display driver support | 698 | # Console display driver support |
| @@ -677,28 +700,17 @@ CONFIG_FB_ARMCLCD=y | |||
| 677 | # CONFIG_VGA_CONSOLE is not set | 700 | # CONFIG_VGA_CONSOLE is not set |
| 678 | CONFIG_DUMMY_CONSOLE=y | 701 | CONFIG_DUMMY_CONSOLE=y |
| 679 | CONFIG_FRAMEBUFFER_CONSOLE=y | 702 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 703 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 680 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 704 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 681 | # CONFIG_FONTS is not set | 705 | # CONFIG_FONTS is not set |
| 682 | CONFIG_FONT_8x8=y | 706 | CONFIG_FONT_8x8=y |
| 683 | CONFIG_FONT_8x16=y | 707 | CONFIG_FONT_8x16=y |
| 684 | |||
| 685 | # | ||
| 686 | # Logo configuration | ||
| 687 | # | ||
| 688 | CONFIG_LOGO=y | 708 | CONFIG_LOGO=y |
| 689 | # CONFIG_LOGO_LINUX_MONO is not set | 709 | # CONFIG_LOGO_LINUX_MONO is not set |
| 690 | # CONFIG_LOGO_LINUX_VGA16 is not set | 710 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| 691 | CONFIG_LOGO_LINUX_CLUT224=y | 711 | CONFIG_LOGO_LINUX_CLUT224=y |
| 692 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 693 | |||
| 694 | # | ||
| 695 | # Sound | ||
| 696 | # | ||
| 697 | CONFIG_SOUND=y | 712 | CONFIG_SOUND=y |
| 698 | 713 | CONFIG_SOUND_OSS_CORE=y | |
| 699 | # | ||
| 700 | # Advanced Linux Sound Architecture | ||
| 701 | # | ||
| 702 | CONFIG_SND=y | 714 | CONFIG_SND=y |
| 703 | CONFIG_SND_TIMER=y | 715 | CONFIG_SND_TIMER=y |
| 704 | CONFIG_SND_PCM=y | 716 | CONFIG_SND_PCM=y |
| @@ -712,100 +724,65 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
| 712 | CONFIG_SND_VERBOSE_PROCFS=y | 724 | CONFIG_SND_VERBOSE_PROCFS=y |
| 713 | # CONFIG_SND_VERBOSE_PRINTK is not set | 725 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 714 | # CONFIG_SND_DEBUG is not set | 726 | # CONFIG_SND_DEBUG is not set |
| 715 | 727 | CONFIG_SND_VMASTER=y | |
| 716 | # | 728 | CONFIG_SND_AC97_CODEC=y |
| 717 | # Generic devices | 729 | # CONFIG_SND_DRIVERS is not set |
| 718 | # | 730 | CONFIG_SND_ARM=y |
| 719 | CONFIG_SND_AC97_CODEC=m | 731 | CONFIG_SND_ARMAACI=y |
| 720 | CONFIG_SND_AC97_BUS=m | 732 | # CONFIG_SND_SOC is not set |
| 721 | # CONFIG_SND_DUMMY is not set | ||
| 722 | # CONFIG_SND_MTPAV is not set | ||
| 723 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 724 | # CONFIG_SND_MPU401 is not set | ||
| 725 | |||
| 726 | # | ||
| 727 | # ALSA ARM devices | ||
| 728 | # | ||
| 729 | CONFIG_SND_ARMAACI=m | ||
| 730 | |||
| 731 | # | ||
| 732 | # Open Sound System | ||
| 733 | # | ||
| 734 | # CONFIG_SOUND_PRIME is not set | 733 | # CONFIG_SOUND_PRIME is not set |
| 735 | 734 | CONFIG_AC97_BUS=y | |
| 736 | # | 735 | # CONFIG_HID_SUPPORT is not set |
| 737 | # USB support | 736 | # CONFIG_USB_SUPPORT is not set |
| 738 | # | ||
| 739 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 740 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
| 741 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 742 | # CONFIG_USB is not set | ||
| 743 | |||
| 744 | # | ||
| 745 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 746 | # | ||
| 747 | |||
| 748 | # | ||
| 749 | # USB Gadget Support | ||
| 750 | # | ||
| 751 | # CONFIG_USB_GADGET is not set | ||
| 752 | |||
| 753 | # | ||
| 754 | # MMC/SD Card support | ||
| 755 | # | ||
| 756 | CONFIG_MMC=y | 737 | CONFIG_MMC=y |
| 757 | # CONFIG_MMC_DEBUG is not set | 738 | # CONFIG_MMC_DEBUG is not set |
| 758 | CONFIG_MMC_BLOCK=y | 739 | # CONFIG_MMC_UNSAFE_RESUME is not set |
| 759 | CONFIG_MMC_ARMMMCI=y | ||
| 760 | # CONFIG_MMC_TIFM_SD is not set | ||
| 761 | 740 | ||
| 762 | # | 741 | # |
| 763 | # Real Time Clock | 742 | # MMC/SD/SDIO Card Drivers |
| 764 | # | 743 | # |
| 765 | CONFIG_RTC_LIB=y | 744 | CONFIG_MMC_BLOCK=y |
| 766 | CONFIG_RTC_CLASS=y | 745 | CONFIG_MMC_BLOCK_BOUNCE=y |
| 767 | CONFIG_RTC_HCTOSYS=y | 746 | # CONFIG_SDIO_UART is not set |
| 768 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 747 | # CONFIG_MMC_TEST is not set |
| 769 | # CONFIG_RTC_DEBUG is not set | ||
| 770 | 748 | ||
| 771 | # | 749 | # |
| 772 | # RTC interfaces | 750 | # MMC/SD/SDIO Host Controller Drivers |
| 773 | # | 751 | # |
| 774 | CONFIG_RTC_INTF_SYSFS=y | 752 | CONFIG_MMC_ARMMMCI=y |
| 775 | CONFIG_RTC_INTF_PROC=y | 753 | # CONFIG_MMC_SDHCI is not set |
| 776 | CONFIG_RTC_INTF_DEV=y | 754 | # CONFIG_MEMSTICK is not set |
| 777 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | 755 | # CONFIG_ACCESSIBILITY is not set |
| 756 | # CONFIG_NEW_LEDS is not set | ||
| 757 | CONFIG_RTC_LIB=y | ||
| 758 | # CONFIG_RTC_CLASS is not set | ||
| 759 | # CONFIG_DMADEVICES is not set | ||
| 778 | 760 | ||
| 779 | # | 761 | # |
| 780 | # RTC drivers | 762 | # Voltage and Current regulators |
| 781 | # | 763 | # |
| 782 | # CONFIG_RTC_DRV_DS1553 is not set | 764 | # CONFIG_REGULATOR is not set |
| 783 | # CONFIG_RTC_DRV_DS1742 is not set | 765 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set |
| 784 | # CONFIG_RTC_DRV_M48T86 is not set | 766 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set |
| 785 | CONFIG_RTC_DRV_PL031=y | 767 | # CONFIG_REGULATOR_BQ24022 is not set |
| 786 | # CONFIG_RTC_DRV_TEST is not set | 768 | # CONFIG_UIO is not set |
| 787 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 788 | 769 | ||
| 789 | # | 770 | # |
| 790 | # File systems | 771 | # File systems |
| 791 | # | 772 | # |
| 792 | CONFIG_EXT2_FS=y | 773 | # CONFIG_EXT2_FS is not set |
| 793 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 794 | # CONFIG_EXT2_FS_XIP is not set | ||
| 795 | # CONFIG_EXT3_FS is not set | 774 | # CONFIG_EXT3_FS is not set |
| 796 | # CONFIG_EXT4DEV_FS is not set | 775 | # CONFIG_EXT4_FS is not set |
| 797 | # CONFIG_REISERFS_FS is not set | 776 | # CONFIG_REISERFS_FS is not set |
| 798 | # CONFIG_JFS_FS is not set | 777 | # CONFIG_JFS_FS is not set |
| 799 | # CONFIG_FS_POSIX_ACL is not set | 778 | # CONFIG_FS_POSIX_ACL is not set |
| 779 | CONFIG_FILE_LOCKING=y | ||
| 800 | # CONFIG_XFS_FS is not set | 780 | # CONFIG_XFS_FS is not set |
| 801 | # CONFIG_GFS2_FS is not set | ||
| 802 | # CONFIG_OCFS2_FS is not set | 781 | # CONFIG_OCFS2_FS is not set |
| 803 | # CONFIG_MINIX_FS is not set | 782 | CONFIG_DNOTIFY=y |
| 804 | # CONFIG_ROMFS_FS is not set | ||
| 805 | CONFIG_INOTIFY=y | 783 | CONFIG_INOTIFY=y |
| 806 | # CONFIG_INOTIFY_USER is not set | 784 | CONFIG_INOTIFY_USER=y |
| 807 | # CONFIG_QUOTA is not set | 785 | # CONFIG_QUOTA is not set |
| 808 | CONFIG_DNOTIFY=y | ||
| 809 | # CONFIG_AUTOFS_FS is not set | 786 | # CONFIG_AUTOFS_FS is not set |
| 810 | # CONFIG_AUTOFS4_FS is not set | 787 | # CONFIG_AUTOFS4_FS is not set |
| 811 | # CONFIG_FUSE_FS is not set | 788 | # CONFIG_FUSE_FS is not set |
| @@ -831,11 +808,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 831 | # | 808 | # |
| 832 | CONFIG_PROC_FS=y | 809 | CONFIG_PROC_FS=y |
| 833 | CONFIG_PROC_SYSCTL=y | 810 | CONFIG_PROC_SYSCTL=y |
| 811 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 834 | CONFIG_SYSFS=y | 812 | CONFIG_SYSFS=y |
| 835 | CONFIG_TMPFS=y | 813 | CONFIG_TMPFS=y |
| 836 | # CONFIG_TMPFS_POSIX_ACL is not set | 814 | # CONFIG_TMPFS_POSIX_ACL is not set |
| 837 | # CONFIG_HUGETLB_PAGE is not set | 815 | # CONFIG_HUGETLB_PAGE is not set |
| 838 | CONFIG_RAMFS=y | ||
| 839 | # CONFIG_CONFIGFS_FS is not set | 816 | # CONFIG_CONFIGFS_FS is not set |
| 840 | 817 | ||
| 841 | # | 818 | # |
| @@ -848,29 +825,28 @@ CONFIG_RAMFS=y | |||
| 848 | # CONFIG_BEFS_FS is not set | 825 | # CONFIG_BEFS_FS is not set |
| 849 | # CONFIG_BFS_FS is not set | 826 | # CONFIG_BFS_FS is not set |
| 850 | # CONFIG_EFS_FS is not set | 827 | # CONFIG_EFS_FS is not set |
| 851 | # CONFIG_JFFS_FS is not set | ||
| 852 | # CONFIG_JFFS2_FS is not set | 828 | # CONFIG_JFFS2_FS is not set |
| 853 | CONFIG_CRAMFS=y | 829 | CONFIG_CRAMFS=y |
| 854 | # CONFIG_VXFS_FS is not set | 830 | # CONFIG_VXFS_FS is not set |
| 831 | # CONFIG_MINIX_FS is not set | ||
| 832 | # CONFIG_OMFS_FS is not set | ||
| 855 | # CONFIG_HPFS_FS is not set | 833 | # CONFIG_HPFS_FS is not set |
| 856 | # CONFIG_QNX4FS_FS is not set | 834 | # CONFIG_QNX4FS_FS is not set |
| 835 | # CONFIG_ROMFS_FS is not set | ||
| 857 | # CONFIG_SYSV_FS is not set | 836 | # CONFIG_SYSV_FS is not set |
| 858 | # CONFIG_UFS_FS is not set | 837 | # CONFIG_UFS_FS is not set |
| 859 | 838 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 860 | # | ||
| 861 | # Network File Systems | ||
| 862 | # | ||
| 863 | CONFIG_NFS_FS=y | 839 | CONFIG_NFS_FS=y |
| 864 | CONFIG_NFS_V3=y | 840 | CONFIG_NFS_V3=y |
| 865 | # CONFIG_NFS_V3_ACL is not set | 841 | # CONFIG_NFS_V3_ACL is not set |
| 866 | # CONFIG_NFS_V4 is not set | 842 | # CONFIG_NFS_V4 is not set |
| 867 | # CONFIG_NFS_DIRECTIO is not set | ||
| 868 | # CONFIG_NFSD is not set | ||
| 869 | CONFIG_ROOT_NFS=y | 843 | CONFIG_ROOT_NFS=y |
| 844 | # CONFIG_NFSD is not set | ||
| 870 | CONFIG_LOCKD=y | 845 | CONFIG_LOCKD=y |
| 871 | CONFIG_LOCKD_V4=y | 846 | CONFIG_LOCKD_V4=y |
| 872 | CONFIG_NFS_COMMON=y | 847 | CONFIG_NFS_COMMON=y |
| 873 | CONFIG_SUNRPC=y | 848 | CONFIG_SUNRPC=y |
| 849 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 874 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 850 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 875 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 851 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 876 | # CONFIG_SMB_FS is not set | 852 | # CONFIG_SMB_FS is not set |
| @@ -878,17 +854,12 @@ CONFIG_SUNRPC=y | |||
| 878 | # CONFIG_NCP_FS is not set | 854 | # CONFIG_NCP_FS is not set |
| 879 | # CONFIG_CODA_FS is not set | 855 | # CONFIG_CODA_FS is not set |
| 880 | # CONFIG_AFS_FS is not set | 856 | # CONFIG_AFS_FS is not set |
| 881 | # CONFIG_9P_FS is not set | ||
| 882 | 857 | ||
| 883 | # | 858 | # |
| 884 | # Partition Types | 859 | # Partition Types |
| 885 | # | 860 | # |
| 886 | # CONFIG_PARTITION_ADVANCED is not set | 861 | # CONFIG_PARTITION_ADVANCED is not set |
| 887 | CONFIG_MSDOS_PARTITION=y | 862 | CONFIG_MSDOS_PARTITION=y |
| 888 | |||
| 889 | # | ||
| 890 | # Native Language Support | ||
| 891 | # | ||
| 892 | CONFIG_NLS=y | 863 | CONFIG_NLS=y |
| 893 | CONFIG_NLS_DEFAULT="iso8859-1" | 864 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 894 | CONFIG_NLS_CODEPAGE_437=y | 865 | CONFIG_NLS_CODEPAGE_437=y |
| @@ -929,64 +900,177 @@ CONFIG_NLS_ISO8859_1=y | |||
| 929 | # CONFIG_NLS_KOI8_R is not set | 900 | # CONFIG_NLS_KOI8_R is not set |
| 930 | # CONFIG_NLS_KOI8_U is not set | 901 | # CONFIG_NLS_KOI8_U is not set |
| 931 | # CONFIG_NLS_UTF8 is not set | 902 | # CONFIG_NLS_UTF8 is not set |
| 932 | 903 | # CONFIG_DLM is not set | |
| 933 | # | ||
| 934 | # Profiling support | ||
| 935 | # | ||
| 936 | # CONFIG_PROFILING is not set | ||
| 937 | 904 | ||
| 938 | # | 905 | # |
| 939 | # Kernel hacking | 906 | # Kernel hacking |
| 940 | # | 907 | # |
| 941 | # CONFIG_PRINTK_TIME is not set | 908 | # CONFIG_PRINTK_TIME is not set |
| 942 | # CONFIG_ENABLE_MUST_CHECK is not set | 909 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 910 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 911 | CONFIG_FRAME_WARN=1024 | ||
| 943 | CONFIG_MAGIC_SYSRQ=y | 912 | CONFIG_MAGIC_SYSRQ=y |
| 944 | # CONFIG_UNUSED_SYMBOLS is not set | 913 | # CONFIG_UNUSED_SYMBOLS is not set |
| 914 | # CONFIG_DEBUG_FS is not set | ||
| 915 | # CONFIG_HEADERS_CHECK is not set | ||
| 945 | CONFIG_DEBUG_KERNEL=y | 916 | CONFIG_DEBUG_KERNEL=y |
| 946 | CONFIG_LOG_BUF_SHIFT=14 | 917 | # CONFIG_DEBUG_SHIRQ is not set |
| 947 | CONFIG_DETECT_SOFTLOCKUP=y | 918 | CONFIG_DETECT_SOFTLOCKUP=y |
| 919 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 920 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 921 | # CONFIG_SCHED_DEBUG is not set | ||
| 948 | # CONFIG_SCHEDSTATS is not set | 922 | # CONFIG_SCHEDSTATS is not set |
| 923 | # CONFIG_TIMER_STATS is not set | ||
| 924 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 949 | # CONFIG_DEBUG_SLAB is not set | 925 | # CONFIG_DEBUG_SLAB is not set |
| 950 | # CONFIG_DEBUG_RT_MUTEXES is not set | 926 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 951 | # CONFIG_RT_MUTEX_TESTER is not set | 927 | # CONFIG_RT_MUTEX_TESTER is not set |
| 952 | CONFIG_DEBUG_SPINLOCK=y | 928 | # CONFIG_DEBUG_SPINLOCK is not set |
| 953 | CONFIG_DEBUG_MUTEXES=y | 929 | # CONFIG_DEBUG_MUTEXES is not set |
| 954 | CONFIG_DEBUG_RWSEMS=y | 930 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
| 931 | # CONFIG_PROVE_LOCKING is not set | ||
| 932 | # CONFIG_LOCK_STAT is not set | ||
| 955 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 933 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 956 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 934 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 957 | # CONFIG_DEBUG_KOBJECT is not set | 935 | # CONFIG_DEBUG_KOBJECT is not set |
| 958 | CONFIG_DEBUG_BUGVERBOSE=y | 936 | CONFIG_DEBUG_BUGVERBOSE=y |
| 959 | # CONFIG_DEBUG_INFO is not set | 937 | # CONFIG_DEBUG_INFO is not set |
| 960 | # CONFIG_DEBUG_FS is not set | ||
| 961 | # CONFIG_DEBUG_VM is not set | 938 | # CONFIG_DEBUG_VM is not set |
| 939 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 940 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 962 | # CONFIG_DEBUG_LIST is not set | 941 | # CONFIG_DEBUG_LIST is not set |
| 942 | # CONFIG_DEBUG_SG is not set | ||
| 963 | CONFIG_FRAME_POINTER=y | 943 | CONFIG_FRAME_POINTER=y |
| 964 | # CONFIG_UNWIND_INFO is not set | 944 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 965 | CONFIG_FORCED_INLINING=y | ||
| 966 | # CONFIG_HEADERS_CHECK is not set | ||
| 967 | # CONFIG_RCU_TORTURE_TEST is not set | 945 | # CONFIG_RCU_TORTURE_TEST is not set |
| 946 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 947 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 948 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 949 | # CONFIG_FAULT_INJECTION is not set | ||
| 950 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 951 | CONFIG_NOP_TRACER=y | ||
| 952 | CONFIG_HAVE_FTRACE=y | ||
| 953 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 954 | # CONFIG_FTRACE is not set | ||
| 955 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 956 | # CONFIG_SCHED_TRACER is not set | ||
| 957 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 958 | # CONFIG_BOOT_TRACER is not set | ||
| 959 | # CONFIG_STACK_TRACER is not set | ||
| 960 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 961 | # CONFIG_SAMPLES is not set | ||
| 962 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 963 | # CONFIG_KGDB is not set | ||
| 968 | CONFIG_DEBUG_USER=y | 964 | CONFIG_DEBUG_USER=y |
| 969 | CONFIG_DEBUG_ERRORS=y | 965 | CONFIG_DEBUG_ERRORS=y |
| 970 | CONFIG_DEBUG_LL=y | 966 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 971 | # CONFIG_DEBUG_ICEDCC is not set | 967 | # CONFIG_DEBUG_LL is not set |
| 972 | 968 | ||
| 973 | # | 969 | # |
| 974 | # Security options | 970 | # Security options |
| 975 | # | 971 | # |
| 976 | # CONFIG_KEYS is not set | 972 | # CONFIG_KEYS is not set |
| 977 | # CONFIG_SECURITY is not set | 973 | # CONFIG_SECURITY is not set |
| 974 | # CONFIG_SECURITYFS is not set | ||
| 975 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 976 | CONFIG_CRYPTO=y | ||
| 977 | |||
| 978 | # | ||
| 979 | # Crypto core or helper | ||
| 980 | # | ||
| 981 | # CONFIG_CRYPTO_FIPS is not set | ||
| 982 | # CONFIG_CRYPTO_MANAGER is not set | ||
| 983 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 984 | # CONFIG_CRYPTO_NULL is not set | ||
| 985 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 986 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 987 | # CONFIG_CRYPTO_TEST is not set | ||
| 988 | |||
| 989 | # | ||
| 990 | # Authenticated Encryption with Associated Data | ||
| 991 | # | ||
| 992 | # CONFIG_CRYPTO_CCM is not set | ||
| 993 | # CONFIG_CRYPTO_GCM is not set | ||
| 994 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 995 | |||
| 996 | # | ||
| 997 | # Block modes | ||
| 998 | # | ||
| 999 | # CONFIG_CRYPTO_CBC is not set | ||
| 1000 | # CONFIG_CRYPTO_CTR is not set | ||
| 1001 | # CONFIG_CRYPTO_CTS is not set | ||
| 1002 | # CONFIG_CRYPTO_ECB is not set | ||
| 1003 | # CONFIG_CRYPTO_LRW is not set | ||
| 1004 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1005 | # CONFIG_CRYPTO_XTS is not set | ||
| 1006 | |||
| 1007 | # | ||
| 1008 | # Hash modes | ||
| 1009 | # | ||
| 1010 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1011 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1012 | |||
| 1013 | # | ||
| 1014 | # Digest | ||
| 1015 | # | ||
| 1016 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1017 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1018 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1019 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1020 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1021 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1022 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1023 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1024 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1025 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1026 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1027 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1028 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1029 | |||
| 1030 | # | ||
| 1031 | # Ciphers | ||
| 1032 | # | ||
| 1033 | # CONFIG_CRYPTO_AES is not set | ||
| 1034 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1035 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1036 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1037 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1038 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1039 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1040 | # CONFIG_CRYPTO_DES is not set | ||
| 1041 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1042 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1043 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1044 | # CONFIG_CRYPTO_SEED is not set | ||
| 1045 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1046 | # CONFIG_CRYPTO_TEA is not set | ||
| 1047 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1048 | |||
| 1049 | # | ||
| 1050 | # Compression | ||
| 1051 | # | ||
| 1052 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1053 | # CONFIG_CRYPTO_LZO is not set | ||
| 978 | 1054 | ||
| 979 | # | 1055 | # |
| 980 | # Cryptographic options | 1056 | # Random Number Generation |
| 981 | # | 1057 | # |
| 982 | # CONFIG_CRYPTO is not set | 1058 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 1059 | # CONFIG_CRYPTO_HW is not set | ||
| 983 | 1060 | ||
| 984 | # | 1061 | # |
| 985 | # Library routines | 1062 | # Library routines |
| 986 | # | 1063 | # |
| 1064 | CONFIG_BITREVERSE=y | ||
| 987 | # CONFIG_CRC_CCITT is not set | 1065 | # CONFIG_CRC_CCITT is not set |
| 988 | # CONFIG_CRC16 is not set | 1066 | # CONFIG_CRC16 is not set |
| 1067 | # CONFIG_CRC_T10DIF is not set | ||
| 1068 | # CONFIG_CRC_ITU_T is not set | ||
| 989 | CONFIG_CRC32=y | 1069 | CONFIG_CRC32=y |
| 1070 | # CONFIG_CRC7 is not set | ||
| 990 | # CONFIG_LIBCRC32C is not set | 1071 | # CONFIG_LIBCRC32C is not set |
| 991 | CONFIG_ZLIB_INFLATE=y | 1072 | CONFIG_ZLIB_INFLATE=y |
| 992 | CONFIG_PLIST=y | 1073 | CONFIG_PLIST=y |
| 1074 | CONFIG_HAS_IOMEM=y | ||
| 1075 | CONFIG_HAS_IOPORT=y | ||
| 1076 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig index 907e54344dad..7e253f58ed18 100644 --- a/arch/arm/configs/realview_defconfig +++ b/arch/arm/configs/realview_defconfig | |||
| @@ -1,105 +1,204 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14-rc2 | 3 | # Linux kernel version: 2.6.28-rc2 |
| 4 | # Thu Sep 29 14:50:10 2005 | 4 | # Mon Nov 10 14:39:48 2008 |
| 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=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 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_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
| 26 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 11 | 28 | ||
| 12 | # | 29 | # |
| 13 | # Code maturity level options | 30 | # General setup |
| 14 | # | 31 | # |
| 15 | # CONFIG_EXPERIMENTAL is not set | 32 | CONFIG_EXPERIMENTAL=y |
| 16 | CONFIG_CLEAN_COMPILE=y | ||
| 17 | CONFIG_BROKEN_ON_SMP=y | 33 | CONFIG_BROKEN_ON_SMP=y |
| 18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 19 | |||
| 20 | # | ||
| 21 | # General setup | ||
| 22 | # | ||
| 23 | CONFIG_LOCALVERSION="" | 35 | CONFIG_LOCALVERSION="" |
| 24 | CONFIG_LOCALVERSION_AUTO=y | 36 | CONFIG_LOCALVERSION_AUTO=y |
| 25 | # CONFIG_SWAP is not set | 37 | # CONFIG_SWAP is not set |
| 26 | CONFIG_SYSVIPC=y | 38 | CONFIG_SYSVIPC=y |
| 39 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 40 | # CONFIG_POSIX_MQUEUE is not set | ||
| 27 | # CONFIG_BSD_PROCESS_ACCT is not set | 41 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 28 | CONFIG_SYSCTL=y | 42 | # CONFIG_TASKSTATS is not set |
| 29 | # CONFIG_AUDIT is not set | 43 | # CONFIG_AUDIT is not set |
| 30 | CONFIG_HOTPLUG=y | ||
| 31 | CONFIG_KOBJECT_UEVENT=y | ||
| 32 | # CONFIG_IKCONFIG is not set | 44 | # CONFIG_IKCONFIG is not set |
| 33 | CONFIG_INITRAMFS_SOURCE="" | 45 | CONFIG_LOG_BUF_SHIFT=14 |
| 46 | # CONFIG_CGROUPS is not set | ||
| 47 | # CONFIG_GROUP_SCHED is not set | ||
| 48 | CONFIG_SYSFS_DEPRECATED=y | ||
| 49 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 50 | # CONFIG_RELAY is not set | ||
| 51 | CONFIG_NAMESPACES=y | ||
| 52 | # CONFIG_UTS_NS is not set | ||
| 53 | # CONFIG_IPC_NS is not set | ||
| 54 | # CONFIG_USER_NS is not set | ||
| 55 | # CONFIG_PID_NS is not set | ||
| 56 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 57 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 58 | CONFIG_SYSCTL=y | ||
| 34 | # CONFIG_EMBEDDED is not set | 59 | # CONFIG_EMBEDDED is not set |
| 60 | CONFIG_UID16=y | ||
| 61 | CONFIG_SYSCTL_SYSCALL=y | ||
| 35 | CONFIG_KALLSYMS=y | 62 | CONFIG_KALLSYMS=y |
| 36 | # CONFIG_KALLSYMS_ALL is not set | 63 | # CONFIG_KALLSYMS_ALL is not set |
| 37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 64 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 65 | CONFIG_HOTPLUG=y | ||
| 38 | CONFIG_PRINTK=y | 66 | CONFIG_PRINTK=y |
| 39 | CONFIG_BUG=y | 67 | CONFIG_BUG=y |
| 68 | CONFIG_ELF_CORE=y | ||
| 69 | CONFIG_COMPAT_BRK=y | ||
| 40 | CONFIG_BASE_FULL=y | 70 | CONFIG_BASE_FULL=y |
| 41 | CONFIG_FUTEX=y | 71 | CONFIG_FUTEX=y |
| 72 | CONFIG_ANON_INODES=y | ||
| 42 | CONFIG_EPOLL=y | 73 | CONFIG_EPOLL=y |
| 43 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 74 | CONFIG_SIGNALFD=y |
| 75 | CONFIG_TIMERFD=y | ||
| 76 | CONFIG_EVENTFD=y | ||
| 44 | CONFIG_SHMEM=y | 77 | CONFIG_SHMEM=y |
| 45 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 78 | CONFIG_AIO=y |
| 46 | CONFIG_CC_ALIGN_LABELS=0 | 79 | CONFIG_VM_EVENT_COUNTERS=y |
| 47 | CONFIG_CC_ALIGN_LOOPS=0 | 80 | CONFIG_SLAB=y |
| 48 | CONFIG_CC_ALIGN_JUMPS=0 | 81 | # CONFIG_SLUB is not set |
| 82 | # CONFIG_SLOB is not set | ||
| 83 | # CONFIG_PROFILING is not set | ||
| 84 | # CONFIG_MARKERS is not set | ||
| 85 | CONFIG_HAVE_OPROFILE=y | ||
| 86 | # CONFIG_KPROBES is not set | ||
| 87 | CONFIG_HAVE_KPROBES=y | ||
| 88 | CONFIG_HAVE_KRETPROBES=y | ||
| 89 | CONFIG_HAVE_CLK=y | ||
| 90 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
| 91 | CONFIG_SLABINFO=y | ||
| 92 | CONFIG_RT_MUTEXES=y | ||
| 49 | # CONFIG_TINY_SHMEM is not set | 93 | # CONFIG_TINY_SHMEM is not set |
| 50 | CONFIG_BASE_SMALL=0 | 94 | CONFIG_BASE_SMALL=0 |
| 51 | |||
| 52 | # | ||
| 53 | # Loadable module support | ||
| 54 | # | ||
| 55 | CONFIG_MODULES=y | 95 | CONFIG_MODULES=y |
| 96 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 56 | CONFIG_MODULE_UNLOAD=y | 97 | CONFIG_MODULE_UNLOAD=y |
| 57 | CONFIG_OBSOLETE_MODPARM=y | 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 99 | # CONFIG_MODVERSIONS is not set | ||
| 58 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 59 | # CONFIG_KMOD is not set | 101 | CONFIG_KMOD=y |
| 102 | CONFIG_BLOCK=y | ||
| 103 | # CONFIG_LBD is not set | ||
| 104 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 105 | # CONFIG_LSF is not set | ||
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 107 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 108 | |||
| 109 | # | ||
| 110 | # IO Schedulers | ||
| 111 | # | ||
| 112 | CONFIG_IOSCHED_NOOP=y | ||
| 113 | # CONFIG_IOSCHED_AS is not set | ||
| 114 | CONFIG_IOSCHED_DEADLINE=y | ||
| 115 | # CONFIG_IOSCHED_CFQ is not set | ||
| 116 | # CONFIG_DEFAULT_AS is not set | ||
| 117 | CONFIG_DEFAULT_DEADLINE=y | ||
| 118 | # CONFIG_DEFAULT_CFQ is not set | ||
| 119 | # CONFIG_DEFAULT_NOOP is not set | ||
| 120 | CONFIG_DEFAULT_IOSCHED="deadline" | ||
| 121 | CONFIG_CLASSIC_RCU=y | ||
| 122 | # CONFIG_FREEZER is not set | ||
| 60 | 123 | ||
| 61 | # | 124 | # |
| 62 | # System Type | 125 | # System Type |
| 63 | # | 126 | # |
| 127 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 128 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 129 | CONFIG_ARCH_REALVIEW=y | ||
| 130 | # CONFIG_ARCH_VERSATILE is not set | ||
| 131 | # CONFIG_ARCH_AT91 is not set | ||
| 64 | # CONFIG_ARCH_CLPS7500 is not set | 132 | # CONFIG_ARCH_CLPS7500 is not set |
| 65 | # CONFIG_ARCH_CLPS711X is not set | 133 | # CONFIG_ARCH_CLPS711X is not set |
| 66 | # CONFIG_ARCH_CO285 is not set | ||
| 67 | # CONFIG_ARCH_EBSA110 is not set | 134 | # CONFIG_ARCH_EBSA110 is not set |
| 135 | # CONFIG_ARCH_EP93XX is not set | ||
| 68 | # CONFIG_ARCH_FOOTBRIDGE is not set | 136 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| 69 | # CONFIG_ARCH_INTEGRATOR is not set | 137 | # CONFIG_ARCH_NETX is not set |
| 70 | # CONFIG_ARCH_IOP3XX is not set | 138 | # CONFIG_ARCH_H720X is not set |
| 71 | # CONFIG_ARCH_IXP4XX is not set | 139 | # CONFIG_ARCH_IMX is not set |
| 140 | # CONFIG_ARCH_IOP13XX is not set | ||
| 141 | # CONFIG_ARCH_IOP32X is not set | ||
| 142 | # CONFIG_ARCH_IOP33X is not set | ||
| 143 | # CONFIG_ARCH_IXP23XX is not set | ||
| 72 | # CONFIG_ARCH_IXP2000 is not set | 144 | # CONFIG_ARCH_IXP2000 is not set |
| 145 | # CONFIG_ARCH_IXP4XX is not set | ||
| 73 | # CONFIG_ARCH_L7200 is not set | 146 | # CONFIG_ARCH_L7200 is not set |
| 147 | # CONFIG_ARCH_KIRKWOOD is not set | ||
| 148 | # CONFIG_ARCH_KS8695 is not set | ||
| 149 | # CONFIG_ARCH_NS9XXX is not set | ||
| 150 | # CONFIG_ARCH_LOKI is not set | ||
| 151 | # CONFIG_ARCH_MV78XX0 is not set | ||
| 152 | # CONFIG_ARCH_MXC is not set | ||
| 153 | # CONFIG_ARCH_ORION5X is not set | ||
| 154 | # CONFIG_ARCH_PNX4008 is not set | ||
| 74 | # CONFIG_ARCH_PXA is not set | 155 | # CONFIG_ARCH_PXA is not set |
| 75 | # CONFIG_ARCH_RPC is not set | 156 | # CONFIG_ARCH_RPC is not set |
| 76 | # CONFIG_ARCH_SA1100 is not set | 157 | # CONFIG_ARCH_SA1100 is not set |
| 77 | # CONFIG_ARCH_S3C2410 is not set | 158 | # CONFIG_ARCH_S3C2410 is not set |
| 78 | # CONFIG_ARCH_SHARK is not set | 159 | # CONFIG_ARCH_SHARK is not set |
| 79 | # CONFIG_ARCH_LH7A40X is not set | 160 | # CONFIG_ARCH_LH7A40X is not set |
| 161 | # CONFIG_ARCH_DAVINCI is not set | ||
| 80 | # CONFIG_ARCH_OMAP is not set | 162 | # CONFIG_ARCH_OMAP is not set |
| 81 | # CONFIG_ARCH_VERSATILE is not set | 163 | # CONFIG_ARCH_MSM is not set |
| 82 | CONFIG_ARCH_REALVIEW=y | 164 | |
| 83 | # CONFIG_ARCH_IMX is not set | 165 | # |
| 84 | # CONFIG_ARCH_H720X is not set | 166 | # Boot options |
| 85 | # CONFIG_ARCH_AAEC2000 is not set | 167 | # |
| 168 | |||
| 169 | # | ||
| 170 | # Power management | ||
| 171 | # | ||
| 86 | 172 | ||
| 87 | # | 173 | # |
| 88 | # RealView platform type | 174 | # RealView platform type |
| 89 | # | 175 | # |
| 90 | CONFIG_MACH_REALVIEW_EB=y | 176 | CONFIG_MACH_REALVIEW_EB=y |
| 177 | # CONFIG_REALVIEW_EB_A9MP is not set | ||
| 178 | CONFIG_REALVIEW_EB_ARM11MP=y | ||
| 179 | # CONFIG_REALVIEW_EB_ARM11MP_REVB is not set | ||
| 180 | CONFIG_MACH_REALVIEW_PB11MP=y | ||
| 181 | CONFIG_MACH_REALVIEW_PB1176=y | ||
| 182 | # CONFIG_MACH_REALVIEW_PBA8 is not set | ||
| 91 | 183 | ||
| 92 | # | 184 | # |
| 93 | # Processor Type | 185 | # Processor Type |
| 94 | # | 186 | # |
| 95 | CONFIG_CPU_32=y | 187 | CONFIG_CPU_32=y |
| 96 | CONFIG_CPU_ARM926T=y | 188 | # CONFIG_CPU_ARM926T is not set |
| 97 | # CONFIG_CPU_V6 is not set | 189 | CONFIG_CPU_V6=y |
| 98 | CONFIG_CPU_32v5=y | 190 | # CONFIG_CPU_32v6K is not set |
| 99 | CONFIG_CPU_ABRT_EV5TJ=y | 191 | # CONFIG_CPU_V7 is not set |
| 100 | CONFIG_CPU_CACHE_VIVT=y | 192 | CONFIG_CPU_32v6=y |
| 101 | CONFIG_CPU_COPY_V4WB=y | 193 | CONFIG_CPU_ABRT_EV6=y |
| 102 | CONFIG_CPU_TLB_V4WBI=y | 194 | CONFIG_CPU_PABRT_NOIFAR=y |
| 195 | CONFIG_CPU_CACHE_V6=y | ||
| 196 | CONFIG_CPU_CACHE_VIPT=y | ||
| 197 | CONFIG_CPU_COPY_V6=y | ||
| 198 | CONFIG_CPU_TLB_V6=y | ||
| 199 | CONFIG_CPU_HAS_ASID=y | ||
| 200 | CONFIG_CPU_CP15=y | ||
| 201 | CONFIG_CPU_CP15_MMU=y | ||
| 103 | 202 | ||
| 104 | # | 203 | # |
| 105 | # Processor Features | 204 | # Processor Features |
| @@ -107,8 +206,9 @@ CONFIG_CPU_TLB_V4WBI=y | |||
| 107 | CONFIG_ARM_THUMB=y | 206 | CONFIG_ARM_THUMB=y |
| 108 | # CONFIG_CPU_ICACHE_DISABLE is not set | 207 | # CONFIG_CPU_ICACHE_DISABLE is not set |
| 109 | # CONFIG_CPU_DCACHE_DISABLE is not set | 208 | # CONFIG_CPU_DCACHE_DISABLE is not set |
| 110 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | 209 | # CONFIG_CPU_BPREDICT_DISABLE is not set |
| 111 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | 210 | CONFIG_OUTER_CACHE=y |
| 211 | CONFIG_CACHE_L2X0=y | ||
| 112 | CONFIG_ARM_GIC=y | 212 | CONFIG_ARM_GIC=y |
| 113 | CONFIG_ICST307=y | 213 | CONFIG_ICST307=y |
| 114 | 214 | ||
| @@ -116,20 +216,41 @@ CONFIG_ICST307=y | |||
| 116 | # Bus support | 216 | # Bus support |
| 117 | # | 217 | # |
| 118 | CONFIG_ARM_AMBA=y | 218 | CONFIG_ARM_AMBA=y |
| 119 | CONFIG_ISA_DMA_API=y | 219 | # CONFIG_PCI_SYSCALL is not set |
| 120 | 220 | # CONFIG_ARCH_SUPPORTS_MSI is not set | |
| 121 | # | ||
| 122 | # PCCARD (PCMCIA/CardBus) support | ||
| 123 | # | ||
| 124 | # CONFIG_PCCARD is not set | 221 | # CONFIG_PCCARD is not set |
| 125 | 222 | ||
| 126 | # | 223 | # |
| 127 | # Kernel Features | 224 | # Kernel Features |
| 128 | # | 225 | # |
| 129 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 226 | # CONFIG_NO_HZ is not set |
| 227 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 228 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 229 | # CONFIG_SMP is not set | ||
| 230 | CONFIG_VMSPLIT_3G=y | ||
| 231 | # CONFIG_VMSPLIT_2G is not set | ||
| 232 | # CONFIG_VMSPLIT_1G is not set | ||
| 233 | CONFIG_PAGE_OFFSET=0xC0000000 | ||
| 234 | # CONFIG_PREEMPT is not set | ||
| 235 | CONFIG_HZ=100 | ||
| 236 | CONFIG_AEABI=y | ||
| 237 | CONFIG_OABI_COMPAT=y | ||
| 238 | CONFIG_ARCH_FLATMEM_HAS_HOLES=y | ||
| 239 | # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set | ||
| 240 | # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set | ||
| 241 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 242 | CONFIG_FLATMEM_MANUAL=y | ||
| 243 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 244 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 130 | CONFIG_FLATMEM=y | 245 | CONFIG_FLATMEM=y |
| 131 | CONFIG_FLAT_NODE_MEM_MAP=y | 246 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 132 | # CONFIG_SPARSEMEM_STATIC is not set | 247 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 248 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 249 | # CONFIG_RESOURCES_64BIT is not set | ||
| 250 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 251 | CONFIG_ZONE_DMA_FLAG=0 | ||
| 252 | CONFIG_VIRT_TO_BUS=y | ||
| 253 | CONFIG_UNEVICTABLE_LRU=y | ||
| 133 | CONFIG_ALIGNMENT_TRAP=y | 254 | CONFIG_ALIGNMENT_TRAP=y |
| 134 | 255 | ||
| 135 | # | 256 | # |
| @@ -139,6 +260,12 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 | |||
| 139 | CONFIG_ZBOOT_ROM_BSS=0x0 | 260 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 140 | CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" | 261 | CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" |
| 141 | # CONFIG_XIP_KERNEL is not set | 262 | # CONFIG_XIP_KERNEL is not set |
| 263 | # CONFIG_KEXEC is not set | ||
| 264 | |||
| 265 | # | ||
| 266 | # CPU Power Management | ||
| 267 | # | ||
| 268 | # CONFIG_CPU_IDLE is not set | ||
| 142 | 269 | ||
| 143 | # | 270 | # |
| 144 | # Floating point emulation | 271 | # Floating point emulation |
| @@ -147,26 +274,24 @@ CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=tt | |||
| 147 | # | 274 | # |
| 148 | # At least one emulation must be selected | 275 | # At least one emulation must be selected |
| 149 | # | 276 | # |
| 150 | CONFIG_FPE_NWFPE=y | 277 | # CONFIG_FPE_NWFPE is not set |
| 151 | # CONFIG_FPE_NWFPE_XP is not set | 278 | # CONFIG_FPE_FASTFPE is not set |
| 152 | # CONFIG_VFP is not set | 279 | CONFIG_VFP=y |
| 153 | 280 | ||
| 154 | # | 281 | # |
| 155 | # Userspace binary formats | 282 | # Userspace binary formats |
| 156 | # | 283 | # |
| 157 | CONFIG_BINFMT_ELF=y | 284 | CONFIG_BINFMT_ELF=y |
| 285 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 286 | CONFIG_HAVE_AOUT=y | ||
| 158 | # CONFIG_BINFMT_AOUT is not set | 287 | # CONFIG_BINFMT_AOUT is not set |
| 159 | # CONFIG_BINFMT_MISC is not set | 288 | # CONFIG_BINFMT_MISC is not set |
| 160 | # CONFIG_ARTHUR is not set | ||
| 161 | 289 | ||
| 162 | # | 290 | # |
| 163 | # Power management options | 291 | # Power management options |
| 164 | # | 292 | # |
| 165 | # CONFIG_PM is not set | 293 | # CONFIG_PM is not set |
| 166 | 294 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | |
| 167 | # | ||
| 168 | # Networking | ||
| 169 | # | ||
| 170 | CONFIG_NET=y | 295 | CONFIG_NET=y |
| 171 | 296 | ||
| 172 | # | 297 | # |
| @@ -175,6 +300,11 @@ CONFIG_NET=y | |||
| 175 | CONFIG_PACKET=y | 300 | CONFIG_PACKET=y |
| 176 | # CONFIG_PACKET_MMAP is not set | 301 | # CONFIG_PACKET_MMAP is not set |
| 177 | CONFIG_UNIX=y | 302 | CONFIG_UNIX=y |
| 303 | CONFIG_XFRM=y | ||
| 304 | # CONFIG_XFRM_USER is not set | ||
| 305 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 306 | # CONFIG_XFRM_MIGRATE is not set | ||
| 307 | # CONFIG_XFRM_STATISTICS is not set | ||
| 178 | # CONFIG_NET_KEY is not set | 308 | # CONFIG_NET_KEY is not set |
| 179 | CONFIG_INET=y | 309 | CONFIG_INET=y |
| 180 | # CONFIG_IP_MULTICAST is not set | 310 | # CONFIG_IP_MULTICAST is not set |
| @@ -186,34 +316,56 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 186 | # CONFIG_IP_PNP_RARP is not set | 316 | # CONFIG_IP_PNP_RARP is not set |
| 187 | # CONFIG_NET_IPIP is not set | 317 | # CONFIG_NET_IPIP is not set |
| 188 | # CONFIG_NET_IPGRE is not set | 318 | # CONFIG_NET_IPGRE is not set |
| 319 | # CONFIG_ARPD is not set | ||
| 189 | # CONFIG_SYN_COOKIES is not set | 320 | # CONFIG_SYN_COOKIES is not set |
| 190 | # CONFIG_INET_AH is not set | 321 | # CONFIG_INET_AH is not set |
| 191 | # CONFIG_INET_ESP is not set | 322 | # CONFIG_INET_ESP is not set |
| 192 | # CONFIG_INET_IPCOMP is not set | 323 | # CONFIG_INET_IPCOMP is not set |
| 324 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 193 | # CONFIG_INET_TUNNEL is not set | 325 | # CONFIG_INET_TUNNEL is not set |
| 326 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 327 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 328 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 329 | # CONFIG_INET_LRO is not set | ||
| 194 | CONFIG_INET_DIAG=y | 330 | CONFIG_INET_DIAG=y |
| 195 | CONFIG_INET_TCP_DIAG=y | 331 | CONFIG_INET_TCP_DIAG=y |
| 196 | # CONFIG_TCP_CONG_ADVANCED is not set | 332 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 197 | CONFIG_TCP_CONG_BIC=y | 333 | CONFIG_TCP_CONG_CUBIC=y |
| 334 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 335 | # CONFIG_TCP_MD5SIG is not set | ||
| 198 | # CONFIG_IPV6 is not set | 336 | # CONFIG_IPV6 is not set |
| 337 | # CONFIG_NETWORK_SECMARK is not set | ||
| 199 | # CONFIG_NETFILTER is not set | 338 | # CONFIG_NETFILTER is not set |
| 339 | # CONFIG_IP_DCCP is not set | ||
| 340 | # CONFIG_IP_SCTP is not set | ||
| 341 | # CONFIG_TIPC is not set | ||
| 342 | # CONFIG_ATM is not set | ||
| 200 | # CONFIG_BRIDGE is not set | 343 | # CONFIG_BRIDGE is not set |
| 344 | # CONFIG_NET_DSA is not set | ||
| 201 | # CONFIG_VLAN_8021Q is not set | 345 | # CONFIG_VLAN_8021Q is not set |
| 202 | # CONFIG_DECNET is not set | 346 | # CONFIG_DECNET is not set |
| 203 | # CONFIG_LLC2 is not set | 347 | # CONFIG_LLC2 is not set |
| 204 | # CONFIG_IPX is not set | 348 | # CONFIG_IPX is not set |
| 205 | # CONFIG_ATALK is not set | 349 | # CONFIG_ATALK is not set |
| 350 | # CONFIG_X25 is not set | ||
| 351 | # CONFIG_LAPB is not set | ||
| 352 | # CONFIG_ECONET is not set | ||
| 353 | # CONFIG_WAN_ROUTER is not set | ||
| 206 | # CONFIG_NET_SCHED is not set | 354 | # CONFIG_NET_SCHED is not set |
| 207 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 208 | 355 | ||
| 209 | # | 356 | # |
| 210 | # Network testing | 357 | # Network testing |
| 211 | # | 358 | # |
| 212 | # CONFIG_NET_PKTGEN is not set | 359 | # CONFIG_NET_PKTGEN is not set |
| 213 | # CONFIG_HAMRADIO is not set | 360 | # CONFIG_HAMRADIO is not set |
| 361 | # CONFIG_CAN is not set | ||
| 214 | # CONFIG_IRDA is not set | 362 | # CONFIG_IRDA is not set |
| 215 | # CONFIG_BT is not set | 363 | # CONFIG_BT is not set |
| 216 | # CONFIG_IEEE80211 is not set | 364 | # CONFIG_AF_RXRPC is not set |
| 365 | # CONFIG_PHONET is not set | ||
| 366 | # CONFIG_WIRELESS is not set | ||
| 367 | # CONFIG_RFKILL is not set | ||
| 368 | # CONFIG_NET_9P is not set | ||
| 217 | 369 | ||
| 218 | # | 370 | # |
| 219 | # Device Drivers | 371 | # Device Drivers |
| @@ -222,30 +374,37 @@ CONFIG_TCP_CONG_BIC=y | |||
| 222 | # | 374 | # |
| 223 | # Generic Driver Options | 375 | # Generic Driver Options |
| 224 | # | 376 | # |
| 377 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 225 | CONFIG_STANDALONE=y | 378 | CONFIG_STANDALONE=y |
| 226 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 379 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 227 | # CONFIG_FW_LOADER is not set | 380 | CONFIG_FW_LOADER=y |
| 381 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 382 | CONFIG_EXTRA_FIRMWARE="" | ||
| 228 | # CONFIG_DEBUG_DRIVER is not set | 383 | # CONFIG_DEBUG_DRIVER is not set |
| 229 | 384 | # CONFIG_DEBUG_DEVRES is not set | |
| 230 | # | 385 | # CONFIG_SYS_HYPERVISOR is not set |
| 231 | # Memory Technology Devices (MTD) | 386 | # CONFIG_CONNECTOR is not set |
| 232 | # | ||
| 233 | CONFIG_MTD=y | 387 | CONFIG_MTD=y |
| 234 | # CONFIG_MTD_DEBUG is not set | 388 | # CONFIG_MTD_DEBUG is not set |
| 235 | # CONFIG_MTD_CONCAT is not set | 389 | CONFIG_MTD_CONCAT=y |
| 236 | CONFIG_MTD_PARTITIONS=y | 390 | CONFIG_MTD_PARTITIONS=y |
| 237 | # CONFIG_MTD_REDBOOT_PARTS is not set | 391 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 238 | CONFIG_MTD_CMDLINE_PARTS=y | 392 | CONFIG_MTD_CMDLINE_PARTS=y |
| 239 | # CONFIG_MTD_AFS_PARTS is not set | 393 | # CONFIG_MTD_AFS_PARTS is not set |
| 394 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 240 | 395 | ||
| 241 | # | 396 | # |
| 242 | # User Modules And Translation Layers | 397 | # User Modules And Translation Layers |
| 243 | # | 398 | # |
| 244 | CONFIG_MTD_CHAR=y | 399 | CONFIG_MTD_CHAR=y |
| 400 | CONFIG_MTD_BLKDEVS=y | ||
| 245 | CONFIG_MTD_BLOCK=y | 401 | CONFIG_MTD_BLOCK=y |
| 246 | # CONFIG_FTL is not set | 402 | # CONFIG_FTL is not set |
| 247 | # CONFIG_NFTL is not set | 403 | # CONFIG_NFTL is not set |
| 248 | # CONFIG_INFTL is not set | 404 | # CONFIG_INFTL is not set |
| 405 | # CONFIG_RFD_FTL is not set | ||
| 406 | # CONFIG_SSFDC is not set | ||
| 407 | # CONFIG_MTD_OOPS is not set | ||
| 249 | 408 | ||
| 250 | # | 409 | # |
| 251 | # RAM/ROM/Flash chip drivers | 410 | # RAM/ROM/Flash chip drivers |
| @@ -266,7 +425,6 @@ CONFIG_MTD_CFI_I2=y | |||
| 266 | # CONFIG_MTD_CFI_I8 is not set | 425 | # CONFIG_MTD_CFI_I8 is not set |
| 267 | CONFIG_MTD_CFI_INTELEXT=y | 426 | CONFIG_MTD_CFI_INTELEXT=y |
| 268 | CONFIG_MTD_CFI_AMDSTD=y | 427 | CONFIG_MTD_CFI_AMDSTD=y |
| 269 | CONFIG_MTD_CFI_AMDSTD_RETRY=0 | ||
| 270 | # CONFIG_MTD_CFI_STAA is not set | 428 | # CONFIG_MTD_CFI_STAA is not set |
| 271 | CONFIG_MTD_CFI_UTIL=y | 429 | CONFIG_MTD_CFI_UTIL=y |
| 272 | # CONFIG_MTD_RAM is not set | 430 | # CONFIG_MTD_RAM is not set |
| @@ -279,7 +437,6 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 279 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 437 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 280 | # CONFIG_MTD_PHYSMAP is not set | 438 | # CONFIG_MTD_PHYSMAP is not set |
| 281 | CONFIG_MTD_ARM_INTEGRATOR=y | 439 | CONFIG_MTD_ARM_INTEGRATOR=y |
| 282 | # CONFIG_MTD_EDB7312 is not set | ||
| 283 | # CONFIG_MTD_PLATRAM is not set | 440 | # CONFIG_MTD_PLATRAM is not set |
| 284 | 441 | ||
| 285 | # | 442 | # |
| @@ -288,7 +445,7 @@ CONFIG_MTD_ARM_INTEGRATOR=y | |||
| 288 | # CONFIG_MTD_SLRAM is not set | 445 | # CONFIG_MTD_SLRAM is not set |
| 289 | # CONFIG_MTD_PHRAM is not set | 446 | # CONFIG_MTD_PHRAM is not set |
| 290 | # CONFIG_MTD_MTDRAM is not set | 447 | # CONFIG_MTD_MTDRAM is not set |
| 291 | # CONFIG_MTD_BLKMTD is not set | 448 | # CONFIG_MTD_BLOCK2MTD is not set |
| 292 | 449 | ||
| 293 | # | 450 | # |
| 294 | # Disk-On-Chip Device Drivers | 451 | # Disk-On-Chip Device Drivers |
| @@ -296,121 +453,81 @@ CONFIG_MTD_ARM_INTEGRATOR=y | |||
| 296 | # CONFIG_MTD_DOC2000 is not set | 453 | # CONFIG_MTD_DOC2000 is not set |
| 297 | # CONFIG_MTD_DOC2001 is not set | 454 | # CONFIG_MTD_DOC2001 is not set |
| 298 | # CONFIG_MTD_DOC2001PLUS is not set | 455 | # CONFIG_MTD_DOC2001PLUS is not set |
| 299 | |||
| 300 | # | ||
| 301 | # NAND Flash Device Drivers | ||
| 302 | # | ||
| 303 | # CONFIG_MTD_NAND is not set | 456 | # CONFIG_MTD_NAND is not set |
| 457 | # CONFIG_MTD_ONENAND is not set | ||
| 304 | 458 | ||
| 305 | # | 459 | # |
| 306 | # Parallel port support | 460 | # UBI - Unsorted block images |
| 307 | # | 461 | # |
| 462 | # CONFIG_MTD_UBI is not set | ||
| 308 | # CONFIG_PARPORT is not set | 463 | # CONFIG_PARPORT is not set |
| 309 | 464 | CONFIG_BLK_DEV=y | |
| 310 | # | ||
| 311 | # Plug and Play support | ||
| 312 | # | ||
| 313 | |||
| 314 | # | ||
| 315 | # Block devices | ||
| 316 | # | ||
| 317 | # CONFIG_BLK_DEV_COW_COMMON is not set | 465 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 318 | # CONFIG_BLK_DEV_LOOP is not set | 466 | # CONFIG_BLK_DEV_LOOP is not set |
| 319 | # CONFIG_BLK_DEV_NBD is not set | 467 | # CONFIG_BLK_DEV_NBD is not set |
| 320 | # CONFIG_BLK_DEV_RAM is not set | 468 | # CONFIG_BLK_DEV_RAM is not set |
| 321 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 322 | # CONFIG_CDROM_PKTCDVD is not set | 469 | # CONFIG_CDROM_PKTCDVD is not set |
| 323 | |||
| 324 | # | ||
| 325 | # IO Schedulers | ||
| 326 | # | ||
| 327 | CONFIG_IOSCHED_NOOP=y | ||
| 328 | # CONFIG_IOSCHED_AS is not set | ||
| 329 | CONFIG_IOSCHED_DEADLINE=y | ||
| 330 | # CONFIG_IOSCHED_CFQ is not set | ||
| 331 | # CONFIG_ATA_OVER_ETH is not set | 470 | # CONFIG_ATA_OVER_ETH is not set |
| 471 | CONFIG_MISC_DEVICES=y | ||
| 472 | # CONFIG_EEPROM_93CX6 is not set | ||
| 473 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 474 | CONFIG_HAVE_IDE=y | ||
| 475 | # CONFIG_IDE is not set | ||
| 332 | 476 | ||
| 333 | # | 477 | # |
| 334 | # SCSI device support | 478 | # SCSI device support |
| 335 | # | 479 | # |
| 336 | # CONFIG_RAID_ATTRS is not set | 480 | # CONFIG_RAID_ATTRS is not set |
| 337 | # CONFIG_SCSI is not set | 481 | # CONFIG_SCSI is not set |
| 338 | 482 | # CONFIG_SCSI_DMA is not set | |
| 339 | # | 483 | # CONFIG_SCSI_NETLINK is not set |
| 340 | # Multi-device support (RAID and LVM) | 484 | # CONFIG_ATA is not set |
| 341 | # | ||
| 342 | # CONFIG_MD is not set | 485 | # CONFIG_MD is not set |
| 343 | |||
| 344 | # | ||
| 345 | # Fusion MPT device support | ||
| 346 | # | ||
| 347 | # CONFIG_FUSION is not set | ||
| 348 | |||
| 349 | # | ||
| 350 | # IEEE 1394 (FireWire) support | ||
| 351 | # | ||
| 352 | |||
| 353 | # | ||
| 354 | # I2O device support | ||
| 355 | # | ||
| 356 | |||
| 357 | # | ||
| 358 | # Network device support | ||
| 359 | # | ||
| 360 | CONFIG_NETDEVICES=y | 486 | CONFIG_NETDEVICES=y |
| 361 | # CONFIG_DUMMY is not set | 487 | # CONFIG_DUMMY is not set |
| 362 | # CONFIG_BONDING is not set | 488 | # CONFIG_BONDING is not set |
| 489 | # CONFIG_MACVLAN is not set | ||
| 363 | # CONFIG_EQUALIZER is not set | 490 | # CONFIG_EQUALIZER is not set |
| 364 | # CONFIG_TUN is not set | 491 | # CONFIG_TUN is not set |
| 365 | 492 | # CONFIG_VETH is not set | |
| 366 | # | ||
| 367 | # PHY device support | ||
| 368 | # | ||
| 369 | # CONFIG_PHYLIB is not set | 493 | # CONFIG_PHYLIB is not set |
| 370 | |||
| 371 | # | ||
| 372 | # Ethernet (10 or 100Mbit) | ||
| 373 | # | ||
| 374 | CONFIG_NET_ETHERNET=y | 494 | CONFIG_NET_ETHERNET=y |
| 375 | CONFIG_MII=y | 495 | CONFIG_MII=y |
| 496 | # CONFIG_AX88796 is not set | ||
| 376 | CONFIG_SMC91X=y | 497 | CONFIG_SMC91X=y |
| 377 | # CONFIG_DM9000 is not set | 498 | # CONFIG_DM9000 is not set |
| 378 | 499 | CONFIG_SMC911X=y | |
| 379 | # | 500 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 380 | # Ethernet (1000 Mbit) | 501 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 381 | # | 502 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 382 | 503 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | |
| 383 | # | 504 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set |
| 384 | # Ethernet (10000 Mbit) | 505 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
| 385 | # | 506 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
| 386 | 507 | # CONFIG_B44 is not set | |
| 387 | # | 508 | # CONFIG_NETDEV_1000 is not set |
| 388 | # Token Ring devices | 509 | # CONFIG_NETDEV_10000 is not set |
| 389 | # | 510 | |
| 390 | 511 | # | |
| 391 | # | 512 | # Wireless LAN |
| 392 | # Wireless LAN (non-hamradio) | 513 | # |
| 393 | # | 514 | # CONFIG_WLAN_PRE80211 is not set |
| 394 | # CONFIG_NET_RADIO is not set | 515 | # CONFIG_WLAN_80211 is not set |
| 395 | 516 | # CONFIG_IWLWIFI_LEDS is not set | |
| 396 | # | ||
| 397 | # Wan interfaces | ||
| 398 | # | ||
| 399 | # CONFIG_WAN is not set | 517 | # CONFIG_WAN is not set |
| 400 | # CONFIG_PPP is not set | 518 | # CONFIG_PPP is not set |
| 401 | # CONFIG_SLIP is not set | 519 | # CONFIG_SLIP is not set |
| 520 | # CONFIG_NETCONSOLE is not set | ||
| 402 | # CONFIG_NETPOLL is not set | 521 | # CONFIG_NETPOLL is not set |
| 403 | # CONFIG_NET_POLL_CONTROLLER is not set | 522 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 404 | |||
| 405 | # | ||
| 406 | # ISDN subsystem | ||
| 407 | # | ||
| 408 | # CONFIG_ISDN is not set | 523 | # CONFIG_ISDN is not set |
| 409 | 524 | ||
| 410 | # | 525 | # |
| 411 | # Input device support | 526 | # Input device support |
| 412 | # | 527 | # |
| 413 | CONFIG_INPUT=y | 528 | CONFIG_INPUT=y |
| 529 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 530 | # CONFIG_INPUT_POLLDEV is not set | ||
| 414 | 531 | ||
| 415 | # | 532 | # |
| 416 | # Userland interfaces | 533 | # Userland interfaces |
| @@ -420,7 +537,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 420 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 537 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 421 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 538 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 422 | # CONFIG_INPUT_JOYDEV is not set | 539 | # CONFIG_INPUT_JOYDEV is not set |
| 423 | # CONFIG_INPUT_TSDEV is not set | ||
| 424 | # CONFIG_INPUT_EVDEV is not set | 540 | # CONFIG_INPUT_EVDEV is not set |
| 425 | # CONFIG_INPUT_EVBUG is not set | 541 | # CONFIG_INPUT_EVBUG is not set |
| 426 | 542 | ||
| @@ -433,11 +549,19 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 433 | # CONFIG_KEYBOARD_LKKBD is not set | 549 | # CONFIG_KEYBOARD_LKKBD is not set |
| 434 | # CONFIG_KEYBOARD_XTKBD is not set | 550 | # CONFIG_KEYBOARD_XTKBD is not set |
| 435 | # CONFIG_KEYBOARD_NEWTON is not set | 551 | # CONFIG_KEYBOARD_NEWTON is not set |
| 552 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 436 | CONFIG_INPUT_MOUSE=y | 553 | CONFIG_INPUT_MOUSE=y |
| 437 | CONFIG_MOUSE_PS2=y | 554 | CONFIG_MOUSE_PS2=y |
| 555 | CONFIG_MOUSE_PS2_ALPS=y | ||
| 556 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
| 557 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
| 558 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 559 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
| 560 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
| 438 | # CONFIG_MOUSE_SERIAL is not set | 561 | # CONFIG_MOUSE_SERIAL is not set |
| 439 | # CONFIG_MOUSE_VSXXXAA is not set | 562 | # CONFIG_MOUSE_VSXXXAA is not set |
| 440 | # CONFIG_INPUT_JOYSTICK is not set | 563 | # CONFIG_INPUT_JOYSTICK is not set |
| 564 | # CONFIG_INPUT_TABLET is not set | ||
| 441 | # CONFIG_INPUT_TOUCHSCREEN is not set | 565 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 442 | # CONFIG_INPUT_MISC is not set | 566 | # CONFIG_INPUT_MISC is not set |
| 443 | 567 | ||
| @@ -455,8 +579,11 @@ CONFIG_SERIO_LIBPS2=y | |||
| 455 | # Character devices | 579 | # Character devices |
| 456 | # | 580 | # |
| 457 | CONFIG_VT=y | 581 | CONFIG_VT=y |
| 582 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 458 | CONFIG_VT_CONSOLE=y | 583 | CONFIG_VT_CONSOLE=y |
| 459 | CONFIG_HW_CONSOLE=y | 584 | CONFIG_HW_CONSOLE=y |
| 585 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 586 | CONFIG_DEVKMEM=y | ||
| 460 | # CONFIG_SERIAL_NONSTANDARD is not set | 587 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 461 | 588 | ||
| 462 | # | 589 | # |
| @@ -475,73 +602,91 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 475 | CONFIG_UNIX98_PTYS=y | 602 | CONFIG_UNIX98_PTYS=y |
| 476 | CONFIG_LEGACY_PTYS=y | 603 | CONFIG_LEGACY_PTYS=y |
| 477 | CONFIG_LEGACY_PTY_COUNT=16 | 604 | CONFIG_LEGACY_PTY_COUNT=16 |
| 478 | |||
| 479 | # | ||
| 480 | # IPMI | ||
| 481 | # | ||
| 482 | # CONFIG_IPMI_HANDLER is not set | 605 | # CONFIG_IPMI_HANDLER is not set |
| 483 | 606 | # CONFIG_HW_RANDOM is not set | |
| 484 | # | ||
| 485 | # Watchdog Cards | ||
| 486 | # | ||
| 487 | # CONFIG_WATCHDOG is not set | ||
| 488 | # CONFIG_NVRAM is not set | 607 | # CONFIG_NVRAM is not set |
| 489 | # CONFIG_RTC is not set | ||
| 490 | # CONFIG_DTLK is not set | ||
| 491 | # CONFIG_R3964 is not set | 608 | # CONFIG_R3964 is not set |
| 492 | |||
| 493 | # | ||
| 494 | # Ftape, the floppy tape device driver | ||
| 495 | # | ||
| 496 | # CONFIG_RAW_DRIVER is not set | 609 | # CONFIG_RAW_DRIVER is not set |
| 497 | 610 | # CONFIG_TCG_TPM is not set | |
| 498 | # | ||
| 499 | # TPM devices | ||
| 500 | # | ||
| 501 | |||
| 502 | # | ||
| 503 | # I2C support | ||
| 504 | # | ||
| 505 | # CONFIG_I2C is not set | 611 | # CONFIG_I2C is not set |
| 612 | # CONFIG_SPI is not set | ||
| 613 | # CONFIG_W1 is not set | ||
| 614 | # CONFIG_POWER_SUPPLY is not set | ||
| 615 | # CONFIG_HWMON is not set | ||
| 616 | # CONFIG_THERMAL is not set | ||
| 617 | # CONFIG_THERMAL_HWMON is not set | ||
| 618 | # CONFIG_WATCHDOG is not set | ||
| 506 | 619 | ||
| 507 | # | 620 | # |
| 508 | # Hardware Monitoring support | 621 | # Sonics Silicon Backplane |
| 509 | # | 622 | # |
| 510 | # CONFIG_HWMON is not set | 623 | CONFIG_SSB_POSSIBLE=y |
| 511 | # CONFIG_HWMON_VID is not set | 624 | # CONFIG_SSB is not set |
| 512 | 625 | ||
| 513 | # | 626 | # |
| 514 | # Misc devices | 627 | # Multifunction device drivers |
| 515 | # | 628 | # |
| 629 | # CONFIG_MFD_CORE is not set | ||
| 630 | # CONFIG_MFD_SM501 is not set | ||
| 631 | # CONFIG_HTC_PASIC3 is not set | ||
| 632 | # CONFIG_MFD_TMIO is not set | ||
| 633 | # CONFIG_MFD_T7L66XB is not set | ||
| 634 | # CONFIG_MFD_TC6387XB is not set | ||
| 635 | # CONFIG_MFD_WM8400 is not set | ||
| 516 | 636 | ||
| 517 | # | 637 | # |
| 518 | # Multimedia Capabilities Port drivers | 638 | # Multimedia devices |
| 519 | # | 639 | # |
| 520 | 640 | ||
| 521 | # | 641 | # |
| 522 | # Multimedia devices | 642 | # Multimedia core support |
| 523 | # | 643 | # |
| 524 | # CONFIG_VIDEO_DEV is not set | 644 | # CONFIG_VIDEO_DEV is not set |
| 645 | # CONFIG_DVB_CORE is not set | ||
| 646 | # CONFIG_VIDEO_MEDIA is not set | ||
| 525 | 647 | ||
| 526 | # | 648 | # |
| 527 | # Digital Video Broadcasting Devices | 649 | # Multimedia drivers |
| 528 | # | 650 | # |
| 529 | # CONFIG_DVB is not set | 651 | # CONFIG_DAB is not set |
| 530 | 652 | ||
| 531 | # | 653 | # |
| 532 | # Graphics support | 654 | # Graphics support |
| 533 | # | 655 | # |
| 656 | # CONFIG_VGASTATE is not set | ||
| 657 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 534 | CONFIG_FB=y | 658 | CONFIG_FB=y |
| 659 | # CONFIG_FIRMWARE_EDID is not set | ||
| 660 | # CONFIG_FB_DDC is not set | ||
| 661 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 535 | CONFIG_FB_CFB_FILLRECT=y | 662 | CONFIG_FB_CFB_FILLRECT=y |
| 536 | CONFIG_FB_CFB_COPYAREA=y | 663 | CONFIG_FB_CFB_COPYAREA=y |
| 537 | CONFIG_FB_CFB_IMAGEBLIT=y | 664 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 538 | CONFIG_FB_SOFT_CURSOR=y | 665 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
| 666 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 667 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 668 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 669 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 670 | # CONFIG_FB_SYS_FOPS is not set | ||
| 671 | # CONFIG_FB_SVGALIB is not set | ||
| 539 | # CONFIG_FB_MACMODES is not set | 672 | # CONFIG_FB_MACMODES is not set |
| 673 | # CONFIG_FB_BACKLIGHT is not set | ||
| 540 | # CONFIG_FB_MODE_HELPERS is not set | 674 | # CONFIG_FB_MODE_HELPERS is not set |
| 541 | # CONFIG_FB_TILEBLITTING is not set | 675 | # CONFIG_FB_TILEBLITTING is not set |
| 676 | |||
| 677 | # | ||
| 678 | # Frame buffer hardware drivers | ||
| 679 | # | ||
| 542 | CONFIG_FB_ARMCLCD=y | 680 | CONFIG_FB_ARMCLCD=y |
| 543 | # CONFIG_FB_S1D13XXX is not set | 681 | # CONFIG_FB_S1D13XXX is not set |
| 544 | # CONFIG_FB_VIRTUAL is not set | 682 | # CONFIG_FB_VIRTUAL is not set |
| 683 | # CONFIG_FB_METRONOME is not set | ||
| 684 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 685 | |||
| 686 | # | ||
| 687 | # Display device support | ||
| 688 | # | ||
| 689 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 545 | 690 | ||
| 546 | # | 691 | # |
| 547 | # Console display driver support | 692 | # Console display driver support |
| @@ -549,27 +694,17 @@ CONFIG_FB_ARMCLCD=y | |||
| 549 | # CONFIG_VGA_CONSOLE is not set | 694 | # CONFIG_VGA_CONSOLE is not set |
| 550 | CONFIG_DUMMY_CONSOLE=y | 695 | CONFIG_DUMMY_CONSOLE=y |
| 551 | CONFIG_FRAMEBUFFER_CONSOLE=y | 696 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 697 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 698 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 552 | # CONFIG_FONTS is not set | 699 | # CONFIG_FONTS is not set |
| 553 | CONFIG_FONT_8x8=y | 700 | CONFIG_FONT_8x8=y |
| 554 | CONFIG_FONT_8x16=y | 701 | CONFIG_FONT_8x16=y |
| 555 | |||
| 556 | # | ||
| 557 | # Logo configuration | ||
| 558 | # | ||
| 559 | CONFIG_LOGO=y | 702 | CONFIG_LOGO=y |
| 560 | # CONFIG_LOGO_LINUX_MONO is not set | 703 | # CONFIG_LOGO_LINUX_MONO is not set |
| 561 | # CONFIG_LOGO_LINUX_VGA16 is not set | 704 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| 562 | CONFIG_LOGO_LINUX_CLUT224=y | 705 | CONFIG_LOGO_LINUX_CLUT224=y |
| 563 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 564 | |||
| 565 | # | ||
| 566 | # Sound | ||
| 567 | # | ||
| 568 | CONFIG_SOUND=y | 706 | CONFIG_SOUND=y |
| 569 | 707 | CONFIG_SOUND_OSS_CORE=y | |
| 570 | # | ||
| 571 | # Advanced Linux Sound Architecture | ||
| 572 | # | ||
| 573 | CONFIG_SND=y | 708 | CONFIG_SND=y |
| 574 | CONFIG_SND_TIMER=y | 709 | CONFIG_SND_TIMER=y |
| 575 | CONFIG_SND_PCM=y | 710 | CONFIG_SND_PCM=y |
| @@ -577,59 +712,71 @@ CONFIG_SND_PCM=y | |||
| 577 | CONFIG_SND_OSSEMUL=y | 712 | CONFIG_SND_OSSEMUL=y |
| 578 | CONFIG_SND_MIXER_OSS=y | 713 | CONFIG_SND_MIXER_OSS=y |
| 579 | CONFIG_SND_PCM_OSS=y | 714 | CONFIG_SND_PCM_OSS=y |
| 715 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 716 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 717 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 718 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 580 | # CONFIG_SND_VERBOSE_PRINTK is not set | 719 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 581 | # CONFIG_SND_DEBUG is not set | 720 | # CONFIG_SND_DEBUG is not set |
| 582 | 721 | CONFIG_SND_VMASTER=y | |
| 583 | # | 722 | CONFIG_SND_AC97_CODEC=y |
| 584 | # Generic devices | 723 | # CONFIG_SND_DRIVERS is not set |
| 585 | # | 724 | CONFIG_SND_ARM=y |
| 586 | # CONFIG_SND_DUMMY is not set | 725 | CONFIG_SND_ARMAACI=y |
| 587 | # CONFIG_SND_MTPAV is not set | 726 | # CONFIG_SND_SOC is not set |
| 588 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 589 | # CONFIG_SND_MPU401 is not set | ||
| 590 | |||
| 591 | # | ||
| 592 | # ALSA ARM devices | ||
| 593 | # | ||
| 594 | # CONFIG_SND_ARMAACI is not set | ||
| 595 | |||
| 596 | # | ||
| 597 | # Open Sound System | ||
| 598 | # | ||
| 599 | # CONFIG_SOUND_PRIME is not set | 727 | # CONFIG_SOUND_PRIME is not set |
| 728 | CONFIG_AC97_BUS=y | ||
| 729 | # CONFIG_HID_SUPPORT is not set | ||
| 730 | # CONFIG_USB_SUPPORT is not set | ||
| 731 | CONFIG_MMC=y | ||
| 732 | # CONFIG_MMC_DEBUG is not set | ||
| 733 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 600 | 734 | ||
| 601 | # | 735 | # |
| 602 | # USB support | 736 | # MMC/SD/SDIO Card Drivers |
| 603 | # | 737 | # |
| 604 | CONFIG_USB_ARCH_HAS_HCD=y | 738 | CONFIG_MMC_BLOCK=y |
| 605 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 739 | CONFIG_MMC_BLOCK_BOUNCE=y |
| 606 | # CONFIG_USB is not set | 740 | # CONFIG_SDIO_UART is not set |
| 741 | # CONFIG_MMC_TEST is not set | ||
| 607 | 742 | ||
| 608 | # | 743 | # |
| 609 | # USB Gadget Support | 744 | # MMC/SD/SDIO Host Controller Drivers |
| 610 | # | 745 | # |
| 611 | # CONFIG_USB_GADGET is not set | 746 | CONFIG_MMC_ARMMMCI=y |
| 747 | # CONFIG_MMC_SDHCI is not set | ||
| 748 | # CONFIG_MEMSTICK is not set | ||
| 749 | # CONFIG_ACCESSIBILITY is not set | ||
| 750 | # CONFIG_NEW_LEDS is not set | ||
| 751 | CONFIG_RTC_LIB=y | ||
| 752 | # CONFIG_RTC_CLASS is not set | ||
| 753 | # CONFIG_DMADEVICES is not set | ||
| 612 | 754 | ||
| 613 | # | 755 | # |
| 614 | # MMC/SD Card support | 756 | # Voltage and Current regulators |
| 615 | # | 757 | # |
| 616 | # CONFIG_MMC is not set | 758 | # CONFIG_REGULATOR is not set |
| 759 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
| 760 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
| 761 | # CONFIG_REGULATOR_BQ24022 is not set | ||
| 762 | # CONFIG_UIO is not set | ||
| 617 | 763 | ||
| 618 | # | 764 | # |
| 619 | # File systems | 765 | # File systems |
| 620 | # | 766 | # |
| 621 | # CONFIG_EXT2_FS is not set | 767 | # CONFIG_EXT2_FS is not set |
| 622 | # CONFIG_EXT3_FS is not set | 768 | # CONFIG_EXT3_FS is not set |
| 623 | # CONFIG_JBD is not set | 769 | # CONFIG_EXT4_FS is not set |
| 624 | # CONFIG_REISERFS_FS is not set | 770 | # CONFIG_REISERFS_FS is not set |
| 625 | # CONFIG_JFS_FS is not set | 771 | # CONFIG_JFS_FS is not set |
| 626 | # CONFIG_FS_POSIX_ACL is not set | 772 | # CONFIG_FS_POSIX_ACL is not set |
| 773 | CONFIG_FILE_LOCKING=y | ||
| 627 | # CONFIG_XFS_FS is not set | 774 | # CONFIG_XFS_FS is not set |
| 628 | # CONFIG_MINIX_FS is not set | 775 | # CONFIG_OCFS2_FS is not set |
| 629 | # CONFIG_ROMFS_FS is not set | 776 | CONFIG_DNOTIFY=y |
| 630 | CONFIG_INOTIFY=y | 777 | CONFIG_INOTIFY=y |
| 778 | CONFIG_INOTIFY_USER=y | ||
| 631 | # CONFIG_QUOTA is not set | 779 | # CONFIG_QUOTA is not set |
| 632 | CONFIG_DNOTIFY=y | ||
| 633 | # CONFIG_AUTOFS_FS is not set | 780 | # CONFIG_AUTOFS_FS is not set |
| 634 | # CONFIG_AUTOFS4_FS is not set | 781 | # CONFIG_AUTOFS4_FS is not set |
| 635 | # CONFIG_FUSE_FS is not set | 782 | # CONFIG_FUSE_FS is not set |
| @@ -654,51 +801,59 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 654 | # Pseudo filesystems | 801 | # Pseudo filesystems |
| 655 | # | 802 | # |
| 656 | CONFIG_PROC_FS=y | 803 | CONFIG_PROC_FS=y |
| 804 | CONFIG_PROC_SYSCTL=y | ||
| 805 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 657 | CONFIG_SYSFS=y | 806 | CONFIG_SYSFS=y |
| 658 | CONFIG_TMPFS=y | 807 | CONFIG_TMPFS=y |
| 808 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 659 | # CONFIG_HUGETLB_PAGE is not set | 809 | # CONFIG_HUGETLB_PAGE is not set |
| 660 | CONFIG_RAMFS=y | 810 | # CONFIG_CONFIGFS_FS is not set |
| 661 | # CONFIG_RELAYFS_FS is not set | ||
| 662 | 811 | ||
| 663 | # | 812 | # |
| 664 | # Miscellaneous filesystems | 813 | # Miscellaneous filesystems |
| 665 | # | 814 | # |
| 815 | # CONFIG_ADFS_FS is not set | ||
| 816 | # CONFIG_AFFS_FS is not set | ||
| 817 | # CONFIG_HFS_FS is not set | ||
| 666 | # CONFIG_HFSPLUS_FS is not set | 818 | # CONFIG_HFSPLUS_FS is not set |
| 667 | # CONFIG_JFFS_FS is not set | 819 | # CONFIG_BEFS_FS is not set |
| 820 | # CONFIG_BFS_FS is not set | ||
| 821 | # CONFIG_EFS_FS is not set | ||
| 668 | # CONFIG_JFFS2_FS is not set | 822 | # CONFIG_JFFS2_FS is not set |
| 669 | CONFIG_CRAMFS=y | 823 | CONFIG_CRAMFS=y |
| 670 | # CONFIG_VXFS_FS is not set | 824 | # CONFIG_VXFS_FS is not set |
| 825 | # CONFIG_MINIX_FS is not set | ||
| 826 | # CONFIG_OMFS_FS is not set | ||
| 671 | # CONFIG_HPFS_FS is not set | 827 | # CONFIG_HPFS_FS is not set |
| 672 | # CONFIG_QNX4FS_FS is not set | 828 | # CONFIG_QNX4FS_FS is not set |
| 829 | # CONFIG_ROMFS_FS is not set | ||
| 673 | # CONFIG_SYSV_FS is not set | 830 | # CONFIG_SYSV_FS is not set |
| 674 | # CONFIG_UFS_FS is not set | 831 | # CONFIG_UFS_FS is not set |
| 675 | 832 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 676 | # | ||
| 677 | # Network File Systems | ||
| 678 | # | ||
| 679 | CONFIG_NFS_FS=y | 833 | CONFIG_NFS_FS=y |
| 680 | CONFIG_NFS_V3=y | 834 | CONFIG_NFS_V3=y |
| 681 | # CONFIG_NFS_V3_ACL is not set | 835 | # CONFIG_NFS_V3_ACL is not set |
| 682 | # CONFIG_NFSD is not set | 836 | # CONFIG_NFS_V4 is not set |
| 683 | CONFIG_ROOT_NFS=y | 837 | CONFIG_ROOT_NFS=y |
| 838 | # CONFIG_NFSD is not set | ||
| 684 | CONFIG_LOCKD=y | 839 | CONFIG_LOCKD=y |
| 685 | CONFIG_LOCKD_V4=y | 840 | CONFIG_LOCKD_V4=y |
| 686 | CONFIG_NFS_COMMON=y | 841 | CONFIG_NFS_COMMON=y |
| 687 | CONFIG_SUNRPC=y | 842 | CONFIG_SUNRPC=y |
| 843 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 844 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 845 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 688 | # CONFIG_SMB_FS is not set | 846 | # CONFIG_SMB_FS is not set |
| 689 | # CONFIG_CIFS is not set | 847 | # CONFIG_CIFS is not set |
| 690 | # CONFIG_NCP_FS is not set | 848 | # CONFIG_NCP_FS is not set |
| 691 | # CONFIG_CODA_FS is not set | 849 | # CONFIG_CODA_FS is not set |
| 850 | # CONFIG_AFS_FS is not set | ||
| 692 | 851 | ||
| 693 | # | 852 | # |
| 694 | # Partition Types | 853 | # Partition Types |
| 695 | # | 854 | # |
| 696 | # CONFIG_PARTITION_ADVANCED is not set | 855 | # CONFIG_PARTITION_ADVANCED is not set |
| 697 | CONFIG_MSDOS_PARTITION=y | 856 | CONFIG_MSDOS_PARTITION=y |
| 698 | |||
| 699 | # | ||
| 700 | # Native Language Support | ||
| 701 | # | ||
| 702 | CONFIG_NLS=y | 857 | CONFIG_NLS=y |
| 703 | CONFIG_NLS_DEFAULT="iso8859-1" | 858 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 704 | CONFIG_NLS_CODEPAGE_437=y | 859 | CONFIG_NLS_CODEPAGE_437=y |
| @@ -739,26 +894,71 @@ CONFIG_NLS_ISO8859_1=y | |||
| 739 | # CONFIG_NLS_KOI8_R is not set | 894 | # CONFIG_NLS_KOI8_R is not set |
| 740 | # CONFIG_NLS_KOI8_U is not set | 895 | # CONFIG_NLS_KOI8_U is not set |
| 741 | # CONFIG_NLS_UTF8 is not set | 896 | # CONFIG_NLS_UTF8 is not set |
| 897 | # CONFIG_DLM is not set | ||
| 742 | 898 | ||
| 743 | # | 899 | # |
| 744 | # Kernel hacking | 900 | # Kernel hacking |
| 745 | # | 901 | # |
| 746 | # CONFIG_PRINTK_TIME is not set | 902 | # CONFIG_PRINTK_TIME is not set |
| 747 | CONFIG_DEBUG_KERNEL=y | 903 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 904 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 905 | CONFIG_FRAME_WARN=1024 | ||
| 748 | CONFIG_MAGIC_SYSRQ=y | 906 | CONFIG_MAGIC_SYSRQ=y |
| 749 | CONFIG_LOG_BUF_SHIFT=14 | 907 | # CONFIG_UNUSED_SYMBOLS is not set |
| 908 | # CONFIG_DEBUG_FS is not set | ||
| 909 | # CONFIG_HEADERS_CHECK is not set | ||
| 910 | CONFIG_DEBUG_KERNEL=y | ||
| 911 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 750 | CONFIG_DETECT_SOFTLOCKUP=y | 912 | CONFIG_DETECT_SOFTLOCKUP=y |
| 913 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 914 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 915 | # CONFIG_SCHED_DEBUG is not set | ||
| 751 | # CONFIG_SCHEDSTATS is not set | 916 | # CONFIG_SCHEDSTATS is not set |
| 917 | # CONFIG_TIMER_STATS is not set | ||
| 918 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 752 | # CONFIG_DEBUG_SLAB is not set | 919 | # CONFIG_DEBUG_SLAB is not set |
| 920 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 921 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 753 | # CONFIG_DEBUG_SPINLOCK is not set | 922 | # CONFIG_DEBUG_SPINLOCK is not set |
| 923 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 924 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 925 | # CONFIG_PROVE_LOCKING is not set | ||
| 926 | # CONFIG_LOCK_STAT is not set | ||
| 754 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 927 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 928 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 755 | # CONFIG_DEBUG_KOBJECT is not set | 929 | # CONFIG_DEBUG_KOBJECT is not set |
| 756 | CONFIG_DEBUG_BUGVERBOSE=y | 930 | CONFIG_DEBUG_BUGVERBOSE=y |
| 757 | # CONFIG_DEBUG_INFO is not set | 931 | # CONFIG_DEBUG_INFO is not set |
| 758 | # CONFIG_DEBUG_FS is not set | 932 | # CONFIG_DEBUG_VM is not set |
| 933 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 934 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 935 | # CONFIG_DEBUG_LIST is not set | ||
| 936 | # CONFIG_DEBUG_SG is not set | ||
| 759 | CONFIG_FRAME_POINTER=y | 937 | CONFIG_FRAME_POINTER=y |
| 938 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 939 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 940 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 941 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 942 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 943 | # CONFIG_FAULT_INJECTION is not set | ||
| 944 | # CONFIG_LATENCYTOP is not set | ||
| 945 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
| 946 | CONFIG_NOP_TRACER=y | ||
| 947 | CONFIG_HAVE_FTRACE=y | ||
| 948 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
| 949 | # CONFIG_FTRACE is not set | ||
| 950 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 951 | # CONFIG_SCHED_TRACER is not set | ||
| 952 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 953 | # CONFIG_BOOT_TRACER is not set | ||
| 954 | # CONFIG_STACK_TRACER is not set | ||
| 955 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 956 | # CONFIG_SAMPLES is not set | ||
| 957 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 958 | # CONFIG_KGDB is not set | ||
| 760 | CONFIG_DEBUG_USER=y | 959 | CONFIG_DEBUG_USER=y |
| 761 | CONFIG_DEBUG_ERRORS=y | 960 | CONFIG_DEBUG_ERRORS=y |
| 961 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 762 | # CONFIG_DEBUG_LL is not set | 962 | # CONFIG_DEBUG_LL is not set |
| 763 | 963 | ||
| 764 | # | 964 | # |
| @@ -766,21 +966,106 @@ CONFIG_DEBUG_ERRORS=y | |||
| 766 | # | 966 | # |
| 767 | # CONFIG_KEYS is not set | 967 | # CONFIG_KEYS is not set |
| 768 | # CONFIG_SECURITY is not set | 968 | # CONFIG_SECURITY is not set |
| 969 | # CONFIG_SECURITYFS is not set | ||
| 970 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 971 | CONFIG_CRYPTO=y | ||
| 972 | |||
| 973 | # | ||
| 974 | # Crypto core or helper | ||
| 975 | # | ||
| 976 | # CONFIG_CRYPTO_FIPS is not set | ||
| 977 | # CONFIG_CRYPTO_MANAGER is not set | ||
| 978 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 979 | # CONFIG_CRYPTO_NULL is not set | ||
| 980 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 981 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 982 | # CONFIG_CRYPTO_TEST is not set | ||
| 983 | |||
| 984 | # | ||
| 985 | # Authenticated Encryption with Associated Data | ||
| 986 | # | ||
| 987 | # CONFIG_CRYPTO_CCM is not set | ||
| 988 | # CONFIG_CRYPTO_GCM is not set | ||
| 989 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 990 | |||
| 991 | # | ||
| 992 | # Block modes | ||
| 993 | # | ||
| 994 | # CONFIG_CRYPTO_CBC is not set | ||
| 995 | # CONFIG_CRYPTO_CTR is not set | ||
| 996 | # CONFIG_CRYPTO_CTS is not set | ||
| 997 | # CONFIG_CRYPTO_ECB is not set | ||
| 998 | # CONFIG_CRYPTO_LRW is not set | ||
| 999 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1000 | # CONFIG_CRYPTO_XTS is not set | ||
| 1001 | |||
| 1002 | # | ||
| 1003 | # Hash modes | ||
| 1004 | # | ||
| 1005 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1006 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1007 | |||
| 1008 | # | ||
| 1009 | # Digest | ||
| 1010 | # | ||
| 1011 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1012 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1013 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1014 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1015 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1016 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1017 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1018 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1019 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1020 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1021 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1022 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1023 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1024 | |||
| 1025 | # | ||
| 1026 | # Ciphers | ||
| 1027 | # | ||
| 1028 | # CONFIG_CRYPTO_AES is not set | ||
| 1029 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1030 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1031 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1032 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1033 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1034 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1035 | # CONFIG_CRYPTO_DES is not set | ||
| 1036 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1037 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1038 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1039 | # CONFIG_CRYPTO_SEED is not set | ||
| 1040 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1041 | # CONFIG_CRYPTO_TEA is not set | ||
| 1042 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 769 | 1043 | ||
| 770 | # | 1044 | # |
| 771 | # Cryptographic options | 1045 | # Compression |
| 772 | # | 1046 | # |
| 773 | # CONFIG_CRYPTO is not set | 1047 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1048 | # CONFIG_CRYPTO_LZO is not set | ||
| 774 | 1049 | ||
| 775 | # | 1050 | # |
| 776 | # Hardware crypto devices | 1051 | # Random Number Generation |
| 777 | # | 1052 | # |
| 1053 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1054 | # CONFIG_CRYPTO_HW is not set | ||
| 778 | 1055 | ||
| 779 | # | 1056 | # |
| 780 | # Library routines | 1057 | # Library routines |
| 781 | # | 1058 | # |
| 1059 | CONFIG_BITREVERSE=y | ||
| 782 | # CONFIG_CRC_CCITT is not set | 1060 | # CONFIG_CRC_CCITT is not set |
| 783 | # CONFIG_CRC16 is not set | 1061 | # CONFIG_CRC16 is not set |
| 1062 | # CONFIG_CRC_T10DIF is not set | ||
| 1063 | # CONFIG_CRC_ITU_T is not set | ||
| 784 | CONFIG_CRC32=y | 1064 | CONFIG_CRC32=y |
| 1065 | # CONFIG_CRC7 is not set | ||
| 785 | # CONFIG_LIBCRC32C is not set | 1066 | # CONFIG_LIBCRC32C is not set |
| 786 | CONFIG_ZLIB_INFLATE=y | 1067 | CONFIG_ZLIB_INFLATE=y |
| 1068 | CONFIG_PLIST=y | ||
| 1069 | CONFIG_HAS_IOMEM=y | ||
| 1070 | CONFIG_HAS_IOPORT=y | ||
| 1071 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index de6c59f814a1..6cbd8fdc9f1f 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h | |||
| @@ -10,11 +10,11 @@ | |||
| 10 | #ifndef _ASMARM_CACHEFLUSH_H | 10 | #ifndef _ASMARM_CACHEFLUSH_H |
| 11 | #define _ASMARM_CACHEFLUSH_H | 11 | #define _ASMARM_CACHEFLUSH_H |
| 12 | 12 | ||
| 13 | #include <linux/sched.h> | ||
| 14 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 15 | 14 | ||
| 16 | #include <asm/glue.h> | 15 | #include <asm/glue.h> |
| 17 | #include <asm/shmparam.h> | 16 | #include <asm/shmparam.h> |
| 17 | #include <asm/cachetype.h> | ||
| 18 | 18 | ||
| 19 | #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) | 19 | #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) |
| 20 | 20 | ||
| @@ -296,16 +296,6 @@ static inline void outer_flush_range(unsigned long start, unsigned long end) | |||
| 296 | #endif | 296 | #endif |
| 297 | 297 | ||
| 298 | /* | 298 | /* |
| 299 | * flush_cache_vmap() is used when creating mappings (eg, via vmap, | ||
| 300 | * vmalloc, ioremap etc) in kernel space for pages. Since the | ||
| 301 | * direct-mappings of these pages may contain cached data, we need | ||
| 302 | * to do a full cache flush to ensure that writebacks don't corrupt | ||
| 303 | * data placed into these pages via the new mappings. | ||
| 304 | */ | ||
| 305 | #define flush_cache_vmap(start, end) flush_cache_all() | ||
| 306 | #define flush_cache_vunmap(start, end) flush_cache_all() | ||
| 307 | |||
| 308 | /* | ||
| 309 | * Copy user data from/to a page which is mapped into a different | 299 | * Copy user data from/to a page which is mapped into a different |
| 310 | * processes address space. Really, we want to allow our "user | 300 | * processes address space. Really, we want to allow our "user |
| 311 | * space" model to handle this. | 301 | * space" model to handle this. |
| @@ -444,4 +434,29 @@ static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt, | |||
| 444 | dmac_inv_range(start, start + size); | 434 | dmac_inv_range(start, start + size); |
| 445 | } | 435 | } |
| 446 | 436 | ||
| 437 | /* | ||
| 438 | * flush_cache_vmap() is used when creating mappings (eg, via vmap, | ||
| 439 | * vmalloc, ioremap etc) in kernel space for pages. On non-VIPT | ||
| 440 | * caches, since the direct-mappings of these pages may contain cached | ||
| 441 | * data, we need to do a full cache flush to ensure that writebacks | ||
| 442 | * don't corrupt data placed into these pages via the new mappings. | ||
| 443 | */ | ||
| 444 | static inline void flush_cache_vmap(unsigned long start, unsigned long end) | ||
| 445 | { | ||
| 446 | if (!cache_is_vipt_nonaliasing()) | ||
| 447 | flush_cache_all(); | ||
| 448 | else | ||
| 449 | /* | ||
| 450 | * set_pte_at() called from vmap_pte_range() does not | ||
| 451 | * have a DSB after cleaning the cache line. | ||
| 452 | */ | ||
| 453 | dsb(); | ||
| 454 | } | ||
| 455 | |||
| 456 | static inline void flush_cache_vunmap(unsigned long start, unsigned long end) | ||
| 457 | { | ||
| 458 | if (!cache_is_vipt_nonaliasing()) | ||
| 459 | flush_cache_all(); | ||
| 460 | } | ||
| 461 | |||
| 447 | #endif | 462 | #endif |
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 4ed149cbb32a..22cb14ec3438 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h | |||
| @@ -69,7 +69,9 @@ extern void dma_cache_maint(const void *kaddr, size_t size, int rw); | |||
| 69 | */ | 69 | */ |
| 70 | static inline int dma_supported(struct device *dev, u64 mask) | 70 | static inline int dma_supported(struct device *dev, u64 mask) |
| 71 | { | 71 | { |
| 72 | return dev->dma_mask && *dev->dma_mask != 0; | 72 | if (mask < ISA_DMA_THRESHOLD) |
| 73 | return 0; | ||
| 74 | return 1; | ||
| 73 | } | 75 | } |
| 74 | 76 | ||
| 75 | static inline int dma_set_mask(struct device *dev, u64 dma_mask) | 77 | static inline int dma_set_mask(struct device *dev, u64 dma_mask) |
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index 75154b193117..df5638f3643a 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h | |||
| @@ -1,12 +1,7 @@ | |||
| 1 | #ifndef __ASM_ARM_DMA_H | 1 | #ifndef __ASM_ARM_DMA_H |
| 2 | #define __ASM_ARM_DMA_H | 2 | #define __ASM_ARM_DMA_H |
| 3 | 3 | ||
| 4 | typedef unsigned int dmach_t; | 4 | #include <asm/memory.h> |
| 5 | |||
| 6 | #include <linux/spinlock.h> | ||
| 7 | #include <asm/system.h> | ||
| 8 | #include <asm/scatterlist.h> | ||
| 9 | #include <mach/dma.h> | ||
| 10 | 5 | ||
| 11 | /* | 6 | /* |
| 12 | * This is the maximum virtual address which can be DMA'd from. | 7 | * This is the maximum virtual address which can be DMA'd from. |
| @@ -15,6 +10,19 @@ typedef unsigned int dmach_t; | |||
| 15 | #define MAX_DMA_ADDRESS 0xffffffff | 10 | #define MAX_DMA_ADDRESS 0xffffffff |
| 16 | #endif | 11 | #endif |
| 17 | 12 | ||
| 13 | #ifdef CONFIG_ISA_DMA_API | ||
| 14 | /* | ||
| 15 | * This is used to support drivers written for the x86 ISA DMA API. | ||
| 16 | * It should not be re-used except for that purpose. | ||
| 17 | */ | ||
| 18 | #include <linux/spinlock.h> | ||
| 19 | #include <asm/system.h> | ||
| 20 | #include <asm/scatterlist.h> | ||
| 21 | |||
| 22 | typedef unsigned int dmach_t; | ||
| 23 | |||
| 24 | #include <mach/isa-dma.h> | ||
| 25 | |||
| 18 | /* | 26 | /* |
| 19 | * DMA modes | 27 | * DMA modes |
| 20 | */ | 28 | */ |
| @@ -140,4 +148,6 @@ extern int isa_dma_bridge_buggy; | |||
| 140 | #define isa_dma_bridge_buggy (0) | 148 | #define isa_dma_bridge_buggy (0) |
| 141 | #endif | 149 | #endif |
| 142 | 150 | ||
| 143 | #endif /* _ARM_DMA_H */ | 151 | #endif /* CONFIG_ISA_DMA_API */ |
| 152 | |||
| 153 | #endif /* __ASM_ARM_DMA_H */ | ||
diff --git a/arch/arm/include/asm/hardware/iomd.h b/arch/arm/include/asm/hardware/iomd.h index 9c5afbd71a69..f9ee69e4f53e 100644 --- a/arch/arm/include/asm/hardware/iomd.h +++ b/arch/arm/include/asm/hardware/iomd.h | |||
| @@ -32,19 +32,11 @@ | |||
| 32 | #define IOMD_KARTRX (0x004) | 32 | #define IOMD_KARTRX (0x004) |
| 33 | #define IOMD_KCTRL (0x008) | 33 | #define IOMD_KCTRL (0x008) |
| 34 | 34 | ||
| 35 | #ifdef CONFIG_ARCH_CLPS7500 | ||
| 36 | #define IOMD_IOLINES (0x00C) | ||
| 37 | #endif | ||
| 38 | |||
| 39 | #define IOMD_IRQSTATA (0x010) | 35 | #define IOMD_IRQSTATA (0x010) |
| 40 | #define IOMD_IRQREQA (0x014) | 36 | #define IOMD_IRQREQA (0x014) |
| 41 | #define IOMD_IRQCLRA (0x014) | 37 | #define IOMD_IRQCLRA (0x014) |
| 42 | #define IOMD_IRQMASKA (0x018) | 38 | #define IOMD_IRQMASKA (0x018) |
| 43 | 39 | ||
| 44 | #ifdef CONFIG_ARCH_CLPS7500 | ||
| 45 | #define IOMD_SUSMODE (0x01C) | ||
| 46 | #endif | ||
| 47 | |||
| 48 | #define IOMD_IRQSTATB (0x020) | 40 | #define IOMD_IRQSTATB (0x020) |
| 49 | #define IOMD_IRQREQB (0x024) | 41 | #define IOMD_IRQREQB (0x024) |
| 50 | #define IOMD_IRQMASKB (0x028) | 42 | #define IOMD_IRQMASKB (0x028) |
| @@ -53,10 +45,6 @@ | |||
| 53 | #define IOMD_FIQREQ (0x034) | 45 | #define IOMD_FIQREQ (0x034) |
| 54 | #define IOMD_FIQMASK (0x038) | 46 | #define IOMD_FIQMASK (0x038) |
| 55 | 47 | ||
| 56 | #ifdef CONFIG_ARCH_CLPS7500 | ||
| 57 | #define IOMD_CLKCTL (0x03C) | ||
| 58 | #endif | ||
| 59 | |||
| 60 | #define IOMD_T0CNTL (0x040) | 48 | #define IOMD_T0CNTL (0x040) |
| 61 | #define IOMD_T0LTCHL (0x040) | 49 | #define IOMD_T0LTCHL (0x040) |
| 62 | #define IOMD_T0CNTH (0x044) | 50 | #define IOMD_T0CNTH (0x044) |
| @@ -71,18 +59,6 @@ | |||
| 71 | #define IOMD_T1GO (0x058) | 59 | #define IOMD_T1GO (0x058) |
| 72 | #define IOMD_T1LATCH (0x05c) | 60 | #define IOMD_T1LATCH (0x05c) |
| 73 | 61 | ||
| 74 | #ifdef CONFIG_ARCH_CLPS7500 | ||
| 75 | #define IOMD_IRQSTATC (0x060) | ||
| 76 | #define IOMD_IRQREQC (0x064) | ||
| 77 | #define IOMD_IRQMASKC (0x068) | ||
| 78 | |||
| 79 | #define IOMD_VIDMUX (0x06c) | ||
| 80 | |||
| 81 | #define IOMD_IRQSTATD (0x070) | ||
| 82 | #define IOMD_IRQREQD (0x074) | ||
| 83 | #define IOMD_IRQMASKD (0x078) | ||
| 84 | #endif | ||
| 85 | |||
| 86 | #define IOMD_ROMCR0 (0x080) | 62 | #define IOMD_ROMCR0 (0x080) |
| 87 | #define IOMD_ROMCR1 (0x084) | 63 | #define IOMD_ROMCR1 (0x084) |
| 88 | #ifdef CONFIG_ARCH_RPC | 64 | #ifdef CONFIG_ARCH_RPC |
| @@ -100,11 +76,6 @@ | |||
| 100 | #define IOMD_MOUSEY (0x0A4) | 76 | #define IOMD_MOUSEY (0x0A4) |
| 101 | #endif | 77 | #endif |
| 102 | 78 | ||
| 103 | #ifdef CONFIG_ARCH_CLPS7500 | ||
| 104 | #define IOMD_MSEDAT (0x0A8) | ||
| 105 | #define IOMD_MSECTL (0x0Ac) | ||
| 106 | #endif | ||
| 107 | |||
| 108 | #ifdef CONFIG_ARCH_RPC | 79 | #ifdef CONFIG_ARCH_RPC |
| 109 | #define IOMD_DMATCR (0x0C0) | 80 | #define IOMD_DMATCR (0x0C0) |
| 110 | #endif | 81 | #endif |
| @@ -113,18 +84,6 @@ | |||
| 113 | #ifdef CONFIG_ARCH_RPC | 84 | #ifdef CONFIG_ARCH_RPC |
| 114 | #define IOMD_DMAEXT (0x0CC) | 85 | #define IOMD_DMAEXT (0x0CC) |
| 115 | #endif | 86 | #endif |
| 116 | #ifdef CONFIG_ARCH_CLPS7500 | ||
| 117 | #define IOMD_ASTCR (0x0CC) | ||
| 118 | #define IOMD_DRAMCR (0x0D0) | ||
| 119 | #define IOMD_SELFREF (0x0D4) | ||
| 120 | #define IOMD_ATODICR (0x0E0) | ||
| 121 | #define IOMD_ATODSR (0x0E4) | ||
| 122 | #define IOMD_ATODCC (0x0E8) | ||
| 123 | #define IOMD_ATODCNT1 (0x0EC) | ||
| 124 | #define IOMD_ATODCNT2 (0x0F0) | ||
| 125 | #define IOMD_ATODCNT3 (0x0F4) | ||
| 126 | #define IOMD_ATODCNT4 (0x0F8) | ||
| 127 | #endif | ||
| 128 | 87 | ||
| 129 | #ifdef CONFIG_ARCH_RPC | 88 | #ifdef CONFIG_ARCH_RPC |
| 130 | #define DMA_EXT_IO0 1 | 89 | #define DMA_EXT_IO0 1 |
diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h index 81f4c899a555..bda489f9f017 100644 --- a/arch/arm/include/asm/hwcap.h +++ b/arch/arm/include/asm/hwcap.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #define HWCAP_IWMMXT 512 | 16 | #define HWCAP_IWMMXT 512 |
| 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 | 20 | ||
| 20 | #if defined(__KERNEL__) && !defined(__ASSEMBLY__) | 21 | #if defined(__KERNEL__) && !defined(__ASSEMBLY__) |
| 21 | /* | 22 | /* |
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index a8094451be57..d2a59cfc30ce 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h | |||
| @@ -80,6 +80,14 @@ extern void __iounmap(volatile void __iomem *addr); | |||
| 80 | extern void __readwrite_bug(const char *fn); | 80 | extern void __readwrite_bug(const char *fn); |
| 81 | 81 | ||
| 82 | /* | 82 | /* |
| 83 | * A typesafe __io() helper | ||
| 84 | */ | ||
| 85 | static inline void __iomem *__typesafe_io(unsigned long addr) | ||
| 86 | { | ||
| 87 | return (void __iomem *)addr; | ||
| 88 | } | ||
| 89 | |||
| 90 | /* | ||
| 83 | * Now, pick up the machine-defined IO definitions | 91 | * Now, pick up the machine-defined IO definitions |
| 84 | */ | 92 | */ |
| 85 | #include <mach/io.h> | 93 | #include <mach/io.h> |
diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index a0009aa5d157..328f14a8b790 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h | |||
| @@ -7,10 +7,6 @@ | |||
| 7 | #define irq_canonicalize(i) (i) | 7 | #define irq_canonicalize(i) (i) |
| 8 | #endif | 8 | #endif |
| 9 | 9 | ||
| 10 | #ifndef NR_IRQS | ||
| 11 | #define NR_IRQS 128 | ||
| 12 | #endif | ||
| 13 | |||
| 14 | /* | 10 | /* |
| 15 | * Use this value to indicate lack of interrupt | 11 | * Use this value to indicate lack of interrupt |
| 16 | * capability | 12 | * capability |
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 77764301844b..0202a7c20e62 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h | |||
| @@ -112,10 +112,8 @@ | |||
| 112 | * private definitions which should NOT be used outside memory.h | 112 | * private definitions which should NOT be used outside memory.h |
| 113 | * files. Use virt_to_phys/phys_to_virt/__pa/__va instead. | 113 | * files. Use virt_to_phys/phys_to_virt/__pa/__va instead. |
| 114 | */ | 114 | */ |
| 115 | #ifndef __virt_to_phys | ||
| 116 | #define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET) | 115 | #define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET) |
| 117 | #define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET) | 116 | #define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET) |
| 118 | #endif | ||
| 119 | 117 | ||
| 120 | /* | 118 | /* |
| 121 | * Convert a physical address to a Page Frame Number and back | 119 | * Convert a physical address to a Page Frame Number and back |
| @@ -180,6 +178,11 @@ static inline void *phys_to_virt(unsigned long x) | |||
| 180 | * memory. Use of these is *deprecated* (and that doesn't mean | 178 | * memory. Use of these is *deprecated* (and that doesn't mean |
| 181 | * use the __ prefixed forms instead.) See dma-mapping.h. | 179 | * use the __ prefixed forms instead.) See dma-mapping.h. |
| 182 | */ | 180 | */ |
| 181 | #ifndef __virt_to_bus | ||
| 182 | #define __virt_to_bus __virt_to_phys | ||
| 183 | #define __bus_to_virt __phys_to_virt | ||
| 184 | #endif | ||
| 185 | |||
| 183 | static inline __deprecated unsigned long virt_to_bus(void *x) | 186 | static inline __deprecated unsigned long virt_to_bus(void *x) |
| 184 | { | 187 | { |
| 185 | return __virt_to_bus((unsigned long)x); | 188 | return __virt_to_bus((unsigned long)x); |
diff --git a/arch/arm/include/asm/mmu_context.h b/arch/arm/include/asm/mmu_context.h index 0559f37c2a27..263fed05ea33 100644 --- a/arch/arm/include/asm/mmu_context.h +++ b/arch/arm/include/asm/mmu_context.h | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #define __ASM_ARM_MMU_CONTEXT_H | 14 | #define __ASM_ARM_MMU_CONTEXT_H |
| 15 | 15 | ||
| 16 | #include <linux/compiler.h> | 16 | #include <linux/compiler.h> |
| 17 | #include <linux/sched.h> | ||
| 17 | #include <asm/cacheflush.h> | 18 | #include <asm/cacheflush.h> |
| 18 | #include <asm/cachetype.h> | 19 | #include <asm/cachetype.h> |
| 19 | #include <asm/proc-fns.h> | 20 | #include <asm/proc-fns.h> |
diff --git a/arch/arm/include/asm/mtd-xip.h b/arch/arm/include/asm/mtd-xip.h index d8fbe2d9b8b9..d79d66d2cf71 100644 --- a/arch/arm/include/asm/mtd-xip.h +++ b/arch/arm/include/asm/mtd-xip.h | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #ifndef __ARM_MTD_XIP_H__ | 15 | #ifndef __ARM_MTD_XIP_H__ |
| 16 | #define __ARM_MTD_XIP_H__ | 16 | #define __ARM_MTD_XIP_H__ |
| 17 | 17 | ||
| 18 | #include <mach/hardware.h> | ||
| 19 | #include <mach/mtd-xip.h> | 18 | #include <mach/mtd-xip.h> |
| 20 | 19 | ||
| 21 | /* fill instruction prefetch */ | 20 | /* fill instruction prefetch */ |
diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h index bed1c0a00368..f341c9dbd662 100644 --- a/arch/arm/include/asm/page.h +++ b/arch/arm/include/asm/page.h | |||
| @@ -108,32 +108,38 @@ | |||
| 108 | #error Unknown user operations model | 108 | #error Unknown user operations model |
| 109 | #endif | 109 | #endif |
| 110 | 110 | ||
| 111 | struct page; | ||
| 112 | |||
| 111 | struct cpu_user_fns { | 113 | struct cpu_user_fns { |
| 112 | void (*cpu_clear_user_page)(void *p, unsigned long user); | 114 | void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr); |
| 113 | void (*cpu_copy_user_page)(void *to, const void *from, | 115 | void (*cpu_copy_user_highpage)(struct page *to, struct page *from, |
| 114 | unsigned long user); | 116 | unsigned long vaddr); |
| 115 | }; | 117 | }; |
| 116 | 118 | ||
| 117 | #ifdef MULTI_USER | 119 | #ifdef MULTI_USER |
| 118 | extern struct cpu_user_fns cpu_user; | 120 | extern struct cpu_user_fns cpu_user; |
| 119 | 121 | ||
| 120 | #define __cpu_clear_user_page cpu_user.cpu_clear_user_page | 122 | #define __cpu_clear_user_highpage cpu_user.cpu_clear_user_highpage |
| 121 | #define __cpu_copy_user_page cpu_user.cpu_copy_user_page | 123 | #define __cpu_copy_user_highpage cpu_user.cpu_copy_user_highpage |
| 122 | 124 | ||
| 123 | #else | 125 | #else |
| 124 | 126 | ||
| 125 | #define __cpu_clear_user_page __glue(_USER,_clear_user_page) | 127 | #define __cpu_clear_user_highpage __glue(_USER,_clear_user_highpage) |
| 126 | #define __cpu_copy_user_page __glue(_USER,_copy_user_page) | 128 | #define __cpu_copy_user_highpage __glue(_USER,_copy_user_highpage) |
| 127 | 129 | ||
| 128 | extern void __cpu_clear_user_page(void *p, unsigned long user); | 130 | extern void __cpu_clear_user_highpage(struct page *page, unsigned long vaddr); |
| 129 | extern void __cpu_copy_user_page(void *to, const void *from, | 131 | extern void __cpu_copy_user_highpage(struct page *to, struct page *from, |
| 130 | unsigned long user); | 132 | unsigned long vaddr); |
| 131 | #endif | 133 | #endif |
| 132 | 134 | ||
| 133 | #define clear_user_page(addr,vaddr,pg) __cpu_clear_user_page(addr, vaddr) | 135 | #define clear_user_highpage(page,vaddr) \ |
| 134 | #define copy_user_page(to,from,vaddr,pg) __cpu_copy_user_page(to, from, vaddr) | 136 | __cpu_clear_user_highpage(page, vaddr) |
| 137 | |||
| 138 | #define __HAVE_ARCH_COPY_USER_HIGHPAGE | ||
| 139 | #define copy_user_highpage(to,from,vaddr,vma) \ | ||
| 140 | __cpu_copy_user_highpage(to, from, vaddr) | ||
| 135 | 141 | ||
| 136 | #define clear_page(page) memzero((void *)(page), PAGE_SIZE) | 142 | #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) |
| 137 | extern void copy_page(void *to, const void *from); | 143 | extern void copy_page(void *to, const void *from); |
| 138 | 144 | ||
| 139 | #undef STRICT_MM_TYPECHECKS | 145 | #undef STRICT_MM_TYPECHECKS |
diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 517a4d6ffc74..2320508443a5 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h | |||
| @@ -64,7 +64,7 @@ struct thread_struct { | |||
| 64 | ({ \ | 64 | ({ \ |
| 65 | unsigned long *stack = (unsigned long *)sp; \ | 65 | unsigned long *stack = (unsigned long *)sp; \ |
| 66 | set_fs(USER_DS); \ | 66 | set_fs(USER_DS); \ |
| 67 | memzero(regs->uregs, sizeof(regs->uregs)); \ | 67 | memset(regs->uregs, 0, sizeof(regs->uregs)); \ |
| 68 | if (current->personality & ADDR_LIMIT_32BIT) \ | 68 | if (current->personality & ADDR_LIMIT_32BIT) \ |
| 69 | regs->ARM_cpsr = USR_MODE; \ | 69 | regs->ARM_cpsr = USR_MODE; \ |
| 70 | else \ | 70 | else \ |
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h index a65413ba121d..f2cd18a0932b 100644 --- a/arch/arm/include/asm/setup.h +++ b/arch/arm/include/asm/setup.h | |||
| @@ -209,9 +209,11 @@ struct meminfo { | |||
| 209 | struct membank bank[NR_BANKS]; | 209 | struct membank bank[NR_BANKS]; |
| 210 | }; | 210 | }; |
| 211 | 211 | ||
| 212 | extern struct meminfo meminfo; | ||
| 213 | |||
| 212 | #define for_each_nodebank(iter,mi,no) \ | 214 | #define for_each_nodebank(iter,mi,no) \ |
| 213 | for (iter = 0; iter < mi->nr_banks; iter++) \ | 215 | for (iter = 0; iter < (mi)->nr_banks; iter++) \ |
| 214 | if (mi->bank[iter].node == no) | 216 | if ((mi)->bank[iter].node == no) |
| 215 | 217 | ||
| 216 | #define bank_pfn_start(bank) __phys_to_pfn((bank)->start) | 218 | #define bank_pfn_start(bank) __phys_to_pfn((bank)->start) |
| 217 | #define bank_pfn_end(bank) __phys_to_pfn((bank)->start + (bank)->size) | 219 | #define bank_pfn_end(bank) __phys_to_pfn((bank)->start + (bank)->size) |
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h index 727b5c042e52..fad70da5911d 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h | |||
| @@ -114,7 +114,7 @@ extern void local_timer_interrupt(void); | |||
| 114 | /* | 114 | /* |
| 115 | * Stop a local timer interrupt. | 115 | * Stop a local timer interrupt. |
| 116 | */ | 116 | */ |
| 117 | extern void local_timer_stop(unsigned int cpu); | 117 | extern void local_timer_stop(void); |
| 118 | 118 | ||
| 119 | /* | 119 | /* |
| 120 | * Platform provides this to acknowledge a local timer IRQ | 120 | * Platform provides this to acknowledge a local timer IRQ |
| @@ -123,7 +123,7 @@ extern int local_timer_ack(void); | |||
| 123 | 123 | ||
| 124 | #else | 124 | #else |
| 125 | 125 | ||
| 126 | static inline void local_timer_stop(unsigned int cpu) | 126 | static inline void local_timer_stop(void) |
| 127 | { | 127 | { |
| 128 | } | 128 | } |
| 129 | 129 | ||
| @@ -132,7 +132,7 @@ static inline void local_timer_stop(unsigned int cpu) | |||
| 132 | /* | 132 | /* |
| 133 | * Setup a local timer interrupt for a CPU. | 133 | * Setup a local timer interrupt for a CPU. |
| 134 | */ | 134 | */ |
| 135 | extern void local_timer_setup(unsigned int cpu); | 135 | extern void local_timer_setup(void); |
| 136 | 136 | ||
| 137 | /* | 137 | /* |
| 138 | * show local interrupt info | 138 | * show local interrupt info |
diff --git a/arch/arm/include/asm/string.h b/arch/arm/include/asm/string.h index e50c4a39b699..cf4f3aad0fc1 100644 --- a/arch/arm/include/asm/string.h +++ b/arch/arm/include/asm/string.h | |||
| @@ -21,7 +21,6 @@ extern void * memmove(void *, const void *, __kernel_size_t); | |||
| 21 | #define __HAVE_ARCH_MEMCHR | 21 | #define __HAVE_ARCH_MEMCHR |
| 22 | extern void * memchr(const void *, int, __kernel_size_t); | 22 | extern void * memchr(const void *, int, __kernel_size_t); |
| 23 | 23 | ||
| 24 | #define __HAVE_ARCH_MEMZERO | ||
| 25 | #define __HAVE_ARCH_MEMSET | 24 | #define __HAVE_ARCH_MEMSET |
| 26 | extern void * memset(void *, int, __kernel_size_t); | 25 | extern void * memset(void *, int, __kernel_size_t); |
| 27 | 26 | ||
| @@ -39,12 +38,4 @@ extern void __memzero(void *ptr, __kernel_size_t n); | |||
| 39 | (__p); \ | 38 | (__p); \ |
| 40 | }) | 39 | }) |
| 41 | 40 | ||
| 42 | #define memzero(p,n) \ | ||
| 43 | ({ \ | ||
| 44 | void *__p = (p); size_t __n = n; \ | ||
| 45 | if ((__n) != 0) \ | ||
| 46 | __memzero((__p),(__n)); \ | ||
| 47 | (__p); \ | ||
| 48 | }) | ||
| 49 | |||
| 50 | #endif | 41 | #endif |
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 568020b34e3e..811be55f338e 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <asm/memory.h> | ||
| 7 | |||
| 8 | #define CPU_ARCH_UNKNOWN 0 | 6 | #define CPU_ARCH_UNKNOWN 0 |
| 9 | #define CPU_ARCH_ARMv3 1 | 7 | #define CPU_ARCH_ARMv3 1 |
| 10 | #define CPU_ARCH_ARMv4 2 | 8 | #define CPU_ARCH_ARMv4 2 |
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index e98ec60b3400..7897464e0c24 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h | |||
| @@ -11,7 +11,8 @@ | |||
| 11 | /* | 11 | /* |
| 12 | * User space memory access functions | 12 | * User space memory access functions |
| 13 | */ | 13 | */ |
| 14 | #include <linux/sched.h> | 14 | #include <linux/string.h> |
| 15 | #include <linux/thread_info.h> | ||
| 15 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
| 16 | #include <asm/memory.h> | 17 | #include <asm/memory.h> |
| 17 | #include <asm/domain.h> | 18 | #include <asm/domain.h> |
| @@ -400,7 +401,7 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u | |||
| 400 | if (access_ok(VERIFY_READ, from, n)) | 401 | if (access_ok(VERIFY_READ, from, n)) |
| 401 | n = __copy_from_user(to, from, n); | 402 | n = __copy_from_user(to, from, n); |
| 402 | else /* security hole - plug it */ | 403 | else /* security hole - plug it */ |
| 403 | memzero(to, n); | 404 | memset(to, 0, n); |
| 404 | return n; | 405 | return n; |
| 405 | } | 406 | } |
| 406 | 407 | ||
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index c74f766ffc12..53d0037a1e9d 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/sched.h> | ||
| 11 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 12 | #include <linux/cryptohash.h> | 13 | #include <linux/cryptohash.h> |
| 13 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S index bde52df1c668..991952c644d1 100644 --- a/arch/arm/kernel/head-common.S +++ b/arch/arm/kernel/head-common.S | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | __switch_data: | 18 | __switch_data: |
| 19 | .long __mmap_switched | 19 | .long __mmap_switched |
| 20 | .long __data_loc @ r4 | 20 | .long __data_loc @ r4 |
| 21 | .long __data_start @ r5 | 21 | .long _data @ r5 |
| 22 | .long __bss_start @ r6 | 22 | .long __bss_start @ r6 |
| 23 | .long _end @ r7 | 23 | .long _end @ r7 |
| 24 | .long processor_id @ r4 | 24 | .long processor_id @ r4 |
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index b8d965dcd6fd..dab48f27263f 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | 22 | ||
| 23 | #include <asm/pgtable.h> | 23 | #include <asm/pgtable.h> |
| 24 | #include <asm/sections.h> | ||
| 24 | 25 | ||
| 25 | #ifdef CONFIG_XIP_KERNEL | 26 | #ifdef CONFIG_XIP_KERNEL |
| 26 | /* | 27 | /* |
| @@ -29,9 +30,8 @@ | |||
| 29 | * MODULES_VADDR is redefined here and not in asm/memory.h to avoid | 30 | * MODULES_VADDR is redefined here and not in asm/memory.h to avoid |
| 30 | * recompiling the whole kernel when CONFIG_XIP_KERNEL is turned on/off. | 31 | * recompiling the whole kernel when CONFIG_XIP_KERNEL is turned on/off. |
| 31 | */ | 32 | */ |
| 32 | extern void _etext; | ||
| 33 | #undef MODULES_VADDR | 33 | #undef MODULES_VADDR |
| 34 | #define MODULES_VADDR (((unsigned long)&_etext + ~PGDIR_MASK) & PGDIR_MASK) | 34 | #define MODULES_VADDR (((unsigned long)_etext + ~PGDIR_MASK) & PGDIR_MASK) |
| 35 | #endif | 35 | #endif |
| 36 | 36 | ||
| 37 | #ifdef CONFIG_MMU | 37 | #ifdef CONFIG_MMU |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 1f1eecca7f55..7049815d66d5 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <asm/cputype.h> | 29 | #include <asm/cputype.h> |
| 30 | #include <asm/elf.h> | 30 | #include <asm/elf.h> |
| 31 | #include <asm/procinfo.h> | 31 | #include <asm/procinfo.h> |
| 32 | #include <asm/sections.h> | ||
| 32 | #include <asm/setup.h> | 33 | #include <asm/setup.h> |
| 33 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
| 34 | #include <asm/cacheflush.h> | 35 | #include <asm/cacheflush.h> |
| @@ -59,9 +60,8 @@ static int __init fpe_setup(char *line) | |||
| 59 | __setup("fpe=", fpe_setup); | 60 | __setup("fpe=", fpe_setup); |
| 60 | #endif | 61 | #endif |
| 61 | 62 | ||
| 62 | extern void paging_init(struct meminfo *, struct machine_desc *desc); | 63 | extern void paging_init(struct machine_desc *desc); |
| 63 | extern void reboot_setup(char *str); | 64 | extern void reboot_setup(char *str); |
| 64 | extern void _text, _etext, __data_start, _edata, _end; | ||
| 65 | 65 | ||
| 66 | unsigned int processor_id; | 66 | unsigned int processor_id; |
| 67 | EXPORT_SYMBOL(processor_id); | 67 | EXPORT_SYMBOL(processor_id); |
| @@ -112,7 +112,6 @@ static struct stack stacks[NR_CPUS]; | |||
| 112 | char elf_platform[ELF_PLATFORM_SIZE]; | 112 | char elf_platform[ELF_PLATFORM_SIZE]; |
| 113 | EXPORT_SYMBOL(elf_platform); | 113 | EXPORT_SYMBOL(elf_platform); |
| 114 | 114 | ||
| 115 | static struct meminfo meminfo __initdata = { 0, }; | ||
| 116 | static const char *cpu_name; | 115 | static const char *cpu_name; |
| 117 | static const char *machine_name; | 116 | static const char *machine_name; |
| 118 | static char __initdata command_line[COMMAND_LINE_SIZE]; | 117 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
| @@ -367,21 +366,34 @@ static struct machine_desc * __init setup_machine(unsigned int nr) | |||
| 367 | return list; | 366 | return list; |
| 368 | } | 367 | } |
| 369 | 368 | ||
| 370 | static void __init arm_add_memory(unsigned long start, unsigned long size) | 369 | static int __init arm_add_memory(unsigned long start, unsigned long size) |
| 371 | { | 370 | { |
| 372 | struct membank *bank; | 371 | struct membank *bank = &meminfo.bank[meminfo.nr_banks]; |
| 372 | |||
| 373 | if (meminfo.nr_banks >= NR_BANKS) { | ||
| 374 | printk(KERN_CRIT "NR_BANKS too low, " | ||
| 375 | "ignoring memory at %#lx\n", start); | ||
| 376 | return -EINVAL; | ||
| 377 | } | ||
| 373 | 378 | ||
| 374 | /* | 379 | /* |
| 375 | * Ensure that start/size are aligned to a page boundary. | 380 | * Ensure that start/size are aligned to a page boundary. |
| 376 | * Size is appropriately rounded down, start is rounded up. | 381 | * Size is appropriately rounded down, start is rounded up. |
| 377 | */ | 382 | */ |
| 378 | size -= start & ~PAGE_MASK; | 383 | size -= start & ~PAGE_MASK; |
| 379 | |||
| 380 | bank = &meminfo.bank[meminfo.nr_banks++]; | ||
| 381 | |||
| 382 | bank->start = PAGE_ALIGN(start); | 384 | bank->start = PAGE_ALIGN(start); |
| 383 | bank->size = size & PAGE_MASK; | 385 | bank->size = size & PAGE_MASK; |
| 384 | bank->node = PHYS_TO_NID(start); | 386 | bank->node = PHYS_TO_NID(start); |
| 387 | |||
| 388 | /* | ||
| 389 | * Check whether this memory region has non-zero size or | ||
| 390 | * invalid node number. | ||
| 391 | */ | ||
| 392 | if (bank->size == 0 || bank->node >= MAX_NUMNODES) | ||
| 393 | return -EINVAL; | ||
| 394 | |||
| 395 | meminfo.nr_banks++; | ||
| 396 | return 0; | ||
| 385 | } | 397 | } |
| 386 | 398 | ||
| 387 | /* | 399 | /* |
| @@ -472,10 +484,10 @@ request_standard_resources(struct meminfo *mi, struct machine_desc *mdesc) | |||
| 472 | struct resource *res; | 484 | struct resource *res; |
| 473 | int i; | 485 | int i; |
| 474 | 486 | ||
| 475 | kernel_code.start = virt_to_phys(&_text); | 487 | kernel_code.start = virt_to_phys(_text); |
| 476 | kernel_code.end = virt_to_phys(&_etext - 1); | 488 | kernel_code.end = virt_to_phys(_etext - 1); |
| 477 | kernel_data.start = virt_to_phys(&__data_start); | 489 | kernel_data.start = virt_to_phys(_data); |
| 478 | kernel_data.end = virt_to_phys(&_end - 1); | 490 | kernel_data.end = virt_to_phys(_end - 1); |
| 479 | 491 | ||
| 480 | for (i = 0; i < mi->nr_banks; i++) { | 492 | for (i = 0; i < mi->nr_banks; i++) { |
| 481 | if (mi->bank[i].size == 0) | 493 | if (mi->bank[i].size == 0) |
| @@ -539,14 +551,7 @@ __tagtable(ATAG_CORE, parse_tag_core); | |||
| 539 | 551 | ||
| 540 | static int __init parse_tag_mem32(const struct tag *tag) | 552 | static int __init parse_tag_mem32(const struct tag *tag) |
| 541 | { | 553 | { |
| 542 | if (meminfo.nr_banks >= NR_BANKS) { | 554 | return arm_add_memory(tag->u.mem.start, tag->u.mem.size); |
| 543 | printk(KERN_WARNING | ||
| 544 | "Ignoring memory bank 0x%08x size %dKB\n", | ||
| 545 | tag->u.mem.start, tag->u.mem.size / 1024); | ||
| 546 | return -EINVAL; | ||
| 547 | } | ||
| 548 | arm_add_memory(tag->u.mem.start, tag->u.mem.size); | ||
| 549 | return 0; | ||
| 550 | } | 555 | } |
| 551 | 556 | ||
| 552 | __tagtable(ATAG_MEM, parse_tag_mem32); | 557 | __tagtable(ATAG_MEM, parse_tag_mem32); |
| @@ -710,15 +715,15 @@ void __init setup_arch(char **cmdline_p) | |||
| 710 | parse_tags(tags); | 715 | parse_tags(tags); |
| 711 | } | 716 | } |
| 712 | 717 | ||
| 713 | init_mm.start_code = (unsigned long) &_text; | 718 | init_mm.start_code = (unsigned long) _text; |
| 714 | init_mm.end_code = (unsigned long) &_etext; | 719 | init_mm.end_code = (unsigned long) _etext; |
| 715 | init_mm.end_data = (unsigned long) &_edata; | 720 | init_mm.end_data = (unsigned long) _edata; |
| 716 | init_mm.brk = (unsigned long) &_end; | 721 | init_mm.brk = (unsigned long) _end; |
| 717 | 722 | ||
| 718 | memcpy(boot_command_line, from, COMMAND_LINE_SIZE); | 723 | memcpy(boot_command_line, from, COMMAND_LINE_SIZE); |
| 719 | boot_command_line[COMMAND_LINE_SIZE-1] = '\0'; | 724 | boot_command_line[COMMAND_LINE_SIZE-1] = '\0'; |
| 720 | parse_cmdline(cmdline_p, from); | 725 | parse_cmdline(cmdline_p, from); |
| 721 | paging_init(&meminfo, mdesc); | 726 | paging_init(mdesc); |
| 722 | request_standard_resources(&meminfo, mdesc); | 727 | request_standard_resources(&meminfo, mdesc); |
| 723 | 728 | ||
| 724 | #ifdef CONFIG_SMP | 729 | #ifdef CONFIG_SMP |
| @@ -772,6 +777,8 @@ static const char *hwcap_str[] = { | |||
| 772 | "java", | 777 | "java", |
| 773 | "iwmmxt", | 778 | "iwmmxt", |
| 774 | "crunch", | 779 | "crunch", |
| 780 | "thumbee", | ||
| 781 | "neon", | ||
| 775 | NULL | 782 | NULL |
| 776 | }; | 783 | }; |
| 777 | 784 | ||
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index e42a749a56dd..019237d21622 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
| @@ -181,7 +181,7 @@ int __cpuexit __cpu_disable(void) | |||
| 181 | /* | 181 | /* |
| 182 | * Stop the local timer for this CPU. | 182 | * Stop the local timer for this CPU. |
| 183 | */ | 183 | */ |
| 184 | local_timer_stop(cpu); | 184 | local_timer_stop(); |
| 185 | 185 | ||
| 186 | /* | 186 | /* |
| 187 | * Flush user cache and TLB mappings, and then remove this CPU | 187 | * Flush user cache and TLB mappings, and then remove this CPU |
| @@ -284,7 +284,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void) | |||
| 284 | /* | 284 | /* |
| 285 | * Setup local timer for this CPU. | 285 | * Setup local timer for this CPU. |
| 286 | */ | 286 | */ |
| 287 | local_timer_setup(cpu); | 287 | local_timer_setup(); |
| 288 | 288 | ||
| 289 | calibrate_delay(); | 289 | calibrate_delay(); |
| 290 | 290 | ||
diff --git a/arch/arm/kernel/thumbee.c b/arch/arm/kernel/thumbee.c index df3f6b7ebcea..9cb7aaca159f 100644 --- a/arch/arm/kernel/thumbee.c +++ b/arch/arm/kernel/thumbee.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | /* | 25 | /* |
| 26 | * Access to the ThumbEE Handler Base register | 26 | * Access to the ThumbEE Handler Base register |
| 27 | */ | 27 | */ |
| 28 | static inline unsigned long teehbr_read() | 28 | static inline unsigned long teehbr_read(void) |
| 29 | { | 29 | { |
| 30 | unsigned long v; | 30 | unsigned long v; |
| 31 | asm("mrc p14, 6, %0, c1, c0, 0\n" : "=r" (v)); | 31 | asm("mrc p14, 6, %0, c1, c0, 0\n" : "=r" (v)); |
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index 4898bdcfe7dd..00216071eaf7 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -119,7 +119,7 @@ SECTIONS | |||
| 119 | #endif | 119 | #endif |
| 120 | 120 | ||
| 121 | .data : AT(__data_loc) { | 121 | .data : AT(__data_loc) { |
| 122 | __data_start = .; /* address in memory */ | 122 | _data = .; /* address in memory */ |
| 123 | 123 | ||
| 124 | /* | 124 | /* |
| 125 | * first, the init task union, aligned | 125 | * first, the init task union, aligned |
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 30351cd4560d..866f84a586ff 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile | |||
| @@ -38,7 +38,6 @@ else | |||
| 38 | endif | 38 | endif |
| 39 | 39 | ||
| 40 | lib-$(CONFIG_ARCH_RPC) += ecard.o io-acorn.o floppydma.o | 40 | lib-$(CONFIG_ARCH_RPC) += ecard.o io-acorn.o floppydma.o |
| 41 | lib-$(CONFIG_ARCH_CLPS7500) += io-acorn.o | ||
| 42 | lib-$(CONFIG_ARCH_L7200) += io-acorn.o | 41 | lib-$(CONFIG_ARCH_L7200) += io-acorn.o |
| 43 | lib-$(CONFIG_ARCH_SHARK) += io-shark.o | 42 | lib-$(CONFIG_ARCH_SHARK) += io-shark.o |
| 44 | 43 | ||
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 761eefa76243..650d5923ab83 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) | 25 | add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) |
| 26 | /* | 26 | /* |
| 27 | * The pointer is now aligned and the length is adjusted. Try doing the | 27 | * The pointer is now aligned and the length is adjusted. Try doing the |
| 28 | * memzero again. | 28 | * memset again. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | ENTRY(memset) | 31 | ENTRY(memset) |
diff --git a/arch/arm/mach-aaec2000/Makefile b/arch/arm/mach-aaec2000/Makefile index a8e462f58bc9..20ec83896c37 100644 --- a/arch/arm/mach-aaec2000/Makefile +++ b/arch/arm/mach-aaec2000/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | # Common support (must be linked before board specific support) | 5 | # Common support (must be linked before board specific support) |
| 6 | obj-y += core.o clock.o | 6 | obj-y += core.o |
| 7 | 7 | ||
| 8 | # Specific board support | 8 | # Specific board support |
| 9 | obj-$(CONFIG_MACH_AAED2000) += aaed2000.o | 9 | obj-$(CONFIG_MACH_AAED2000) += aaed2000.o |
diff --git a/arch/arm/mach-aaec2000/clock.c b/arch/arm/mach-aaec2000/clock.c deleted file mode 100644 index e10ee158d720..000000000000 --- a/arch/arm/mach-aaec2000/clock.c +++ /dev/null | |||
| @@ -1,99 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-aaec2000/clock.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005 Nicolas Bellido Y Ortega | ||
| 5 | * | ||
| 6 | * Based on linux/arch/arm/mach-integrator/clock.c | ||
| 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 | #include <linux/module.h> | ||
| 13 | #include <linux/kernel.h> | ||
| 14 | #include <linux/list.h> | ||
| 15 | #include <linux/errno.h> | ||
| 16 | #include <linux/err.h> | ||
| 17 | #include <linux/string.h> | ||
| 18 | #include <linux/clk.h> | ||
| 19 | #include <linux/mutex.h> | ||
| 20 | |||
| 21 | #include "clock.h" | ||
| 22 | |||
| 23 | static LIST_HEAD(clocks); | ||
| 24 | static DEFINE_MUTEX(clocks_mutex); | ||
| 25 | |||
| 26 | struct clk *clk_get(struct device *dev, const char *id) | ||
| 27 | { | ||
| 28 | struct clk *p, *clk = ERR_PTR(-ENOENT); | ||
| 29 | |||
| 30 | mutex_lock(&clocks_mutex); | ||
| 31 | list_for_each_entry(p, &clocks, node) { | ||
| 32 | if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) { | ||
| 33 | clk = p; | ||
| 34 | break; | ||
| 35 | } | ||
| 36 | } | ||
| 37 | mutex_unlock(&clocks_mutex); | ||
| 38 | |||
| 39 | return clk; | ||
| 40 | } | ||
| 41 | EXPORT_SYMBOL(clk_get); | ||
| 42 | |||
| 43 | void clk_put(struct clk *clk) | ||
| 44 | { | ||
| 45 | module_put(clk->owner); | ||
| 46 | } | ||
| 47 | EXPORT_SYMBOL(clk_put); | ||
| 48 | |||
| 49 | int clk_enable(struct clk *clk) | ||
| 50 | { | ||
| 51 | return 0; | ||
| 52 | } | ||
| 53 | EXPORT_SYMBOL(clk_enable); | ||
| 54 | |||
| 55 | void clk_disable(struct clk *clk) | ||
| 56 | { | ||
| 57 | } | ||
| 58 | EXPORT_SYMBOL(clk_disable); | ||
| 59 | |||
| 60 | unsigned long clk_get_rate(struct clk *clk) | ||
| 61 | { | ||
| 62 | return clk->rate; | ||
| 63 | } | ||
| 64 | EXPORT_SYMBOL(clk_get_rate); | ||
| 65 | |||
| 66 | long clk_round_rate(struct clk *clk, unsigned long rate) | ||
| 67 | { | ||
| 68 | return rate; | ||
| 69 | } | ||
| 70 | EXPORT_SYMBOL(clk_round_rate); | ||
| 71 | |||
| 72 | int clk_set_rate(struct clk *clk, unsigned long rate) | ||
| 73 | { | ||
| 74 | return 0; | ||
| 75 | } | ||
| 76 | EXPORT_SYMBOL(clk_set_rate); | ||
| 77 | |||
| 78 | int clk_register(struct clk *clk) | ||
| 79 | { | ||
| 80 | mutex_lock(&clocks_mutex); | ||
| 81 | list_add(&clk->node, &clocks); | ||
| 82 | mutex_unlock(&clocks_mutex); | ||
| 83 | return 0; | ||
| 84 | } | ||
| 85 | EXPORT_SYMBOL(clk_register); | ||
| 86 | |||
| 87 | void clk_unregister(struct clk *clk) | ||
| 88 | { | ||
| 89 | mutex_lock(&clocks_mutex); | ||
| 90 | list_del(&clk->node); | ||
| 91 | mutex_unlock(&clocks_mutex); | ||
| 92 | } | ||
| 93 | EXPORT_SYMBOL(clk_unregister); | ||
| 94 | |||
| 95 | static int __init clk_init(void) | ||
| 96 | { | ||
| 97 | return 0; | ||
| 98 | } | ||
| 99 | arch_initcall(clk_init); | ||
diff --git a/arch/arm/mach-aaec2000/clock.h b/arch/arm/mach-aaec2000/clock.h deleted file mode 100644 index d4bb74ff613f..000000000000 --- a/arch/arm/mach-aaec2000/clock.h +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-aaec2000/clock.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005 Nicolas Bellido Y Ortega | ||
| 5 | * | ||
| 6 | * Based on linux/arch/arm/mach-integrator/clock.h | ||
| 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 | struct module; | ||
| 13 | |||
| 14 | struct clk { | ||
| 15 | struct list_head node; | ||
| 16 | unsigned long rate; | ||
| 17 | struct module *owner; | ||
| 18 | const char *name; | ||
| 19 | void *data; | ||
| 20 | }; | ||
| 21 | |||
| 22 | int clk_register(struct clk *clk); | ||
| 23 | void clk_unregister(struct clk *clk); | ||
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c index dfb26bc23d1a..50e13965dfed 100644 --- a/arch/arm/mach-aaec2000/core.c +++ b/arch/arm/mach-aaec2000/core.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/timex.h> | 20 | #include <linux/timex.h> |
| 21 | #include <linux/signal.h> | 21 | #include <linux/signal.h> |
| 22 | #include <linux/clk.h> | ||
| 22 | 23 | ||
| 23 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 24 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
| @@ -30,7 +31,6 @@ | |||
| 30 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
| 31 | 32 | ||
| 32 | #include "core.h" | 33 | #include "core.h" |
| 33 | #include "clock.h" | ||
| 34 | 34 | ||
| 35 | /* | 35 | /* |
| 36 | * Common I/O mapping: | 36 | * Common I/O mapping: |
| @@ -229,9 +229,28 @@ static struct amba_device *amba_devs[] __initdata = { | |||
| 229 | &clcd_device, | 229 | &clcd_device, |
| 230 | }; | 230 | }; |
| 231 | 231 | ||
| 232 | static struct clk aaec2000_clcd_clk = { | 232 | void clk_disable(struct clk *clk) |
| 233 | .name = "CLCDCLK", | 233 | { |
| 234 | }; | 234 | } |
| 235 | |||
| 236 | int clk_set_rate(struct clk *clk, unsigned long rate) | ||
| 237 | { | ||
| 238 | return 0; | ||
| 239 | } | ||
| 240 | |||
| 241 | int clk_enable(struct clk *clk) | ||
| 242 | { | ||
| 243 | return 0; | ||
| 244 | } | ||
| 245 | |||
| 246 | struct clk *clk_get(struct device *dev, const char *id) | ||
| 247 | { | ||
| 248 | return dev && strcmp(dev_name(dev), "mb:16") == 0 ? NULL : ERR_PTR(-ENOENT); | ||
| 249 | } | ||
| 250 | |||
| 251 | void clk_put(struct clk *clk) | ||
| 252 | { | ||
| 253 | } | ||
| 235 | 254 | ||
| 236 | void __init aaec2000_set_clcd_plat_data(struct aaec2000_clcd_info *clcd) | 255 | void __init aaec2000_set_clcd_plat_data(struct aaec2000_clcd_info *clcd) |
| 237 | { | 256 | { |
| @@ -265,8 +284,6 @@ static int __init aaec2000_init(void) | |||
| 265 | { | 284 | { |
| 266 | int i; | 285 | int i; |
| 267 | 286 | ||
| 268 | clk_register(&aaec2000_clcd_clk); | ||
| 269 | |||
| 270 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { | 287 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { |
| 271 | struct amba_device *d = amba_devs[i]; | 288 | struct amba_device *d = amba_devs[i]; |
| 272 | amba_device_register(d, &iomem_resource); | 289 | amba_device_register(d, &iomem_resource); |
diff --git a/arch/arm/mach-aaec2000/include/mach/dma.h b/arch/arm/mach-aaec2000/include/mach/dma.h deleted file mode 100644 index 2da846c72fe7..000000000000 --- a/arch/arm/mach-aaec2000/include/mach/dma.h +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-aaec2000/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2005 Nicolas Bellido Y Ortega | ||
| 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 | */ | ||
diff --git a/arch/arm/mach-aaec2000/include/mach/io.h b/arch/arm/mach-aaec2000/include/mach/io.h index c87c24de1110..ab4fe5d20eaf 100644 --- a/arch/arm/mach-aaec2000/include/mach/io.h +++ b/arch/arm/mach-aaec2000/include/mach/io.h | |||
| @@ -6,15 +6,13 @@ | |||
| 6 | #ifndef __ASM_ARM_ARCH_IO_H | 6 | #ifndef __ASM_ARM_ARCH_IO_H |
| 7 | #define __ASM_ARM_ARCH_IO_H | 7 | #define __ASM_ARM_ARCH_IO_H |
| 8 | 8 | ||
| 9 | #include <mach/hardware.h> | ||
| 10 | |||
| 11 | #define IO_SPACE_LIMIT 0xffffffff | 9 | #define IO_SPACE_LIMIT 0xffffffff |
| 12 | 10 | ||
| 13 | /* | 11 | /* |
| 14 | * We don't actually have real ISA nor PCI buses, but there is so many | 12 | * We don't actually have real ISA nor PCI buses, but there is so many |
| 15 | * drivers out there that might just work if we fake them... | 13 | * drivers out there that might just work if we fake them... |
| 16 | */ | 14 | */ |
| 17 | #define __io(a) ((void __iomem *)(a)) | 15 | #define __io(a) __typesafe_io(a) |
| 18 | #define __mem_pci(a) (a) | 16 | #define __mem_pci(a) (a) |
| 19 | 17 | ||
| 20 | #endif | 18 | #endif |
diff --git a/arch/arm/mach-aaec2000/include/mach/memory.h b/arch/arm/mach-aaec2000/include/mach/memory.h index 56ae900a482e..c00822543d9f 100644 --- a/arch/arm/mach-aaec2000/include/mach/memory.h +++ b/arch/arm/mach-aaec2000/include/mach/memory.h | |||
| @@ -14,9 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #define PHYS_OFFSET UL(0xf0000000) | 15 | #define PHYS_OFFSET UL(0xf0000000) |
| 16 | 16 | ||
| 17 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 18 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 19 | |||
| 20 | /* | 17 | /* |
| 21 | * The nodes are the followings: | 18 | * The nodes are the followings: |
| 22 | * | 19 | * |
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 5aafb2e2ca7a..323b47f2b52f 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
| @@ -7,36 +7,43 @@ choice | |||
| 7 | 7 | ||
| 8 | config ARCH_AT91RM9200 | 8 | config ARCH_AT91RM9200 |
| 9 | bool "AT91RM9200" | 9 | bool "AT91RM9200" |
| 10 | select CPU_ARM920T | ||
| 10 | select GENERIC_TIME | 11 | select GENERIC_TIME |
| 11 | select GENERIC_CLOCKEVENTS | 12 | select GENERIC_CLOCKEVENTS |
| 12 | 13 | ||
| 13 | config ARCH_AT91SAM9260 | 14 | config ARCH_AT91SAM9260 |
| 14 | bool "AT91SAM9260 or AT91SAM9XE" | 15 | bool "AT91SAM9260 or AT91SAM9XE" |
| 16 | select CPU_ARM926T | ||
| 15 | select GENERIC_TIME | 17 | select GENERIC_TIME |
| 16 | select GENERIC_CLOCKEVENTS | 18 | select GENERIC_CLOCKEVENTS |
| 17 | 19 | ||
| 18 | config ARCH_AT91SAM9261 | 20 | config ARCH_AT91SAM9261 |
| 19 | bool "AT91SAM9261" | 21 | bool "AT91SAM9261" |
| 22 | select CPU_ARM926T | ||
| 20 | select GENERIC_TIME | 23 | select GENERIC_TIME |
| 21 | select GENERIC_CLOCKEVENTS | 24 | select GENERIC_CLOCKEVENTS |
| 22 | 25 | ||
| 23 | config ARCH_AT91SAM9263 | 26 | config ARCH_AT91SAM9263 |
| 24 | bool "AT91SAM9263" | 27 | bool "AT91SAM9263" |
| 28 | select CPU_ARM926T | ||
| 25 | select GENERIC_TIME | 29 | select GENERIC_TIME |
| 26 | select GENERIC_CLOCKEVENTS | 30 | select GENERIC_CLOCKEVENTS |
| 27 | 31 | ||
| 28 | config ARCH_AT91SAM9RL | 32 | config ARCH_AT91SAM9RL |
| 29 | bool "AT91SAM9RL" | 33 | bool "AT91SAM9RL" |
| 34 | select CPU_ARM926T | ||
| 30 | select GENERIC_TIME | 35 | select GENERIC_TIME |
| 31 | select GENERIC_CLOCKEVENTS | 36 | select GENERIC_CLOCKEVENTS |
| 32 | 37 | ||
| 33 | config ARCH_AT91SAM9G20 | 38 | config ARCH_AT91SAM9G20 |
| 34 | bool "AT91SAM9G20" | 39 | bool "AT91SAM9G20" |
| 40 | select CPU_ARM926T | ||
| 35 | select GENERIC_TIME | 41 | select GENERIC_TIME |
| 36 | select GENERIC_CLOCKEVENTS | 42 | select GENERIC_CLOCKEVENTS |
| 37 | 43 | ||
| 38 | config ARCH_AT91CAP9 | 44 | config ARCH_AT91CAP9 |
| 39 | bool "AT91CAP9" | 45 | bool "AT91CAP9" |
| 46 | select CPU_ARM926T | ||
| 40 | select GENERIC_TIME | 47 | select GENERIC_TIME |
| 41 | select GENERIC_CLOCKEVENTS | 48 | select GENERIC_CLOCKEVENTS |
| 42 | 49 | ||
| @@ -235,6 +242,12 @@ config MACH_USB_A9263 | |||
| 235 | Select this if you are using a Calao Systems USB-A9263. | 242 | Select this if you are using a Calao Systems USB-A9263. |
| 236 | <http://www.calao-systems.com> | 243 | <http://www.calao-systems.com> |
| 237 | 244 | ||
| 245 | config MACH_NEOCORE926 | ||
| 246 | bool "Adeneo NEOCORE926" | ||
| 247 | depends on ARCH_AT91SAM9263 | ||
| 248 | help | ||
| 249 | Select this if you are using the Adeneo Neocore 926 board. | ||
| 250 | |||
| 238 | endif | 251 | endif |
| 239 | 252 | ||
| 240 | # ---------------------------------------------------------- | 253 | # ---------------------------------------------------------- |
| @@ -302,7 +315,7 @@ comment "AT91 Board Options" | |||
| 302 | 315 | ||
| 303 | config MTD_AT91_DATAFLASH_CARD | 316 | config MTD_AT91_DATAFLASH_CARD |
| 304 | bool "Enable DataFlash Card support" | 317 | bool "Enable DataFlash Card support" |
| 305 | depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK) | 318 | depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK || MACH_NEOCORE926) |
| 306 | help | 319 | help |
| 307 | Enable support for the DataFlash card. | 320 | Enable support for the DataFlash card. |
| 308 | 321 | ||
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index cca612d97ca2..c69ff237fd14 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile | |||
| @@ -11,12 +11,12 @@ obj-$(CONFIG_AT91_PMC_UNIT) += clock.o | |||
| 11 | 11 | ||
| 12 | # CPU-specific support | 12 | # CPU-specific support |
| 13 | obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o | 13 | obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o |
| 14 | obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o | 14 | obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o |
| 15 | obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o | 15 | obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o |
| 16 | obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o | 16 | obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o |
| 17 | obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o | 17 | obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o |
| 18 | obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o | 18 | obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o |
| 19 | obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o | 19 | obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o sam9_smc.o |
| 20 | obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o | 20 | obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o |
| 21 | 21 | ||
| 22 | # AT91RM9200 board-specific support | 22 | # AT91RM9200 board-specific support |
| @@ -47,6 +47,7 @@ obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o | |||
| 47 | # AT91SAM9263 board-specific support | 47 | # AT91SAM9263 board-specific support |
| 48 | obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o | 48 | obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o |
| 49 | obj-$(CONFIG_MACH_USB_A9263) += board-usb-a9263.o | 49 | obj-$(CONFIG_MACH_USB_A9263) += board-usb-a9263.o |
| 50 | obj-$(CONFIG_MACH_NEOCORE926) += board-neocore926.o | ||
| 50 | 51 | ||
| 51 | # AT91SAM9RL board-specific support | 52 | # AT91SAM9RL board-specific support |
| 52 | obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o | 53 | obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o |
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index 0fc0adaebd58..0a38c69fdbc4 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | 17 | ||
| 18 | #include <asm/mach/arch.h> | 18 | #include <asm/mach/arch.h> |
| 19 | #include <asm/mach/map.h> | 19 | #include <asm/mach/map.h> |
| 20 | |||
| 21 | #include <mach/cpu.h> | ||
| 20 | #include <mach/at91cap9.h> | 22 | #include <mach/at91cap9.h> |
| 21 | #include <mach/at91_pmc.h> | 23 | #include <mach/at91_pmc.h> |
| 22 | #include <mach/at91_rstc.h> | 24 | #include <mach/at91_rstc.h> |
| @@ -317,6 +319,12 @@ void __init at91cap9_initialize(unsigned long main_clock) | |||
| 317 | 319 | ||
| 318 | /* Register GPIO subsystem */ | 320 | /* Register GPIO subsystem */ |
| 319 | at91_gpio_init(at91cap9_gpio, 4); | 321 | at91_gpio_init(at91cap9_gpio, 4); |
| 322 | |||
| 323 | /* Remember the silicon revision */ | ||
| 324 | if (cpu_is_at91cap9_revB()) | ||
| 325 | system_rev = 0xB; | ||
| 326 | else if (cpu_is_at91cap9_revC()) | ||
| 327 | system_rev = 0xC; | ||
| 320 | } | 328 | } |
| 321 | 329 | ||
| 322 | /* -------------------------------------------------------------------- | 330 | /* -------------------------------------------------------------------- |
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index 5ebd4273d353..9eca2209cde6 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | */ | 13 | */ |
| 14 | #include <asm/mach/arch.h> | 14 | #include <asm/mach/arch.h> |
| 15 | #include <asm/mach/map.h> | 15 | #include <asm/mach/map.h> |
| 16 | #include <asm/mach/irq.h> | ||
| 16 | 17 | ||
| 17 | #include <linux/dma-mapping.h> | 18 | #include <linux/dma-mapping.h> |
| 18 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| @@ -21,6 +22,7 @@ | |||
| 21 | #include <video/atmel_lcdc.h> | 22 | #include <video/atmel_lcdc.h> |
| 22 | 23 | ||
| 23 | #include <mach/board.h> | 24 | #include <mach/board.h> |
| 25 | #include <mach/cpu.h> | ||
| 24 | #include <mach/gpio.h> | 26 | #include <mach/gpio.h> |
| 25 | #include <mach/at91cap9.h> | 27 | #include <mach/at91cap9.h> |
| 26 | #include <mach/at91cap9_matrix.h> | 28 | #include <mach/at91cap9_matrix.h> |
| @@ -69,6 +71,9 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) | |||
| 69 | if (!data) | 71 | if (!data) |
| 70 | return; | 72 | return; |
| 71 | 73 | ||
| 74 | if (cpu_is_at91cap9_revB()) | ||
| 75 | set_irq_type(AT91CAP9_ID_UHP, IRQ_TYPE_LEVEL_HIGH); | ||
| 76 | |||
| 72 | /* Enable VBus control for UHP ports */ | 77 | /* Enable VBus control for UHP ports */ |
| 73 | for (i = 0; i < data->ports; i++) { | 78 | for (i = 0; i < data->ports; i++) { |
| 74 | if (data->vbus_pin[i]) | 79 | if (data->vbus_pin[i]) |
| @@ -151,8 +156,13 @@ static struct platform_device at91_usba_udc_device = { | |||
| 151 | 156 | ||
| 152 | void __init at91_add_device_usba(struct usba_platform_data *data) | 157 | void __init at91_add_device_usba(struct usba_platform_data *data) |
| 153 | { | 158 | { |
| 154 | at91_sys_write(AT91_MATRIX_UDPHS, AT91_MATRIX_SELECT_UDPHS | | 159 | if (cpu_is_at91cap9_revB()) { |
| 155 | AT91_MATRIX_UDPHS_BYPASS_LOCK); | 160 | set_irq_type(AT91CAP9_ID_UDPHS, IRQ_TYPE_LEVEL_HIGH); |
| 161 | at91_sys_write(AT91_MATRIX_UDPHS, AT91_MATRIX_SELECT_UDPHS | | ||
| 162 | AT91_MATRIX_UDPHS_BYPASS_LOCK); | ||
| 163 | } | ||
| 164 | else | ||
| 165 | at91_sys_write(AT91_MATRIX_UDPHS, AT91_MATRIX_SELECT_UDPHS); | ||
| 156 | 166 | ||
| 157 | /* | 167 | /* |
| 158 | * Invalid pins are 0 on AT91, but the usba driver is shared | 168 | * Invalid pins are 0 on AT91, but the usba driver is shared |
| @@ -406,28 +416,13 @@ static struct platform_device at91cap9_nand_device = { | |||
| 406 | 416 | ||
| 407 | void __init at91_add_device_nand(struct atmel_nand_data *data) | 417 | void __init at91_add_device_nand(struct atmel_nand_data *data) |
| 408 | { | 418 | { |
| 409 | unsigned long csa, mode; | 419 | unsigned long csa; |
| 410 | 420 | ||
| 411 | if (!data) | 421 | if (!data) |
| 412 | return; | 422 | return; |
| 413 | 423 | ||
| 414 | csa = at91_sys_read(AT91_MATRIX_EBICSA); | 424 | csa = at91_sys_read(AT91_MATRIX_EBICSA); |
| 415 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA | AT91_MATRIX_EBI_VDDIOMSEL_3_3V); | 425 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA); |
| 416 | |||
| 417 | /* set the bus interface characteristics */ | ||
| 418 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(1) | ||
| 419 | | AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(1)); | ||
| 420 | |||
| 421 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(6) | ||
| 422 | | AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(6)); | ||
| 423 | |||
| 424 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(8) | AT91_SMC_NRDCYCLE_(8)); | ||
| 425 | |||
| 426 | if (data->bus_width_16) | ||
| 427 | mode = AT91_SMC_DBW_16; | ||
| 428 | else | ||
| 429 | mode = AT91_SMC_DBW_8; | ||
| 430 | at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(1)); | ||
| 431 | 426 | ||
| 432 | /* enable pin */ | 427 | /* enable pin */ |
| 433 | if (data->enable_pin) | 428 | if (data->enable_pin) |
| @@ -865,6 +860,9 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | |||
| 865 | if (!data) | 860 | if (!data) |
| 866 | return; | 861 | return; |
| 867 | 862 | ||
| 863 | if (cpu_is_at91cap9_revB()) | ||
| 864 | set_irq_type(AT91CAP9_ID_LCDC, IRQ_TYPE_LEVEL_HIGH); | ||
| 865 | |||
| 868 | at91_set_A_periph(AT91_PIN_PC1, 0); /* LCDHSYNC */ | 866 | at91_set_A_periph(AT91_PIN_PC1, 0); /* LCDHSYNC */ |
| 869 | at91_set_A_periph(AT91_PIN_PC2, 0); /* LCDDOTCK */ | 867 | at91_set_A_periph(AT91_PIN_PC2, 0); /* LCDDOTCK */ |
| 870 | at91_set_A_periph(AT91_PIN_PC3, 0); /* LCDDEN */ | 868 | at91_set_A_periph(AT91_PIN_PC3, 0); /* LCDDEN */ |
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 7774d17dde74..fdde1ea21b07 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c | |||
| @@ -313,7 +313,7 @@ static struct platform_device at91sam9260_nand_device = { | |||
| 313 | 313 | ||
| 314 | void __init at91_add_device_nand(struct atmel_nand_data *data) | 314 | void __init at91_add_device_nand(struct atmel_nand_data *data) |
| 315 | { | 315 | { |
| 316 | unsigned long csa, mode; | 316 | unsigned long csa; |
| 317 | 317 | ||
| 318 | if (!data) | 318 | if (!data) |
| 319 | return; | 319 | return; |
| @@ -321,42 +321,6 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) | |||
| 321 | csa = at91_sys_read(AT91_MATRIX_EBICSA); | 321 | csa = at91_sys_read(AT91_MATRIX_EBICSA); |
| 322 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); | 322 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); |
| 323 | 323 | ||
| 324 | if (cpu_is_at91sam9260()) { | ||
| 325 | /* Timing for sam9260 */ | ||
| 326 | /* set the bus interface characteristics */ | ||
| 327 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) | ||
| 328 | | AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); | ||
| 329 | |||
| 330 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) | ||
| 331 | | AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); | ||
| 332 | |||
| 333 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); | ||
| 334 | |||
| 335 | if (data->bus_width_16) | ||
| 336 | mode = AT91_SMC_DBW_16; | ||
| 337 | else | ||
| 338 | mode = AT91_SMC_DBW_8; | ||
| 339 | at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2)); | ||
| 340 | } | ||
| 341 | |||
| 342 | if (cpu_is_at91sam9g20()) { | ||
| 343 | /* Timing for sam9g20 */ | ||
| 344 | /* set the bus interface characteristics */ | ||
| 345 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) | ||
| 346 | | AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0)); | ||
| 347 | |||
| 348 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(4) | ||
| 349 | | AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(4)); | ||
| 350 | |||
| 351 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7)); | ||
| 352 | |||
| 353 | if (data->bus_width_16) | ||
| 354 | mode = AT91_SMC_DBW_16; | ||
| 355 | else | ||
| 356 | mode = AT91_SMC_DBW_8; | ||
| 357 | at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(3)); | ||
| 358 | } | ||
| 359 | |||
| 360 | /* enable pin */ | 324 | /* enable pin */ |
| 361 | if (data->enable_pin) | 325 | if (data->enable_pin) |
| 362 | at91_set_gpio_output(data->enable_pin, 1); | 326 | at91_set_gpio_output(data->enable_pin, 1); |
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 6b89172310c7..17289756f80f 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c | |||
| @@ -223,7 +223,7 @@ static struct platform_device atmel_nand_device = { | |||
| 223 | 223 | ||
| 224 | void __init at91_add_device_nand(struct atmel_nand_data *data) | 224 | void __init at91_add_device_nand(struct atmel_nand_data *data) |
| 225 | { | 225 | { |
| 226 | unsigned long csa, mode; | 226 | unsigned long csa; |
| 227 | 227 | ||
| 228 | if (!data) | 228 | if (!data) |
| 229 | return; | 229 | return; |
| @@ -231,21 +231,6 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) | |||
| 231 | csa = at91_sys_read(AT91_MATRIX_EBICSA); | 231 | csa = at91_sys_read(AT91_MATRIX_EBICSA); |
| 232 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); | 232 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); |
| 233 | 233 | ||
| 234 | /* set the bus interface characteristics */ | ||
| 235 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) | ||
| 236 | | AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); | ||
| 237 | |||
| 238 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) | ||
| 239 | | AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); | ||
| 240 | |||
| 241 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); | ||
| 242 | |||
| 243 | if (data->bus_width_16) | ||
| 244 | mode = AT91_SMC_DBW_16; | ||
| 245 | else | ||
| 246 | mode = AT91_SMC_DBW_8; | ||
| 247 | at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2)); | ||
| 248 | |||
| 249 | /* enable pin */ | 234 | /* enable pin */ |
| 250 | if (data->enable_pin) | 235 | if (data->enable_pin) |
| 251 | at91_set_gpio_output(data->enable_pin, 1); | 236 | at91_set_gpio_output(data->enable_pin, 1); |
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index 8b884083f76d..b753cb879d8e 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c | |||
| @@ -382,7 +382,7 @@ static struct platform_device at91sam9263_nand_device = { | |||
| 382 | 382 | ||
| 383 | void __init at91_add_device_nand(struct atmel_nand_data *data) | 383 | void __init at91_add_device_nand(struct atmel_nand_data *data) |
| 384 | { | 384 | { |
| 385 | unsigned long csa, mode; | 385 | unsigned long csa; |
| 386 | 386 | ||
| 387 | if (!data) | 387 | if (!data) |
| 388 | return; | 388 | return; |
| @@ -390,21 +390,6 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) | |||
| 390 | csa = at91_sys_read(AT91_MATRIX_EBI0CSA); | 390 | csa = at91_sys_read(AT91_MATRIX_EBI0CSA); |
| 391 | at91_sys_write(AT91_MATRIX_EBI0CSA, csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA); | 391 | at91_sys_write(AT91_MATRIX_EBI0CSA, csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA); |
| 392 | 392 | ||
| 393 | /* set the bus interface characteristics */ | ||
| 394 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) | ||
| 395 | | AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); | ||
| 396 | |||
| 397 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) | ||
| 398 | | AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); | ||
| 399 | |||
| 400 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); | ||
| 401 | |||
| 402 | if (data->bus_width_16) | ||
| 403 | mode = AT91_SMC_DBW_16; | ||
| 404 | else | ||
| 405 | mode = AT91_SMC_DBW_8; | ||
| 406 | at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2)); | ||
| 407 | |||
| 408 | /* enable pin */ | 393 | /* enable pin */ |
| 409 | if (data->enable_pin) | 394 | if (data->enable_pin) |
| 410 | at91_set_gpio_output(data->enable_pin, 1); | 395 | at91_set_gpio_output(data->enable_pin, 1); |
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c index 87deb1e1b529..145324f4ec56 100644 --- a/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/at91sam9rl_devices.c | |||
| @@ -232,17 +232,6 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) | |||
| 232 | csa = at91_sys_read(AT91_MATRIX_EBICSA); | 232 | csa = at91_sys_read(AT91_MATRIX_EBICSA); |
| 233 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); | 233 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); |
| 234 | 234 | ||
| 235 | /* set the bus interface characteristics */ | ||
| 236 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) | ||
| 237 | | AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); | ||
| 238 | |||
| 239 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) | ||
| 240 | | AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); | ||
| 241 | |||
| 242 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); | ||
| 243 | |||
| 244 | at91_sys_write(AT91_SMC_MODE(3), AT91_SMC_DBW_8 | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2)); | ||
| 245 | |||
| 246 | /* enable pin */ | 235 | /* enable pin */ |
| 247 | if (data->enable_pin) | 236 | if (data->enable_pin) |
| 248 | at91_set_gpio_output(data->enable_pin, 1); | 237 | at91_set_gpio_output(data->enable_pin, 1); |
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c index cdddca54b938..d3ba29c5d8c8 100644 --- a/arch/arm/mach-at91/board-cam60.c +++ b/arch/arm/mach-at91/board-cam60.c | |||
| @@ -39,7 +39,9 @@ | |||
| 39 | 39 | ||
| 40 | #include <mach/board.h> | 40 | #include <mach/board.h> |
| 41 | #include <mach/gpio.h> | 41 | #include <mach/gpio.h> |
| 42 | #include <mach/at91sam9_smc.h> | ||
| 42 | 43 | ||
| 44 | #include "sam9_smc.h" | ||
| 43 | #include "generic.h" | 45 | #include "generic.h" |
| 44 | 46 | ||
| 45 | 47 | ||
| @@ -151,6 +153,32 @@ static struct atmel_nand_data __initdata cam60_nand_data = { | |||
| 151 | .partition_info = nand_partitions, | 153 | .partition_info = nand_partitions, |
| 152 | }; | 154 | }; |
| 153 | 155 | ||
| 156 | static struct sam9_smc_config __initdata cam60_nand_smc_config = { | ||
| 157 | .ncs_read_setup = 0, | ||
| 158 | .nrd_setup = 1, | ||
| 159 | .ncs_write_setup = 0, | ||
| 160 | .nwe_setup = 1, | ||
| 161 | |||
| 162 | .ncs_read_pulse = 3, | ||
| 163 | .nrd_pulse = 3, | ||
| 164 | .ncs_write_pulse = 3, | ||
| 165 | .nwe_pulse = 3, | ||
| 166 | |||
| 167 | .read_cycle = 5, | ||
| 168 | .write_cycle = 5, | ||
| 169 | |||
| 170 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8, | ||
| 171 | .tdf_cycles = 2, | ||
| 172 | }; | ||
| 173 | |||
| 174 | static void __init cam60_add_device_nand(void) | ||
| 175 | { | ||
| 176 | /* configure chip-select 3 (NAND) */ | ||
| 177 | sam9_smc_configure(3, &cam60_nand_smc_config); | ||
| 178 | |||
| 179 | at91_add_device_nand(&cam60_nand_data); | ||
| 180 | } | ||
| 181 | |||
| 154 | 182 | ||
| 155 | static void __init cam60_board_init(void) | 183 | static void __init cam60_board_init(void) |
| 156 | { | 184 | { |
| @@ -165,7 +193,7 @@ static void __init cam60_board_init(void) | |||
| 165 | at91_set_gpio_output(AT91_PIN_PB18, 1); | 193 | at91_set_gpio_output(AT91_PIN_PB18, 1); |
| 166 | at91_add_device_usbh(&cam60_usbh_data); | 194 | at91_add_device_usbh(&cam60_usbh_data); |
| 167 | /* NAND */ | 195 | /* NAND */ |
| 168 | at91_add_device_nand(&cam60_nand_data); | 196 | cam60_add_device_nand(); |
| 169 | } | 197 | } |
| 170 | 198 | ||
| 171 | MACHINE_START(CAM60, "KwikByte CAM60") | 199 | MACHINE_START(CAM60, "KwikByte CAM60") |
diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c index 201b89392dcc..83a1a0fef47b 100644 --- a/arch/arm/mach-at91/board-cap9adk.c +++ b/arch/arm/mach-at91/board-cap9adk.c | |||
| @@ -36,17 +36,16 @@ | |||
| 36 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
| 37 | #include <asm/setup.h> | 37 | #include <asm/setup.h> |
| 38 | #include <asm/mach-types.h> | 38 | #include <asm/mach-types.h> |
| 39 | #include <asm/irq.h> | ||
| 40 | 39 | ||
| 41 | #include <asm/mach/arch.h> | 40 | #include <asm/mach/arch.h> |
| 42 | #include <asm/mach/map.h> | 41 | #include <asm/mach/map.h> |
| 43 | #include <asm/mach/irq.h> | ||
| 44 | 42 | ||
| 45 | #include <mach/board.h> | 43 | #include <mach/board.h> |
| 46 | #include <mach/gpio.h> | 44 | #include <mach/gpio.h> |
| 47 | #include <mach/at91cap9_matrix.h> | 45 | #include <mach/at91cap9_matrix.h> |
| 48 | #include <mach/at91sam9_smc.h> | 46 | #include <mach/at91sam9_smc.h> |
| 49 | 47 | ||
| 48 | #include "sam9_smc.h" | ||
| 50 | #include "generic.h" | 49 | #include "generic.h" |
| 51 | 50 | ||
| 52 | 51 | ||
| @@ -195,6 +194,43 @@ static struct atmel_nand_data __initdata cap9adk_nand_data = { | |||
| 195 | #endif | 194 | #endif |
| 196 | }; | 195 | }; |
| 197 | 196 | ||
| 197 | static struct sam9_smc_config __initdata cap9adk_nand_smc_config = { | ||
| 198 | .ncs_read_setup = 1, | ||
| 199 | .nrd_setup = 2, | ||
| 200 | .ncs_write_setup = 1, | ||
| 201 | .nwe_setup = 2, | ||
| 202 | |||
| 203 | .ncs_read_pulse = 6, | ||
| 204 | .nrd_pulse = 4, | ||
| 205 | .ncs_write_pulse = 6, | ||
| 206 | .nwe_pulse = 4, | ||
| 207 | |||
| 208 | .read_cycle = 8, | ||
| 209 | .write_cycle = 8, | ||
| 210 | |||
| 211 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE, | ||
| 212 | .tdf_cycles = 1, | ||
| 213 | }; | ||
| 214 | |||
| 215 | static void __init cap9adk_add_device_nand(void) | ||
| 216 | { | ||
| 217 | unsigned long csa; | ||
| 218 | |||
| 219 | csa = at91_sys_read(AT91_MATRIX_EBICSA); | ||
| 220 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_VDDIOMSEL_3_3V); | ||
| 221 | |||
| 222 | /* setup bus-width (8 or 16) */ | ||
| 223 | if (cap9adk_nand_data.bus_width_16) | ||
| 224 | cap9adk_nand_smc_config.mode |= AT91_SMC_DBW_16; | ||
| 225 | else | ||
| 226 | cap9adk_nand_smc_config.mode |= AT91_SMC_DBW_8; | ||
| 227 | |||
| 228 | /* configure chip-select 3 (NAND) */ | ||
| 229 | sam9_smc_configure(3, &cap9adk_nand_smc_config); | ||
| 230 | |||
| 231 | at91_add_device_nand(&cap9adk_nand_data); | ||
| 232 | } | ||
| 233 | |||
| 198 | 234 | ||
| 199 | /* | 235 | /* |
| 200 | * NOR flash | 236 | * NOR flash |
| @@ -234,6 +270,24 @@ static struct platform_device cap9adk_nor_flash = { | |||
| 234 | .num_resources = ARRAY_SIZE(nor_flash_resources), | 270 | .num_resources = ARRAY_SIZE(nor_flash_resources), |
| 235 | }; | 271 | }; |
| 236 | 272 | ||
| 273 | static struct sam9_smc_config __initdata cap9adk_nor_smc_config = { | ||
| 274 | .ncs_read_setup = 2, | ||
| 275 | .nrd_setup = 4, | ||
| 276 | .ncs_write_setup = 2, | ||
| 277 | .nwe_setup = 4, | ||
| 278 | |||
| 279 | .ncs_read_pulse = 10, | ||
| 280 | .nrd_pulse = 8, | ||
| 281 | .ncs_write_pulse = 10, | ||
| 282 | .nwe_pulse = 8, | ||
| 283 | |||
| 284 | .read_cycle = 16, | ||
| 285 | .write_cycle = 16, | ||
| 286 | |||
| 287 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_WRITE | AT91_SMC_DBW_16, | ||
| 288 | .tdf_cycles = 1, | ||
| 289 | }; | ||
| 290 | |||
| 237 | static __init void cap9adk_add_device_nor(void) | 291 | static __init void cap9adk_add_device_nor(void) |
| 238 | { | 292 | { |
| 239 | unsigned long csa; | 293 | unsigned long csa; |
| @@ -241,18 +295,8 @@ static __init void cap9adk_add_device_nor(void) | |||
| 241 | csa = at91_sys_read(AT91_MATRIX_EBICSA); | 295 | csa = at91_sys_read(AT91_MATRIX_EBICSA); |
| 242 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_VDDIOMSEL_3_3V); | 296 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_VDDIOMSEL_3_3V); |
| 243 | 297 | ||
| 244 | /* set the bus interface characteristics */ | 298 | /* configure chip-select 0 (NOR) */ |
| 245 | at91_sys_write(AT91_SMC_SETUP(0), AT91_SMC_NWESETUP_(4) | AT91_SMC_NCS_WRSETUP_(2) | 299 | sam9_smc_configure(0, &cap9adk_nor_smc_config); |
| 246 | | AT91_SMC_NRDSETUP_(4) | AT91_SMC_NCS_RDSETUP_(2)); | ||
| 247 | |||
| 248 | at91_sys_write(AT91_SMC_PULSE(0), AT91_SMC_NWEPULSE_(8) | AT91_SMC_NCS_WRPULSE_(10) | ||
| 249 | | AT91_SMC_NRDPULSE_(8) | AT91_SMC_NCS_RDPULSE_(10)); | ||
| 250 | |||
| 251 | at91_sys_write(AT91_SMC_CYCLE(0), AT91_SMC_NWECYCLE_(16) | AT91_SMC_NRDCYCLE_(16)); | ||
| 252 | |||
| 253 | at91_sys_write(AT91_SMC_MODE(0), AT91_SMC_READMODE | AT91_SMC_WRITEMODE | ||
| 254 | | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_WRITE | ||
| 255 | | AT91_SMC_DBW_16 | AT91_SMC_TDF_(1)); | ||
| 256 | 300 | ||
| 257 | platform_device_register(&cap9adk_nor_flash); | 301 | platform_device_register(&cap9adk_nor_flash); |
| 258 | } | 302 | } |
| @@ -330,10 +374,8 @@ static void __init cap9adk_board_init(void) | |||
| 330 | /* Serial */ | 374 | /* Serial */ |
| 331 | at91_add_device_serial(); | 375 | at91_add_device_serial(); |
| 332 | /* USB Host */ | 376 | /* USB Host */ |
| 333 | set_irq_type(AT91CAP9_ID_UHP, IRQ_TYPE_LEVEL_HIGH); | ||
| 334 | at91_add_device_usbh(&cap9adk_usbh_data); | 377 | at91_add_device_usbh(&cap9adk_usbh_data); |
| 335 | /* USB HS */ | 378 | /* USB HS */ |
| 336 | set_irq_type(AT91CAP9_ID_UDPHS, IRQ_TYPE_LEVEL_HIGH); | ||
| 337 | at91_add_device_usba(&cap9adk_usba_udc_data); | 379 | at91_add_device_usba(&cap9adk_usba_udc_data); |
| 338 | /* SPI */ | 380 | /* SPI */ |
| 339 | at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices)); | 381 | at91_add_device_spi(cap9adk_spi_devices, ARRAY_SIZE(cap9adk_spi_devices)); |
| @@ -344,13 +386,12 @@ static void __init cap9adk_board_init(void) | |||
| 344 | /* Ethernet */ | 386 | /* Ethernet */ |
| 345 | at91_add_device_eth(&cap9adk_macb_data); | 387 | at91_add_device_eth(&cap9adk_macb_data); |
| 346 | /* NAND */ | 388 | /* NAND */ |
| 347 | at91_add_device_nand(&cap9adk_nand_data); | 389 | cap9adk_add_device_nand(); |
| 348 | /* NOR Flash */ | 390 | /* NOR Flash */ |
| 349 | cap9adk_add_device_nor(); | 391 | cap9adk_add_device_nor(); |
| 350 | /* I2C */ | 392 | /* I2C */ |
| 351 | at91_add_device_i2c(NULL, 0); | 393 | at91_add_device_i2c(NULL, 0); |
| 352 | /* LCD Controller */ | 394 | /* LCD Controller */ |
| 353 | set_irq_type(AT91CAP9_ID_LCDC, IRQ_TYPE_LEVEL_HIGH); | ||
| 354 | at91_add_device_lcdc(&cap9adk_lcdc_data); | 395 | at91_add_device_lcdc(&cap9adk_lcdc_data); |
| 355 | /* AC97 */ | 396 | /* AC97 */ |
| 356 | at91_add_device_ac97(&cap9adk_ac97_data); | 397 | at91_add_device_ac97(&cap9adk_ac97_data); |
diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c new file mode 100644 index 000000000000..9ba7ba2cc3b1 --- /dev/null +++ b/arch/arm/mach-at91/board-neocore926.c | |||
| @@ -0,0 +1,397 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-at91/board-neocore926.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005 SAN People | ||
| 5 | * Copyright (C) 2007 Atmel Corporation | ||
| 6 | * Copyright (C) 2008 ADENEO. | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation; either version 2 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * This program is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with this program; if not, write to the Free Software | ||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 21 | */ | ||
| 22 | |||
| 23 | #include <linux/types.h> | ||
| 24 | #include <linux/init.h> | ||
| 25 | #include <linux/mm.h> | ||
| 26 | #include <linux/module.h> | ||
| 27 | #include <linux/platform_device.h> | ||
| 28 | #include <linux/spi/spi.h> | ||
| 29 | #include <linux/spi/ads7846.h> | ||
| 30 | #include <linux/fb.h> | ||
| 31 | #include <linux/gpio_keys.h> | ||
| 32 | #include <linux/input.h> | ||
| 33 | |||
| 34 | #include <video/atmel_lcdc.h> | ||
| 35 | |||
| 36 | #include <asm/setup.h> | ||
| 37 | #include <asm/mach-types.h> | ||
| 38 | #include <asm/irq.h> | ||
| 39 | #include <asm/sizes.h> | ||
| 40 | |||
| 41 | #include <asm/mach/arch.h> | ||
| 42 | #include <asm/mach/map.h> | ||
| 43 | #include <asm/mach/irq.h> | ||
| 44 | |||
| 45 | #include <mach/hardware.h> | ||
| 46 | #include <mach/board.h> | ||
| 47 | #include <mach/gpio.h> | ||
| 48 | #include <mach/at91sam9_smc.h> | ||
| 49 | |||
| 50 | #include "sam9_smc.h" | ||
| 51 | #include "generic.h" | ||
| 52 | |||
| 53 | |||
| 54 | static void __init neocore926_map_io(void) | ||
| 55 | { | ||
| 56 | /* Initialize processor: 20 MHz crystal */ | ||
| 57 | at91sam9263_initialize(20000000); | ||
| 58 | |||
| 59 | /* DGBU on ttyS0. (Rx & Tx only) */ | ||
| 60 | at91_register_uart(0, 0, 0); | ||
| 61 | |||
| 62 | /* USART0 on ttyS1. (Rx, Tx, RTS, CTS) */ | ||
| 63 | at91_register_uart(AT91SAM9263_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS); | ||
| 64 | |||
| 65 | /* set serial console to ttyS0 (ie, DBGU) */ | ||
| 66 | at91_set_serial_console(0); | ||
| 67 | } | ||
| 68 | |||
| 69 | static void __init neocore926_init_irq(void) | ||
| 70 | { | ||
| 71 | at91sam9263_init_interrupts(NULL); | ||
| 72 | } | ||
| 73 | |||
| 74 | |||
| 75 | /* | ||
| 76 | * USB Host port | ||
| 77 | */ | ||
| 78 | static struct at91_usbh_data __initdata neocore926_usbh_data = { | ||
| 79 | .ports = 2, | ||
| 80 | .vbus_pin = { AT91_PIN_PA24, AT91_PIN_PA21 }, | ||
| 81 | }; | ||
| 82 | |||
| 83 | /* | ||
| 84 | * USB Device port | ||
| 85 | */ | ||
| 86 | static struct at91_udc_data __initdata neocore926_udc_data = { | ||
| 87 | .vbus_pin = AT91_PIN_PA25, | ||
| 88 | .pullup_pin = 0, /* pull-up driven by UDC */ | ||
| 89 | }; | ||
| 90 | |||
| 91 | |||
| 92 | /* | ||
| 93 | * ADS7846 Touchscreen | ||
| 94 | */ | ||
| 95 | #if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) | ||
| 96 | static int ads7843_pendown_state(void) | ||
| 97 | { | ||
| 98 | return !at91_get_gpio_value(AT91_PIN_PA15); /* Touchscreen PENIRQ */ | ||
| 99 | } | ||
| 100 | |||
| 101 | static struct ads7846_platform_data ads_info = { | ||
| 102 | .model = 7843, | ||
| 103 | .x_min = 150, | ||
| 104 | .x_max = 3830, | ||
| 105 | .y_min = 190, | ||
| 106 | .y_max = 3830, | ||
| 107 | .vref_delay_usecs = 100, | ||
| 108 | .x_plate_ohms = 450, | ||
| 109 | .y_plate_ohms = 250, | ||
| 110 | .pressure_max = 15000, | ||
| 111 | .debounce_max = 1, | ||
| 112 | .debounce_rep = 0, | ||
| 113 | .debounce_tol = (~0), | ||
| 114 | .get_pendown_state = ads7843_pendown_state, | ||
| 115 | }; | ||
| 116 | |||
| 117 | static void __init neocore926_add_device_ts(void) | ||
| 118 | { | ||
| 119 | at91_set_B_periph(AT91_PIN_PA15, 1); /* External IRQ1, with pullup */ | ||
| 120 | at91_set_gpio_input(AT91_PIN_PC13, 1); /* Touchscreen BUSY signal */ | ||
| 121 | } | ||
| 122 | #else | ||
| 123 | static void __init neocore926_add_device_ts(void) {} | ||
| 124 | #endif | ||
| 125 | |||
| 126 | /* | ||
| 127 | * SPI devices. | ||
| 128 | */ | ||
| 129 | static struct spi_board_info neocore926_spi_devices[] = { | ||
| 130 | #if defined(CONFIG_MTD_AT91_DATAFLASH_CARD) | ||
| 131 | { /* DataFlash card */ | ||
| 132 | .modalias = "mtd_dataflash", | ||
| 133 | .chip_select = 0, | ||
| 134 | .max_speed_hz = 15 * 1000 * 1000, | ||
| 135 | .bus_num = 0, | ||
| 136 | }, | ||
| 137 | #endif | ||
| 138 | #if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) | ||
| 139 | { | ||
| 140 | .modalias = "ads7846", | ||
| 141 | .chip_select = 1, | ||
| 142 | .max_speed_hz = 125000 * 16, | ||
| 143 | .bus_num = 0, | ||
| 144 | .platform_data = &ads_info, | ||
| 145 | .irq = AT91SAM9263_ID_IRQ1, | ||
| 146 | }, | ||
| 147 | #endif | ||
| 148 | }; | ||
| 149 | |||
| 150 | |||
| 151 | /* | ||
| 152 | * MCI (SD/MMC) | ||
| 153 | */ | ||
| 154 | static struct at91_mmc_data __initdata neocore926_mmc_data = { | ||
| 155 | .wire4 = 1, | ||
| 156 | .det_pin = AT91_PIN_PE18, | ||
| 157 | .wp_pin = AT91_PIN_PE19, | ||
| 158 | }; | ||
| 159 | |||
| 160 | |||
| 161 | /* | ||
| 162 | * MACB Ethernet device | ||
| 163 | */ | ||
| 164 | static struct at91_eth_data __initdata neocore926_macb_data = { | ||
| 165 | .phy_irq_pin = AT91_PIN_PE31, | ||
| 166 | .is_rmii = 1, | ||
| 167 | }; | ||
| 168 | |||
| 169 | |||
| 170 | /* | ||
| 171 | * NAND flash | ||
| 172 | */ | ||
| 173 | static struct mtd_partition __initdata neocore926_nand_partition[] = { | ||
| 174 | { | ||
| 175 | .name = "Linux Kernel", /* "Partition 1", */ | ||
| 176 | .offset = 0, | ||
| 177 | .size = SZ_8M, | ||
| 178 | }, | ||
| 179 | { | ||
| 180 | .name = "Filesystem", /* "Partition 2", */ | ||
| 181 | .offset = MTDPART_OFS_NXTBLK, | ||
| 182 | .size = SZ_32M, | ||
| 183 | }, | ||
| 184 | { | ||
| 185 | .name = "Free", /* "Partition 3", */ | ||
| 186 | .offset = MTDPART_OFS_NXTBLK, | ||
| 187 | .size = MTDPART_SIZ_FULL, | ||
| 188 | }, | ||
| 189 | }; | ||
| 190 | |||
| 191 | static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) | ||
| 192 | { | ||
| 193 | *num_partitions = ARRAY_SIZE(neocore926_nand_partition); | ||
| 194 | return neocore926_nand_partition; | ||
| 195 | } | ||
| 196 | |||
| 197 | static struct atmel_nand_data __initdata neocore926_nand_data = { | ||
| 198 | .ale = 21, | ||
| 199 | .cle = 22, | ||
| 200 | .rdy_pin = AT91_PIN_PB19, | ||
| 201 | .rdy_pin_active_low = 1, | ||
| 202 | .enable_pin = AT91_PIN_PD15, | ||
| 203 | .partition_info = nand_partitions, | ||
| 204 | }; | ||
| 205 | |||
| 206 | static struct sam9_smc_config __initdata neocore926_nand_smc_config = { | ||
| 207 | .ncs_read_setup = 0, | ||
| 208 | .nrd_setup = 1, | ||
| 209 | .ncs_write_setup = 0, | ||
| 210 | .nwe_setup = 1, | ||
| 211 | |||
| 212 | .ncs_read_pulse = 4, | ||
| 213 | .nrd_pulse = 4, | ||
| 214 | .ncs_write_pulse = 4, | ||
| 215 | .nwe_pulse = 4, | ||
| 216 | |||
| 217 | .read_cycle = 6, | ||
| 218 | .write_cycle = 6, | ||
| 219 | |||
| 220 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8, | ||
| 221 | .tdf_cycles = 2, | ||
| 222 | }; | ||
| 223 | |||
| 224 | static void __init neocore926_add_device_nand(void) | ||
| 225 | { | ||
| 226 | /* configure chip-select 3 (NAND) */ | ||
| 227 | sam9_smc_configure(3, &neocore926_nand_smc_config); | ||
| 228 | |||
| 229 | at91_add_device_nand(&neocore926_nand_data); | ||
| 230 | } | ||
| 231 | |||
| 232 | |||
| 233 | /* | ||
| 234 | * LCD Controller | ||
| 235 | */ | ||
| 236 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) | ||
| 237 | static struct fb_videomode at91_tft_vga_modes[] = { | ||
| 238 | { | ||
| 239 | .name = "TX09D50VM1CCA @ 60", | ||
| 240 | .refresh = 60, | ||
| 241 | .xres = 240, .yres = 320, | ||
| 242 | .pixclock = KHZ2PICOS(5000), | ||
| 243 | |||
| 244 | .left_margin = 1, .right_margin = 33, | ||
| 245 | .upper_margin = 1, .lower_margin = 0, | ||
| 246 | .hsync_len = 5, .vsync_len = 1, | ||
| 247 | |||
| 248 | .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, | ||
| 249 | .vmode = FB_VMODE_NONINTERLACED, | ||
| 250 | }, | ||
| 251 | }; | ||
| 252 | |||
| 253 | static struct fb_monspecs at91fb_default_monspecs = { | ||
| 254 | .manufacturer = "HIT", | ||
| 255 | .monitor = "TX09D70VM1CCA", | ||
| 256 | |||
| 257 | .modedb = at91_tft_vga_modes, | ||
| 258 | .modedb_len = ARRAY_SIZE(at91_tft_vga_modes), | ||
| 259 | .hfmin = 15000, | ||
| 260 | .hfmax = 64000, | ||
| 261 | .vfmin = 50, | ||
| 262 | .vfmax = 150, | ||
| 263 | }; | ||
| 264 | |||
| 265 | #define AT91SAM9263_DEFAULT_LCDCON2 (ATMEL_LCDC_MEMOR_LITTLE \ | ||
| 266 | | ATMEL_LCDC_DISTYPE_TFT \ | ||
| 267 | | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE) | ||
| 268 | |||
| 269 | static void at91_lcdc_power_control(int on) | ||
| 270 | { | ||
| 271 | at91_set_gpio_value(AT91_PIN_PA30, on); | ||
| 272 | } | ||
| 273 | |||
| 274 | /* Driver datas */ | ||
| 275 | static struct atmel_lcdfb_info __initdata neocore926_lcdc_data = { | ||
| 276 | .lcdcon_is_backlight = true, | ||
| 277 | .default_bpp = 16, | ||
| 278 | .default_dmacon = ATMEL_LCDC_DMAEN, | ||
| 279 | .default_lcdcon2 = AT91SAM9263_DEFAULT_LCDCON2, | ||
| 280 | .default_monspecs = &at91fb_default_monspecs, | ||
| 281 | .atmel_lcdfb_power_control = at91_lcdc_power_control, | ||
| 282 | .guard_time = 1, | ||
| 283 | .lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB555, | ||
| 284 | }; | ||
| 285 | |||
| 286 | #else | ||
| 287 | static struct atmel_lcdfb_info __initdata neocore926_lcdc_data; | ||
| 288 | #endif | ||
| 289 | |||
| 290 | |||
| 291 | /* | ||
| 292 | * GPIO Buttons | ||
| 293 | */ | ||
| 294 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | ||
| 295 | static struct gpio_keys_button neocore926_buttons[] = { | ||
| 296 | { /* BP1, "leftclic" */ | ||
| 297 | .code = BTN_LEFT, | ||
| 298 | .gpio = AT91_PIN_PC5, | ||
| 299 | .active_low = 1, | ||
| 300 | .desc = "left_click", | ||
| 301 | .wakeup = 1, | ||
| 302 | }, | ||
| 303 | { /* BP2, "rightclic" */ | ||
| 304 | .code = BTN_RIGHT, | ||
| 305 | .gpio = AT91_PIN_PC4, | ||
| 306 | .active_low = 1, | ||
| 307 | .desc = "right_click", | ||
| 308 | .wakeup = 1, | ||
| 309 | }, | ||
| 310 | }; | ||
| 311 | |||
| 312 | static struct gpio_keys_platform_data neocore926_button_data = { | ||
| 313 | .buttons = neocore926_buttons, | ||
| 314 | .nbuttons = ARRAY_SIZE(neocore926_buttons), | ||
| 315 | }; | ||
| 316 | |||
| 317 | static struct platform_device neocore926_button_device = { | ||
| 318 | .name = "gpio-keys", | ||
| 319 | .id = -1, | ||
| 320 | .num_resources = 0, | ||
| 321 | .dev = { | ||
| 322 | .platform_data = &neocore926_button_data, | ||
| 323 | } | ||
| 324 | }; | ||
| 325 | |||
| 326 | static void __init neocore926_add_device_buttons(void) | ||
| 327 | { | ||
| 328 | at91_set_GPIO_periph(AT91_PIN_PC5, 0); /* left button */ | ||
| 329 | at91_set_deglitch(AT91_PIN_PC5, 1); | ||
| 330 | at91_set_GPIO_periph(AT91_PIN_PC4, 0); /* right button */ | ||
| 331 | at91_set_deglitch(AT91_PIN_PC4, 1); | ||
| 332 | |||
| 333 | platform_device_register(&neocore926_button_device); | ||
| 334 | } | ||
| 335 | #else | ||
| 336 | static void __init neocore926_add_device_buttons(void) {} | ||
| 337 | #endif | ||
| 338 | |||
| 339 | |||
| 340 | /* | ||
| 341 | * AC97 | ||
| 342 | */ | ||
| 343 | static struct atmel_ac97_data neocore926_ac97_data = { | ||
| 344 | .reset_pin = AT91_PIN_PA13, | ||
| 345 | }; | ||
| 346 | |||
| 347 | |||
| 348 | static void __init neocore926_board_init(void) | ||
| 349 | { | ||
| 350 | /* Serial */ | ||
| 351 | at91_add_device_serial(); | ||
| 352 | |||
| 353 | /* USB Host */ | ||
| 354 | at91_add_device_usbh(&neocore926_usbh_data); | ||
| 355 | |||
| 356 | /* USB Device */ | ||
| 357 | at91_add_device_udc(&neocore926_udc_data); | ||
| 358 | |||
| 359 | /* SPI */ | ||
| 360 | at91_set_gpio_output(AT91_PIN_PE20, 1); /* select spi0 clock */ | ||
| 361 | at91_add_device_spi(neocore926_spi_devices, ARRAY_SIZE(neocore926_spi_devices)); | ||
| 362 | |||
| 363 | /* Touchscreen */ | ||
| 364 | neocore926_add_device_ts(); | ||
| 365 | |||
| 366 | /* MMC */ | ||
| 367 | at91_add_device_mmc(1, &neocore926_mmc_data); | ||
| 368 | |||
| 369 | /* Ethernet */ | ||
| 370 | at91_add_device_eth(&neocore926_macb_data); | ||
| 371 | |||
| 372 | /* NAND */ | ||
| 373 | neocore926_add_device_nand(); | ||
| 374 | |||
| 375 | /* I2C */ | ||
| 376 | at91_add_device_i2c(NULL, 0); | ||
| 377 | |||
| 378 | /* LCD Controller */ | ||
| 379 | at91_add_device_lcdc(&neocore926_lcdc_data); | ||
| 380 | |||
| 381 | /* Push Buttons */ | ||
| 382 | neocore926_add_device_buttons(); | ||
| 383 | |||
| 384 | /* AC97 */ | ||
| 385 | at91_add_device_ac97(&neocore926_ac97_data); | ||
| 386 | } | ||
| 387 | |||
| 388 | MACHINE_START(NEOCORE926, "ADENEO NEOCORE 926") | ||
| 389 | /* Maintainer: ADENEO */ | ||
| 390 | .phys_io = AT91_BASE_SYS, | ||
| 391 | .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc, | ||
| 392 | .boot_params = AT91_SDRAM_BASE + 0x100, | ||
| 393 | .timer = &at91sam926x_timer, | ||
| 394 | .map_io = neocore926_map_io, | ||
| 395 | .init_irq = neocore926_init_irq, | ||
| 396 | .init_machine = neocore926_board_init, | ||
| 397 | MACHINE_END | ||
diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c index cfb4571a2e27..4cff9a7e61d2 100644 --- a/arch/arm/mach-at91/board-qil-a9260.c +++ b/arch/arm/mach-at91/board-qil-a9260.c | |||
| @@ -41,8 +41,10 @@ | |||
| 41 | #include <mach/hardware.h> | 41 | #include <mach/hardware.h> |
| 42 | #include <mach/board.h> | 42 | #include <mach/board.h> |
| 43 | #include <mach/gpio.h> | 43 | #include <mach/gpio.h> |
| 44 | #include <mach/at91sam9_smc.h> | ||
| 44 | #include <mach/at91_shdwc.h> | 45 | #include <mach/at91_shdwc.h> |
| 45 | 46 | ||
| 47 | #include "sam9_smc.h" | ||
| 46 | #include "generic.h" | 48 | #include "generic.h" |
| 47 | 49 | ||
| 48 | 50 | ||
| @@ -147,13 +149,34 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
| 147 | .rdy_pin = AT91_PIN_PC13, | 149 | .rdy_pin = AT91_PIN_PC13, |
| 148 | .enable_pin = AT91_PIN_PC14, | 150 | .enable_pin = AT91_PIN_PC14, |
| 149 | .partition_info = nand_partitions, | 151 | .partition_info = nand_partitions, |
| 150 | #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) | ||
| 151 | .bus_width_16 = 1, | ||
| 152 | #else | ||
| 153 | .bus_width_16 = 0, | ||
| 154 | #endif | ||
| 155 | }; | 152 | }; |
| 156 | 153 | ||
| 154 | static struct sam9_smc_config __initdata ek_nand_smc_config = { | ||
| 155 | .ncs_read_setup = 0, | ||
| 156 | .nrd_setup = 1, | ||
| 157 | .ncs_write_setup = 0, | ||
| 158 | .nwe_setup = 1, | ||
| 159 | |||
| 160 | .ncs_read_pulse = 3, | ||
| 161 | .nrd_pulse = 3, | ||
| 162 | .ncs_write_pulse = 3, | ||
| 163 | .nwe_pulse = 3, | ||
| 164 | |||
| 165 | .read_cycle = 5, | ||
| 166 | .write_cycle = 5, | ||
| 167 | |||
| 168 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8, | ||
| 169 | .tdf_cycles = 2, | ||
| 170 | }; | ||
| 171 | |||
| 172 | static void __init ek_add_device_nand(void) | ||
| 173 | { | ||
| 174 | /* configure chip-select 3 (NAND) */ | ||
| 175 | sam9_smc_configure(3, &ek_nand_smc_config); | ||
| 176 | |||
| 177 | at91_add_device_nand(&ek_nand_data); | ||
| 178 | } | ||
| 179 | |||
| 157 | /* | 180 | /* |
| 158 | * MCI (SD/MMC) | 181 | * MCI (SD/MMC) |
| 159 | */ | 182 | */ |
| @@ -227,7 +250,7 @@ static void __init ek_board_init(void) | |||
| 227 | /* SPI */ | 250 | /* SPI */ |
| 228 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); | 251 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); |
| 229 | /* NAND */ | 252 | /* NAND */ |
| 230 | at91_add_device_nand(&ek_nand_data); | 253 | ek_add_device_nand(); |
| 231 | /* I2C */ | 254 | /* I2C */ |
| 232 | at91_add_device_i2c(NULL, 0); | 255 | at91_add_device_i2c(NULL, 0); |
| 233 | /* Ethernet */ | 256 | /* Ethernet */ |
diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c index 99bb4cc23a09..b48346977534 100644 --- a/arch/arm/mach-at91/board-sam9-l9260.c +++ b/arch/arm/mach-at91/board-sam9-l9260.c | |||
| @@ -38,7 +38,9 @@ | |||
| 38 | 38 | ||
| 39 | #include <mach/board.h> | 39 | #include <mach/board.h> |
| 40 | #include <mach/gpio.h> | 40 | #include <mach/gpio.h> |
| 41 | #include <mach/at91sam9_smc.h> | ||
| 41 | 42 | ||
| 43 | #include "sam9_smc.h" | ||
| 42 | #include "generic.h" | 44 | #include "generic.h" |
| 43 | 45 | ||
| 44 | 46 | ||
| @@ -148,13 +150,34 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
| 148 | .rdy_pin = AT91_PIN_PC13, | 150 | .rdy_pin = AT91_PIN_PC13, |
| 149 | .enable_pin = AT91_PIN_PC14, | 151 | .enable_pin = AT91_PIN_PC14, |
| 150 | .partition_info = nand_partitions, | 152 | .partition_info = nand_partitions, |
| 151 | #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) | ||
| 152 | .bus_width_16 = 1, | ||
| 153 | #else | ||
| 154 | .bus_width_16 = 0, | ||
| 155 | #endif | ||
| 156 | }; | 153 | }; |
| 157 | 154 | ||
| 155 | static struct sam9_smc_config __initdata ek_nand_smc_config = { | ||
| 156 | .ncs_read_setup = 0, | ||
| 157 | .nrd_setup = 1, | ||
| 158 | .ncs_write_setup = 0, | ||
| 159 | .nwe_setup = 1, | ||
| 160 | |||
| 161 | .ncs_read_pulse = 3, | ||
| 162 | .nrd_pulse = 3, | ||
| 163 | .ncs_write_pulse = 3, | ||
| 164 | .nwe_pulse = 3, | ||
| 165 | |||
| 166 | .read_cycle = 5, | ||
| 167 | .write_cycle = 5, | ||
| 168 | |||
| 169 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8, | ||
| 170 | .tdf_cycles = 2, | ||
| 171 | }; | ||
| 172 | |||
| 173 | static void __init ek_add_device_nand(void) | ||
| 174 | { | ||
| 175 | /* configure chip-select 3 (NAND) */ | ||
| 176 | sam9_smc_configure(3, &ek_nand_smc_config); | ||
| 177 | |||
| 178 | at91_add_device_nand(&ek_nand_data); | ||
| 179 | } | ||
| 180 | |||
| 158 | 181 | ||
| 159 | /* | 182 | /* |
| 160 | * MCI (SD/MMC) | 183 | * MCI (SD/MMC) |
| @@ -178,7 +201,7 @@ static void __init ek_board_init(void) | |||
| 178 | /* SPI */ | 201 | /* SPI */ |
| 179 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); | 202 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); |
| 180 | /* NAND */ | 203 | /* NAND */ |
| 181 | at91_add_device_nand(&ek_nand_data); | 204 | ek_add_device_nand(); |
| 182 | /* Ethernet */ | 205 | /* Ethernet */ |
| 183 | at91_add_device_eth(&ek_macb_data); | 206 | at91_add_device_eth(&ek_macb_data); |
| 184 | /* MMC */ | 207 | /* MMC */ |
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index b49eb6e4918a..93a0f8b100eb 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c | |||
| @@ -42,7 +42,10 @@ | |||
| 42 | #include <mach/hardware.h> | 42 | #include <mach/hardware.h> |
| 43 | #include <mach/board.h> | 43 | #include <mach/board.h> |
| 44 | #include <mach/gpio.h> | 44 | #include <mach/gpio.h> |
| 45 | #include <mach/at91sam9_smc.h> | ||
| 46 | #include <mach/at91_shdwc.h> | ||
| 45 | 47 | ||
| 48 | #include "sam9_smc.h" | ||
| 46 | #include "generic.h" | 49 | #include "generic.h" |
| 47 | 50 | ||
| 48 | 51 | ||
| @@ -195,6 +198,38 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
| 195 | #endif | 198 | #endif |
| 196 | }; | 199 | }; |
| 197 | 200 | ||
| 201 | static struct sam9_smc_config __initdata ek_nand_smc_config = { | ||
| 202 | .ncs_read_setup = 0, | ||
| 203 | .nrd_setup = 1, | ||
| 204 | .ncs_write_setup = 0, | ||
| 205 | .nwe_setup = 1, | ||
| 206 | |||
| 207 | .ncs_read_pulse = 3, | ||
| 208 | .nrd_pulse = 3, | ||
| 209 | .ncs_write_pulse = 3, | ||
| 210 | .nwe_pulse = 3, | ||
| 211 | |||
| 212 | .read_cycle = 5, | ||
| 213 | .write_cycle = 5, | ||
| 214 | |||
| 215 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE, | ||
| 216 | .tdf_cycles = 2, | ||
| 217 | }; | ||
| 218 | |||
| 219 | static void __init ek_add_device_nand(void) | ||
| 220 | { | ||
| 221 | /* setup bus-width (8 or 16) */ | ||
| 222 | if (ek_nand_data.bus_width_16) | ||
| 223 | ek_nand_smc_config.mode |= AT91_SMC_DBW_16; | ||
| 224 | else | ||
| 225 | ek_nand_smc_config.mode |= AT91_SMC_DBW_8; | ||
| 226 | |||
| 227 | /* configure chip-select 3 (NAND) */ | ||
| 228 | sam9_smc_configure(3, &ek_nand_smc_config); | ||
| 229 | |||
| 230 | at91_add_device_nand(&ek_nand_data); | ||
| 231 | } | ||
| 232 | |||
| 198 | 233 | ||
| 199 | /* | 234 | /* |
| 200 | * MCI (SD/MMC) | 235 | * MCI (SD/MMC) |
| @@ -303,7 +338,7 @@ static void __init ek_board_init(void) | |||
| 303 | /* SPI */ | 338 | /* SPI */ |
| 304 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); | 339 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); |
| 305 | /* NAND */ | 340 | /* NAND */ |
| 306 | at91_add_device_nand(&ek_nand_data); | 341 | ek_add_device_nand(); |
| 307 | /* Ethernet */ | 342 | /* Ethernet */ |
| 308 | at91_add_device_eth(&ek_macb_data); | 343 | at91_add_device_eth(&ek_macb_data); |
| 309 | /* MMC */ | 344 | /* MMC */ |
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index 4977409d4fc6..d5266da55311 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c | |||
| @@ -47,7 +47,9 @@ | |||
| 47 | #include <mach/board.h> | 47 | #include <mach/board.h> |
| 48 | #include <mach/gpio.h> | 48 | #include <mach/gpio.h> |
| 49 | #include <mach/at91sam9_smc.h> | 49 | #include <mach/at91sam9_smc.h> |
| 50 | #include <mach/at91_shdwc.h> | ||
| 50 | 51 | ||
| 52 | #include "sam9_smc.h" | ||
| 51 | #include "generic.h" | 53 | #include "generic.h" |
| 52 | 54 | ||
| 53 | 55 | ||
| @@ -76,7 +78,7 @@ static void __init ek_init_irq(void) | |||
| 76 | * DM9000 ethernet device | 78 | * DM9000 ethernet device |
| 77 | */ | 79 | */ |
| 78 | #if defined(CONFIG_DM9000) | 80 | #if defined(CONFIG_DM9000) |
| 79 | static struct resource at91sam9261_dm9000_resource[] = { | 81 | static struct resource dm9000_resource[] = { |
| 80 | [0] = { | 82 | [0] = { |
| 81 | .start = AT91_CHIPSELECT_2, | 83 | .start = AT91_CHIPSELECT_2, |
| 82 | .end = AT91_CHIPSELECT_2 + 3, | 84 | .end = AT91_CHIPSELECT_2 + 3, |
| @@ -98,27 +100,42 @@ static struct dm9000_plat_data dm9000_platdata = { | |||
| 98 | .flags = DM9000_PLATF_16BITONLY, | 100 | .flags = DM9000_PLATF_16BITONLY, |
| 99 | }; | 101 | }; |
| 100 | 102 | ||
| 101 | static struct platform_device at91sam9261_dm9000_device = { | 103 | static struct platform_device dm9000_device = { |
| 102 | .name = "dm9000", | 104 | .name = "dm9000", |
| 103 | .id = 0, | 105 | .id = 0, |
| 104 | .num_resources = ARRAY_SIZE(at91sam9261_dm9000_resource), | 106 | .num_resources = ARRAY_SIZE(dm9000_resource), |
| 105 | .resource = at91sam9261_dm9000_resource, | 107 | .resource = dm9000_resource, |
| 106 | .dev = { | 108 | .dev = { |
| 107 | .platform_data = &dm9000_platdata, | 109 | .platform_data = &dm9000_platdata, |
| 108 | } | 110 | } |
| 109 | }; | 111 | }; |
| 110 | 112 | ||
| 113 | /* | ||
| 114 | * SMC timings for the DM9000. | ||
| 115 | * Note: These timings were calculated for MASTER_CLOCK = 100000000 according to the DM9000 timings. | ||
| 116 | */ | ||
| 117 | static struct sam9_smc_config __initdata dm9000_smc_config = { | ||
| 118 | .ncs_read_setup = 0, | ||
| 119 | .nrd_setup = 2, | ||
| 120 | .ncs_write_setup = 0, | ||
| 121 | .nwe_setup = 2, | ||
| 122 | |||
| 123 | .ncs_read_pulse = 8, | ||
| 124 | .nrd_pulse = 4, | ||
| 125 | .ncs_write_pulse = 8, | ||
| 126 | .nwe_pulse = 4, | ||
| 127 | |||
| 128 | .read_cycle = 16, | ||
| 129 | .write_cycle = 16, | ||
| 130 | |||
| 131 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_WRITE | AT91_SMC_DBW_16, | ||
| 132 | .tdf_cycles = 1, | ||
| 133 | }; | ||
| 134 | |||
| 111 | static void __init ek_add_device_dm9000(void) | 135 | static void __init ek_add_device_dm9000(void) |
| 112 | { | 136 | { |
| 113 | /* | 137 | /* Configure chip-select 2 (DM9000) */ |
| 114 | * Configure Chip-Select 2 on SMC for the DM9000. | 138 | sam9_smc_configure(2, &dm9000_smc_config); |
| 115 | * Note: These timings were calculated for MASTER_CLOCK = 100000000 | ||
| 116 | * according to the DM9000 timings. | ||
| 117 | */ | ||
| 118 | at91_sys_write(AT91_SMC_SETUP(2), AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) | AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0)); | ||
| 119 | at91_sys_write(AT91_SMC_PULSE(2), AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(8) | AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(8)); | ||
| 120 | at91_sys_write(AT91_SMC_CYCLE(2), AT91_SMC_NWECYCLE_(16) | AT91_SMC_NRDCYCLE_(16)); | ||
| 121 | at91_sys_write(AT91_SMC_MODE(2), AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_WRITE | AT91_SMC_DBW_16 | AT91_SMC_TDF_(1)); | ||
| 122 | 139 | ||
| 123 | /* Configure Reset signal as output */ | 140 | /* Configure Reset signal as output */ |
| 124 | at91_set_gpio_output(AT91_PIN_PC10, 0); | 141 | at91_set_gpio_output(AT91_PIN_PC10, 0); |
| @@ -126,7 +143,7 @@ static void __init ek_add_device_dm9000(void) | |||
| 126 | /* Configure Interrupt pin as input, no pull-up */ | 143 | /* Configure Interrupt pin as input, no pull-up */ |
| 127 | at91_set_gpio_input(AT91_PIN_PC11, 0); | 144 | at91_set_gpio_input(AT91_PIN_PC11, 0); |
| 128 | 145 | ||
| 129 | platform_device_register(&at91sam9261_dm9000_device); | 146 | platform_device_register(&dm9000_device); |
| 130 | } | 147 | } |
| 131 | #else | 148 | #else |
| 132 | static void __init ek_add_device_dm9000(void) {} | 149 | static void __init ek_add_device_dm9000(void) {} |
| @@ -197,6 +214,39 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
| 197 | #endif | 214 | #endif |
| 198 | }; | 215 | }; |
| 199 | 216 | ||
| 217 | static struct sam9_smc_config __initdata ek_nand_smc_config = { | ||
| 218 | .ncs_read_setup = 0, | ||
| 219 | .nrd_setup = 1, | ||
| 220 | .ncs_write_setup = 0, | ||
| 221 | .nwe_setup = 1, | ||
| 222 | |||
| 223 | .ncs_read_pulse = 3, | ||
| 224 | .nrd_pulse = 3, | ||
| 225 | .ncs_write_pulse = 3, | ||
| 226 | .nwe_pulse = 3, | ||
| 227 | |||
| 228 | .read_cycle = 5, | ||
| 229 | .write_cycle = 5, | ||
| 230 | |||
| 231 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE, | ||
| 232 | .tdf_cycles = 2, | ||
| 233 | }; | ||
| 234 | |||
| 235 | static void __init ek_add_device_nand(void) | ||
| 236 | { | ||
| 237 | /* setup bus-width (8 or 16) */ | ||
| 238 | if (ek_nand_data.bus_width_16) | ||
| 239 | ek_nand_smc_config.mode |= AT91_SMC_DBW_16; | ||
| 240 | else | ||
| 241 | ek_nand_smc_config.mode |= AT91_SMC_DBW_8; | ||
| 242 | |||
| 243 | /* configure chip-select 3 (NAND) */ | ||
| 244 | sam9_smc_configure(3, &ek_nand_smc_config); | ||
| 245 | |||
| 246 | at91_add_device_nand(&ek_nand_data); | ||
| 247 | } | ||
| 248 | |||
| 249 | |||
| 200 | /* | 250 | /* |
| 201 | * ADS7846 Touchscreen | 251 | * ADS7846 Touchscreen |
| 202 | */ | 252 | */ |
| @@ -525,7 +575,7 @@ static void __init ek_board_init(void) | |||
| 525 | /* I2C */ | 575 | /* I2C */ |
| 526 | at91_add_device_i2c(NULL, 0); | 576 | at91_add_device_i2c(NULL, 0); |
| 527 | /* NAND */ | 577 | /* NAND */ |
| 528 | at91_add_device_nand(&ek_nand_data); | 578 | ek_add_device_nand(); |
| 529 | /* DM9000 ethernet */ | 579 | /* DM9000 ethernet */ |
| 530 | ek_add_device_dm9000(); | 580 | ek_add_device_dm9000(); |
| 531 | 581 | ||
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c index 8354015c6a23..57d52528f224 100644 --- a/arch/arm/mach-at91/board-sam9263ek.c +++ b/arch/arm/mach-at91/board-sam9263ek.c | |||
| @@ -46,7 +46,9 @@ | |||
| 46 | #include <mach/board.h> | 46 | #include <mach/board.h> |
| 47 | #include <mach/gpio.h> | 47 | #include <mach/gpio.h> |
| 48 | #include <mach/at91sam9_smc.h> | 48 | #include <mach/at91sam9_smc.h> |
| 49 | #include <mach/at91_shdwc.h> | ||
| 49 | 50 | ||
| 51 | #include "sam9_smc.h" | ||
| 50 | #include "generic.h" | 52 | #include "generic.h" |
| 51 | 53 | ||
| 52 | 54 | ||
| @@ -203,6 +205,38 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
| 203 | #endif | 205 | #endif |
| 204 | }; | 206 | }; |
| 205 | 207 | ||
| 208 | static struct sam9_smc_config __initdata ek_nand_smc_config = { | ||
| 209 | .ncs_read_setup = 0, | ||
| 210 | .nrd_setup = 1, | ||
| 211 | .ncs_write_setup = 0, | ||
| 212 | .nwe_setup = 1, | ||
| 213 | |||
| 214 | .ncs_read_pulse = 3, | ||
| 215 | .nrd_pulse = 3, | ||
| 216 | .ncs_write_pulse = 3, | ||
| 217 | .nwe_pulse = 3, | ||
| 218 | |||
| 219 | .read_cycle = 5, | ||
| 220 | .write_cycle = 5, | ||
| 221 | |||
| 222 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE, | ||
| 223 | .tdf_cycles = 2, | ||
| 224 | }; | ||
| 225 | |||
| 226 | static void __init ek_add_device_nand(void) | ||
| 227 | { | ||
| 228 | /* setup bus-width (8 or 16) */ | ||
| 229 | if (ek_nand_data.bus_width_16) | ||
| 230 | ek_nand_smc_config.mode |= AT91_SMC_DBW_16; | ||
| 231 | else | ||
| 232 | ek_nand_smc_config.mode |= AT91_SMC_DBW_8; | ||
| 233 | |||
| 234 | /* configure chip-select 3 (NAND) */ | ||
| 235 | sam9_smc_configure(3, &ek_nand_smc_config); | ||
| 236 | |||
| 237 | at91_add_device_nand(&ek_nand_data); | ||
| 238 | } | ||
| 239 | |||
| 206 | 240 | ||
| 207 | /* | 241 | /* |
| 208 | * I2C devices | 242 | * I2C devices |
| @@ -385,7 +419,7 @@ static void __init ek_board_init(void) | |||
| 385 | /* Ethernet */ | 419 | /* Ethernet */ |
| 386 | at91_add_device_eth(&ek_macb_data); | 420 | at91_add_device_eth(&ek_macb_data); |
| 387 | /* NAND */ | 421 | /* NAND */ |
| 388 | at91_add_device_nand(&ek_nand_data); | 422 | ek_add_device_nand(); |
| 389 | /* I2C */ | 423 | /* I2C */ |
| 390 | at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices)); | 424 | at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices)); |
| 391 | /* LCD Controller */ | 425 | /* LCD Controller */ |
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index b588ead14d68..81439fe6fb3d 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
| @@ -37,7 +37,9 @@ | |||
| 37 | 37 | ||
| 38 | #include <mach/board.h> | 38 | #include <mach/board.h> |
| 39 | #include <mach/gpio.h> | 39 | #include <mach/gpio.h> |
| 40 | #include <mach/at91sam9_smc.h> | ||
| 40 | 41 | ||
| 42 | #include "sam9_smc.h" | ||
| 41 | #include "generic.h" | 43 | #include "generic.h" |
| 42 | 44 | ||
| 43 | 45 | ||
| @@ -156,6 +158,38 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
| 156 | #endif | 158 | #endif |
| 157 | }; | 159 | }; |
| 158 | 160 | ||
| 161 | static struct sam9_smc_config __initdata ek_nand_smc_config = { | ||
| 162 | .ncs_read_setup = 0, | ||
| 163 | .nrd_setup = 2, | ||
| 164 | .ncs_write_setup = 0, | ||
| 165 | .nwe_setup = 2, | ||
| 166 | |||
| 167 | .ncs_read_pulse = 4, | ||
| 168 | .nrd_pulse = 4, | ||
| 169 | .ncs_write_pulse = 4, | ||
| 170 | .nwe_pulse = 4, | ||
| 171 | |||
| 172 | .read_cycle = 7, | ||
| 173 | .write_cycle = 7, | ||
| 174 | |||
| 175 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE, | ||
| 176 | .tdf_cycles = 3, | ||
| 177 | }; | ||
| 178 | |||
| 179 | static void __init ek_add_device_nand(void) | ||
| 180 | { | ||
| 181 | /* setup bus-width (8 or 16) */ | ||
| 182 | if (ek_nand_data.bus_width_16) | ||
| 183 | ek_nand_smc_config.mode |= AT91_SMC_DBW_16; | ||
| 184 | else | ||
| 185 | ek_nand_smc_config.mode |= AT91_SMC_DBW_8; | ||
| 186 | |||
| 187 | /* configure chip-select 3 (NAND) */ | ||
| 188 | sam9_smc_configure(3, &ek_nand_smc_config); | ||
| 189 | |||
| 190 | at91_add_device_nand(&ek_nand_data); | ||
| 191 | } | ||
| 192 | |||
| 159 | 193 | ||
| 160 | /* | 194 | /* |
| 161 | * MCI (SD/MMC) | 195 | * MCI (SD/MMC) |
| @@ -195,7 +229,7 @@ static void __init ek_board_init(void) | |||
| 195 | /* SPI */ | 229 | /* SPI */ |
| 196 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); | 230 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); |
| 197 | /* NAND */ | 231 | /* NAND */ |
| 198 | at91_add_device_nand(&ek_nand_data); | 232 | ek_add_device_nand(); |
| 199 | /* Ethernet */ | 233 | /* Ethernet */ |
| 200 | at91_add_device_eth(&ek_macb_data); | 234 | at91_add_device_eth(&ek_macb_data); |
| 201 | /* MMC */ | 235 | /* MMC */ |
diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index 270851864308..9b937ee4815a 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c | |||
| @@ -29,8 +29,9 @@ | |||
| 29 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
| 30 | #include <mach/board.h> | 30 | #include <mach/board.h> |
| 31 | #include <mach/gpio.h> | 31 | #include <mach/gpio.h> |
| 32 | #include <mach/at91sam9_smc.h> | 32 | #include <mach/at91_shdwc.h> |
| 33 | 33 | ||
| 34 | #include "sam9_smc.h" | ||
| 34 | #include "generic.h" | 35 | #include "generic.h" |
| 35 | 36 | ||
| 36 | 37 | ||
| @@ -103,9 +104,34 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
| 103 | .rdy_pin = AT91_PIN_PD17, | 104 | .rdy_pin = AT91_PIN_PD17, |
| 104 | .enable_pin = AT91_PIN_PB6, | 105 | .enable_pin = AT91_PIN_PB6, |
| 105 | .partition_info = nand_partitions, | 106 | .partition_info = nand_partitions, |
| 106 | .bus_width_16 = 0, | ||
| 107 | }; | 107 | }; |
| 108 | 108 | ||
| 109 | static struct sam9_smc_config __initdata ek_nand_smc_config = { | ||
| 110 | .ncs_read_setup = 0, | ||
| 111 | .nrd_setup = 1, | ||
| 112 | .ncs_write_setup = 0, | ||
| 113 | .nwe_setup = 1, | ||
| 114 | |||
| 115 | .ncs_read_pulse = 3, | ||
| 116 | .nrd_pulse = 3, | ||
| 117 | .ncs_write_pulse = 3, | ||
| 118 | .nwe_pulse = 3, | ||
| 119 | |||
| 120 | .read_cycle = 5, | ||
| 121 | .write_cycle = 5, | ||
| 122 | |||
| 123 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8, | ||
| 124 | .tdf_cycles = 2, | ||
| 125 | }; | ||
| 126 | |||
| 127 | static void __init ek_add_device_nand(void) | ||
| 128 | { | ||
| 129 | /* configure chip-select 3 (NAND) */ | ||
| 130 | sam9_smc_configure(3, &ek_nand_smc_config); | ||
| 131 | |||
| 132 | at91_add_device_nand(&ek_nand_data); | ||
| 133 | } | ||
| 134 | |||
| 109 | 135 | ||
| 110 | /* | 136 | /* |
| 111 | * SPI devices | 137 | * SPI devices |
| @@ -188,7 +214,7 @@ static void __init ek_board_init(void) | |||
| 188 | /* I2C */ | 214 | /* I2C */ |
| 189 | at91_add_device_i2c(NULL, 0); | 215 | at91_add_device_i2c(NULL, 0); |
| 190 | /* NAND */ | 216 | /* NAND */ |
| 191 | at91_add_device_nand(&ek_nand_data); | 217 | ek_add_device_nand(); |
| 192 | /* SPI */ | 218 | /* SPI */ |
| 193 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); | 219 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); |
| 194 | /* MMC */ | 220 | /* MMC */ |
diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c index 7c350357333a..d13304c0bc45 100644 --- a/arch/arm/mach-at91/board-usb-a9260.c +++ b/arch/arm/mach-at91/board-usb-a9260.c | |||
| @@ -41,8 +41,10 @@ | |||
| 41 | #include <mach/hardware.h> | 41 | #include <mach/hardware.h> |
| 42 | #include <mach/board.h> | 42 | #include <mach/board.h> |
| 43 | #include <mach/gpio.h> | 43 | #include <mach/gpio.h> |
| 44 | #include <mach/at91sam9_smc.h> | ||
| 44 | #include <mach/at91_shdwc.h> | 45 | #include <mach/at91_shdwc.h> |
| 45 | 46 | ||
| 47 | #include "sam9_smc.h" | ||
| 46 | #include "generic.h" | 48 | #include "generic.h" |
| 47 | 49 | ||
| 48 | 50 | ||
| @@ -121,13 +123,34 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
| 121 | .rdy_pin = AT91_PIN_PC13, | 123 | .rdy_pin = AT91_PIN_PC13, |
| 122 | .enable_pin = AT91_PIN_PC14, | 124 | .enable_pin = AT91_PIN_PC14, |
| 123 | .partition_info = nand_partitions, | 125 | .partition_info = nand_partitions, |
| 124 | #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) | ||
| 125 | .bus_width_16 = 1, | ||
| 126 | #else | ||
| 127 | .bus_width_16 = 0, | ||
| 128 | #endif | ||
| 129 | }; | 126 | }; |
| 130 | 127 | ||
| 128 | static struct sam9_smc_config __initdata ek_nand_smc_config = { | ||
| 129 | .ncs_read_setup = 0, | ||
| 130 | .nrd_setup = 1, | ||
| 131 | .ncs_write_setup = 0, | ||
| 132 | .nwe_setup = 1, | ||
| 133 | |||
| 134 | .ncs_read_pulse = 3, | ||
| 135 | .nrd_pulse = 3, | ||
| 136 | .ncs_write_pulse = 3, | ||
| 137 | .nwe_pulse = 3, | ||
| 138 | |||
| 139 | .read_cycle = 5, | ||
| 140 | .write_cycle = 5, | ||
| 141 | |||
| 142 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8, | ||
| 143 | .tdf_cycles = 2, | ||
| 144 | }; | ||
| 145 | |||
| 146 | static void __init ek_add_device_nand(void) | ||
| 147 | { | ||
| 148 | /* configure chip-select 3 (NAND) */ | ||
| 149 | sam9_smc_configure(3, &ek_nand_smc_config); | ||
| 150 | |||
| 151 | at91_add_device_nand(&ek_nand_data); | ||
| 152 | } | ||
| 153 | |||
| 131 | /* | 154 | /* |
| 132 | * GPIO Buttons | 155 | * GPIO Buttons |
| 133 | */ | 156 | */ |
| @@ -189,7 +212,7 @@ static void __init ek_board_init(void) | |||
| 189 | /* USB Device */ | 212 | /* USB Device */ |
| 190 | at91_add_device_udc(&ek_udc_data); | 213 | at91_add_device_udc(&ek_udc_data); |
| 191 | /* NAND */ | 214 | /* NAND */ |
| 192 | at91_add_device_nand(&ek_nand_data); | 215 | ek_add_device_nand(); |
| 193 | /* I2C */ | 216 | /* I2C */ |
| 194 | at91_add_device_i2c(NULL, 0); | 217 | at91_add_device_i2c(NULL, 0); |
| 195 | /* Ethernet */ | 218 | /* Ethernet */ |
diff --git a/arch/arm/mach-at91/board-usb-a9263.c b/arch/arm/mach-at91/board-usb-a9263.c index 391b566c4571..d96405b7d578 100644 --- a/arch/arm/mach-at91/board-usb-a9263.c +++ b/arch/arm/mach-at91/board-usb-a9263.c | |||
| @@ -40,8 +40,10 @@ | |||
| 40 | #include <mach/hardware.h> | 40 | #include <mach/hardware.h> |
| 41 | #include <mach/board.h> | 41 | #include <mach/board.h> |
| 42 | #include <mach/gpio.h> | 42 | #include <mach/gpio.h> |
| 43 | #include <mach/at91sam9_smc.h> | ||
| 43 | #include <mach/at91_shdwc.h> | 44 | #include <mach/at91_shdwc.h> |
| 44 | 45 | ||
| 46 | #include "sam9_smc.h" | ||
| 45 | #include "generic.h" | 47 | #include "generic.h" |
| 46 | 48 | ||
| 47 | 49 | ||
| @@ -134,13 +136,35 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
| 134 | .rdy_pin = AT91_PIN_PA22, | 136 | .rdy_pin = AT91_PIN_PA22, |
| 135 | .enable_pin = AT91_PIN_PD15, | 137 | .enable_pin = AT91_PIN_PD15, |
| 136 | .partition_info = nand_partitions, | 138 | .partition_info = nand_partitions, |
| 137 | #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) | ||
| 138 | .bus_width_16 = 1, | ||
| 139 | #else | ||
| 140 | .bus_width_16 = 0, | ||
| 141 | #endif | ||
| 142 | }; | 139 | }; |
| 143 | 140 | ||
| 141 | static struct sam9_smc_config __initdata ek_nand_smc_config = { | ||
| 142 | .ncs_read_setup = 0, | ||
| 143 | .nrd_setup = 1, | ||
| 144 | .ncs_write_setup = 0, | ||
| 145 | .nwe_setup = 1, | ||
| 146 | |||
| 147 | .ncs_read_pulse = 3, | ||
| 148 | .nrd_pulse = 3, | ||
| 149 | .ncs_write_pulse = 3, | ||
| 150 | .nwe_pulse = 3, | ||
| 151 | |||
| 152 | .read_cycle = 5, | ||
| 153 | .write_cycle = 5, | ||
| 154 | |||
| 155 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8, | ||
| 156 | .tdf_cycles = 2, | ||
| 157 | }; | ||
| 158 | |||
| 159 | static void __init ek_add_device_nand(void) | ||
| 160 | { | ||
| 161 | /* configure chip-select 3 (NAND) */ | ||
| 162 | sam9_smc_configure(3, &ek_nand_smc_config); | ||
| 163 | |||
| 164 | at91_add_device_nand(&ek_nand_data); | ||
| 165 | } | ||
| 166 | |||
| 167 | |||
| 144 | /* | 168 | /* |
| 145 | * GPIO Buttons | 169 | * GPIO Buttons |
| 146 | */ | 170 | */ |
| @@ -206,7 +230,7 @@ static void __init ek_board_init(void) | |||
| 206 | /* Ethernet */ | 230 | /* Ethernet */ |
| 207 | at91_add_device_eth(&ek_macb_data); | 231 | at91_add_device_eth(&ek_macb_data); |
| 208 | /* NAND */ | 232 | /* NAND */ |
| 209 | at91_add_device_nand(&ek_nand_data); | 233 | ek_add_device_nand(); |
| 210 | /* I2C */ | 234 | /* I2C */ |
| 211 | at91_add_device_i2c(NULL, 0); | 235 | at91_add_device_i2c(NULL, 0); |
| 212 | /* Push Buttons */ | 236 | /* Push Buttons */ |
diff --git a/arch/arm/mach-at91/include/mach/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h index 2e3f2894b704..9561e33b8a9a 100644 --- a/arch/arm/mach-at91/include/mach/at91_pmc.h +++ b/arch/arm/mach-at91/include/mach/at91_pmc.h | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #define AT91_PMC_PCK (1 << 0) /* Processor Clock */ | 23 | #define AT91_PMC_PCK (1 << 0) /* Processor Clock */ |
| 24 | #define AT91RM9200_PMC_UDP (1 << 1) /* USB Devcice Port Clock [AT91RM9200 only] */ | 24 | #define AT91RM9200_PMC_UDP (1 << 1) /* USB Devcice Port Clock [AT91RM9200 only] */ |
| 25 | #define AT91RM9200_PMC_MCKUDP (1 << 2) /* USB Device Port Master Clock Automatic Disable on Suspend [AT91RM9200 only] */ | 25 | #define AT91RM9200_PMC_MCKUDP (1 << 2) /* USB Device Port Master Clock Automatic Disable on Suspend [AT91RM9200 only] */ |
| 26 | #define AT91CAP9_PMC_DDR (1 << 2) /* DDR Clock [AT91CAP9 revC only] */ | ||
| 26 | #define AT91RM9200_PMC_UHP (1 << 4) /* USB Host Port Clock [AT91RM9200 only] */ | 27 | #define AT91RM9200_PMC_UHP (1 << 4) /* USB Host Port Clock [AT91RM9200 only] */ |
| 27 | #define AT91SAM926x_PMC_UHP (1 << 6) /* USB Host Port Clock [AT91SAM926x only] */ | 28 | #define AT91SAM926x_PMC_UHP (1 << 6) /* USB Host Port Clock [AT91SAM926x only] */ |
| 28 | #define AT91CAP9_PMC_UHP (1 << 6) /* USB Host Port Clock [AT91CAP9 only] */ | 29 | #define AT91CAP9_PMC_UHP (1 << 6) /* USB Host Port Clock [AT91CAP9 only] */ |
| @@ -102,10 +103,16 @@ | |||
| 102 | #define AT91_PMC_LOCKB (1 << 2) /* PLLB Lock */ | 103 | #define AT91_PMC_LOCKB (1 << 2) /* PLLB Lock */ |
| 103 | #define AT91_PMC_MCKRDY (1 << 3) /* Master Clock */ | 104 | #define AT91_PMC_MCKRDY (1 << 3) /* Master Clock */ |
| 104 | #define AT91_PMC_LOCKU (1 << 6) /* UPLL Lock [AT91CAP9 only] */ | 105 | #define AT91_PMC_LOCKU (1 << 6) /* UPLL Lock [AT91CAP9 only] */ |
| 106 | #define AT91_PMC_OSCSEL (1 << 7) /* Slow Clock Oscillator [AT91CAP9 revC only] */ | ||
| 105 | #define AT91_PMC_PCK0RDY (1 << 8) /* Programmable Clock 0 */ | 107 | #define AT91_PMC_PCK0RDY (1 << 8) /* Programmable Clock 0 */ |
| 106 | #define AT91_PMC_PCK1RDY (1 << 9) /* Programmable Clock 1 */ | 108 | #define AT91_PMC_PCK1RDY (1 << 9) /* Programmable Clock 1 */ |
| 107 | #define AT91_PMC_PCK2RDY (1 << 10) /* Programmable Clock 2 */ | 109 | #define AT91_PMC_PCK2RDY (1 << 10) /* Programmable Clock 2 */ |
| 108 | #define AT91_PMC_PCK3RDY (1 << 11) /* Programmable Clock 3 */ | 110 | #define AT91_PMC_PCK3RDY (1 << 11) /* Programmable Clock 3 */ |
| 109 | #define AT91_PMC_IMR (AT91_PMC + 0x6c) /* Interrupt Mask Register */ | 111 | #define AT91_PMC_IMR (AT91_PMC + 0x6c) /* Interrupt Mask Register */ |
| 110 | 112 | ||
| 113 | #define AT91_PMC_PROT (AT91_PMC + 0xe4) /* Protect Register [AT91CAP9 revC only] */ | ||
| 114 | #define AT91_PMC_PROTKEY 0x504d4301 /* Activation Code */ | ||
| 115 | |||
| 116 | #define AT91_PMC_VER (AT91_PMC + 0xfc) /* PMC Module Version [AT91CAP9 only] */ | ||
| 117 | |||
| 111 | #endif | 118 | #endif |
diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h index 4a4b64135a92..d8c1ededaa75 100644 --- a/arch/arm/mach-at91/include/mach/at91cap9.h +++ b/arch/arm/mach-at91/include/mach/at91cap9.h | |||
| @@ -101,7 +101,9 @@ | |||
| 101 | #define AT91_RTT (0xfffffd20 - AT91_BASE_SYS) | 101 | #define AT91_RTT (0xfffffd20 - AT91_BASE_SYS) |
| 102 | #define AT91_PIT (0xfffffd30 - AT91_BASE_SYS) | 102 | #define AT91_PIT (0xfffffd30 - AT91_BASE_SYS) |
| 103 | #define AT91_WDT (0xfffffd40 - AT91_BASE_SYS) | 103 | #define AT91_WDT (0xfffffd40 - AT91_BASE_SYS) |
| 104 | #define AT91_GPBR (0xfffffd50 - AT91_BASE_SYS) | 104 | #define AT91_GPBR (cpu_is_at91cap9_revB() ? \ |
| 105 | (0xfffffd50 - AT91_BASE_SYS) : \ | ||
| 106 | (0xfffffd60 - AT91_BASE_SYS)) | ||
| 105 | 107 | ||
| 106 | #define AT91_USART0 AT91CAP9_BASE_US0 | 108 | #define AT91_USART0 AT91CAP9_BASE_US0 |
| 107 | #define AT91_USART1 AT91CAP9_BASE_US1 | 109 | #define AT91_USART1 AT91CAP9_BASE_US1 |
diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h index dbfd9f73f80b..c554c3e4d553 100644 --- a/arch/arm/mach-at91/include/mach/cpu.h +++ b/arch/arm/mach-at91/include/mach/cpu.h | |||
| @@ -49,6 +49,17 @@ static inline unsigned long at91_arch_identify(void) | |||
| 49 | return (at91_sys_read(AT91_DBGU_CIDR) & AT91_CIDR_ARCH); | 49 | return (at91_sys_read(AT91_DBGU_CIDR) & AT91_CIDR_ARCH); |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | #ifdef CONFIG_ARCH_AT91CAP9 | ||
| 53 | #include <mach/at91_pmc.h> | ||
| 54 | |||
| 55 | #define ARCH_REVISION_CAP9_B 0x399 | ||
| 56 | #define ARCH_REVISION_CAP9_C 0x601 | ||
| 57 | |||
| 58 | static inline unsigned long at91cap9_rev_identify(void) | ||
| 59 | { | ||
| 60 | return (at91_sys_read(AT91_PMC_VER)); | ||
| 61 | } | ||
| 62 | #endif | ||
| 52 | 63 | ||
| 53 | #ifdef CONFIG_ARCH_AT91RM9200 | 64 | #ifdef CONFIG_ARCH_AT91RM9200 |
| 54 | #define cpu_is_at91rm9200() (at91_cpu_identify() == ARCH_ID_AT91RM9200) | 65 | #define cpu_is_at91rm9200() (at91_cpu_identify() == ARCH_ID_AT91RM9200) |
| @@ -90,8 +101,12 @@ static inline unsigned long at91_arch_identify(void) | |||
| 90 | 101 | ||
| 91 | #ifdef CONFIG_ARCH_AT91CAP9 | 102 | #ifdef CONFIG_ARCH_AT91CAP9 |
| 92 | #define cpu_is_at91cap9() (at91_cpu_identify() == ARCH_ID_AT91CAP9) | 103 | #define cpu_is_at91cap9() (at91_cpu_identify() == ARCH_ID_AT91CAP9) |
| 104 | #define cpu_is_at91cap9_revB() (at91cap9_rev_identify() == ARCH_REVISION_CAP9_B) | ||
| 105 | #define cpu_is_at91cap9_revC() (at91cap9_rev_identify() == ARCH_REVISION_CAP9_C) | ||
| 93 | #else | 106 | #else |
| 94 | #define cpu_is_at91cap9() (0) | 107 | #define cpu_is_at91cap9() (0) |
| 108 | #define cpu_is_at91cap9_revB() (0) | ||
| 109 | #define cpu_is_at91cap9_revC() (0) | ||
| 95 | #endif | 110 | #endif |
| 96 | 111 | ||
| 97 | /* | 112 | /* |
diff --git a/arch/arm/mach-at91/include/mach/dma.h b/arch/arm/mach-at91/include/mach/dma.h deleted file mode 100644 index e4f90c177616..000000000000 --- a/arch/arm/mach-at91/include/mach/dma.h +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-at91/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2003 SAN People | ||
| 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 as published by | ||
| 8 | * the Free Software Foundation; either version 2 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 19 | */ | ||
diff --git a/arch/arm/mach-at91/include/mach/io.h b/arch/arm/mach-at91/include/mach/io.h index 1611bd03f528..0b0cccc46e68 100644 --- a/arch/arm/mach-at91/include/mach/io.h +++ b/arch/arm/mach-at91/include/mach/io.h | |||
| @@ -23,8 +23,8 @@ | |||
| 23 | 23 | ||
| 24 | #define IO_SPACE_LIMIT 0xFFFFFFFF | 24 | #define IO_SPACE_LIMIT 0xFFFFFFFF |
| 25 | 25 | ||
| 26 | #define __io(a) ((void __iomem *)(a)) | 26 | #define __io(a) __typesafe_io(a) |
| 27 | #define __mem_pci(a) (a) | 27 | #define __mem_pci(a) (a) |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | #ifndef __ASSEMBLY__ | 30 | #ifndef __ASSEMBLY__ |
diff --git a/arch/arm/mach-at91/include/mach/memory.h b/arch/arm/mach-at91/include/mach/memory.h index 9dd1b8c79b08..14f4ef4b6a9e 100644 --- a/arch/arm/mach-at91/include/mach/memory.h +++ b/arch/arm/mach-at91/include/mach/memory.h | |||
| @@ -25,15 +25,4 @@ | |||
| 25 | 25 | ||
| 26 | #define PHYS_OFFSET (AT91_SDRAM_BASE) | 26 | #define PHYS_OFFSET (AT91_SDRAM_BASE) |
| 27 | 27 | ||
| 28 | |||
| 29 | /* | ||
| 30 | * Virtual view <-> DMA view memory address translations | ||
| 31 | * virt_to_bus: Used to translate the virtual address to an | ||
| 32 | * address suitable to be passed to set_dma_addr | ||
| 33 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 34 | * to an address that the kernel can use. | ||
| 35 | */ | ||
| 36 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 37 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 38 | |||
| 39 | #endif | 28 | #endif |
diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c new file mode 100644 index 000000000000..5eab6aa621d0 --- /dev/null +++ b/arch/arm/mach-at91/sam9_smc.c | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-at91/sam9_smc.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Andrew Victor | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/module.h> | ||
| 12 | #include <linux/io.h> | ||
| 13 | |||
| 14 | #include <mach/at91sam9_smc.h> | ||
| 15 | |||
| 16 | #include "sam9_smc.h" | ||
| 17 | |||
| 18 | void __init sam9_smc_configure(int cs, struct sam9_smc_config* config) | ||
| 19 | { | ||
| 20 | /* Setup register */ | ||
| 21 | at91_sys_write(AT91_SMC_SETUP(cs), | ||
| 22 | AT91_SMC_NWESETUP_(config->nwe_setup) | ||
| 23 | | AT91_SMC_NCS_WRSETUP_(config->ncs_write_setup) | ||
| 24 | | AT91_SMC_NRDSETUP_(config->nrd_setup) | ||
| 25 | | AT91_SMC_NCS_RDSETUP_(config->ncs_read_setup) | ||
| 26 | ); | ||
| 27 | |||
| 28 | /* Pulse register */ | ||
| 29 | at91_sys_write(AT91_SMC_PULSE(cs), | ||
| 30 | AT91_SMC_NWEPULSE_(config->nwe_pulse) | ||
| 31 | | AT91_SMC_NCS_WRPULSE_(config->ncs_write_pulse) | ||
| 32 | | AT91_SMC_NRDPULSE_(config->nrd_pulse) | ||
| 33 | | AT91_SMC_NCS_RDPULSE_(config->ncs_read_pulse) | ||
| 34 | ); | ||
| 35 | |||
| 36 | /* Cycle register */ | ||
| 37 | at91_sys_write(AT91_SMC_CYCLE(cs), | ||
| 38 | AT91_SMC_NWECYCLE_(config->write_cycle) | ||
| 39 | | AT91_SMC_NRDCYCLE_(config->read_cycle) | ||
| 40 | ); | ||
| 41 | |||
| 42 | /* Mode register */ | ||
| 43 | at91_sys_write(AT91_SMC_MODE(cs), | ||
| 44 | config->mode | ||
| 45 | | AT91_SMC_TDF_(config->tdf_cycles) | ||
| 46 | ); | ||
| 47 | } | ||
diff --git a/arch/arm/mach-at91/sam9_smc.h b/arch/arm/mach-at91/sam9_smc.h new file mode 100644 index 000000000000..bf72cfb3455b --- /dev/null +++ b/arch/arm/mach-at91/sam9_smc.h | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-at91/sam9_smc. | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Andrew Victor | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | struct sam9_smc_config { | ||
| 12 | /* Setup register */ | ||
| 13 | u8 ncs_read_setup; | ||
| 14 | u8 nrd_setup; | ||
| 15 | u8 ncs_write_setup; | ||
| 16 | u8 nwe_setup; | ||
| 17 | |||
| 18 | /* Pulse register */ | ||
| 19 | u8 ncs_read_pulse; | ||
| 20 | u8 nrd_pulse; | ||
| 21 | u8 ncs_write_pulse; | ||
| 22 | u8 nwe_pulse; | ||
| 23 | |||
| 24 | /* Cycle register */ | ||
| 25 | u16 read_cycle; | ||
| 26 | u16 write_cycle; | ||
| 27 | |||
| 28 | /* Mode register */ | ||
| 29 | u32 mode; | ||
| 30 | u8 tdf_cycles:4; | ||
| 31 | }; | ||
| 32 | |||
| 33 | extern void __init sam9_smc_configure(int cs, struct sam9_smc_config* config); | ||
diff --git a/arch/arm/mach-clps711x/include/mach/dma.h b/arch/arm/mach-clps711x/include/mach/dma.h deleted file mode 100644 index 0d620e869536..000000000000 --- a/arch/arm/mach-clps711x/include/mach/dma.h +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps711x/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1997,1998 Russell King | ||
| 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 as published by | ||
| 8 | * the Free Software Foundation; either version 2 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 19 | */ | ||
diff --git a/arch/arm/mach-clps711x/include/mach/io.h b/arch/arm/mach-clps711x/include/mach/io.h index 4c8440087679..2e0b3ced8f07 100644 --- a/arch/arm/mach-clps711x/include/mach/io.h +++ b/arch/arm/mach-clps711x/include/mach/io.h | |||
| @@ -20,12 +20,10 @@ | |||
| 20 | #ifndef __ASM_ARM_ARCH_IO_H | 20 | #ifndef __ASM_ARM_ARCH_IO_H |
| 21 | #define __ASM_ARM_ARCH_IO_H | 21 | #define __ASM_ARM_ARCH_IO_H |
| 22 | 22 | ||
| 23 | #include <mach/hardware.h> | ||
| 24 | |||
| 25 | #define IO_SPACE_LIMIT 0xffffffff | 23 | #define IO_SPACE_LIMIT 0xffffffff |
| 26 | 24 | ||
| 27 | #define __io(a) ((void __iomem *)(a)) | 25 | #define __io(a) __typesafe_io(a) |
| 28 | #define __mem_pci(a) (a) | 26 | #define __mem_pci(a) (a) |
| 29 | 27 | ||
| 30 | /* | 28 | /* |
| 31 | * We don't support ins[lb]/outs[lb]. Make them fault. | 29 | * We don't support ins[lb]/outs[lb]. Make them fault. |
diff --git a/arch/arm/mach-clps711x/include/mach/memory.h b/arch/arm/mach-clps711x/include/mach/memory.h index 98ec30c97bbe..e522b20bcbc2 100644 --- a/arch/arm/mach-clps711x/include/mach/memory.h +++ b/arch/arm/mach-clps711x/include/mach/memory.h | |||
| @@ -26,25 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | #define PHYS_OFFSET UL(0xc0000000) | 27 | #define PHYS_OFFSET UL(0xc0000000) |
| 28 | 28 | ||
| 29 | /* | 29 | #if !defined(CONFIG_ARCH_CDB89712) && !defined (CONFIG_ARCH_AUTCPU12) |
| 30 | * Virtual view <-> DMA view memory address translations | ||
| 31 | * virt_to_bus: Used to translate the virtual address to an | ||
| 32 | * address suitable to be passed to set_dma_addr | ||
| 33 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 34 | * to an address that the kernel can use. | ||
| 35 | */ | ||
| 36 | |||
| 37 | #if defined(CONFIG_ARCH_CDB89712) | ||
| 38 | |||
| 39 | #define __virt_to_bus(x) (x) | ||
| 40 | #define __bus_to_virt(x) (x) | ||
| 41 | |||
| 42 | #elif defined (CONFIG_ARCH_AUTCPU12) | ||
| 43 | |||
| 44 | #define __virt_to_bus(x) (x) | ||
| 45 | #define __bus_to_virt(x) (x) | ||
| 46 | |||
| 47 | #else | ||
| 48 | 30 | ||
| 49 | #define __virt_to_bus(x) ((x) - PAGE_OFFSET) | 31 | #define __virt_to_bus(x) ((x) - PAGE_OFFSET) |
| 50 | #define __bus_to_virt(x) ((x) + PAGE_OFFSET) | 32 | #define __bus_to_virt(x) ((x) + PAGE_OFFSET) |
diff --git a/arch/arm/mach-clps7500/Makefile b/arch/arm/mach-clps7500/Makefile deleted file mode 100644 index 4bd8ebd70e7b..000000000000 --- a/arch/arm/mach-clps7500/Makefile +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Makefile for the linux kernel. | ||
| 3 | # | ||
| 4 | |||
| 5 | # Object file lists. | ||
| 6 | |||
| 7 | obj-y := core.o | ||
| 8 | obj-m := | ||
| 9 | obj-n := | ||
| 10 | obj- := | ||
| 11 | |||
diff --git a/arch/arm/mach-clps7500/Makefile.boot b/arch/arm/mach-clps7500/Makefile.boot deleted file mode 100644 index fe16506c1540..000000000000 --- a/arch/arm/mach-clps7500/Makefile.boot +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | zreladdr-y := 0x10008000 | ||
| 2 | |||
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c deleted file mode 100644 index 7e247c04d41c..000000000000 --- a/arch/arm/mach-clps7500/core.c +++ /dev/null | |||
| @@ -1,395 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-clps7500/core.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 1998 Russell King | ||
| 5 | * Copyright (C) 1999 Nexus Electronics Ltd | ||
| 6 | * | ||
| 7 | * Extra MM routines for CL7500 architecture | ||
| 8 | */ | ||
| 9 | #include <linux/kernel.h> | ||
| 10 | #include <linux/types.h> | ||
| 11 | #include <linux/interrupt.h> | ||
| 12 | #include <linux/irq.h> | ||
| 13 | #include <linux/list.h> | ||
| 14 | #include <linux/sched.h> | ||
| 15 | #include <linux/init.h> | ||
| 16 | #include <linux/device.h> | ||
| 17 | #include <linux/serial_8250.h> | ||
| 18 | #include <linux/io.h> | ||
| 19 | |||
| 20 | #include <asm/mach/arch.h> | ||
| 21 | #include <asm/mach/map.h> | ||
| 22 | #include <asm/mach/irq.h> | ||
| 23 | #include <asm/mach/time.h> | ||
| 24 | |||
| 25 | #include <mach/hardware.h> | ||
| 26 | #include <asm/hardware/iomd.h> | ||
| 27 | #include <asm/irq.h> | ||
| 28 | #include <asm/mach-types.h> | ||
| 29 | |||
| 30 | unsigned int vram_size; | ||
| 31 | |||
| 32 | static void cl7500_ack_irq_a(unsigned int irq) | ||
| 33 | { | ||
| 34 | unsigned int val, mask; | ||
| 35 | |||
| 36 | mask = 1 << irq; | ||
| 37 | val = iomd_readb(IOMD_IRQMASKA); | ||
| 38 | iomd_writeb(val & ~mask, IOMD_IRQMASKA); | ||
| 39 | iomd_writeb(mask, IOMD_IRQCLRA); | ||
| 40 | } | ||
| 41 | |||
| 42 | static void cl7500_mask_irq_a(unsigned int irq) | ||
| 43 | { | ||
| 44 | unsigned int val, mask; | ||
| 45 | |||
| 46 | mask = 1 << irq; | ||
| 47 | val = iomd_readb(IOMD_IRQMASKA); | ||
| 48 | iomd_writeb(val & ~mask, IOMD_IRQMASKA); | ||
| 49 | } | ||
| 50 | |||
| 51 | static void cl7500_unmask_irq_a(unsigned int irq) | ||
| 52 | { | ||
| 53 | unsigned int val, mask; | ||
| 54 | |||
| 55 | mask = 1 << irq; | ||
| 56 | val = iomd_readb(IOMD_IRQMASKA); | ||
| 57 | iomd_writeb(val | mask, IOMD_IRQMASKA); | ||
| 58 | } | ||
| 59 | |||
| 60 | static struct irq_chip clps7500_a_chip = { | ||
| 61 | .ack = cl7500_ack_irq_a, | ||
| 62 | .mask = cl7500_mask_irq_a, | ||
| 63 | .unmask = cl7500_unmask_irq_a, | ||
| 64 | }; | ||
| 65 | |||
| 66 | static void cl7500_mask_irq_b(unsigned int irq) | ||
| 67 | { | ||
| 68 | unsigned int val, mask; | ||
| 69 | |||
| 70 | mask = 1 << (irq & 7); | ||
| 71 | val = iomd_readb(IOMD_IRQMASKB); | ||
| 72 | iomd_writeb(val & ~mask, IOMD_IRQMASKB); | ||
| 73 | } | ||
| 74 | |||
| 75 | static void cl7500_unmask_irq_b(unsigned int irq) | ||
| 76 | { | ||
| 77 | unsigned int val, mask; | ||
| 78 | |||
| 79 | mask = 1 << (irq & 7); | ||
| 80 | val = iomd_readb(IOMD_IRQMASKB); | ||
| 81 | iomd_writeb(val | mask, IOMD_IRQMASKB); | ||
| 82 | } | ||
| 83 | |||
| 84 | static struct irq_chip clps7500_b_chip = { | ||
| 85 | .ack = cl7500_mask_irq_b, | ||
| 86 | .mask = cl7500_mask_irq_b, | ||
| 87 | .unmask = cl7500_unmask_irq_b, | ||
| 88 | }; | ||
| 89 | |||
| 90 | static void cl7500_mask_irq_c(unsigned int irq) | ||
| 91 | { | ||
| 92 | unsigned int val, mask; | ||
| 93 | |||
| 94 | mask = 1 << (irq & 7); | ||
| 95 | val = iomd_readb(IOMD_IRQMASKC); | ||
| 96 | iomd_writeb(val & ~mask, IOMD_IRQMASKC); | ||
| 97 | } | ||
| 98 | |||
| 99 | static void cl7500_unmask_irq_c(unsigned int irq) | ||
| 100 | { | ||
| 101 | unsigned int val, mask; | ||
| 102 | |||
| 103 | mask = 1 << (irq & 7); | ||
| 104 | val = iomd_readb(IOMD_IRQMASKC); | ||
| 105 | iomd_writeb(val | mask, IOMD_IRQMASKC); | ||
| 106 | } | ||
| 107 | |||
| 108 | static struct irq_chip clps7500_c_chip = { | ||
| 109 | .ack = cl7500_mask_irq_c, | ||
| 110 | .mask = cl7500_mask_irq_c, | ||
| 111 | .unmask = cl7500_unmask_irq_c, | ||
| 112 | }; | ||
| 113 | |||
| 114 | static void cl7500_mask_irq_d(unsigned int irq) | ||
| 115 | { | ||
| 116 | unsigned int val, mask; | ||
| 117 | |||
| 118 | mask = 1 << (irq & 7); | ||
| 119 | val = iomd_readb(IOMD_IRQMASKD); | ||
| 120 | iomd_writeb(val & ~mask, IOMD_IRQMASKD); | ||
| 121 | } | ||
| 122 | |||
| 123 | static void cl7500_unmask_irq_d(unsigned int irq) | ||
| 124 | { | ||
| 125 | unsigned int val, mask; | ||
| 126 | |||
| 127 | mask = 1 << (irq & 7); | ||
| 128 | val = iomd_readb(IOMD_IRQMASKD); | ||
| 129 | iomd_writeb(val | mask, IOMD_IRQMASKD); | ||
| 130 | } | ||
| 131 | |||
| 132 | static struct irq_chip clps7500_d_chip = { | ||
| 133 | .ack = cl7500_mask_irq_d, | ||
| 134 | .mask = cl7500_mask_irq_d, | ||
| 135 | .unmask = cl7500_unmask_irq_d, | ||
| 136 | }; | ||
| 137 | |||
| 138 | static void cl7500_mask_irq_dma(unsigned int irq) | ||
| 139 | { | ||
| 140 | unsigned int val, mask; | ||
| 141 | |||
| 142 | mask = 1 << (irq & 7); | ||
| 143 | val = iomd_readb(IOMD_DMAMASK); | ||
| 144 | iomd_writeb(val & ~mask, IOMD_DMAMASK); | ||
| 145 | } | ||
| 146 | |||
| 147 | static void cl7500_unmask_irq_dma(unsigned int irq) | ||
| 148 | { | ||
| 149 | unsigned int val, mask; | ||
| 150 | |||
| 151 | mask = 1 << (irq & 7); | ||
| 152 | val = iomd_readb(IOMD_DMAMASK); | ||
| 153 | iomd_writeb(val | mask, IOMD_DMAMASK); | ||
| 154 | } | ||
| 155 | |||
| 156 | static struct irq_chip clps7500_dma_chip = { | ||
| 157 | .ack = cl7500_mask_irq_dma, | ||
| 158 | .mask = cl7500_mask_irq_dma, | ||
| 159 | .unmask = cl7500_unmask_irq_dma, | ||
| 160 | }; | ||
| 161 | |||
| 162 | static void cl7500_mask_irq_fiq(unsigned int irq) | ||
| 163 | { | ||
| 164 | unsigned int val, mask; | ||
| 165 | |||
| 166 | mask = 1 << (irq & 7); | ||
| 167 | val = iomd_readb(IOMD_FIQMASK); | ||
| 168 | iomd_writeb(val & ~mask, IOMD_FIQMASK); | ||
| 169 | } | ||
| 170 | |||
| 171 | static void cl7500_unmask_irq_fiq(unsigned int irq) | ||
| 172 | { | ||
| 173 | unsigned int val, mask; | ||
| 174 | |||
| 175 | mask = 1 << (irq & 7); | ||
| 176 | val = iomd_readb(IOMD_FIQMASK); | ||
| 177 | iomd_writeb(val | mask, IOMD_FIQMASK); | ||
| 178 | } | ||
| 179 | |||
| 180 | static struct irq_chip clps7500_fiq_chip = { | ||
| 181 | .ack = cl7500_mask_irq_fiq, | ||
| 182 | .mask = cl7500_mask_irq_fiq, | ||
| 183 | .unmask = cl7500_unmask_irq_fiq, | ||
| 184 | }; | ||
| 185 | |||
| 186 | static void cl7500_no_action(unsigned int irq) | ||
| 187 | { | ||
| 188 | } | ||
| 189 | |||
| 190 | static struct irq_chip clps7500_no_chip = { | ||
| 191 | .ack = cl7500_no_action, | ||
| 192 | .mask = cl7500_no_action, | ||
| 193 | .unmask = cl7500_no_action, | ||
| 194 | }; | ||
| 195 | |||
| 196 | static struct irqaction irq_isa = { | ||
| 197 | .handler = no_action, | ||
| 198 | .mask = CPU_MASK_NONE, | ||
| 199 | .name = "isa", | ||
| 200 | }; | ||
| 201 | |||
| 202 | static void __init clps7500_init_irq(void) | ||
| 203 | { | ||
| 204 | unsigned int irq, flags; | ||
| 205 | |||
| 206 | iomd_writeb(0, IOMD_IRQMASKA); | ||
| 207 | iomd_writeb(0, IOMD_IRQMASKB); | ||
| 208 | iomd_writeb(0, IOMD_FIQMASK); | ||
| 209 | iomd_writeb(0, IOMD_DMAMASK); | ||
| 210 | |||
| 211 | for (irq = 0; irq < NR_IRQS; irq++) { | ||
| 212 | flags = IRQF_VALID; | ||
| 213 | |||
| 214 | if (irq <= 6 || (irq >= 9 && irq <= 15) || | ||
| 215 | (irq >= 48 && irq <= 55)) | ||
| 216 | flags |= IRQF_PROBE; | ||
| 217 | |||
| 218 | switch (irq) { | ||
| 219 | case 0 ... 7: | ||
| 220 | set_irq_chip(irq, &clps7500_a_chip); | ||
| 221 | set_irq_handler(irq, handle_level_irq); | ||
| 222 | set_irq_flags(irq, flags); | ||
| 223 | break; | ||
| 224 | |||
| 225 | case 8 ... 15: | ||
| 226 | set_irq_chip(irq, &clps7500_b_chip); | ||
| 227 | set_irq_handler(irq, handle_level_irq); | ||
| 228 | set_irq_flags(irq, flags); | ||
| 229 | break; | ||
| 230 | |||
| 231 | case 16 ... 22: | ||
| 232 | set_irq_chip(irq, &clps7500_dma_chip); | ||
| 233 | set_irq_handler(irq, handle_level_irq); | ||
| 234 | set_irq_flags(irq, flags); | ||
| 235 | break; | ||
| 236 | |||
| 237 | case 24 ... 31: | ||
| 238 | set_irq_chip(irq, &clps7500_c_chip); | ||
| 239 | set_irq_handler(irq, handle_level_irq); | ||
| 240 | set_irq_flags(irq, flags); | ||
| 241 | break; | ||
| 242 | |||
| 243 | case 40 ... 47: | ||
| 244 | set_irq_chip(irq, &clps7500_d_chip); | ||
| 245 | set_irq_handler(irq, handle_level_irq); | ||
| 246 | set_irq_flags(irq, flags); | ||
| 247 | break; | ||
| 248 | |||
| 249 | case 48 ... 55: | ||
| 250 | set_irq_chip(irq, &clps7500_no_chip); | ||
| 251 | set_irq_handler(irq, handle_level_irq); | ||
| 252 | set_irq_flags(irq, flags); | ||
| 253 | break; | ||
| 254 | |||
| 255 | case 64 ... 72: | ||
| 256 | set_irq_chip(irq, &clps7500_fiq_chip); | ||
| 257 | set_irq_handler(irq, handle_level_irq); | ||
| 258 | set_irq_flags(irq, flags); | ||
| 259 | break; | ||
| 260 | } | ||
| 261 | } | ||
| 262 | |||
| 263 | setup_irq(IRQ_ISA, &irq_isa); | ||
| 264 | } | ||
| 265 | |||
| 266 | static struct map_desc cl7500_io_desc[] __initdata = { | ||
| 267 | { /* IO space */ | ||
| 268 | .virtual = (unsigned long)IO_BASE, | ||
| 269 | .pfn = __phys_to_pfn(IO_START), | ||
| 270 | .length = IO_SIZE, | ||
| 271 | .type = MT_DEVICE | ||
| 272 | }, { /* ISA space */ | ||
| 273 | .virtual = ISA_BASE, | ||
| 274 | .pfn = __phys_to_pfn(ISA_START), | ||
| 275 | .length = ISA_SIZE, | ||
| 276 | .type = MT_DEVICE | ||
| 277 | }, { /* Flash */ | ||
| 278 | .virtual = CLPS7500_FLASH_BASE, | ||
| 279 | .pfn = __phys_to_pfn(CLPS7500_FLASH_START), | ||
| 280 | .length = CLPS7500_FLASH_SIZE, | ||
| 281 | .type = MT_DEVICE | ||
| 282 | }, { /* LED */ | ||
| 283 | .virtual = LED_BASE, | ||
| 284 | .pfn = __phys_to_pfn(LED_START), | ||
| 285 | .length = LED_SIZE, | ||
| 286 | .type = MT_DEVICE | ||
| 287 | } | ||
| 288 | }; | ||
| 289 | |||
| 290 | static void __init clps7500_map_io(void) | ||
| 291 | { | ||
| 292 | iotable_init(cl7500_io_desc, ARRAY_SIZE(cl7500_io_desc)); | ||
| 293 | } | ||
| 294 | |||
| 295 | extern void ioctime_init(void); | ||
| 296 | extern unsigned long ioc_timer_gettimeoffset(void); | ||
| 297 | |||
| 298 | static irqreturn_t | ||
| 299 | clps7500_timer_interrupt(int irq, void *dev_id) | ||
| 300 | { | ||
| 301 | timer_tick(); | ||
| 302 | |||
| 303 | /* Why not using do_leds interface?? */ | ||
| 304 | { | ||
| 305 | /* Twinkle the lights. */ | ||
| 306 | static int count, state = 0xff00; | ||
| 307 | if (count-- == 0) { | ||
| 308 | state ^= 0x100; | ||
| 309 | count = 25; | ||
| 310 | *((volatile unsigned int *)LED_ADDRESS) = state; | ||
| 311 | } | ||
| 312 | } | ||
| 313 | |||
| 314 | return IRQ_HANDLED; | ||
| 315 | } | ||
| 316 | |||
| 317 | static struct irqaction clps7500_timer_irq = { | ||
| 318 | .name = "CLPS7500 Timer Tick", | ||
| 319 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, | ||
| 320 | .handler = clps7500_timer_interrupt, | ||
| 321 | }; | ||
| 322 | |||
| 323 | /* | ||
| 324 | * Set up timer interrupt. | ||
| 325 | */ | ||
| 326 | static void __init clps7500_timer_init(void) | ||
| 327 | { | ||
| 328 | ioctime_init(); | ||
| 329 | setup_irq(IRQ_TIMER, &clps7500_timer_irq); | ||
| 330 | } | ||
| 331 | |||
| 332 | static struct sys_timer clps7500_timer = { | ||
| 333 | .init = clps7500_timer_init, | ||
| 334 | .offset = ioc_timer_gettimeoffset, | ||
| 335 | }; | ||
| 336 | |||
| 337 | static struct plat_serial8250_port serial_platform_data[] = { | ||
| 338 | { | ||
| 339 | .mapbase = 0x03010fe0, | ||
| 340 | .irq = 10, | ||
| 341 | .uartclk = 1843200, | ||
| 342 | .regshift = 2, | ||
| 343 | .iotype = UPIO_MEM, | ||
| 344 | .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP | UPF_SKIP_TEST, | ||
| 345 | }, | ||
| 346 | { | ||
| 347 | .mapbase = 0x03010be0, | ||
| 348 | .irq = 0, | ||
| 349 | .uartclk = 1843200, | ||
| 350 | .regshift = 2, | ||
| 351 | .iotype = UPIO_MEM, | ||
| 352 | .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP | UPF_SKIP_TEST, | ||
| 353 | }, | ||
| 354 | { | ||
| 355 | .iobase = ISASLOT_IO + 0x2e8, | ||
| 356 | .irq = 41, | ||
| 357 | .uartclk = 1843200, | ||
| 358 | .regshift = 0, | ||
| 359 | .iotype = UPIO_PORT, | ||
| 360 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, | ||
| 361 | }, | ||
| 362 | { | ||
| 363 | .iobase = ISASLOT_IO + 0x3e8, | ||
| 364 | .irq = 40, | ||
| 365 | .uartclk = 1843200, | ||
| 366 | .regshift = 0, | ||
| 367 | .iotype = UPIO_PORT, | ||
| 368 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, | ||
| 369 | }, | ||
| 370 | { }, | ||
| 371 | }; | ||
| 372 | |||
| 373 | static struct platform_device serial_device = { | ||
| 374 | .name = "serial8250", | ||
| 375 | .id = PLAT8250_DEV_PLATFORM, | ||
| 376 | .dev = { | ||
| 377 | .platform_data = serial_platform_data, | ||
| 378 | }, | ||
| 379 | }; | ||
| 380 | |||
| 381 | static void __init clps7500_init(void) | ||
| 382 | { | ||
| 383 | platform_device_register(&serial_device); | ||
| 384 | } | ||
| 385 | |||
| 386 | MACHINE_START(CLPS7500, "CL-PS7500") | ||
| 387 | /* Maintainer: Philip Blundell */ | ||
| 388 | .phys_io = 0x03000000, | ||
| 389 | .io_pg_offst = ((0xe0000000) >> 18) & 0xfffc, | ||
| 390 | .map_io = clps7500_map_io, | ||
| 391 | .init_irq = clps7500_init_irq, | ||
| 392 | .init_machine = clps7500_init, | ||
| 393 | .timer = &clps7500_timer, | ||
| 394 | MACHINE_END | ||
| 395 | |||
diff --git a/arch/arm/mach-clps7500/include/mach/acornfb.h b/arch/arm/mach-clps7500/include/mach/acornfb.h deleted file mode 100644 index aea6330c9745..000000000000 --- a/arch/arm/mach-clps7500/include/mach/acornfb.h +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | #define acornfb_valid_pixrate(var) (var->pixclock >= 39325 && var->pixclock <= 40119) | ||
| 2 | |||
| 3 | static inline void | ||
| 4 | acornfb_vidc20_find_rates(struct vidc_timing *vidc, | ||
| 5 | struct fb_var_screeninfo *var) | ||
| 6 | { | ||
| 7 | u_int bandwidth; | ||
| 8 | |||
| 9 | vidc->control |= VIDC20_CTRL_PIX_CK; | ||
| 10 | |||
| 11 | /* Calculate bandwidth */ | ||
| 12 | bandwidth = var->pixclock * 8 / var->bits_per_pixel; | ||
| 13 | |||
| 14 | /* Encode bandwidth as VIDC20 setting */ | ||
| 15 | if (bandwidth > 16667*2) | ||
| 16 | vidc->control |= VIDC20_CTRL_FIFO_16; | ||
| 17 | else if (bandwidth > 13333*2) | ||
| 18 | vidc->control |= VIDC20_CTRL_FIFO_20; | ||
| 19 | else if (bandwidth > 11111*2) | ||
| 20 | vidc->control |= VIDC20_CTRL_FIFO_24; | ||
| 21 | else | ||
| 22 | vidc->control |= VIDC20_CTRL_FIFO_28; | ||
| 23 | |||
| 24 | vidc->pll_ctl = 0x2020; | ||
| 25 | } | ||
| 26 | |||
| 27 | #ifdef CONFIG_CHRONTEL_7003 | ||
| 28 | #define acornfb_default_control() VIDC20_CTRL_PIX_HCLK | ||
| 29 | #else | ||
| 30 | #define acornfb_default_control() VIDC20_CTRL_PIX_VCLK | ||
| 31 | #endif | ||
| 32 | |||
| 33 | #define acornfb_default_econtrol() VIDC20_ECTL_DAC | VIDC20_ECTL_REG(3) | VIDC20_ECTL_ECK | ||
diff --git a/arch/arm/mach-clps7500/include/mach/debug-macro.S b/arch/arm/mach-clps7500/include/mach/debug-macro.S deleted file mode 100644 index af4104e7e84a..000000000000 --- a/arch/arm/mach-clps7500/include/mach/debug-macro.S +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | /* arch/arm/mach-clps7500/include/mach/debug-macro.S | ||
| 2 | * | ||
| 3 | * Debugging macro include header | ||
| 4 | * | ||
| 5 | * Copyright (C) 1994-1999 Russell King | ||
| 6 | * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks | ||
| 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 | |||
| 14 | .macro addruart,rx | ||
| 15 | mov \rx, #0xe0000000 | ||
| 16 | orr \rx, \rx, #0x00010000 | ||
| 17 | orr \rx, \rx, #0x00000be0 | ||
| 18 | .endm | ||
| 19 | |||
| 20 | #define UART_SHIFT 2 | ||
| 21 | #include <asm/hardware/debug-8250.S> | ||
diff --git a/arch/arm/mach-clps7500/include/mach/dma.h b/arch/arm/mach-clps7500/include/mach/dma.h deleted file mode 100644 index 63fcde505498..000000000000 --- a/arch/arm/mach-clps7500/include/mach/dma.h +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps7500/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1999 Nexus Electronics Ltd. | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef __ASM_ARCH_DMA_H | ||
| 8 | #define __ASM_ARCH_DMA_H | ||
| 9 | |||
| 10 | /* DMA is not yet implemented! It should be the same as acorn, copy over.. */ | ||
| 11 | |||
| 12 | /* | ||
| 13 | * This is the maximum DMA address that can be DMAd to. | ||
| 14 | * There should not be more than (0xd0000000 - 0xc0000000) | ||
| 15 | * bytes of RAM. | ||
| 16 | */ | ||
| 17 | #define MAX_DMA_ADDRESS 0xd0000000 | ||
| 18 | |||
| 19 | #define DMA_S0 0 | ||
| 20 | |||
| 21 | #endif /* _ASM_ARCH_DMA_H */ | ||
diff --git a/arch/arm/mach-clps7500/include/mach/entry-macro.S b/arch/arm/mach-clps7500/include/mach/entry-macro.S deleted file mode 100644 index 4e7e54144093..000000000000 --- a/arch/arm/mach-clps7500/include/mach/entry-macro.S +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | #include <mach/hardware.h> | ||
| 2 | #include <asm/hardware/entry-macro-iomd.S> | ||
| 3 | |||
| 4 | .equ ioc_base_high, IOC_BASE & 0xff000000 | ||
| 5 | .equ ioc_base_low, IOC_BASE & 0x00ff0000 | ||
| 6 | |||
| 7 | .macro get_irqnr_preamble, base, tmp | ||
| 8 | mov \base, #ioc_base_high @ point at IOC | ||
| 9 | .if ioc_base_low | ||
| 10 | orr \base, \base, #ioc_base_low | ||
| 11 | .endif | ||
| 12 | .endm | ||
| 13 | |||
| 14 | .macro arch_ret_to_user, tmp1, tmp2 | ||
| 15 | .endm | ||
| 16 | |||
diff --git a/arch/arm/mach-clps7500/include/mach/hardware.h b/arch/arm/mach-clps7500/include/mach/hardware.h deleted file mode 100644 index a6ad1d44badf..000000000000 --- a/arch/arm/mach-clps7500/include/mach/hardware.h +++ /dev/null | |||
| @@ -1,67 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps7500/include/mach/hardware.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1996-1999 Russell King. | ||
| 5 | * Copyright (C) 1999 Nexus Electronics Ltd. | ||
| 6 | * | ||
| 7 | * This file contains the hardware definitions of the | ||
| 8 | * CL7500 evaluation board. | ||
| 9 | */ | ||
| 10 | #ifndef __ASM_ARCH_HARDWARE_H | ||
| 11 | #define __ASM_ARCH_HARDWARE_H | ||
| 12 | |||
| 13 | #include <mach/memory.h> | ||
| 14 | #include <asm/hardware/iomd.h> | ||
| 15 | |||
| 16 | #ifdef __ASSEMBLY__ | ||
| 17 | #define IOMEM(x) x | ||
| 18 | #else | ||
| 19 | #define IOMEM(x) ((void __iomem *)(x)) | ||
| 20 | #endif | ||
| 21 | |||
| 22 | /* | ||
| 23 | * What hardware must be present | ||
| 24 | */ | ||
| 25 | #define HAS_IOMD | ||
| 26 | #define HAS_VIDC20 | ||
| 27 | |||
| 28 | /* Hardware addresses of major areas. | ||
| 29 | * *_START is the physical address | ||
| 30 | * *_SIZE is the size of the region | ||
| 31 | * *_BASE is the virtual address | ||
| 32 | */ | ||
| 33 | |||
| 34 | #define IO_START 0x03000000 /* I/O */ | ||
| 35 | #define IO_SIZE 0x01000000 | ||
| 36 | #define IO_BASE IOMEM(0xe0000000) | ||
| 37 | |||
| 38 | #define ISA_START 0x0c000000 /* ISA */ | ||
| 39 | #define ISA_SIZE 0x00010000 | ||
| 40 | #define ISA_BASE 0xe1000000 | ||
| 41 | |||
| 42 | #define CLPS7500_FLASH_START 0x01000000 /* XXX */ | ||
| 43 | #define CLPS7500_FLASH_SIZE 0x01000000 | ||
| 44 | #define CLPS7500_FLASH_BASE 0xe2000000 | ||
| 45 | |||
| 46 | #define LED_START 0x0302B000 | ||
| 47 | #define LED_SIZE 0x00001000 | ||
| 48 | #define LED_BASE 0xe3000000 | ||
| 49 | #define LED_ADDRESS (LED_BASE + 0xa00) | ||
| 50 | |||
| 51 | /* Let's define SCREEN_START for CL7500, even though it's a lie. */ | ||
| 52 | #define SCREEN_START 0x02000000 /* VRAM */ | ||
| 53 | #define SCREEN_END 0xdfc00000 | ||
| 54 | #define SCREEN_BASE 0xdf800000 | ||
| 55 | |||
| 56 | #define VIDC_BASE (void __iomem *)0xe0400000 | ||
| 57 | #define IOMD_BASE IOMEM(0xe0200000) | ||
| 58 | #define IOC_BASE IOMEM(0xe0200000) | ||
| 59 | #define FLOPPYDMA_BASE IOMEM(0xe002a000) | ||
| 60 | #define PCIO_BASE IOMEM(0xe0010000) | ||
| 61 | |||
| 62 | #define vidc_writel(val) __raw_writel(val, VIDC_BASE) | ||
| 63 | |||
| 64 | /* in/out bias for the ISA slot region */ | ||
| 65 | #define ISASLOT_IO 0x80400000 | ||
| 66 | |||
| 67 | #endif | ||
diff --git a/arch/arm/mach-clps7500/include/mach/io.h b/arch/arm/mach-clps7500/include/mach/io.h deleted file mode 100644 index 2ff2860889ed..000000000000 --- a/arch/arm/mach-clps7500/include/mach/io.h +++ /dev/null | |||
| @@ -1,255 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps7500/include/mach/io.h | ||
| 3 | * from arch/arm/mach-rpc/include/mach/io.h | ||
| 4 | * | ||
| 5 | * Copyright (C) 1997 Russell King | ||
| 6 | * | ||
| 7 | * Modifications: | ||
| 8 | * 06-Dec-1997 RMK Created. | ||
| 9 | */ | ||
| 10 | #ifndef __ASM_ARM_ARCH_IO_H | ||
| 11 | #define __ASM_ARM_ARCH_IO_H | ||
| 12 | |||
| 13 | #include <mach/hardware.h> | ||
| 14 | |||
| 15 | #define IO_SPACE_LIMIT 0xffffffff | ||
| 16 | |||
| 17 | /* | ||
| 18 | * GCC is totally crap at loading/storing data. We try to persuade it | ||
| 19 | * to do the right thing by using these whereever possible instead of | ||
| 20 | * the above. | ||
| 21 | */ | ||
| 22 | #define __arch_base_getb(b,o) \ | ||
| 23 | ({ \ | ||
| 24 | unsigned int v, r = (b); \ | ||
| 25 | __asm__ __volatile__( \ | ||
| 26 | "ldrb %0, [%1, %2]" \ | ||
| 27 | : "=r" (v) \ | ||
| 28 | : "r" (r), "Ir" (o)); \ | ||
| 29 | v; \ | ||
| 30 | }) | ||
| 31 | |||
| 32 | #define __arch_base_getl(b,o) \ | ||
| 33 | ({ \ | ||
| 34 | unsigned int v, r = (b); \ | ||
| 35 | __asm__ __volatile__( \ | ||
| 36 | "ldr %0, [%1, %2]" \ | ||
| 37 | : "=r" (v) \ | ||
| 38 | : "r" (r), "Ir" (o)); \ | ||
| 39 | v; \ | ||
| 40 | }) | ||
| 41 | |||
| 42 | #define __arch_base_putb(v,b,o) \ | ||
| 43 | ({ \ | ||
| 44 | unsigned int r = (b); \ | ||
| 45 | __asm__ __volatile__( \ | ||
| 46 | "strb %0, [%1, %2]" \ | ||
| 47 | : \ | ||
| 48 | : "r" (v), "r" (r), "Ir" (o)); \ | ||
| 49 | }) | ||
| 50 | |||
| 51 | #define __arch_base_putl(v,b,o) \ | ||
| 52 | ({ \ | ||
| 53 | unsigned int r = (b); \ | ||
| 54 | __asm__ __volatile__( \ | ||
| 55 | "str %0, [%1, %2]" \ | ||
| 56 | : \ | ||
| 57 | : "r" (v), "r" (r), "Ir" (o)); \ | ||
| 58 | }) | ||
| 59 | |||
| 60 | /* | ||
| 61 | * We use two different types of addressing - PC style addresses, and ARM | ||
| 62 | * addresses. PC style accesses the PC hardware with the normal PC IO | ||
| 63 | * addresses, eg 0x3f8 for serial#1. ARM addresses are 0x80000000+ | ||
| 64 | * and are translated to the start of IO. Note that all addresses are | ||
| 65 | * shifted left! | ||
| 66 | */ | ||
| 67 | #define __PORT_PCIO(x) (!((x) & 0x80000000)) | ||
| 68 | |||
| 69 | /* | ||
| 70 | * Dynamic IO functions - let the compiler | ||
| 71 | * optimize the expressions | ||
| 72 | */ | ||
| 73 | static inline void __outb (unsigned int value, unsigned int port) | ||
| 74 | { | ||
| 75 | unsigned long temp; | ||
| 76 | __asm__ __volatile__( | ||
| 77 | "tst %2, #0x80000000\n\t" | ||
| 78 | "mov %0, %4\n\t" | ||
| 79 | "addeq %0, %0, %3\n\t" | ||
| 80 | "strb %1, [%0, %2, lsl #2] @ outb" | ||
| 81 | : "=&r" (temp) | ||
| 82 | : "r" (value), "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE) | ||
| 83 | : "cc"); | ||
| 84 | } | ||
| 85 | |||
| 86 | static inline void __outw (unsigned int value, unsigned int port) | ||
| 87 | { | ||
| 88 | unsigned long temp; | ||
| 89 | __asm__ __volatile__( | ||
| 90 | "tst %2, #0x80000000\n\t" | ||
| 91 | "mov %0, %4\n\t" | ||
| 92 | "addeq %0, %0, %3\n\t" | ||
| 93 | "str %1, [%0, %2, lsl #2] @ outw" | ||
| 94 | : "=&r" (temp) | ||
| 95 | : "r" (value|value<<16), "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE) | ||
| 96 | : "cc"); | ||
| 97 | } | ||
| 98 | |||
| 99 | static inline void __outl (unsigned int value, unsigned int port) | ||
| 100 | { | ||
| 101 | unsigned long temp; | ||
| 102 | __asm__ __volatile__( | ||
| 103 | "tst %2, #0x80000000\n\t" | ||
| 104 | "mov %0, %4\n\t" | ||
| 105 | "addeq %0, %0, %3\n\t" | ||
| 106 | "str %1, [%0, %2, lsl #2] @ outl" | ||
| 107 | : "=&r" (temp) | ||
| 108 | : "r" (value), "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE) | ||
| 109 | : "cc"); | ||
| 110 | } | ||
| 111 | |||
| 112 | #define DECLARE_DYN_IN(sz,fnsuffix,instr) \ | ||
| 113 | static inline unsigned sz __in##fnsuffix (unsigned int port) \ | ||
| 114 | { \ | ||
| 115 | unsigned long temp, value; \ | ||
| 116 | __asm__ __volatile__( \ | ||
| 117 | "tst %2, #0x80000000\n\t" \ | ||
| 118 | "mov %0, %4\n\t" \ | ||
| 119 | "addeq %0, %0, %3\n\t" \ | ||
| 120 | "ldr" instr " %1, [%0, %2, lsl #2] @ in" #fnsuffix \ | ||
| 121 | : "=&r" (temp), "=r" (value) \ | ||
| 122 | : "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE) \ | ||
| 123 | : "cc"); \ | ||
| 124 | return (unsigned sz)value; \ | ||
| 125 | } | ||
| 126 | |||
| 127 | static inline unsigned int __ioaddr (unsigned int port) \ | ||
| 128 | { \ | ||
| 129 | if (__PORT_PCIO(port)) \ | ||
| 130 | return (unsigned int)(PCIO_BASE + (port << 2)); \ | ||
| 131 | else \ | ||
| 132 | return (unsigned int)(IO_BASE + (port << 2)); \ | ||
| 133 | } | ||
| 134 | |||
| 135 | #define DECLARE_IO(sz,fnsuffix,instr) \ | ||
| 136 | DECLARE_DYN_IN(sz,fnsuffix,instr) | ||
| 137 | |||
| 138 | DECLARE_IO(char,b,"b") | ||
| 139 | DECLARE_IO(short,w,"") | ||
| 140 | DECLARE_IO(int,l,"") | ||
| 141 | |||
| 142 | #undef DECLARE_IO | ||
| 143 | #undef DECLARE_DYN_IN | ||
| 144 | |||
| 145 | /* | ||
| 146 | * Constant address IO functions | ||
| 147 | * | ||
| 148 | * These have to be macros for the 'J' constraint to work - | ||
| 149 | * +/-4096 immediate operand. | ||
| 150 | */ | ||
| 151 | #define __outbc(value,port) \ | ||
| 152 | ({ \ | ||
| 153 | if (__PORT_PCIO((port))) \ | ||
| 154 | __asm__ __volatile__( \ | ||
| 155 | "strb %0, [%1, %2] @ outbc" \ | ||
| 156 | : : "r" (value), "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
| 157 | else \ | ||
| 158 | __asm__ __volatile__( \ | ||
| 159 | "strb %0, [%1, %2] @ outbc" \ | ||
| 160 | : : "r" (value), "r" (IO_BASE), "r" ((port) << 2)); \ | ||
| 161 | }) | ||
| 162 | |||
| 163 | #define __inbc(port) \ | ||
| 164 | ({ \ | ||
| 165 | unsigned char result; \ | ||
| 166 | if (__PORT_PCIO((port))) \ | ||
| 167 | __asm__ __volatile__( \ | ||
| 168 | "ldrb %0, [%1, %2] @ inbc" \ | ||
| 169 | : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
| 170 | else \ | ||
| 171 | __asm__ __volatile__( \ | ||
| 172 | "ldrb %0, [%1, %2] @ inbc" \ | ||
| 173 | : "=r" (result) : "r" (IO_BASE), "r" ((port) << 2)); \ | ||
| 174 | result; \ | ||
| 175 | }) | ||
| 176 | |||
| 177 | #define __outwc(value,port) \ | ||
| 178 | ({ \ | ||
| 179 | unsigned long v = value; \ | ||
| 180 | if (__PORT_PCIO((port))) \ | ||
| 181 | __asm__ __volatile__( \ | ||
| 182 | "str %0, [%1, %2] @ outwc" \ | ||
| 183 | : : "r" (v|v<<16), "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
| 184 | else \ | ||
| 185 | __asm__ __volatile__( \ | ||
| 186 | "str %0, [%1, %2] @ outwc" \ | ||
| 187 | : : "r" (v|v<<16), "r" (IO_BASE), "r" ((port) << 2)); \ | ||
| 188 | }) | ||
| 189 | |||
| 190 | #define __inwc(port) \ | ||
| 191 | ({ \ | ||
| 192 | unsigned short result; \ | ||
| 193 | if (__PORT_PCIO((port))) \ | ||
| 194 | __asm__ __volatile__( \ | ||
| 195 | "ldr %0, [%1, %2] @ inwc" \ | ||
| 196 | : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
| 197 | else \ | ||
| 198 | __asm__ __volatile__( \ | ||
| 199 | "ldr %0, [%1, %2] @ inwc" \ | ||
| 200 | : "=r" (result) : "r" (IO_BASE), "r" ((port) << 2)); \ | ||
| 201 | result & 0xffff; \ | ||
| 202 | }) | ||
| 203 | |||
| 204 | #define __outlc(value,port) \ | ||
| 205 | ({ \ | ||
| 206 | unsigned long v = value; \ | ||
| 207 | if (__PORT_PCIO((port))) \ | ||
| 208 | __asm__ __volatile__( \ | ||
| 209 | "str %0, [%1, %2] @ outlc" \ | ||
| 210 | : : "r" (v), "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
| 211 | else \ | ||
| 212 | __asm__ __volatile__( \ | ||
| 213 | "str %0, [%1, %2] @ outlc" \ | ||
| 214 | : : "r" (v), "r" (IO_BASE), "r" ((port) << 2)); \ | ||
| 215 | }) | ||
| 216 | |||
| 217 | #define __inlc(port) \ | ||
| 218 | ({ \ | ||
| 219 | unsigned long result; \ | ||
| 220 | if (__PORT_PCIO((port))) \ | ||
| 221 | __asm__ __volatile__( \ | ||
| 222 | "ldr %0, [%1, %2] @ inlc" \ | ||
| 223 | : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
| 224 | else \ | ||
| 225 | __asm__ __volatile__( \ | ||
| 226 | "ldr %0, [%1, %2] @ inlc" \ | ||
| 227 | : "=r" (result) : "r" (IO_BASE), "r" ((port) << 2)); \ | ||
| 228 | result; \ | ||
| 229 | }) | ||
| 230 | |||
| 231 | #define __ioaddrc(port) \ | ||
| 232 | (__PORT_PCIO((port)) ? PCIO_BASE + ((port) << 2) : IO_BASE + ((port) << 2)) | ||
| 233 | |||
| 234 | #define inb(p) (__builtin_constant_p((p)) ? __inbc(p) : __inb(p)) | ||
| 235 | #define inw(p) (__builtin_constant_p((p)) ? __inwc(p) : __inw(p)) | ||
| 236 | #define inl(p) (__builtin_constant_p((p)) ? __inlc(p) : __inl(p)) | ||
| 237 | #define outb(v,p) (__builtin_constant_p((p)) ? __outbc(v,p) : __outb(v,p)) | ||
| 238 | #define outw(v,p) (__builtin_constant_p((p)) ? __outwc(v,p) : __outw(v,p)) | ||
| 239 | #define outl(v,p) (__builtin_constant_p((p)) ? __outlc(v,p) : __outl(v,p)) | ||
| 240 | #define __ioaddr(p) (__builtin_constant_p((p)) ? __ioaddr(p) : __ioaddrc(p)) | ||
| 241 | /* the following macro is deprecated */ | ||
| 242 | #define ioaddr(port) __ioaddr((port)) | ||
| 243 | |||
| 244 | #define insb(p,d,l) __raw_readsb(__ioaddr(p),d,l) | ||
| 245 | #define insw(p,d,l) __raw_readsw(__ioaddr(p),d,l) | ||
| 246 | |||
| 247 | #define outsb(p,d,l) __raw_writesb(__ioaddr(p),d,l) | ||
| 248 | #define outsw(p,d,l) __raw_writesw(__ioaddr(p),d,l) | ||
| 249 | |||
| 250 | /* | ||
| 251 | * 1:1 mapping for ioremapped regions. | ||
| 252 | */ | ||
| 253 | #define __mem_pci(x) (x) | ||
| 254 | |||
| 255 | #endif | ||
diff --git a/arch/arm/mach-clps7500/include/mach/irq.h b/arch/arm/mach-clps7500/include/mach/irq.h deleted file mode 100644 index d02fcf28ee05..000000000000 --- a/arch/arm/mach-clps7500/include/mach/irq.h +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps7500/include/mach/irq.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1996 Russell King | ||
| 5 | * Copyright (C) 1999, 2001 Nexus Electronics Ltd. | ||
| 6 | * | ||
| 7 | * Changelog: | ||
| 8 | * 10-10-1996 RMK Brought up to date with arch-sa110eval | ||
| 9 | * 22-08-1998 RMK Restructured IRQ routines | ||
| 10 | * 11-08-1999 PJB Created ARM7500 version, derived from RiscPC code | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/io.h> | ||
| 14 | #include <asm/hardware/iomd.h> | ||
| 15 | |||
| 16 | static inline int fixup_irq(unsigned int irq) | ||
| 17 | { | ||
| 18 | if (irq == IRQ_ISA) { | ||
| 19 | int isabits = *((volatile unsigned int *)0xe002b700); | ||
| 20 | if (isabits == 0) { | ||
| 21 | printk("Spurious ISA IRQ!\n"); | ||
| 22 | return irq; | ||
| 23 | } | ||
| 24 | irq = IRQ_ISA_BASE; | ||
| 25 | while (!(isabits & 1)) { | ||
| 26 | irq++; | ||
| 27 | isabits >>= 1; | ||
| 28 | } | ||
| 29 | } | ||
| 30 | |||
| 31 | return irq; | ||
| 32 | } | ||
diff --git a/arch/arm/mach-clps7500/include/mach/irqs.h b/arch/arm/mach-clps7500/include/mach/irqs.h deleted file mode 100644 index bee66b487f59..000000000000 --- a/arch/arm/mach-clps7500/include/mach/irqs.h +++ /dev/null | |||
| @@ -1,66 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps7500/include/mach/irqs.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1999 Nexus Electronics Ltd | ||
| 5 | */ | ||
| 6 | |||
| 7 | #define IRQ_INT2 0 | ||
| 8 | #define IRQ_INT1 2 | ||
| 9 | #define IRQ_VSYNCPULSE 3 | ||
| 10 | #define IRQ_POWERON 4 | ||
| 11 | #define IRQ_TIMER0 5 | ||
| 12 | #define IRQ_TIMER1 6 | ||
| 13 | #define IRQ_FORCE 7 | ||
| 14 | #define IRQ_INT8 8 | ||
| 15 | #define IRQ_ISA 9 | ||
| 16 | #define IRQ_INT6 10 | ||
| 17 | #define IRQ_INT5 11 | ||
| 18 | #define IRQ_INT4 12 | ||
| 19 | #define IRQ_INT3 13 | ||
| 20 | #define IRQ_KEYBOARDTX 14 | ||
| 21 | #define IRQ_KEYBOARDRX 15 | ||
| 22 | |||
| 23 | #define IRQ_DMA0 16 | ||
| 24 | #define IRQ_DMA1 17 | ||
| 25 | #define IRQ_DMA2 18 | ||
| 26 | #define IRQ_DMA3 19 | ||
| 27 | #define IRQ_DMAS0 20 | ||
| 28 | #define IRQ_DMAS1 21 | ||
| 29 | |||
| 30 | #define IRQ_IOP0 24 | ||
| 31 | #define IRQ_IOP1 25 | ||
| 32 | #define IRQ_IOP2 26 | ||
| 33 | #define IRQ_IOP3 27 | ||
| 34 | #define IRQ_IOP4 28 | ||
| 35 | #define IRQ_IOP5 29 | ||
| 36 | #define IRQ_IOP6 30 | ||
| 37 | #define IRQ_IOP7 31 | ||
| 38 | |||
| 39 | #define IRQ_MOUSERX 40 | ||
| 40 | #define IRQ_MOUSETX 41 | ||
| 41 | #define IRQ_ADC 42 | ||
| 42 | #define IRQ_EVENT1 43 | ||
| 43 | #define IRQ_EVENT2 44 | ||
| 44 | |||
| 45 | #define IRQ_ISA_BASE 48 | ||
| 46 | #define IRQ_ISA_3 48 | ||
| 47 | #define IRQ_ISA_4 49 | ||
| 48 | #define IRQ_ISA_5 50 | ||
| 49 | #define IRQ_ISA_7 51 | ||
| 50 | #define IRQ_ISA_9 52 | ||
| 51 | #define IRQ_ISA_10 53 | ||
| 52 | #define IRQ_ISA_11 54 | ||
| 53 | #define IRQ_ISA_14 55 | ||
| 54 | |||
| 55 | #define FIQ_INT9 0 | ||
| 56 | #define FIQ_INT5 1 | ||
| 57 | #define FIQ_INT6 4 | ||
| 58 | #define FIQ_INT8 6 | ||
| 59 | #define FIQ_FORCE 7 | ||
| 60 | |||
| 61 | /* | ||
| 62 | * This is the offset of the FIQ "IRQ" numbers | ||
| 63 | */ | ||
| 64 | #define FIQ_START 64 | ||
| 65 | |||
| 66 | #define IRQ_TIMER IRQ_TIMER0 | ||
diff --git a/arch/arm/mach-clps7500/include/mach/memory.h b/arch/arm/mach-clps7500/include/mach/memory.h deleted file mode 100644 index 87b32db470c8..000000000000 --- a/arch/arm/mach-clps7500/include/mach/memory.h +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps7500/include/mach/memory.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 1996,1997,1998 Russell King. | ||
| 5 | * | ||
| 6 | * Changelog: | ||
| 7 | * 20-Oct-1996 RMK Created | ||
| 8 | * 31-Dec-1997 RMK Fixed definitions to reduce warnings | ||
| 9 | * 11-Jan-1998 RMK Uninlined to reduce hits on cache | ||
| 10 | * 08-Feb-1998 RMK Added __virt_to_bus and __bus_to_virt | ||
| 11 | * 21-Mar-1999 RMK Renamed to memory.h | ||
| 12 | * RMK Added TASK_SIZE and PAGE_OFFSET | ||
| 13 | */ | ||
| 14 | #ifndef __ASM_ARCH_MEMORY_H | ||
| 15 | #define __ASM_ARCH_MEMORY_H | ||
| 16 | |||
| 17 | /* | ||
| 18 | * Physical DRAM offset. | ||
| 19 | */ | ||
| 20 | #define PHYS_OFFSET UL(0x10000000) | ||
| 21 | |||
| 22 | /* | ||
| 23 | * These are exactly the same on the RiscPC as the | ||
| 24 | * physical memory view. | ||
| 25 | */ | ||
| 26 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 27 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 28 | |||
| 29 | /* | ||
| 30 | * Cache flushing area - ROM | ||
| 31 | */ | ||
| 32 | #define FLUSH_BASE_PHYS 0x00000000 | ||
| 33 | #define FLUSH_BASE 0xdf000000 | ||
| 34 | |||
| 35 | /* | ||
| 36 | * Sparsemem support. Each section is a maximum of 64MB. The sections | ||
| 37 | * are offset by 128MB and can cover 128MB, so that gives us a maximum | ||
| 38 | * of 29 physmem bits. | ||
| 39 | */ | ||
| 40 | #define MAX_PHYSMEM_BITS 29 | ||
| 41 | #define SECTION_SIZE_BITS 26 | ||
| 42 | |||
| 43 | #endif | ||
diff --git a/arch/arm/mach-clps7500/include/mach/system.h b/arch/arm/mach-clps7500/include/mach/system.h deleted file mode 100644 index 6d325fbe8b08..000000000000 --- a/arch/arm/mach-clps7500/include/mach/system.h +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps7500/include/mach/system.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 1999 Nexus Electronics Ltd. | ||
| 5 | */ | ||
| 6 | #ifndef __ASM_ARCH_SYSTEM_H | ||
| 7 | #define __ASM_ARCH_SYSTEM_H | ||
| 8 | |||
| 9 | #include <linux/io.h> | ||
| 10 | #include <asm/hardware/iomd.h> | ||
| 11 | |||
| 12 | static inline void arch_idle(void) | ||
| 13 | { | ||
| 14 | iomd_writeb(0, IOMD_SUSMODE); | ||
| 15 | } | ||
| 16 | |||
| 17 | #define arch_reset(mode) \ | ||
| 18 | do { \ | ||
| 19 | iomd_writeb(0, IOMD_ROMCR0); \ | ||
| 20 | cpu_reset(0); \ | ||
| 21 | } while (0) | ||
| 22 | |||
| 23 | #endif | ||
diff --git a/arch/arm/mach-clps7500/include/mach/timex.h b/arch/arm/mach-clps7500/include/mach/timex.h deleted file mode 100644 index dfaa9b425757..000000000000 --- a/arch/arm/mach-clps7500/include/mach/timex.h +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps7500/include/mach/timex.h | ||
| 3 | * | ||
| 4 | * CL7500 architecture timex specifications | ||
| 5 | * | ||
| 6 | * Copyright (C) 1999 Nexus Electronics Ltd | ||
| 7 | */ | ||
| 8 | |||
| 9 | /* | ||
| 10 | * On the ARM7500, the clock ticks at 2MHz. | ||
| 11 | */ | ||
| 12 | #define CLOCK_TICK_RATE 2000000 | ||
| 13 | |||
diff --git a/arch/arm/mach-clps7500/include/mach/uncompress.h b/arch/arm/mach-clps7500/include/mach/uncompress.h deleted file mode 100644 index d7d0af4b49fc..000000000000 --- a/arch/arm/mach-clps7500/include/mach/uncompress.h +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps7500/include/mach/uncompress.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1999, 2000 Nexus Electronics Ltd. | ||
| 5 | */ | ||
| 6 | #define BASE 0x03010000 | ||
| 7 | #define SERBASE (BASE + (0x2f8 << 2)) | ||
| 8 | |||
| 9 | static inline void putc(char c) | ||
| 10 | { | ||
| 11 | while (!(*((volatile unsigned int *)(SERBASE + 0x14)) & 0x20)) | ||
| 12 | barrier(); | ||
| 13 | |||
| 14 | *((volatile unsigned int *)(SERBASE)) = c; | ||
| 15 | } | ||
| 16 | |||
| 17 | static inline void flush(void) | ||
| 18 | { | ||
| 19 | } | ||
| 20 | |||
| 21 | static __inline__ void arch_decomp_setup(void) | ||
| 22 | { | ||
| 23 | int baud = 3686400 / (9600 * 32); | ||
| 24 | |||
| 25 | *((volatile unsigned int *)(SERBASE + 0xC)) = 0x80; | ||
| 26 | *((volatile unsigned int *)(SERBASE + 0x0)) = baud & 0xff; | ||
| 27 | *((volatile unsigned int *)(SERBASE + 0x4)) = (baud & 0xff00) >> 8; | ||
| 28 | *((volatile unsigned int *)(SERBASE + 0xC)) = 3; /* 8 bits */ | ||
| 29 | *((volatile unsigned int *)(SERBASE + 0x10)) = 3; /* DTR, RTS */ | ||
| 30 | } | ||
| 31 | |||
| 32 | /* | ||
| 33 | * nothing to do | ||
| 34 | */ | ||
| 35 | #define arch_decomp_wdog() | ||
diff --git a/arch/arm/mach-clps7500/include/mach/vmalloc.h b/arch/arm/mach-clps7500/include/mach/vmalloc.h deleted file mode 100644 index 8fc5406d1b6d..000000000000 --- a/arch/arm/mach-clps7500/include/mach/vmalloc.h +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-clps7500/include/mach/vmalloc.h | ||
| 3 | */ | ||
| 4 | #define VMALLOC_END (PAGE_OFFSET + 0x1c000000) | ||
diff --git a/arch/arm/mach-davinci/include/mach/dma.h b/arch/arm/mach-davinci/include/mach/dma.h deleted file mode 100644 index 8e2f2d0ba667..000000000000 --- a/arch/arm/mach-davinci/include/mach/dma.h +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * DaVinci DMA definitions | ||
| 3 | * | ||
| 4 | * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com> | ||
| 5 | * | ||
| 6 | * 2007 (c) MontaVista Software, Inc. This file is licensed under | ||
| 7 | * the terms of the GNU General Public License version 2. This program | ||
| 8 | * is licensed "as is" without any warranty of any kind, whether express | ||
| 9 | * or implied. | ||
| 10 | */ | ||
| 11 | #ifndef __ASM_ARCH_DMA_H | ||
| 12 | #define __ASM_ARCH_DMA_H | ||
| 13 | |||
| 14 | #define MAX_DMA_ADDRESS 0xffffffff | ||
| 15 | |||
| 16 | #endif /* __ASM_ARCH_DMA_H */ | ||
diff --git a/arch/arm/mach-davinci/include/mach/io.h b/arch/arm/mach-davinci/include/mach/io.h index b78ee9140496..a48795fd2417 100644 --- a/arch/arm/mach-davinci/include/mach/io.h +++ b/arch/arm/mach-davinci/include/mach/io.h | |||
| @@ -29,8 +29,7 @@ | |||
| 29 | * We don't actually have real ISA nor PCI buses, but there is so many | 29 | * We don't actually have real ISA nor PCI buses, but there is so many |
| 30 | * drivers out there that might just work if we fake them... | 30 | * drivers out there that might just work if we fake them... |
| 31 | */ | 31 | */ |
| 32 | #define PCIO_BASE 0 | 32 | #define __io(a) __typesafe_io(a) |
| 33 | #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) | ||
| 34 | #define __mem_pci(a) (a) | 33 | #define __mem_pci(a) (a) |
| 35 | #define __mem_isa(a) (a) | 34 | #define __mem_isa(a) (a) |
| 36 | 35 | ||
diff --git a/arch/arm/mach-davinci/include/mach/memory.h b/arch/arm/mach-davinci/include/mach/memory.h index dd1625c23cf4..86c25c7f3ce3 100644 --- a/arch/arm/mach-davinci/include/mach/memory.h +++ b/arch/arm/mach-davinci/include/mach/memory.h | |||
| @@ -52,13 +52,8 @@ __arch_adjust_zones(int node, unsigned long *size, unsigned long *holes) | |||
| 52 | if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(node, zone_size, holes) | 52 | if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(node, zone_size, holes) |
| 53 | 53 | ||
| 54 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + (128<<20) - 1) | 54 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + (128<<20) - 1) |
| 55 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + (128<<20)) | ||
| 55 | 56 | ||
| 56 | #endif | 57 | #endif |
| 57 | 58 | ||
| 58 | /* | ||
| 59 | * Bus address is physical address | ||
| 60 | */ | ||
| 61 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 62 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 63 | |||
| 64 | #endif /* __ASM_ARCH_MEMORY_H */ | 59 | #endif /* __ASM_ARCH_MEMORY_H */ |
diff --git a/arch/arm/mach-davinci/include/mach/vmalloc.h b/arch/arm/mach-davinci/include/mach/vmalloc.h index b98bd9e92fd6..ad51625b6609 100644 --- a/arch/arm/mach-davinci/include/mach/vmalloc.h +++ b/arch/arm/mach-davinci/include/mach/vmalloc.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * is licensed "as is" without any warranty of any kind, whether express | 8 | * is licensed "as is" without any warranty of any kind, whether express |
| 9 | * or implied. | 9 | * or implied. |
| 10 | */ | 10 | */ |
| 11 | #include <asm/memory.h> | ||
| 12 | #include <mach/io.h> | 11 | #include <mach/io.h> |
| 13 | 12 | ||
| 14 | /* Allow vmalloc range until the IO virtual range minus a 2M "hole" */ | 13 | /* Allow vmalloc range until the IO virtual range minus a 2M "hole" */ |
diff --git a/arch/arm/mach-ebsa110/include/mach/dma.h b/arch/arm/mach-ebsa110/include/mach/dma.h deleted file mode 100644 index 780a04c8bbe9..000000000000 --- a/arch/arm/mach-ebsa110/include/mach/dma.h +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ebsa110/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1997,1998 Russell King | ||
| 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 | * EBSA110 DMA definitions | ||
| 11 | */ | ||
diff --git a/arch/arm/mach-ebsa110/include/mach/memory.h b/arch/arm/mach-ebsa110/include/mach/memory.h index eea4b75b657b..0ca66d080c69 100644 --- a/arch/arm/mach-ebsa110/include/mach/memory.h +++ b/arch/arm/mach-ebsa110/include/mach/memory.h | |||
| @@ -22,13 +22,6 @@ | |||
| 22 | #define PHYS_OFFSET UL(0x00000000) | 22 | #define PHYS_OFFSET UL(0x00000000) |
| 23 | 23 | ||
| 24 | /* | 24 | /* |
| 25 | * We keep this 1:1 so that we don't interfere | ||
| 26 | * with the PCMCIA memory regions | ||
| 27 | */ | ||
| 28 | #define __virt_to_bus(x) (x) | ||
| 29 | #define __bus_to_virt(x) (x) | ||
| 30 | |||
| 31 | /* | ||
| 32 | * Cache flushing area - SRAM | 25 | * Cache flushing area - SRAM |
| 33 | */ | 26 | */ |
| 34 | #define FLUSH_BASE_PHYS 0x40000000 | 27 | #define FLUSH_BASE_PHYS 0x40000000 |
diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig index 5a1b8c05c958..56bddcef6905 100644 --- a/arch/arm/mach-ep93xx/Kconfig +++ b/arch/arm/mach-ep93xx/Kconfig | |||
| @@ -33,6 +33,12 @@ config MACH_EDB9307 | |||
| 33 | Say 'Y' here if you want your kernel to support the Cirrus | 33 | Say 'Y' here if you want your kernel to support the Cirrus |
| 34 | Logic EDB9307 Evaluation Board. | 34 | Logic EDB9307 Evaluation Board. |
| 35 | 35 | ||
| 36 | config MACH_EDB9307A | ||
| 37 | bool "Support Cirrus Logic EDB9307A" | ||
| 38 | help | ||
| 39 | Say 'Y' here if you want your kernel to support the Cirrus | ||
| 40 | Logic EDB9307A Evaluation Board. | ||
| 41 | |||
| 36 | config MACH_EDB9312 | 42 | config MACH_EDB9312 |
| 37 | bool "Support Cirrus Logic EDB9312" | 43 | bool "Support Cirrus Logic EDB9312" |
| 38 | help | 44 | help |
diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile index c1252ca9648e..944e42d51646 100644 --- a/arch/arm/mach-ep93xx/Makefile +++ b/arch/arm/mach-ep93xx/Makefile | |||
| @@ -10,6 +10,7 @@ obj-$(CONFIG_MACH_ADSSPHERE) += adssphere.o | |||
| 10 | obj-$(CONFIG_MACH_EDB9302) += edb9302.o | 10 | obj-$(CONFIG_MACH_EDB9302) += edb9302.o |
| 11 | obj-$(CONFIG_MACH_EDB9302A) += edb9302a.o | 11 | obj-$(CONFIG_MACH_EDB9302A) += edb9302a.o |
| 12 | obj-$(CONFIG_MACH_EDB9307) += edb9307.o | 12 | obj-$(CONFIG_MACH_EDB9307) += edb9307.o |
| 13 | obj-$(CONFIG_MACH_EDB9307A) += edb9307a.o | ||
| 13 | obj-$(CONFIG_MACH_EDB9312) += edb9312.o | 14 | obj-$(CONFIG_MACH_EDB9312) += edb9312.o |
| 14 | obj-$(CONFIG_MACH_EDB9315) += edb9315.o | 15 | obj-$(CONFIG_MACH_EDB9315) += edb9315.o |
| 15 | obj-$(CONFIG_MACH_EDB9315A) += edb9315a.o | 16 | obj-$(CONFIG_MACH_EDB9315A) += edb9315a.o |
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index 561db73ec1ae..3fbd9b0fbe24 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/mtd/physmap.h> | 19 | #include <linux/mtd/physmap.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/i2c.h> | ||
| 22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 23 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
| 24 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| @@ -28,8 +29,8 @@ static struct physmap_flash_data adssphere_flash_data = { | |||
| 28 | }; | 29 | }; |
| 29 | 30 | ||
| 30 | static struct resource adssphere_flash_resource = { | 31 | static struct resource adssphere_flash_resource = { |
| 31 | .start = 0x60000000, | 32 | .start = EP93XX_CS6_PHYS_BASE, |
| 32 | .end = 0x61ffffff, | 33 | .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1, |
| 33 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| @@ -59,7 +60,7 @@ MACHINE_START(ADSSPHERE, "ADS Sphere board") | |||
| 59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 60 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
| 60 | .phys_io = EP93XX_APB_PHYS_BASE, | 61 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 62 | .boot_params = 0x00000100, | 63 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 63 | .map_io = ep93xx_map_io, | 64 | .map_io = ep93xx_map_io, |
| 64 | .init_irq = ep93xx_init_irq, | 65 | .init_irq = ep93xx_init_irq, |
| 65 | .timer = &ep93xx_timer, | 66 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index 8c9f2491dccc..96049283a10a 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c | |||
| @@ -16,11 +16,12 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | |||
| 20 | #include <asm/clkdev.h> | ||
| 19 | #include <asm/div64.h> | 21 | #include <asm/div64.h> |
| 20 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
| 21 | 23 | ||
| 22 | struct clk { | 24 | struct clk { |
| 23 | char *name; | ||
| 24 | unsigned long rate; | 25 | unsigned long rate; |
| 25 | int users; | 26 | int users; |
| 26 | u32 enable_reg; | 27 | u32 enable_reg; |
| @@ -28,53 +29,33 @@ struct clk { | |||
| 28 | }; | 29 | }; |
| 29 | 30 | ||
| 30 | static struct clk clk_uart = { | 31 | static struct clk clk_uart = { |
| 31 | .name = "UARTCLK", | ||
| 32 | .rate = 14745600, | 32 | .rate = 14745600, |
| 33 | }; | 33 | }; |
| 34 | static struct clk clk_pll1 = { | 34 | static struct clk clk_pll1; |
| 35 | .name = "pll1", | 35 | static struct clk clk_f; |
| 36 | }; | 36 | static struct clk clk_h; |
| 37 | static struct clk clk_f = { | 37 | static struct clk clk_p; |
| 38 | .name = "fclk", | 38 | static struct clk clk_pll2; |
| 39 | }; | ||
| 40 | static struct clk clk_h = { | ||
| 41 | .name = "hclk", | ||
| 42 | }; | ||
| 43 | static struct clk clk_p = { | ||
| 44 | .name = "pclk", | ||
| 45 | }; | ||
| 46 | static struct clk clk_pll2 = { | ||
| 47 | .name = "pll2", | ||
| 48 | }; | ||
| 49 | static struct clk clk_usb_host = { | 39 | static struct clk clk_usb_host = { |
| 50 | .name = "usb_host", | ||
| 51 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, | 40 | .enable_reg = EP93XX_SYSCON_CLOCK_CONTROL, |
| 52 | .enable_mask = EP93XX_SYSCON_CLOCK_USH_EN, | 41 | .enable_mask = EP93XX_SYSCON_CLOCK_USH_EN, |
| 53 | }; | 42 | }; |
| 54 | 43 | ||
| 55 | 44 | #define INIT_CK(dev,con,ck) \ | |
| 56 | static struct clk *clocks[] = { | 45 | { .dev_id = dev, .con_id = con, .clk = ck } |
| 57 | &clk_uart, | 46 | |
| 58 | &clk_pll1, | 47 | static struct clk_lookup clocks[] = { |
| 59 | &clk_f, | 48 | INIT_CK("apb:uart1", NULL, &clk_uart), |
| 60 | &clk_h, | 49 | INIT_CK("apb:uart2", NULL, &clk_uart), |
| 61 | &clk_p, | 50 | INIT_CK("apb:uart3", NULL, &clk_uart), |
| 62 | &clk_pll2, | 51 | INIT_CK(NULL, "pll1", &clk_pll1), |
| 63 | &clk_usb_host, | 52 | INIT_CK(NULL, "fclk", &clk_f), |
| 53 | INIT_CK(NULL, "hclk", &clk_h), | ||
| 54 | INIT_CK(NULL, "pclk", &clk_p), | ||
| 55 | INIT_CK(NULL, "pll2", &clk_pll2), | ||
| 56 | INIT_CK(NULL, "usb_host", &clk_usb_host), | ||
| 64 | }; | 57 | }; |
| 65 | 58 | ||
| 66 | struct clk *clk_get(struct device *dev, const char *id) | ||
| 67 | { | ||
| 68 | int i; | ||
| 69 | |||
| 70 | for (i = 0; i < ARRAY_SIZE(clocks); i++) { | ||
| 71 | if (!strcmp(clocks[i]->name, id)) | ||
| 72 | return clocks[i]; | ||
| 73 | } | ||
| 74 | |||
| 75 | return ERR_PTR(-ENOENT); | ||
| 76 | } | ||
| 77 | EXPORT_SYMBOL(clk_get); | ||
| 78 | 59 | ||
| 79 | int clk_enable(struct clk *clk) | 60 | int clk_enable(struct clk *clk) |
| 80 | { | 61 | { |
| @@ -106,12 +87,6 @@ unsigned long clk_get_rate(struct clk *clk) | |||
| 106 | } | 87 | } |
| 107 | EXPORT_SYMBOL(clk_get_rate); | 88 | EXPORT_SYMBOL(clk_get_rate); |
| 108 | 89 | ||
| 109 | void clk_put(struct clk *clk) | ||
| 110 | { | ||
| 111 | } | ||
| 112 | EXPORT_SYMBOL(clk_put); | ||
| 113 | |||
| 114 | |||
| 115 | 90 | ||
| 116 | static char fclk_divisors[] = { 1, 2, 4, 8, 16, 1, 1, 1 }; | 91 | static char fclk_divisors[] = { 1, 2, 4, 8, 16, 1, 1, 1 }; |
| 117 | static char hclk_divisors[] = { 1, 2, 4, 5, 6, 8, 16, 32 }; | 92 | static char hclk_divisors[] = { 1, 2, 4, 5, 6, 8, 16, 32 }; |
| @@ -138,6 +113,7 @@ static unsigned long calc_pll_rate(u32 config_word) | |||
| 138 | static int __init ep93xx_clock_init(void) | 113 | static int __init ep93xx_clock_init(void) |
| 139 | { | 114 | { |
| 140 | u32 value; | 115 | u32 value; |
| 116 | int i; | ||
| 141 | 117 | ||
| 142 | value = __raw_readl(EP93XX_SYSCON_CLOCK_SET1); | 118 | value = __raw_readl(EP93XX_SYSCON_CLOCK_SET1); |
| 143 | if (!(value & 0x00800000)) { /* PLL1 bypassed? */ | 119 | if (!(value & 0x00800000)) { /* PLL1 bypassed? */ |
| @@ -165,6 +141,8 @@ static int __init ep93xx_clock_init(void) | |||
| 165 | clk_f.rate / 1000000, clk_h.rate / 1000000, | 141 | clk_f.rate / 1000000, clk_h.rate / 1000000, |
| 166 | clk_p.rate / 1000000); | 142 | clk_p.rate / 1000000); |
| 167 | 143 | ||
| 144 | for (i = 0; i < ARRAY_SIZE(clocks); i++) | ||
| 145 | clkdev_add(&clocks[i]); | ||
| 168 | return 0; | 146 | return 0; |
| 169 | } | 147 | } |
| 170 | arch_initcall(ep93xx_clock_init); | 148 | arch_initcall(ep93xx_clock_init); |
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 48345fb34613..4781f323703b 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
| @@ -34,6 +34,8 @@ | |||
| 34 | #include <linux/amba/bus.h> | 34 | #include <linux/amba/bus.h> |
| 35 | #include <linux/amba/serial.h> | 35 | #include <linux/amba/serial.h> |
| 36 | #include <linux/io.h> | 36 | #include <linux/io.h> |
| 37 | #include <linux/i2c.h> | ||
| 38 | #include <linux/i2c-gpio.h> | ||
| 37 | 39 | ||
| 38 | #include <asm/types.h> | 40 | #include <asm/types.h> |
| 39 | #include <asm/setup.h> | 41 | #include <asm/setup.h> |
| @@ -153,12 +155,14 @@ static unsigned char gpio_int_unmasked[3]; | |||
| 153 | static unsigned char gpio_int_enabled[3]; | 155 | static unsigned char gpio_int_enabled[3]; |
| 154 | static unsigned char gpio_int_type1[3]; | 156 | static unsigned char gpio_int_type1[3]; |
| 155 | static unsigned char gpio_int_type2[3]; | 157 | static unsigned char gpio_int_type2[3]; |
| 158 | static unsigned char gpio_int_debouce[3]; | ||
| 156 | 159 | ||
| 157 | /* Port ordering is: A B F */ | 160 | /* Port ordering is: A B F */ |
| 158 | static const u8 int_type1_register_offset[3] = { 0x90, 0xac, 0x4c }; | 161 | static const u8 int_type1_register_offset[3] = { 0x90, 0xac, 0x4c }; |
| 159 | static const u8 int_type2_register_offset[3] = { 0x94, 0xb0, 0x50 }; | 162 | static const u8 int_type2_register_offset[3] = { 0x94, 0xb0, 0x50 }; |
| 160 | static const u8 eoi_register_offset[3] = { 0x98, 0xb4, 0x54 }; | 163 | static const u8 eoi_register_offset[3] = { 0x98, 0xb4, 0x54 }; |
| 161 | static const u8 int_en_register_offset[3] = { 0x9c, 0xb8, 0x58 }; | 164 | static const u8 int_en_register_offset[3] = { 0x9c, 0xb8, 0x58 }; |
| 165 | static const u8 int_debounce_register_offset[3] = { 0xa8, 0xc4, 0x64 }; | ||
| 162 | 166 | ||
| 163 | void ep93xx_gpio_update_int_params(unsigned port) | 167 | void ep93xx_gpio_update_int_params(unsigned port) |
| 164 | { | 168 | { |
| @@ -181,6 +185,22 @@ void ep93xx_gpio_int_mask(unsigned line) | |||
| 181 | gpio_int_unmasked[line >> 3] &= ~(1 << (line & 7)); | 185 | gpio_int_unmasked[line >> 3] &= ~(1 << (line & 7)); |
| 182 | } | 186 | } |
| 183 | 187 | ||
| 188 | void ep93xx_gpio_int_debounce(unsigned int irq, int enable) | ||
| 189 | { | ||
| 190 | int line = irq_to_gpio(irq); | ||
| 191 | int port = line >> 3; | ||
| 192 | int port_mask = 1 << (line & 7); | ||
| 193 | |||
| 194 | if (enable) | ||
| 195 | gpio_int_debouce[port] |= port_mask; | ||
| 196 | else | ||
| 197 | gpio_int_debouce[port] &= ~port_mask; | ||
| 198 | |||
| 199 | __raw_writeb(gpio_int_debouce[port], | ||
| 200 | EP93XX_GPIO_REG(int_debounce_register_offset[port])); | ||
| 201 | } | ||
| 202 | EXPORT_SYMBOL(ep93xx_gpio_int_debounce); | ||
| 203 | |||
| 184 | /************************************************************************* | 204 | /************************************************************************* |
| 185 | * EP93xx IRQ handling | 205 | * EP93xx IRQ handling |
| 186 | *************************************************************************/ | 206 | *************************************************************************/ |
| @@ -497,6 +517,26 @@ void __init ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr) | |||
| 497 | platform_device_register(&ep93xx_eth_device); | 517 | platform_device_register(&ep93xx_eth_device); |
| 498 | } | 518 | } |
| 499 | 519 | ||
| 520 | static struct i2c_gpio_platform_data ep93xx_i2c_data = { | ||
| 521 | .sda_pin = EP93XX_GPIO_LINE_EEDAT, | ||
| 522 | .sda_is_open_drain = 0, | ||
| 523 | .scl_pin = EP93XX_GPIO_LINE_EECLK, | ||
| 524 | .scl_is_open_drain = 0, | ||
| 525 | .udelay = 2, | ||
| 526 | }; | ||
| 527 | |||
| 528 | static struct platform_device ep93xx_i2c_device = { | ||
| 529 | .name = "i2c-gpio", | ||
| 530 | .id = 0, | ||
| 531 | .dev.platform_data = &ep93xx_i2c_data, | ||
| 532 | }; | ||
| 533 | |||
| 534 | void __init ep93xx_register_i2c(struct i2c_board_info *devices, int num) | ||
| 535 | { | ||
| 536 | i2c_register_board_info(0, devices, num); | ||
| 537 | platform_device_register(&ep93xx_i2c_device); | ||
| 538 | } | ||
| 539 | |||
| 500 | extern void ep93xx_gpio_init(void); | 540 | extern void ep93xx_gpio_init(void); |
| 501 | 541 | ||
| 502 | void __init ep93xx_init_devices(void) | 542 | void __init ep93xx_init_devices(void) |
diff --git a/arch/arm/mach-ep93xx/edb9302.c b/arch/arm/mach-ep93xx/edb9302.c index e4add5bdccfd..8bf8d7c78f1a 100644 --- a/arch/arm/mach-ep93xx/edb9302.c +++ b/arch/arm/mach-ep93xx/edb9302.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/mtd/physmap.h> | 19 | #include <linux/mtd/physmap.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/i2c.h> | ||
| 22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 23 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
| 24 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| @@ -28,8 +29,8 @@ static struct physmap_flash_data edb9302_flash_data = { | |||
| 28 | }; | 29 | }; |
| 29 | 30 | ||
| 30 | static struct resource edb9302_flash_resource = { | 31 | static struct resource edb9302_flash_resource = { |
| 31 | .start = 0x60000000, | 32 | .start = EP93XX_CS6_PHYS_BASE, |
| 32 | .end = 0x60ffffff, | 33 | .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1, |
| 33 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| @@ -59,7 +60,7 @@ MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board") | |||
| 59 | /* Maintainer: George Kashperko <george@chas.com.ua> */ | 60 | /* Maintainer: George Kashperko <george@chas.com.ua> */ |
| 60 | .phys_io = EP93XX_APB_PHYS_BASE, | 61 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 62 | .boot_params = 0x00000100, | 63 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 63 | .map_io = ep93xx_map_io, | 64 | .map_io = ep93xx_map_io, |
| 64 | .init_irq = ep93xx_init_irq, | 65 | .init_irq = ep93xx_init_irq, |
| 65 | .timer = &ep93xx_timer, | 66 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9302a.c b/arch/arm/mach-ep93xx/edb9302a.c index 02c4405afed7..a352c57c7b46 100644 --- a/arch/arm/mach-ep93xx/edb9302a.c +++ b/arch/arm/mach-ep93xx/edb9302a.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/mtd/physmap.h> | 19 | #include <linux/mtd/physmap.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/i2c.h> | ||
| 22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 23 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
| 24 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| @@ -28,8 +29,8 @@ static struct physmap_flash_data edb9302a_flash_data = { | |||
| 28 | }; | 29 | }; |
| 29 | 30 | ||
| 30 | static struct resource edb9302a_flash_resource = { | 31 | static struct resource edb9302a_flash_resource = { |
| 31 | .start = 0x60000000, | 32 | .start = EP93XX_CS6_PHYS_BASE, |
| 32 | .end = 0x60ffffff, | 33 | .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1, |
| 33 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| @@ -44,7 +45,7 @@ static struct platform_device edb9302a_flash = { | |||
| 44 | }; | 45 | }; |
| 45 | 46 | ||
| 46 | static struct ep93xx_eth_data edb9302a_eth_data = { | 47 | static struct ep93xx_eth_data edb9302a_eth_data = { |
| 47 | .phy_id = 1, | 48 | .phy_id = 1, |
| 48 | }; | 49 | }; |
| 49 | 50 | ||
| 50 | static void __init edb9302a_init_machine(void) | 51 | static void __init edb9302a_init_machine(void) |
| @@ -59,7 +60,7 @@ MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board") | |||
| 59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 60 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
| 60 | .phys_io = EP93XX_APB_PHYS_BASE, | 61 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 62 | .boot_params = 0xc0000100, | 63 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, |
| 63 | .map_io = ep93xx_map_io, | 64 | .map_io = ep93xx_map_io, |
| 64 | .init_irq = ep93xx_init_irq, | 65 | .init_irq = ep93xx_init_irq, |
| 65 | .timer = &ep93xx_timer, | 66 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9307.c b/arch/arm/mach-ep93xx/edb9307.c index 040edbd2ea05..5ab22f63a4eb 100644 --- a/arch/arm/mach-ep93xx/edb9307.c +++ b/arch/arm/mach-ep93xx/edb9307.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/mtd/physmap.h> | 19 | #include <linux/mtd/physmap.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/i2c.h> | ||
| 22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 23 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
| 24 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| @@ -28,8 +29,8 @@ static struct physmap_flash_data edb9307_flash_data = { | |||
| 28 | }; | 29 | }; |
| 29 | 30 | ||
| 30 | static struct resource edb9307_flash_resource = { | 31 | static struct resource edb9307_flash_resource = { |
| 31 | .start = 0x60000000, | 32 | .start = EP93XX_CS6_PHYS_BASE, |
| 32 | .end = 0x61ffffff, | 33 | .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1, |
| 33 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| @@ -44,7 +45,7 @@ static struct platform_device edb9307_flash = { | |||
| 44 | }; | 45 | }; |
| 45 | 46 | ||
| 46 | static struct ep93xx_eth_data edb9307_eth_data = { | 47 | static struct ep93xx_eth_data edb9307_eth_data = { |
| 47 | .phy_id = 1, | 48 | .phy_id = 1, |
| 48 | }; | 49 | }; |
| 49 | 50 | ||
| 50 | static void __init edb9307_init_machine(void) | 51 | static void __init edb9307_init_machine(void) |
| @@ -59,7 +60,7 @@ MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board") | |||
| 59 | /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */ | 60 | /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */ |
| 60 | .phys_io = EP93XX_APB_PHYS_BASE, | 61 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 62 | .boot_params = 0x00000100, | 63 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 63 | .map_io = ep93xx_map_io, | 64 | .map_io = ep93xx_map_io, |
| 64 | .init_irq = ep93xx_init_irq, | 65 | .init_irq = ep93xx_init_irq, |
| 65 | .timer = &ep93xx_timer, | 66 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9307a.c b/arch/arm/mach-ep93xx/edb9307a.c new file mode 100644 index 000000000000..5b5c22b681be --- /dev/null +++ b/arch/arm/mach-ep93xx/edb9307a.c | |||
| @@ -0,0 +1,68 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ep93xx/edb9307a.c | ||
| 3 | * Cirrus Logic EDB9307A support. | ||
| 4 | * | ||
| 5 | * Copyright (C) 2008 H Hartley Sweeten <hsweeten@visionengravers.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or (at | ||
| 10 | * your option) any later version. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/kernel.h> | ||
| 14 | #include <linux/init.h> | ||
| 15 | #include <linux/mm.h> | ||
| 16 | #include <linux/sched.h> | ||
| 17 | #include <linux/interrupt.h> | ||
| 18 | #include <linux/ioport.h> | ||
| 19 | #include <linux/mtd/physmap.h> | ||
| 20 | #include <linux/platform_device.h> | ||
| 21 | #include <linux/io.h> | ||
| 22 | #include <linux/i2c.h> | ||
| 23 | #include <mach/hardware.h> | ||
| 24 | #include <asm/mach-types.h> | ||
| 25 | #include <asm/mach/arch.h> | ||
| 26 | |||
| 27 | static struct physmap_flash_data edb9307a_flash_data = { | ||
| 28 | .width = 2, | ||
| 29 | }; | ||
| 30 | |||
| 31 | static struct resource edb9307a_flash_resource = { | ||
| 32 | .start = EP93XX_CS6_PHYS_BASE, | ||
| 33 | .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1, | ||
| 34 | .flags = IORESOURCE_MEM, | ||
| 35 | }; | ||
| 36 | |||
| 37 | static struct platform_device edb9307a_flash = { | ||
| 38 | .name = "physmap-flash", | ||
| 39 | .id = 0, | ||
| 40 | .dev = { | ||
| 41 | .platform_data = &edb9307a_flash_data, | ||
| 42 | }, | ||
| 43 | .num_resources = 1, | ||
| 44 | .resource = &edb9307a_flash_resource, | ||
| 45 | }; | ||
| 46 | |||
| 47 | static struct ep93xx_eth_data edb9307a_eth_data = { | ||
| 48 | .phy_id = 1, | ||
| 49 | }; | ||
| 50 | |||
| 51 | static void __init edb9307a_init_machine(void) | ||
| 52 | { | ||
| 53 | ep93xx_init_devices(); | ||
| 54 | platform_device_register(&edb9307a_flash); | ||
| 55 | |||
| 56 | ep93xx_register_eth(&edb9307a_eth_data, 1); | ||
| 57 | } | ||
| 58 | |||
| 59 | MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board") | ||
| 60 | /* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */ | ||
| 61 | .phys_io = EP93XX_APB_PHYS_BASE, | ||
| 62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | ||
| 63 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, | ||
| 64 | .map_io = ep93xx_map_io, | ||
| 65 | .init_irq = ep93xx_init_irq, | ||
| 66 | .timer = &ep93xx_timer, | ||
| 67 | .init_machine = edb9307a_init_machine, | ||
| 68 | MACHINE_END | ||
diff --git a/arch/arm/mach-ep93xx/edb9312.c b/arch/arm/mach-ep93xx/edb9312.c index 6853e302bc3a..d7179f66d804 100644 --- a/arch/arm/mach-ep93xx/edb9312.c +++ b/arch/arm/mach-ep93xx/edb9312.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/mtd/physmap.h> | 20 | #include <linux/mtd/physmap.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/i2c.h> | ||
| 23 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 24 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
| 25 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
| @@ -29,8 +30,8 @@ static struct physmap_flash_data edb9312_flash_data = { | |||
| 29 | }; | 30 | }; |
| 30 | 31 | ||
| 31 | static struct resource edb9312_flash_resource = { | 32 | static struct resource edb9312_flash_resource = { |
| 32 | .start = 0x60000000, | 33 | .start = EP93XX_CS6_PHYS_BASE, |
| 33 | .end = 0x61ffffff, | 34 | .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1, |
| 34 | .flags = IORESOURCE_MEM, | 35 | .flags = IORESOURCE_MEM, |
| 35 | }; | 36 | }; |
| 36 | 37 | ||
| @@ -45,7 +46,7 @@ static struct platform_device edb9312_flash = { | |||
| 45 | }; | 46 | }; |
| 46 | 47 | ||
| 47 | static struct ep93xx_eth_data edb9312_eth_data = { | 48 | static struct ep93xx_eth_data edb9312_eth_data = { |
| 48 | .phy_id = 1, | 49 | .phy_id = 1, |
| 49 | }; | 50 | }; |
| 50 | 51 | ||
| 51 | static void __init edb9312_init_machine(void) | 52 | static void __init edb9312_init_machine(void) |
| @@ -60,7 +61,7 @@ MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board") | |||
| 60 | /* Maintainer: Toufeeq Hussain <toufeeq_hussain@infosys.com> */ | 61 | /* Maintainer: Toufeeq Hussain <toufeeq_hussain@infosys.com> */ |
| 61 | .phys_io = EP93XX_APB_PHYS_BASE, | 62 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 63 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 63 | .boot_params = 0x00000100, | 64 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 64 | .map_io = ep93xx_map_io, | 65 | .map_io = ep93xx_map_io, |
| 65 | .init_irq = ep93xx_init_irq, | 66 | .init_irq = ep93xx_init_irq, |
| 66 | .timer = &ep93xx_timer, | 67 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9315.c b/arch/arm/mach-ep93xx/edb9315.c index 9469b350d253..025af6eaca10 100644 --- a/arch/arm/mach-ep93xx/edb9315.c +++ b/arch/arm/mach-ep93xx/edb9315.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/mtd/physmap.h> | 19 | #include <linux/mtd/physmap.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/i2c.h> | ||
| 22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 23 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
| 24 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| @@ -28,8 +29,8 @@ static struct physmap_flash_data edb9315_flash_data = { | |||
| 28 | }; | 29 | }; |
| 29 | 30 | ||
| 30 | static struct resource edb9315_flash_resource = { | 31 | static struct resource edb9315_flash_resource = { |
| 31 | .start = 0x60000000, | 32 | .start = EP93XX_CS6_PHYS_BASE, |
| 32 | .end = 0x61ffffff, | 33 | .end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1, |
| 33 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| @@ -44,7 +45,7 @@ static struct platform_device edb9315_flash = { | |||
| 44 | }; | 45 | }; |
| 45 | 46 | ||
| 46 | static struct ep93xx_eth_data edb9315_eth_data = { | 47 | static struct ep93xx_eth_data edb9315_eth_data = { |
| 47 | .phy_id = 1, | 48 | .phy_id = 1, |
| 48 | }; | 49 | }; |
| 49 | 50 | ||
| 50 | static void __init edb9315_init_machine(void) | 51 | static void __init edb9315_init_machine(void) |
| @@ -59,7 +60,7 @@ MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board") | |||
| 59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 60 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
| 60 | .phys_io = EP93XX_APB_PHYS_BASE, | 61 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 62 | .boot_params = 0x00000100, | 63 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 63 | .map_io = ep93xx_map_io, | 64 | .map_io = ep93xx_map_io, |
| 64 | .init_irq = ep93xx_init_irq, | 65 | .init_irq = ep93xx_init_irq, |
| 65 | .timer = &ep93xx_timer, | 66 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb9315a.c b/arch/arm/mach-ep93xx/edb9315a.c index 584457ce7c80..4c9cc8a39f5c 100644 --- a/arch/arm/mach-ep93xx/edb9315a.c +++ b/arch/arm/mach-ep93xx/edb9315a.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/mtd/physmap.h> | 19 | #include <linux/mtd/physmap.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/i2c.h> | ||
| 22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 23 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
| 24 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| @@ -28,8 +29,8 @@ static struct physmap_flash_data edb9315a_flash_data = { | |||
| 28 | }; | 29 | }; |
| 29 | 30 | ||
| 30 | static struct resource edb9315a_flash_resource = { | 31 | static struct resource edb9315a_flash_resource = { |
| 31 | .start = 0x60000000, | 32 | .start = EP93XX_CS6_PHYS_BASE, |
| 32 | .end = 0x60ffffff, | 33 | .end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1, |
| 33 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| @@ -44,7 +45,7 @@ static struct platform_device edb9315a_flash = { | |||
| 44 | }; | 45 | }; |
| 45 | 46 | ||
| 46 | static struct ep93xx_eth_data edb9315a_eth_data = { | 47 | static struct ep93xx_eth_data edb9315a_eth_data = { |
| 47 | .phy_id = 1, | 48 | .phy_id = 1, |
| 48 | }; | 49 | }; |
| 49 | 50 | ||
| 50 | static void __init edb9315a_init_machine(void) | 51 | static void __init edb9315a_init_machine(void) |
| @@ -59,7 +60,7 @@ MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board") | |||
| 59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 60 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
| 60 | .phys_io = EP93XX_APB_PHYS_BASE, | 61 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 62 | .boot_params = 0xc0000100, | 63 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, |
| 63 | .map_io = ep93xx_map_io, | 64 | .map_io = ep93xx_map_io, |
| 64 | .init_irq = ep93xx_init_irq, | 65 | .init_irq = ep93xx_init_irq, |
| 65 | .timer = &ep93xx_timer, | 66 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index 035b24e31b64..3bad500b71b6 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/mtd/physmap.h> | 19 | #include <linux/mtd/physmap.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/i2c.h> | ||
| 22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 23 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
| 24 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| @@ -28,8 +29,8 @@ static struct physmap_flash_data gesbc9312_flash_data = { | |||
| 28 | }; | 29 | }; |
| 29 | 30 | ||
| 30 | static struct resource gesbc9312_flash_resource = { | 31 | static struct resource gesbc9312_flash_resource = { |
| 31 | .start = 0x60000000, | 32 | .start = EP93XX_CS6_PHYS_BASE, |
| 32 | .end = 0x607fffff, | 33 | .end = EP93XX_CS6_PHYS_BASE + SZ_8M - 1, |
| 33 | .flags = IORESOURCE_MEM, | 34 | .flags = IORESOURCE_MEM, |
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| @@ -59,7 +60,7 @@ MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") | |||
| 59 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 60 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
| 60 | .phys_io = EP93XX_APB_PHYS_BASE, | 61 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 61 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 62 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 62 | .boot_params = 0x00000100, | 63 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 63 | .map_io = ep93xx_map_io, | 64 | .map_io = ep93xx_map_io, |
| 64 | .init_irq = ep93xx_init_irq, | 65 | .init_irq = ep93xx_init_irq, |
| 65 | .timer = &ep93xx_timer, | 66 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/include/mach/clkdev.h b/arch/arm/mach-ep93xx/include/mach/clkdev.h new file mode 100644 index 000000000000..04b37a89801c --- /dev/null +++ b/arch/arm/mach-ep93xx/include/mach/clkdev.h | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | #ifndef __ASM_MACH_CLKDEV_H | ||
| 2 | #define __ASM_MACH_CLKDEV_H | ||
| 3 | |||
| 4 | #define __clk_get(clk) ({ 1; }) | ||
| 5 | #define __clk_put(clk) do { } while (0) | ||
| 6 | |||
| 7 | #endif | ||
diff --git a/arch/arm/mach-ep93xx/include/mach/dma.h b/arch/arm/mach-ep93xx/include/mach/dma.h deleted file mode 100644 index d0fa9656e92f..000000000000 --- a/arch/arm/mach-ep93xx/include/mach/dma.h +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ep93xx/include/mach/dma.h | ||
| 3 | */ | ||
diff --git a/arch/arm/mach-ep93xx/include/mach/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h index f7020414c5df..0a1498ae899a 100644 --- a/arch/arm/mach-ep93xx/include/mach/gpio.h +++ b/arch/arm/mach-ep93xx/include/mach/gpio.h | |||
| @@ -99,6 +99,8 @@ | |||
| 99 | /* maximum value for irq capable line identifiers */ | 99 | /* maximum value for irq capable line identifiers */ |
| 100 | #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) | 100 | #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) |
| 101 | 101 | ||
| 102 | extern void ep93xx_gpio_int_debounce(unsigned int irq, int enable); | ||
| 103 | |||
| 102 | /* new generic GPIO API - see Documentation/gpio.txt */ | 104 | /* new generic GPIO API - see Documentation/gpio.txt */ |
| 103 | 105 | ||
| 104 | #include <asm-generic/gpio.h> | 106 | #include <asm-generic/gpio.h> |
diff --git a/arch/arm/mach-ep93xx/include/mach/io.h b/arch/arm/mach-ep93xx/include/mach/io.h index 1ab9a90ad339..fd5f081cc8b7 100644 --- a/arch/arm/mach-ep93xx/include/mach/io.h +++ b/arch/arm/mach-ep93xx/include/mach/io.h | |||
| @@ -4,5 +4,5 @@ | |||
| 4 | 4 | ||
| 5 | #define IO_SPACE_LIMIT 0xffffffff | 5 | #define IO_SPACE_LIMIT 0xffffffff |
| 6 | 6 | ||
| 7 | #define __io(p) ((void __iomem *)(p)) | 7 | #define __io(p) __typesafe_io(p) |
| 8 | #define __mem_pci(p) (p) | 8 | #define __mem_pci(p) (p) |
diff --git a/arch/arm/mach-ep93xx/include/mach/memory.h b/arch/arm/mach-ep93xx/include/mach/memory.h index f1b633590752..5c80c3c8158d 100644 --- a/arch/arm/mach-ep93xx/include/mach/memory.h +++ b/arch/arm/mach-ep93xx/include/mach/memory.h | |||
| @@ -7,8 +7,4 @@ | |||
| 7 | 7 | ||
| 8 | #define PHYS_OFFSET UL(0x00000000) | 8 | #define PHYS_OFFSET UL(0x00000000) |
| 9 | 9 | ||
| 10 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 11 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 12 | |||
| 13 | |||
| 14 | #endif | 10 | #endif |
diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index db2489d3bda7..88f7e88f152f 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h | |||
| @@ -14,6 +14,7 @@ void ep93xx_map_io(void); | |||
| 14 | void ep93xx_init_irq(void); | 14 | void ep93xx_init_irq(void); |
| 15 | void ep93xx_init_time(unsigned long); | 15 | void ep93xx_init_time(unsigned long); |
| 16 | void ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr); | 16 | void ep93xx_register_eth(struct ep93xx_eth_data *data, int copy_addr); |
| 17 | void ep93xx_register_i2c(struct i2c_board_info *devices, int num); | ||
| 17 | void ep93xx_init_devices(void); | 18 | void ep93xx_init_devices(void); |
| 18 | extern struct sys_timer ep93xx_timer; | 19 | extern struct sys_timer ep93xx_timer; |
| 19 | 20 | ||
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index c2197236b632..15d6815d78c4 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | #include <linux/i2c.h> | ||
| 20 | #include <linux/mtd/physmap.h> | 21 | #include <linux/mtd/physmap.h> |
| 21 | 22 | ||
| 22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| @@ -25,7 +26,7 @@ | |||
| 25 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
| 26 | 27 | ||
| 27 | static struct ep93xx_eth_data micro9_eth_data = { | 28 | static struct ep93xx_eth_data micro9_eth_data = { |
| 28 | .phy_id = 0x1f, | 29 | .phy_id = 0x1f, |
| 29 | }; | 30 | }; |
| 30 | 31 | ||
| 31 | static void __init micro9_init(void) | 32 | static void __init micro9_init(void) |
| @@ -38,46 +39,46 @@ static void __init micro9_init(void) | |||
| 38 | */ | 39 | */ |
| 39 | #ifdef CONFIG_MACH_MICRO9H | 40 | #ifdef CONFIG_MACH_MICRO9H |
| 40 | static struct physmap_flash_data micro9h_flash_data = { | 41 | static struct physmap_flash_data micro9h_flash_data = { |
| 41 | .width = 4, | 42 | .width = 4, |
| 42 | }; | 43 | }; |
| 43 | 44 | ||
| 44 | static struct resource micro9h_flash_resource = { | 45 | static struct resource micro9h_flash_resource = { |
| 45 | .start = 0x10000000, | 46 | .start = EP93XX_CS1_PHYS_BASE, |
| 46 | .end = 0x13ffffff, | 47 | .end = EP93XX_CS1_PHYS_BASE + SZ_64M - 1, |
| 47 | .flags = IORESOURCE_MEM, | 48 | .flags = IORESOURCE_MEM, |
| 48 | }; | 49 | }; |
| 49 | 50 | ||
| 50 | static struct platform_device micro9h_flash = { | 51 | static struct platform_device micro9h_flash = { |
| 51 | .name = "physmap-flash", | 52 | .name = "physmap-flash", |
| 52 | .id = 0, | 53 | .id = 0, |
| 53 | .dev = { | 54 | .dev = { |
| 54 | .platform_data = µ9h_flash_data, | 55 | .platform_data = µ9h_flash_data, |
| 55 | }, | 56 | }, |
| 56 | .num_resources = 1, | 57 | .num_resources = 1, |
| 57 | .resource = µ9h_flash_resource, | 58 | .resource = µ9h_flash_resource, |
| 58 | }; | 59 | }; |
| 59 | 60 | ||
| 60 | static void __init micro9h_init(void) | 61 | static void __init micro9h_init(void) |
| 61 | { | 62 | { |
| 62 | platform_device_register(µ9h_flash); | 63 | platform_device_register(µ9h_flash); |
| 63 | } | 64 | } |
| 64 | 65 | ||
| 65 | static void __init micro9h_init_machine(void) | 66 | static void __init micro9h_init_machine(void) |
| 66 | { | 67 | { |
| 67 | ep93xx_init_devices(); | 68 | ep93xx_init_devices(); |
| 68 | micro9_init(); | 69 | micro9_init(); |
| 69 | micro9h_init(); | 70 | micro9h_init(); |
| 70 | } | 71 | } |
| 71 | 72 | ||
| 72 | MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H") | 73 | MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H") |
| 73 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 74 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ |
| 74 | .phys_io = EP93XX_APB_PHYS_BASE, | 75 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 75 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 76 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 76 | .boot_params = 0x00000100, | 77 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 77 | .map_io = ep93xx_map_io, | 78 | .map_io = ep93xx_map_io, |
| 78 | .init_irq = ep93xx_init_irq, | 79 | .init_irq = ep93xx_init_irq, |
| 79 | .timer = &ep93xx_timer, | 80 | .timer = &ep93xx_timer, |
| 80 | .init_machine = micro9h_init_machine, | 81 | .init_machine = micro9h_init_machine, |
| 81 | MACHINE_END | 82 | MACHINE_END |
| 82 | #endif | 83 | #endif |
| 83 | 84 | ||
| @@ -87,19 +88,19 @@ MACHINE_END | |||
| 87 | #ifdef CONFIG_MACH_MICRO9M | 88 | #ifdef CONFIG_MACH_MICRO9M |
| 88 | static void __init micro9m_init_machine(void) | 89 | static void __init micro9m_init_machine(void) |
| 89 | { | 90 | { |
| 90 | ep93xx_init_devices(); | 91 | ep93xx_init_devices(); |
| 91 | micro9_init(); | 92 | micro9_init(); |
| 92 | } | 93 | } |
| 93 | 94 | ||
| 94 | MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M") | 95 | MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M") |
| 95 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 96 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ |
| 96 | .phys_io = EP93XX_APB_PHYS_BASE, | 97 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 97 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 98 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 98 | .boot_params = 0x00000100, | 99 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 99 | .map_io = ep93xx_map_io, | 100 | .map_io = ep93xx_map_io, |
| 100 | .init_irq = ep93xx_init_irq, | 101 | .init_irq = ep93xx_init_irq, |
| 101 | .timer = &ep93xx_timer, | 102 | .timer = &ep93xx_timer, |
| 102 | .init_machine = micro9m_init_machine, | 103 | .init_machine = micro9m_init_machine, |
| 103 | MACHINE_END | 104 | MACHINE_END |
| 104 | #endif | 105 | #endif |
| 105 | 106 | ||
| @@ -109,19 +110,19 @@ MACHINE_END | |||
| 109 | #ifdef CONFIG_MACH_MICRO9L | 110 | #ifdef CONFIG_MACH_MICRO9L |
| 110 | static void __init micro9l_init_machine(void) | 111 | static void __init micro9l_init_machine(void) |
| 111 | { | 112 | { |
| 112 | ep93xx_init_devices(); | 113 | ep93xx_init_devices(); |
| 113 | micro9_init(); | 114 | micro9_init(); |
| 114 | } | 115 | } |
| 115 | 116 | ||
| 116 | MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L") | 117 | MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L") |
| 117 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ | 118 | /* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */ |
| 118 | .phys_io = EP93XX_APB_PHYS_BASE, | 119 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 119 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 120 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 120 | .boot_params = 0x00000100, | 121 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 121 | .map_io = ep93xx_map_io, | 122 | .map_io = ep93xx_map_io, |
| 122 | .init_irq = ep93xx_init_irq, | 123 | .init_irq = ep93xx_init_irq, |
| 123 | .timer = &ep93xx_timer, | 124 | .timer = &ep93xx_timer, |
| 124 | .init_machine = micro9l_init_machine, | 125 | .init_machine = micro9l_init_machine, |
| 125 | MACHINE_END | 126 | MACHINE_END |
| 126 | #endif | 127 | #endif |
| 127 | 128 | ||
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index b4aa4c054276..7ee024d34829 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/m48t86.h> | 21 | #include <linux/m48t86.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/i2c.h> | ||
| 23 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 24 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
| 25 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
| @@ -117,7 +118,7 @@ static struct physmap_flash_data ts72xx_flash_data = { | |||
| 117 | 118 | ||
| 118 | static struct resource ts72xx_flash_resource = { | 119 | static struct resource ts72xx_flash_resource = { |
| 119 | .start = TS72XX_NOR_PHYS_BASE, | 120 | .start = TS72XX_NOR_PHYS_BASE, |
| 120 | .end = TS72XX_NOR_PHYS_BASE + 0x00ffffff, | 121 | .end = TS72XX_NOR_PHYS_BASE + SZ_16M - 1, |
| 121 | .flags = IORESOURCE_MEM, | 122 | .flags = IORESOURCE_MEM, |
| 122 | }; | 123 | }; |
| 123 | 124 | ||
| @@ -144,21 +145,21 @@ static void ts72xx_rtc_writebyte(unsigned char value, unsigned long addr) | |||
| 144 | } | 145 | } |
| 145 | 146 | ||
| 146 | static struct m48t86_ops ts72xx_rtc_ops = { | 147 | static struct m48t86_ops ts72xx_rtc_ops = { |
| 147 | .readbyte = ts72xx_rtc_readbyte, | 148 | .readbyte = ts72xx_rtc_readbyte, |
| 148 | .writebyte = ts72xx_rtc_writebyte, | 149 | .writebyte = ts72xx_rtc_writebyte, |
| 149 | }; | 150 | }; |
| 150 | 151 | ||
| 151 | static struct platform_device ts72xx_rtc_device = { | 152 | static struct platform_device ts72xx_rtc_device = { |
| 152 | .name = "rtc-m48t86", | 153 | .name = "rtc-m48t86", |
| 153 | .id = -1, | 154 | .id = -1, |
| 154 | .dev = { | 155 | .dev = { |
| 155 | .platform_data = &ts72xx_rtc_ops, | 156 | .platform_data = &ts72xx_rtc_ops, |
| 156 | }, | 157 | }, |
| 157 | .num_resources = 0, | 158 | .num_resources = 0, |
| 158 | }; | 159 | }; |
| 159 | 160 | ||
| 160 | static struct ep93xx_eth_data ts72xx_eth_data = { | 161 | static struct ep93xx_eth_data ts72xx_eth_data = { |
| 161 | .phy_id = 1, | 162 | .phy_id = 1, |
| 162 | }; | 163 | }; |
| 163 | 164 | ||
| 164 | static void __init ts72xx_init_machine(void) | 165 | static void __init ts72xx_init_machine(void) |
| @@ -175,7 +176,7 @@ MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") | |||
| 175 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 176 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
| 176 | .phys_io = EP93XX_APB_PHYS_BASE, | 177 | .phys_io = EP93XX_APB_PHYS_BASE, |
| 177 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, | 178 | .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, |
| 178 | .boot_params = 0x00000100, | 179 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, |
| 179 | .map_io = ts72xx_map_io, | 180 | .map_io = ts72xx_map_io, |
| 180 | .init_irq = ep93xx_init_irq, | 181 | .init_irq = ep93xx_init_irq, |
| 181 | .timer = &ep93xx_timer, | 182 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c index 6a5b437ab86f..1b996b26d2e0 100644 --- a/arch/arm/mach-footbridge/cats-hw.c +++ b/arch/arm/mach-footbridge/cats-hw.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/screen_info.h> | 11 | #include <linux/screen_info.h> |
| 12 | #include <linux/io.h> | 12 | #include <linux/io.h> |
| 13 | #include <linux/spinlock.h> | ||
| 13 | 14 | ||
| 14 | #include <asm/hardware/dec21285.h> | 15 | #include <asm/hardware/dec21285.h> |
| 15 | #include <asm/mach-types.h> | 16 | #include <asm/mach-types.h> |
diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c index 818014e09f4a..36ff06d4df15 100644 --- a/arch/arm/mach-footbridge/common.c +++ b/arch/arm/mach-footbridge/common.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/list.h> | 14 | #include <linux/list.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | #include <linux/spinlock.h> | ||
| 17 | 18 | ||
| 18 | #include <asm/pgtable.h> | 19 | #include <asm/pgtable.h> |
| 19 | #include <asm/page.h> | 20 | #include <asm/page.h> |
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c index b2a21189dd81..da35bc5c5ccc 100644 --- a/arch/arm/mach-footbridge/dc21285-timer.c +++ b/arch/arm/mach-footbridge/dc21285-timer.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 8 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
| 9 | #include <linux/irq.h> | 9 | #include <linux/irq.h> |
| 10 | #include <linux/spinlock.h> | ||
| 10 | 11 | ||
| 11 | #include <asm/irq.h> | 12 | #include <asm/irq.h> |
| 12 | 13 | ||
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c index d4c1e526f59c..133086019e3e 100644 --- a/arch/arm/mach-footbridge/dc21285.c +++ b/arch/arm/mach-footbridge/dc21285.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/ioport.h> | 17 | #include <linux/ioport.h> |
| 18 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | #include <linux/spinlock.h> | ||
| 20 | 21 | ||
| 21 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
| 22 | #include <asm/system.h> | 23 | #include <asm/system.h> |
diff --git a/arch/arm/mach-footbridge/dma.c b/arch/arm/mach-footbridge/dma.c index b653e9cfa3f7..4f3506346969 100644 --- a/arch/arm/mach-footbridge/dma.c +++ b/arch/arm/mach-footbridge/dma.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | */ | 12 | */ |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <linux/spinlock.h> | ||
| 15 | 16 | ||
| 16 | #include <asm/dma.h> | 17 | #include <asm/dma.h> |
| 17 | #include <asm/scatterlist.h> | 18 | #include <asm/scatterlist.h> |
diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c index b1d3bf20a41e..30040fd588cc 100644 --- a/arch/arm/mach-footbridge/ebsa285.c +++ b/arch/arm/mach-footbridge/ebsa285.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * EBSA285 machine fixup | 4 | * EBSA285 machine fixup |
| 5 | */ | 5 | */ |
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/spinlock.h> | ||
| 7 | 8 | ||
| 8 | #include <asm/hardware/dec21285.h> | 9 | #include <asm/hardware/dec21285.h> |
| 9 | #include <asm/mach-types.h> | 10 | #include <asm/mach-types.h> |
diff --git a/arch/arm/mach-footbridge/include/mach/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h index ffaea90486f9..51dd902043ad 100644 --- a/arch/arm/mach-footbridge/include/mach/hardware.h +++ b/arch/arm/mach-footbridge/include/mach/hardware.h | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | #ifndef __ASM_ARCH_HARDWARE_H | 12 | #ifndef __ASM_ARCH_HARDWARE_H |
| 13 | #define __ASM_ARCH_HARDWARE_H | 13 | #define __ASM_ARCH_HARDWARE_H |
| 14 | 14 | ||
| 15 | #include <mach/memory.h> | ||
| 16 | |||
| 17 | /* Virtual Physical Size | 15 | /* Virtual Physical Size |
| 18 | * 0xff800000 0x40000000 1MB X-Bus | 16 | * 0xff800000 0x40000000 1MB X-Bus |
| 19 | * 0xff000000 0x7c000000 1MB PCI I/O space | 17 | * 0xff000000 0x7c000000 1MB PCI I/O space |
| @@ -28,9 +26,6 @@ | |||
| 28 | #define XBUS_SIZE 0x00100000 | 26 | #define XBUS_SIZE 0x00100000 |
| 29 | #define XBUS_BASE 0xff800000 | 27 | #define XBUS_BASE 0xff800000 |
| 30 | 28 | ||
| 31 | #define PCIO_SIZE 0x00100000 | ||
| 32 | #define PCIO_BASE 0xff000000 | ||
| 33 | |||
| 34 | #define ARMCSR_SIZE 0x00100000 | 29 | #define ARMCSR_SIZE 0x00100000 |
| 35 | #define ARMCSR_BASE 0xfe000000 | 30 | #define ARMCSR_BASE 0xfe000000 |
| 36 | 31 | ||
| @@ -91,10 +86,11 @@ | |||
| 91 | #define CPLD_FLASH_WR_ENABLE 1 | 86 | #define CPLD_FLASH_WR_ENABLE 1 |
| 92 | 87 | ||
| 93 | #ifndef __ASSEMBLY__ | 88 | #ifndef __ASSEMBLY__ |
| 94 | extern void gpio_modify_op(int mask, int set); | 89 | extern spinlock_t nw_gpio_lock; |
| 95 | extern void gpio_modify_io(int mask, int in); | 90 | extern void nw_gpio_modify_op(unsigned int mask, unsigned int set); |
| 96 | extern int gpio_read(void); | 91 | extern void nw_gpio_modify_io(unsigned int mask, unsigned int in); |
| 97 | extern void cpld_modify(int mask, int set); | 92 | extern unsigned int nw_gpio_read(void); |
| 93 | extern void nw_cpld_modify(unsigned int mask, unsigned int set); | ||
| 98 | #endif | 94 | #endif |
| 99 | 95 | ||
| 100 | #define pcibios_assign_all_busses() 1 | 96 | #define pcibios_assign_all_busses() 1 |
diff --git a/arch/arm/mach-footbridge/include/mach/io.h b/arch/arm/mach-footbridge/include/mach/io.h index a7b066239996..101a4fe90bde 100644 --- a/arch/arm/mach-footbridge/include/mach/io.h +++ b/arch/arm/mach-footbridge/include/mach/io.h | |||
| @@ -14,7 +14,8 @@ | |||
| 14 | #ifndef __ASM_ARM_ARCH_IO_H | 14 | #ifndef __ASM_ARM_ARCH_IO_H |
| 15 | #define __ASM_ARM_ARCH_IO_H | 15 | #define __ASM_ARM_ARCH_IO_H |
| 16 | 16 | ||
| 17 | #include <mach/hardware.h> | 17 | #define PCIO_SIZE 0x00100000 |
| 18 | #define PCIO_BASE 0xff000000 | ||
| 18 | 19 | ||
| 19 | #define IO_SPACE_LIMIT 0xffff | 20 | #define IO_SPACE_LIMIT 0xffff |
| 20 | 21 | ||
diff --git a/arch/arm/mach-footbridge/include/mach/dma.h b/arch/arm/mach-footbridge/include/mach/isa-dma.h index 62afd213effb..5bd4a0d338a8 100644 --- a/arch/arm/mach-footbridge/include/mach/dma.h +++ b/arch/arm/mach-footbridge/include/mach/isa-dma.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-footbridge/include/mach/dma.h | 2 | * arch/arm/mach-footbridge/include/mach/isa-dma.h |
| 3 | * | 3 | * |
| 4 | * Architecture DMA routines | 4 | * Architecture DMA routines |
| 5 | * | 5 | * |
diff --git a/arch/arm/mach-footbridge/include/mach/memory.h b/arch/arm/mach-footbridge/include/mach/memory.h index 6ae2f1a07ab9..cb16e59d87b6 100644 --- a/arch/arm/mach-footbridge/include/mach/memory.h +++ b/arch/arm/mach-footbridge/include/mach/memory.h | |||
| @@ -30,9 +30,18 @@ | |||
| 30 | extern unsigned long __virt_to_bus(unsigned long); | 30 | extern unsigned long __virt_to_bus(unsigned long); |
| 31 | extern unsigned long __bus_to_virt(unsigned long); | 31 | extern unsigned long __bus_to_virt(unsigned long); |
| 32 | #endif | 32 | #endif |
| 33 | #define __virt_to_bus __virt_to_bus | ||
| 34 | #define __bus_to_virt __bus_to_virt | ||
| 33 | 35 | ||
| 34 | #elif defined(CONFIG_FOOTBRIDGE_HOST) | 36 | #elif defined(CONFIG_FOOTBRIDGE_HOST) |
| 35 | 37 | ||
| 38 | /* | ||
| 39 | * The footbridge is programmed to expose the system RAM at the corresponding | ||
| 40 | * address. So, if PAGE_OFFSET is 0xc0000000, RAM appears at 0xe0000000. | ||
| 41 | * If 0x80000000, then its exposed at 0xa0000000 on the bus. etc. | ||
| 42 | * The only requirement is that the RAM isn't placed at bus address 0 which | ||
| 43 | * would clash with VGA cards. | ||
| 44 | */ | ||
| 36 | #define __virt_to_bus(x) ((x) - 0xe0000000) | 45 | #define __virt_to_bus(x) ((x) - 0xe0000000) |
| 37 | #define __bus_to_virt(x) ((x) + 0xe0000000) | 46 | #define __bus_to_virt(x) ((x) + 0xe0000000) |
| 38 | 47 | ||
diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c index 54fec9ae28b9..9ee80a211d3c 100644 --- a/arch/arm/mach-footbridge/isa-irq.c +++ b/arch/arm/mach-footbridge/isa-irq.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/list.h> | 19 | #include <linux/list.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/spinlock.h> | ||
| 22 | 23 | ||
| 23 | #include <asm/mach/irq.h> | 24 | #include <asm/mach/irq.h> |
| 24 | 25 | ||
diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c index 00b0ddcac283..ac7ffa6fc413 100644 --- a/arch/arm/mach-footbridge/netwinder-hw.c +++ b/arch/arm/mach-footbridge/netwinder-hw.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
| 14 | #include <linux/spinlock.h> | ||
| 14 | 15 | ||
| 15 | #include <asm/hardware/dec21285.h> | 16 | #include <asm/hardware/dec21285.h> |
| 16 | #include <asm/leds.h> | 17 | #include <asm/leds.h> |
| @@ -67,13 +68,14 @@ static inline void wb977_ww(int reg, int val) | |||
| 67 | /* | 68 | /* |
| 68 | * This is a lock for accessing ports GP1_IO_BASE and GP2_IO_BASE | 69 | * This is a lock for accessing ports GP1_IO_BASE and GP2_IO_BASE |
| 69 | */ | 70 | */ |
| 70 | DEFINE_SPINLOCK(gpio_lock); | 71 | DEFINE_SPINLOCK(nw_gpio_lock); |
| 72 | EXPORT_SYMBOL(nw_gpio_lock); | ||
| 71 | 73 | ||
| 72 | static unsigned int current_gpio_op; | 74 | static unsigned int current_gpio_op; |
| 73 | static unsigned int current_gpio_io; | 75 | static unsigned int current_gpio_io; |
| 74 | static unsigned int current_cpld; | 76 | static unsigned int current_cpld; |
| 75 | 77 | ||
| 76 | void gpio_modify_op(int mask, int set) | 78 | void nw_gpio_modify_op(unsigned int mask, unsigned int set) |
| 77 | { | 79 | { |
| 78 | unsigned int new_gpio, changed; | 80 | unsigned int new_gpio, changed; |
| 79 | 81 | ||
| @@ -86,6 +88,7 @@ void gpio_modify_op(int mask, int set) | |||
| 86 | if (changed & 0xff00) | 88 | if (changed & 0xff00) |
| 87 | outb(new_gpio >> 8, GP2_IO_BASE); | 89 | outb(new_gpio >> 8, GP2_IO_BASE); |
| 88 | } | 90 | } |
| 91 | EXPORT_SYMBOL(nw_gpio_modify_op); | ||
| 89 | 92 | ||
| 90 | static inline void __gpio_modify_io(int mask, int in) | 93 | static inline void __gpio_modify_io(int mask, int in) |
| 91 | { | 94 | { |
| @@ -118,7 +121,7 @@ static inline void __gpio_modify_io(int mask, int in) | |||
| 118 | } | 121 | } |
| 119 | } | 122 | } |
| 120 | 123 | ||
| 121 | void gpio_modify_io(int mask, int in) | 124 | void nw_gpio_modify_io(unsigned int mask, unsigned int in) |
| 122 | { | 125 | { |
| 123 | /* Open up the SuperIO chip */ | 126 | /* Open up the SuperIO chip */ |
| 124 | wb977_open(); | 127 | wb977_open(); |
| @@ -128,11 +131,13 @@ void gpio_modify_io(int mask, int in) | |||
| 128 | /* Close up the EFER gate */ | 131 | /* Close up the EFER gate */ |
| 129 | wb977_close(); | 132 | wb977_close(); |
| 130 | } | 133 | } |
| 134 | EXPORT_SYMBOL(nw_gpio_modify_io); | ||
| 131 | 135 | ||
| 132 | int gpio_read(void) | 136 | unsigned int nw_gpio_read(void) |
| 133 | { | 137 | { |
| 134 | return inb(GP1_IO_BASE) | inb(GP2_IO_BASE) << 8; | 138 | return inb(GP1_IO_BASE) | inb(GP2_IO_BASE) << 8; |
| 135 | } | 139 | } |
| 140 | EXPORT_SYMBOL(nw_gpio_read); | ||
| 136 | 141 | ||
| 137 | /* | 142 | /* |
| 138 | * Initialise the Winbond W83977F global registers | 143 | * Initialise the Winbond W83977F global registers |
| @@ -322,9 +327,9 @@ static inline void wb977_init_gpio(void) | |||
| 322 | /* | 327 | /* |
| 323 | * Set Group1/Group2 outputs | 328 | * Set Group1/Group2 outputs |
| 324 | */ | 329 | */ |
| 325 | spin_lock_irqsave(&gpio_lock, flags); | 330 | spin_lock_irqsave(&nw_gpio_lock, flags); |
| 326 | gpio_modify_op(-1, GPIO_RED_LED | GPIO_FAN); | 331 | nw_gpio_modify_op(-1, GPIO_RED_LED | GPIO_FAN); |
| 327 | spin_unlock_irqrestore(&gpio_lock, flags); | 332 | spin_unlock_irqrestore(&nw_gpio_lock, flags); |
| 328 | } | 333 | } |
| 329 | 334 | ||
| 330 | /* | 335 | /* |
| @@ -359,34 +364,35 @@ static void __init wb977_init(void) | |||
| 359 | wb977_close(); | 364 | wb977_close(); |
| 360 | } | 365 | } |
| 361 | 366 | ||
| 362 | void cpld_modify(int mask, int set) | 367 | void nw_cpld_modify(unsigned int mask, unsigned int set) |
| 363 | { | 368 | { |
| 364 | int msk; | 369 | int msk; |
| 365 | 370 | ||
| 366 | current_cpld = (current_cpld & ~mask) | set; | 371 | current_cpld = (current_cpld & ~mask) | set; |
| 367 | 372 | ||
| 368 | gpio_modify_io(GPIO_DATA | GPIO_IOCLK | GPIO_IOLOAD, 0); | 373 | nw_gpio_modify_io(GPIO_DATA | GPIO_IOCLK | GPIO_IOLOAD, 0); |
| 369 | gpio_modify_op(GPIO_IOLOAD, 0); | 374 | nw_gpio_modify_op(GPIO_IOLOAD, 0); |
| 370 | 375 | ||
| 371 | for (msk = 8; msk; msk >>= 1) { | 376 | for (msk = 8; msk; msk >>= 1) { |
| 372 | int bit = current_cpld & msk; | 377 | int bit = current_cpld & msk; |
| 373 | 378 | ||
| 374 | gpio_modify_op(GPIO_DATA | GPIO_IOCLK, bit ? GPIO_DATA : 0); | 379 | nw_gpio_modify_op(GPIO_DATA | GPIO_IOCLK, bit ? GPIO_DATA : 0); |
| 375 | gpio_modify_op(GPIO_IOCLK, GPIO_IOCLK); | 380 | nw_gpio_modify_op(GPIO_IOCLK, GPIO_IOCLK); |
| 376 | } | 381 | } |
| 377 | 382 | ||
| 378 | gpio_modify_op(GPIO_IOCLK|GPIO_DATA, 0); | 383 | nw_gpio_modify_op(GPIO_IOCLK|GPIO_DATA, 0); |
| 379 | gpio_modify_op(GPIO_IOLOAD|GPIO_DSCLK, GPIO_IOLOAD|GPIO_DSCLK); | 384 | nw_gpio_modify_op(GPIO_IOLOAD|GPIO_DSCLK, GPIO_IOLOAD|GPIO_DSCLK); |
| 380 | gpio_modify_op(GPIO_IOLOAD, 0); | 385 | nw_gpio_modify_op(GPIO_IOLOAD, 0); |
| 381 | } | 386 | } |
| 387 | EXPORT_SYMBOL(nw_cpld_modify); | ||
| 382 | 388 | ||
| 383 | static void __init cpld_init(void) | 389 | static void __init cpld_init(void) |
| 384 | { | 390 | { |
| 385 | unsigned long flags; | 391 | unsigned long flags; |
| 386 | 392 | ||
| 387 | spin_lock_irqsave(&gpio_lock, flags); | 393 | spin_lock_irqsave(&nw_gpio_lock, flags); |
| 388 | cpld_modify(-1, CPLD_UNMUTE | CPLD_7111_DISABLE); | 394 | nw_cpld_modify(-1, CPLD_UNMUTE | CPLD_7111_DISABLE); |
| 389 | spin_unlock_irqrestore(&gpio_lock, flags); | 395 | spin_unlock_irqrestore(&nw_gpio_lock, flags); |
| 390 | } | 396 | } |
| 391 | 397 | ||
| 392 | static unsigned char rwa_unlock[] __initdata = | 398 | static unsigned char rwa_unlock[] __initdata = |
| @@ -596,12 +602,6 @@ static void __init rwa010_init(void) | |||
| 596 | rwa010_soundblaster_reset(); | 602 | rwa010_soundblaster_reset(); |
| 597 | } | 603 | } |
| 598 | 604 | ||
| 599 | EXPORT_SYMBOL(gpio_lock); | ||
| 600 | EXPORT_SYMBOL(gpio_modify_op); | ||
| 601 | EXPORT_SYMBOL(gpio_modify_io); | ||
| 602 | EXPORT_SYMBOL(cpld_modify); | ||
| 603 | EXPORT_SYMBOL(gpio_read); | ||
| 604 | |||
| 605 | /* | 605 | /* |
| 606 | * Initialise any other hardware after we've got the PCI bus | 606 | * Initialise any other hardware after we've got the PCI bus |
| 607 | * initialised. We may need the PCI bus to talk to this other | 607 | * initialised. We may need the PCI bus to talk to this other |
| @@ -616,9 +616,9 @@ static int __init nw_hw_init(void) | |||
| 616 | cpld_init(); | 616 | cpld_init(); |
| 617 | rwa010_init(); | 617 | rwa010_init(); |
| 618 | 618 | ||
| 619 | spin_lock_irqsave(&gpio_lock, flags); | 619 | spin_lock_irqsave(&nw_gpio_lock, flags); |
| 620 | gpio_modify_op(GPIO_RED_LED|GPIO_GREEN_LED, DEFAULT_LEDS); | 620 | nw_gpio_modify_op(GPIO_RED_LED|GPIO_GREEN_LED, DEFAULT_LEDS); |
| 621 | spin_unlock_irqrestore(&gpio_lock, flags); | 621 | spin_unlock_irqrestore(&nw_gpio_lock, flags); |
| 622 | } | 622 | } |
| 623 | return 0; | 623 | return 0; |
| 624 | } | 624 | } |
diff --git a/arch/arm/mach-footbridge/netwinder-leds.c b/arch/arm/mach-footbridge/netwinder-leds.c index d91a4f4a32dc..00269fe0be8a 100644 --- a/arch/arm/mach-footbridge/netwinder-leds.c +++ b/arch/arm/mach-footbridge/netwinder-leds.c | |||
| @@ -32,7 +32,6 @@ static char led_state; | |||
| 32 | static char hw_led_state; | 32 | static char hw_led_state; |
| 33 | 33 | ||
| 34 | static DEFINE_SPINLOCK(leds_lock); | 34 | static DEFINE_SPINLOCK(leds_lock); |
| 35 | extern spinlock_t gpio_lock; | ||
| 36 | 35 | ||
| 37 | static void netwinder_leds_event(led_event_t evt) | 36 | static void netwinder_leds_event(led_event_t evt) |
| 38 | { | 37 | { |
| @@ -121,9 +120,9 @@ static void netwinder_leds_event(led_event_t evt) | |||
| 121 | spin_unlock_irqrestore(&leds_lock, flags); | 120 | spin_unlock_irqrestore(&leds_lock, flags); |
| 122 | 121 | ||
| 123 | if (led_state & LED_STATE_ENABLED) { | 122 | if (led_state & LED_STATE_ENABLED) { |
| 124 | spin_lock_irqsave(&gpio_lock, flags); | 123 | spin_lock_irqsave(&nw_gpio_lock, flags); |
| 125 | gpio_modify_op(GPIO_RED_LED | GPIO_GREEN_LED, hw_led_state); | 124 | nw_gpio_modify_op(GPIO_RED_LED | GPIO_GREEN_LED, hw_led_state); |
| 126 | spin_unlock_irqrestore(&gpio_lock, flags); | 125 | spin_unlock_irqrestore(&nw_gpio_lock, flags); |
| 127 | } | 126 | } |
| 128 | } | 127 | } |
| 129 | 128 | ||
diff --git a/arch/arm/mach-footbridge/personal.c b/arch/arm/mach-footbridge/personal.c index c4f843fc099d..e2c9f0690b16 100644 --- a/arch/arm/mach-footbridge/personal.c +++ b/arch/arm/mach-footbridge/personal.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * Personal server (Skiff) machine fixup | 4 | * Personal server (Skiff) machine fixup |
| 5 | */ | 5 | */ |
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/spinlock.h> | ||
| 7 | 8 | ||
| 8 | #include <asm/hardware/dec21285.h> | 9 | #include <asm/hardware/dec21285.h> |
| 9 | #include <asm/mach-types.h> | 10 | #include <asm/mach-types.h> |
diff --git a/arch/arm/mach-h720x/include/mach/io.h b/arch/arm/mach-h720x/include/mach/io.h index 1dab74ce88c6..2c8659c21a93 100644 --- a/arch/arm/mach-h720x/include/mach/io.h +++ b/arch/arm/mach-h720x/include/mach/io.h | |||
| @@ -14,11 +14,9 @@ | |||
| 14 | #ifndef __ASM_ARM_ARCH_IO_H | 14 | #ifndef __ASM_ARM_ARCH_IO_H |
| 15 | #define __ASM_ARM_ARCH_IO_H | 15 | #define __ASM_ARM_ARCH_IO_H |
| 16 | 16 | ||
| 17 | #include <mach/hardware.h> | ||
| 18 | |||
| 19 | #define IO_SPACE_LIMIT 0xffffffff | 17 | #define IO_SPACE_LIMIT 0xffffffff |
| 20 | 18 | ||
| 21 | #define __io(a) ((void __iomem *)(a)) | 19 | #define __io(a) __typesafe_io(a) |
| 22 | #define __mem_pci(a) (a) | 20 | #define __mem_pci(a) (a) |
| 23 | 21 | ||
| 24 | #endif | 22 | #endif |
diff --git a/arch/arm/mach-h720x/include/mach/dma.h b/arch/arm/mach-h720x/include/mach/isa-dma.h index 0a9d86ee84fe..3eafb3f163c0 100644 --- a/arch/arm/mach-h720x/include/mach/dma.h +++ b/arch/arm/mach-h720x/include/mach/isa-dma.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-h720x/include/mach/dma.h | 2 | * arch/arm/mach-h720x/include/mach/isa-dma.h |
| 3 | * | 3 | * |
| 4 | * Architecture DMA routes | 4 | * Architecture DMA routes |
| 5 | * | 5 | * |
| @@ -8,13 +8,6 @@ | |||
| 8 | #ifndef __ASM_ARCH_DMA_H | 8 | #ifndef __ASM_ARCH_DMA_H |
| 9 | #define __ASM_ARCH_DMA_H | 9 | #define __ASM_ARCH_DMA_H |
| 10 | 10 | ||
| 11 | /* | ||
| 12 | * This is the maximum DMA address that can be DMAd to. | ||
| 13 | * There should not be more than (0xd0000000 - 0xc0000000) | ||
| 14 | * bytes of RAM. | ||
| 15 | */ | ||
| 16 | #define MAX_DMA_ADDRESS 0xd0000000 | ||
| 17 | |||
| 18 | #if defined (CONFIG_CPU_H7201) | 11 | #if defined (CONFIG_CPU_H7201) |
| 19 | #define MAX_DMA_CHANNELS 3 | 12 | #define MAX_DMA_CHANNELS 3 |
| 20 | #elif defined (CONFIG_CPU_H7202) | 13 | #elif defined (CONFIG_CPU_H7202) |
diff --git a/arch/arm/mach-h720x/include/mach/memory.h b/arch/arm/mach-h720x/include/mach/memory.h index cb26f49cc4e1..ef4c1e26f18e 100644 --- a/arch/arm/mach-h720x/include/mach/memory.h +++ b/arch/arm/mach-h720x/include/mach/memory.h | |||
| @@ -7,23 +7,13 @@ | |||
| 7 | #ifndef __ASM_ARCH_MEMORY_H | 7 | #ifndef __ASM_ARCH_MEMORY_H |
| 8 | #define __ASM_ARCH_MEMORY_H | 8 | #define __ASM_ARCH_MEMORY_H |
| 9 | 9 | ||
| 10 | /* | ||
| 11 | * Page offset: | ||
| 12 | * ( 0xc0000000UL ) | ||
| 13 | */ | ||
| 14 | #define PHYS_OFFSET UL(0x40000000) | 10 | #define PHYS_OFFSET UL(0x40000000) |
| 15 | |||
| 16 | /* | 11 | /* |
| 17 | * Virtual view <-> DMA view memory address translations | 12 | * This is the maximum DMA address that can be DMAd to. |
| 18 | * virt_to_bus: Used to translate the virtual address to an | 13 | * There should not be more than (0xd0000000 - 0xc0000000) |
| 19 | * address suitable to be passed to set_dma_addr | 14 | * bytes of RAM. |
| 20 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 21 | * to an address that the kernel can use. | ||
| 22 | * | ||
| 23 | * There is something to do here later !, Mar 2000, Jungjun Kim | ||
| 24 | */ | 15 | */ |
| 25 | 16 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_256M - 1) | |
| 26 | #define __virt_to_bus(x) __virt_to_phys(x) | 17 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M) |
| 27 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 28 | 18 | ||
| 29 | #endif | 19 | #endif |
diff --git a/arch/arm/mach-imx/dma.c b/arch/arm/mach-imx/dma.c index c10810c936b3..1536583eece0 100644 --- a/arch/arm/mach-imx/dma.c +++ b/arch/arm/mach-imx/dma.c | |||
| @@ -28,10 +28,11 @@ | |||
| 28 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
| 29 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| 30 | 30 | ||
| 31 | #include <asm/scatterlist.h> | ||
| 31 | #include <asm/system.h> | 32 | #include <asm/system.h> |
| 32 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
| 33 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
| 34 | #include <asm/dma.h> | 35 | #include <mach/dma.h> |
| 35 | #include <mach/imx-dma.h> | 36 | #include <mach/imx-dma.h> |
| 36 | 37 | ||
| 37 | struct imx_dma_channel imx_dma_channels[IMX_DMA_CHANNELS]; | 38 | struct imx_dma_channel imx_dma_channels[IMX_DMA_CHANNELS]; |
| @@ -138,7 +139,7 @@ imx_dma_setup_sg_base(imx_dmach_t dma_ch, | |||
| 138 | int | 139 | int |
| 139 | imx_dma_setup_single(imx_dmach_t dma_ch, dma_addr_t dma_address, | 140 | imx_dma_setup_single(imx_dmach_t dma_ch, dma_addr_t dma_address, |
| 140 | unsigned int dma_length, unsigned int dev_addr, | 141 | unsigned int dma_length, unsigned int dev_addr, |
| 141 | dmamode_t dmamode) | 142 | unsigned int dmamode) |
| 142 | { | 143 | { |
| 143 | struct imx_dma_channel *imxdma = &imx_dma_channels[dma_ch]; | 144 | struct imx_dma_channel *imxdma = &imx_dma_channels[dma_ch]; |
| 144 | 145 | ||
| @@ -223,7 +224,7 @@ imx_dma_setup_single(imx_dmach_t dma_ch, dma_addr_t dma_address, | |||
| 223 | int | 224 | int |
| 224 | imx_dma_setup_sg(imx_dmach_t dma_ch, | 225 | imx_dma_setup_sg(imx_dmach_t dma_ch, |
| 225 | struct scatterlist *sg, unsigned int sgcount, unsigned int dma_length, | 226 | struct scatterlist *sg, unsigned int sgcount, unsigned int dma_length, |
| 226 | unsigned int dev_addr, dmamode_t dmamode) | 227 | unsigned int dev_addr, unsigned int dmamode) |
| 227 | { | 228 | { |
| 228 | int res; | 229 | int res; |
| 229 | struct imx_dma_channel *imxdma = &imx_dma_channels[dma_ch]; | 230 | struct imx_dma_channel *imxdma = &imx_dma_channels[dma_ch]; |
diff --git a/arch/arm/mach-imx/include/mach/imx-dma.h b/arch/arm/mach-imx/include/mach/imx-dma.h index 44d89c35539a..bbe54df7f0de 100644 --- a/arch/arm/mach-imx/include/mach/imx-dma.h +++ b/arch/arm/mach-imx/include/mach/imx-dma.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <asm/dma.h> | 21 | #include <mach/dma.h> |
| 22 | 22 | ||
| 23 | #ifndef __ASM_ARCH_IMX_DMA_H | 23 | #ifndef __ASM_ARCH_IMX_DMA_H |
| 24 | #define __ASM_ARCH_IMX_DMA_H | 24 | #define __ASM_ARCH_IMX_DMA_H |
| @@ -48,7 +48,7 @@ struct imx_dma_channel { | |||
| 48 | void (*irq_handler) (int, void *); | 48 | void (*irq_handler) (int, void *); |
| 49 | void (*err_handler) (int, void *, int errcode); | 49 | void (*err_handler) (int, void *, int errcode); |
| 50 | void *data; | 50 | void *data; |
| 51 | dmamode_t dma_mode; | 51 | unsigned int dma_mode; |
| 52 | struct scatterlist *sg; | 52 | struct scatterlist *sg; |
| 53 | unsigned int sgbc; | 53 | unsigned int sgbc; |
| 54 | unsigned int sgcount; | 54 | unsigned int sgcount; |
| @@ -66,14 +66,18 @@ extern struct imx_dma_channel imx_dma_channels[IMX_DMA_CHANNELS]; | |||
| 66 | /* The type to distinguish channel numbers parameter from ordinal int type */ | 66 | /* The type to distinguish channel numbers parameter from ordinal int type */ |
| 67 | typedef int imx_dmach_t; | 67 | typedef int imx_dmach_t; |
| 68 | 68 | ||
| 69 | #define DMA_MODE_READ 0 | ||
| 70 | #define DMA_MODE_WRITE 1 | ||
| 71 | #define DMA_MODE_MASK 1 | ||
| 72 | |||
| 69 | int | 73 | int |
| 70 | imx_dma_setup_single(imx_dmach_t dma_ch, dma_addr_t dma_address, | 74 | imx_dma_setup_single(imx_dmach_t dma_ch, dma_addr_t dma_address, |
| 71 | unsigned int dma_length, unsigned int dev_addr, dmamode_t dmamode); | 75 | unsigned int dma_length, unsigned int dev_addr, unsigned int dmamode); |
| 72 | 76 | ||
| 73 | int | 77 | int |
| 74 | imx_dma_setup_sg(imx_dmach_t dma_ch, | 78 | imx_dma_setup_sg(imx_dmach_t dma_ch, |
| 75 | struct scatterlist *sg, unsigned int sgcount, unsigned int dma_length, | 79 | struct scatterlist *sg, unsigned int sgcount, unsigned int dma_length, |
| 76 | unsigned int dev_addr, dmamode_t dmamode); | 80 | unsigned int dev_addr, unsigned int dmamode); |
| 77 | 81 | ||
| 78 | int | 82 | int |
| 79 | imx_dma_setup_handlers(imx_dmach_t dma_ch, | 83 | imx_dma_setup_handlers(imx_dmach_t dma_ch, |
diff --git a/arch/arm/mach-imx/include/mach/io.h b/arch/arm/mach-imx/include/mach/io.h index c50c5fa6fb81..9e197ae4590f 100644 --- a/arch/arm/mach-imx/include/mach/io.h +++ b/arch/arm/mach-imx/include/mach/io.h | |||
| @@ -20,11 +20,9 @@ | |||
| 20 | #ifndef __ASM_ARM_ARCH_IO_H | 20 | #ifndef __ASM_ARM_ARCH_IO_H |
| 21 | #define __ASM_ARM_ARCH_IO_H | 21 | #define __ASM_ARM_ARCH_IO_H |
| 22 | 22 | ||
| 23 | #include <mach/hardware.h> | ||
| 24 | |||
| 25 | #define IO_SPACE_LIMIT 0xffffffff | 23 | #define IO_SPACE_LIMIT 0xffffffff |
| 26 | 24 | ||
| 27 | #define __io(a) ((void __iomem *)(a)) | 25 | #define __io(a) __typesafe_io(a) |
| 28 | #define __mem_pci(a) (a) | 26 | #define __mem_pci(a) (a) |
| 29 | 27 | ||
| 30 | #endif | 28 | #endif |
diff --git a/arch/arm/mach-imx/include/mach/memory.h b/arch/arm/mach-imx/include/mach/memory.h index 5c453063c0ed..a93df7cba694 100644 --- a/arch/arm/mach-imx/include/mach/memory.h +++ b/arch/arm/mach-imx/include/mach/memory.h | |||
| @@ -23,14 +23,4 @@ | |||
| 23 | 23 | ||
| 24 | #define PHYS_OFFSET UL(0x08000000) | 24 | #define PHYS_OFFSET UL(0x08000000) |
| 25 | 25 | ||
| 26 | /* | ||
| 27 | * Virtual view <-> DMA view memory address translations | ||
| 28 | * virt_to_bus: Used to translate the virtual address to an | ||
| 29 | * address suitable to be passed to set_dma_addr | ||
| 30 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 31 | * to an address that the kernel can use. | ||
| 32 | */ | ||
| 33 | #define __virt_to_bus(x) (x - PAGE_OFFSET + PHYS_OFFSET) | ||
| 34 | #define __bus_to_virt(x) (x - PHYS_OFFSET + PAGE_OFFSET) | ||
| 35 | |||
| 36 | #endif | 26 | #endif |
diff --git a/arch/arm/mach-integrator/include/mach/dma.h b/arch/arm/mach-integrator/include/mach/dma.h deleted file mode 100644 index fbebe85a2db7..000000000000 --- a/arch/arm/mach-integrator/include/mach/dma.h +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-integrator/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1997,1998 Russell King | ||
| 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 as published by | ||
| 8 | * the Free Software Foundation; either version 2 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 19 | */ | ||
diff --git a/arch/arm/mach-integrator/include/mach/memory.h b/arch/arm/mach-integrator/include/mach/memory.h index be7e63c21d25..2b2e7a110724 100644 --- a/arch/arm/mach-integrator/include/mach/memory.h +++ b/arch/arm/mach-integrator/include/mach/memory.h | |||
| @@ -24,16 +24,9 @@ | |||
| 24 | * Physical DRAM offset. | 24 | * Physical DRAM offset. |
| 25 | */ | 25 | */ |
| 26 | #define PHYS_OFFSET UL(0x00000000) | 26 | #define PHYS_OFFSET UL(0x00000000) |
| 27 | #define BUS_OFFSET UL(0x80000000) | ||
| 28 | 27 | ||
| 29 | /* | 28 | #define BUS_OFFSET UL(0x80000000) |
| 30 | * Virtual view <-> DMA view memory address translations | 29 | #define __virt_to_bus(x) ((x) - PAGE_OFFSET + BUS_OFFSET) |
| 31 | * virt_to_bus: Used to translate the virtual address to an | 30 | #define __bus_to_virt(x) ((x) - BUS_OFFSET + PAGE_OFFSET) |
| 32 | * address suitable to be passed to set_dma_addr | ||
| 33 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 34 | * to an address that the kernel can use. | ||
| 35 | */ | ||
| 36 | #define __virt_to_bus(x) (x - PAGE_OFFSET + BUS_OFFSET) | ||
| 37 | #define __bus_to_virt(x) (x - BUS_OFFSET + PAGE_OFFSET) | ||
| 38 | 31 | ||
| 39 | #endif | 32 | #endif |
diff --git a/arch/arm/mach-iop13xx/include/mach/dma.h b/arch/arm/mach-iop13xx/include/mach/dma.h deleted file mode 100644 index d79846fbb394..000000000000 --- a/arch/arm/mach-iop13xx/include/mach/dma.h +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | #ifndef _IOP13XX_DMA_H | ||
| 2 | #define _IOP13XX_DMA_H | ||
| 3 | #endif | ||
diff --git a/arch/arm/mach-iop13xx/include/mach/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h index b82602d529bf..e012bf13c955 100644 --- a/arch/arm/mach-iop13xx/include/mach/memory.h +++ b/arch/arm/mach-iop13xx/include/mach/memory.h | |||
| @@ -16,18 +16,6 @@ | |||
| 16 | #define IOP13XX_PMMR_P_START (IOP13XX_PMMR_PHYS_MEM_BASE) | 16 | #define IOP13XX_PMMR_P_START (IOP13XX_PMMR_PHYS_MEM_BASE) |
| 17 | #define IOP13XX_PMMR_P_END (IOP13XX_PMMR_PHYS_MEM_BASE + IOP13XX_PMMR_SIZE) | 17 | #define IOP13XX_PMMR_P_END (IOP13XX_PMMR_PHYS_MEM_BASE + IOP13XX_PMMR_SIZE) |
| 18 | 18 | ||
| 19 | /* | ||
| 20 | * Virtual view <-> PCI DMA view memory address translations | ||
| 21 | * virt_to_bus: Used to translate the virtual address to an | ||
| 22 | * address suitable to be passed to set_dma_addr | ||
| 23 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 24 | * to an address that the kernel can use. | ||
| 25 | */ | ||
| 26 | |||
| 27 | /* RAM has 1:1 mapping on the PCIe/x Busses */ | ||
| 28 | #define __virt_to_bus(x) (__virt_to_phys(x)) | ||
| 29 | #define __bus_to_virt(x) (__phys_to_virt(x)) | ||
| 30 | |||
| 31 | static inline dma_addr_t __virt_to_lbus(unsigned long x) | 19 | static inline dma_addr_t __virt_to_lbus(unsigned long x) |
| 32 | { | 20 | { |
| 33 | return x + IOP13XX_PMMR_PHYS_MEM_BASE - IOP13XX_PMMR_VIRT_MEM_BASE; | 21 | return x + IOP13XX_PMMR_PHYS_MEM_BASE - IOP13XX_PMMR_VIRT_MEM_BASE; |
| @@ -55,7 +43,7 @@ static inline unsigned long __lbus_to_virt(dma_addr_t x) | |||
| 55 | if (is_lbus_device(dev) && __is_lbus_dma(__dma)) \ | 43 | if (is_lbus_device(dev) && __is_lbus_dma(__dma)) \ |
| 56 | __virt = __lbus_to_virt(__dma); \ | 44 | __virt = __lbus_to_virt(__dma); \ |
| 57 | else \ | 45 | else \ |
| 58 | __virt = __bus_to_virt(__dma); \ | 46 | __virt = __phys_to_virt(__dma); \ |
| 59 | (void *)__virt; \ | 47 | (void *)__virt; \ |
| 60 | }) | 48 | }) |
| 61 | 49 | ||
| @@ -66,7 +54,7 @@ static inline unsigned long __lbus_to_virt(dma_addr_t x) | |||
| 66 | if (is_lbus_device(dev) && __is_lbus_virt(__virt)) \ | 54 | if (is_lbus_device(dev) && __is_lbus_virt(__virt)) \ |
| 67 | __dma = __virt_to_lbus(__virt); \ | 55 | __dma = __virt_to_lbus(__virt); \ |
| 68 | else \ | 56 | else \ |
| 69 | __dma = __virt_to_bus(__virt); \ | 57 | __dma = __virt_to_phys(__virt); \ |
| 70 | __dma; \ | 58 | __dma; \ |
| 71 | }) | 59 | }) |
| 72 | 60 | ||
diff --git a/arch/arm/mach-iop13xx/include/mach/timex.h b/arch/arm/mach-iop13xx/include/mach/timex.h index 5b1f1c8a8270..45fb2745bb54 100644 --- a/arch/arm/mach-iop13xx/include/mach/timex.h +++ b/arch/arm/mach-iop13xx/include/mach/timex.h | |||
| @@ -1,3 +1 @@ | |||
| 1 | #include <mach/hardware.h> | ||
| 2 | |||
| 3 | #define CLOCK_TICK_RATE (100 * HZ) | #define CLOCK_TICK_RATE (100 * HZ) | |
diff --git a/arch/arm/mach-iop32x/include/mach/dma.h b/arch/arm/mach-iop32x/include/mach/dma.h deleted file mode 100644 index f8bd817f205d..000000000000 --- a/arch/arm/mach-iop32x/include/mach/dma.h +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-iop32x/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Intel Corp. | ||
| 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 | */ | ||
diff --git a/arch/arm/mach-iop32x/include/mach/io.h b/arch/arm/mach-iop32x/include/mach/io.h index ce54705ba3d4..339e5854728b 100644 --- a/arch/arm/mach-iop32x/include/mach/io.h +++ b/arch/arm/mach-iop32x/include/mach/io.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #ifndef __IO_H | 11 | #ifndef __IO_H |
| 12 | #define __IO_H | 12 | #define __IO_H |
| 13 | 13 | ||
| 14 | #include <mach/hardware.h> | 14 | #include <asm/hardware/iop3xx.h> |
| 15 | 15 | ||
| 16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, | 16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, |
| 17 | unsigned int mtype); | 17 | unsigned int mtype); |
diff --git a/arch/arm/mach-iop32x/include/mach/memory.h b/arch/arm/mach-iop32x/include/mach/memory.h index 42cd4bf3148c..c30f6450ad50 100644 --- a/arch/arm/mach-iop32x/include/mach/memory.h +++ b/arch/arm/mach-iop32x/include/mach/memory.h | |||
| @@ -5,22 +5,9 @@ | |||
| 5 | #ifndef __MEMORY_H | 5 | #ifndef __MEMORY_H |
| 6 | #define __MEMORY_H | 6 | #define __MEMORY_H |
| 7 | 7 | ||
| 8 | #include <mach/hardware.h> | ||
| 9 | |||
| 10 | /* | 8 | /* |
| 11 | * Physical DRAM offset. | 9 | * Physical DRAM offset. |
| 12 | */ | 10 | */ |
| 13 | #define PHYS_OFFSET UL(0xa0000000) | 11 | #define PHYS_OFFSET UL(0xa0000000) |
| 14 | 12 | ||
| 15 | /* | ||
| 16 | * Virtual view <-> PCI DMA view memory address translations | ||
| 17 | * virt_to_bus: Used to translate the virtual address to an | ||
| 18 | * address suitable to be passed to set_dma_addr | ||
| 19 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 20 | * to an address that the kernel can use. | ||
| 21 | */ | ||
| 22 | #define __virt_to_bus(x) (__virt_to_phys(x)) | ||
| 23 | #define __bus_to_virt(x) (__phys_to_virt(x)) | ||
| 24 | |||
| 25 | |||
| 26 | #endif | 13 | #endif |
diff --git a/arch/arm/mach-iop32x/include/mach/system.h b/arch/arm/mach-iop32x/include/mach/system.h index 20f923e54f46..32d9e5b0a28d 100644 --- a/arch/arm/mach-iop32x/include/mach/system.h +++ b/arch/arm/mach-iop32x/include/mach/system.h | |||
| @@ -7,8 +7,9 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | |||
| 11 | #include <asm/mach-types.h> | 10 | #include <asm/mach-types.h> |
| 11 | #include <asm/hardware/iop3xx.h> | ||
| 12 | #include <mach/n2100.h> | ||
| 12 | 13 | ||
| 13 | static inline void arch_idle(void) | 14 | static inline void arch_idle(void) |
| 14 | { | 15 | { |
diff --git a/arch/arm/mach-iop32x/include/mach/timex.h b/arch/arm/mach-iop32x/include/mach/timex.h index a541afced3cb..7262ab81419d 100644 --- a/arch/arm/mach-iop32x/include/mach/timex.h +++ b/arch/arm/mach-iop32x/include/mach/timex.h | |||
| @@ -3,7 +3,4 @@ | |||
| 3 | * | 3 | * |
| 4 | * IOP32x architecture timex specifications | 4 | * IOP32x architecture timex specifications |
| 5 | */ | 5 | */ |
| 6 | |||
| 7 | #include <mach/hardware.h> | ||
| 8 | |||
| 9 | #define CLOCK_TICK_RATE (100 * HZ) | 6 | #define CLOCK_TICK_RATE (100 * HZ) |
diff --git a/arch/arm/mach-iop33x/include/mach/dma.h b/arch/arm/mach-iop33x/include/mach/dma.h deleted file mode 100644 index d8b42232931d..000000000000 --- a/arch/arm/mach-iop33x/include/mach/dma.h +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-iop33x/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Intel Corp. | ||
| 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 | */ | ||
diff --git a/arch/arm/mach-iop33x/include/mach/io.h b/arch/arm/mach-iop33x/include/mach/io.h index 158874631217..e99a7ed6d050 100644 --- a/arch/arm/mach-iop33x/include/mach/io.h +++ b/arch/arm/mach-iop33x/include/mach/io.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #ifndef __IO_H | 11 | #ifndef __IO_H |
| 12 | #define __IO_H | 12 | #define __IO_H |
| 13 | 13 | ||
| 14 | #include <mach/hardware.h> | 14 | #include <asm/hardware/iop3xx.h> |
| 15 | 15 | ||
| 16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, | 16 | extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size, |
| 17 | unsigned int mtype); | 17 | unsigned int mtype); |
diff --git a/arch/arm/mach-iop33x/include/mach/memory.h b/arch/arm/mach-iop33x/include/mach/memory.h index 2cef0bbb354f..a30a96aa6d2d 100644 --- a/arch/arm/mach-iop33x/include/mach/memory.h +++ b/arch/arm/mach-iop33x/include/mach/memory.h | |||
| @@ -5,22 +5,9 @@ | |||
| 5 | #ifndef __MEMORY_H | 5 | #ifndef __MEMORY_H |
| 6 | #define __MEMORY_H | 6 | #define __MEMORY_H |
| 7 | 7 | ||
| 8 | #include <mach/hardware.h> | ||
| 9 | |||
| 10 | /* | 8 | /* |
| 11 | * Physical DRAM offset. | 9 | * Physical DRAM offset. |
| 12 | */ | 10 | */ |
| 13 | #define PHYS_OFFSET UL(0x00000000) | 11 | #define PHYS_OFFSET UL(0x00000000) |
| 14 | 12 | ||
| 15 | /* | ||
| 16 | * Virtual view <-> PCI DMA view memory address translations | ||
| 17 | * virt_to_bus: Used to translate the virtual address to an | ||
| 18 | * address suitable to be passed to set_dma_addr | ||
| 19 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 20 | * to an address that the kernel can use. | ||
| 21 | */ | ||
| 22 | #define __virt_to_bus(x) (__virt_to_phys(x)) | ||
| 23 | #define __bus_to_virt(x) (__phys_to_virt(x)) | ||
| 24 | |||
| 25 | |||
| 26 | #endif | 13 | #endif |
diff --git a/arch/arm/mach-iop33x/include/mach/system.h b/arch/arm/mach-iop33x/include/mach/system.h index 7bf3bfb49446..0cb3ad862acd 100644 --- a/arch/arm/mach-iop33x/include/mach/system.h +++ b/arch/arm/mach-iop33x/include/mach/system.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #include <asm/hardware/iop3xx.h> | ||
| 10 | 11 | ||
| 11 | static inline void arch_idle(void) | 12 | static inline void arch_idle(void) |
| 12 | { | 13 | { |
diff --git a/arch/arm/mach-iop33x/include/mach/timex.h b/arch/arm/mach-iop33x/include/mach/timex.h index c75760844d49..54c589091d6e 100644 --- a/arch/arm/mach-iop33x/include/mach/timex.h +++ b/arch/arm/mach-iop33x/include/mach/timex.h | |||
| @@ -3,7 +3,4 @@ | |||
| 3 | * | 3 | * |
| 4 | * IOP3xx architecture timex specifications | 4 | * IOP3xx architecture timex specifications |
| 5 | */ | 5 | */ |
| 6 | |||
| 7 | #include <mach/hardware.h> | ||
| 8 | |||
| 9 | #define CLOCK_TICK_RATE (100 * HZ) | 6 | #define CLOCK_TICK_RATE (100 * HZ) |
diff --git a/arch/arm/mach-ixp2000/include/mach/dma.h b/arch/arm/mach-ixp2000/include/mach/dma.h deleted file mode 100644 index 26063d60f622..000000000000 --- a/arch/arm/mach-ixp2000/include/mach/dma.h +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ixp2000/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2002 Intel Corp. | ||
| 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 | */ | ||
diff --git a/arch/arm/mach-ixp2000/include/mach/memory.h b/arch/arm/mach-ixp2000/include/mach/memory.h index 241529a7c52d..aee7eb8a71b2 100644 --- a/arch/arm/mach-ixp2000/include/mach/memory.h +++ b/arch/arm/mach-ixp2000/include/mach/memory.h | |||
| @@ -15,13 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | #define PHYS_OFFSET UL(0x00000000) | 16 | #define PHYS_OFFSET UL(0x00000000) |
| 17 | 17 | ||
| 18 | /* | ||
| 19 | * Virtual view <-> DMA view memory address translations | ||
| 20 | * virt_to_bus: Used to translate the virtual address to an | ||
| 21 | * address suitable to be passed to set_dma_addr | ||
| 22 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 23 | * to an address that the kernel can use. | ||
| 24 | */ | ||
| 25 | #include <mach/ixp2000-regs.h> | 18 | #include <mach/ixp2000-regs.h> |
| 26 | 19 | ||
| 27 | #define __virt_to_bus(v) \ | 20 | #define __virt_to_bus(v) \ |
diff --git a/arch/arm/mach-ixp23xx/include/mach/dma.h b/arch/arm/mach-ixp23xx/include/mach/dma.h deleted file mode 100644 index 8886544b93f7..000000000000 --- a/arch/arm/mach-ixp23xx/include/mach/dma.h +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ixp23xx/include/mach/dma.h | ||
| 3 | */ | ||
diff --git a/arch/arm/mach-ixp23xx/include/mach/io.h b/arch/arm/mach-ixp23xx/include/mach/io.h index 305ea1808c71..fd9ef8e519f7 100644 --- a/arch/arm/mach-ixp23xx/include/mach/io.h +++ b/arch/arm/mach-ixp23xx/include/mach/io.h | |||
| @@ -20,8 +20,6 @@ | |||
| 20 | #define __io(p) ((void __iomem*)((p) + IXP23XX_PCI_IO_VIRT)) | 20 | #define __io(p) ((void __iomem*)((p) + IXP23XX_PCI_IO_VIRT)) |
| 21 | #define __mem_pci(a) (a) | 21 | #define __mem_pci(a) (a) |
| 22 | 22 | ||
| 23 | #include <linux/kernel.h> /* For BUG */ | ||
| 24 | |||
| 25 | static inline void __iomem * | 23 | static inline void __iomem * |
| 26 | ixp23xx_ioremap(unsigned long addr, unsigned long size, unsigned int mtype) | 24 | ixp23xx_ioremap(unsigned long addr, unsigned long size, unsigned int mtype) |
| 27 | { | 25 | { |
diff --git a/arch/arm/mach-ixp23xx/include/mach/memory.h b/arch/arm/mach-ixp23xx/include/mach/memory.h index 9d40115f7ebe..fdd138706c70 100644 --- a/arch/arm/mach-ixp23xx/include/mach/memory.h +++ b/arch/arm/mach-ixp23xx/include/mach/memory.h | |||
| @@ -19,16 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | #define PHYS_OFFSET (0x00000000) | 20 | #define PHYS_OFFSET (0x00000000) |
| 21 | 21 | ||
| 22 | |||
| 23 | /* | ||
| 24 | * Virtual view <-> DMA view memory address translations | ||
| 25 | * virt_to_bus: Used to translate the virtual address to an | ||
| 26 | * address suitable to be passed to set_dma_addr | ||
| 27 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 28 | * to an address that the kernel can use. | ||
| 29 | */ | ||
| 30 | #ifndef __ASSEMBLY__ | ||
| 31 | |||
| 32 | #define __virt_to_bus(v) \ | 22 | #define __virt_to_bus(v) \ |
| 33 | ({ unsigned int ret; \ | 23 | ({ unsigned int ret; \ |
| 34 | ret = ((__virt_to_phys(v) - 0x00000000) + \ | 24 | ret = ((__virt_to_phys(v) - 0x00000000) + \ |
| @@ -43,6 +33,3 @@ | |||
| 43 | #define arch_is_coherent() 1 | 33 | #define arch_is_coherent() 1 |
| 44 | 34 | ||
| 45 | #endif | 35 | #endif |
| 46 | |||
| 47 | |||
| 48 | #endif | ||
diff --git a/arch/arm/mach-ixp4xx/include/mach/dma.h b/arch/arm/mach-ixp4xx/include/mach/dma.h deleted file mode 100644 index 00c5070c0201..000000000000 --- a/arch/arm/mach-ixp4xx/include/mach/dma.h +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ixp4xx/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2001-2004 MontaVista Software, Inc. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | */ | ||
| 11 | #ifndef __ASM_ARCH_DMA_H | ||
| 12 | #define __ASM_ARCH_DMA_H | ||
| 13 | |||
| 14 | #include <linux/device.h> | ||
| 15 | #include <asm/page.h> | ||
| 16 | #include <asm/sizes.h> | ||
| 17 | #include <mach/hardware.h> | ||
| 18 | |||
| 19 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) | ||
| 20 | |||
| 21 | #endif /* _ASM_ARCH_DMA_H */ | ||
diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h index 319948e31bec..ce63048d45eb 100644 --- a/arch/arm/mach-ixp4xx/include/mach/io.h +++ b/arch/arm/mach-ixp4xx/include/mach/io.h | |||
| @@ -49,8 +49,6 @@ extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data); | |||
| 49 | 49 | ||
| 50 | #else | 50 | #else |
| 51 | 51 | ||
| 52 | #include <linux/mm.h> | ||
| 53 | |||
| 54 | /* | 52 | /* |
| 55 | * In the case of using indirect PCI, we simply return the actual PCI | 53 | * In the case of using indirect PCI, we simply return the actual PCI |
| 56 | * address and our read/write implementation use that to drive the | 54 | * address and our read/write implementation use that to drive the |
| @@ -241,7 +239,7 @@ __ixp4xx_readsl(const volatile void __iomem *bus_addr, u32 *vaddr, u32 count) | |||
| 241 | 239 | ||
| 242 | #ifndef CONFIG_PCI | 240 | #ifndef CONFIG_PCI |
| 243 | 241 | ||
| 244 | #define __io(v) v | 242 | #define __io(v) __typesafe_io(v) |
| 245 | 243 | ||
| 246 | #else | 244 | #else |
| 247 | 245 | ||
diff --git a/arch/arm/mach-ixp4xx/include/mach/memory.h b/arch/arm/mach-ixp4xx/include/mach/memory.h index c4d2830ac987..98f5e5e20980 100644 --- a/arch/arm/mach-ixp4xx/include/mach/memory.h +++ b/arch/arm/mach-ixp4xx/include/mach/memory.h | |||
| @@ -22,19 +22,8 @@ void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes); | |||
| 22 | ixp4xx_adjust_zones(node, size, holes) | 22 | ixp4xx_adjust_zones(node, size, holes) |
| 23 | 23 | ||
| 24 | #define ISA_DMA_THRESHOLD (SZ_64M - 1) | 24 | #define ISA_DMA_THRESHOLD (SZ_64M - 1) |
| 25 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) | ||
| 25 | 26 | ||
| 26 | #endif | 27 | #endif |
| 27 | 28 | ||
| 28 | /* | ||
| 29 | * Virtual view <-> DMA view memory address translations | ||
| 30 | * virt_to_bus: Used to translate the virtual address to an | ||
| 31 | * address suitable to be passed to set_dma_addr | ||
| 32 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 33 | * to an address that the kernel can use. | ||
| 34 | * | ||
| 35 | * These are dummies for now. | ||
| 36 | */ | ||
| 37 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 38 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 39 | |||
| 40 | #endif | 29 | #endif |
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 0bb1fbd84ccb..7b8ef97fb501 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
| @@ -57,6 +57,7 @@ void __init kirkwood_map_io(void) | |||
| 57 | ****************************************************************************/ | 57 | ****************************************************************************/ |
| 58 | static struct orion_ehci_data kirkwood_ehci_data = { | 58 | static struct orion_ehci_data kirkwood_ehci_data = { |
| 59 | .dram = &kirkwood_mbus_dram_info, | 59 | .dram = &kirkwood_mbus_dram_info, |
| 60 | .phy_version = EHCI_PHY_NA, | ||
| 60 | }; | 61 | }; |
| 61 | 62 | ||
| 62 | static u64 ehci_dmamask = 0xffffffffUL; | 63 | static u64 ehci_dmamask = 0xffffffffUL; |
| @@ -153,6 +154,64 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data) | |||
| 153 | 154 | ||
| 154 | 155 | ||
| 155 | /***************************************************************************** | 156 | /***************************************************************************** |
| 157 | * GE01 | ||
| 158 | ****************************************************************************/ | ||
| 159 | struct mv643xx_eth_shared_platform_data kirkwood_ge01_shared_data = { | ||
| 160 | .dram = &kirkwood_mbus_dram_info, | ||
| 161 | .shared_smi = &kirkwood_ge00_shared, | ||
| 162 | }; | ||
| 163 | |||
| 164 | static struct resource kirkwood_ge01_shared_resources[] = { | ||
| 165 | { | ||
| 166 | .name = "ge01 base", | ||
| 167 | .start = GE01_PHYS_BASE + 0x2000, | ||
| 168 | .end = GE01_PHYS_BASE + 0x3fff, | ||
| 169 | .flags = IORESOURCE_MEM, | ||
| 170 | }, { | ||
| 171 | .name = "ge01 err irq", | ||
| 172 | .start = IRQ_KIRKWOOD_GE01_ERR, | ||
| 173 | .end = IRQ_KIRKWOOD_GE01_ERR, | ||
| 174 | .flags = IORESOURCE_IRQ, | ||
| 175 | }, | ||
| 176 | }; | ||
| 177 | |||
| 178 | static struct platform_device kirkwood_ge01_shared = { | ||
| 179 | .name = MV643XX_ETH_SHARED_NAME, | ||
| 180 | .id = 1, | ||
| 181 | .dev = { | ||
| 182 | .platform_data = &kirkwood_ge01_shared_data, | ||
| 183 | }, | ||
| 184 | .num_resources = ARRAY_SIZE(kirkwood_ge01_shared_resources), | ||
| 185 | .resource = kirkwood_ge01_shared_resources, | ||
| 186 | }; | ||
| 187 | |||
| 188 | static struct resource kirkwood_ge01_resources[] = { | ||
| 189 | { | ||
| 190 | .name = "ge01 irq", | ||
| 191 | .start = IRQ_KIRKWOOD_GE01_SUM, | ||
| 192 | .end = IRQ_KIRKWOOD_GE01_SUM, | ||
| 193 | .flags = IORESOURCE_IRQ, | ||
| 194 | }, | ||
| 195 | }; | ||
| 196 | |||
| 197 | static struct platform_device kirkwood_ge01 = { | ||
| 198 | .name = MV643XX_ETH_NAME, | ||
| 199 | .id = 1, | ||
| 200 | .num_resources = 1, | ||
| 201 | .resource = kirkwood_ge01_resources, | ||
| 202 | }; | ||
| 203 | |||
| 204 | void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data) | ||
| 205 | { | ||
| 206 | eth_data->shared = &kirkwood_ge01_shared; | ||
| 207 | kirkwood_ge01.dev.platform_data = eth_data; | ||
| 208 | |||
| 209 | platform_device_register(&kirkwood_ge01_shared); | ||
| 210 | platform_device_register(&kirkwood_ge01); | ||
| 211 | } | ||
| 212 | |||
| 213 | |||
| 214 | /***************************************************************************** | ||
| 156 | * Ethernet switch | 215 | * Ethernet switch |
| 157 | ****************************************************************************/ | 216 | ****************************************************************************/ |
| 158 | static struct resource kirkwood_switch_resources[] = { | 217 | static struct resource kirkwood_switch_resources[] = { |
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 5774632a67e3..fe367c18e722 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h | |||
| @@ -30,6 +30,7 @@ void kirkwood_pcie_id(u32 *dev, u32 *rev); | |||
| 30 | 30 | ||
| 31 | void kirkwood_ehci_init(void); | 31 | void kirkwood_ehci_init(void); |
| 32 | void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); | 32 | void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); |
| 33 | void kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 33 | void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq); | 34 | void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq); |
| 34 | void kirkwood_pcie_init(void); | 35 | void kirkwood_pcie_init(void); |
| 35 | void kirkwood_rtc_init(void); | 36 | void kirkwood_rtc_init(void); |
diff --git a/arch/arm/mach-kirkwood/include/mach/dma.h b/arch/arm/mach-kirkwood/include/mach/dma.h deleted file mode 100644 index 40a8c178f10d..000000000000 --- a/arch/arm/mach-kirkwood/include/mach/dma.h +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | /* empty */ | ||
diff --git a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h index ffab89f21c11..3a964bb14973 100644 --- a/arch/arm/mach-kirkwood/include/mach/irqs.h +++ b/arch/arm/mach-kirkwood/include/mach/irqs.h | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #define IRQ_KIRKWOOD_GPIO_HIGH_8_15 40 | 51 | #define IRQ_KIRKWOOD_GPIO_HIGH_8_15 40 |
| 52 | #define IRQ_KIRKWOOD_GPIO_HIGH_16_23 41 | 52 | #define IRQ_KIRKWOOD_GPIO_HIGH_16_23 41 |
| 53 | #define IRQ_KIRKWOOD_GE00_ERR 46 | 53 | #define IRQ_KIRKWOOD_GE00_ERR 46 |
| 54 | #define IRQ_KIRKWOOD_GE01_ERR 47 | ||
| 54 | 55 | ||
| 55 | /* | 56 | /* |
| 56 | * KIRKWOOD General Purpose Pins | 57 | * KIRKWOOD General Purpose Pins |
diff --git a/arch/arm/mach-kirkwood/include/mach/memory.h b/arch/arm/mach-kirkwood/include/mach/memory.h index b5fb34bdccd5..45431e131465 100644 --- a/arch/arm/mach-kirkwood/include/mach/memory.h +++ b/arch/arm/mach-kirkwood/include/mach/memory.h | |||
| @@ -7,8 +7,4 @@ | |||
| 7 | 7 | ||
| 8 | #define PHYS_OFFSET UL(0x00000000) | 8 | #define PHYS_OFFSET UL(0x00000000) |
| 9 | 9 | ||
| 10 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 11 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 12 | |||
| 13 | |||
| 14 | #endif | 10 | #endif |
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index 175054abd630..9a0e905d10cd 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c | |||
| @@ -80,24 +80,38 @@ static struct dsa_platform_data rd88f6281_switch_data = { | |||
| 80 | .port_names[1] = "lan2", | 80 | .port_names[1] = "lan2", |
| 81 | .port_names[2] = "lan3", | 81 | .port_names[2] = "lan3", |
| 82 | .port_names[3] = "lan4", | 82 | .port_names[3] = "lan4", |
| 83 | .port_names[4] = "wan", | ||
| 84 | .port_names[5] = "cpu", | 83 | .port_names[5] = "cpu", |
| 85 | }; | 84 | }; |
| 86 | 85 | ||
| 86 | static struct mv643xx_eth_platform_data rd88f6281_ge01_data = { | ||
| 87 | .phy_addr = MV643XX_ETH_PHY_ADDR(11), | ||
| 88 | }; | ||
| 89 | |||
| 87 | static struct mv_sata_platform_data rd88f6281_sata_data = { | 90 | static struct mv_sata_platform_data rd88f6281_sata_data = { |
| 88 | .n_ports = 2, | 91 | .n_ports = 2, |
| 89 | }; | 92 | }; |
| 90 | 93 | ||
| 91 | static void __init rd88f6281_init(void) | 94 | static void __init rd88f6281_init(void) |
| 92 | { | 95 | { |
| 96 | u32 dev, rev; | ||
| 97 | |||
| 93 | /* | 98 | /* |
| 94 | * Basic setup. Needs to be called early. | 99 | * Basic setup. Needs to be called early. |
| 95 | */ | 100 | */ |
| 96 | kirkwood_init(); | 101 | kirkwood_init(); |
| 97 | 102 | ||
| 98 | kirkwood_ehci_init(); | 103 | kirkwood_ehci_init(); |
| 104 | |||
| 99 | kirkwood_ge00_init(&rd88f6281_ge00_data); | 105 | kirkwood_ge00_init(&rd88f6281_ge00_data); |
| 106 | kirkwood_pcie_id(&dev, &rev); | ||
| 107 | if (rev == MV88F6281_REV_A0) { | ||
| 108 | rd88f6281_switch_data.sw_addr = 10; | ||
| 109 | kirkwood_ge01_init(&rd88f6281_ge01_data); | ||
| 110 | } else { | ||
| 111 | rd88f6281_switch_data.port_names[4] = "wan"; | ||
| 112 | } | ||
| 100 | kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ); | 113 | kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ); |
| 114 | |||
| 101 | kirkwood_rtc_init(); | 115 | kirkwood_rtc_init(); |
| 102 | kirkwood_sata_init(&rd88f6281_sata_data); | 116 | kirkwood_sata_init(&rd88f6281_sata_data); |
| 103 | kirkwood_uart0_init(); | 117 | kirkwood_uart0_init(); |
diff --git a/arch/arm/mach-ks8695/Kconfig b/arch/arm/mach-ks8695/Kconfig index ce1cf8de2b4d..2754daabda55 100644 --- a/arch/arm/mach-ks8695/Kconfig +++ b/arch/arm/mach-ks8695/Kconfig | |||
| @@ -8,6 +8,12 @@ config MACH_KS8695 | |||
| 8 | Say 'Y' here if you want your kernel to run on the original | 8 | Say 'Y' here if you want your kernel to run on the original |
| 9 | Kendin-Micrel KS8695 development board. | 9 | Kendin-Micrel KS8695 development board. |
| 10 | 10 | ||
| 11 | config MACH_DSM320 | ||
| 12 | bool "DSM-320 Wireless Media Player" | ||
| 13 | help | ||
| 14 | Say 'Y' here if you want your kernel to run on the D-Link | ||
| 15 | DSM-320 Wireless Media Player. | ||
| 16 | |||
| 11 | endmenu | 17 | endmenu |
| 12 | 18 | ||
| 13 | endif | 19 | endif |
diff --git a/arch/arm/mach-ks8695/Makefile b/arch/arm/mach-ks8695/Makefile index ade42b73afbb..f735d2cc0294 100644 --- a/arch/arm/mach-ks8695/Makefile +++ b/arch/arm/mach-ks8695/Makefile | |||
| @@ -16,3 +16,4 @@ obj-$(CONFIG_LEDS) += leds.o | |||
| 16 | 16 | ||
| 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 | ||
diff --git a/arch/arm/mach-ks8695/board-dsm320.c b/arch/arm/mach-ks8695/board-dsm320.c new file mode 100644 index 000000000000..521ff0789f39 --- /dev/null +++ b/arch/arm/mach-ks8695/board-dsm320.c | |||
| @@ -0,0 +1,131 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ks8695/board-dsm320.c | ||
| 3 | * | ||
| 4 | * DSM-320 D-Link Wireless Media Player, board support. | ||
| 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/mtd/mtd.h> | ||
| 21 | #include <linux/mtd/map.h> | ||
| 22 | #include <linux/mtd/physmap.h> | ||
| 23 | #include <linux/mtd/partitions.h> | ||
| 24 | |||
| 25 | #include <asm/mach-types.h> | ||
| 26 | |||
| 27 | #include <asm/mach/arch.h> | ||
| 28 | #include <asm/mach/map.h> | ||
| 29 | #include <asm/mach/irq.h> | ||
| 30 | |||
| 31 | #include <mach/devices.h> | ||
| 32 | #include <mach/gpio.h> | ||
| 33 | |||
| 34 | #include "generic.h" | ||
| 35 | |||
| 36 | #ifdef CONFIG_PCI | ||
| 37 | static int dsm320_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
| 38 | { | ||
| 39 | switch (slot) { | ||
| 40 | case 0: | ||
| 41 | /* PCI-AHB bridge? */ | ||
| 42 | return KS8695_IRQ_EXTERN0; | ||
| 43 | case 18: | ||
| 44 | /* Mini PCI slot */ | ||
| 45 | return KS8695_IRQ_EXTERN2; | ||
| 46 | case 20: | ||
| 47 | /* RealMAGIC chip */ | ||
| 48 | return KS8695_IRQ_EXTERN0; | ||
| 49 | } | ||
| 50 | BUG(); | ||
| 51 | } | ||
| 52 | |||
| 53 | static struct ks8695_pci_cfg __initdata dsm320_pci = { | ||
| 54 | .mode = KS8695_MODE_MINIPCI, | ||
| 55 | .map_irq = dsm320_pci_map_irq, | ||
| 56 | }; | ||
| 57 | |||
| 58 | static void __init dsm320_register_pci(void) | ||
| 59 | { | ||
| 60 | /* Initialise the GPIO lines for interrupt mode */ | ||
| 61 | /* RealMAGIC */ | ||
| 62 | ks8695_gpio_interrupt(KS8695_GPIO_0, IRQ_TYPE_LEVEL_LOW); | ||
| 63 | /* MiniPCI Slot */ | ||
| 64 | ks8695_gpio_interrupt(KS8695_GPIO_2, IRQ_TYPE_LEVEL_LOW); | ||
| 65 | |||
| 66 | ks8695_init_pci(&dsm320_pci); | ||
| 67 | } | ||
| 68 | |||
| 69 | #else | ||
| 70 | static inline void __init dsm320_register_pci(void) { } | ||
| 71 | #endif | ||
| 72 | |||
| 73 | static struct physmap_flash_data dsm320_nor_pdata = { | ||
| 74 | .width = 4, | ||
| 75 | .nr_parts = 0, | ||
| 76 | }; | ||
| 77 | |||
| 78 | static struct resource dsm320_nor_resource[] = { | ||
| 79 | [0] = { | ||
| 80 | .start = SZ_32M, /* We expect the bootloader to map | ||
| 81 | * the flash here. | ||
| 82 | */ | ||
| 83 | .end = SZ_32M + SZ_4M - 1, | ||
| 84 | .flags = IORESOURCE_MEM, | ||
| 85 | } | ||
| 86 | }; | ||
| 87 | |||
| 88 | static struct platform_device dsm320_device_nor = { | ||
| 89 | .name = "physmap-flash", | ||
| 90 | .id = -1, | ||
| 91 | .num_resources = ARRAY_SIZE(dsm320_nor_resource), | ||
| 92 | .resource = dsm320_nor_resource, | ||
| 93 | .dev = { | ||
| 94 | .platform_data = &dsm320_nor_pdata, | ||
| 95 | }, | ||
| 96 | }; | ||
| 97 | |||
| 98 | void __init dsm320_register_nor(void) | ||
| 99 | { | ||
| 100 | int ret; | ||
| 101 | |||
| 102 | ret = platform_device_register(&dsm320_device_nor); | ||
| 103 | if (ret < 0) | ||
| 104 | printk(KERN_ERR "failed to register physmap-flash device\n"); | ||
| 105 | } | ||
| 106 | |||
| 107 | static void __init dsm320_init(void) | ||
| 108 | { | ||
| 109 | /* GPIO registration */ | ||
| 110 | ks8695_register_gpios(); | ||
| 111 | |||
| 112 | /* PCI registration */ | ||
| 113 | dsm320_register_pci(); | ||
| 114 | |||
| 115 | /* Network device */ | ||
| 116 | ks8695_add_device_lan(); /* eth0 = LAN */ | ||
| 117 | |||
| 118 | /* NOR devices */ | ||
| 119 | dsm320_register_nor(); | ||
| 120 | } | ||
| 121 | |||
| 122 | MACHINE_START(DSM320, "D-Link DSM-320 Wireless Media Player") | ||
| 123 | /* Maintainer: Simtec Electronics. */ | ||
| 124 | .phys_io = KS8695_IO_PA, | ||
| 125 | .io_pg_offst = (KS8695_IO_VA >> 18) & 0xfffc, | ||
| 126 | .boot_params = KS8695_SDRAM_PA + 0x100, | ||
| 127 | .map_io = ks8695_map_io, | ||
| 128 | .init_irq = ks8695_init_irq, | ||
| 129 | .init_machine = dsm320_init, | ||
| 130 | .timer = &ks8695_timer, | ||
| 131 | MACHINE_END | ||
diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c index 0468e93b7d3b..8ceaf5ac6e2c 100644 --- a/arch/arm/mach-ks8695/board-micrel.c +++ b/arch/arm/mach-ks8695/board-micrel.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <asm/mach/map.h> | 18 | #include <asm/mach/map.h> |
| 19 | #include <asm/mach/irq.h> | 19 | #include <asm/mach/irq.h> |
| 20 | 20 | ||
| 21 | #include <mach/gpio.h> | ||
| 21 | #include <mach/devices.h> | 22 | #include <mach/devices.h> |
| 22 | 23 | ||
| 23 | #include "generic.h" | 24 | #include "generic.h" |
| @@ -39,6 +40,8 @@ static void __init micrel_init(void) | |||
| 39 | { | 40 | { |
| 40 | printk(KERN_INFO "Micrel KS8695 Development Board initializing\n"); | 41 | printk(KERN_INFO "Micrel KS8695 Development Board initializing\n"); |
| 41 | 42 | ||
| 43 | ks8695_register_gpios(); | ||
| 44 | |||
| 42 | #ifdef CONFIG_PCI | 45 | #ifdef CONFIG_PCI |
| 43 | ks8695_init_pci(&micrel_pci); | 46 | ks8695_init_pci(&micrel_pci); |
| 44 | #endif | 47 | #endif |
diff --git a/arch/arm/mach-ks8695/devices.c b/arch/arm/mach-ks8695/devices.c index 4bd251482c8f..36ab0fd3d9b6 100644 --- a/arch/arm/mach-ks8695/devices.c +++ b/arch/arm/mach-ks8695/devices.c | |||
| @@ -25,19 +25,20 @@ | |||
| 25 | #include <mach/regs-wan.h> | 25 | #include <mach/regs-wan.h> |
| 26 | #include <mach/regs-lan.h> | 26 | #include <mach/regs-lan.h> |
| 27 | #include <mach/regs-hpna.h> | 27 | #include <mach/regs-hpna.h> |
| 28 | #include <mach/regs-switch.h> | ||
| 29 | #include <mach/regs-misc.h> | ||
| 28 | 30 | ||
| 29 | 31 | ||
| 30 | /* -------------------------------------------------------------------- | 32 | /* -------------------------------------------------------------------- |
| 31 | * Ethernet | 33 | * Ethernet |
| 32 | * -------------------------------------------------------------------- */ | 34 | * -------------------------------------------------------------------- */ |
| 33 | 35 | ||
| 34 | #if defined(CONFIG_ARM_KS8695_ETHER) || defined(CONFIG_ARM_KS8695_ETHER_MODULE) | ||
| 35 | static u64 eth_dmamask = 0xffffffffUL; | 36 | static u64 eth_dmamask = 0xffffffffUL; |
| 36 | 37 | ||
| 37 | static struct resource ks8695_wan_resources[] = { | 38 | static struct resource ks8695_wan_resources[] = { |
| 38 | [0] = { | 39 | [0] = { |
| 39 | .start = KS8695_WAN_VA, | 40 | .start = KS8695_WAN_PA, |
| 40 | .end = KS8695_WAN_VA + 0x00ff, | 41 | .end = KS8695_WAN_PA + 0x00ff, |
| 41 | .flags = IORESOURCE_MEM, | 42 | .flags = IORESOURCE_MEM, |
| 42 | }, | 43 | }, |
| 43 | [1] = { | 44 | [1] = { |
| @@ -58,6 +59,12 @@ static struct resource ks8695_wan_resources[] = { | |||
| 58 | .end = KS8695_IRQ_WAN_LINK, | 59 | .end = KS8695_IRQ_WAN_LINK, |
| 59 | .flags = IORESOURCE_IRQ, | 60 | .flags = IORESOURCE_IRQ, |
| 60 | }, | 61 | }, |
| 62 | [4] = { | ||
| 63 | .name = "WAN PHY", | ||
| 64 | .start = KS8695_MISC_PA, | ||
| 65 | .end = KS8695_MISC_PA + 0x1f, | ||
| 66 | .flags = IORESOURCE_MEM, | ||
| 67 | }, | ||
| 61 | }; | 68 | }; |
| 62 | 69 | ||
| 63 | static struct platform_device ks8695_wan_device = { | 70 | static struct platform_device ks8695_wan_device = { |
| @@ -74,8 +81,8 @@ static struct platform_device ks8695_wan_device = { | |||
| 74 | 81 | ||
| 75 | static struct resource ks8695_lan_resources[] = { | 82 | static struct resource ks8695_lan_resources[] = { |
| 76 | [0] = { | 83 | [0] = { |
| 77 | .start = KS8695_LAN_VA, | 84 | .start = KS8695_LAN_PA, |
| 78 | .end = KS8695_LAN_VA + 0x00ff, | 85 | .end = KS8695_LAN_PA + 0x00ff, |
| 79 | .flags = IORESOURCE_MEM, | 86 | .flags = IORESOURCE_MEM, |
| 80 | }, | 87 | }, |
| 81 | [1] = { | 88 | [1] = { |
| @@ -90,6 +97,12 @@ static struct resource ks8695_lan_resources[] = { | |||
| 90 | .end = KS8695_IRQ_LAN_TX_STATUS, | 97 | .end = KS8695_IRQ_LAN_TX_STATUS, |
| 91 | .flags = IORESOURCE_IRQ, | 98 | .flags = IORESOURCE_IRQ, |
| 92 | }, | 99 | }, |
| 100 | [3] = { | ||
| 101 | .name = "LAN SWITCH", | ||
| 102 | .start = KS8695_SWITCH_PA, | ||
| 103 | .end = KS8695_SWITCH_PA + 0x4f, | ||
| 104 | .flags = IORESOURCE_MEM, | ||
| 105 | }, | ||
| 93 | }; | 106 | }; |
| 94 | 107 | ||
| 95 | static struct platform_device ks8695_lan_device = { | 108 | static struct platform_device ks8695_lan_device = { |
| @@ -106,8 +119,8 @@ static struct platform_device ks8695_lan_device = { | |||
| 106 | 119 | ||
| 107 | static struct resource ks8695_hpna_resources[] = { | 120 | static struct resource ks8695_hpna_resources[] = { |
| 108 | [0] = { | 121 | [0] = { |
| 109 | .start = KS8695_HPNA_VA, | 122 | .start = KS8695_HPNA_PA, |
| 110 | .end = KS8695_HPNA_VA + 0x00ff, | 123 | .end = KS8695_HPNA_PA + 0x00ff, |
| 111 | .flags = IORESOURCE_MEM, | 124 | .flags = IORESOURCE_MEM, |
| 112 | }, | 125 | }, |
| 113 | [1] = { | 126 | [1] = { |
| @@ -149,18 +162,12 @@ void __init ks8696_add_device_hpna(void) | |||
| 149 | { | 162 | { |
| 150 | platform_device_register(&ks8695_hpna_device); | 163 | platform_device_register(&ks8695_hpna_device); |
| 151 | } | 164 | } |
| 152 | #else | ||
| 153 | void __init ks8695_add_device_wan(void) {} | ||
| 154 | void __init ks8695_add_device_lan(void) {} | ||
| 155 | void __init ks8696_add_device_hpna(void) {} | ||
| 156 | #endif | ||
| 157 | 165 | ||
| 158 | 166 | ||
| 159 | /* -------------------------------------------------------------------- | 167 | /* -------------------------------------------------------------------- |
| 160 | * Watchdog | 168 | * Watchdog |
| 161 | * -------------------------------------------------------------------- */ | 169 | * -------------------------------------------------------------------- */ |
| 162 | 170 | ||
| 163 | #if defined(CONFIG_KS8695_WATCHDOG) || defined(CONFIG_KS8695_WATCHDOG_MODULE) | ||
| 164 | static struct platform_device ks8695_wdt_device = { | 171 | static struct platform_device ks8695_wdt_device = { |
| 165 | .name = "ks8695_wdt", | 172 | .name = "ks8695_wdt", |
| 166 | .id = -1, | 173 | .id = -1, |
| @@ -171,9 +178,6 @@ static void __init ks8695_add_device_watchdog(void) | |||
| 171 | { | 178 | { |
| 172 | platform_device_register(&ks8695_wdt_device); | 179 | platform_device_register(&ks8695_wdt_device); |
| 173 | } | 180 | } |
| 174 | #else | ||
| 175 | static void __init ks8695_add_device_watchdog(void) {} | ||
| 176 | #endif | ||
| 177 | 181 | ||
| 178 | 182 | ||
| 179 | /* -------------------------------------------------------------------- | 183 | /* -------------------------------------------------------------------- |
| @@ -190,7 +194,7 @@ void __init ks8695_init_leds(u8 cpu_led, u8 timer_led) | |||
| 190 | gpio_direction_output(cpu_led, 1); | 194 | gpio_direction_output(cpu_led, 1); |
| 191 | gpio_direction_output(timer_led, 1); | 195 | gpio_direction_output(timer_led, 1); |
| 192 | 196 | ||
| 193 | ks8695_leds_cpu = cpu_led; | 197 | ks8695_leds_cpu = cpu_led; |
| 194 | ks8695_leds_timer = timer_led; | 198 | ks8695_leds_timer = timer_led; |
| 195 | } | 199 | } |
| 196 | #else | 200 | #else |
diff --git a/arch/arm/mach-ks8695/gpio.c b/arch/arm/mach-ks8695/gpio.c index 9aecf0c4b8b1..55fbf7111a5b 100644 --- a/arch/arm/mach-ks8695/gpio.c +++ b/arch/arm/mach-ks8695/gpio.c | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | * arch/arm/mach-ks8695/gpio.c | 2 | * arch/arm/mach-ks8695/gpio.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2006 Andrew Victor | 4 | * Copyright (C) 2006 Andrew Victor |
| 5 | * Updated to GPIOLIB, Copyright 2008 Simtec Electronics | ||
| 6 | * Daniel Silverstone <dsilvers@simtec.co.uk> | ||
| 5 | * | 7 | * |
| 6 | * This program is free software; you can redistribute it and/or modify | 8 | * 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 | 9 | * it under the terms of the GNU General Public License version 2 as |
| @@ -35,7 +37,7 @@ | |||
| 35 | * Configure a GPIO line for either GPIO function, or its internal | 37 | * Configure a GPIO line for either GPIO function, or its internal |
| 36 | * function (Interrupt, Timer, etc). | 38 | * function (Interrupt, Timer, etc). |
| 37 | */ | 39 | */ |
| 38 | static void __init_or_module ks8695_gpio_mode(unsigned int pin, short gpio) | 40 | static void ks8695_gpio_mode(unsigned int pin, short gpio) |
| 39 | { | 41 | { |
| 40 | unsigned int enable[] = { IOPC_IOEINT0EN, IOPC_IOEINT1EN, IOPC_IOEINT2EN, IOPC_IOEINT3EN, IOPC_IOTIM0EN, IOPC_IOTIM1EN }; | 42 | unsigned int enable[] = { IOPC_IOEINT0EN, IOPC_IOEINT1EN, IOPC_IOEINT2EN, IOPC_IOEINT3EN, IOPC_IOTIM0EN, IOPC_IOTIM1EN }; |
| 41 | unsigned long x, flags; | 43 | unsigned long x, flags; |
| @@ -61,7 +63,7 @@ static unsigned short gpio_irq[] = { KS8695_IRQ_EXTERN0, KS8695_IRQ_EXTERN1, KS8 | |||
| 61 | /* | 63 | /* |
| 62 | * Configure GPIO pin as external interrupt source. | 64 | * Configure GPIO pin as external interrupt source. |
| 63 | */ | 65 | */ |
| 64 | int __init_or_module ks8695_gpio_interrupt(unsigned int pin, unsigned int type) | 66 | int ks8695_gpio_interrupt(unsigned int pin, unsigned int type) |
| 65 | { | 67 | { |
| 66 | unsigned long x, flags; | 68 | unsigned long x, flags; |
| 67 | 69 | ||
| @@ -94,7 +96,7 @@ EXPORT_SYMBOL(ks8695_gpio_interrupt); | |||
| 94 | /* | 96 | /* |
| 95 | * Configure the GPIO line as an input. | 97 | * Configure the GPIO line as an input. |
| 96 | */ | 98 | */ |
| 97 | int __init_or_module gpio_direction_input(unsigned int pin) | 99 | static int ks8695_gpio_direction_input(struct gpio_chip *gc, unsigned int pin) |
| 98 | { | 100 | { |
| 99 | unsigned long x, flags; | 101 | unsigned long x, flags; |
| 100 | 102 | ||
| @@ -115,13 +117,13 @@ int __init_or_module gpio_direction_input(unsigned int pin) | |||
| 115 | 117 | ||
| 116 | return 0; | 118 | return 0; |
| 117 | } | 119 | } |
| 118 | EXPORT_SYMBOL(gpio_direction_input); | ||
| 119 | 120 | ||
| 120 | 121 | ||
| 121 | /* | 122 | /* |
| 122 | * Configure the GPIO line as an output, with default state. | 123 | * Configure the GPIO line as an output, with default state. |
| 123 | */ | 124 | */ |
| 124 | int __init_or_module gpio_direction_output(unsigned int pin, unsigned int state) | 125 | static int ks8695_gpio_direction_output(struct gpio_chip *gc, |
| 126 | unsigned int pin, int state) | ||
| 125 | { | 127 | { |
| 126 | unsigned long x, flags; | 128 | unsigned long x, flags; |
| 127 | 129 | ||
| @@ -150,13 +152,13 @@ int __init_or_module gpio_direction_output(unsigned int pin, unsigned int state) | |||
| 150 | 152 | ||
| 151 | return 0; | 153 | return 0; |
| 152 | } | 154 | } |
| 153 | EXPORT_SYMBOL(gpio_direction_output); | ||
| 154 | 155 | ||
| 155 | 156 | ||
| 156 | /* | 157 | /* |
| 157 | * Set the state of an output GPIO line. | 158 | * Set the state of an output GPIO line. |
| 158 | */ | 159 | */ |
| 159 | void gpio_set_value(unsigned int pin, unsigned int state) | 160 | static void ks8695_gpio_set_value(struct gpio_chip *gc, |
| 161 | unsigned int pin, int state) | ||
| 160 | { | 162 | { |
| 161 | unsigned long x, flags; | 163 | unsigned long x, flags; |
| 162 | 164 | ||
| @@ -175,13 +177,12 @@ void gpio_set_value(unsigned int pin, unsigned int state) | |||
| 175 | 177 | ||
| 176 | local_irq_restore(flags); | 178 | local_irq_restore(flags); |
| 177 | } | 179 | } |
| 178 | EXPORT_SYMBOL(gpio_set_value); | ||
| 179 | 180 | ||
| 180 | 181 | ||
| 181 | /* | 182 | /* |
| 182 | * Read the state of a GPIO line. | 183 | * Read the state of a GPIO line. |
| 183 | */ | 184 | */ |
| 184 | int gpio_get_value(unsigned int pin) | 185 | static int ks8695_gpio_get_value(struct gpio_chip *gc, unsigned int pin) |
| 185 | { | 186 | { |
| 186 | unsigned long x; | 187 | unsigned long x; |
| 187 | 188 | ||
| @@ -191,21 +192,18 @@ int gpio_get_value(unsigned int pin) | |||
| 191 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD); | 192 | x = __raw_readl(KS8695_GPIO_VA + KS8695_IOPD); |
| 192 | return (x & IOPD(pin)) != 0; | 193 | return (x & IOPD(pin)) != 0; |
| 193 | } | 194 | } |
| 194 | EXPORT_SYMBOL(gpio_get_value); | ||
| 195 | 195 | ||
| 196 | 196 | ||
| 197 | /* | 197 | /* |
| 198 | * Map GPIO line to IRQ number. | 198 | * Map GPIO line to IRQ number. |
| 199 | */ | 199 | */ |
| 200 | int gpio_to_irq(unsigned int pin) | 200 | static int ks8695_gpio_to_irq(struct gpio_chip *gc, unsigned int pin) |
| 201 | { | 201 | { |
| 202 | if (pin > KS8695_GPIO_3) /* only GPIO 0..3 can generate IRQ */ | 202 | if (pin > KS8695_GPIO_3) /* only GPIO 0..3 can generate IRQ */ |
| 203 | return -EINVAL; | 203 | return -EINVAL; |
| 204 | 204 | ||
| 205 | return gpio_irq[pin]; | 205 | return gpio_irq[pin]; |
| 206 | } | 206 | } |
| 207 | EXPORT_SYMBOL(gpio_to_irq); | ||
| 208 | |||
| 209 | 207 | ||
| 210 | /* | 208 | /* |
| 211 | * Map IRQ number to GPIO line. | 209 | * Map IRQ number to GPIO line. |
| @@ -219,6 +217,26 @@ int irq_to_gpio(unsigned int irq) | |||
| 219 | } | 217 | } |
| 220 | EXPORT_SYMBOL(irq_to_gpio); | 218 | EXPORT_SYMBOL(irq_to_gpio); |
| 221 | 219 | ||
| 220 | /* GPIOLIB interface */ | ||
| 221 | |||
| 222 | static struct gpio_chip ks8695_gpio_chip = { | ||
| 223 | .label = "KS8695", | ||
| 224 | .direction_input = ks8695_gpio_direction_input, | ||
| 225 | .direction_output = ks8695_gpio_direction_output, | ||
| 226 | .get = ks8695_gpio_get_value, | ||
| 227 | .set = ks8695_gpio_set_value, | ||
| 228 | .to_irq = ks8695_gpio_to_irq, | ||
| 229 | .base = 0, | ||
| 230 | .ngpio = 16, | ||
| 231 | .can_sleep = 0, | ||
| 232 | }; | ||
| 233 | |||
| 234 | /* Register the GPIOs */ | ||
| 235 | void ks8695_register_gpios(void) | ||
| 236 | { | ||
| 237 | if (gpiochip_add(&ks8695_gpio_chip)) | ||
| 238 | printk(KERN_ERR "Unable to register core GPIOs\n"); | ||
| 239 | } | ||
| 222 | 240 | ||
| 223 | /* .... Debug interface ..................................................... */ | 241 | /* .... Debug interface ..................................................... */ |
| 224 | 242 | ||
diff --git a/arch/arm/mach-ks8695/include/mach/dma.h b/arch/arm/mach-ks8695/include/mach/dma.h deleted file mode 100644 index 561206280089..000000000000 --- a/arch/arm/mach-ks8695/include/mach/dma.h +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ks8695/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License as published by | ||
| 6 | * the Free Software Foundation; either version 2 of the License, or | ||
| 7 | * (at your option) any later version. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope that it will be useful, | ||
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | * GNU General Public License for more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License | ||
| 15 | * along with this program; if not, write to the Free Software | ||
| 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 17 | */ | ||
diff --git a/arch/arm/mach-ks8695/include/mach/gpio.h b/arch/arm/mach-ks8695/include/mach/gpio.h index d4af5c335f16..86312d476bc6 100644 --- a/arch/arm/mach-ks8695/include/mach/gpio.h +++ b/arch/arm/mach-ks8695/include/mach/gpio.h | |||
| @@ -30,53 +30,28 @@ | |||
| 30 | #define KS8695_GPIO_14 14 | 30 | #define KS8695_GPIO_14 14 |
| 31 | #define KS8695_GPIO_15 15 | 31 | #define KS8695_GPIO_15 15 |
| 32 | 32 | ||
| 33 | |||
| 34 | /* | 33 | /* |
| 35 | * Configure GPIO pin as external interrupt source. | 34 | * Configure GPIO pin as external interrupt source. |
| 36 | */ | 35 | */ |
| 37 | int __init_or_module ks8695_gpio_interrupt(unsigned int pin, unsigned int type); | 36 | extern int ks8695_gpio_interrupt(unsigned int pin, unsigned int type); |
| 38 | |||
| 39 | /* | ||
| 40 | * Configure the GPIO line as an input. | ||
| 41 | */ | ||
| 42 | int __init_or_module gpio_direction_input(unsigned int pin); | ||
| 43 | |||
| 44 | /* | ||
| 45 | * Configure the GPIO line as an output, with default state. | ||
| 46 | */ | ||
| 47 | int __init_or_module gpio_direction_output(unsigned int pin, unsigned int state); | ||
| 48 | |||
| 49 | /* | ||
| 50 | * Set the state of an output GPIO line. | ||
| 51 | */ | ||
| 52 | void gpio_set_value(unsigned int pin, unsigned int state); | ||
| 53 | |||
| 54 | /* | ||
| 55 | * Read the state of a GPIO line. | ||
| 56 | */ | ||
| 57 | int gpio_get_value(unsigned int pin); | ||
| 58 | |||
| 59 | /* | ||
| 60 | * Map GPIO line to IRQ number. | ||
| 61 | */ | ||
| 62 | int gpio_to_irq(unsigned int pin); | ||
| 63 | 37 | ||
| 64 | /* | 38 | /* |
| 65 | * Map IRQ number to GPIO line. | 39 | * Map IRQ number to GPIO line. |
| 66 | */ | 40 | */ |
| 67 | int irq_to_gpio(unsigned int irq); | 41 | extern int irq_to_gpio(unsigned int irq); |
| 68 | |||
| 69 | 42 | ||
| 70 | #include <asm-generic/gpio.h> | 43 | #include <asm-generic/gpio.h> |
| 71 | 44 | ||
| 72 | static inline int gpio_request(unsigned int pin, const char *label) | 45 | /* If it turns out that we need to optimise GPIO access for the |
| 73 | { | 46 | * Micrel's GPIOs, then these can be changed to check their argument |
| 74 | return 0; | 47 | * directly as static inlines. However for now it's probably not |
| 75 | } | 48 | * worthwhile. |
| 49 | */ | ||
| 50 | #define gpio_get_value __gpio_get_value | ||
| 51 | #define gpio_set_value __gpio_set_value | ||
| 52 | #define gpio_to_irq __gpio_to_irq | ||
| 76 | 53 | ||
| 77 | static inline void gpio_free(unsigned int pin) | 54 | /* Register the GPIOs */ |
| 78 | { | 55 | extern void ks8695_register_gpios(void); |
| 79 | might_sleep(); | ||
| 80 | } | ||
| 81 | 56 | ||
| 82 | #endif | 57 | #endif |
diff --git a/arch/arm/mach-ks8695/include/mach/io.h b/arch/arm/mach-ks8695/include/mach/io.h index f364f24ffe1e..a7a63ac3ba4e 100644 --- a/arch/arm/mach-ks8695/include/mach/io.h +++ b/arch/arm/mach-ks8695/include/mach/io.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #define IO_SPACE_LIMIT 0xffffffff | 14 | #define IO_SPACE_LIMIT 0xffffffff |
| 15 | 15 | ||
| 16 | #define __io(a) ((void __iomem *)(a)) | 16 | #define __io(a) __typesafe_io(a) |
| 17 | #define __mem_pci(a) (a) | 17 | #define __mem_pci(a) (a) |
| 18 | 18 | ||
| 19 | #endif | 19 | #endif |
diff --git a/arch/arm/mach-ks8695/include/mach/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h index 8fbc4c76c38b..6d5887cf5742 100644 --- a/arch/arm/mach-ks8695/include/mach/memory.h +++ b/arch/arm/mach-ks8695/include/mach/memory.h | |||
| @@ -37,11 +37,6 @@ extern struct bus_type platform_bus_type; | |||
| 37 | (dma_addr_t)__virt_to_phys(x) : (dma_addr_t)__virt_to_bus(x); }) | 37 | (dma_addr_t)__virt_to_phys(x) : (dma_addr_t)__virt_to_bus(x); }) |
| 38 | #define __arch_page_to_dma(dev, x) __arch_virt_to_dma(dev, page_address(x)) | 38 | #define __arch_page_to_dma(dev, x) __arch_virt_to_dma(dev, page_address(x)) |
| 39 | 39 | ||
| 40 | #else | ||
| 41 | |||
| 42 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 43 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 44 | |||
| 45 | #endif | 40 | #endif |
| 46 | 41 | ||
| 47 | #endif | 42 | #endif |
diff --git a/arch/arm/mach-l7200/include/mach/dma.h b/arch/arm/mach-l7200/include/mach/dma.h deleted file mode 100644 index c7e48bd4590c..000000000000 --- a/arch/arm/mach-l7200/include/mach/dma.h +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-l7200/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2000 Steve Hill (sjhill@cotw.com) | ||
| 5 | * | ||
| 6 | * Changelog: | ||
| 7 | * 08-29-2000 SJH Created | ||
| 8 | */ | ||
| 9 | #ifndef __ASM_ARCH_DMA_H | ||
| 10 | #define __ASM_ARCH_DMA_H | ||
| 11 | |||
| 12 | /* DMA is not yet implemented! It should be the same as acorn, copy over.. */ | ||
| 13 | |||
| 14 | /* | ||
| 15 | * This is the maximum DMA address that can be DMAd to. | ||
| 16 | * There should not be more than (0xd0000000 - 0xc0000000) | ||
| 17 | * bytes of RAM. | ||
| 18 | */ | ||
| 19 | #define MAX_DMA_ADDRESS 0xd0000000 | ||
| 20 | |||
| 21 | #define DMA_S0 0 | ||
| 22 | |||
| 23 | #endif /* _ASM_ARCH_DMA_H */ | ||
diff --git a/arch/arm/mach-l7200/include/mach/io.h b/arch/arm/mach-l7200/include/mach/io.h index d432ba9e5dff..a770a89fb708 100644 --- a/arch/arm/mach-l7200/include/mach/io.h +++ b/arch/arm/mach-l7200/include/mach/io.h | |||
| @@ -10,18 +10,12 @@ | |||
| 10 | #ifndef __ASM_ARM_ARCH_IO_H | 10 | #ifndef __ASM_ARM_ARCH_IO_H |
| 11 | #define __ASM_ARM_ARCH_IO_H | 11 | #define __ASM_ARM_ARCH_IO_H |
| 12 | 12 | ||
| 13 | #include <mach/hardware.h> | ||
| 14 | |||
| 15 | #define IO_SPACE_LIMIT 0xffffffff | 13 | #define IO_SPACE_LIMIT 0xffffffff |
| 16 | 14 | ||
| 17 | /* | 15 | /* |
| 18 | * There are not real ISA nor PCI buses, so we fake it. | 16 | * There are not real ISA nor PCI buses, so we fake it. |
| 19 | */ | 17 | */ |
| 20 | static inline void __iomem *__io(unsigned long addr) | 18 | #define __io(a) __typesafe_io(a) |
| 21 | { | 19 | #define __mem_pci(a) (a) |
| 22 | return (void __iomem *)addr; | ||
| 23 | } | ||
| 24 | #define __io(a) __io(a) | ||
| 25 | #define __mem_pci(a) (a) | ||
| 26 | 20 | ||
| 27 | #endif | 21 | #endif |
diff --git a/arch/arm/mach-l7200/include/mach/memory.h b/arch/arm/mach-l7200/include/mach/memory.h index f338cf3ffd93..9fb40ed2f03b 100644 --- a/arch/arm/mach-l7200/include/mach/memory.h +++ b/arch/arm/mach-l7200/include/mach/memory.h | |||
| @@ -17,9 +17,6 @@ | |||
| 17 | */ | 17 | */ |
| 18 | #define PHYS_OFFSET UL(0xf0000000) | 18 | #define PHYS_OFFSET UL(0xf0000000) |
| 19 | 19 | ||
| 20 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 21 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 22 | |||
| 23 | /* | 20 | /* |
| 24 | * Cache flushing area - ROM | 21 | * Cache flushing area - ROM |
| 25 | */ | 22 | */ |
diff --git a/arch/arm/mach-lh7a40x/clocks.c b/arch/arm/mach-lh7a40x/clocks.c index 4fb23ac6b5ac..6182f5410b4d 100644 --- a/arch/arm/mach-lh7a40x/clocks.c +++ b/arch/arm/mach-lh7a40x/clocks.c | |||
| @@ -14,21 +14,14 @@ | |||
| 14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
| 15 | 15 | ||
| 16 | struct module; | 16 | struct module; |
| 17 | struct icst525_params; | ||
| 18 | 17 | ||
| 19 | struct clk { | 18 | struct clk { |
| 20 | struct list_head node; | 19 | struct list_head node; |
| 21 | unsigned long rate; | 20 | unsigned long rate; |
| 22 | struct module *owner; | 21 | struct module *owner; |
| 23 | const char *name; | 22 | const char *name; |
| 24 | // void *data; | ||
| 25 | // const struct icst525_params *params; | ||
| 26 | // void (*setvco)(struct clk *, struct icst525_vco vco); | ||
| 27 | }; | 23 | }; |
| 28 | 24 | ||
| 29 | int clk_register(struct clk *clk); | ||
| 30 | void clk_unregister(struct clk *clk); | ||
| 31 | |||
| 32 | /* ----- */ | 25 | /* ----- */ |
| 33 | 26 | ||
| 34 | #define MAINDIV1(c) (((c) >> 7) & 0x0f) | 27 | #define MAINDIV1(c) (((c) >> 7) & 0x0f) |
| @@ -79,31 +72,15 @@ unsigned int pclkfreq_get (void) | |||
| 79 | 72 | ||
| 80 | /* ----- */ | 73 | /* ----- */ |
| 81 | 74 | ||
| 82 | static LIST_HEAD(clocks); | ||
| 83 | static DECLARE_MUTEX(clocks_sem); | ||
| 84 | |||
| 85 | struct clk *clk_get (struct device *dev, const char *id) | 75 | struct clk *clk_get (struct device *dev, const char *id) |
| 86 | { | 76 | { |
| 87 | struct clk *p; | 77 | return dev && strcmp(dev_name(dev), "cldc-lh7a40x") == 0 |
| 88 | struct clk *clk = ERR_PTR(-ENOENT); | 78 | ? NULL : ERR_PTR(-ENOENT); |
| 89 | |||
| 90 | down (&clocks_sem); | ||
| 91 | list_for_each_entry (p, &clocks, node) { | ||
| 92 | if (strcmp (id, p->name) == 0 | ||
| 93 | && try_module_get(p->owner)) { | ||
| 94 | clk = p; | ||
| 95 | break; | ||
| 96 | } | ||
| 97 | } | ||
| 98 | up (&clocks_sem); | ||
| 99 | |||
| 100 | return clk; | ||
| 101 | } | 79 | } |
| 102 | EXPORT_SYMBOL(clk_get); | 80 | EXPORT_SYMBOL(clk_get); |
| 103 | 81 | ||
| 104 | void clk_put (struct clk *clk) | 82 | void clk_put (struct clk *clk) |
| 105 | { | 83 | { |
| 106 | module_put(clk->owner); | ||
| 107 | } | 84 | } |
| 108 | EXPORT_SYMBOL(clk_put); | 85 | EXPORT_SYMBOL(clk_put); |
| 109 | 86 | ||
| @@ -118,20 +95,9 @@ void clk_disable (struct clk *clk) | |||
| 118 | } | 95 | } |
| 119 | EXPORT_SYMBOL(clk_disable); | 96 | EXPORT_SYMBOL(clk_disable); |
| 120 | 97 | ||
| 121 | int clk_use (struct clk *clk) | ||
| 122 | { | ||
| 123 | return 0; | ||
| 124 | } | ||
| 125 | EXPORT_SYMBOL(clk_use); | ||
| 126 | |||
| 127 | void clk_unuse (struct clk *clk) | ||
| 128 | { | ||
| 129 | } | ||
| 130 | EXPORT_SYMBOL(clk_unuse); | ||
| 131 | |||
| 132 | unsigned long clk_get_rate (struct clk *clk) | 98 | unsigned long clk_get_rate (struct clk *clk) |
| 133 | { | 99 | { |
| 134 | return clk->rate; | 100 | return 0; |
| 135 | } | 101 | } |
| 136 | EXPORT_SYMBOL(clk_get_rate); | 102 | EXPORT_SYMBOL(clk_get_rate); |
| 137 | 103 | ||
| @@ -143,56 +109,6 @@ EXPORT_SYMBOL(clk_round_rate); | |||
| 143 | 109 | ||
| 144 | int clk_set_rate (struct clk *clk, unsigned long rate) | 110 | int clk_set_rate (struct clk *clk, unsigned long rate) |
| 145 | { | 111 | { |
| 146 | int ret = -EIO; | 112 | return -EIO; |
| 147 | return ret; | ||
| 148 | } | 113 | } |
| 149 | EXPORT_SYMBOL(clk_set_rate); | 114 | EXPORT_SYMBOL(clk_set_rate); |
| 150 | |||
| 151 | #if 0 | ||
| 152 | /* | ||
| 153 | * These are fixed clocks. | ||
| 154 | */ | ||
| 155 | static struct clk kmi_clk = { | ||
| 156 | .name = "KMIREFCLK", | ||
| 157 | .rate = 24000000, | ||
| 158 | }; | ||
| 159 | |||
| 160 | static struct clk uart_clk = { | ||
| 161 | .name = "UARTCLK", | ||
| 162 | .rate = 24000000, | ||
| 163 | }; | ||
| 164 | |||
| 165 | static struct clk mmci_clk = { | ||
| 166 | .name = "MCLK", | ||
| 167 | .rate = 33000000, | ||
| 168 | }; | ||
| 169 | #endif | ||
| 170 | |||
| 171 | static struct clk clcd_clk = { | ||
| 172 | .name = "CLCDCLK", | ||
| 173 | .rate = 0, | ||
| 174 | }; | ||
| 175 | |||
| 176 | int clk_register (struct clk *clk) | ||
| 177 | { | ||
| 178 | down (&clocks_sem); | ||
| 179 | list_add (&clk->node, &clocks); | ||
| 180 | up (&clocks_sem); | ||
| 181 | return 0; | ||
| 182 | } | ||
| 183 | EXPORT_SYMBOL(clk_register); | ||
| 184 | |||
| 185 | void clk_unregister (struct clk *clk) | ||
| 186 | { | ||
| 187 | down (&clocks_sem); | ||
| 188 | list_del (&clk->node); | ||
| 189 | up (&clocks_sem); | ||
| 190 | } | ||
| 191 | EXPORT_SYMBOL(clk_unregister); | ||
| 192 | |||
| 193 | static int __init clk_init (void) | ||
| 194 | { | ||
| 195 | clk_register(&clcd_clk); | ||
| 196 | return 0; | ||
| 197 | } | ||
| 198 | arch_initcall(clk_init); | ||
diff --git a/arch/arm/mach-lh7a40x/include/mach/io.h b/arch/arm/mach-lh7a40x/include/mach/io.h index 031d26f9163c..6ece45911cbc 100644 --- a/arch/arm/mach-lh7a40x/include/mach/io.h +++ b/arch/arm/mach-lh7a40x/include/mach/io.h | |||
| @@ -11,12 +11,10 @@ | |||
| 11 | #ifndef __ASM_ARCH_IO_H | 11 | #ifndef __ASM_ARCH_IO_H |
| 12 | #define __ASM_ARCH_IO_H | 12 | #define __ASM_ARCH_IO_H |
| 13 | 13 | ||
| 14 | #include <mach/hardware.h> | ||
| 15 | |||
| 16 | #define IO_SPACE_LIMIT 0xffffffff | 14 | #define IO_SPACE_LIMIT 0xffffffff |
| 17 | 15 | ||
| 18 | /* No ISA or PCI bus on this machine. */ | 16 | /* No ISA or PCI bus on this machine. */ |
| 19 | #define __io(a) ((void __iomem *)(a)) | 17 | #define __io(a) __typesafe_io(a) |
| 20 | #define __mem_pci(a) (a) | 18 | #define __mem_pci(a) (a) |
| 21 | 19 | ||
| 22 | #endif /* __ASM_ARCH_IO_H */ | 20 | #endif /* __ASM_ARCH_IO_H */ |
diff --git a/arch/arm/mach-lh7a40x/include/mach/memory.h b/arch/arm/mach-lh7a40x/include/mach/memory.h index 1da14ff66c93..189d20e543e7 100644 --- a/arch/arm/mach-lh7a40x/include/mach/memory.h +++ b/arch/arm/mach-lh7a40x/include/mach/memory.h | |||
| @@ -19,16 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | #define PHYS_OFFSET UL(0xc0000000) | 20 | #define PHYS_OFFSET UL(0xc0000000) |
| 21 | 21 | ||
| 22 | /* | ||
| 23 | * Virtual view <-> DMA view memory address translations | ||
| 24 | * virt_to_bus: Used to translate the virtual address to an | ||
| 25 | * address suitable to be passed to set_dma_addr | ||
| 26 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 27 | * to an address that the kernel can use. | ||
| 28 | */ | ||
| 29 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 30 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 31 | |||
| 32 | #ifdef CONFIG_DISCONTIGMEM | 22 | #ifdef CONFIG_DISCONTIGMEM |
| 33 | 23 | ||
| 34 | /* | 24 | /* |
diff --git a/arch/arm/mach-loki/include/mach/dma.h b/arch/arm/mach-loki/include/mach/dma.h deleted file mode 100644 index 40a8c178f10d..000000000000 --- a/arch/arm/mach-loki/include/mach/dma.h +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | /* empty */ | ||
diff --git a/arch/arm/mach-loki/include/mach/memory.h b/arch/arm/mach-loki/include/mach/memory.h index a39533ab489d..2ed7e6e732c2 100644 --- a/arch/arm/mach-loki/include/mach/memory.h +++ b/arch/arm/mach-loki/include/mach/memory.h | |||
| @@ -7,8 +7,4 @@ | |||
| 7 | 7 | ||
| 8 | #define PHYS_OFFSET UL(0x00000000) | 8 | #define PHYS_OFFSET UL(0x00000000) |
| 9 | 9 | ||
| 10 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 11 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 12 | |||
| 13 | |||
| 14 | #endif | 10 | #endif |
diff --git a/arch/arm/mach-msm/include/mach/io.h b/arch/arm/mach-msm/include/mach/io.h index c6a2feb268b0..aab964591db4 100644 --- a/arch/arm/mach-msm/include/mach/io.h +++ b/arch/arm/mach-msm/include/mach/io.h | |||
| @@ -23,11 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | void __iomem *__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype); | 24 | void __iomem *__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype); |
| 25 | 25 | ||
| 26 | static inline void __iomem *__io(unsigned long addr) | 26 | #define __io(a) __typesafe_io(a) |
| 27 | { | ||
| 28 | return (void __iomem *)addr; | ||
| 29 | } | ||
| 30 | #define __io(a) __io(a) | ||
| 31 | #define __mem_pci(a) (a) | 27 | #define __mem_pci(a) (a) |
| 32 | 28 | ||
| 33 | #endif | 29 | #endif |
diff --git a/arch/arm/mach-msm/include/mach/memory.h b/arch/arm/mach-msm/include/mach/memory.h index 63fd47f2e62e..f4698baec976 100644 --- a/arch/arm/mach-msm/include/mach/memory.h +++ b/arch/arm/mach-msm/include/mach/memory.h | |||
| @@ -19,9 +19,5 @@ | |||
| 19 | /* physical offset of RAM */ | 19 | /* physical offset of RAM */ |
| 20 | #define PHYS_OFFSET UL(0x10000000) | 20 | #define PHYS_OFFSET UL(0x10000000) |
| 21 | 21 | ||
| 22 | /* bus address and physical addresses are identical */ | ||
| 23 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 24 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 25 | |||
| 26 | #endif | 22 | #endif |
| 27 | 23 | ||
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index 238a2f8c2d52..b0e4e0d8f506 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c | |||
| @@ -167,6 +167,7 @@ void __init mv78xx0_map_io(void) | |||
| 167 | ****************************************************************************/ | 167 | ****************************************************************************/ |
| 168 | static struct orion_ehci_data mv78xx0_ehci_data = { | 168 | static struct orion_ehci_data mv78xx0_ehci_data = { |
| 169 | .dram = &mv78xx0_mbus_dram_info, | 169 | .dram = &mv78xx0_mbus_dram_info, |
| 170 | .phy_version = EHCI_PHY_NA, | ||
| 170 | }; | 171 | }; |
| 171 | 172 | ||
| 172 | static u64 ehci_dmamask = 0xffffffffUL; | 173 | static u64 ehci_dmamask = 0xffffffffUL; |
diff --git a/arch/arm/mach-mv78xx0/include/mach/dma.h b/arch/arm/mach-mv78xx0/include/mach/dma.h deleted file mode 100644 index 40a8c178f10d..000000000000 --- a/arch/arm/mach-mv78xx0/include/mach/dma.h +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | /* empty */ | ||
diff --git a/arch/arm/mach-mv78xx0/include/mach/memory.h b/arch/arm/mach-mv78xx0/include/mach/memory.h index 9e47a140ff7a..e663042d307f 100644 --- a/arch/arm/mach-mv78xx0/include/mach/memory.h +++ b/arch/arm/mach-mv78xx0/include/mach/memory.h | |||
| @@ -7,8 +7,4 @@ | |||
| 7 | 7 | ||
| 8 | #define PHYS_OFFSET UL(0x00000000) | 8 | #define PHYS_OFFSET UL(0x00000000) |
| 9 | 9 | ||
| 10 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 11 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 12 | |||
| 13 | |||
| 14 | #endif | 10 | #endif |
diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c index bd0559d5933e..092e09baeefa 100644 --- a/arch/arm/mach-mx2/devices.c +++ b/arch/arm/mach-mx2/devices.c | |||
| @@ -190,6 +190,21 @@ struct platform_device mxc_wdt = { | |||
| 190 | .resource = mxc_wdt_resources, | 190 | .resource = mxc_wdt_resources, |
| 191 | }; | 191 | }; |
| 192 | 192 | ||
| 193 | static struct resource mxc_w1_master_resources[] = { | ||
| 194 | { | ||
| 195 | .start = OWIRE_BASE_ADDR, | ||
| 196 | .end = OWIRE_BASE_ADDR + SZ_4K - 1, | ||
| 197 | .flags = IORESOURCE_MEM, | ||
| 198 | }, | ||
| 199 | }; | ||
| 200 | |||
| 201 | struct platform_device mxc_w1_master_device = { | ||
| 202 | .name = "mxc_w1", | ||
| 203 | .id = 0, | ||
| 204 | .num_resources = ARRAY_SIZE(mxc_w1_master_resources), | ||
| 205 | .resource = mxc_w1_master_resources, | ||
| 206 | }; | ||
| 207 | |||
| 193 | /* GPIO port description */ | 208 | /* GPIO port description */ |
| 194 | static struct mxc_gpio_port imx_gpio_ports[] = { | 209 | static struct mxc_gpio_port imx_gpio_ports[] = { |
| 195 | [0] = { | 210 | [0] = { |
diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h index c77a4b8f73b4..5683c4574325 100644 --- a/arch/arm/mach-mx2/devices.h +++ b/arch/arm/mach-mx2/devices.h | |||
| @@ -12,4 +12,4 @@ extern struct platform_device mxc_uart_device2; | |||
| 12 | extern struct platform_device mxc_uart_device3; | 12 | extern struct platform_device mxc_uart_device3; |
| 13 | extern struct platform_device mxc_uart_device4; | 13 | extern struct platform_device mxc_uart_device4; |
| 14 | extern struct platform_device mxc_uart_device5; | 14 | extern struct platform_device mxc_uart_device5; |
| 15 | 15 | extern struct platform_device mxc_w1_master_device; | |
diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c index 7f55746e2591..ac516b1d3f77 100644 --- a/arch/arm/mach-mx2/pcm038.c +++ b/arch/arm/mach-mx2/pcm038.c | |||
| @@ -168,6 +168,7 @@ static void gpio_fec_inactive(void) | |||
| 168 | 168 | ||
| 169 | static struct platform_device *platform_devices[] __initdata = { | 169 | static struct platform_device *platform_devices[] __initdata = { |
| 170 | &pcm038_nor_mtd_device, | 170 | &pcm038_nor_mtd_device, |
| 171 | &mxc_w1_master_device, | ||
| 171 | }; | 172 | }; |
| 172 | 173 | ||
| 173 | static void __init pcm038_init(void) | 174 | static void __init pcm038_init(void) |
| @@ -177,6 +178,7 @@ static void __init pcm038_init(void) | |||
| 177 | mxc_register_device(&mxc_uart_device0, &uart_pdata[0]); | 178 | mxc_register_device(&mxc_uart_device0, &uart_pdata[0]); |
| 178 | mxc_register_device(&mxc_uart_device1, &uart_pdata[1]); | 179 | mxc_register_device(&mxc_uart_device1, &uart_pdata[1]); |
| 179 | mxc_register_device(&mxc_uart_device2, &uart_pdata[2]); | 180 | mxc_register_device(&mxc_uart_device2, &uart_pdata[2]); |
| 181 | mxc_gpio_mode(PE16_AF_RTCK); /* OWIRE */ | ||
| 180 | 182 | ||
| 181 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 183 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
| 182 | 184 | ||
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index a6bdcc07f3c9..12b3e3c00460 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c | |||
| @@ -145,3 +145,18 @@ int __init mxc_register_gpios(void) | |||
| 145 | { | 145 | { |
| 146 | return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports)); | 146 | return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports)); |
| 147 | } | 147 | } |
| 148 | |||
| 149 | static struct resource mxc_w1_master_resources[] = { | ||
| 150 | { | ||
| 151 | .start = OWIRE_BASE_ADDR, | ||
| 152 | .end = OWIRE_BASE_ADDR + SZ_4K - 1, | ||
| 153 | .flags = IORESOURCE_MEM, | ||
| 154 | }, | ||
| 155 | }; | ||
| 156 | |||
| 157 | struct platform_device mxc_w1_master_device = { | ||
| 158 | .name = "mxc_w1", | ||
| 159 | .id = 0, | ||
| 160 | .num_resources = ARRAY_SIZE(mxc_w1_master_resources), | ||
| 161 | .resource = mxc_w1_master_resources, | ||
| 162 | }; | ||
diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h index 4dc03f9e6001..cb1459c7c960 100644 --- a/arch/arm/mach-mx3/devices.h +++ b/arch/arm/mach-mx3/devices.h | |||
| @@ -4,3 +4,4 @@ extern struct platform_device mxc_uart_device1; | |||
| 4 | extern struct platform_device mxc_uart_device2; | 4 | extern struct platform_device mxc_uart_device2; |
| 5 | extern struct platform_device mxc_uart_device3; | 5 | extern struct platform_device mxc_uart_device3; |
| 6 | extern struct platform_device mxc_uart_device4; | 6 | extern struct platform_device mxc_uart_device4; |
| 7 | extern struct platform_device mxc_w1_master_device; | ||
diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c index 843f68c8ead1..8cd1fdf1897c 100644 --- a/arch/arm/mach-mx3/pcm037.c +++ b/arch/arm/mach-mx3/pcm037.c | |||
| @@ -81,6 +81,9 @@ static void __init mxc_board_init(void) | |||
| 81 | mxc_iomux_mode(MX31_PIN_CSPI3_MISO__TXD3); | 81 | mxc_iomux_mode(MX31_PIN_CSPI3_MISO__TXD3); |
| 82 | 82 | ||
| 83 | mxc_register_device(&mxc_uart_device2, &uart_pdata); | 83 | mxc_register_device(&mxc_uart_device2, &uart_pdata); |
| 84 | |||
| 85 | mxc_iomux_mode(MX31_PIN_BATT_LINE__OWIRE); | ||
| 86 | mxc_register_device(&mxc_w1_master_device, NULL); | ||
| 84 | } | 87 | } |
| 85 | 88 | ||
| 86 | /* | 89 | /* |
diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c index 24c79650f9f3..8f1f992f002e 100644 --- a/arch/arm/mach-netx/fb.c +++ b/arch/arm/mach-netx/fb.c | |||
| @@ -22,14 +22,11 @@ | |||
| 22 | #include <linux/dma-mapping.h> | 22 | #include <linux/dma-mapping.h> |
| 23 | #include <linux/amba/bus.h> | 23 | #include <linux/amba/bus.h> |
| 24 | #include <linux/amba/clcd.h> | 24 | #include <linux/amba/clcd.h> |
| 25 | #include <linux/err.h> | ||
| 25 | 26 | ||
| 26 | #include <mach/netx-regs.h> | 27 | #include <mach/netx-regs.h> |
| 27 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
| 28 | 29 | ||
| 29 | struct clk {}; | ||
| 30 | |||
| 31 | static struct clk fb_clk; | ||
| 32 | |||
| 33 | static struct clcd_panel *netx_panel; | 30 | static struct clcd_panel *netx_panel; |
| 34 | 31 | ||
| 35 | void netx_clcd_enable(struct clcd_fb *fb) | 32 | void netx_clcd_enable(struct clcd_fb *fb) |
| @@ -85,7 +82,7 @@ int clk_enable(struct clk *clk) | |||
| 85 | 82 | ||
| 86 | struct clk *clk_get(struct device *dev, const char *id) | 83 | struct clk *clk_get(struct device *dev, const char *id) |
| 87 | { | 84 | { |
| 88 | return &fb_clk; | 85 | return dev && strcmp(dev_name(dev), "fb") == 0 ? NULL : ERR_PTR(-ENOENT); |
| 89 | } | 86 | } |
| 90 | 87 | ||
| 91 | void clk_put(struct clk *clk) | 88 | void clk_put(struct clk *clk) |
diff --git a/arch/arm/mach-netx/include/mach/dma.h b/arch/arm/mach-netx/include/mach/dma.h deleted file mode 100644 index 690b3ebc43ac..000000000000 --- a/arch/arm/mach-netx/include/mach/dma.h +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-netx/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix | ||
| 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 | ||
| 8 | * as 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 | #define MAX_DMA_CHANNELS 0 | ||
| 21 | #define MAX_DMA_ADDRESS ~0 | ||
diff --git a/arch/arm/mach-netx/include/mach/io.h b/arch/arm/mach-netx/include/mach/io.h index 468b92a82585..c3921cb3b6a6 100644 --- a/arch/arm/mach-netx/include/mach/io.h +++ b/arch/arm/mach-netx/include/mach/io.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #define IO_SPACE_LIMIT 0xffffffff | 23 | #define IO_SPACE_LIMIT 0xffffffff |
| 24 | 24 | ||
| 25 | #define __io(a) ((void __iomem *)(a)) | 25 | #define __io(a) __typesafe_io(a) |
| 26 | #define __mem_pci(a) (a) | 26 | #define __mem_pci(a) (a) |
| 27 | 27 | ||
| 28 | #endif | 28 | #endif |
diff --git a/arch/arm/mach-netx/include/mach/memory.h b/arch/arm/mach-netx/include/mach/memory.h index 53745a1378de..9a363f297f90 100644 --- a/arch/arm/mach-netx/include/mach/memory.h +++ b/arch/arm/mach-netx/include/mach/memory.h | |||
| @@ -22,15 +22,5 @@ | |||
| 22 | 22 | ||
| 23 | #define PHYS_OFFSET UL(0x80000000) | 23 | #define PHYS_OFFSET UL(0x80000000) |
| 24 | 24 | ||
| 25 | /* | ||
| 26 | * Virtual view <-> DMA view memory address translations | ||
| 27 | * virt_to_bus: Used to translate the virtual address to an | ||
| 28 | * address suitable to be passed to set_dma_addr | ||
| 29 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 30 | * to an address that the kernel can use. | ||
| 31 | */ | ||
| 32 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 33 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 34 | |||
| 35 | #endif | 25 | #endif |
| 36 | 26 | ||
diff --git a/arch/arm/mach-ns9xxx/include/mach/dma.h b/arch/arm/mach-ns9xxx/include/mach/dma.h deleted file mode 100644 index 3f50d8c9e5c7..000000000000 --- a/arch/arm/mach-ns9xxx/include/mach/dma.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ns9xxx/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006 by Digi International Inc. | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify it | ||
| 8 | * under the terms of the GNU General Public License version 2 as published by | ||
| 9 | * the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | #ifndef __ASM_ARCH_DMA_H | ||
| 12 | #define __ASM_ARCH_DMA_H | ||
| 13 | |||
| 14 | #endif /* ifndef __ASM_ARCH_DMA_H */ | ||
diff --git a/arch/arm/mach-ns9xxx/include/mach/hardware.h b/arch/arm/mach-ns9xxx/include/mach/hardware.h index 6dbb2030f563..76631128e11c 100644 --- a/arch/arm/mach-ns9xxx/include/mach/hardware.h +++ b/arch/arm/mach-ns9xxx/include/mach/hardware.h | |||
| @@ -11,8 +11,6 @@ | |||
| 11 | #ifndef __ASM_ARCH_HARDWARE_H | 11 | #ifndef __ASM_ARCH_HARDWARE_H |
| 12 | #define __ASM_ARCH_HARDWARE_H | 12 | #define __ASM_ARCH_HARDWARE_H |
| 13 | 13 | ||
| 14 | #include <asm/memory.h> | ||
| 15 | |||
| 16 | /* | 14 | /* |
| 17 | * NetSilicon NS9xxx internal mapping: | 15 | * NetSilicon NS9xxx internal mapping: |
| 18 | * | 16 | * |
diff --git a/arch/arm/mach-ns9xxx/include/mach/io.h b/arch/arm/mach-ns9xxx/include/mach/io.h index 027bf649645a..f08451d2e1bc 100644 --- a/arch/arm/mach-ns9xxx/include/mach/io.h +++ b/arch/arm/mach-ns9xxx/include/mach/io.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #define IO_SPACE_LIMIT 0xffffffff /* XXX */ | 14 | #define IO_SPACE_LIMIT 0xffffffff /* XXX */ |
| 15 | 15 | ||
| 16 | #define __io(a) ((void __iomem *)(a)) | 16 | #define __io(a) __typesafe_io(a) |
| 17 | #define __mem_pci(a) (a) | 17 | #define __mem_pci(a) (a) |
| 18 | #define __mem_isa(a) (IO_BASE + (a)) | 18 | #define __mem_isa(a) (IO_BASE + (a)) |
| 19 | 19 | ||
diff --git a/arch/arm/mach-ns9xxx/include/mach/memory.h b/arch/arm/mach-ns9xxx/include/mach/memory.h index 649ee6235b94..6107193adbfe 100644 --- a/arch/arm/mach-ns9xxx/include/mach/memory.h +++ b/arch/arm/mach-ns9xxx/include/mach/memory.h | |||
| @@ -21,7 +21,4 @@ | |||
| 21 | 21 | ||
| 22 | #define PHYS_OFFSET UL(0x00000000) | 22 | #define PHYS_OFFSET UL(0x00000000) |
| 23 | 23 | ||
| 24 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 25 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 26 | |||
| 27 | #endif | 24 | #endif |
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 79f0b1f8497b..10a301e32434 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
| @@ -4,16 +4,19 @@ comment "OMAP Core Type" | |||
| 4 | config ARCH_OMAP730 | 4 | config ARCH_OMAP730 |
| 5 | depends on ARCH_OMAP1 | 5 | depends on ARCH_OMAP1 |
| 6 | bool "OMAP730 Based System" | 6 | bool "OMAP730 Based System" |
| 7 | select CPU_ARM926T | ||
| 7 | select ARCH_OMAP_OTG | 8 | select ARCH_OMAP_OTG |
| 8 | 9 | ||
| 9 | config ARCH_OMAP15XX | 10 | config ARCH_OMAP15XX |
| 10 | depends on ARCH_OMAP1 | 11 | depends on ARCH_OMAP1 |
| 11 | default y | 12 | default y |
| 12 | bool "OMAP15xx Based System" | 13 | bool "OMAP15xx Based System" |
| 14 | select CPU_ARM925T | ||
| 13 | 15 | ||
| 14 | config ARCH_OMAP16XX | 16 | config ARCH_OMAP16XX |
| 15 | depends on ARCH_OMAP1 | 17 | depends on ARCH_OMAP1 |
| 16 | bool "OMAP16xx Based System" | 18 | bool "OMAP16xx Based System" |
| 19 | select CPU_ARM926T | ||
| 17 | select ARCH_OMAP_OTG | 20 | select ARCH_OMAP_OTG |
| 18 | 21 | ||
| 19 | comment "OMAP Board Type" | 22 | comment "OMAP Board Type" |
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 437065c25c9c..0a623379789f 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
| @@ -72,6 +72,7 @@ void __init orion5x_map_io(void) | |||
| 72 | ****************************************************************************/ | 72 | ****************************************************************************/ |
| 73 | static struct orion_ehci_data orion5x_ehci_data = { | 73 | static struct orion_ehci_data orion5x_ehci_data = { |
| 74 | .dram = &orion5x_mbus_dram_info, | 74 | .dram = &orion5x_mbus_dram_info, |
| 75 | .phy_version = EHCI_PHY_ORION, | ||
| 75 | }; | 76 | }; |
| 76 | 77 | ||
| 77 | static u64 ehci_dmamask = 0xffffffffUL; | 78 | static u64 ehci_dmamask = 0xffffffffUL; |
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index 3e66098340a5..0722d6510df1 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/gpio_keys.h> | 21 | #include <linux/gpio_keys.h> |
| 22 | #include <linux/input.h> | 22 | #include <linux/input.h> |
| 23 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
| 24 | #include <linux/ata_platform.h> | ||
| 24 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
| 25 | #include <asm/gpio.h> | 26 | #include <asm/gpio.h> |
| 26 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
| @@ -64,9 +65,21 @@ static struct hw_pci dns323_pci __initdata = { | |||
| 64 | .map_irq = dns323_pci_map_irq, | 65 | .map_irq = dns323_pci_map_irq, |
| 65 | }; | 66 | }; |
| 66 | 67 | ||
| 68 | static int __init dns323_dev_id(void) | ||
| 69 | { | ||
| 70 | u32 dev, rev; | ||
| 71 | |||
| 72 | orion5x_pcie_id(&dev, &rev); | ||
| 73 | |||
| 74 | return dev; | ||
| 75 | } | ||
| 76 | |||
| 67 | static int __init dns323_pci_init(void) | 77 | static int __init dns323_pci_init(void) |
| 68 | { | 78 | { |
| 69 | if (machine_is_dns323()) | 79 | /* The 5182 doesn't really use it's PCI bus, and initialising PCI |
| 80 | * gets in the way of initialising the SATA controller. | ||
| 81 | */ | ||
| 82 | if (machine_is_dns323() && dns323_dev_id() != MV88F5182_DEV_ID) | ||
| 70 | pci_common_init(&dns323_pci); | 83 | pci_common_init(&dns323_pci); |
| 71 | 84 | ||
| 72 | return 0; | 85 | return 0; |
| @@ -75,14 +88,6 @@ static int __init dns323_pci_init(void) | |||
| 75 | subsys_initcall(dns323_pci_init); | 88 | subsys_initcall(dns323_pci_init); |
| 76 | 89 | ||
| 77 | /**************************************************************************** | 90 | /**************************************************************************** |
| 78 | * Ethernet | ||
| 79 | */ | ||
| 80 | |||
| 81 | static struct mv643xx_eth_platform_data dns323_eth_data = { | ||
| 82 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), | ||
| 83 | }; | ||
| 84 | |||
| 85 | /**************************************************************************** | ||
| 86 | * 8MiB NOR flash (Spansion S29GL064M90TFIR4) | 91 | * 8MiB NOR flash (Spansion S29GL064M90TFIR4) |
| 87 | * | 92 | * |
| 88 | * Layout as used by D-Link: | 93 | * Layout as used by D-Link: |
| @@ -143,6 +148,90 @@ static struct platform_device dns323_nor_flash = { | |||
| 143 | }; | 148 | }; |
| 144 | 149 | ||
| 145 | /**************************************************************************** | 150 | /**************************************************************************** |
| 151 | * Ethernet | ||
| 152 | */ | ||
| 153 | |||
| 154 | static struct mv643xx_eth_platform_data dns323_eth_data = { | ||
| 155 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), | ||
| 156 | }; | ||
| 157 | |||
| 158 | /* dns323_parse_hex_*() taken from tsx09-common.c; should a common copy of these | ||
| 159 | * functions be kept somewhere? | ||
| 160 | */ | ||
| 161 | static int __init dns323_parse_hex_nibble(char n) | ||
| 162 | { | ||
| 163 | if (n >= '0' && n <= '9') | ||
| 164 | return n - '0'; | ||
| 165 | |||
| 166 | if (n >= 'A' && n <= 'F') | ||
| 167 | return n - 'A' + 10; | ||
| 168 | |||
| 169 | if (n >= 'a' && n <= 'f') | ||
| 170 | return n - 'a' + 10; | ||
| 171 | |||
| 172 | return -1; | ||
| 173 | } | ||
| 174 | |||
| 175 | static int __init dns323_parse_hex_byte(const char *b) | ||
| 176 | { | ||
| 177 | int hi; | ||
| 178 | int lo; | ||
| 179 | |||
| 180 | hi = dns323_parse_hex_nibble(b[0]); | ||
| 181 | lo = dns323_parse_hex_nibble(b[1]); | ||
| 182 | |||
| 183 | if (hi < 0 || lo < 0) | ||
| 184 | return -1; | ||
| 185 | |||
| 186 | return (hi << 4) | lo; | ||
| 187 | } | ||
| 188 | |||
| 189 | static int __init dns323_read_mac_addr(void) | ||
| 190 | { | ||
| 191 | u_int8_t addr[6]; | ||
| 192 | int i; | ||
| 193 | char *mac_page; | ||
| 194 | |||
| 195 | /* MAC address is stored as a regular ol' string in /dev/mtdblock4 | ||
| 196 | * (0x007d0000-0x00800000) starting at offset 196480 (0x2ff80). | ||
| 197 | */ | ||
| 198 | mac_page = ioremap(DNS323_NOR_BOOT_BASE + 0x7d0000 + 196480, 1024); | ||
| 199 | if (!mac_page) | ||
| 200 | return -ENOMEM; | ||
| 201 | |||
| 202 | /* Sanity check the string we're looking at */ | ||
| 203 | for (i = 0; i < 5; i++) { | ||
| 204 | if (*(mac_page + (i * 3) + 2) != ':') { | ||
| 205 | goto error_fail; | ||
| 206 | } | ||
| 207 | } | ||
| 208 | |||
| 209 | for (i = 0; i < 6; i++) { | ||
| 210 | int byte; | ||
| 211 | |||
| 212 | byte = dns323_parse_hex_byte(mac_page + (i * 3)); | ||
| 213 | if (byte < 0) { | ||
| 214 | goto error_fail; | ||
| 215 | } | ||
| 216 | |||
| 217 | addr[i] = byte; | ||
| 218 | } | ||
| 219 | |||
| 220 | iounmap(mac_page); | ||
| 221 | printk("DNS323: Found ethernet MAC address: "); | ||
| 222 | for (i = 0; i < 6; i++) | ||
| 223 | printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n"); | ||
| 224 | |||
| 225 | memcpy(dns323_eth_data.mac_addr, addr, 6); | ||
| 226 | |||
| 227 | return 0; | ||
| 228 | |||
| 229 | error_fail: | ||
| 230 | iounmap(mac_page); | ||
| 231 | return -EINVAL; | ||
| 232 | } | ||
| 233 | |||
| 234 | /**************************************************************************** | ||
| 146 | * GPIO LEDs (simple - doesn't use hardware blinking support) | 235 | * GPIO LEDs (simple - doesn't use hardware blinking support) |
| 147 | */ | 236 | */ |
| 148 | 237 | ||
| @@ -207,10 +296,17 @@ static struct platform_device dns323_button_device = { | |||
| 207 | }, | 296 | }, |
| 208 | }; | 297 | }; |
| 209 | 298 | ||
| 299 | /***************************************************************************** | ||
| 300 | * SATA | ||
| 301 | */ | ||
| 302 | static struct mv_sata_platform_data dns323_sata_data = { | ||
| 303 | .n_ports = 2, | ||
| 304 | }; | ||
| 305 | |||
| 210 | /**************************************************************************** | 306 | /**************************************************************************** |
| 211 | * General Setup | 307 | * General Setup |
| 212 | */ | 308 | */ |
| 213 | static struct orion5x_mpp_mode dns323_mpp_modes[] __initdata = { | 309 | static struct orion5x_mpp_mode dns323_mv88f5181_mpp_modes[] __initdata = { |
| 214 | { 0, MPP_PCIE_RST_OUTn }, | 310 | { 0, MPP_PCIE_RST_OUTn }, |
| 215 | { 1, MPP_GPIO }, /* right amber LED (sata ch0) */ | 311 | { 1, MPP_GPIO }, /* right amber LED (sata ch0) */ |
| 216 | { 2, MPP_GPIO }, /* left amber LED (sata ch1) */ | 312 | { 2, MPP_GPIO }, /* left amber LED (sata ch1) */ |
| @@ -234,6 +330,30 @@ static struct orion5x_mpp_mode dns323_mpp_modes[] __initdata = { | |||
| 234 | { -1 }, | 330 | { -1 }, |
| 235 | }; | 331 | }; |
| 236 | 332 | ||
| 333 | static struct orion5x_mpp_mode dns323_mv88f5182_mpp_modes[] __initdata = { | ||
| 334 | { 0, MPP_UNUSED }, | ||
| 335 | { 1, MPP_GPIO }, /* right amber LED (sata ch0) */ | ||
| 336 | { 2, MPP_GPIO }, /* left amber LED (sata ch1) */ | ||
| 337 | { 3, MPP_UNUSED }, | ||
| 338 | { 4, MPP_GPIO }, /* power button LED */ | ||
| 339 | { 5, MPP_GPIO }, /* power button LED */ | ||
| 340 | { 6, MPP_GPIO }, /* GMT G751-2f overtemp */ | ||
| 341 | { 7, MPP_GPIO }, /* M41T80 nIRQ/OUT/SQW */ | ||
| 342 | { 8, MPP_GPIO }, /* triggers power off */ | ||
| 343 | { 9, MPP_GPIO }, /* power button switch */ | ||
| 344 | { 10, MPP_GPIO }, /* reset button switch */ | ||
| 345 | { 11, MPP_UNUSED }, | ||
| 346 | { 12, MPP_SATA_LED }, | ||
| 347 | { 13, MPP_SATA_LED }, | ||
| 348 | { 14, MPP_SATA_LED }, | ||
| 349 | { 15, MPP_SATA_LED }, | ||
| 350 | { 16, MPP_UNUSED }, | ||
| 351 | { 17, MPP_UNUSED }, | ||
| 352 | { 18, MPP_UNUSED }, | ||
| 353 | { 19, MPP_UNUSED }, | ||
| 354 | { -1 }, | ||
| 355 | }; | ||
| 356 | |||
| 237 | /* | 357 | /* |
| 238 | * On the DNS-323 the following devices are attached via I2C: | 358 | * On the DNS-323 the following devices are attached via I2C: |
| 239 | * | 359 | * |
| @@ -264,16 +384,15 @@ static void __init dns323_init(void) | |||
| 264 | /* Setup basic Orion functions. Need to be called early. */ | 384 | /* Setup basic Orion functions. Need to be called early. */ |
| 265 | orion5x_init(); | 385 | orion5x_init(); |
| 266 | 386 | ||
| 267 | orion5x_mpp_conf(dns323_mpp_modes); | 387 | /* Just to be tricky, the 5182 has a completely different |
| 268 | writel(0, MPP_DEV_CTRL); /* DEV_D[31:16] */ | 388 | * set of MPP modes to the 5181. |
| 269 | |||
| 270 | /* | ||
| 271 | * Configure peripherals. | ||
| 272 | */ | 389 | */ |
| 273 | orion5x_ehci0_init(); | 390 | if (dns323_dev_id() == MV88F5182_DEV_ID) |
| 274 | orion5x_eth_init(&dns323_eth_data); | 391 | orion5x_mpp_conf(dns323_mv88f5182_mpp_modes); |
| 275 | orion5x_i2c_init(); | 392 | else { |
| 276 | orion5x_uart0_init(); | 393 | orion5x_mpp_conf(dns323_mv88f5181_mpp_modes); |
| 394 | writel(0, MPP_DEV_CTRL); /* DEV_D[31:16] */ | ||
| 395 | } | ||
| 277 | 396 | ||
| 278 | /* setup flash mapping | 397 | /* setup flash mapping |
| 279 | * CS3 holds a 8 MB Spansion S29GL064M90TFIR4 | 398 | * CS3 holds a 8 MB Spansion S29GL064M90TFIR4 |
| @@ -288,6 +407,23 @@ static void __init dns323_init(void) | |||
| 288 | i2c_register_board_info(0, dns323_i2c_devices, | 407 | i2c_register_board_info(0, dns323_i2c_devices, |
| 289 | ARRAY_SIZE(dns323_i2c_devices)); | 408 | ARRAY_SIZE(dns323_i2c_devices)); |
| 290 | 409 | ||
| 410 | /* | ||
| 411 | * Configure peripherals. | ||
| 412 | */ | ||
| 413 | if (dns323_read_mac_addr() < 0) | ||
| 414 | printk("DNS323: Failed to read MAC address\n"); | ||
| 415 | |||
| 416 | orion5x_ehci0_init(); | ||
| 417 | orion5x_eth_init(&dns323_eth_data); | ||
| 418 | orion5x_i2c_init(); | ||
| 419 | orion5x_uart0_init(); | ||
| 420 | |||
| 421 | /* The 5182 has it's SATA controller on-chip, and needs it's own little | ||
| 422 | * init routine. | ||
| 423 | */ | ||
| 424 | if (dns323_dev_id() == MV88F5182_DEV_ID) | ||
| 425 | orion5x_sata_init(&dns323_sata_data); | ||
| 426 | |||
| 291 | /* register dns323 specific power-off method */ | 427 | /* register dns323 specific power-off method */ |
| 292 | if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 || | 428 | if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 || |
| 293 | gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0) | 429 | gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0) |
diff --git a/arch/arm/mach-orion5x/include/mach/dma.h b/arch/arm/mach-orion5x/include/mach/dma.h deleted file mode 100644 index 40a8c178f10d..000000000000 --- a/arch/arm/mach-orion5x/include/mach/dma.h +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | /* empty */ | ||
diff --git a/arch/arm/mach-orion5x/include/mach/io.h b/arch/arm/mach-orion5x/include/mach/io.h index f24b2513f7f3..c47b033bd999 100644 --- a/arch/arm/mach-orion5x/include/mach/io.h +++ b/arch/arm/mach-orion5x/include/mach/io.h | |||
| @@ -38,14 +38,9 @@ __arch_iounmap(void __iomem *addr) | |||
| 38 | __iounmap(addr); | 38 | __iounmap(addr); |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | static inline void __iomem *__io(unsigned long addr) | ||
| 42 | { | ||
| 43 | return (void __iomem *)addr; | ||
| 44 | } | ||
| 45 | |||
| 46 | #define __arch_ioremap(p, s, m) __arch_ioremap(p, s, m) | 41 | #define __arch_ioremap(p, s, m) __arch_ioremap(p, s, m) |
| 47 | #define __arch_iounmap(a) __arch_iounmap(a) | 42 | #define __arch_iounmap(a) __arch_iounmap(a) |
| 48 | #define __io(a) __io(a) | 43 | #define __io(a) __typesafe_io(a) |
| 49 | #define __mem_pci(a) (a) | 44 | #define __mem_pci(a) (a) |
| 50 | 45 | ||
| 51 | 46 | ||
diff --git a/arch/arm/mach-orion5x/include/mach/memory.h b/arch/arm/mach-orion5x/include/mach/memory.h index 54dd76b013f2..52a2955d0f87 100644 --- a/arch/arm/mach-orion5x/include/mach/memory.h +++ b/arch/arm/mach-orion5x/include/mach/memory.h | |||
| @@ -9,8 +9,4 @@ | |||
| 9 | 9 | ||
| 10 | #define PHYS_OFFSET UL(0x00000000) | 10 | #define PHYS_OFFSET UL(0x00000000) |
| 11 | 11 | ||
| 12 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 13 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 14 | |||
| 15 | |||
| 16 | #endif | 12 | #endif |
diff --git a/arch/arm/mach-pnx4008/dma.c b/arch/arm/mach-pnx4008/dma.c index ac2f70eddb9e..425f7188505e 100644 --- a/arch/arm/mach-pnx4008/dma.c +++ b/arch/arm/mach-pnx4008/dma.c | |||
| @@ -25,9 +25,8 @@ | |||
| 25 | 25 | ||
| 26 | #include <asm/system.h> | 26 | #include <asm/system.h> |
| 27 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
| 28 | #include <asm/dma.h> | 28 | #include <mach/dma.h> |
| 29 | #include <asm/dma-mapping.h> | 29 | #include <asm/dma-mapping.h> |
| 30 | #include <asm/mach/dma.h> | ||
| 31 | #include <mach/clock.h> | 30 | #include <mach/clock.h> |
| 32 | 31 | ||
| 33 | static struct dma_channel { | 32 | static struct dma_channel { |
diff --git a/arch/arm/mach-pnx4008/include/mach/dma.h b/arch/arm/mach-pnx4008/include/mach/dma.h index 5442d04fc575..f094bf8bfb18 100644 --- a/arch/arm/mach-pnx4008/include/mach/dma.h +++ b/arch/arm/mach-pnx4008/include/mach/dma.h | |||
| @@ -16,8 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #include "platform.h" | 17 | #include "platform.h" |
| 18 | 18 | ||
| 19 | #define MAX_DMA_ADDRESS 0xffffffff | ||
| 20 | |||
| 21 | #define MAX_DMA_CHANNELS 8 | 19 | #define MAX_DMA_CHANNELS 8 |
| 22 | 20 | ||
| 23 | #define DMAC_BASE IO_ADDRESS(PNX4008_DMA_CONFIG_BASE) | 21 | #define DMAC_BASE IO_ADDRESS(PNX4008_DMA_CONFIG_BASE) |
diff --git a/arch/arm/mach-pnx4008/include/mach/io.h b/arch/arm/mach-pnx4008/include/mach/io.h index c6206f25839d..cbf0904540ea 100644 --- a/arch/arm/mach-pnx4008/include/mach/io.h +++ b/arch/arm/mach-pnx4008/include/mach/io.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #define IO_SPACE_LIMIT 0xffffffff | 16 | #define IO_SPACE_LIMIT 0xffffffff |
| 17 | 17 | ||
| 18 | #define __io(a) ((void __iomem *)(a)) | 18 | #define __io(a) __typesafe_io(a) |
| 19 | #define __mem_pci(a) (a) | 19 | #define __mem_pci(a) (a) |
| 20 | 20 | ||
| 21 | #endif | 21 | #endif |
diff --git a/arch/arm/mach-pnx4008/include/mach/memory.h b/arch/arm/mach-pnx4008/include/mach/memory.h index 5789a2d16f5a..0e8770081058 100644 --- a/arch/arm/mach-pnx4008/include/mach/memory.h +++ b/arch/arm/mach-pnx4008/include/mach/memory.h | |||
| @@ -16,9 +16,6 @@ | |||
| 16 | /* | 16 | /* |
| 17 | * Physical DRAM offset. | 17 | * Physical DRAM offset. |
| 18 | */ | 18 | */ |
| 19 | #define PHYS_OFFSET (0x80000000) | 19 | #define PHYS_OFFSET UL(0x80000000) |
| 20 | |||
| 21 | #define __virt_to_bus(x) ((x) - PAGE_OFFSET + PHYS_OFFSET) | ||
| 22 | #define __bus_to_virt(x) ((x) + PAGE_OFFSET - PHYS_OFFSET) | ||
| 23 | 20 | ||
| 24 | #endif | 21 | #endif |
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index a062235e83a8..6755c7d6bb31 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -19,6 +19,9 @@ config CPU_PXA320 | |||
| 19 | config CPU_PXA930 | 19 | config CPU_PXA930 |
| 20 | bool "PXA930 (codename Tavor-P)" | 20 | bool "PXA930 (codename Tavor-P)" |
| 21 | 21 | ||
| 22 | config CPU_PXA935 | ||
| 23 | bool "PXA935 (codename Tavor-P65)" | ||
| 24 | |||
| 22 | endmenu | 25 | endmenu |
| 23 | 26 | ||
| 24 | endif | 27 | endif |
| @@ -199,6 +202,10 @@ config MACH_E800 | |||
| 199 | config TRIZEPS_PXA | 202 | config TRIZEPS_PXA |
| 200 | bool "PXA based Keith und Koep Trizeps DIMM-Modules" | 203 | bool "PXA based Keith und Koep Trizeps DIMM-Modules" |
| 201 | 204 | ||
| 205 | config MACH_H5000 | ||
| 206 | bool "HP iPAQ h5000" | ||
| 207 | select PXA25x | ||
| 208 | |||
| 202 | config MACH_TRIZEPS4 | 209 | config MACH_TRIZEPS4 |
| 203 | bool "Keith und Koep Trizeps4 DIMM-Module" | 210 | bool "Keith und Koep Trizeps4 DIMM-Module" |
| 204 | depends on TRIZEPS_PXA | 211 | depends on TRIZEPS_PXA |
| @@ -283,7 +290,6 @@ config MACH_MIOA701 | |||
| 283 | bool "Mitac Mio A701 Support" | 290 | bool "Mitac Mio A701 Support" |
| 284 | select PXA27x | 291 | select PXA27x |
| 285 | select IWMMXT | 292 | select IWMMXT |
| 286 | select LEDS_GPIO | ||
| 287 | select HAVE_PWM | 293 | select HAVE_PWM |
| 288 | select GPIO_SYSFS | 294 | select GPIO_SYSFS |
| 289 | help | 295 | help |
| @@ -386,16 +392,25 @@ endmenu | |||
| 386 | 392 | ||
| 387 | config PXA25x | 393 | config PXA25x |
| 388 | bool | 394 | bool |
| 395 | select CPU_XSCALE | ||
| 389 | help | 396 | help |
| 390 | Select code specific to PXA21x/25x/26x variants | 397 | Select code specific to PXA21x/25x/26x variants |
| 391 | 398 | ||
| 392 | config PXA27x | 399 | config PXA27x |
| 393 | bool | 400 | bool |
| 401 | select CPU_XSCALE | ||
| 394 | help | 402 | help |
| 395 | Select code specific to PXA27x variants | 403 | Select code specific to PXA27x variants |
| 396 | 404 | ||
| 405 | config CPU_PXA26x | ||
| 406 | bool | ||
| 407 | select PXA25x | ||
| 408 | help | ||
| 409 | Select code specific to PXA26x (codename Dalhart) | ||
| 410 | |||
| 397 | config PXA3xx | 411 | config PXA3xx |
| 398 | bool | 412 | bool |
| 413 | select CPU_XSC3 | ||
| 399 | help | 414 | help |
| 400 | Select code specific to PXA3xx variants | 415 | Select code specific to PXA3xx variants |
| 401 | 416 | ||
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index d64c68b232e3..dc184eae5109 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile | |||
| @@ -35,6 +35,7 @@ obj-$(CONFIG_MACH_MP900C) += mp900.o | |||
| 35 | obj-$(CONFIG_ARCH_PXA_IDP) += idp.o | 35 | obj-$(CONFIG_ARCH_PXA_IDP) += idp.o |
| 36 | obj-$(CONFIG_MACH_TRIZEPS4) += trizeps4.o | 36 | obj-$(CONFIG_MACH_TRIZEPS4) += trizeps4.o |
| 37 | obj-$(CONFIG_MACH_COLIBRI) += colibri.o | 37 | obj-$(CONFIG_MACH_COLIBRI) += colibri.o |
| 38 | obj-$(CONFIG_MACH_H5000) += h5000.o | ||
| 38 | obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o sharpsl_pm.o corgi_pm.o | 39 | obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o sharpsl_pm.o corgi_pm.o |
| 39 | obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o | 40 | obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o sharpsl_pm.o spitz_pm.o |
| 40 | obj-$(CONFIG_CORGI_SSP_DEPRECATED) += corgi_ssp.o corgi_lcd.o | 41 | obj-$(CONFIG_CORGI_SSP_DEPRECATED) += corgi_ssp.o corgi_lcd.o |
diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c index b965085a37b9..3a4f8d855a52 100644 --- a/arch/arm/mach-pxa/am200epd.c +++ b/arch/arm/mach-pxa/am200epd.c | |||
| @@ -30,8 +30,12 @@ | |||
| 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/gumstix.h> | ||
| 34 | #include <mach/mfp-pxa25x.h> | ||
| 33 | #include <mach/pxafb.h> | 35 | #include <mach/pxafb.h> |
| 34 | 36 | ||
| 37 | #include "generic.h" | ||
| 38 | |||
| 35 | #include <video/metronomefb.h> | 39 | #include <video/metronomefb.h> |
| 36 | 40 | ||
| 37 | static unsigned int panel_type = 6; | 41 | static unsigned int panel_type = 6; |
| @@ -331,6 +335,15 @@ static struct metronome_board am200_board = { | |||
| 331 | .cleanup = am200_cleanup, | 335 | .cleanup = am200_cleanup, |
| 332 | }; | 336 | }; |
| 333 | 337 | ||
| 338 | static unsigned long am200_pin_config[] __initdata = { | ||
| 339 | GPIO51_GPIO, | ||
| 340 | GPIO49_GPIO, | ||
| 341 | GPIO48_GPIO, | ||
| 342 | GPIO32_GPIO, | ||
| 343 | GPIO17_GPIO, | ||
| 344 | GPIO16_GPIO, | ||
| 345 | }; | ||
| 346 | |||
| 334 | static int __init am200_init(void) | 347 | static int __init am200_init(void) |
| 335 | { | 348 | { |
| 336 | int ret; | 349 | int ret; |
| @@ -339,6 +352,8 @@ static int __init am200_init(void) | |||
| 339 | * creation events */ | 352 | * creation events */ |
| 340 | fb_register_client(&am200_fb_notif); | 353 | fb_register_client(&am200_fb_notif); |
| 341 | 354 | ||
| 355 | pxa2xx_mfp_config(ARRAY_AND_SIZE(am200_pin_config)); | ||
| 356 | |||
| 342 | /* request our platform independent driver */ | 357 | /* request our platform independent driver */ |
| 343 | request_module("metronomefb"); | 358 | request_module("metronomefb"); |
| 344 | 359 | ||
diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c index a3e0e1989a6b..40b774084514 100644 --- a/arch/arm/mach-pxa/clock.c +++ b/arch/arm/mach-pxa/clock.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #include <asm/clkdev.h> | 15 | #include <asm/clkdev.h> |
| 16 | #include <mach/pxa2xx-regs.h> | 16 | #include <mach/pxa2xx-regs.h> |
| 17 | #include <mach/pxa2xx-gpio.h> | ||
| 18 | #include <mach/hardware.h> | 17 | #include <mach/hardware.h> |
| 19 | 18 | ||
| 20 | #include "devices.h" | 19 | #include "devices.h" |
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index deb46cd144bf..ff0c577cd1ac 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <mach/mfp-pxa300.h> | 31 | #include <mach/mfp-pxa300.h> |
| 32 | 32 | ||
| 33 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
| 34 | #include <mach/gpio.h> | ||
| 35 | #include <mach/pxafb.h> | 34 | #include <mach/pxafb.h> |
| 36 | #include <mach/mmc.h> | 35 | #include <mach/mmc.h> |
| 37 | #include <mach/ohci.h> | 36 | #include <mach/ohci.h> |
| @@ -137,6 +136,10 @@ static mfp_cfg_t cm_x300_mfp_cfg[] __initdata = { | |||
| 137 | GPIO82_GPIO | MFP_PULL_HIGH, /* MMC CD */ | 136 | GPIO82_GPIO | MFP_PULL_HIGH, /* MMC CD */ |
| 138 | GPIO85_GPIO, /* MMC WP */ | 137 | GPIO85_GPIO, /* MMC WP */ |
| 139 | GPIO99_GPIO, /* Ethernet IRQ */ | 138 | GPIO99_GPIO, /* Ethernet IRQ */ |
| 139 | |||
| 140 | /* Standard I2C */ | ||
| 141 | GPIO21_I2C_SCL, | ||
| 142 | GPIO22_I2C_SDA, | ||
| 140 | }; | 143 | }; |
| 141 | 144 | ||
| 142 | #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) | 145 | #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) |
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index 65558d6aa220..c5e28a46b292 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/mmc/host.h> | 21 | #include <linux/mmc/host.h> |
| 22 | #include <linux/mtd/physmap.h> | ||
| 22 | #include <linux/pm.h> | 23 | #include <linux/pm.h> |
| 23 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
| 24 | #include <linux/backlight.h> | 25 | #include <linux/backlight.h> |
| @@ -541,11 +542,42 @@ err_free_1: | |||
| 541 | static inline void corgi_init_spi(void) {} | 542 | static inline void corgi_init_spi(void) {} |
| 542 | #endif | 543 | #endif |
| 543 | 544 | ||
| 545 | static struct mtd_partition sharpsl_rom_parts[] = { | ||
| 546 | { | ||
| 547 | .name ="Boot PROM Filesystem", | ||
| 548 | .offset = 0x00120000, | ||
| 549 | .size = MTDPART_SIZ_FULL, | ||
| 550 | }, | ||
| 551 | }; | ||
| 552 | |||
| 553 | static struct physmap_flash_data sharpsl_rom_data = { | ||
| 554 | .width = 2, | ||
| 555 | .nr_parts = ARRAY_SIZE(sharpsl_rom_parts), | ||
| 556 | .parts = sharpsl_rom_parts, | ||
| 557 | }; | ||
| 558 | |||
| 559 | static struct resource sharpsl_rom_resources[] = { | ||
| 560 | { | ||
| 561 | .start = 0x00000000, | ||
| 562 | .end = 0x007fffff, | ||
| 563 | .flags = IORESOURCE_MEM, | ||
| 564 | }, | ||
| 565 | }; | ||
| 566 | |||
| 567 | static struct platform_device sharpsl_rom_device = { | ||
| 568 | .name = "physmap-flash", | ||
| 569 | .id = -1, | ||
| 570 | .resource = sharpsl_rom_resources, | ||
| 571 | .num_resources = ARRAY_SIZE(sharpsl_rom_resources), | ||
| 572 | .dev.platform_data = &sharpsl_rom_data, | ||
| 573 | }; | ||
| 574 | |||
| 544 | static struct platform_device *devices[] __initdata = { | 575 | static struct platform_device *devices[] __initdata = { |
| 545 | &corgiscoop_device, | 576 | &corgiscoop_device, |
| 546 | &corgifb_device, | 577 | &corgifb_device, |
| 547 | &corgikbd_device, | 578 | &corgikbd_device, |
| 548 | &corgiled_device, | 579 | &corgiled_device, |
| 580 | &sharpsl_rom_device, | ||
| 549 | }; | 581 | }; |
| 550 | 582 | ||
| 551 | static void corgi_poweroff(void) | 583 | static void corgi_poweroff(void) |
diff --git a/arch/arm/mach-pxa/cpufreq-pxa2xx.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c index 1f272ea83f36..771dd4eac935 100644 --- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c +++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c | |||
| @@ -64,7 +64,7 @@ typedef struct { | |||
| 64 | 64 | ||
| 65 | /* Define the refresh period in mSec for the SDRAM and the number of rows */ | 65 | /* Define the refresh period in mSec for the SDRAM and the number of rows */ |
| 66 | #define SDRAM_TREF 64 /* standard 64ms SDRAM */ | 66 | #define SDRAM_TREF 64 /* standard 64ms SDRAM */ |
| 67 | #define SDRAM_ROWS 4096 /* 64MB=8192 32MB=4096 */ | 67 | static unsigned int sdram_rows; |
| 68 | 68 | ||
| 69 | #define CCLKCFG_TURBO 0x1 | 69 | #define CCLKCFG_TURBO 0x1 |
| 70 | #define CCLKCFG_FCS 0x2 | 70 | #define CCLKCFG_FCS 0x2 |
| @@ -73,6 +73,9 @@ typedef struct { | |||
| 73 | #define MDREFR_DB2_MASK (MDREFR_K2DB2 | MDREFR_K1DB2) | 73 | #define MDREFR_DB2_MASK (MDREFR_K2DB2 | MDREFR_K1DB2) |
| 74 | #define MDREFR_DRI_MASK 0xFFF | 74 | #define MDREFR_DRI_MASK 0xFFF |
| 75 | 75 | ||
| 76 | #define MDCNFG_DRAC2(mdcnfg) (((mdcnfg) >> 21) & 0x3) | ||
| 77 | #define MDCNFG_DRAC0(mdcnfg) (((mdcnfg) >> 5) & 0x3) | ||
| 78 | |||
| 76 | /* | 79 | /* |
| 77 | * PXA255 definitions | 80 | * PXA255 definitions |
| 78 | */ | 81 | */ |
| @@ -109,6 +112,10 @@ static struct cpufreq_frequency_table | |||
| 109 | static struct cpufreq_frequency_table | 112 | static struct cpufreq_frequency_table |
| 110 | pxa255_turbo_freq_table[NUM_PXA25x_TURBO_FREQS+1]; | 113 | pxa255_turbo_freq_table[NUM_PXA25x_TURBO_FREQS+1]; |
| 111 | 114 | ||
| 115 | static unsigned int pxa255_turbo_table; | ||
| 116 | module_param(pxa255_turbo_table, uint, 0); | ||
| 117 | MODULE_PARM_DESC(pxa255_turbo_table, "Selects the frequency table (0 = run table, !0 = turbo table)"); | ||
| 118 | |||
| 112 | /* | 119 | /* |
| 113 | * PXA270 definitions | 120 | * PXA270 definitions |
| 114 | * | 121 | * |
| @@ -158,22 +165,16 @@ static struct cpufreq_frequency_table | |||
| 158 | 165 | ||
| 159 | extern unsigned get_clk_frequency_khz(int info); | 166 | extern unsigned get_clk_frequency_khz(int info); |
| 160 | 167 | ||
| 161 | static void find_freq_tables(struct cpufreq_policy *policy, | 168 | static void find_freq_tables(struct cpufreq_frequency_table **freq_table, |
| 162 | struct cpufreq_frequency_table **freq_table, | ||
| 163 | pxa_freqs_t **pxa_freqs) | 169 | pxa_freqs_t **pxa_freqs) |
| 164 | { | 170 | { |
| 165 | if (cpu_is_pxa25x()) { | 171 | if (cpu_is_pxa25x()) { |
| 166 | if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) { | 172 | if (!pxa255_turbo_table) { |
| 167 | *pxa_freqs = pxa255_run_freqs; | 173 | *pxa_freqs = pxa255_run_freqs; |
| 168 | *freq_table = pxa255_run_freq_table; | 174 | *freq_table = pxa255_run_freq_table; |
| 169 | } else if (policy->policy == CPUFREQ_POLICY_POWERSAVE) { | 175 | } else { |
| 170 | *pxa_freqs = pxa255_turbo_freqs; | 176 | *pxa_freqs = pxa255_turbo_freqs; |
| 171 | *freq_table = pxa255_turbo_freq_table; | 177 | *freq_table = pxa255_turbo_freq_table; |
| 172 | } else { | ||
| 173 | printk("CPU PXA: Unknown policy found. " | ||
| 174 | "Using CPUFREQ_POLICY_PERFORMANCE\n"); | ||
| 175 | *pxa_freqs = pxa255_run_freqs; | ||
| 176 | *freq_table = pxa255_run_freq_table; | ||
| 177 | } | 178 | } |
| 178 | } | 179 | } |
| 179 | if (cpu_is_pxa27x()) { | 180 | if (cpu_is_pxa27x()) { |
| @@ -194,14 +195,28 @@ static void pxa27x_guess_max_freq(void) | |||
| 194 | } | 195 | } |
| 195 | } | 196 | } |
| 196 | 197 | ||
| 198 | static void init_sdram_rows(void) | ||
| 199 | { | ||
| 200 | uint32_t mdcnfg = MDCNFG; | ||
| 201 | unsigned int drac2 = 0, drac0 = 0; | ||
| 202 | |||
| 203 | if (mdcnfg & (MDCNFG_DE2 | MDCNFG_DE3)) | ||
| 204 | drac2 = MDCNFG_DRAC2(mdcnfg); | ||
| 205 | |||
| 206 | if (mdcnfg & (MDCNFG_DE0 | MDCNFG_DE1)) | ||
| 207 | drac0 = MDCNFG_DRAC0(mdcnfg); | ||
| 208 | |||
| 209 | sdram_rows = 1 << (11 + max(drac0, drac2)); | ||
| 210 | } | ||
| 211 | |||
| 197 | static u32 mdrefr_dri(unsigned int freq) | 212 | static u32 mdrefr_dri(unsigned int freq) |
| 198 | { | 213 | { |
| 199 | u32 dri = 0; | 214 | u32 dri = 0; |
| 200 | 215 | ||
| 201 | if (cpu_is_pxa25x()) | 216 | if (cpu_is_pxa25x()) |
| 202 | dri = ((freq * SDRAM_TREF) / (SDRAM_ROWS * 32)); | 217 | dri = ((freq * SDRAM_TREF) / (sdram_rows * 32)); |
| 203 | if (cpu_is_pxa27x()) | 218 | if (cpu_is_pxa27x()) |
| 204 | dri = ((freq * SDRAM_TREF) / (SDRAM_ROWS - 31)) / 32; | 219 | dri = ((freq * SDRAM_TREF) / (sdram_rows - 31)) / 32; |
| 205 | return dri; | 220 | return dri; |
| 206 | } | 221 | } |
| 207 | 222 | ||
| @@ -212,7 +227,7 @@ static int pxa_verify_policy(struct cpufreq_policy *policy) | |||
| 212 | pxa_freqs_t *pxa_freqs; | 227 | pxa_freqs_t *pxa_freqs; |
| 213 | int ret; | 228 | int ret; |
| 214 | 229 | ||
| 215 | find_freq_tables(policy, &pxa_freqs_table, &pxa_freqs); | 230 | find_freq_tables(&pxa_freqs_table, &pxa_freqs); |
| 216 | ret = cpufreq_frequency_table_verify(policy, pxa_freqs_table); | 231 | ret = cpufreq_frequency_table_verify(policy, pxa_freqs_table); |
| 217 | 232 | ||
| 218 | if (freq_debug) | 233 | if (freq_debug) |
| @@ -240,7 +255,7 @@ static int pxa_set_target(struct cpufreq_policy *policy, | |||
| 240 | unsigned int unused, preset_mdrefr, postset_mdrefr, cclkcfg; | 255 | unsigned int unused, preset_mdrefr, postset_mdrefr, cclkcfg; |
| 241 | 256 | ||
| 242 | /* Get the current policy */ | 257 | /* Get the current policy */ |
| 243 | find_freq_tables(policy, &pxa_freqs_table, &pxa_freq_settings); | 258 | find_freq_tables(&pxa_freqs_table, &pxa_freq_settings); |
| 244 | 259 | ||
| 245 | /* Lookup the next frequency */ | 260 | /* Lookup the next frequency */ |
| 246 | if (cpufreq_frequency_table_target(policy, pxa_freqs_table, | 261 | if (cpufreq_frequency_table_target(policy, pxa_freqs_table, |
| @@ -329,11 +344,15 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy) | |||
| 329 | { | 344 | { |
| 330 | int i; | 345 | int i; |
| 331 | unsigned int freq; | 346 | unsigned int freq; |
| 347 | struct cpufreq_frequency_table *pxa255_freq_table; | ||
| 348 | pxa_freqs_t *pxa255_freqs; | ||
| 332 | 349 | ||
| 333 | /* try to guess pxa27x cpu */ | 350 | /* try to guess pxa27x cpu */ |
| 334 | if (cpu_is_pxa27x()) | 351 | if (cpu_is_pxa27x()) |
| 335 | pxa27x_guess_max_freq(); | 352 | pxa27x_guess_max_freq(); |
| 336 | 353 | ||
| 354 | init_sdram_rows(); | ||
| 355 | |||
| 337 | /* set default policy and cpuinfo */ | 356 | /* set default policy and cpuinfo */ |
| 338 | policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ | 357 | policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ |
| 339 | policy->cur = get_clk_frequency_khz(0); /* current freq */ | 358 | policy->cur = get_clk_frequency_khz(0); /* current freq */ |
| @@ -354,6 +373,8 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy) | |||
| 354 | } | 373 | } |
| 355 | pxa255_turbo_freq_table[i].frequency = CPUFREQ_TABLE_END; | 374 | pxa255_turbo_freq_table[i].frequency = CPUFREQ_TABLE_END; |
| 356 | 375 | ||
| 376 | pxa255_turbo_table = !!pxa255_turbo_table; | ||
| 377 | |||
| 357 | /* Generate the pxa27x cpufreq_frequency_table struct */ | 378 | /* Generate the pxa27x cpufreq_frequency_table struct */ |
| 358 | for (i = 0; i < NUM_PXA27x_FREQS; i++) { | 379 | for (i = 0; i < NUM_PXA27x_FREQS; i++) { |
| 359 | freq = pxa27x_freqs[i].khz; | 380 | freq = pxa27x_freqs[i].khz; |
| @@ -368,8 +389,12 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy) | |||
| 368 | * Set the policy's minimum and maximum frequencies from the tables | 389 | * Set the policy's minimum and maximum frequencies from the tables |
| 369 | * just constructed. This sets cpuinfo.mxx_freq, min and max. | 390 | * just constructed. This sets cpuinfo.mxx_freq, min and max. |
| 370 | */ | 391 | */ |
| 371 | if (cpu_is_pxa25x()) | 392 | if (cpu_is_pxa25x()) { |
| 372 | cpufreq_frequency_table_cpuinfo(policy, pxa255_run_freq_table); | 393 | find_freq_tables(&pxa255_freq_table, &pxa255_freqs); |
| 394 | pr_info("PXA255 cpufreq using %s frequency table\n", | ||
| 395 | pxa255_turbo_table ? "turbo" : "run"); | ||
| 396 | cpufreq_frequency_table_cpuinfo(policy, pxa255_freq_table); | ||
| 397 | } | ||
| 373 | else if (cpu_is_pxa27x()) | 398 | else if (cpu_is_pxa27x()) |
| 374 | cpufreq_frequency_table_cpuinfo(policy, pxa27x_freq_table); | 399 | cpufreq_frequency_table_cpuinfo(policy, pxa27x_freq_table); |
| 375 | 400 | ||
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 35736fc08634..e16f8e3d58d3 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
| @@ -4,13 +4,12 @@ | |||
| 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/gpio.h> | 7 | #include <mach/pxa-regs.h> |
| 8 | #include <mach/udc.h> | 8 | #include <mach/udc.h> |
| 9 | #include <mach/pxafb.h> | 9 | #include <mach/pxafb.h> |
| 10 | #include <mach/mmc.h> | 10 | #include <mach/mmc.h> |
| 11 | #include <mach/irda.h> | 11 | #include <mach/irda.h> |
| 12 | #include <mach/i2c.h> | 12 | #include <mach/i2c.h> |
| 13 | #include <mach/mfp-pxa27x.h> | ||
| 14 | #include <mach/ohci.h> | 13 | #include <mach/ohci.h> |
| 15 | #include <mach/pxa27x_keypad.h> | 14 | #include <mach/pxa27x_keypad.h> |
| 16 | #include <mach/pxa2xx_spi.h> | 15 | #include <mach/pxa2xx_spi.h> |
| @@ -156,8 +155,8 @@ void __init set_pxa_fb_parent(struct device *parent_dev) | |||
| 156 | 155 | ||
| 157 | static struct resource pxa_resource_ffuart[] = { | 156 | static struct resource pxa_resource_ffuart[] = { |
| 158 | { | 157 | { |
| 159 | .start = __PREG(FFUART), | 158 | .start = 0x40100000, |
| 160 | .end = __PREG(FFUART) + 35, | 159 | .end = 0x40100023, |
| 161 | .flags = IORESOURCE_MEM, | 160 | .flags = IORESOURCE_MEM, |
| 162 | }, { | 161 | }, { |
| 163 | .start = IRQ_FFUART, | 162 | .start = IRQ_FFUART, |
| @@ -175,8 +174,8 @@ struct platform_device pxa_device_ffuart= { | |||
| 175 | 174 | ||
| 176 | static struct resource pxa_resource_btuart[] = { | 175 | static struct resource pxa_resource_btuart[] = { |
| 177 | { | 176 | { |
| 178 | .start = __PREG(BTUART), | 177 | .start = 0x40200000, |
| 179 | .end = __PREG(BTUART) + 35, | 178 | .end = 0x40200023, |
| 180 | .flags = IORESOURCE_MEM, | 179 | .flags = IORESOURCE_MEM, |
| 181 | }, { | 180 | }, { |
| 182 | .start = IRQ_BTUART, | 181 | .start = IRQ_BTUART, |
| @@ -194,8 +193,8 @@ struct platform_device pxa_device_btuart = { | |||
| 194 | 193 | ||
| 195 | static struct resource pxa_resource_stuart[] = { | 194 | static struct resource pxa_resource_stuart[] = { |
| 196 | { | 195 | { |
| 197 | .start = __PREG(STUART), | 196 | .start = 0x40700000, |
| 198 | .end = __PREG(STUART) + 35, | 197 | .end = 0x40700023, |
| 199 | .flags = IORESOURCE_MEM, | 198 | .flags = IORESOURCE_MEM, |
| 200 | }, { | 199 | }, { |
| 201 | .start = IRQ_STUART, | 200 | .start = IRQ_STUART, |
| @@ -213,8 +212,8 @@ struct platform_device pxa_device_stuart = { | |||
| 213 | 212 | ||
| 214 | static struct resource pxa_resource_hwuart[] = { | 213 | static struct resource pxa_resource_hwuart[] = { |
| 215 | { | 214 | { |
| 216 | .start = __PREG(HWUART), | 215 | .start = 0x41600000, |
| 217 | .end = __PREG(HWUART) + 47, | 216 | .end = 0x4160002F, |
| 218 | .flags = IORESOURCE_MEM, | 217 | .flags = IORESOURCE_MEM, |
| 219 | }, { | 218 | }, { |
| 220 | .start = IRQ_HWUART, | 219 | .start = IRQ_HWUART, |
| @@ -249,18 +248,53 @@ struct platform_device pxa_device_i2c = { | |||
| 249 | .num_resources = ARRAY_SIZE(pxai2c_resources), | 248 | .num_resources = ARRAY_SIZE(pxai2c_resources), |
| 250 | }; | 249 | }; |
| 251 | 250 | ||
| 252 | static unsigned long pxa27x_i2c_mfp_cfg[] = { | ||
| 253 | GPIO117_I2C_SCL, | ||
| 254 | GPIO118_I2C_SDA, | ||
| 255 | }; | ||
| 256 | |||
| 257 | void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info) | 251 | void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info) |
| 258 | { | 252 | { |
| 259 | if (cpu_is_pxa27x()) | ||
| 260 | pxa2xx_mfp_config(ARRAY_AND_SIZE(pxa27x_i2c_mfp_cfg)); | ||
| 261 | pxa_register_device(&pxa_device_i2c, info); | 253 | pxa_register_device(&pxa_device_i2c, info); |
| 262 | } | 254 | } |
| 263 | 255 | ||
| 256 | #ifdef CONFIG_PXA27x | ||
| 257 | static struct resource pxa27x_resources_i2c_power[] = { | ||
| 258 | { | ||
| 259 | .start = 0x40f00180, | ||
| 260 | .end = 0x40f001a3, | ||
| 261 | .flags = IORESOURCE_MEM, | ||
| 262 | }, { | ||
| 263 | .start = IRQ_PWRI2C, | ||
| 264 | .end = IRQ_PWRI2C, | ||
| 265 | .flags = IORESOURCE_IRQ, | ||
| 266 | }, | ||
| 267 | }; | ||
| 268 | |||
| 269 | struct platform_device pxa27x_device_i2c_power = { | ||
| 270 | .name = "pxa2xx-i2c", | ||
| 271 | .id = 1, | ||
| 272 | .resource = pxa27x_resources_i2c_power, | ||
| 273 | .num_resources = ARRAY_SIZE(pxa27x_resources_i2c_power), | ||
| 274 | }; | ||
| 275 | #endif | ||
| 276 | |||
| 277 | #ifdef CONFIG_PXA3xx | ||
| 278 | static struct resource pxa3xx_resources_i2c_power[] = { | ||
| 279 | { | ||
| 280 | .start = 0x40f500c0, | ||
| 281 | .end = 0x40f500d3, | ||
| 282 | .flags = IORESOURCE_MEM, | ||
| 283 | }, { | ||
| 284 | .start = IRQ_PWRI2C, | ||
| 285 | .end = IRQ_PWRI2C, | ||
| 286 | .flags = IORESOURCE_IRQ, | ||
| 287 | }, | ||
| 288 | }; | ||
| 289 | |||
| 290 | struct platform_device pxa3xx_device_i2c_power = { | ||
| 291 | .name = "pxa2xx-i2c", | ||
| 292 | .id = 1, | ||
| 293 | .resource = pxa3xx_resources_i2c_power, | ||
| 294 | .num_resources = ARRAY_SIZE(pxa3xx_resources_i2c_power), | ||
| 295 | }; | ||
| 296 | #endif | ||
| 297 | |||
| 264 | static struct resource pxai2s_resources[] = { | 298 | static struct resource pxai2s_resources[] = { |
| 265 | { | 299 | { |
| 266 | .start = 0x40400000, | 300 | .start = 0x40400000, |
| @@ -296,11 +330,36 @@ void __init pxa_set_ficp_info(struct pxaficp_platform_data *info) | |||
| 296 | pxa_register_device(&pxa_device_ficp, info); | 330 | pxa_register_device(&pxa_device_ficp, info); |
| 297 | } | 331 | } |
| 298 | 332 | ||
| 299 | struct platform_device pxa_device_rtc = { | 333 | static struct resource pxa_rtc_resources[] = { |
| 334 | [0] = { | ||
| 335 | .start = 0x40900000, | ||
| 336 | .end = 0x40900000 + 0x3b, | ||
| 337 | .flags = IORESOURCE_MEM, | ||
| 338 | }, | ||
| 339 | [1] = { | ||
| 340 | .start = IRQ_RTC1Hz, | ||
| 341 | .end = IRQ_RTC1Hz, | ||
| 342 | .flags = IORESOURCE_IRQ, | ||
| 343 | }, | ||
| 344 | [2] = { | ||
| 345 | .start = IRQ_RTCAlrm, | ||
| 346 | .end = IRQ_RTCAlrm, | ||
| 347 | .flags = IORESOURCE_IRQ, | ||
| 348 | }, | ||
| 349 | }; | ||
| 350 | |||
| 351 | struct platform_device sa1100_device_rtc = { | ||
| 300 | .name = "sa1100-rtc", | 352 | .name = "sa1100-rtc", |
| 301 | .id = -1, | 353 | .id = -1, |
| 302 | }; | 354 | }; |
| 303 | 355 | ||
| 356 | struct platform_device pxa_device_rtc = { | ||
| 357 | .name = "pxa-rtc", | ||
| 358 | .id = -1, | ||
| 359 | .num_resources = ARRAY_SIZE(pxa_rtc_resources), | ||
| 360 | .resource = pxa_rtc_resources, | ||
| 361 | }; | ||
| 362 | |||
| 304 | static struct resource pxa_ac97_resources[] = { | 363 | static struct resource pxa_ac97_resources[] = { |
| 305 | [0] = { | 364 | [0] = { |
| 306 | .start = 0x40500000, | 365 | .start = 0x40500000, |
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h index bb04af4b0aa3..ecc24a4dca6d 100644 --- a/arch/arm/mach-pxa/devices.h +++ b/arch/arm/mach-pxa/devices.h | |||
| @@ -11,6 +11,7 @@ extern struct platform_device pxa_device_hwuart; | |||
| 11 | extern struct platform_device pxa_device_i2c; | 11 | extern struct platform_device pxa_device_i2c; |
| 12 | extern struct platform_device pxa_device_i2s; | 12 | extern struct platform_device pxa_device_i2s; |
| 13 | extern struct platform_device pxa_device_ficp; | 13 | extern struct platform_device pxa_device_ficp; |
| 14 | extern struct platform_device sa1100_device_rtc; | ||
| 14 | extern struct platform_device pxa_device_rtc; | 15 | extern struct platform_device pxa_device_rtc; |
| 15 | extern struct platform_device pxa_device_ac97; | 16 | extern struct platform_device pxa_device_ac97; |
| 16 | 17 | ||
diff --git a/arch/arm/mach-pxa/dma.c b/arch/arm/mach-pxa/dma.c index c0be17e0ab82..b1514fb20d3a 100644 --- a/arch/arm/mach-pxa/dma.c +++ b/arch/arm/mach-pxa/dma.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <asm/system.h> | 21 | #include <asm/system.h> |
| 22 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
| 23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 24 | #include <asm/dma.h> | 24 | #include <mach/dma.h> |
| 25 | 25 | ||
| 26 | #include <mach/pxa-regs.h> | 26 | #include <mach/pxa-regs.h> |
| 27 | 27 | ||
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c index cc3d850cc0b6..3e6aa33a2c7c 100644 --- a/arch/arm/mach-pxa/ezx.c +++ b/arch/arm/mach-pxa/ezx.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <mach/pxafb.h> | 21 | #include <mach/pxafb.h> |
| 22 | #include <mach/ohci.h> | 22 | #include <mach/ohci.h> |
| 23 | #include <mach/i2c.h> | 23 | #include <mach/i2c.h> |
| 24 | #include <mach/hardware.h> | ||
| 24 | 25 | ||
| 25 | #include <mach/mfp-pxa27x.h> | 26 | #include <mach/mfp-pxa27x.h> |
| 26 | #include <mach/pxa-regs.h> | 27 | #include <mach/pxa-regs.h> |
| @@ -112,6 +113,10 @@ static unsigned long ezx_pin_config[] __initdata = { | |||
| 112 | GPIO91_USB_P3_1, /* ICL_XRXD */ | 113 | GPIO91_USB_P3_1, /* ICL_XRXD */ |
| 113 | GPIO56_USB_P3_4, /* ICL_VMOUT */ | 114 | GPIO56_USB_P3_4, /* ICL_VMOUT */ |
| 114 | GPIO113_USB_P3_3, /* /ICL_VMIN */ | 115 | GPIO113_USB_P3_3, /* /ICL_VMIN */ |
| 116 | |||
| 117 | /* I2C */ | ||
| 118 | GPIO117_I2C_SCL, | ||
| 119 | GPIO118_I2C_SDA, | ||
| 115 | }; | 120 | }; |
| 116 | 121 | ||
| 117 | static void __init ezx_init(void) | 122 | static void __init ezx_init(void) |
diff --git a/arch/arm/mach-pxa/gpio.c b/arch/arm/mach-pxa/gpio.c index 14930cf8be7b..5fec1e479cb3 100644 --- a/arch/arm/mach-pxa/gpio.c +++ b/arch/arm/mach-pxa/gpio.c | |||
| @@ -25,6 +25,18 @@ | |||
| 25 | 25 | ||
| 26 | #include "generic.h" | 26 | #include "generic.h" |
| 27 | 27 | ||
| 28 | #define GPIO0_BASE ((void __iomem *)io_p2v(0x40E00000)) | ||
| 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 | |||
| 33 | #define GPLR_OFFSET 0x00 | ||
| 34 | #define GPDR_OFFSET 0x0C | ||
| 35 | #define GPSR_OFFSET 0x18 | ||
| 36 | #define GPCR_OFFSET 0x24 | ||
| 37 | #define GRER_OFFSET 0x30 | ||
| 38 | #define GFER_OFFSET 0x3C | ||
| 39 | #define GEDR_OFFSET 0x48 | ||
| 28 | 40 | ||
| 29 | struct pxa_gpio_chip { | 41 | struct pxa_gpio_chip { |
| 30 | struct gpio_chip chip; | 42 | struct gpio_chip chip; |
| @@ -33,6 +45,18 @@ struct pxa_gpio_chip { | |||
| 33 | 45 | ||
| 34 | int pxa_last_gpio; | 46 | int pxa_last_gpio; |
| 35 | 47 | ||
| 48 | #ifdef CONFIG_CPU_PXA26x | ||
| 49 | /* GPIO86/87/88/89 on PXA26x have their direction bits in GPDR2 inverted, | ||
| 50 | * as well as their Alternate Function value being '1' for GPIO in GAFRx. | ||
| 51 | */ | ||
| 52 | static int __gpio_is_inverted(unsigned gpio) | ||
| 53 | { | ||
| 54 | return cpu_is_pxa25x() && gpio > 85; | ||
| 55 | } | ||
| 56 | #else | ||
| 57 | #define __gpio_is_inverted(gpio) (0) | ||
| 58 | #endif | ||
| 59 | |||
| 36 | /* | 60 | /* |
| 37 | * Configure pins for GPIO or other functions | 61 | * Configure pins for GPIO or other functions |
| 38 | */ | 62 | */ |
| @@ -75,7 +99,10 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | |||
| 75 | gpdr = pxa->regbase + GPDR_OFFSET; | 99 | gpdr = pxa->regbase + GPDR_OFFSET; |
| 76 | local_irq_save(flags); | 100 | local_irq_save(flags); |
| 77 | value = __raw_readl(gpdr); | 101 | value = __raw_readl(gpdr); |
| 78 | value &= ~mask; | 102 | if (__gpio_is_inverted(chip->base + offset)) |
| 103 | value |= mask; | ||
| 104 | else | ||
| 105 | value &= ~mask; | ||
| 79 | __raw_writel(value, gpdr); | 106 | __raw_writel(value, gpdr); |
| 80 | local_irq_restore(flags); | 107 | local_irq_restore(flags); |
| 81 | 108 | ||
| @@ -97,7 +124,10 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip, | |||
| 97 | gpdr = pxa->regbase + GPDR_OFFSET; | 124 | gpdr = pxa->regbase + GPDR_OFFSET; |
| 98 | local_irq_save(flags); | 125 | local_irq_save(flags); |
| 99 | tmp = __raw_readl(gpdr); | 126 | tmp = __raw_readl(gpdr); |
| 100 | tmp |= mask; | 127 | if (__gpio_is_inverted(chip->base + offset)) |
| 128 | tmp &= ~mask; | ||
| 129 | else | ||
| 130 | tmp |= mask; | ||
| 101 | __raw_writel(tmp, gpdr); | 131 | __raw_writel(tmp, gpdr); |
| 102 | local_irq_restore(flags); | 132 | local_irq_restore(flags); |
| 103 | 133 | ||
| @@ -173,10 +203,17 @@ static unsigned long GPIO_IRQ_mask[4]; | |||
| 173 | */ | 203 | */ |
| 174 | static int __gpio_is_occupied(unsigned gpio) | 204 | static int __gpio_is_occupied(unsigned gpio) |
| 175 | { | 205 | { |
| 176 | if (cpu_is_pxa25x() || cpu_is_pxa27x()) | 206 | if (cpu_is_pxa27x() || cpu_is_pxa25x()) { |
| 177 | return GAFR(gpio) & (0x3 << (((gpio) & 0xf) * 2)); | 207 | int af = (GAFR(gpio) >> ((gpio & 0xf) * 2)) & 0x3; |
| 178 | else | 208 | int dir = GPDR(gpio) & GPIO_bit(gpio); |
| 179 | return 0; | 209 | |
| 210 | if (__gpio_is_inverted(gpio)) | ||
| 211 | return af != 1 || dir == 0; | ||
| 212 | else | ||
| 213 | return af != 0 || dir != 0; | ||
| 214 | } | ||
| 215 | |||
| 216 | return 0; | ||
| 180 | } | 217 | } |
| 181 | 218 | ||
| 182 | static int pxa_gpio_irq_type(unsigned int irq, unsigned int type) | 219 | static int pxa_gpio_irq_type(unsigned int irq, unsigned int type) |
| @@ -190,9 +227,8 @@ static int pxa_gpio_irq_type(unsigned int irq, unsigned int type) | |||
| 190 | /* Don't mess with enabled GPIOs using preconfigured edges or | 227 | /* Don't mess with enabled GPIOs using preconfigured edges or |
| 191 | * GPIOs set to alternate function or to output during probe | 228 | * GPIOs set to alternate function or to output during probe |
| 192 | */ | 229 | */ |
| 193 | if ((GPIO_IRQ_rising_edge[idx] | | 230 | if ((GPIO_IRQ_rising_edge[idx] & GPIO_bit(gpio)) || |
| 194 | GPIO_IRQ_falling_edge[idx] | | 231 | (GPIO_IRQ_falling_edge[idx] & GPIO_bit(gpio))) |
| 195 | GPDR(gpio)) & GPIO_bit(gpio)) | ||
| 196 | return 0; | 232 | return 0; |
| 197 | 233 | ||
| 198 | if (__gpio_is_occupied(gpio)) | 234 | if (__gpio_is_occupied(gpio)) |
| @@ -201,7 +237,10 @@ static int pxa_gpio_irq_type(unsigned int irq, unsigned int type) | |||
| 201 | type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING; | 237 | type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING; |
| 202 | } | 238 | } |
| 203 | 239 | ||
| 204 | GPDR(gpio) &= ~GPIO_bit(gpio); | 240 | if (__gpio_is_inverted(gpio)) |
| 241 | GPDR(gpio) |= GPIO_bit(gpio); | ||
| 242 | else | ||
| 243 | GPDR(gpio) &= ~GPIO_bit(gpio); | ||
| 205 | 244 | ||
| 206 | if (type & IRQ_TYPE_EDGE_RISING) | 245 | if (type & IRQ_TYPE_EDGE_RISING) |
| 207 | __set_bit(gpio, GPIO_IRQ_rising_edge); | 246 | __set_bit(gpio, GPIO_IRQ_rising_edge); |
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c index d8962a0fb98d..06bc6674b015 100644 --- a/arch/arm/mach-pxa/gumstix.c +++ b/arch/arm/mach-pxa/gumstix.c | |||
| @@ -184,13 +184,6 @@ static unsigned long gumstix_pin_config[] __initdata = { | |||
| 184 | GPIO6_MMC_CLK, | 184 | GPIO6_MMC_CLK, |
| 185 | GPIO53_MMC_CLK, | 185 | GPIO53_MMC_CLK, |
| 186 | GPIO8_MMC_CS0, | 186 | GPIO8_MMC_CS0, |
| 187 | /* these are used by AM200EPD */ | ||
| 188 | GPIO51_GPIO, | ||
| 189 | GPIO49_GPIO, | ||
| 190 | GPIO48_GPIO, | ||
| 191 | GPIO32_GPIO, | ||
| 192 | GPIO17_GPIO, | ||
| 193 | GPIO16_GPIO, | ||
| 194 | }; | 187 | }; |
| 195 | 188 | ||
| 196 | static void __init gumstix_init(void) | 189 | static void __init gumstix_init(void) |
diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c new file mode 100644 index 000000000000..da6e4422c0f3 --- /dev/null +++ b/arch/arm/mach-pxa/h5000.c | |||
| @@ -0,0 +1,200 @@ | |||
| 1 | /* | ||
| 2 | * Hardware definitions for HP iPAQ h5xxx Handheld Computers | ||
| 3 | * | ||
| 4 | * Copyright 2000-2003 Hewlett-Packard Company. | ||
| 5 | * Copyright 2002 Jamey Hicks <jamey.hicks@hp.com> | ||
| 6 | * Copyright 2004-2005 Phil Blundell <pb@handhelds.org> | ||
| 7 | * Copyright 2007-2008 Anton Vorontsov <cbouatmailru@gmail.com> | ||
| 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 as published by | ||
| 11 | * the Free Software Foundation; either version 2 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | * | ||
| 14 | * COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED, | ||
| 15 | * AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS | ||
| 16 | * FITNESS FOR ANY PARTICULAR PURPOSE. | ||
| 17 | * | ||
| 18 | * Author: Jamey Hicks. | ||
| 19 | */ | ||
| 20 | |||
| 21 | #include <linux/kernel.h> | ||
| 22 | #include <linux/init.h> | ||
| 23 | #include <linux/platform_device.h> | ||
| 24 | #include <linux/mtd/mtd.h> | ||
| 25 | #include <linux/mtd/partitions.h> | ||
| 26 | #include <linux/mtd/physmap.h> | ||
| 27 | #include <asm/mach-types.h> | ||
| 28 | #include <asm/mach/arch.h> | ||
| 29 | #include <asm/mach/map.h> | ||
| 30 | #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> | ||
| 35 | #include "generic.h" | ||
| 36 | |||
| 37 | /* | ||
| 38 | * Flash | ||
| 39 | */ | ||
| 40 | |||
| 41 | static struct mtd_partition h5000_flash0_partitions[] = { | ||
| 42 | { | ||
| 43 | .name = "bootldr", | ||
| 44 | .size = 0x00040000, | ||
| 45 | .offset = 0, | ||
| 46 | .mask_flags = MTD_WRITEABLE, | ||
| 47 | }, | ||
| 48 | { | ||
| 49 | .name = "root", | ||
| 50 | .size = MTDPART_SIZ_FULL, | ||
| 51 | .offset = MTDPART_OFS_APPEND, | ||
| 52 | }, | ||
| 53 | }; | ||
| 54 | |||
| 55 | static struct mtd_partition h5000_flash1_partitions[] = { | ||
| 56 | { | ||
| 57 | .name = "second root", | ||
| 58 | .size = SZ_16M - 0x00040000, | ||
| 59 | .offset = 0, | ||
| 60 | }, | ||
| 61 | { | ||
| 62 | .name = "asset", | ||
| 63 | .size = MTDPART_SIZ_FULL, | ||
| 64 | .offset = MTDPART_OFS_APPEND, | ||
| 65 | .mask_flags = MTD_WRITEABLE, | ||
| 66 | }, | ||
| 67 | }; | ||
| 68 | |||
| 69 | static struct physmap_flash_data h5000_flash0_data = { | ||
| 70 | .width = 4, | ||
| 71 | .parts = h5000_flash0_partitions, | ||
| 72 | .nr_parts = ARRAY_SIZE(h5000_flash0_partitions), | ||
| 73 | }; | ||
| 74 | |||
| 75 | static struct physmap_flash_data h5000_flash1_data = { | ||
| 76 | .width = 4, | ||
| 77 | .parts = h5000_flash1_partitions, | ||
| 78 | .nr_parts = ARRAY_SIZE(h5000_flash1_partitions), | ||
| 79 | }; | ||
| 80 | |||
| 81 | static struct resource h5000_flash0_resources = { | ||
| 82 | .start = PXA_CS0_PHYS, | ||
| 83 | .end = PXA_CS0_PHYS + SZ_32M - 1, | ||
| 84 | .flags = IORESOURCE_MEM | IORESOURCE_MEM_32BIT, | ||
| 85 | }; | ||
| 86 | |||
| 87 | static struct resource h5000_flash1_resources = { | ||
| 88 | .start = PXA_CS0_PHYS + SZ_32M, | ||
| 89 | .end = PXA_CS0_PHYS + SZ_32M + SZ_16M - 1, | ||
| 90 | .flags = IORESOURCE_MEM | IORESOURCE_MEM_32BIT, | ||
| 91 | }; | ||
| 92 | |||
| 93 | static struct platform_device h5000_flash[] = { | ||
| 94 | { | ||
| 95 | .name = "physmap-flash", | ||
| 96 | .id = 0, | ||
| 97 | .resource = &h5000_flash0_resources, | ||
| 98 | .num_resources = 1, | ||
| 99 | .dev = { | ||
| 100 | .platform_data = &h5000_flash0_data, | ||
| 101 | }, | ||
| 102 | }, | ||
| 103 | { | ||
| 104 | .name = "physmap-flash", | ||
| 105 | .id = 1, | ||
| 106 | .resource = &h5000_flash1_resources, | ||
| 107 | .num_resources = 1, | ||
| 108 | .dev = { | ||
| 109 | .platform_data = &h5000_flash1_data, | ||
| 110 | }, | ||
| 111 | }, | ||
| 112 | }; | ||
| 113 | |||
| 114 | /* | ||
| 115 | * USB Device Controller | ||
| 116 | */ | ||
| 117 | |||
| 118 | static struct pxa2xx_udc_mach_info h5000_udc_mach_info __initdata = { | ||
| 119 | .gpio_pullup = H5000_GPIO_USB_PULLUP, | ||
| 120 | }; | ||
| 121 | |||
| 122 | /* | ||
| 123 | * GPIO setup | ||
| 124 | */ | ||
| 125 | |||
| 126 | static unsigned long h5000_pin_config[] __initdata = { | ||
| 127 | /* Crystal and Clock Signals */ | ||
| 128 | GPIO12_32KHz, | ||
| 129 | |||
| 130 | /* SDRAM and Static Memory I/O Signals */ | ||
| 131 | GPIO15_nCS_1, | ||
| 132 | GPIO78_nCS_2, | ||
| 133 | GPIO79_nCS_3, | ||
| 134 | GPIO80_nCS_4, | ||
| 135 | |||
| 136 | /* FFUART */ | ||
| 137 | GPIO34_FFUART_RXD, | ||
| 138 | GPIO35_FFUART_CTS, | ||
| 139 | GPIO36_FFUART_DCD, | ||
| 140 | GPIO37_FFUART_DSR, | ||
| 141 | GPIO38_FFUART_RI, | ||
| 142 | GPIO39_FFUART_TXD, | ||
| 143 | GPIO40_FFUART_DTR, | ||
| 144 | GPIO41_FFUART_RTS, | ||
| 145 | |||
| 146 | /* BTUART */ | ||
| 147 | GPIO42_BTUART_RXD, | ||
| 148 | GPIO43_BTUART_TXD, | ||
| 149 | GPIO44_BTUART_CTS, | ||
| 150 | GPIO45_BTUART_RTS, | ||
| 151 | |||
| 152 | /* SSP1 */ | ||
| 153 | GPIO23_SSP1_SCLK, | ||
| 154 | GPIO25_SSP1_TXD, | ||
| 155 | GPIO26_SSP1_RXD, | ||
| 156 | }; | ||
| 157 | |||
| 158 | /* | ||
| 159 | * Localbus setup: | ||
| 160 | * CS0: Flash; | ||
| 161 | * CS1: MediaQ chip, select 16-bit bus and vlio; | ||
| 162 | * CS5: SAMCOP. | ||
| 163 | */ | ||
| 164 | |||
| 165 | static void fix_msc(void) | ||
| 166 | { | ||
| 167 | MSC0 = 0x129c24f2; | ||
| 168 | MSC1 = 0x7ff424fa; | ||
| 169 | MSC2 = 0x7ff47ff4; | ||
| 170 | |||
| 171 | MDREFR |= 0x02080000; | ||
| 172 | } | ||
| 173 | |||
| 174 | /* | ||
| 175 | * Platform devices | ||
| 176 | */ | ||
| 177 | |||
| 178 | static struct platform_device *devices[] __initdata = { | ||
| 179 | &h5000_flash[0], | ||
| 180 | &h5000_flash[1], | ||
| 181 | }; | ||
| 182 | |||
| 183 | static void __init h5000_init(void) | ||
| 184 | { | ||
| 185 | fix_msc(); | ||
| 186 | |||
| 187 | pxa2xx_mfp_config(ARRAY_AND_SIZE(h5000_pin_config)); | ||
| 188 | pxa_set_udc_info(&h5000_udc_mach_info); | ||
| 189 | platform_add_devices(ARRAY_AND_SIZE(devices)); | ||
| 190 | } | ||
| 191 | |||
| 192 | MACHINE_START(H5400, "HP iPAQ H5000") | ||
| 193 | .phys_io = 0x40000000, | ||
| 194 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | ||
| 195 | .boot_params = 0xa0000100, | ||
| 196 | .map_io = pxa_map_io, | ||
| 197 | .init_irq = pxa25x_init_irq, | ||
| 198 | .timer = &pxa_timer, | ||
| 199 | .init_machine = h5000_init, | ||
| 200 | MACHINE_END | ||
diff --git a/arch/arm/mach-pxa/include/mach/dma.h b/arch/arm/mach-pxa/include/mach/dma.h index 955bfe606067..7804637a6df3 100644 --- a/arch/arm/mach-pxa/include/mach/dma.h +++ b/arch/arm/mach-pxa/include/mach/dma.h | |||
| @@ -30,10 +30,6 @@ typedef enum { | |||
| 30 | DMA_PRIO_LOW = 2 | 30 | DMA_PRIO_LOW = 2 |
| 31 | } pxa_dma_prio; | 31 | } pxa_dma_prio; |
| 32 | 32 | ||
| 33 | #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) | ||
| 34 | #define HAVE_ARCH_PCI_SET_DMA_MASK 1 | ||
| 35 | #endif | ||
| 36 | |||
| 37 | /* | 33 | /* |
| 38 | * DMA registration | 34 | * DMA registration |
| 39 | */ | 35 | */ |
diff --git a/arch/arm/mach-pxa/include/mach/h5000.h b/arch/arm/mach-pxa/include/mach/h5000.h new file mode 100644 index 000000000000..2a5ae3802787 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/h5000.h | |||
| @@ -0,0 +1,113 @@ | |||
| 1 | /* | ||
| 2 | * Hardware definitions for HP iPAQ h5xxx Handheld Computers | ||
| 3 | * | ||
| 4 | * Copyright(20)02 Hewlett-Packard Company. | ||
| 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 as published by | ||
| 8 | * the Free Software Foundation; either version 2 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED, | ||
| 12 | * AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS | ||
| 13 | * FITNESS FOR ANY PARTICULAR PURPOSE. | ||
| 14 | * | ||
| 15 | * Author: Jamey Hicks | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARCH_H5000_H | ||
| 19 | #define __ASM_ARCH_H5000_H | ||
| 20 | |||
| 21 | #include <mach/mfp-pxa25x.h> | ||
| 22 | |||
| 23 | /* | ||
| 24 | * CPU GPIOs | ||
| 25 | */ | ||
| 26 | |||
| 27 | #define H5000_GPIO_POWER_BUTTON (0) | ||
| 28 | #define H5000_GPIO_RESET_BUTTON_N (1) | ||
| 29 | #define H5000_GPIO_OPT_INT (2) | ||
| 30 | #define H5000_GPIO_BACKUP_POWER (3) | ||
| 31 | #define H5000_GPIO_ACTION_BUTTON (4) | ||
| 32 | #define H5000_GPIO_COM_DCD_SOMETHING (5) /* what is this really ? */ | ||
| 33 | /* 6 not connected */ | ||
| 34 | #define H5000_GPIO_RESET_BUTTON_AGAIN_N (7) /* connected to gpio 1 as well */ | ||
| 35 | /* 8 not connected */ | ||
| 36 | #define H5000_GPIO_RSO_N (9) /* reset output from max1702 which regulates 3.3 and 2.5 */ | ||
| 37 | #define H5000_GPIO_ASIC_INT_N (10) /* from companion asic */ | ||
| 38 | #define H5000_GPIO_BT_ENV_0 (11) /* to LMX9814, set to 1 according to regdump */ | ||
| 39 | /*(12) not connected */ | ||
| 40 | #define H5000_GPIO_BT_ENV_1 (13) /* to LMX9814, set to 1 according to regdump */ | ||
| 41 | #define H5000_GPIO_BT_WU (14) /* from LMX9814, Defined as HOST_WAKEUP in the LMX9820 data sheet */ | ||
| 42 | /*(15) is CS1# */ | ||
| 43 | /*(16) not connected */ | ||
| 44 | /*(17) not connected */ | ||
| 45 | /*(18) is pcmcia ready */ | ||
| 46 | /*(19) is dreq1 */ | ||
| 47 | /*(20) is dreq0 */ | ||
| 48 | #define H5000_GPIO_OE_RD_NWR (21) /* output enable on rd/nwr signal to companion asic */ | ||
| 49 | /*(22) is not connected */ | ||
| 50 | #define H5000_GPIO_OPT_SPI_CLK (23) /* to extension pack */ | ||
| 51 | #define H5000_GPIO_OPT_SPI_CS_N (24) /* to extension pack */ | ||
| 52 | #define H5000_GPIO_OPT_SPI_DOUT (25) /* to extension pack */ | ||
| 53 | #define H5000_GPIO_OPT_SPI_DIN (26) /* to extension pack */ | ||
| 54 | /*(27) not connected */ | ||
| 55 | #define H5000_GPIO_I2S_BITCLK (28) /* connected to AC97 codec */ | ||
| 56 | #define H5000_GPIO_I2S_DATAOUT (29) /* connected to AC97 codec */ | ||
| 57 | #define H5000_GPIO_I2S_DATAIN (30) /* connected to AC97 codec */ | ||
| 58 | #define H5000_GPIO_I2S_LRCLK (31) /* connected to AC97 codec */ | ||
| 59 | #define H5000_GPIO_I2S_SYSCLK (32) /* connected to AC97 codec */ | ||
| 60 | /*(33) is CS5# */ | ||
| 61 | #define H5000_GPIO_COM_RXD (34) /* connected to cradle/cable connector */ | ||
| 62 | #define H5000_GPIO_COM_CTS (35) /* connected to cradle/cable connector */ | ||
| 63 | #define H5000_GPIO_COM_DCD (36) /* connected to cradle/cable connector */ | ||
| 64 | #define H5000_GPIO_COM_DSR (37) /* connected to cradle/cable connector */ | ||
| 65 | #define H5000_GPIO_COM_RI (38) /* connected to cradle/cable connector */ | ||
| 66 | #define H5000_GPIO_COM_TXD (39) /* connected to cradle/cable connector */ | ||
| 67 | #define H5000_GPIO_COM_DTR (40) /* connected to cradle/cable connector */ | ||
| 68 | #define H5000_GPIO_COM_RTS (41) /* connected to cradle/cable connector */ | ||
| 69 | |||
| 70 | #define H5000_GPIO_BT_RXD (42) /* connected to BT (LMX9814) */ | ||
| 71 | #define H5000_GPIO_BT_TXD (43) /* connected to BT (LMX9814) */ | ||
| 72 | #define H5000_GPIO_BT_CTS (44) /* connected to BT (LMX9814) */ | ||
| 73 | #define H5000_GPIO_BT_RTS (45) /* connected to BT (LMX9814) */ | ||
| 74 | |||
| 75 | #define H5000_GPIO_IRDA_RXD (46) | ||
| 76 | #define H5000_GPIO_IRDA_TXD (47) | ||
| 77 | |||
| 78 | #define H5000_GPIO_POE_N (48) /* used for pcmcia */ | ||
| 79 | #define H5000_GPIO_PWE_N (49) /* used for pcmcia */ | ||
| 80 | #define H5000_GPIO_PIOR_N (50) /* used for pcmcia */ | ||
| 81 | #define H5000_GPIO_PIOW_N (51) /* used for pcmcia */ | ||
| 82 | #define H5000_GPIO_PCE1_N (52) /* used for pcmcia */ | ||
| 83 | #define H5000_GPIO_PCE2_N (53) /* used for pcmcia */ | ||
| 84 | #define H5000_GPIO_PSKTSEL (54) /* used for pcmcia */ | ||
| 85 | #define H5000_GPIO_PREG_N (55) /* used for pcmcia */ | ||
| 86 | #define H5000_GPIO_PWAIT_N (56) /* used for pcmcia */ | ||
| 87 | #define H5000_GPIO_IOIS16_N (57) /* used for pcmcia */ | ||
| 88 | |||
| 89 | #define H5000_GPIO_IRDA_SD (58) /* to hsdl3002 sd */ | ||
| 90 | /*(59) not connected */ | ||
| 91 | #define H5000_GPIO_POWER_SD_N (60) /* controls power to SD */ | ||
| 92 | #define H5000_GPIO_POWER_RS232_N (61) /* inverted FORCEON to rs232 transceiver */ | ||
| 93 | #define H5000_GPIO_POWER_ACCEL_N (62) /* controls power to accel */ | ||
| 94 | /*(63) is not connected */ | ||
| 95 | #define H5000_GPIO_OPT_NVRAM (64) /* controls power to expansion pack */ | ||
| 96 | #define H5000_GPIO_CHG_EN (65) /* to sc801 en */ | ||
| 97 | #define H5000_GPIO_USB_PULLUP (66) /* USB d+ pullup via 1.5K resistor */ | ||
| 98 | #define H5000_GPIO_BT_2V8_N (67) /* 2.8V used by bluetooth */ | ||
| 99 | #define H5000_GPIO_EXT_CHG_RATE (68) /* enables external charging rate */ | ||
| 100 | /*(69) is not connected */ | ||
| 101 | #define H5000_GPIO_CIR_RESET (70) /* consumer IR reset */ | ||
| 102 | #define H5000_GPIO_POWER_LIGHT_SENSOR_N (71) | ||
| 103 | #define H5000_GPIO_BT_M_RESET (72) | ||
| 104 | #define H5000_GPIO_STD_CHG_RATE (73) | ||
| 105 | #define H5000_GPIO_SD_WP_N (74) | ||
| 106 | #define H5000_GPIO_MOTOR_ON_N (75) /* external pullup on this */ | ||
| 107 | #define H5000_GPIO_HEADPHONE_DETECT (76) | ||
| 108 | #define H5000_GPIO_USB_CHG_RATE (77) /* select rate for charging via usb */ | ||
| 109 | /*(78) is CS2# */ | ||
| 110 | /*(79) is CS3# */ | ||
| 111 | /*(80) is CS4# */ | ||
| 112 | |||
| 113 | #endif /* __ASM_ARCH_H5000_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index a582a6d9b92b..4e782ec38668 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h | |||
| @@ -102,6 +102,9 @@ | |||
| 102 | * PXA930 B0 0x69056835 0x5E643013 | 102 | * PXA930 B0 0x69056835 0x5E643013 |
| 103 | * PXA930 B1 0x69056837 0x7E643013 | 103 | * PXA930 B1 0x69056837 0x7E643013 |
| 104 | * PXA930 B2 0x69056838 0x8E643013 | 104 | * PXA930 B2 0x69056838 0x8E643013 |
| 105 | * | ||
| 106 | * PXA935 A0 0x56056931 0x1E653013 | ||
| 107 | * PXA935 B0 0x56056936 0x6E653013 | ||
| 105 | */ | 108 | */ |
| 106 | #ifdef CONFIG_PXA25x | 109 | #ifdef CONFIG_PXA25x |
| 107 | #define __cpu_is_pxa210(id) \ | 110 | #define __cpu_is_pxa210(id) \ |
| @@ -178,12 +181,22 @@ | |||
| 178 | #define __cpu_is_pxa930(id) \ | 181 | #define __cpu_is_pxa930(id) \ |
| 179 | ({ \ | 182 | ({ \ |
| 180 | unsigned int _id = (id) >> 4 & 0xfff; \ | 183 | unsigned int _id = (id) >> 4 & 0xfff; \ |
| 181 | _id == 0x683; \ | 184 | _id == 0x683; \ |
| 182 | }) | 185 | }) |
| 183 | #else | 186 | #else |
| 184 | #define __cpu_is_pxa930(id) (0) | 187 | #define __cpu_is_pxa930(id) (0) |
| 185 | #endif | 188 | #endif |
| 186 | 189 | ||
| 190 | #ifdef CONFIG_CPU_PXA935 | ||
| 191 | #define __cpu_is_pxa935(id) \ | ||
| 192 | ({ \ | ||
| 193 | unsigned int _id = (id) >> 4 & 0xfff; \ | ||
| 194 | _id == 0x693; \ | ||
| 195 | }) | ||
| 196 | #else | ||
| 197 | #define __cpu_is_pxa935(id) (0) | ||
| 198 | #endif | ||
| 199 | |||
| 187 | #define cpu_is_pxa210() \ | 200 | #define cpu_is_pxa210() \ |
| 188 | ({ \ | 201 | ({ \ |
| 189 | __cpu_is_pxa210(read_cpuid_id()); \ | 202 | __cpu_is_pxa210(read_cpuid_id()); \ |
| @@ -204,8 +217,6 @@ | |||
| 204 | __cpu_is_pxa25x(read_cpuid_id()); \ | 217 | __cpu_is_pxa25x(read_cpuid_id()); \ |
| 205 | }) | 218 | }) |
| 206 | 219 | ||
| 207 | extern int cpu_is_pxa26x(void); | ||
| 208 | |||
| 209 | #define cpu_is_pxa27x() \ | 220 | #define cpu_is_pxa27x() \ |
| 210 | ({ \ | 221 | ({ \ |
| 211 | __cpu_is_pxa27x(read_cpuid_id()); \ | 222 | __cpu_is_pxa27x(read_cpuid_id()); \ |
| @@ -232,6 +243,12 @@ extern int cpu_is_pxa26x(void); | |||
| 232 | __cpu_is_pxa930(id); \ | 243 | __cpu_is_pxa930(id); \ |
| 233 | }) | 244 | }) |
| 234 | 245 | ||
| 246 | #define cpu_is_pxa935() \ | ||
| 247 | ({ \ | ||
| 248 | unsigned int id = read_cpuid(CPUID_ID); \ | ||
| 249 | __cpu_is_pxa935(id); \ | ||
| 250 | }) | ||
| 251 | |||
| 235 | /* | 252 | /* |
| 236 | * CPUID Core Generation Bit | 253 | * CPUID Core Generation Bit |
| 237 | * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x | 254 | * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x |
| @@ -249,6 +266,12 @@ extern int cpu_is_pxa26x(void); | |||
| 249 | _id == 0x3; \ | 266 | _id == 0x3; \ |
| 250 | }) | 267 | }) |
| 251 | 268 | ||
| 269 | #define __cpu_is_pxa9xx(id) \ | ||
| 270 | ({ \ | ||
| 271 | unsigned int _id = (id) >> 4 & 0xfff; \ | ||
| 272 | _id == 0x683 || _id == 0x693; \ | ||
| 273 | }) | ||
| 274 | |||
| 252 | #define cpu_is_pxa2xx() \ | 275 | #define cpu_is_pxa2xx() \ |
| 253 | ({ \ | 276 | ({ \ |
| 254 | __cpu_is_pxa2xx(read_cpuid_id()); \ | 277 | __cpu_is_pxa2xx(read_cpuid_id()); \ |
| @@ -259,21 +282,10 @@ extern int cpu_is_pxa26x(void); | |||
| 259 | __cpu_is_pxa3xx(read_cpuid_id()); \ | 282 | __cpu_is_pxa3xx(read_cpuid_id()); \ |
| 260 | }) | 283 | }) |
| 261 | 284 | ||
| 262 | /* | 285 | #define cpu_is_pxa9xx() \ |
| 263 | * Handy routine to set GPIO alternate functions | 286 | ({ \ |
| 264 | */ | 287 | __cpu_is_pxa9xx(read_cpuid_id()); \ |
| 265 | extern int pxa_gpio_mode( int gpio_mode ); | 288 | }) |
| 266 | |||
| 267 | /* | ||
| 268 | * Return GPIO level, nonzero means high, zero is low | ||
| 269 | */ | ||
| 270 | extern int pxa_gpio_get_value(unsigned gpio); | ||
| 271 | |||
| 272 | /* | ||
| 273 | * Set output GPIO level | ||
| 274 | */ | ||
| 275 | extern void pxa_gpio_set_value(unsigned gpio, int value); | ||
| 276 | |||
| 277 | /* | 289 | /* |
| 278 | * return current memory and LCD clock frequency in units of 10kHz | 290 | * return current memory and LCD clock frequency in units of 10kHz |
| 279 | */ | 291 | */ |
| @@ -285,6 +297,8 @@ extern unsigned int get_memclk_frequency_10khz(void); | |||
| 285 | #define PCIBIOS_MIN_IO 0 | 297 | #define PCIBIOS_MIN_IO 0 |
| 286 | #define PCIBIOS_MIN_MEM 0 | 298 | #define PCIBIOS_MIN_MEM 0 |
| 287 | #define pcibios_assign_all_busses() 1 | 299 | #define pcibios_assign_all_busses() 1 |
| 300 | #define HAVE_ARCH_PCI_SET_DMA_MASK 1 | ||
| 288 | #endif | 301 | #endif |
| 289 | 302 | ||
| 303 | |||
| 290 | #endif /* _ASM_ARCH_HARDWARE_H */ | 304 | #endif /* _ASM_ARCH_HARDWARE_H */ |
diff --git a/arch/arm/mach-pxa/include/mach/io.h b/arch/arm/mach-pxa/include/mach/io.h index 600fd4f76603..262691fb97d8 100644 --- a/arch/arm/mach-pxa/include/mach/io.h +++ b/arch/arm/mach-pxa/include/mach/io.h | |||
| @@ -6,15 +6,13 @@ | |||
| 6 | #ifndef __ASM_ARM_ARCH_IO_H | 6 | #ifndef __ASM_ARM_ARCH_IO_H |
| 7 | #define __ASM_ARM_ARCH_IO_H | 7 | #define __ASM_ARM_ARCH_IO_H |
| 8 | 8 | ||
| 9 | #include <mach/hardware.h> | ||
| 10 | |||
| 11 | #define IO_SPACE_LIMIT 0xffffffff | 9 | #define IO_SPACE_LIMIT 0xffffffff |
| 12 | 10 | ||
| 13 | /* | 11 | /* |
| 14 | * We don't actually have real ISA nor PCI buses, but there is so many | 12 | * We don't actually have real ISA nor PCI buses, but there is so many |
| 15 | * drivers out there that might just work if we fake them... | 13 | * drivers out there that might just work if we fake them... |
| 16 | */ | 14 | */ |
| 17 | #define __io(a) ((void __iomem *)(a)) | 15 | #define __io(a) __typesafe_io(a) |
| 18 | #define __mem_pci(a) (a) | 16 | #define __mem_pci(a) (a) |
| 19 | 17 | ||
| 20 | #endif | 18 | #endif |
diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h index 59aef89808d6..f626730ee42e 100644 --- a/arch/arm/mach-pxa/include/mach/memory.h +++ b/arch/arm/mach-pxa/include/mach/memory.h | |||
| @@ -18,16 +18,6 @@ | |||
| 18 | #define PHYS_OFFSET UL(0xa0000000) | 18 | #define PHYS_OFFSET UL(0xa0000000) |
| 19 | 19 | ||
| 20 | /* | 20 | /* |
| 21 | * Virtual view <-> DMA view memory address translations | ||
| 22 | * virt_to_bus: Used to translate the virtual address to an | ||
| 23 | * address suitable to be passed to set_dma_addr | ||
| 24 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 25 | * to an address that the kernel can use. | ||
| 26 | */ | ||
| 27 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 28 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 29 | |||
| 30 | /* | ||
| 31 | * The nodes are matched with the physical SDRAM banks as follows: | 21 | * The nodes are matched with the physical SDRAM banks as follows: |
| 32 | * | 22 | * |
| 33 | * node 0: 0xa0000000-0xa3ffffff --> 0xc0000000-0xc3ffffff | 23 | * node 0: 0xa0000000-0xa3ffffff --> 0xc0000000-0xc3ffffff |
| @@ -47,6 +37,7 @@ void cmx2xx_pci_adjust_zones(int node, unsigned long *size, | |||
| 47 | cmx2xx_pci_adjust_zones(node, size, holes) | 37 | cmx2xx_pci_adjust_zones(node, size, holes) |
| 48 | 38 | ||
| 49 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1) | 39 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1) |
| 40 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) | ||
| 50 | #endif | 41 | #endif |
| 51 | 42 | ||
| 52 | #endif | 43 | #endif |
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h index 617cab2cc8d0..a72869b73ee3 100644 --- a/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa25x.h | |||
| @@ -158,4 +158,35 @@ | |||
| 158 | #define GPIO76_LCD_PCLK MFP_CFG_OUT(GPIO76, AF2, DRIVE_LOW) | 158 | #define GPIO76_LCD_PCLK MFP_CFG_OUT(GPIO76, AF2, DRIVE_LOW) |
| 159 | #define GPIO77_LCD_BIAS MFP_CFG_OUT(GPIO77, AF2, DRIVE_LOW) | 159 | #define GPIO77_LCD_BIAS MFP_CFG_OUT(GPIO77, AF2, DRIVE_LOW) |
| 160 | 160 | ||
| 161 | #ifdef CONFIG_CPU_PXA26x | ||
| 162 | /* GPIO */ | ||
| 163 | #define GPIO85_GPIO MFP_CFG_IN(GPIO85, AF0) | ||
| 164 | #define GPIO86_GPIO MFP_CFG_IN(GPIO86, AF1) | ||
| 165 | #define GPIO87_GPIO MFP_CFG_IN(GPIO87, AF1) | ||
| 166 | #define GPIO88_GPIO MFP_CFG_IN(GPIO88, AF1) | ||
| 167 | #define GPIO89_GPIO MFP_CFG_IN(GPIO89, AF1) | ||
| 168 | |||
| 169 | /* SDRAM */ | ||
| 170 | #define GPIO86_nSDCS2 MFP_CFG_OUT(GPIO86, AF0, DRIVE_HIGH) | ||
| 171 | #define GPIO87_nSDCS3 MFP_CFG_OUT(GPIO87, AF0, DRIVE_HIGH) | ||
| 172 | #define GPIO88_RDnWR MFP_CFG_OUT(GPIO88, AF0, DRIVE_HIGH) | ||
| 173 | #define GPIO89_nACRESET MFP_CFG_OUT(GPIO89, AF0, DRIVE_HIGH) | ||
| 174 | |||
| 175 | /* USB */ | ||
| 176 | #define GPIO9_USB_RCV MFP_CFG_IN(GPIO9, AF1) | ||
| 177 | #define GPIO32_USB_VP MFP_CFG_IN(GPIO32, AF2) | ||
| 178 | #define GPIO34_USB_VM MFP_CFG_IN(GPIO34, AF2) | ||
| 179 | #define GPIO39_USB_VPO MFP_CFG_OUT(GPIO39, AF3, DRIVE_LOW) | ||
| 180 | #define GPIO56_USB_VMO MFP_CFG_OUT(GPIO56, AF1, DRIVE_LOW) | ||
| 181 | #define GPIO57_USB_nOE MFP_CFG_OUT(GPIO57, AF1, DRIVE_HIGH) | ||
| 182 | |||
| 183 | /* ASSP */ | ||
| 184 | #define GPIO28_ASSP_BITCLK_IN MFP_CFG_IN(GPIO28, AF3) | ||
| 185 | #define GPIO28_ASSP_BITCLK_OUT MFP_CFG_OUT(GPIO28, AF3, DRIVE_LOW) | ||
| 186 | #define GPIO29_ASSP_RXD MFP_CFG_IN(GPIO29, AF3) | ||
| 187 | #define GPIO30_ASSP_TXD MFP_CFG_OUT(GPIO30, AF3, DRIVE_LOW) | ||
| 188 | #define GPIO31_ASSP_SFRM_IN MFP_CFG_IN(GPIO31, AF1) | ||
| 189 | #define GPIO31_ASSP_SFRM_OUT MFP_CFG_OUT(GPIO31, AF3, DRIVE_LOW) | ||
| 190 | #endif | ||
| 191 | |||
| 161 | #endif /* __ASM_ARCH_MFP_PXA25X_H */ | 192 | #endif /* __ASM_ARCH_MFP_PXA25X_H */ |
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h index 122bdbd53182..da4f85a4f990 100644 --- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | |||
| @@ -11,6 +11,12 @@ | |||
| 11 | #include <mach/mfp.h> | 11 | #include <mach/mfp.h> |
| 12 | #include <mach/mfp-pxa2xx.h> | 12 | #include <mach/mfp-pxa2xx.h> |
| 13 | 13 | ||
| 14 | /* Note: GPIO3/GPIO4 will be driven by Power I2C when PCFR/PI2C_EN | ||
| 15 | * bit is set, regardless of the GPIO configuration | ||
| 16 | */ | ||
| 17 | #define GPIO3_GPIO MFP_CFG_IN(GPIO3, AF0) | ||
| 18 | #define GPIO4_GPIO MFP_CFG_IN(GPIO4, AF0) | ||
| 19 | |||
| 14 | /* GPIO */ | 20 | /* GPIO */ |
| 15 | #define GPIO85_GPIO MFP_CFG_IN(GPIO85, AF0) | 21 | #define GPIO85_GPIO MFP_CFG_IN(GPIO85, AF0) |
| 16 | #define GPIO86_GPIO MFP_CFG_IN(GPIO86, AF0) | 22 | #define GPIO86_GPIO MFP_CFG_IN(GPIO86, AF0) |
diff --git a/arch/arm/mach-pxa/include/mach/mioa701.h b/arch/arm/mach-pxa/include/mach/mioa701.h index 8483cb511831..02868447b0b1 100644 --- a/arch/arm/mach-pxa/include/mach/mioa701.h +++ b/arch/arm/mach-pxa/include/mach/mioa701.h | |||
| @@ -10,12 +10,14 @@ | |||
| 10 | (MFP_PIN(pin) | MFP_##af | MFP_DIR_OUT | MFP_LPM_##state)) | 10 | (MFP_PIN(pin) | MFP_##af | MFP_DIR_OUT | MFP_LPM_##state)) |
| 11 | 11 | ||
| 12 | /* Global GPIOs */ | 12 | /* Global GPIOs */ |
| 13 | #define GPIO9_CHARGE_nEN 9 | 13 | #define GPIO9_CHARGE_EN 9 |
| 14 | #define GPIO18_POWEROFF 18 | 14 | #define GPIO18_POWEROFF 18 |
| 15 | #define GPIO87_LCD_POWER 87 | 15 | #define GPIO87_LCD_POWER 87 |
| 16 | #define GPIO96_AC_DETECT 96 | ||
| 17 | #define GPIO80_MAYBE_CHARGE_VDROP 80 /* Drop of 88mV */ | ||
| 16 | 18 | ||
| 17 | /* USB */ | 19 | /* USB */ |
| 18 | #define GPIO13_USB_DETECT 13 | 20 | #define GPIO13_nUSB_DETECT 13 |
| 19 | #define GPIO22_USB_ENABLE 22 | 21 | #define GPIO22_USB_ENABLE 22 |
| 20 | 22 | ||
| 21 | /* SDIO bits */ | 23 | /* SDIO bits */ |
| @@ -24,7 +26,10 @@ | |||
| 24 | #define GPIO91_SDIO_EN 91 | 26 | #define GPIO91_SDIO_EN 91 |
| 25 | 27 | ||
| 26 | /* Bluetooth */ | 28 | /* Bluetooth */ |
| 29 | #define GPIO14_BT_nACTIVITY 14 | ||
| 27 | #define GPIO83_BT_ON 83 | 30 | #define GPIO83_BT_ON 83 |
| 31 | #define GPIO77_BT_UNKNOWN1 77 | ||
| 32 | #define GPIO86_BT_MAYBE_nRESET 86 | ||
| 28 | 33 | ||
| 29 | /* GPS */ | 34 | /* GPS */ |
| 30 | #define GPIO23_GPS_UNKNOWN1 23 | 35 | #define GPIO23_GPS_UNKNOWN1 23 |
diff --git a/arch/arm/mach-pxa/include/mach/mtd-xip.h b/arch/arm/mach-pxa/include/mach/mtd-xip.h index 4d452fcb1508..cfca8155be72 100644 --- a/arch/arm/mach-pxa/include/mach/mtd-xip.h +++ b/arch/arm/mach-pxa/include/mach/mtd-xip.h | |||
| @@ -15,6 +15,7 @@ | |||
| 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/pxa-regs.h> | 19 | #include <mach/pxa-regs.h> |
| 19 | 20 | ||
| 20 | #define xip_irqpending() (ICIP & ICMR) | 21 | #define xip_irqpending() (ICIP & ICMR) |
diff --git a/arch/arm/mach-pxa/include/mach/pxa-regs.h b/arch/arm/mach-pxa/include/mach/pxa-regs.h index 15295d960000..31d615aa7723 100644 --- a/arch/arm/mach-pxa/include/mach/pxa-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa-regs.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #ifndef __PXA_REGS_H | 13 | #ifndef __PXA_REGS_H |
| 14 | #define __PXA_REGS_H | 14 | #define __PXA_REGS_H |
| 15 | 15 | ||
| 16 | #include <mach/hardware.h> | ||
| 16 | 17 | ||
| 17 | /* | 18 | /* |
| 18 | * PXA Chip selects | 19 | * PXA Chip selects |
| @@ -123,298 +124,6 @@ | |||
| 123 | #define DCMD_WIDTH4 (3 << 14) /* 4 byte width (Word) */ | 124 | #define DCMD_WIDTH4 (3 << 14) /* 4 byte width (Word) */ |
| 124 | #define DCMD_LENGTH 0x01fff /* length mask (max = 8K - 1) */ | 125 | #define DCMD_LENGTH 0x01fff /* length mask (max = 8K - 1) */ |
| 125 | 126 | ||
| 126 | |||
| 127 | /* | ||
| 128 | * UARTs | ||
| 129 | */ | ||
| 130 | |||
| 131 | /* Full Function UART (FFUART) */ | ||
| 132 | #define FFUART FFRBR | ||
| 133 | #define FFRBR __REG(0x40100000) /* Receive Buffer Register (read only) */ | ||
| 134 | #define FFTHR __REG(0x40100000) /* Transmit Holding Register (write only) */ | ||
| 135 | #define FFIER __REG(0x40100004) /* Interrupt Enable Register (read/write) */ | ||
| 136 | #define FFIIR __REG(0x40100008) /* Interrupt ID Register (read only) */ | ||
| 137 | #define FFFCR __REG(0x40100008) /* FIFO Control Register (write only) */ | ||
| 138 | #define FFLCR __REG(0x4010000C) /* Line Control Register (read/write) */ | ||
| 139 | #define FFMCR __REG(0x40100010) /* Modem Control Register (read/write) */ | ||
| 140 | #define FFLSR __REG(0x40100014) /* Line Status Register (read only) */ | ||
| 141 | #define FFMSR __REG(0x40100018) /* Modem Status Register (read only) */ | ||
| 142 | #define FFSPR __REG(0x4010001C) /* Scratch Pad Register (read/write) */ | ||
| 143 | #define FFISR __REG(0x40100020) /* Infrared Selection Register (read/write) */ | ||
| 144 | #define FFDLL __REG(0x40100000) /* Divisor Latch Low Register (DLAB = 1) (read/write) */ | ||
| 145 | #define FFDLH __REG(0x40100004) /* Divisor Latch High Register (DLAB = 1) (read/write) */ | ||
| 146 | |||
| 147 | /* Bluetooth UART (BTUART) */ | ||
| 148 | #define BTUART BTRBR | ||
| 149 | #define BTRBR __REG(0x40200000) /* Receive Buffer Register (read only) */ | ||
| 150 | #define BTTHR __REG(0x40200000) /* Transmit Holding Register (write only) */ | ||
| 151 | #define BTIER __REG(0x40200004) /* Interrupt Enable Register (read/write) */ | ||
| 152 | #define BTIIR __REG(0x40200008) /* Interrupt ID Register (read only) */ | ||
| 153 | #define BTFCR __REG(0x40200008) /* FIFO Control Register (write only) */ | ||
| 154 | #define BTLCR __REG(0x4020000C) /* Line Control Register (read/write) */ | ||
| 155 | #define BTMCR __REG(0x40200010) /* Modem Control Register (read/write) */ | ||
| 156 | #define BTLSR __REG(0x40200014) /* Line Status Register (read only) */ | ||
| 157 | #define BTMSR __REG(0x40200018) /* Modem Status Register (read only) */ | ||
| 158 | #define BTSPR __REG(0x4020001C) /* Scratch Pad Register (read/write) */ | ||
| 159 | #define BTISR __REG(0x40200020) /* Infrared Selection Register (read/write) */ | ||
| 160 | #define BTDLL __REG(0x40200000) /* Divisor Latch Low Register (DLAB = 1) (read/write) */ | ||
| 161 | #define BTDLH __REG(0x40200004) /* Divisor Latch High Register (DLAB = 1) (read/write) */ | ||
| 162 | |||
| 163 | /* Standard UART (STUART) */ | ||
| 164 | #define STUART STRBR | ||
| 165 | #define STRBR __REG(0x40700000) /* Receive Buffer Register (read only) */ | ||
| 166 | #define STTHR __REG(0x40700000) /* Transmit Holding Register (write only) */ | ||
| 167 | #define STIER __REG(0x40700004) /* Interrupt Enable Register (read/write) */ | ||
| 168 | #define STIIR __REG(0x40700008) /* Interrupt ID Register (read only) */ | ||
| 169 | #define STFCR __REG(0x40700008) /* FIFO Control Register (write only) */ | ||
| 170 | #define STLCR __REG(0x4070000C) /* Line Control Register (read/write) */ | ||
| 171 | #define STMCR __REG(0x40700010) /* Modem Control Register (read/write) */ | ||
| 172 | #define STLSR __REG(0x40700014) /* Line Status Register (read only) */ | ||
| 173 | #define STMSR __REG(0x40700018) /* Reserved */ | ||
| 174 | #define STSPR __REG(0x4070001C) /* Scratch Pad Register (read/write) */ | ||
| 175 | #define STISR __REG(0x40700020) /* Infrared Selection Register (read/write) */ | ||
| 176 | #define STDLL __REG(0x40700000) /* Divisor Latch Low Register (DLAB = 1) (read/write) */ | ||
| 177 | #define STDLH __REG(0x40700004) /* Divisor Latch High Register (DLAB = 1) (read/write) */ | ||
| 178 | |||
| 179 | /* Hardware UART (HWUART) */ | ||
| 180 | #define HWUART HWRBR | ||
| 181 | #define HWRBR __REG(0x41600000) /* Receive Buffer Register (read only) */ | ||
| 182 | #define HWTHR __REG(0x41600000) /* Transmit Holding Register (write only) */ | ||
| 183 | #define HWIER __REG(0x41600004) /* Interrupt Enable Register (read/write) */ | ||
| 184 | #define HWIIR __REG(0x41600008) /* Interrupt ID Register (read only) */ | ||
| 185 | #define HWFCR __REG(0x41600008) /* FIFO Control Register (write only) */ | ||
| 186 | #define HWLCR __REG(0x4160000C) /* Line Control Register (read/write) */ | ||
| 187 | #define HWMCR __REG(0x41600010) /* Modem Control Register (read/write) */ | ||
| 188 | #define HWLSR __REG(0x41600014) /* Line Status Register (read only) */ | ||
| 189 | #define HWMSR __REG(0x41600018) /* Modem Status Register (read only) */ | ||
| 190 | #define HWSPR __REG(0x4160001C) /* Scratch Pad Register (read/write) */ | ||
| 191 | #define HWISR __REG(0x41600020) /* Infrared Selection Register (read/write) */ | ||
| 192 | #define HWFOR __REG(0x41600024) /* Receive FIFO Occupancy Register (read only) */ | ||
| 193 | #define HWABR __REG(0x41600028) /* Auto-Baud Control Register (read/write) */ | ||
| 194 | #define HWACR __REG(0x4160002C) /* Auto-Baud Count Register (read only) */ | ||
| 195 | #define HWDLL __REG(0x41600000) /* Divisor Latch Low Register (DLAB = 1) (read/write) */ | ||
| 196 | #define HWDLH __REG(0x41600004) /* Divisor Latch High Register (DLAB = 1) (read/write) */ | ||
| 197 | |||
| 198 | #define IER_DMAE (1 << 7) /* DMA Requests Enable */ | ||
| 199 | #define IER_UUE (1 << 6) /* UART Unit Enable */ | ||
| 200 | #define IER_NRZE (1 << 5) /* NRZ coding Enable */ | ||
| 201 | #define IER_RTIOE (1 << 4) /* Receiver Time Out Interrupt Enable */ | ||
| 202 | #define IER_MIE (1 << 3) /* Modem Interrupt Enable */ | ||
| 203 | #define IER_RLSE (1 << 2) /* Receiver Line Status Interrupt Enable */ | ||
| 204 | #define IER_TIE (1 << 1) /* Transmit Data request Interrupt Enable */ | ||
| 205 | #define IER_RAVIE (1 << 0) /* Receiver Data Available Interrupt Enable */ | ||
| 206 | |||
| 207 | #define IIR_FIFOES1 (1 << 7) /* FIFO Mode Enable Status */ | ||
| 208 | #define IIR_FIFOES0 (1 << 6) /* FIFO Mode Enable Status */ | ||
| 209 | #define IIR_TOD (1 << 3) /* Time Out Detected */ | ||
| 210 | #define IIR_IID2 (1 << 2) /* Interrupt Source Encoded */ | ||
| 211 | #define IIR_IID1 (1 << 1) /* Interrupt Source Encoded */ | ||
| 212 | #define IIR_IP (1 << 0) /* Interrupt Pending (active low) */ | ||
| 213 | |||
| 214 | #define FCR_ITL2 (1 << 7) /* Interrupt Trigger Level */ | ||
| 215 | #define FCR_ITL1 (1 << 6) /* Interrupt Trigger Level */ | ||
| 216 | #define FCR_RESETTF (1 << 2) /* Reset Transmitter FIFO */ | ||
| 217 | #define FCR_RESETRF (1 << 1) /* Reset Receiver FIFO */ | ||
| 218 | #define FCR_TRFIFOE (1 << 0) /* Transmit and Receive FIFO Enable */ | ||
| 219 | #define FCR_ITL_1 (0) | ||
| 220 | #define FCR_ITL_8 (FCR_ITL1) | ||
| 221 | #define FCR_ITL_16 (FCR_ITL2) | ||
| 222 | #define FCR_ITL_32 (FCR_ITL2|FCR_ITL1) | ||
| 223 | |||
| 224 | #define LCR_DLAB (1 << 7) /* Divisor Latch Access Bit */ | ||
| 225 | #define LCR_SB (1 << 6) /* Set Break */ | ||
| 226 | #define LCR_STKYP (1 << 5) /* Sticky Parity */ | ||
| 227 | #define LCR_EPS (1 << 4) /* Even Parity Select */ | ||
| 228 | #define LCR_PEN (1 << 3) /* Parity Enable */ | ||
| 229 | #define LCR_STB (1 << 2) /* Stop Bit */ | ||
| 230 | #define LCR_WLS1 (1 << 1) /* Word Length Select */ | ||
| 231 | #define LCR_WLS0 (1 << 0) /* Word Length Select */ | ||
| 232 | |||
| 233 | #define LSR_FIFOE (1 << 7) /* FIFO Error Status */ | ||
| 234 | #define LSR_TEMT (1 << 6) /* Transmitter Empty */ | ||
| 235 | #define LSR_TDRQ (1 << 5) /* Transmit Data Request */ | ||
| 236 | #define LSR_BI (1 << 4) /* Break Interrupt */ | ||
| 237 | #define LSR_FE (1 << 3) /* Framing Error */ | ||
| 238 | #define LSR_PE (1 << 2) /* Parity Error */ | ||
| 239 | #define LSR_OE (1 << 1) /* Overrun Error */ | ||
| 240 | #define LSR_DR (1 << 0) /* Data Ready */ | ||
| 241 | |||
| 242 | #define MCR_LOOP (1 << 4) | ||
| 243 | #define MCR_OUT2 (1 << 3) /* force MSR_DCD in loopback mode */ | ||
| 244 | #define MCR_OUT1 (1 << 2) /* force MSR_RI in loopback mode */ | ||
| 245 | #define MCR_RTS (1 << 1) /* Request to Send */ | ||
| 246 | #define MCR_DTR (1 << 0) /* Data Terminal Ready */ | ||
| 247 | |||
| 248 | #define MSR_DCD (1 << 7) /* Data Carrier Detect */ | ||
| 249 | #define MSR_RI (1 << 6) /* Ring Indicator */ | ||
| 250 | #define MSR_DSR (1 << 5) /* Data Set Ready */ | ||
| 251 | #define MSR_CTS (1 << 4) /* Clear To Send */ | ||
| 252 | #define MSR_DDCD (1 << 3) /* Delta Data Carrier Detect */ | ||
| 253 | #define MSR_TERI (1 << 2) /* Trailing Edge Ring Indicator */ | ||
| 254 | #define MSR_DDSR (1 << 1) /* Delta Data Set Ready */ | ||
| 255 | #define MSR_DCTS (1 << 0) /* Delta Clear To Send */ | ||
| 256 | |||
| 257 | /* | ||
| 258 | * IrSR (Infrared Selection Register) | ||
| 259 | */ | ||
| 260 | #define STISR_RXPL (1 << 4) /* Receive Data Polarity */ | ||
| 261 | #define STISR_TXPL (1 << 3) /* Transmit Data Polarity */ | ||
| 262 | #define STISR_XMODE (1 << 2) /* Transmit Pulse Width Select */ | ||
| 263 | #define STISR_RCVEIR (1 << 1) /* Receiver SIR Enable */ | ||
| 264 | #define STISR_XMITIR (1 << 0) /* Transmitter SIR Enable */ | ||
| 265 | |||
| 266 | |||
| 267 | /* | ||
| 268 | * I2C registers - moved into drivers/i2c/busses/i2c-pxa.c | ||
| 269 | */ | ||
| 270 | |||
| 271 | /* | ||
| 272 | * Serial Audio Controller - moved into sound/soc/pxa/pxa2xx-i2s.c | ||
| 273 | */ | ||
| 274 | |||
| 275 | /* | ||
| 276 | * AC97 Controller registers | ||
| 277 | */ | ||
| 278 | |||
| 279 | #define POCR __REG(0x40500000) /* PCM Out Control Register */ | ||
| 280 | #define POCR_FEIE (1 << 3) /* FIFO Error Interrupt Enable */ | ||
| 281 | #define POCR_FSRIE (1 << 1) /* FIFO Service Request Interrupt Enable */ | ||
| 282 | |||
| 283 | #define PICR __REG(0x40500004) /* PCM In Control Register */ | ||
| 284 | #define PICR_FEIE (1 << 3) /* FIFO Error Interrupt Enable */ | ||
| 285 | #define PICR_FSRIE (1 << 1) /* FIFO Service Request Interrupt Enable */ | ||
| 286 | |||
| 287 | #define MCCR __REG(0x40500008) /* Mic In Control Register */ | ||
| 288 | #define MCCR_FEIE (1 << 3) /* FIFO Error Interrupt Enable */ | ||
| 289 | #define MCCR_FSRIE (1 << 1) /* FIFO Service Request Interrupt Enable */ | ||
| 290 | |||
| 291 | #define GCR __REG(0x4050000C) /* Global Control Register */ | ||
| 292 | #ifdef CONFIG_PXA3xx | ||
| 293 | #define GCR_CLKBPB (1 << 31) /* Internal clock enable */ | ||
| 294 | #endif | ||
| 295 | #define GCR_nDMAEN (1 << 24) /* non DMA Enable */ | ||
| 296 | #define GCR_CDONE_IE (1 << 19) /* Command Done Interrupt Enable */ | ||
| 297 | #define GCR_SDONE_IE (1 << 18) /* Status Done Interrupt Enable */ | ||
| 298 | #define GCR_SECRDY_IEN (1 << 9) /* Secondary Ready Interrupt Enable */ | ||
| 299 | #define GCR_PRIRDY_IEN (1 << 8) /* Primary Ready Interrupt Enable */ | ||
| 300 | #define GCR_SECRES_IEN (1 << 5) /* Secondary Resume Interrupt Enable */ | ||
| 301 | #define GCR_PRIRES_IEN (1 << 4) /* Primary Resume Interrupt Enable */ | ||
| 302 | #define GCR_ACLINK_OFF (1 << 3) /* AC-link Shut Off */ | ||
| 303 | #define GCR_WARM_RST (1 << 2) /* AC97 Warm Reset */ | ||
| 304 | #define GCR_COLD_RST (1 << 1) /* AC'97 Cold Reset (0 = active) */ | ||
| 305 | #define GCR_GIE (1 << 0) /* Codec GPI Interrupt Enable */ | ||
| 306 | |||
| 307 | #define POSR __REG(0x40500010) /* PCM Out Status Register */ | ||
| 308 | #define POSR_FIFOE (1 << 4) /* FIFO error */ | ||
| 309 | #define POSR_FSR (1 << 2) /* FIFO Service Request */ | ||
| 310 | |||
| 311 | #define PISR __REG(0x40500014) /* PCM In Status Register */ | ||
| 312 | #define PISR_FIFOE (1 << 4) /* FIFO error */ | ||
| 313 | #define PISR_EOC (1 << 3) /* DMA End-of-Chain (exclusive clear) */ | ||
| 314 | #define PISR_FSR (1 << 2) /* FIFO Service Request */ | ||
| 315 | |||
| 316 | #define MCSR __REG(0x40500018) /* Mic In Status Register */ | ||
| 317 | #define MCSR_FIFOE (1 << 4) /* FIFO error */ | ||
| 318 | #define MCSR_EOC (1 << 3) /* DMA End-of-Chain (exclusive clear) */ | ||
| 319 | #define MCSR_FSR (1 << 2) /* FIFO Service Request */ | ||
| 320 | |||
| 321 | #define GSR __REG(0x4050001C) /* Global Status Register */ | ||
| 322 | #define GSR_CDONE (1 << 19) /* Command Done */ | ||
| 323 | #define GSR_SDONE (1 << 18) /* Status Done */ | ||
| 324 | #define GSR_RDCS (1 << 15) /* Read Completion Status */ | ||
| 325 | #define GSR_BIT3SLT12 (1 << 14) /* Bit 3 of slot 12 */ | ||
| 326 | #define GSR_BIT2SLT12 (1 << 13) /* Bit 2 of slot 12 */ | ||
| 327 | #define GSR_BIT1SLT12 (1 << 12) /* Bit 1 of slot 12 */ | ||
| 328 | #define GSR_SECRES (1 << 11) /* Secondary Resume Interrupt */ | ||
| 329 | #define GSR_PRIRES (1 << 10) /* Primary Resume Interrupt */ | ||
| 330 | #define GSR_SCR (1 << 9) /* Secondary Codec Ready */ | ||
| 331 | #define GSR_PCR (1 << 8) /* Primary Codec Ready */ | ||
| 332 | #define GSR_MCINT (1 << 7) /* Mic In Interrupt */ | ||
| 333 | #define GSR_POINT (1 << 6) /* PCM Out Interrupt */ | ||
| 334 | #define GSR_PIINT (1 << 5) /* PCM In Interrupt */ | ||
| 335 | #define GSR_ACOFFD (1 << 3) /* AC-link Shut Off Done */ | ||
| 336 | #define GSR_MOINT (1 << 2) /* Modem Out Interrupt */ | ||
| 337 | #define GSR_MIINT (1 << 1) /* Modem In Interrupt */ | ||
| 338 | #define GSR_GSCI (1 << 0) /* Codec GPI Status Change Interrupt */ | ||
| 339 | |||
| 340 | #define CAR __REG(0x40500020) /* CODEC Access Register */ | ||
| 341 | #define CAR_CAIP (1 << 0) /* Codec Access In Progress */ | ||
| 342 | |||
| 343 | #define PCDR __REG(0x40500040) /* PCM FIFO Data Register */ | ||
| 344 | #define MCDR __REG(0x40500060) /* Mic-in FIFO Data Register */ | ||
| 345 | |||
| 346 | #define MOCR __REG(0x40500100) /* Modem Out Control Register */ | ||
| 347 | #define MOCR_FEIE (1 << 3) /* FIFO Error */ | ||
| 348 | #define MOCR_FSRIE (1 << 1) /* FIFO Service Request Interrupt Enable */ | ||
| 349 | |||
| 350 | #define MICR __REG(0x40500108) /* Modem In Control Register */ | ||
| 351 | #define MICR_FEIE (1 << 3) /* FIFO Error */ | ||
| 352 | #define MICR_FSRIE (1 << 1) /* FIFO Service Request Interrupt Enable */ | ||
| 353 | |||
| 354 | #define MOSR __REG(0x40500110) /* Modem Out Status Register */ | ||
| 355 | #define MOSR_FIFOE (1 << 4) /* FIFO error */ | ||
| 356 | #define MOSR_FSR (1 << 2) /* FIFO Service Request */ | ||
| 357 | |||
| 358 | #define MISR __REG(0x40500118) /* Modem In Status Register */ | ||
| 359 | #define MISR_FIFOE (1 << 4) /* FIFO error */ | ||
| 360 | #define MISR_EOC (1 << 3) /* DMA End-of-Chain (exclusive clear) */ | ||
| 361 | #define MISR_FSR (1 << 2) /* FIFO Service Request */ | ||
| 362 | |||
| 363 | #define MODR __REG(0x40500140) /* Modem FIFO Data Register */ | ||
| 364 | |||
| 365 | #define PAC_REG_BASE __REG(0x40500200) /* Primary Audio Codec */ | ||
| 366 | #define SAC_REG_BASE __REG(0x40500300) /* Secondary Audio Codec */ | ||
| 367 | #define PMC_REG_BASE __REG(0x40500400) /* Primary Modem Codec */ | ||
| 368 | #define SMC_REG_BASE __REG(0x40500500) /* Secondary Modem Codec */ | ||
| 369 | |||
| 370 | |||
| 371 | /* | ||
| 372 | * Fast Infrared Communication Port | ||
| 373 | */ | ||
| 374 | |||
| 375 | #define FICP __REG(0x40800000) /* Start of FICP area */ | ||
| 376 | #define ICCR0 __REG(0x40800000) /* ICP Control Register 0 */ | ||
| 377 | #define ICCR1 __REG(0x40800004) /* ICP Control Register 1 */ | ||
| 378 | #define ICCR2 __REG(0x40800008) /* ICP Control Register 2 */ | ||
| 379 | #define ICDR __REG(0x4080000c) /* ICP Data Register */ | ||
| 380 | #define ICSR0 __REG(0x40800014) /* ICP Status Register 0 */ | ||
| 381 | #define ICSR1 __REG(0x40800018) /* ICP Status Register 1 */ | ||
| 382 | |||
| 383 | #define ICCR0_AME (1 << 7) /* Address match enable */ | ||
| 384 | #define ICCR0_TIE (1 << 6) /* Transmit FIFO interrupt enable */ | ||
| 385 | #define ICCR0_RIE (1 << 5) /* Recieve FIFO interrupt enable */ | ||
| 386 | #define ICCR0_RXE (1 << 4) /* Receive enable */ | ||
| 387 | #define ICCR0_TXE (1 << 3) /* Transmit enable */ | ||
| 388 | #define ICCR0_TUS (1 << 2) /* Transmit FIFO underrun select */ | ||
| 389 | #define ICCR0_LBM (1 << 1) /* Loopback mode */ | ||
| 390 | #define ICCR0_ITR (1 << 0) /* IrDA transmission */ | ||
| 391 | |||
| 392 | #define ICCR2_RXP (1 << 3) /* Receive Pin Polarity select */ | ||
| 393 | #define ICCR2_TXP (1 << 2) /* Transmit Pin Polarity select */ | ||
| 394 | #define ICCR2_TRIG (3 << 0) /* Receive FIFO Trigger threshold */ | ||
| 395 | #define ICCR2_TRIG_8 (0 << 0) /* >= 8 bytes */ | ||
| 396 | #define ICCR2_TRIG_16 (1 << 0) /* >= 16 bytes */ | ||
| 397 | #define ICCR2_TRIG_32 (2 << 0) /* >= 32 bytes */ | ||
| 398 | |||
| 399 | #ifdef CONFIG_PXA27x | ||
| 400 | #define ICSR0_EOC (1 << 6) /* DMA End of Descriptor Chain */ | ||
| 401 | #endif | ||
| 402 | #define ICSR0_FRE (1 << 5) /* Framing error */ | ||
| 403 | #define ICSR0_RFS (1 << 4) /* Receive FIFO service request */ | ||
| 404 | #define ICSR0_TFS (1 << 3) /* Transnit FIFO service request */ | ||
| 405 | #define ICSR0_RAB (1 << 2) /* Receiver abort */ | ||
| 406 | #define ICSR0_TUR (1 << 1) /* Trunsmit FIFO underun */ | ||
| 407 | #define ICSR0_EIF (1 << 0) /* End/Error in FIFO */ | ||
| 408 | |||
| 409 | #define ICSR1_ROR (1 << 6) /* Receiver FIFO underrun */ | ||
| 410 | #define ICSR1_CRE (1 << 5) /* CRC error */ | ||
| 411 | #define ICSR1_EOF (1 << 4) /* End of frame */ | ||
| 412 | #define ICSR1_TNF (1 << 3) /* Transmit FIFO not full */ | ||
| 413 | #define ICSR1_RNE (1 << 2) /* Receive FIFO not empty */ | ||
| 414 | #define ICSR1_TBY (1 << 1) /* Tramsmiter busy flag */ | ||
| 415 | #define ICSR1_RSY (1 << 0) /* Recevier synchronized flag */ | ||
| 416 | |||
| 417 | |||
| 418 | /* | 127 | /* |
| 419 | * Real Time Clock | 128 | * Real Time Clock |
| 420 | */ | 129 | */ |
| @@ -463,19 +172,6 @@ | |||
| 463 | 172 | ||
| 464 | 173 | ||
| 465 | /* | 174 | /* |
| 466 | * Pulse Width Modulator | ||
| 467 | */ | ||
| 468 | |||
| 469 | #define PWM_CTRL0 __REG(0x40B00000) /* PWM 0 Control Register */ | ||
| 470 | #define PWM_PWDUTY0 __REG(0x40B00004) /* PWM 0 Duty Cycle Register */ | ||
| 471 | #define PWM_PERVAL0 __REG(0x40B00008) /* PWM 0 Period Control Register */ | ||
| 472 | |||
| 473 | #define PWM_CTRL1 __REG(0x40C00000) /* PWM 1Control Register */ | ||
| 474 | #define PWM_PWDUTY1 __REG(0x40C00004) /* PWM 1 Duty Cycle Register */ | ||
| 475 | #define PWM_PERVAL1 __REG(0x40C00008) /* PWM 1 Period Control Register */ | ||
| 476 | |||
| 477 | |||
| 478 | /* | ||
| 479 | * Interrupt Controller | 175 | * Interrupt Controller |
| 480 | */ | 176 | */ |
| 481 | 177 | ||
| @@ -496,19 +192,6 @@ | |||
| 496 | * General Purpose I/O | 192 | * General Purpose I/O |
| 497 | */ | 193 | */ |
| 498 | 194 | ||
| 499 | #define GPIO0_BASE ((void __iomem *)io_p2v(0x40E00000)) | ||
| 500 | #define GPIO1_BASE ((void __iomem *)io_p2v(0x40E00004)) | ||
| 501 | #define GPIO2_BASE ((void __iomem *)io_p2v(0x40E00008)) | ||
| 502 | #define GPIO3_BASE ((void __iomem *)io_p2v(0x40E00100)) | ||
| 503 | |||
| 504 | #define GPLR_OFFSET 0x00 | ||
| 505 | #define GPDR_OFFSET 0x0C | ||
| 506 | #define GPSR_OFFSET 0x18 | ||
| 507 | #define GPCR_OFFSET 0x24 | ||
| 508 | #define GRER_OFFSET 0x30 | ||
| 509 | #define GFER_OFFSET 0x3C | ||
| 510 | #define GEDR_OFFSET 0x48 | ||
| 511 | |||
| 512 | #define GPLR0 __REG(0x40E00000) /* GPIO Pin-Level Register GPIO<31:0> */ | 195 | #define GPLR0 __REG(0x40E00000) /* GPIO Pin-Level Register GPIO<31:0> */ |
| 513 | #define GPLR1 __REG(0x40E00004) /* GPIO Pin-Level Register GPIO<63:32> */ | 196 | #define GPLR1 __REG(0x40E00004) /* GPIO Pin-Level Register GPIO<63:32> */ |
| 514 | #define GPLR2 __REG(0x40E00008) /* GPIO Pin-Level Register GPIO<80:64> */ | 197 | #define GPLR2 __REG(0x40E00008) /* GPIO Pin-Level Register GPIO<80:64> */ |
| @@ -558,10 +241,6 @@ | |||
| 558 | 241 | ||
| 559 | #define GPIO_bit(x) (1 << ((x) & 0x1f)) | 242 | #define GPIO_bit(x) (1 << ((x) & 0x1f)) |
| 560 | 243 | ||
| 561 | #if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) | ||
| 562 | |||
| 563 | /* Interrupt Controller */ | ||
| 564 | |||
| 565 | #define _GPLR(x) __REG2(0x40E00000, ((x) & 0x60) >> 3) | 244 | #define _GPLR(x) __REG2(0x40E00000, ((x) & 0x60) >> 3) |
| 566 | #define _GPDR(x) __REG2(0x40E0000C, ((x) & 0x60) >> 3) | 245 | #define _GPDR(x) __REG2(0x40E0000C, ((x) & 0x60) >> 3) |
| 567 | #define _GPSR(x) __REG2(0x40E00018, ((x) & 0x60) >> 3) | 246 | #define _GPSR(x) __REG2(0x40E00018, ((x) & 0x60) >> 3) |
| @@ -580,189 +259,5 @@ | |||
| 580 | #define GEDR(x) (*((((x) & 0x7f) < 96) ? &_GEDR(x) : &GEDR3)) | 259 | #define GEDR(x) (*((((x) & 0x7f) < 96) ? &_GEDR(x) : &GEDR3)) |
| 581 | #define GAFR(x) (*((((x) & 0x7f) < 96) ? &_GAFR(x) : \ | 260 | #define GAFR(x) (*((((x) & 0x7f) < 96) ? &_GAFR(x) : \ |
| 582 | ((((x) & 0x7f) < 112) ? &GAFR3_L : &GAFR3_U))) | 261 | ((((x) & 0x7f) < 112) ? &GAFR3_L : &GAFR3_U))) |
| 583 | #else | ||
| 584 | |||
| 585 | #define GPLR(x) __REG2(0x40E00000, ((x) & 0x60) >> 3) | ||
| 586 | #define GPDR(x) __REG2(0x40E0000C, ((x) & 0x60) >> 3) | ||
| 587 | #define GPSR(x) __REG2(0x40E00018, ((x) & 0x60) >> 3) | ||
| 588 | #define GPCR(x) __REG2(0x40E00024, ((x) & 0x60) >> 3) | ||
| 589 | #define GRER(x) __REG2(0x40E00030, ((x) & 0x60) >> 3) | ||
| 590 | #define GFER(x) __REG2(0x40E0003C, ((x) & 0x60) >> 3) | ||
| 591 | #define GEDR(x) __REG2(0x40E00048, ((x) & 0x60) >> 3) | ||
| 592 | #define GAFR(x) __REG2(0x40E00054, ((x) & 0x70) >> 2) | ||
| 593 | |||
| 594 | #endif | ||
| 595 | |||
| 596 | /* | ||
| 597 | * Power Manager - see pxa2xx-regs.h | ||
| 598 | */ | ||
| 599 | |||
| 600 | /* | ||
| 601 | * SSP Serial Port Registers - see arch/arm/mach-pxa/include/mach/regs-ssp.h | ||
| 602 | */ | ||
| 603 | |||
| 604 | /* | ||
| 605 | * MultiMediaCard (MMC) controller - see drivers/mmc/host/pxamci.h | ||
| 606 | */ | ||
| 607 | |||
| 608 | /* | ||
| 609 | * Core Clock - see arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | ||
| 610 | */ | ||
| 611 | |||
| 612 | #ifdef CONFIG_PXA27x | ||
| 613 | |||
| 614 | /* Camera Interface */ | ||
| 615 | #define CICR0 __REG(0x50000000) | ||
| 616 | #define CICR1 __REG(0x50000004) | ||
| 617 | #define CICR2 __REG(0x50000008) | ||
| 618 | #define CICR3 __REG(0x5000000C) | ||
| 619 | #define CICR4 __REG(0x50000010) | ||
| 620 | #define CISR __REG(0x50000014) | ||
| 621 | #define CIFR __REG(0x50000018) | ||
| 622 | #define CITOR __REG(0x5000001C) | ||
| 623 | #define CIBR0 __REG(0x50000028) | ||
| 624 | #define CIBR1 __REG(0x50000030) | ||
| 625 | #define CIBR2 __REG(0x50000038) | ||
| 626 | |||
| 627 | #define CICR0_DMAEN (1 << 31) /* DMA request enable */ | ||
| 628 | #define CICR0_PAR_EN (1 << 30) /* Parity enable */ | ||
| 629 | #define CICR0_SL_CAP_EN (1 << 29) /* Capture enable for slave mode */ | ||
| 630 | #define CICR0_ENB (1 << 28) /* Camera interface enable */ | ||
| 631 | #define CICR0_DIS (1 << 27) /* Camera interface disable */ | ||
| 632 | #define CICR0_SIM (0x7 << 24) /* Sensor interface mode mask */ | ||
| 633 | #define CICR0_TOM (1 << 9) /* Time-out mask */ | ||
| 634 | #define CICR0_RDAVM (1 << 8) /* Receive-data-available mask */ | ||
| 635 | #define CICR0_FEM (1 << 7) /* FIFO-empty mask */ | ||
| 636 | #define CICR0_EOLM (1 << 6) /* End-of-line mask */ | ||
| 637 | #define CICR0_PERRM (1 << 5) /* Parity-error mask */ | ||
| 638 | #define CICR0_QDM (1 << 4) /* Quick-disable mask */ | ||
| 639 | #define CICR0_CDM (1 << 3) /* Disable-done mask */ | ||
| 640 | #define CICR0_SOFM (1 << 2) /* Start-of-frame mask */ | ||
| 641 | #define CICR0_EOFM (1 << 1) /* End-of-frame mask */ | ||
| 642 | #define CICR0_FOM (1 << 0) /* FIFO-overrun mask */ | ||
| 643 | |||
| 644 | #define CICR1_TBIT (1 << 31) /* Transparency bit */ | ||
| 645 | #define CICR1_RGBT_CONV (0x3 << 29) /* RGBT conversion mask */ | ||
| 646 | #define CICR1_PPL (0x7ff << 15) /* Pixels per line mask */ | ||
| 647 | #define CICR1_RGB_CONV (0x7 << 12) /* RGB conversion mask */ | ||
| 648 | #define CICR1_RGB_F (1 << 11) /* RGB format */ | ||
| 649 | #define CICR1_YCBCR_F (1 << 10) /* YCbCr format */ | ||
| 650 | #define CICR1_RGB_BPP (0x7 << 7) /* RGB bis per pixel mask */ | ||
| 651 | #define CICR1_RAW_BPP (0x3 << 5) /* Raw bis per pixel mask */ | ||
| 652 | #define CICR1_COLOR_SP (0x3 << 3) /* Color space mask */ | ||
| 653 | #define CICR1_DW (0x7 << 0) /* Data width mask */ | ||
| 654 | |||
| 655 | #define CICR2_BLW (0xff << 24) /* Beginning-of-line pixel clock | ||
| 656 | wait count mask */ | ||
| 657 | #define CICR2_ELW (0xff << 16) /* End-of-line pixel clock | ||
| 658 | wait count mask */ | ||
| 659 | #define CICR2_HSW (0x3f << 10) /* Horizontal sync pulse width mask */ | ||
| 660 | #define CICR2_BFPW (0x3f << 3) /* Beginning-of-frame pixel clock | ||
| 661 | wait count mask */ | ||
| 662 | #define CICR2_FSW (0x7 << 0) /* Frame stabilization | ||
| 663 | wait count mask */ | ||
| 664 | |||
| 665 | #define CICR3_BFW (0xff << 24) /* Beginning-of-frame line clock | ||
| 666 | wait count mask */ | ||
| 667 | #define CICR3_EFW (0xff << 16) /* End-of-frame line clock | ||
| 668 | wait count mask */ | ||
| 669 | #define CICR3_VSW (0x3f << 10) /* Vertical sync pulse width mask */ | ||
| 670 | #define CICR3_BFPW (0x3f << 3) /* Beginning-of-frame pixel clock | ||
| 671 | wait count mask */ | ||
| 672 | #define CICR3_LPF (0x7ff << 0) /* Lines per frame mask */ | ||
| 673 | |||
| 674 | #define CICR4_MCLK_DLY (0x3 << 24) /* MCLK Data Capture Delay mask */ | ||
| 675 | #define CICR4_PCLK_EN (1 << 23) /* Pixel clock enable */ | ||
| 676 | #define CICR4_PCP (1 << 22) /* Pixel clock polarity */ | ||
| 677 | #define CICR4_HSP (1 << 21) /* Horizontal sync polarity */ | ||
| 678 | #define CICR4_VSP (1 << 20) /* Vertical sync polarity */ | ||
| 679 | #define CICR4_MCLK_EN (1 << 19) /* MCLK enable */ | ||
| 680 | #define CICR4_FR_RATE (0x7 << 8) /* Frame rate mask */ | ||
| 681 | #define CICR4_DIV (0xff << 0) /* Clock divisor mask */ | ||
| 682 | |||
| 683 | #define CISR_FTO (1 << 15) /* FIFO time-out */ | ||
| 684 | #define CISR_RDAV_2 (1 << 14) /* Channel 2 receive data available */ | ||
| 685 | #define CISR_RDAV_1 (1 << 13) /* Channel 1 receive data available */ | ||
| 686 | #define CISR_RDAV_0 (1 << 12) /* Channel 0 receive data available */ | ||
| 687 | #define CISR_FEMPTY_2 (1 << 11) /* Channel 2 FIFO empty */ | ||
| 688 | #define CISR_FEMPTY_1 (1 << 10) /* Channel 1 FIFO empty */ | ||
| 689 | #define CISR_FEMPTY_0 (1 << 9) /* Channel 0 FIFO empty */ | ||
| 690 | #define CISR_EOL (1 << 8) /* End of line */ | ||
| 691 | #define CISR_PAR_ERR (1 << 7) /* Parity error */ | ||
| 692 | #define CISR_CQD (1 << 6) /* Camera interface quick disable */ | ||
| 693 | #define CISR_CDD (1 << 5) /* Camera interface disable done */ | ||
| 694 | #define CISR_SOF (1 << 4) /* Start of frame */ | ||
| 695 | #define CISR_EOF (1 << 3) /* End of frame */ | ||
| 696 | #define CISR_IFO_2 (1 << 2) /* FIFO overrun for Channel 2 */ | ||
| 697 | #define CISR_IFO_1 (1 << 1) /* FIFO overrun for Channel 1 */ | ||
| 698 | #define CISR_IFO_0 (1 << 0) /* FIFO overrun for Channel 0 */ | ||
| 699 | |||
| 700 | #define CIFR_FLVL2 (0x7f << 23) /* FIFO 2 level mask */ | ||
| 701 | #define CIFR_FLVL1 (0x7f << 16) /* FIFO 1 level mask */ | ||
| 702 | #define CIFR_FLVL0 (0xff << 8) /* FIFO 0 level mask */ | ||
| 703 | #define CIFR_THL_0 (0x3 << 4) /* Threshold Level for Channel 0 FIFO */ | ||
| 704 | #define CIFR_RESET_F (1 << 3) /* Reset input FIFOs */ | ||
| 705 | #define CIFR_FEN2 (1 << 2) /* FIFO enable for channel 2 */ | ||
| 706 | #define CIFR_FEN1 (1 << 1) /* FIFO enable for channel 1 */ | ||
| 707 | #define CIFR_FEN0 (1 << 0) /* FIFO enable for channel 0 */ | ||
| 708 | |||
| 709 | #define SRAM_SIZE 0x40000 /* 4x64K */ | ||
| 710 | |||
| 711 | #define SRAM_MEM_PHYS 0x5C000000 | ||
| 712 | |||
| 713 | #define IMPMCR __REG(0x58000000) /* IM Power Management Control Reg */ | ||
| 714 | #define IMPMSR __REG(0x58000008) /* IM Power Management Status Reg */ | ||
| 715 | |||
| 716 | #define IMPMCR_PC3 (0x3 << 22) /* Bank 3 Power Control */ | ||
| 717 | #define IMPMCR_PC3_RUN_MODE (0x0 << 22) /* Run mode */ | ||
| 718 | #define IMPMCR_PC3_STANDBY_MODE (0x1 << 22) /* Standby mode */ | ||
| 719 | #define IMPMCR_PC3_AUTO_MODE (0x3 << 22) /* Automatically controlled */ | ||
| 720 | |||
| 721 | #define IMPMCR_PC2 (0x3 << 20) /* Bank 2 Power Control */ | ||
| 722 | #define IMPMCR_PC2_RUN_MODE (0x0 << 20) /* Run mode */ | ||
| 723 | #define IMPMCR_PC2_STANDBY_MODE (0x1 << 20) /* Standby mode */ | ||
| 724 | #define IMPMCR_PC2_AUTO_MODE (0x3 << 20) /* Automatically controlled */ | ||
| 725 | |||
| 726 | #define IMPMCR_PC1 (0x3 << 18) /* Bank 1 Power Control */ | ||
| 727 | #define IMPMCR_PC1_RUN_MODE (0x0 << 18) /* Run mode */ | ||
| 728 | #define IMPMCR_PC1_STANDBY_MODE (0x1 << 18) /* Standby mode */ | ||
| 729 | #define IMPMCR_PC1_AUTO_MODE (0x3 << 18) /* Automatically controlled */ | ||
| 730 | |||
| 731 | #define IMPMCR_PC0 (0x3 << 16) /* Bank 0 Power Control */ | ||
| 732 | #define IMPMCR_PC0_RUN_MODE (0x0 << 16) /* Run mode */ | ||
| 733 | #define IMPMCR_PC0_STANDBY_MODE (0x1 << 16) /* Standby mode */ | ||
| 734 | #define IMPMCR_PC0_AUTO_MODE (0x3 << 16) /* Automatically controlled */ | ||
| 735 | |||
| 736 | #define IMPMCR_AW3 (1 << 11) /* Bank 3 Automatic Wake-up enable */ | ||
| 737 | #define IMPMCR_AW2 (1 << 10) /* Bank 2 Automatic Wake-up enable */ | ||
| 738 | #define IMPMCR_AW1 (1 << 9) /* Bank 1 Automatic Wake-up enable */ | ||
| 739 | #define IMPMCR_AW0 (1 << 8) /* Bank 0 Automatic Wake-up enable */ | ||
| 740 | |||
| 741 | #define IMPMCR_DST (0xFF << 0) /* Delay Standby Time, ms */ | ||
| 742 | |||
| 743 | #define IMPMSR_PS3 (0x3 << 6) /* Bank 3 Power Status: */ | ||
| 744 | #define IMPMSR_PS3_RUN_MODE (0x0 << 6) /* Run mode */ | ||
| 745 | #define IMPMSR_PS3_STANDBY_MODE (0x1 << 6) /* Standby mode */ | ||
| 746 | |||
| 747 | #define IMPMSR_PS2 (0x3 << 4) /* Bank 2 Power Status: */ | ||
| 748 | #define IMPMSR_PS2_RUN_MODE (0x0 << 4) /* Run mode */ | ||
| 749 | #define IMPMSR_PS2_STANDBY_MODE (0x1 << 4) /* Standby mode */ | ||
| 750 | |||
| 751 | #define IMPMSR_PS1 (0x3 << 2) /* Bank 1 Power Status: */ | ||
| 752 | #define IMPMSR_PS1_RUN_MODE (0x0 << 2) /* Run mode */ | ||
| 753 | #define IMPMSR_PS1_STANDBY_MODE (0x1 << 2) /* Standby mode */ | ||
| 754 | |||
| 755 | #define IMPMSR_PS0 (0x3 << 0) /* Bank 0 Power Status: */ | ||
| 756 | #define IMPMSR_PS0_RUN_MODE (0x0 << 0) /* Run mode */ | ||
| 757 | #define IMPMSR_PS0_STANDBY_MODE (0x1 << 0) /* Standby mode */ | ||
| 758 | |||
| 759 | #endif | ||
| 760 | |||
| 761 | /* PWRMODE register M field values */ | ||
| 762 | |||
| 763 | #define PWRMODE_IDLE 0x1 | ||
| 764 | #define PWRMODE_STANDBY 0x2 | ||
| 765 | #define PWRMODE_SLEEP 0x3 | ||
| 766 | #define PWRMODE_DEEPSLEEP 0x7 | ||
| 767 | 262 | ||
| 768 | #endif | 263 | #endif |
diff --git a/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h b/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h index 6ef1dd09970b..d83393e25273 100644 --- a/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h +++ b/arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h | |||
| @@ -365,4 +365,9 @@ | |||
| 365 | #define GPIO117_I2CSCL_MD (117 | GPIO_ALT_FN_1_IN) | 365 | #define GPIO117_I2CSCL_MD (117 | GPIO_ALT_FN_1_IN) |
| 366 | #define GPIO118_I2CSDA_MD (118 | GPIO_ALT_FN_1_IN) | 366 | #define GPIO118_I2CSDA_MD (118 | GPIO_ALT_FN_1_IN) |
| 367 | 367 | ||
| 368 | /* | ||
| 369 | * Handy routine to set GPIO alternate functions | ||
| 370 | */ | ||
| 371 | extern int pxa_gpio_mode( int gpio_mode ); | ||
| 372 | |||
| 368 | #endif /* __ASM_ARCH_PXA2XX_GPIO_H */ | 373 | #endif /* __ASM_ARCH_PXA2XX_GPIO_H */ |
diff --git a/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h index 806ecfea44bf..77102d695cc7 100644 --- a/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h +++ b/arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | |||
| @@ -49,6 +49,11 @@ | |||
| 49 | #define MECR_NOS (1 << 0) /* Number Of Sockets: 0 -> 1 sock, 1 -> 2 sock */ | 49 | #define MECR_NOS (1 << 0) /* Number Of Sockets: 0 -> 1 sock, 1 -> 2 sock */ |
| 50 | #define MECR_CIT (1 << 1) /* Card Is There: 0 -> no card, 1 -> card inserted */ | 50 | #define MECR_CIT (1 << 1) /* Card Is There: 0 -> no card, 1 -> card inserted */ |
| 51 | 51 | ||
| 52 | #define MDCNFG_DE0 (1 << 0) /* SDRAM Bank 0 Enable */ | ||
| 53 | #define MDCNFG_DE1 (1 << 1) /* SDRAM Bank 1 Enable */ | ||
| 54 | #define MDCNFG_DE2 (1 << 16) /* SDRAM Bank 2 Enable */ | ||
| 55 | #define MDCNFG_DE3 (1 << 17) /* SDRAM Bank 3 Enable */ | ||
| 56 | |||
| 52 | #define MDREFR_K0DB4 (1 << 29) /* SDCLK0 Divide by 4 Control/Status */ | 57 | #define MDREFR_K0DB4 (1 << 29) /* SDCLK0 Divide by 4 Control/Status */ |
| 53 | #define MDREFR_K2FREE (1 << 25) /* SDRAM Free-Running Control */ | 58 | #define MDREFR_K2FREE (1 << 25) /* SDRAM Free-Running Control */ |
| 54 | #define MDREFR_K1FREE (1 << 24) /* SDRAM Free-Running Control */ | 59 | #define MDREFR_K1FREE (1 << 24) /* SDRAM Free-Running Control */ |
| @@ -243,4 +248,11 @@ | |||
| 243 | #define OSCC_OON (1 << 1) /* 32.768kHz OON (write-once only bit) */ | 248 | #define OSCC_OON (1 << 1) /* 32.768kHz OON (write-once only bit) */ |
| 244 | #define OSCC_OOK (1 << 0) /* 32.768kHz OOK (read-only bit) */ | 249 | #define OSCC_OOK (1 << 0) /* 32.768kHz OOK (read-only bit) */ |
| 245 | 250 | ||
| 251 | /* PWRMODE register M field values */ | ||
| 252 | |||
| 253 | #define PWRMODE_IDLE 0x1 | ||
| 254 | #define PWRMODE_STANDBY 0x2 | ||
| 255 | #define PWRMODE_SLEEP 0x3 | ||
| 256 | #define PWRMODE_DEEPSLEEP 0x7 | ||
| 257 | |||
| 246 | #endif | 258 | #endif |
diff --git a/arch/arm/mach-pxa/include/mach/regs-ac97.h b/arch/arm/mach-pxa/include/mach/regs-ac97.h new file mode 100644 index 000000000000..e41b9d202b8c --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/regs-ac97.h | |||
| @@ -0,0 +1,99 @@ | |||
| 1 | #ifndef __ASM_ARCH_REGS_AC97_H | ||
| 2 | #define __ASM_ARCH_REGS_AC97_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | * AC97 Controller registers | ||
| 6 | */ | ||
| 7 | |||
| 8 | #define POCR __REG(0x40500000) /* PCM Out Control Register */ | ||
| 9 | #define POCR_FEIE (1 << 3) /* FIFO Error Interrupt Enable */ | ||
| 10 | #define POCR_FSRIE (1 << 1) /* FIFO Service Request Interrupt Enable */ | ||
| 11 | |||
| 12 | #define PICR __REG(0x40500004) /* PCM In Control Register */ | ||
| 13 | #define PICR_FEIE (1 << 3) /* FIFO Error Interrupt Enable */ | ||
| 14 | #define PICR_FSRIE (1 << 1) /* FIFO Service Request Interrupt Enable */ | ||
| 15 | |||
| 16 | #define MCCR __REG(0x40500008) /* Mic In Control Register */ | ||
| 17 | #define MCCR_FEIE (1 << 3) /* FIFO Error Interrupt Enable */ | ||
| 18 | #define MCCR_FSRIE (1 << 1) /* FIFO Service Request Interrupt Enable */ | ||
| 19 | |||
| 20 | #define GCR __REG(0x4050000C) /* Global Control Register */ | ||
| 21 | #ifdef CONFIG_PXA3xx | ||
| 22 | #define GCR_CLKBPB (1 << 31) /* Internal clock enable */ | ||
| 23 | #endif | ||
| 24 | #define GCR_nDMAEN (1 << 24) /* non DMA Enable */ | ||
| 25 | #define GCR_CDONE_IE (1 << 19) /* Command Done Interrupt Enable */ | ||
| 26 | #define GCR_SDONE_IE (1 << 18) /* Status Done Interrupt Enable */ | ||
| 27 | #define GCR_SECRDY_IEN (1 << 9) /* Secondary Ready Interrupt Enable */ | ||
| 28 | #define GCR_PRIRDY_IEN (1 << 8) /* Primary Ready Interrupt Enable */ | ||
| 29 | #define GCR_SECRES_IEN (1 << 5) /* Secondary Resume Interrupt Enable */ | ||
| 30 | #define GCR_PRIRES_IEN (1 << 4) /* Primary Resume Interrupt Enable */ | ||
| 31 | #define GCR_ACLINK_OFF (1 << 3) /* AC-link Shut Off */ | ||
| 32 | #define GCR_WARM_RST (1 << 2) /* AC97 Warm Reset */ | ||
| 33 | #define GCR_COLD_RST (1 << 1) /* AC'97 Cold Reset (0 = active) */ | ||
| 34 | #define GCR_GIE (1 << 0) /* Codec GPI Interrupt Enable */ | ||
| 35 | |||
| 36 | #define POSR __REG(0x40500010) /* PCM Out Status Register */ | ||
| 37 | #define POSR_FIFOE (1 << 4) /* FIFO error */ | ||
| 38 | #define POSR_FSR (1 << 2) /* FIFO Service Request */ | ||
| 39 | |||
| 40 | #define PISR __REG(0x40500014) /* PCM In Status Register */ | ||
| 41 | #define PISR_FIFOE (1 << 4) /* FIFO error */ | ||
| 42 | #define PISR_EOC (1 << 3) /* DMA End-of-Chain (exclusive clear) */ | ||
| 43 | #define PISR_FSR (1 << 2) /* FIFO Service Request */ | ||
| 44 | |||
| 45 | #define MCSR __REG(0x40500018) /* Mic In Status Register */ | ||
| 46 | #define MCSR_FIFOE (1 << 4) /* FIFO error */ | ||
| 47 | #define MCSR_EOC (1 << 3) /* DMA End-of-Chain (exclusive clear) */ | ||
| 48 | #define MCSR_FSR (1 << 2) /* FIFO Service Request */ | ||
| 49 | |||
| 50 | #define GSR __REG(0x4050001C) /* Global Status Register */ | ||
| 51 | #define GSR_CDONE (1 << 19) /* Command Done */ | ||
| 52 | #define GSR_SDONE (1 << 18) /* Status Done */ | ||
| 53 | #define GSR_RDCS (1 << 15) /* Read Completion Status */ | ||
| 54 | #define GSR_BIT3SLT12 (1 << 14) /* Bit 3 of slot 12 */ | ||
| 55 | #define GSR_BIT2SLT12 (1 << 13) /* Bit 2 of slot 12 */ | ||
| 56 | #define GSR_BIT1SLT12 (1 << 12) /* Bit 1 of slot 12 */ | ||
| 57 | #define GSR_SECRES (1 << 11) /* Secondary Resume Interrupt */ | ||
| 58 | #define GSR_PRIRES (1 << 10) /* Primary Resume Interrupt */ | ||
| 59 | #define GSR_SCR (1 << 9) /* Secondary Codec Ready */ | ||
| 60 | #define GSR_PCR (1 << 8) /* Primary Codec Ready */ | ||
| 61 | #define GSR_MCINT (1 << 7) /* Mic In Interrupt */ | ||
| 62 | #define GSR_POINT (1 << 6) /* PCM Out Interrupt */ | ||
| 63 | #define GSR_PIINT (1 << 5) /* PCM In Interrupt */ | ||
| 64 | #define GSR_ACOFFD (1 << 3) /* AC-link Shut Off Done */ | ||
| 65 | #define GSR_MOINT (1 << 2) /* Modem Out Interrupt */ | ||
| 66 | #define GSR_MIINT (1 << 1) /* Modem In Interrupt */ | ||
| 67 | #define GSR_GSCI (1 << 0) /* Codec GPI Status Change Interrupt */ | ||
| 68 | |||
| 69 | #define CAR __REG(0x40500020) /* CODEC Access Register */ | ||
| 70 | #define CAR_CAIP (1 << 0) /* Codec Access In Progress */ | ||
| 71 | |||
| 72 | #define PCDR __REG(0x40500040) /* PCM FIFO Data Register */ | ||
| 73 | #define MCDR __REG(0x40500060) /* Mic-in FIFO Data Register */ | ||
| 74 | |||
| 75 | #define MOCR __REG(0x40500100) /* Modem Out Control Register */ | ||
| 76 | #define MOCR_FEIE (1 << 3) /* FIFO Error */ | ||
| 77 | #define MOCR_FSRIE (1 << 1) /* FIFO Service Request Interrupt Enable */ | ||
| 78 | |||
| 79 | #define MICR __REG(0x40500108) /* Modem In Control Register */ | ||
| 80 | #define MICR_FEIE (1 << 3) /* FIFO Error */ | ||
| 81 | #define MICR_FSRIE (1 << 1) /* FIFO Service Request Interrupt Enable */ | ||
| 82 | |||
| 83 | #define MOSR __REG(0x40500110) /* Modem Out Status Register */ | ||
| 84 | #define MOSR_FIFOE (1 << 4) /* FIFO error */ | ||
| 85 | #define MOSR_FSR (1 << 2) /* FIFO Service Request */ | ||
| 86 | |||
| 87 | #define MISR __REG(0x40500118) /* Modem In Status Register */ | ||
| 88 | #define MISR_FIFOE (1 << 4) /* FIFO error */ | ||
| 89 | #define MISR_EOC (1 << 3) /* DMA End-of-Chain (exclusive clear) */ | ||
| 90 | #define MISR_FSR (1 << 2) /* FIFO Service Request */ | ||
| 91 | |||
| 92 | #define MODR __REG(0x40500140) /* Modem FIFO Data Register */ | ||
| 93 | |||
| 94 | #define PAC_REG_BASE __REG(0x40500200) /* Primary Audio Codec */ | ||
| 95 | #define SAC_REG_BASE __REG(0x40500300) /* Secondary Audio Codec */ | ||
| 96 | #define PMC_REG_BASE __REG(0x40500400) /* Primary Modem Codec */ | ||
| 97 | #define SMC_REG_BASE __REG(0x40500500) /* Secondary Modem Codec */ | ||
| 98 | |||
| 99 | #endif /* __ASM_ARCH_REGS_AC97_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/regs-uart.h b/arch/arm/mach-pxa/include/mach/regs-uart.h new file mode 100644 index 000000000000..55aeb7fb72f6 --- /dev/null +++ b/arch/arm/mach-pxa/include/mach/regs-uart.h | |||
| @@ -0,0 +1,143 @@ | |||
| 1 | #ifndef __ASM_ARCH_REGS_UART_H | ||
| 2 | #define __ASM_ARCH_REGS_UART_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | * UARTs | ||
| 6 | */ | ||
| 7 | |||
| 8 | /* Full Function UART (FFUART) */ | ||
| 9 | #define FFUART FFRBR | ||
| 10 | #define FFRBR __REG(0x40100000) /* Receive Buffer Register (read only) */ | ||
| 11 | #define FFTHR __REG(0x40100000) /* Transmit Holding Register (write only) */ | ||
| 12 | #define FFIER __REG(0x40100004) /* Interrupt Enable Register (read/write) */ | ||
| 13 | #define FFIIR __REG(0x40100008) /* Interrupt ID Register (read only) */ | ||
| 14 | #define FFFCR __REG(0x40100008) /* FIFO Control Register (write only) */ | ||
| 15 | #define FFLCR __REG(0x4010000C) /* Line Control Register (read/write) */ | ||
| 16 | #define FFMCR __REG(0x40100010) /* Modem Control Register (read/write) */ | ||
| 17 | #define FFLSR __REG(0x40100014) /* Line Status Register (read only) */ | ||
| 18 | #define FFMSR __REG(0x40100018) /* Modem Status Register (read only) */ | ||
| 19 | #define FFSPR __REG(0x4010001C) /* Scratch Pad Register (read/write) */ | ||
| 20 | #define FFISR __REG(0x40100020) /* Infrared Selection Register (read/write) */ | ||
| 21 | #define FFDLL __REG(0x40100000) /* Divisor Latch Low Register (DLAB = 1) (read/write) */ | ||
| 22 | #define FFDLH __REG(0x40100004) /* Divisor Latch High Register (DLAB = 1) (read/write) */ | ||
| 23 | |||
| 24 | /* Bluetooth UART (BTUART) */ | ||
| 25 | #define BTUART BTRBR | ||
| 26 | #define BTRBR __REG(0x40200000) /* Receive Buffer Register (read only) */ | ||
| 27 | #define BTTHR __REG(0x40200000) /* Transmit Holding Register (write only) */ | ||
| 28 | #define BTIER __REG(0x40200004) /* Interrupt Enable Register (read/write) */ | ||
| 29 | #define BTIIR __REG(0x40200008) /* Interrupt ID Register (read only) */ | ||
| 30 | #define BTFCR __REG(0x40200008) /* FIFO Control Register (write only) */ | ||
| 31 | #define BTLCR __REG(0x4020000C) /* Line Control Register (read/write) */ | ||
| 32 | #define BTMCR __REG(0x40200010) /* Modem Control Register (read/write) */ | ||
| 33 | #define BTLSR __REG(0x40200014) /* Line Status Register (read only) */ | ||
| 34 | #define BTMSR __REG(0x40200018) /* Modem Status Register (read only) */ | ||
| 35 | #define BTSPR __REG(0x4020001C) /* Scratch Pad Register (read/write) */ | ||
| 36 | #define BTISR __REG(0x40200020) /* Infrared Selection Register (read/write) */ | ||
| 37 | #define BTDLL __REG(0x40200000) /* Divisor Latch Low Register (DLAB = 1) (read/write) */ | ||
| 38 | #define BTDLH __REG(0x40200004) /* Divisor Latch High Register (DLAB = 1) (read/write) */ | ||
| 39 | |||
| 40 | /* Standard UART (STUART) */ | ||
| 41 | #define STUART STRBR | ||
| 42 | #define STRBR __REG(0x40700000) /* Receive Buffer Register (read only) */ | ||
| 43 | #define STTHR __REG(0x40700000) /* Transmit Holding Register (write only) */ | ||
| 44 | #define STIER __REG(0x40700004) /* Interrupt Enable Register (read/write) */ | ||
| 45 | #define STIIR __REG(0x40700008) /* Interrupt ID Register (read only) */ | ||
| 46 | #define STFCR __REG(0x40700008) /* FIFO Control Register (write only) */ | ||
| 47 | #define STLCR __REG(0x4070000C) /* Line Control Register (read/write) */ | ||
| 48 | #define STMCR __REG(0x40700010) /* Modem Control Register (read/write) */ | ||
| 49 | #define STLSR __REG(0x40700014) /* Line Status Register (read only) */ | ||
| 50 | #define STMSR __REG(0x40700018) /* Reserved */ | ||
| 51 | #define STSPR __REG(0x4070001C) /* Scratch Pad Register (read/write) */ | ||
| 52 | #define STISR __REG(0x40700020) /* Infrared Selection Register (read/write) */ | ||
| 53 | #define STDLL __REG(0x40700000) /* Divisor Latch Low Register (DLAB = 1) (read/write) */ | ||
| 54 | #define STDLH __REG(0x40700004) /* Divisor Latch High Register (DLAB = 1) (read/write) */ | ||
| 55 | |||
| 56 | /* Hardware UART (HWUART) */ | ||
| 57 | #define HWUART HWRBR | ||
| 58 | #define HWRBR __REG(0x41600000) /* Receive Buffer Register (read only) */ | ||
| 59 | #define HWTHR __REG(0x41600000) /* Transmit Holding Register (write only) */ | ||
| 60 | #define HWIER __REG(0x41600004) /* Interrupt Enable Register (read/write) */ | ||
| 61 | #define HWIIR __REG(0x41600008) /* Interrupt ID Register (read only) */ | ||
| 62 | #define HWFCR __REG(0x41600008) /* FIFO Control Register (write only) */ | ||
| 63 | #define HWLCR __REG(0x4160000C) /* Line Control Register (read/write) */ | ||
| 64 | #define HWMCR __REG(0x41600010) /* Modem Control Register (read/write) */ | ||
| 65 | #define HWLSR __REG(0x41600014) /* Line Status Register (read only) */ | ||
| 66 | #define HWMSR __REG(0x41600018) /* Modem Status Register (read only) */ | ||
| 67 | #define HWSPR __REG(0x4160001C) /* Scratch Pad Register (read/write) */ | ||
| 68 | #define HWISR __REG(0x41600020) /* Infrared Selection Register (read/write) */ | ||
| 69 | #define HWFOR __REG(0x41600024) /* Receive FIFO Occupancy Register (read only) */ | ||
| 70 | #define HWABR __REG(0x41600028) /* Auto-Baud Control Register (read/write) */ | ||
| 71 | #define HWACR __REG(0x4160002C) /* Auto-Baud Count Register (read only) */ | ||
| 72 | #define HWDLL __REG(0x41600000) /* Divisor Latch Low Register (DLAB = 1) (read/write) */ | ||
| 73 | #define HWDLH __REG(0x41600004) /* Divisor Latch High Register (DLAB = 1) (read/write) */ | ||
| 74 | |||
| 75 | #define IER_DMAE (1 << 7) /* DMA Requests Enable */ | ||
| 76 | #define IER_UUE (1 << 6) /* UART Unit Enable */ | ||
| 77 | #define IER_NRZE (1 << 5) /* NRZ coding Enable */ | ||
| 78 | #define IER_RTIOE (1 << 4) /* Receiver Time Out Interrupt Enable */ | ||
| 79 | #define IER_MIE (1 << 3) /* Modem Interrupt Enable */ | ||
| 80 | #define IER_RLSE (1 << 2) /* Receiver Line Status Interrupt Enable */ | ||
| 81 | #define IER_TIE (1 << 1) /* Transmit Data request Interrupt Enable */ | ||
| 82 | #define IER_RAVIE (1 << 0) /* Receiver Data Available Interrupt Enable */ | ||
| 83 | |||
| 84 | #define IIR_FIFOES1 (1 << 7) /* FIFO Mode Enable Status */ | ||
| 85 | #define IIR_FIFOES0 (1 << 6) /* FIFO Mode Enable Status */ | ||
| 86 | #define IIR_TOD (1 << 3) /* Time Out Detected */ | ||
| 87 | #define IIR_IID2 (1 << 2) /* Interrupt Source Encoded */ | ||
| 88 | #define IIR_IID1 (1 << 1) /* Interrupt Source Encoded */ | ||
| 89 | #define IIR_IP (1 << 0) /* Interrupt Pending (active low) */ | ||
| 90 | |||
| 91 | #define FCR_ITL2 (1 << 7) /* Interrupt Trigger Level */ | ||
| 92 | #define FCR_ITL1 (1 << 6) /* Interrupt Trigger Level */ | ||
| 93 | #define FCR_RESETTF (1 << 2) /* Reset Transmitter FIFO */ | ||
| 94 | #define FCR_RESETRF (1 << 1) /* Reset Receiver FIFO */ | ||
| 95 | #define FCR_TRFIFOE (1 << 0) /* Transmit and Receive FIFO Enable */ | ||
| 96 | #define FCR_ITL_1 (0) | ||
| 97 | #define FCR_ITL_8 (FCR_ITL1) | ||
| 98 | #define FCR_ITL_16 (FCR_ITL2) | ||
| 99 | #define FCR_ITL_32 (FCR_ITL2|FCR_ITL1) | ||
| 100 | |||
| 101 | #define LCR_DLAB (1 << 7) /* Divisor Latch Access Bit */ | ||
| 102 | #define LCR_SB (1 << 6) /* Set Break */ | ||
| 103 | #define LCR_STKYP (1 << 5) /* Sticky Parity */ | ||
| 104 | #define LCR_EPS (1 << 4) /* Even Parity Select */ | ||
| 105 | #define LCR_PEN (1 << 3) /* Parity Enable */ | ||
| 106 | #define LCR_STB (1 << 2) /* Stop Bit */ | ||
| 107 | #define LCR_WLS1 (1 << 1) /* Word Length Select */ | ||
| 108 | #define LCR_WLS0 (1 << 0) /* Word Length Select */ | ||
| 109 | |||
| 110 | #define LSR_FIFOE (1 << 7) /* FIFO Error Status */ | ||
| 111 | #define LSR_TEMT (1 << 6) /* Transmitter Empty */ | ||
| 112 | #define LSR_TDRQ (1 << 5) /* Transmit Data Request */ | ||
| 113 | #define LSR_BI (1 << 4) /* Break Interrupt */ | ||
| 114 | #define LSR_FE (1 << 3) /* Framing Error */ | ||
| 115 | #define LSR_PE (1 << 2) /* Parity Error */ | ||
| 116 | #define LSR_OE (1 << 1) /* Overrun Error */ | ||
| 117 | #define LSR_DR (1 << 0) /* Data Ready */ | ||
| 118 | |||
| 119 | #define MCR_LOOP (1 << 4) | ||
| 120 | #define MCR_OUT2 (1 << 3) /* force MSR_DCD in loopback mode */ | ||
| 121 | #define MCR_OUT1 (1 << 2) /* force MSR_RI in loopback mode */ | ||
| 122 | #define MCR_RTS (1 << 1) /* Request to Send */ | ||
| 123 | #define MCR_DTR (1 << 0) /* Data Terminal Ready */ | ||
| 124 | |||
| 125 | #define MSR_DCD (1 << 7) /* Data Carrier Detect */ | ||
| 126 | #define MSR_RI (1 << 6) /* Ring Indicator */ | ||
| 127 | #define MSR_DSR (1 << 5) /* Data Set Ready */ | ||
| 128 | #define MSR_CTS (1 << 4) /* Clear To Send */ | ||
| 129 | #define MSR_DDCD (1 << 3) /* Delta Data Carrier Detect */ | ||
| 130 | #define MSR_TERI (1 << 2) /* Trailing Edge Ring Indicator */ | ||
| 131 | #define MSR_DDSR (1 << 1) /* Delta Data Set Ready */ | ||
| 132 | #define MSR_DCTS (1 << 0) /* Delta Clear To Send */ | ||
| 133 | |||
| 134 | /* | ||
| 135 | * IrSR (Infrared Selection Register) | ||
| 136 | */ | ||
| 137 | #define STISR_RXPL (1 << 4) /* Receive Data Polarity */ | ||
| 138 | #define STISR_TXPL (1 << 3) /* Transmit Data Polarity */ | ||
| 139 | #define STISR_XMODE (1 << 2) /* Transmit Pulse Width Select */ | ||
| 140 | #define STISR_RCVEIR (1 << 1) /* Receiver SIR Enable */ | ||
| 141 | #define STISR_XMITIR (1 << 0) /* Transmitter SIR Enable */ | ||
| 142 | |||
| 143 | #endif /* __ASM_ARCH_REGS_UART_H */ | ||
diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h index 21e3e890af98..a9a4f302b6ef 100644 --- a/arch/arm/mach-pxa/include/mach/uncompress.h +++ b/arch/arm/mach-pxa/include/mach/uncompress.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/serial_reg.h> | 12 | #include <linux/serial_reg.h> |
| 13 | #include <mach/pxa-regs.h> | 13 | #include <mach/regs-uart.h> |
| 14 | #include <asm/mach-types.h> | 14 | #include <asm/mach-types.h> |
| 15 | 15 | ||
| 16 | #define __REG(x) ((volatile unsigned long *)x) | 16 | #define __REG(x) ((volatile unsigned long *)x) |
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c index b4d00aba0e31..5609f52e36b1 100644 --- a/arch/arm/mach-pxa/littleton.c +++ b/arch/arm/mach-pxa/littleton.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
| 23 | #include <linux/gpio.h> | ||
| 23 | #include <linux/spi/spi.h> | 24 | #include <linux/spi/spi.h> |
| 24 | #include <linux/smc91x.h> | 25 | #include <linux/smc91x.h> |
| 25 | 26 | ||
| @@ -36,7 +37,6 @@ | |||
| 36 | 37 | ||
| 37 | #include <mach/pxa-regs.h> | 38 | #include <mach/pxa-regs.h> |
| 38 | #include <mach/mfp-pxa300.h> | 39 | #include <mach/mfp-pxa300.h> |
| 39 | #include <mach/gpio.h> | ||
| 40 | #include <mach/pxafb.h> | 40 | #include <mach/pxafb.h> |
| 41 | #include <mach/ssp.h> | 41 | #include <mach/ssp.h> |
| 42 | #include <mach/pxa2xx_spi.h> | 42 | #include <mach/pxa2xx_spi.h> |
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 519138bc5f85..bf59cec27def 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
| @@ -123,6 +123,10 @@ static unsigned long magician_pin_config[] __initdata = { | |||
| 123 | GPIO107_GPIO, /* DS1WM_IRQ */ | 123 | GPIO107_GPIO, /* DS1WM_IRQ */ |
| 124 | GPIO108_GPIO, /* GSM_READY */ | 124 | GPIO108_GPIO, /* GSM_READY */ |
| 125 | GPIO115_GPIO, /* nPEN_IRQ */ | 125 | GPIO115_GPIO, /* nPEN_IRQ */ |
| 126 | |||
| 127 | /* I2C */ | ||
| 128 | GPIO117_I2C_SCL, | ||
| 129 | GPIO118_I2C_SDA, | ||
| 126 | }; | 130 | }; |
| 127 | 131 | ||
| 128 | /* | 132 | /* |
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index f2c7ad8f2b6b..5f224968043c 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
| @@ -128,6 +128,10 @@ static unsigned long mainstone_pin_config[] = { | |||
| 128 | GPIO108_KP_MKOUT_5, | 128 | GPIO108_KP_MKOUT_5, |
| 129 | GPIO96_KP_MKOUT_6, | 129 | GPIO96_KP_MKOUT_6, |
| 130 | 130 | ||
| 131 | /* I2C */ | ||
| 132 | GPIO117_I2C_SCL, | ||
| 133 | GPIO118_I2C_SDA, | ||
| 134 | |||
| 131 | /* GPIO */ | 135 | /* GPIO */ |
| 132 | GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH, | 136 | GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH, |
| 133 | }; | 137 | }; |
diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c index 2061c00c8ead..33626de8cbf6 100644 --- a/arch/arm/mach-pxa/mfp-pxa2xx.c +++ b/arch/arm/mach-pxa/mfp-pxa2xx.c | |||
| @@ -38,12 +38,13 @@ struct gpio_desc { | |||
| 38 | unsigned valid : 1; | 38 | unsigned valid : 1; |
| 39 | unsigned can_wakeup : 1; | 39 | unsigned can_wakeup : 1; |
| 40 | unsigned keypad_gpio : 1; | 40 | unsigned keypad_gpio : 1; |
| 41 | unsigned dir_inverted : 1; | ||
| 41 | unsigned int mask; /* bit mask in PWER or PKWR */ | 42 | unsigned int mask; /* bit mask in PWER or PKWR */ |
| 43 | unsigned int mux_mask; /* bit mask of muxed gpio bits, 0 if no mux */ | ||
| 42 | unsigned long config; | 44 | unsigned long config; |
| 43 | }; | 45 | }; |
| 44 | 46 | ||
| 45 | static struct gpio_desc gpio_desc[MFP_PIN_GPIO127 + 1]; | 47 | static struct gpio_desc gpio_desc[MFP_PIN_GPIO127 + 1]; |
| 46 | static int gpio_nr; | ||
| 47 | 48 | ||
| 48 | static unsigned long gpdr_lpm[4]; | 49 | static unsigned long gpdr_lpm[4]; |
| 49 | 50 | ||
| @@ -54,7 +55,7 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c) | |||
| 54 | int uorl = !!(gpio & 0x10); /* GAFRx_U or GAFRx_L ? */ | 55 | int uorl = !!(gpio & 0x10); /* GAFRx_U or GAFRx_L ? */ |
| 55 | int shft = (gpio & 0xf) << 1; | 56 | int shft = (gpio & 0xf) << 1; |
| 56 | int fn = MFP_AF(c); | 57 | int fn = MFP_AF(c); |
| 57 | int dir = c & MFP_DIR_OUT; | 58 | int is_out = (c & MFP_DIR_OUT) ? 1 : 0; |
| 58 | 59 | ||
| 59 | if (fn > 3) | 60 | if (fn > 3) |
| 60 | return -EINVAL; | 61 | return -EINVAL; |
| @@ -68,7 +69,7 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c) | |||
| 68 | else | 69 | else |
| 69 | GAFR_U(bank) = gafr; | 70 | GAFR_U(bank) = gafr; |
| 70 | 71 | ||
| 71 | if (dir == MFP_DIR_OUT) | 72 | if (is_out ^ gpio_desc[gpio].dir_inverted) |
| 72 | GPDR(gpio) |= mask; | 73 | GPDR(gpio) |= mask; |
| 73 | else | 74 | else |
| 74 | GPDR(gpio) &= ~mask; | 75 | GPDR(gpio) &= ~mask; |
| @@ -77,11 +78,11 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c) | |||
| 77 | switch (c & MFP_LPM_STATE_MASK) { | 78 | switch (c & MFP_LPM_STATE_MASK) { |
| 78 | case MFP_LPM_DRIVE_HIGH: | 79 | case MFP_LPM_DRIVE_HIGH: |
| 79 | PGSR(bank) |= mask; | 80 | PGSR(bank) |= mask; |
| 80 | dir = MFP_DIR_OUT; | 81 | is_out = 1; |
| 81 | break; | 82 | break; |
| 82 | case MFP_LPM_DRIVE_LOW: | 83 | case MFP_LPM_DRIVE_LOW: |
| 83 | PGSR(bank) &= ~mask; | 84 | PGSR(bank) &= ~mask; |
| 84 | dir = MFP_DIR_OUT; | 85 | is_out = 1; |
| 85 | break; | 86 | break; |
| 86 | case MFP_LPM_DEFAULT: | 87 | case MFP_LPM_DEFAULT: |
| 87 | break; | 88 | break; |
| @@ -92,7 +93,7 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c) | |||
| 92 | break; | 93 | break; |
| 93 | } | 94 | } |
| 94 | 95 | ||
| 95 | if (dir == MFP_DIR_OUT) | 96 | if (is_out ^ gpio_desc[gpio].dir_inverted) |
| 96 | gpdr_lpm[bank] |= mask; | 97 | gpdr_lpm[bank] |= mask; |
| 97 | else | 98 | else |
| 98 | gpdr_lpm[bank] &= ~mask; | 99 | gpdr_lpm[bank] &= ~mask; |
| @@ -106,7 +107,7 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c) | |||
| 106 | return -EINVAL; | 107 | return -EINVAL; |
| 107 | } | 108 | } |
| 108 | 109 | ||
| 109 | if ((c & MFP_LPM_CAN_WAKEUP) && (dir == MFP_DIR_OUT)) { | 110 | if ((c & MFP_LPM_CAN_WAKEUP) && is_out) { |
| 110 | pr_warning("%s: output GPIO%d unable to wakeup\n", | 111 | pr_warning("%s: output GPIO%d unable to wakeup\n", |
| 111 | __func__, gpio); | 112 | __func__, gpio); |
| 112 | return -EINVAL; | 113 | return -EINVAL; |
| @@ -169,7 +170,7 @@ void pxa2xx_mfp_set_lpm(int mfp, unsigned long lpm) | |||
| 169 | int gpio_set_wake(unsigned int gpio, unsigned int on) | 170 | int gpio_set_wake(unsigned int gpio, unsigned int on) |
| 170 | { | 171 | { |
| 171 | struct gpio_desc *d; | 172 | struct gpio_desc *d; |
| 172 | unsigned long c; | 173 | unsigned long c, mux_taken; |
| 173 | 174 | ||
| 174 | if (gpio > mfp_to_gpio(MFP_PIN_GPIO127)) | 175 | if (gpio > mfp_to_gpio(MFP_PIN_GPIO127)) |
| 175 | return -EINVAL; | 176 | return -EINVAL; |
| @@ -183,9 +184,13 @@ int gpio_set_wake(unsigned int gpio, unsigned int on) | |||
| 183 | if (d->keypad_gpio) | 184 | if (d->keypad_gpio) |
| 184 | return -EINVAL; | 185 | return -EINVAL; |
| 185 | 186 | ||
| 187 | mux_taken = (PWER & d->mux_mask) & (~d->mask); | ||
| 188 | if (on && mux_taken) | ||
| 189 | return -EBUSY; | ||
| 190 | |||
| 186 | if (d->can_wakeup && (c & MFP_LPM_CAN_WAKEUP)) { | 191 | if (d->can_wakeup && (c & MFP_LPM_CAN_WAKEUP)) { |
| 187 | if (on) { | 192 | if (on) { |
| 188 | PWER |= d->mask; | 193 | PWER = (PWER & ~d->mux_mask) | d->mask; |
| 189 | 194 | ||
| 190 | if (c & MFP_LPM_EDGE_RISE) | 195 | if (c & MFP_LPM_EDGE_RISE) |
| 191 | PRER |= d->mask; | 196 | PRER |= d->mask; |
| @@ -210,7 +215,7 @@ static void __init pxa25x_mfp_init(void) | |||
| 210 | { | 215 | { |
| 211 | int i; | 216 | int i; |
| 212 | 217 | ||
| 213 | for (i = 0; i <= 84; i++) | 218 | for (i = 0; i <= pxa_last_gpio; i++) |
| 214 | gpio_desc[i].valid = 1; | 219 | gpio_desc[i].valid = 1; |
| 215 | 220 | ||
| 216 | for (i = 0; i <= 15; i++) { | 221 | for (i = 0; i <= 15; i++) { |
| @@ -218,7 +223,11 @@ static void __init pxa25x_mfp_init(void) | |||
| 218 | gpio_desc[i].mask = GPIO_bit(i); | 223 | gpio_desc[i].mask = GPIO_bit(i); |
| 219 | } | 224 | } |
| 220 | 225 | ||
| 221 | gpio_nr = 85; | 226 | /* PXA26x has additional 4 GPIOs (86/87/88/89) which has the |
| 227 | * direction bit inverted in GPDR2. See PXA26x DM 4.1.1. | ||
| 228 | */ | ||
| 229 | for (i = 86; i <= pxa_last_gpio; i++) | ||
| 230 | gpio_desc[i].dir_inverted = 1; | ||
| 222 | } | 231 | } |
| 223 | #else | 232 | #else |
| 224 | static inline void pxa25x_mfp_init(void) {} | 233 | static inline void pxa25x_mfp_init(void) {} |
| @@ -251,11 +260,27 @@ int keypad_set_wake(unsigned int on) | |||
| 251 | return 0; | 260 | return 0; |
| 252 | } | 261 | } |
| 253 | 262 | ||
| 263 | #define PWER_WEMUX2_GPIO38 (1 << 16) | ||
| 264 | #define PWER_WEMUX2_GPIO53 (2 << 16) | ||
| 265 | #define PWER_WEMUX2_GPIO40 (3 << 16) | ||
| 266 | #define PWER_WEMUX2_GPIO36 (4 << 16) | ||
| 267 | #define PWER_WEMUX2_MASK (7 << 16) | ||
| 268 | #define PWER_WEMUX3_GPIO31 (1 << 19) | ||
| 269 | #define PWER_WEMUX3_GPIO113 (2 << 19) | ||
| 270 | #define PWER_WEMUX3_MASK (3 << 19) | ||
| 271 | |||
| 272 | #define INIT_GPIO_DESC_MUXED(mux, gpio) \ | ||
| 273 | do { \ | ||
| 274 | gpio_desc[(gpio)].can_wakeup = 1; \ | ||
| 275 | gpio_desc[(gpio)].mask = PWER_ ## mux ## _GPIO ##gpio; \ | ||
| 276 | gpio_desc[(gpio)].mux_mask = PWER_ ## mux ## _MASK; \ | ||
| 277 | } while (0) | ||
| 278 | |||
| 254 | static void __init pxa27x_mfp_init(void) | 279 | static void __init pxa27x_mfp_init(void) |
| 255 | { | 280 | { |
| 256 | int i, gpio; | 281 | int i, gpio; |
| 257 | 282 | ||
| 258 | for (i = 0; i <= 120; i++) { | 283 | for (i = 0; i <= pxa_last_gpio; i++) { |
| 259 | /* skip GPIO2, 5, 6, 7, 8, they are not | 284 | /* skip GPIO2, 5, 6, 7, 8, they are not |
| 260 | * valid pins allow configuration | 285 | * valid pins allow configuration |
| 261 | */ | 286 | */ |
| @@ -286,7 +311,12 @@ static void __init pxa27x_mfp_init(void) | |||
| 286 | gpio_desc[35].can_wakeup = 1; | 311 | gpio_desc[35].can_wakeup = 1; |
| 287 | gpio_desc[35].mask = PWER_WE35; | 312 | gpio_desc[35].mask = PWER_WE35; |
| 288 | 313 | ||
| 289 | gpio_nr = 121; | 314 | INIT_GPIO_DESC_MUXED(WEMUX3, 31); |
| 315 | INIT_GPIO_DESC_MUXED(WEMUX3, 113); | ||
| 316 | INIT_GPIO_DESC_MUXED(WEMUX2, 38); | ||
| 317 | INIT_GPIO_DESC_MUXED(WEMUX2, 53); | ||
| 318 | INIT_GPIO_DESC_MUXED(WEMUX2, 40); | ||
| 319 | INIT_GPIO_DESC_MUXED(WEMUX2, 36); | ||
| 290 | } | 320 | } |
| 291 | #else | 321 | #else |
| 292 | static inline void pxa27x_mfp_init(void) {} | 322 | static inline void pxa27x_mfp_init(void) {} |
| @@ -300,7 +330,7 @@ static int pxa2xx_mfp_suspend(struct sys_device *d, pm_message_t state) | |||
| 300 | { | 330 | { |
| 301 | int i; | 331 | int i; |
| 302 | 332 | ||
| 303 | for (i = 0; i <= gpio_to_bank(gpio_nr); i++) { | 333 | for (i = 0; i <= gpio_to_bank(pxa_last_gpio); i++) { |
| 304 | 334 | ||
| 305 | saved_gafr[0][i] = GAFR_L(i); | 335 | saved_gafr[0][i] = GAFR_L(i); |
| 306 | saved_gafr[1][i] = GAFR_U(i); | 336 | saved_gafr[1][i] = GAFR_U(i); |
| @@ -315,7 +345,7 @@ static int pxa2xx_mfp_resume(struct sys_device *d) | |||
| 315 | { | 345 | { |
| 316 | int i; | 346 | int i; |
| 317 | 347 | ||
| 318 | for (i = 0; i <= gpio_to_bank(gpio_nr); i++) { | 348 | for (i = 0; i <= gpio_to_bank(pxa_last_gpio); i++) { |
| 319 | GAFR_L(i) = saved_gafr[0][i]; | 349 | GAFR_L(i) = saved_gafr[0][i]; |
| 320 | GAFR_U(i) = saved_gafr[1][i]; | 350 | GAFR_U(i) = saved_gafr[1][i]; |
| 321 | GPDR(i * 32) = saved_gpdr[i]; | 351 | GPDR(i * 32) = saved_gpdr[i]; |
| @@ -348,7 +378,7 @@ static int __init pxa2xx_mfp_init(void) | |||
| 348 | pxa27x_mfp_init(); | 378 | pxa27x_mfp_init(); |
| 349 | 379 | ||
| 350 | /* initialize gafr_run[], pgsr_lpm[] from existing values */ | 380 | /* initialize gafr_run[], pgsr_lpm[] from existing values */ |
| 351 | for (i = 0; i <= gpio_to_bank(gpio_nr); i++) | 381 | for (i = 0; i <= gpio_to_bank(pxa_last_gpio); i++) |
| 352 | gpdr_lpm[i] = GPDR(i * 32); | 382 | gpdr_lpm[i] = GPDR(i * 32); |
| 353 | 383 | ||
| 354 | return sysdev_class_register(&pxa2xx_mfp_sysclass); | 384 | return sysdev_class_register(&pxa2xx_mfp_sysclass); |
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 0842c531ee4d..2b427e015b6f 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #include <linux/irq.h> | 34 | #include <linux/irq.h> |
| 35 | #include <linux/pda_power.h> | 35 | #include <linux/pda_power.h> |
| 36 | #include <linux/power_supply.h> | 36 | #include <linux/power_supply.h> |
| 37 | #include <linux/wm97xx.h> | 37 | #include <linux/wm97xx_batt.h> |
| 38 | #include <linux/mtd/physmap.h> | 38 | #include <linux/mtd/physmap.h> |
| 39 | 39 | ||
| 40 | #include <asm/mach-types.h> | 40 | #include <asm/mach-types.h> |
| @@ -46,6 +46,9 @@ | |||
| 46 | #include <mach/mmc.h> | 46 | #include <mach/mmc.h> |
| 47 | #include <mach/udc.h> | 47 | #include <mach/udc.h> |
| 48 | #include <mach/pxa27x-udc.h> | 48 | #include <mach/pxa27x-udc.h> |
| 49 | #include <mach/i2c.h> | ||
| 50 | #include <mach/camera.h> | ||
| 51 | #include <media/soc_camera.h> | ||
| 49 | 52 | ||
| 50 | #include <mach/mioa701.h> | 53 | #include <mach/mioa701.h> |
| 51 | 54 | ||
| @@ -54,10 +57,11 @@ | |||
| 54 | 57 | ||
| 55 | static unsigned long mioa701_pin_config[] = { | 58 | static unsigned long mioa701_pin_config[] = { |
| 56 | /* Mio global */ | 59 | /* Mio global */ |
| 57 | MIO_CFG_OUT(GPIO9_CHARGE_nEN, AF0, DRIVE_LOW), | 60 | MIO_CFG_OUT(GPIO9_CHARGE_EN, AF0, DRIVE_LOW), |
| 58 | MIO_CFG_OUT(GPIO18_POWEROFF, AF0, DRIVE_LOW), | 61 | MIO_CFG_OUT(GPIO18_POWEROFF, AF0, DRIVE_LOW), |
| 59 | MFP_CFG_OUT(GPIO3, AF0, DRIVE_HIGH), | 62 | MFP_CFG_OUT(GPIO3, AF0, DRIVE_HIGH), |
| 60 | MFP_CFG_OUT(GPIO4, AF0, DRIVE_HIGH), | 63 | MFP_CFG_OUT(GPIO4, AF0, DRIVE_HIGH), |
| 64 | MIO_CFG_IN(GPIO80_MAYBE_CHARGE_VDROP, AF0), | ||
| 61 | 65 | ||
| 62 | /* Backlight PWM 0 */ | 66 | /* Backlight PWM 0 */ |
| 63 | GPIO16_PWM0_OUT, | 67 | GPIO16_PWM0_OUT, |
| @@ -74,7 +78,7 @@ static unsigned long mioa701_pin_config[] = { | |||
| 74 | MIO_CFG_OUT(GPIO91_SDIO_EN, AF0, DRIVE_LOW), | 78 | MIO_CFG_OUT(GPIO91_SDIO_EN, AF0, DRIVE_LOW), |
| 75 | 79 | ||
| 76 | /* USB */ | 80 | /* USB */ |
| 77 | MIO_CFG_IN(GPIO13_USB_DETECT, AF0), | 81 | MIO_CFG_IN(GPIO13_nUSB_DETECT, AF0), |
| 78 | MIO_CFG_OUT(GPIO22_USB_ENABLE, AF0, DRIVE_LOW), | 82 | MIO_CFG_OUT(GPIO22_USB_ENABLE, AF0, DRIVE_LOW), |
| 79 | 83 | ||
| 80 | /* LCD */ | 84 | /* LCD */ |
| @@ -98,12 +102,29 @@ static unsigned long mioa701_pin_config[] = { | |||
| 98 | GPIO75_LCD_LCLK, | 102 | GPIO75_LCD_LCLK, |
| 99 | GPIO76_LCD_PCLK, | 103 | GPIO76_LCD_PCLK, |
| 100 | 104 | ||
| 105 | /* QCI */ | ||
| 106 | GPIO12_CIF_DD_7, | ||
| 107 | GPIO17_CIF_DD_6, | ||
| 108 | GPIO50_CIF_DD_3, | ||
| 109 | GPIO51_CIF_DD_2, | ||
| 110 | GPIO52_CIF_DD_4, | ||
| 111 | GPIO53_CIF_MCLK, | ||
| 112 | GPIO54_CIF_PCLK, | ||
| 113 | GPIO55_CIF_DD_1, | ||
| 114 | GPIO81_CIF_DD_0, | ||
| 115 | GPIO82_CIF_DD_5, | ||
| 116 | GPIO84_CIF_FV, | ||
| 117 | GPIO85_CIF_LV, | ||
| 118 | |||
| 101 | /* Bluetooth */ | 119 | /* Bluetooth */ |
| 120 | MIO_CFG_IN(GPIO14_BT_nACTIVITY, AF0), | ||
| 102 | GPIO44_BTUART_CTS, | 121 | GPIO44_BTUART_CTS, |
| 103 | GPIO42_BTUART_RXD, | 122 | GPIO42_BTUART_RXD, |
| 104 | GPIO45_BTUART_RTS, | 123 | GPIO45_BTUART_RTS, |
| 105 | GPIO43_BTUART_TXD, | 124 | GPIO43_BTUART_TXD, |
| 106 | MIO_CFG_OUT(GPIO83_BT_ON, AF0, DRIVE_LOW), | 125 | MIO_CFG_OUT(GPIO83_BT_ON, AF0, DRIVE_LOW), |
| 126 | MIO_CFG_OUT(GPIO77_BT_UNKNOWN1, AF0, DRIVE_HIGH), | ||
| 127 | MIO_CFG_OUT(GPIO86_BT_MAYBE_nRESET, AF0, DRIVE_HIGH), | ||
| 107 | 128 | ||
| 108 | /* GPS */ | 129 | /* GPS */ |
| 109 | MIO_CFG_OUT(GPIO23_GPS_UNKNOWN1, AF0, DRIVE_LOW), | 130 | MIO_CFG_OUT(GPIO23_GPS_UNKNOWN1, AF0, DRIVE_LOW), |
| @@ -151,16 +172,16 @@ static unsigned long mioa701_pin_config[] = { | |||
| 151 | GPIO104_KP_MKOUT_1, | 172 | GPIO104_KP_MKOUT_1, |
| 152 | GPIO105_KP_MKOUT_2, | 173 | GPIO105_KP_MKOUT_2, |
| 153 | 174 | ||
| 175 | /* I2C */ | ||
| 176 | GPIO117_I2C_SCL, | ||
| 177 | GPIO118_I2C_SDA, | ||
| 178 | |||
| 154 | /* Unknown */ | 179 | /* Unknown */ |
| 155 | MFP_CFG_IN(GPIO14, AF0), | ||
| 156 | MFP_CFG_IN(GPIO20, AF0), | 180 | MFP_CFG_IN(GPIO20, AF0), |
| 157 | MFP_CFG_IN(GPIO21, AF0), | 181 | MFP_CFG_IN(GPIO21, AF0), |
| 158 | MFP_CFG_IN(GPIO33, AF0), | 182 | MFP_CFG_IN(GPIO33, AF0), |
| 159 | MFP_CFG_OUT(GPIO49, AF0, DRIVE_HIGH), | 183 | MFP_CFG_OUT(GPIO49, AF0, DRIVE_HIGH), |
| 160 | MFP_CFG_OUT(GPIO57, AF0, DRIVE_HIGH), | 184 | MFP_CFG_OUT(GPIO57, AF0, DRIVE_HIGH), |
| 161 | MFP_CFG_OUT(GPIO77, AF0, DRIVE_HIGH), | ||
| 162 | MFP_CFG_IN(GPIO80, AF0), | ||
| 163 | MFP_CFG_OUT(GPIO86, AF0, DRIVE_HIGH), | ||
| 164 | MFP_CFG_IN(GPIO96, AF0), | 185 | MFP_CFG_IN(GPIO96, AF0), |
| 165 | MFP_CFG_OUT(GPIO116, AF0, DRIVE_HIGH), | 186 | MFP_CFG_OUT(GPIO116, AF0, DRIVE_HIGH), |
| 166 | }; | 187 | }; |
| @@ -407,7 +428,7 @@ static void udc_power_command(int cmd) | |||
| 407 | 428 | ||
| 408 | static int is_usb_connected(void) | 429 | static int is_usb_connected(void) |
| 409 | { | 430 | { |
| 410 | return !!gpio_get_value(GPIO13_USB_DETECT); | 431 | return !gpio_get_value(GPIO13_nUSB_DETECT); |
| 411 | } | 432 | } |
| 412 | 433 | ||
| 413 | static struct pxa2xx_udc_mach_info mioa701_udc_info = { | 434 | static struct pxa2xx_udc_mach_info mioa701_udc_info = { |
| @@ -565,7 +586,7 @@ static int mioa701_sys_suspend(struct sys_device *sysdev, pm_message_t state) | |||
| 565 | u32 *mem_resume_unknown = phys_to_virt(RESUME_UNKNOWN_ADDR); | 586 | u32 *mem_resume_unknown = phys_to_virt(RESUME_UNKNOWN_ADDR); |
| 566 | 587 | ||
| 567 | /* Devices prepare suspend */ | 588 | /* Devices prepare suspend */ |
| 568 | is_bt_on = gpio_get_value(GPIO83_BT_ON); | 589 | is_bt_on = !!gpio_get_value(GPIO83_BT_ON); |
| 569 | pxa2xx_mfp_set_lpm(GPIO83_BT_ON, | 590 | pxa2xx_mfp_set_lpm(GPIO83_BT_ON, |
| 570 | is_bt_on ? MFP_LPM_DRIVE_HIGH : MFP_LPM_DRIVE_LOW); | 591 | is_bt_on ? MFP_LPM_DRIVE_HIGH : MFP_LPM_DRIVE_LOW); |
| 571 | 592 | ||
| @@ -659,13 +680,19 @@ static char *supplicants[] = { | |||
| 659 | "mioa701_battery" | 680 | "mioa701_battery" |
| 660 | }; | 681 | }; |
| 661 | 682 | ||
| 683 | static int is_ac_connected(void) | ||
| 684 | { | ||
| 685 | return gpio_get_value(GPIO96_AC_DETECT); | ||
| 686 | } | ||
| 687 | |||
| 662 | static void mioa701_set_charge(int flags) | 688 | static void mioa701_set_charge(int flags) |
| 663 | { | 689 | { |
| 664 | gpio_set_value(GPIO9_CHARGE_nEN, !flags); | 690 | gpio_set_value(GPIO9_CHARGE_EN, (flags == PDA_POWER_CHARGE_USB)); |
| 665 | } | 691 | } |
| 666 | 692 | ||
| 667 | static struct pda_power_pdata power_pdata = { | 693 | static struct pda_power_pdata power_pdata = { |
| 668 | .is_ac_online = is_usb_connected, | 694 | .is_ac_online = is_ac_connected, |
| 695 | .is_usb_online = is_usb_connected, | ||
| 669 | .set_charge = mioa701_set_charge, | 696 | .set_charge = mioa701_set_charge, |
| 670 | .supplied_to = supplicants, | 697 | .supplied_to = supplicants, |
| 671 | .num_supplicants = ARRAY_SIZE(supplicants), | 698 | .num_supplicants = ARRAY_SIZE(supplicants), |
| @@ -674,8 +701,15 @@ static struct pda_power_pdata power_pdata = { | |||
| 674 | static struct resource power_resources[] = { | 701 | static struct resource power_resources[] = { |
| 675 | [0] = { | 702 | [0] = { |
| 676 | .name = "ac", | 703 | .name = "ac", |
| 677 | .start = gpio_to_irq(GPIO13_USB_DETECT), | 704 | .start = gpio_to_irq(GPIO96_AC_DETECT), |
| 678 | .end = gpio_to_irq(GPIO13_USB_DETECT), | 705 | .end = gpio_to_irq(GPIO96_AC_DETECT), |
| 706 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | | ||
| 707 | IORESOURCE_IRQ_LOWEDGE, | ||
| 708 | }, | ||
| 709 | [1] = { | ||
| 710 | .name = "usb", | ||
| 711 | .start = gpio_to_irq(GPIO13_nUSB_DETECT), | ||
| 712 | .end = gpio_to_irq(GPIO13_nUSB_DETECT), | ||
| 679 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | | 713 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | |
| 680 | IORESOURCE_IRQ_LOWEDGE, | 714 | IORESOURCE_IRQ_LOWEDGE, |
| 681 | }, | 715 | }, |
| @@ -691,120 +725,43 @@ static struct platform_device power_dev = { | |||
| 691 | }, | 725 | }, |
| 692 | }; | 726 | }; |
| 693 | 727 | ||
| 694 | #if defined(CONFIG_PDA_POWER) && defined(CONFIG_TOUCHSCREEN_WM97XX) | 728 | static struct wm97xx_batt_info mioa701_battery_data = { |
| 695 | static struct wm97xx *battery_wm; | 729 | .batt_aux = WM97XX_AUX_ID1, |
| 696 | 730 | .temp_aux = -1, | |
| 697 | static enum power_supply_property battery_props[] = { | 731 | .charge_gpio = -1, |
| 698 | POWER_SUPPLY_PROP_STATUS, | 732 | .min_voltage = 0xc00, |
| 699 | POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN, | 733 | .max_voltage = 0xfc0, |
| 700 | POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, | 734 | .batt_tech = POWER_SUPPLY_TECHNOLOGY_LION, |
| 701 | POWER_SUPPLY_PROP_VOLTAGE_NOW, | 735 | .batt_div = 1, |
| 702 | POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, /* Necessary for apm */ | 736 | .batt_mult = 1, |
| 737 | .batt_name = "mioa701_battery", | ||
| 703 | }; | 738 | }; |
| 704 | 739 | ||
| 705 | static int get_battery_voltage(void) | 740 | /* |
| 706 | { | 741 | * Camera interface |
| 707 | int adc = -1; | 742 | */ |
| 708 | 743 | struct pxacamera_platform_data mioa701_pxacamera_platform_data = { | |
| 709 | if (battery_wm) | 744 | .flags = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | |
| 710 | adc = wm97xx_read_aux_adc(battery_wm, WM97XX_AUX_ID1); | 745 | PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN, |
| 711 | return adc; | 746 | .mclk_10khz = 5000, |
| 712 | } | ||
| 713 | |||
| 714 | static int get_battery_status(struct power_supply *b) | ||
| 715 | { | ||
| 716 | int status; | ||
| 717 | |||
| 718 | if (is_usb_connected()) | ||
| 719 | status = POWER_SUPPLY_STATUS_CHARGING; | ||
| 720 | else | ||
| 721 | status = POWER_SUPPLY_STATUS_DISCHARGING; | ||
| 722 | |||
| 723 | return status; | ||
| 724 | } | ||
| 725 | |||
| 726 | static int get_property(struct power_supply *b, | ||
| 727 | enum power_supply_property psp, | ||
| 728 | union power_supply_propval *val) | ||
| 729 | { | ||
| 730 | int rc = 0; | ||
| 731 | |||
| 732 | switch (psp) { | ||
| 733 | case POWER_SUPPLY_PROP_STATUS: | ||
| 734 | val->intval = get_battery_status(b); | ||
| 735 | break; | ||
| 736 | case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN: | ||
| 737 | val->intval = 0xfd0; | ||
| 738 | break; | ||
| 739 | case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN: | ||
| 740 | val->intval = 0xc00; | ||
| 741 | break; | ||
| 742 | case POWER_SUPPLY_PROP_VOLTAGE_NOW: | ||
| 743 | val->intval = get_battery_voltage(); | ||
| 744 | break; | ||
| 745 | case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: | ||
| 746 | val->intval = 100; | ||
| 747 | break; | ||
| 748 | default: | ||
| 749 | val->intval = -1; | ||
| 750 | rc = -1; | ||
| 751 | } | ||
| 752 | |||
| 753 | return rc; | ||
| 754 | }; | 747 | }; |
| 755 | 748 | ||
| 756 | static struct power_supply battery_ps = { | 749 | static struct soc_camera_link iclink = { |
| 757 | .name = "mioa701_battery", | 750 | .bus_id = 0, /* Must match id in pxa27x_device_camera in device.c */ |
| 758 | .type = POWER_SUPPLY_TYPE_BATTERY, | ||
| 759 | .get_property = get_property, | ||
| 760 | .properties = battery_props, | ||
| 761 | .num_properties = ARRAY_SIZE(battery_props), | ||
| 762 | }; | 751 | }; |
| 763 | 752 | ||
| 764 | static int battery_probe(struct platform_device *pdev) | 753 | /* Board I2C devices. */ |
| 765 | { | 754 | static struct i2c_board_info __initdata mioa701_i2c_devices[] = { |
| 766 | struct wm97xx *wm = platform_get_drvdata(pdev); | 755 | { |
| 767 | int rc; | 756 | /* Must initialize before the camera(s) */ |
| 768 | 757 | I2C_BOARD_INFO("mt9m111", 0x5d), | |
| 769 | battery_wm = wm; | 758 | .platform_data = &iclink, |
| 770 | |||
| 771 | rc = power_supply_register(NULL, &battery_ps); | ||
| 772 | if (rc) | ||
| 773 | dev_err(&pdev->dev, | ||
| 774 | "Could not register mioa701 battery -> %d\n", rc); | ||
| 775 | return rc; | ||
| 776 | } | ||
| 777 | |||
| 778 | static int battery_remove(struct platform_device *pdev) | ||
| 779 | { | ||
| 780 | battery_wm = NULL; | ||
| 781 | return 0; | ||
| 782 | } | ||
| 783 | |||
| 784 | static struct platform_driver mioa701_battery_driver = { | ||
| 785 | .driver = { | ||
| 786 | .name = "wm97xx-battery", | ||
| 787 | }, | 759 | }, |
| 788 | .probe = battery_probe, | ||
| 789 | .remove = battery_remove | ||
| 790 | }; | 760 | }; |
| 791 | 761 | ||
| 792 | static int __init mioa701_battery_init(void) | 762 | struct i2c_pxa_platform_data i2c_pdata = { |
| 793 | { | 763 | .fast_mode = 1, |
| 794 | int rc; | 764 | }; |
| 795 | |||
| 796 | rc = platform_driver_register(&mioa701_battery_driver); | ||
| 797 | if (rc) | ||
| 798 | printk(KERN_ERR "Could not register mioa701 battery driver\n"); | ||
| 799 | return rc; | ||
| 800 | } | ||
| 801 | |||
| 802 | #else | ||
| 803 | static int __init mioa701_battery_init(void) | ||
| 804 | { | ||
| 805 | return 0; | ||
| 806 | } | ||
| 807 | #endif | ||
| 808 | 765 | ||
| 809 | /* | 766 | /* |
| 810 | * Mio global | 767 | * Mio global |
| @@ -851,17 +808,17 @@ static void mioa701_machine_exit(void); | |||
| 851 | static void mioa701_poweroff(void) | 808 | static void mioa701_poweroff(void) |
| 852 | { | 809 | { |
| 853 | mioa701_machine_exit(); | 810 | mioa701_machine_exit(); |
| 854 | gpio_set_value(GPIO18_POWEROFF, 1); | 811 | arm_machine_restart('s'); |
| 855 | } | 812 | } |
| 856 | 813 | ||
| 857 | static void mioa701_restart(char c) | 814 | static void mioa701_restart(char c) |
| 858 | { | 815 | { |
| 859 | mioa701_machine_exit(); | 816 | mioa701_machine_exit(); |
| 860 | arm_machine_restart(c); | 817 | arm_machine_restart('s'); |
| 861 | } | 818 | } |
| 862 | 819 | ||
| 863 | struct gpio_ress global_gpios[] = { | 820 | struct gpio_ress global_gpios[] = { |
| 864 | MIO_GPIO_OUT(GPIO9_CHARGE_nEN, 1, "Charger enable"), | 821 | MIO_GPIO_OUT(GPIO9_CHARGE_EN, 1, "Charger enable"), |
| 865 | MIO_GPIO_OUT(GPIO18_POWEROFF, 0, "Power Off"), | 822 | MIO_GPIO_OUT(GPIO18_POWEROFF, 0, "Power Off"), |
| 866 | MIO_GPIO_OUT(GPIO87_LCD_POWER, 0, "LCD Power") | 823 | MIO_GPIO_OUT(GPIO87_LCD_POWER, 0, "LCD Power") |
| 867 | }; | 824 | }; |
| @@ -879,12 +836,16 @@ static void __init mioa701_machine_init(void) | |||
| 879 | set_pxa_fb_info(&mioa701_pxafb_info); | 836 | set_pxa_fb_info(&mioa701_pxafb_info); |
| 880 | pxa_set_mci_info(&mioa701_mci_info); | 837 | pxa_set_mci_info(&mioa701_mci_info); |
| 881 | pxa_set_keypad_info(&mioa701_keypad_info); | 838 | pxa_set_keypad_info(&mioa701_keypad_info); |
| 839 | wm97xx_bat_set_pdata(&mioa701_battery_data); | ||
| 882 | udc_init(); | 840 | udc_init(); |
| 883 | pm_power_off = mioa701_poweroff; | 841 | pm_power_off = mioa701_poweroff; |
| 884 | arm_pm_restart = mioa701_restart; | 842 | arm_pm_restart = mioa701_restart; |
| 885 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 843 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 886 | gsm_init(); | 844 | gsm_init(); |
| 887 | mioa701_battery_init(); | 845 | |
| 846 | pxa_set_i2c_info(&i2c_pdata); | ||
| 847 | pxa_set_camera_info(&mioa701_pxacamera_platform_data); | ||
| 848 | i2c_register_board_info(0, ARRAY_AND_SIZE(mioa701_i2c_devices)); | ||
| 888 | } | 849 | } |
| 889 | 850 | ||
| 890 | static void mioa701_machine_exit(void) | 851 | static void mioa701_machine_exit(void) |
diff --git a/arch/arm/mach-pxa/mioa701_bootresume.S b/arch/arm/mach-pxa/mioa701_bootresume.S index a647693d9856..324d25a48c85 100644 --- a/arch/arm/mach-pxa/mioa701_bootresume.S +++ b/arch/arm/mach-pxa/mioa701_bootresume.S | |||
| @@ -24,6 +24,7 @@ ENTRY(mioa701_jumpaddr) | |||
| 24 | 1: | 24 | 1: |
| 25 | mov r0, #0xa0000000 @ Don't suppose memory access works | 25 | mov r0, #0xa0000000 @ Don't suppose memory access works |
| 26 | orr r0, r0, #0x00200000 @ even if it's supposed to | 26 | orr r0, r0, #0x00200000 @ even if it's supposed to |
| 27 | orr r0, r0, #0x0000b000 | ||
| 27 | mov r1, #0 | 28 | mov r1, #0 |
| 28 | str r1, [r0] @ Early disable resume for next boot | 29 | str r1, [r0] @ Early disable resume for next boot |
| 29 | ldr r0, mioa701_jumpaddr @ (Murphy's Law) | 30 | ldr r0, mioa701_jumpaddr @ (Murphy's Law) |
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index 4447711c9fc6..a9d94f5dbec4 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
| @@ -56,6 +56,9 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
| 56 | GPIO110_MMC_DAT_2, | 56 | GPIO110_MMC_DAT_2, |
| 57 | GPIO111_MMC_DAT_3, | 57 | GPIO111_MMC_DAT_3, |
| 58 | GPIO112_MMC_CMD, | 58 | GPIO112_MMC_CMD, |
| 59 | GPIO14_GPIO, /* SD detect */ | ||
| 60 | GPIO114_GPIO, /* SD power */ | ||
| 61 | GPIO115_GPIO, /* SD r/o switch */ | ||
| 59 | 62 | ||
| 60 | /* AC97 */ | 63 | /* AC97 */ |
| 61 | GPIO28_AC97_BITCLK, | 64 | GPIO28_AC97_BITCLK, |
| @@ -64,6 +67,7 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
| 64 | GPIO31_AC97_SYNC, | 67 | GPIO31_AC97_SYNC, |
| 65 | 68 | ||
| 66 | /* IrDA */ | 69 | /* IrDA */ |
| 70 | GPIO40_GPIO, /* ir disable */ | ||
| 67 | GPIO46_FICP_RXD, | 71 | GPIO46_FICP_RXD, |
| 68 | GPIO47_FICP_TXD, | 72 | GPIO47_FICP_TXD, |
| 69 | 73 | ||
| @@ -71,7 +75,8 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
| 71 | GPIO16_PWM0_OUT, | 75 | GPIO16_PWM0_OUT, |
| 72 | 76 | ||
| 73 | /* USB */ | 77 | /* USB */ |
| 74 | GPIO13_GPIO, | 78 | GPIO13_GPIO, /* usb detect */ |
| 79 | GPIO95_GPIO, /* usb power */ | ||
| 75 | 80 | ||
| 76 | /* PCMCIA */ | 81 | /* PCMCIA */ |
| 77 | GPIO48_nPOE, | 82 | GPIO48_nPOE, |
| @@ -84,6 +89,45 @@ static unsigned long palmtx_pin_config[] __initdata = { | |||
| 84 | GPIO55_nPREG, | 89 | GPIO55_nPREG, |
| 85 | GPIO56_nPWAIT, | 90 | GPIO56_nPWAIT, |
| 86 | GPIO57_nIOIS16, | 91 | GPIO57_nIOIS16, |
| 92 | GPIO94_GPIO, /* wifi power 1 */ | ||
| 93 | GPIO108_GPIO, /* wifi power 2 */ | ||
| 94 | GPIO116_GPIO, /* wifi ready */ | ||
| 95 | |||
| 96 | /* MATRIX KEYPAD */ | ||
| 97 | GPIO100_KP_MKIN_0, | ||
| 98 | GPIO101_KP_MKIN_1, | ||
| 99 | GPIO102_KP_MKIN_2, | ||
| 100 | GPIO97_KP_MKIN_3, | ||
| 101 | GPIO103_KP_MKOUT_0, | ||
| 102 | GPIO104_KP_MKOUT_1, | ||
| 103 | GPIO105_KP_MKOUT_2, | ||
| 104 | |||
| 105 | /* LCD */ | ||
| 106 | GPIO58_LCD_LDD_0, | ||
| 107 | GPIO59_LCD_LDD_1, | ||
| 108 | GPIO60_LCD_LDD_2, | ||
| 109 | GPIO61_LCD_LDD_3, | ||
| 110 | GPIO62_LCD_LDD_4, | ||
| 111 | GPIO63_LCD_LDD_5, | ||
| 112 | GPIO64_LCD_LDD_6, | ||
| 113 | GPIO65_LCD_LDD_7, | ||
| 114 | GPIO66_LCD_LDD_8, | ||
| 115 | GPIO67_LCD_LDD_9, | ||
| 116 | GPIO68_LCD_LDD_10, | ||
| 117 | GPIO69_LCD_LDD_11, | ||
| 118 | GPIO70_LCD_LDD_12, | ||
| 119 | GPIO71_LCD_LDD_13, | ||
| 120 | GPIO72_LCD_LDD_14, | ||
| 121 | GPIO73_LCD_LDD_15, | ||
| 122 | GPIO74_LCD_FCLK, | ||
| 123 | GPIO75_LCD_LCLK, | ||
| 124 | GPIO76_LCD_PCLK, | ||
| 125 | GPIO77_LCD_BIAS, | ||
| 126 | |||
| 127 | /* MISC. */ | ||
| 128 | GPIO10_GPIO, /* hotsync button */ | ||
| 129 | GPIO12_GPIO, /* power detect */ | ||
| 130 | GPIO107_GPIO, /* earphone detect */ | ||
| 87 | }; | 131 | }; |
| 88 | 132 | ||
| 89 | /****************************************************************************** | 133 | /****************************************************************************** |
| @@ -95,32 +139,49 @@ static int palmtx_mci_init(struct device *dev, irq_handler_t palmtx_detect_int, | |||
| 95 | int err = 0; | 139 | int err = 0; |
| 96 | 140 | ||
| 97 | /* Setup an interrupt for detecting card insert/remove events */ | 141 | /* Setup an interrupt for detecting card insert/remove events */ |
| 98 | err = request_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, palmtx_detect_int, | 142 | err = gpio_request(GPIO_NR_PALMTX_SD_DETECT_N, "SD IRQ"); |
| 99 | IRQF_DISABLED | IRQF_SAMPLE_RANDOM | | 143 | if (err) |
| 144 | goto err; | ||
| 145 | err = gpio_direction_input(GPIO_NR_PALMTX_SD_DETECT_N); | ||
| 146 | if (err) | ||
| 147 | goto err2; | ||
| 148 | err = request_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), | ||
| 149 | palmtx_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM | | ||
| 100 | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, | 150 | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, |
| 101 | "SD/MMC card detect", data); | 151 | "SD/MMC card detect", data); |
| 102 | if (err) { | 152 | if (err) { |
| 103 | printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n", | 153 | printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n", |
| 104 | __func__); | 154 | __func__); |
| 105 | return err; | 155 | goto err2; |
| 106 | } | 156 | } |
| 107 | 157 | ||
| 108 | err = gpio_request(GPIO_NR_PALMTX_SD_POWER, "SD_POWER"); | 158 | err = gpio_request(GPIO_NR_PALMTX_SD_POWER, "SD_POWER"); |
| 109 | if (err) | 159 | if (err) |
| 110 | goto pwr_err; | 160 | goto err3; |
| 161 | err = gpio_direction_output(GPIO_NR_PALMTX_SD_POWER, 0); | ||
| 162 | if (err) | ||
| 163 | goto err4; | ||
| 111 | 164 | ||
| 112 | err = gpio_request(GPIO_NR_PALMTX_SD_READONLY, "SD_READONLY"); | 165 | err = gpio_request(GPIO_NR_PALMTX_SD_READONLY, "SD_READONLY"); |
| 113 | if (err) | 166 | if (err) |
| 114 | goto ro_err; | 167 | goto err4; |
| 168 | err = gpio_direction_input(GPIO_NR_PALMTX_SD_READONLY); | ||
| 169 | if (err) | ||
| 170 | goto err5; | ||
| 115 | 171 | ||
| 116 | printk(KERN_DEBUG "%s: irq registered\n", __func__); | 172 | printk(KERN_DEBUG "%s: irq registered\n", __func__); |
| 117 | 173 | ||
| 118 | return 0; | 174 | return 0; |
| 119 | 175 | ||
| 120 | ro_err: | 176 | err5: |
| 177 | gpio_free(GPIO_NR_PALMTX_SD_READONLY); | ||
| 178 | err4: | ||
| 121 | gpio_free(GPIO_NR_PALMTX_SD_POWER); | 179 | gpio_free(GPIO_NR_PALMTX_SD_POWER); |
| 122 | pwr_err: | 180 | err3: |
| 123 | free_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, data); | 181 | free_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), data); |
| 182 | err2: | ||
| 183 | gpio_free(GPIO_NR_PALMTX_SD_DETECT_N); | ||
| 184 | err: | ||
| 124 | return err; | 185 | return err; |
| 125 | } | 186 | } |
| 126 | 187 | ||
| @@ -128,7 +189,8 @@ static void palmtx_mci_exit(struct device *dev, void *data) | |||
| 128 | { | 189 | { |
| 129 | gpio_free(GPIO_NR_PALMTX_SD_READONLY); | 190 | gpio_free(GPIO_NR_PALMTX_SD_READONLY); |
| 130 | gpio_free(GPIO_NR_PALMTX_SD_POWER); | 191 | gpio_free(GPIO_NR_PALMTX_SD_POWER); |
| 131 | free_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, data); | 192 | free_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), data); |
| 193 | gpio_free(GPIO_NR_PALMTX_SD_DETECT_N); | ||
| 132 | } | 194 | } |
| 133 | 195 | ||
| 134 | static void palmtx_mci_power(struct device *dev, unsigned int vdd) | 196 | static void palmtx_mci_power(struct device *dev, unsigned int vdd) |
| @@ -167,7 +229,6 @@ static unsigned int palmtx_matrix_keys[] = { | |||
| 167 | 229 | ||
| 168 | KEY(3, 0, KEY_RIGHT), | 230 | KEY(3, 0, KEY_RIGHT), |
| 169 | KEY(3, 2, KEY_LEFT), | 231 | KEY(3, 2, KEY_LEFT), |
| 170 | |||
| 171 | }; | 232 | }; |
| 172 | 233 | ||
| 173 | static struct pxa27x_keypad_platform_data palmtx_keypad_platform_data = { | 234 | static struct pxa27x_keypad_platform_data palmtx_keypad_platform_data = { |
| @@ -209,11 +270,19 @@ static int palmtx_backlight_init(struct device *dev) | |||
| 209 | ret = gpio_request(GPIO_NR_PALMTX_BL_POWER, "BL POWER"); | 270 | ret = gpio_request(GPIO_NR_PALMTX_BL_POWER, "BL POWER"); |
| 210 | if (ret) | 271 | if (ret) |
| 211 | goto err; | 272 | goto err; |
| 273 | ret = gpio_direction_output(GPIO_NR_PALMTX_BL_POWER, 0); | ||
| 274 | if (ret) | ||
| 275 | goto err2; | ||
| 212 | ret = gpio_request(GPIO_NR_PALMTX_LCD_POWER, "LCD POWER"); | 276 | ret = gpio_request(GPIO_NR_PALMTX_LCD_POWER, "LCD POWER"); |
| 213 | if (ret) | 277 | if (ret) |
| 214 | goto err2; | 278 | goto err2; |
| 279 | ret = gpio_direction_output(GPIO_NR_PALMTX_LCD_POWER, 0); | ||
| 280 | if (ret) | ||
| 281 | goto err3; | ||
| 215 | 282 | ||
| 216 | return 0; | 283 | return 0; |
| 284 | err3: | ||
| 285 | gpio_free(GPIO_NR_PALMTX_LCD_POWER); | ||
| 217 | err2: | 286 | err2: |
| 218 | gpio_free(GPIO_NR_PALMTX_BL_POWER); | 287 | gpio_free(GPIO_NR_PALMTX_BL_POWER); |
| 219 | err: | 288 | err: |
| @@ -254,6 +323,24 @@ static struct platform_device palmtx_backlight = { | |||
| 254 | /****************************************************************************** | 323 | /****************************************************************************** |
| 255 | * IrDA | 324 | * IrDA |
| 256 | ******************************************************************************/ | 325 | ******************************************************************************/ |
| 326 | static int palmtx_irda_startup(struct device *dev) | ||
| 327 | { | ||
| 328 | int err; | ||
| 329 | err = gpio_request(GPIO_NR_PALMTX_IR_DISABLE, "IR DISABLE"); | ||
| 330 | if (err) | ||
| 331 | goto err; | ||
| 332 | err = gpio_direction_output(GPIO_NR_PALMTX_IR_DISABLE, 1); | ||
| 333 | if (err) | ||
| 334 | gpio_free(GPIO_NR_PALMTX_IR_DISABLE); | ||
| 335 | err: | ||
| 336 | return err; | ||
| 337 | } | ||
| 338 | |||
| 339 | static void palmtx_irda_shutdown(struct device *dev) | ||
| 340 | { | ||
| 341 | gpio_free(GPIO_NR_PALMTX_IR_DISABLE); | ||
| 342 | } | ||
| 343 | |||
| 257 | static void palmtx_irda_transceiver_mode(struct device *dev, int mode) | 344 | static void palmtx_irda_transceiver_mode(struct device *dev, int mode) |
| 258 | { | 345 | { |
| 259 | gpio_set_value(GPIO_NR_PALMTX_IR_DISABLE, mode & IR_OFF); | 346 | gpio_set_value(GPIO_NR_PALMTX_IR_DISABLE, mode & IR_OFF); |
| @@ -261,6 +348,8 @@ static void palmtx_irda_transceiver_mode(struct device *dev, int mode) | |||
| 261 | } | 348 | } |
| 262 | 349 | ||
| 263 | static struct pxaficp_platform_data palmtx_ficp_platform_data = { | 350 | static struct pxaficp_platform_data palmtx_ficp_platform_data = { |
| 351 | .startup = palmtx_irda_startup, | ||
| 352 | .shutdown = palmtx_irda_shutdown, | ||
| 264 | .transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF, | 353 | .transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF, |
| 265 | .transceiver_mode = palmtx_irda_transceiver_mode, | 354 | .transceiver_mode = palmtx_irda_transceiver_mode, |
| 266 | }; | 355 | }; |
| @@ -268,17 +357,11 @@ static struct pxaficp_platform_data palmtx_ficp_platform_data = { | |||
| 268 | /****************************************************************************** | 357 | /****************************************************************************** |
| 269 | * UDC | 358 | * UDC |
| 270 | ******************************************************************************/ | 359 | ******************************************************************************/ |
| 271 | static void palmtx_udc_command(int cmd) | ||
| 272 | { | ||
| 273 | gpio_set_value(GPIO_NR_PALMTX_USB_POWER, !cmd); | ||
| 274 | udelay(50); | ||
| 275 | gpio_set_value(GPIO_NR_PALMTX_USB_PULLUP, !cmd); | ||
| 276 | } | ||
| 277 | |||
| 278 | static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = { | 360 | static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = { |
| 279 | .gpio_vbus = GPIO_NR_PALMTX_USB_DETECT_N, | 361 | .gpio_vbus = GPIO_NR_PALMTX_USB_DETECT_N, |
| 280 | .gpio_vbus_inverted = 1, | 362 | .gpio_vbus_inverted = 1, |
| 281 | .udc_command = palmtx_udc_command, | 363 | .gpio_pullup = GPIO_NR_PALMTX_USB_POWER, |
| 364 | .gpio_pullup_inverted = 0, | ||
| 282 | }; | 365 | }; |
| 283 | 366 | ||
| 284 | /****************************************************************************** | 367 | /****************************************************************************** |
| @@ -290,17 +373,16 @@ static int power_supply_init(struct device *dev) | |||
| 290 | 373 | ||
| 291 | ret = gpio_request(GPIO_NR_PALMTX_POWER_DETECT, "CABLE_STATE_AC"); | 374 | ret = gpio_request(GPIO_NR_PALMTX_POWER_DETECT, "CABLE_STATE_AC"); |
| 292 | if (ret) | 375 | if (ret) |
| 293 | goto err_cs_ac; | 376 | goto err1; |
| 294 | 377 | ret = gpio_direction_input(GPIO_NR_PALMTX_POWER_DETECT); | |
| 295 | ret = gpio_request(GPIO_NR_PALMTX_USB_DETECT_N, "CABLE_STATE_USB"); | ||
| 296 | if (ret) | 378 | if (ret) |
| 297 | goto err_cs_usb; | 379 | goto err2; |
| 298 | 380 | ||
| 299 | return 0; | 381 | return 0; |
| 300 | 382 | ||
| 301 | err_cs_usb: | 383 | err2: |
| 302 | gpio_free(GPIO_NR_PALMTX_POWER_DETECT); | 384 | gpio_free(GPIO_NR_PALMTX_POWER_DETECT); |
| 303 | err_cs_ac: | 385 | err1: |
| 304 | return ret; | 386 | return ret; |
| 305 | } | 387 | } |
| 306 | 388 | ||
| @@ -309,14 +391,8 @@ static int palmtx_is_ac_online(void) | |||
| 309 | return gpio_get_value(GPIO_NR_PALMTX_POWER_DETECT); | 391 | return gpio_get_value(GPIO_NR_PALMTX_POWER_DETECT); |
| 310 | } | 392 | } |
| 311 | 393 | ||
| 312 | static int palmtx_is_usb_online(void) | ||
| 313 | { | ||
| 314 | return !gpio_get_value(GPIO_NR_PALMTX_USB_DETECT_N); | ||
| 315 | } | ||
| 316 | |||
| 317 | static void power_supply_exit(struct device *dev) | 394 | static void power_supply_exit(struct device *dev) |
| 318 | { | 395 | { |
| 319 | gpio_free(GPIO_NR_PALMTX_USB_DETECT_N); | ||
| 320 | gpio_free(GPIO_NR_PALMTX_POWER_DETECT); | 396 | gpio_free(GPIO_NR_PALMTX_POWER_DETECT); |
| 321 | } | 397 | } |
| 322 | 398 | ||
| @@ -327,7 +403,6 @@ static char *palmtx_supplicants[] = { | |||
| 327 | static struct pda_power_pdata power_supply_info = { | 403 | static struct pda_power_pdata power_supply_info = { |
| 328 | .init = power_supply_init, | 404 | .init = power_supply_init, |
| 329 | .is_ac_online = palmtx_is_ac_online, | 405 | .is_ac_online = palmtx_is_ac_online, |
| 330 | .is_usb_online = palmtx_is_usb_online, | ||
| 331 | .exit = power_supply_exit, | 406 | .exit = power_supply_exit, |
| 332 | .supplied_to = palmtx_supplicants, | 407 | .supplied_to = palmtx_supplicants, |
| 333 | .num_supplicants = ARRAY_SIZE(palmtx_supplicants), | 408 | .num_supplicants = ARRAY_SIZE(palmtx_supplicants), |
| @@ -410,12 +485,23 @@ static void __init palmtx_map_io(void) | |||
| 410 | iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc)); | 485 | iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc)); |
| 411 | } | 486 | } |
| 412 | 487 | ||
| 488 | /* setup udc GPIOs initial state */ | ||
| 489 | static void __init palmtx_udc_init(void) | ||
| 490 | { | ||
| 491 | if (!gpio_request(GPIO_NR_PALMTX_USB_POWER, "UDC Vbus")) { | ||
| 492 | gpio_direction_output(GPIO_NR_PALMTX_USB_POWER, 1); | ||
| 493 | gpio_free(GPIO_NR_PALMTX_USB_POWER); | ||
| 494 | } | ||
| 495 | } | ||
| 496 | |||
| 497 | |||
| 413 | static void __init palmtx_init(void) | 498 | static void __init palmtx_init(void) |
| 414 | { | 499 | { |
| 415 | pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config)); | 500 | pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config)); |
| 416 | 501 | ||
| 417 | set_pxa_fb_info(&palmtx_lcd_screen); | 502 | set_pxa_fb_info(&palmtx_lcd_screen); |
| 418 | pxa_set_mci_info(&palmtx_mci_platform_data); | 503 | pxa_set_mci_info(&palmtx_mci_platform_data); |
| 504 | palmtx_udc_init(); | ||
| 419 | pxa_set_udc_info(&palmtx_udc_info); | 505 | pxa_set_udc_info(&palmtx_udc_info); |
| 420 | pxa_set_ac97_info(NULL); | 506 | pxa_set_ac97_info(NULL); |
| 421 | pxa_set_ficp_info(&palmtx_ficp_platform_data); | 507 | pxa_set_ficp_info(&palmtx_ficp_platform_data); |
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index f601425f1b1e..3ea01e0eac63 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c | |||
| @@ -55,6 +55,10 @@ static unsigned long pcm990_pin_config[] __initdata = { | |||
| 55 | GPIO89_USBH1_PEN, | 55 | GPIO89_USBH1_PEN, |
| 56 | /* PWM0 */ | 56 | /* PWM0 */ |
| 57 | GPIO16_PWM0_OUT, | 57 | GPIO16_PWM0_OUT, |
| 58 | |||
| 59 | /* I2C */ | ||
| 60 | GPIO117_I2C_SCL, | ||
| 61 | GPIO118_I2C_SDA, | ||
| 58 | }; | 62 | }; |
| 59 | 63 | ||
| 60 | /* | 64 | /* |
| @@ -385,6 +389,7 @@ static struct soc_camera_link iclink[] = { | |||
| 385 | .gpio = NR_BUILTIN_GPIO + 1, | 389 | .gpio = NR_BUILTIN_GPIO + 1, |
| 386 | }, { | 390 | }, { |
| 387 | .bus_id = 0, /* Must match with the camera ID above */ | 391 | .bus_id = 0, /* Must match with the camera ID above */ |
| 392 | .gpio = -ENXIO, | ||
| 388 | } | 393 | } |
| 389 | }; | 394 | }; |
| 390 | 395 | ||
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 2e3bd8b1523b..ae88855bf974 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/fb.h> | 20 | #include <linux/fb.h> |
| 21 | #include <linux/pm.h> | 21 | #include <linux/pm.h> |
| 22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 23 | #include <linux/mtd/physmap.h> | ||
| 23 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
| 24 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
| 25 | #include <linux/spi/ads7846.h> | 26 | #include <linux/spi/ads7846.h> |
| @@ -413,9 +414,40 @@ static struct pxafb_mach_info poodle_fb_info = { | |||
| 413 | .lcd_conn = LCD_COLOR_TFT_16BPP, | 414 | .lcd_conn = LCD_COLOR_TFT_16BPP, |
| 414 | }; | 415 | }; |
| 415 | 416 | ||
| 417 | static struct mtd_partition sharpsl_rom_parts[] = { | ||
| 418 | { | ||
| 419 | .name ="Boot PROM Filesystem", | ||
| 420 | .offset = 0x00120000, | ||
| 421 | .size = MTDPART_SIZ_FULL, | ||
| 422 | }, | ||
| 423 | }; | ||
| 424 | |||
| 425 | static struct physmap_flash_data sharpsl_rom_data = { | ||
| 426 | .width = 2, | ||
| 427 | .nr_parts = ARRAY_SIZE(sharpsl_rom_parts), | ||
| 428 | .parts = sharpsl_rom_parts, | ||
| 429 | }; | ||
| 430 | |||
| 431 | static struct resource sharpsl_rom_resources[] = { | ||
| 432 | { | ||
| 433 | .start = 0x00000000, | ||
| 434 | .end = 0x007fffff, | ||
| 435 | .flags = IORESOURCE_MEM, | ||
| 436 | }, | ||
| 437 | }; | ||
| 438 | |||
| 439 | static struct platform_device sharpsl_rom_device = { | ||
| 440 | .name = "physmap-flash", | ||
| 441 | .id = -1, | ||
| 442 | .resource = sharpsl_rom_resources, | ||
| 443 | .num_resources = ARRAY_SIZE(sharpsl_rom_resources), | ||
| 444 | .dev.platform_data = &sharpsl_rom_data, | ||
| 445 | }; | ||
| 446 | |||
| 416 | static struct platform_device *devices[] __initdata = { | 447 | static struct platform_device *devices[] __initdata = { |
| 417 | &poodle_locomo_device, | 448 | &poodle_locomo_device, |
| 418 | &poodle_scoop_device, | 449 | &poodle_scoop_device, |
| 450 | &sharpsl_rom_device, | ||
| 419 | }; | 451 | }; |
| 420 | 452 | ||
| 421 | static void poodle_poweroff(void) | 453 | static void poodle_poweroff(void) |
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 344b3282caf9..6c57522e2469 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
| @@ -36,12 +36,6 @@ | |||
| 36 | #include "devices.h" | 36 | #include "devices.h" |
| 37 | #include "clock.h" | 37 | #include "clock.h" |
| 38 | 38 | ||
| 39 | int cpu_is_pxa26x(void) | ||
| 40 | { | ||
| 41 | return cpu_is_pxa250() && ((BOOT_DEF & 0x8) == 0); | ||
| 42 | } | ||
| 43 | EXPORT_SYMBOL_GPL(cpu_is_pxa26x); | ||
| 44 | |||
| 45 | /* | 39 | /* |
| 46 | * Various clock factors driven by the CCCR register. | 40 | * Various clock factors driven by the CCCR register. |
| 47 | */ | 41 | */ |
| @@ -319,13 +313,21 @@ void __init pxa25x_init_irq(void) | |||
| 319 | pxa_init_gpio(85, pxa25x_set_wake); | 313 | pxa_init_gpio(85, pxa25x_set_wake); |
| 320 | } | 314 | } |
| 321 | 315 | ||
| 316 | #ifdef CONFIG_CPU_PXA26x | ||
| 317 | void __init pxa26x_init_irq(void) | ||
| 318 | { | ||
| 319 | pxa_init_irq(32, pxa25x_set_wake); | ||
| 320 | pxa_init_gpio(90, pxa25x_set_wake); | ||
| 321 | } | ||
| 322 | #endif | ||
| 323 | |||
| 322 | static struct platform_device *pxa25x_devices[] __initdata = { | 324 | static struct platform_device *pxa25x_devices[] __initdata = { |
| 323 | &pxa25x_device_udc, | 325 | &pxa25x_device_udc, |
| 324 | &pxa_device_ffuart, | 326 | &pxa_device_ffuart, |
| 325 | &pxa_device_btuart, | 327 | &pxa_device_btuart, |
| 326 | &pxa_device_stuart, | 328 | &pxa_device_stuart, |
| 327 | &pxa_device_i2s, | 329 | &pxa_device_i2s, |
| 328 | &pxa_device_rtc, | 330 | &sa1100_device_rtc, |
| 329 | &pxa25x_device_ssp, | 331 | &pxa25x_device_ssp, |
| 330 | &pxa25x_device_nssp, | 332 | &pxa25x_device_nssp, |
| 331 | &pxa25x_device_assp, | 333 | &pxa25x_device_assp, |
| @@ -371,7 +373,7 @@ static int __init pxa25x_init(void) | |||
| 371 | } | 373 | } |
| 372 | 374 | ||
| 373 | /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */ | 375 | /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */ |
| 374 | if (cpu_is_pxa255() || cpu_is_pxa26x()) { | 376 | if (cpu_is_pxa255()) { |
| 375 | clks_register(&pxa25x_hwuart_clkreg, 1); | 377 | clks_register(&pxa25x_hwuart_clkreg, 1); |
| 376 | ret = platform_device_register(&pxa_device_hwuart); | 378 | ret = platform_device_register(&pxa_device_hwuart); |
| 377 | } | 379 | } |
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 15c8e5b9f9bc..411bec54fdc4 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
| @@ -332,38 +332,18 @@ static int pxa27x_set_wake(unsigned int irq, unsigned int on) | |||
| 332 | void __init pxa27x_init_irq(void) | 332 | void __init pxa27x_init_irq(void) |
| 333 | { | 333 | { |
| 334 | pxa_init_irq(34, pxa27x_set_wake); | 334 | pxa_init_irq(34, pxa27x_set_wake); |
| 335 | pxa_init_gpio(128, pxa27x_set_wake); | 335 | pxa_init_gpio(121, pxa27x_set_wake); |
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | /* | 338 | /* |
| 339 | * device registration specific to PXA27x. | 339 | * device registration specific to PXA27x. |
| 340 | */ | 340 | */ |
| 341 | |||
| 342 | static struct resource i2c_power_resources[] = { | ||
| 343 | { | ||
| 344 | .start = 0x40f00180, | ||
| 345 | .end = 0x40f001a3, | ||
| 346 | .flags = IORESOURCE_MEM, | ||
| 347 | }, { | ||
| 348 | .start = IRQ_PWRI2C, | ||
| 349 | .end = IRQ_PWRI2C, | ||
| 350 | .flags = IORESOURCE_IRQ, | ||
| 351 | }, | ||
| 352 | }; | ||
| 353 | |||
| 354 | struct platform_device pxa27x_device_i2c_power = { | ||
| 355 | .name = "pxa2xx-i2c", | ||
| 356 | .id = 1, | ||
| 357 | .resource = i2c_power_resources, | ||
| 358 | .num_resources = ARRAY_SIZE(i2c_power_resources), | ||
| 359 | }; | ||
| 360 | |||
| 361 | void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info) | 341 | void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info) |
| 362 | { | 342 | { |
| 363 | local_irq_disable(); | 343 | local_irq_disable(); |
| 364 | PCFR |= PCFR_PI2CEN; | 344 | PCFR |= PCFR_PI2CEN; |
| 365 | local_irq_enable(); | 345 | local_irq_enable(); |
| 366 | pxa27x_device_i2c_power.dev.platform_data = info; | 346 | pxa_register_device(&pxa27x_device_i2c_power, info); |
| 367 | } | 347 | } |
| 368 | 348 | ||
| 369 | static struct platform_device *devices[] __initdata = { | 349 | static struct platform_device *devices[] __initdata = { |
| @@ -372,8 +352,8 @@ static struct platform_device *devices[] __initdata = { | |||
| 372 | &pxa_device_btuart, | 352 | &pxa_device_btuart, |
| 373 | &pxa_device_stuart, | 353 | &pxa_device_stuart, |
| 374 | &pxa_device_i2s, | 354 | &pxa_device_i2s, |
| 355 | &sa1100_device_rtc, | ||
| 375 | &pxa_device_rtc, | 356 | &pxa_device_rtc, |
| 376 | &pxa27x_device_i2c_power, | ||
| 377 | &pxa27x_device_ssp1, | 357 | &pxa27x_device_ssp1, |
| 378 | &pxa27x_device_ssp2, | 358 | &pxa27x_device_ssp2, |
| 379 | &pxa27x_device_ssp3, | 359 | &pxa27x_device_ssp3, |
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index b7e53829d376..490893824e78 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <mach/pm.h> | 29 | #include <mach/pm.h> |
| 30 | #include <mach/dma.h> | 30 | #include <mach/dma.h> |
| 31 | #include <mach/ssp.h> | 31 | #include <mach/ssp.h> |
| 32 | #include <mach/i2c.h> | ||
| 32 | 33 | ||
| 33 | #include "generic.h" | 34 | #include "generic.h" |
| 34 | #include "devices.h" | 35 | #include "devices.h" |
| @@ -544,28 +545,9 @@ void __init pxa3xx_init_irq(void) | |||
| 544 | * device registration specific to PXA3xx. | 545 | * device registration specific to PXA3xx. |
| 545 | */ | 546 | */ |
| 546 | 547 | ||
| 547 | static struct resource i2c_power_resources[] = { | ||
| 548 | { | ||
| 549 | .start = 0x40f500c0, | ||
| 550 | .end = 0x40f500d3, | ||
| 551 | .flags = IORESOURCE_MEM, | ||
| 552 | }, { | ||
| 553 | .start = IRQ_PWRI2C, | ||
| 554 | .end = IRQ_PWRI2C, | ||
| 555 | .flags = IORESOURCE_IRQ, | ||
| 556 | }, | ||
| 557 | }; | ||
| 558 | |||
| 559 | struct platform_device pxa3xx_device_i2c_power = { | ||
| 560 | .name = "pxa2xx-i2c", | ||
| 561 | .id = 1, | ||
| 562 | .resource = i2c_power_resources, | ||
| 563 | .num_resources = ARRAY_SIZE(i2c_power_resources), | ||
| 564 | }; | ||
| 565 | |||
| 566 | void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info) | 548 | void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info) |
| 567 | { | 549 | { |
| 568 | pxa3xx_device_i2c_power.dev.platform_data = info; | 550 | pxa_register_device(&pxa3xx_device_i2c_power, info); |
| 569 | } | 551 | } |
| 570 | 552 | ||
| 571 | static struct platform_device *devices[] __initdata = { | 553 | static struct platform_device *devices[] __initdata = { |
| @@ -574,6 +556,7 @@ static struct platform_device *devices[] __initdata = { | |||
| 574 | &pxa_device_btuart, | 556 | &pxa_device_btuart, |
| 575 | &pxa_device_stuart, | 557 | &pxa_device_stuart, |
| 576 | &pxa_device_i2s, | 558 | &pxa_device_i2s, |
| 559 | &sa1100_device_rtc, | ||
| 577 | &pxa_device_rtc, | 560 | &pxa_device_rtc, |
| 578 | &pxa27x_device_ssp1, | 561 | &pxa27x_device_ssp1, |
| 579 | &pxa27x_device_ssp2, | 562 | &pxa27x_device_ssp2, |
| @@ -581,7 +564,6 @@ static struct platform_device *devices[] __initdata = { | |||
| 581 | &pxa3xx_device_ssp4, | 564 | &pxa3xx_device_ssp4, |
| 582 | &pxa27x_device_pwm0, | 565 | &pxa27x_device_pwm0, |
| 583 | &pxa27x_device_pwm1, | 566 | &pxa27x_device_pwm1, |
| 584 | &pxa3xx_device_i2c_power, | ||
| 585 | }; | 567 | }; |
| 586 | 568 | ||
| 587 | static struct sys_device pxa3xx_sysdev[] = { | 569 | static struct sys_device pxa3xx_sysdev[] = { |
diff --git a/arch/arm/mach-pxa/smemc.c b/arch/arm/mach-pxa/smemc.c index ad346addc028..d6f6904132a6 100644 --- a/arch/arm/mach-pxa/smemc.c +++ b/arch/arm/mach-pxa/smemc.c | |||
| @@ -8,6 +8,8 @@ | |||
| 8 | #include <linux/io.h> | 8 | #include <linux/io.h> |
| 9 | #include <linux/sysdev.h> | 9 | #include <linux/sysdev.h> |
| 10 | 10 | ||
| 11 | #include <mach/hardware.h> | ||
| 12 | |||
| 11 | #define SMEMC_PHYS_BASE (0x4A000000) | 13 | #define SMEMC_PHYS_BASE (0x4A000000) |
| 12 | #define SMEMC_PHYS_SIZE (0x90) | 14 | #define SMEMC_PHYS_SIZE (0x90) |
| 13 | 15 | ||
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 3be76ee2bdbf..7299d87a1cb3 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
| 23 | #include <linux/leds.h> | 23 | #include <linux/leds.h> |
| 24 | #include <linux/mmc/host.h> | 24 | #include <linux/mmc/host.h> |
| 25 | #include <linux/mtd/physmap.h> | ||
| 25 | #include <linux/pm.h> | 26 | #include <linux/pm.h> |
| 26 | #include <linux/backlight.h> | 27 | #include <linux/backlight.h> |
| 27 | #include <linux/io.h> | 28 | #include <linux/io.h> |
| @@ -122,6 +123,10 @@ static unsigned long spitz_pin_config[] __initdata = { | |||
| 122 | GPIO105_GPIO, /* SPITZ_GPIO_CF_IRQ */ | 123 | GPIO105_GPIO, /* SPITZ_GPIO_CF_IRQ */ |
| 123 | GPIO106_GPIO, /* SPITZ_GPIO_CF2_IRQ */ | 124 | GPIO106_GPIO, /* SPITZ_GPIO_CF2_IRQ */ |
| 124 | 125 | ||
| 126 | /* I2C */ | ||
| 127 | GPIO117_I2C_SCL, | ||
| 128 | GPIO118_I2C_SDA, | ||
| 129 | |||
| 125 | GPIO1_GPIO | WAKEUP_ON_EDGE_RISE, | 130 | GPIO1_GPIO | WAKEUP_ON_EDGE_RISE, |
| 126 | }; | 131 | }; |
| 127 | 132 | ||
| @@ -609,10 +614,41 @@ static struct pxafb_mach_info spitz_pxafb_info = { | |||
| 609 | }; | 614 | }; |
| 610 | 615 | ||
| 611 | 616 | ||
| 617 | static struct mtd_partition sharpsl_rom_parts[] = { | ||
| 618 | { | ||
| 619 | .name ="Boot PROM Filesystem", | ||
| 620 | .offset = 0x00140000, | ||
| 621 | .size = MTDPART_SIZ_FULL, | ||
| 622 | }, | ||
| 623 | }; | ||
| 624 | |||
| 625 | static struct physmap_flash_data sharpsl_rom_data = { | ||
| 626 | .width = 2, | ||
| 627 | .nr_parts = ARRAY_SIZE(sharpsl_rom_parts), | ||
| 628 | .parts = sharpsl_rom_parts, | ||
| 629 | }; | ||
| 630 | |||
| 631 | static struct resource sharpsl_rom_resources[] = { | ||
| 632 | { | ||
| 633 | .start = 0x00000000, | ||
| 634 | .end = 0x007fffff, | ||
| 635 | .flags = IORESOURCE_MEM, | ||
| 636 | }, | ||
| 637 | }; | ||
| 638 | |||
| 639 | static struct platform_device sharpsl_rom_device = { | ||
| 640 | .name = "physmap-flash", | ||
| 641 | .id = -1, | ||
| 642 | .resource = sharpsl_rom_resources, | ||
| 643 | .num_resources = ARRAY_SIZE(sharpsl_rom_resources), | ||
| 644 | .dev.platform_data = &sharpsl_rom_data, | ||
| 645 | }; | ||
| 646 | |||
| 612 | static struct platform_device *devices[] __initdata = { | 647 | static struct platform_device *devices[] __initdata = { |
| 613 | &spitzscoop_device, | 648 | &spitzscoop_device, |
| 614 | &spitzkbd_device, | 649 | &spitzkbd_device, |
| 615 | &spitzled_device, | 650 | &spitzled_device, |
| 651 | &sharpsl_rom_device, | ||
| 616 | }; | 652 | }; |
| 617 | 653 | ||
| 618 | static void spitz_poweroff(void) | 654 | static void spitz_poweroff(void) |
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index f8a9a62959e5..ef4ddf9d5040 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c | |||
| @@ -22,6 +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/pxa-regs.h> | 26 | #include <mach/pxa-regs.h> |
| 26 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
| 27 | 28 | ||
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 224897a67d15..3332e5d0356c 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/mfd/tmio.h> | 25 | #include <linux/mfd/tmio.h> |
| 26 | #include <linux/mtd/nand.h> | 26 | #include <linux/mtd/nand.h> |
| 27 | #include <linux/mtd/partitions.h> | 27 | #include <linux/mtd/partitions.h> |
| 28 | #include <linux/mtd/physmap.h> | ||
| 28 | #include <linux/pm.h> | 29 | #include <linux/pm.h> |
| 29 | #include <linux/gpio_keys.h> | 30 | #include <linux/gpio_keys.h> |
| 30 | #include <linux/input.h> | 31 | #include <linux/input.h> |
| @@ -733,6 +734,45 @@ static void tosa_tc6393xb_teardown(struct platform_device *dev) | |||
| 733 | gpio_free(TOSA_GPIO_CARD_VCC_ON); | 734 | gpio_free(TOSA_GPIO_CARD_VCC_ON); |
| 734 | } | 735 | } |
| 735 | 736 | ||
| 737 | #ifdef CONFIG_MFD_TC6393XB | ||
| 738 | static struct fb_videomode tosa_tc6393xb_lcd_mode[] = { | ||
| 739 | { | ||
| 740 | .xres = 480, | ||
| 741 | .yres = 640, | ||
| 742 | .pixclock = 0x002cdf00,/* PLL divisor */ | ||
| 743 | .left_margin = 0x004c, | ||
| 744 | .right_margin = 0x005b, | ||
| 745 | .upper_margin = 0x0001, | ||
| 746 | .lower_margin = 0x000d, | ||
| 747 | .hsync_len = 0x0002, | ||
| 748 | .vsync_len = 0x0001, | ||
| 749 | .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, | ||
| 750 | .vmode = FB_VMODE_NONINTERLACED, | ||
| 751 | },{ | ||
| 752 | .xres = 240, | ||
| 753 | .yres = 320, | ||
| 754 | .pixclock = 0x00e7f203,/* PLL divisor */ | ||
| 755 | .left_margin = 0x0024, | ||
| 756 | .right_margin = 0x002f, | ||
| 757 | .upper_margin = 0x0001, | ||
| 758 | .lower_margin = 0x000d, | ||
| 759 | .hsync_len = 0x0002, | ||
| 760 | .vsync_len = 0x0001, | ||
| 761 | .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, | ||
| 762 | .vmode = FB_VMODE_NONINTERLACED, | ||
| 763 | } | ||
| 764 | }; | ||
| 765 | |||
| 766 | static struct tmio_fb_data tosa_tc6393xb_fb_config = { | ||
| 767 | .lcd_set_power = tc6393xb_lcd_set_power, | ||
| 768 | .lcd_mode = tc6393xb_lcd_mode, | ||
| 769 | .num_modes = ARRAY_SIZE(tosa_tc6393xb_lcd_mode), | ||
| 770 | .modes = &tosa_tc6393xb_lcd_mode[0], | ||
| 771 | .height = 82, | ||
| 772 | .width = 60, | ||
| 773 | }; | ||
| 774 | #endif | ||
| 775 | |||
| 736 | static struct tc6393xb_platform_data tosa_tc6393xb_data = { | 776 | static struct tc6393xb_platform_data tosa_tc6393xb_data = { |
| 737 | .scr_pll2cr = 0x0cc1, | 777 | .scr_pll2cr = 0x0cc1, |
| 738 | .scr_gper = 0x3300, | 778 | .scr_gper = 0x3300, |
| @@ -748,6 +788,9 @@ static struct tc6393xb_platform_data tosa_tc6393xb_data = { | |||
| 748 | .resume = tosa_tc6393xb_resume, | 788 | .resume = tosa_tc6393xb_resume, |
| 749 | 789 | ||
| 750 | .nand_data = &tosa_tc6393xb_nand_config, | 790 | .nand_data = &tosa_tc6393xb_nand_config, |
| 791 | #ifdef CONFIG_MFD_TC6393XB | ||
| 792 | .fb_data = &tosa_tc6393xb_fb_config, | ||
| 793 | #endif | ||
| 751 | 794 | ||
| 752 | .resume_restore = 1, | 795 | .resume_restore = 1, |
| 753 | }; | 796 | }; |
| @@ -789,6 +832,36 @@ static struct spi_board_info spi_board_info[] __initdata = { | |||
| 789 | }, | 832 | }, |
| 790 | }; | 833 | }; |
| 791 | 834 | ||
| 835 | static struct mtd_partition sharpsl_rom_parts[] = { | ||
| 836 | { | ||
| 837 | .name ="Boot PROM Filesystem", | ||
| 838 | .offset = 0x00160000, | ||
| 839 | .size = MTDPART_SIZ_FULL, | ||
| 840 | }, | ||
| 841 | }; | ||
| 842 | |||
| 843 | static struct physmap_flash_data sharpsl_rom_data = { | ||
| 844 | .width = 2, | ||
| 845 | .nr_parts = ARRAY_SIZE(sharpsl_rom_parts), | ||
| 846 | .parts = sharpsl_rom_parts, | ||
| 847 | }; | ||
| 848 | |||
| 849 | static struct resource sharpsl_rom_resources[] = { | ||
| 850 | { | ||
| 851 | .start = 0x00000000, | ||
| 852 | .end = 0x007fffff, | ||
| 853 | .flags = IORESOURCE_MEM, | ||
| 854 | }, | ||
| 855 | }; | ||
| 856 | |||
| 857 | static struct platform_device sharpsl_rom_device = { | ||
| 858 | .name = "physmap-flash", | ||
| 859 | .id = -1, | ||
| 860 | .resource = sharpsl_rom_resources, | ||
| 861 | .num_resources = ARRAY_SIZE(sharpsl_rom_resources), | ||
| 862 | .dev.platform_data = &sharpsl_rom_data, | ||
| 863 | }; | ||
| 864 | |||
| 792 | static struct platform_device *devices[] __initdata = { | 865 | static struct platform_device *devices[] __initdata = { |
| 793 | &tosascoop_device, | 866 | &tosascoop_device, |
| 794 | &tosascoop_jc_device, | 867 | &tosascoop_jc_device, |
| @@ -798,6 +871,7 @@ static struct platform_device *devices[] __initdata = { | |||
| 798 | &tosa_gpio_keys_device, | 871 | &tosa_gpio_keys_device, |
| 799 | &tosaled_device, | 872 | &tosaled_device, |
| 800 | &tosa_bt_device, | 873 | &tosa_bt_device, |
| 874 | &sharpsl_rom_device, | ||
| 801 | }; | 875 | }; |
| 802 | 876 | ||
| 803 | static void tosa_poweroff(void) | 877 | static void tosa_poweroff(void) |
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index 813804433466..218d2001f1df 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/gpio.h> | ||
| 21 | #include <linux/pwm_backlight.h> | 22 | #include <linux/pwm_backlight.h> |
| 22 | #include <linux/smc91x.h> | 23 | #include <linux/smc91x.h> |
| 23 | 24 | ||
| @@ -25,7 +26,6 @@ | |||
| 25 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
| 26 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
| 27 | #include <mach/audio.h> | 28 | #include <mach/audio.h> |
| 28 | #include <mach/gpio.h> | ||
| 29 | #include <mach/pxafb.h> | 29 | #include <mach/pxafb.h> |
| 30 | #include <mach/zylonite.h> | 30 | #include <mach/zylonite.h> |
| 31 | #include <mach/mmc.h> | 31 | #include <mach/mmc.h> |
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index 0f244744daae..28e4e623780b 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c | |||
| @@ -16,8 +16,8 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/gpio.h> | ||
| 19 | 20 | ||
| 20 | #include <mach/gpio.h> | ||
| 21 | #include <mach/mfp-pxa320.h> | 21 | #include <mach/mfp-pxa320.h> |
| 22 | #include <mach/zylonite.h> | 22 | #include <mach/zylonite.h> |
| 23 | 23 | ||
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig index 5ccde7cf39e8..ad911854eb4c 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig | |||
| @@ -7,9 +7,17 @@ config MACH_REALVIEW_EB | |||
| 7 | help | 7 | help |
| 8 | Include support for the ARM(R) RealView Emulation Baseboard platform. | 8 | Include support for the ARM(R) RealView Emulation Baseboard platform. |
| 9 | 9 | ||
| 10 | config REALVIEW_EB_A9MP | ||
| 11 | bool "Support Multicore Cortex-A9" | ||
| 12 | depends on MACH_REALVIEW_EB | ||
| 13 | select CPU_V7 | ||
| 14 | help | ||
| 15 | Enable support for the Cortex-A9MPCore tile on the Realview platform. | ||
| 16 | |||
| 10 | config REALVIEW_EB_ARM11MP | 17 | config REALVIEW_EB_ARM11MP |
| 11 | bool "Support ARM11MPCore tile" | 18 | bool "Support ARM11MPCore tile" |
| 12 | depends on MACH_REALVIEW_EB | 19 | depends on MACH_REALVIEW_EB |
| 20 | select CPU_V6 | ||
| 13 | help | 21 | help |
| 14 | Enable support for the ARM11MPCore tile on the Realview platform. | 22 | Enable support for the ARM11MPCore tile on the Realview platform. |
| 15 | 23 | ||
| @@ -25,6 +33,7 @@ config REALVIEW_EB_ARM11MP_REVB | |||
| 25 | 33 | ||
| 26 | config MACH_REALVIEW_PB11MP | 34 | config MACH_REALVIEW_PB11MP |
| 27 | bool "Support RealView/PB11MPCore platform" | 35 | bool "Support RealView/PB11MPCore platform" |
| 36 | select CPU_V6 | ||
| 28 | select ARM_GIC | 37 | select ARM_GIC |
| 29 | help | 38 | help |
| 30 | Include support for the ARM(R) RealView MPCore Platform Baseboard. | 39 | Include support for the ARM(R) RealView MPCore Platform Baseboard. |
| @@ -33,8 +42,29 @@ config MACH_REALVIEW_PB11MP | |||
| 33 | 42 | ||
| 34 | config MACH_REALVIEW_PB1176 | 43 | config MACH_REALVIEW_PB1176 |
| 35 | bool "Support RealView/PB1176 platform" | 44 | bool "Support RealView/PB1176 platform" |
| 45 | select CPU_V6 | ||
| 36 | select ARM_GIC | 46 | select ARM_GIC |
| 37 | help | 47 | help |
| 38 | Include support for the ARM(R) RealView ARM1176 Platform Baseboard. | 48 | Include support for the ARM(R) RealView ARM1176 Platform Baseboard. |
| 39 | 49 | ||
| 50 | config MACH_REALVIEW_PBA8 | ||
| 51 | bool "Support RealView/PB-A8 platform" | ||
| 52 | select CPU_V7 | ||
| 53 | select ARM_GIC | ||
| 54 | help | ||
| 55 | 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 | ||
| 57 | PCI-E and Compact Flash. | ||
| 58 | |||
| 59 | config REALVIEW_HIGH_PHYS_OFFSET | ||
| 60 | bool "High physical base address for the RealView platform" | ||
| 61 | depends on !MACH_REALVIEW_PB1176 | ||
| 62 | default y | ||
| 63 | help | ||
| 64 | RealView boards other than PB1176 have the RAM available at | ||
| 65 | 0x70000000, 256MB of which being mirrored at 0x00000000. If | ||
| 66 | the board supports 512MB of RAM, this option allows the | ||
| 67 | memory to be accessed contiguously at the high physical | ||
| 68 | offset. | ||
| 69 | |||
| 40 | endmenu | 70 | endmenu |
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile index d2ae077431dd..7bea8ffc4b59 100644 --- a/arch/arm/mach-realview/Makefile +++ b/arch/arm/mach-realview/Makefile | |||
| @@ -6,5 +6,6 @@ obj-y := core.o clock.o | |||
| 6 | obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o | 6 | obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o |
| 7 | obj-$(CONFIG_MACH_REALVIEW_PB11MP) += realview_pb11mp.o | 7 | obj-$(CONFIG_MACH_REALVIEW_PB11MP) += realview_pb11mp.o |
| 8 | obj-$(CONFIG_MACH_REALVIEW_PB1176) += realview_pb1176.o | 8 | obj-$(CONFIG_MACH_REALVIEW_PB1176) += realview_pb1176.o |
| 9 | obj-$(CONFIG_MACH_REALVIEW_PBA8) += realview_pba8.o | ||
| 9 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o localtimer.o | 10 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o localtimer.o |
| 10 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o | 11 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o |
diff --git a/arch/arm/mach-realview/Makefile.boot b/arch/arm/mach-realview/Makefile.boot index c7e75acfe6c9..d97e003d3df4 100644 --- a/arch/arm/mach-realview/Makefile.boot +++ b/arch/arm/mach-realview/Makefile.boot | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | ifeq ($(CONFIG_REALVIEW_HIGH_PHYS_OFFSET),y) | ||
| 2 | zreladdr-y := 0x70008000 | ||
| 3 | params_phys-y := 0x70000100 | ||
| 4 | initrd_phys-y := 0x70800000 | ||
| 5 | else | ||
| 1 | zreladdr-y := 0x00008000 | 6 | zreladdr-y := 0x00008000 |
| 2 | params_phys-y := 0x00000100 | 7 | params_phys-y := 0x00000100 |
| 3 | initrd_phys-y := 0x00800000 | 8 | initrd_phys-y := 0x00800000 |
| 4 | 9 | endif | |
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index 2491374818e9..5f1d55963ced 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
| @@ -28,12 +28,14 @@ | |||
| 28 | #include <linux/clocksource.h> | 28 | #include <linux/clocksource.h> |
| 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 | 32 | ||
| 32 | #include <asm/clkdev.h> | 33 | #include <asm/clkdev.h> |
| 33 | #include <asm/system.h> | 34 | #include <asm/system.h> |
| 34 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
| 35 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
| 36 | #include <asm/leds.h> | 37 | #include <asm/leds.h> |
| 38 | #include <asm/mach-types.h> | ||
| 37 | #include <asm/hardware/arm_timer.h> | 39 | #include <asm/hardware/arm_timer.h> |
| 38 | #include <asm/hardware/icst307.h> | 40 | #include <asm/hardware/icst307.h> |
| 39 | 41 | ||
| @@ -50,7 +52,7 @@ | |||
| 50 | 52 | ||
| 51 | #define REALVIEW_REFCOUNTER (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_24MHz_OFFSET) | 53 | #define REALVIEW_REFCOUNTER (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_24MHz_OFFSET) |
| 52 | 54 | ||
| 53 | /* used by entry-macro.S */ | 55 | /* used by entry-macro.S and platsmp.c */ |
| 54 | void __iomem *gic_cpu_base_addr; | 56 | void __iomem *gic_cpu_base_addr; |
| 55 | 57 | ||
| 56 | /* | 58 | /* |
| @@ -125,6 +127,29 @@ int realview_flash_register(struct resource *res, u32 num) | |||
| 125 | return platform_device_register(&realview_flash_device); | 127 | return platform_device_register(&realview_flash_device); |
| 126 | } | 128 | } |
| 127 | 129 | ||
| 130 | static struct smc911x_platdata realview_smc911x_platdata = { | ||
| 131 | .flags = SMC911X_USE_32BIT, | ||
| 132 | .irq_flags = IRQF_SHARED, | ||
| 133 | .irq_polarity = 1, | ||
| 134 | }; | ||
| 135 | |||
| 136 | static struct platform_device realview_eth_device = { | ||
| 137 | .name = "smc911x", | ||
| 138 | .id = 0, | ||
| 139 | .num_resources = 2, | ||
| 140 | }; | ||
| 141 | |||
| 142 | int realview_eth_register(const char *name, struct resource *res) | ||
| 143 | { | ||
| 144 | if (name) | ||
| 145 | realview_eth_device.name = name; | ||
| 146 | realview_eth_device.resource = res; | ||
| 147 | if (strcmp(realview_eth_device.name, "smc911x") == 0) | ||
| 148 | realview_eth_device.dev.platform_data = &realview_smc911x_platdata; | ||
| 149 | |||
| 150 | return platform_device_register(&realview_eth_device); | ||
| 151 | } | ||
| 152 | |||
| 128 | static struct resource realview_i2c_resource = { | 153 | static struct resource realview_i2c_resource = { |
| 129 | .start = REALVIEW_I2C_BASE, | 154 | .start = REALVIEW_I2C_BASE, |
| 130 | .end = REALVIEW_I2C_BASE + SZ_4K - 1, | 155 | .end = REALVIEW_I2C_BASE + SZ_4K - 1, |
| @@ -178,9 +203,14 @@ static const struct icst307_params realview_oscvco_params = { | |||
| 178 | static void realview_oscvco_set(struct clk *clk, struct icst307_vco vco) | 203 | static void realview_oscvco_set(struct clk *clk, struct icst307_vco vco) |
| 179 | { | 204 | { |
| 180 | void __iomem *sys_lock = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LOCK_OFFSET; | 205 | void __iomem *sys_lock = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LOCK_OFFSET; |
| 181 | void __iomem *sys_osc = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_OSC4_OFFSET; | 206 | void __iomem *sys_osc; |
| 182 | u32 val; | 207 | u32 val; |
| 183 | 208 | ||
| 209 | if (machine_is_realview_pb1176()) | ||
| 210 | sys_osc = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_OSC0_OFFSET; | ||
| 211 | else | ||
| 212 | sys_osc = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_OSC4_OFFSET; | ||
| 213 | |||
| 184 | val = readl(sys_osc) & ~0x7ffff; | 214 | val = readl(sys_osc) & ~0x7ffff; |
| 185 | val |= vco.v | (vco.r << 9) | (vco.s << 16); | 215 | val |= vco.v | (vco.r << 9) | (vco.s << 16); |
| 186 | 216 | ||
| @@ -274,7 +304,30 @@ static struct clcd_panel vga = { | |||
| 274 | .width = -1, | 304 | .width = -1, |
| 275 | .height = -1, | 305 | .height = -1, |
| 276 | .tim2 = TIM2_BCD | TIM2_IPC, | 306 | .tim2 = TIM2_BCD | TIM2_IPC, |
| 277 | .cntl = CNTL_LCDTFT | CNTL_LCDVCOMP(1), | 307 | .cntl = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1), |
| 308 | .bpp = 16, | ||
| 309 | }; | ||
| 310 | |||
| 311 | static struct clcd_panel xvga = { | ||
| 312 | .mode = { | ||
| 313 | .name = "XVGA", | ||
| 314 | .refresh = 60, | ||
| 315 | .xres = 1024, | ||
| 316 | .yres = 768, | ||
| 317 | .pixclock = 15748, | ||
| 318 | .left_margin = 152, | ||
| 319 | .right_margin = 48, | ||
| 320 | .upper_margin = 23, | ||
| 321 | .lower_margin = 3, | ||
| 322 | .hsync_len = 104, | ||
| 323 | .vsync_len = 4, | ||
| 324 | .sync = 0, | ||
| 325 | .vmode = FB_VMODE_NONINTERLACED, | ||
| 326 | }, | ||
| 327 | .width = -1, | ||
| 328 | .height = -1, | ||
| 329 | .tim2 = TIM2_BCD | TIM2_IPC, | ||
| 330 | .cntl = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1), | ||
| 278 | .bpp = 16, | 331 | .bpp = 16, |
| 279 | }; | 332 | }; |
| 280 | 333 | ||
| @@ -297,7 +350,7 @@ static struct clcd_panel sanyo_3_8_in = { | |||
| 297 | .width = -1, | 350 | .width = -1, |
| 298 | .height = -1, | 351 | .height = -1, |
| 299 | .tim2 = TIM2_BCD, | 352 | .tim2 = TIM2_BCD, |
| 300 | .cntl = CNTL_LCDTFT | CNTL_LCDVCOMP(1), | 353 | .cntl = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1), |
| 301 | .bpp = 16, | 354 | .bpp = 16, |
| 302 | }; | 355 | }; |
| 303 | 356 | ||
| @@ -320,7 +373,7 @@ static struct clcd_panel sanyo_2_5_in = { | |||
| 320 | .width = -1, | 373 | .width = -1, |
| 321 | .height = -1, | 374 | .height = -1, |
| 322 | .tim2 = TIM2_IVS | TIM2_IHS | TIM2_IPC, | 375 | .tim2 = TIM2_IVS | TIM2_IHS | TIM2_IPC, |
| 323 | .cntl = CNTL_LCDTFT | CNTL_LCDVCOMP(1), | 376 | .cntl = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1), |
| 324 | .bpp = 16, | 377 | .bpp = 16, |
| 325 | }; | 378 | }; |
| 326 | 379 | ||
| @@ -343,7 +396,7 @@ static struct clcd_panel epson_2_2_in = { | |||
| 343 | .width = -1, | 396 | .width = -1, |
| 344 | .height = -1, | 397 | .height = -1, |
| 345 | .tim2 = TIM2_BCD | TIM2_IPC, | 398 | .tim2 = TIM2_BCD | TIM2_IPC, |
| 346 | .cntl = CNTL_LCDTFT | CNTL_LCDVCOMP(1), | 399 | .cntl = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1), |
| 347 | .bpp = 16, | 400 | .bpp = 16, |
| 348 | }; | 401 | }; |
| 349 | 402 | ||
| @@ -356,9 +409,15 @@ static struct clcd_panel epson_2_2_in = { | |||
| 356 | static struct clcd_panel *realview_clcd_panel(void) | 409 | static struct clcd_panel *realview_clcd_panel(void) |
| 357 | { | 410 | { |
| 358 | void __iomem *sys_clcd = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_CLCD_OFFSET; | 411 | void __iomem *sys_clcd = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_CLCD_OFFSET; |
| 359 | struct clcd_panel *panel = &vga; | 412 | struct clcd_panel *vga_panel; |
| 413 | struct clcd_panel *panel; | ||
| 360 | u32 val; | 414 | u32 val; |
| 361 | 415 | ||
| 416 | if (machine_is_realview_eb()) | ||
| 417 | vga_panel = &vga; | ||
| 418 | else | ||
| 419 | vga_panel = &xvga; | ||
| 420 | |||
| 362 | val = readl(sys_clcd) & SYS_CLCD_ID_MASK; | 421 | val = readl(sys_clcd) & SYS_CLCD_ID_MASK; |
| 363 | if (val == SYS_CLCD_ID_SANYO_3_8) | 422 | if (val == SYS_CLCD_ID_SANYO_3_8) |
| 364 | panel = &sanyo_3_8_in; | 423 | panel = &sanyo_3_8_in; |
| @@ -367,11 +426,11 @@ static struct clcd_panel *realview_clcd_panel(void) | |||
| 367 | else if (val == SYS_CLCD_ID_EPSON_2_2) | 426 | else if (val == SYS_CLCD_ID_EPSON_2_2) |
| 368 | panel = &epson_2_2_in; | 427 | panel = &epson_2_2_in; |
| 369 | else if (val == SYS_CLCD_ID_VGA) | 428 | else if (val == SYS_CLCD_ID_VGA) |
| 370 | panel = &vga; | 429 | panel = vga_panel; |
| 371 | else { | 430 | else { |
| 372 | printk(KERN_ERR "CLCD: unknown LCD panel ID 0x%08x, using VGA\n", | 431 | printk(KERN_ERR "CLCD: unknown LCD panel ID 0x%08x, using VGA\n", |
| 373 | val); | 432 | val); |
| 374 | panel = &vga; | 433 | panel = vga_panel; |
| 375 | } | 434 | } |
| 376 | 435 | ||
| 377 | return panel; | 436 | return panel; |
| @@ -406,12 +465,18 @@ static void realview_clcd_enable(struct clcd_fb *fb) | |||
| 406 | writel(val, sys_clcd); | 465 | writel(val, sys_clcd); |
| 407 | } | 466 | } |
| 408 | 467 | ||
| 409 | static unsigned long framesize = SZ_1M; | ||
| 410 | |||
| 411 | static int realview_clcd_setup(struct clcd_fb *fb) | 468 | static int realview_clcd_setup(struct clcd_fb *fb) |
| 412 | { | 469 | { |
| 470 | unsigned long framesize; | ||
| 413 | dma_addr_t dma; | 471 | dma_addr_t dma; |
| 414 | 472 | ||
| 473 | if (machine_is_realview_eb()) | ||
| 474 | /* VGA, 16bpp */ | ||
| 475 | framesize = 640 * 480 * 2; | ||
| 476 | else | ||
| 477 | /* XVGA, 16bpp */ | ||
| 478 | framesize = 1024 * 768 * 2; | ||
| 479 | |||
| 415 | fb->panel = realview_clcd_panel(); | 480 | fb->panel = realview_clcd_panel(); |
| 416 | 481 | ||
| 417 | fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev, framesize, | 482 | fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev, framesize, |
| @@ -636,7 +701,7 @@ void __init realview_timer_init(unsigned int timer_irq) | |||
| 636 | * The dummy clock device has to be registered before the main device | 701 | * The dummy clock device has to be registered before the main device |
| 637 | * so that the latter will broadcast the clock events | 702 | * so that the latter will broadcast the clock events |
| 638 | */ | 703 | */ |
| 639 | local_timer_setup(smp_processor_id()); | 704 | local_timer_setup(); |
| 640 | #endif | 705 | #endif |
| 641 | 706 | ||
| 642 | /* | 707 | /* |
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h index 614e8cb31713..63be2abdc19c 100644 --- a/arch/arm/mach-realview/core.h +++ b/arch/arm/mach-realview/core.h | |||
| @@ -51,8 +51,7 @@ extern struct mmc_platform_data realview_mmc1_plat_data; | |||
| 51 | extern struct clcd_board clcd_plat_data; | 51 | extern struct clcd_board clcd_plat_data; |
| 52 | extern void __iomem *gic_cpu_base_addr; | 52 | extern void __iomem *gic_cpu_base_addr; |
| 53 | #ifdef CONFIG_LOCAL_TIMERS | 53 | #ifdef CONFIG_LOCAL_TIMERS |
| 54 | extern void __iomem *twd_base_addr; | 54 | extern void __iomem *twd_base; |
| 55 | extern unsigned int twd_size; | ||
| 56 | #endif | 55 | #endif |
| 57 | extern void __iomem *timer0_va_base; | 56 | extern void __iomem *timer0_va_base; |
| 58 | extern void __iomem *timer1_va_base; | 57 | extern void __iomem *timer1_va_base; |
| @@ -62,5 +61,6 @@ extern void __iomem *timer3_va_base; | |||
| 62 | extern void realview_leds_event(led_event_t ledevt); | 61 | extern void realview_leds_event(led_event_t ledevt); |
| 63 | extern void realview_timer_init(unsigned int timer_irq); | 62 | extern void realview_timer_init(unsigned int timer_irq); |
| 64 | extern int realview_flash_register(struct resource *res, u32 num); | 63 | extern int realview_flash_register(struct resource *res, u32 num); |
| 64 | extern int realview_eth_register(const char *name, struct resource *res); | ||
| 65 | 65 | ||
| 66 | #endif | 66 | #endif |
diff --git a/arch/arm/mach-realview/hotplug.c b/arch/arm/mach-realview/hotplug.c index 09748cbcd10e..be048e3e8799 100644 --- a/arch/arm/mach-realview/hotplug.c +++ b/arch/arm/mach-realview/hotplug.c | |||
| @@ -13,6 +13,8 @@ | |||
| 13 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
| 14 | #include <linux/completion.h> | 14 | #include <linux/completion.h> |
| 15 | 15 | ||
| 16 | #include <asm/cacheflush.h> | ||
| 17 | |||
| 16 | extern volatile int pen_release; | 18 | extern volatile int pen_release; |
| 17 | 19 | ||
| 18 | static DECLARE_COMPLETION(cpu_killed); | 20 | static DECLARE_COMPLETION(cpu_killed); |
| @@ -21,7 +23,8 @@ static inline void cpu_enter_lowpower(void) | |||
| 21 | { | 23 | { |
| 22 | unsigned int v; | 24 | unsigned int v; |
| 23 | 25 | ||
| 24 | asm volatile( "mcr p15, 0, %1, c7, c14, 0\n" | 26 | flush_cache_all(); |
| 27 | asm volatile( | ||
| 25 | " mcr p15, 0, %1, c7, c5, 0\n" | 28 | " mcr p15, 0, %1, c7, c5, 0\n" |
| 26 | " mcr p15, 0, %1, c7, c10, 4\n" | 29 | " mcr p15, 0, %1, c7, c10, 4\n" |
| 27 | /* | 30 | /* |
diff --git a/arch/arm/mach-realview/include/mach/board-eb.h b/arch/arm/mach-realview/include/mach/board-eb.h index 8d699fd324d0..268d7701fa9b 100644 --- a/arch/arm/mach-realview/include/mach/board-eb.h +++ b/arch/arm/mach-realview/include/mach/board-eb.h | |||
| @@ -49,16 +49,14 @@ | |||
| 49 | #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB | 49 | #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB |
| 50 | #define REALVIEW_EB11MP_SCU_BASE 0x10100000 /* SCU registers */ | 50 | #define REALVIEW_EB11MP_SCU_BASE 0x10100000 /* SCU registers */ |
| 51 | #define REALVIEW_EB11MP_GIC_CPU_BASE 0x10100100 /* Generic interrupt controller CPU interface */ | 51 | #define REALVIEW_EB11MP_GIC_CPU_BASE 0x10100100 /* Generic interrupt controller CPU interface */ |
| 52 | #define REALVIEW_EB11MP_TWD_BASE 0x10100700 | 52 | #define REALVIEW_EB11MP_TWD_BASE 0x10100600 |
| 53 | #define REALVIEW_EB11MP_TWD_SIZE 0x00000100 | ||
| 54 | #define REALVIEW_EB11MP_GIC_DIST_BASE 0x10101000 /* Generic interrupt controller distributor */ | 53 | #define REALVIEW_EB11MP_GIC_DIST_BASE 0x10101000 /* Generic interrupt controller distributor */ |
| 55 | #define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */ | 54 | #define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */ |
| 56 | #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */ | 55 | #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */ |
| 57 | #else | 56 | #else |
| 58 | #define REALVIEW_EB11MP_SCU_BASE 0x1F000000 /* SCU registers */ | 57 | #define REALVIEW_EB11MP_SCU_BASE 0x1F000000 /* SCU registers */ |
| 59 | #define REALVIEW_EB11MP_GIC_CPU_BASE 0x1F000100 /* Generic interrupt controller CPU interface */ | 58 | #define REALVIEW_EB11MP_GIC_CPU_BASE 0x1F000100 /* Generic interrupt controller CPU interface */ |
| 60 | #define REALVIEW_EB11MP_TWD_BASE 0x1F000700 | 59 | #define REALVIEW_EB11MP_TWD_BASE 0x1F000600 |
| 61 | #define REALVIEW_EB11MP_TWD_SIZE 0x00000100 | ||
| 62 | #define REALVIEW_EB11MP_GIC_DIST_BASE 0x1F001000 /* Generic interrupt controller distributor */ | 60 | #define REALVIEW_EB11MP_GIC_DIST_BASE 0x1F001000 /* Generic interrupt controller distributor */ |
| 63 | #define REALVIEW_EB11MP_L220_BASE 0x1F002000 /* L220 registers */ | 61 | #define REALVIEW_EB11MP_L220_BASE 0x1F002000 /* L220 registers */ |
| 64 | #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0x74 /* Register offset for MPCore sysctl */ | 62 | #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0x74 /* Register offset for MPCore sysctl */ |
| @@ -163,7 +161,7 @@ | |||
| 163 | #define NR_IRQS NR_IRQS_EB | 161 | #define NR_IRQS NR_IRQS_EB |
| 164 | #endif | 162 | #endif |
| 165 | 163 | ||
| 166 | #if defined(CONFIG_REALVIEW_EB_ARM11MP) \ | 164 | #if defined(CONFIG_REALVIEW_EB_ARM11MP) || defined(CONFIG_REALVIEW_EB_A9MP) \ |
| 167 | && (!defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_EB11MP)) | 165 | && (!defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_EB11MP)) |
| 168 | #undef MAX_GIC_NR | 166 | #undef MAX_GIC_NR |
| 169 | #define MAX_GIC_NR NR_GIC_EB11MP | 167 | #define MAX_GIC_NR NR_GIC_EB11MP |
| @@ -177,6 +175,7 @@ | |||
| 177 | #define REALVIEW_EB_PROC_ARM9 0x02000000 | 175 | #define REALVIEW_EB_PROC_ARM9 0x02000000 |
| 178 | #define REALVIEW_EB_PROC_ARM11 0x04000000 | 176 | #define REALVIEW_EB_PROC_ARM11 0x04000000 |
| 179 | #define REALVIEW_EB_PROC_ARM11MP 0x06000000 | 177 | #define REALVIEW_EB_PROC_ARM11MP 0x06000000 |
| 178 | #define REALVIEW_EB_PROC_A9MP 0x0C000000 | ||
| 180 | 179 | ||
| 181 | #define check_eb_proc(proc_type) \ | 180 | #define check_eb_proc(proc_type) \ |
| 182 | ((readl(__io_address(REALVIEW_SYS_PROCID)) & REALVIEW_EB_PROC_MASK) \ | 181 | ((readl(__io_address(REALVIEW_SYS_PROCID)) & REALVIEW_EB_PROC_MASK) \ |
| @@ -188,4 +187,13 @@ | |||
| 188 | #define core_tile_eb11mp() 0 | 187 | #define core_tile_eb11mp() 0 |
| 189 | #endif | 188 | #endif |
| 190 | 189 | ||
| 190 | #ifdef CONFIG_REALVIEW_EB_A9MP | ||
| 191 | #define core_tile_a9mp() check_eb_proc(REALVIEW_EB_PROC_A9MP) | ||
| 192 | #else | ||
| 193 | #define core_tile_a9mp() 0 | ||
| 194 | #endif | ||
| 195 | |||
| 196 | #define machine_is_realview_eb_mp() \ | ||
| 197 | (machine_is_realview_eb() && (core_tile_eb11mp() || core_tile_a9mp())) | ||
| 198 | |||
| 191 | #endif /* __ASM_ARCH_BOARD_EB_H */ | 199 | #endif /* __ASM_ARCH_BOARD_EB_H */ |
diff --git a/arch/arm/mach-realview/include/mach/board-pb11mp.h b/arch/arm/mach-realview/include/mach/board-pb11mp.h index ecd80e58631e..53ea0e7a1267 100644 --- a/arch/arm/mach-realview/include/mach/board-pb11mp.h +++ b/arch/arm/mach-realview/include/mach/board-pb11mp.h | |||
| @@ -77,8 +77,7 @@ | |||
| 77 | */ | 77 | */ |
| 78 | #define REALVIEW_TC11MP_SCU_BASE 0x1F000000 /* IRQ, Test chip */ | 78 | #define REALVIEW_TC11MP_SCU_BASE 0x1F000000 /* IRQ, Test chip */ |
| 79 | #define REALVIEW_TC11MP_GIC_CPU_BASE 0x1F000100 /* Test chip interrupt controller CPU interface */ | 79 | #define REALVIEW_TC11MP_GIC_CPU_BASE 0x1F000100 /* Test chip interrupt controller CPU interface */ |
| 80 | #define REALVIEW_TC11MP_TWD_BASE 0x1F000700 | 80 | #define REALVIEW_TC11MP_TWD_BASE 0x1F000600 |
| 81 | #define REALVIEW_TC11MP_TWD_SIZE 0x00000100 | ||
| 82 | #define REALVIEW_TC11MP_GIC_DIST_BASE 0x1F001000 /* Test chip interrupt controller distributor */ | 81 | #define REALVIEW_TC11MP_GIC_DIST_BASE 0x1F001000 /* Test chip interrupt controller distributor */ |
| 83 | #define REALVIEW_TC11MP_L220_BASE 0x1F002000 /* L220 registers */ | 82 | #define REALVIEW_TC11MP_L220_BASE 0x1F002000 /* L220 registers */ |
| 84 | 83 | ||
diff --git a/arch/arm/mach-realview/include/mach/board-pba8.h b/arch/arm/mach-realview/include/mach/board-pba8.h new file mode 100644 index 000000000000..c8bed8f58bab --- /dev/null +++ b/arch/arm/mach-realview/include/mach/board-pba8.h | |||
| @@ -0,0 +1,152 @@ | |||
| 1 | /* | ||
| 2 | * include/asm-arm/arch-realview/board-pba8.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., 51 Franklin Street, Fifth Floor, Boston, | ||
| 18 | * MA 02110-1301, USA. | ||
| 19 | */ | ||
| 20 | |||
| 21 | #ifndef __ASM_ARCH_BOARD_PBA8_H | ||
| 22 | #define __ASM_ARCH_BOARD_PBA8_H | ||
| 23 | |||
| 24 | #include <mach/platform.h> | ||
| 25 | |||
| 26 | /* | ||
| 27 | * Peripheral addresses | ||
| 28 | */ | ||
| 29 | #define REALVIEW_PBA8_UART0_BASE 0x10009000 /* UART 0 */ | ||
| 30 | #define REALVIEW_PBA8_UART1_BASE 0x1000A000 /* UART 1 */ | ||
| 31 | #define REALVIEW_PBA8_UART2_BASE 0x1000B000 /* UART 2 */ | ||
| 32 | #define REALVIEW_PBA8_UART3_BASE 0x1000C000 /* UART 3 */ | ||
| 33 | #define REALVIEW_PBA8_SSP_BASE 0x1000D000 /* Synchronous Serial Port */ | ||
| 34 | #define REALVIEW_PBA8_WATCHDOG0_BASE 0x1000F000 /* Watchdog 0 */ | ||
| 35 | #define REALVIEW_PBA8_WATCHDOG_BASE 0x10010000 /* watchdog interface */ | ||
| 36 | #define REALVIEW_PBA8_TIMER0_1_BASE 0x10011000 /* Timer 0 and 1 */ | ||
| 37 | #define REALVIEW_PBA8_TIMER2_3_BASE 0x10012000 /* Timer 2 and 3 */ | ||
| 38 | #define REALVIEW_PBA8_GPIO0_BASE 0x10013000 /* GPIO port 0 */ | ||
| 39 | #define REALVIEW_PBA8_RTC_BASE 0x10017000 /* Real Time Clock */ | ||
| 40 | #define REALVIEW_PBA8_TIMER4_5_BASE 0x10018000 /* Timer 4/5 */ | ||
| 41 | #define REALVIEW_PBA8_TIMER6_7_BASE 0x10019000 /* Timer 6/7 */ | ||
| 42 | #define REALVIEW_PBA8_SCTL_BASE 0x1001A000 /* System Controller */ | ||
| 43 | #define REALVIEW_PBA8_CLCD_BASE 0x10020000 /* CLCD */ | ||
| 44 | #define REALVIEW_PBA8_ONB_SRAM_BASE 0x10060000 /* On-board SRAM */ | ||
| 45 | #define REALVIEW_PBA8_DMC_BASE 0x100E0000 /* DMC configuration */ | ||
| 46 | #define REALVIEW_PBA8_SMC_BASE 0x100E1000 /* SMC configuration */ | ||
| 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 */ | ||
| 51 | #define REALVIEW_PBA8_FLASH0_BASE 0x40000000 | ||
| 52 | #define REALVIEW_PBA8_FLASH0_SIZE SZ_64M | ||
| 53 | #define REALVIEW_PBA8_FLASH1_BASE 0x44000000 | ||
| 54 | #define REALVIEW_PBA8_FLASH1_SIZE SZ_64M | ||
| 55 | #define REALVIEW_PBA8_ETH_BASE 0x4E000000 /* Ethernet */ | ||
| 56 | #define REALVIEW_PBA8_USB_BASE 0x4F000000 /* USB */ | ||
| 57 | #define REALVIEW_PBA8_GIC_DIST_BASE 0x1E001000 /* Generic interrupt controller distributor */ | ||
| 58 | #define REALVIEW_PBA8_LT_BASE 0xC0000000 /* Logic Tile expansion */ | ||
| 59 | #define REALVIEW_PBA8_SDRAM6_BASE 0x70000000 /* SDRAM bank 6 256MB */ | ||
| 60 | #define REALVIEW_PBA8_SDRAM7_BASE 0x80000000 /* SDRAM bank 7 256MB */ | ||
| 61 | |||
| 62 | #define REALVIEW_PBA8_SYS_PLD_CTRL1 0x74 | ||
| 63 | |||
| 64 | /* | ||
| 65 | * PBA8 PCI regions | ||
| 66 | */ | ||
| 67 | #define REALVIEW_PBA8_PCI_BASE 0x90040000 /* PCI-X Unit base */ | ||
| 68 | #define REALVIEW_PBA8_PCI_IO_BASE 0x90050000 /* IO Region on AHB */ | ||
| 69 | #define REALVIEW_PBA8_PCI_MEM_BASE 0xA0000000 /* MEM Region on AHB */ | ||
| 70 | |||
| 71 | #define REALVIEW_PBA8_PCI_BASE_SIZE 0x10000 /* 16 Kb */ | ||
| 72 | #define REALVIEW_PBA8_PCI_IO_SIZE 0x1000 /* 4 Kb */ | ||
| 73 | #define REALVIEW_PBA8_PCI_MEM_SIZE 0x20000000 /* 512 MB */ | ||
| 74 | |||
| 75 | /* | ||
| 76 | * Irqs | ||
| 77 | */ | ||
| 78 | #define IRQ_PBA8_GIC_START 32 | ||
| 79 | |||
| 80 | /* L220 | ||
| 81 | #define IRQ_PBA8_L220_EVENT (IRQ_PBA8_GIC_START + 29) | ||
| 82 | #define IRQ_PBA8_L220_SLAVE (IRQ_PBA8_GIC_START + 30) | ||
| 83 | #define IRQ_PBA8_L220_DECODE (IRQ_PBA8_GIC_START + 31) | ||
| 84 | */ | ||
| 85 | |||
| 86 | /* | ||
| 87 | * PB-A8 on-board gic irq sources | ||
| 88 | */ | ||
| 89 | #define IRQ_PBA8_WATCHDOG (IRQ_PBA8_GIC_START + 0) /* Watchdog timer */ | ||
| 90 | #define IRQ_PBA8_SOFT (IRQ_PBA8_GIC_START + 1) /* Software interrupt */ | ||
| 91 | #define IRQ_PBA8_COMMRx (IRQ_PBA8_GIC_START + 2) /* Debug Comm Rx interrupt */ | ||
| 92 | #define IRQ_PBA8_COMMTx (IRQ_PBA8_GIC_START + 3) /* Debug Comm Tx interrupt */ | ||
| 93 | #define IRQ_PBA8_TIMER0_1 (IRQ_PBA8_GIC_START + 4) /* Timer 0/1 (default timer) */ | ||
| 94 | #define IRQ_PBA8_TIMER2_3 (IRQ_PBA8_GIC_START + 5) /* Timer 2/3 */ | ||
| 95 | #define IRQ_PBA8_GPIO0 (IRQ_PBA8_GIC_START + 6) /* GPIO 0 */ | ||
| 96 | #define IRQ_PBA8_GPIO1 (IRQ_PBA8_GIC_START + 7) /* GPIO 1 */ | ||
| 97 | #define IRQ_PBA8_GPIO2 (IRQ_PBA8_GIC_START + 8) /* GPIO 2 */ | ||
| 98 | /* 9 reserved */ | ||
| 99 | #define IRQ_PBA8_RTC (IRQ_PBA8_GIC_START + 10) /* Real Time Clock */ | ||
| 100 | #define IRQ_PBA8_SSP (IRQ_PBA8_GIC_START + 11) /* Synchronous Serial Port */ | ||
| 101 | #define IRQ_PBA8_UART0 (IRQ_PBA8_GIC_START + 12) /* UART 0 on development chip */ | ||
| 102 | #define IRQ_PBA8_UART1 (IRQ_PBA8_GIC_START + 13) /* UART 1 on development chip */ | ||
| 103 | #define IRQ_PBA8_UART2 (IRQ_PBA8_GIC_START + 14) /* UART 2 on development chip */ | ||
| 104 | #define IRQ_PBA8_UART3 (IRQ_PBA8_GIC_START + 15) /* UART 3 on development chip */ | ||
| 105 | #define IRQ_PBA8_SCI (IRQ_PBA8_GIC_START + 16) /* Smart Card Interface */ | ||
| 106 | #define IRQ_PBA8_MMCI0A (IRQ_PBA8_GIC_START + 17) /* Multimedia Card 0A */ | ||
| 107 | #define IRQ_PBA8_MMCI0B (IRQ_PBA8_GIC_START + 18) /* Multimedia Card 0B */ | ||
| 108 | #define IRQ_PBA8_AACI (IRQ_PBA8_GIC_START + 19) /* Audio Codec */ | ||
| 109 | #define IRQ_PBA8_KMI0 (IRQ_PBA8_GIC_START + 20) /* Keyboard/Mouse port 0 */ | ||
| 110 | #define IRQ_PBA8_KMI1 (IRQ_PBA8_GIC_START + 21) /* Keyboard/Mouse port 1 */ | ||
| 111 | #define IRQ_PBA8_CHARLCD (IRQ_PBA8_GIC_START + 22) /* Character LCD */ | ||
| 112 | #define IRQ_PBA8_CLCD (IRQ_PBA8_GIC_START + 23) /* CLCD controller */ | ||
| 113 | #define IRQ_PBA8_DMAC (IRQ_PBA8_GIC_START + 24) /* DMA controller */ | ||
| 114 | #define IRQ_PBA8_PWRFAIL (IRQ_PBA8_GIC_START + 25) /* Power failure */ | ||
| 115 | #define IRQ_PBA8_PISMO (IRQ_PBA8_GIC_START + 26) /* PISMO interface */ | ||
| 116 | #define IRQ_PBA8_DoC (IRQ_PBA8_GIC_START + 27) /* Disk on Chip memory controller */ | ||
| 117 | #define IRQ_PBA8_ETH (IRQ_PBA8_GIC_START + 28) /* Ethernet controller */ | ||
| 118 | #define IRQ_PBA8_USB (IRQ_PBA8_GIC_START + 29) /* USB controller */ | ||
| 119 | #define IRQ_PBA8_TSPEN (IRQ_PBA8_GIC_START + 30) /* Touchscreen pen */ | ||
| 120 | #define IRQ_PBA8_TSKPAD (IRQ_PBA8_GIC_START + 31) /* Touchscreen keypad */ | ||
| 121 | |||
| 122 | /* ... */ | ||
| 123 | #define IRQ_PBA8_PCI0 (IRQ_PBA8_GIC_START + 50) | ||
| 124 | #define IRQ_PBA8_PCI1 (IRQ_PBA8_GIC_START + 51) | ||
| 125 | #define IRQ_PBA8_PCI2 (IRQ_PBA8_GIC_START + 52) | ||
| 126 | #define IRQ_PBA8_PCI3 (IRQ_PBA8_GIC_START + 53) | ||
| 127 | |||
| 128 | #define IRQ_PBA8_SMC -1 | ||
| 129 | #define IRQ_PBA8_SCTL -1 | ||
| 130 | |||
| 131 | #define NR_GIC_PBA8 1 | ||
| 132 | |||
| 133 | /* | ||
| 134 | * Only define NR_IRQS if less than NR_IRQS_PBA8 | ||
| 135 | */ | ||
| 136 | #define NR_IRQS_PBA8 (IRQ_PBA8_GIC_START + 64) | ||
| 137 | |||
| 138 | #if defined(CONFIG_MACH_REALVIEW_PBA8) | ||
| 139 | |||
| 140 | #if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_PBA8) | ||
| 141 | #undef NR_IRQS | ||
| 142 | #define NR_IRQS NR_IRQS_PBA8 | ||
| 143 | #endif | ||
| 144 | |||
| 145 | #if !defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_PBA8) | ||
| 146 | #undef MAX_GIC_NR | ||
| 147 | #define MAX_GIC_NR NR_GIC_PBA8 | ||
| 148 | #endif | ||
| 149 | |||
| 150 | #endif /* CONFIG_MACH_REALVIEW_PBA8 */ | ||
| 151 | |||
| 152 | #endif /* __ASM_ARCH_BOARD_PBA8_H */ | ||
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S index 7196bcadff0c..92dbcb9e1792 100644 --- a/arch/arm/mach-realview/include/mach/debug-macro.S +++ b/arch/arm/mach-realview/include/mach/debug-macro.S | |||
| @@ -8,15 +8,36 @@ | |||
| 8 | * This program is free software; you can redistribute it and/or modify | 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 | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | * | 11 | */ |
| 12 | */ | 12 | |
| 13 | #if defined(CONFIG_MACH_REALVIEW_EB) || \ | ||
| 14 | defined(CONFIG_MACH_REALVIEW_PB11MP) || \ | ||
| 15 | defined(CONFIG_MACH_REALVIEW_PBA8) | ||
| 16 | #ifndef DEBUG_LL_UART_OFFSET | ||
| 17 | #define DEBUG_LL_UART_OFFSET 0x00009000 | ||
| 18 | #elif DEBUG_LL_UART_OFFSET != 0x00009000 | ||
| 19 | #warning "DEBUG_LL_UART_OFFSET already defined to a different value" | ||
| 20 | #endif | ||
| 21 | #endif | ||
| 22 | |||
| 23 | #ifdef CONFIG_MACH_REALVIEW_PB1176 | ||
| 24 | #ifndef DEBUG_LL_UART_OFFSET | ||
| 25 | #define DEBUG_LL_UART_OFFSET 0x0010c000 | ||
| 26 | #elif DEBUG_LL_UART_OFFSET != 0x0010c000 | ||
| 27 | #warning "DEBUG_LL_UART_OFFSET already defined to a different value" | ||
| 28 | #endif | ||
| 29 | #endif | ||
| 30 | |||
| 31 | #ifndef DEBUG_LL_UART_OFFSET | ||
| 32 | #error "Unknown RealView platform" | ||
| 33 | #endif | ||
| 13 | 34 | ||
| 14 | .macro addruart,rx | 35 | .macro addruart,rx |
| 15 | mrc p15, 0, \rx, c1, c0 | 36 | mrc p15, 0, \rx, c1, c0 |
| 16 | tst \rx, #1 @ MMU enabled? | 37 | tst \rx, #1 @ MMU enabled? |
| 17 | moveq \rx, #0x10000000 | 38 | moveq \rx, #0x10000000 |
| 18 | movne \rx, #0xf0000000 @ virtual base | 39 | movne \rx, #0xfb000000 @ virtual base |
| 19 | orr \rx, \rx, #0x00009000 | 40 | orr \rx, \rx, #DEBUG_LL_UART_OFFSET |
| 20 | .endm | 41 | .endm |
| 21 | 42 | ||
| 22 | #include <asm/hardware/debug-pl01x.S> | 43 | #include <asm/hardware/debug-pl01x.S> |
diff --git a/arch/arm/mach-realview/include/mach/dma.h b/arch/arm/mach-realview/include/mach/dma.h deleted file mode 100644 index f1a5a1a10952..000000000000 --- a/arch/arm/mach-realview/include/mach/dma.h +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-realview/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2003 ARM Limited. | ||
| 5 | * Copyright (C) 1997,1998 Russell King | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, | ||
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | * GNU General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 20 | */ | ||
diff --git a/arch/arm/mach-realview/include/mach/hardware.h b/arch/arm/mach-realview/include/mach/hardware.h index 79a93b3dfca9..b42c14f89acb 100644 --- a/arch/arm/mach-realview/include/mach/hardware.h +++ b/arch/arm/mach-realview/include/mach/hardware.h | |||
| @@ -25,7 +25,14 @@ | |||
| 25 | #include <asm/sizes.h> | 25 | #include <asm/sizes.h> |
| 26 | 26 | ||
| 27 | /* macro to get at IO space when running virtually */ | 27 | /* macro to get at IO space when running virtually */ |
| 28 | #define IO_ADDRESS(x) (((x) & 0x0fffffff) + 0xf0000000) | 28 | /* |
| 29 | * Statically mapped addresses: | ||
| 30 | * | ||
| 31 | * 10xx xxxx -> fbxx xxxx | ||
| 32 | * 1exx xxxx -> fdxx xxxx | ||
| 33 | * 1fxx xxxx -> fexx xxxx | ||
| 34 | */ | ||
| 35 | #define IO_ADDRESS(x) (((x) & 0x03ffffff) + 0xfb000000) | ||
| 29 | #define __io_address(n) __io(IO_ADDRESS(n)) | 36 | #define __io_address(n) __io(IO_ADDRESS(n)) |
| 30 | 37 | ||
| 31 | #endif | 38 | #endif |
diff --git a/arch/arm/mach-realview/include/mach/io.h b/arch/arm/mach-realview/include/mach/io.h index aa069424d310..f05bcdf605d8 100644 --- a/arch/arm/mach-realview/include/mach/io.h +++ b/arch/arm/mach-realview/include/mach/io.h | |||
| @@ -22,12 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #define IO_SPACE_LIMIT 0xffffffff | 23 | #define IO_SPACE_LIMIT 0xffffffff |
| 24 | 24 | ||
| 25 | static inline void __iomem *__io(unsigned long addr) | 25 | #define __io(a) __typesafe_io(a) |
| 26 | { | 26 | #define __mem_pci(a) (a) |
| 27 | return (void __iomem *)addr; | ||
| 28 | } | ||
| 29 | |||
| 30 | #define __io(a) __io(a) | ||
| 31 | #define __mem_pci(a) (a) | ||
| 32 | 27 | ||
| 33 | #endif | 28 | #endif |
diff --git a/arch/arm/mach-realview/include/mach/irqs.h b/arch/arm/mach-realview/include/mach/irqs.h index 02a918529db3..fe5cb987aa21 100644 --- a/arch/arm/mach-realview/include/mach/irqs.h +++ b/arch/arm/mach-realview/include/mach/irqs.h | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <mach/board-eb.h> | 25 | #include <mach/board-eb.h> |
| 26 | #include <mach/board-pb11mp.h> | 26 | #include <mach/board-pb11mp.h> |
| 27 | #include <mach/board-pb1176.h> | 27 | #include <mach/board-pb1176.h> |
| 28 | #include <mach/board-pba8.h> | ||
| 28 | 29 | ||
| 29 | #define IRQ_LOCALTIMER 29 | 30 | #define IRQ_LOCALTIMER 29 |
| 30 | #define IRQ_LOCALWDOG 30 | 31 | #define IRQ_LOCALWDOG 30 |
diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h index 0e673483a141..293c30025e7e 100644 --- a/arch/arm/mach-realview/include/mach/memory.h +++ b/arch/arm/mach-realview/include/mach/memory.h | |||
| @@ -23,16 +23,10 @@ | |||
| 23 | /* | 23 | /* |
| 24 | * Physical DRAM offset. | 24 | * Physical DRAM offset. |
| 25 | */ | 25 | */ |
| 26 | #ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET | ||
| 27 | #define PHYS_OFFSET UL(0x70000000) | ||
| 28 | #else | ||
| 26 | #define PHYS_OFFSET UL(0x00000000) | 29 | #define PHYS_OFFSET UL(0x00000000) |
| 27 | 30 | #endif | |
| 28 | /* | ||
| 29 | * Virtual view <-> DMA view memory address translations | ||
| 30 | * virt_to_bus: Used to translate the virtual address to an | ||
| 31 | * address suitable to be passed to set_dma_addr | ||
| 32 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 33 | * to an address that the kernel can use. | ||
| 34 | */ | ||
| 35 | #define __virt_to_bus(x) ((x) - PAGE_OFFSET) | ||
| 36 | #define __bus_to_virt(x) ((x) + PAGE_OFFSET) | ||
| 37 | 31 | ||
| 38 | #endif | 32 | #endif |
diff --git a/arch/arm/mach-realview/include/mach/uncompress.h b/arch/arm/mach-realview/include/mach/uncompress.h index 79f50f218e77..415d634d52ab 100644 --- a/arch/arm/mach-realview/include/mach/uncompress.h +++ b/arch/arm/mach-realview/include/mach/uncompress.h | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <mach/board-eb.h> | 23 | #include <mach/board-eb.h> |
| 24 | #include <mach/board-pb11mp.h> | 24 | #include <mach/board-pb11mp.h> |
| 25 | #include <mach/board-pb1176.h> | 25 | #include <mach/board-pb1176.h> |
| 26 | #include <mach/board-pba8.h> | ||
| 26 | 27 | ||
| 27 | #define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) | 28 | #define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) |
| 28 | #define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) | 29 | #define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) |
| @@ -40,6 +41,8 @@ static inline unsigned long get_uart_base(void) | |||
| 40 | return REALVIEW_PB11MP_UART0_BASE; | 41 | return REALVIEW_PB11MP_UART0_BASE; |
| 41 | else if (machine_is_realview_pb1176()) | 42 | else if (machine_is_realview_pb1176()) |
| 42 | return REALVIEW_PB1176_UART0_BASE; | 43 | return REALVIEW_PB1176_UART0_BASE; |
| 44 | else if (machine_is_realview_pba8()) | ||
| 45 | return REALVIEW_PBA8_UART0_BASE; | ||
| 43 | else | 46 | else |
| 44 | return 0; | 47 | return 0; |
| 45 | } | 48 | } |
diff --git a/arch/arm/mach-realview/include/mach/vmalloc.h b/arch/arm/mach-realview/include/mach/vmalloc.h index 48cbcc873db2..fe0de1b507ac 100644 --- a/arch/arm/mach-realview/include/mach/vmalloc.h +++ b/arch/arm/mach-realview/include/mach/vmalloc.h | |||
| @@ -18,4 +18,4 @@ | |||
| 18 | * along with this program; if not, write to the Free Software | 18 | * along with this program; if not, write to the Free Software |
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | #define VMALLOC_END (PAGE_OFFSET + 0x18000000) | 21 | #define VMALLOC_END 0xf8000000 |
diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c index 44d178cd5733..9019ef2e5611 100644 --- a/arch/arm/mach-realview/localtimer.c +++ b/arch/arm/mach-realview/localtimer.c | |||
| @@ -38,18 +38,14 @@ void local_timer_interrupt(void) | |||
| 38 | 38 | ||
| 39 | #ifdef CONFIG_LOCAL_TIMERS | 39 | #ifdef CONFIG_LOCAL_TIMERS |
| 40 | 40 | ||
| 41 | #define TWD_BASE(cpu) (twd_base_addr + (cpu) * twd_size) | ||
| 42 | |||
| 43 | /* set up by the platform code */ | 41 | /* set up by the platform code */ |
| 44 | void __iomem *twd_base_addr; | 42 | void __iomem *twd_base; |
| 45 | unsigned int twd_size; | ||
| 46 | 43 | ||
| 47 | static unsigned long mpcore_timer_rate; | 44 | static unsigned long mpcore_timer_rate; |
| 48 | 45 | ||
| 49 | static void local_timer_set_mode(enum clock_event_mode mode, | 46 | static void local_timer_set_mode(enum clock_event_mode mode, |
| 50 | struct clock_event_device *clk) | 47 | struct clock_event_device *clk) |
| 51 | { | 48 | { |
| 52 | void __iomem *base = TWD_BASE(smp_processor_id()); | ||
| 53 | unsigned long ctrl; | 49 | unsigned long ctrl; |
| 54 | 50 | ||
| 55 | switch(mode) { | 51 | switch(mode) { |
| @@ -68,17 +64,16 @@ static void local_timer_set_mode(enum clock_event_mode mode, | |||
| 68 | ctrl = 0; | 64 | ctrl = 0; |
| 69 | } | 65 | } |
| 70 | 66 | ||
| 71 | __raw_writel(ctrl, base + TWD_TIMER_CONTROL); | 67 | __raw_writel(ctrl, twd_base + TWD_TIMER_CONTROL); |
| 72 | } | 68 | } |
| 73 | 69 | ||
| 74 | static int local_timer_set_next_event(unsigned long evt, | 70 | static int local_timer_set_next_event(unsigned long evt, |
| 75 | struct clock_event_device *unused) | 71 | struct clock_event_device *unused) |
| 76 | { | 72 | { |
| 77 | void __iomem *base = TWD_BASE(smp_processor_id()); | 73 | unsigned long ctrl = __raw_readl(twd_base + TWD_TIMER_CONTROL); |
| 78 | unsigned long ctrl = __raw_readl(base + TWD_TIMER_CONTROL); | ||
| 79 | 74 | ||
| 80 | __raw_writel(evt, base + TWD_TIMER_COUNTER); | 75 | __raw_writel(evt, twd_base + TWD_TIMER_COUNTER); |
| 81 | __raw_writel(ctrl | TWD_TIMER_CONTROL_ENABLE, base + TWD_TIMER_CONTROL); | 76 | __raw_writel(ctrl | TWD_TIMER_CONTROL_ENABLE, twd_base + TWD_TIMER_CONTROL); |
| 82 | 77 | ||
| 83 | return 0; | 78 | return 0; |
| 84 | } | 79 | } |
| @@ -91,19 +86,16 @@ static int local_timer_set_next_event(unsigned long evt, | |||
| 91 | */ | 86 | */ |
| 92 | int local_timer_ack(void) | 87 | int local_timer_ack(void) |
| 93 | { | 88 | { |
| 94 | void __iomem *base = TWD_BASE(smp_processor_id()); | 89 | if (__raw_readl(twd_base + TWD_TIMER_INTSTAT)) { |
| 95 | 90 | __raw_writel(1, twd_base + TWD_TIMER_INTSTAT); | |
| 96 | if (__raw_readl(base + TWD_TIMER_INTSTAT)) { | ||
| 97 | __raw_writel(1, base + TWD_TIMER_INTSTAT); | ||
| 98 | return 1; | 91 | return 1; |
| 99 | } | 92 | } |
| 100 | 93 | ||
| 101 | return 0; | 94 | return 0; |
| 102 | } | 95 | } |
| 103 | 96 | ||
| 104 | static void __cpuinit twd_calibrate_rate(unsigned int cpu) | 97 | static void __cpuinit twd_calibrate_rate(void) |
| 105 | { | 98 | { |
| 106 | void __iomem *base = TWD_BASE(cpu); | ||
| 107 | unsigned long load, count; | 99 | unsigned long load, count; |
| 108 | u64 waitjiffies; | 100 | u64 waitjiffies; |
| 109 | 101 | ||
| @@ -124,15 +116,15 @@ static void __cpuinit twd_calibrate_rate(unsigned int cpu) | |||
| 124 | waitjiffies += 5; | 116 | waitjiffies += 5; |
| 125 | 117 | ||
| 126 | /* enable, no interrupt or reload */ | 118 | /* enable, no interrupt or reload */ |
| 127 | __raw_writel(0x1, base + TWD_TIMER_CONTROL); | 119 | __raw_writel(0x1, twd_base + TWD_TIMER_CONTROL); |
| 128 | 120 | ||
| 129 | /* maximum value */ | 121 | /* maximum value */ |
| 130 | __raw_writel(0xFFFFFFFFU, base + TWD_TIMER_COUNTER); | 122 | __raw_writel(0xFFFFFFFFU, twd_base + TWD_TIMER_COUNTER); |
| 131 | 123 | ||
| 132 | while (get_jiffies_64() < waitjiffies) | 124 | while (get_jiffies_64() < waitjiffies) |
| 133 | udelay(10); | 125 | udelay(10); |
| 134 | 126 | ||
| 135 | count = __raw_readl(base + TWD_TIMER_COUNTER); | 127 | count = __raw_readl(twd_base + TWD_TIMER_COUNTER); |
| 136 | 128 | ||
| 137 | mpcore_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5); | 129 | mpcore_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5); |
| 138 | 130 | ||
| @@ -142,18 +134,19 @@ static void __cpuinit twd_calibrate_rate(unsigned int cpu) | |||
| 142 | 134 | ||
| 143 | load = mpcore_timer_rate / HZ; | 135 | load = mpcore_timer_rate / HZ; |
| 144 | 136 | ||
| 145 | __raw_writel(load, base + TWD_TIMER_LOAD); | 137 | __raw_writel(load, twd_base + TWD_TIMER_LOAD); |
| 146 | } | 138 | } |
| 147 | 139 | ||
| 148 | /* | 140 | /* |
| 149 | * Setup the local clock events for a CPU. | 141 | * Setup the local clock events for a CPU. |
| 150 | */ | 142 | */ |
| 151 | void __cpuinit local_timer_setup(unsigned int cpu) | 143 | void __cpuinit local_timer_setup(void) |
| 152 | { | 144 | { |
| 145 | unsigned int cpu = smp_processor_id(); | ||
| 153 | struct clock_event_device *clk = &per_cpu(local_clockevent, cpu); | 146 | struct clock_event_device *clk = &per_cpu(local_clockevent, cpu); |
| 154 | unsigned long flags; | 147 | unsigned long flags; |
| 155 | 148 | ||
| 156 | twd_calibrate_rate(cpu); | 149 | twd_calibrate_rate(); |
| 157 | 150 | ||
| 158 | clk->name = "local_timer"; | 151 | clk->name = "local_timer"; |
| 159 | clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; | 152 | clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; |
| @@ -178,9 +171,9 @@ void __cpuinit local_timer_setup(unsigned int cpu) | |||
| 178 | /* | 171 | /* |
| 179 | * take a local timer down | 172 | * take a local timer down |
| 180 | */ | 173 | */ |
| 181 | void __cpuexit local_timer_stop(unsigned int cpu) | 174 | void __cpuexit local_timer_stop(void) |
| 182 | { | 175 | { |
| 183 | __raw_writel(0, TWD_BASE(cpu) + TWD_TIMER_CONTROL); | 176 | __raw_writel(0, twd_base + TWD_TIMER_CONTROL); |
| 184 | } | 177 | } |
| 185 | 178 | ||
| 186 | #else /* CONFIG_LOCAL_TIMERS */ | 179 | #else /* CONFIG_LOCAL_TIMERS */ |
| @@ -190,8 +183,9 @@ static void dummy_timer_set_mode(enum clock_event_mode mode, | |||
| 190 | { | 183 | { |
| 191 | } | 184 | } |
| 192 | 185 | ||
| 193 | void __cpuinit local_timer_setup(unsigned int cpu) | 186 | void __cpuinit local_timer_setup(void) |
| 194 | { | 187 | { |
| 188 | unsigned int cpu = smp_processor_id(); | ||
| 195 | struct clock_event_device *clk = &per_cpu(local_clockevent, cpu); | 189 | struct clock_event_device *clk = &per_cpu(local_clockevent, cpu); |
| 196 | 190 | ||
| 197 | clk->name = "dummy_timer"; | 191 | clk->name = "dummy_timer"; |
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c index e102aeb0f76e..8fce85f33033 100644 --- a/arch/arm/mach-realview/platsmp.c +++ b/arch/arm/mach-realview/platsmp.c | |||
| @@ -23,6 +23,8 @@ | |||
| 23 | #include <mach/board-pb11mp.h> | 23 | #include <mach/board-pb11mp.h> |
| 24 | #include <mach/scu.h> | 24 | #include <mach/scu.h> |
| 25 | 25 | ||
| 26 | #include "core.h" | ||
| 27 | |||
| 26 | extern void realview_secondary_startup(void); | 28 | extern void realview_secondary_startup(void); |
| 27 | 29 | ||
| 28 | /* | 30 | /* |
| @@ -31,15 +33,20 @@ extern void realview_secondary_startup(void); | |||
| 31 | */ | 33 | */ |
| 32 | volatile int __cpuinitdata pen_release = -1; | 34 | volatile int __cpuinitdata pen_release = -1; |
| 33 | 35 | ||
| 36 | static void __iomem *scu_base_addr(void) | ||
| 37 | { | ||
| 38 | if (machine_is_realview_eb_mp()) | ||
| 39 | return __io_address(REALVIEW_EB11MP_SCU_BASE); | ||
| 40 | else if (machine_is_realview_pb11mp()) | ||
| 41 | return __io_address(REALVIEW_TC11MP_SCU_BASE); | ||
| 42 | else | ||
| 43 | return (void __iomem *)0; | ||
| 44 | } | ||
| 45 | |||
| 34 | static unsigned int __init get_core_count(void) | 46 | static unsigned int __init get_core_count(void) |
| 35 | { | 47 | { |
| 36 | unsigned int ncores; | 48 | unsigned int ncores; |
| 37 | void __iomem *scu_base = 0; | 49 | void __iomem *scu_base = scu_base_addr(); |
| 38 | |||
| 39 | if (machine_is_realview_eb() && core_tile_eb11mp()) | ||
| 40 | scu_base = __io_address(REALVIEW_EB11MP_SCU_BASE); | ||
| 41 | else if (machine_is_realview_pb11mp()) | ||
| 42 | scu_base = __io_address(REALVIEW_TC11MP_SCU_BASE); | ||
| 43 | 50 | ||
| 44 | if (scu_base) { | 51 | if (scu_base) { |
| 45 | ncores = __raw_readl(scu_base + SCU_CONFIG); | 52 | ncores = __raw_readl(scu_base + SCU_CONFIG); |
| @@ -56,14 +63,7 @@ static unsigned int __init get_core_count(void) | |||
| 56 | static void scu_enable(void) | 63 | static void scu_enable(void) |
| 57 | { | 64 | { |
| 58 | u32 scu_ctrl; | 65 | u32 scu_ctrl; |
| 59 | void __iomem *scu_base; | 66 | void __iomem *scu_base = scu_base_addr(); |
| 60 | |||
| 61 | if (machine_is_realview_eb() && core_tile_eb11mp()) | ||
| 62 | scu_base = __io_address(REALVIEW_EB11MP_SCU_BASE); | ||
| 63 | else if (machine_is_realview_pb11mp()) | ||
| 64 | scu_base = __io_address(REALVIEW_TC11MP_SCU_BASE); | ||
| 65 | else | ||
| 66 | BUG(); | ||
| 67 | 67 | ||
| 68 | scu_ctrl = __raw_readl(scu_base + SCU_CTRL); | 68 | scu_ctrl = __raw_readl(scu_base + SCU_CTRL); |
| 69 | scu_ctrl |= 1; | 69 | scu_ctrl |= 1; |
| @@ -88,10 +88,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu) | |||
| 88 | * core (e.g. timer irq), then they will not have been enabled | 88 | * core (e.g. timer irq), then they will not have been enabled |
| 89 | * for us: do so | 89 | * for us: do so |
| 90 | */ | 90 | */ |
| 91 | if (machine_is_realview_eb() && core_tile_eb11mp()) | 91 | gic_cpu_init(0, gic_cpu_base_addr); |
| 92 | gic_cpu_init(0, __io_address(REALVIEW_EB11MP_GIC_CPU_BASE)); | ||
| 93 | else if (machine_is_realview_pb11mp()) | ||
| 94 | gic_cpu_init(0, __io_address(REALVIEW_TC11MP_GIC_CPU_BASE)); | ||
| 95 | 92 | ||
| 96 | /* | 93 | /* |
| 97 | * let the primary processor know we're out of the | 94 | * let the primary processor know we're out of the |
| @@ -232,9 +229,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
| 232 | * dummy (!CONFIG_LOCAL_TIMERS), it was already registers in | 229 | * dummy (!CONFIG_LOCAL_TIMERS), it was already registers in |
| 233 | * realview_timer_init | 230 | * realview_timer_init |
| 234 | */ | 231 | */ |
| 235 | if ((machine_is_realview_eb() && core_tile_eb11mp()) || | 232 | local_timer_setup(); |
| 236 | machine_is_realview_pb11mp()) | ||
| 237 | local_timer_setup(cpu); | ||
| 238 | #endif | 233 | #endif |
| 239 | 234 | ||
| 240 | /* | 235 | /* |
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 3420e2e719e6..bed39ed97613 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
| @@ -108,7 +108,7 @@ static struct map_desc realview_eb11mp_io_desc[] __initdata = { | |||
| 108 | static void __init realview_eb_map_io(void) | 108 | static void __init realview_eb_map_io(void) |
| 109 | { | 109 | { |
| 110 | iotable_init(realview_eb_io_desc, ARRAY_SIZE(realview_eb_io_desc)); | 110 | iotable_init(realview_eb_io_desc, ARRAY_SIZE(realview_eb_io_desc)); |
| 111 | if (core_tile_eb11mp()) | 111 | if (core_tile_eb11mp() || core_tile_a9mp()) |
| 112 | iotable_init(realview_eb11mp_io_desc, ARRAY_SIZE(realview_eb11mp_io_desc)); | 112 | iotable_init(realview_eb11mp_io_desc, ARRAY_SIZE(realview_eb11mp_io_desc)); |
| 113 | } | 113 | } |
| 114 | 114 | ||
| @@ -242,12 +242,6 @@ static struct resource realview_eb_eth_resources[] = { | |||
| 242 | }, | 242 | }, |
| 243 | }; | 243 | }; |
| 244 | 244 | ||
| 245 | static struct platform_device realview_eb_eth_device = { | ||
| 246 | .id = 0, | ||
| 247 | .num_resources = ARRAY_SIZE(realview_eb_eth_resources), | ||
| 248 | .resource = realview_eb_eth_resources, | ||
| 249 | }; | ||
| 250 | |||
| 251 | /* | 245 | /* |
| 252 | * Detect and register the correct Ethernet device. RealView/EB rev D | 246 | * Detect and register the correct Ethernet device. RealView/EB rev D |
| 253 | * platforms use the newer SMSC LAN9118 Ethernet chip | 247 | * platforms use the newer SMSC LAN9118 Ethernet chip |
| @@ -255,26 +249,24 @@ static struct platform_device realview_eb_eth_device = { | |||
| 255 | static int eth_device_register(void) | 249 | static int eth_device_register(void) |
| 256 | { | 250 | { |
| 257 | void __iomem *eth_addr = ioremap(REALVIEW_EB_ETH_BASE, SZ_4K); | 251 | void __iomem *eth_addr = ioremap(REALVIEW_EB_ETH_BASE, SZ_4K); |
| 252 | const char *name = NULL; | ||
| 258 | u32 idrev; | 253 | u32 idrev; |
| 259 | 254 | ||
| 260 | if (!eth_addr) | 255 | if (!eth_addr) |
| 261 | return -ENOMEM; | 256 | return -ENOMEM; |
| 262 | 257 | ||
| 263 | idrev = readl(eth_addr + 0x50); | 258 | idrev = readl(eth_addr + 0x50); |
| 264 | if ((idrev & 0xFFFF0000) == 0x01180000) | 259 | if ((idrev & 0xFFFF0000) != 0x01180000) |
| 265 | /* SMSC LAN9118 chip present */ | 260 | /* SMSC LAN9118 not present, use LAN91C111 instead */ |
| 266 | realview_eb_eth_device.name = "smc911x"; | 261 | name = "smc91x"; |
| 267 | else | ||
| 268 | /* SMSC 91C111 chip present */ | ||
| 269 | realview_eb_eth_device.name = "smc91x"; | ||
| 270 | 262 | ||
| 271 | iounmap(eth_addr); | 263 | iounmap(eth_addr); |
| 272 | return platform_device_register(&realview_eb_eth_device); | 264 | return realview_eth_register(name, realview_eb_eth_resources); |
| 273 | } | 265 | } |
| 274 | 266 | ||
| 275 | static void __init gic_init_irq(void) | 267 | static void __init gic_init_irq(void) |
| 276 | { | 268 | { |
| 277 | if (core_tile_eb11mp()) { | 269 | if (core_tile_eb11mp() || core_tile_a9mp()) { |
| 278 | unsigned int pldctrl; | 270 | unsigned int pldctrl; |
| 279 | 271 | ||
| 280 | /* new irq mode */ | 272 | /* new irq mode */ |
| @@ -342,10 +334,9 @@ static void __init realview_eb_timer_init(void) | |||
| 342 | timer2_va_base = __io_address(REALVIEW_EB_TIMER2_3_BASE); | 334 | timer2_va_base = __io_address(REALVIEW_EB_TIMER2_3_BASE); |
| 343 | timer3_va_base = __io_address(REALVIEW_EB_TIMER2_3_BASE) + 0x20; | 335 | timer3_va_base = __io_address(REALVIEW_EB_TIMER2_3_BASE) + 0x20; |
| 344 | 336 | ||
| 345 | if (core_tile_eb11mp()) { | 337 | if (core_tile_eb11mp() || core_tile_a9mp()) { |
| 346 | #ifdef CONFIG_LOCAL_TIMERS | 338 | #ifdef CONFIG_LOCAL_TIMERS |
| 347 | twd_base_addr = __io_address(REALVIEW_EB11MP_TWD_BASE); | 339 | twd_base = __io_address(REALVIEW_EB11MP_TWD_BASE); |
| 348 | twd_size = REALVIEW_EB11MP_TWD_SIZE; | ||
| 349 | #endif | 340 | #endif |
| 350 | timer_irq = IRQ_EB11MP_TIMER0_1; | 341 | timer_irq = IRQ_EB11MP_TIMER0_1; |
| 351 | } else | 342 | } else |
| @@ -362,7 +353,7 @@ static void __init realview_eb_init(void) | |||
| 362 | { | 353 | { |
| 363 | int i; | 354 | int i; |
| 364 | 355 | ||
| 365 | if (core_tile_eb11mp()) { | 356 | if (core_tile_eb11mp() || core_tile_a9mp()) { |
| 366 | realview_eb11mp_fixup(); | 357 | realview_eb11mp_fixup(); |
| 367 | 358 | ||
| 368 | #ifdef CONFIG_CACHE_L2X0 | 359 | #ifdef CONFIG_CACHE_L2X0 |
| @@ -390,7 +381,7 @@ MACHINE_START(REALVIEW_EB, "ARM-RealView EB") | |||
| 390 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 381 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
| 391 | .phys_io = REALVIEW_EB_UART0_BASE, | 382 | .phys_io = REALVIEW_EB_UART0_BASE, |
| 392 | .io_pg_offst = (IO_ADDRESS(REALVIEW_EB_UART0_BASE) >> 18) & 0xfffc, | 383 | .io_pg_offst = (IO_ADDRESS(REALVIEW_EB_UART0_BASE) >> 18) & 0xfffc, |
| 393 | .boot_params = 0x00000100, | 384 | .boot_params = PHYS_OFFSET + 0x00000100, |
| 394 | .map_io = realview_eb_map_io, | 385 | .map_io = realview_eb_map_io, |
| 395 | .init_irq = gic_init_irq, | 386 | .init_irq = gic_init_irq, |
| 396 | .timer = &realview_eb_timer, | 387 | .timer = &realview_eb_timer, |
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c index 0481416d37c9..8f0683c22140 100644 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c | |||
| @@ -222,13 +222,6 @@ static struct resource realview_pb1176_smsc911x_resources[] = { | |||
| 222 | }, | 222 | }, |
| 223 | }; | 223 | }; |
| 224 | 224 | ||
| 225 | static struct platform_device realview_pb1176_smsc911x_device = { | ||
| 226 | .name = "smc911x", | ||
| 227 | .id = 0, | ||
| 228 | .num_resources = ARRAY_SIZE(realview_pb1176_smsc911x_resources), | ||
| 229 | .resource = realview_pb1176_smsc911x_resources, | ||
| 230 | }; | ||
| 231 | |||
| 232 | static void __init gic_init_irq(void) | 225 | static void __init gic_init_irq(void) |
| 233 | { | 226 | { |
| 234 | /* ARM1176 DevChip GIC, primary */ | 227 | /* ARM1176 DevChip GIC, primary */ |
| @@ -266,7 +259,7 @@ static void __init realview_pb1176_init(void) | |||
| 266 | #endif | 259 | #endif |
| 267 | 260 | ||
| 268 | realview_flash_register(&realview_pb1176_flash_resource, 1); | 261 | realview_flash_register(&realview_pb1176_flash_resource, 1); |
| 269 | platform_device_register(&realview_pb1176_smsc911x_device); | 262 | realview_eth_register(NULL, realview_pb1176_smsc911x_resources); |
| 270 | 263 | ||
| 271 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { | 264 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { |
| 272 | struct amba_device *d = amba_devs[i]; | 265 | struct amba_device *d = amba_devs[i]; |
| @@ -282,7 +275,7 @@ MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176") | |||
| 282 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 275 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
| 283 | .phys_io = REALVIEW_PB1176_UART0_BASE, | 276 | .phys_io = REALVIEW_PB1176_UART0_BASE, |
| 284 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PB1176_UART0_BASE) >> 18) & 0xfffc, | 277 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PB1176_UART0_BASE) >> 18) & 0xfffc, |
| 285 | .boot_params = 0x00000100, | 278 | .boot_params = PHYS_OFFSET + 0x00000100, |
| 286 | .map_io = realview_pb1176_map_io, | 279 | .map_io = realview_pb1176_map_io, |
| 287 | .init_irq = gic_init_irq, | 280 | .init_irq = gic_init_irq, |
| 288 | .timer = &realview_pb1176_timer, | 281 | .timer = &realview_pb1176_timer, |
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index 6197dd8e8edf..3ebdb2dadd6f 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
| @@ -230,13 +230,6 @@ static struct resource realview_pb11mp_smsc911x_resources[] = { | |||
| 230 | }, | 230 | }, |
| 231 | }; | 231 | }; |
| 232 | 232 | ||
| 233 | static struct platform_device realview_pb11mp_smsc911x_device = { | ||
| 234 | .name = "smc911x", | ||
| 235 | .id = 0, | ||
| 236 | .num_resources = ARRAY_SIZE(realview_pb11mp_smsc911x_resources), | ||
| 237 | .resource = realview_pb11mp_smsc911x_resources, | ||
| 238 | }; | ||
| 239 | |||
| 240 | struct resource realview_pb11mp_cf_resources[] = { | 233 | struct resource realview_pb11mp_cf_resources[] = { |
| 241 | [0] = { | 234 | [0] = { |
| 242 | .start = REALVIEW_PB11MP_CF_BASE, | 235 | .start = REALVIEW_PB11MP_CF_BASE, |
| @@ -292,8 +285,7 @@ static void __init realview_pb11mp_timer_init(void) | |||
| 292 | timer3_va_base = __io_address(REALVIEW_PB11MP_TIMER2_3_BASE) + 0x20; | 285 | timer3_va_base = __io_address(REALVIEW_PB11MP_TIMER2_3_BASE) + 0x20; |
| 293 | 286 | ||
| 294 | #ifdef CONFIG_LOCAL_TIMERS | 287 | #ifdef CONFIG_LOCAL_TIMERS |
| 295 | twd_base_addr = __io_address(REALVIEW_TC11MP_TWD_BASE); | 288 | twd_base = __io_address(REALVIEW_TC11MP_TWD_BASE); |
| 296 | twd_size = REALVIEW_TC11MP_TWD_SIZE; | ||
| 297 | #endif | 289 | #endif |
| 298 | realview_timer_init(IRQ_TC11MP_TIMER0_1); | 290 | realview_timer_init(IRQ_TC11MP_TIMER0_1); |
| 299 | } | 291 | } |
| @@ -314,7 +306,7 @@ static void __init realview_pb11mp_init(void) | |||
| 314 | 306 | ||
| 315 | realview_flash_register(realview_pb11mp_flash_resource, | 307 | realview_flash_register(realview_pb11mp_flash_resource, |
| 316 | ARRAY_SIZE(realview_pb11mp_flash_resource)); | 308 | ARRAY_SIZE(realview_pb11mp_flash_resource)); |
| 317 | platform_device_register(&realview_pb11mp_smsc911x_device); | 309 | realview_eth_register(NULL, realview_pb11mp_smsc911x_resources); |
| 318 | platform_device_register(&realview_i2c_device); | 310 | platform_device_register(&realview_i2c_device); |
| 319 | platform_device_register(&realview_pb11mp_cf_device); | 311 | platform_device_register(&realview_pb11mp_cf_device); |
| 320 | 312 | ||
| @@ -332,7 +324,7 @@ MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore") | |||
| 332 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 324 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
| 333 | .phys_io = REALVIEW_PB11MP_UART0_BASE, | 325 | .phys_io = REALVIEW_PB11MP_UART0_BASE, |
| 334 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE) >> 18) & 0xfffc, | 326 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE) >> 18) & 0xfffc, |
| 335 | .boot_params = 0x00000100, | 327 | .boot_params = PHYS_OFFSET + 0x00000100, |
| 336 | .map_io = realview_pb11mp_map_io, | 328 | .map_io = realview_pb11mp_map_io, |
| 337 | .init_irq = gic_init_irq, | 329 | .init_irq = gic_init_irq, |
| 338 | .timer = &realview_pb11mp_timer, | 330 | .timer = &realview_pb11mp_timer, |
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c new file mode 100644 index 000000000000..34c94435d2d8 --- /dev/null +++ b/arch/arm/mach-realview/realview_pba8.c | |||
| @@ -0,0 +1,300 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-realview/realview_pba8.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 ARM Limited | ||
| 5 | * Copyright (C) 2000 Deep Blue Solutions Ltd | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, | ||
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | * GNU General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 20 | */ | ||
| 21 | |||
| 22 | #include <linux/init.h> | ||
| 23 | #include <linux/platform_device.h> | ||
| 24 | #include <linux/sysdev.h> | ||
| 25 | #include <linux/amba/bus.h> | ||
| 26 | #include <linux/io.h> | ||
| 27 | |||
| 28 | #include <asm/irq.h> | ||
| 29 | #include <asm/leds.h> | ||
| 30 | #include <asm/mach-types.h> | ||
| 31 | #include <asm/hardware/gic.h> | ||
| 32 | #include <asm/hardware/icst307.h> | ||
| 33 | |||
| 34 | #include <asm/mach/arch.h> | ||
| 35 | #include <asm/mach/map.h> | ||
| 36 | #include <asm/mach/mmc.h> | ||
| 37 | #include <asm/mach/time.h> | ||
| 38 | |||
| 39 | #include <mach/hardware.h> | ||
| 40 | #include <mach/board-pba8.h> | ||
| 41 | #include <mach/irqs.h> | ||
| 42 | |||
| 43 | #include "core.h" | ||
| 44 | #include "clock.h" | ||
| 45 | |||
| 46 | static struct map_desc realview_pba8_io_desc[] __initdata = { | ||
| 47 | { | ||
| 48 | .virtual = IO_ADDRESS(REALVIEW_SYS_BASE), | ||
| 49 | .pfn = __phys_to_pfn(REALVIEW_SYS_BASE), | ||
| 50 | .length = SZ_4K, | ||
| 51 | .type = MT_DEVICE, | ||
| 52 | }, { | ||
| 53 | .virtual = IO_ADDRESS(REALVIEW_PBA8_GIC_CPU_BASE), | ||
| 54 | .pfn = __phys_to_pfn(REALVIEW_PBA8_GIC_CPU_BASE), | ||
| 55 | .length = SZ_4K, | ||
| 56 | .type = MT_DEVICE, | ||
| 57 | }, { | ||
| 58 | .virtual = IO_ADDRESS(REALVIEW_PBA8_GIC_DIST_BASE), | ||
| 59 | .pfn = __phys_to_pfn(REALVIEW_PBA8_GIC_DIST_BASE), | ||
| 60 | .length = SZ_4K, | ||
| 61 | .type = MT_DEVICE, | ||
| 62 | }, { | ||
| 63 | .virtual = IO_ADDRESS(REALVIEW_SCTL_BASE), | ||
| 64 | .pfn = __phys_to_pfn(REALVIEW_SCTL_BASE), | ||
| 65 | .length = SZ_4K, | ||
| 66 | .type = MT_DEVICE, | ||
| 67 | }, { | ||
| 68 | .virtual = IO_ADDRESS(REALVIEW_PBA8_TIMER0_1_BASE), | ||
| 69 | .pfn = __phys_to_pfn(REALVIEW_PBA8_TIMER0_1_BASE), | ||
| 70 | .length = SZ_4K, | ||
| 71 | .type = MT_DEVICE, | ||
| 72 | }, { | ||
| 73 | .virtual = IO_ADDRESS(REALVIEW_PBA8_TIMER2_3_BASE), | ||
| 74 | .pfn = __phys_to_pfn(REALVIEW_PBA8_TIMER2_3_BASE), | ||
| 75 | .length = SZ_4K, | ||
| 76 | .type = MT_DEVICE, | ||
| 77 | }, | ||
| 78 | #ifdef CONFIG_PCI | ||
| 79 | { | ||
| 80 | .virtual = PCIX_UNIT_BASE, | ||
| 81 | .pfn = __phys_to_pfn(REALVIEW_PBA8_PCI_BASE), | ||
| 82 | .length = REALVIEW_PBA8_PCI_BASE_SIZE, | ||
| 83 | .type = MT_DEVICE | ||
| 84 | }, | ||
| 85 | #endif | ||
| 86 | #ifdef CONFIG_DEBUG_LL | ||
| 87 | { | ||
| 88 | .virtual = IO_ADDRESS(REALVIEW_PBA8_UART0_BASE), | ||
| 89 | .pfn = __phys_to_pfn(REALVIEW_PBA8_UART0_BASE), | ||
| 90 | .length = SZ_4K, | ||
| 91 | .type = MT_DEVICE, | ||
| 92 | }, | ||
| 93 | #endif | ||
| 94 | }; | ||
| 95 | |||
| 96 | static void __init realview_pba8_map_io(void) | ||
| 97 | { | ||
| 98 | iotable_init(realview_pba8_io_desc, ARRAY_SIZE(realview_pba8_io_desc)); | ||
| 99 | } | ||
| 100 | |||
| 101 | /* | ||
| 102 | * RealView PBA8Core AMBA devices | ||
| 103 | */ | ||
| 104 | |||
| 105 | #define GPIO2_IRQ { IRQ_PBA8_GPIO2, NO_IRQ } | ||
| 106 | #define GPIO2_DMA { 0, 0 } | ||
| 107 | #define GPIO3_IRQ { IRQ_PBA8_GPIO3, NO_IRQ } | ||
| 108 | #define GPIO3_DMA { 0, 0 } | ||
| 109 | #define AACI_IRQ { IRQ_PBA8_AACI, NO_IRQ } | ||
| 110 | #define AACI_DMA { 0x80, 0x81 } | ||
| 111 | #define MMCI0_IRQ { IRQ_PBA8_MMCI0A, IRQ_PBA8_MMCI0B } | ||
| 112 | #define MMCI0_DMA { 0x84, 0 } | ||
| 113 | #define KMI0_IRQ { IRQ_PBA8_KMI0, NO_IRQ } | ||
| 114 | #define KMI0_DMA { 0, 0 } | ||
| 115 | #define KMI1_IRQ { IRQ_PBA8_KMI1, NO_IRQ } | ||
| 116 | #define KMI1_DMA { 0, 0 } | ||
| 117 | #define PBA8_SMC_IRQ { NO_IRQ, NO_IRQ } | ||
| 118 | #define PBA8_SMC_DMA { 0, 0 } | ||
| 119 | #define MPMC_IRQ { NO_IRQ, NO_IRQ } | ||
| 120 | #define MPMC_DMA { 0, 0 } | ||
| 121 | #define PBA8_CLCD_IRQ { IRQ_PBA8_CLCD, NO_IRQ } | ||
| 122 | #define PBA8_CLCD_DMA { 0, 0 } | ||
| 123 | #define DMAC_IRQ { IRQ_PBA8_DMAC, NO_IRQ } | ||
| 124 | #define DMAC_DMA { 0, 0 } | ||
| 125 | #define SCTL_IRQ { NO_IRQ, NO_IRQ } | ||
| 126 | #define SCTL_DMA { 0, 0 } | ||
| 127 | #define PBA8_WATCHDOG_IRQ { IRQ_PBA8_WATCHDOG, NO_IRQ } | ||
| 128 | #define PBA8_WATCHDOG_DMA { 0, 0 } | ||
| 129 | #define PBA8_GPIO0_IRQ { IRQ_PBA8_GPIO0, NO_IRQ } | ||
| 130 | #define PBA8_GPIO0_DMA { 0, 0 } | ||
| 131 | #define GPIO1_IRQ { IRQ_PBA8_GPIO1, NO_IRQ } | ||
| 132 | #define GPIO1_DMA { 0, 0 } | ||
| 133 | #define PBA8_RTC_IRQ { IRQ_PBA8_RTC, NO_IRQ } | ||
| 134 | #define PBA8_RTC_DMA { 0, 0 } | ||
| 135 | #define SCI_IRQ { IRQ_PBA8_SCI, NO_IRQ } | ||
| 136 | #define SCI_DMA { 7, 6 } | ||
| 137 | #define PBA8_UART0_IRQ { IRQ_PBA8_UART0, NO_IRQ } | ||
| 138 | #define PBA8_UART0_DMA { 15, 14 } | ||
| 139 | #define PBA8_UART1_IRQ { IRQ_PBA8_UART1, NO_IRQ } | ||
| 140 | #define PBA8_UART1_DMA { 13, 12 } | ||
| 141 | #define PBA8_UART2_IRQ { IRQ_PBA8_UART2, NO_IRQ } | ||
| 142 | #define PBA8_UART2_DMA { 11, 10 } | ||
| 143 | #define PBA8_UART3_IRQ { IRQ_PBA8_UART3, NO_IRQ } | ||
| 144 | #define PBA8_UART3_DMA { 0x86, 0x87 } | ||
| 145 | #define PBA8_SSP_IRQ { IRQ_PBA8_SSP, NO_IRQ } | ||
| 146 | #define PBA8_SSP_DMA { 9, 8 } | ||
| 147 | |||
| 148 | /* FPGA Primecells */ | ||
| 149 | AMBA_DEVICE(aaci, "fpga:04", AACI, NULL); | ||
| 150 | AMBA_DEVICE(mmc0, "fpga:05", MMCI0, &realview_mmc0_plat_data); | ||
| 151 | AMBA_DEVICE(kmi0, "fpga:06", KMI0, NULL); | ||
| 152 | AMBA_DEVICE(kmi1, "fpga:07", KMI1, NULL); | ||
| 153 | AMBA_DEVICE(uart3, "fpga:09", PBA8_UART3, NULL); | ||
| 154 | |||
| 155 | /* DevChip Primecells */ | ||
| 156 | AMBA_DEVICE(smc, "dev:00", PBA8_SMC, NULL); | ||
| 157 | AMBA_DEVICE(sctl, "dev:e0", SCTL, NULL); | ||
| 158 | AMBA_DEVICE(wdog, "dev:e1", PBA8_WATCHDOG, NULL); | ||
| 159 | AMBA_DEVICE(gpio0, "dev:e4", PBA8_GPIO0, NULL); | ||
| 160 | AMBA_DEVICE(gpio1, "dev:e5", GPIO1, NULL); | ||
| 161 | AMBA_DEVICE(gpio2, "dev:e6", GPIO2, NULL); | ||
| 162 | AMBA_DEVICE(rtc, "dev:e8", PBA8_RTC, NULL); | ||
| 163 | AMBA_DEVICE(sci0, "dev:f0", SCI, NULL); | ||
| 164 | AMBA_DEVICE(uart0, "dev:f1", PBA8_UART0, NULL); | ||
| 165 | AMBA_DEVICE(uart1, "dev:f2", PBA8_UART1, NULL); | ||
| 166 | AMBA_DEVICE(uart2, "dev:f3", PBA8_UART2, NULL); | ||
| 167 | AMBA_DEVICE(ssp0, "dev:f4", PBA8_SSP, NULL); | ||
| 168 | |||
| 169 | /* Primecells on the NEC ISSP chip */ | ||
| 170 | AMBA_DEVICE(clcd, "issp:20", PBA8_CLCD, &clcd_plat_data); | ||
| 171 | AMBA_DEVICE(dmac, "issp:30", DMAC, NULL); | ||
| 172 | |||
| 173 | static struct amba_device *amba_devs[] __initdata = { | ||
| 174 | &dmac_device, | ||
| 175 | &uart0_device, | ||
| 176 | &uart1_device, | ||
| 177 | &uart2_device, | ||
| 178 | &uart3_device, | ||
| 179 | &smc_device, | ||
| 180 | &clcd_device, | ||
| 181 | &sctl_device, | ||
| 182 | &wdog_device, | ||
| 183 | &gpio0_device, | ||
| 184 | &gpio1_device, | ||
| 185 | &gpio2_device, | ||
| 186 | &rtc_device, | ||
| 187 | &sci0_device, | ||
| 188 | &ssp0_device, | ||
| 189 | &aaci_device, | ||
| 190 | &mmc0_device, | ||
| 191 | &kmi0_device, | ||
| 192 | &kmi1_device, | ||
| 193 | }; | ||
| 194 | |||
| 195 | /* | ||
| 196 | * RealView PB-A8 platform devices | ||
| 197 | */ | ||
| 198 | static struct resource realview_pba8_flash_resource[] = { | ||
| 199 | [0] = { | ||
| 200 | .start = REALVIEW_PBA8_FLASH0_BASE, | ||
| 201 | .end = REALVIEW_PBA8_FLASH0_BASE + REALVIEW_PBA8_FLASH0_SIZE - 1, | ||
| 202 | .flags = IORESOURCE_MEM, | ||
| 203 | }, | ||
| 204 | [1] = { | ||
| 205 | .start = REALVIEW_PBA8_FLASH1_BASE, | ||
| 206 | .end = REALVIEW_PBA8_FLASH1_BASE + REALVIEW_PBA8_FLASH1_SIZE - 1, | ||
| 207 | .flags = IORESOURCE_MEM, | ||
| 208 | }, | ||
| 209 | }; | ||
| 210 | |||
| 211 | static struct resource realview_pba8_smsc911x_resources[] = { | ||
| 212 | [0] = { | ||
| 213 | .start = REALVIEW_PBA8_ETH_BASE, | ||
| 214 | .end = REALVIEW_PBA8_ETH_BASE + SZ_64K - 1, | ||
| 215 | .flags = IORESOURCE_MEM, | ||
| 216 | }, | ||
| 217 | [1] = { | ||
| 218 | .start = IRQ_PBA8_ETH, | ||
| 219 | .end = IRQ_PBA8_ETH, | ||
| 220 | .flags = IORESOURCE_IRQ, | ||
| 221 | }, | ||
| 222 | }; | ||
| 223 | |||
| 224 | struct resource realview_pba8_cf_resources[] = { | ||
| 225 | [0] = { | ||
| 226 | .start = REALVIEW_PBA8_CF_BASE, | ||
| 227 | .end = REALVIEW_PBA8_CF_BASE + SZ_4K - 1, | ||
| 228 | .flags = IORESOURCE_MEM, | ||
| 229 | }, | ||
| 230 | [1] = { | ||
| 231 | .start = REALVIEW_PBA8_CF_MEM_BASE, | ||
| 232 | .end = REALVIEW_PBA8_CF_MEM_BASE + SZ_4K - 1, | ||
| 233 | .flags = IORESOURCE_MEM, | ||
| 234 | }, | ||
| 235 | [2] = { | ||
| 236 | .start = -1, /* FIXME: Find correct irq */ | ||
| 237 | .end = -1, | ||
| 238 | .flags = IORESOURCE_IRQ, | ||
| 239 | }, | ||
| 240 | }; | ||
| 241 | |||
| 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) | ||
| 250 | { | ||
| 251 | /* ARM PB-A8 on-board GIC */ | ||
| 252 | gic_cpu_base_addr = __io_address(REALVIEW_PBA8_GIC_CPU_BASE); | ||
| 253 | gic_dist_init(0, __io_address(REALVIEW_PBA8_GIC_DIST_BASE), IRQ_PBA8_GIC_START); | ||
| 254 | gic_cpu_init(0, __io_address(REALVIEW_PBA8_GIC_CPU_BASE)); | ||
| 255 | } | ||
| 256 | |||
| 257 | static void __init realview_pba8_timer_init(void) | ||
| 258 | { | ||
| 259 | timer0_va_base = __io_address(REALVIEW_PBA8_TIMER0_1_BASE); | ||
| 260 | timer1_va_base = __io_address(REALVIEW_PBA8_TIMER0_1_BASE) + 0x20; | ||
| 261 | timer2_va_base = __io_address(REALVIEW_PBA8_TIMER2_3_BASE); | ||
| 262 | timer3_va_base = __io_address(REALVIEW_PBA8_TIMER2_3_BASE) + 0x20; | ||
| 263 | |||
| 264 | realview_timer_init(IRQ_PBA8_TIMER0_1); | ||
| 265 | } | ||
| 266 | |||
| 267 | static struct sys_timer realview_pba8_timer = { | ||
| 268 | .init = realview_pba8_timer_init, | ||
| 269 | }; | ||
| 270 | |||
| 271 | static void __init realview_pba8_init(void) | ||
| 272 | { | ||
| 273 | int i; | ||
| 274 | |||
| 275 | realview_flash_register(realview_pba8_flash_resource, | ||
| 276 | ARRAY_SIZE(realview_pba8_flash_resource)); | ||
| 277 | realview_eth_register(NULL, realview_pba8_smsc911x_resources); | ||
| 278 | platform_device_register(&realview_i2c_device); | ||
| 279 | platform_device_register(&realview_pba8_cf_device); | ||
| 280 | |||
| 281 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { | ||
| 282 | struct amba_device *d = amba_devs[i]; | ||
| 283 | amba_device_register(d, &iomem_resource); | ||
| 284 | } | ||
| 285 | |||
| 286 | #ifdef CONFIG_LEDS | ||
| 287 | leds_event = realview_leds_event; | ||
| 288 | #endif | ||
| 289 | } | ||
| 290 | |||
| 291 | MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8") | ||
| 292 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | ||
| 293 | .phys_io = REALVIEW_PBA8_UART0_BASE, | ||
| 294 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PBA8_UART0_BASE) >> 18) & 0xfffc, | ||
| 295 | .boot_params = PHYS_OFFSET + 0x00000100, | ||
| 296 | .map_io = realview_pba8_map_io, | ||
| 297 | .init_irq = gic_init_irq, | ||
| 298 | .timer = &realview_pba8_timer, | ||
| 299 | .init_machine = realview_pba8_init, | ||
| 300 | MACHINE_END | ||
diff --git a/arch/arm/mach-rpc/include/mach/io.h b/arch/arm/mach-rpc/include/mach/io.h index 9f0553b7ec28..20da7f486e51 100644 --- a/arch/arm/mach-rpc/include/mach/io.h +++ b/arch/arm/mach-rpc/include/mach/io.h | |||
| @@ -18,49 +18,6 @@ | |||
| 18 | #define IO_SPACE_LIMIT 0xffffffff | 18 | #define IO_SPACE_LIMIT 0xffffffff |
| 19 | 19 | ||
| 20 | /* | 20 | /* |
| 21 | * GCC is totally crap at loading/storing data. We try to persuade it | ||
| 22 | * to do the right thing by using these whereever possible instead of | ||
| 23 | * the above. | ||
| 24 | */ | ||
| 25 | #define __arch_base_getb(b,o) \ | ||
| 26 | ({ \ | ||
| 27 | unsigned int __v, __r = (b); \ | ||
| 28 | __asm__ __volatile__( \ | ||
| 29 | "ldrb %0, [%1, %2]" \ | ||
| 30 | : "=r" (__v) \ | ||
| 31 | : "r" (__r), "Ir" (o)); \ | ||
| 32 | __v; \ | ||
| 33 | }) | ||
| 34 | |||
| 35 | #define __arch_base_getl(b,o) \ | ||
| 36 | ({ \ | ||
| 37 | unsigned int __v, __r = (b); \ | ||
| 38 | __asm__ __volatile__( \ | ||
| 39 | "ldr %0, [%1, %2]" \ | ||
| 40 | : "=r" (__v) \ | ||
| 41 | : "r" (__r), "Ir" (o)); \ | ||
| 42 | __v; \ | ||
| 43 | }) | ||
| 44 | |||
| 45 | #define __arch_base_putb(v,b,o) \ | ||
| 46 | ({ \ | ||
| 47 | unsigned int __r = (b); \ | ||
| 48 | __asm__ __volatile__( \ | ||
| 49 | "strb %0, [%1, %2]" \ | ||
| 50 | : \ | ||
| 51 | : "r" (v), "r" (__r), "Ir" (o));\ | ||
| 52 | }) | ||
| 53 | |||
| 54 | #define __arch_base_putl(v,b,o) \ | ||
| 55 | ({ \ | ||
| 56 | unsigned int __r = (b); \ | ||
| 57 | __asm__ __volatile__( \ | ||
| 58 | "str %0, [%1, %2]" \ | ||
| 59 | : \ | ||
| 60 | : "r" (v), "r" (__r), "Ir" (o));\ | ||
| 61 | }) | ||
| 62 | |||
| 63 | /* | ||
| 64 | * We use two different types of addressing - PC style addresses, and ARM | 21 | * We use two different types of addressing - PC style addresses, and ARM |
| 65 | * addresses. PC style accesses the PC hardware with the normal PC IO | 22 | * addresses. PC style accesses the PC hardware with the normal PC IO |
| 66 | * addresses, eg 0x3f8 for serial#1. ARM addresses are 0x80000000+ | 23 | * addresses, eg 0x3f8 for serial#1. ARM addresses are 0x80000000+ |
| @@ -232,15 +189,13 @@ DECLARE_IO(int,l,"") | |||
| 232 | result; \ | 189 | result; \ |
| 233 | }) | 190 | }) |
| 234 | 191 | ||
| 235 | #define __ioaddrc(port) __ioaddr(port) | ||
| 236 | |||
| 237 | #define inb(p) (__builtin_constant_p((p)) ? __inbc(p) : __inb(p)) | 192 | #define inb(p) (__builtin_constant_p((p)) ? __inbc(p) : __inb(p)) |
| 238 | #define inw(p) (__builtin_constant_p((p)) ? __inwc(p) : __inw(p)) | 193 | #define inw(p) (__builtin_constant_p((p)) ? __inwc(p) : __inw(p)) |
| 239 | #define inl(p) (__builtin_constant_p((p)) ? __inlc(p) : __inl(p)) | 194 | #define inl(p) (__builtin_constant_p((p)) ? __inlc(p) : __inl(p)) |
| 240 | #define outb(v,p) (__builtin_constant_p((p)) ? __outbc(v,p) : __outb(v,p)) | 195 | #define outb(v,p) (__builtin_constant_p((p)) ? __outbc(v,p) : __outb(v,p)) |
| 241 | #define outw(v,p) (__builtin_constant_p((p)) ? __outwc(v,p) : __outw(v,p)) | 196 | #define outw(v,p) (__builtin_constant_p((p)) ? __outwc(v,p) : __outw(v,p)) |
| 242 | #define outl(v,p) (__builtin_constant_p((p)) ? __outlc(v,p) : __outl(v,p)) | 197 | #define outl(v,p) (__builtin_constant_p((p)) ? __outlc(v,p) : __outl(v,p)) |
| 243 | #define __ioaddr(p) (__builtin_constant_p((p)) ? __ioaddr(p) : __ioaddrc(p)) | 198 | |
| 244 | /* the following macro is deprecated */ | 199 | /* the following macro is deprecated */ |
| 245 | #define ioaddr(port) ((unsigned long)__ioaddr((port))) | 200 | #define ioaddr(port) ((unsigned long)__ioaddr((port))) |
| 246 | 201 | ||
diff --git a/arch/arm/mach-rpc/include/mach/irqs.h b/arch/arm/mach-rpc/include/mach/irqs.h index 4ce6ca97f669..3d2037496e38 100644 --- a/arch/arm/mach-rpc/include/mach/irqs.h +++ b/arch/arm/mach-rpc/include/mach/irqs.h | |||
| @@ -44,3 +44,4 @@ | |||
| 44 | 44 | ||
| 45 | #define IRQ_TIMER IRQ_TIMER0 | 45 | #define IRQ_TIMER IRQ_TIMER0 |
| 46 | 46 | ||
| 47 | #define NR_IRQS 128 | ||
diff --git a/arch/arm/mach-rpc/include/mach/dma.h b/arch/arm/mach-rpc/include/mach/isa-dma.h index 360b56f8f29f..bad720548587 100644 --- a/arch/arm/mach-rpc/include/mach/dma.h +++ b/arch/arm/mach-rpc/include/mach/isa-dma.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-rpc/include/mach/dma.h | 2 | * arch/arm/mach-rpc/include/mach/isa-dma.h |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 Russell King | 4 | * Copyright (C) 1997 Russell King |
| 5 | * | 5 | * |
| @@ -10,12 +10,6 @@ | |||
| 10 | #ifndef __ASM_ARCH_DMA_H | 10 | #ifndef __ASM_ARCH_DMA_H |
| 11 | #define __ASM_ARCH_DMA_H | 11 | #define __ASM_ARCH_DMA_H |
| 12 | 12 | ||
| 13 | /* | ||
| 14 | * This is the maximum DMA address that can be DMAd to. | ||
| 15 | * There should not be more than (0xd0000000 - 0xc0000000) | ||
| 16 | * bytes of RAM. | ||
| 17 | */ | ||
| 18 | #define MAX_DMA_ADDRESS 0xd0000000 | ||
| 19 | #define MAX_DMA_CHANNELS 8 | 13 | #define MAX_DMA_CHANNELS 8 |
| 20 | 14 | ||
| 21 | #define DMA_0 0 | 15 | #define DMA_0 0 |
diff --git a/arch/arm/mach-rpc/include/mach/memory.h b/arch/arm/mach-rpc/include/mach/memory.h index 9bf7e43e2863..78191bf25192 100644 --- a/arch/arm/mach-rpc/include/mach/memory.h +++ b/arch/arm/mach-rpc/include/mach/memory.h | |||
| @@ -24,13 +24,6 @@ | |||
| 24 | #define PHYS_OFFSET UL(0x10000000) | 24 | #define PHYS_OFFSET UL(0x10000000) |
| 25 | 25 | ||
| 26 | /* | 26 | /* |
| 27 | * These are exactly the same on the RiscPC as the | ||
| 28 | * physical memory view. | ||
| 29 | */ | ||
| 30 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 31 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 32 | |||
| 33 | /* | ||
| 34 | * Cache flushing area - ROM | 27 | * Cache flushing area - ROM |
| 35 | */ | 28 | */ |
| 36 | #define FLUSH_BASE_PHYS 0x00000000 | 29 | #define FLUSH_BASE_PHYS 0x00000000 |
diff --git a/arch/arm/mach-s3c2400/include/mach/memory.h b/arch/arm/mach-s3c2400/include/mach/memory.h index 8f4878e4f591..cf5901ffd385 100644 --- a/arch/arm/mach-s3c2400/include/mach/memory.h +++ b/arch/arm/mach-s3c2400/include/mach/memory.h | |||
| @@ -17,7 +17,4 @@ | |||
| 17 | 17 | ||
| 18 | #define PHYS_OFFSET UL(0x0C000000) | 18 | #define PHYS_OFFSET UL(0x0C000000) |
| 19 | 19 | ||
| 20 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 21 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 22 | |||
| 23 | #endif | 20 | #endif |
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index 99fdc736698c..7315569fbfd7 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | config CPU_S3C2410 | 7 | config CPU_S3C2410 |
| 8 | bool | 8 | bool |
| 9 | depends on ARCH_S3C2410 | 9 | depends on ARCH_S3C2410 |
| 10 | select CPU_ARM920T | ||
| 10 | select S3C2410_CLOCK | 11 | select S3C2410_CLOCK |
| 11 | select S3C2410_GPIO | 12 | select S3C2410_GPIO |
| 12 | select CPU_LLSERIAL_S3C2410 | 13 | select CPU_LLSERIAL_S3C2410 |
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c index 7d914a470b6c..552b4c778fdc 100644 --- a/arch/arm/mach-s3c2410/dma.c +++ b/arch/arm/mach-s3c2410/dma.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/sysdev.h> | 17 | #include <linux/sysdev.h> |
| 18 | #include <linux/serial_core.h> | 18 | #include <linux/serial_core.h> |
| 19 | 19 | ||
| 20 | #include <asm/dma.h> | ||
| 21 | #include <mach/dma.h> | 20 | #include <mach/dma.h> |
| 22 | 21 | ||
| 23 | #include <plat/cpu.h> | 22 | #include <plat/cpu.h> |
| @@ -25,12 +24,12 @@ | |||
| 25 | 24 | ||
| 26 | #include <plat/regs-serial.h> | 25 | #include <plat/regs-serial.h> |
| 27 | #include <mach/regs-gpio.h> | 26 | #include <mach/regs-gpio.h> |
| 28 | #include <asm/plat-s3c/regs-ac97.h> | 27 | #include <plat/regs-ac97.h> |
| 29 | #include <mach/regs-mem.h> | 28 | #include <mach/regs-mem.h> |
| 30 | #include <mach/regs-lcd.h> | 29 | #include <mach/regs-lcd.h> |
| 31 | #include <mach/regs-sdi.h> | 30 | #include <mach/regs-sdi.h> |
| 32 | #include <asm/plat-s3c24xx/regs-iis.h> | 31 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 33 | #include <asm/plat-s3c24xx/regs-spi.h> | 32 | #include <plat/regs-spi.h> |
| 34 | 33 | ||
| 35 | static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = { | 34 | static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = { |
| 36 | [DMACH_XD0] = { | 35 | [DMACH_XD0] = { |
diff --git a/arch/arm/mach-s3c2410/include/mach/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h index 891b53cd69b8..13358ce2128c 100644 --- a/arch/arm/mach-s3c2410/include/mach/dma.h +++ b/arch/arm/mach-s3c2410/include/mach/dma.h | |||
| @@ -16,11 +16,6 @@ | |||
| 16 | #include <linux/sysdev.h> | 16 | #include <linux/sysdev.h> |
| 17 | #include <mach/hardware.h> | 17 | #include <mach/hardware.h> |
| 18 | 18 | ||
| 19 | /* | ||
| 20 | * This is the maximum DMA address(physical address) that can be DMAd to. | ||
| 21 | * | ||
| 22 | */ | ||
| 23 | #define MAX_DMA_ADDRESS 0x40000000 | ||
| 24 | #define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */ | 19 | #define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */ |
| 25 | 20 | ||
| 26 | /* We use `virtual` dma channels to hide the fact we have only a limited | 21 | /* We use `virtual` dma channels to hide the fact we have only a limited |
| @@ -254,7 +249,7 @@ typedef unsigned long dma_device_t; | |||
| 254 | * request a dma channel exclusivley | 249 | * request a dma channel exclusivley |
| 255 | */ | 250 | */ |
| 256 | 251 | ||
| 257 | extern int s3c2410_dma_request(dmach_t channel, | 252 | extern int s3c2410_dma_request(unsigned int channel, |
| 258 | struct s3c2410_dma_client *, void *dev); | 253 | struct s3c2410_dma_client *, void *dev); |
| 259 | 254 | ||
| 260 | 255 | ||
| @@ -263,14 +258,14 @@ extern int s3c2410_dma_request(dmach_t channel, | |||
| 263 | * change the state of the dma channel | 258 | * change the state of the dma channel |
| 264 | */ | 259 | */ |
| 265 | 260 | ||
| 266 | extern int s3c2410_dma_ctrl(dmach_t channel, enum s3c2410_chan_op op); | 261 | extern int s3c2410_dma_ctrl(unsigned int channel, enum s3c2410_chan_op op); |
| 267 | 262 | ||
| 268 | /* s3c2410_dma_setflags | 263 | /* s3c2410_dma_setflags |
| 269 | * | 264 | * |
| 270 | * set the channel's flags to a given state | 265 | * set the channel's flags to a given state |
| 271 | */ | 266 | */ |
| 272 | 267 | ||
| 273 | extern int s3c2410_dma_setflags(dmach_t channel, | 268 | extern int s3c2410_dma_setflags(unsigned int channel, |
| 274 | unsigned int flags); | 269 | unsigned int flags); |
| 275 | 270 | ||
| 276 | /* s3c2410_dma_free | 271 | /* s3c2410_dma_free |
| @@ -278,7 +273,7 @@ extern int s3c2410_dma_setflags(dmach_t channel, | |||
| 278 | * free the dma channel (will also abort any outstanding operations) | 273 | * free the dma channel (will also abort any outstanding operations) |
| 279 | */ | 274 | */ |
| 280 | 275 | ||
| 281 | extern int s3c2410_dma_free(dmach_t channel, struct s3c2410_dma_client *); | 276 | extern int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *); |
| 282 | 277 | ||
| 283 | /* s3c2410_dma_enqueue | 278 | /* s3c2410_dma_enqueue |
| 284 | * | 279 | * |
| @@ -287,7 +282,7 @@ extern int s3c2410_dma_free(dmach_t channel, struct s3c2410_dma_client *); | |||
| 287 | * drained before the buffer is given to the DMA system. | 282 | * drained before the buffer is given to the DMA system. |
| 288 | */ | 283 | */ |
| 289 | 284 | ||
| 290 | extern int s3c2410_dma_enqueue(dmach_t channel, void *id, | 285 | extern int s3c2410_dma_enqueue(unsigned int channel, void *id, |
| 291 | dma_addr_t data, int size); | 286 | dma_addr_t data, int size); |
| 292 | 287 | ||
| 293 | /* s3c2410_dma_config | 288 | /* s3c2410_dma_config |
| @@ -295,7 +290,7 @@ extern int s3c2410_dma_enqueue(dmach_t channel, void *id, | |||
| 295 | * configure the dma channel | 290 | * configure the dma channel |
| 296 | */ | 291 | */ |
| 297 | 292 | ||
| 298 | extern int s3c2410_dma_config(dmach_t channel, int xferunit, int dcon); | 293 | extern int s3c2410_dma_config(unsigned int channel, int xferunit, int dcon); |
| 299 | 294 | ||
| 300 | /* s3c2410_dma_devconfig | 295 | /* s3c2410_dma_devconfig |
| 301 | * | 296 | * |
| @@ -310,11 +305,11 @@ extern int s3c2410_dma_devconfig(int channel, enum s3c2410_dmasrc source, | |||
| 310 | * get the position that the dma transfer is currently at | 305 | * get the position that the dma transfer is currently at |
| 311 | */ | 306 | */ |
| 312 | 307 | ||
| 313 | extern int s3c2410_dma_getposition(dmach_t channel, | 308 | extern int s3c2410_dma_getposition(unsigned int channel, |
| 314 | dma_addr_t *src, dma_addr_t *dest); | 309 | dma_addr_t *src, dma_addr_t *dest); |
| 315 | 310 | ||
| 316 | extern int s3c2410_dma_set_opfn(dmach_t, s3c2410_dma_opfn_t rtn); | 311 | extern int s3c2410_dma_set_opfn(unsigned int, s3c2410_dma_opfn_t rtn); |
| 317 | extern int s3c2410_dma_set_buffdone_fn(dmach_t, s3c2410_dma_cbfn_t rtn); | 312 | extern int s3c2410_dma_set_buffdone_fn(unsigned int, s3c2410_dma_cbfn_t rtn); |
| 318 | 313 | ||
| 319 | /* DMA Register definitions */ | 314 | /* DMA Register definitions */ |
| 320 | 315 | ||
diff --git a/arch/arm/mach-s3c2410/include/mach/memory.h b/arch/arm/mach-s3c2410/include/mach/memory.h index 93782628a786..6f1e5871ae4b 100644 --- a/arch/arm/mach-s3c2410/include/mach/memory.h +++ b/arch/arm/mach-s3c2410/include/mach/memory.h | |||
| @@ -13,7 +13,4 @@ | |||
| 13 | 13 | ||
| 14 | #define PHYS_OFFSET UL(0x30000000) | 14 | #define PHYS_OFFSET UL(0x30000000) |
| 15 | 15 | ||
| 16 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 17 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 18 | |||
| 19 | #endif | 16 | #endif |
diff --git a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h index 3fe8be9ca110..980a099e209c 100644 --- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h | |||
| @@ -18,6 +18,7 @@ struct s3c2410_spigpio_info { | |||
| 18 | unsigned long pin_mosi; | 18 | unsigned long pin_mosi; |
| 19 | unsigned long pin_miso; | 19 | unsigned long pin_miso; |
| 20 | 20 | ||
| 21 | int num_chipselect; | ||
| 21 | int bus_num; | 22 | int bus_num; |
| 22 | 23 | ||
| 23 | void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs); | 24 | void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs); |
diff --git a/arch/arm/mach-s3c2410/include/mach/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h index 43535a0e7186..7613d0a384ba 100644 --- a/arch/arm/mach-s3c2410/include/mach/system-reset.h +++ b/arch/arm/mach-s3c2410/include/mach/system-reset.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <mach/hardware.h> | 13 | #include <mach/hardware.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | 15 | ||
| 16 | #include <asm/plat-s3c/regs-watchdog.h> | 16 | #include <plat/regs-watchdog.h> |
| 17 | #include <mach/regs-clock.h> | 17 | #include <mach/regs-clock.h> |
| 18 | 18 | ||
| 19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 8db9c700e3c2..c04c24444e0d 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
| @@ -44,8 +44,8 @@ | |||
| 44 | #include <mach/regs-mem.h> | 44 | #include <mach/regs-mem.h> |
| 45 | #include <mach/regs-lcd.h> | 45 | #include <mach/regs-lcd.h> |
| 46 | 46 | ||
| 47 | #include <asm/plat-s3c/nand.h> | 47 | #include <plat/nand.h> |
| 48 | #include <asm/plat-s3c/iic.h> | 48 | #include <plat/iic.h> |
| 49 | #include <mach/fb.h> | 49 | #include <mach/fb.h> |
| 50 | 50 | ||
| 51 | #include <linux/mtd/mtd.h> | 51 | #include <linux/mtd/mtd.h> |
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 98716d0108e9..32d550fcff4d 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include <mach/h1940.h> | 38 | #include <mach/h1940.h> |
| 39 | #include <mach/h1940-latch.h> | 39 | #include <mach/h1940-latch.h> |
| 40 | #include <mach/fb.h> | 40 | #include <mach/fb.h> |
| 41 | #include <asm/plat-s3c24xx/udc.h> | 41 | #include <plat/udc.h> |
| 42 | 42 | ||
| 43 | #include <plat/clock.h> | 43 | #include <plat/clock.h> |
| 44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index 82505517846c..7a7c45d28fe7 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c | |||
| @@ -40,14 +40,14 @@ | |||
| 40 | #include <asm/mach/irq.h> | 40 | #include <asm/mach/irq.h> |
| 41 | #include <asm/mach/map.h> | 41 | #include <asm/mach/map.h> |
| 42 | 42 | ||
| 43 | #include <asm/plat-s3c/iic.h> | 43 | #include <plat/iic.h> |
| 44 | #include <plat/regs-serial.h> | 44 | #include <plat/regs-serial.h> |
| 45 | 45 | ||
| 46 | #include <plat/clock.h> | 46 | #include <plat/clock.h> |
| 47 | #include <plat/cpu.h> | 47 | #include <plat/cpu.h> |
| 48 | #include <plat/devs.h> | 48 | #include <plat/devs.h> |
| 49 | #include <plat/s3c2410.h> | 49 | #include <plat/s3c2410.h> |
| 50 | #include <asm/plat-s3c24xx/udc.h> | 50 | #include <plat/udc.h> |
| 51 | 51 | ||
| 52 | static struct map_desc n30_iodesc[] __initdata = { | 52 | static struct map_desc n30_iodesc[] __initdata = { |
| 53 | /* nothing here yet */ | 53 | /* nothing here yet */ |
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c index 661807e14e8a..ef868472f6a4 100644 --- a/arch/arm/mach-s3c2410/mach-qt2410.c +++ b/arch/arm/mach-s3c2410/mach-qt2410.c | |||
| @@ -50,8 +50,8 @@ | |||
| 50 | #include <mach/leds-gpio.h> | 50 | #include <mach/leds-gpio.h> |
| 51 | #include <plat/regs-serial.h> | 51 | #include <plat/regs-serial.h> |
| 52 | #include <mach/fb.h> | 52 | #include <mach/fb.h> |
| 53 | #include <asm/plat-s3c/nand.h> | 53 | #include <plat/nand.h> |
| 54 | #include <asm/plat-s3c24xx/udc.h> | 54 | #include <plat/udc.h> |
| 55 | #include <mach/spi.h> | 55 | #include <mach/spi.h> |
| 56 | #include <mach/spi-gpio.h> | 56 | #include <mach/spi-gpio.h> |
| 57 | 57 | ||
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig index c59a9d2ee9a6..ca99564ae4b5 100644 --- a/arch/arm/mach-s3c2412/Kconfig +++ b/arch/arm/mach-s3c2412/Kconfig | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | config CPU_S3C2412 | 7 | config CPU_S3C2412 |
| 8 | bool | 8 | bool |
| 9 | depends on ARCH_S3C2410 | 9 | depends on ARCH_S3C2410 |
| 10 | select CPU_ARM926T | ||
| 10 | select CPU_LLSERIAL_S3C2440 | 11 | select CPU_LLSERIAL_S3C2440 |
| 11 | select S3C2412_PM if PM | 12 | select S3C2412_PM if PM |
| 12 | select S3C2412_DMA if S3C2410_DMA | 13 | select S3C2412_DMA if S3C2410_DMA |
diff --git a/arch/arm/mach-s3c2412/dma.c b/arch/arm/mach-s3c2412/dma.c index ba0591e71f32..919856c9433f 100644 --- a/arch/arm/mach-s3c2412/dma.c +++ b/arch/arm/mach-s3c2412/dma.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/serial_core.h> | 18 | #include <linux/serial_core.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | 20 | ||
| 21 | #include <asm/dma.h> | ||
| 22 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
| 23 | 22 | ||
| 24 | #include <plat/dma.h> | 23 | #include <plat/dma.h> |
| @@ -26,13 +25,13 @@ | |||
| 26 | 25 | ||
| 27 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
| 28 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
| 29 | #include <asm/plat-s3c/regs-ac97.h> | 28 | #include <plat/regs-ac97.h> |
| 30 | #include <mach/regs-mem.h> | 29 | #include <mach/regs-mem.h> |
| 31 | #include <mach/regs-lcd.h> | 30 | #include <mach/regs-lcd.h> |
| 32 | #include <mach/regs-sdi.h> | 31 | #include <mach/regs-sdi.h> |
| 33 | #include <asm/plat-s3c24xx/regs-s3c2412-iis.h> | 32 | #include <asm/plat-s3c24xx/regs-s3c2412-iis.h> |
| 34 | #include <asm/plat-s3c24xx/regs-iis.h> | 33 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 35 | #include <asm/plat-s3c24xx/regs-spi.h> | 34 | #include <plat/regs-spi.h> |
| 36 | 35 | ||
| 37 | #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID } | 36 | #define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID } |
| 38 | 37 | ||
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index b08f18c8c47a..25ff1ec9f8ad 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
| @@ -31,8 +31,8 @@ | |||
| 31 | #include <asm/mach/irq.h> | 31 | #include <asm/mach/irq.h> |
| 32 | 32 | ||
| 33 | #include <plat/regs-serial.h> | 33 | #include <plat/regs-serial.h> |
| 34 | #include <asm/plat-s3c/nand.h> | 34 | #include <plat/nand.h> |
| 35 | #include <asm/plat-s3c/iic.h> | 35 | #include <plat/iic.h> |
| 36 | 36 | ||
| 37 | #include <mach/regs-power.h> | 37 | #include <mach/regs-power.h> |
| 38 | #include <mach/regs-gpio.h> | 38 | #include <mach/regs-gpio.h> |
| @@ -52,7 +52,7 @@ | |||
| 52 | #include <plat/devs.h> | 52 | #include <plat/devs.h> |
| 53 | #include <plat/cpu.h> | 53 | #include <plat/cpu.h> |
| 54 | #include <plat/pm.h> | 54 | #include <plat/pm.h> |
| 55 | #include <asm/plat-s3c24xx/udc.h> | 55 | #include <plat/udc.h> |
| 56 | 56 | ||
| 57 | static struct map_desc jive_iodesc[] __initdata = { | 57 | static struct map_desc jive_iodesc[] __initdata = { |
| 58 | }; | 58 | }; |
diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c index c719b5a740a9..8fd17b8d5679 100644 --- a/arch/arm/mach-s3c2412/mach-smdk2413.c +++ b/arch/arm/mach-s3c2412/mach-smdk2413.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include <mach/regs-lcd.h> | 37 | #include <mach/regs-lcd.h> |
| 38 | 38 | ||
| 39 | #include <mach/idle.h> | 39 | #include <mach/idle.h> |
| 40 | #include <asm/plat-s3c24xx/udc.h> | 40 | #include <plat/udc.h> |
| 41 | #include <mach/fb.h> | 41 | #include <mach/fb.h> |
| 42 | 42 | ||
| 43 | #include <plat/s3c2410.h> | 43 | #include <plat/s3c2410.h> |
diff --git a/arch/arm/mach-s3c2412/mach-vstms.c b/arch/arm/mach-s3c2412/mach-vstms.c index 4cfa19ad9be0..da32a6cb17ae 100644 --- a/arch/arm/mach-s3c2412/mach-vstms.c +++ b/arch/arm/mach-s3c2412/mach-vstms.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <mach/idle.h> | 39 | #include <mach/idle.h> |
| 40 | #include <mach/fb.h> | 40 | #include <mach/fb.h> |
| 41 | 41 | ||
| 42 | #include <asm/plat-s3c/nand.h> | 42 | #include <plat/nand.h> |
| 43 | 43 | ||
| 44 | #include <plat/s3c2410.h> | 44 | #include <plat/s3c2410.h> |
| 45 | #include <plat/s3c2412.h> | 45 | #include <plat/s3c2412.h> |
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c index 313759c3da69..a086818e117e 100644 --- a/arch/arm/mach-s3c2412/s3c2412.c +++ b/arch/arm/mach-s3c2412/s3c2412.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <mach/regs-gpio.h> | 39 | #include <mach/regs-gpio.h> |
| 40 | #include <mach/regs-gpioj.h> | 40 | #include <mach/regs-gpioj.h> |
| 41 | #include <mach/regs-dsc.h> | 41 | #include <mach/regs-dsc.h> |
| 42 | #include <asm/plat-s3c24xx/regs-spi.h> | 42 | #include <plat/regs-spi.h> |
| 43 | #include <mach/regs-s3c2412.h> | 43 | #include <mach/regs-s3c2412.h> |
| 44 | 44 | ||
| 45 | #include <plat/s3c2412.h> | 45 | #include <plat/s3c2412.h> |
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 25de042ab996..0429d255b0d8 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | config CPU_S3C2440 | 7 | config CPU_S3C2440 |
| 8 | bool | 8 | bool |
| 9 | depends on ARCH_S3C2410 | 9 | depends on ARCH_S3C2410 |
| 10 | select CPU_ARM920T | ||
| 10 | select S3C2410_CLOCK | 11 | select S3C2410_CLOCK |
| 11 | select S3C2410_PM if PM | 12 | select S3C2410_PM if PM |
| 12 | select S3C2410_GPIO | 13 | select S3C2410_GPIO |
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c index 32303f6a8321..5b5ee0b8f4e0 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/sysdev.h> | 17 | #include <linux/sysdev.h> |
| 18 | #include <linux/serial_core.h> | 18 | #include <linux/serial_core.h> |
| 19 | 19 | ||
| 20 | #include <asm/dma.h> | ||
| 21 | #include <mach/dma.h> | 20 | #include <mach/dma.h> |
| 22 | 21 | ||
| 23 | #include <plat/dma.h> | 22 | #include <plat/dma.h> |
| @@ -25,12 +24,12 @@ | |||
| 25 | 24 | ||
| 26 | #include <plat/regs-serial.h> | 25 | #include <plat/regs-serial.h> |
| 27 | #include <mach/regs-gpio.h> | 26 | #include <mach/regs-gpio.h> |
| 28 | #include <asm/plat-s3c/regs-ac97.h> | 27 | #include <plat/regs-ac97.h> |
| 29 | #include <mach/regs-mem.h> | 28 | #include <mach/regs-mem.h> |
| 30 | #include <mach/regs-lcd.h> | 29 | #include <mach/regs-lcd.h> |
| 31 | #include <mach/regs-sdi.h> | 30 | #include <mach/regs-sdi.h> |
| 32 | #include <asm/plat-s3c24xx/regs-iis.h> | 31 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 33 | #include <asm/plat-s3c24xx/regs-spi.h> | 32 | #include <plat/regs-spi.h> |
| 34 | 33 | ||
| 35 | static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { | 34 | static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = { |
| 36 | [DMACH_XD0] = { | 35 | [DMACH_XD0] = { |
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index e2beca470484..334379bdfc6e 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <mach/regs-gpio.h> | 39 | #include <mach/regs-gpio.h> |
| 40 | #include <mach/regs-mem.h> | 40 | #include <mach/regs-mem.h> |
| 41 | #include <mach/regs-lcd.h> | 41 | #include <mach/regs-lcd.h> |
| 42 | #include <asm/plat-s3c/nand.h> | 42 | #include <plat/nand.h> |
| 43 | 43 | ||
| 44 | #include <linux/mtd/mtd.h> | 44 | #include <linux/mtd/mtd.h> |
| 45 | #include <linux/mtd/nand.h> | 45 | #include <linux/mtd/nand.h> |
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index 66876c6f2f1c..07b42a0207d1 100644 --- a/arch/arm/mach-s3c2440/mach-at2440evb.c +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <mach/regs-gpio.h> | 35 | #include <mach/regs-gpio.h> |
| 36 | #include <mach/regs-mem.h> | 36 | #include <mach/regs-mem.h> |
| 37 | #include <mach/regs-lcd.h> | 37 | #include <mach/regs-lcd.h> |
| 38 | #include <asm/plat-s3c/nand.h> | 38 | #include <plat/nand.h> |
| 39 | 39 | ||
| 40 | #include <linux/mtd/mtd.h> | 40 | #include <linux/mtd/mtd.h> |
| 41 | #include <linux/mtd/nand.h> | 41 | #include <linux/mtd/nand.h> |
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 2361d606abc5..884a3c7ae75f 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include <mach/regs-gpio.h> | 37 | #include <mach/regs-gpio.h> |
| 38 | #include <mach/regs-mem.h> | 38 | #include <mach/regs-mem.h> |
| 39 | #include <mach/regs-lcd.h> | 39 | #include <mach/regs-lcd.h> |
| 40 | #include <asm/plat-s3c/nand.h> | 40 | #include <plat/nand.h> |
| 41 | 41 | ||
| 42 | #include <linux/mtd/mtd.h> | 42 | #include <linux/mtd/mtd.h> |
| 43 | #include <linux/mtd/nand.h> | 43 | #include <linux/mtd/nand.h> |
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index 4d14c7cff892..fbd081de592f 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #include <mach/regs-lcd.h> | 42 | #include <mach/regs-lcd.h> |
| 43 | 43 | ||
| 44 | #include <mach/h1940.h> | 44 | #include <mach/h1940.h> |
| 45 | #include <asm/plat-s3c/nand.h> | 45 | #include <plat/nand.h> |
| 46 | #include <mach/fb.h> | 46 | #include <mach/fb.h> |
| 47 | 47 | ||
| 48 | #include <plat/clock.h> | 48 | #include <plat/clock.h> |
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index 26d131a77074..b289d198020e 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | config CPU_S3C2442 | 7 | config CPU_S3C2442 |
| 8 | bool | 8 | bool |
| 9 | depends on ARCH_S3C2410 | 9 | depends on ARCH_S3C2410 |
| 10 | select CPU_ARM920T | ||
| 10 | select S3C2410_CLOCK | 11 | select S3C2410_CLOCK |
| 11 | select S3C2410_GPIO | 12 | select S3C2410_GPIO |
| 12 | select S3C2410_PM if PM | 13 | select S3C2410_PM if PM |
diff --git a/arch/arm/mach-s3c2443/dma.c b/arch/arm/mach-s3c2443/dma.c index f73ccb25ff94..2a58a4d5aa5a 100644 --- a/arch/arm/mach-s3c2443/dma.c +++ b/arch/arm/mach-s3c2443/dma.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/serial_core.h> | 18 | #include <linux/serial_core.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | 20 | ||
| 21 | #include <asm/dma.h> | ||
| 22 | #include <mach/dma.h> | 21 | #include <mach/dma.h> |
| 23 | 22 | ||
| 24 | #include <plat/dma.h> | 23 | #include <plat/dma.h> |
| @@ -26,12 +25,12 @@ | |||
| 26 | 25 | ||
| 27 | #include <plat/regs-serial.h> | 26 | #include <plat/regs-serial.h> |
| 28 | #include <mach/regs-gpio.h> | 27 | #include <mach/regs-gpio.h> |
| 29 | #include <asm/plat-s3c/regs-ac97.h> | 28 | #include <plat/regs-ac97.h> |
| 30 | #include <mach/regs-mem.h> | 29 | #include <mach/regs-mem.h> |
| 31 | #include <mach/regs-lcd.h> | 30 | #include <mach/regs-lcd.h> |
| 32 | #include <mach/regs-sdi.h> | 31 | #include <mach/regs-sdi.h> |
| 33 | #include <asm/plat-s3c24xx/regs-iis.h> | 32 | #include <asm/plat-s3c24xx/regs-iis.h> |
| 34 | #include <asm/plat-s3c24xx/regs-spi.h> | 33 | #include <plat/regs-spi.h> |
| 35 | 34 | ||
| 36 | #define MAP(x) { \ | 35 | #define MAP(x) { \ |
| 37 | [0] = (x) | DMA_CH_VALID, \ | 36 | [0] = (x) | DMA_CH_VALID, \ |
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index fe289997cfaf..2052eb88c961 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c | |||
| @@ -68,23 +68,22 @@ struct platform_device colliescoop_device = { | |||
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | static struct scoop_pcmcia_dev collie_pcmcia_scoop[] = { | 70 | static struct scoop_pcmcia_dev collie_pcmcia_scoop[] = { |
| 71 | { | 71 | { |
| 72 | .dev = &colliescoop_device.dev, | 72 | .dev = &colliescoop_device.dev, |
| 73 | .irq = COLLIE_IRQ_GPIO_CF_IRQ, | 73 | .irq = COLLIE_IRQ_GPIO_CF_IRQ, |
| 74 | .cd_irq = COLLIE_IRQ_GPIO_CF_CD, | 74 | .cd_irq = COLLIE_IRQ_GPIO_CF_CD, |
| 75 | .cd_irq_str = "PCMCIA0 CD", | 75 | .cd_irq_str = "PCMCIA0 CD", |
| 76 | }, | 76 | }, |
| 77 | }; | 77 | }; |
| 78 | 78 | ||
| 79 | static struct scoop_pcmcia_config collie_pcmcia_config = { | 79 | static struct scoop_pcmcia_config collie_pcmcia_config = { |
| 80 | .devs = &collie_pcmcia_scoop[0], | 80 | .devs = &collie_pcmcia_scoop[0], |
| 81 | .num_devs = 1, | 81 | .num_devs = 1, |
| 82 | }; | 82 | }; |
| 83 | 83 | ||
| 84 | |||
| 85 | static struct mcp_plat_data collie_mcp_data = { | 84 | static struct mcp_plat_data collie_mcp_data = { |
| 86 | .mccr0 = MCCR0_ADM | MCCR0_ExtClk, | 85 | .mccr0 = MCCR0_ADM | MCCR0_ExtClk, |
| 87 | .sclk_rate = 9216000, | 86 | .sclk_rate = 9216000, |
| 88 | }; | 87 | }; |
| 89 | 88 | ||
| 90 | #ifdef CONFIG_SHARP_LOCOMO | 89 | #ifdef CONFIG_SHARP_LOCOMO |
| @@ -95,14 +94,14 @@ struct platform_device collie_locomo_device; | |||
| 95 | 94 | ||
| 96 | static void collie_uart_set_mctrl(struct uart_port *port, u_int mctrl) | 95 | static void collie_uart_set_mctrl(struct uart_port *port, u_int mctrl) |
| 97 | { | 96 | { |
| 98 | if (mctrl & TIOCM_RTS) | 97 | if (mctrl & TIOCM_RTS) |
| 99 | locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 0); | 98 | locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 0); |
| 100 | else | 99 | else |
| 101 | locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 1); | 100 | locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 1); |
| 102 | 101 | ||
| 103 | if (mctrl & TIOCM_DTR) | 102 | if (mctrl & TIOCM_DTR) |
| 104 | locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 0); | 103 | locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 0); |
| 105 | else | 104 | else |
| 106 | locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 1); | 105 | locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 1); |
| 107 | } | 106 | } |
| 108 | 107 | ||
diff --git a/arch/arm/mach-sa1100/collie_pm.c b/arch/arm/mach-sa1100/collie_pm.c index b1161fc80602..b39307f26b52 100644 --- a/arch/arm/mach-sa1100/collie_pm.c +++ b/arch/arm/mach-sa1100/collie_pm.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <asm/irq.h> | 26 | #include <asm/irq.h> |
| 27 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
| 28 | #include <asm/hardware/scoop.h> | 28 | #include <asm/hardware/scoop.h> |
| 29 | #include <asm/dma.h> | 29 | #include <mach/dma.h> |
| 30 | #include <mach/collie.h> | 30 | #include <mach/collie.h> |
| 31 | #include <asm/mach/sharpsl_param.h> | 31 | #include <asm/mach/sharpsl_param.h> |
| 32 | #include <asm/hardware/sharpsl_pm.h> | 32 | #include <asm/hardware/sharpsl_pm.h> |
| @@ -263,24 +263,24 @@ static int __init collie_pm_ucb_add(struct ucb1x00_dev *pdev) | |||
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | static struct ucb1x00_driver collie_pm_ucb_driver = { | 265 | static struct ucb1x00_driver collie_pm_ucb_driver = { |
| 266 | .add = collie_pm_ucb_add, | 266 | .add = collie_pm_ucb_add, |
| 267 | }; | 267 | }; |
| 268 | 268 | ||
| 269 | static struct platform_device *collie_pm_device; | 269 | static struct platform_device *collie_pm_device; |
| 270 | 270 | ||
| 271 | static int __init collie_pm_init(void) | 271 | static int __init collie_pm_init(void) |
| 272 | { | 272 | { |
| 273 | int ret; | 273 | int ret; |
| 274 | 274 | ||
| 275 | collie_pm_device = platform_device_alloc("sharpsl-pm", -1); | 275 | collie_pm_device = platform_device_alloc("sharpsl-pm", -1); |
| 276 | if (!collie_pm_device) | 276 | if (!collie_pm_device) |
| 277 | return -ENOMEM; | 277 | return -ENOMEM; |
| 278 | 278 | ||
| 279 | collie_pm_device->dev.platform_data = &collie_pm_machinfo; | 279 | collie_pm_device->dev.platform_data = &collie_pm_machinfo; |
| 280 | ret = platform_device_add(collie_pm_device); | 280 | ret = platform_device_add(collie_pm_device); |
| 281 | 281 | ||
| 282 | if (ret) | 282 | if (ret) |
| 283 | platform_device_put(collie_pm_device); | 283 | platform_device_put(collie_pm_device); |
| 284 | 284 | ||
| 285 | if (!ret) | 285 | if (!ret) |
| 286 | ret = ucb1x00_register_driver(&collie_pm_ucb_driver); | 286 | ret = ucb1x00_register_driver(&collie_pm_ucb_driver); |
| @@ -291,7 +291,7 @@ static int __init collie_pm_init(void) | |||
| 291 | static void __exit collie_pm_exit(void) | 291 | static void __exit collie_pm_exit(void) |
| 292 | { | 292 | { |
| 293 | ucb1x00_unregister_driver(&collie_pm_ucb_driver); | 293 | ucb1x00_unregister_driver(&collie_pm_ucb_driver); |
| 294 | platform_device_unregister(collie_pm_device); | 294 | platform_device_unregister(collie_pm_device); |
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | module_init(collie_pm_init); | 297 | module_init(collie_pm_init); |
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c index 244d5956312c..ef817876a5d6 100644 --- a/arch/arm/mach-sa1100/cpu-sa1100.c +++ b/arch/arm/mach-sa1100/cpu-sa1100.c | |||
| @@ -3,17 +3,17 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2000 2001, The Delft University of Technology | 4 | * Copyright (C) 2000 2001, The Delft University of Technology |
| 5 | * | 5 | * |
| 6 | * Authors: | 6 | * Authors: |
| 7 | * - Johan Pouwelse (J.A.Pouwelse@its.tudelft.nl): initial version | 7 | * - Johan Pouwelse (J.A.Pouwelse@its.tudelft.nl): initial version |
| 8 | * - Erik Mouw (J.A.K.Mouw@its.tudelft.nl): | 8 | * - Erik Mouw (J.A.K.Mouw@its.tudelft.nl): |
| 9 | * - major rewrite for linux-2.3.99 | 9 | * - major rewrite for linux-2.3.99 |
| 10 | * - rewritten for the more generic power management scheme in | 10 | * - rewritten for the more generic power management scheme in |
| 11 | * linux-2.4.5-rmk1 | 11 | * linux-2.4.5-rmk1 |
| 12 | * | 12 | * |
| 13 | * This software has been developed while working on the LART | 13 | * This software has been developed while working on the LART |
| 14 | * computing board (http://www.lartmaker.nl/), which is | 14 | * computing board (http://www.lartmaker.nl/), which is |
| 15 | * sponsored by the Mobile Multi-media Communications | 15 | * sponsored by the Mobile Multi-media Communications |
| 16 | * (http://www.mmc.tudelft.nl/) and Ubiquitous Communications | 16 | * (http://www.mmc.tudelft.nl/) and Ubiquitous Communications |
| 17 | * (http://www.ubicom.tudelft.nl/) projects. | 17 | * (http://www.ubicom.tudelft.nl/) projects. |
| 18 | * | 18 | * |
| 19 | * The authors can be reached at: | 19 | * The authors can be reached at: |
| @@ -36,7 +36,7 @@ | |||
| 36 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 36 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 37 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 37 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 38 | * GNU General Public License for more details. | 38 | * GNU General Public License for more details. |
| 39 | * | 39 | * |
| 40 | * You should have received a copy of the GNU General Public License | 40 | * You should have received a copy of the GNU General Public License |
| 41 | * along with this program; if not, write to the Free Software | 41 | * along with this program; if not, write to the Free Software |
| 42 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 42 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| @@ -44,7 +44,7 @@ | |||
| 44 | * | 44 | * |
| 45 | * Theory of operations | 45 | * Theory of operations |
| 46 | * ==================== | 46 | * ==================== |
| 47 | * | 47 | * |
| 48 | * Clock scaling can be used to lower the power consumption of the CPU | 48 | * Clock scaling can be used to lower the power consumption of the CPU |
| 49 | * core. This will give you a somewhat longer running time. | 49 | * core. This will give you a somewhat longer running time. |
| 50 | * | 50 | * |
| @@ -58,11 +58,11 @@ | |||
| 58 | * MDCNFG 0xA0000000 DRAM config | 58 | * MDCNFG 0xA0000000 DRAM config |
| 59 | * MDCAS0 0xA0000004 Access waveform | 59 | * MDCAS0 0xA0000004 Access waveform |
| 60 | * MDCAS1 0xA0000008 Access waveform | 60 | * MDCAS1 0xA0000008 Access waveform |
| 61 | * MDCAS2 0xA000000C Access waveform | 61 | * MDCAS2 0xA000000C Access waveform |
| 62 | * | 62 | * |
| 63 | * Care must be taken to change the DRAM parameters the correct way, | 63 | * Care must be taken to change the DRAM parameters the correct way, |
| 64 | * because otherwise the DRAM becomes unusable and the kernel will | 64 | * because otherwise the DRAM becomes unusable and the kernel will |
| 65 | * crash. | 65 | * crash. |
| 66 | * | 66 | * |
| 67 | * The simple solution to avoid a kernel crash is to put the actual | 67 | * The simple solution to avoid a kernel crash is to put the actual |
| 68 | * clock change in ROM and jump to that code from the kernel. The main | 68 | * clock change in ROM and jump to that code from the kernel. The main |
| @@ -75,7 +75,7 @@ | |||
| 75 | * as long as all re-configuration steps yield a valid DRAM | 75 | * as long as all re-configuration steps yield a valid DRAM |
| 76 | * configuration. The advantages are clear: it will run on all SA-1100 | 76 | * configuration. The advantages are clear: it will run on all SA-1100 |
| 77 | * platforms, and the code is very simple. | 77 | * platforms, and the code is very simple. |
| 78 | * | 78 | * |
| 79 | * If you really want to understand what is going on in | 79 | * If you really want to understand what is going on in |
| 80 | * sa1100_update_dram_timings(), you'll have to read sections 8.2, | 80 | * sa1100_update_dram_timings(), you'll have to read sections 8.2, |
| 81 | * 9.5.7.3, and 10.2 from the "Intel StrongARM SA-1100 Microprocessor | 81 | * 9.5.7.3, and 10.2 from the "Intel StrongARM SA-1100 Microprocessor |
| @@ -97,7 +97,7 @@ | |||
| 97 | typedef struct { | 97 | typedef struct { |
| 98 | int speed; | 98 | int speed; |
| 99 | u32 mdcnfg; | 99 | u32 mdcnfg; |
| 100 | u32 mdcas0; | 100 | u32 mdcas0; |
| 101 | u32 mdcas1; | 101 | u32 mdcas1; |
| 102 | u32 mdcas2; | 102 | u32 mdcas2; |
| 103 | } sa1100_dram_regs_t; | 103 | } sa1100_dram_regs_t; |
| @@ -147,7 +147,7 @@ static void sa1100_update_dram_timings(int current_speed, int new_speed) | |||
| 147 | /* No risk, no fun: run with interrupts on! */ | 147 | /* No risk, no fun: run with interrupts on! */ |
| 148 | if (new_speed > current_speed) { | 148 | if (new_speed > current_speed) { |
| 149 | /* We're going FASTER, so first relax the memory | 149 | /* We're going FASTER, so first relax the memory |
| 150 | * timings before changing the core frequency | 150 | * timings before changing the core frequency |
| 151 | */ | 151 | */ |
| 152 | 152 | ||
| 153 | /* Half the memory access clock */ | 153 | /* Half the memory access clock */ |
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c index 3e4fb214eada..63b32b68b296 100644 --- a/arch/arm/mach-sa1100/cpu-sa1110.c +++ b/arch/arm/mach-sa1100/cpu-sa1110.c | |||
| @@ -81,14 +81,14 @@ static struct sdram_params sdram_tbl[] __initdata = { | |||
| 81 | .twr = 9, | 81 | .twr = 9, |
| 82 | .refresh = 64000, | 82 | .refresh = 64000, |
| 83 | .cas_latency = 3, | 83 | .cas_latency = 3, |
| 84 | }, { /* Samsung K4S281632B-1H */ | 84 | }, { /* Samsung K4S281632B-1H */ |
| 85 | .name = "K4S281632B-1H", | 85 | .name = "K4S281632B-1H", |
| 86 | .rows = 12, | 86 | .rows = 12, |
| 87 | .tck = 10, | 87 | .tck = 10, |
| 88 | .trp = 20, | 88 | .trp = 20, |
| 89 | .twr = 10, | 89 | .twr = 10, |
| 90 | .refresh = 64000, | 90 | .refresh = 64000, |
| 91 | .cas_latency = 3, | 91 | .cas_latency = 3, |
| 92 | }, { /* Samsung KM416S4030CT */ | 92 | }, { /* Samsung KM416S4030CT */ |
| 93 | .name = "KM416S4030CT", | 93 | .name = "KM416S4030CT", |
| 94 | .rows = 13, | 94 | .rows = 13, |
| @@ -220,7 +220,7 @@ sdram_update_refresh(u_int cpu_khz, struct sdram_params *sdram) | |||
| 220 | } | 220 | } |
| 221 | 221 | ||
| 222 | /* | 222 | /* |
| 223 | * Ok, set the CPU frequency. | 223 | * Ok, set the CPU frequency. |
| 224 | */ | 224 | */ |
| 225 | static int sa1110_target(struct cpufreq_policy *policy, | 225 | static int sa1110_target(struct cpufreq_policy *policy, |
| 226 | unsigned int target_freq, | 226 | unsigned int target_freq, |
diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c index f990a3e85846..95f9c5a6d6d5 100644 --- a/arch/arm/mach-sa1100/dma.c +++ b/arch/arm/mach-sa1100/dma.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <asm/system.h> | 19 | #include <asm/system.h> |
| 20 | #include <asm/irq.h> | 20 | #include <asm/irq.h> |
| 21 | #include <mach/hardware.h> | 21 | #include <mach/hardware.h> |
| 22 | #include <asm/dma.h> | 22 | #include <mach/dma.h> |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | #undef DEBUG | 25 | #undef DEBUG |
| @@ -113,10 +113,10 @@ int sa1100_request_dma (dma_device_t device, const char *device_id, | |||
| 113 | } | 113 | } |
| 114 | } | 114 | } |
| 115 | if (!err) { | 115 | if (!err) { |
| 116 | if (dma) | 116 | if (dma) |
| 117 | dma->device = device; | 117 | dma->device = device; |
| 118 | else | 118 | else |
| 119 | err = -ENOSR; | 119 | err = -ENOSR; |
| 120 | } | 120 | } |
| 121 | spin_unlock(&dma_list_lock); | 121 | spin_unlock(&dma_list_lock); |
| 122 | if (err) | 122 | if (err) |
diff --git a/arch/arm/mach-sa1100/include/mach/h3600.h b/arch/arm/mach-sa1100/include/mach/h3600.h index 3ca0ecf095e6..9cc47fddb335 100644 --- a/arch/arm/mach-sa1100/include/mach/h3600.h +++ b/arch/arm/mach-sa1100/include/mach/h3600.h | |||
| @@ -32,14 +32,14 @@ typedef int __bitwise pm_request_t; | |||
| 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() || machine_is_h3800()) |
| 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) |
| 36 | #define H3600_BANK_2_PHYS SA1100_CS2_PHYS | 36 | #define H3600_BANK_2_PHYS SA1100_CS2_PHYS |
| 37 | #define H3600_BANK_4_PHYS SA1100_CS4_PHYS | 37 | #define H3600_BANK_4_PHYS SA1100_CS4_PHYS |
| 38 | 38 | ||
| 39 | /* Virtual memory regions corresponding to chip selects 2 & 4 (used on sleeves) */ | 39 | /* Virtual memory regions corresponding to chip selects 2 & 4 (used on sleeves) */ |
| 40 | #define H3600_EGPIO_VIRT 0xf0000000 | 40 | #define H3600_EGPIO_VIRT 0xf0000000 |
| 41 | #define H3600_BANK_2_VIRT 0xf1000000 | 41 | #define H3600_BANK_2_VIRT 0xf1000000 |
| 42 | #define H3600_BANK_4_VIRT 0xf3800000 | 42 | #define H3600_BANK_4_VIRT 0xf3800000 |
| 43 | 43 | ||
| 44 | /* | 44 | /* |
| 45 | Machine-independent GPIO definitions | 45 | Machine-independent GPIO definitions |
diff --git a/arch/arm/mach-sa1100/include/mach/io.h b/arch/arm/mach-sa1100/include/mach/io.h index 0c070a6149bc..d8b43f3dcd2d 100644 --- a/arch/arm/mach-sa1100/include/mach/io.h +++ b/arch/arm/mach-sa1100/include/mach/io.h | |||
| @@ -16,11 +16,7 @@ | |||
| 16 | * We don't actually have real ISA nor PCI buses, but there is so many | 16 | * We don't actually have real ISA nor PCI buses, but there is so many |
| 17 | * drivers out there that might just work if we fake them... | 17 | * drivers out there that might just work if we fake them... |
| 18 | */ | 18 | */ |
| 19 | static inline void __iomem *__io(unsigned long addr) | 19 | #define __io(a) __typesafe_io(a) |
| 20 | { | 20 | #define __mem_pci(a) (a) |
| 21 | return (void __iomem *)addr; | ||
| 22 | } | ||
| 23 | #define __io(a) __io(a) | ||
| 24 | #define __mem_pci(a) (a) | ||
| 25 | 21 | ||
| 26 | #endif | 22 | #endif |
diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h index 1c127b68581d..e9f8eed900f5 100644 --- a/arch/arm/mach-sa1100/include/mach/memory.h +++ b/arch/arm/mach-sa1100/include/mach/memory.h | |||
| @@ -23,23 +23,12 @@ void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes); | |||
| 23 | sa1111_adjust_zones(node, size, holes) | 23 | sa1111_adjust_zones(node, size, holes) |
| 24 | 24 | ||
| 25 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) | 25 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) |
| 26 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_1M) | ||
| 26 | 27 | ||
| 27 | #endif | 28 | #endif |
| 28 | #endif | 29 | #endif |
| 29 | 30 | ||
| 30 | /* | 31 | /* |
| 31 | * Virtual view <-> DMA view memory address translations | ||
| 32 | * virt_to_bus: Used to translate the virtual address to an | ||
| 33 | * address suitable to be passed to set_dma_addr | ||
| 34 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 35 | * to an address that the kernel can use. | ||
| 36 | * | ||
| 37 | * On the SA1100, bus addresses are equivalent to physical addresses. | ||
| 38 | */ | ||
| 39 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 40 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 41 | |||
| 42 | /* | ||
| 43 | * Because of the wide memory address space between physical RAM banks on the | 32 | * Because of the wide memory address space between physical RAM banks on the |
| 44 | * SA1100, it's much convenient to use Linux's SparseMEM support to implement | 33 | * SA1100, it's much convenient to use Linux's SparseMEM support to implement |
| 45 | * our memory map representation. Assuming all memory nodes have equal access | 34 | * our memory map representation. Assuming all memory nodes have equal access |
diff --git a/arch/arm/mach-sa1100/include/mach/mtd-xip.h b/arch/arm/mach-sa1100/include/mach/mtd-xip.h index eaa09e86ad16..b3d684098fbf 100644 --- a/arch/arm/mach-sa1100/include/mach/mtd-xip.h +++ b/arch/arm/mach-sa1100/include/mach/mtd-xip.h | |||
| @@ -15,6 +15,8 @@ | |||
| 15 | #ifndef __ARCH_SA1100_MTD_XIP_H__ | 15 | #ifndef __ARCH_SA1100_MTD_XIP_H__ |
| 16 | #define __ARCH_SA1100_MTD_XIP_H__ | 16 | #define __ARCH_SA1100_MTD_XIP_H__ |
| 17 | 17 | ||
| 18 | #include <mach/hardware.h> | ||
| 19 | |||
| 18 | #define xip_irqpending() (ICIP & ICMR) | 20 | #define xip_irqpending() (ICIP & ICMR) |
| 19 | 21 | ||
| 20 | /* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */ | 22 | /* we sample OSCR and convert desired delta to usec (1/4 ~= 1000000/3686400) */ |
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c index e45d3a1890bc..e1458bc1868e 100644 --- a/arch/arm/mach-sa1100/pleb.c +++ b/arch/arm/mach-sa1100/pleb.c | |||
| @@ -122,12 +122,12 @@ static void __init pleb_map_io(void) | |||
| 122 | sa1100_map_io(); | 122 | sa1100_map_io(); |
| 123 | 123 | ||
| 124 | sa1100_register_uart(0, 3); | 124 | sa1100_register_uart(0, 3); |
| 125 | sa1100_register_uart(1, 1); | 125 | sa1100_register_uart(1, 1); |
| 126 | 126 | ||
| 127 | GAFR |= (GPIO_UART_TXD | GPIO_UART_RXD); | 127 | GAFR |= (GPIO_UART_TXD | GPIO_UART_RXD); |
| 128 | GPDR |= GPIO_UART_TXD; | 128 | GPDR |= GPIO_UART_TXD; |
| 129 | GPDR &= ~GPIO_UART_RXD; | 129 | GPDR &= ~GPIO_UART_RXD; |
| 130 | PPAR |= PPAR_UPR; | 130 | PPAR |= PPAR_UPR; |
| 131 | 131 | ||
| 132 | /* | 132 | /* |
| 133 | * Fix expansion memory timing for network card | 133 | * Fix expansion memory timing for network card |
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index 9ccdd09cf69f..ddd917d1083d 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c | |||
| @@ -33,7 +33,7 @@ static struct mtd_partition shannon_partitions[] = { | |||
| 33 | .offset = MTDPART_OFS_APPEND, | 33 | .offset = MTDPART_OFS_APPEND, |
| 34 | .size = 0xe0000 | 34 | .size = 0xe0000 |
| 35 | }, | 35 | }, |
| 36 | { | 36 | { |
| 37 | .name = "initrd", | 37 | .name = "initrd", |
| 38 | .offset = MTDPART_OFS_APPEND, | 38 | .offset = MTDPART_OFS_APPEND, |
| 39 | .size = MTDPART_SIZ_FULL | 39 | .size = MTDPART_SIZ_FULL |
diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S index 171441f96710..80f31bad707c 100644 --- a/arch/arm/mach-sa1100/sleep.S +++ b/arch/arm/mach-sa1100/sleep.S | |||
| @@ -100,36 +100,36 @@ ENTRY(sa1100_cpu_suspend) | |||
| 100 | ldr r1, =MSC1 | 100 | ldr r1, =MSC1 |
| 101 | ldr r2, =MSC2 | 101 | ldr r2, =MSC2 |
| 102 | 102 | ||
| 103 | ldr r3, [r0] | 103 | ldr r3, [r0] |
| 104 | bic r3, r3, #FMsk(MSC_RT) | 104 | bic r3, r3, #FMsk(MSC_RT) |
| 105 | bic r3, r3, #FMsk(MSC_RT)<<16 | 105 | bic r3, r3, #FMsk(MSC_RT)<<16 |
| 106 | 106 | ||
| 107 | ldr r4, [r1] | 107 | ldr r4, [r1] |
| 108 | bic r4, r4, #FMsk(MSC_RT) | 108 | bic r4, r4, #FMsk(MSC_RT) |
| 109 | bic r4, r4, #FMsk(MSC_RT)<<16 | 109 | bic r4, r4, #FMsk(MSC_RT)<<16 |
| 110 | 110 | ||
| 111 | ldr r5, [r2] | 111 | ldr r5, [r2] |
| 112 | bic r5, r5, #FMsk(MSC_RT) | 112 | bic r5, r5, #FMsk(MSC_RT) |
| 113 | bic r5, r5, #FMsk(MSC_RT)<<16 | 113 | bic r5, r5, #FMsk(MSC_RT)<<16 |
| 114 | 114 | ||
| 115 | ldr r6, =MDREFR | 115 | ldr r6, =MDREFR |
| 116 | 116 | ||
| 117 | ldr r7, [r6] | 117 | ldr r7, [r6] |
| 118 | bic r7, r7, #0x0000FF00 | 118 | bic r7, r7, #0x0000FF00 |
| 119 | bic r7, r7, #0x000000F0 | 119 | bic r7, r7, #0x000000F0 |
| 120 | orr r8, r7, #MDREFR_SLFRSH | 120 | orr r8, r7, #MDREFR_SLFRSH |
| 121 | 121 | ||
| 122 | ldr r9, =MDCNFG | 122 | ldr r9, =MDCNFG |
| 123 | ldr r10, [r9] | 123 | ldr r10, [r9] |
| 124 | bic r10, r10, #(MDCNFG_DE0+MDCNFG_DE1) | 124 | bic r10, r10, #(MDCNFG_DE0+MDCNFG_DE1) |
| 125 | bic r10, r10, #(MDCNFG_DE2+MDCNFG_DE3) | 125 | bic r10, r10, #(MDCNFG_DE2+MDCNFG_DE3) |
| 126 | 126 | ||
| 127 | bic r11, r8, #MDREFR_SLFRSH | 127 | bic r11, r8, #MDREFR_SLFRSH |
| 128 | bic r11, r11, #MDREFR_E1PIN | 128 | bic r11, r11, #MDREFR_E1PIN |
| 129 | 129 | ||
| 130 | ldr r12, =PMCR | 130 | ldr r12, =PMCR |
| 131 | 131 | ||
| 132 | mov r13, #PMCR_SF | 132 | mov r13, #PMCR_SF |
| 133 | 133 | ||
| 134 | b sa1110_sdram_controller_fix | 134 | b sa1110_sdram_controller_fix |
| 135 | 135 | ||
| @@ -188,10 +188,10 @@ ENTRY(sa1100_cpu_resume) | |||
| 188 | mcr p15, 0, r1, c8, c7, 0 @ flush I+D TLBs | 188 | mcr p15, 0, r1, c8, c7, 0 @ flush I+D TLBs |
| 189 | mcr p15, 0, r1, c7, c7, 0 @ flush I&D cache | 189 | mcr p15, 0, r1, c7, c7, 0 @ flush I&D cache |
| 190 | mcr p15, 0, r1, c9, c0, 0 @ invalidate RB | 190 | mcr p15, 0, r1, c9, c0, 0 @ invalidate RB |
| 191 | mcr p15, 0, r1, c9, c0, 5 @ allow user space to use RB | 191 | mcr p15, 0, r1, c9, c0, 5 @ allow user space to use RB |
| 192 | 192 | ||
| 193 | mcr p15, 0, r4, c3, c0, 0 @ domain ID | 193 | mcr p15, 0, r4, c3, c0, 0 @ domain ID |
| 194 | mcr p15, 0, r5, c2, c0, 0 @ translation table base addr | 194 | mcr p15, 0, r5, c2, c0, 0 @ translation table base addr |
| 195 | mcr p15, 0, r6, c13, c0, 0 @ PID | 195 | mcr p15, 0, r6, c13, c0, 0 @ PID |
| 196 | b resume_turn_on_mmu @ cache align execution | 196 | b resume_turn_on_mmu @ cache align execution |
| 197 | 197 | ||
| @@ -209,7 +209,7 @@ sleep_save_sp: | |||
| 209 | 209 | ||
| 210 | .text | 210 | .text |
| 211 | resume_after_mmu: | 211 | resume_after_mmu: |
| 212 | mcr p15, 0, r1, c15, c1, 2 @ enable clock switching | 212 | mcr p15, 0, r1, c15, c1, 2 @ enable clock switching |
| 213 | ldmfd sp!, {r4 - r12, pc} @ return to caller | 213 | ldmfd sp!, {r4 - r12, pc} @ return to caller |
| 214 | 214 | ||
| 215 | 215 | ||
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index 24c0a4bae850..8c5e727f3b75 100644 --- a/arch/arm/mach-sa1100/time.c +++ b/arch/arm/mach-sa1100/time.c | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | * linux/arch/arm/mach-sa1100/time.c | 2 | * linux/arch/arm/mach-sa1100/time.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1998 Deborah Wallach. | 4 | * Copyright (C) 1998 Deborah Wallach. |
| 5 | * Twiddles (C) 1999 Hugo Fiennes <hugo@empeg.com> | 5 | * Twiddles (C) 1999 Hugo Fiennes <hugo@empeg.com> |
| 6 | * | 6 | * |
| 7 | * 2000/03/29 (C) Nicolas Pitre <nico@cam.org> | 7 | * 2000/03/29 (C) Nicolas Pitre <nico@cam.org> |
| 8 | * Rewritten: big cleanup, much simpler, better HZ accuracy. | 8 | * Rewritten: big cleanup, much simpler, better HZ accuracy. |
| 9 | * | 9 | * |
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index a9400d984451..a23fd3d0163a 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c | |||
| @@ -16,6 +16,8 @@ | |||
| 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 | |||
| 19 | #include <asm/mach/map.h> | 21 | #include <asm/mach/map.h> |
| 20 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
| 21 | #include <asm/mach/time.h> | 23 | #include <asm/mach/time.h> |
diff --git a/arch/arm/mach-shark/include/mach/hardware.h b/arch/arm/mach-shark/include/mach/hardware.h index cb0ee2943c1a..01bf76099ce5 100644 --- a/arch/arm/mach-shark/include/mach/hardware.h +++ b/arch/arm/mach-shark/include/mach/hardware.h | |||
| @@ -28,8 +28,6 @@ | |||
| 28 | #define ROMCARD_SIZE 0x08000000 | 28 | #define ROMCARD_SIZE 0x08000000 |
| 29 | #define ROMCARD_START 0x10000000 | 29 | #define ROMCARD_START 0x10000000 |
| 30 | 30 | ||
| 31 | #define PCIO_BASE 0xe0000000 | ||
| 32 | |||
| 33 | 31 | ||
| 34 | /* defines for the Framebuffer */ | 32 | /* defines for the Framebuffer */ |
| 35 | #define FB_START 0x06000000 | 33 | #define FB_START 0x06000000 |
diff --git a/arch/arm/mach-shark/include/mach/io.h b/arch/arm/mach-shark/include/mach/io.h index 92475922c068..c5cee829fc87 100644 --- a/arch/arm/mach-shark/include/mach/io.h +++ b/arch/arm/mach-shark/include/mach/io.h | |||
| @@ -11,46 +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 | #include <mach/hardware.h> | 14 | #define PCIO_BASE 0xe0000000 |
| 15 | #define IO_SPACE_LIMIT 0xffffffff | ||
| 15 | 16 | ||
| 16 | #define IO_SPACE_LIMIT 0xffffffff | 17 | #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) |
| 17 | 18 | #define __mem_pci(addr) (addr) | |
| 18 | /* | ||
| 19 | * We use two different types of addressing - PC style addresses, and ARM | ||
| 20 | * addresses. PC style accesses the PC hardware with the normal PC IO | ||
| 21 | * addresses, eg 0x3f8 for serial#1. ARM addresses are 0x80000000+ | ||
| 22 | * and are translated to the start of IO. | ||
| 23 | */ | ||
| 24 | #define __PORT_PCIO(x) (!((x) & 0x80000000)) | ||
| 25 | |||
| 26 | #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) | ||
| 27 | |||
| 28 | |||
| 29 | static inline unsigned int __ioaddr (unsigned int port) \ | ||
| 30 | { \ | ||
| 31 | if (__PORT_PCIO(port)) \ | ||
| 32 | return (unsigned int)(PCIO_BASE + (port)); \ | ||
| 33 | else \ | ||
| 34 | return (unsigned int)(IO_BASE + (port)); \ | ||
| 35 | } | ||
| 36 | |||
| 37 | #define __mem_pci(addr) (addr) | ||
| 38 | |||
| 39 | /* | ||
| 40 | * Translated address IO functions | ||
| 41 | * | ||
| 42 | * IO address has already been translated to a virtual address | ||
| 43 | */ | ||
| 44 | #define outb_t(v,p) \ | ||
| 45 | (*(volatile unsigned char *)(p) = (v)) | ||
| 46 | |||
| 47 | #define inb_t(p) \ | ||
| 48 | (*(volatile unsigned char *)(p)) | ||
| 49 | |||
| 50 | #define outl_t(v,p) \ | ||
| 51 | (*(volatile unsigned long *)(p) = (v)) | ||
| 52 | |||
| 53 | #define inl_t(p) \ | ||
| 54 | (*(volatile unsigned long *)(p)) | ||
| 55 | 19 | ||
| 56 | #endif | 20 | #endif |
diff --git a/arch/arm/mach-shark/include/mach/dma.h b/arch/arm/mach-shark/include/mach/isa-dma.h index c0a29bd2a74f..864298ff3927 100644 --- a/arch/arm/mach-shark/include/mach/dma.h +++ b/arch/arm/mach-shark/include/mach/isa-dma.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-shark/include/mach/dma.h | 2 | * arch/arm/mach-shark/include/mach/isa-dma.h |
| 3 | * | 3 | * |
| 4 | * by Alexander Schulz | 4 | * by Alexander Schulz |
| 5 | */ | 5 | */ |
| @@ -10,7 +10,6 @@ | |||
| 10 | * The rest is not DMAable. See dev / .properties | 10 | * The rest is not DMAable. See dev / .properties |
| 11 | * in OpenFirmware. | 11 | * in OpenFirmware. |
| 12 | */ | 12 | */ |
| 13 | #define MAX_DMA_ADDRESS 0xC0400000 | ||
| 14 | #define MAX_DMA_CHANNELS 8 | 13 | #define MAX_DMA_CHANNELS 8 |
| 15 | #define DMA_ISA_CASCADE 4 | 14 | #define DMA_ISA_CASCADE 4 |
| 16 | 15 | ||
diff --git a/arch/arm/mach-shark/include/mach/memory.h b/arch/arm/mach-shark/include/mach/memory.h index b7874ad9f9f6..c5ab038925d6 100644 --- a/arch/arm/mach-shark/include/mach/memory.h +++ b/arch/arm/mach-shark/include/mach/memory.h | |||
| @@ -33,12 +33,10 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig | |||
| 33 | __arch_adjust_zones(node, size, holes) | 33 | __arch_adjust_zones(node, size, holes) |
| 34 | 34 | ||
| 35 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1) | 35 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1) |
| 36 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_4M) | ||
| 36 | 37 | ||
| 37 | #endif | 38 | #endif |
| 38 | 39 | ||
| 39 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 40 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 41 | |||
| 42 | /* | 40 | /* |
| 43 | * Cache flushing area | 41 | * Cache flushing area |
| 44 | */ | 42 | */ |
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig index 95096afd5271..c781f30c8368 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig | |||
| @@ -3,12 +3,14 @@ menu "Versatile platform type" | |||
| 3 | 3 | ||
| 4 | config ARCH_VERSATILE_PB | 4 | config ARCH_VERSATILE_PB |
| 5 | bool "Support Versatile/PB platform" | 5 | bool "Support Versatile/PB platform" |
| 6 | select CPU_ARM926T | ||
| 6 | default y | 7 | default y |
| 7 | help | 8 | help |
| 8 | Include support for the ARM(R) Versatile/PB platform. | 9 | Include support for the ARM(R) Versatile/PB platform. |
| 9 | 10 | ||
| 10 | config MACH_VERSATILE_AB | 11 | config MACH_VERSATILE_AB |
| 11 | bool "Support Versatile/AB platform" | 12 | bool "Support Versatile/AB platform" |
| 13 | select CPU_ARM926T | ||
| 12 | help | 14 | help |
| 13 | Include support for the ARM(R) Versatile/AP platform. | 15 | Include support for the ARM(R) Versatile/AP platform. |
| 14 | 16 | ||
diff --git a/arch/arm/mach-versatile/include/mach/dma.h b/arch/arm/mach-versatile/include/mach/dma.h deleted file mode 100644 index 0aabf12c8834..000000000000 --- a/arch/arm/mach-versatile/include/mach/dma.h +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-versatile/include/mach/dma.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2003 ARM Limited. | ||
| 5 | * Copyright (C) 1997,1998 Russell King | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | * This program is distributed in the hope that it will be useful, | ||
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | * GNU General Public License for more details. | ||
| 16 | * | ||
| 17 | * You should have received a copy of the GNU General Public License | ||
| 18 | * along with this program; if not, write to the Free Software | ||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 20 | */ | ||
diff --git a/arch/arm/mach-versatile/include/mach/io.h b/arch/arm/mach-versatile/include/mach/io.h index c0b9dd1d0257..f067c14c7182 100644 --- a/arch/arm/mach-versatile/include/mach/io.h +++ b/arch/arm/mach-versatile/include/mach/io.h | |||
| @@ -22,11 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #define IO_SPACE_LIMIT 0xffffffff | 23 | #define IO_SPACE_LIMIT 0xffffffff |
| 24 | 24 | ||
| 25 | static inline void __iomem *__io(unsigned long addr) | 25 | #define __io(a) __typesafe_io(a) |
| 26 | { | 26 | #define __mem_pci(a) (a) |
| 27 | return (void __iomem *)addr; | ||
| 28 | } | ||
| 29 | #define __io(a) __io(a) | ||
| 30 | #define __mem_pci(a) (a) | ||
| 31 | 27 | ||
| 32 | #endif | 28 | #endif |
diff --git a/arch/arm/mach-versatile/include/mach/irqs.h b/arch/arm/mach-versatile/include/mach/irqs.h index 216a1312e62e..9bfdb30e1f3f 100644 --- a/arch/arm/mach-versatile/include/mach/irqs.h +++ b/arch/arm/mach-versatile/include/mach/irqs.h | |||
| @@ -60,39 +60,6 @@ | |||
| 60 | #define IRQ_VICSOURCE31 (IRQ_VIC_START + INT_VICSOURCE31) | 60 | #define IRQ_VICSOURCE31 (IRQ_VIC_START + INT_VICSOURCE31) |
| 61 | #define IRQ_VIC_END (IRQ_VIC_START + 31) | 61 | #define IRQ_VIC_END (IRQ_VIC_START + 31) |
| 62 | 62 | ||
| 63 | #define IRQMASK_WDOGINT INTMASK_WDOGINT | ||
| 64 | #define IRQMASK_SOFTINT INTMASK_SOFTINT | ||
| 65 | #define IRQMASK_COMMRx INTMASK_COMMRx | ||
| 66 | #define IRQMASK_COMMTx INTMASK_COMMTx | ||
| 67 | #define IRQMASK_TIMERINT0_1 INTMASK_TIMERINT0_1 | ||
| 68 | #define IRQMASK_TIMERINT2_3 INTMASK_TIMERINT2_3 | ||
| 69 | #define IRQMASK_GPIOINT0 INTMASK_GPIOINT0 | ||
| 70 | #define IRQMASK_GPIOINT1 INTMASK_GPIOINT1 | ||
| 71 | #define IRQMASK_GPIOINT2 INTMASK_GPIOINT2 | ||
| 72 | #define IRQMASK_GPIOINT3 INTMASK_GPIOINT3 | ||
| 73 | #define IRQMASK_RTCINT INTMASK_RTCINT | ||
| 74 | #define IRQMASK_SSPINT INTMASK_SSPINT | ||
| 75 | #define IRQMASK_UARTINT0 INTMASK_UARTINT0 | ||
| 76 | #define IRQMASK_UARTINT1 INTMASK_UARTINT1 | ||
| 77 | #define IRQMASK_UARTINT2 INTMASK_UARTINT2 | ||
| 78 | #define IRQMASK_SCIINT INTMASK_SCIINT | ||
| 79 | #define IRQMASK_CLCDINT INTMASK_CLCDINT | ||
| 80 | #define IRQMASK_DMAINT INTMASK_DMAINT | ||
| 81 | #define IRQMASK_PWRFAILINT INTMASK_PWRFAILINT | ||
| 82 | #define IRQMASK_MBXINT INTMASK_MBXINT | ||
| 83 | #define IRQMASK_GNDINT INTMASK_GNDINT | ||
| 84 | #define IRQMASK_VICSOURCE21 INTMASK_VICSOURCE21 | ||
| 85 | #define IRQMASK_VICSOURCE22 INTMASK_VICSOURCE22 | ||
| 86 | #define IRQMASK_VICSOURCE23 INTMASK_VICSOURCE23 | ||
| 87 | #define IRQMASK_VICSOURCE24 INTMASK_VICSOURCE24 | ||
| 88 | #define IRQMASK_VICSOURCE25 INTMASK_VICSOURCE25 | ||
| 89 | #define IRQMASK_VICSOURCE26 INTMASK_VICSOURCE26 | ||
| 90 | #define IRQMASK_VICSOURCE27 INTMASK_VICSOURCE27 | ||
| 91 | #define IRQMASK_VICSOURCE28 INTMASK_VICSOURCE28 | ||
| 92 | #define IRQMASK_VICSOURCE29 INTMASK_VICSOURCE29 | ||
| 93 | #define IRQMASK_VICSOURCE30 INTMASK_VICSOURCE30 | ||
| 94 | #define IRQMASK_VICSOURCE31 INTMASK_VICSOURCE31 | ||
| 95 | |||
| 96 | /* | 63 | /* |
| 97 | * FIQ interrupts definitions are the same as the INT definitions. | 64 | * FIQ interrupts definitions are the same as the INT definitions. |
| 98 | */ | 65 | */ |
| @@ -130,39 +97,6 @@ | |||
| 130 | #define FIQ_VICSOURCE31 INT_VICSOURCE31 | 97 | #define FIQ_VICSOURCE31 INT_VICSOURCE31 |
| 131 | 98 | ||
| 132 | 99 | ||
| 133 | #define FIQMASK_WDOGINT INTMASK_WDOGINT | ||
| 134 | #define FIQMASK_SOFTINT INTMASK_SOFTINT | ||
| 135 | #define FIQMASK_COMMRx INTMASK_COMMRx | ||
| 136 | #define FIQMASK_COMMTx INTMASK_COMMTx | ||
| 137 | #define FIQMASK_TIMERINT0_1 INTMASK_TIMERINT0_1 | ||
| 138 | #define FIQMASK_TIMERINT2_3 INTMASK_TIMERINT2_3 | ||
| 139 | #define FIQMASK_GPIOINT0 INTMASK_GPIOINT0 | ||
| 140 | #define FIQMASK_GPIOINT1 INTMASK_GPIOINT1 | ||
| 141 | #define FIQMASK_GPIOINT2 INTMASK_GPIOINT2 | ||
| 142 | #define FIQMASK_GPIOINT3 INTMASK_GPIOINT3 | ||
| 143 | #define FIQMASK_RTCINT INTMASK_RTCINT | ||
| 144 | #define FIQMASK_SSPINT INTMASK_SSPINT | ||
| 145 | #define FIQMASK_UARTINT0 INTMASK_UARTINT0 | ||
| 146 | #define FIQMASK_UARTINT1 INTMASK_UARTINT1 | ||
| 147 | #define FIQMASK_UARTINT2 INTMASK_UARTINT2 | ||
| 148 | #define FIQMASK_SCIINT INTMASK_SCIINT | ||
| 149 | #define FIQMASK_CLCDINT INTMASK_CLCDINT | ||
| 150 | #define FIQMASK_DMAINT INTMASK_DMAINT | ||
| 151 | #define FIQMASK_PWRFAILINT INTMASK_PWRFAILINT | ||
| 152 | #define FIQMASK_MBXINT INTMASK_MBXINT | ||
| 153 | #define FIQMASK_GNDINT INTMASK_GNDINT | ||
| 154 | #define FIQMASK_VICSOURCE21 INTMASK_VICSOURCE21 | ||
| 155 | #define FIQMASK_VICSOURCE22 INTMASK_VICSOURCE22 | ||
| 156 | #define FIQMASK_VICSOURCE23 INTMASK_VICSOURCE23 | ||
| 157 | #define FIQMASK_VICSOURCE24 INTMASK_VICSOURCE24 | ||
| 158 | #define FIQMASK_VICSOURCE25 INTMASK_VICSOURCE25 | ||
| 159 | #define FIQMASK_VICSOURCE26 INTMASK_VICSOURCE26 | ||
| 160 | #define FIQMASK_VICSOURCE27 INTMASK_VICSOURCE27 | ||
| 161 | #define FIQMASK_VICSOURCE28 INTMASK_VICSOURCE28 | ||
| 162 | #define FIQMASK_VICSOURCE29 INTMASK_VICSOURCE29 | ||
| 163 | #define FIQMASK_VICSOURCE30 INTMASK_VICSOURCE30 | ||
| 164 | #define FIQMASK_VICSOURCE31 INTMASK_VICSOURCE31 | ||
| 165 | |||
| 166 | /* | 100 | /* |
| 167 | * Secondary interrupt controller | 101 | * Secondary interrupt controller |
| 168 | */ | 102 | */ |
| @@ -188,24 +122,4 @@ | |||
| 188 | #define IRQ_SIC_PCI3 (IRQ_SIC_START + SIC_INT_PCI3) | 122 | #define IRQ_SIC_PCI3 (IRQ_SIC_START + SIC_INT_PCI3) |
| 189 | #define IRQ_SIC_END 63 | 123 | #define IRQ_SIC_END 63 |
| 190 | 124 | ||
| 191 | #define SIC_IRQMASK_MMCI0B SIC_INTMASK_MMCI0B | ||
| 192 | #define SIC_IRQMASK_MMCI1B SIC_INTMASK_MMCI1B | ||
| 193 | #define SIC_IRQMASK_KMI0 SIC_INTMASK_KMI0 | ||
| 194 | #define SIC_IRQMASK_KMI1 SIC_INTMASK_KMI1 | ||
| 195 | #define SIC_IRQMASK_SCI3 SIC_INTMASK_SCI3 | ||
| 196 | #define SIC_IRQMASK_UART3 SIC_INTMASK_UART3 | ||
| 197 | #define SIC_IRQMASK_CLCD SIC_INTMASK_CLCD | ||
| 198 | #define SIC_IRQMASK_TOUCH SIC_INTMASK_TOUCH | ||
| 199 | #define SIC_IRQMASK_KEYPAD SIC_INTMASK_KEYPAD | ||
| 200 | #define SIC_IRQMASK_DoC SIC_INTMASK_DoC | ||
| 201 | #define SIC_IRQMASK_MMCI0A SIC_INTMASK_MMCI0A | ||
| 202 | #define SIC_IRQMASK_MMCI1A SIC_INTMASK_MMCI1A | ||
| 203 | #define SIC_IRQMASK_AACI SIC_INTMASK_AACI | ||
| 204 | #define SIC_IRQMASK_ETH SIC_INTMASK_ETH | ||
| 205 | #define SIC_IRQMASK_USB SIC_INTMASK_USB | ||
| 206 | #define SIC_IRQMASK_PCI0 SIC_INTMASK_PCI0 | ||
| 207 | #define SIC_IRQMASK_PCI1 SIC_INTMASK_PCI1 | ||
| 208 | #define SIC_IRQMASK_PCI2 SIC_INTMASK_PCI2 | ||
| 209 | #define SIC_IRQMASK_PCI3 SIC_INTMASK_PCI3 | ||
| 210 | |||
| 211 | #define NR_IRQS 64 | 125 | #define NR_IRQS 64 |
diff --git a/arch/arm/mach-versatile/include/mach/memory.h b/arch/arm/mach-versatile/include/mach/memory.h index b6315c0602ac..79aeab86b903 100644 --- a/arch/arm/mach-versatile/include/mach/memory.h +++ b/arch/arm/mach-versatile/include/mach/memory.h | |||
| @@ -25,14 +25,4 @@ | |||
| 25 | */ | 25 | */ |
| 26 | #define PHYS_OFFSET UL(0x00000000) | 26 | #define PHYS_OFFSET UL(0x00000000) |
| 27 | 27 | ||
| 28 | /* | ||
| 29 | * Virtual view <-> DMA view memory address translations | ||
| 30 | * virt_to_bus: Used to translate the virtual address to an | ||
| 31 | * address suitable to be passed to set_dma_addr | ||
| 32 | * bus_to_virt: Used to convert an address for DMA operations | ||
| 33 | * to an address that the kernel can use. | ||
| 34 | */ | ||
| 35 | #define __virt_to_bus(x) ((x) - PAGE_OFFSET) | ||
| 36 | #define __bus_to_virt(x) ((x) + PAGE_OFFSET) | ||
| 37 | |||
| 38 | #endif | 28 | #endif |
diff --git a/arch/arm/mach-versatile/include/mach/platform.h b/arch/arm/mach-versatile/include/mach/platform.h index f91ba930ca8a..83207395191a 100644 --- a/arch/arm/mach-versatile/include/mach/platform.h +++ b/arch/arm/mach-versatile/include/mach/platform.h | |||
| @@ -347,44 +347,6 @@ | |||
| 347 | #define INT_VICSOURCE30 30 /* PCI 3 */ | 347 | #define INT_VICSOURCE30 30 /* PCI 3 */ |
| 348 | #define INT_VICSOURCE31 31 /* SIC source */ | 348 | #define INT_VICSOURCE31 31 /* SIC source */ |
| 349 | 349 | ||
| 350 | /* | ||
| 351 | * Interrupt bit positions | ||
| 352 | * | ||
| 353 | */ | ||
| 354 | #define INTMASK_WDOGINT (1 << INT_WDOGINT) | ||
| 355 | #define INTMASK_SOFTINT (1 << INT_SOFTINT) | ||
| 356 | #define INTMASK_COMMRx (1 << INT_COMMRx) | ||
| 357 | #define INTMASK_COMMTx (1 << INT_COMMTx) | ||
| 358 | #define INTMASK_TIMERINT0_1 (1 << INT_TIMERINT0_1) | ||
| 359 | #define INTMASK_TIMERINT2_3 (1 << INT_TIMERINT2_3) | ||
| 360 | #define INTMASK_GPIOINT0 (1 << INT_GPIOINT0) | ||
| 361 | #define INTMASK_GPIOINT1 (1 << INT_GPIOINT1) | ||
| 362 | #define INTMASK_GPIOINT2 (1 << INT_GPIOINT2) | ||
| 363 | #define INTMASK_GPIOINT3 (1 << INT_GPIOINT3) | ||
| 364 | #define INTMASK_RTCINT (1 << INT_RTCINT) | ||
| 365 | #define INTMASK_SSPINT (1 << INT_SSPINT) | ||
| 366 | #define INTMASK_UARTINT0 (1 << INT_UARTINT0) | ||
| 367 | #define INTMASK_UARTINT1 (1 << INT_UARTINT1) | ||
| 368 | #define INTMASK_UARTINT2 (1 << INT_UARTINT2) | ||
| 369 | #define INTMASK_SCIINT (1 << INT_SCIINT) | ||
| 370 | #define INTMASK_CLCDINT (1 << INT_CLCDINT) | ||
| 371 | #define INTMASK_DMAINT (1 << INT_DMAINT) | ||
| 372 | #define INTMASK_PWRFAILINT (1 << INT_PWRFAILINT) | ||
| 373 | #define INTMASK_MBXINT (1 << INT_MBXINT) | ||
| 374 | #define INTMASK_GNDINT (1 << INT_GNDINT) | ||
| 375 | #define INTMASK_VICSOURCE21 (1 << INT_VICSOURCE21) | ||
| 376 | #define INTMASK_VICSOURCE22 (1 << INT_VICSOURCE22) | ||
| 377 | #define INTMASK_VICSOURCE23 (1 << INT_VICSOURCE23) | ||
| 378 | #define INTMASK_VICSOURCE24 (1 << INT_VICSOURCE24) | ||
| 379 | #define INTMASK_VICSOURCE25 (1 << INT_VICSOURCE25) | ||
| 380 | #define INTMASK_VICSOURCE26 (1 << INT_VICSOURCE26) | ||
| 381 | #define INTMASK_VICSOURCE27 (1 << INT_VICSOURCE27) | ||
| 382 | #define INTMASK_VICSOURCE28 (1 << INT_VICSOURCE28) | ||
| 383 | #define INTMASK_VICSOURCE29 (1 << INT_VICSOURCE29) | ||
| 384 | #define INTMASK_VICSOURCE30 (1 << INT_VICSOURCE30) | ||
| 385 | #define INTMASK_VICSOURCE31 (1 << INT_VICSOURCE31) | ||
| 386 | |||
| 387 | |||
| 388 | #define VERSATILE_SC_VALID_INT 0x003FFFFF | 350 | #define VERSATILE_SC_VALID_INT 0x003FFFFF |
| 389 | 351 | ||
| 390 | #define MAXIRQNUM 31 | 352 | #define MAXIRQNUM 31 |
| @@ -417,26 +379,6 @@ | |||
| 417 | #define SIC_INT_PCI3 30 | 379 | #define SIC_INT_PCI3 30 |
| 418 | 380 | ||
| 419 | 381 | ||
| 420 | #define SIC_INTMASK_MMCI0B (1 << SIC_INT_MMCI0B) | ||
| 421 | #define SIC_INTMASK_MMCI1B (1 << SIC_INT_MMCI1B) | ||
| 422 | #define SIC_INTMASK_KMI0 (1 << SIC_INT_KMI0) | ||
| 423 | #define SIC_INTMASK_KMI1 (1 << SIC_INT_KMI1) | ||
| 424 | #define SIC_INTMASK_SCI3 (1 << SIC_INT_SCI3) | ||
| 425 | #define SIC_INTMASK_UART3 (1 << SIC_INT_UART3) | ||
| 426 | #define SIC_INTMASK_CLCD (1 << SIC_INT_CLCD) | ||
| 427 | #define SIC_INTMASK_TOUCH (1 << SIC_INT_TOUCH) | ||
| 428 | #define SIC_INTMASK_KEYPAD (1 << SIC_INT_KEYPAD) | ||
| 429 | #define SIC_INTMASK_DoC (1 << SIC_INT_DoC) | ||
| 430 | #define SIC_INTMASK_MMCI0A (1 << SIC_INT_MMCI0A) | ||
| 431 | #define SIC_INTMASK_MMCI1A (1 << SIC_INT_MMCI1A) | ||
| 432 | #define SIC_INTMASK_AACI (1 << SIC_INT_AACI) | ||
| 433 | #define SIC_INTMASK_ETH (1 << SIC_INT_ETH) | ||
| 434 | #define SIC_INTMASK_USB (1 << SIC_INT_USB) | ||
| 435 | #define SIC_INTMASK_PCI0 (1 << SIC_INT_PCI0) | ||
| 436 | #define SIC_INTMASK_PCI1 (1 << SIC_INT_PCI1) | ||
| 437 | #define SIC_INTMASK_PCI2 (1 << SIC_INT_PCI2) | ||
| 438 | #define SIC_INTMASK_PCI3 (1 << SIC_INT_PCI3) | ||
| 439 | |||
| 440 | /* | 382 | /* |
| 441 | * Clean base - dummy | 383 | * Clean base - dummy |
| 442 | * | 384 | * |
diff --git a/arch/arm/mach-w90x900/Kconfig b/arch/arm/mach-w90x900/Kconfig new file mode 100644 index 000000000000..8e4178fe5ec2 --- /dev/null +++ b/arch/arm/mach-w90x900/Kconfig | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | if ARCH_W90X900 | ||
| 2 | |||
| 3 | config CPU_W90P910 | ||
| 4 | bool | ||
| 5 | help | ||
| 6 | Support for W90P910 of Nuvoton W90X900 CPUs. | ||
| 7 | |||
| 8 | menu "W90P910 Machines" | ||
| 9 | |||
| 10 | config MACH_W90P910EVB | ||
| 11 | bool "Nuvoton W90P910 Evaluation Board" | ||
| 12 | default y | ||
| 13 | select CPU_W90P910 | ||
| 14 | help | ||
| 15 | Say Y here if you are using the Nuvoton W90P910EVB | ||
| 16 | |||
| 17 | endmenu | ||
| 18 | |||
| 19 | endif | ||
diff --git a/arch/arm/mach-w90x900/Makefile b/arch/arm/mach-w90x900/Makefile new file mode 100644 index 000000000000..0c0c1d63f1c7 --- /dev/null +++ b/arch/arm/mach-w90x900/Makefile | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | # | ||
| 2 | # Makefile for the linux kernel. | ||
| 3 | # | ||
| 4 | |||
| 5 | # Object file lists. | ||
| 6 | |||
| 7 | obj-y := irq.o time.o | ||
| 8 | |||
| 9 | # W90X900 CPU support files | ||
| 10 | |||
| 11 | obj-$(CONFIG_CPU_W90P910) += w90p910.o | ||
| 12 | |||
| 13 | # machine support | ||
| 14 | |||
| 15 | obj-$(CONFIG_MACH_W90P910EVB) += mach-w90p910evb.o | ||
diff --git a/arch/arm/mach-w90x900/Makefile.boot b/arch/arm/mach-w90x900/Makefile.boot new file mode 100644 index 000000000000..a057b546b6e5 --- /dev/null +++ b/arch/arm/mach-w90x900/Makefile.boot | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | zreladdr-y := 0x00008000 | ||
| 2 | params_phys-y := 0x00000100 | ||
| 3 | |||
diff --git a/arch/arm/mach-w90x900/cpu.h b/arch/arm/mach-w90x900/cpu.h new file mode 100644 index 000000000000..40ff40845df0 --- /dev/null +++ b/arch/arm/mach-w90x900/cpu.h | |||
| @@ -0,0 +1,77 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/cpu.h | ||
| 3 | * | ||
| 4 | * Based on linux/include/asm-arm/plat-s3c24xx/cpu.h by Ben Dooks | ||
| 5 | * | ||
| 6 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 7 | * All rights reserved. | ||
| 8 | * | ||
| 9 | * Header file for W90X900 CPU support | ||
| 10 | * | ||
| 11 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 12 | * | ||
| 13 | * This program is free software; you can redistribute it and/or modify | ||
| 14 | * it under the terms of the GNU General Public License version 2 as | ||
| 15 | * published by the Free Software Foundation. | ||
| 16 | * | ||
| 17 | */ | ||
| 18 | |||
| 19 | #define IODESC_ENT(y) \ | ||
| 20 | { \ | ||
| 21 | .virtual = (unsigned long)W90X900_VA_##y, \ | ||
| 22 | .pfn = __phys_to_pfn(W90X900_PA_##y), \ | ||
| 23 | .length = W90X900_SZ_##y, \ | ||
| 24 | .type = MT_DEVICE, \ | ||
| 25 | } | ||
| 26 | |||
| 27 | /*Cpu identifier register*/ | ||
| 28 | |||
| 29 | #define W90X900PDID W90X900_VA_GCR | ||
| 30 | #define W90P910_CPUID 0x02900910 | ||
| 31 | #define W90P920_CPUID 0x02900920 | ||
| 32 | #define W90P950_CPUID 0x02900950 | ||
| 33 | #define W90N960_CPUID 0x02900960 | ||
| 34 | |||
| 35 | struct w90x900_uartcfg; | ||
| 36 | struct map_desc; | ||
| 37 | struct sys_timer; | ||
| 38 | |||
| 39 | /* core initialisation functions */ | ||
| 40 | |||
| 41 | extern void w90x900_init_irq(void); | ||
| 42 | extern void w90p910_init_io(struct map_desc *mach_desc, int size); | ||
| 43 | extern void w90p910_init_uarts(struct w90x900_uartcfg *cfg, int no); | ||
| 44 | extern void w90p910_init_clocks(int xtal); | ||
| 45 | extern void w90p910_map_io(struct map_desc *mach_desc, int size); | ||
| 46 | extern struct sys_timer w90x900_timer; | ||
| 47 | |||
| 48 | #define W90X900_RES(name) \ | ||
| 49 | struct resource w90x900_##name##_resource[] = { \ | ||
| 50 | [0] = { \ | ||
| 51 | .start = name##_PA, \ | ||
| 52 | .end = name##_PA + 0x0ff, \ | ||
| 53 | .flags = IORESOURCE_MEM, \ | ||
| 54 | }, \ | ||
| 55 | [1] = { \ | ||
| 56 | .start = IRQ_##name, \ | ||
| 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 | } | ||
diff --git a/arch/arm/mach-w90x900/include/mach/entry-macro.S b/arch/arm/mach-w90x900/include/mach/entry-macro.S new file mode 100644 index 000000000000..d39aca5be9ee --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/entry-macro.S | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/entry-macro.S | ||
| 3 | * | ||
| 4 | * Low-level IRQ helper macros for W90P910-based platforms | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | * | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <mach/hardware.h> | ||
| 13 | #include <mach/regs-irq.h> | ||
| 14 | |||
| 15 | .macro get_irqnr_preamble, base, tmp | ||
| 16 | .endm | ||
| 17 | |||
| 18 | .macro arch_ret_to_user, tmp1, tmp2 | ||
| 19 | .endm | ||
| 20 | |||
| 21 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | ||
| 22 | |||
| 23 | mov \base, #AIC_BA | ||
| 24 | |||
| 25 | ldr \irqnr, [ \base, #AIC_IPER] | ||
| 26 | ldr \irqnr, [ \base, #AIC_ISNR] | ||
| 27 | cmp \irqnr, #0 | ||
| 28 | |||
| 29 | .endm | ||
| 30 | |||
| 31 | /* currently don't need an disable_fiq macro */ | ||
| 32 | |||
| 33 | .macro disable_fiq | ||
| 34 | .endm | ||
diff --git a/arch/arm/mach-w90x900/include/mach/hardware.h b/arch/arm/mach-w90x900/include/mach/hardware.h new file mode 100644 index 000000000000..fe3c6265a466 --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/hardware.h | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/hardware.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/hardware.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARCH_HARDWARE_H | ||
| 19 | #define __ASM_ARCH_HARDWARE_H | ||
| 20 | |||
| 21 | #include <asm/sizes.h> | ||
| 22 | #include <mach/map.h> | ||
| 23 | |||
| 24 | #endif /* __ASM_ARCH_HARDWARE_H */ | ||
diff --git a/arch/arm/mach-w90x900/include/mach/io.h b/arch/arm/mach-w90x900/include/mach/io.h new file mode 100644 index 000000000000..d96ab99df05b --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/io.h | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/io.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/io.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARM_ARCH_IO_H | ||
| 19 | #define __ASM_ARM_ARCH_IO_H | ||
| 20 | |||
| 21 | #define IO_SPACE_LIMIT 0xffffffff | ||
| 22 | |||
| 23 | /* | ||
| 24 | * 1:1 mapping for ioremapped regions. | ||
| 25 | */ | ||
| 26 | |||
| 27 | #define __mem_pci(a) (a) | ||
| 28 | #define __io(a) __typesafe_io(a) | ||
| 29 | |||
| 30 | #endif | ||
diff --git a/arch/arm/mach-w90x900/include/mach/irqs.h b/arch/arm/mach-w90x900/include/mach/irqs.h new file mode 100644 index 000000000000..1c583f9cbcde --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/irqs.h | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/irqs.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/irqs.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARCH_IRQS_H | ||
| 19 | #define __ASM_ARCH_IRQS_H | ||
| 20 | |||
| 21 | /* | ||
| 22 | * we keep the first set of CPU IRQs out of the range of | ||
| 23 | * the ISA space, so that the PC104 has them to itself | ||
| 24 | * and we don't end up having to do horrible things to the | ||
| 25 | * standard ISA drivers.... | ||
| 26 | * | ||
| 27 | */ | ||
| 28 | |||
| 29 | #define W90X900_IRQ(x) (x) | ||
| 30 | |||
| 31 | /* Main cpu interrupts */ | ||
| 32 | |||
| 33 | #define IRQ_WDT W90X900_IRQ(1) | ||
| 34 | #define IRQ_UART0 W90X900_IRQ(7) | ||
| 35 | #define IRQ_UART1 W90X900_IRQ(8) | ||
| 36 | #define IRQ_UART2 W90X900_IRQ(9) | ||
| 37 | #define IRQ_UART3 W90X900_IRQ(10) | ||
| 38 | #define IRQ_UART4 W90X900_IRQ(11) | ||
| 39 | #define IRQ_TIMER0 W90X900_IRQ(12) | ||
| 40 | #define IRQ_TIMER1 W90X900_IRQ(13) | ||
| 41 | #define IRQ_T_INT_GROUP W90X900_IRQ(14) | ||
| 42 | #define IRQ_ADC W90X900_IRQ(31) | ||
| 43 | #define NR_IRQS (IRQ_ADC+1) | ||
| 44 | |||
| 45 | #endif /* __ASM_ARCH_IRQ_H */ | ||
diff --git a/arch/arm/mach-w90x900/include/mach/map.h b/arch/arm/mach-w90x900/include/mach/map.h new file mode 100644 index 000000000000..79320ebe614b --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/map.h | |||
| @@ -0,0 +1,76 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/map.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/map.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARCH_MAP_H | ||
| 19 | #define __ASM_ARCH_MAP_H | ||
| 20 | |||
| 21 | #ifndef __ASSEMBLY__ | ||
| 22 | #define W90X900_ADDR(x) ((void __iomem *)(0xF0000000 + (x))) | ||
| 23 | #else | ||
| 24 | #define W90X900_ADDR(x) (0xF0000000 + (x)) | ||
| 25 | #endif | ||
| 26 | |||
| 27 | #define AHB_IO_BASE 0xB0000000 | ||
| 28 | #define APB_IO_BASE 0xB8000000 | ||
| 29 | #define CLOCKPW_BASE (APB_IO_BASE+0x200) | ||
| 30 | #define AIC_IO_BASE (APB_IO_BASE+0x2000) | ||
| 31 | #define TIMER_IO_BASE (APB_IO_BASE+0x1000) | ||
| 32 | |||
| 33 | /* | ||
| 34 | * interrupt controller is the first thing we put in, to make | ||
| 35 | * the assembly code for the irq detection easier | ||
| 36 | */ | ||
| 37 | |||
| 38 | #define W90X900_VA_IRQ W90X900_ADDR(0x00000000) | ||
| 39 | #define W90X900_PA_IRQ (0xB8002000) | ||
| 40 | #define W90X900_SZ_IRQ SZ_4K | ||
| 41 | |||
| 42 | #define W90X900_VA_GCR W90X900_ADDR(0x08002000) | ||
| 43 | #define W90X900_PA_GCR (0xB0000000) | ||
| 44 | #define W90X900_SZ_GCR SZ_4K | ||
| 45 | |||
| 46 | /* Clock and Power management */ | ||
| 47 | |||
| 48 | #define W90X900_VA_CLKPWR (W90X900_VA_GCR+0x200) | ||
| 49 | #define W90X900_PA_CLKPWR (0xB0000200) | ||
| 50 | #define W90X900_SZ_CLKPWR SZ_4K | ||
| 51 | |||
| 52 | /* EBI management */ | ||
| 53 | |||
| 54 | #define W90X900_VA_EBI W90X900_ADDR(0x00001000) | ||
| 55 | #define W90X900_PA_EBI (0xB0001000) | ||
| 56 | #define W90X900_SZ_EBI SZ_4K | ||
| 57 | |||
| 58 | /* UARTs */ | ||
| 59 | |||
| 60 | #define W90X900_VA_UART W90X900_ADDR(0x08000000) | ||
| 61 | #define W90X900_PA_UART (0xB8000000) | ||
| 62 | #define W90X900_SZ_UART SZ_4K | ||
| 63 | |||
| 64 | /* Timers */ | ||
| 65 | |||
| 66 | #define W90X900_VA_TIMER W90X900_ADDR(0x08001000) | ||
| 67 | #define W90X900_PA_TIMER (0xB8001000) | ||
| 68 | #define W90X900_SZ_TIMER SZ_4K | ||
| 69 | |||
| 70 | /* GPIO ports */ | ||
| 71 | |||
| 72 | #define W90X900_VA_GPIO W90X900_ADDR(0x08003000) | ||
| 73 | #define W90X900_PA_GPIO (0xB8003000) | ||
| 74 | #define W90X900_SZ_GPIO SZ_4K | ||
| 75 | |||
| 76 | #endif /* __ASM_ARCH_MAP_H */ | ||
diff --git a/arch/arm/mach-w90x900/include/mach/memory.h b/arch/arm/mach-w90x900/include/mach/memory.h new file mode 100644 index 000000000000..971b80702c27 --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/memory.h | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/memory.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/memory.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARCH_MEMORY_H | ||
| 19 | #define __ASM_ARCH_MEMORY_H | ||
| 20 | |||
| 21 | #define PHYS_OFFSET UL(0x00000000) | ||
| 22 | |||
| 23 | #endif | ||
diff --git a/arch/arm/mach-w90x900/include/mach/regs-irq.h b/arch/arm/mach-w90x900/include/mach/regs-irq.h new file mode 100644 index 000000000000..8a3185fbc9cf --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/regs-irq.h | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/regs-irq.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/regs-irq.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef ___ASM_ARCH_REGS_IRQ_H | ||
| 19 | #define ___ASM_ARCH_REGS_IRQ_H | ||
| 20 | |||
| 21 | /* Advance Interrupt Controller (AIC) Registers */ | ||
| 22 | |||
| 23 | #define AIC_BA W90X900_VA_IRQ | ||
| 24 | |||
| 25 | #define REG_AIC_IRQSC (AIC_BA+0x80) | ||
| 26 | #define REG_AIC_GEN (AIC_BA+0x84) | ||
| 27 | #define REG_AIC_GASR (AIC_BA+0x88) | ||
| 28 | #define REG_AIC_GSCR (AIC_BA+0x8C) | ||
| 29 | #define REG_AIC_IRSR (AIC_BA+0x100) | ||
| 30 | #define REG_AIC_IASR (AIC_BA+0x104) | ||
| 31 | #define REG_AIC_ISR (AIC_BA+0x108) | ||
| 32 | #define REG_AIC_IPER (AIC_BA+0x10C) | ||
| 33 | #define REG_AIC_ISNR (AIC_BA+0x110) | ||
| 34 | #define REG_AIC_IMR (AIC_BA+0x114) | ||
| 35 | #define REG_AIC_OISR (AIC_BA+0x118) | ||
| 36 | #define REG_AIC_MECR (AIC_BA+0x120) | ||
| 37 | #define REG_AIC_MDCR (AIC_BA+0x124) | ||
| 38 | #define REG_AIC_SSCR (AIC_BA+0x128) | ||
| 39 | #define REG_AIC_SCCR (AIC_BA+0x12C) | ||
| 40 | #define REG_AIC_EOSCR (AIC_BA+0x130) | ||
| 41 | #define AIC_IPER (0x10C) | ||
| 42 | #define AIC_ISNR (0x110) | ||
| 43 | |||
| 44 | /*16-18 bits of REG_AIC_GEN define irq(2-4) group*/ | ||
| 45 | |||
| 46 | #define TIMER2_IRQ (1 << 16) | ||
| 47 | #define TIMER3_IRQ (1 << 17) | ||
| 48 | #define TIMER4_IRQ (1 << 18) | ||
| 49 | #define TIME_GROUP_IRQ (TIMER2_IRQ|TIMER3_IRQ|TIMER4_IRQ) | ||
| 50 | |||
| 51 | #endif /* ___ASM_ARCH_REGS_IRQ_H */ | ||
diff --git a/arch/arm/mach-w90x900/include/mach/regs-serial.h b/arch/arm/mach-w90x900/include/mach/regs-serial.h new file mode 100644 index 000000000000..f08fa0d75e11 --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/regs-serial.h | |||
| @@ -0,0 +1,59 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/regs-serial.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/regs-serial.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARM_REGS_SERIAL_H | ||
| 19 | #define __ASM_ARM_REGS_SERIAL_H | ||
| 20 | |||
| 21 | #define UART0_BA W90X900_VA_UART | ||
| 22 | #define UART1_BA (W90X900_VA_UART+0x100) | ||
| 23 | #define UART2_BA (W90X900_VA_UART+0x200) | ||
| 24 | #define UART3_BA (W90X900_VA_UART+0x300) | ||
| 25 | #define UART4_BA (W90X900_VA_UART+0x400) | ||
| 26 | |||
| 27 | #define UART0_PA W90X900_PA_UART | ||
| 28 | #define UART1_PA (W90X900_PA_UART+0x100) | ||
| 29 | #define UART2_PA (W90X900_PA_UART+0x200) | ||
| 30 | #define UART3_PA (W90X900_PA_UART+0x300) | ||
| 31 | #define UART4_PA (W90X900_PA_UART+0x400) | ||
| 32 | |||
| 33 | #ifndef __ASSEMBLY__ | ||
| 34 | |||
| 35 | struct w90x900_uart_clksrc { | ||
| 36 | const char *name; | ||
| 37 | unsigned int divisor; | ||
| 38 | unsigned int min_baud; | ||
| 39 | unsigned int max_baud; | ||
| 40 | }; | ||
| 41 | |||
| 42 | struct w90x900_uartcfg { | ||
| 43 | unsigned char hwport; | ||
| 44 | unsigned char unused; | ||
| 45 | unsigned short flags; | ||
| 46 | unsigned long uart_flags; | ||
| 47 | |||
| 48 | unsigned long ucon; | ||
| 49 | unsigned long ulcon; | ||
| 50 | unsigned long ufcon; | ||
| 51 | |||
| 52 | struct w90x900_uart_clksrc *clocks; | ||
| 53 | unsigned int clocks_size; | ||
| 54 | }; | ||
| 55 | |||
| 56 | #endif /* __ASSEMBLY__ */ | ||
| 57 | |||
| 58 | #endif /* __ASM_ARM_REGS_SERIAL_H */ | ||
| 59 | |||
diff --git a/arch/arm/mach-w90x900/include/mach/regs-timer.h b/arch/arm/mach-w90x900/include/mach/regs-timer.h new file mode 100644 index 000000000000..8f390620c0e4 --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/regs-timer.h | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/regs-timer.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/regs-timer.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARCH_REGS_TIMER_H | ||
| 19 | #define __ASM_ARCH_REGS_TIMER_H | ||
| 20 | |||
| 21 | /* Timer Registers */ | ||
| 22 | |||
| 23 | #define TMR_BA W90X900_VA_TIMER | ||
| 24 | #define REG_TCSR0 (TMR_BA+0x00) | ||
| 25 | #define REG_TCSR1 (TMR_BA+0x04) | ||
| 26 | #define REG_TICR0 (TMR_BA+0x08) | ||
| 27 | #define REG_TICR1 (TMR_BA+0x0C) | ||
| 28 | #define REG_TDR0 (TMR_BA+0x10) | ||
| 29 | #define REG_TDR1 (TMR_BA+0x14) | ||
| 30 | #define REG_TISR (TMR_BA+0x18) | ||
| 31 | #define REG_WTCR (TMR_BA+0x1C) | ||
| 32 | #define REG_TCSR2 (TMR_BA+0x20) | ||
| 33 | #define REG_TCSR3 (TMR_BA+0x24) | ||
| 34 | #define REG_TICR2 (TMR_BA+0x28) | ||
| 35 | #define REG_TICR3 (TMR_BA+0x2C) | ||
| 36 | #define REG_TDR2 (TMR_BA+0x30) | ||
| 37 | #define REG_TDR3 (TMR_BA+0x34) | ||
| 38 | #define REG_TCSR4 (TMR_BA+0x40) | ||
| 39 | #define REG_TICR4 (TMR_BA+0x48) | ||
| 40 | #define REG_TDR4 (TMR_BA+0x50) | ||
| 41 | |||
| 42 | #endif /* __ASM_ARCH_REGS_TIMER_H */ | ||
diff --git a/arch/arm/mach-w90x900/include/mach/system.h b/arch/arm/mach-w90x900/include/mach/system.h new file mode 100644 index 000000000000..93753f922618 --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/system.h | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/system.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/system.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include <asm/proc-fns.h> | ||
| 19 | |||
| 20 | static void arch_idle(void) | ||
| 21 | { | ||
| 22 | } | ||
| 23 | |||
| 24 | static void arch_reset(char mode) | ||
| 25 | { | ||
| 26 | cpu_reset(0); | ||
| 27 | } | ||
| 28 | |||
diff --git a/arch/arm/mach-w90x900/include/mach/timex.h b/arch/arm/mach-w90x900/include/mach/timex.h new file mode 100644 index 000000000000..164dce0b64db --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/timex.h | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/timex.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/timex.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARCH_TIMEX_H | ||
| 19 | #define __ASM_ARCH_TIMEX_H | ||
| 20 | |||
| 21 | /* CLOCK_TICK_RATE Now, I don't use it. */ | ||
| 22 | |||
| 23 | #define CLOCK_TICK_RATE 15000000 | ||
| 24 | |||
| 25 | #endif /* __ASM_ARCH_TIMEX_H */ | ||
diff --git a/arch/arm/mach-w90x900/include/mach/uncompress.h b/arch/arm/mach-w90x900/include/mach/uncompress.h new file mode 100644 index 000000000000..050d9fe5ae1b --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/uncompress.h | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/uncompress.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/uncompress.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARCH_UNCOMPRESS_H | ||
| 19 | #define __ASM_ARCH_UNCOMPRESS_H | ||
| 20 | |||
| 21 | /* Defines for UART registers */ | ||
| 22 | |||
| 23 | #include <mach/regs-serial.h> | ||
| 24 | #include <mach/map.h> | ||
| 25 | |||
| 26 | #define arch_decomp_wdog() | ||
| 27 | |||
| 28 | static void putc(int ch) | ||
| 29 | { | ||
| 30 | } | ||
| 31 | |||
| 32 | static inline void flush(void) | ||
| 33 | { | ||
| 34 | } | ||
| 35 | |||
| 36 | static void arch_decomp_setup(void) | ||
| 37 | { | ||
| 38 | } | ||
| 39 | |||
| 40 | #endif/* __ASM_W90X900_UNCOMPRESS_H */ | ||
diff --git a/arch/arm/mach-w90x900/include/mach/vmalloc.h b/arch/arm/mach-w90x900/include/mach/vmalloc.h new file mode 100644 index 000000000000..2f9dfb928533 --- /dev/null +++ b/arch/arm/mach-w90x900/include/mach/vmalloc.h | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-w90x900/include/mach/vmalloc.h | ||
| 3 | * | ||
| 4 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 8 | * | ||
| 9 | * Based on arch/arm/mach-s3c2410/include/mach/vmalloc.h | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef __ASM_ARCH_VMALLOC_H | ||
| 19 | #define __ASM_ARCH_VMALLOC_H | ||
| 20 | |||
| 21 | #define VMALLOC_END (0xE0000000) | ||
| 22 | |||
| 23 | #endif /* __ASM_ARCH_VMALLOC_H */ | ||
diff --git a/arch/arm/mach-w90x900/irq.c b/arch/arm/mach-w90x900/irq.c new file mode 100644 index 000000000000..0b4fc194729c --- /dev/null +++ b/arch/arm/mach-w90x900/irq.c | |||
| @@ -0,0 +1,76 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-w90x900/irq.c | ||
| 3 | * | ||
| 4 | * based on linux/arch/arm/plat-s3c24xx/irq.c by Ben Dooks | ||
| 5 | * | ||
| 6 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 7 | * All rights reserved. | ||
| 8 | * | ||
| 9 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include <linux/init.h> | ||
| 19 | #include <linux/module.h> | ||
| 20 | #include <linux/interrupt.h> | ||
| 21 | #include <linux/ioport.h> | ||
| 22 | #include <linux/ptrace.h> | ||
| 23 | #include <linux/sysdev.h> | ||
| 24 | #include <linux/io.h> | ||
| 25 | |||
| 26 | #include <asm/irq.h> | ||
| 27 | #include <asm/mach/irq.h> | ||
| 28 | |||
| 29 | #include <mach/hardware.h> | ||
| 30 | #include <mach/regs-irq.h> | ||
| 31 | |||
| 32 | static void w90x900_irq_mask(unsigned int irq) | ||
| 33 | { | ||
| 34 | __raw_writel(1 << irq, REG_AIC_MDCR); | ||
| 35 | } | ||
| 36 | |||
| 37 | /* | ||
| 38 | * By the w90p910 spec,any irq,only write 1 | ||
| 39 | * to REG_AIC_EOSCR for ACK | ||
| 40 | */ | ||
| 41 | |||
| 42 | static void w90x900_irq_ack(unsigned int irq) | ||
| 43 | { | ||
| 44 | __raw_writel(0x01, REG_AIC_EOSCR); | ||
| 45 | } | ||
| 46 | |||
| 47 | static void w90x900_irq_unmask(unsigned int irq) | ||
| 48 | { | ||
| 49 | unsigned long mask; | ||
| 50 | |||
| 51 | if (irq == IRQ_T_INT_GROUP) { | ||
| 52 | mask = __raw_readl(REG_AIC_GEN); | ||
| 53 | __raw_writel(TIME_GROUP_IRQ | mask, REG_AIC_GEN); | ||
| 54 | __raw_writel(1 << IRQ_T_INT_GROUP, REG_AIC_MECR); | ||
| 55 | } | ||
| 56 | __raw_writel(1 << irq, REG_AIC_MECR); | ||
| 57 | } | ||
| 58 | |||
| 59 | static struct irq_chip w90x900_irq_chip = { | ||
| 60 | .ack = w90x900_irq_ack, | ||
| 61 | .mask = w90x900_irq_mask, | ||
| 62 | .unmask = w90x900_irq_unmask, | ||
| 63 | }; | ||
| 64 | |||
| 65 | void __init w90x900_init_irq(void) | ||
| 66 | { | ||
| 67 | int irqno; | ||
| 68 | |||
| 69 | __raw_writel(0xFFFFFFFE, REG_AIC_MDCR); | ||
| 70 | |||
| 71 | for (irqno = IRQ_WDT; irqno <= IRQ_ADC; irqno++) { | ||
| 72 | set_irq_chip(irqno, &w90x900_irq_chip); | ||
| 73 | set_irq_handler(irqno, handle_level_irq); | ||
| 74 | set_irq_flags(irqno, IRQF_VALID); | ||
| 75 | } | ||
| 76 | } | ||
diff --git a/arch/arm/mach-w90x900/mach-w90p910evb.c b/arch/arm/mach-w90x900/mach-w90p910evb.c new file mode 100644 index 000000000000..9307a2475438 --- /dev/null +++ b/arch/arm/mach-w90x900/mach-w90p910evb.c | |||
| @@ -0,0 +1,72 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-w90x900/mach-w90p910evb.c | ||
| 3 | * | ||
| 4 | * Based on mach-s3c2410/mach-smdk2410.c by Jonas Dietsche | ||
| 5 | * | ||
| 6 | * Copyright (C) 2008 Nuvoton technology corporation | ||
| 7 | * All rights reserved. | ||
| 8 | * | ||
| 9 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 10 | * | ||
| 11 | * This program is free software; you can redistribute it and/or | ||
| 12 | * modify it under the terms of the GNU General Public License as | ||
| 13 | * published by the Free Software Foundation; either version 2 of | ||
| 14 | * the License, or (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include <linux/kernel.h> | ||
| 19 | #include <linux/types.h> | ||
| 20 | #include <linux/interrupt.h> | ||
| 21 | #include <linux/list.h> | ||
| 22 | #include <linux/timer.h> | ||
| 23 | #include <linux/init.h> | ||
| 24 | #include <linux/platform_device.h> | ||
| 25 | |||
| 26 | #include <asm/mach/arch.h> | ||
| 27 | #include <asm/mach/map.h> | ||
| 28 | #include <asm/mach/irq.h> | ||
| 29 | #include <asm/mach-types.h> | ||
| 30 | |||
| 31 | #include <mach/regs-serial.h> | ||
| 32 | |||
| 33 | #include "cpu.h" | ||
| 34 | |||
| 35 | static struct map_desc w90p910_iodesc[] __initdata = { | ||
| 36 | }; | ||
| 37 | |||
| 38 | static struct w90x900_uartcfg w90p910_uartcfgs[] = { | ||
| 39 | W90X900_UARTCFG(0, 0, 0, 0, 0), | ||
| 40 | W90X900_UARTCFG(1, 0, 0, 0, 0), | ||
| 41 | W90X900_UARTCFG(2, 0, 0, 0, 0), | ||
| 42 | W90X900_UARTCFG(3, 0, 0, 0, 0), | ||
| 43 | W90X900_UARTCFG(4, 0, 0, 0, 0), | ||
| 44 | }; | ||
| 45 | |||
| 46 | /*Here should be your evb resourse,such as LCD*/ | ||
| 47 | |||
| 48 | static struct platform_device *w90p910evb_dev[] __initdata = { | ||
| 49 | }; | ||
| 50 | |||
| 51 | static void __init w90p910evb_map_io(void) | ||
| 52 | { | ||
| 53 | w90p910_map_io(w90p910_iodesc, ARRAY_SIZE(w90p910_iodesc)); | ||
| 54 | w90p910_init_clocks(0); | ||
| 55 | w90p910_init_uarts(w90p910_uartcfgs, ARRAY_SIZE(w90p910_uartcfgs)); | ||
| 56 | } | ||
| 57 | |||
| 58 | static void __init w90p910evb_init(void) | ||
| 59 | { | ||
| 60 | platform_add_devices(w90p910evb_dev, ARRAY_SIZE(w90p910evb_dev)); | ||
| 61 | } | ||
| 62 | |||
| 63 | MACHINE_START(W90P910EVB, "W90P910EVB") | ||
| 64 | /* Maintainer: Wan ZongShun */ | ||
| 65 | .phys_io = W90X900_PA_UART, | ||
| 66 | .io_pg_offst = (((u32)W90X900_VA_UART) >> 18) & 0xfffc, | ||
| 67 | .boot_params = 0, | ||
| 68 | .map_io = w90p910evb_map_io, | ||
| 69 | .init_irq = w90x900_init_irq, | ||
| 70 | .init_machine = w90p910evb_init, | ||
| 71 | .timer = &w90x900_timer, | ||
| 72 | MACHINE_END | ||
diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c new file mode 100644 index 000000000000..3a69e381f316 --- /dev/null +++ b/arch/arm/mach-w90x900/time.c | |||
| @@ -0,0 +1,80 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-w90x900/time.c | ||
| 3 | * | ||
| 4 | * Based on linux/arch/arm/plat-s3c24xx/time.c by Ben Dooks | ||
| 5 | * | ||
| 6 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 7 | * All rights reserved. | ||
| 8 | * | ||
| 9 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 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 as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include <linux/kernel.h> | ||
| 19 | #include <linux/sched.h> | ||
| 20 | #include <linux/init.h> | ||
| 21 | #include <linux/interrupt.h> | ||
| 22 | #include <linux/err.h> | ||
| 23 | #include <linux/clk.h> | ||
| 24 | #include <linux/io.h> | ||
| 25 | #include <linux/leds.h> | ||
| 26 | |||
| 27 | #include <asm/mach-types.h> | ||
| 28 | #include <asm/mach/irq.h> | ||
| 29 | #include <asm/mach/time.h> | ||
| 30 | |||
| 31 | #include <mach/system.h> | ||
| 32 | #include <mach/map.h> | ||
| 33 | #include <mach/regs-timer.h> | ||
| 34 | |||
| 35 | static unsigned long w90x900_gettimeoffset(void) | ||
| 36 | { | ||
| 37 | return 0; | ||
| 38 | } | ||
| 39 | |||
| 40 | /*IRQ handler for the timer*/ | ||
| 41 | |||
| 42 | static irqreturn_t | ||
| 43 | w90x900_timer_interrupt(int irq, void *dev_id) | ||
| 44 | { | ||
| 45 | timer_tick(); | ||
| 46 | __raw_writel(0x01, REG_TISR); /* clear TIF0 */ | ||
| 47 | return IRQ_HANDLED; | ||
| 48 | } | ||
| 49 | |||
| 50 | static struct irqaction w90x900_timer_irq = { | ||
| 51 | .name = "w90x900 Timer Tick", | ||
| 52 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, | ||
| 53 | .handler = w90x900_timer_interrupt, | ||
| 54 | }; | ||
| 55 | |||
| 56 | /*Set up timer reg.*/ | ||
| 57 | |||
| 58 | static void w90x900_timer_setup(void) | ||
| 59 | { | ||
| 60 | __raw_writel(0, REG_TCSR0); | ||
| 61 | __raw_writel(0, REG_TCSR1); | ||
| 62 | __raw_writel(0, REG_TCSR2); | ||
| 63 | __raw_writel(0, REG_TCSR3); | ||
| 64 | __raw_writel(0, REG_TCSR4); | ||
| 65 | __raw_writel(0x1F, REG_TISR); | ||
| 66 | __raw_writel(15000000/(100 * 100), REG_TICR0); | ||
| 67 | __raw_writel(0x68000063, REG_TCSR0); | ||
| 68 | } | ||
| 69 | |||
| 70 | static void __init w90x900_timer_init(void) | ||
| 71 | { | ||
| 72 | w90x900_timer_setup(); | ||
| 73 | setup_irq(IRQ_TIMER0, &w90x900_timer_irq); | ||
| 74 | } | ||
| 75 | |||
| 76 | struct sys_timer w90x900_timer = { | ||
| 77 | .init = w90x900_timer_init, | ||
| 78 | .offset = w90x900_gettimeoffset, | ||
| 79 | .resume = w90x900_timer_setup | ||
| 80 | }; | ||
diff --git a/arch/arm/mach-w90x900/w90p910.c b/arch/arm/mach-w90x900/w90p910.c new file mode 100644 index 000000000000..aa783bc94310 --- /dev/null +++ b/arch/arm/mach-w90x900/w90p910.c | |||
| @@ -0,0 +1,134 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-w90x900/w90p910.c | ||
| 3 | * | ||
| 4 | * Based on linux/arch/arm/plat-s3c24xx/s3c244x.c by Ben Dooks | ||
| 5 | * | ||
| 6 | * Copyright (c) 2008 Nuvoton technology corporation | ||
| 7 | * All rights reserved. | ||
| 8 | * | ||
| 9 | * Wan ZongShun <mcuos.com@gmail.com> | ||
| 10 | * | ||
| 11 | * W90P910 cpu support | ||
| 12 | * | ||
| 13 | * This program is free software; you can redistribute it and/or modify | ||
| 14 | * it under the terms of the GNU General Public License as published by | ||
| 15 | * the Free Software Foundation; either version 2 of the License, or | ||
| 16 | * (at your option) any later version. | ||
| 17 | * | ||
| 18 | */ | ||
| 19 | |||
| 20 | #include <linux/kernel.h> | ||
| 21 | #include <linux/types.h> | ||
| 22 | #include <linux/interrupt.h> | ||
| 23 | #include <linux/list.h> | ||
| 24 | #include <linux/timer.h> | ||
| 25 | #include <linux/init.h> | ||
| 26 | #include <linux/platform_device.h> | ||
| 27 | #include <linux/io.h> | ||
| 28 | |||
| 29 | #include <asm/mach/arch.h> | ||
| 30 | #include <asm/mach/map.h> | ||
| 31 | #include <asm/mach/irq.h> | ||
| 32 | #include <asm/irq.h> | ||
| 33 | |||
| 34 | #include <mach/hardware.h> | ||
| 35 | #include <mach/regs-serial.h> | ||
| 36 | |||
| 37 | #include "cpu.h" | ||
| 38 | |||
| 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 */ | ||
| 46 | |||
| 47 | static struct map_desc w90p910_iodesc[] __initdata = { | ||
| 48 | IODESC_ENT(IRQ), | ||
| 49 | IODESC_ENT(GCR), | ||
| 50 | IODESC_ENT(UART), | ||
| 51 | IODESC_ENT(TIMER), | ||
| 52 | IODESC_ENT(EBI), | ||
| 53 | /*IODESC_ENT(LCD),*/ | ||
| 54 | }; | ||
| 55 | |||
| 56 | /*Init the dev resource*/ | ||
| 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 | |||
| 77 | /*Init W90P910 uart device*/ | ||
| 78 | |||
| 79 | void __init w90p910_init_uarts(struct w90x900_uartcfg *cfg, int no) | ||
| 80 | { | ||
| 81 | struct platform_device *platdev; | ||
| 82 | int uart, uartdev; | ||
| 83 | |||
| 84 | /*By min() to judge count of uart be used indeed*/ | ||
| 85 | |||
| 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 | |||
| 99 | /*Init W90P910 evb io*/ | ||
| 100 | |||
| 101 | void __init w90p910_map_io(struct map_desc *mach_desc, int mach_size) | ||
| 102 | { | ||
| 103 | unsigned long idcode = 0x0; | ||
| 104 | |||
| 105 | iotable_init(w90p910_iodesc, ARRAY_SIZE(w90p910_iodesc)); | ||
| 106 | |||
| 107 | idcode = __raw_readl(W90X900PDID); | ||
| 108 | if (idcode != W90P910_CPUID) | ||
| 109 | printk(KERN_ERR "CPU type 0x%08lx is not W90P910\n", idcode); | ||
| 110 | } | ||
| 111 | |||
| 112 | /*Init W90P910 clock*/ | ||
| 113 | |||
| 114 | void __init w90p910_init_clocks(int xtal) | ||
| 115 | { | ||
| 116 | } | ||
| 117 | |||
| 118 | static int __init w90p910_init_cpu(void) | ||
| 119 | { | ||
| 120 | return 0; | ||
| 121 | } | ||
| 122 | |||
| 123 | static int __init w90x900_arch_init(void) | ||
| 124 | { | ||
| 125 | int ret; | ||
| 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 | } | ||
| 134 | arch_initcall(w90x900_arch_init); | ||
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index ab5f7a21350b..d490f3773c01 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -10,8 +10,7 @@ config CPU_32 | |||
| 10 | 10 | ||
| 11 | # ARM610 | 11 | # ARM610 |
| 12 | config CPU_ARM610 | 12 | config CPU_ARM610 |
| 13 | bool "Support ARM610 processor" | 13 | bool "Support ARM610 processor" if ARCH_RPC |
| 14 | depends on ARCH_RPC | ||
| 15 | select CPU_32v3 | 14 | select CPU_32v3 |
| 16 | select CPU_CACHE_V3 | 15 | select CPU_CACHE_V3 |
| 17 | select CPU_CACHE_VIVT | 16 | select CPU_CACHE_VIVT |
| @@ -43,8 +42,7 @@ config CPU_ARM7TDMI | |||
| 43 | 42 | ||
| 44 | # ARM710 | 43 | # ARM710 |
| 45 | config CPU_ARM710 | 44 | config CPU_ARM710 |
| 46 | bool "Support ARM710 processor" if !ARCH_CLPS7500 && ARCH_RPC | 45 | bool "Support ARM710 processor" if ARCH_RPC |
| 47 | default y if ARCH_CLPS7500 | ||
| 48 | select CPU_32v3 | 46 | select CPU_32v3 |
| 49 | select CPU_CACHE_V3 | 47 | select CPU_CACHE_V3 |
| 50 | select CPU_CACHE_VIVT | 48 | select CPU_CACHE_VIVT |
| @@ -63,8 +61,7 @@ config CPU_ARM710 | |||
| 63 | 61 | ||
| 64 | # ARM720T | 62 | # ARM720T |
| 65 | config CPU_ARM720T | 63 | config CPU_ARM720T |
| 66 | bool "Support ARM720T processor" if !ARCH_CLPS711X && !ARCH_L7200 && !ARCH_CDB89712 && ARCH_INTEGRATOR | 64 | bool "Support ARM720T processor" if ARCH_INTEGRATOR |
| 67 | default y if ARCH_CLPS711X || ARCH_L7200 || ARCH_CDB89712 || ARCH_H720X | ||
| 68 | select CPU_32v4T | 65 | select CPU_32v4T |
| 69 | select CPU_ABRT_LV4T | 66 | select CPU_ABRT_LV4T |
| 70 | select CPU_PABRT_NOIFAR | 67 | select CPU_PABRT_NOIFAR |
| @@ -114,9 +111,7 @@ config CPU_ARM9TDMI | |||
| 114 | 111 | ||
| 115 | # ARM920T | 112 | # ARM920T |
| 116 | config CPU_ARM920T | 113 | config CPU_ARM920T |
| 117 | bool "Support ARM920T processor" | 114 | bool "Support ARM920T processor" if ARCH_INTEGRATOR |
| 118 | depends on ARCH_EP93XX || ARCH_INTEGRATOR || CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_IMX || ARCH_AAEC2000 || ARCH_AT91RM9200 | ||
| 119 | default y if CPU_S3C2410 || CPU_S3C2440 || CPU_S3C2442 || ARCH_AT91RM9200 | ||
| 120 | select CPU_32v4T | 115 | select CPU_32v4T |
| 121 | select CPU_ABRT_EV4T | 116 | select CPU_ABRT_EV4T |
| 122 | select CPU_PABRT_NOIFAR | 117 | select CPU_PABRT_NOIFAR |
| @@ -138,8 +133,6 @@ config CPU_ARM920T | |||
| 138 | # ARM922T | 133 | # ARM922T |
| 139 | config CPU_ARM922T | 134 | config CPU_ARM922T |
| 140 | bool "Support ARM922T processor" if ARCH_INTEGRATOR | 135 | bool "Support ARM922T processor" if ARCH_INTEGRATOR |
| 141 | depends on ARCH_LH7A40X || ARCH_INTEGRATOR || ARCH_KS8695 | ||
| 142 | default y if ARCH_LH7A40X || ARCH_KS8695 | ||
| 143 | select CPU_32v4T | 136 | select CPU_32v4T |
| 144 | select CPU_ABRT_EV4T | 137 | select CPU_ABRT_EV4T |
| 145 | select CPU_PABRT_NOIFAR | 138 | select CPU_PABRT_NOIFAR |
| @@ -159,8 +152,6 @@ config CPU_ARM922T | |||
| 159 | # ARM925T | 152 | # ARM925T |
| 160 | config CPU_ARM925T | 153 | config CPU_ARM925T |
| 161 | bool "Support ARM925T processor" if ARCH_OMAP1 | 154 | bool "Support ARM925T processor" if ARCH_OMAP1 |
| 162 | depends on ARCH_OMAP15XX | ||
| 163 | default y if ARCH_OMAP15XX | ||
| 164 | select CPU_32v4T | 155 | select CPU_32v4T |
| 165 | select CPU_ABRT_EV4T | 156 | select CPU_ABRT_EV4T |
| 166 | select CPU_PABRT_NOIFAR | 157 | select CPU_PABRT_NOIFAR |
| @@ -179,22 +170,7 @@ config CPU_ARM925T | |||
| 179 | 170 | ||
| 180 | # ARM926T | 171 | # ARM926T |
| 181 | config CPU_ARM926T | 172 | config CPU_ARM926T |
| 182 | bool "Support ARM926T processor" | 173 | bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB |
| 183 | depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || \ | ||
| 184 | MACH_VERSATILE_AB || ARCH_OMAP730 || \ | ||
| 185 | ARCH_OMAP16XX || MACH_REALVIEW_EB || \ | ||
| 186 | ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \ | ||
| 187 | ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \ | ||
| 188 | ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \ | ||
| 189 | ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \ | ||
| 190 | ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2 | ||
| 191 | default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || \ | ||
| 192 | ARCH_OMAP730 || ARCH_OMAP16XX || \ | ||
| 193 | ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || \ | ||
| 194 | ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || \ | ||
| 195 | ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || \ | ||
| 196 | ARCH_AT91SAM9G20 || ARCH_AT91CAP9 || \ | ||
| 197 | ARCH_NS9XXX || ARCH_DAVINCI || ARCH_MX2 | ||
| 198 | select CPU_32v5 | 174 | select CPU_32v5 |
| 199 | select CPU_ABRT_EV5TJ | 175 | select CPU_ABRT_EV5TJ |
| 200 | select CPU_PABRT_NOIFAR | 176 | select CPU_PABRT_NOIFAR |
| @@ -247,8 +223,7 @@ config CPU_ARM946E | |||
| 247 | 223 | ||
| 248 | # ARM1020 - needs validating | 224 | # ARM1020 - needs validating |
| 249 | config CPU_ARM1020 | 225 | config CPU_ARM1020 |
| 250 | bool "Support ARM1020T (rev 0) processor" | 226 | bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR |
| 251 | depends on ARCH_INTEGRATOR | ||
| 252 | select CPU_32v5 | 227 | select CPU_32v5 |
| 253 | select CPU_ABRT_EV4T | 228 | select CPU_ABRT_EV4T |
| 254 | select CPU_PABRT_NOIFAR | 229 | select CPU_PABRT_NOIFAR |
| @@ -266,8 +241,7 @@ config CPU_ARM1020 | |||
| 266 | 241 | ||
| 267 | # ARM1020E - needs validating | 242 | # ARM1020E - needs validating |
| 268 | config CPU_ARM1020E | 243 | config CPU_ARM1020E |
| 269 | bool "Support ARM1020E processor" | 244 | bool "Support ARM1020E processor" if ARCH_INTEGRATOR |
| 270 | depends on ARCH_INTEGRATOR | ||
| 271 | select CPU_32v5 | 245 | select CPU_32v5 |
| 272 | select CPU_ABRT_EV4T | 246 | select CPU_ABRT_EV4T |
| 273 | select CPU_PABRT_NOIFAR | 247 | select CPU_PABRT_NOIFAR |
| @@ -280,8 +254,7 @@ config CPU_ARM1020E | |||
| 280 | 254 | ||
| 281 | # ARM1022E | 255 | # ARM1022E |
| 282 | config CPU_ARM1022 | 256 | config CPU_ARM1022 |
| 283 | bool "Support ARM1022E processor" | 257 | bool "Support ARM1022E processor" if ARCH_INTEGRATOR |
| 284 | depends on ARCH_INTEGRATOR | ||
| 285 | select CPU_32v5 | 258 | select CPU_32v5 |
| 286 | select CPU_ABRT_EV4T | 259 | select CPU_ABRT_EV4T |
| 287 | select CPU_PABRT_NOIFAR | 260 | select CPU_PABRT_NOIFAR |
| @@ -299,8 +272,7 @@ config CPU_ARM1022 | |||
| 299 | 272 | ||
| 300 | # ARM1026EJ-S | 273 | # ARM1026EJ-S |
| 301 | config CPU_ARM1026 | 274 | config CPU_ARM1026 |
| 302 | bool "Support ARM1026EJ-S processor" | 275 | bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR |
| 303 | depends on ARCH_INTEGRATOR | ||
| 304 | select CPU_32v5 | 276 | select CPU_32v5 |
| 305 | select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10 | 277 | select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10 |
| 306 | select CPU_PABRT_NOIFAR | 278 | select CPU_PABRT_NOIFAR |
| @@ -317,8 +289,7 @@ config CPU_ARM1026 | |||
| 317 | 289 | ||
| 318 | # SA110 | 290 | # SA110 |
| 319 | config CPU_SA110 | 291 | config CPU_SA110 |
| 320 | bool "Support StrongARM(R) SA-110 processor" if !ARCH_EBSA110 && !FOOTBRIDGE && !ARCH_TBOX && !ARCH_SHARK && !ARCH_NEXUSPCI && ARCH_RPC | 292 | bool "Support StrongARM(R) SA-110 processor" if ARCH_RPC |
| 321 | default y if ARCH_EBSA110 || FOOTBRIDGE || ARCH_TBOX || ARCH_SHARK || ARCH_NEXUSPCI | ||
| 322 | select CPU_32v3 if ARCH_RPC | 293 | select CPU_32v3 if ARCH_RPC |
| 323 | select CPU_32v4 if !ARCH_RPC | 294 | select CPU_32v4 if !ARCH_RPC |
| 324 | select CPU_ABRT_EV4 | 295 | select CPU_ABRT_EV4 |
| @@ -340,8 +311,6 @@ config CPU_SA110 | |||
| 340 | # SA1100 | 311 | # SA1100 |
| 341 | config CPU_SA1100 | 312 | config CPU_SA1100 |
| 342 | bool | 313 | bool |
| 343 | depends on ARCH_SA1100 | ||
| 344 | default y | ||
| 345 | select CPU_32v4 | 314 | select CPU_32v4 |
| 346 | select CPU_ABRT_EV4 | 315 | select CPU_ABRT_EV4 |
| 347 | select CPU_PABRT_NOIFAR | 316 | select CPU_PABRT_NOIFAR |
| @@ -353,8 +322,6 @@ config CPU_SA1100 | |||
| 353 | # XScale | 322 | # XScale |
| 354 | config CPU_XSCALE | 323 | config CPU_XSCALE |
| 355 | bool | 324 | bool |
| 356 | depends on ARCH_IOP32X || ARCH_IOP33X || PXA25x || PXA27x || ARCH_IXP4XX || ARCH_IXP2000 | ||
| 357 | default y | ||
| 358 | select CPU_32v5 | 325 | select CPU_32v5 |
| 359 | select CPU_ABRT_EV5T | 326 | select CPU_ABRT_EV5T |
| 360 | select CPU_PABRT_NOIFAR | 327 | select CPU_PABRT_NOIFAR |
| @@ -365,8 +332,6 @@ config CPU_XSCALE | |||
| 365 | # XScale Core Version 3 | 332 | # XScale Core Version 3 |
| 366 | config CPU_XSC3 | 333 | config CPU_XSC3 |
| 367 | bool | 334 | bool |
| 368 | depends on ARCH_IXP23XX || ARCH_IOP13XX || PXA3xx | ||
| 369 | default y | ||
| 370 | select CPU_32v5 | 335 | select CPU_32v5 |
| 371 | select CPU_ABRT_EV5T | 336 | select CPU_ABRT_EV5T |
| 372 | select CPU_PABRT_NOIFAR | 337 | select CPU_PABRT_NOIFAR |
| @@ -378,8 +343,6 @@ config CPU_XSC3 | |||
| 378 | # Feroceon | 343 | # Feroceon |
| 379 | config CPU_FEROCEON | 344 | config CPU_FEROCEON |
| 380 | bool | 345 | bool |
| 381 | depends on ARCH_ORION5X || ARCH_LOKI || ARCH_KIRKWOOD || ARCH_MV78XX0 | ||
| 382 | default y | ||
| 383 | select CPU_32v5 | 346 | select CPU_32v5 |
| 384 | select CPU_ABRT_EV5T | 347 | select CPU_ABRT_EV5T |
| 385 | select CPU_PABRT_NOIFAR | 348 | select CPU_PABRT_NOIFAR |
| @@ -399,10 +362,7 @@ config CPU_FEROCEON_OLD_ID | |||
| 399 | 362 | ||
| 400 | # ARMv6 | 363 | # ARMv6 |
| 401 | config CPU_V6 | 364 | config CPU_V6 |
| 402 | bool "Support ARM V6 processor" | 365 | bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB |
| 403 | depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP2 || ARCH_MX3 || ARCH_MSM || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 | ||
| 404 | default y if ARCH_MX3 | ||
| 405 | default y if ARCH_MSM | ||
| 406 | select CPU_32v6 | 366 | select CPU_32v6 |
| 407 | select CPU_ABRT_EV6 | 367 | select CPU_ABRT_EV6 |
| 408 | select CPU_PABRT_NOIFAR | 368 | select CPU_PABRT_NOIFAR |
| @@ -427,8 +387,7 @@ config CPU_32v6K | |||
| 427 | 387 | ||
| 428 | # ARMv7 | 388 | # ARMv7 |
| 429 | config CPU_V7 | 389 | config CPU_V7 |
| 430 | bool "Support ARM V7 processor" | 390 | bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB |
| 431 | depends on ARCH_INTEGRATOR || MACH_REALVIEW_EB || ARCH_OMAP3 | ||
| 432 | select CPU_32v6K | 391 | select CPU_32v6K |
| 433 | select CPU_32v7 | 392 | select CPU_32v7 |
| 434 | select CPU_ABRT_EV7 | 393 | select CPU_ABRT_EV7 |
| @@ -745,7 +704,7 @@ config CACHE_FEROCEON_L2_WRITETHROUGH | |||
| 745 | 704 | ||
| 746 | config CACHE_L2X0 | 705 | config CACHE_L2X0 |
| 747 | bool "Enable the L2x0 outer cache controller" | 706 | bool "Enable the L2x0 outer cache controller" |
| 748 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 | 707 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || REALVIEW_EB_A9MP |
| 749 | default y | 708 | default y |
| 750 | select OUTER_CACHE | 709 | select OUTER_CACHE |
| 751 | help | 710 | help |
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 133e65d166b3..c5a57fbf095d 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/proc_fs.h> | 18 | #include <linux/proc_fs.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/sched.h> | ||
| 20 | #include <linux/uaccess.h> | 21 | #include <linux/uaccess.h> |
| 21 | 22 | ||
| 22 | #include <asm/unaligned.h> | 23 | #include <asm/unaligned.h> |
diff --git a/arch/arm/mm/cache-v3.S b/arch/arm/mm/cache-v3.S index 3b3639eb7ca5..8a4abebc478a 100644 --- a/arch/arm/mm/cache-v3.S +++ b/arch/arm/mm/cache-v3.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | */ | 9 | */ |
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <mach/hardware.h> | ||
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
| 14 | #include "proc-macros.S" | 13 | #include "proc-macros.S" |
| 15 | 14 | ||
diff --git a/arch/arm/mm/cache-v4.S b/arch/arm/mm/cache-v4.S index 5786adf10040..3668611cb400 100644 --- a/arch/arm/mm/cache-v4.S +++ b/arch/arm/mm/cache-v4.S | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | */ | 9 | */ |
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <mach/hardware.h> | ||
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
| 14 | #include "proc-macros.S" | 13 | #include "proc-macros.S" |
| 15 | 14 | ||
diff --git a/arch/arm/mm/cache-v4wt.S b/arch/arm/mm/cache-v4wt.S index 51a9b0b273b6..c54fa2cc40e6 100644 --- a/arch/arm/mm/cache-v4wt.S +++ b/arch/arm/mm/cache-v4wt.S | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <mach/hardware.h> | ||
| 17 | #include <asm/page.h> | 16 | #include <asm/page.h> |
| 18 | #include "proc-macros.S" | 17 | #include "proc-macros.S" |
| 19 | 18 | ||
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S index d19c2bec2b1f..be93ff02a98d 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | * - mm - mm_struct describing address space | 26 | * - mm - mm_struct describing address space |
| 27 | */ | 27 | */ |
| 28 | ENTRY(v7_flush_dcache_all) | 28 | ENTRY(v7_flush_dcache_all) |
| 29 | dmb @ ensure ordering with previous memory accesses | ||
| 29 | mrc p15, 1, r0, c0, c0, 1 @ read clidr | 30 | mrc p15, 1, r0, c0, c0, 1 @ read clidr |
| 30 | ands r3, r0, #0x7000000 @ extract loc from clidr | 31 | ands r3, r0, #0x7000000 @ extract loc from clidr |
| 31 | mov r3, r3, lsr #23 @ left align loc bit field | 32 | mov r3, r3, lsr #23 @ left align loc bit field |
| @@ -64,6 +65,7 @@ skip: | |||
| 64 | finished: | 65 | finished: |
| 65 | mov r10, #0 @ swith back to cache level 0 | 66 | mov r10, #0 @ swith back to cache level 0 |
| 66 | mcr p15, 2, r10, c0, c0, 0 @ select current cache level in cssr | 67 | mcr p15, 2, r10, c0, c0, 0 @ select current cache level in cssr |
| 68 | dsb | ||
| 67 | isb | 69 | isb |
| 68 | mov pc, lr | 70 | mov pc, lr |
| 69 | ENDPROC(v7_flush_dcache_all) | 71 | ENDPROC(v7_flush_dcache_all) |
diff --git a/arch/arm/mm/copypage-feroceon.S b/arch/arm/mm/copypage-feroceon.S deleted file mode 100644 index 7eb0d320d240..000000000000 --- a/arch/arm/mm/copypage-feroceon.S +++ /dev/null | |||
| @@ -1,95 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/lib/copypage-feroceon.S | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Marvell Semiconductors | ||
| 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 handles copy_user_page and clear_user_page on Feroceon | ||
| 11 | * more optimally than the generic implementations. | ||
| 12 | */ | ||
| 13 | #include <linux/linkage.h> | ||
| 14 | #include <linux/init.h> | ||
| 15 | #include <asm/asm-offsets.h> | ||
| 16 | |||
| 17 | .text | ||
| 18 | .align 5 | ||
| 19 | |||
| 20 | ENTRY(feroceon_copy_user_page) | ||
| 21 | stmfd sp!, {r4-r9, lr} | ||
| 22 | mov ip, #PAGE_SZ | ||
| 23 | 1: mov lr, r1 | ||
| 24 | ldmia r1!, {r2 - r9} | ||
| 25 | pld [lr, #32] | ||
| 26 | pld [lr, #64] | ||
| 27 | pld [lr, #96] | ||
| 28 | pld [lr, #128] | ||
| 29 | pld [lr, #160] | ||
| 30 | pld [lr, #192] | ||
| 31 | pld [lr, #224] | ||
| 32 | stmia r0, {r2 - r9} | ||
| 33 | ldmia r1!, {r2 - r9} | ||
| 34 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line | ||
| 35 | add r0, r0, #32 | ||
| 36 | stmia r0, {r2 - r9} | ||
| 37 | ldmia r1!, {r2 - r9} | ||
| 38 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line | ||
| 39 | add r0, r0, #32 | ||
| 40 | stmia r0, {r2 - r9} | ||
| 41 | ldmia r1!, {r2 - r9} | ||
| 42 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line | ||
| 43 | add r0, r0, #32 | ||
| 44 | stmia r0, {r2 - r9} | ||
| 45 | ldmia r1!, {r2 - r9} | ||
| 46 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line | ||
| 47 | add r0, r0, #32 | ||
| 48 | stmia r0, {r2 - r9} | ||
| 49 | ldmia r1!, {r2 - r9} | ||
| 50 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line | ||
| 51 | add r0, r0, #32 | ||
| 52 | stmia r0, {r2 - r9} | ||
| 53 | ldmia r1!, {r2 - r9} | ||
| 54 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line | ||
| 55 | add r0, r0, #32 | ||
| 56 | stmia r0, {r2 - r9} | ||
| 57 | ldmia r1!, {r2 - r9} | ||
| 58 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line | ||
| 59 | add r0, r0, #32 | ||
| 60 | stmia r0, {r2 - r9} | ||
| 61 | subs ip, ip, #(32 * 8) | ||
| 62 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line | ||
| 63 | add r0, r0, #32 | ||
| 64 | bne 1b | ||
| 65 | mcr p15, 0, ip, c7, c10, 4 @ drain WB | ||
| 66 | ldmfd sp!, {r4-r9, pc} | ||
| 67 | |||
| 68 | .align 5 | ||
| 69 | |||
| 70 | ENTRY(feroceon_clear_user_page) | ||
| 71 | stmfd sp!, {r4-r7, lr} | ||
| 72 | mov r1, #PAGE_SZ/32 | ||
| 73 | mov r2, #0 | ||
| 74 | mov r3, #0 | ||
| 75 | mov r4, #0 | ||
| 76 | mov r5, #0 | ||
| 77 | mov r6, #0 | ||
| 78 | mov r7, #0 | ||
| 79 | mov ip, #0 | ||
| 80 | mov lr, #0 | ||
| 81 | 1: stmia r0, {r2-r7, ip, lr} | ||
| 82 | subs r1, r1, #1 | ||
| 83 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line | ||
| 84 | add r0, r0, #32 | ||
| 85 | bne 1b | ||
| 86 | mcr p15, 0, r1, c7, c10, 4 @ drain WB | ||
| 87 | ldmfd sp!, {r4-r7, pc} | ||
| 88 | |||
| 89 | __INITDATA | ||
| 90 | |||
| 91 | .type feroceon_user_fns, #object | ||
| 92 | ENTRY(feroceon_user_fns) | ||
| 93 | .long feroceon_clear_user_page | ||
| 94 | .long feroceon_copy_user_page | ||
| 95 | .size feroceon_user_fns, . - feroceon_user_fns | ||
diff --git a/arch/arm/mm/copypage-feroceon.c b/arch/arm/mm/copypage-feroceon.c new file mode 100644 index 000000000000..c3ba6a94da0c --- /dev/null +++ b/arch/arm/mm/copypage-feroceon.c | |||
| @@ -0,0 +1,111 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mm/copypage-feroceon.S | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Marvell Semiconductors | ||
| 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 handles copy_user_highpage and clear_user_page on Feroceon | ||
| 11 | * more optimally than the generic implementations. | ||
| 12 | */ | ||
| 13 | #include <linux/init.h> | ||
| 14 | #include <linux/highmem.h> | ||
| 15 | |||
| 16 | static void __attribute__((naked)) | ||
| 17 | feroceon_copy_user_page(void *kto, const void *kfrom) | ||
| 18 | { | ||
| 19 | asm("\ | ||
| 20 | stmfd sp!, {r4-r9, lr} \n\ | ||
| 21 | mov ip, %0 \n\ | ||
| 22 | 1: mov lr, r1 \n\ | ||
| 23 | ldmia r1!, {r2 - r9} \n\ | ||
| 24 | pld [lr, #32] \n\ | ||
| 25 | pld [lr, #64] \n\ | ||
| 26 | pld [lr, #96] \n\ | ||
| 27 | pld [lr, #128] \n\ | ||
| 28 | pld [lr, #160] \n\ | ||
| 29 | pld [lr, #192] \n\ | ||
| 30 | pld [lr, #224] \n\ | ||
| 31 | stmia r0, {r2 - r9} \n\ | ||
| 32 | ldmia r1!, {r2 - r9} \n\ | ||
| 33 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\ | ||
| 34 | add r0, r0, #32 \n\ | ||
| 35 | stmia r0, {r2 - r9} \n\ | ||
| 36 | ldmia r1!, {r2 - r9} \n\ | ||
| 37 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\ | ||
| 38 | add r0, r0, #32 \n\ | ||
| 39 | stmia r0, {r2 - r9} \n\ | ||
| 40 | ldmia r1!, {r2 - r9} \n\ | ||
| 41 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\ | ||
| 42 | add r0, r0, #32 \n\ | ||
| 43 | stmia r0, {r2 - r9} \n\ | ||
| 44 | ldmia r1!, {r2 - r9} \n\ | ||
| 45 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\ | ||
| 46 | add r0, r0, #32 \n\ | ||
| 47 | stmia r0, {r2 - r9} \n\ | ||
| 48 | ldmia r1!, {r2 - r9} \n\ | ||
| 49 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\ | ||
| 50 | add r0, r0, #32 \n\ | ||
| 51 | stmia r0, {r2 - r9} \n\ | ||
| 52 | ldmia r1!, {r2 - r9} \n\ | ||
| 53 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\ | ||
| 54 | add r0, r0, #32 \n\ | ||
| 55 | stmia r0, {r2 - r9} \n\ | ||
| 56 | ldmia r1!, {r2 - r9} \n\ | ||
| 57 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\ | ||
| 58 | add r0, r0, #32 \n\ | ||
| 59 | stmia r0, {r2 - r9} \n\ | ||
| 60 | subs ip, ip, #(32 * 8) \n\ | ||
| 61 | mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\ | ||
| 62 | add r0, r0, #32 \n\ | ||
| 63 | bne 1b \n\ | ||
| 64 | mcr p15, 0, ip, c7, c10, 4 @ drain WB\n\ | ||
| 65 | ldmfd sp!, {r4-r9, pc}" | ||
| 66 | : | ||
| 67 | : "I" (PAGE_SIZE)); | ||
| 68 | } | ||
| 69 | |||
| 70 | void feroceon_copy_user_highpage(struct page *to, struct page *from, | ||
| 71 | unsigned long vaddr) | ||
| 72 | { | ||
| 73 | void *kto, *kfrom; | ||
| 74 | |||
| 75 | kto = kmap_atomic(to, KM_USER0); | ||
| 76 | kfrom = kmap_atomic(from, KM_USER1); | ||
| 77 | feroceon_copy_user_page(kto, kfrom); | ||
| 78 | kunmap_atomic(kfrom, KM_USER1); | ||
| 79 | kunmap_atomic(kto, KM_USER0); | ||
| 80 | } | ||
| 81 | |||
| 82 | void feroceon_clear_user_highpage(struct page *page, unsigned long vaddr) | ||
| 83 | { | ||
| 84 | void *ptr, *kaddr = kmap_atomic(page, KM_USER0); | ||
| 85 | asm volatile ("\ | ||
| 86 | mov r1, %2 \n\ | ||
| 87 | mov r2, #0 \n\ | ||
| 88 | mov r3, #0 \n\ | ||
| 89 | mov r4, #0 \n\ | ||
| 90 | mov r5, #0 \n\ | ||
| 91 | mov r6, #0 \n\ | ||
| 92 | mov r7, #0 \n\ | ||
| 93 | mov ip, #0 \n\ | ||
| 94 | mov lr, #0 \n\ | ||
| 95 | 1: stmia %0, {r2-r7, ip, lr} \n\ | ||
| 96 | subs r1, r1, #1 \n\ | ||
| 97 | mcr p15, 0, %0, c7, c14, 1 @ clean and invalidate D line\n\ | ||
| 98 | add %0, %0, #32 \n\ | ||
| 99 | bne 1b \n\ | ||
| 100 | mcr p15, 0, r1, c7, c10, 4 @ drain WB" | ||
| 101 | : "=r" (ptr) | ||
| 102 | : "0" (kaddr), "I" (PAGE_SIZE / 32) | ||
| 103 | : "r1", "r2", "r3", "r4", "r5", "r6", "r7", "ip", "lr"); | ||
| 104 | kunmap_atomic(kaddr, KM_USER0); | ||
| 105 | } | ||
| 106 | |||
| 107 | struct cpu_user_fns feroceon_user_fns __initdata = { | ||
| 108 | .cpu_clear_user_highpage = feroceon_clear_user_highpage, | ||
| 109 | .cpu_copy_user_highpage = feroceon_copy_user_highpage, | ||
| 110 | }; | ||
| 111 | |||
diff --git a/arch/arm/mm/copypage-v3.S b/arch/arm/mm/copypage-v3.S deleted file mode 100644 index 2ee394b11bcb..000000000000 --- a/arch/arm/mm/copypage-v3.S +++ /dev/null | |||
| @@ -1,67 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/lib/copypage.S | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995-1999 Russell King | ||
| 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 | * ASM optimised string functions | ||
| 11 | */ | ||
| 12 | #include <linux/linkage.h> | ||
| 13 | #include <linux/init.h> | ||
| 14 | #include <asm/assembler.h> | ||
| 15 | #include <asm/asm-offsets.h> | ||
| 16 | |||
| 17 | .text | ||
| 18 | .align 5 | ||
| 19 | /* | ||
| 20 | * ARMv3 optimised copy_user_page | ||
| 21 | * | ||
| 22 | * FIXME: do we need to handle cache stuff... | ||
| 23 | */ | ||
| 24 | ENTRY(v3_copy_user_page) | ||
| 25 | stmfd sp!, {r4, lr} @ 2 | ||
| 26 | mov r2, #PAGE_SZ/64 @ 1 | ||
| 27 | ldmia r1!, {r3, r4, ip, lr} @ 4+1 | ||
| 28 | 1: stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 29 | ldmia r1!, {r3, r4, ip, lr} @ 4+1 | ||
| 30 | stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 31 | ldmia r1!, {r3, r4, ip, lr} @ 4+1 | ||
| 32 | stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 33 | ldmia r1!, {r3, r4, ip, lr} @ 4 | ||
| 34 | subs r2, r2, #1 @ 1 | ||
| 35 | stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 36 | ldmneia r1!, {r3, r4, ip, lr} @ 4 | ||
| 37 | bne 1b @ 1 | ||
| 38 | ldmfd sp!, {r4, pc} @ 3 | ||
| 39 | |||
| 40 | .align 5 | ||
| 41 | /* | ||
| 42 | * ARMv3 optimised clear_user_page | ||
| 43 | * | ||
| 44 | * FIXME: do we need to handle cache stuff... | ||
| 45 | */ | ||
| 46 | ENTRY(v3_clear_user_page) | ||
| 47 | str lr, [sp, #-4]! | ||
| 48 | mov r1, #PAGE_SZ/64 @ 1 | ||
| 49 | mov r2, #0 @ 1 | ||
| 50 | mov r3, #0 @ 1 | ||
| 51 | mov ip, #0 @ 1 | ||
| 52 | mov lr, #0 @ 1 | ||
| 53 | 1: stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 54 | stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 55 | stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 56 | stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 57 | subs r1, r1, #1 @ 1 | ||
| 58 | bne 1b @ 1 | ||
| 59 | ldr pc, [sp], #4 | ||
| 60 | |||
| 61 | __INITDATA | ||
| 62 | |||
| 63 | .type v3_user_fns, #object | ||
| 64 | ENTRY(v3_user_fns) | ||
| 65 | .long v3_clear_user_page | ||
| 66 | .long v3_copy_user_page | ||
| 67 | .size v3_user_fns, . - v3_user_fns | ||
diff --git a/arch/arm/mm/copypage-v3.c b/arch/arm/mm/copypage-v3.c new file mode 100644 index 000000000000..70ed96c8af8e --- /dev/null +++ b/arch/arm/mm/copypage-v3.c | |||
| @@ -0,0 +1,81 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mm/copypage-v3.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995-1999 Russell King | ||
| 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 | #include <linux/init.h> | ||
| 11 | #include <linux/highmem.h> | ||
| 12 | |||
| 13 | /* | ||
| 14 | * ARMv3 optimised copy_user_highpage | ||
| 15 | * | ||
| 16 | * FIXME: do we need to handle cache stuff... | ||
| 17 | */ | ||
| 18 | static void __attribute__((naked)) | ||
| 19 | v3_copy_user_page(void *kto, const void *kfrom) | ||
| 20 | { | ||
| 21 | asm("\n\ | ||
| 22 | stmfd sp!, {r4, lr} @ 2\n\ | ||
| 23 | mov r2, %2 @ 1\n\ | ||
| 24 | ldmia %0!, {r3, r4, ip, lr} @ 4+1\n\ | ||
| 25 | 1: stmia %1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 26 | ldmia %0!, {r3, r4, ip, lr} @ 4+1\n\ | ||
| 27 | stmia %1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 28 | ldmia %0!, {r3, r4, ip, lr} @ 4+1\n\ | ||
| 29 | stmia %1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 30 | ldmia %0!, {r3, r4, ip, lr} @ 4\n\ | ||
| 31 | subs r2, r2, #1 @ 1\n\ | ||
| 32 | stmia %1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 33 | ldmneia %0!, {r3, r4, ip, lr} @ 4\n\ | ||
| 34 | bne 1b @ 1\n\ | ||
| 35 | ldmfd sp!, {r4, pc} @ 3" | ||
| 36 | : | ||
| 37 | : "r" (kfrom), "r" (kto), "I" (PAGE_SIZE / 64)); | ||
| 38 | } | ||
| 39 | |||
| 40 | void v3_copy_user_highpage(struct page *to, struct page *from, | ||
| 41 | unsigned long vaddr) | ||
| 42 | { | ||
| 43 | void *kto, *kfrom; | ||
| 44 | |||
| 45 | kto = kmap_atomic(to, KM_USER0); | ||
| 46 | kfrom = kmap_atomic(from, KM_USER1); | ||
| 47 | v3_copy_user_page(kto, kfrom); | ||
| 48 | kunmap_atomic(kfrom, KM_USER1); | ||
| 49 | kunmap_atomic(kto, KM_USER0); | ||
| 50 | } | ||
| 51 | |||
| 52 | /* | ||
| 53 | * ARMv3 optimised clear_user_page | ||
| 54 | * | ||
| 55 | * FIXME: do we need to handle cache stuff... | ||
| 56 | */ | ||
| 57 | void v3_clear_user_highpage(struct page *page, unsigned long vaddr) | ||
| 58 | { | ||
| 59 | void *ptr, *kaddr = kmap_atomic(page, KM_USER0); | ||
| 60 | asm volatile("\n\ | ||
| 61 | mov r1, %2 @ 1\n\ | ||
| 62 | mov r2, #0 @ 1\n\ | ||
| 63 | mov r3, #0 @ 1\n\ | ||
| 64 | mov ip, #0 @ 1\n\ | ||
| 65 | mov lr, #0 @ 1\n\ | ||
| 66 | 1: stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 67 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 68 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 69 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 70 | subs r1, r1, #1 @ 1\n\ | ||
| 71 | bne 1b @ 1" | ||
| 72 | : "=r" (ptr) | ||
| 73 | : "0" (kaddr), "I" (PAGE_SIZE / 64) | ||
| 74 | : "r1", "r2", "r3", "ip", "lr"); | ||
| 75 | kunmap_atomic(kaddr, KM_USER0); | ||
| 76 | } | ||
| 77 | |||
| 78 | struct cpu_user_fns v3_user_fns __initdata = { | ||
| 79 | .cpu_clear_user_highpage = v3_clear_user_highpage, | ||
| 80 | .cpu_copy_user_highpage = v3_copy_user_highpage, | ||
| 81 | }; | ||
diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c index 8d33e2549344..bdb5fd983b15 100644 --- a/arch/arm/mm/copypage-v4mc.c +++ b/arch/arm/mm/copypage-v4mc.c | |||
| @@ -15,8 +15,8 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/highmem.h> | ||
| 18 | 19 | ||
| 19 | #include <asm/page.h> | ||
| 20 | #include <asm/pgtable.h> | 20 | #include <asm/pgtable.h> |
| 21 | #include <asm/tlbflush.h> | 21 | #include <asm/tlbflush.h> |
| 22 | #include <asm/cacheflush.h> | 22 | #include <asm/cacheflush.h> |
| @@ -33,7 +33,7 @@ | |||
| 33 | static DEFINE_SPINLOCK(minicache_lock); | 33 | static DEFINE_SPINLOCK(minicache_lock); |
| 34 | 34 | ||
| 35 | /* | 35 | /* |
| 36 | * ARMv4 mini-dcache optimised copy_user_page | 36 | * ARMv4 mini-dcache optimised copy_user_highpage |
| 37 | * | 37 | * |
| 38 | * We flush the destination cache lines just before we write the data into the | 38 | * We flush the destination cache lines just before we write the data into the |
| 39 | * corresponding address. Since the Dcache is read-allocate, this removes the | 39 | * corresponding address. Since the Dcache is read-allocate, this removes the |
| @@ -42,7 +42,7 @@ static DEFINE_SPINLOCK(minicache_lock); | |||
| 42 | * | 42 | * |
| 43 | * Note: We rely on all ARMv4 processors implementing the "invalidate D line" | 43 | * Note: We rely on all ARMv4 processors implementing the "invalidate D line" |
| 44 | * instruction. If your processor does not supply this, you have to write your | 44 | * instruction. If your processor does not supply this, you have to write your |
| 45 | * own copy_user_page that does the right thing. | 45 | * own copy_user_highpage that does the right thing. |
| 46 | */ | 46 | */ |
| 47 | static void __attribute__((naked)) | 47 | static void __attribute__((naked)) |
| 48 | mc_copy_user_page(void *from, void *to) | 48 | mc_copy_user_page(void *from, void *to) |
| @@ -68,50 +68,53 @@ mc_copy_user_page(void *from, void *to) | |||
| 68 | : "r" (from), "r" (to), "I" (PAGE_SIZE / 64)); | 68 | : "r" (from), "r" (to), "I" (PAGE_SIZE / 64)); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | void v4_mc_copy_user_page(void *kto, const void *kfrom, unsigned long vaddr) | 71 | void v4_mc_copy_user_highpage(struct page *from, struct page *to, |
| 72 | unsigned long vaddr) | ||
| 72 | { | 73 | { |
| 73 | struct page *page = virt_to_page(kfrom); | 74 | void *kto = kmap_atomic(to, KM_USER1); |
| 74 | 75 | ||
| 75 | if (test_and_clear_bit(PG_dcache_dirty, &page->flags)) | 76 | if (test_and_clear_bit(PG_dcache_dirty, &from->flags)) |
| 76 | __flush_dcache_page(page_mapping(page), page); | 77 | __flush_dcache_page(page_mapping(from), from); |
| 77 | 78 | ||
| 78 | spin_lock(&minicache_lock); | 79 | spin_lock(&minicache_lock); |
| 79 | 80 | ||
| 80 | set_pte_ext(TOP_PTE(0xffff8000), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot), 0); | 81 | set_pte_ext(TOP_PTE(0xffff8000), pfn_pte(page_to_pfn(from), minicache_pgprot), 0); |
| 81 | flush_tlb_kernel_page(0xffff8000); | 82 | flush_tlb_kernel_page(0xffff8000); |
| 82 | 83 | ||
| 83 | mc_copy_user_page((void *)0xffff8000, kto); | 84 | mc_copy_user_page((void *)0xffff8000, kto); |
| 84 | 85 | ||
| 85 | spin_unlock(&minicache_lock); | 86 | spin_unlock(&minicache_lock); |
| 87 | |||
| 88 | kunmap_atomic(kto, KM_USER1); | ||
| 86 | } | 89 | } |
| 87 | 90 | ||
| 88 | /* | 91 | /* |
| 89 | * ARMv4 optimised clear_user_page | 92 | * ARMv4 optimised clear_user_page |
| 90 | */ | 93 | */ |
| 91 | void __attribute__((naked)) | 94 | void v4_mc_clear_user_highpage(struct page *page, unsigned long vaddr) |
| 92 | v4_mc_clear_user_page(void *kaddr, unsigned long vaddr) | ||
| 93 | { | 95 | { |
| 94 | asm volatile( | 96 | void *ptr, *kaddr = kmap_atomic(page, KM_USER0); |
| 95 | "str lr, [sp, #-4]!\n\ | 97 | asm volatile("\ |
| 96 | mov r1, %0 @ 1\n\ | 98 | mov r1, %2 @ 1\n\ |
| 97 | mov r2, #0 @ 1\n\ | 99 | mov r2, #0 @ 1\n\ |
| 98 | mov r3, #0 @ 1\n\ | 100 | mov r3, #0 @ 1\n\ |
| 99 | mov ip, #0 @ 1\n\ | 101 | mov ip, #0 @ 1\n\ |
| 100 | mov lr, #0 @ 1\n\ | 102 | mov lr, #0 @ 1\n\ |
| 101 | 1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\ | 103 | 1: mcr p15, 0, %0, c7, c6, 1 @ 1 invalidate D line\n\ |
| 102 | stmia r0!, {r2, r3, ip, lr} @ 4\n\ | 104 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ |
| 103 | stmia r0!, {r2, r3, ip, lr} @ 4\n\ | 105 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ |
| 104 | mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\ | 106 | mcr p15, 0, %0, c7, c6, 1 @ 1 invalidate D line\n\ |
| 105 | stmia r0!, {r2, r3, ip, lr} @ 4\n\ | 107 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ |
| 106 | stmia r0!, {r2, r3, ip, lr} @ 4\n\ | 108 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ |
| 107 | subs r1, r1, #1 @ 1\n\ | 109 | subs r1, r1, #1 @ 1\n\ |
| 108 | bne 1b @ 1\n\ | 110 | bne 1b @ 1" |
| 109 | ldr pc, [sp], #4" | 111 | : "=r" (ptr) |
| 110 | : | 112 | : "0" (kaddr), "I" (PAGE_SIZE / 64) |
| 111 | : "I" (PAGE_SIZE / 64)); | 113 | : "r1", "r2", "r3", "ip", "lr"); |
| 114 | kunmap_atomic(kaddr, KM_USER0); | ||
| 112 | } | 115 | } |
| 113 | 116 | ||
| 114 | struct cpu_user_fns v4_mc_user_fns __initdata = { | 117 | struct cpu_user_fns v4_mc_user_fns __initdata = { |
| 115 | .cpu_clear_user_page = v4_mc_clear_user_page, | 118 | .cpu_clear_user_highpage = v4_mc_clear_user_highpage, |
| 116 | .cpu_copy_user_page = v4_mc_copy_user_page, | 119 | .cpu_copy_user_highpage = v4_mc_copy_user_highpage, |
| 117 | }; | 120 | }; |
diff --git a/arch/arm/mm/copypage-v4wb.S b/arch/arm/mm/copypage-v4wb.S deleted file mode 100644 index 83117354b1cd..000000000000 --- a/arch/arm/mm/copypage-v4wb.S +++ /dev/null | |||
| @@ -1,79 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/lib/copypage.S | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995-1999 Russell King | ||
| 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 | * ASM optimised string functions | ||
| 11 | */ | ||
| 12 | #include <linux/linkage.h> | ||
| 13 | #include <linux/init.h> | ||
| 14 | #include <asm/asm-offsets.h> | ||
| 15 | |||
| 16 | .text | ||
| 17 | .align 5 | ||
| 18 | /* | ||
| 19 | * ARMv4 optimised copy_user_page | ||
| 20 | * | ||
| 21 | * We flush the destination cache lines just before we write the data into the | ||
| 22 | * corresponding address. Since the Dcache is read-allocate, this removes the | ||
| 23 | * Dcache aliasing issue. The writes will be forwarded to the write buffer, | ||
| 24 | * and merged as appropriate. | ||
| 25 | * | ||
| 26 | * Note: We rely on all ARMv4 processors implementing the "invalidate D line" | ||
| 27 | * instruction. If your processor does not supply this, you have to write your | ||
| 28 | * own copy_user_page that does the right thing. | ||
| 29 | */ | ||
| 30 | ENTRY(v4wb_copy_user_page) | ||
| 31 | stmfd sp!, {r4, lr} @ 2 | ||
| 32 | mov r2, #PAGE_SZ/64 @ 1 | ||
| 33 | ldmia r1!, {r3, r4, ip, lr} @ 4 | ||
| 34 | 1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line | ||
| 35 | stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 36 | ldmia r1!, {r3, r4, ip, lr} @ 4+1 | ||
| 37 | stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 38 | ldmia r1!, {r3, r4, ip, lr} @ 4 | ||
| 39 | mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line | ||
| 40 | stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 41 | ldmia r1!, {r3, r4, ip, lr} @ 4 | ||
| 42 | subs r2, r2, #1 @ 1 | ||
| 43 | stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 44 | ldmneia r1!, {r3, r4, ip, lr} @ 4 | ||
| 45 | bne 1b @ 1 | ||
| 46 | mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB | ||
| 47 | ldmfd sp!, {r4, pc} @ 3 | ||
| 48 | |||
| 49 | .align 5 | ||
| 50 | /* | ||
| 51 | * ARMv4 optimised clear_user_page | ||
| 52 | * | ||
| 53 | * Same story as above. | ||
| 54 | */ | ||
| 55 | ENTRY(v4wb_clear_user_page) | ||
| 56 | str lr, [sp, #-4]! | ||
| 57 | mov r1, #PAGE_SZ/64 @ 1 | ||
| 58 | mov r2, #0 @ 1 | ||
| 59 | mov r3, #0 @ 1 | ||
| 60 | mov ip, #0 @ 1 | ||
| 61 | mov lr, #0 @ 1 | ||
| 62 | 1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line | ||
| 63 | stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 64 | stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 65 | mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line | ||
| 66 | stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 67 | stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 68 | subs r1, r1, #1 @ 1 | ||
| 69 | bne 1b @ 1 | ||
| 70 | mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB | ||
| 71 | ldr pc, [sp], #4 | ||
| 72 | |||
| 73 | __INITDATA | ||
| 74 | |||
| 75 | .type v4wb_user_fns, #object | ||
| 76 | ENTRY(v4wb_user_fns) | ||
| 77 | .long v4wb_clear_user_page | ||
| 78 | .long v4wb_copy_user_page | ||
| 79 | .size v4wb_user_fns, . - v4wb_user_fns | ||
diff --git a/arch/arm/mm/copypage-v4wb.c b/arch/arm/mm/copypage-v4wb.c new file mode 100644 index 000000000000..3ec93dab7656 --- /dev/null +++ b/arch/arm/mm/copypage-v4wb.c | |||
| @@ -0,0 +1,94 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mm/copypage-v4wb.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995-1999 Russell King | ||
| 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 | #include <linux/init.h> | ||
| 11 | #include <linux/highmem.h> | ||
| 12 | |||
| 13 | /* | ||
| 14 | * ARMv4 optimised copy_user_highpage | ||
| 15 | * | ||
| 16 | * We flush the destination cache lines just before we write the data into the | ||
| 17 | * corresponding address. Since the Dcache is read-allocate, this removes the | ||
| 18 | * Dcache aliasing issue. The writes will be forwarded to the write buffer, | ||
| 19 | * and merged as appropriate. | ||
| 20 | * | ||
| 21 | * Note: We rely on all ARMv4 processors implementing the "invalidate D line" | ||
| 22 | * instruction. If your processor does not supply this, you have to write your | ||
| 23 | * own copy_user_highpage that does the right thing. | ||
| 24 | */ | ||
| 25 | static void __attribute__((naked)) | ||
| 26 | v4wb_copy_user_page(void *kto, const void *kfrom) | ||
| 27 | { | ||
| 28 | asm("\ | ||
| 29 | stmfd sp!, {r4, lr} @ 2\n\ | ||
| 30 | mov r2, %0 @ 1\n\ | ||
| 31 | ldmia r1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 32 | 1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\ | ||
| 33 | stmia r0!, {r3, r4, ip, lr} @ 4\n\ | ||
| 34 | ldmia r1!, {r3, r4, ip, lr} @ 4+1\n\ | ||
| 35 | stmia r0!, {r3, r4, ip, lr} @ 4\n\ | ||
| 36 | ldmia r1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 37 | mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\ | ||
| 38 | stmia r0!, {r3, r4, ip, lr} @ 4\n\ | ||
| 39 | ldmia r1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 40 | subs r2, r2, #1 @ 1\n\ | ||
| 41 | stmia r0!, {r3, r4, ip, lr} @ 4\n\ | ||
| 42 | ldmneia r1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 43 | bne 1b @ 1\n\ | ||
| 44 | mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB\n\ | ||
| 45 | ldmfd sp!, {r4, pc} @ 3" | ||
| 46 | : | ||
| 47 | : "I" (PAGE_SIZE / 64)); | ||
| 48 | } | ||
| 49 | |||
| 50 | void v4wb_copy_user_highpage(struct page *to, struct page *from, | ||
| 51 | unsigned long vaddr) | ||
| 52 | { | ||
| 53 | void *kto, *kfrom; | ||
| 54 | |||
| 55 | kto = kmap_atomic(to, KM_USER0); | ||
| 56 | kfrom = kmap_atomic(from, KM_USER1); | ||
| 57 | v4wb_copy_user_page(kto, kfrom); | ||
| 58 | kunmap_atomic(kfrom, KM_USER1); | ||
| 59 | kunmap_atomic(kto, KM_USER0); | ||
| 60 | } | ||
| 61 | |||
| 62 | /* | ||
| 63 | * ARMv4 optimised clear_user_page | ||
| 64 | * | ||
| 65 | * Same story as above. | ||
| 66 | */ | ||
| 67 | void v4wb_clear_user_highpage(struct page *page, unsigned long vaddr) | ||
| 68 | { | ||
| 69 | void *ptr, *kaddr = kmap_atomic(page, KM_USER0); | ||
| 70 | asm volatile("\ | ||
| 71 | mov r1, %2 @ 1\n\ | ||
| 72 | mov r2, #0 @ 1\n\ | ||
| 73 | mov r3, #0 @ 1\n\ | ||
| 74 | mov ip, #0 @ 1\n\ | ||
| 75 | mov lr, #0 @ 1\n\ | ||
| 76 | 1: mcr p15, 0, %0, c7, c6, 1 @ 1 invalidate D line\n\ | ||
| 77 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 78 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 79 | mcr p15, 0, %0, c7, c6, 1 @ 1 invalidate D line\n\ | ||
| 80 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 81 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 82 | subs r1, r1, #1 @ 1\n\ | ||
| 83 | bne 1b @ 1\n\ | ||
| 84 | mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB" | ||
| 85 | : "=r" (ptr) | ||
| 86 | : "0" (kaddr), "I" (PAGE_SIZE / 64) | ||
| 87 | : "r1", "r2", "r3", "ip", "lr"); | ||
| 88 | kunmap_atomic(kaddr, KM_USER0); | ||
| 89 | } | ||
| 90 | |||
| 91 | struct cpu_user_fns v4wb_user_fns __initdata = { | ||
| 92 | .cpu_clear_user_highpage = v4wb_clear_user_highpage, | ||
| 93 | .cpu_copy_user_highpage = v4wb_copy_user_highpage, | ||
| 94 | }; | ||
diff --git a/arch/arm/mm/copypage-v4wt.S b/arch/arm/mm/copypage-v4wt.S deleted file mode 100644 index e1f2af28d549..000000000000 --- a/arch/arm/mm/copypage-v4wt.S +++ /dev/null | |||
| @@ -1,73 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/lib/copypage-v4.S | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995-1999 Russell King | ||
| 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 | * ASM optimised string functions | ||
| 11 | * | ||
| 12 | * This is for CPUs with a writethrough cache and 'flush ID cache' is | ||
| 13 | * the only supported cache operation. | ||
| 14 | */ | ||
| 15 | #include <linux/linkage.h> | ||
| 16 | #include <linux/init.h> | ||
| 17 | #include <asm/asm-offsets.h> | ||
| 18 | |||
| 19 | .text | ||
| 20 | .align 5 | ||
| 21 | /* | ||
| 22 | * ARMv4 optimised copy_user_page | ||
| 23 | * | ||
| 24 | * Since we have writethrough caches, we don't have to worry about | ||
| 25 | * dirty data in the cache. However, we do have to ensure that | ||
| 26 | * subsequent reads are up to date. | ||
| 27 | */ | ||
| 28 | ENTRY(v4wt_copy_user_page) | ||
| 29 | stmfd sp!, {r4, lr} @ 2 | ||
| 30 | mov r2, #PAGE_SZ/64 @ 1 | ||
| 31 | ldmia r1!, {r3, r4, ip, lr} @ 4 | ||
| 32 | 1: stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 33 | ldmia r1!, {r3, r4, ip, lr} @ 4+1 | ||
| 34 | stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 35 | ldmia r1!, {r3, r4, ip, lr} @ 4 | ||
| 36 | stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 37 | ldmia r1!, {r3, r4, ip, lr} @ 4 | ||
| 38 | subs r2, r2, #1 @ 1 | ||
| 39 | stmia r0!, {r3, r4, ip, lr} @ 4 | ||
| 40 | ldmneia r1!, {r3, r4, ip, lr} @ 4 | ||
| 41 | bne 1b @ 1 | ||
| 42 | mcr p15, 0, r2, c7, c7, 0 @ flush ID cache | ||
| 43 | ldmfd sp!, {r4, pc} @ 3 | ||
| 44 | |||
| 45 | .align 5 | ||
| 46 | /* | ||
| 47 | * ARMv4 optimised clear_user_page | ||
| 48 | * | ||
| 49 | * Same story as above. | ||
| 50 | */ | ||
| 51 | ENTRY(v4wt_clear_user_page) | ||
| 52 | str lr, [sp, #-4]! | ||
| 53 | mov r1, #PAGE_SZ/64 @ 1 | ||
| 54 | mov r2, #0 @ 1 | ||
| 55 | mov r3, #0 @ 1 | ||
| 56 | mov ip, #0 @ 1 | ||
| 57 | mov lr, #0 @ 1 | ||
| 58 | 1: stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 59 | stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 60 | stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 61 | stmia r0!, {r2, r3, ip, lr} @ 4 | ||
| 62 | subs r1, r1, #1 @ 1 | ||
| 63 | bne 1b @ 1 | ||
| 64 | mcr p15, 0, r2, c7, c7, 0 @ flush ID cache | ||
| 65 | ldr pc, [sp], #4 | ||
| 66 | |||
| 67 | __INITDATA | ||
| 68 | |||
| 69 | .type v4wt_user_fns, #object | ||
| 70 | ENTRY(v4wt_user_fns) | ||
| 71 | .long v4wt_clear_user_page | ||
| 72 | .long v4wt_copy_user_page | ||
| 73 | .size v4wt_user_fns, . - v4wt_user_fns | ||
diff --git a/arch/arm/mm/copypage-v4wt.c b/arch/arm/mm/copypage-v4wt.c new file mode 100644 index 000000000000..0f1188efae45 --- /dev/null +++ b/arch/arm/mm/copypage-v4wt.c | |||
| @@ -0,0 +1,88 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mm/copypage-v4wt.S | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995-1999 Russell King | ||
| 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 is for CPUs with a writethrough cache and 'flush ID cache' is | ||
| 11 | * the only supported cache operation. | ||
| 12 | */ | ||
| 13 | #include <linux/init.h> | ||
| 14 | #include <linux/highmem.h> | ||
| 15 | |||
| 16 | /* | ||
| 17 | * ARMv4 optimised copy_user_highpage | ||
| 18 | * | ||
| 19 | * Since we have writethrough caches, we don't have to worry about | ||
| 20 | * dirty data in the cache. However, we do have to ensure that | ||
| 21 | * subsequent reads are up to date. | ||
| 22 | */ | ||
| 23 | static void __attribute__((naked)) | ||
| 24 | v4wt_copy_user_page(void *kto, const void *kfrom) | ||
| 25 | { | ||
| 26 | asm("\ | ||
| 27 | stmfd sp!, {r4, lr} @ 2\n\ | ||
| 28 | mov r2, %0 @ 1\n\ | ||
| 29 | ldmia r1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 30 | 1: stmia r0!, {r3, r4, ip, lr} @ 4\n\ | ||
| 31 | ldmia r1!, {r3, r4, ip, lr} @ 4+1\n\ | ||
| 32 | stmia r0!, {r3, r4, ip, lr} @ 4\n\ | ||
| 33 | ldmia r1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 34 | stmia r0!, {r3, r4, ip, lr} @ 4\n\ | ||
| 35 | ldmia r1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 36 | subs r2, r2, #1 @ 1\n\ | ||
| 37 | stmia r0!, {r3, r4, ip, lr} @ 4\n\ | ||
| 38 | ldmneia r1!, {r3, r4, ip, lr} @ 4\n\ | ||
| 39 | bne 1b @ 1\n\ | ||
| 40 | mcr p15, 0, r2, c7, c7, 0 @ flush ID cache\n\ | ||
| 41 | ldmfd sp!, {r4, pc} @ 3" | ||
| 42 | : | ||
| 43 | : "I" (PAGE_SIZE / 64)); | ||
| 44 | } | ||
| 45 | |||
| 46 | void v4wt_copy_user_highpage(struct page *to, struct page *from, | ||
| 47 | unsigned long vaddr) | ||
| 48 | { | ||
| 49 | void *kto, *kfrom; | ||
| 50 | |||
| 51 | kto = kmap_atomic(to, KM_USER0); | ||
| 52 | kfrom = kmap_atomic(from, KM_USER1); | ||
| 53 | v4wt_copy_user_page(kto, kfrom); | ||
| 54 | kunmap_atomic(kfrom, KM_USER1); | ||
| 55 | kunmap_atomic(kto, KM_USER0); | ||
| 56 | } | ||
| 57 | |||
| 58 | /* | ||
| 59 | * ARMv4 optimised clear_user_page | ||
| 60 | * | ||
| 61 | * Same story as above. | ||
| 62 | */ | ||
| 63 | void v4wt_clear_user_highpage(struct page *page, unsigned long vaddr) | ||
| 64 | { | ||
| 65 | void *ptr, *kaddr = kmap_atomic(page, KM_USER0); | ||
| 66 | asm volatile("\ | ||
| 67 | mov r1, %2 @ 1\n\ | ||
| 68 | mov r2, #0 @ 1\n\ | ||
| 69 | mov r3, #0 @ 1\n\ | ||
| 70 | mov ip, #0 @ 1\n\ | ||
| 71 | mov lr, #0 @ 1\n\ | ||
| 72 | 1: stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 73 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 74 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 75 | stmia %0!, {r2, r3, ip, lr} @ 4\n\ | ||
| 76 | subs r1, r1, #1 @ 1\n\ | ||
| 77 | bne 1b @ 1\n\ | ||
| 78 | mcr p15, 0, r2, c7, c7, 0 @ flush ID cache" | ||
| 79 | : "=r" (ptr) | ||
| 80 | : "0" (kaddr), "I" (PAGE_SIZE / 64) | ||
| 81 | : "r1", "r2", "r3", "ip", "lr"); | ||
| 82 | kunmap_atomic(kaddr, KM_USER0); | ||
| 83 | } | ||
| 84 | |||
| 85 | struct cpu_user_fns v4wt_user_fns __initdata = { | ||
| 86 | .cpu_clear_user_highpage = v4wt_clear_user_highpage, | ||
| 87 | .cpu_copy_user_highpage = v4wt_copy_user_highpage, | ||
| 88 | }; | ||
diff --git a/arch/arm/mm/copypage-v6.c b/arch/arm/mm/copypage-v6.c index 0e21c0767580..4127a7bddfe5 100644 --- a/arch/arm/mm/copypage-v6.c +++ b/arch/arm/mm/copypage-v6.c | |||
| @@ -10,8 +10,8 @@ | |||
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
| 12 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 13 | #include <linux/highmem.h> | ||
| 13 | 14 | ||
| 14 | #include <asm/page.h> | ||
| 15 | #include <asm/pgtable.h> | 15 | #include <asm/pgtable.h> |
| 16 | #include <asm/shmparam.h> | 16 | #include <asm/shmparam.h> |
| 17 | #include <asm/tlbflush.h> | 17 | #include <asm/tlbflush.h> |
| @@ -33,41 +33,56 @@ static DEFINE_SPINLOCK(v6_lock); | |||
| 33 | * Copy the user page. No aliasing to deal with so we can just | 33 | * Copy the user page. No aliasing to deal with so we can just |
| 34 | * attack the kernel's existing mapping of these pages. | 34 | * attack the kernel's existing mapping of these pages. |
| 35 | */ | 35 | */ |
| 36 | static void v6_copy_user_page_nonaliasing(void *kto, const void *kfrom, unsigned long vaddr) | 36 | static void v6_copy_user_highpage_nonaliasing(struct page *to, |
| 37 | struct page *from, unsigned long vaddr) | ||
| 37 | { | 38 | { |
| 39 | void *kto, *kfrom; | ||
| 40 | |||
| 41 | kfrom = kmap_atomic(from, KM_USER0); | ||
| 42 | kto = kmap_atomic(to, KM_USER1); | ||
| 38 | copy_page(kto, kfrom); | 43 | copy_page(kto, kfrom); |
| 44 | kunmap_atomic(kto, KM_USER1); | ||
| 45 | kunmap_atomic(kfrom, KM_USER0); | ||
| 39 | } | 46 | } |
| 40 | 47 | ||
| 41 | /* | 48 | /* |
| 42 | * Clear the user page. No aliasing to deal with so we can just | 49 | * Clear the user page. No aliasing to deal with so we can just |
| 43 | * attack the kernel's existing mapping of this page. | 50 | * attack the kernel's existing mapping of this page. |
| 44 | */ | 51 | */ |
| 45 | static void v6_clear_user_page_nonaliasing(void *kaddr, unsigned long vaddr) | 52 | static void v6_clear_user_highpage_nonaliasing(struct page *page, unsigned long vaddr) |
| 46 | { | 53 | { |
| 54 | void *kaddr = kmap_atomic(page, KM_USER0); | ||
| 47 | clear_page(kaddr); | 55 | clear_page(kaddr); |
| 56 | kunmap_atomic(kaddr, KM_USER0); | ||
| 48 | } | 57 | } |
| 49 | 58 | ||
| 50 | /* | 59 | /* |
| 51 | * Copy the page, taking account of the cache colour. | 60 | * Discard data in the kernel mapping for the new page. |
| 61 | * FIXME: needs this MCRR to be supported. | ||
| 52 | */ | 62 | */ |
| 53 | static void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned long vaddr) | 63 | static void discard_old_kernel_data(void *kto) |
| 54 | { | 64 | { |
| 55 | unsigned int offset = CACHE_COLOUR(vaddr); | ||
| 56 | unsigned long from, to; | ||
| 57 | struct page *page = virt_to_page(kfrom); | ||
| 58 | |||
| 59 | if (test_and_clear_bit(PG_dcache_dirty, &page->flags)) | ||
| 60 | __flush_dcache_page(page_mapping(page), page); | ||
| 61 | |||
| 62 | /* | ||
| 63 | * Discard data in the kernel mapping for the new page. | ||
| 64 | * FIXME: needs this MCRR to be supported. | ||
| 65 | */ | ||
| 66 | __asm__("mcrr p15, 0, %1, %0, c6 @ 0xec401f06" | 65 | __asm__("mcrr p15, 0, %1, %0, c6 @ 0xec401f06" |
| 67 | : | 66 | : |
| 68 | : "r" (kto), | 67 | : "r" (kto), |
| 69 | "r" ((unsigned long)kto + PAGE_SIZE - L1_CACHE_BYTES) | 68 | "r" ((unsigned long)kto + PAGE_SIZE - L1_CACHE_BYTES) |
| 70 | : "cc"); | 69 | : "cc"); |
| 70 | } | ||
| 71 | |||
| 72 | /* | ||
| 73 | * Copy the page, taking account of the cache colour. | ||
| 74 | */ | ||
| 75 | static void v6_copy_user_highpage_aliasing(struct page *to, | ||
| 76 | struct page *from, unsigned long vaddr) | ||
| 77 | { | ||
| 78 | unsigned int offset = CACHE_COLOUR(vaddr); | ||
| 79 | unsigned long kfrom, kto; | ||
| 80 | |||
| 81 | if (test_and_clear_bit(PG_dcache_dirty, &from->flags)) | ||
| 82 | __flush_dcache_page(page_mapping(from), from); | ||
| 83 | |||
| 84 | /* FIXME: not highmem safe */ | ||
| 85 | discard_old_kernel_data(page_address(to)); | ||
| 71 | 86 | ||
| 72 | /* | 87 | /* |
| 73 | * Now copy the page using the same cache colour as the | 88 | * Now copy the page using the same cache colour as the |
| @@ -75,16 +90,16 @@ static void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned lo | |||
| 75 | */ | 90 | */ |
| 76 | spin_lock(&v6_lock); | 91 | spin_lock(&v6_lock); |
| 77 | 92 | ||
| 78 | set_pte_ext(TOP_PTE(from_address) + offset, pfn_pte(__pa(kfrom) >> PAGE_SHIFT, PAGE_KERNEL), 0); | 93 | set_pte_ext(TOP_PTE(from_address) + offset, pfn_pte(page_to_pfn(from), PAGE_KERNEL), 0); |
| 79 | set_pte_ext(TOP_PTE(to_address) + offset, pfn_pte(__pa(kto) >> PAGE_SHIFT, PAGE_KERNEL), 0); | 94 | set_pte_ext(TOP_PTE(to_address) + offset, pfn_pte(page_to_pfn(to), PAGE_KERNEL), 0); |
| 80 | 95 | ||
| 81 | from = from_address + (offset << PAGE_SHIFT); | 96 | kfrom = from_address + (offset << PAGE_SHIFT); |
| 82 | to = to_address + (offset << PAGE_SHIFT); | 97 | kto = to_address + (offset << PAGE_SHIFT); |
| 83 | 98 | ||
| 84 | flush_tlb_kernel_page(from); | 99 | flush_tlb_kernel_page(kfrom); |
| 85 | flush_tlb_kernel_page(to); | 100 | flush_tlb_kernel_page(kto); |
| 86 | 101 | ||
| 87 | copy_page((void *)to, (void *)from); | 102 | copy_page((void *)kto, (void *)kfrom); |
| 88 | 103 | ||
| 89 | spin_unlock(&v6_lock); | 104 | spin_unlock(&v6_lock); |
| 90 | } | 105 | } |
| @@ -94,20 +109,13 @@ static void v6_copy_user_page_aliasing(void *kto, const void *kfrom, unsigned lo | |||
| 94 | * so remap the kernel page into the same cache colour as the user | 109 | * so remap the kernel page into the same cache colour as the user |
| 95 | * page. | 110 | * page. |
| 96 | */ | 111 | */ |
| 97 | static void v6_clear_user_page_aliasing(void *kaddr, unsigned long vaddr) | 112 | static void v6_clear_user_highpage_aliasing(struct page *page, unsigned long vaddr) |
| 98 | { | 113 | { |
| 99 | unsigned int offset = CACHE_COLOUR(vaddr); | 114 | unsigned int offset = CACHE_COLOUR(vaddr); |
| 100 | unsigned long to = to_address + (offset << PAGE_SHIFT); | 115 | unsigned long to = to_address + (offset << PAGE_SHIFT); |
| 101 | 116 | ||
| 102 | /* | 117 | /* FIXME: not highmem safe */ |
| 103 | * Discard data in the kernel mapping for the new page | 118 | discard_old_kernel_data(page_address(page)); |
| 104 | * FIXME: needs this MCRR to be supported. | ||
| 105 | */ | ||
| 106 | __asm__("mcrr p15, 0, %1, %0, c6 @ 0xec401f06" | ||
| 107 | : | ||
| 108 | : "r" (kaddr), | ||
| 109 | "r" ((unsigned long)kaddr + PAGE_SIZE - L1_CACHE_BYTES) | ||
| 110 | : "cc"); | ||
| 111 | 119 | ||
| 112 | /* | 120 | /* |
| 113 | * Now clear the page using the same cache colour as | 121 | * Now clear the page using the same cache colour as |
| @@ -115,7 +123,7 @@ static void v6_clear_user_page_aliasing(void *kaddr, unsigned long vaddr) | |||
| 115 | */ | 123 | */ |
| 116 | spin_lock(&v6_lock); | 124 | spin_lock(&v6_lock); |
| 117 | 125 | ||
| 118 | set_pte_ext(TOP_PTE(to_address) + offset, pfn_pte(__pa(kaddr) >> PAGE_SHIFT, PAGE_KERNEL), 0); | 126 | set_pte_ext(TOP_PTE(to_address) + offset, pfn_pte(page_to_pfn(page), PAGE_KERNEL), 0); |
| 119 | flush_tlb_kernel_page(to); | 127 | flush_tlb_kernel_page(to); |
| 120 | clear_page((void *)to); | 128 | clear_page((void *)to); |
| 121 | 129 | ||
| @@ -123,15 +131,15 @@ static void v6_clear_user_page_aliasing(void *kaddr, unsigned long vaddr) | |||
| 123 | } | 131 | } |
| 124 | 132 | ||
| 125 | struct cpu_user_fns v6_user_fns __initdata = { | 133 | struct cpu_user_fns v6_user_fns __initdata = { |
| 126 | .cpu_clear_user_page = v6_clear_user_page_nonaliasing, | 134 | .cpu_clear_user_highpage = v6_clear_user_highpage_nonaliasing, |
| 127 | .cpu_copy_user_page = v6_copy_user_page_nonaliasing, | 135 | .cpu_copy_user_highpage = v6_copy_user_highpage_nonaliasing, |
| 128 | }; | 136 | }; |
| 129 | 137 | ||
| 130 | static int __init v6_userpage_init(void) | 138 | static int __init v6_userpage_init(void) |
| 131 | { | 139 | { |
| 132 | if (cache_is_vipt_aliasing()) { | 140 | if (cache_is_vipt_aliasing()) { |
| 133 | cpu_user.cpu_clear_user_page = v6_clear_user_page_aliasing; | 141 | cpu_user.cpu_clear_user_highpage = v6_clear_user_highpage_aliasing; |
| 134 | cpu_user.cpu_copy_user_page = v6_copy_user_page_aliasing; | 142 | cpu_user.cpu_copy_user_highpage = v6_copy_user_highpage_aliasing; |
| 135 | } | 143 | } |
| 136 | 144 | ||
| 137 | return 0; | 145 | return 0; |
diff --git a/arch/arm/mm/copypage-xsc3.S b/arch/arm/mm/copypage-xsc3.S deleted file mode 100644 index 9a2cb4332b4c..000000000000 --- a/arch/arm/mm/copypage-xsc3.S +++ /dev/null | |||
| @@ -1,97 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/lib/copypage-xsc3.S | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Intel Corp. | ||
| 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 | * Adapted for 3rd gen XScale core, no more mini-dcache | ||
| 11 | * Author: Matt Gilbert (matthew.m.gilbert@intel.com) | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/linkage.h> | ||
| 15 | #include <linux/init.h> | ||
| 16 | #include <asm/asm-offsets.h> | ||
| 17 | |||
| 18 | /* | ||
| 19 | * General note: | ||
| 20 | * We don't really want write-allocate cache behaviour for these functions | ||
| 21 | * since that will just eat through 8K of the cache. | ||
| 22 | */ | ||
| 23 | |||
| 24 | .text | ||
| 25 | .align 5 | ||
| 26 | /* | ||
| 27 | * XSC3 optimised copy_user_page | ||
| 28 | * r0 = destination | ||
| 29 | * r1 = source | ||
| 30 | * r2 = virtual user address of ultimate destination page | ||
| 31 | * | ||
| 32 | * The source page may have some clean entries in the cache already, but we | ||
| 33 | * can safely ignore them - break_cow() will flush them out of the cache | ||
| 34 | * if we eventually end up using our copied page. | ||
| 35 | * | ||
| 36 | */ | ||
| 37 | ENTRY(xsc3_mc_copy_user_page) | ||
| 38 | stmfd sp!, {r4, r5, lr} | ||
| 39 | mov lr, #PAGE_SZ/64-1 | ||
| 40 | |||
| 41 | pld [r1, #0] | ||
| 42 | pld [r1, #32] | ||
| 43 | 1: pld [r1, #64] | ||
| 44 | pld [r1, #96] | ||
| 45 | |||
| 46 | 2: ldrd r2, [r1], #8 | ||
| 47 | mov ip, r0 | ||
| 48 | ldrd r4, [r1], #8 | ||
| 49 | mcr p15, 0, ip, c7, c6, 1 @ invalidate | ||
| 50 | strd r2, [r0], #8 | ||
| 51 | ldrd r2, [r1], #8 | ||
| 52 | strd r4, [r0], #8 | ||
| 53 | ldrd r4, [r1], #8 | ||
| 54 | strd r2, [r0], #8 | ||
| 55 | strd r4, [r0], #8 | ||
| 56 | ldrd r2, [r1], #8 | ||
| 57 | mov ip, r0 | ||
| 58 | ldrd r4, [r1], #8 | ||
| 59 | mcr p15, 0, ip, c7, c6, 1 @ invalidate | ||
| 60 | strd r2, [r0], #8 | ||
| 61 | ldrd r2, [r1], #8 | ||
| 62 | subs lr, lr, #1 | ||
| 63 | strd r4, [r0], #8 | ||
| 64 | ldrd r4, [r1], #8 | ||
| 65 | strd r2, [r0], #8 | ||
| 66 | strd r4, [r0], #8 | ||
| 67 | bgt 1b | ||
| 68 | beq 2b | ||
| 69 | |||
| 70 | ldmfd sp!, {r4, r5, pc} | ||
| 71 | |||
| 72 | .align 5 | ||
| 73 | /* | ||
| 74 | * XScale optimised clear_user_page | ||
| 75 | * r0 = destination | ||
| 76 | * r1 = virtual user address of ultimate destination page | ||
| 77 | */ | ||
| 78 | ENTRY(xsc3_mc_clear_user_page) | ||
| 79 | mov r1, #PAGE_SZ/32 | ||
| 80 | mov r2, #0 | ||
| 81 | mov r3, #0 | ||
| 82 | 1: mcr p15, 0, r0, c7, c6, 1 @ invalidate line | ||
| 83 | strd r2, [r0], #8 | ||
| 84 | strd r2, [r0], #8 | ||
| 85 | strd r2, [r0], #8 | ||
| 86 | strd r2, [r0], #8 | ||
| 87 | subs r1, r1, #1 | ||
| 88 | bne 1b | ||
| 89 | mov pc, lr | ||
| 90 | |||
| 91 | __INITDATA | ||
| 92 | |||
| 93 | .type xsc3_mc_user_fns, #object | ||
| 94 | ENTRY(xsc3_mc_user_fns) | ||
| 95 | .long xsc3_mc_clear_user_page | ||
| 96 | .long xsc3_mc_copy_user_page | ||
| 97 | .size xsc3_mc_user_fns, . - xsc3_mc_user_fns | ||
diff --git a/arch/arm/mm/copypage-xsc3.c b/arch/arm/mm/copypage-xsc3.c new file mode 100644 index 000000000000..39a994542cad --- /dev/null +++ b/arch/arm/mm/copypage-xsc3.c | |||
| @@ -0,0 +1,113 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mm/copypage-xsc3.S | ||
| 3 | * | ||
| 4 | * Copyright (C) 2004 Intel Corp. | ||
| 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 | * Adapted for 3rd gen XScale core, no more mini-dcache | ||
| 11 | * Author: Matt Gilbert (matthew.m.gilbert@intel.com) | ||
| 12 | */ | ||
| 13 | #include <linux/init.h> | ||
| 14 | #include <linux/highmem.h> | ||
| 15 | |||
| 16 | /* | ||
| 17 | * General note: | ||
| 18 | * We don't really want write-allocate cache behaviour for these functions | ||
| 19 | * since that will just eat through 8K of the cache. | ||
| 20 | */ | ||
| 21 | |||
| 22 | /* | ||
| 23 | * XSC3 optimised copy_user_highpage | ||
| 24 | * r0 = destination | ||
| 25 | * r1 = source | ||
| 26 | * | ||
| 27 | * The source page may have some clean entries in the cache already, but we | ||
| 28 | * can safely ignore them - break_cow() will flush them out of the cache | ||
| 29 | * if we eventually end up using our copied page. | ||
| 30 | * | ||
| 31 | */ | ||
| 32 | static void __attribute__((naked)) | ||
| 33 | xsc3_mc_copy_user_page(void *kto, const void *kfrom) | ||
| 34 | { | ||
| 35 | asm("\ | ||
| 36 | stmfd sp!, {r4, r5, lr} \n\ | ||
| 37 | mov lr, %0 \n\ | ||
| 38 | \n\ | ||
| 39 | pld [r1, #0] \n\ | ||
| 40 | pld [r1, #32] \n\ | ||
| 41 | 1: pld [r1, #64] \n\ | ||
| 42 | pld [r1, #96] \n\ | ||
| 43 | \n\ | ||
| 44 | 2: ldrd r2, [r1], #8 \n\ | ||
| 45 | mov ip, r0 \n\ | ||
| 46 | ldrd r4, [r1], #8 \n\ | ||
| 47 | mcr p15, 0, ip, c7, c6, 1 @ invalidate\n\ | ||
| 48 | strd r2, [r0], #8 \n\ | ||
| 49 | ldrd r2, [r1], #8 \n\ | ||
| 50 | strd r4, [r0], #8 \n\ | ||
| 51 | ldrd r4, [r1], #8 \n\ | ||
| 52 | strd r2, [r0], #8 \n\ | ||
| 53 | strd r4, [r0], #8 \n\ | ||
| 54 | ldrd r2, [r1], #8 \n\ | ||
| 55 | mov ip, r0 \n\ | ||
| 56 | ldrd r4, [r1], #8 \n\ | ||
| 57 | mcr p15, 0, ip, c7, c6, 1 @ invalidate\n\ | ||
| 58 | strd r2, [r0], #8 \n\ | ||
| 59 | ldrd r2, [r1], #8 \n\ | ||
| 60 | subs lr, lr, #1 \n\ | ||
| 61 | strd r4, [r0], #8 \n\ | ||
| 62 | ldrd r4, [r1], #8 \n\ | ||
| 63 | strd r2, [r0], #8 \n\ | ||
| 64 | strd r4, [r0], #8 \n\ | ||
| 65 | bgt 1b \n\ | ||
| 66 | beq 2b \n\ | ||
| 67 | \n\ | ||
| 68 | ldmfd sp!, {r4, r5, pc}" | ||
| 69 | : | ||
| 70 | : "I" (PAGE_SIZE / 64 - 1)); | ||
| 71 | } | ||
| 72 | |||
| 73 | void xsc3_mc_copy_user_highpage(struct page *to, struct page *from, | ||
| 74 | unsigned long vaddr) | ||
| 75 | { | ||
| 76 | void *kto, *kfrom; | ||
| 77 | |||
| 78 | kto = kmap_atomic(to, KM_USER0); | ||
| 79 | kfrom = kmap_atomic(from, KM_USER1); | ||
| 80 | xsc3_mc_copy_user_page(kto, kfrom); | ||
| 81 | kunmap_atomic(kfrom, KM_USER1); | ||
| 82 | kunmap_atomic(kto, KM_USER0); | ||
| 83 | } | ||
| 84 | |||
| 85 | /* | ||
| 86 | * XScale optimised clear_user_page | ||
| 87 | * r0 = destination | ||
| 88 | * r1 = virtual user address of ultimate destination page | ||
| 89 | */ | ||
| 90 | void xsc3_mc_clear_user_highpage(struct page *page, unsigned long vaddr) | ||
| 91 | { | ||
| 92 | void *ptr, *kaddr = kmap_atomic(page, KM_USER0); | ||
| 93 | asm volatile ("\ | ||
| 94 | mov r1, %2 \n\ | ||
| 95 | mov r2, #0 \n\ | ||
| 96 | mov r3, #0 \n\ | ||
| 97 | 1: mcr p15, 0, %0, c7, c6, 1 @ invalidate line\n\ | ||
| 98 | strd r2, [%0], #8 \n\ | ||
| 99 | strd r2, [%0], #8 \n\ | ||
| 100 | strd r2, [%0], #8 \n\ | ||
| 101 | strd r2, [%0], #8 \n\ | ||
| 102 | subs r1, r1, #1 \n\ | ||
| 103 | bne 1b" | ||
| 104 | : "=r" (ptr) | ||
| 105 | : "0" (kaddr), "I" (PAGE_SIZE / 32) | ||
| 106 | : "r1", "r2", "r3"); | ||
| 107 | kunmap_atomic(kaddr, KM_USER0); | ||
| 108 | } | ||
| 109 | |||
| 110 | struct cpu_user_fns xsc3_mc_user_fns __initdata = { | ||
| 111 | .cpu_clear_user_highpage = xsc3_mc_clear_user_highpage, | ||
| 112 | .cpu_copy_user_highpage = xsc3_mc_copy_user_highpage, | ||
| 113 | }; | ||
diff --git a/arch/arm/mm/copypage-xscale.c b/arch/arm/mm/copypage-xscale.c index bad49331bbf9..d18f2397ee2d 100644 --- a/arch/arm/mm/copypage-xscale.c +++ b/arch/arm/mm/copypage-xscale.c | |||
| @@ -15,8 +15,8 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/highmem.h> | ||
| 18 | 19 | ||
| 19 | #include <asm/page.h> | ||
| 20 | #include <asm/pgtable.h> | 20 | #include <asm/pgtable.h> |
| 21 | #include <asm/tlbflush.h> | 21 | #include <asm/tlbflush.h> |
| 22 | #include <asm/cacheflush.h> | 22 | #include <asm/cacheflush.h> |
| @@ -35,7 +35,7 @@ | |||
| 35 | static DEFINE_SPINLOCK(minicache_lock); | 35 | static DEFINE_SPINLOCK(minicache_lock); |
| 36 | 36 | ||
| 37 | /* | 37 | /* |
| 38 | * XScale mini-dcache optimised copy_user_page | 38 | * XScale mini-dcache optimised copy_user_highpage |
| 39 | * | 39 | * |
| 40 | * We flush the destination cache lines just before we write the data into the | 40 | * We flush the destination cache lines just before we write the data into the |
| 41 | * corresponding address. Since the Dcache is read-allocate, this removes the | 41 | * corresponding address. Since the Dcache is read-allocate, this removes the |
| @@ -90,48 +90,53 @@ mc_copy_user_page(void *from, void *to) | |||
| 90 | : "r" (from), "r" (to), "I" (PAGE_SIZE / 64 - 1)); | 90 | : "r" (from), "r" (to), "I" (PAGE_SIZE / 64 - 1)); |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | void xscale_mc_copy_user_page(void *kto, const void *kfrom, unsigned long vaddr) | 93 | void xscale_mc_copy_user_highpage(struct page *to, struct page *from, |
| 94 | unsigned long vaddr) | ||
| 94 | { | 95 | { |
| 95 | struct page *page = virt_to_page(kfrom); | 96 | void *kto = kmap_atomic(to, KM_USER1); |
| 96 | 97 | ||
| 97 | if (test_and_clear_bit(PG_dcache_dirty, &page->flags)) | 98 | if (test_and_clear_bit(PG_dcache_dirty, &from->flags)) |
| 98 | __flush_dcache_page(page_mapping(page), page); | 99 | __flush_dcache_page(page_mapping(from), from); |
| 99 | 100 | ||
| 100 | spin_lock(&minicache_lock); | 101 | spin_lock(&minicache_lock); |
| 101 | 102 | ||
| 102 | set_pte_ext(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot), 0); | 103 | set_pte_ext(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(page_to_pfn(from), minicache_pgprot), 0); |
| 103 | flush_tlb_kernel_page(COPYPAGE_MINICACHE); | 104 | flush_tlb_kernel_page(COPYPAGE_MINICACHE); |
| 104 | 105 | ||
| 105 | mc_copy_user_page((void *)COPYPAGE_MINICACHE, kto); | 106 | mc_copy_user_page((void *)COPYPAGE_MINICACHE, kto); |
| 106 | 107 | ||
| 107 | spin_unlock(&minicache_lock); | 108 | spin_unlock(&minicache_lock); |
| 109 | |||
| 110 | kunmap_atomic(kto, KM_USER1); | ||
| 108 | } | 111 | } |
| 109 | 112 | ||
| 110 | /* | 113 | /* |
| 111 | * XScale optimised clear_user_page | 114 | * XScale optimised clear_user_page |
| 112 | */ | 115 | */ |
| 113 | void __attribute__((naked)) | 116 | void |
| 114 | xscale_mc_clear_user_page(void *kaddr, unsigned long vaddr) | 117 | xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr) |
| 115 | { | 118 | { |
| 119 | void *ptr, *kaddr = kmap_atomic(page, KM_USER0); | ||
| 116 | asm volatile( | 120 | asm volatile( |
| 117 | "mov r1, %0 \n\ | 121 | "mov r1, %2 \n\ |
| 118 | mov r2, #0 \n\ | 122 | mov r2, #0 \n\ |
| 119 | mov r3, #0 \n\ | 123 | mov r3, #0 \n\ |
| 120 | 1: mov ip, r0 \n\ | 124 | 1: mov ip, %0 \n\ |
| 121 | strd r2, [r0], #8 \n\ | 125 | strd r2, [%0], #8 \n\ |
| 122 | strd r2, [r0], #8 \n\ | 126 | strd r2, [%0], #8 \n\ |
| 123 | strd r2, [r0], #8 \n\ | 127 | strd r2, [%0], #8 \n\ |
| 124 | strd r2, [r0], #8 \n\ | 128 | strd r2, [%0], #8 \n\ |
| 125 | mcr p15, 0, ip, c7, c10, 1 @ clean D line\n\ | 129 | mcr p15, 0, ip, c7, c10, 1 @ clean D line\n\ |
| 126 | subs r1, r1, #1 \n\ | 130 | subs r1, r1, #1 \n\ |
| 127 | mcr p15, 0, ip, c7, c6, 1 @ invalidate D line\n\ | 131 | mcr p15, 0, ip, c7, c6, 1 @ invalidate D line\n\ |
| 128 | bne 1b \n\ | 132 | bne 1b" |
| 129 | mov pc, lr" | 133 | : "=r" (ptr) |
| 130 | : | 134 | : "0" (kaddr), "I" (PAGE_SIZE / 32) |
| 131 | : "I" (PAGE_SIZE / 32)); | 135 | : "r1", "r2", "r3", "ip"); |
| 136 | kunmap_atomic(kaddr, KM_USER0); | ||
| 132 | } | 137 | } |
| 133 | 138 | ||
| 134 | struct cpu_user_fns xscale_mc_user_fns __initdata = { | 139 | struct cpu_user_fns xscale_mc_user_fns __initdata = { |
| 135 | .cpu_clear_user_page = xscale_mc_clear_user_page, | 140 | .cpu_clear_user_highpage = xscale_mc_clear_user_highpage, |
| 136 | .cpu_copy_user_page = xscale_mc_copy_user_page, | 141 | .cpu_copy_user_highpage = xscale_mc_copy_user_highpage, |
| 137 | }; | 142 | }; |
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 2df8d9facf57..ffd8b228a139 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/kprobes.h> | 15 | #include <linux/kprobes.h> |
| 16 | #include <linux/uaccess.h> | 16 | #include <linux/uaccess.h> |
| 17 | #include <linux/page-flags.h> | ||
| 17 | 18 | ||
| 18 | #include <asm/system.h> | 19 | #include <asm/system.h> |
| 19 | #include <asm/pgtable.h> | 20 | #include <asm/pgtable.h> |
| @@ -83,13 +84,14 @@ void show_pte(struct mm_struct *mm, unsigned long addr) | |||
| 83 | break; | 84 | break; |
| 84 | } | 85 | } |
| 85 | 86 | ||
| 86 | #ifndef CONFIG_HIGHMEM | ||
| 87 | /* We must not map this if we have highmem enabled */ | 87 | /* We must not map this if we have highmem enabled */ |
| 88 | if (PageHighMem(pfn_to_page(pmd_val(*pmd) >> PAGE_SHIFT))) | ||
| 89 | break; | ||
| 90 | |||
| 88 | pte = pte_offset_map(pmd, addr); | 91 | pte = pte_offset_map(pmd, addr); |
| 89 | printk(", *pte=%08lx", pte_val(*pte)); | 92 | printk(", *pte=%08lx", pte_val(*pte)); |
| 90 | printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE])); | 93 | printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE])); |
| 91 | pte_unmap(pte); | 94 | pte_unmap(pte); |
| 92 | #endif | ||
| 93 | } while(0); | 95 | } while(0); |
| 94 | 96 | ||
| 95 | printk("\n"); | 97 | printk("\n"); |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 82c4b4217989..34df4d9d03a6 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/initrd.h> | 17 | #include <linux/initrd.h> |
| 18 | 18 | ||
| 19 | #include <asm/mach-types.h> | 19 | #include <asm/mach-types.h> |
| 20 | #include <asm/sections.h> | ||
| 20 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
| 21 | #include <asm/sizes.h> | 22 | #include <asm/sizes.h> |
| 22 | #include <asm/tlb.h> | 23 | #include <asm/tlb.h> |
| @@ -64,10 +65,11 @@ static int __init parse_tag_initrd2(const struct tag *tag) | |||
| 64 | __tagtable(ATAG_INITRD2, parse_tag_initrd2); | 65 | __tagtable(ATAG_INITRD2, parse_tag_initrd2); |
| 65 | 66 | ||
| 66 | /* | 67 | /* |
| 67 | * This is used to pass memory configuration data from paging_init | 68 | * This keeps memory configuration data used by a couple memory |
| 68 | * to mem_init, and by show_mem() to skip holes in the memory map. | 69 | * initialization functions, as well as show_mem() for the skipping |
| 70 | * of holes in the memory map. It is populated by arm_add_memory(). | ||
| 69 | */ | 71 | */ |
| 70 | static struct meminfo meminfo = { 0, }; | 72 | struct meminfo meminfo; |
| 71 | 73 | ||
| 72 | void show_mem(void) | 74 | void show_mem(void) |
| 73 | { | 75 | { |
| @@ -128,7 +130,7 @@ find_bootmap_pfn(int node, struct meminfo *mi, unsigned int bootmap_pages) | |||
| 128 | { | 130 | { |
| 129 | unsigned int start_pfn, i, bootmap_pfn; | 131 | unsigned int start_pfn, i, bootmap_pfn; |
| 130 | 132 | ||
| 131 | start_pfn = PAGE_ALIGN(__pa(&_end)) >> PAGE_SHIFT; | 133 | start_pfn = PAGE_ALIGN(__pa(_end)) >> PAGE_SHIFT; |
| 132 | bootmap_pfn = 0; | 134 | bootmap_pfn = 0; |
| 133 | 135 | ||
| 134 | for_each_nodebank(i, mi, node) { | 136 | for_each_nodebank(i, mi, node) { |
| @@ -331,13 +333,12 @@ static void __init bootmem_free_node(int node, struct meminfo *mi) | |||
| 331 | free_area_init_node(node, zone_size, start_pfn, zhole_size); | 333 | free_area_init_node(node, zone_size, start_pfn, zhole_size); |
| 332 | } | 334 | } |
| 333 | 335 | ||
| 334 | void __init bootmem_init(struct meminfo *mi) | 336 | void __init bootmem_init(void) |
| 335 | { | 337 | { |
| 338 | struct meminfo *mi = &meminfo; | ||
| 336 | unsigned long memend_pfn = 0; | 339 | unsigned long memend_pfn = 0; |
| 337 | int node, initrd_node; | 340 | int node, initrd_node; |
| 338 | 341 | ||
| 339 | memcpy(&meminfo, mi, sizeof(meminfo)); | ||
| 340 | |||
| 341 | /* | 342 | /* |
| 342 | * Locate which node contains the ramdisk image, if any. | 343 | * Locate which node contains the ramdisk image, if any. |
| 343 | */ | 344 | */ |
| @@ -394,20 +395,22 @@ void __init bootmem_init(struct meminfo *mi) | |||
| 394 | max_pfn = max_low_pfn = memend_pfn - PHYS_PFN_OFFSET; | 395 | max_pfn = max_low_pfn = memend_pfn - PHYS_PFN_OFFSET; |
| 395 | } | 396 | } |
| 396 | 397 | ||
| 397 | static inline void free_area(unsigned long addr, unsigned long end, char *s) | 398 | static inline int free_area(unsigned long pfn, unsigned long end, char *s) |
| 398 | { | 399 | { |
| 399 | unsigned int size = (end - addr) >> 10; | 400 | unsigned int pages = 0, size = (end - pfn) << (PAGE_SHIFT - 10); |
| 400 | 401 | ||
| 401 | for (; addr < end; addr += PAGE_SIZE) { | 402 | for (; pfn < end; pfn++) { |
| 402 | struct page *page = virt_to_page(addr); | 403 | struct page *page = pfn_to_page(pfn); |
| 403 | ClearPageReserved(page); | 404 | ClearPageReserved(page); |
| 404 | init_page_count(page); | 405 | init_page_count(page); |
| 405 | free_page(addr); | 406 | __free_page(page); |
| 406 | totalram_pages++; | 407 | pages++; |
| 407 | } | 408 | } |
| 408 | 409 | ||
| 409 | if (size && s) | 410 | if (size && s) |
| 410 | printk(KERN_INFO "Freeing %s memory: %dK\n", s, size); | 411 | printk(KERN_INFO "Freeing %s memory: %dK\n", s, size); |
| 412 | |||
| 413 | return pages; | ||
| 411 | } | 414 | } |
| 412 | 415 | ||
| 413 | static inline void | 416 | static inline void |
| @@ -478,13 +481,9 @@ static void __init free_unused_memmap_node(int node, struct meminfo *mi) | |||
| 478 | */ | 481 | */ |
| 479 | void __init mem_init(void) | 482 | void __init mem_init(void) |
| 480 | { | 483 | { |
| 481 | unsigned int codepages, datapages, initpages; | 484 | unsigned int codesize, datasize, initsize; |
| 482 | int i, node; | 485 | int i, node; |
| 483 | 486 | ||
| 484 | codepages = &_etext - &_text; | ||
| 485 | datapages = &_end - &__data_start; | ||
| 486 | initpages = &__init_end - &__init_begin; | ||
| 487 | |||
| 488 | #ifndef CONFIG_DISCONTIGMEM | 487 | #ifndef CONFIG_DISCONTIGMEM |
| 489 | max_mapnr = virt_to_page(high_memory) - mem_map; | 488 | max_mapnr = virt_to_page(high_memory) - mem_map; |
| 490 | #endif | 489 | #endif |
| @@ -501,7 +500,8 @@ void __init mem_init(void) | |||
| 501 | 500 | ||
| 502 | #ifdef CONFIG_SA1111 | 501 | #ifdef CONFIG_SA1111 |
| 503 | /* now that our DMA memory is actually so designated, we can free it */ | 502 | /* now that our DMA memory is actually so designated, we can free it */ |
| 504 | free_area(PAGE_OFFSET, (unsigned long)swapper_pg_dir, NULL); | 503 | totalram_pages += free_area(PHYS_PFN_OFFSET, |
| 504 | __phys_to_pfn(__pa(swapper_pg_dir)), NULL); | ||
| 505 | #endif | 505 | #endif |
| 506 | 506 | ||
| 507 | /* | 507 | /* |
| @@ -509,18 +509,21 @@ void __init mem_init(void) | |||
| 509 | * real number of pages we have in this system | 509 | * real number of pages we have in this system |
| 510 | */ | 510 | */ |
| 511 | printk(KERN_INFO "Memory:"); | 511 | printk(KERN_INFO "Memory:"); |
| 512 | |||
| 513 | num_physpages = 0; | 512 | num_physpages = 0; |
| 514 | for (i = 0; i < meminfo.nr_banks; i++) { | 513 | for (i = 0; i < meminfo.nr_banks; i++) { |
| 515 | num_physpages += bank_pfn_size(&meminfo.bank[i]); | 514 | num_physpages += bank_pfn_size(&meminfo.bank[i]); |
| 516 | printk(" %ldMB", bank_phys_size(&meminfo.bank[i]) >> 20); | 515 | printk(" %ldMB", bank_phys_size(&meminfo.bank[i]) >> 20); |
| 517 | } | 516 | } |
| 518 | |||
| 519 | printk(" = %luMB total\n", num_physpages >> (20 - PAGE_SHIFT)); | 517 | printk(" = %luMB total\n", num_physpages >> (20 - PAGE_SHIFT)); |
| 518 | |||
| 519 | codesize = _etext - _text; | ||
| 520 | datasize = _end - _data; | ||
| 521 | initsize = __init_end - __init_begin; | ||
| 522 | |||
| 520 | printk(KERN_NOTICE "Memory: %luKB available (%dK code, " | 523 | printk(KERN_NOTICE "Memory: %luKB available (%dK code, " |
| 521 | "%dK data, %dK init)\n", | 524 | "%dK data, %dK init)\n", |
| 522 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), | 525 | (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), |
| 523 | codepages >> 10, datapages >> 10, initpages >> 10); | 526 | codesize >> 10, datasize >> 10, initsize >> 10); |
| 524 | 527 | ||
| 525 | if (PAGE_SIZE >= 16384 && num_physpages <= 128) { | 528 | if (PAGE_SIZE >= 16384 && num_physpages <= 128) { |
| 526 | extern int sysctl_overcommit_memory; | 529 | extern int sysctl_overcommit_memory; |
| @@ -535,11 +538,10 @@ void __init mem_init(void) | |||
| 535 | 538 | ||
| 536 | void free_initmem(void) | 539 | void free_initmem(void) |
| 537 | { | 540 | { |
| 538 | if (!machine_is_integrator() && !machine_is_cintegrator()) { | 541 | if (!machine_is_integrator() && !machine_is_cintegrator()) |
| 539 | free_area((unsigned long)(&__init_begin), | 542 | totalram_pages += free_area(__phys_to_pfn(__pa(__init_begin)), |
| 540 | (unsigned long)(&__init_end), | 543 | __phys_to_pfn(__pa(__init_end)), |
| 541 | "init"); | 544 | "init"); |
| 542 | } | ||
| 543 | } | 545 | } |
| 544 | 546 | ||
| 545 | #ifdef CONFIG_BLK_DEV_INITRD | 547 | #ifdef CONFIG_BLK_DEV_INITRD |
| @@ -549,7 +551,9 @@ static int keep_initrd; | |||
| 549 | void free_initrd_mem(unsigned long start, unsigned long end) | 551 | void free_initrd_mem(unsigned long start, unsigned long end) |
| 550 | { | 552 | { |
| 551 | if (!keep_initrd) | 553 | if (!keep_initrd) |
| 552 | free_area(start, end, "initrd"); | 554 | totalram_pages += free_area(__phys_to_pfn(__pa(start)), |
| 555 | __phys_to_pfn(__pa(end)), | ||
| 556 | "initrd"); | ||
| 553 | } | 557 | } |
| 554 | 558 | ||
| 555 | static int __init keepinitrd_setup(char *__unused) | 559 | static int __init keepinitrd_setup(char *__unused) |
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h index 5d9f53907b4e..95bbe112965e 100644 --- a/arch/arm/mm/mm.h +++ b/arch/arm/mm/mm.h | |||
| @@ -32,7 +32,5 @@ struct meminfo; | |||
| 32 | struct pglist_data; | 32 | struct pglist_data; |
| 33 | 33 | ||
| 34 | void __init create_mapping(struct map_desc *md); | 34 | void __init create_mapping(struct map_desc *md); |
| 35 | void __init bootmem_init(struct meminfo *mi); | 35 | void __init bootmem_init(void); |
| 36 | void reserve_node_zero(struct pglist_data *pgdat); | 36 | void reserve_node_zero(struct pglist_data *pgdat); |
| 37 | |||
| 38 | extern void _text, _stext, _etext, __data_start, _end, __init_begin, __init_end; | ||
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 7f36c825718d..9b36c5cb5e9f 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #include <asm/cputype.h> | 18 | #include <asm/cputype.h> |
| 19 | #include <asm/mach-types.h> | 19 | #include <asm/mach-types.h> |
| 20 | #include <asm/sections.h> | ||
| 20 | #include <asm/setup.h> | 21 | #include <asm/setup.h> |
| 21 | #include <asm/sizes.h> | 22 | #include <asm/sizes.h> |
| 22 | #include <asm/tlb.h> | 23 | #include <asm/tlb.h> |
| @@ -646,61 +647,79 @@ static void __init early_vmalloc(char **arg) | |||
| 646 | "vmalloc area too small, limiting to %luMB\n", | 647 | "vmalloc area too small, limiting to %luMB\n", |
| 647 | vmalloc_reserve >> 20); | 648 | vmalloc_reserve >> 20); |
| 648 | } | 649 | } |
| 650 | |||
| 651 | if (vmalloc_reserve > VMALLOC_END - (PAGE_OFFSET + SZ_32M)) { | ||
| 652 | vmalloc_reserve = VMALLOC_END - (PAGE_OFFSET + SZ_32M); | ||
| 653 | printk(KERN_WARNING | ||
| 654 | "vmalloc area is too big, limiting to %luMB\n", | ||
| 655 | vmalloc_reserve >> 20); | ||
| 656 | } | ||
| 649 | } | 657 | } |
| 650 | __early_param("vmalloc=", early_vmalloc); | 658 | __early_param("vmalloc=", early_vmalloc); |
| 651 | 659 | ||
| 652 | #define VMALLOC_MIN (void *)(VMALLOC_END - vmalloc_reserve) | 660 | #define VMALLOC_MIN (void *)(VMALLOC_END - vmalloc_reserve) |
| 653 | 661 | ||
| 654 | static int __init check_membank_valid(struct membank *mb) | 662 | static void __init sanity_check_meminfo(void) |
| 655 | { | 663 | { |
| 656 | /* | 664 | int i, j; |
| 657 | * Check whether this memory region has non-zero size or | ||
| 658 | * invalid node number. | ||
| 659 | */ | ||
| 660 | if (mb->size == 0 || mb->node >= MAX_NUMNODES) | ||
| 661 | return 0; | ||
| 662 | |||
| 663 | /* | ||
| 664 | * Check whether this memory region would entirely overlap | ||
| 665 | * the vmalloc area. | ||
| 666 | */ | ||
| 667 | if (phys_to_virt(mb->start) >= VMALLOC_MIN) { | ||
| 668 | printk(KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx " | ||
| 669 | "(vmalloc region overlap).\n", | ||
| 670 | mb->start, mb->start + mb->size - 1); | ||
| 671 | return 0; | ||
| 672 | } | ||
| 673 | |||
| 674 | /* | ||
| 675 | * Check whether this memory region would partially overlap | ||
| 676 | * the vmalloc area. | ||
| 677 | */ | ||
| 678 | if (phys_to_virt(mb->start + mb->size) < phys_to_virt(mb->start) || | ||
| 679 | phys_to_virt(mb->start + mb->size) > VMALLOC_MIN) { | ||
| 680 | unsigned long newsize = VMALLOC_MIN - phys_to_virt(mb->start); | ||
| 681 | |||
| 682 | printk(KERN_NOTICE "Truncating RAM at %.8lx-%.8lx " | ||
| 683 | "to -%.8lx (vmalloc region overlap).\n", | ||
| 684 | mb->start, mb->start + mb->size - 1, | ||
| 685 | mb->start + newsize - 1); | ||
| 686 | mb->size = newsize; | ||
| 687 | } | ||
| 688 | 665 | ||
| 689 | return 1; | 666 | for (i = 0, j = 0; i < meminfo.nr_banks; i++) { |
| 690 | } | 667 | struct membank *bank = &meminfo.bank[j]; |
| 668 | *bank = meminfo.bank[i]; | ||
| 691 | 669 | ||
| 692 | static void __init sanity_check_meminfo(struct meminfo *mi) | 670 | #ifdef CONFIG_HIGHMEM |
| 693 | { | 671 | /* |
| 694 | int i, j; | 672 | * Split those memory banks which are partially overlapping |
| 673 | * the vmalloc area greatly simplifying things later. | ||
| 674 | */ | ||
| 675 | if (__va(bank->start) < VMALLOC_MIN && | ||
| 676 | bank->size > VMALLOC_MIN - __va(bank->start)) { | ||
| 677 | if (meminfo.nr_banks >= NR_BANKS) { | ||
| 678 | printk(KERN_CRIT "NR_BANKS too low, " | ||
| 679 | "ignoring high memory\n"); | ||
| 680 | } else { | ||
| 681 | memmove(bank + 1, bank, | ||
| 682 | (meminfo.nr_banks - i) * sizeof(*bank)); | ||
| 683 | meminfo.nr_banks++; | ||
| 684 | i++; | ||
| 685 | bank[1].size -= VMALLOC_MIN - __va(bank->start); | ||
| 686 | bank[1].start = __pa(VMALLOC_MIN - 1) + 1; | ||
| 687 | j++; | ||
| 688 | } | ||
| 689 | bank->size = VMALLOC_MIN - __va(bank->start); | ||
| 690 | } | ||
| 691 | #else | ||
| 692 | /* | ||
| 693 | * Check whether this memory bank would entirely overlap | ||
| 694 | * the vmalloc area. | ||
| 695 | */ | ||
| 696 | if (__va(bank->start) >= VMALLOC_MIN) { | ||
| 697 | printk(KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx " | ||
| 698 | "(vmalloc region overlap).\n", | ||
| 699 | bank->start, bank->start + bank->size - 1); | ||
| 700 | continue; | ||
| 701 | } | ||
| 695 | 702 | ||
| 696 | for (i = 0, j = 0; i < mi->nr_banks; i++) { | 703 | /* |
| 697 | if (check_membank_valid(&mi->bank[i])) | 704 | * Check whether this memory bank would partially overlap |
| 698 | mi->bank[j++] = mi->bank[i]; | 705 | * the vmalloc area. |
| 706 | */ | ||
| 707 | if (__va(bank->start + bank->size) > VMALLOC_MIN || | ||
| 708 | __va(bank->start + bank->size) < __va(bank->start)) { | ||
| 709 | unsigned long newsize = VMALLOC_MIN - __va(bank->start); | ||
| 710 | printk(KERN_NOTICE "Truncating RAM at %.8lx-%.8lx " | ||
| 711 | "to -%.8lx (vmalloc region overlap).\n", | ||
| 712 | bank->start, bank->start + bank->size - 1, | ||
| 713 | bank->start + newsize - 1); | ||
| 714 | bank->size = newsize; | ||
| 715 | } | ||
| 716 | #endif | ||
| 717 | j++; | ||
| 699 | } | 718 | } |
| 700 | mi->nr_banks = j; | 719 | meminfo.nr_banks = j; |
| 701 | } | 720 | } |
| 702 | 721 | ||
| 703 | static inline void prepare_page_table(struct meminfo *mi) | 722 | static inline void prepare_page_table(void) |
| 704 | { | 723 | { |
| 705 | unsigned long addr; | 724 | unsigned long addr; |
| 706 | 725 | ||
| @@ -712,7 +731,7 @@ static inline void prepare_page_table(struct meminfo *mi) | |||
| 712 | 731 | ||
| 713 | #ifdef CONFIG_XIP_KERNEL | 732 | #ifdef CONFIG_XIP_KERNEL |
| 714 | /* The XIP kernel is mapped in the module area -- skip over it */ | 733 | /* The XIP kernel is mapped in the module area -- skip over it */ |
| 715 | addr = ((unsigned long)&_etext + PGDIR_SIZE - 1) & PGDIR_MASK; | 734 | addr = ((unsigned long)_etext + PGDIR_SIZE - 1) & PGDIR_MASK; |
| 716 | #endif | 735 | #endif |
| 717 | for ( ; addr < PAGE_OFFSET; addr += PGDIR_SIZE) | 736 | for ( ; addr < PAGE_OFFSET; addr += PGDIR_SIZE) |
| 718 | pmd_clear(pmd_off_k(addr)); | 737 | pmd_clear(pmd_off_k(addr)); |
| @@ -721,7 +740,7 @@ static inline void prepare_page_table(struct meminfo *mi) | |||
| 721 | * Clear out all the kernel space mappings, except for the first | 740 | * Clear out all the kernel space mappings, except for the first |
| 722 | * memory bank, up to the end of the vmalloc region. | 741 | * memory bank, up to the end of the vmalloc region. |
| 723 | */ | 742 | */ |
| 724 | for (addr = __phys_to_virt(mi->bank[0].start + mi->bank[0].size); | 743 | for (addr = __phys_to_virt(bank_phys_end(&meminfo.bank[0])); |
| 725 | addr < VMALLOC_END; addr += PGDIR_SIZE) | 744 | addr < VMALLOC_END; addr += PGDIR_SIZE) |
| 726 | pmd_clear(pmd_off_k(addr)); | 745 | pmd_clear(pmd_off_k(addr)); |
| 727 | } | 746 | } |
| @@ -738,10 +757,10 @@ void __init reserve_node_zero(pg_data_t *pgdat) | |||
| 738 | * Note that this can only be in node 0. | 757 | * Note that this can only be in node 0. |
| 739 | */ | 758 | */ |
| 740 | #ifdef CONFIG_XIP_KERNEL | 759 | #ifdef CONFIG_XIP_KERNEL |
| 741 | reserve_bootmem_node(pgdat, __pa(&__data_start), &_end - &__data_start, | 760 | reserve_bootmem_node(pgdat, __pa(_data), _end - _data, |
| 742 | BOOTMEM_DEFAULT); | 761 | BOOTMEM_DEFAULT); |
| 743 | #else | 762 | #else |
| 744 | reserve_bootmem_node(pgdat, __pa(&_stext), &_end - &_stext, | 763 | reserve_bootmem_node(pgdat, __pa(_stext), _end - _stext, |
| 745 | BOOTMEM_DEFAULT); | 764 | BOOTMEM_DEFAULT); |
| 746 | #endif | 765 | #endif |
| 747 | 766 | ||
| @@ -808,7 +827,6 @@ static void __init devicemaps_init(struct machine_desc *mdesc) | |||
| 808 | * Allocate the vector page early. | 827 | * Allocate the vector page early. |
| 809 | */ | 828 | */ |
| 810 | vectors = alloc_bootmem_low_pages(PAGE_SIZE); | 829 | vectors = alloc_bootmem_low_pages(PAGE_SIZE); |
| 811 | BUG_ON(!vectors); | ||
| 812 | 830 | ||
| 813 | for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE) | 831 | for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE) |
| 814 | pmd_clear(pmd_off_k(addr)); | 832 | pmd_clear(pmd_off_k(addr)); |
| @@ -820,7 +838,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc) | |||
| 820 | #ifdef CONFIG_XIP_KERNEL | 838 | #ifdef CONFIG_XIP_KERNEL |
| 821 | map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK); | 839 | map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK); |
| 822 | map.virtual = MODULES_VADDR; | 840 | map.virtual = MODULES_VADDR; |
| 823 | map.length = ((unsigned long)&_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK; | 841 | map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK; |
| 824 | map.type = MT_ROM; | 842 | map.type = MT_ROM; |
| 825 | create_mapping(&map); | 843 | create_mapping(&map); |
| 826 | #endif | 844 | #endif |
| @@ -880,23 +898,23 @@ static void __init devicemaps_init(struct machine_desc *mdesc) | |||
| 880 | * paging_init() sets up the page tables, initialises the zone memory | 898 | * paging_init() sets up the page tables, initialises the zone memory |
| 881 | * maps, and sets up the zero page, bad page and bad page tables. | 899 | * maps, and sets up the zero page, bad page and bad page tables. |
| 882 | */ | 900 | */ |
| 883 | void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc) | 901 | void __init paging_init(struct machine_desc *mdesc) |
| 884 | { | 902 | { |
| 885 | void *zero_page; | 903 | void *zero_page; |
| 886 | 904 | ||
| 887 | build_mem_type_table(); | 905 | build_mem_type_table(); |
| 888 | sanity_check_meminfo(mi); | 906 | sanity_check_meminfo(); |
| 889 | prepare_page_table(mi); | 907 | prepare_page_table(); |
| 890 | bootmem_init(mi); | 908 | bootmem_init(); |
| 891 | devicemaps_init(mdesc); | 909 | devicemaps_init(mdesc); |
| 892 | 910 | ||
| 893 | top_pmd = pmd_off_k(0xffff0000); | 911 | top_pmd = pmd_off_k(0xffff0000); |
| 894 | 912 | ||
| 895 | /* | 913 | /* |
| 896 | * allocate the zero page. Note that we count on this going ok. | 914 | * allocate the zero page. Note that this always succeeds and |
| 915 | * returns a zeroed result. | ||
| 897 | */ | 916 | */ |
| 898 | zero_page = alloc_bootmem_low_pages(PAGE_SIZE); | 917 | zero_page = alloc_bootmem_low_pages(PAGE_SIZE); |
| 899 | memzero(zero_page, PAGE_SIZE); | ||
| 900 | empty_zero_page = virt_to_page(zero_page); | 918 | empty_zero_page = virt_to_page(zero_page); |
| 901 | flush_dcache_page(empty_zero_page); | 919 | flush_dcache_page(empty_zero_page); |
| 902 | } | 920 | } |
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 07b62b238979..ad7bacc693b2 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/io.h> | 10 | #include <linux/io.h> |
| 11 | 11 | ||
| 12 | #include <asm/cacheflush.h> | 12 | #include <asm/cacheflush.h> |
| 13 | #include <asm/sections.h> | ||
| 13 | #include <asm/page.h> | 14 | #include <asm/page.h> |
| 14 | #include <asm/mach/arch.h> | 15 | #include <asm/mach/arch.h> |
| 15 | 16 | ||
| @@ -25,10 +26,10 @@ void __init reserve_node_zero(pg_data_t *pgdat) | |||
| 25 | * Note that this can only be in node 0. | 26 | * Note that this can only be in node 0. |
| 26 | */ | 27 | */ |
| 27 | #ifdef CONFIG_XIP_KERNEL | 28 | #ifdef CONFIG_XIP_KERNEL |
| 28 | reserve_bootmem_node(pgdat, __pa(&__data_start), &_end - &__data_start, | 29 | reserve_bootmem_node(pgdat, __pa(_data), _end - _data, |
| 29 | BOOTMEM_DEFAULT); | 30 | BOOTMEM_DEFAULT); |
| 30 | #else | 31 | #else |
| 31 | reserve_bootmem_node(pgdat, __pa(&_stext), &_end - &_stext, | 32 | reserve_bootmem_node(pgdat, __pa(_stext), _end - _stext, |
| 32 | BOOTMEM_DEFAULT); | 33 | BOOTMEM_DEFAULT); |
| 33 | #endif | 34 | #endif |
| 34 | 35 | ||
| @@ -41,27 +42,13 @@ void __init reserve_node_zero(pg_data_t *pgdat) | |||
| 41 | BOOTMEM_DEFAULT); | 42 | BOOTMEM_DEFAULT); |
| 42 | } | 43 | } |
| 43 | 44 | ||
| 44 | static void __init sanity_check_meminfo(struct meminfo *mi) | ||
| 45 | { | ||
| 46 | int i, j; | ||
| 47 | |||
| 48 | for (i = 0, j = 0; i < mi->nr_banks; i++) { | ||
| 49 | struct membank *mb = &mi->bank[i]; | ||
| 50 | |||
| 51 | if (mb->size != 0 && mb->node < MAX_NUMNODES) | ||
| 52 | mi->bank[j++] = mi->bank[i]; | ||
| 53 | } | ||
| 54 | mi->nr_banks = j; | ||
| 55 | } | ||
| 56 | |||
| 57 | /* | 45 | /* |
| 58 | * paging_init() sets up the page tables, initialises the zone memory | 46 | * paging_init() sets up the page tables, initialises the zone memory |
| 59 | * maps, and sets up the zero page, bad page and bad page tables. | 47 | * maps, and sets up the zero page, bad page and bad page tables. |
| 60 | */ | 48 | */ |
| 61 | void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc) | 49 | void __init paging_init(struct machine_desc *mdesc) |
| 62 | { | 50 | { |
| 63 | sanity_check_meminfo(mi); | 51 | bootmem_init(); |
| 64 | bootmem_init(mi); | ||
| 65 | } | 52 | } |
| 66 | 53 | ||
| 67 | /* | 54 | /* |
diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c index e0f19ab91163..2690146161ba 100644 --- a/arch/arm/mm/pgd.c +++ b/arch/arm/mm/pgd.c | |||
| @@ -31,7 +31,7 @@ pgd_t *get_pgd_slow(struct mm_struct *mm) | |||
| 31 | if (!new_pgd) | 31 | if (!new_pgd) |
| 32 | goto no_pgd; | 32 | goto no_pgd; |
| 33 | 33 | ||
| 34 | memzero(new_pgd, FIRST_KERNEL_PGD_NR * sizeof(pgd_t)); | 34 | memset(new_pgd, 0, FIRST_KERNEL_PGD_NR * sizeof(pgd_t)); |
| 35 | 35 | ||
| 36 | /* | 36 | /* |
| 37 | * Copy over the kernel and IO PGD entries | 37 | * Copy over the kernel and IO PGD entries |
diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c index 2b5ba396e3a6..4ad3bf291ad3 100644 --- a/arch/arm/mm/proc-syms.c +++ b/arch/arm/mm/proc-syms.c | |||
| @@ -33,8 +33,8 @@ EXPORT_SYMBOL(cpu_cache); | |||
| 33 | 33 | ||
| 34 | #ifdef CONFIG_MMU | 34 | #ifdef CONFIG_MMU |
| 35 | #ifndef MULTI_USER | 35 | #ifndef MULTI_USER |
| 36 | EXPORT_SYMBOL(__cpu_clear_user_page); | 36 | EXPORT_SYMBOL(__cpu_clear_user_highpage); |
| 37 | EXPORT_SYMBOL(__cpu_copy_user_page); | 37 | EXPORT_SYMBOL(__cpu_copy_user_highpage); |
| 38 | #else | 38 | #else |
| 39 | EXPORT_SYMBOL(cpu_user); | 39 | EXPORT_SYMBOL(cpu_user); |
| 40 | #endif | 40 | #endif |
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 294943b85973..f0cc599facb7 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
| @@ -71,6 +71,8 @@ ENTRY(cpu_v6_reset) | |||
| 71 | * IRQs are already disabled. | 71 | * IRQs are already disabled. |
| 72 | */ | 72 | */ |
| 73 | ENTRY(cpu_v6_do_idle) | 73 | ENTRY(cpu_v6_do_idle) |
| 74 | mov r1, #0 | ||
| 75 | mcr p15, 0, r1, c7, c10, 4 @ DWB - WFI may enter a low-power mode | ||
| 74 | mcr p15, 0, r1, c7, c0, 4 @ wait for interrupt | 76 | mcr p15, 0, r1, c7, c0, 4 @ wait for interrupt |
| 75 | mov pc, lr | 77 | mov pc, lr |
| 76 | 78 | ||
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 4d3c0a73e7fb..d1ebec42521d 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S | |||
| @@ -20,9 +20,17 @@ | |||
| 20 | 20 | ||
| 21 | #define TTB_C (1 << 0) | 21 | #define TTB_C (1 << 0) |
| 22 | #define TTB_S (1 << 1) | 22 | #define TTB_S (1 << 1) |
| 23 | #define TTB_RGN_NC (0 << 3) | ||
| 24 | #define TTB_RGN_OC_WBWA (1 << 3) | ||
| 23 | #define TTB_RGN_OC_WT (2 << 3) | 25 | #define TTB_RGN_OC_WT (2 << 3) |
| 24 | #define TTB_RGN_OC_WB (3 << 3) | 26 | #define TTB_RGN_OC_WB (3 << 3) |
| 25 | 27 | ||
| 28 | #ifndef CONFIG_SMP | ||
| 29 | #define TTB_FLAGS TTB_C|TTB_RGN_OC_WB @ mark PTWs cacheable, outer WB | ||
| 30 | #else | ||
| 31 | #define TTB_FLAGS TTB_C|TTB_S|TTB_RGN_OC_WBWA @ mark PTWs cacheable and shared, outer WBWA | ||
| 32 | #endif | ||
| 33 | |||
| 26 | ENTRY(cpu_v7_proc_init) | 34 | ENTRY(cpu_v7_proc_init) |
| 27 | mov pc, lr | 35 | mov pc, lr |
| 28 | ENDPROC(cpu_v7_proc_init) | 36 | ENDPROC(cpu_v7_proc_init) |
| @@ -55,6 +63,7 @@ ENDPROC(cpu_v7_reset) | |||
| 55 | * IRQs are already disabled. | 63 | * IRQs are already disabled. |
| 56 | */ | 64 | */ |
| 57 | ENTRY(cpu_v7_do_idle) | 65 | ENTRY(cpu_v7_do_idle) |
| 66 | dsb @ WFI may enter a low-power mode | ||
| 58 | wfi | 67 | wfi |
| 59 | mov pc, lr | 68 | mov pc, lr |
| 60 | ENDPROC(cpu_v7_do_idle) | 69 | ENDPROC(cpu_v7_do_idle) |
| @@ -85,7 +94,7 @@ ENTRY(cpu_v7_switch_mm) | |||
| 85 | #ifdef CONFIG_MMU | 94 | #ifdef CONFIG_MMU |
| 86 | mov r2, #0 | 95 | mov r2, #0 |
| 87 | ldr r1, [r1, #MM_CONTEXT_ID] @ get mm->context.id | 96 | ldr r1, [r1, #MM_CONTEXT_ID] @ get mm->context.id |
| 88 | orr r0, r0, #TTB_RGN_OC_WB @ mark PTWs outer cacheable, WB | 97 | orr r0, r0, #TTB_FLAGS |
| 89 | mcr p15, 0, r2, c13, c0, 1 @ set reserved context ID | 98 | mcr p15, 0, r2, c13, c0, 1 @ set reserved context ID |
| 90 | isb | 99 | isb |
| 91 | 1: mcr p15, 0, r0, c2, c0, 0 @ set TTB 0 | 100 | 1: mcr p15, 0, r0, c2, c0, 0 @ set TTB 0 |
| @@ -162,6 +171,11 @@ cpu_v7_name: | |||
| 162 | * - cache type register is implemented | 171 | * - cache type register is implemented |
| 163 | */ | 172 | */ |
| 164 | __v7_setup: | 173 | __v7_setup: |
| 174 | #ifdef CONFIG_SMP | ||
| 175 | mrc p15, 0, r0, c1, c0, 1 @ Enable SMP/nAMP mode | ||
| 176 | orr r0, r0, #(0x1 << 6) | ||
| 177 | mcr p15, 0, r0, c1, c0, 1 | ||
| 178 | #endif | ||
| 165 | adr r12, __v7_setup_stack @ the local stack | 179 | adr r12, __v7_setup_stack @ the local stack |
| 166 | stmia r12, {r0-r5, r7, r9, r11, lr} | 180 | stmia r12, {r0-r5, r7, r9, r11, lr} |
| 167 | bl v7_flush_dcache_all | 181 | bl v7_flush_dcache_all |
| @@ -174,8 +188,7 @@ __v7_setup: | |||
| 174 | #ifdef CONFIG_MMU | 188 | #ifdef CONFIG_MMU |
| 175 | mcr p15, 0, r10, c8, c7, 0 @ invalidate I + D TLBs | 189 | mcr p15, 0, r10, c8, c7, 0 @ invalidate I + D TLBs |
| 176 | mcr p15, 0, r10, c2, c0, 2 @ TTB control register | 190 | mcr p15, 0, r10, c2, c0, 2 @ TTB control register |
| 177 | orr r4, r4, #TTB_RGN_OC_WB @ mark PTWs outer cacheable, WB | 191 | orr r4, r4, #TTB_FLAGS |
| 178 | mcr p15, 0, r4, c2, c0, 0 @ load TTB0 | ||
| 179 | mcr p15, 0, r4, c2, c0, 1 @ load TTB1 | 192 | mcr p15, 0, r4, c2, c0, 1 @ load TTB1 |
| 180 | mov r10, #0x1f @ domains 0, 1 = manager | 193 | mov r10, #0x1f @ domains 0, 1 = manager |
| 181 | mcr p15, 0, r10, c3, c0, 0 @ load domain access register | 194 | mcr p15, 0, r10, c3, c0, 0 @ load domain access register |
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S index 8f6cf56c11c0..33515c214b92 100644 --- a/arch/arm/mm/proc-xsc3.S +++ b/arch/arm/mm/proc-xsc3.S | |||
| @@ -481,3 +481,28 @@ __xsc3_proc_info: | |||
| 481 | .long xsc3_mc_user_fns | 481 | .long xsc3_mc_user_fns |
| 482 | .long xsc3_cache_fns | 482 | .long xsc3_cache_fns |
| 483 | .size __xsc3_proc_info, . - __xsc3_proc_info | 483 | .size __xsc3_proc_info, . - __xsc3_proc_info |
| 484 | |||
| 485 | /* Note: PXA935 changed its implementor ID from Intel to Marvell */ | ||
| 486 | |||
| 487 | .type __xsc3_pxa935_proc_info,#object | ||
| 488 | __xsc3_pxa935_proc_info: | ||
| 489 | .long 0x56056000 | ||
| 490 | .long 0xffffe000 | ||
| 491 | .long PMD_TYPE_SECT | \ | ||
| 492 | PMD_SECT_BUFFERABLE | \ | ||
| 493 | PMD_SECT_CACHEABLE | \ | ||
| 494 | PMD_SECT_AP_WRITE | \ | ||
| 495 | PMD_SECT_AP_READ | ||
| 496 | .long PMD_TYPE_SECT | \ | ||
| 497 | PMD_SECT_AP_WRITE | \ | ||
| 498 | PMD_SECT_AP_READ | ||
| 499 | b __xsc3_setup | ||
| 500 | .long cpu_arch_name | ||
| 501 | .long cpu_elf_name | ||
| 502 | .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP | ||
| 503 | .long cpu_xsc3_name | ||
| 504 | .long xsc3_processor_functions | ||
| 505 | .long v4wbi_tlb_fns | ||
| 506 | .long xsc3_mc_user_fns | ||
| 507 | .long xsc3_cache_fns | ||
| 508 | .size __xsc3_pxa935_proc_info, . - __xsc3_pxa935_proc_info | ||
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index b2a7e3fad117..a1612958a59e 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig | |||
| @@ -8,11 +8,13 @@ choice | |||
| 8 | 8 | ||
| 9 | config ARCH_MX2 | 9 | config ARCH_MX2 |
| 10 | bool "MX2-based" | 10 | bool "MX2-based" |
| 11 | select CPU_ARM926T | ||
| 11 | help | 12 | help |
| 12 | This enables support for systems based on the Freescale i.MX2 family | 13 | This enables support for systems based on the Freescale i.MX2 family |
| 13 | 14 | ||
| 14 | config ARCH_MX3 | 15 | config ARCH_MX3 |
| 15 | bool "MX3-based" | 16 | bool "MX3-based" |
| 17 | select CPU_V6 | ||
| 16 | help | 18 | help |
| 17 | This enables support for systems based on the Freescale i.MX3 family | 19 | This enables support for systems based on the Freescale i.MX3 family |
| 18 | 20 | ||
diff --git a/arch/arm/plat-mxc/dma-mx1-mx2.c b/arch/arm/plat-mxc/dma-mx1-mx2.c index b296f19fd89a..214274344442 100644 --- a/arch/arm/plat-mxc/dma-mx1-mx2.c +++ b/arch/arm/plat-mxc/dma-mx1-mx2.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #include <asm/system.h> | 34 | #include <asm/system.h> |
| 35 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 36 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
| 37 | #include <asm/dma.h> | 37 | #include <mach/dma.h> |
| 38 | #include <mach/dma-mx1-mx2.h> | 38 | #include <mach/dma-mx1-mx2.h> |
| 39 | 39 | ||
| 40 | #define DMA_DCR 0x00 /* Control Register */ | 40 | #define DMA_DCR 0x00 /* Control Register */ |
diff --git a/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h b/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h index e85fd946116c..6cc6f0c8cb25 100644 --- a/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h +++ b/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | * MA 02110-1301, USA. | 22 | * MA 02110-1301, USA. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <asm/dma.h> | 25 | #include <mach/dma.h> |
| 26 | 26 | ||
| 27 | #ifndef __ASM_ARCH_MXC_DMA_H | 27 | #ifndef __ASM_ARCH_MXC_DMA_H |
| 28 | #define __ASM_ARCH_MXC_DMA_H | 28 | #define __ASM_ARCH_MXC_DMA_H |
diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h deleted file mode 100644 index c822d569a05e..000000000000 --- a/arch/arm/plat-mxc/include/mach/dma.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. | ||
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __ASM_ARCH_MXC_DMA_H__ | ||
| 12 | #define __ASM_ARCH_MXC_DMA_H__ | ||
| 13 | |||
| 14 | #endif | ||
diff --git a/arch/arm/plat-mxc/include/mach/io.h b/arch/arm/plat-mxc/include/mach/io.h index 5d4cb1196441..c0cb267e7403 100644 --- a/arch/arm/plat-mxc/include/mach/io.h +++ b/arch/arm/plat-mxc/include/mach/io.h | |||
| @@ -35,8 +35,8 @@ __mx3_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype) | |||
| 35 | #endif | 35 | #endif |
| 36 | 36 | ||
| 37 | /* io address mapping macro */ | 37 | /* io address mapping macro */ |
| 38 | #define __io(a) ((void __iomem *)(a)) | 38 | #define __io(a) __typesafe_io(a) |
| 39 | 39 | ||
| 40 | #define __mem_pci(a) (a) | 40 | #define __mem_pci(a) (a) |
| 41 | 41 | ||
| 42 | #endif | 42 | #endif |
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index d7a8d3ebed57..203688e6164e 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h | |||
| @@ -13,17 +13,4 @@ | |||
| 13 | 13 | ||
| 14 | #include <mach/hardware.h> | 14 | #include <mach/hardware.h> |
| 15 | 15 | ||
| 16 | /* | ||
| 17 | * Virtual view <-> DMA view memory address translations | ||
| 18 | * This macro is used to translate the virtual address to an address | ||
| 19 | * suitable to be passed to set_dma_addr() | ||
| 20 | */ | ||
| 21 | #define __virt_to_bus(a) __virt_to_phys(a) | ||
| 22 | |||
| 23 | /* | ||
| 24 | * Used to convert an address for DMA operations to an address that the | ||
| 25 | * kernel can use. | ||
| 26 | */ | ||
| 27 | #define __bus_to_virt(a) __phys_to_virt(a) | ||
| 28 | |||
| 29 | #endif /* __ASM_ARCH_MXC_MEMORY_H__ */ | 16 | #endif /* __ASM_ARCH_MXC_MEMORY_H__ */ |
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index a94f0c44ebc8..46d3b0b9ce69 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
| @@ -14,9 +14,11 @@ config ARCH_OMAP1 | |||
| 14 | 14 | ||
| 15 | config ARCH_OMAP2 | 15 | config ARCH_OMAP2 |
| 16 | bool "TI OMAP2" | 16 | bool "TI OMAP2" |
| 17 | select CPU_V6 | ||
| 17 | 18 | ||
| 18 | config ARCH_OMAP3 | 19 | config ARCH_OMAP3 |
| 19 | bool "TI OMAP3" | 20 | bool "TI OMAP3" |
| 21 | select CPU_V7 | ||
| 20 | 22 | ||
| 21 | endchoice | 23 | endchoice |
| 22 | 24 | ||
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 50f8b4ad9a09..7686b9fa53f2 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <asm/system.h> | 30 | #include <asm/system.h> |
| 31 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
| 32 | #include <asm/dma.h> | 32 | #include <mach/dma.h> |
| 33 | 33 | ||
| 34 | #include <mach/tc.h> | 34 | #include <mach/tc.h> |
| 35 | 35 | ||
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 8679fbca6bbe..424049d83fbe 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
| @@ -101,6 +101,7 @@ | |||
| 101 | #define OMAP24XX_GPIO_IRQSTATUS2 0x0028 | 101 | #define OMAP24XX_GPIO_IRQSTATUS2 0x0028 |
| 102 | #define OMAP24XX_GPIO_IRQENABLE2 0x002c | 102 | #define OMAP24XX_GPIO_IRQENABLE2 0x002c |
| 103 | #define OMAP24XX_GPIO_IRQENABLE1 0x001c | 103 | #define OMAP24XX_GPIO_IRQENABLE1 0x001c |
| 104 | #define OMAP24XX_GPIO_WAKE_EN 0x0020 | ||
| 104 | #define OMAP24XX_GPIO_CTRL 0x0030 | 105 | #define OMAP24XX_GPIO_CTRL 0x0030 |
| 105 | #define OMAP24XX_GPIO_OE 0x0034 | 106 | #define OMAP24XX_GPIO_OE 0x0034 |
| 106 | #define OMAP24XX_GPIO_DATAIN 0x0038 | 107 | #define OMAP24XX_GPIO_DATAIN 0x0038 |
| @@ -1551,7 +1552,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) | |||
| 1551 | #endif | 1552 | #endif |
| 1552 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | 1553 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) |
| 1553 | case METHOD_GPIO_24XX: | 1554 | case METHOD_GPIO_24XX: |
| 1554 | wake_status = bank->base + OMAP24XX_GPIO_SETWKUENA; | 1555 | wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN; |
| 1555 | wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; | 1556 | wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; |
| 1556 | wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; | 1557 | wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; |
| 1557 | break; | 1558 | break; |
| @@ -1574,7 +1575,7 @@ static int omap_gpio_resume(struct sys_device *dev) | |||
| 1574 | { | 1575 | { |
| 1575 | int i; | 1576 | int i; |
| 1576 | 1577 | ||
| 1577 | if (!cpu_is_omap24xx() && !cpu_is_omap16xx()) | 1578 | if (!cpu_class_is_omap2() && !cpu_is_omap16xx()) |
| 1578 | return 0; | 1579 | return 0; |
| 1579 | 1580 | ||
| 1580 | for (i = 0; i < gpio_bank_count; i++) { | 1581 | for (i = 0; i < gpio_bank_count; i++) { |
diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h index adc83b7b8205..d92bf7964481 100644 --- a/arch/arm/plat-omap/include/mach/io.h +++ b/arch/arm/plat-omap/include/mach/io.h | |||
| @@ -42,8 +42,8 @@ | |||
| 42 | * We don't actually have real ISA nor PCI buses, but there is so many | 42 | * We don't actually have real ISA nor PCI buses, but there is so many |
| 43 | * drivers out there that might just work if we fake them... | 43 | * drivers out there that might just work if we fake them... |
| 44 | */ | 44 | */ |
| 45 | #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) | 45 | #define __io(a) __typesafe_io(a) |
| 46 | #define __mem_pci(a) (a) | 46 | #define __mem_pci(a) (a) |
| 47 | 47 | ||
| 48 | /* | 48 | /* |
| 49 | * ---------------------------------------------------------------------------- | 49 | * ---------------------------------------------------------------------------- |
| @@ -51,8 +51,6 @@ | |||
| 51 | * ---------------------------------------------------------------------------- | 51 | * ---------------------------------------------------------------------------- |
| 52 | */ | 52 | */ |
| 53 | 53 | ||
| 54 | #define PCIO_BASE 0 | ||
| 55 | |||
| 56 | #if defined(CONFIG_ARCH_OMAP1) | 54 | #if defined(CONFIG_ARCH_OMAP1) |
| 57 | 55 | ||
| 58 | #define IO_PHYS 0xFFFB0000 | 56 | #define IO_PHYS 0xFFFB0000 |
diff --git a/arch/arm/plat-omap/include/mach/memory.h b/arch/arm/plat-omap/include/mach/memory.h index d40cac60b959..211c9f6619e9 100644 --- a/arch/arm/plat-omap/include/mach/memory.h +++ b/arch/arm/plat-omap/include/mach/memory.h | |||
| @@ -43,18 +43,7 @@ | |||
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
| 45 | /* | 45 | /* |
| 46 | * Conversion between SDRAM and fake PCI bus, used by USB | ||
| 47 | * NOTE: Physical address must be converted to Local Bus address | ||
| 48 | * on OMAP-1510 only | ||
| 49 | */ | ||
| 50 | |||
| 51 | /* | ||
| 52 | * Bus address is physical address, except for OMAP-1510 Local Bus. | 46 | * Bus address is physical address, except for OMAP-1510 Local Bus. |
| 53 | */ | ||
| 54 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
| 55 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
| 56 | |||
| 57 | /* | ||
| 58 | * OMAP-1510 bus address is translated into a Local Bus address if the | 47 | * OMAP-1510 bus address is translated into a Local Bus address if the |
| 59 | * OMAP bus type is lbus. We do the address translation based on the | 48 | * OMAP bus type is lbus. We do the address translation based on the |
| 60 | * device overriding the defaults used in the dma-mapping API. | 49 | * device overriding the defaults used in the dma-mapping API. |
| @@ -74,16 +63,16 @@ | |||
| 74 | 63 | ||
| 75 | #define __arch_page_to_dma(dev, page) ({is_lbus_device(dev) ? \ | 64 | #define __arch_page_to_dma(dev, page) ({is_lbus_device(dev) ? \ |
| 76 | (dma_addr_t)virt_to_lbus(page_address(page)) : \ | 65 | (dma_addr_t)virt_to_lbus(page_address(page)) : \ |
| 77 | (dma_addr_t)__virt_to_bus(page_address(page));}) | 66 | (dma_addr_t)__virt_to_phys(page_address(page));}) |
| 78 | 67 | ||
| 79 | #define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \ | 68 | #define __arch_dma_to_virt(dev, addr) ({ (void *) (is_lbus_device(dev) ? \ |
| 80 | lbus_to_virt(addr) : \ | 69 | lbus_to_virt(addr) : \ |
| 81 | __bus_to_virt(addr)); }) | 70 | __phys_to_virt(addr)); }) |
| 82 | 71 | ||
| 83 | #define __arch_virt_to_dma(dev, addr) ({ unsigned long __addr = (unsigned long)(addr); \ | 72 | #define __arch_virt_to_dma(dev, addr) ({ unsigned long __addr = (unsigned long)(addr); \ |
| 84 | (dma_addr_t) (is_lbus_device(dev) ? \ | 73 | (dma_addr_t) (is_lbus_device(dev) ? \ |
| 85 | virt_to_lbus(__addr) : \ | 74 | virt_to_lbus(__addr) : \ |
| 86 | __virt_to_bus(__addr)); }) | 75 | __virt_to_phys(__addr)); }) |
| 87 | 76 | ||
| 88 | #endif /* CONFIG_ARCH_OMAP15XX */ | 77 | #endif /* CONFIG_ARCH_OMAP15XX */ |
| 89 | 78 | ||
diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/plat-omap/include/mach/pm.h index 768eb6e7abcf..2a9c27ad4c37 100644 --- a/arch/arm/plat-omap/include/mach/pm.h +++ b/arch/arm/plat-omap/include/mach/pm.h | |||
| @@ -128,7 +128,7 @@ void clk_deny_idle(struct clk *clk); | |||
| 128 | * clk_allow_idle - Counters previous clk_deny_idle | 128 | * clk_allow_idle - Counters previous clk_deny_idle |
| 129 | * @clk: clock signal handle | 129 | * @clk: clock signal handle |
| 130 | */ | 130 | */ |
| 131 | void clk_deny_idle(struct clk *clk); | 131 | void clk_allow_idle(struct clk *clk); |
| 132 | 132 | ||
| 133 | extern void omap_pm_idle(void); | 133 | extern void omap_pm_idle(void); |
| 134 | extern void omap_pm_suspend(void); | 134 | extern void omap_pm_suspend(void); |
diff --git a/arch/arm/plat-orion/include/plat/ehci-orion.h b/arch/arm/plat-orion/include/plat/ehci-orion.h index 64343051095a..4ec668e77460 100644 --- a/arch/arm/plat-orion/include/plat/ehci-orion.h +++ b/arch/arm/plat-orion/include/plat/ehci-orion.h | |||
| @@ -11,8 +11,16 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/mbus.h> | 12 | #include <linux/mbus.h> |
| 13 | 13 | ||
| 14 | enum orion_ehci_phy_ver { | ||
| 15 | EHCI_PHY_ORION, | ||
| 16 | EHCI_PHY_DD, | ||
| 17 | EHCI_PHY_KW, | ||
| 18 | EHCI_PHY_NA, | ||
| 19 | }; | ||
| 20 | |||
| 14 | struct orion_ehci_data { | 21 | struct orion_ehci_data { |
| 15 | struct mbus_dram_target_info *dram; | 22 | struct mbus_dram_target_info *dram; |
| 23 | enum orion_ehci_phy_ver phy_version; | ||
| 16 | }; | 24 | }; |
| 17 | 25 | ||
| 18 | 26 | ||
diff --git a/include/asm-arm/plat-s3c/iic.h b/arch/arm/plat-s3c/include/plat/iic.h index 5106acaa1d0e..5106acaa1d0e 100644 --- a/include/asm-arm/plat-s3c/iic.h +++ b/arch/arm/plat-s3c/include/plat/iic.h | |||
diff --git a/include/asm-arm/plat-s3c/nand.h b/arch/arm/plat-s3c/include/plat/nand.h index f4dcd14af059..f4dcd14af059 100644 --- a/include/asm-arm/plat-s3c/nand.h +++ b/arch/arm/plat-s3c/include/plat/nand.h | |||
diff --git a/include/asm-arm/plat-s3c/regs-ac97.h b/arch/arm/plat-s3c/include/plat/regs-ac97.h index c3878f7acb83..c3878f7acb83 100644 --- a/include/asm-arm/plat-s3c/regs-ac97.h +++ b/arch/arm/plat-s3c/include/plat/regs-ac97.h | |||
diff --git a/include/asm-arm/plat-s3c/regs-iic.h b/arch/arm/plat-s3c/include/plat/regs-iic.h index 2f7c17de8ac8..2f7c17de8ac8 100644 --- a/include/asm-arm/plat-s3c/regs-iic.h +++ b/arch/arm/plat-s3c/include/plat/regs-iic.h | |||
diff --git a/include/asm-arm/plat-s3c/regs-nand.h b/arch/arm/plat-s3c/include/plat/regs-nand.h index b2caa4bca270..b2caa4bca270 100644 --- a/include/asm-arm/plat-s3c/regs-nand.h +++ b/arch/arm/plat-s3c/include/plat/regs-nand.h | |||
diff --git a/include/asm-arm/plat-s3c/regs-rtc.h b/arch/arm/plat-s3c/include/plat/regs-rtc.h index d5837cf8e402..d5837cf8e402 100644 --- a/include/asm-arm/plat-s3c/regs-rtc.h +++ b/arch/arm/plat-s3c/include/plat/regs-rtc.h | |||
diff --git a/include/asm-arm/plat-s3c/regs-watchdog.h b/arch/arm/plat-s3c/include/plat/regs-watchdog.h index 4938492470f7..4938492470f7 100644 --- a/include/asm-arm/plat-s3c/regs-watchdog.h +++ b/arch/arm/plat-s3c/include/plat/regs-watchdog.h | |||
diff --git a/arch/arm/plat-s3c/include/plat/uncompress.h b/arch/arm/plat-s3c/include/plat/uncompress.h index 4df006b9cc10..8a8a927292e0 100644 --- a/arch/arm/plat-s3c/include/plat/uncompress.h +++ b/arch/arm/plat-s3c/include/plat/uncompress.h | |||
| @@ -28,7 +28,7 @@ static void arch_detect_cpu(void); | |||
| 28 | /* defines for UART registers */ | 28 | /* defines for UART registers */ |
| 29 | 29 | ||
| 30 | #include <plat/regs-serial.h> | 30 | #include <plat/regs-serial.h> |
| 31 | #include <asm/plat-s3c/regs-watchdog.h> | 31 | #include <plat/regs-watchdog.h> |
| 32 | 32 | ||
| 33 | /* working in physical space... */ | 33 | /* working in physical space... */ |
| 34 | #undef S3C2410_WDOGREG | 34 | #undef S3C2410_WDOGREG |
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index 3098736c65d9..3d4837021ac7 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include <mach/regs-gpio.h> | 38 | #include <mach/regs-gpio.h> |
| 39 | #include <mach/leds-gpio.h> | 39 | #include <mach/leds-gpio.h> |
| 40 | 40 | ||
| 41 | #include <asm/plat-s3c/nand.h> | 41 | #include <plat/nand.h> |
| 42 | 42 | ||
| 43 | #include <plat/common-smdk.h> | 43 | #include <plat/common-smdk.h> |
| 44 | #include <plat/devs.h> | 44 | #include <plat/devs.h> |
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index e93f8bf6d338..adf535aaf43a 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c | |||
| @@ -29,11 +29,11 @@ | |||
| 29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
| 30 | 30 | ||
| 31 | #include <plat/regs-serial.h> | 31 | #include <plat/regs-serial.h> |
| 32 | #include <asm/plat-s3c24xx/udc.h> | 32 | #include <plat/udc.h> |
| 33 | 33 | ||
| 34 | #include <plat/devs.h> | 34 | #include <plat/devs.h> |
| 35 | #include <plat/cpu.h> | 35 | #include <plat/cpu.h> |
| 36 | #include <asm/plat-s3c24xx/regs-spi.h> | 36 | #include <plat/regs-spi.h> |
| 37 | 37 | ||
| 38 | /* Serial port registrations */ | 38 | /* Serial port registrations */ |
| 39 | 39 | ||
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index 1baf941d1930..63bb22b973e3 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c | |||
| @@ -31,9 +31,8 @@ | |||
| 31 | #include <asm/system.h> | 31 | #include <asm/system.h> |
| 32 | #include <asm/irq.h> | 32 | #include <asm/irq.h> |
| 33 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
| 34 | #include <asm/dma.h> | 34 | #include <mach/dma.h> |
| 35 | 35 | ||
| 36 | #include <asm/mach/dma.h> | ||
| 37 | #include <mach/map.h> | 36 | #include <mach/map.h> |
| 38 | 37 | ||
| 39 | #include <plat/dma.h> | 38 | #include <plat/dma.h> |
| @@ -804,7 +803,7 @@ EXPORT_SYMBOL(s3c2410_dma_request); | |||
| 804 | * allowed to go through. | 803 | * allowed to go through. |
| 805 | */ | 804 | */ |
| 806 | 805 | ||
| 807 | int s3c2410_dma_free(dmach_t channel, struct s3c2410_dma_client *client) | 806 | int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client) |
| 808 | { | 807 | { |
| 809 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); | 808 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); |
| 810 | unsigned long flags; | 809 | unsigned long flags; |
| @@ -995,7 +994,7 @@ static int s3c2410_dma_started(struct s3c2410_dma_chan *chan) | |||
| 995 | } | 994 | } |
| 996 | 995 | ||
| 997 | int | 996 | int |
| 998 | s3c2410_dma_ctrl(dmach_t channel, enum s3c2410_chan_op op) | 997 | s3c2410_dma_ctrl(unsigned int channel, enum s3c2410_chan_op op) |
| 999 | { | 998 | { |
| 1000 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); | 999 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); |
| 1001 | 1000 | ||
| @@ -1043,7 +1042,7 @@ EXPORT_SYMBOL(s3c2410_dma_ctrl); | |||
| 1043 | * dcon: base value of the DCONx register | 1042 | * dcon: base value of the DCONx register |
| 1044 | */ | 1043 | */ |
| 1045 | 1044 | ||
| 1046 | int s3c2410_dma_config(dmach_t channel, | 1045 | int s3c2410_dma_config(unsigned int channel, |
| 1047 | int xferunit, | 1046 | int xferunit, |
| 1048 | int dcon) | 1047 | int dcon) |
| 1049 | { | 1048 | { |
| @@ -1092,7 +1091,7 @@ int s3c2410_dma_config(dmach_t channel, | |||
| 1092 | 1091 | ||
| 1093 | EXPORT_SYMBOL(s3c2410_dma_config); | 1092 | EXPORT_SYMBOL(s3c2410_dma_config); |
| 1094 | 1093 | ||
| 1095 | int s3c2410_dma_setflags(dmach_t channel, unsigned int flags) | 1094 | int s3c2410_dma_setflags(unsigned int channel, unsigned int flags) |
| 1096 | { | 1095 | { |
| 1097 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); | 1096 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); |
| 1098 | 1097 | ||
| @@ -1113,7 +1112,7 @@ EXPORT_SYMBOL(s3c2410_dma_setflags); | |||
| 1113 | * irq? | 1112 | * irq? |
| 1114 | */ | 1113 | */ |
| 1115 | 1114 | ||
| 1116 | int s3c2410_dma_set_opfn(dmach_t channel, s3c2410_dma_opfn_t rtn) | 1115 | int s3c2410_dma_set_opfn(unsigned int channel, s3c2410_dma_opfn_t rtn) |
| 1117 | { | 1116 | { |
| 1118 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); | 1117 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); |
| 1119 | 1118 | ||
| @@ -1129,7 +1128,7 @@ int s3c2410_dma_set_opfn(dmach_t channel, s3c2410_dma_opfn_t rtn) | |||
| 1129 | 1128 | ||
| 1130 | EXPORT_SYMBOL(s3c2410_dma_set_opfn); | 1129 | EXPORT_SYMBOL(s3c2410_dma_set_opfn); |
| 1131 | 1130 | ||
| 1132 | int s3c2410_dma_set_buffdone_fn(dmach_t channel, s3c2410_dma_cbfn_t rtn) | 1131 | int s3c2410_dma_set_buffdone_fn(unsigned int channel, s3c2410_dma_cbfn_t rtn) |
| 1133 | { | 1132 | { |
| 1134 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); | 1133 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); |
| 1135 | 1134 | ||
| @@ -1219,7 +1218,7 @@ EXPORT_SYMBOL(s3c2410_dma_devconfig); | |||
| 1219 | * returns the current transfer points for the dma source and destination | 1218 | * returns the current transfer points for the dma source and destination |
| 1220 | */ | 1219 | */ |
| 1221 | 1220 | ||
| 1222 | int s3c2410_dma_getposition(dmach_t channel, dma_addr_t *src, dma_addr_t *dst) | 1221 | int s3c2410_dma_getposition(unsigned int channel, dma_addr_t *src, dma_addr_t *dst) |
| 1223 | { | 1222 | { |
| 1224 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); | 1223 | struct s3c2410_dma_chan *chan = lookup_dma_channel(channel); |
| 1225 | 1224 | ||
diff --git a/include/asm-arm/plat-s3c24xx/mci.h b/arch/arm/plat-s3c24xx/include/plat/mci.h index 2d0852ac3b27..2d0852ac3b27 100644 --- a/include/asm-arm/plat-s3c24xx/mci.h +++ b/arch/arm/plat-s3c24xx/include/plat/mci.h | |||
diff --git a/include/asm-arm/plat-s3c24xx/regs-spi.h b/arch/arm/plat-s3c24xx/include/plat/regs-spi.h index 2b35479ee35c..2b35479ee35c 100644 --- a/include/asm-arm/plat-s3c24xx/regs-spi.h +++ b/arch/arm/plat-s3c24xx/include/plat/regs-spi.h | |||
diff --git a/include/asm-arm/plat-s3c24xx/regs-udc.h b/arch/arm/plat-s3c24xx/include/plat/regs-udc.h index f0dd4a41b37b..f0dd4a41b37b 100644 --- a/include/asm-arm/plat-s3c24xx/regs-udc.h +++ b/arch/arm/plat-s3c24xx/include/plat/regs-udc.h | |||
diff --git a/include/asm-arm/plat-s3c24xx/udc.h b/arch/arm/plat-s3c24xx/include/plat/udc.h index 546bb4008f49..546bb4008f49 100644 --- a/include/asm-arm/plat-s3c24xx/udc.h +++ b/arch/arm/plat-s3c24xx/include/plat/udc.h | |||
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 43aa2020f85c..fd23c0e9e698 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | # | 12 | # |
| 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new | 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new |
| 14 | # | 14 | # |
| 15 | # Last update: Thu Sep 25 10:10:50 2008 | 15 | # Last update: Sun Nov 30 16:39:36 2008 |
| 16 | # | 16 | # |
| 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number | 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number |
| 18 | # | 18 | # |
| @@ -1380,7 +1380,7 @@ holon MACH_HOLON HOLON 1377 | |||
| 1380 | olip8 MACH_OLIP8 OLIP8 1378 | 1380 | olip8 MACH_OLIP8 OLIP8 1378 |
| 1381 | ghi270hg MACH_GHI270HG GHI270HG 1379 | 1381 | ghi270hg MACH_GHI270HG GHI270HG 1379 |
| 1382 | davinci_dm6467_evm MACH_DAVINCI_DM6467_EVM DAVINCI_DM6467_EVM 1380 | 1382 | davinci_dm6467_evm MACH_DAVINCI_DM6467_EVM DAVINCI_DM6467_EVM 1380 |
| 1383 | davinci_dm355_evm MACH_DAVINCI_DM350_EVM DAVINCI_DM350_EVM 1381 | 1383 | davinci_dm355_evm MACH_DAVINCI_DM355_EVM DAVINCI_DM355_EVM 1381 |
| 1384 | blackriver MACH_BLACKRIVER BLACKRIVER 1383 | 1384 | blackriver MACH_BLACKRIVER BLACKRIVER 1383 |
| 1385 | sandgate_wp MACH_SANDGATEWP SANDGATEWP 1384 | 1385 | sandgate_wp MACH_SANDGATEWP SANDGATEWP 1384 |
| 1386 | cdotbwsg MACH_CDOTBWSG CDOTBWSG 1385 | 1386 | cdotbwsg MACH_CDOTBWSG CDOTBWSG 1385 |
| @@ -1771,7 +1771,7 @@ axs_ultrax MACH_AXS_ULTRAX AXS_ULTRAX 1779 | |||
| 1771 | at572d940deb MACH_AT572D940DEB AT572D940DEB 1780 | 1771 | at572d940deb MACH_AT572D940DEB AT572D940DEB 1780 |
| 1772 | davinci_da8xx_evm MACH_DAVINCI_DA8XX_EVM DAVINCI_DA8XX_EVM 1781 | 1772 | davinci_da8xx_evm MACH_DAVINCI_DA8XX_EVM DAVINCI_DA8XX_EVM 1781 |
| 1773 | ep9302 MACH_EP9302 EP9302 1782 | 1773 | ep9302 MACH_EP9302 EP9302 1782 |
| 1774 | at572d940hfeb MACH_AT572D940HFEB AT572D940HFEB 1783 | 1774 | at572d940hfek MACH_AT572D940HFEB AT572D940HFEB 1783 |
| 1775 | cybook3 MACH_CYBOOK3 CYBOOK3 1784 | 1775 | cybook3 MACH_CYBOOK3 CYBOOK3 1784 |
| 1776 | wdg002 MACH_WDG002 WDG002 1785 | 1776 | wdg002 MACH_WDG002 WDG002 1785 |
| 1777 | sg560adsl MACH_SG560ADSL SG560ADSL 1786 | 1777 | sg560adsl MACH_SG560ADSL SG560ADSL 1786 |
| @@ -1899,3 +1899,98 @@ rut100 MACH_RUT100 RUT100 1908 | |||
| 1899 | asusp535 MACH_ASUSP535 ASUSP535 1909 | 1899 | asusp535 MACH_ASUSP535 ASUSP535 1909 |
| 1900 | htcraphael MACH_HTCRAPHAEL HTCRAPHAEL 1910 | 1900 | htcraphael MACH_HTCRAPHAEL HTCRAPHAEL 1910 |
| 1901 | sygdg1 MACH_SYGDG1 SYGDG1 1911 | 1901 | sygdg1 MACH_SYGDG1 SYGDG1 1911 |
| 1902 | sygdg2 MACH_SYGDG2 SYGDG2 1912 | ||
| 1903 | seoul MACH_SEOUL SEOUL 1913 | ||
| 1904 | salerno MACH_SALERNO SALERNO 1914 | ||
| 1905 | ucn_s3c64xx MACH_UCN_S3C64XX UCN_S3C64XX 1915 | ||
| 1906 | msm7201a MACH_MSM7201A MSM7201A 1916 | ||
| 1907 | lpr1 MACH_LPR1 LPR1 1917 | ||
| 1908 | armadillo500fx MACH_ARMADILLO500FX ARMADILLO500FX 1918 | ||
| 1909 | g3evm MACH_G3EVM G3EVM 1919 | ||
| 1910 | z3_dm355 MACH_Z3_DM355 Z3_DM355 1920 | ||
| 1911 | w90p910evb MACH_W90P910EVB W90P910EVB 1921 | ||
| 1912 | w90p920evb MACH_W90P920EVB W90P920EVB 1922 | ||
| 1913 | w90p950evb MACH_W90P950EVB W90P950EVB 1923 | ||
| 1914 | w90n960evb MACH_W90N960EVB W90N960EVB 1924 | ||
| 1915 | camhd MACH_CAMHD CAMHD 1925 | ||
| 1916 | mvc100 MACH_MVC100 MVC100 1926 | ||
| 1917 | electrum_200 MACH_ELECTRUM_200 ELECTRUM_200 1927 | ||
| 1918 | htcjade MACH_HTCJADE HTCJADE 1928 | ||
| 1919 | memphis MACH_MEMPHIS MEMPHIS 1929 | ||
| 1920 | imx27sbc MACH_IMX27SBC IMX27SBC 1930 | ||
| 1921 | lextar MACH_LEXTAR LEXTAR 1931 | ||
| 1922 | mv88f6281gtw_ge MACH_MV88F6281GTW_GE MV88F6281GTW_GE 1932 | ||
| 1923 | ncp MACH_NCP NCP 1933 | ||
| 1924 | z32an_series MACH_Z32AN Z32AN 1934 | ||
| 1925 | tmq_capd MACH_TMQ_CAPD TMQ_CAPD 1935 | ||
| 1926 | omap3_wl MACH_OMAP3_WL OMAP3_WL 1936 | ||
| 1927 | chumby MACH_CHUMBY CHUMBY 1937 | ||
| 1928 | atsarm9 MACH_ATSARM9 ATSARM9 1938 | ||
| 1929 | davinci_dm365_evm MACH_DAVINCI_DM365_EVM DAVINCI_DM365_EVM 1939 | ||
| 1930 | bahamas MACH_BAHAMAS BAHAMAS 1940 | ||
| 1931 | das MACH_DAS DAS 1941 | ||
| 1932 | minidas MACH_MINIDAS MINIDAS 1942 | ||
| 1933 | vk1000 MACH_VK1000 VK1000 1943 | ||
| 1934 | centro MACH_CENTRO CENTRO 1944 | ||
| 1935 | ctera_2bay MACH_CTERA_2BAY CTERA_2BAY 1945 | ||
| 1936 | edgeconnect MACH_EDGECONNECT EDGECONNECT 1946 | ||
| 1937 | nd27000 MACH_ND27000 ND27000 1947 | ||
| 1938 | cobra MACH_GEMALTO_COBRA GEMALTO_COBRA 1948 | ||
| 1939 | ingelabs_comet MACH_INGELABS_COMET INGELABS_COMET 1949 | ||
| 1940 | pollux_wiz MACH_POLLUX_WIZ POLLUX_WIZ 1950 | ||
| 1941 | blackstone MACH_BLACKSTONE BLACKSTONE 1951 | ||
| 1942 | topaz MACH_TOPAZ TOPAZ 1952 | ||
| 1943 | aixle MACH_AIXLE AIXLE 1953 | ||
| 1944 | mw998 MACH_MW998 MW998 1954 | ||
| 1945 | nokia_rx51 MACH_NOKIA_RX51 NOKIA_RX51 1955 | ||
| 1946 | vsc5605ev MACH_VSC5605EV VSC5605EV 1956 | ||
| 1947 | nt98700dk MACH_NT98700DK NT98700DK 1957 | ||
| 1948 | icontact MACH_ICONTACT ICONTACT 1958 | ||
| 1949 | swarco_frcpu MACH_SWARCO_FRCPU SWARCO_FRCPU 1959 | ||
| 1950 | swarco_scpu MACH_SWARCO_SCPU SWARCO_SCPU 1960 | ||
| 1951 | bbox_p16 MACH_BBOX_P16 BBOX_P16 1961 | ||
| 1952 | bstd MACH_BSTD BSTD 1962 | ||
| 1953 | sbc2440ii MACH_SBC2440II SBC2440II 1963 | ||
| 1954 | pcm034 MACH_PCM034 PCM034 1964 | ||
| 1955 | neso MACH_NESO NESO 1965 | ||
| 1956 | wlnx_9g20 MACH_WLNX_9G20 WLNX_9G20 1966 | ||
| 1957 | omap_zoom2 MACH_OMAP_ZOOM2 OMAP_ZOOM2 1967 | ||
| 1958 | totemnova MACH_TOTEMNOVA TOTEMNOVA 1968 | ||
| 1959 | c5000 MACH_C5000 C5000 1969 | ||
| 1960 | unipo_at91sam9263 MACH_UNIPO_AT91SAM9263 UNIPO_AT91SAM9263 1970 | ||
| 1961 | ethernut5 MACH_ETHERNUT5 ETHERNUT5 1971 | ||
| 1962 | arm11 MACH_ARM11 ARM11 1972 | ||
| 1963 | cpuat9260 MACH_CPUAT9260 CPUAT9260 1973 | ||
| 1964 | cpupxa255 MACH_CPUPXA255 CPUPXA255 1974 | ||
| 1965 | cpuimx27 MACH_CPUIMX27 CPUIMX27 1975 | ||
| 1966 | cheflux MACH_CHEFLUX CHEFLUX 1976 | ||
| 1967 | eb_cpux9k2 MACH_EB_CPUX9K2 EB_CPUX9K2 1977 | ||
| 1968 | opcotec MACH_OPCOTEC OPCOTEC 1978 | ||
| 1969 | yt MACH_YT YT 1979 | ||
| 1970 | motoq MACH_MOTOQ MOTOQ 1980 | ||
| 1971 | bsb1 MACH_BSB1 BSB1 1981 | ||
| 1972 | acs5k MACH_ACS5K ACS5K 1982 | ||
| 1973 | milan MACH_MILAN MILAN 1983 | ||
| 1974 | quartzv2 MACH_QUARTZV2 QUARTZV2 1984 | ||
| 1975 | rsvp MACH_RSVP RSVP 1985 | ||
| 1976 | rmp200 MACH_RMP200 RMP200 1986 | ||
| 1977 | snapper_9260 MACH_SNAPPER_9260 SNAPPER_9260 1987 | ||
| 1978 | dsm320 MACH_DSM320 DSM320 1988 | ||
| 1979 | adsgcm MACH_ADSGCM ADSGCM 1989 | ||
| 1980 | ase2_400 MACH_ASE2_400 ASE2_400 1990 | ||
| 1981 | pizza MACH_PIZZA PIZZA 1991 | ||
| 1982 | spot_ngpl MACH_SPOT_NGPL SPOT_NGPL 1992 | ||
| 1983 | armata MACH_ARMATA ARMATA 1993 | ||
| 1984 | exeda MACH_EXEDA EXEDA 1994 | ||
| 1985 | mx31sf005 MACH_MX31SF005 MX31SF005 1995 | ||
| 1986 | f5d8231_4_v2 MACH_F5D8231_4_V2 F5D8231_4_V2 1996 | ||
| 1987 | q2440 MACH_Q2440 Q2440 1997 | ||
| 1988 | qq2440 MACH_QQ2440 QQ2440 1998 | ||
| 1989 | mini2440 MACH_MINI2440 MINI2440 1999 | ||
| 1990 | colibri300 MACH_COLIBRI300 COLIBRI300 2000 | ||
| 1991 | jades MACH_JADES JADES 2001 | ||
| 1992 | spark MACH_SPARK SPARK 2002 | ||
| 1993 | benzina MACH_BENZINA BENZINA 2003 | ||
| 1994 | blaze MACH_BLAZE BLAZE 2004 | ||
| 1995 | linkstation_ls_hgl MACH_LINKSTATION_LS_HGL LINKSTATION_LS_HGL 2005 | ||
| 1996 | htcvenus MACH_HTCVENUS HTCVENUS 2006 | ||
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S index a62dcf7098ba..3c73aafe3e01 100644 --- a/arch/arm/vfp/vfphw.S +++ b/arch/arm/vfp/vfphw.S | |||
| @@ -101,9 +101,12 @@ ENTRY(vfp_support_entry) | |||
| 101 | VFPFSTMIA r4, r5 @ save the working registers | 101 | VFPFSTMIA r4, r5 @ save the working registers |
| 102 | VFPFMRX r5, FPSCR @ current status | 102 | VFPFMRX r5, FPSCR @ current status |
| 103 | tst r1, #FPEXC_EX @ is there additional state to save? | 103 | tst r1, #FPEXC_EX @ is there additional state to save? |
| 104 | VFPFMRX r6, FPINST, NE @ FPINST (only if FPEXC.EX is set) | 104 | beq 1f |
| 105 | tstne r1, #FPEXC_FP2V @ is there an FPINST2 to read? | 105 | VFPFMRX r6, FPINST @ FPINST (only if FPEXC.EX is set) |
| 106 | VFPFMRX r8, FPINST2, NE @ FPINST2 if needed (and present) | 106 | tst r1, #FPEXC_FP2V @ is there an FPINST2 to read? |
| 107 | beq 1f | ||
| 108 | VFPFMRX r8, FPINST2 @ FPINST2 if needed (and present) | ||
| 109 | 1: | ||
| 107 | stmia r4, {r1, r5, r6, r8} @ save FPEXC, FPSCR, FPINST, FPINST2 | 110 | stmia r4, {r1, r5, r6, r8} @ save FPEXC, FPSCR, FPINST, FPINST2 |
| 108 | @ and point r4 at the word at the | 111 | @ and point r4 at the word at the |
| 109 | @ start of the register dump | 112 | @ start of the register dump |
| @@ -117,9 +120,12 @@ no_old_VFP_process: | |||
| 117 | @ FPEXC is in a safe state | 120 | @ FPEXC is in a safe state |
| 118 | ldmia r10, {r1, r5, r6, r8} @ load FPEXC, FPSCR, FPINST, FPINST2 | 121 | ldmia r10, {r1, r5, r6, r8} @ load FPEXC, FPSCR, FPINST, FPINST2 |
| 119 | tst r1, #FPEXC_EX @ is there additional state to restore? | 122 | tst r1, #FPEXC_EX @ is there additional state to restore? |
| 120 | VFPFMXR FPINST, r6, NE @ restore FPINST (only if FPEXC.EX is set) | 123 | beq 1f |
| 121 | tstne r1, #FPEXC_FP2V @ is there an FPINST2 to write? | 124 | VFPFMXR FPINST, r6 @ restore FPINST (only if FPEXC.EX is set) |
| 122 | VFPFMXR FPINST2, r8, NE @ FPINST2 if needed (and present) | 125 | tst r1, #FPEXC_FP2V @ is there an FPINST2 to write? |
| 126 | beq 1f | ||
| 127 | VFPFMXR FPINST2, r8 @ FPINST2 if needed (and present) | ||
| 128 | 1: | ||
| 123 | VFPFMXR FPSCR, r5 @ restore status | 129 | VFPFMXR FPSCR, r5 @ restore status |
| 124 | 130 | ||
| 125 | check_for_exception: | 131 | check_for_exception: |
| @@ -175,9 +181,12 @@ ENTRY(vfp_save_state) | |||
| 175 | VFPFSTMIA r0, r2 @ save the working registers | 181 | VFPFSTMIA r0, r2 @ save the working registers |
| 176 | VFPFMRX r2, FPSCR @ current status | 182 | VFPFMRX r2, FPSCR @ current status |
| 177 | tst r1, #FPEXC_EX @ is there additional state to save? | 183 | tst r1, #FPEXC_EX @ is there additional state to save? |
| 178 | VFPFMRX r3, FPINST, NE @ FPINST (only if FPEXC.EX is set) | 184 | beq 1f |
| 179 | tstne r1, #FPEXC_FP2V @ is there an FPINST2 to read? | 185 | VFPFMRX r3, FPINST @ FPINST (only if FPEXC.EX is set) |
| 180 | VFPFMRX r12, FPINST2, NE @ FPINST2 if needed (and present) | 186 | tst r1, #FPEXC_FP2V @ is there an FPINST2 to read? |
| 187 | beq 1f | ||
| 188 | VFPFMRX r12, FPINST2 @ FPINST2 if needed (and present) | ||
| 189 | 1: | ||
| 181 | stmia r0, {r1, r2, r3, r12} @ save FPEXC, FPSCR, FPINST, FPINST2 | 190 | stmia r0, {r1, r2, r3, r12} @ save FPEXC, FPSCR, FPINST, FPINST2 |
| 182 | mov pc, lr | 191 | mov pc, lr |
| 183 | ENDPROC(vfp_save_state) | 192 | ENDPROC(vfp_save_state) |
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index c0d2c9bb952b..67ca340a7c85 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c | |||
| @@ -371,6 +371,15 @@ static int __init vfp_init(void) | |||
| 371 | * in place; report VFP support to userspace. | 371 | * in place; report VFP support to userspace. |
| 372 | */ | 372 | */ |
| 373 | elf_hwcap |= HWCAP_VFP; | 373 | elf_hwcap |= HWCAP_VFP; |
| 374 | #ifdef CONFIG_NEON | ||
| 375 | /* | ||
| 376 | * Check for the presence of the Advanced SIMD | ||
| 377 | * load/store instructions, integer and single | ||
| 378 | * precision floating point operations. | ||
| 379 | */ | ||
| 380 | if ((fmrx(MVFR1) & 0x000fff00) == 0x00011100) | ||
| 381 | elf_hwcap |= HWCAP_NEON; | ||
| 382 | #endif | ||
| 374 | } | 383 | } |
| 375 | return 0; | 384 | return 0; |
| 376 | } | 385 | } |
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c index 49b2cf2c38f3..baadc97f8627 100644 --- a/arch/frv/kernel/sys_frv.c +++ b/arch/frv/kernel/sys_frv.c | |||
| @@ -35,22 +35,21 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | |||
| 35 | int error = -EBADF; | 35 | int error = -EBADF; |
| 36 | struct file * file = NULL; | 36 | struct file * file = NULL; |
| 37 | 37 | ||
| 38 | flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); | ||
| 39 | if (!(flags & MAP_ANONYMOUS)) { | ||
| 40 | file = fget(fd); | ||
| 41 | if (!file) | ||
| 42 | goto out; | ||
| 43 | } | ||
| 44 | |||
| 45 | /* As with sparc32, make sure the shift for mmap2 is constant | 38 | /* As with sparc32, make sure the shift for mmap2 is constant |
| 46 | (12), no matter what PAGE_SIZE we have.... */ | 39 | (12), no matter what PAGE_SIZE we have.... */ |
| 47 | 40 | ||
| 48 | /* But unlike sparc32, don't just silently break if we're | 41 | /* But unlike sparc32, don't just silently break if we're |
| 49 | trying to map something we can't */ | 42 | trying to map something we can't */ |
| 50 | if (pgoff & ((1<<(PAGE_SHIFT-12))-1)) | 43 | if (pgoff & ((1 << (PAGE_SHIFT - 12)) - 1)) |
| 51 | return -EINVAL; | 44 | return -EINVAL; |
| 45 | pgoff >>= PAGE_SHIFT - 12; | ||
| 52 | 46 | ||
| 53 | pgoff >>= (PAGE_SHIFT - 12); | 47 | flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); |
| 48 | if (!(flags & MAP_ANONYMOUS)) { | ||
| 49 | file = fget(fd); | ||
| 50 | if (!file) | ||
| 51 | goto out; | ||
| 52 | } | ||
| 54 | 53 | ||
| 55 | down_write(¤t->mm->mmap_sem); | 54 | down_write(¤t->mm->mmap_sem); |
| 56 | error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); | 55 | error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); |
diff --git a/arch/ia64/include/asm/ptrace.h b/arch/ia64/include/asm/ptrace.h index 6417c1ecb44e..14055c636adf 100644 --- a/arch/ia64/include/asm/ptrace.h +++ b/arch/ia64/include/asm/ptrace.h | |||
| @@ -325,8 +325,6 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs) | |||
| 325 | #define arch_has_block_step() (1) | 325 | #define arch_has_block_step() (1) |
| 326 | extern void user_enable_block_step(struct task_struct *); | 326 | extern void user_enable_block_step(struct task_struct *); |
| 327 | 327 | ||
| 328 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
| 329 | |||
| 330 | #endif /* !__KERNEL__ */ | 328 | #endif /* !__KERNEL__ */ |
| 331 | 329 | ||
| 332 | /* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */ | 330 | /* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */ |
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index c3aa851d1ca6..4e1801bad83a 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c | |||
| @@ -292,7 +292,7 @@ EXPORT_SYMBOL(sn_io_slot_fixup); | |||
| 292 | * sn_pci_controller_fixup() - This routine sets up a bus's resources | 292 | * sn_pci_controller_fixup() - This routine sets up a bus's resources |
| 293 | * consistent with the Linux PCI abstraction layer. | 293 | * consistent with the Linux PCI abstraction layer. |
| 294 | */ | 294 | */ |
| 295 | static void | 295 | static void __init |
| 296 | sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) | 296 | sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) |
| 297 | { | 297 | { |
| 298 | s64 status = 0; | 298 | s64 status = 0; |
diff --git a/arch/m32r/kernel/head.S b/arch/m32r/kernel/head.S index 40180778a5c7..90916067b9c1 100644 --- a/arch/m32r/kernel/head.S +++ b/arch/m32r/kernel/head.S | |||
| @@ -23,7 +23,7 @@ __INITDATA | |||
| 23 | /* | 23 | /* |
| 24 | * References to members of the boot_cpu_data structure. | 24 | * References to members of the boot_cpu_data structure. |
| 25 | */ | 25 | */ |
| 26 | .text | 26 | .section .text.head, "ax" |
| 27 | .global start_kernel | 27 | .global start_kernel |
| 28 | .global __bss_start | 28 | .global __bss_start |
| 29 | .global _end | 29 | .global _end |
| @@ -133,7 +133,6 @@ loop1: | |||
| 133 | /* | 133 | /* |
| 134 | * AP startup routine | 134 | * AP startup routine |
| 135 | */ | 135 | */ |
| 136 | .text | ||
| 137 | .global eit_vector | 136 | .global eit_vector |
| 138 | ENTRY(startup_AP) | 137 | ENTRY(startup_AP) |
| 139 | ;; setup EVB | 138 | ;; setup EVB |
| @@ -230,6 +229,7 @@ ENTRY(startup_AP) | |||
| 230 | nop | 229 | nop |
| 231 | #endif /* CONFIG_SMP */ | 230 | #endif /* CONFIG_SMP */ |
| 232 | 231 | ||
| 232 | .text | ||
| 233 | ENTRY(stack_start) | 233 | ENTRY(stack_start) |
| 234 | .long init_thread_union+8192 | 234 | .long init_thread_union+8192 |
| 235 | .long __KERNEL_DS | 235 | .long __KERNEL_DS |
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index 15a6f36c06db..9db05df20c0e 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S | |||
| @@ -27,6 +27,7 @@ SECTIONS | |||
| 27 | _text = .; /* Text and read-only data */ | 27 | _text = .; /* Text and read-only data */ |
| 28 | .boot : { *(.boot) } = 0 | 28 | .boot : { *(.boot) } = 0 |
| 29 | .text : { | 29 | .text : { |
| 30 | *(.text.head) | ||
| 30 | TEXT_TEXT | 31 | TEXT_TEXT |
| 31 | SCHED_TEXT | 32 | SCHED_TEXT |
| 32 | LOCK_TEXT | 33 | LOCK_TEXT |
diff --git a/arch/mips/include/asm/bug.h b/arch/mips/include/asm/bug.h index 7eb63de808bc..08ea46863fe5 100644 --- a/arch/mips/include/asm/bug.h +++ b/arch/mips/include/asm/bug.h | |||
| @@ -7,20 +7,31 @@ | |||
| 7 | 7 | ||
| 8 | #include <asm/break.h> | 8 | #include <asm/break.h> |
| 9 | 9 | ||
| 10 | #define BUG() \ | 10 | static inline void __noreturn BUG(void) |
| 11 | do { \ | 11 | { |
| 12 | __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \ | 12 | __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); |
| 13 | } while (0) | 13 | /* Fool GCC into thinking the function doesn't return. */ |
| 14 | while (1) | ||
| 15 | ; | ||
| 16 | } | ||
| 14 | 17 | ||
| 15 | #define HAVE_ARCH_BUG | 18 | #define HAVE_ARCH_BUG |
| 16 | 19 | ||
| 17 | #if (_MIPS_ISA > _MIPS_ISA_MIPS1) | 20 | #if (_MIPS_ISA > _MIPS_ISA_MIPS1) |
| 18 | 21 | ||
| 19 | #define BUG_ON(condition) \ | 22 | static inline void __BUG_ON(unsigned long condition) |
| 20 | do { \ | 23 | { |
| 21 | __asm__ __volatile__("tne $0, %0, %1" \ | 24 | if (__builtin_constant_p(condition)) { |
| 22 | : : "r" (condition), "i" (BRK_BUG)); \ | 25 | if (condition) |
| 23 | } while (0) | 26 | BUG(); |
| 27 | else | ||
| 28 | return; | ||
| 29 | } | ||
| 30 | __asm__ __volatile__("tne $0, %0, %1" | ||
| 31 | : : "r" (condition), "i" (BRK_BUG)); | ||
| 32 | } | ||
| 33 | |||
| 34 | #define BUG_ON(C) __BUG_ON((unsigned long)(C)) | ||
| 24 | 35 | ||
| 25 | #define HAVE_ARCH_BUG_ON | 36 | #define HAVE_ARCH_BUG_ON |
| 26 | 37 | ||
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h index 813abd16255d..c2c8bac43307 100644 --- a/arch/mips/include/asm/ptrace.h +++ b/arch/mips/include/asm/ptrace.h | |||
| @@ -9,10 +9,6 @@ | |||
| 9 | #ifndef _ASM_PTRACE_H | 9 | #ifndef _ASM_PTRACE_H |
| 10 | #define _ASM_PTRACE_H | 10 | #define _ASM_PTRACE_H |
| 11 | 11 | ||
| 12 | #ifdef CONFIG_64BIT | ||
| 13 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
| 14 | #endif | ||
| 15 | |||
| 16 | /* 0 - 31 are integer registers, 32 - 63 are fp registers. */ | 12 | /* 0 - 31 are integer registers, 32 - 63 are fp registers. */ |
| 17 | #define FPR_BASE 32 | 13 | #define FPR_BASE 32 |
| 18 | #define PC 64 | 14 | #define PC 64 |
diff --git a/arch/mn10300/kernel/gdb-stub.c b/arch/mn10300/kernel/gdb-stub.c index 54be6afb5555..0ea7482c1522 100644 --- a/arch/mn10300/kernel/gdb-stub.c +++ b/arch/mn10300/kernel/gdb-stub.c | |||
| @@ -522,17 +522,7 @@ static int gdbstub_single_step(struct pt_regs *regs) | |||
| 522 | } else { | 522 | } else { |
| 523 | switch (cur) { | 523 | switch (cur) { |
| 524 | /* Bxx (d8,PC) */ | 524 | /* Bxx (d8,PC) */ |
| 525 | case 0xc0: | 525 | case 0xc0 ... 0xca: |
| 526 | case 0xc1: | ||
| 527 | case 0xc2: | ||
| 528 | case 0xc3: | ||
| 529 | case 0xc4: | ||
| 530 | case 0xc5: | ||
| 531 | case 0xc6: | ||
| 532 | case 0xc7: | ||
| 533 | case 0xc8: | ||
| 534 | case 0xc9: | ||
| 535 | case 0xca: | ||
| 536 | if (gdbstub_read_byte(pc + 1, (u8 *) &x) < 0) | 526 | if (gdbstub_read_byte(pc + 1, (u8 *) &x) < 0) |
| 537 | goto fault; | 527 | goto fault; |
| 538 | if (!__gdbstub_mark_bp(pc + 2, 0)) | 528 | if (!__gdbstub_mark_bp(pc + 2, 0)) |
| @@ -543,17 +533,7 @@ static int gdbstub_single_step(struct pt_regs *regs) | |||
| 543 | break; | 533 | break; |
| 544 | 534 | ||
| 545 | /* LXX (d8,PC) */ | 535 | /* LXX (d8,PC) */ |
| 546 | case 0xd0: | 536 | case 0xd0 ... 0xda: |
| 547 | case 0xd1: | ||
| 548 | case 0xd2: | ||
| 549 | case 0xd3: | ||
| 550 | case 0xd4: | ||
| 551 | case 0xd5: | ||
| 552 | case 0xd6: | ||
| 553 | case 0xd7: | ||
| 554 | case 0xd8: | ||
| 555 | case 0xd9: | ||
| 556 | case 0xda: | ||
| 557 | if (!__gdbstub_mark_bp(pc + 1, 0)) | 537 | if (!__gdbstub_mark_bp(pc + 1, 0)) |
| 558 | goto fault; | 538 | goto fault; |
| 559 | if (regs->pc != regs->lar && | 539 | if (regs->pc != regs->lar && |
diff --git a/arch/parisc/include/asm/parisc-device.h b/arch/parisc/include/asm/parisc-device.h index 7aa13f2add7a..9afdad6c2ffb 100644 --- a/arch/parisc/include/asm/parisc-device.h +++ b/arch/parisc/include/asm/parisc-device.h | |||
| @@ -42,9 +42,9 @@ struct parisc_driver { | |||
| 42 | #define to_parisc_driver(d) container_of(d, struct parisc_driver, drv) | 42 | #define to_parisc_driver(d) container_of(d, struct parisc_driver, drv) |
| 43 | #define parisc_parent(d) to_parisc_device(d->dev.parent) | 43 | #define parisc_parent(d) to_parisc_device(d->dev.parent) |
| 44 | 44 | ||
| 45 | static inline char *parisc_pathname(struct parisc_device *d) | 45 | static inline const char *parisc_pathname(struct parisc_device *d) |
| 46 | { | 46 | { |
| 47 | return d->dev.bus_id; | 47 | return dev_name(&d->dev); |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | static inline void | 50 | static inline void |
diff --git a/arch/parisc/include/asm/posix_types.h b/arch/parisc/include/asm/posix_types.h index bb725a6630bb..00da29a340ba 100644 --- a/arch/parisc/include/asm/posix_types.h +++ b/arch/parisc/include/asm/posix_types.h | |||
| @@ -24,13 +24,12 @@ typedef int __kernel_daddr_t; | |||
| 24 | typedef unsigned long __kernel_size_t; | 24 | typedef unsigned long __kernel_size_t; |
| 25 | typedef long __kernel_ssize_t; | 25 | typedef long __kernel_ssize_t; |
| 26 | typedef long __kernel_ptrdiff_t; | 26 | typedef long __kernel_ptrdiff_t; |
| 27 | typedef long __kernel_time_t; | ||
| 28 | #else | 27 | #else |
| 29 | typedef unsigned int __kernel_size_t; | 28 | typedef unsigned int __kernel_size_t; |
| 30 | typedef int __kernel_ssize_t; | 29 | typedef int __kernel_ssize_t; |
| 31 | typedef int __kernel_ptrdiff_t; | 30 | typedef int __kernel_ptrdiff_t; |
| 32 | typedef long __kernel_time_t; | ||
| 33 | #endif | 31 | #endif |
| 32 | typedef long __kernel_time_t; | ||
| 34 | typedef char * __kernel_caddr_t; | 33 | typedef char * __kernel_caddr_t; |
| 35 | 34 | ||
| 36 | typedef unsigned short __kernel_uid16_t; | 35 | typedef unsigned short __kernel_uid16_t; |
diff --git a/arch/parisc/include/asm/ptrace.h b/arch/parisc/include/asm/ptrace.h index afa5333187b4..302f68dc889c 100644 --- a/arch/parisc/include/asm/ptrace.h +++ b/arch/parisc/include/asm/ptrace.h | |||
| @@ -47,8 +47,6 @@ struct pt_regs { | |||
| 47 | 47 | ||
| 48 | #define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS)) | 48 | #define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS)) |
| 49 | 49 | ||
| 50 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
| 51 | |||
| 52 | struct task_struct; | 50 | struct task_struct; |
| 53 | #define arch_has_single_step() 1 | 51 | #define arch_has_single_step() 1 |
| 54 | void user_disable_single_step(struct task_struct *task); | 52 | void user_disable_single_step(struct task_struct *task); |
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index 2ca654bd6322..884b7ce16a3b 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c | |||
| @@ -43,7 +43,7 @@ struct hppa_dma_ops *hppa_dma_ops __read_mostly; | |||
| 43 | EXPORT_SYMBOL(hppa_dma_ops); | 43 | EXPORT_SYMBOL(hppa_dma_ops); |
| 44 | 44 | ||
| 45 | static struct device root = { | 45 | static struct device root = { |
| 46 | .bus_id = "parisc", | 46 | .init_name = "parisc", |
| 47 | }; | 47 | }; |
| 48 | 48 | ||
| 49 | static inline int check_dev(struct device *dev) | 49 | static inline int check_dev(struct device *dev) |
| @@ -393,7 +393,8 @@ EXPORT_SYMBOL(print_pci_hwpath); | |||
| 393 | static void setup_bus_id(struct parisc_device *padev) | 393 | static void setup_bus_id(struct parisc_device *padev) |
| 394 | { | 394 | { |
| 395 | struct hardware_path path; | 395 | struct hardware_path path; |
| 396 | char *output = padev->dev.bus_id; | 396 | char name[20]; |
| 397 | char *output = name; | ||
| 397 | int i; | 398 | int i; |
| 398 | 399 | ||
| 399 | get_node_path(padev->dev.parent, &path); | 400 | get_node_path(padev->dev.parent, &path); |
| @@ -404,6 +405,7 @@ static void setup_bus_id(struct parisc_device *padev) | |||
| 404 | output += sprintf(output, "%u:", (unsigned char) path.bc[i]); | 405 | output += sprintf(output, "%u:", (unsigned char) path.bc[i]); |
| 405 | } | 406 | } |
| 406 | sprintf(output, "%u", (unsigned char) padev->hw_path); | 407 | sprintf(output, "%u", (unsigned char) padev->hw_path); |
| 408 | dev_set_name(&padev->dev, name); | ||
| 407 | } | 409 | } |
| 408 | 410 | ||
| 409 | struct parisc_device * create_tree_node(char id, struct device *parent) | 411 | struct parisc_device * create_tree_node(char id, struct device *parent) |
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 675f1d098f05..4c771cd580ec 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/console.h> | 26 | #include <linux/console.h> |
| 27 | #include <linux/kallsyms.h> | ||
| 28 | #include <linux/bug.h> | 27 | #include <linux/bug.h> |
| 29 | 28 | ||
| 30 | #include <asm/assembly.h> | 29 | #include <asm/assembly.h> |
| @@ -51,7 +50,7 @@ | |||
| 51 | DEFINE_SPINLOCK(pa_dbit_lock); | 50 | DEFINE_SPINLOCK(pa_dbit_lock); |
| 52 | #endif | 51 | #endif |
| 53 | 52 | ||
| 54 | void parisc_show_stack(struct task_struct *t, unsigned long *sp, | 53 | static void parisc_show_stack(struct task_struct *task, unsigned long *sp, |
| 55 | struct pt_regs *regs); | 54 | struct pt_regs *regs); |
| 56 | 55 | ||
| 57 | static int printbinary(char *buf, unsigned long x, int nbits) | 56 | static int printbinary(char *buf, unsigned long x, int nbits) |
| @@ -121,18 +120,19 @@ static void print_fr(char *level, struct pt_regs *regs) | |||
| 121 | 120 | ||
| 122 | void show_regs(struct pt_regs *regs) | 121 | void show_regs(struct pt_regs *regs) |
| 123 | { | 122 | { |
| 124 | int i; | 123 | int i, user; |
| 125 | char *level; | 124 | char *level; |
| 126 | unsigned long cr30, cr31; | 125 | unsigned long cr30, cr31; |
| 127 | 126 | ||
| 128 | level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT; | 127 | user = user_mode(regs); |
| 128 | level = user ? KERN_DEBUG : KERN_CRIT; | ||
| 129 | 129 | ||
| 130 | print_gr(level, regs); | 130 | print_gr(level, regs); |
| 131 | 131 | ||
| 132 | for (i = 0; i < 8; i += 4) | 132 | for (i = 0; i < 8; i += 4) |
| 133 | PRINTREGS(level, regs->sr, "sr", RFMT, i); | 133 | PRINTREGS(level, regs->sr, "sr", RFMT, i); |
| 134 | 134 | ||
| 135 | if (user_mode(regs)) | 135 | if (user) |
| 136 | print_fr(level, regs); | 136 | print_fr(level, regs); |
| 137 | 137 | ||
| 138 | cr30 = mfctl(30); | 138 | cr30 = mfctl(30); |
| @@ -145,14 +145,18 @@ void show_regs(struct pt_regs *regs) | |||
| 145 | printk("%s CPU: %8d CR30: " RFMT " CR31: " RFMT "\n", | 145 | printk("%s CPU: %8d CR30: " RFMT " CR31: " RFMT "\n", |
| 146 | level, current_thread_info()->cpu, cr30, cr31); | 146 | level, current_thread_info()->cpu, cr30, cr31); |
| 147 | printk("%s ORIG_R28: " RFMT "\n", level, regs->orig_r28); | 147 | printk("%s ORIG_R28: " RFMT "\n", level, regs->orig_r28); |
| 148 | printk(level); | 148 | |
| 149 | print_symbol(" IAOQ[0]: %s\n", regs->iaoq[0]); | 149 | if (user) { |
| 150 | printk(level); | 150 | printk("%s IAOQ[0]: " RFMT "\n", level, regs->iaoq[0]); |
| 151 | print_symbol(" IAOQ[1]: %s\n", regs->iaoq[1]); | 151 | printk("%s IAOQ[1]: " RFMT "\n", level, regs->iaoq[1]); |
| 152 | printk(level); | 152 | printk("%s RP(r2): " RFMT "\n", level, regs->gr[2]); |
| 153 | print_symbol(" RP(r2): %s\n", regs->gr[2]); | 153 | } else { |
| 154 | 154 | printk("%s IAOQ[0]: %pS\n", level, (void *) regs->iaoq[0]); | |
| 155 | parisc_show_stack(current, NULL, regs); | 155 | printk("%s IAOQ[1]: %pS\n", level, (void *) regs->iaoq[1]); |
| 156 | printk("%s RP(r2): %pS\n", level, (void *) regs->gr[2]); | ||
| 157 | |||
| 158 | parisc_show_stack(current, NULL, regs); | ||
| 159 | } | ||
| 156 | } | 160 | } |
| 157 | 161 | ||
| 158 | 162 | ||
| @@ -173,20 +177,15 @@ static void do_show_stack(struct unwind_frame_info *info) | |||
| 173 | break; | 177 | break; |
| 174 | 178 | ||
| 175 | if (__kernel_text_address(info->ip)) { | 179 | if (__kernel_text_address(info->ip)) { |
| 176 | printk("%s [<" RFMT ">] ", (i&0x3)==1 ? KERN_CRIT : "", info->ip); | 180 | printk(KERN_CRIT " [<" RFMT ">] %pS\n", |
| 177 | #ifdef CONFIG_KALLSYMS | 181 | info->ip, (void *) info->ip); |
| 178 | print_symbol("%s\n", info->ip); | ||
| 179 | #else | ||
| 180 | if ((i & 0x03) == 0) | ||
| 181 | printk("\n"); | ||
| 182 | #endif | ||
| 183 | i++; | 182 | i++; |
| 184 | } | 183 | } |
| 185 | } | 184 | } |
| 186 | printk("\n"); | 185 | printk(KERN_CRIT "\n"); |
| 187 | } | 186 | } |
| 188 | 187 | ||
| 189 | void parisc_show_stack(struct task_struct *task, unsigned long *sp, | 188 | static void parisc_show_stack(struct task_struct *task, unsigned long *sp, |
| 190 | struct pt_regs *regs) | 189 | struct pt_regs *regs) |
| 191 | { | 190 | { |
| 192 | struct unwind_frame_info info; | 191 | struct unwind_frame_info info; |
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index 226ff066652b..dea30910c136 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | #size-cells = <1>; | 18 | #size-cells = <1>; |
| 19 | 19 | ||
| 20 | aliases { | 20 | aliases { |
| 21 | ethernet0 = &enet0; | 21 | ethernet0 = &enet1; |
| 22 | ethernet1 = &enet1; | 22 | ethernet1 = &enet0; |
| 23 | serial0 = &serial0; | 23 | serial0 = &serial0; |
| 24 | serial1 = &serial1; | 24 | serial1 = &serial1; |
| 25 | pci0 = &pci0; | 25 | pci0 = &pci0; |
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts index cadd4652a695..5c69b2fafd32 100644 --- a/arch/powerpc/boot/dts/mpc8572ds.dts +++ b/arch/powerpc/boot/dts/mpc8572ds.dts | |||
| @@ -90,7 +90,7 @@ | |||
| 90 | compatible = "fsl,mpc8572-l2-cache-controller"; | 90 | compatible = "fsl,mpc8572-l2-cache-controller"; |
| 91 | reg = <0x20000 0x1000>; | 91 | reg = <0x20000 0x1000>; |
| 92 | cache-line-size = <32>; // 32 bytes | 92 | cache-line-size = <32>; // 32 bytes |
| 93 | cache-size = <0x80000>; // L2, 512K | 93 | cache-size = <0x100000>; // L2, 1M |
| 94 | interrupt-parent = <&mpic>; | 94 | interrupt-parent = <&mpic>; |
| 95 | interrupts = <16 2>; | 95 | interrupts = <16 2>; |
| 96 | }; | 96 | }; |
diff --git a/arch/powerpc/configs/40x/virtex_defconfig b/arch/powerpc/configs/40x/virtex_defconfig new file mode 100644 index 000000000000..9a9350ded292 --- /dev/null +++ b/arch/powerpc/configs/40x/virtex_defconfig | |||
| @@ -0,0 +1,1176 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.28-rc4 | ||
| 4 | # Fri Nov 14 10:49:16 2008 | ||
| 5 | # | ||
| 6 | # CONFIG_PPC64 is not set | ||
| 7 | |||
| 8 | # | ||
| 9 | # Processor support | ||
| 10 | # | ||
| 11 | # CONFIG_6xx is not set | ||
| 12 | # CONFIG_PPC_85xx is not set | ||
| 13 | # CONFIG_PPC_8xx is not set | ||
| 14 | CONFIG_40x=y | ||
| 15 | # CONFIG_44x is not set | ||
| 16 | # CONFIG_E200 is not set | ||
| 17 | CONFIG_4xx=y | ||
| 18 | # CONFIG_PPC_MM_SLICES is not set | ||
| 19 | CONFIG_NOT_COHERENT_CACHE=y | ||
| 20 | CONFIG_PPC32=y | ||
| 21 | CONFIG_WORD_SIZE=32 | ||
| 22 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set | ||
| 23 | CONFIG_MMU=y | ||
| 24 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 25 | CONFIG_GENERIC_TIME=y | ||
| 26 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
| 27 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 28 | CONFIG_GENERIC_HARDIRQS=y | ||
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | ||
| 30 | CONFIG_IRQ_PER_CPU=y | ||
| 31 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 33 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
| 36 | CONFIG_GENERIC_HWEIGHT=y | ||
| 37 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 38 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 39 | CONFIG_GENERIC_GPIO=y | ||
| 40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
| 41 | CONFIG_PPC=y | ||
| 42 | CONFIG_EARLY_PRINTK=y | ||
| 43 | CONFIG_GENERIC_NVRAM=y | ||
| 44 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 45 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
| 46 | CONFIG_PPC_OF=y | ||
| 47 | CONFIG_OF=y | ||
| 48 | CONFIG_PPC_UDBG_16550=y | ||
| 49 | # CONFIG_GENERIC_TBSYNC is not set | ||
| 50 | CONFIG_AUDIT_ARCH=y | ||
| 51 | CONFIG_GENERIC_BUG=y | ||
| 52 | # CONFIG_DEFAULT_UIMAGE is not set | ||
| 53 | CONFIG_PPC_DCR_NATIVE=y | ||
| 54 | # CONFIG_PPC_DCR_MMIO is not set | ||
| 55 | CONFIG_PPC_DCR=y | ||
| 56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 57 | |||
| 58 | # | ||
| 59 | # General setup | ||
| 60 | # | ||
| 61 | CONFIG_EXPERIMENTAL=y | ||
| 62 | CONFIG_BROKEN_ON_SMP=y | ||
| 63 | CONFIG_LOCK_KERNEL=y | ||
| 64 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 65 | CONFIG_LOCALVERSION="" | ||
| 66 | # CONFIG_LOCALVERSION_AUTO is not set | ||
| 67 | CONFIG_SWAP=y | ||
| 68 | CONFIG_SYSVIPC=y | ||
| 69 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 70 | CONFIG_POSIX_MQUEUE=y | ||
| 71 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 72 | # CONFIG_TASKSTATS is not set | ||
| 73 | # CONFIG_AUDIT is not set | ||
| 74 | CONFIG_IKCONFIG=y | ||
| 75 | CONFIG_IKCONFIG_PROC=y | ||
| 76 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 77 | # CONFIG_CGROUPS is not set | ||
| 78 | # CONFIG_GROUP_SCHED is not set | ||
| 79 | CONFIG_SYSFS_DEPRECATED=y | ||
| 80 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 81 | # CONFIG_RELAY is not set | ||
| 82 | CONFIG_NAMESPACES=y | ||
| 83 | # CONFIG_UTS_NS is not set | ||
| 84 | # CONFIG_IPC_NS is not set | ||
| 85 | # CONFIG_USER_NS is not set | ||
| 86 | # CONFIG_PID_NS is not set | ||
| 87 | CONFIG_BLK_DEV_INITRD=y | ||
| 88 | CONFIG_INITRAMFS_SOURCE="" | ||
| 89 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 90 | CONFIG_SYSCTL=y | ||
| 91 | # CONFIG_EMBEDDED is not set | ||
| 92 | CONFIG_SYSCTL_SYSCALL=y | ||
| 93 | CONFIG_KALLSYMS=y | ||
| 94 | # CONFIG_KALLSYMS_ALL is not set | ||
| 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 96 | CONFIG_HOTPLUG=y | ||
| 97 | CONFIG_PRINTK=y | ||
| 98 | CONFIG_BUG=y | ||
| 99 | CONFIG_ELF_CORE=y | ||
| 100 | CONFIG_COMPAT_BRK=y | ||
| 101 | CONFIG_BASE_FULL=y | ||
| 102 | CONFIG_FUTEX=y | ||
| 103 | CONFIG_ANON_INODES=y | ||
| 104 | CONFIG_EPOLL=y | ||
| 105 | CONFIG_SIGNALFD=y | ||
| 106 | CONFIG_TIMERFD=y | ||
| 107 | CONFIG_EVENTFD=y | ||
| 108 | CONFIG_SHMEM=y | ||
| 109 | CONFIG_AIO=y | ||
| 110 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 111 | CONFIG_PCI_QUIRKS=y | ||
| 112 | CONFIG_SLAB=y | ||
| 113 | # CONFIG_SLUB is not set | ||
| 114 | # CONFIG_SLOB is not set | ||
| 115 | # CONFIG_PROFILING is not set | ||
| 116 | # CONFIG_MARKERS is not set | ||
| 117 | CONFIG_HAVE_OPROFILE=y | ||
| 118 | # CONFIG_KPROBES is not set | ||
| 119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 121 | CONFIG_HAVE_KPROBES=y | ||
| 122 | CONFIG_HAVE_KRETPROBES=y | ||
| 123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 125 | CONFIG_SLABINFO=y | ||
| 126 | CONFIG_RT_MUTEXES=y | ||
| 127 | # CONFIG_TINY_SHMEM is not set | ||
| 128 | CONFIG_BASE_SMALL=0 | ||
| 129 | CONFIG_MODULES=y | ||
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 131 | CONFIG_MODULE_UNLOAD=y | ||
| 132 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
| 133 | CONFIG_MODVERSIONS=y | ||
| 134 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 135 | CONFIG_KMOD=y | ||
| 136 | CONFIG_BLOCK=y | ||
| 137 | # CONFIG_LBD is not set | ||
| 138 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 139 | # CONFIG_LSF is not set | ||
| 140 | # CONFIG_BLK_DEV_BSG is not set | ||
| 141 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 142 | |||
| 143 | # | ||
| 144 | # IO Schedulers | ||
| 145 | # | ||
| 146 | CONFIG_IOSCHED_NOOP=y | ||
| 147 | CONFIG_IOSCHED_AS=y | ||
| 148 | CONFIG_IOSCHED_DEADLINE=y | ||
| 149 | CONFIG_IOSCHED_CFQ=y | ||
| 150 | # CONFIG_DEFAULT_AS is not set | ||
| 151 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 152 | CONFIG_DEFAULT_CFQ=y | ||
| 153 | # CONFIG_DEFAULT_NOOP is not set | ||
| 154 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 155 | CONFIG_CLASSIC_RCU=y | ||
| 156 | # CONFIG_FREEZER is not set | ||
| 157 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | ||
| 158 | |||
| 159 | # | ||
| 160 | # Platform support | ||
| 161 | # | ||
| 162 | # CONFIG_PPC_CELL is not set | ||
| 163 | # CONFIG_PPC_CELL_NATIVE is not set | ||
| 164 | # CONFIG_PQ2ADS is not set | ||
| 165 | # CONFIG_PPC4xx_GPIO is not set | ||
| 166 | CONFIG_XILINX_VIRTEX=y | ||
| 167 | # CONFIG_ACADIA is not set | ||
| 168 | # CONFIG_EP405 is not set | ||
| 169 | # CONFIG_HCU4 is not set | ||
| 170 | # CONFIG_KILAUEA is not set | ||
| 171 | # CONFIG_MAKALU is not set | ||
| 172 | # CONFIG_WALNUT is not set | ||
| 173 | CONFIG_XILINX_VIRTEX_GENERIC_BOARD=y | ||
| 174 | # CONFIG_PPC40x_SIMPLE is not set | ||
| 175 | CONFIG_XILINX_VIRTEX_II_PRO=y | ||
| 176 | CONFIG_XILINX_VIRTEX_4_FX=y | ||
| 177 | CONFIG_IBM405_ERR77=y | ||
| 178 | CONFIG_IBM405_ERR51=y | ||
| 179 | # CONFIG_IPIC is not set | ||
| 180 | # CONFIG_MPIC is not set | ||
| 181 | # CONFIG_MPIC_WEIRD is not set | ||
| 182 | # CONFIG_PPC_I8259 is not set | ||
| 183 | # CONFIG_PPC_RTAS is not set | ||
| 184 | # CONFIG_MMIO_NVRAM is not set | ||
| 185 | # CONFIG_PPC_MPC106 is not set | ||
| 186 | # CONFIG_PPC_970_NAP is not set | ||
| 187 | # CONFIG_PPC_INDIRECT_IO is not set | ||
| 188 | # CONFIG_GENERIC_IOMAP is not set | ||
| 189 | # CONFIG_CPU_FREQ is not set | ||
| 190 | # CONFIG_FSL_ULI1575 is not set | ||
| 191 | |||
| 192 | # | ||
| 193 | # Kernel options | ||
| 194 | # | ||
| 195 | # CONFIG_HIGHMEM is not set | ||
| 196 | # CONFIG_NO_HZ is not set | ||
| 197 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 198 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 199 | # CONFIG_HZ_100 is not set | ||
| 200 | CONFIG_HZ_250=y | ||
| 201 | # CONFIG_HZ_300 is not set | ||
| 202 | # CONFIG_HZ_1000 is not set | ||
| 203 | CONFIG_HZ=250 | ||
| 204 | # CONFIG_SCHED_HRTICK is not set | ||
| 205 | # CONFIG_PREEMPT_NONE is not set | ||
| 206 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 207 | CONFIG_PREEMPT=y | ||
| 208 | # CONFIG_PREEMPT_RCU is not set | ||
| 209 | CONFIG_BINFMT_ELF=y | ||
| 210 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 211 | # CONFIG_HAVE_AOUT is not set | ||
| 212 | # CONFIG_BINFMT_MISC is not set | ||
| 213 | CONFIG_MATH_EMULATION=y | ||
| 214 | # CONFIG_IOMMU_HELPER is not set | ||
| 215 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 216 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
| 217 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 218 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 219 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 220 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 221 | CONFIG_FLATMEM_MANUAL=y | ||
| 222 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 223 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 224 | CONFIG_FLATMEM=y | ||
| 225 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 228 | CONFIG_MIGRATION=y | ||
| 229 | CONFIG_RESOURCES_64BIT=y | ||
| 230 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 231 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 232 | CONFIG_BOUNCE=y | ||
| 233 | CONFIG_VIRT_TO_BUS=y | ||
| 234 | CONFIG_UNEVICTABLE_LRU=y | ||
| 235 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 236 | CONFIG_PROC_DEVICETREE=y | ||
| 237 | CONFIG_CMDLINE_BOOL=y | ||
| 238 | CONFIG_CMDLINE="" | ||
| 239 | CONFIG_EXTRA_TARGETS="" | ||
| 240 | # CONFIG_PM is not set | ||
| 241 | CONFIG_SECCOMP=y | ||
| 242 | CONFIG_ISA_DMA_API=y | ||
| 243 | |||
| 244 | # | ||
| 245 | # Bus options | ||
| 246 | # | ||
| 247 | CONFIG_ZONE_DMA=y | ||
| 248 | CONFIG_PPC_INDIRECT_PCI=y | ||
| 249 | CONFIG_4xx_SOC=y | ||
| 250 | CONFIG_PPC_PCI_CHOICE=y | ||
| 251 | CONFIG_PCI=y | ||
| 252 | CONFIG_PCI_DOMAINS=y | ||
| 253 | CONFIG_PCI_SYSCALL=y | ||
| 254 | # CONFIG_PCIEPORTBUS is not set | ||
| 255 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
| 256 | # CONFIG_PCI_MSI is not set | ||
| 257 | CONFIG_PCI_LEGACY=y | ||
| 258 | # CONFIG_PCI_DEBUG is not set | ||
| 259 | # CONFIG_PCCARD is not set | ||
| 260 | # CONFIG_HOTPLUG_PCI is not set | ||
| 261 | # CONFIG_HAS_RAPIDIO is not set | ||
| 262 | |||
| 263 | # | ||
| 264 | # Advanced setup | ||
| 265 | # | ||
| 266 | # CONFIG_ADVANCED_OPTIONS is not set | ||
| 267 | |||
| 268 | # | ||
| 269 | # Default settings for advanced configuration options are used | ||
| 270 | # | ||
| 271 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
| 272 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 273 | CONFIG_KERNEL_START=0xc0000000 | ||
| 274 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 275 | CONFIG_TASK_SIZE=0xc0000000 | ||
| 276 | CONFIG_CONSISTENT_START=0xff100000 | ||
| 277 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
| 278 | CONFIG_NET=y | ||
| 279 | |||
| 280 | # | ||
| 281 | # Networking options | ||
| 282 | # | ||
| 283 | CONFIG_PACKET=y | ||
| 284 | # CONFIG_PACKET_MMAP is not set | ||
| 285 | CONFIG_UNIX=y | ||
| 286 | CONFIG_XFRM=y | ||
| 287 | # CONFIG_XFRM_USER is not set | ||
| 288 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 289 | # CONFIG_XFRM_MIGRATE is not set | ||
| 290 | # CONFIG_XFRM_STATISTICS is not set | ||
| 291 | # CONFIG_NET_KEY is not set | ||
| 292 | CONFIG_INET=y | ||
| 293 | CONFIG_IP_MULTICAST=y | ||
| 294 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 295 | CONFIG_IP_FIB_HASH=y | ||
| 296 | CONFIG_IP_PNP=y | ||
| 297 | CONFIG_IP_PNP_DHCP=y | ||
| 298 | CONFIG_IP_PNP_BOOTP=y | ||
| 299 | # CONFIG_IP_PNP_RARP is not set | ||
| 300 | # CONFIG_NET_IPIP is not set | ||
| 301 | # CONFIG_NET_IPGRE is not set | ||
| 302 | # CONFIG_IP_MROUTE is not set | ||
| 303 | # CONFIG_ARPD is not set | ||
| 304 | # CONFIG_SYN_COOKIES is not set | ||
| 305 | # CONFIG_INET_AH is not set | ||
| 306 | # CONFIG_INET_ESP is not set | ||
| 307 | # CONFIG_INET_IPCOMP is not set | ||
| 308 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 309 | CONFIG_INET_TUNNEL=m | ||
| 310 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 311 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 312 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 313 | # CONFIG_INET_LRO is not set | ||
| 314 | CONFIG_INET_DIAG=y | ||
| 315 | CONFIG_INET_TCP_DIAG=y | ||
| 316 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 317 | CONFIG_TCP_CONG_CUBIC=y | ||
| 318 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 319 | # CONFIG_TCP_MD5SIG is not set | ||
| 320 | CONFIG_IPV6=m | ||
| 321 | # CONFIG_IPV6_PRIVACY is not set | ||
| 322 | # CONFIG_IPV6_ROUTER_PREF is not set | ||
| 323 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
| 324 | # CONFIG_INET6_AH is not set | ||
| 325 | # CONFIG_INET6_ESP is not set | ||
| 326 | # CONFIG_INET6_IPCOMP is not set | ||
| 327 | # CONFIG_IPV6_MIP6 is not set | ||
| 328 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 329 | # CONFIG_INET6_TUNNEL is not set | ||
| 330 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
| 331 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
| 332 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
| 333 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
| 334 | CONFIG_IPV6_SIT=m | ||
| 335 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 336 | # CONFIG_IPV6_TUNNEL is not set | ||
| 337 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 338 | # CONFIG_IPV6_MROUTE is not set | ||
| 339 | # CONFIG_NETWORK_SECMARK is not set | ||
| 340 | CONFIG_NETFILTER=y | ||
| 341 | # CONFIG_NETFILTER_DEBUG is not set | ||
| 342 | CONFIG_NETFILTER_ADVANCED=y | ||
| 343 | |||
| 344 | # | ||
| 345 | # Core Netfilter Configuration | ||
| 346 | # | ||
| 347 | # CONFIG_NETFILTER_NETLINK_QUEUE is not set | ||
| 348 | # CONFIG_NETFILTER_NETLINK_LOG is not set | ||
| 349 | # CONFIG_NF_CONNTRACK is not set | ||
| 350 | CONFIG_NETFILTER_XTABLES=m | ||
| 351 | # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set | ||
| 352 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | ||
| 353 | # CONFIG_NETFILTER_XT_TARGET_MARK is not set | ||
| 354 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | ||
| 355 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set | ||
| 356 | # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set | ||
| 357 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | ||
| 358 | # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set | ||
| 359 | # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set | ||
| 360 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | ||
| 361 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | ||
| 362 | # CONFIG_NETFILTER_XT_MATCH_ESP is not set | ||
| 363 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
| 364 | # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set | ||
| 365 | # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set | ||
| 366 | # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set | ||
| 367 | # CONFIG_NETFILTER_XT_MATCH_MAC is not set | ||
| 368 | # CONFIG_NETFILTER_XT_MATCH_MARK is not set | ||
| 369 | # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set | ||
| 370 | # CONFIG_NETFILTER_XT_MATCH_OWNER is not set | ||
| 371 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | ||
| 372 | # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set | ||
| 373 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set | ||
| 374 | # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set | ||
| 375 | # CONFIG_NETFILTER_XT_MATCH_REALM is not set | ||
| 376 | # CONFIG_NETFILTER_XT_MATCH_RECENT is not set | ||
| 377 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set | ||
| 378 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | ||
| 379 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set | ||
| 380 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set | ||
| 381 | # CONFIG_NETFILTER_XT_MATCH_TIME is not set | ||
| 382 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | ||
| 383 | # CONFIG_IP_VS is not set | ||
| 384 | |||
| 385 | # | ||
| 386 | # IP: Netfilter Configuration | ||
| 387 | # | ||
| 388 | # CONFIG_NF_DEFRAG_IPV4 is not set | ||
| 389 | # CONFIG_IP_NF_QUEUE is not set | ||
| 390 | CONFIG_IP_NF_IPTABLES=m | ||
| 391 | # CONFIG_IP_NF_MATCH_ADDRTYPE is not set | ||
| 392 | # CONFIG_IP_NF_MATCH_AH is not set | ||
| 393 | # CONFIG_IP_NF_MATCH_ECN is not set | ||
| 394 | # CONFIG_IP_NF_MATCH_TTL is not set | ||
| 395 | CONFIG_IP_NF_FILTER=m | ||
| 396 | # CONFIG_IP_NF_TARGET_REJECT is not set | ||
| 397 | # CONFIG_IP_NF_TARGET_LOG is not set | ||
| 398 | # CONFIG_IP_NF_TARGET_ULOG is not set | ||
| 399 | CONFIG_IP_NF_MANGLE=m | ||
| 400 | # CONFIG_IP_NF_TARGET_ECN is not set | ||
| 401 | # CONFIG_IP_NF_TARGET_TTL is not set | ||
| 402 | # CONFIG_IP_NF_RAW is not set | ||
| 403 | # CONFIG_IP_NF_ARPTABLES is not set | ||
| 404 | |||
| 405 | # | ||
| 406 | # IPv6: Netfilter Configuration | ||
| 407 | # | ||
| 408 | # CONFIG_IP6_NF_QUEUE is not set | ||
| 409 | # CONFIG_IP6_NF_IPTABLES is not set | ||
| 410 | # CONFIG_IP_DCCP is not set | ||
| 411 | # CONFIG_IP_SCTP is not set | ||
| 412 | # CONFIG_TIPC is not set | ||
| 413 | # CONFIG_ATM is not set | ||
| 414 | # CONFIG_BRIDGE is not set | ||
| 415 | # CONFIG_NET_DSA is not set | ||
| 416 | # CONFIG_VLAN_8021Q is not set | ||
| 417 | # CONFIG_DECNET is not set | ||
| 418 | # CONFIG_LLC2 is not set | ||
| 419 | # CONFIG_IPX is not set | ||
| 420 | # CONFIG_ATALK is not set | ||
| 421 | # CONFIG_X25 is not set | ||
| 422 | # CONFIG_LAPB is not set | ||
| 423 | # CONFIG_ECONET is not set | ||
| 424 | # CONFIG_WAN_ROUTER is not set | ||
| 425 | # CONFIG_NET_SCHED is not set | ||
| 426 | |||
| 427 | # | ||
| 428 | # Network testing | ||
| 429 | # | ||
| 430 | # CONFIG_NET_PKTGEN is not set | ||
| 431 | # CONFIG_HAMRADIO is not set | ||
| 432 | # CONFIG_CAN is not set | ||
| 433 | # CONFIG_IRDA is not set | ||
| 434 | # CONFIG_BT is not set | ||
| 435 | # CONFIG_AF_RXRPC is not set | ||
| 436 | # CONFIG_PHONET is not set | ||
| 437 | CONFIG_WIRELESS=y | ||
| 438 | # CONFIG_CFG80211 is not set | ||
| 439 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 440 | # CONFIG_WIRELESS_EXT is not set | ||
| 441 | # CONFIG_MAC80211 is not set | ||
| 442 | # CONFIG_IEEE80211 is not set | ||
| 443 | # CONFIG_RFKILL is not set | ||
| 444 | # CONFIG_NET_9P is not set | ||
| 445 | |||
| 446 | # | ||
| 447 | # Device Drivers | ||
| 448 | # | ||
| 449 | |||
| 450 | # | ||
| 451 | # Generic Driver Options | ||
| 452 | # | ||
| 453 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 454 | CONFIG_STANDALONE=y | ||
| 455 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 456 | CONFIG_FW_LOADER=y | ||
| 457 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
| 458 | CONFIG_EXTRA_FIRMWARE="" | ||
| 459 | # CONFIG_DEBUG_DRIVER is not set | ||
| 460 | # CONFIG_DEBUG_DEVRES is not set | ||
| 461 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 462 | # CONFIG_CONNECTOR is not set | ||
| 463 | # CONFIG_MTD is not set | ||
| 464 | CONFIG_OF_DEVICE=y | ||
| 465 | CONFIG_OF_GPIO=y | ||
| 466 | # CONFIG_PARPORT is not set | ||
| 467 | CONFIG_BLK_DEV=y | ||
| 468 | # CONFIG_BLK_DEV_FD is not set | ||
| 469 | # CONFIG_BLK_CPQ_DA is not set | ||
| 470 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 471 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 472 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 473 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 474 | CONFIG_BLK_DEV_LOOP=y | ||
| 475 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 476 | # CONFIG_BLK_DEV_NBD is not set | ||
| 477 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 478 | CONFIG_BLK_DEV_RAM=y | ||
| 479 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 480 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
| 481 | # CONFIG_BLK_DEV_XIP is not set | ||
| 482 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 483 | # CONFIG_ATA_OVER_ETH is not set | ||
| 484 | CONFIG_XILINX_SYSACE=y | ||
| 485 | # CONFIG_BLK_DEV_HD is not set | ||
| 486 | CONFIG_MISC_DEVICES=y | ||
| 487 | # CONFIG_PHANTOM is not set | ||
| 488 | # CONFIG_EEPROM_93CX6 is not set | ||
| 489 | # CONFIG_SGI_IOC4 is not set | ||
| 490 | # CONFIG_TIFM_CORE is not set | ||
| 491 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 492 | # CONFIG_HP_ILO is not set | ||
| 493 | # CONFIG_C2PORT is not set | ||
| 494 | CONFIG_HAVE_IDE=y | ||
| 495 | # CONFIG_IDE is not set | ||
| 496 | |||
| 497 | # | ||
| 498 | # SCSI device support | ||
| 499 | # | ||
| 500 | # CONFIG_RAID_ATTRS is not set | ||
| 501 | # CONFIG_SCSI is not set | ||
| 502 | # CONFIG_SCSI_DMA is not set | ||
| 503 | # CONFIG_SCSI_NETLINK is not set | ||
| 504 | # CONFIG_ATA is not set | ||
| 505 | # CONFIG_MD is not set | ||
| 506 | # CONFIG_FUSION is not set | ||
| 507 | |||
| 508 | # | ||
| 509 | # IEEE 1394 (FireWire) support | ||
| 510 | # | ||
| 511 | |||
| 512 | # | ||
| 513 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 514 | # | ||
| 515 | # CONFIG_FIREWIRE is not set | ||
| 516 | # CONFIG_IEEE1394 is not set | ||
| 517 | # CONFIG_I2O is not set | ||
| 518 | # CONFIG_MACINTOSH_DRIVERS is not set | ||
| 519 | CONFIG_NETDEVICES=y | ||
| 520 | # CONFIG_DUMMY is not set | ||
| 521 | # CONFIG_BONDING is not set | ||
| 522 | # CONFIG_MACVLAN is not set | ||
| 523 | # CONFIG_EQUALIZER is not set | ||
| 524 | # CONFIG_TUN is not set | ||
| 525 | # CONFIG_VETH is not set | ||
| 526 | # CONFIG_ARCNET is not set | ||
| 527 | # CONFIG_PHYLIB is not set | ||
| 528 | CONFIG_NET_ETHERNET=y | ||
| 529 | CONFIG_MII=y | ||
| 530 | # CONFIG_HAPPYMEAL is not set | ||
| 531 | # CONFIG_SUNGEM is not set | ||
| 532 | # CONFIG_CASSINI is not set | ||
| 533 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 534 | # CONFIG_NET_TULIP is not set | ||
| 535 | # CONFIG_HP100 is not set | ||
| 536 | # CONFIG_IBM_NEW_EMAC is not set | ||
| 537 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 538 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 539 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 540 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 541 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 542 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 543 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 544 | # CONFIG_NET_PCI is not set | ||
| 545 | # CONFIG_B44 is not set | ||
| 546 | # CONFIG_ATL2 is not set | ||
| 547 | CONFIG_NETDEV_1000=y | ||
| 548 | # CONFIG_ACENIC is not set | ||
| 549 | # CONFIG_DL2K is not set | ||
| 550 | # CONFIG_E1000 is not set | ||
| 551 | # CONFIG_E1000E is not set | ||
| 552 | # CONFIG_IP1000 is not set | ||
| 553 | # CONFIG_IGB is not set | ||
| 554 | # CONFIG_NS83820 is not set | ||
| 555 | # CONFIG_HAMACHI is not set | ||
| 556 | # CONFIG_YELLOWFIN is not set | ||
| 557 | # CONFIG_R8169 is not set | ||
| 558 | # CONFIG_SIS190 is not set | ||
| 559 | # CONFIG_SKGE is not set | ||
| 560 | # CONFIG_SKY2 is not set | ||
| 561 | # CONFIG_VIA_VELOCITY is not set | ||
| 562 | # CONFIG_TIGON3 is not set | ||
| 563 | # CONFIG_BNX2 is not set | ||
| 564 | # CONFIG_QLA3XXX is not set | ||
| 565 | # CONFIG_ATL1 is not set | ||
| 566 | # CONFIG_ATL1E is not set | ||
| 567 | # CONFIG_JME is not set | ||
| 568 | # CONFIG_NETDEV_10000 is not set | ||
| 569 | # CONFIG_TR is not set | ||
| 570 | |||
| 571 | # | ||
| 572 | # Wireless LAN | ||
| 573 | # | ||
| 574 | # CONFIG_WLAN_PRE80211 is not set | ||
| 575 | # CONFIG_WLAN_80211 is not set | ||
| 576 | # CONFIG_IWLWIFI_LEDS 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 | # CONFIG_PHONE is not set | ||
| 587 | |||
| 588 | # | ||
| 589 | # Input device support | ||
| 590 | # | ||
| 591 | CONFIG_INPUT=y | ||
| 592 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 593 | # CONFIG_INPUT_POLLDEV is not set | ||
| 594 | |||
| 595 | # | ||
| 596 | # Userland interfaces | ||
| 597 | # | ||
| 598 | CONFIG_INPUT_MOUSEDEV=y | ||
| 599 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 600 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 601 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 602 | # CONFIG_INPUT_JOYDEV is not set | ||
| 603 | # CONFIG_INPUT_EVDEV is not set | ||
| 604 | # CONFIG_INPUT_EVBUG is not set | ||
| 605 | |||
| 606 | # | ||
| 607 | # Input Device Drivers | ||
| 608 | # | ||
| 609 | CONFIG_INPUT_KEYBOARD=y | ||
| 610 | CONFIG_KEYBOARD_ATKBD=y | ||
| 611 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 612 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 613 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 614 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 615 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 616 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 617 | CONFIG_INPUT_MOUSE=y | ||
| 618 | CONFIG_MOUSE_PS2=y | ||
| 619 | CONFIG_MOUSE_PS2_ALPS=y | ||
| 620 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
| 621 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
| 622 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 623 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
| 624 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 625 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
| 626 | # CONFIG_MOUSE_SERIAL is not set | ||
| 627 | # CONFIG_MOUSE_VSXXXAA is not set | ||
| 628 | # CONFIG_MOUSE_GPIO is not set | ||
| 629 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 630 | # CONFIG_INPUT_TABLET is not set | ||
| 631 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 632 | # CONFIG_INPUT_MISC is not set | ||
| 633 | |||
| 634 | # | ||
| 635 | # Hardware I/O ports | ||
| 636 | # | ||
| 637 | CONFIG_SERIO=y | ||
| 638 | # CONFIG_SERIO_I8042 is not set | ||
| 639 | # CONFIG_SERIO_SERPORT is not set | ||
| 640 | # CONFIG_SERIO_PCIPS2 is not set | ||
| 641 | CONFIG_SERIO_LIBPS2=y | ||
| 642 | # CONFIG_SERIO_RAW is not set | ||
| 643 | CONFIG_SERIO_XILINX_XPS_PS2=y | ||
| 644 | # CONFIG_GAMEPORT is not set | ||
| 645 | |||
| 646 | # | ||
| 647 | # Character devices | ||
| 648 | # | ||
| 649 | CONFIG_VT=y | ||
| 650 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 651 | CONFIG_VT_CONSOLE=y | ||
| 652 | CONFIG_HW_CONSOLE=y | ||
| 653 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 654 | CONFIG_DEVKMEM=y | ||
| 655 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 656 | # CONFIG_NOZOMI is not set | ||
| 657 | |||
| 658 | # | ||
| 659 | # Serial drivers | ||
| 660 | # | ||
| 661 | CONFIG_SERIAL_8250=y | ||
| 662 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 663 | CONFIG_SERIAL_8250_PCI=y | ||
| 664 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 665 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 666 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 667 | |||
| 668 | # | ||
| 669 | # Non-8250 serial port support | ||
| 670 | # | ||
| 671 | CONFIG_SERIAL_UARTLITE=y | ||
| 672 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | ||
| 673 | CONFIG_SERIAL_CORE=y | ||
| 674 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 675 | # CONFIG_SERIAL_JSM is not set | ||
| 676 | # CONFIG_SERIAL_OF_PLATFORM is not set | ||
| 677 | CONFIG_UNIX98_PTYS=y | ||
| 678 | CONFIG_LEGACY_PTYS=y | ||
| 679 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 680 | # CONFIG_IPMI_HANDLER is not set | ||
| 681 | CONFIG_HW_RANDOM=m | ||
| 682 | # CONFIG_NVRAM is not set | ||
| 683 | # CONFIG_GEN_RTC is not set | ||
| 684 | CONFIG_XILINX_HWICAP=y | ||
| 685 | # CONFIG_R3964 is not set | ||
| 686 | # CONFIG_APPLICOM is not set | ||
| 687 | # CONFIG_RAW_DRIVER is not set | ||
| 688 | # CONFIG_TCG_TPM is not set | ||
| 689 | CONFIG_DEVPORT=y | ||
| 690 | # CONFIG_I2C is not set | ||
| 691 | # CONFIG_SPI is not set | ||
| 692 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 693 | CONFIG_GPIOLIB=y | ||
| 694 | # CONFIG_DEBUG_GPIO is not set | ||
| 695 | CONFIG_GPIO_SYSFS=y | ||
| 696 | |||
| 697 | # | ||
| 698 | # Memory mapped GPIO expanders: | ||
| 699 | # | ||
| 700 | CONFIG_GPIO_XILINX=y | ||
| 701 | |||
| 702 | # | ||
| 703 | # I2C GPIO expanders: | ||
| 704 | # | ||
| 705 | |||
| 706 | # | ||
| 707 | # PCI GPIO expanders: | ||
| 708 | # | ||
| 709 | # CONFIG_GPIO_BT8XX is not set | ||
| 710 | |||
| 711 | # | ||
| 712 | # SPI GPIO expanders: | ||
| 713 | # | ||
| 714 | # CONFIG_W1 is not set | ||
| 715 | # CONFIG_POWER_SUPPLY is not set | ||
| 716 | # CONFIG_HWMON is not set | ||
| 717 | # CONFIG_THERMAL is not set | ||
| 718 | # CONFIG_THERMAL_HWMON is not set | ||
| 719 | # CONFIG_WATCHDOG is not set | ||
| 720 | CONFIG_SSB_POSSIBLE=y | ||
| 721 | |||
| 722 | # | ||
| 723 | # Sonics Silicon Backplane | ||
| 724 | # | ||
| 725 | # CONFIG_SSB is not set | ||
| 726 | |||
| 727 | # | ||
| 728 | # Multifunction device drivers | ||
| 729 | # | ||
| 730 | # CONFIG_MFD_CORE is not set | ||
| 731 | # CONFIG_MFD_SM501 is not set | ||
| 732 | # CONFIG_HTC_PASIC3 is not set | ||
| 733 | # CONFIG_MFD_TMIO is not set | ||
| 734 | # CONFIG_REGULATOR is not set | ||
| 735 | |||
| 736 | # | ||
| 737 | # Multimedia devices | ||
| 738 | # | ||
| 739 | |||
| 740 | # | ||
| 741 | # Multimedia core support | ||
| 742 | # | ||
| 743 | # CONFIG_VIDEO_DEV is not set | ||
| 744 | # CONFIG_DVB_CORE is not set | ||
| 745 | # CONFIG_VIDEO_MEDIA is not set | ||
| 746 | |||
| 747 | # | ||
| 748 | # Multimedia drivers | ||
| 749 | # | ||
| 750 | # CONFIG_DAB is not set | ||
| 751 | |||
| 752 | # | ||
| 753 | # Graphics support | ||
| 754 | # | ||
| 755 | # CONFIG_AGP is not set | ||
| 756 | # CONFIG_DRM is not set | ||
| 757 | # CONFIG_VGASTATE is not set | ||
| 758 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 759 | CONFIG_FB=y | ||
| 760 | # CONFIG_FIRMWARE_EDID is not set | ||
| 761 | # CONFIG_FB_DDC is not set | ||
| 762 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 763 | CONFIG_FB_CFB_FILLRECT=y | ||
| 764 | CONFIG_FB_CFB_COPYAREA=y | ||
| 765 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 766 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 767 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 768 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 769 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 770 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 771 | # CONFIG_FB_SYS_FOPS is not set | ||
| 772 | # CONFIG_FB_SVGALIB is not set | ||
| 773 | # CONFIG_FB_MACMODES is not set | ||
| 774 | # CONFIG_FB_BACKLIGHT is not set | ||
| 775 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 776 | # CONFIG_FB_TILEBLITTING is not set | ||
| 777 | |||
| 778 | # | ||
| 779 | # Frame buffer hardware drivers | ||
| 780 | # | ||
| 781 | # CONFIG_FB_CIRRUS is not set | ||
| 782 | # CONFIG_FB_PM2 is not set | ||
| 783 | # CONFIG_FB_CYBER2000 is not set | ||
| 784 | # CONFIG_FB_OF is not set | ||
| 785 | # CONFIG_FB_CT65550 is not set | ||
| 786 | # CONFIG_FB_ASILIANT is not set | ||
| 787 | # CONFIG_FB_IMSTT is not set | ||
| 788 | # CONFIG_FB_VGA16 is not set | ||
| 789 | # CONFIG_FB_S1D13XXX is not set | ||
| 790 | # CONFIG_FB_NVIDIA is not set | ||
| 791 | # CONFIG_FB_RIVA is not set | ||
| 792 | # CONFIG_FB_MATROX is not set | ||
| 793 | # CONFIG_FB_RADEON is not set | ||
| 794 | # CONFIG_FB_ATY128 is not set | ||
| 795 | # CONFIG_FB_ATY is not set | ||
| 796 | # CONFIG_FB_S3 is not set | ||
| 797 | # CONFIG_FB_SAVAGE is not set | ||
| 798 | # CONFIG_FB_SIS is not set | ||
| 799 | # CONFIG_FB_VIA is not set | ||
| 800 | # CONFIG_FB_NEOMAGIC is not set | ||
| 801 | # CONFIG_FB_KYRO is not set | ||
| 802 | # CONFIG_FB_3DFX is not set | ||
| 803 | # CONFIG_FB_VOODOO1 is not set | ||
| 804 | # CONFIG_FB_VT8623 is not set | ||
| 805 | # CONFIG_FB_TRIDENT is not set | ||
| 806 | # CONFIG_FB_ARK is not set | ||
| 807 | # CONFIG_FB_PM3 is not set | ||
| 808 | # CONFIG_FB_CARMINE is not set | ||
| 809 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 810 | CONFIG_FB_XILINX=y | ||
| 811 | # CONFIG_FB_VIRTUAL is not set | ||
| 812 | # CONFIG_FB_METRONOME is not set | ||
| 813 | # CONFIG_FB_MB862XX is not set | ||
| 814 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 815 | |||
| 816 | # | ||
| 817 | # Display device support | ||
| 818 | # | ||
| 819 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 820 | |||
| 821 | # | ||
| 822 | # Console display driver support | ||
| 823 | # | ||
| 824 | CONFIG_DUMMY_CONSOLE=y | ||
| 825 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 826 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 827 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 828 | CONFIG_FONTS=y | ||
| 829 | CONFIG_FONT_8x8=y | ||
| 830 | CONFIG_FONT_8x16=y | ||
| 831 | # CONFIG_FONT_6x11 is not set | ||
| 832 | # CONFIG_FONT_7x14 is not set | ||
| 833 | # CONFIG_FONT_PEARL_8x8 is not set | ||
| 834 | # CONFIG_FONT_ACORN_8x8 is not set | ||
| 835 | # CONFIG_FONT_MINI_4x6 is not set | ||
| 836 | # CONFIG_FONT_SUN8x16 is not set | ||
| 837 | # CONFIG_FONT_SUN12x22 is not set | ||
| 838 | # CONFIG_FONT_10x18 is not set | ||
| 839 | CONFIG_LOGO=y | ||
| 840 | CONFIG_LOGO_LINUX_MONO=y | ||
| 841 | CONFIG_LOGO_LINUX_VGA16=y | ||
| 842 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 843 | # CONFIG_SOUND is not set | ||
| 844 | # CONFIG_HID_SUPPORT is not set | ||
| 845 | # CONFIG_USB_SUPPORT is not set | ||
| 846 | # CONFIG_UWB is not set | ||
| 847 | # CONFIG_MMC is not set | ||
| 848 | # CONFIG_MEMSTICK is not set | ||
| 849 | # CONFIG_NEW_LEDS is not set | ||
| 850 | # CONFIG_ACCESSIBILITY is not set | ||
| 851 | # CONFIG_INFINIBAND is not set | ||
| 852 | # CONFIG_EDAC is not set | ||
| 853 | # CONFIG_RTC_CLASS is not set | ||
| 854 | # CONFIG_DMADEVICES is not set | ||
| 855 | # CONFIG_UIO is not set | ||
| 856 | # CONFIG_STAGING is not set | ||
| 857 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 858 | |||
| 859 | # | ||
| 860 | # File systems | ||
| 861 | # | ||
| 862 | CONFIG_EXT2_FS=y | ||
| 863 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 864 | # CONFIG_EXT2_FS_XIP is not set | ||
| 865 | # CONFIG_EXT3_FS is not set | ||
| 866 | # CONFIG_EXT4_FS is not set | ||
| 867 | # CONFIG_REISERFS_FS is not set | ||
| 868 | # CONFIG_JFS_FS is not set | ||
| 869 | # CONFIG_FS_POSIX_ACL is not set | ||
| 870 | CONFIG_FILE_LOCKING=y | ||
| 871 | # CONFIG_XFS_FS is not set | ||
| 872 | # CONFIG_OCFS2_FS is not set | ||
| 873 | CONFIG_DNOTIFY=y | ||
| 874 | CONFIG_INOTIFY=y | ||
| 875 | CONFIG_INOTIFY_USER=y | ||
| 876 | # CONFIG_QUOTA is not set | ||
| 877 | CONFIG_AUTOFS_FS=y | ||
| 878 | CONFIG_AUTOFS4_FS=y | ||
| 879 | # CONFIG_FUSE_FS is not set | ||
| 880 | |||
| 881 | # | ||
| 882 | # CD-ROM/DVD Filesystems | ||
| 883 | # | ||
| 884 | # CONFIG_ISO9660_FS is not set | ||
| 885 | # CONFIG_UDF_FS is not set | ||
| 886 | |||
| 887 | # | ||
| 888 | # DOS/FAT/NT Filesystems | ||
| 889 | # | ||
| 890 | CONFIG_FAT_FS=y | ||
| 891 | CONFIG_MSDOS_FS=y | ||
| 892 | CONFIG_VFAT_FS=y | ||
| 893 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 894 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 895 | # CONFIG_NTFS_FS is not set | ||
| 896 | |||
| 897 | # | ||
| 898 | # Pseudo filesystems | ||
| 899 | # | ||
| 900 | CONFIG_PROC_FS=y | ||
| 901 | # CONFIG_PROC_KCORE is not set | ||
| 902 | CONFIG_PROC_SYSCTL=y | ||
| 903 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 904 | CONFIG_SYSFS=y | ||
| 905 | CONFIG_TMPFS=y | ||
| 906 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 907 | # CONFIG_HUGETLB_PAGE is not set | ||
| 908 | # CONFIG_CONFIGFS_FS is not set | ||
| 909 | |||
| 910 | # | ||
| 911 | # Miscellaneous filesystems | ||
| 912 | # | ||
| 913 | # CONFIG_ADFS_FS is not set | ||
| 914 | # CONFIG_AFFS_FS is not set | ||
| 915 | # CONFIG_HFS_FS is not set | ||
| 916 | # CONFIG_HFSPLUS_FS is not set | ||
| 917 | # CONFIG_BEFS_FS is not set | ||
| 918 | # CONFIG_BFS_FS is not set | ||
| 919 | # CONFIG_EFS_FS is not set | ||
| 920 | CONFIG_CRAMFS=y | ||
| 921 | # CONFIG_VXFS_FS is not set | ||
| 922 | # CONFIG_MINIX_FS is not set | ||
| 923 | # CONFIG_OMFS_FS is not set | ||
| 924 | # CONFIG_HPFS_FS is not set | ||
| 925 | # CONFIG_QNX4FS_FS is not set | ||
| 926 | CONFIG_ROMFS_FS=y | ||
| 927 | # CONFIG_SYSV_FS is not set | ||
| 928 | # CONFIG_UFS_FS is not set | ||
| 929 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 930 | CONFIG_NFS_FS=y | ||
| 931 | CONFIG_NFS_V3=y | ||
| 932 | # CONFIG_NFS_V3_ACL is not set | ||
| 933 | # CONFIG_NFS_V4 is not set | ||
| 934 | CONFIG_ROOT_NFS=y | ||
| 935 | # CONFIG_NFSD is not set | ||
| 936 | CONFIG_LOCKD=y | ||
| 937 | CONFIG_LOCKD_V4=y | ||
| 938 | CONFIG_NFS_COMMON=y | ||
| 939 | CONFIG_SUNRPC=y | ||
| 940 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 941 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 942 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 943 | # CONFIG_SMB_FS is not set | ||
| 944 | # CONFIG_CIFS is not set | ||
| 945 | # CONFIG_NCP_FS is not set | ||
| 946 | # CONFIG_CODA_FS is not set | ||
| 947 | # CONFIG_AFS_FS is not set | ||
| 948 | |||
| 949 | # | ||
| 950 | # Partition Types | ||
| 951 | # | ||
| 952 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 953 | CONFIG_MSDOS_PARTITION=y | ||
| 954 | CONFIG_NLS=y | ||
| 955 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 956 | CONFIG_NLS_CODEPAGE_437=y | ||
| 957 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 958 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 959 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
| 960 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 961 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 962 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 963 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 964 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 965 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 966 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 967 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 968 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 969 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 970 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 971 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 972 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 973 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 974 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 975 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 976 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 977 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 978 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 979 | CONFIG_NLS_ASCII=m | ||
| 980 | CONFIG_NLS_ISO8859_1=m | ||
| 981 | # CONFIG_NLS_ISO8859_2 is not set | ||
| 982 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 983 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 984 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 985 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 986 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 987 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 988 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 989 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 990 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 991 | # CONFIG_NLS_KOI8_R is not set | ||
| 992 | # CONFIG_NLS_KOI8_U is not set | ||
| 993 | CONFIG_NLS_UTF8=m | ||
| 994 | # CONFIG_DLM is not set | ||
| 995 | |||
| 996 | # | ||
| 997 | # Library routines | ||
| 998 | # | ||
| 999 | CONFIG_BITREVERSE=y | ||
| 1000 | CONFIG_CRC_CCITT=y | ||
| 1001 | # CONFIG_CRC16 is not set | ||
| 1002 | # CONFIG_CRC_T10DIF is not set | ||
| 1003 | # CONFIG_CRC_ITU_T is not set | ||
| 1004 | CONFIG_CRC32=y | ||
| 1005 | # CONFIG_CRC7 is not set | ||
| 1006 | # CONFIG_LIBCRC32C is not set | ||
| 1007 | CONFIG_ZLIB_INFLATE=y | ||
| 1008 | CONFIG_PLIST=y | ||
| 1009 | CONFIG_HAS_IOMEM=y | ||
| 1010 | CONFIG_HAS_IOPORT=y | ||
| 1011 | CONFIG_HAS_DMA=y | ||
| 1012 | CONFIG_HAVE_LMB=y | ||
| 1013 | |||
| 1014 | # | ||
| 1015 | # Kernel hacking | ||
| 1016 | # | ||
| 1017 | CONFIG_PRINTK_TIME=y | ||
| 1018 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1019 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1020 | CONFIG_FRAME_WARN=1024 | ||
| 1021 | # CONFIG_MAGIC_SYSRQ is not set | ||
| 1022 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1023 | # CONFIG_DEBUG_FS is not set | ||
| 1024 | # CONFIG_HEADERS_CHECK is not set | ||
| 1025 | CONFIG_DEBUG_KERNEL=y | ||
| 1026 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1027 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1028 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1029 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1030 | CONFIG_SCHED_DEBUG=y | ||
| 1031 | # CONFIG_SCHEDSTATS is not set | ||
| 1032 | # CONFIG_TIMER_STATS is not set | ||
| 1033 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1034 | # CONFIG_DEBUG_SLAB is not set | ||
| 1035 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1036 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1037 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1038 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1039 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1040 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1041 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1042 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 1043 | CONFIG_DEBUG_INFO=y | ||
| 1044 | # CONFIG_DEBUG_VM is not set | ||
| 1045 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1046 | CONFIG_DEBUG_MEMORY_INIT=y | ||
| 1047 | # CONFIG_DEBUG_LIST is not set | ||
| 1048 | # CONFIG_DEBUG_SG is not set | ||
| 1049 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1050 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1051 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1052 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1053 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1054 | # CONFIG_FAULT_INJECTION is not set | ||
| 1055 | # CONFIG_LATENCYTOP is not set | ||
| 1056 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 1057 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1058 | |||
| 1059 | # | ||
| 1060 | # Tracers | ||
| 1061 | # | ||
| 1062 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1063 | # CONFIG_PREEMPT_TRACER is not set | ||
| 1064 | # CONFIG_SCHED_TRACER is not set | ||
| 1065 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1066 | # CONFIG_BOOT_TRACER is not set | ||
| 1067 | # CONFIG_STACK_TRACER is not set | ||
| 1068 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1069 | # CONFIG_SAMPLES is not set | ||
| 1070 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1071 | # CONFIG_KGDB is not set | ||
| 1072 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
| 1073 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1074 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1075 | # CONFIG_CODE_PATCHING_SELFTEST is not set | ||
| 1076 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1077 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
| 1078 | # CONFIG_XMON is not set | ||
| 1079 | # CONFIG_IRQSTACKS is not set | ||
| 1080 | # CONFIG_BDI_SWITCH is not set | ||
| 1081 | # CONFIG_PPC_EARLY_DEBUG is not set | ||
| 1082 | |||
| 1083 | # | ||
| 1084 | # Security options | ||
| 1085 | # | ||
| 1086 | # CONFIG_KEYS is not set | ||
| 1087 | # CONFIG_SECURITY is not set | ||
| 1088 | # CONFIG_SECURITYFS is not set | ||
| 1089 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1090 | CONFIG_CRYPTO=y | ||
| 1091 | |||
| 1092 | # | ||
| 1093 | # Crypto core or helper | ||
| 1094 | # | ||
| 1095 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1096 | # CONFIG_CRYPTO_MANAGER is not set | ||
| 1097 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1098 | # CONFIG_CRYPTO_NULL is not set | ||
| 1099 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1100 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1101 | # CONFIG_CRYPTO_TEST is not set | ||
| 1102 | |||
| 1103 | # | ||
| 1104 | # Authenticated Encryption with Associated Data | ||
| 1105 | # | ||
| 1106 | # CONFIG_CRYPTO_CCM is not set | ||
| 1107 | # CONFIG_CRYPTO_GCM is not set | ||
| 1108 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1109 | |||
| 1110 | # | ||
| 1111 | # Block modes | ||
| 1112 | # | ||
| 1113 | # CONFIG_CRYPTO_CBC is not set | ||
| 1114 | # CONFIG_CRYPTO_CTR is not set | ||
| 1115 | # CONFIG_CRYPTO_CTS is not set | ||
| 1116 | # CONFIG_CRYPTO_ECB is not set | ||
| 1117 | # CONFIG_CRYPTO_LRW is not set | ||
| 1118 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1119 | # CONFIG_CRYPTO_XTS is not set | ||
| 1120 | |||
| 1121 | # | ||
| 1122 | # Hash modes | ||
| 1123 | # | ||
| 1124 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1125 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1126 | |||
| 1127 | # | ||
| 1128 | # Digest | ||
| 1129 | # | ||
| 1130 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1131 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1132 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1133 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1134 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1135 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1136 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1137 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1138 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1139 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1140 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1141 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1142 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1143 | |||
| 1144 | # | ||
| 1145 | # Ciphers | ||
| 1146 | # | ||
| 1147 | # CONFIG_CRYPTO_AES is not set | ||
| 1148 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1149 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1150 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1151 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1152 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1153 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1154 | # CONFIG_CRYPTO_DES is not set | ||
| 1155 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1156 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1157 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1158 | # CONFIG_CRYPTO_SEED is not set | ||
| 1159 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1160 | # CONFIG_CRYPTO_TEA is not set | ||
| 1161 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1162 | |||
| 1163 | # | ||
| 1164 | # Compression | ||
| 1165 | # | ||
| 1166 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1167 | # CONFIG_CRYPTO_LZO is not set | ||
| 1168 | |||
| 1169 | # | ||
| 1170 | # Random Number Generation | ||
| 1171 | # | ||
| 1172 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1173 | CONFIG_CRYPTO_HW=y | ||
| 1174 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1175 | # CONFIG_PPC_CLOCK is not set | ||
| 1176 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig index 663ec512b33b..7513d360e0b0 100644 --- a/arch/powerpc/configs/44x/virtex5_defconfig +++ b/arch/powerpc/configs/44x/virtex5_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-rc1 | 3 | # Linux kernel version: 2.6.28-rc4 |
| 4 | # Tue Aug 5 09:20:16 2008 | 4 | # Fri Nov 14 10:31:16 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -22,14 +22,13 @@ CONFIG_PHYS_64BIT=y | |||
| 22 | CONFIG_NOT_COHERENT_CACHE=y | 22 | CONFIG_NOT_COHERENT_CACHE=y |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| 29 | CONFIG_GENERIC_TIME_VSYSCALL=y | 29 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 30 | CONFIG_GENERIC_CLOCKEVENTS=y | 30 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_GET_USER_PAGES_FAST is not set | ||
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| @@ -40,6 +39,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y | |||
| 40 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| 41 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 42 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 42 | CONFIG_GENERIC_GPIO=y | ||
| 43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
| 44 | CONFIG_PPC=y | 44 | CONFIG_PPC=y |
| 45 | CONFIG_EARLY_PRINTK=y | 45 | CONFIG_EARLY_PRINTK=y |
| @@ -93,8 +93,8 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 93 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 94 | # CONFIG_EMBEDDED is not set | 94 | # CONFIG_EMBEDDED is not set |
| 95 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 97 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 97 | # CONFIG_KALLSYMS_ALL is not set | ||
| 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 99 | CONFIG_HOTPLUG=y | 99 | CONFIG_HOTPLUG=y |
| 100 | CONFIG_PRINTK=y | 100 | CONFIG_PRINTK=y |
| @@ -109,7 +109,9 @@ CONFIG_SIGNALFD=y | |||
| 109 | CONFIG_TIMERFD=y | 109 | CONFIG_TIMERFD=y |
| 110 | CONFIG_EVENTFD=y | 110 | CONFIG_EVENTFD=y |
| 111 | CONFIG_SHMEM=y | 111 | CONFIG_SHMEM=y |
| 112 | CONFIG_AIO=y | ||
| 112 | CONFIG_VM_EVENT_COUNTERS=y | 113 | CONFIG_VM_EVENT_COUNTERS=y |
| 114 | CONFIG_PCI_QUIRKS=y | ||
| 113 | CONFIG_SLAB=y | 115 | CONFIG_SLAB=y |
| 114 | # CONFIG_SLUB is not set | 116 | # CONFIG_SLUB is not set |
| 115 | # CONFIG_SLOB is not set | 117 | # CONFIG_SLOB is not set |
| @@ -122,10 +124,6 @@ CONFIG_HAVE_IOREMAP_PROT=y | |||
| 122 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
| 123 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
| 124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 126 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 127 | # CONFIG_HAVE_CLK is not set | ||
| 128 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 130 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
| 131 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
| @@ -158,6 +156,7 @@ CONFIG_DEFAULT_CFQ=y | |||
| 158 | # CONFIG_DEFAULT_NOOP is not set | 156 | # CONFIG_DEFAULT_NOOP is not set |
| 159 | CONFIG_DEFAULT_IOSCHED="cfq" | 157 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 160 | CONFIG_CLASSIC_RCU=y | 158 | CONFIG_CLASSIC_RCU=y |
| 159 | # CONFIG_FREEZER is not set | ||
| 161 | # CONFIG_PPC4xx_PCI_EXPRESS is not set | 160 | # CONFIG_PPC4xx_PCI_EXPRESS is not set |
| 162 | 161 | ||
| 163 | # | 162 | # |
| @@ -174,9 +173,13 @@ CONFIG_CLASSIC_RCU=y | |||
| 174 | # CONFIG_KATMAI is not set | 173 | # CONFIG_KATMAI is not set |
| 175 | # CONFIG_RAINIER is not set | 174 | # CONFIG_RAINIER is not set |
| 176 | # CONFIG_WARP is not set | 175 | # CONFIG_WARP is not set |
| 176 | # CONFIG_ARCHES is not set | ||
| 177 | # CONFIG_CANYONLANDS is not set | 177 | # CONFIG_CANYONLANDS is not set |
| 178 | # CONFIG_GLACIER is not set | ||
| 178 | # CONFIG_YOSEMITE is not set | 179 | # CONFIG_YOSEMITE is not set |
| 179 | CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y | 180 | CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y |
| 181 | # CONFIG_PPC44x_SIMPLE is not set | ||
| 182 | # CONFIG_PPC4xx_GPIO is not set | ||
| 180 | CONFIG_XILINX_VIRTEX=y | 183 | CONFIG_XILINX_VIRTEX=y |
| 181 | CONFIG_XILINX_VIRTEX_5_FXT=y | 184 | CONFIG_XILINX_VIRTEX_5_FXT=y |
| 182 | # CONFIG_IPIC is not set | 185 | # CONFIG_IPIC is not set |
| @@ -196,7 +199,6 @@ CONFIG_XILINX_VIRTEX_5_FXT=y | |||
| 196 | # Kernel options | 199 | # Kernel options |
| 197 | # | 200 | # |
| 198 | # CONFIG_HIGHMEM is not set | 201 | # CONFIG_HIGHMEM is not set |
| 199 | # CONFIG_TICK_ONESHOT is not set | ||
| 200 | # CONFIG_NO_HZ is not set | 202 | # CONFIG_NO_HZ is not set |
| 201 | # CONFIG_HIGH_RES_TIMERS is not set | 203 | # CONFIG_HIGH_RES_TIMERS is not set |
| 202 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 204 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| @@ -211,6 +213,8 @@ CONFIG_HZ=250 | |||
| 211 | CONFIG_PREEMPT=y | 213 | CONFIG_PREEMPT=y |
| 212 | # CONFIG_PREEMPT_RCU is not set | 214 | # CONFIG_PREEMPT_RCU is not set |
| 213 | CONFIG_BINFMT_ELF=y | 215 | CONFIG_BINFMT_ELF=y |
| 216 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 217 | # CONFIG_HAVE_AOUT is not set | ||
| 214 | # CONFIG_BINFMT_MISC is not set | 218 | # CONFIG_BINFMT_MISC is not set |
| 215 | CONFIG_MATH_EMULATION=y | 219 | CONFIG_MATH_EMULATION=y |
| 216 | # CONFIG_IOMMU_HELPER is not set | 220 | # CONFIG_IOMMU_HELPER is not set |
| @@ -225,15 +229,15 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 225 | # CONFIG_SPARSEMEM_MANUAL is not set | 229 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 226 | CONFIG_FLATMEM=y | 230 | CONFIG_FLATMEM=y |
| 227 | CONFIG_FLAT_NODE_MEM_MAP=y | 231 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 228 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 229 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 230 | CONFIG_PAGEFLAGS_EXTENDED=y | 232 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 233 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 232 | CONFIG_MIGRATION=y | 234 | CONFIG_MIGRATION=y |
| 233 | CONFIG_RESOURCES_64BIT=y | 235 | CONFIG_RESOURCES_64BIT=y |
| 236 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 234 | CONFIG_ZONE_DMA_FLAG=1 | 237 | CONFIG_ZONE_DMA_FLAG=1 |
| 235 | CONFIG_BOUNCE=y | 238 | CONFIG_BOUNCE=y |
| 236 | CONFIG_VIRT_TO_BUS=y | 239 | CONFIG_VIRT_TO_BUS=y |
| 240 | CONFIG_UNEVICTABLE_LRU=y | ||
| 237 | CONFIG_FORCE_MAX_ZONEORDER=11 | 241 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 238 | CONFIG_PROC_DEVICETREE=y | 242 | CONFIG_PROC_DEVICETREE=y |
| 239 | CONFIG_CMDLINE_BOOL=y | 243 | CONFIG_CMDLINE_BOOL=y |
| @@ -256,6 +260,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 256 | CONFIG_ARCH_SUPPORTS_MSI=y | 260 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 257 | # CONFIG_PCI_MSI is not set | 261 | # CONFIG_PCI_MSI is not set |
| 258 | CONFIG_PCI_LEGACY=y | 262 | CONFIG_PCI_LEGACY=y |
| 263 | # CONFIG_PCI_DEBUG is not set | ||
| 259 | # CONFIG_PCCARD is not set | 264 | # CONFIG_PCCARD is not set |
| 260 | # CONFIG_HOTPLUG_PCI is not set | 265 | # CONFIG_HOTPLUG_PCI is not set |
| 261 | # CONFIG_HAS_RAPIDIO is not set | 266 | # CONFIG_HAS_RAPIDIO is not set |
| @@ -317,7 +322,6 @@ CONFIG_INET_TCP_DIAG=y | |||
| 317 | CONFIG_TCP_CONG_CUBIC=y | 322 | CONFIG_TCP_CONG_CUBIC=y |
| 318 | CONFIG_DEFAULT_TCP_CONG="cubic" | 323 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 319 | # CONFIG_TCP_MD5SIG is not set | 324 | # CONFIG_TCP_MD5SIG is not set |
| 320 | # CONFIG_IP_VS is not set | ||
| 321 | CONFIG_IPV6=m | 325 | CONFIG_IPV6=m |
| 322 | # CONFIG_IPV6_PRIVACY is not set | 326 | # CONFIG_IPV6_PRIVACY is not set |
| 323 | # CONFIG_IPV6_ROUTER_PREF is not set | 327 | # CONFIG_IPV6_ROUTER_PREF is not set |
| @@ -352,8 +356,8 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 352 | # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set | 356 | # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set |
| 353 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | 357 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set |
| 354 | # CONFIG_NETFILTER_XT_TARGET_MARK is not set | 358 | # CONFIG_NETFILTER_XT_TARGET_MARK is not set |
| 355 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set | ||
| 356 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set | 359 | # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set |
| 360 | # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set | ||
| 357 | # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set | 361 | # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set |
| 358 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set | 362 | # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set |
| 359 | # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set | 363 | # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set |
| @@ -361,36 +365,38 @@ CONFIG_NETFILTER_XTABLES=m | |||
| 361 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | 365 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set |
| 362 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | 366 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set |
| 363 | # CONFIG_NETFILTER_XT_MATCH_ESP is not set | 367 | # CONFIG_NETFILTER_XT_MATCH_ESP is not set |
| 368 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | ||
| 364 | # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set | 369 | # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set |
| 365 | # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set | 370 | # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set |
| 366 | # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set | 371 | # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set |
| 367 | # CONFIG_NETFILTER_XT_MATCH_MAC is not set | 372 | # CONFIG_NETFILTER_XT_MATCH_MAC is not set |
| 368 | # CONFIG_NETFILTER_XT_MATCH_MARK is not set | 373 | # CONFIG_NETFILTER_XT_MATCH_MARK is not set |
| 374 | # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set | ||
| 369 | # CONFIG_NETFILTER_XT_MATCH_OWNER is not set | 375 | # CONFIG_NETFILTER_XT_MATCH_OWNER is not set |
| 370 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set | 376 | # CONFIG_NETFILTER_XT_MATCH_POLICY is not set |
| 371 | # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set | ||
| 372 | # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set | 377 | # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set |
| 373 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set | 378 | # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set |
| 374 | # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set | 379 | # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set |
| 375 | # CONFIG_NETFILTER_XT_MATCH_REALM is not set | 380 | # CONFIG_NETFILTER_XT_MATCH_REALM is not set |
| 381 | # CONFIG_NETFILTER_XT_MATCH_RECENT is not set | ||
| 376 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set | 382 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set |
| 377 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set | 383 | # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set |
| 378 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set | 384 | # CONFIG_NETFILTER_XT_MATCH_STRING is not set |
| 379 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set | 385 | # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set |
| 380 | # CONFIG_NETFILTER_XT_MATCH_TIME is not set | 386 | # CONFIG_NETFILTER_XT_MATCH_TIME is not set |
| 381 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | 387 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set |
| 382 | # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set | 388 | # CONFIG_IP_VS is not set |
| 383 | 389 | ||
| 384 | # | 390 | # |
| 385 | # IP: Netfilter Configuration | 391 | # IP: Netfilter Configuration |
| 386 | # | 392 | # |
| 393 | # CONFIG_NF_DEFRAG_IPV4 is not set | ||
| 387 | # CONFIG_IP_NF_QUEUE is not set | 394 | # CONFIG_IP_NF_QUEUE is not set |
| 388 | CONFIG_IP_NF_IPTABLES=m | 395 | CONFIG_IP_NF_IPTABLES=m |
| 389 | # CONFIG_IP_NF_MATCH_RECENT is not set | 396 | # CONFIG_IP_NF_MATCH_ADDRTYPE is not set |
| 390 | # CONFIG_IP_NF_MATCH_ECN is not set | ||
| 391 | # CONFIG_IP_NF_MATCH_AH is not set | 397 | # CONFIG_IP_NF_MATCH_AH is not set |
| 398 | # CONFIG_IP_NF_MATCH_ECN is not set | ||
| 392 | # CONFIG_IP_NF_MATCH_TTL is not set | 399 | # CONFIG_IP_NF_MATCH_TTL is not set |
| 393 | # CONFIG_IP_NF_MATCH_ADDRTYPE is not set | ||
| 394 | CONFIG_IP_NF_FILTER=m | 400 | CONFIG_IP_NF_FILTER=m |
| 395 | # CONFIG_IP_NF_TARGET_REJECT is not set | 401 | # CONFIG_IP_NF_TARGET_REJECT is not set |
| 396 | # CONFIG_IP_NF_TARGET_LOG is not set | 402 | # CONFIG_IP_NF_TARGET_LOG is not set |
| @@ -411,6 +417,7 @@ CONFIG_IP_NF_MANGLE=m | |||
| 411 | # CONFIG_TIPC is not set | 417 | # CONFIG_TIPC is not set |
| 412 | # CONFIG_ATM is not set | 418 | # CONFIG_ATM is not set |
| 413 | # CONFIG_BRIDGE is not set | 419 | # CONFIG_BRIDGE is not set |
| 420 | # CONFIG_NET_DSA is not set | ||
| 414 | # CONFIG_VLAN_8021Q is not set | 421 | # CONFIG_VLAN_8021Q is not set |
| 415 | # CONFIG_DECNET is not set | 422 | # CONFIG_DECNET is not set |
| 416 | # CONFIG_LLC2 is not set | 423 | # CONFIG_LLC2 is not set |
| @@ -431,11 +438,10 @@ CONFIG_IP_NF_MANGLE=m | |||
| 431 | # CONFIG_IRDA is not set | 438 | # CONFIG_IRDA is not set |
| 432 | # CONFIG_BT is not set | 439 | # CONFIG_BT is not set |
| 433 | # CONFIG_AF_RXRPC is not set | 440 | # CONFIG_AF_RXRPC is not set |
| 434 | 441 | # CONFIG_PHONET is not set | |
| 435 | # | 442 | CONFIG_WIRELESS=y |
| 436 | # Wireless | ||
| 437 | # | ||
| 438 | # CONFIG_CFG80211 is not set | 443 | # CONFIG_CFG80211 is not set |
| 444 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
| 439 | # CONFIG_WIRELESS_EXT is not set | 445 | # CONFIG_WIRELESS_EXT is not set |
| 440 | # CONFIG_MAC80211 is not set | 446 | # CONFIG_MAC80211 is not set |
| 441 | # CONFIG_IEEE80211 is not set | 447 | # CONFIG_IEEE80211 is not set |
| @@ -455,11 +461,13 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 455 | CONFIG_FW_LOADER=y | 461 | CONFIG_FW_LOADER=y |
| 456 | CONFIG_FIRMWARE_IN_KERNEL=y | 462 | CONFIG_FIRMWARE_IN_KERNEL=y |
| 457 | CONFIG_EXTRA_FIRMWARE="" | 463 | CONFIG_EXTRA_FIRMWARE="" |
| 464 | # CONFIG_DEBUG_DRIVER is not set | ||
| 465 | # CONFIG_DEBUG_DEVRES is not set | ||
| 458 | # CONFIG_SYS_HYPERVISOR is not set | 466 | # CONFIG_SYS_HYPERVISOR is not set |
| 459 | # CONFIG_CONNECTOR is not set | 467 | # CONFIG_CONNECTOR is not set |
| 460 | # CONFIG_MTD is not set | 468 | # CONFIG_MTD is not set |
| 461 | CONFIG_OF_DEVICE=y | 469 | CONFIG_OF_DEVICE=y |
| 462 | CONFIG_OF_I2C=y | 470 | CONFIG_OF_GPIO=y |
| 463 | # CONFIG_PARPORT is not set | 471 | # CONFIG_PARPORT is not set |
| 464 | CONFIG_BLK_DEV=y | 472 | CONFIG_BLK_DEV=y |
| 465 | # CONFIG_BLK_DEV_FD is not set | 473 | # CONFIG_BLK_DEV_FD is not set |
| @@ -478,7 +486,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 | |||
| 478 | # CONFIG_BLK_DEV_XIP is not set | 486 | # CONFIG_BLK_DEV_XIP is not set |
| 479 | # CONFIG_CDROM_PKTCDVD is not set | 487 | # CONFIG_CDROM_PKTCDVD is not set |
| 480 | # CONFIG_ATA_OVER_ETH is not set | 488 | # CONFIG_ATA_OVER_ETH is not set |
| 481 | # CONFIG_XILINX_SYSACE is not set | 489 | CONFIG_XILINX_SYSACE=y |
| 482 | # CONFIG_BLK_DEV_HD is not set | 490 | # CONFIG_BLK_DEV_HD is not set |
| 483 | CONFIG_MISC_DEVICES=y | 491 | CONFIG_MISC_DEVICES=y |
| 484 | # CONFIG_PHANTOM is not set | 492 | # CONFIG_PHANTOM is not set |
| @@ -487,6 +495,7 @@ CONFIG_MISC_DEVICES=y | |||
| 487 | # CONFIG_TIFM_CORE is not set | 495 | # CONFIG_TIFM_CORE is not set |
| 488 | # CONFIG_ENCLOSURE_SERVICES is not set | 496 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 489 | # CONFIG_HP_ILO is not set | 497 | # CONFIG_HP_ILO is not set |
| 498 | # CONFIG_C2PORT is not set | ||
| 490 | CONFIG_HAVE_IDE=y | 499 | CONFIG_HAVE_IDE=y |
| 491 | # CONFIG_IDE is not set | 500 | # CONFIG_IDE is not set |
| 492 | 501 | ||
| @@ -534,8 +543,12 @@ CONFIG_MII=y | |||
| 534 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 543 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 535 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 544 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 536 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 545 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 546 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 547 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 548 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 537 | # CONFIG_NET_PCI is not set | 549 | # CONFIG_NET_PCI is not set |
| 538 | # CONFIG_B44 is not set | 550 | # CONFIG_B44 is not set |
| 551 | # CONFIG_ATL2 is not set | ||
| 539 | CONFIG_NETDEV_1000=y | 552 | CONFIG_NETDEV_1000=y |
| 540 | # CONFIG_ACENIC is not set | 553 | # CONFIG_ACENIC is not set |
| 541 | # CONFIG_DL2K is not set | 554 | # CONFIG_DL2K is not set |
| @@ -556,6 +569,7 @@ CONFIG_NETDEV_1000=y | |||
| 556 | # CONFIG_QLA3XXX is not set | 569 | # CONFIG_QLA3XXX is not set |
| 557 | # CONFIG_ATL1 is not set | 570 | # CONFIG_ATL1 is not set |
| 558 | # CONFIG_ATL1E is not set | 571 | # CONFIG_ATL1E is not set |
| 572 | # CONFIG_JME is not set | ||
| 559 | # CONFIG_NETDEV_10000 is not set | 573 | # CONFIG_NETDEV_10000 is not set |
| 560 | # CONFIG_TR is not set | 574 | # CONFIG_TR is not set |
| 561 | 575 | ||
| @@ -604,6 +618,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 604 | # CONFIG_KEYBOARD_XTKBD is not set | 618 | # CONFIG_KEYBOARD_XTKBD is not set |
| 605 | # CONFIG_KEYBOARD_NEWTON is not set | 619 | # CONFIG_KEYBOARD_NEWTON is not set |
| 606 | # CONFIG_KEYBOARD_STOWAWAY is not set | 620 | # CONFIG_KEYBOARD_STOWAWAY is not set |
| 621 | # CONFIG_KEYBOARD_GPIO is not set | ||
| 607 | CONFIG_INPUT_MOUSE=y | 622 | CONFIG_INPUT_MOUSE=y |
| 608 | CONFIG_MOUSE_PS2=y | 623 | CONFIG_MOUSE_PS2=y |
| 609 | CONFIG_MOUSE_PS2_ALPS=y | 624 | CONFIG_MOUSE_PS2_ALPS=y |
| @@ -611,9 +626,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
| 611 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 626 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
| 612 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 627 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
| 613 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 628 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
| 629 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
| 614 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 630 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
| 615 | # CONFIG_MOUSE_SERIAL is not set | 631 | # CONFIG_MOUSE_SERIAL is not set |
| 616 | # CONFIG_MOUSE_VSXXXAA is not set | 632 | # CONFIG_MOUSE_VSXXXAA is not set |
| 633 | # CONFIG_MOUSE_GPIO is not set | ||
| 617 | # CONFIG_INPUT_JOYSTICK is not set | 634 | # CONFIG_INPUT_JOYSTICK is not set |
| 618 | # CONFIG_INPUT_TABLET is not set | 635 | # CONFIG_INPUT_TABLET is not set |
| 619 | # CONFIG_INPUT_TOUCHSCREEN is not set | 636 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| @@ -624,11 +641,11 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 624 | # | 641 | # |
| 625 | CONFIG_SERIO=y | 642 | CONFIG_SERIO=y |
| 626 | # CONFIG_SERIO_I8042 is not set | 643 | # CONFIG_SERIO_I8042 is not set |
| 627 | CONFIG_SERIO_SERPORT=y | 644 | # CONFIG_SERIO_SERPORT is not set |
| 628 | # CONFIG_SERIO_PCIPS2 is not set | 645 | # CONFIG_SERIO_PCIPS2 is not set |
| 629 | CONFIG_SERIO_LIBPS2=y | 646 | CONFIG_SERIO_LIBPS2=y |
| 630 | # CONFIG_SERIO_RAW is not set | 647 | # CONFIG_SERIO_RAW is not set |
| 631 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | 648 | CONFIG_SERIO_XILINX_XPS_PS2=y |
| 632 | # CONFIG_GAMEPORT is not set | 649 | # CONFIG_GAMEPORT is not set |
| 633 | 650 | ||
| 634 | # | 651 | # |
| @@ -656,11 +673,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
| 656 | # | 673 | # |
| 657 | # Non-8250 serial port support | 674 | # Non-8250 serial port support |
| 658 | # | 675 | # |
| 659 | # CONFIG_SERIAL_UARTLITE is not set | 676 | CONFIG_SERIAL_UARTLITE=y |
| 677 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | ||
| 660 | CONFIG_SERIAL_CORE=y | 678 | CONFIG_SERIAL_CORE=y |
| 661 | CONFIG_SERIAL_CORE_CONSOLE=y | 679 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 662 | # CONFIG_SERIAL_JSM is not set | 680 | # CONFIG_SERIAL_JSM is not set |
| 663 | CONFIG_SERIAL_OF_PLATFORM=y | 681 | # CONFIG_SERIAL_OF_PLATFORM is not set |
| 664 | CONFIG_UNIX98_PTYS=y | 682 | CONFIG_UNIX98_PTYS=y |
| 665 | CONFIG_LEGACY_PTYS=y | 683 | CONFIG_LEGACY_PTYS=y |
| 666 | CONFIG_LEGACY_PTY_COUNT=256 | 684 | CONFIG_LEGACY_PTY_COUNT=256 |
| @@ -674,87 +692,41 @@ CONFIG_XILINX_HWICAP=y | |||
| 674 | # CONFIG_RAW_DRIVER is not set | 692 | # CONFIG_RAW_DRIVER is not set |
| 675 | # CONFIG_TCG_TPM is not set | 693 | # CONFIG_TCG_TPM is not set |
| 676 | CONFIG_DEVPORT=y | 694 | CONFIG_DEVPORT=y |
| 677 | CONFIG_I2C=y | 695 | # CONFIG_I2C is not set |
| 678 | CONFIG_I2C_BOARDINFO=y | 696 | # CONFIG_SPI is not set |
| 679 | CONFIG_I2C_CHARDEV=y | 697 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 680 | 698 | CONFIG_GPIOLIB=y | |
| 681 | # | 699 | # CONFIG_DEBUG_GPIO is not set |
| 682 | # I2C Hardware Bus support | 700 | CONFIG_GPIO_SYSFS=y |
| 683 | # | ||
| 684 | |||
| 685 | # | ||
| 686 | # PC SMBus host controller drivers | ||
| 687 | # | ||
| 688 | # CONFIG_I2C_ALI1535 is not set | ||
| 689 | # CONFIG_I2C_ALI1563 is not set | ||
| 690 | # CONFIG_I2C_ALI15X3 is not set | ||
| 691 | # CONFIG_I2C_AMD756 is not set | ||
| 692 | # CONFIG_I2C_AMD8111 is not set | ||
| 693 | # CONFIG_I2C_I801 is not set | ||
| 694 | # CONFIG_I2C_ISCH is not set | ||
| 695 | # CONFIG_I2C_PIIX4 is not set | ||
| 696 | # CONFIG_I2C_NFORCE2 is not set | ||
| 697 | # CONFIG_I2C_SIS5595 is not set | ||
| 698 | # CONFIG_I2C_SIS630 is not set | ||
| 699 | # CONFIG_I2C_SIS96X is not set | ||
| 700 | # CONFIG_I2C_VIA is not set | ||
| 701 | # CONFIG_I2C_VIAPRO is not set | ||
| 702 | 701 | ||
| 703 | # | 702 | # |
| 704 | # I2C system bus drivers (mostly embedded / system-on-chip) | 703 | # Memory mapped GPIO expanders: |
| 705 | # | 704 | # |
| 706 | # CONFIG_I2C_IBM_IIC is not set | 705 | CONFIG_GPIO_XILINX=y |
| 707 | # CONFIG_I2C_MPC is not set | ||
| 708 | # CONFIG_I2C_OCORES is not set | ||
| 709 | # CONFIG_I2C_SIMTEC is not set | ||
| 710 | 706 | ||
| 711 | # | 707 | # |
| 712 | # External I2C/SMBus adapter drivers | 708 | # I2C GPIO expanders: |
| 713 | # | 709 | # |
| 714 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 715 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 716 | 710 | ||
| 717 | # | 711 | # |
| 718 | # Graphics adapter I2C/DDC channel drivers | 712 | # PCI GPIO expanders: |
| 719 | # | 713 | # |
| 720 | # CONFIG_I2C_VOODOO3 is not set | 714 | # CONFIG_GPIO_BT8XX is not set |
| 721 | 715 | ||
| 722 | # | 716 | # |
| 723 | # Other I2C/SMBus bus drivers | 717 | # SPI GPIO expanders: |
| 724 | # | 718 | # |
| 725 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 726 | # CONFIG_I2C_STUB is not set | ||
| 727 | |||
| 728 | # | ||
| 729 | # Miscellaneous I2C Chip support | ||
| 730 | # | ||
| 731 | # CONFIG_DS1682 is not set | ||
| 732 | # CONFIG_AT24 is not set | ||
| 733 | # CONFIG_SENSORS_EEPROM is not set | ||
| 734 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 735 | # CONFIG_PCF8575 is not set | ||
| 736 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 737 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 738 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 739 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 740 | CONFIG_I2C_DEBUG_CORE=y | ||
| 741 | CONFIG_I2C_DEBUG_ALGO=y | ||
| 742 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 743 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 744 | # CONFIG_SPI is not set | ||
| 745 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 746 | # CONFIG_GPIOLIB is not set | ||
| 747 | # CONFIG_W1 is not set | 719 | # CONFIG_W1 is not set |
| 748 | # CONFIG_POWER_SUPPLY is not set | 720 | # CONFIG_POWER_SUPPLY is not set |
| 749 | # CONFIG_HWMON is not set | 721 | # CONFIG_HWMON is not set |
| 750 | # CONFIG_THERMAL is not set | 722 | # CONFIG_THERMAL is not set |
| 751 | # CONFIG_THERMAL_HWMON is not set | 723 | # CONFIG_THERMAL_HWMON is not set |
| 752 | # CONFIG_WATCHDOG is not set | 724 | # CONFIG_WATCHDOG is not set |
| 725 | CONFIG_SSB_POSSIBLE=y | ||
| 753 | 726 | ||
| 754 | # | 727 | # |
| 755 | # Sonics Silicon Backplane | 728 | # Sonics Silicon Backplane |
| 756 | # | 729 | # |
| 757 | CONFIG_SSB_POSSIBLE=y | ||
| 758 | # CONFIG_SSB is not set | 730 | # CONFIG_SSB is not set |
| 759 | 731 | ||
| 760 | # | 732 | # |
| @@ -763,6 +735,8 @@ CONFIG_SSB_POSSIBLE=y | |||
| 763 | # CONFIG_MFD_CORE is not set | 735 | # CONFIG_MFD_CORE is not set |
| 764 | # CONFIG_MFD_SM501 is not set | 736 | # CONFIG_MFD_SM501 is not set |
| 765 | # CONFIG_HTC_PASIC3 is not set | 737 | # CONFIG_HTC_PASIC3 is not set |
| 738 | # CONFIG_MFD_TMIO is not set | ||
| 739 | # CONFIG_REGULATOR is not set | ||
| 766 | 740 | ||
| 767 | # | 741 | # |
| 768 | # Multimedia devices | 742 | # Multimedia devices |
| @@ -790,6 +764,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 790 | CONFIG_FB=y | 764 | CONFIG_FB=y |
| 791 | # CONFIG_FIRMWARE_EDID is not set | 765 | # CONFIG_FIRMWARE_EDID is not set |
| 792 | # CONFIG_FB_DDC is not set | 766 | # CONFIG_FB_DDC is not set |
| 767 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 793 | CONFIG_FB_CFB_FILLRECT=y | 768 | CONFIG_FB_CFB_FILLRECT=y |
| 794 | CONFIG_FB_CFB_COPYAREA=y | 769 | CONFIG_FB_CFB_COPYAREA=y |
| 795 | CONFIG_FB_CFB_IMAGEBLIT=y | 770 | CONFIG_FB_CFB_IMAGEBLIT=y |
| @@ -826,6 +801,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 826 | # CONFIG_FB_S3 is not set | 801 | # CONFIG_FB_S3 is not set |
| 827 | # CONFIG_FB_SAVAGE is not set | 802 | # CONFIG_FB_SAVAGE is not set |
| 828 | # CONFIG_FB_SIS is not set | 803 | # CONFIG_FB_SIS is not set |
| 804 | # CONFIG_FB_VIA is not set | ||
| 829 | # CONFIG_FB_NEOMAGIC is not set | 805 | # CONFIG_FB_NEOMAGIC is not set |
| 830 | # CONFIG_FB_KYRO is not set | 806 | # CONFIG_FB_KYRO is not set |
| 831 | # CONFIG_FB_3DFX is not set | 807 | # CONFIG_FB_3DFX is not set |
| @@ -838,6 +814,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 838 | # CONFIG_FB_IBM_GXT4500 is not set | 814 | # CONFIG_FB_IBM_GXT4500 is not set |
| 839 | CONFIG_FB_XILINX=y | 815 | CONFIG_FB_XILINX=y |
| 840 | # CONFIG_FB_VIRTUAL is not set | 816 | # CONFIG_FB_VIRTUAL is not set |
| 817 | # CONFIG_FB_METRONOME is not set | ||
| 818 | # CONFIG_FB_MB862XX is not set | ||
| 841 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 819 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 842 | 820 | ||
| 843 | # | 821 | # |
| @@ -870,6 +848,7 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
| 870 | # CONFIG_SOUND is not set | 848 | # CONFIG_SOUND is not set |
| 871 | # CONFIG_HID_SUPPORT is not set | 849 | # CONFIG_HID_SUPPORT is not set |
| 872 | # CONFIG_USB_SUPPORT is not set | 850 | # CONFIG_USB_SUPPORT is not set |
| 851 | # CONFIG_UWB is not set | ||
| 873 | # CONFIG_MMC is not set | 852 | # CONFIG_MMC is not set |
| 874 | # CONFIG_MEMSTICK is not set | 853 | # CONFIG_MEMSTICK is not set |
| 875 | # CONFIG_NEW_LEDS is not set | 854 | # CONFIG_NEW_LEDS is not set |
| @@ -879,6 +858,8 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
| 879 | # CONFIG_RTC_CLASS is not set | 858 | # CONFIG_RTC_CLASS is not set |
| 880 | # CONFIG_DMADEVICES is not set | 859 | # CONFIG_DMADEVICES is not set |
| 881 | # CONFIG_UIO is not set | 860 | # CONFIG_UIO is not set |
| 861 | # CONFIG_STAGING is not set | ||
| 862 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 882 | 863 | ||
| 883 | # | 864 | # |
| 884 | # File systems | 865 | # File systems |
| @@ -887,10 +868,11 @@ CONFIG_EXT2_FS=y | |||
| 887 | # CONFIG_EXT2_FS_XATTR is not set | 868 | # CONFIG_EXT2_FS_XATTR is not set |
| 888 | # CONFIG_EXT2_FS_XIP is not set | 869 | # CONFIG_EXT2_FS_XIP is not set |
| 889 | # CONFIG_EXT3_FS is not set | 870 | # CONFIG_EXT3_FS is not set |
| 890 | # CONFIG_EXT4DEV_FS is not set | 871 | # CONFIG_EXT4_FS is not set |
| 891 | # CONFIG_REISERFS_FS is not set | 872 | # CONFIG_REISERFS_FS is not set |
| 892 | # CONFIG_JFS_FS is not set | 873 | # CONFIG_JFS_FS is not set |
| 893 | # CONFIG_FS_POSIX_ACL is not set | 874 | # CONFIG_FS_POSIX_ACL is not set |
| 875 | CONFIG_FILE_LOCKING=y | ||
| 894 | # CONFIG_XFS_FS is not set | 876 | # CONFIG_XFS_FS is not set |
| 895 | # CONFIG_OCFS2_FS is not set | 877 | # CONFIG_OCFS2_FS is not set |
| 896 | CONFIG_DNOTIFY=y | 878 | CONFIG_DNOTIFY=y |
| @@ -899,7 +881,7 @@ CONFIG_INOTIFY_USER=y | |||
| 899 | # CONFIG_QUOTA is not set | 881 | # CONFIG_QUOTA is not set |
| 900 | CONFIG_AUTOFS_FS=y | 882 | CONFIG_AUTOFS_FS=y |
| 901 | CONFIG_AUTOFS4_FS=y | 883 | CONFIG_AUTOFS4_FS=y |
| 902 | CONFIG_FUSE_FS=m | 884 | # CONFIG_FUSE_FS is not set |
| 903 | 885 | ||
| 904 | # | 886 | # |
| 905 | # CD-ROM/DVD Filesystems | 887 | # CD-ROM/DVD Filesystems |
| @@ -923,6 +905,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 923 | CONFIG_PROC_FS=y | 905 | CONFIG_PROC_FS=y |
| 924 | # CONFIG_PROC_KCORE is not set | 906 | # CONFIG_PROC_KCORE is not set |
| 925 | CONFIG_PROC_SYSCTL=y | 907 | CONFIG_PROC_SYSCTL=y |
| 908 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 926 | CONFIG_SYSFS=y | 909 | CONFIG_SYSFS=y |
| 927 | CONFIG_TMPFS=y | 910 | CONFIG_TMPFS=y |
| 928 | # CONFIG_TMPFS_POSIX_ACL is not set | 911 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -954,19 +937,15 @@ CONFIG_NFS_V3=y | |||
| 954 | # CONFIG_NFS_V3_ACL is not set | 937 | # CONFIG_NFS_V3_ACL is not set |
| 955 | # CONFIG_NFS_V4 is not set | 938 | # CONFIG_NFS_V4 is not set |
| 956 | CONFIG_ROOT_NFS=y | 939 | CONFIG_ROOT_NFS=y |
| 957 | CONFIG_NFSD=y | 940 | # CONFIG_NFSD is not set |
| 958 | CONFIG_NFSD_V3=y | ||
| 959 | # CONFIG_NFSD_V3_ACL is not set | ||
| 960 | # CONFIG_NFSD_V4 is not set | ||
| 961 | CONFIG_LOCKD=y | 941 | CONFIG_LOCKD=y |
| 962 | CONFIG_LOCKD_V4=y | 942 | CONFIG_LOCKD_V4=y |
| 963 | CONFIG_EXPORTFS=y | ||
| 964 | CONFIG_NFS_COMMON=y | 943 | CONFIG_NFS_COMMON=y |
| 965 | CONFIG_SUNRPC=y | 944 | CONFIG_SUNRPC=y |
| 945 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 966 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 946 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 967 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 947 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 968 | CONFIG_SMB_FS=y | 948 | # CONFIG_SMB_FS is not set |
| 969 | # CONFIG_SMB_NLS_DEFAULT is not set | ||
| 970 | # CONFIG_CIFS is not set | 949 | # CONFIG_CIFS is not set |
| 971 | # CONFIG_NCP_FS is not set | 950 | # CONFIG_NCP_FS is not set |
| 972 | # CONFIG_CODA_FS is not set | 951 | # CONFIG_CODA_FS is not set |
| @@ -1023,7 +1002,6 @@ CONFIG_NLS_UTF8=m | |||
| 1023 | # Library routines | 1002 | # Library routines |
| 1024 | # | 1003 | # |
| 1025 | CONFIG_BITREVERSE=y | 1004 | CONFIG_BITREVERSE=y |
| 1026 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1027 | CONFIG_CRC_CCITT=y | 1005 | CONFIG_CRC_CCITT=y |
| 1028 | # CONFIG_CRC16 is not set | 1006 | # CONFIG_CRC16 is not set |
| 1029 | # CONFIG_CRC_T10DIF is not set | 1007 | # CONFIG_CRC_T10DIF is not set |
| @@ -1041,7 +1019,7 @@ CONFIG_HAVE_LMB=y | |||
| 1041 | # | 1019 | # |
| 1042 | # Kernel hacking | 1020 | # Kernel hacking |
| 1043 | # | 1021 | # |
| 1044 | # CONFIG_PRINTK_TIME is not set | 1022 | CONFIG_PRINTK_TIME=y |
| 1045 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1023 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1046 | CONFIG_ENABLE_MUST_CHECK=y | 1024 | CONFIG_ENABLE_MUST_CHECK=y |
| 1047 | CONFIG_FRAME_WARN=1024 | 1025 | CONFIG_FRAME_WARN=1024 |
| @@ -1049,19 +1027,62 @@ CONFIG_FRAME_WARN=1024 | |||
| 1049 | # CONFIG_UNUSED_SYMBOLS is not set | 1027 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1050 | # CONFIG_DEBUG_FS is not set | 1028 | # CONFIG_DEBUG_FS is not set |
| 1051 | # CONFIG_HEADERS_CHECK is not set | 1029 | # CONFIG_HEADERS_CHECK is not set |
| 1052 | # CONFIG_DEBUG_KERNEL is not set | 1030 | CONFIG_DEBUG_KERNEL=y |
| 1031 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1032 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1033 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1034 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1035 | CONFIG_SCHED_DEBUG=y | ||
| 1036 | # CONFIG_SCHEDSTATS is not set | ||
| 1037 | # CONFIG_TIMER_STATS is not set | ||
| 1038 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1039 | # CONFIG_DEBUG_SLAB is not set | ||
| 1040 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1041 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1042 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1043 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1044 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1045 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1046 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1053 | CONFIG_DEBUG_BUGVERBOSE=y | 1047 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1048 | CONFIG_DEBUG_INFO=y | ||
| 1049 | # CONFIG_DEBUG_VM is not set | ||
| 1050 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1054 | CONFIG_DEBUG_MEMORY_INIT=y | 1051 | CONFIG_DEBUG_MEMORY_INIT=y |
| 1052 | # CONFIG_DEBUG_LIST is not set | ||
| 1053 | # CONFIG_DEBUG_SG is not set | ||
| 1054 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1055 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1056 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1057 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1058 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1059 | # CONFIG_FAULT_INJECTION is not set | ||
| 1055 | # CONFIG_LATENCYTOP is not set | 1060 | # CONFIG_LATENCYTOP is not set |
| 1056 | CONFIG_HAVE_FTRACE=y | 1061 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1057 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1062 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1058 | # CONFIG_FTRACE is not set | 1063 | |
| 1064 | # | ||
| 1065 | # Tracers | ||
| 1066 | # | ||
| 1067 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1059 | # CONFIG_PREEMPT_TRACER is not set | 1068 | # CONFIG_PREEMPT_TRACER is not set |
| 1060 | # CONFIG_SCHED_TRACER is not set | 1069 | # CONFIG_SCHED_TRACER is not set |
| 1061 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1070 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1071 | # CONFIG_BOOT_TRACER is not set | ||
| 1072 | # CONFIG_STACK_TRACER is not set | ||
| 1073 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1062 | # CONFIG_SAMPLES is not set | 1074 | # CONFIG_SAMPLES is not set |
| 1063 | CONFIG_HAVE_ARCH_KGDB=y | 1075 | CONFIG_HAVE_ARCH_KGDB=y |
| 1076 | # CONFIG_KGDB is not set | ||
| 1077 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
| 1078 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1079 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 1080 | # CONFIG_CODE_PATCHING_SELFTEST is not set | ||
| 1081 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1082 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
| 1083 | # CONFIG_XMON is not set | ||
| 1064 | # CONFIG_IRQSTACKS is not set | 1084 | # CONFIG_IRQSTACKS is not set |
| 1085 | # CONFIG_BDI_SWITCH is not set | ||
| 1065 | # CONFIG_PPC_EARLY_DEBUG is not set | 1086 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1066 | 1087 | ||
| 1067 | # | 1088 | # |
| @@ -1069,12 +1090,14 @@ CONFIG_HAVE_ARCH_KGDB=y | |||
| 1069 | # | 1090 | # |
| 1070 | # CONFIG_KEYS is not set | 1091 | # CONFIG_KEYS is not set |
| 1071 | # CONFIG_SECURITY is not set | 1092 | # CONFIG_SECURITY is not set |
| 1093 | # CONFIG_SECURITYFS is not set | ||
| 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1094 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1073 | CONFIG_CRYPTO=y | 1095 | CONFIG_CRYPTO=y |
| 1074 | 1096 | ||
| 1075 | # | 1097 | # |
| 1076 | # Crypto core or helper | 1098 | # Crypto core or helper |
| 1077 | # | 1099 | # |
| 1100 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1078 | # CONFIG_CRYPTO_MANAGER is not set | 1101 | # CONFIG_CRYPTO_MANAGER is not set |
| 1079 | # CONFIG_CRYPTO_GF128MUL is not set | 1102 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1080 | # CONFIG_CRYPTO_NULL is not set | 1103 | # CONFIG_CRYPTO_NULL is not set |
| @@ -1147,6 +1170,11 @@ CONFIG_CRYPTO=y | |||
| 1147 | # | 1170 | # |
| 1148 | # CONFIG_CRYPTO_DEFLATE is not set | 1171 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1149 | # CONFIG_CRYPTO_LZO is not set | 1172 | # CONFIG_CRYPTO_LZO is not set |
| 1173 | |||
| 1174 | # | ||
| 1175 | # Random Number Generation | ||
| 1176 | # | ||
| 1177 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1150 | CONFIG_CRYPTO_HW=y | 1178 | CONFIG_CRYPTO_HW=y |
| 1151 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1179 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1152 | # CONFIG_PPC_CLOCK is not set | 1180 | # CONFIG_PPC_CLOCK is not set |
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig index c10f7395aa1b..3df627494b65 100644 --- a/arch/powerpc/configs/52xx/cm5200_defconfig +++ b/arch/powerpc/configs/52xx/cm5200_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.25 | 3 | # Linux kernel version: 2.6.28-rc4 |
| 4 | # Tue Apr 29 07:11:37 2008 | 4 | # Thu Nov 13 02:12:40 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y | |||
| 22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| @@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -102,6 +103,7 @@ CONFIG_SIGNALFD=y | |||
| 102 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 103 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 104 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 105 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 106 | CONFIG_SLUB_DEBUG=y | 108 | CONFIG_SLUB_DEBUG=y |
| 107 | # CONFIG_SLAB is not set | 109 | # CONFIG_SLAB is not set |
| @@ -110,9 +112,13 @@ CONFIG_SLUB=y | |||
| 110 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
| 111 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
| 112 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 113 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 115 | CONFIG_PROC_PAGE_MONITOR=y | 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 120 | CONFIG_HAVE_CLK=y | ||
| 121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 116 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 117 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
| 118 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
| @@ -123,6 +129,7 @@ CONFIG_BLOCK=y | |||
| 123 | # CONFIG_BLK_DEV_IO_TRACE is not set | 129 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 124 | # CONFIG_LSF is not set | 130 | # CONFIG_LSF is not set |
| 125 | # CONFIG_BLK_DEV_BSG is not set | 131 | # CONFIG_BLK_DEV_BSG is not set |
| 132 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 126 | 133 | ||
| 127 | # | 134 | # |
| 128 | # IO Schedulers | 135 | # IO Schedulers |
| @@ -137,19 +144,16 @@ CONFIG_DEFAULT_AS=y | |||
| 137 | # CONFIG_DEFAULT_NOOP is not set | 144 | # CONFIG_DEFAULT_NOOP is not set |
| 138 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 145 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 139 | CONFIG_CLASSIC_RCU=y | 146 | CONFIG_CLASSIC_RCU=y |
| 147 | # CONFIG_FREEZER is not set | ||
| 140 | 148 | ||
| 141 | # | 149 | # |
| 142 | # Platform support | 150 | # Platform support |
| 143 | # | 151 | # |
| 144 | CONFIG_PPC_MULTIPLATFORM=y | 152 | CONFIG_PPC_MULTIPLATFORM=y |
| 145 | # CONFIG_PPC_82xx is not set | ||
| 146 | # CONFIG_PPC_83xx is not set | ||
| 147 | # CONFIG_PPC_86xx is not set | ||
| 148 | CONFIG_CLASSIC32=y | 153 | CONFIG_CLASSIC32=y |
| 149 | # CONFIG_PPC_CHRP is not set | 154 | # CONFIG_PPC_CHRP is not set |
| 150 | # CONFIG_PPC_MPC512x is not set | ||
| 151 | # CONFIG_PPC_MPC5121 is not set | ||
| 152 | # CONFIG_MPC5121_ADS is not set | 155 | # CONFIG_MPC5121_ADS is not set |
| 156 | # CONFIG_MPC5121_GENERIC is not set | ||
| 153 | CONFIG_PPC_MPC52xx=y | 157 | CONFIG_PPC_MPC52xx=y |
| 154 | CONFIG_PPC_MPC5200_SIMPLE=y | 158 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 155 | # CONFIG_PPC_EFIKA is not set | 159 | # CONFIG_PPC_EFIKA is not set |
| @@ -159,7 +163,10 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
| 159 | # CONFIG_PPC_PMAC is not set | 163 | # CONFIG_PPC_PMAC is not set |
| 160 | # CONFIG_PPC_CELL is not set | 164 | # CONFIG_PPC_CELL is not set |
| 161 | # CONFIG_PPC_CELL_NATIVE is not set | 165 | # CONFIG_PPC_CELL_NATIVE is not set |
| 166 | # CONFIG_PPC_82xx is not set | ||
| 162 | # CONFIG_PQ2ADS is not set | 167 | # CONFIG_PQ2ADS is not set |
| 168 | # CONFIG_PPC_83xx is not set | ||
| 169 | # CONFIG_PPC_86xx is not set | ||
| 163 | # CONFIG_EMBEDDED6xx is not set | 170 | # CONFIG_EMBEDDED6xx is not set |
| 164 | # CONFIG_IPIC is not set | 171 | # CONFIG_IPIC is not set |
| 165 | # CONFIG_MPIC is not set | 172 | # CONFIG_MPIC is not set |
| @@ -183,7 +190,6 @@ CONFIG_PPC_BESTCOMM_FEC=y | |||
| 183 | # Kernel options | 190 | # Kernel options |
| 184 | # | 191 | # |
| 185 | # CONFIG_HIGHMEM is not set | 192 | # CONFIG_HIGHMEM is not set |
| 186 | # CONFIG_TICK_ONESHOT is not set | ||
| 187 | # CONFIG_NO_HZ is not set | 193 | # CONFIG_NO_HZ is not set |
| 188 | # CONFIG_HIGH_RES_TIMERS is not set | 194 | # CONFIG_HIGH_RES_TIMERS is not set |
| 189 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 195 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| @@ -197,6 +203,8 @@ CONFIG_PREEMPT_NONE=y | |||
| 197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 203 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 198 | # CONFIG_PREEMPT is not set | 204 | # CONFIG_PREEMPT is not set |
| 199 | CONFIG_BINFMT_ELF=y | 205 | CONFIG_BINFMT_ELF=y |
| 206 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 207 | # CONFIG_HAVE_AOUT is not set | ||
| 200 | # CONFIG_BINFMT_MISC is not set | 208 | # CONFIG_BINFMT_MISC is not set |
| 201 | # CONFIG_IOMMU_HELPER is not set | 209 | # CONFIG_IOMMU_HELPER is not set |
| 202 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 210 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -211,19 +219,20 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 211 | # CONFIG_SPARSEMEM_MANUAL is not set | 219 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 212 | CONFIG_FLATMEM=y | 220 | CONFIG_FLATMEM=y |
| 213 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 214 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 224 | CONFIG_MIGRATION=y | ||
| 218 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
| 226 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 219 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 220 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| 221 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_UNEVICTABLE_LRU=y | ||
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 223 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
| 234 | CONFIG_EXTRA_TARGETS="" | ||
| 225 | CONFIG_PM=y | 235 | CONFIG_PM=y |
| 226 | # CONFIG_PM_LEGACY is not set | ||
| 227 | # CONFIG_PM_DEBUG is not set | 236 | # CONFIG_PM_DEBUG is not set |
| 228 | CONFIG_SECCOMP=y | 237 | CONFIG_SECCOMP=y |
| 229 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
| @@ -233,7 +242,7 @@ CONFIG_ISA_DMA_API=y | |||
| 233 | # | 242 | # |
| 234 | CONFIG_ZONE_DMA=y | 243 | CONFIG_ZONE_DMA=y |
| 235 | CONFIG_GENERIC_ISA_DMA=y | 244 | CONFIG_GENERIC_ISA_DMA=y |
| 236 | CONFIG_FSL_SOC=y | 245 | CONFIG_PPC_PCI_CHOICE=y |
| 237 | # CONFIG_PCI is not set | 246 | # CONFIG_PCI is not set |
| 238 | # CONFIG_PCI_DOMAINS is not set | 247 | # CONFIG_PCI_DOMAINS is not set |
| 239 | # CONFIG_PCI_SYSCALL is not set | 248 | # CONFIG_PCI_SYSCALL is not set |
| @@ -254,10 +263,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 263 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | 264 | CONFIG_PHYSICAL_START=0x00000000 |
| 256 | CONFIG_TASK_SIZE=0xc0000000 | 265 | CONFIG_TASK_SIZE=0xc0000000 |
| 257 | |||
| 258 | # | ||
| 259 | # Networking | ||
| 260 | # | ||
| 261 | CONFIG_NET=y | 266 | CONFIG_NET=y |
| 262 | 267 | ||
| 263 | # | 268 | # |
| @@ -308,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 308 | # CONFIG_TIPC is not set | 313 | # CONFIG_TIPC is not set |
| 309 | # CONFIG_ATM is not set | 314 | # CONFIG_ATM is not set |
| 310 | # CONFIG_BRIDGE is not set | 315 | # CONFIG_BRIDGE is not set |
| 316 | # CONFIG_NET_DSA is not set | ||
| 311 | # CONFIG_VLAN_8021Q is not set | 317 | # CONFIG_VLAN_8021Q is not set |
| 312 | # CONFIG_DECNET is not set | 318 | # CONFIG_DECNET is not set |
| 313 | # CONFIG_LLC2 is not set | 319 | # CONFIG_LLC2 is not set |
| @@ -328,14 +334,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 328 | # CONFIG_IRDA is not set | 334 | # CONFIG_IRDA is not set |
| 329 | # CONFIG_BT is not set | 335 | # CONFIG_BT is not set |
| 330 | # CONFIG_AF_RXRPC is not set | 336 | # CONFIG_AF_RXRPC is not set |
| 331 | 337 | # CONFIG_PHONET is not set | |
| 332 | # | 338 | # CONFIG_WIRELESS is not set |
| 333 | # Wireless | ||
| 334 | # | ||
| 335 | # CONFIG_CFG80211 is not set | ||
| 336 | # CONFIG_WIRELESS_EXT is not set | ||
| 337 | # CONFIG_MAC80211 is not set | ||
| 338 | # CONFIG_IEEE80211 is not set | ||
| 339 | # CONFIG_RFKILL is not set | 339 | # CONFIG_RFKILL is not set |
| 340 | # CONFIG_NET_9P is not set | 340 | # CONFIG_NET_9P is not set |
| 341 | 341 | ||
| @@ -446,6 +446,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 446 | # CONFIG_BLK_DEV_XIP is not set | 446 | # CONFIG_BLK_DEV_XIP is not set |
| 447 | # CONFIG_CDROM_PKTCDVD is not set | 447 | # CONFIG_CDROM_PKTCDVD is not set |
| 448 | # CONFIG_ATA_OVER_ETH is not set | 448 | # CONFIG_ATA_OVER_ETH is not set |
| 449 | # CONFIG_BLK_DEV_HD is not set | ||
| 449 | # CONFIG_MISC_DEVICES is not set | 450 | # CONFIG_MISC_DEVICES is not set |
| 450 | CONFIG_HAVE_IDE=y | 451 | CONFIG_HAVE_IDE=y |
| 451 | # CONFIG_IDE is not set | 452 | # CONFIG_IDE is not set |
| @@ -487,11 +488,11 @@ CONFIG_CHR_DEV_SG=y | |||
| 487 | # CONFIG_SCSI_SAS_LIBSAS is not set | 488 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 488 | # CONFIG_SCSI_SRP_ATTRS is not set | 489 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 489 | # CONFIG_SCSI_LOWLEVEL is not set | 490 | # CONFIG_SCSI_LOWLEVEL is not set |
| 491 | # CONFIG_SCSI_DH is not set | ||
| 490 | # CONFIG_ATA is not set | 492 | # CONFIG_ATA is not set |
| 491 | # CONFIG_MD is not set | 493 | # CONFIG_MD is not set |
| 492 | # CONFIG_MACINTOSH_DRIVERS is not set | 494 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 493 | CONFIG_NETDEVICES=y | 495 | CONFIG_NETDEVICES=y |
| 494 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 495 | # CONFIG_DUMMY is not set | 496 | # CONFIG_DUMMY is not set |
| 496 | # CONFIG_BONDING is not set | 497 | # CONFIG_BONDING is not set |
| 497 | # CONFIG_MACVLAN is not set | 498 | # CONFIG_MACVLAN is not set |
| @@ -521,6 +522,9 @@ CONFIG_NET_ETHERNET=y | |||
| 521 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 522 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 522 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 523 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 523 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 524 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 525 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 526 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 527 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 524 | # CONFIG_B44 is not set | 528 | # CONFIG_B44 is not set |
| 525 | CONFIG_FEC_MPC52xx=y | 529 | CONFIG_FEC_MPC52xx=y |
| 526 | CONFIG_FEC_MPC52xx_MDIO=y | 530 | CONFIG_FEC_MPC52xx_MDIO=y |
| @@ -532,7 +536,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 532 | # | 536 | # |
| 533 | # CONFIG_WLAN_PRE80211 is not set | 537 | # CONFIG_WLAN_PRE80211 is not set |
| 534 | # CONFIG_WLAN_80211 is not set | 538 | # CONFIG_WLAN_80211 is not set |
| 535 | # CONFIG_IWLWIFI is not set | ||
| 536 | # CONFIG_IWLWIFI_LEDS is not set | 539 | # CONFIG_IWLWIFI_LEDS is not set |
| 537 | 540 | ||
| 538 | # | 541 | # |
| @@ -567,6 +570,7 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 567 | # Character devices | 570 | # Character devices |
| 568 | # | 571 | # |
| 569 | # CONFIG_VT is not set | 572 | # CONFIG_VT is not set |
| 573 | CONFIG_DEVKMEM=y | ||
| 570 | # CONFIG_SERIAL_NONSTANDARD is not set | 574 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 571 | 575 | ||
| 572 | # | 576 | # |
| @@ -596,25 +600,40 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 596 | CONFIG_I2C=y | 600 | CONFIG_I2C=y |
| 597 | CONFIG_I2C_BOARDINFO=y | 601 | CONFIG_I2C_BOARDINFO=y |
| 598 | CONFIG_I2C_CHARDEV=y | 602 | CONFIG_I2C_CHARDEV=y |
| 603 | CONFIG_I2C_HELPER_AUTO=y | ||
| 599 | 604 | ||
| 600 | # | 605 | # |
| 601 | # I2C Hardware Bus support | 606 | # I2C Hardware Bus support |
| 602 | # | 607 | # |
| 608 | |||
| 609 | # | ||
| 610 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 611 | # | ||
| 603 | CONFIG_I2C_MPC=y | 612 | CONFIG_I2C_MPC=y |
| 604 | # CONFIG_I2C_OCORES is not set | 613 | # CONFIG_I2C_OCORES is not set |
| 605 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 606 | # CONFIG_I2C_SIMTEC is not set | 614 | # CONFIG_I2C_SIMTEC is not set |
| 615 | |||
| 616 | # | ||
| 617 | # External I2C/SMBus adapter drivers | ||
| 618 | # | ||
| 619 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 607 | # CONFIG_I2C_TAOS_EVM is not set | 620 | # CONFIG_I2C_TAOS_EVM is not set |
| 608 | # CONFIG_I2C_TINY_USB is not set | 621 | # CONFIG_I2C_TINY_USB is not set |
| 622 | |||
| 623 | # | ||
| 624 | # Other I2C/SMBus bus drivers | ||
| 625 | # | ||
| 609 | # CONFIG_I2C_PCA_PLATFORM is not set | 626 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 610 | 627 | ||
| 611 | # | 628 | # |
| 612 | # Miscellaneous I2C Chip support | 629 | # Miscellaneous I2C Chip support |
| 613 | # | 630 | # |
| 614 | # CONFIG_DS1682 is not set | 631 | # CONFIG_DS1682 is not set |
| 632 | # CONFIG_AT24 is not set | ||
| 615 | # CONFIG_SENSORS_EEPROM is not set | 633 | # CONFIG_SENSORS_EEPROM is not set |
| 616 | # CONFIG_SENSORS_PCF8574 is not set | 634 | # CONFIG_SENSORS_PCF8574 is not set |
| 617 | # CONFIG_PCF8575 is not set | 635 | # CONFIG_PCF8575 is not set |
| 636 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 618 | # CONFIG_SENSORS_PCF8591 is not set | 637 | # CONFIG_SENSORS_PCF8591 is not set |
| 619 | # CONFIG_SENSORS_MAX6875 is not set | 638 | # CONFIG_SENSORS_MAX6875 is not set |
| 620 | # CONFIG_SENSORS_TSL2550 is not set | 639 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -623,10 +642,13 @@ CONFIG_I2C_MPC=y | |||
| 623 | # CONFIG_I2C_DEBUG_BUS is not set | 642 | # CONFIG_I2C_DEBUG_BUS is not set |
| 624 | # CONFIG_I2C_DEBUG_CHIP is not set | 643 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 625 | # CONFIG_SPI is not set | 644 | # CONFIG_SPI is not set |
| 645 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 646 | # CONFIG_GPIOLIB is not set | ||
| 626 | # CONFIG_W1 is not set | 647 | # CONFIG_W1 is not set |
| 627 | # CONFIG_POWER_SUPPLY is not set | 648 | # CONFIG_POWER_SUPPLY is not set |
| 628 | # CONFIG_HWMON is not set | 649 | # CONFIG_HWMON is not set |
| 629 | # CONFIG_THERMAL is not set | 650 | # CONFIG_THERMAL is not set |
| 651 | # CONFIG_THERMAL_HWMON is not set | ||
| 630 | CONFIG_WATCHDOG=y | 652 | CONFIG_WATCHDOG=y |
| 631 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 653 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 632 | 654 | ||
| @@ -640,24 +662,39 @@ CONFIG_WATCHDOG=y | |||
| 640 | # USB-based Watchdog Cards | 662 | # USB-based Watchdog Cards |
| 641 | # | 663 | # |
| 642 | # CONFIG_USBPCWATCHDOG is not set | 664 | # CONFIG_USBPCWATCHDOG is not set |
| 665 | CONFIG_SSB_POSSIBLE=y | ||
| 643 | 666 | ||
| 644 | # | 667 | # |
| 645 | # Sonics Silicon Backplane | 668 | # Sonics Silicon Backplane |
| 646 | # | 669 | # |
| 647 | CONFIG_SSB_POSSIBLE=y | ||
| 648 | # CONFIG_SSB is not set | 670 | # CONFIG_SSB is not set |
| 649 | 671 | ||
| 650 | # | 672 | # |
| 651 | # Multifunction device drivers | 673 | # Multifunction device drivers |
| 652 | # | 674 | # |
| 675 | # CONFIG_MFD_CORE is not set | ||
| 653 | # CONFIG_MFD_SM501 is not set | 676 | # CONFIG_MFD_SM501 is not set |
| 654 | # CONFIG_HTC_PASIC3 is not set | 677 | # CONFIG_HTC_PASIC3 is not set |
| 678 | # CONFIG_MFD_TMIO is not set | ||
| 679 | # CONFIG_PMIC_DA903X is not set | ||
| 680 | # CONFIG_MFD_WM8400 is not set | ||
| 681 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 682 | # CONFIG_REGULATOR is not set | ||
| 655 | 683 | ||
| 656 | # | 684 | # |
| 657 | # Multimedia devices | 685 | # Multimedia devices |
| 658 | # | 686 | # |
| 687 | |||
| 688 | # | ||
| 689 | # Multimedia core support | ||
| 690 | # | ||
| 659 | # CONFIG_VIDEO_DEV is not set | 691 | # CONFIG_VIDEO_DEV is not set |
| 660 | # CONFIG_DVB_CORE is not set | 692 | # CONFIG_DVB_CORE is not set |
| 693 | # CONFIG_VIDEO_MEDIA is not set | ||
| 694 | |||
| 695 | # | ||
| 696 | # Multimedia drivers | ||
| 697 | # | ||
| 661 | # CONFIG_DAB is not set | 698 | # CONFIG_DAB is not set |
| 662 | 699 | ||
| 663 | # | 700 | # |
| @@ -672,10 +709,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 672 | # Display device support | 709 | # Display device support |
| 673 | # | 710 | # |
| 674 | # CONFIG_DISPLAY_SUPPORT is not set | 711 | # CONFIG_DISPLAY_SUPPORT is not set |
| 675 | |||
| 676 | # | ||
| 677 | # Sound | ||
| 678 | # | ||
| 679 | # CONFIG_SOUND is not set | 712 | # CONFIG_SOUND is not set |
| 680 | CONFIG_USB_SUPPORT=y | 713 | CONFIG_USB_SUPPORT=y |
| 681 | CONFIG_USB_ARCH_HAS_HCD=y | 714 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -695,11 +728,16 @@ CONFIG_USB_DEVICEFS=y | |||
| 695 | # CONFIG_USB_OTG is not set | 728 | # CONFIG_USB_OTG is not set |
| 696 | # CONFIG_USB_OTG_WHITELIST is not set | 729 | # CONFIG_USB_OTG_WHITELIST is not set |
| 697 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 730 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 731 | # CONFIG_USB_MON is not set | ||
| 732 | # CONFIG_USB_WUSB is not set | ||
| 733 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 698 | 734 | ||
| 699 | # | 735 | # |
| 700 | # USB Host Controller Drivers | 736 | # USB Host Controller Drivers |
| 701 | # | 737 | # |
| 738 | # CONFIG_USB_C67X00_HCD is not set | ||
| 702 | # CONFIG_USB_ISP116X_HCD is not set | 739 | # CONFIG_USB_ISP116X_HCD is not set |
| 740 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 703 | CONFIG_USB_OHCI_HCD=y | 741 | CONFIG_USB_OHCI_HCD=y |
| 704 | CONFIG_USB_OHCI_HCD_PPC_SOC=y | 742 | CONFIG_USB_OHCI_HCD_PPC_SOC=y |
| 705 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 743 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| @@ -710,12 +748,16 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 710 | # CONFIG_USB_OHCI_LITTLE_ENDIAN is not set | 748 | # CONFIG_USB_OHCI_LITTLE_ENDIAN is not set |
| 711 | # CONFIG_USB_SL811_HCD is not set | 749 | # CONFIG_USB_SL811_HCD is not set |
| 712 | # CONFIG_USB_R8A66597_HCD is not set | 750 | # CONFIG_USB_R8A66597_HCD is not set |
| 751 | # CONFIG_USB_HWA_HCD is not set | ||
| 752 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 713 | 753 | ||
| 714 | # | 754 | # |
| 715 | # USB Device Class drivers | 755 | # USB Device Class drivers |
| 716 | # | 756 | # |
| 717 | # CONFIG_USB_ACM is not set | 757 | # CONFIG_USB_ACM is not set |
| 718 | # CONFIG_USB_PRINTER is not set | 758 | # CONFIG_USB_PRINTER is not set |
| 759 | # CONFIG_USB_WDM is not set | ||
| 760 | # CONFIG_USB_TMC is not set | ||
| 719 | 761 | ||
| 720 | # | 762 | # |
| 721 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 763 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -744,7 +786,6 @@ CONFIG_USB_STORAGE=y | |||
| 744 | # | 786 | # |
| 745 | # CONFIG_USB_MDC800 is not set | 787 | # CONFIG_USB_MDC800 is not set |
| 746 | # CONFIG_USB_MICROTEK is not set | 788 | # CONFIG_USB_MICROTEK is not set |
| 747 | # CONFIG_USB_MON is not set | ||
| 748 | 789 | ||
| 749 | # | 790 | # |
| 750 | # USB port drivers | 791 | # USB port drivers |
| @@ -757,7 +798,7 @@ CONFIG_USB_STORAGE=y | |||
| 757 | # CONFIG_USB_EMI62 is not set | 798 | # CONFIG_USB_EMI62 is not set |
| 758 | # CONFIG_USB_EMI26 is not set | 799 | # CONFIG_USB_EMI26 is not set |
| 759 | # CONFIG_USB_ADUTUX is not set | 800 | # CONFIG_USB_ADUTUX is not set |
| 760 | # CONFIG_USB_AUERSWALD is not set | 801 | # CONFIG_USB_SEVSEG is not set |
| 761 | # CONFIG_USB_RIO500 is not set | 802 | # CONFIG_USB_RIO500 is not set |
| 762 | # CONFIG_USB_LEGOTOWER is not set | 803 | # CONFIG_USB_LEGOTOWER is not set |
| 763 | # CONFIG_USB_LCD is not set | 804 | # CONFIG_USB_LCD is not set |
| @@ -773,14 +814,19 @@ CONFIG_USB_STORAGE=y | |||
| 773 | # CONFIG_USB_TRANCEVIBRATOR is not set | 814 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 774 | # CONFIG_USB_IOWARRIOR is not set | 815 | # CONFIG_USB_IOWARRIOR is not set |
| 775 | # CONFIG_USB_TEST is not set | 816 | # CONFIG_USB_TEST is not set |
| 817 | # CONFIG_USB_ISIGHTFW is not set | ||
| 818 | # CONFIG_USB_VST is not set | ||
| 776 | # CONFIG_USB_GADGET is not set | 819 | # CONFIG_USB_GADGET is not set |
| 777 | # CONFIG_MMC is not set | 820 | # CONFIG_MMC is not set |
| 778 | # CONFIG_MEMSTICK is not set | 821 | # CONFIG_MEMSTICK is not set |
| 779 | # CONFIG_NEW_LEDS is not set | 822 | # CONFIG_NEW_LEDS is not set |
| 823 | # CONFIG_ACCESSIBILITY is not set | ||
| 780 | # CONFIG_EDAC is not set | 824 | # CONFIG_EDAC is not set |
| 781 | # CONFIG_RTC_CLASS is not set | 825 | # CONFIG_RTC_CLASS is not set |
| 782 | # CONFIG_DMADEVICES is not set | 826 | # CONFIG_DMADEVICES is not set |
| 783 | # CONFIG_UIO is not set | 827 | # CONFIG_UIO is not set |
| 828 | # CONFIG_STAGING is not set | ||
| 829 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 784 | 830 | ||
| 785 | # | 831 | # |
| 786 | # File systems | 832 | # File systems |
| @@ -792,12 +838,13 @@ CONFIG_EXT3_FS=y | |||
| 792 | CONFIG_EXT3_FS_XATTR=y | 838 | CONFIG_EXT3_FS_XATTR=y |
| 793 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 839 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 794 | # CONFIG_EXT3_FS_SECURITY is not set | 840 | # CONFIG_EXT3_FS_SECURITY is not set |
| 795 | # CONFIG_EXT4DEV_FS is not set | 841 | # CONFIG_EXT4_FS is not set |
| 796 | CONFIG_JBD=y | 842 | CONFIG_JBD=y |
| 797 | CONFIG_FS_MBCACHE=y | 843 | CONFIG_FS_MBCACHE=y |
| 798 | # CONFIG_REISERFS_FS is not set | 844 | # CONFIG_REISERFS_FS is not set |
| 799 | # CONFIG_JFS_FS is not set | 845 | # CONFIG_JFS_FS is not set |
| 800 | # CONFIG_FS_POSIX_ACL is not set | 846 | # CONFIG_FS_POSIX_ACL is not set |
| 847 | CONFIG_FILE_LOCKING=y | ||
| 801 | # CONFIG_XFS_FS is not set | 848 | # CONFIG_XFS_FS is not set |
| 802 | # CONFIG_OCFS2_FS is not set | 849 | # CONFIG_OCFS2_FS is not set |
| 803 | CONFIG_DNOTIFY=y | 850 | CONFIG_DNOTIFY=y |
| @@ -830,6 +877,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 830 | CONFIG_PROC_FS=y | 877 | CONFIG_PROC_FS=y |
| 831 | CONFIG_PROC_KCORE=y | 878 | CONFIG_PROC_KCORE=y |
| 832 | CONFIG_PROC_SYSCTL=y | 879 | CONFIG_PROC_SYSCTL=y |
| 880 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 833 | CONFIG_SYSFS=y | 881 | CONFIG_SYSFS=y |
| 834 | CONFIG_TMPFS=y | 882 | CONFIG_TMPFS=y |
| 835 | # CONFIG_TMPFS_POSIX_ACL is not set | 883 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -860,6 +908,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 860 | CONFIG_CRAMFS=y | 908 | CONFIG_CRAMFS=y |
| 861 | # CONFIG_VXFS_FS is not set | 909 | # CONFIG_VXFS_FS is not set |
| 862 | # CONFIG_MINIX_FS is not set | 910 | # CONFIG_MINIX_FS is not set |
| 911 | # CONFIG_OMFS_FS is not set | ||
| 863 | # CONFIG_HPFS_FS is not set | 912 | # CONFIG_HPFS_FS is not set |
| 864 | # CONFIG_QNX4FS_FS is not set | 913 | # CONFIG_QNX4FS_FS is not set |
| 865 | # CONFIG_ROMFS_FS is not set | 914 | # CONFIG_ROMFS_FS is not set |
| @@ -870,14 +919,14 @@ CONFIG_NFS_FS=y | |||
| 870 | CONFIG_NFS_V3=y | 919 | CONFIG_NFS_V3=y |
| 871 | # CONFIG_NFS_V3_ACL is not set | 920 | # CONFIG_NFS_V3_ACL is not set |
| 872 | CONFIG_NFS_V4=y | 921 | CONFIG_NFS_V4=y |
| 873 | # CONFIG_NFSD is not set | ||
| 874 | CONFIG_ROOT_NFS=y | 922 | CONFIG_ROOT_NFS=y |
| 923 | # CONFIG_NFSD is not set | ||
| 875 | CONFIG_LOCKD=y | 924 | CONFIG_LOCKD=y |
| 876 | CONFIG_LOCKD_V4=y | 925 | CONFIG_LOCKD_V4=y |
| 877 | CONFIG_NFS_COMMON=y | 926 | CONFIG_NFS_COMMON=y |
| 878 | CONFIG_SUNRPC=y | 927 | CONFIG_SUNRPC=y |
| 879 | CONFIG_SUNRPC_GSS=y | 928 | CONFIG_SUNRPC_GSS=y |
| 880 | # CONFIG_SUNRPC_BIND34 is not set | 929 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 881 | CONFIG_RPCSEC_GSS_KRB5=y | 930 | CONFIG_RPCSEC_GSS_KRB5=y |
| 882 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 931 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 883 | # CONFIG_SMB_FS is not set | 932 | # CONFIG_SMB_FS is not set |
| @@ -953,9 +1002,9 @@ CONFIG_NLS_ISO8859_1=y | |||
| 953 | # Library routines | 1002 | # Library routines |
| 954 | # | 1003 | # |
| 955 | CONFIG_BITREVERSE=y | 1004 | CONFIG_BITREVERSE=y |
| 956 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 957 | # CONFIG_CRC_CCITT is not set | 1005 | # CONFIG_CRC_CCITT is not set |
| 958 | # CONFIG_CRC16 is not set | 1006 | # CONFIG_CRC16 is not set |
| 1007 | # CONFIG_CRC_T10DIF is not set | ||
| 959 | # CONFIG_CRC_ITU_T is not set | 1008 | # CONFIG_CRC_ITU_T is not set |
| 960 | CONFIG_CRC32=y | 1009 | CONFIG_CRC32=y |
| 961 | # CONFIG_CRC7 is not set | 1010 | # CONFIG_CRC7 is not set |
| @@ -982,9 +1031,12 @@ CONFIG_FRAME_WARN=1024 | |||
| 982 | CONFIG_DEBUG_KERNEL=y | 1031 | CONFIG_DEBUG_KERNEL=y |
| 983 | # CONFIG_DEBUG_SHIRQ is not set | 1032 | # CONFIG_DEBUG_SHIRQ is not set |
| 984 | CONFIG_DETECT_SOFTLOCKUP=y | 1033 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1034 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1035 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 985 | CONFIG_SCHED_DEBUG=y | 1036 | CONFIG_SCHED_DEBUG=y |
| 986 | # CONFIG_SCHEDSTATS is not set | 1037 | # CONFIG_SCHEDSTATS is not set |
| 987 | # CONFIG_TIMER_STATS is not set | 1038 | # CONFIG_TIMER_STATS is not set |
| 1039 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 988 | # CONFIG_SLUB_DEBUG_ON is not set | 1040 | # CONFIG_SLUB_DEBUG_ON is not set |
| 989 | # CONFIG_SLUB_STATS is not set | 1041 | # CONFIG_SLUB_STATS is not set |
| 990 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1042 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -998,16 +1050,37 @@ CONFIG_SCHED_DEBUG=y | |||
| 998 | # CONFIG_DEBUG_INFO is not set | 1050 | # CONFIG_DEBUG_INFO is not set |
| 999 | # CONFIG_DEBUG_VM is not set | 1051 | # CONFIG_DEBUG_VM is not set |
| 1000 | # CONFIG_DEBUG_WRITECOUNT is not set | 1052 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1053 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1001 | # CONFIG_DEBUG_LIST is not set | 1054 | # CONFIG_DEBUG_LIST is not set |
| 1002 | # CONFIG_DEBUG_SG is not set | 1055 | # CONFIG_DEBUG_SG is not set |
| 1003 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1056 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1057 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1058 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1004 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1059 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1060 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1005 | # CONFIG_FAULT_INJECTION is not set | 1061 | # CONFIG_FAULT_INJECTION is not set |
| 1062 | # CONFIG_LATENCYTOP is not set | ||
| 1063 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1064 | |||
| 1065 | # | ||
| 1066 | # Tracers | ||
| 1067 | # | ||
| 1068 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1069 | # CONFIG_SCHED_TRACER is not set | ||
| 1070 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1071 | # CONFIG_BOOT_TRACER is not set | ||
| 1072 | # CONFIG_STACK_TRACER is not set | ||
| 1073 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1006 | # CONFIG_SAMPLES is not set | 1074 | # CONFIG_SAMPLES is not set |
| 1075 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1076 | # CONFIG_KGDB is not set | ||
| 1007 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1077 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1008 | # CONFIG_DEBUG_STACK_USAGE is not set | 1078 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1009 | # CONFIG_DEBUG_PAGEALLOC is not set | 1079 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1010 | # CONFIG_DEBUGGER is not set | 1080 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1081 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1082 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
| 1083 | # CONFIG_XMON is not set | ||
| 1011 | # CONFIG_IRQSTACKS is not set | 1084 | # CONFIG_IRQSTACKS is not set |
| 1012 | # CONFIG_BDI_SWITCH is not set | 1085 | # CONFIG_BDI_SWITCH is not set |
| 1013 | # CONFIG_BOOTX_TEXT is not set | 1086 | # CONFIG_BOOTX_TEXT is not set |
| @@ -1018,14 +1091,19 @@ CONFIG_SCHED_DEBUG=y | |||
| 1018 | # | 1091 | # |
| 1019 | # CONFIG_KEYS is not set | 1092 | # CONFIG_KEYS is not set |
| 1020 | # CONFIG_SECURITY is not set | 1093 | # CONFIG_SECURITY is not set |
| 1094 | # CONFIG_SECURITYFS is not set | ||
| 1021 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1095 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1022 | CONFIG_CRYPTO=y | 1096 | CONFIG_CRYPTO=y |
| 1023 | 1097 | ||
| 1024 | # | 1098 | # |
| 1025 | # Crypto core or helper | 1099 | # Crypto core or helper |
| 1026 | # | 1100 | # |
| 1101 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1027 | CONFIG_CRYPTO_ALGAPI=y | 1102 | CONFIG_CRYPTO_ALGAPI=y |
| 1103 | CONFIG_CRYPTO_AEAD=y | ||
| 1028 | CONFIG_CRYPTO_BLKCIPHER=y | 1104 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1105 | CONFIG_CRYPTO_HASH=y | ||
| 1106 | CONFIG_CRYPTO_RNG=y | ||
| 1029 | CONFIG_CRYPTO_MANAGER=y | 1107 | CONFIG_CRYPTO_MANAGER=y |
| 1030 | # CONFIG_CRYPTO_GF128MUL is not set | 1108 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1031 | # CONFIG_CRYPTO_NULL is not set | 1109 | # CONFIG_CRYPTO_NULL is not set |
| @@ -1063,6 +1141,10 @@ CONFIG_CRYPTO_PCBC=y | |||
| 1063 | # CONFIG_CRYPTO_MD4 is not set | 1141 | # CONFIG_CRYPTO_MD4 is not set |
| 1064 | CONFIG_CRYPTO_MD5=y | 1142 | CONFIG_CRYPTO_MD5=y |
| 1065 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1143 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1144 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1145 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1146 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1147 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1066 | # CONFIG_CRYPTO_SHA1 is not set | 1148 | # CONFIG_CRYPTO_SHA1 is not set |
| 1067 | # CONFIG_CRYPTO_SHA256 is not set | 1149 | # CONFIG_CRYPTO_SHA256 is not set |
| 1068 | # CONFIG_CRYPTO_SHA512 is not set | 1150 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1093,6 +1175,11 @@ CONFIG_CRYPTO_DES=y | |||
| 1093 | # | 1175 | # |
| 1094 | # CONFIG_CRYPTO_DEFLATE is not set | 1176 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1095 | # CONFIG_CRYPTO_LZO is not set | 1177 | # CONFIG_CRYPTO_LZO is not set |
| 1178 | |||
| 1179 | # | ||
| 1180 | # Random Number Generation | ||
| 1181 | # | ||
| 1182 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1096 | CONFIG_CRYPTO_HW=y | 1183 | CONFIG_CRYPTO_HW=y |
| 1097 | CONFIG_PPC_CLOCK=y | 1184 | CONFIG_PPC_CLOCK=y |
| 1098 | CONFIG_PPC_LIB_RHEAP=y | 1185 | CONFIG_PPC_LIB_RHEAP=y |
diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig index 1a8a250fa11b..5b969f9c925e 100644 --- a/arch/powerpc/configs/52xx/lite5200b_defconfig +++ b/arch/powerpc/configs/52xx/lite5200b_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.25 | 3 | # Linux kernel version: 2.6.28-rc4 |
| 4 | # Tue Apr 29 07:12:56 2008 | 4 | # Thu Nov 13 02:10:16 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y | |||
| 22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| @@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -103,7 +104,9 @@ CONFIG_SIGNALFD=y | |||
| 103 | CONFIG_TIMERFD=y | 104 | CONFIG_TIMERFD=y |
| 104 | CONFIG_EVENTFD=y | 105 | CONFIG_EVENTFD=y |
| 105 | CONFIG_SHMEM=y | 106 | CONFIG_SHMEM=y |
| 107 | CONFIG_AIO=y | ||
| 106 | CONFIG_VM_EVENT_COUNTERS=y | 108 | CONFIG_VM_EVENT_COUNTERS=y |
| 109 | CONFIG_PCI_QUIRKS=y | ||
| 107 | CONFIG_SLUB_DEBUG=y | 110 | CONFIG_SLUB_DEBUG=y |
| 108 | # CONFIG_SLAB is not set | 111 | # CONFIG_SLAB is not set |
| 109 | CONFIG_SLUB=y | 112 | CONFIG_SLUB=y |
| @@ -111,24 +114,30 @@ CONFIG_SLUB=y | |||
| 111 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
| 112 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 114 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 122 | CONFIG_HAVE_CLK=y | ||
| 123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 117 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
| 119 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
| 120 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
| 121 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
| 129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 122 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
| 123 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 131 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 124 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
| 125 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 133 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 126 | # CONFIG_KMOD is not set | 134 | CONFIG_KMOD=y |
| 127 | CONFIG_BLOCK=y | 135 | CONFIG_BLOCK=y |
| 128 | # CONFIG_LBD is not set | 136 | # CONFIG_LBD is not set |
| 129 | # CONFIG_BLK_DEV_IO_TRACE is not set | 137 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 130 | # CONFIG_LSF is not set | 138 | # CONFIG_LSF is not set |
| 131 | # CONFIG_BLK_DEV_BSG is not set | 139 | # CONFIG_BLK_DEV_BSG is not set |
| 140 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 132 | 141 | ||
| 133 | # | 142 | # |
| 134 | # IO Schedulers | 143 | # IO Schedulers |
| @@ -143,19 +152,16 @@ CONFIG_DEFAULT_AS=y | |||
| 143 | # CONFIG_DEFAULT_NOOP is not set | 152 | # CONFIG_DEFAULT_NOOP is not set |
| 144 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 153 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 145 | CONFIG_CLASSIC_RCU=y | 154 | CONFIG_CLASSIC_RCU=y |
| 155 | CONFIG_FREEZER=y | ||
| 146 | 156 | ||
| 147 | # | 157 | # |
| 148 | # Platform support | 158 | # Platform support |
| 149 | # | 159 | # |
| 150 | CONFIG_PPC_MULTIPLATFORM=y | 160 | CONFIG_PPC_MULTIPLATFORM=y |
| 151 | # CONFIG_PPC_82xx is not set | ||
| 152 | # CONFIG_PPC_83xx is not set | ||
| 153 | # CONFIG_PPC_86xx is not set | ||
| 154 | CONFIG_CLASSIC32=y | 161 | CONFIG_CLASSIC32=y |
| 155 | # CONFIG_PPC_CHRP is not set | 162 | # CONFIG_PPC_CHRP is not set |
| 156 | # CONFIG_PPC_MPC512x is not set | ||
| 157 | # CONFIG_PPC_MPC5121 is not set | ||
| 158 | # CONFIG_MPC5121_ADS is not set | 163 | # CONFIG_MPC5121_ADS is not set |
| 164 | # CONFIG_MPC5121_GENERIC is not set | ||
| 159 | CONFIG_PPC_MPC52xx=y | 165 | CONFIG_PPC_MPC52xx=y |
| 160 | CONFIG_PPC_MPC5200_SIMPLE=y | 166 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 161 | # CONFIG_PPC_EFIKA is not set | 167 | # CONFIG_PPC_EFIKA is not set |
| @@ -165,7 +171,10 @@ CONFIG_PPC_LITE5200=y | |||
| 165 | # CONFIG_PPC_PMAC is not set | 171 | # CONFIG_PPC_PMAC is not set |
| 166 | # CONFIG_PPC_CELL is not set | 172 | # CONFIG_PPC_CELL is not set |
| 167 | # CONFIG_PPC_CELL_NATIVE is not set | 173 | # CONFIG_PPC_CELL_NATIVE is not set |
| 174 | # CONFIG_PPC_82xx is not set | ||
| 168 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
| 176 | # CONFIG_PPC_83xx is not set | ||
| 177 | # CONFIG_PPC_86xx is not set | ||
| 169 | # CONFIG_EMBEDDED6xx is not set | 178 | # CONFIG_EMBEDDED6xx is not set |
| 170 | # CONFIG_IPIC is not set | 179 | # CONFIG_IPIC is not set |
| 171 | # CONFIG_MPIC is not set | 180 | # CONFIG_MPIC is not set |
| @@ -198,11 +207,13 @@ CONFIG_HZ_250=y | |||
| 198 | # CONFIG_HZ_300 is not set | 207 | # CONFIG_HZ_300 is not set |
| 199 | # CONFIG_HZ_1000 is not set | 208 | # CONFIG_HZ_1000 is not set |
| 200 | CONFIG_HZ=250 | 209 | CONFIG_HZ=250 |
| 201 | # CONFIG_SCHED_HRTICK is not set | 210 | CONFIG_SCHED_HRTICK=y |
| 202 | CONFIG_PREEMPT_NONE=y | 211 | CONFIG_PREEMPT_NONE=y |
| 203 | # CONFIG_PREEMPT_VOLUNTARY is not set | 212 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 204 | # CONFIG_PREEMPT is not set | 213 | # CONFIG_PREEMPT is not set |
| 205 | CONFIG_BINFMT_ELF=y | 214 | CONFIG_BINFMT_ELF=y |
| 215 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 216 | # CONFIG_HAVE_AOUT is not set | ||
| 206 | # CONFIG_BINFMT_MISC is not set | 217 | # CONFIG_BINFMT_MISC is not set |
| 207 | # CONFIG_IOMMU_HELPER is not set | 218 | # CONFIG_IOMMU_HELPER is not set |
| 208 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 219 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -217,19 +228,20 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 217 | # CONFIG_SPARSEMEM_MANUAL is not set | 228 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 218 | CONFIG_FLATMEM=y | 229 | CONFIG_FLATMEM=y |
| 219 | CONFIG_FLAT_NODE_MEM_MAP=y | 230 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 220 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | 231 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 233 | CONFIG_MIGRATION=y | ||
| 224 | # CONFIG_RESOURCES_64BIT is not set | 234 | # CONFIG_RESOURCES_64BIT is not set |
| 235 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 225 | CONFIG_ZONE_DMA_FLAG=1 | 236 | CONFIG_ZONE_DMA_FLAG=1 |
| 226 | CONFIG_BOUNCE=y | 237 | CONFIG_BOUNCE=y |
| 227 | CONFIG_VIRT_TO_BUS=y | 238 | CONFIG_VIRT_TO_BUS=y |
| 239 | CONFIG_UNEVICTABLE_LRU=y | ||
| 228 | CONFIG_FORCE_MAX_ZONEORDER=11 | 240 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 229 | CONFIG_PROC_DEVICETREE=y | 241 | CONFIG_PROC_DEVICETREE=y |
| 230 | # CONFIG_CMDLINE_BOOL is not set | 242 | # CONFIG_CMDLINE_BOOL is not set |
| 243 | CONFIG_EXTRA_TARGETS="" | ||
| 231 | CONFIG_PM=y | 244 | CONFIG_PM=y |
| 232 | # CONFIG_PM_LEGACY is not set | ||
| 233 | # CONFIG_PM_DEBUG is not set | 245 | # CONFIG_PM_DEBUG is not set |
| 234 | CONFIG_PM_SLEEP=y | 246 | CONFIG_PM_SLEEP=y |
| 235 | CONFIG_SUSPEND=y | 247 | CONFIG_SUSPEND=y |
| @@ -243,7 +255,7 @@ CONFIG_ISA_DMA_API=y | |||
| 243 | CONFIG_ZONE_DMA=y | 255 | CONFIG_ZONE_DMA=y |
| 244 | CONFIG_GENERIC_ISA_DMA=y | 256 | CONFIG_GENERIC_ISA_DMA=y |
| 245 | # CONFIG_PPC_INDIRECT_PCI is not set | 257 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 246 | CONFIG_FSL_SOC=y | 258 | CONFIG_PPC_PCI_CHOICE=y |
| 247 | CONFIG_PCI=y | 259 | CONFIG_PCI=y |
| 248 | CONFIG_PCI_DOMAINS=y | 260 | CONFIG_PCI_DOMAINS=y |
| 249 | CONFIG_PCI_SYSCALL=y | 261 | CONFIG_PCI_SYSCALL=y |
| @@ -269,10 +281,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 269 | CONFIG_KERNEL_START=0xc0000000 | 281 | CONFIG_KERNEL_START=0xc0000000 |
| 270 | CONFIG_PHYSICAL_START=0x00000000 | 282 | CONFIG_PHYSICAL_START=0x00000000 |
| 271 | CONFIG_TASK_SIZE=0xc0000000 | 283 | CONFIG_TASK_SIZE=0xc0000000 |
| 272 | |||
| 273 | # | ||
| 274 | # Networking | ||
| 275 | # | ||
| 276 | CONFIG_NET=y | 284 | CONFIG_NET=y |
| 277 | 285 | ||
| 278 | # | 286 | # |
| @@ -323,6 +331,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 323 | # CONFIG_TIPC is not set | 331 | # CONFIG_TIPC is not set |
| 324 | # CONFIG_ATM is not set | 332 | # CONFIG_ATM is not set |
| 325 | # CONFIG_BRIDGE is not set | 333 | # CONFIG_BRIDGE is not set |
| 334 | # CONFIG_NET_DSA is not set | ||
| 326 | # CONFIG_VLAN_8021Q is not set | 335 | # CONFIG_VLAN_8021Q is not set |
| 327 | # CONFIG_DECNET is not set | 336 | # CONFIG_DECNET is not set |
| 328 | # CONFIG_LLC2 is not set | 337 | # CONFIG_LLC2 is not set |
| @@ -343,14 +352,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 343 | # CONFIG_IRDA is not set | 352 | # CONFIG_IRDA is not set |
| 344 | # CONFIG_BT is not set | 353 | # CONFIG_BT is not set |
| 345 | # CONFIG_AF_RXRPC is not set | 354 | # CONFIG_AF_RXRPC is not set |
| 346 | 355 | # CONFIG_PHONET is not set | |
| 347 | # | 356 | # CONFIG_WIRELESS is not set |
| 348 | # Wireless | ||
| 349 | # | ||
| 350 | # CONFIG_CFG80211 is not set | ||
| 351 | # CONFIG_WIRELESS_EXT is not set | ||
| 352 | # CONFIG_MAC80211 is not set | ||
| 353 | # CONFIG_IEEE80211 is not set | ||
| 354 | # CONFIG_RFKILL is not set | 357 | # CONFIG_RFKILL is not set |
| 355 | # CONFIG_NET_9P is not set | 358 | # CONFIG_NET_9P is not set |
| 356 | 359 | ||
| @@ -390,12 +393,16 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 390 | # CONFIG_BLK_DEV_XIP is not set | 393 | # CONFIG_BLK_DEV_XIP is not set |
| 391 | # CONFIG_CDROM_PKTCDVD is not set | 394 | # CONFIG_CDROM_PKTCDVD is not set |
| 392 | # CONFIG_ATA_OVER_ETH is not set | 395 | # CONFIG_ATA_OVER_ETH is not set |
| 396 | # CONFIG_BLK_DEV_HD is not set | ||
| 393 | CONFIG_MISC_DEVICES=y | 397 | CONFIG_MISC_DEVICES=y |
| 394 | # CONFIG_PHANTOM is not set | 398 | # CONFIG_PHANTOM is not set |
| 395 | # CONFIG_EEPROM_93CX6 is not set | 399 | # CONFIG_EEPROM_93CX6 is not set |
| 396 | # CONFIG_SGI_IOC4 is not set | 400 | # CONFIG_SGI_IOC4 is not set |
| 397 | # CONFIG_TIFM_CORE is not set | 401 | # CONFIG_TIFM_CORE is not set |
| 402 | # CONFIG_ICS932S401 is not set | ||
| 398 | # CONFIG_ENCLOSURE_SERVICES is not set | 403 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 404 | # CONFIG_HP_ILO is not set | ||
| 405 | # CONFIG_C2PORT is not set | ||
| 399 | CONFIG_HAVE_IDE=y | 406 | CONFIG_HAVE_IDE=y |
| 400 | # CONFIG_IDE is not set | 407 | # CONFIG_IDE is not set |
| 401 | 408 | ||
| @@ -412,7 +419,7 @@ CONFIG_SCSI_DMA=y | |||
| 412 | # | 419 | # |
| 413 | # SCSI support type (disk, tape, CD-ROM) | 420 | # SCSI support type (disk, tape, CD-ROM) |
| 414 | # | 421 | # |
| 415 | # CONFIG_BLK_DEV_SD is not set | 422 | CONFIG_BLK_DEV_SD=y |
| 416 | # CONFIG_CHR_DEV_ST is not set | 423 | # CONFIG_CHR_DEV_ST is not set |
| 417 | # CONFIG_CHR_DEV_OSST is not set | 424 | # CONFIG_CHR_DEV_OSST is not set |
| 418 | # CONFIG_BLK_DEV_SR is not set | 425 | # CONFIG_BLK_DEV_SR is not set |
| @@ -474,12 +481,12 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 474 | # CONFIG_SCSI_NSP32 is not set | 481 | # CONFIG_SCSI_NSP32 is not set |
| 475 | # CONFIG_SCSI_DEBUG is not set | 482 | # CONFIG_SCSI_DEBUG is not set |
| 476 | # CONFIG_SCSI_SRP is not set | 483 | # CONFIG_SCSI_SRP is not set |
| 484 | # CONFIG_SCSI_DH is not set | ||
| 477 | CONFIG_ATA=y | 485 | CONFIG_ATA=y |
| 478 | # CONFIG_ATA_NONSTANDARD is not set | 486 | # CONFIG_ATA_NONSTANDARD is not set |
| 479 | CONFIG_SATA_PMP=y | 487 | CONFIG_SATA_PMP=y |
| 480 | # CONFIG_SATA_AHCI is not set | 488 | # CONFIG_SATA_AHCI is not set |
| 481 | # CONFIG_SATA_SIL24 is not set | 489 | # CONFIG_SATA_SIL24 is not set |
| 482 | # CONFIG_SATA_FSL is not set | ||
| 483 | CONFIG_ATA_SFF=y | 490 | CONFIG_ATA_SFF=y |
| 484 | # CONFIG_SATA_SVW is not set | 491 | # CONFIG_SATA_SVW is not set |
| 485 | # CONFIG_ATA_PIIX is not set | 492 | # CONFIG_ATA_PIIX is not set |
| @@ -535,18 +542,22 @@ CONFIG_PATA_MPC52xx=y | |||
| 535 | # CONFIG_PATA_VIA is not set | 542 | # CONFIG_PATA_VIA is not set |
| 536 | # CONFIG_PATA_WINBOND is not set | 543 | # CONFIG_PATA_WINBOND is not set |
| 537 | # CONFIG_PATA_PLATFORM is not set | 544 | # CONFIG_PATA_PLATFORM is not set |
| 545 | # CONFIG_PATA_SCH is not set | ||
| 538 | # CONFIG_MD is not set | 546 | # CONFIG_MD is not set |
| 539 | # CONFIG_FUSION is not set | 547 | # CONFIG_FUSION is not set |
| 540 | 548 | ||
| 541 | # | 549 | # |
| 542 | # IEEE 1394 (FireWire) support | 550 | # IEEE 1394 (FireWire) support |
| 543 | # | 551 | # |
| 552 | |||
| 553 | # | ||
| 554 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 555 | # | ||
| 544 | # CONFIG_FIREWIRE is not set | 556 | # CONFIG_FIREWIRE is not set |
| 545 | # CONFIG_IEEE1394 is not set | 557 | # CONFIG_IEEE1394 is not set |
| 546 | # CONFIG_I2O is not set | 558 | # CONFIG_I2O is not set |
| 547 | # CONFIG_MACINTOSH_DRIVERS is not set | 559 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 548 | CONFIG_NETDEVICES=y | 560 | CONFIG_NETDEVICES=y |
| 549 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 550 | # CONFIG_DUMMY is not set | 561 | # CONFIG_DUMMY is not set |
| 551 | # CONFIG_BONDING is not set | 562 | # CONFIG_BONDING is not set |
| 552 | # CONFIG_MACVLAN is not set | 563 | # CONFIG_MACVLAN is not set |
| @@ -583,16 +594,19 @@ CONFIG_NET_ETHERNET=y | |||
| 583 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 594 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 584 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 595 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 585 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 596 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 597 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 598 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 599 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 586 | # CONFIG_NET_PCI is not set | 600 | # CONFIG_NET_PCI is not set |
| 587 | # CONFIG_B44 is not set | 601 | # CONFIG_B44 is not set |
| 588 | CONFIG_FEC_MPC52xx=y | 602 | CONFIG_FEC_MPC52xx=y |
| 589 | CONFIG_FEC_MPC52xx_MDIO=y | 603 | CONFIG_FEC_MPC52xx_MDIO=y |
| 604 | # CONFIG_ATL2 is not set | ||
| 590 | CONFIG_NETDEV_1000=y | 605 | CONFIG_NETDEV_1000=y |
| 591 | # CONFIG_ACENIC is not set | 606 | # CONFIG_ACENIC is not set |
| 592 | # CONFIG_DL2K is not set | 607 | # CONFIG_DL2K is not set |
| 593 | # CONFIG_E1000 is not set | 608 | # CONFIG_E1000 is not set |
| 594 | # CONFIG_E1000E is not set | 609 | # CONFIG_E1000E is not set |
| 595 | # CONFIG_E1000E_ENABLED is not set | ||
| 596 | # CONFIG_IP1000 is not set | 610 | # CONFIG_IP1000 is not set |
| 597 | # CONFIG_IGB is not set | 611 | # CONFIG_IGB is not set |
| 598 | # CONFIG_NS83820 is not set | 612 | # CONFIG_NS83820 is not set |
| @@ -605,22 +619,27 @@ CONFIG_NETDEV_1000=y | |||
| 605 | # CONFIG_VIA_VELOCITY is not set | 619 | # CONFIG_VIA_VELOCITY is not set |
| 606 | # CONFIG_TIGON3 is not set | 620 | # CONFIG_TIGON3 is not set |
| 607 | # CONFIG_BNX2 is not set | 621 | # CONFIG_BNX2 is not set |
| 608 | # CONFIG_GIANFAR is not set | ||
| 609 | # CONFIG_MV643XX_ETH is not set | 622 | # CONFIG_MV643XX_ETH is not set |
| 610 | # CONFIG_QLA3XXX is not set | 623 | # CONFIG_QLA3XXX is not set |
| 611 | # CONFIG_ATL1 is not set | 624 | # CONFIG_ATL1 is not set |
| 625 | # CONFIG_ATL1E is not set | ||
| 626 | # CONFIG_JME is not set | ||
| 612 | CONFIG_NETDEV_10000=y | 627 | CONFIG_NETDEV_10000=y |
| 613 | # CONFIG_CHELSIO_T1 is not set | 628 | # CONFIG_CHELSIO_T1 is not set |
| 614 | # CONFIG_CHELSIO_T3 is not set | 629 | # CONFIG_CHELSIO_T3 is not set |
| 630 | # CONFIG_ENIC is not set | ||
| 615 | # CONFIG_IXGBE is not set | 631 | # CONFIG_IXGBE is not set |
| 616 | # CONFIG_IXGB is not set | 632 | # CONFIG_IXGB is not set |
| 617 | # CONFIG_S2IO is not set | 633 | # CONFIG_S2IO is not set |
| 618 | # CONFIG_MYRI10GE is not set | 634 | # CONFIG_MYRI10GE is not set |
| 619 | # CONFIG_NETXEN_NIC is not set | 635 | # CONFIG_NETXEN_NIC is not set |
| 620 | # CONFIG_NIU is not set | 636 | # CONFIG_NIU is not set |
| 637 | # CONFIG_MLX4_EN is not set | ||
| 621 | # CONFIG_MLX4_CORE is not set | 638 | # CONFIG_MLX4_CORE is not set |
| 622 | # CONFIG_TEHUTI is not set | 639 | # CONFIG_TEHUTI is not set |
| 623 | # CONFIG_BNX2X is not set | 640 | # CONFIG_BNX2X is not set |
| 641 | # CONFIG_QLGE is not set | ||
| 642 | # CONFIG_SFC is not set | ||
| 624 | # CONFIG_TR is not set | 643 | # CONFIG_TR is not set |
| 625 | 644 | ||
| 626 | # | 645 | # |
| @@ -628,7 +647,6 @@ CONFIG_NETDEV_10000=y | |||
| 628 | # | 647 | # |
| 629 | # CONFIG_WLAN_PRE80211 is not set | 648 | # CONFIG_WLAN_PRE80211 is not set |
| 630 | # CONFIG_WLAN_80211 is not set | 649 | # CONFIG_WLAN_80211 is not set |
| 631 | # CONFIG_IWLWIFI is not set | ||
| 632 | # CONFIG_IWLWIFI_LEDS is not set | 650 | # CONFIG_IWLWIFI_LEDS is not set |
| 633 | # CONFIG_WAN is not set | 651 | # CONFIG_WAN is not set |
| 634 | # CONFIG_FDDI is not set | 652 | # CONFIG_FDDI is not set |
| @@ -657,6 +675,7 @@ CONFIG_NETDEV_10000=y | |||
| 657 | # Character devices | 675 | # Character devices |
| 658 | # | 676 | # |
| 659 | # CONFIG_VT is not set | 677 | # CONFIG_VT is not set |
| 678 | CONFIG_DEVKMEM=y | ||
| 660 | # CONFIG_SERIAL_NONSTANDARD is not set | 679 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 661 | # CONFIG_NOZOMI is not set | 680 | # CONFIG_NOZOMI is not set |
| 662 | 681 | ||
| @@ -691,42 +710,63 @@ CONFIG_DEVPORT=y | |||
| 691 | CONFIG_I2C=y | 710 | CONFIG_I2C=y |
| 692 | CONFIG_I2C_BOARDINFO=y | 711 | CONFIG_I2C_BOARDINFO=y |
| 693 | CONFIG_I2C_CHARDEV=y | 712 | CONFIG_I2C_CHARDEV=y |
| 713 | CONFIG_I2C_HELPER_AUTO=y | ||
| 694 | 714 | ||
| 695 | # | 715 | # |
| 696 | # I2C Hardware Bus support | 716 | # I2C Hardware Bus support |
| 697 | # | 717 | # |
| 718 | |||
| 719 | # | ||
| 720 | # PC SMBus host controller drivers | ||
| 721 | # | ||
| 698 | # CONFIG_I2C_ALI1535 is not set | 722 | # CONFIG_I2C_ALI1535 is not set |
| 699 | # CONFIG_I2C_ALI1563 is not set | 723 | # CONFIG_I2C_ALI1563 is not set |
| 700 | # CONFIG_I2C_ALI15X3 is not set | 724 | # CONFIG_I2C_ALI15X3 is not set |
| 701 | # CONFIG_I2C_AMD756 is not set | 725 | # CONFIG_I2C_AMD756 is not set |
| 702 | # CONFIG_I2C_AMD8111 is not set | 726 | # CONFIG_I2C_AMD8111 is not set |
| 703 | # CONFIG_I2C_I801 is not set | 727 | # CONFIG_I2C_I801 is not set |
| 704 | # CONFIG_I2C_I810 is not set | 728 | # CONFIG_I2C_ISCH is not set |
| 705 | # CONFIG_I2C_PIIX4 is not set | 729 | # CONFIG_I2C_PIIX4 is not set |
| 706 | CONFIG_I2C_MPC=y | ||
| 707 | # CONFIG_I2C_NFORCE2 is not set | 730 | # CONFIG_I2C_NFORCE2 is not set |
| 708 | # CONFIG_I2C_OCORES is not set | ||
| 709 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 710 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 711 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 712 | # CONFIG_I2C_SIMTEC is not set | ||
| 713 | # CONFIG_I2C_SIS5595 is not set | 731 | # CONFIG_I2C_SIS5595 is not set |
| 714 | # CONFIG_I2C_SIS630 is not set | 732 | # CONFIG_I2C_SIS630 is not set |
| 715 | # CONFIG_I2C_SIS96X is not set | 733 | # CONFIG_I2C_SIS96X is not set |
| 716 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 717 | # CONFIG_I2C_STUB is not set | ||
| 718 | # CONFIG_I2C_VIA is not set | 734 | # CONFIG_I2C_VIA is not set |
| 719 | # CONFIG_I2C_VIAPRO is not set | 735 | # CONFIG_I2C_VIAPRO is not set |
| 736 | |||
| 737 | # | ||
| 738 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 739 | # | ||
| 740 | CONFIG_I2C_MPC=y | ||
| 741 | # CONFIG_I2C_OCORES is not set | ||
| 742 | # CONFIG_I2C_SIMTEC is not set | ||
| 743 | |||
| 744 | # | ||
| 745 | # External I2C/SMBus adapter drivers | ||
| 746 | # | ||
| 747 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 748 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 749 | |||
| 750 | # | ||
| 751 | # Graphics adapter I2C/DDC channel drivers | ||
| 752 | # | ||
| 720 | # CONFIG_I2C_VOODOO3 is not set | 753 | # CONFIG_I2C_VOODOO3 is not set |
| 754 | |||
| 755 | # | ||
| 756 | # Other I2C/SMBus bus drivers | ||
| 757 | # | ||
| 721 | # CONFIG_I2C_PCA_PLATFORM is not set | 758 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 759 | # CONFIG_I2C_STUB is not set | ||
| 722 | 760 | ||
| 723 | # | 761 | # |
| 724 | # Miscellaneous I2C Chip support | 762 | # Miscellaneous I2C Chip support |
| 725 | # | 763 | # |
| 726 | # CONFIG_DS1682 is not set | 764 | # CONFIG_DS1682 is not set |
| 765 | # CONFIG_AT24 is not set | ||
| 727 | # CONFIG_SENSORS_EEPROM is not set | 766 | # CONFIG_SENSORS_EEPROM is not set |
| 728 | # CONFIG_SENSORS_PCF8574 is not set | 767 | # CONFIG_SENSORS_PCF8574 is not set |
| 729 | # CONFIG_PCF8575 is not set | 768 | # CONFIG_PCF8575 is not set |
| 769 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 730 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
| 731 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
| 732 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -735,29 +775,47 @@ CONFIG_I2C_MPC=y | |||
| 735 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
| 736 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 737 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
| 778 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 779 | # CONFIG_GPIOLIB is not set | ||
| 738 | # CONFIG_W1 is not set | 780 | # CONFIG_W1 is not set |
| 739 | # CONFIG_POWER_SUPPLY is not set | 781 | # CONFIG_POWER_SUPPLY is not set |
| 740 | # CONFIG_HWMON is not set | 782 | # CONFIG_HWMON is not set |
| 741 | # CONFIG_THERMAL is not set | 783 | # CONFIG_THERMAL is not set |
| 784 | # CONFIG_THERMAL_HWMON is not set | ||
| 742 | # CONFIG_WATCHDOG is not set | 785 | # CONFIG_WATCHDOG is not set |
| 786 | CONFIG_SSB_POSSIBLE=y | ||
| 743 | 787 | ||
| 744 | # | 788 | # |
| 745 | # Sonics Silicon Backplane | 789 | # Sonics Silicon Backplane |
| 746 | # | 790 | # |
| 747 | CONFIG_SSB_POSSIBLE=y | ||
| 748 | # CONFIG_SSB is not set | 791 | # CONFIG_SSB is not set |
| 749 | 792 | ||
| 750 | # | 793 | # |
| 751 | # Multifunction device drivers | 794 | # Multifunction device drivers |
| 752 | # | 795 | # |
| 796 | # CONFIG_MFD_CORE is not set | ||
| 753 | # CONFIG_MFD_SM501 is not set | 797 | # CONFIG_MFD_SM501 is not set |
| 754 | # CONFIG_HTC_PASIC3 is not set | 798 | # CONFIG_HTC_PASIC3 is not set |
| 799 | # CONFIG_MFD_TMIO is not set | ||
| 800 | # CONFIG_PMIC_DA903X is not set | ||
| 801 | # CONFIG_MFD_WM8400 is not set | ||
| 802 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 803 | # CONFIG_REGULATOR is not set | ||
| 755 | 804 | ||
| 756 | # | 805 | # |
| 757 | # Multimedia devices | 806 | # Multimedia devices |
| 758 | # | 807 | # |
| 808 | |||
| 809 | # | ||
| 810 | # Multimedia core support | ||
| 811 | # | ||
| 759 | # CONFIG_VIDEO_DEV is not set | 812 | # CONFIG_VIDEO_DEV is not set |
| 760 | # CONFIG_DVB_CORE is not set | 813 | # CONFIG_DVB_CORE is not set |
| 814 | # CONFIG_VIDEO_MEDIA is not set | ||
| 815 | |||
| 816 | # | ||
| 817 | # Multimedia drivers | ||
| 818 | # | ||
| 761 | # CONFIG_DAB is not set | 819 | # CONFIG_DAB is not set |
| 762 | 820 | ||
| 763 | # | 821 | # |
| @@ -774,10 +832,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 774 | # Display device support | 832 | # Display device support |
| 775 | # | 833 | # |
| 776 | # CONFIG_DISPLAY_SUPPORT is not set | 834 | # CONFIG_DISPLAY_SUPPORT is not set |
| 777 | |||
| 778 | # | ||
| 779 | # Sound | ||
| 780 | # | ||
| 781 | # CONFIG_SOUND is not set | 835 | # CONFIG_SOUND is not set |
| 782 | CONFIG_USB_SUPPORT=y | 836 | CONFIG_USB_SUPPORT=y |
| 783 | CONFIG_USB_ARCH_HAS_HCD=y | 837 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -788,17 +842,25 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 788 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 842 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 789 | 843 | ||
| 790 | # | 844 | # |
| 845 | # Enable Host or Gadget support to see Inventra options | ||
| 846 | # | ||
| 847 | |||
| 848 | # | ||
| 791 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 849 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 792 | # | 850 | # |
| 793 | # CONFIG_USB_GADGET is not set | 851 | # CONFIG_USB_GADGET is not set |
| 852 | # CONFIG_UWB is not set | ||
| 794 | # CONFIG_MMC is not set | 853 | # CONFIG_MMC is not set |
| 795 | # CONFIG_MEMSTICK is not set | 854 | # CONFIG_MEMSTICK is not set |
| 796 | # CONFIG_NEW_LEDS is not set | 855 | # CONFIG_NEW_LEDS is not set |
| 856 | # CONFIG_ACCESSIBILITY is not set | ||
| 797 | # CONFIG_INFINIBAND is not set | 857 | # CONFIG_INFINIBAND is not set |
| 798 | # CONFIG_EDAC is not set | 858 | # CONFIG_EDAC is not set |
| 799 | # CONFIG_RTC_CLASS is not set | 859 | # CONFIG_RTC_CLASS is not set |
| 800 | # CONFIG_DMADEVICES is not set | 860 | # CONFIG_DMADEVICES is not set |
| 801 | # CONFIG_UIO is not set | 861 | # CONFIG_UIO is not set |
| 862 | # CONFIG_STAGING is not set | ||
| 863 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 802 | 864 | ||
| 803 | # | 865 | # |
| 804 | # File systems | 866 | # File systems |
| @@ -810,12 +872,13 @@ CONFIG_EXT3_FS=y | |||
| 810 | CONFIG_EXT3_FS_XATTR=y | 872 | CONFIG_EXT3_FS_XATTR=y |
| 811 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 873 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 812 | # CONFIG_EXT3_FS_SECURITY is not set | 874 | # CONFIG_EXT3_FS_SECURITY is not set |
| 813 | # CONFIG_EXT4DEV_FS is not set | 875 | # CONFIG_EXT4_FS is not set |
| 814 | CONFIG_JBD=y | 876 | CONFIG_JBD=y |
| 815 | CONFIG_FS_MBCACHE=y | 877 | CONFIG_FS_MBCACHE=y |
| 816 | # CONFIG_REISERFS_FS is not set | 878 | # CONFIG_REISERFS_FS is not set |
| 817 | # CONFIG_JFS_FS is not set | 879 | # CONFIG_JFS_FS is not set |
| 818 | # CONFIG_FS_POSIX_ACL is not set | 880 | # CONFIG_FS_POSIX_ACL is not set |
| 881 | CONFIG_FILE_LOCKING=y | ||
| 819 | # CONFIG_XFS_FS is not set | 882 | # CONFIG_XFS_FS is not set |
| 820 | # CONFIG_OCFS2_FS is not set | 883 | # CONFIG_OCFS2_FS is not set |
| 821 | CONFIG_DNOTIFY=y | 884 | CONFIG_DNOTIFY=y |
| @@ -845,6 +908,7 @@ CONFIG_INOTIFY_USER=y | |||
| 845 | CONFIG_PROC_FS=y | 908 | CONFIG_PROC_FS=y |
| 846 | CONFIG_PROC_KCORE=y | 909 | CONFIG_PROC_KCORE=y |
| 847 | CONFIG_PROC_SYSCTL=y | 910 | CONFIG_PROC_SYSCTL=y |
| 911 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 848 | CONFIG_SYSFS=y | 912 | CONFIG_SYSFS=y |
| 849 | CONFIG_TMPFS=y | 913 | CONFIG_TMPFS=y |
| 850 | # CONFIG_TMPFS_POSIX_ACL is not set | 914 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -864,6 +928,7 @@ CONFIG_TMPFS=y | |||
| 864 | # CONFIG_CRAMFS is not set | 928 | # CONFIG_CRAMFS is not set |
| 865 | # CONFIG_VXFS_FS is not set | 929 | # CONFIG_VXFS_FS is not set |
| 866 | # CONFIG_MINIX_FS is not set | 930 | # CONFIG_MINIX_FS is not set |
| 931 | # CONFIG_OMFS_FS is not set | ||
| 867 | # CONFIG_HPFS_FS is not set | 932 | # CONFIG_HPFS_FS is not set |
| 868 | # CONFIG_QNX4FS_FS is not set | 933 | # CONFIG_QNX4FS_FS is not set |
| 869 | # CONFIG_ROMFS_FS is not set | 934 | # CONFIG_ROMFS_FS is not set |
| @@ -874,14 +939,14 @@ CONFIG_NFS_FS=y | |||
| 874 | CONFIG_NFS_V3=y | 939 | CONFIG_NFS_V3=y |
| 875 | # CONFIG_NFS_V3_ACL is not set | 940 | # CONFIG_NFS_V3_ACL is not set |
| 876 | CONFIG_NFS_V4=y | 941 | CONFIG_NFS_V4=y |
| 877 | # CONFIG_NFSD is not set | ||
| 878 | CONFIG_ROOT_NFS=y | 942 | CONFIG_ROOT_NFS=y |
| 943 | # CONFIG_NFSD is not set | ||
| 879 | CONFIG_LOCKD=y | 944 | CONFIG_LOCKD=y |
| 880 | CONFIG_LOCKD_V4=y | 945 | CONFIG_LOCKD_V4=y |
| 881 | CONFIG_NFS_COMMON=y | 946 | CONFIG_NFS_COMMON=y |
| 882 | CONFIG_SUNRPC=y | 947 | CONFIG_SUNRPC=y |
| 883 | CONFIG_SUNRPC_GSS=y | 948 | CONFIG_SUNRPC_GSS=y |
| 884 | # CONFIG_SUNRPC_BIND34 is not set | 949 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 885 | CONFIG_RPCSEC_GSS_KRB5=y | 950 | CONFIG_RPCSEC_GSS_KRB5=y |
| 886 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 951 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 887 | # CONFIG_SMB_FS is not set | 952 | # CONFIG_SMB_FS is not set |
| @@ -902,9 +967,9 @@ CONFIG_MSDOS_PARTITION=y | |||
| 902 | # Library routines | 967 | # Library routines |
| 903 | # | 968 | # |
| 904 | CONFIG_BITREVERSE=y | 969 | CONFIG_BITREVERSE=y |
| 905 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 906 | # CONFIG_CRC_CCITT is not set | 970 | # CONFIG_CRC_CCITT is not set |
| 907 | # CONFIG_CRC16 is not set | 971 | # CONFIG_CRC16 is not set |
| 972 | # CONFIG_CRC_T10DIF is not set | ||
| 908 | # CONFIG_CRC_ITU_T is not set | 973 | # CONFIG_CRC_ITU_T is not set |
| 909 | CONFIG_CRC32=y | 974 | CONFIG_CRC32=y |
| 910 | # CONFIG_CRC7 is not set | 975 | # CONFIG_CRC7 is not set |
| @@ -929,9 +994,12 @@ CONFIG_FRAME_WARN=1024 | |||
| 929 | CONFIG_DEBUG_KERNEL=y | 994 | CONFIG_DEBUG_KERNEL=y |
| 930 | # CONFIG_DEBUG_SHIRQ is not set | 995 | # CONFIG_DEBUG_SHIRQ is not set |
| 931 | CONFIG_DETECT_SOFTLOCKUP=y | 996 | CONFIG_DETECT_SOFTLOCKUP=y |
| 997 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 998 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 932 | CONFIG_SCHED_DEBUG=y | 999 | CONFIG_SCHED_DEBUG=y |
| 933 | # CONFIG_SCHEDSTATS is not set | 1000 | # CONFIG_SCHEDSTATS is not set |
| 934 | # CONFIG_TIMER_STATS is not set | 1001 | # CONFIG_TIMER_STATS is not set |
| 1002 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 935 | # CONFIG_SLUB_DEBUG_ON is not set | 1003 | # CONFIG_SLUB_DEBUG_ON is not set |
| 936 | # CONFIG_SLUB_STATS is not set | 1004 | # CONFIG_SLUB_STATS is not set |
| 937 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1005 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -945,17 +1013,37 @@ CONFIG_SCHED_DEBUG=y | |||
| 945 | CONFIG_DEBUG_INFO=y | 1013 | CONFIG_DEBUG_INFO=y |
| 946 | # CONFIG_DEBUG_VM is not set | 1014 | # CONFIG_DEBUG_VM is not set |
| 947 | # CONFIG_DEBUG_WRITECOUNT is not set | 1015 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1016 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 948 | # CONFIG_DEBUG_LIST is not set | 1017 | # CONFIG_DEBUG_LIST is not set |
| 949 | # CONFIG_DEBUG_SG is not set | 1018 | # CONFIG_DEBUG_SG is not set |
| 950 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1019 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 951 | # CONFIG_RCU_TORTURE_TEST is not set | 1020 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1021 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 952 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1022 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1023 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 953 | # CONFIG_FAULT_INJECTION is not set | 1024 | # CONFIG_FAULT_INJECTION is not set |
| 1025 | # CONFIG_LATENCYTOP is not set | ||
| 1026 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1027 | |||
| 1028 | # | ||
| 1029 | # Tracers | ||
| 1030 | # | ||
| 1031 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1032 | # CONFIG_SCHED_TRACER is not set | ||
| 1033 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1034 | # CONFIG_BOOT_TRACER is not set | ||
| 1035 | # CONFIG_STACK_TRACER is not set | ||
| 1036 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 954 | # CONFIG_SAMPLES is not set | 1037 | # CONFIG_SAMPLES is not set |
| 1038 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1039 | # CONFIG_KGDB is not set | ||
| 955 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1040 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 956 | # CONFIG_DEBUG_STACK_USAGE is not set | 1041 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 957 | # CONFIG_DEBUG_PAGEALLOC is not set | 1042 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 958 | # CONFIG_DEBUGGER is not set | 1043 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1044 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1045 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
| 1046 | # CONFIG_XMON is not set | ||
| 959 | # CONFIG_IRQSTACKS is not set | 1047 | # CONFIG_IRQSTACKS is not set |
| 960 | # CONFIG_BDI_SWITCH is not set | 1048 | # CONFIG_BDI_SWITCH is not set |
| 961 | # CONFIG_BOOTX_TEXT is not set | 1049 | # CONFIG_BOOTX_TEXT is not set |
| @@ -966,14 +1054,19 @@ CONFIG_DEBUG_INFO=y | |||
| 966 | # | 1054 | # |
| 967 | # CONFIG_KEYS is not set | 1055 | # CONFIG_KEYS is not set |
| 968 | # CONFIG_SECURITY is not set | 1056 | # CONFIG_SECURITY is not set |
| 1057 | # CONFIG_SECURITYFS is not set | ||
| 969 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1058 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 970 | CONFIG_CRYPTO=y | 1059 | CONFIG_CRYPTO=y |
| 971 | 1060 | ||
| 972 | # | 1061 | # |
| 973 | # Crypto core or helper | 1062 | # Crypto core or helper |
| 974 | # | 1063 | # |
| 1064 | # CONFIG_CRYPTO_FIPS is not set | ||
| 975 | CONFIG_CRYPTO_ALGAPI=y | 1065 | CONFIG_CRYPTO_ALGAPI=y |
| 1066 | CONFIG_CRYPTO_AEAD=y | ||
| 976 | CONFIG_CRYPTO_BLKCIPHER=y | 1067 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1068 | CONFIG_CRYPTO_HASH=y | ||
| 1069 | CONFIG_CRYPTO_RNG=y | ||
| 977 | CONFIG_CRYPTO_MANAGER=y | 1070 | CONFIG_CRYPTO_MANAGER=y |
| 978 | # CONFIG_CRYPTO_GF128MUL is not set | 1071 | # CONFIG_CRYPTO_GF128MUL is not set |
| 979 | # CONFIG_CRYPTO_NULL is not set | 1072 | # CONFIG_CRYPTO_NULL is not set |
| @@ -1012,6 +1105,10 @@ CONFIG_CRYPTO_CBC=y | |||
| 1012 | # CONFIG_CRYPTO_MD4 is not set | 1105 | # CONFIG_CRYPTO_MD4 is not set |
| 1013 | CONFIG_CRYPTO_MD5=y | 1106 | CONFIG_CRYPTO_MD5=y |
| 1014 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1107 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1108 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1109 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1110 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1111 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1015 | # CONFIG_CRYPTO_SHA1 is not set | 1112 | # CONFIG_CRYPTO_SHA1 is not set |
| 1016 | # CONFIG_CRYPTO_SHA256 is not set | 1113 | # CONFIG_CRYPTO_SHA256 is not set |
| 1017 | # CONFIG_CRYPTO_SHA512 is not set | 1114 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1042,6 +1139,11 @@ CONFIG_CRYPTO_DES=y | |||
| 1042 | # | 1139 | # |
| 1043 | # CONFIG_CRYPTO_DEFLATE is not set | 1140 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1044 | # CONFIG_CRYPTO_LZO is not set | 1141 | # CONFIG_CRYPTO_LZO is not set |
| 1142 | |||
| 1143 | # | ||
| 1144 | # Random Number Generation | ||
| 1145 | # | ||
| 1146 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1045 | CONFIG_CRYPTO_HW=y | 1147 | CONFIG_CRYPTO_HW=y |
| 1046 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1148 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1047 | CONFIG_PPC_CLOCK=y | 1149 | CONFIG_PPC_CLOCK=y |
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig index 8c7ba7c6ba49..3c0d4e561726 100644 --- a/arch/powerpc/configs/52xx/motionpro_defconfig +++ b/arch/powerpc/configs/52xx/motionpro_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.25 | 3 | # Linux kernel version: 2.6.28-rc4 |
| 4 | # Tue Apr 29 07:12:22 2008 | 4 | # Thu Nov 13 02:11:02 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y | |||
| 22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| @@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -102,6 +103,7 @@ CONFIG_SIGNALFD=y | |||
| 102 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 103 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 104 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 105 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 106 | CONFIG_SLUB_DEBUG=y | 108 | CONFIG_SLUB_DEBUG=y |
| 107 | # CONFIG_SLAB is not set | 109 | # CONFIG_SLAB is not set |
| @@ -110,9 +112,13 @@ CONFIG_SLUB=y | |||
| 110 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
| 111 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
| 112 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 113 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 115 | CONFIG_PROC_PAGE_MONITOR=y | 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 120 | CONFIG_HAVE_CLK=y | ||
| 121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 116 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 117 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
| 118 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
| @@ -123,6 +129,7 @@ CONFIG_BLOCK=y | |||
| 123 | # CONFIG_BLK_DEV_IO_TRACE is not set | 129 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 124 | # CONFIG_LSF is not set | 130 | # CONFIG_LSF is not set |
| 125 | # CONFIG_BLK_DEV_BSG is not set | 131 | # CONFIG_BLK_DEV_BSG is not set |
| 132 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 126 | 133 | ||
| 127 | # | 134 | # |
| 128 | # IO Schedulers | 135 | # IO Schedulers |
| @@ -137,19 +144,16 @@ CONFIG_DEFAULT_AS=y | |||
| 137 | # CONFIG_DEFAULT_NOOP is not set | 144 | # CONFIG_DEFAULT_NOOP is not set |
| 138 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 145 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 139 | CONFIG_CLASSIC_RCU=y | 146 | CONFIG_CLASSIC_RCU=y |
| 147 | # CONFIG_FREEZER is not set | ||
| 140 | 148 | ||
| 141 | # | 149 | # |
| 142 | # Platform support | 150 | # Platform support |
| 143 | # | 151 | # |
| 144 | CONFIG_PPC_MULTIPLATFORM=y | 152 | CONFIG_PPC_MULTIPLATFORM=y |
| 145 | # CONFIG_PPC_82xx is not set | ||
| 146 | # CONFIG_PPC_83xx is not set | ||
| 147 | # CONFIG_PPC_86xx is not set | ||
| 148 | CONFIG_CLASSIC32=y | 153 | CONFIG_CLASSIC32=y |
| 149 | # CONFIG_PPC_CHRP is not set | 154 | # CONFIG_PPC_CHRP is not set |
| 150 | # CONFIG_PPC_MPC512x is not set | ||
| 151 | # CONFIG_PPC_MPC5121 is not set | ||
| 152 | # CONFIG_MPC5121_ADS is not set | 155 | # CONFIG_MPC5121_ADS is not set |
| 156 | # CONFIG_MPC5121_GENERIC is not set | ||
| 153 | CONFIG_PPC_MPC52xx=y | 157 | CONFIG_PPC_MPC52xx=y |
| 154 | CONFIG_PPC_MPC5200_SIMPLE=y | 158 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 155 | # CONFIG_PPC_EFIKA is not set | 159 | # CONFIG_PPC_EFIKA is not set |
| @@ -159,7 +163,10 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
| 159 | # CONFIG_PPC_PMAC is not set | 163 | # CONFIG_PPC_PMAC is not set |
| 160 | # CONFIG_PPC_CELL is not set | 164 | # CONFIG_PPC_CELL is not set |
| 161 | # CONFIG_PPC_CELL_NATIVE is not set | 165 | # CONFIG_PPC_CELL_NATIVE is not set |
| 166 | # CONFIG_PPC_82xx is not set | ||
| 162 | # CONFIG_PQ2ADS is not set | 167 | # CONFIG_PQ2ADS is not set |
| 168 | # CONFIG_PPC_83xx is not set | ||
| 169 | # CONFIG_PPC_86xx is not set | ||
| 163 | # CONFIG_EMBEDDED6xx is not set | 170 | # CONFIG_EMBEDDED6xx is not set |
| 164 | # CONFIG_IPIC is not set | 171 | # CONFIG_IPIC is not set |
| 165 | # CONFIG_MPIC is not set | 172 | # CONFIG_MPIC is not set |
| @@ -183,7 +190,6 @@ CONFIG_PPC_BESTCOMM_FEC=y | |||
| 183 | # Kernel options | 190 | # Kernel options |
| 184 | # | 191 | # |
| 185 | # CONFIG_HIGHMEM is not set | 192 | # CONFIG_HIGHMEM is not set |
| 186 | # CONFIG_TICK_ONESHOT is not set | ||
| 187 | # CONFIG_NO_HZ is not set | 193 | # CONFIG_NO_HZ is not set |
| 188 | # CONFIG_HIGH_RES_TIMERS is not set | 194 | # CONFIG_HIGH_RES_TIMERS is not set |
| 189 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 195 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| @@ -197,6 +203,8 @@ CONFIG_PREEMPT_NONE=y | |||
| 197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 203 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 198 | # CONFIG_PREEMPT is not set | 204 | # CONFIG_PREEMPT is not set |
| 199 | CONFIG_BINFMT_ELF=y | 205 | CONFIG_BINFMT_ELF=y |
| 206 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 207 | # CONFIG_HAVE_AOUT is not set | ||
| 200 | # CONFIG_BINFMT_MISC is not set | 208 | # CONFIG_BINFMT_MISC is not set |
| 201 | # CONFIG_IOMMU_HELPER is not set | 209 | # CONFIG_IOMMU_HELPER is not set |
| 202 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 210 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -211,19 +219,20 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 211 | # CONFIG_SPARSEMEM_MANUAL is not set | 219 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 212 | CONFIG_FLATMEM=y | 220 | CONFIG_FLATMEM=y |
| 213 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 214 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 224 | CONFIG_MIGRATION=y | ||
| 218 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
| 226 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 219 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 220 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| 221 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_UNEVICTABLE_LRU=y | ||
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 223 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
| 234 | CONFIG_EXTRA_TARGETS="" | ||
| 225 | CONFIG_PM=y | 235 | CONFIG_PM=y |
| 226 | # CONFIG_PM_LEGACY is not set | ||
| 227 | # CONFIG_PM_DEBUG is not set | 236 | # CONFIG_PM_DEBUG is not set |
| 228 | CONFIG_SECCOMP=y | 237 | CONFIG_SECCOMP=y |
| 229 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
| @@ -233,7 +242,7 @@ CONFIG_ISA_DMA_API=y | |||
| 233 | # | 242 | # |
| 234 | CONFIG_ZONE_DMA=y | 243 | CONFIG_ZONE_DMA=y |
| 235 | CONFIG_GENERIC_ISA_DMA=y | 244 | CONFIG_GENERIC_ISA_DMA=y |
| 236 | CONFIG_FSL_SOC=y | 245 | CONFIG_PPC_PCI_CHOICE=y |
| 237 | # CONFIG_PCI is not set | 246 | # CONFIG_PCI is not set |
| 238 | # CONFIG_PCI_DOMAINS is not set | 247 | # CONFIG_PCI_DOMAINS is not set |
| 239 | # CONFIG_PCI_SYSCALL is not set | 248 | # CONFIG_PCI_SYSCALL is not set |
| @@ -254,10 +263,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 263 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | 264 | CONFIG_PHYSICAL_START=0x00000000 |
| 256 | CONFIG_TASK_SIZE=0xc0000000 | 265 | CONFIG_TASK_SIZE=0xc0000000 |
| 257 | |||
| 258 | # | ||
| 259 | # Networking | ||
| 260 | # | ||
| 261 | CONFIG_NET=y | 266 | CONFIG_NET=y |
| 262 | 267 | ||
| 263 | # | 268 | # |
| @@ -308,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 308 | # CONFIG_TIPC is not set | 313 | # CONFIG_TIPC is not set |
| 309 | # CONFIG_ATM is not set | 314 | # CONFIG_ATM is not set |
| 310 | # CONFIG_BRIDGE is not set | 315 | # CONFIG_BRIDGE is not set |
| 316 | # CONFIG_NET_DSA is not set | ||
| 311 | # CONFIG_VLAN_8021Q is not set | 317 | # CONFIG_VLAN_8021Q is not set |
| 312 | # CONFIG_DECNET is not set | 318 | # CONFIG_DECNET is not set |
| 313 | # CONFIG_LLC2 is not set | 319 | # CONFIG_LLC2 is not set |
| @@ -328,14 +334,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 328 | # CONFIG_IRDA is not set | 334 | # CONFIG_IRDA is not set |
| 329 | # CONFIG_BT is not set | 335 | # CONFIG_BT is not set |
| 330 | # CONFIG_AF_RXRPC is not set | 336 | # CONFIG_AF_RXRPC is not set |
| 331 | 337 | # CONFIG_PHONET is not set | |
| 332 | # | 338 | # CONFIG_WIRELESS is not set |
| 333 | # Wireless | ||
| 334 | # | ||
| 335 | # CONFIG_CFG80211 is not set | ||
| 336 | # CONFIG_WIRELESS_EXT is not set | ||
| 337 | # CONFIG_MAC80211 is not set | ||
| 338 | # CONFIG_IEEE80211 is not set | ||
| 339 | # CONFIG_RFKILL is not set | 339 | # CONFIG_RFKILL is not set |
| 340 | # CONFIG_NET_9P is not set | 340 | # CONFIG_NET_9P is not set |
| 341 | 341 | ||
| @@ -445,9 +445,12 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 445 | # CONFIG_BLK_DEV_XIP is not set | 445 | # CONFIG_BLK_DEV_XIP is not set |
| 446 | # CONFIG_CDROM_PKTCDVD is not set | 446 | # CONFIG_CDROM_PKTCDVD is not set |
| 447 | # CONFIG_ATA_OVER_ETH is not set | 447 | # CONFIG_ATA_OVER_ETH is not set |
| 448 | # CONFIG_BLK_DEV_HD is not set | ||
| 448 | CONFIG_MISC_DEVICES=y | 449 | CONFIG_MISC_DEVICES=y |
| 449 | # CONFIG_EEPROM_93CX6 is not set | 450 | # CONFIG_EEPROM_93CX6 is not set |
| 451 | # CONFIG_ICS932S401 is not set | ||
| 450 | # CONFIG_ENCLOSURE_SERVICES is not set | 452 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 453 | # CONFIG_C2PORT is not set | ||
| 451 | CONFIG_HAVE_IDE=y | 454 | CONFIG_HAVE_IDE=y |
| 452 | # CONFIG_IDE is not set | 455 | # CONFIG_IDE is not set |
| 453 | 456 | ||
| @@ -490,10 +493,10 @@ CONFIG_CHR_DEV_SG=y | |||
| 490 | CONFIG_SCSI_LOWLEVEL=y | 493 | CONFIG_SCSI_LOWLEVEL=y |
| 491 | # CONFIG_ISCSI_TCP is not set | 494 | # CONFIG_ISCSI_TCP is not set |
| 492 | # CONFIG_SCSI_DEBUG is not set | 495 | # CONFIG_SCSI_DEBUG is not set |
| 496 | # CONFIG_SCSI_DH is not set | ||
| 493 | CONFIG_ATA=y | 497 | CONFIG_ATA=y |
| 494 | # CONFIG_ATA_NONSTANDARD is not set | 498 | # CONFIG_ATA_NONSTANDARD is not set |
| 495 | CONFIG_SATA_PMP=y | 499 | CONFIG_SATA_PMP=y |
| 496 | # CONFIG_SATA_FSL is not set | ||
| 497 | CONFIG_ATA_SFF=y | 500 | CONFIG_ATA_SFF=y |
| 498 | # CONFIG_SATA_MV is not set | 501 | # CONFIG_SATA_MV is not set |
| 499 | CONFIG_PATA_MPC52xx=y | 502 | CONFIG_PATA_MPC52xx=y |
| @@ -501,7 +504,6 @@ CONFIG_PATA_MPC52xx=y | |||
| 501 | # CONFIG_MD is not set | 504 | # CONFIG_MD is not set |
| 502 | # CONFIG_MACINTOSH_DRIVERS is not set | 505 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 503 | CONFIG_NETDEVICES=y | 506 | CONFIG_NETDEVICES=y |
| 504 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 505 | # CONFIG_DUMMY is not set | 507 | # CONFIG_DUMMY is not set |
| 506 | # CONFIG_BONDING is not set | 508 | # CONFIG_BONDING is not set |
| 507 | # CONFIG_MACVLAN is not set | 509 | # CONFIG_MACVLAN is not set |
| @@ -531,6 +533,9 @@ CONFIG_MII=y | |||
| 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 533 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 534 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 533 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 535 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 536 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 537 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 538 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 534 | # CONFIG_B44 is not set | 539 | # CONFIG_B44 is not set |
| 535 | CONFIG_FEC_MPC52xx=y | 540 | CONFIG_FEC_MPC52xx=y |
| 536 | CONFIG_FEC_MPC52xx_MDIO=y | 541 | CONFIG_FEC_MPC52xx_MDIO=y |
| @@ -542,7 +547,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 542 | # | 547 | # |
| 543 | # CONFIG_WLAN_PRE80211 is not set | 548 | # CONFIG_WLAN_PRE80211 is not set |
| 544 | # CONFIG_WLAN_80211 is not set | 549 | # CONFIG_WLAN_80211 is not set |
| 545 | # CONFIG_IWLWIFI is not set | ||
| 546 | # CONFIG_IWLWIFI_LEDS is not set | 550 | # CONFIG_IWLWIFI_LEDS is not set |
| 547 | # CONFIG_WAN is not set | 551 | # CONFIG_WAN is not set |
| 548 | # CONFIG_PPP is not set | 552 | # CONFIG_PPP is not set |
| @@ -568,6 +572,7 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 568 | # Character devices | 572 | # Character devices |
| 569 | # | 573 | # |
| 570 | # CONFIG_VT is not set | 574 | # CONFIG_VT is not set |
| 575 | CONFIG_DEVKMEM=y | ||
| 571 | # CONFIG_SERIAL_NONSTANDARD is not set | 576 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 572 | 577 | ||
| 573 | # | 578 | # |
| @@ -596,24 +601,39 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 596 | CONFIG_I2C=y | 601 | CONFIG_I2C=y |
| 597 | CONFIG_I2C_BOARDINFO=y | 602 | CONFIG_I2C_BOARDINFO=y |
| 598 | CONFIG_I2C_CHARDEV=y | 603 | CONFIG_I2C_CHARDEV=y |
| 604 | CONFIG_I2C_HELPER_AUTO=y | ||
| 599 | 605 | ||
| 600 | # | 606 | # |
| 601 | # I2C Hardware Bus support | 607 | # I2C Hardware Bus support |
| 602 | # | 608 | # |
| 609 | |||
| 610 | # | ||
| 611 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 612 | # | ||
| 603 | CONFIG_I2C_MPC=y | 613 | CONFIG_I2C_MPC=y |
| 604 | # CONFIG_I2C_OCORES is not set | 614 | # CONFIG_I2C_OCORES is not set |
| 605 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 606 | # CONFIG_I2C_SIMTEC is not set | 615 | # CONFIG_I2C_SIMTEC is not set |
| 616 | |||
| 617 | # | ||
| 618 | # External I2C/SMBus adapter drivers | ||
| 619 | # | ||
| 620 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 607 | # CONFIG_I2C_TAOS_EVM is not set | 621 | # CONFIG_I2C_TAOS_EVM is not set |
| 622 | |||
| 623 | # | ||
| 624 | # Other I2C/SMBus bus drivers | ||
| 625 | # | ||
| 608 | # CONFIG_I2C_PCA_PLATFORM is not set | 626 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 609 | 627 | ||
| 610 | # | 628 | # |
| 611 | # Miscellaneous I2C Chip support | 629 | # Miscellaneous I2C Chip support |
| 612 | # | 630 | # |
| 613 | # CONFIG_DS1682 is not set | 631 | # CONFIG_DS1682 is not set |
| 632 | # CONFIG_AT24 is not set | ||
| 614 | CONFIG_SENSORS_EEPROM=y | 633 | CONFIG_SENSORS_EEPROM=y |
| 615 | # CONFIG_SENSORS_PCF8574 is not set | 634 | # CONFIG_SENSORS_PCF8574 is not set |
| 616 | # CONFIG_PCF8575 is not set | 635 | # CONFIG_PCF8575 is not set |
| 636 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 617 | # CONFIG_SENSORS_PCF8591 is not set | 637 | # CONFIG_SENSORS_PCF8591 is not set |
| 618 | # CONFIG_SENSORS_MAX6875 is not set | 638 | # CONFIG_SENSORS_MAX6875 is not set |
| 619 | # CONFIG_SENSORS_TSL2550 is not set | 639 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -622,10 +642,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 622 | # CONFIG_I2C_DEBUG_BUS is not set | 642 | # CONFIG_I2C_DEBUG_BUS is not set |
| 623 | # CONFIG_I2C_DEBUG_CHIP is not set | 643 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 624 | # CONFIG_SPI is not set | 644 | # CONFIG_SPI is not set |
| 645 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 646 | # CONFIG_GPIOLIB is not set | ||
| 625 | # CONFIG_W1 is not set | 647 | # CONFIG_W1 is not set |
| 626 | # CONFIG_POWER_SUPPLY is not set | 648 | # CONFIG_POWER_SUPPLY is not set |
| 627 | CONFIG_HWMON=y | 649 | CONFIG_HWMON=y |
| 628 | # CONFIG_HWMON_VID is not set | 650 | # CONFIG_HWMON_VID is not set |
| 651 | # CONFIG_SENSORS_AD7414 is not set | ||
| 629 | # CONFIG_SENSORS_AD7418 is not set | 652 | # CONFIG_SENSORS_AD7418 is not set |
| 630 | # CONFIG_SENSORS_ADM1021 is not set | 653 | # CONFIG_SENSORS_ADM1021 is not set |
| 631 | # CONFIG_SENSORS_ADM1025 is not set | 654 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -633,6 +656,7 @@ CONFIG_HWMON=y | |||
| 633 | # CONFIG_SENSORS_ADM1029 is not set | 656 | # CONFIG_SENSORS_ADM1029 is not set |
| 634 | # CONFIG_SENSORS_ADM1031 is not set | 657 | # CONFIG_SENSORS_ADM1031 is not set |
| 635 | # CONFIG_SENSORS_ADM9240 is not set | 658 | # CONFIG_SENSORS_ADM9240 is not set |
| 659 | # CONFIG_SENSORS_ADT7462 is not set | ||
| 636 | # CONFIG_SENSORS_ADT7470 is not set | 660 | # CONFIG_SENSORS_ADT7470 is not set |
| 637 | # CONFIG_SENSORS_ADT7473 is not set | 661 | # CONFIG_SENSORS_ADT7473 is not set |
| 638 | # CONFIG_SENSORS_ATXP1 is not set | 662 | # CONFIG_SENSORS_ATXP1 is not set |
| @@ -675,6 +699,7 @@ CONFIG_HWMON=y | |||
| 675 | # CONFIG_SENSORS_W83627EHF is not set | 699 | # CONFIG_SENSORS_W83627EHF is not set |
| 676 | # CONFIG_HWMON_DEBUG_CHIP is not set | 700 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 677 | # CONFIG_THERMAL is not set | 701 | # CONFIG_THERMAL is not set |
| 702 | # CONFIG_THERMAL_HWMON is not set | ||
| 678 | CONFIG_WATCHDOG=y | 703 | CONFIG_WATCHDOG=y |
| 679 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 704 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 680 | 705 | ||
| @@ -683,24 +708,39 @@ CONFIG_WATCHDOG=y | |||
| 683 | # | 708 | # |
| 684 | # CONFIG_SOFT_WATCHDOG is not set | 709 | # CONFIG_SOFT_WATCHDOG is not set |
| 685 | # CONFIG_MPC5200_WDT is not set | 710 | # CONFIG_MPC5200_WDT is not set |
| 711 | CONFIG_SSB_POSSIBLE=y | ||
| 686 | 712 | ||
| 687 | # | 713 | # |
| 688 | # Sonics Silicon Backplane | 714 | # Sonics Silicon Backplane |
| 689 | # | 715 | # |
| 690 | CONFIG_SSB_POSSIBLE=y | ||
| 691 | # CONFIG_SSB is not set | 716 | # CONFIG_SSB is not set |
| 692 | 717 | ||
| 693 | # | 718 | # |
| 694 | # Multifunction device drivers | 719 | # Multifunction device drivers |
| 695 | # | 720 | # |
| 721 | # CONFIG_MFD_CORE is not set | ||
| 696 | # CONFIG_MFD_SM501 is not set | 722 | # CONFIG_MFD_SM501 is not set |
| 697 | # CONFIG_HTC_PASIC3 is not set | 723 | # CONFIG_HTC_PASIC3 is not set |
| 724 | # CONFIG_MFD_TMIO is not set | ||
| 725 | # CONFIG_PMIC_DA903X is not set | ||
| 726 | # CONFIG_MFD_WM8400 is not set | ||
| 727 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 728 | # CONFIG_REGULATOR is not set | ||
| 698 | 729 | ||
| 699 | # | 730 | # |
| 700 | # Multimedia devices | 731 | # Multimedia devices |
| 701 | # | 732 | # |
| 733 | |||
| 734 | # | ||
| 735 | # Multimedia core support | ||
| 736 | # | ||
| 702 | # CONFIG_VIDEO_DEV is not set | 737 | # CONFIG_VIDEO_DEV is not set |
| 703 | # CONFIG_DVB_CORE is not set | 738 | # CONFIG_DVB_CORE is not set |
| 739 | # CONFIG_VIDEO_MEDIA is not set | ||
| 740 | |||
| 741 | # | ||
| 742 | # Multimedia drivers | ||
| 743 | # | ||
| 704 | CONFIG_DAB=y | 744 | CONFIG_DAB=y |
| 705 | 745 | ||
| 706 | # | 746 | # |
| @@ -715,10 +755,6 @@ CONFIG_DAB=y | |||
| 715 | # Display device support | 755 | # Display device support |
| 716 | # | 756 | # |
| 717 | # CONFIG_DISPLAY_SUPPORT is not set | 757 | # CONFIG_DISPLAY_SUPPORT is not set |
| 718 | |||
| 719 | # | ||
| 720 | # Sound | ||
| 721 | # | ||
| 722 | # CONFIG_SOUND is not set | 758 | # CONFIG_SOUND is not set |
| 723 | # CONFIG_USB_SUPPORT is not set | 759 | # CONFIG_USB_SUPPORT is not set |
| 724 | # CONFIG_MMC is not set | 760 | # CONFIG_MMC is not set |
| @@ -729,6 +765,7 @@ CONFIG_LEDS_CLASS=y | |||
| 729 | # | 765 | # |
| 730 | # LED drivers | 766 | # LED drivers |
| 731 | # | 767 | # |
| 768 | # CONFIG_LEDS_PCA955X is not set | ||
| 732 | 769 | ||
| 733 | # | 770 | # |
| 734 | # LED Triggers | 771 | # LED Triggers |
| @@ -736,7 +773,9 @@ CONFIG_LEDS_CLASS=y | |||
| 736 | CONFIG_LEDS_TRIGGERS=y | 773 | CONFIG_LEDS_TRIGGERS=y |
| 737 | CONFIG_LEDS_TRIGGER_TIMER=y | 774 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 738 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | 775 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set |
| 776 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
| 739 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | 777 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set |
| 778 | # CONFIG_ACCESSIBILITY is not set | ||
| 740 | # CONFIG_EDAC is not set | 779 | # CONFIG_EDAC is not set |
| 741 | CONFIG_RTC_LIB=y | 780 | CONFIG_RTC_LIB=y |
| 742 | CONFIG_RTC_CLASS=y | 781 | CONFIG_RTC_CLASS=y |
| @@ -767,6 +806,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 767 | # CONFIG_RTC_DRV_PCF8583 is not set | 806 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 768 | # CONFIG_RTC_DRV_M41T80 is not set | 807 | # CONFIG_RTC_DRV_M41T80 is not set |
| 769 | # CONFIG_RTC_DRV_S35390A is not set | 808 | # CONFIG_RTC_DRV_S35390A is not set |
| 809 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 810 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 770 | 811 | ||
| 771 | # | 812 | # |
| 772 | # SPI RTC drivers | 813 | # SPI RTC drivers |
| @@ -776,19 +817,25 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 776 | # Platform RTC drivers | 817 | # Platform RTC drivers |
| 777 | # | 818 | # |
| 778 | # CONFIG_RTC_DRV_CMOS is not set | 819 | # CONFIG_RTC_DRV_CMOS is not set |
| 820 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 779 | # CONFIG_RTC_DRV_DS1511 is not set | 821 | # CONFIG_RTC_DRV_DS1511 is not set |
| 780 | # CONFIG_RTC_DRV_DS1553 is not set | 822 | # CONFIG_RTC_DRV_DS1553 is not set |
| 781 | # CONFIG_RTC_DRV_DS1742 is not set | 823 | # CONFIG_RTC_DRV_DS1742 is not set |
| 782 | # CONFIG_RTC_DRV_STK17TA8 is not set | 824 | # CONFIG_RTC_DRV_STK17TA8 is not set |
| 783 | # CONFIG_RTC_DRV_M48T86 is not set | 825 | # CONFIG_RTC_DRV_M48T86 is not set |
| 826 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 784 | # CONFIG_RTC_DRV_M48T59 is not set | 827 | # CONFIG_RTC_DRV_M48T59 is not set |
| 828 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 785 | # CONFIG_RTC_DRV_V3020 is not set | 829 | # CONFIG_RTC_DRV_V3020 is not set |
| 786 | 830 | ||
| 787 | # | 831 | # |
| 788 | # on-CPU RTC drivers | 832 | # on-CPU RTC drivers |
| 789 | # | 833 | # |
| 834 | # CONFIG_RTC_DRV_PPC is not set | ||
| 790 | # CONFIG_DMADEVICES is not set | 835 | # CONFIG_DMADEVICES is not set |
| 791 | # CONFIG_UIO is not set | 836 | # CONFIG_UIO is not set |
| 837 | # CONFIG_STAGING is not set | ||
| 838 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 792 | 839 | ||
| 793 | # | 840 | # |
| 794 | # File systems | 841 | # File systems |
| @@ -800,12 +847,13 @@ CONFIG_EXT3_FS=y | |||
| 800 | CONFIG_EXT3_FS_XATTR=y | 847 | CONFIG_EXT3_FS_XATTR=y |
| 801 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 848 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 802 | # CONFIG_EXT3_FS_SECURITY is not set | 849 | # CONFIG_EXT3_FS_SECURITY is not set |
| 803 | # CONFIG_EXT4DEV_FS is not set | 850 | # CONFIG_EXT4_FS is not set |
| 804 | CONFIG_JBD=y | 851 | CONFIG_JBD=y |
| 805 | CONFIG_FS_MBCACHE=y | 852 | CONFIG_FS_MBCACHE=y |
| 806 | # CONFIG_REISERFS_FS is not set | 853 | # CONFIG_REISERFS_FS is not set |
| 807 | # CONFIG_JFS_FS is not set | 854 | # CONFIG_JFS_FS is not set |
| 808 | # CONFIG_FS_POSIX_ACL is not set | 855 | # CONFIG_FS_POSIX_ACL is not set |
| 856 | CONFIG_FILE_LOCKING=y | ||
| 809 | # CONFIG_XFS_FS is not set | 857 | # CONFIG_XFS_FS is not set |
| 810 | # CONFIG_OCFS2_FS is not set | 858 | # CONFIG_OCFS2_FS is not set |
| 811 | CONFIG_DNOTIFY=y | 859 | CONFIG_DNOTIFY=y |
| @@ -838,6 +886,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 838 | CONFIG_PROC_FS=y | 886 | CONFIG_PROC_FS=y |
| 839 | CONFIG_PROC_KCORE=y | 887 | CONFIG_PROC_KCORE=y |
| 840 | CONFIG_PROC_SYSCTL=y | 888 | CONFIG_PROC_SYSCTL=y |
| 889 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 841 | CONFIG_SYSFS=y | 890 | CONFIG_SYSFS=y |
| 842 | CONFIG_TMPFS=y | 891 | CONFIG_TMPFS=y |
| 843 | # CONFIG_TMPFS_POSIX_ACL is not set | 892 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -868,6 +917,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 868 | CONFIG_CRAMFS=y | 917 | CONFIG_CRAMFS=y |
| 869 | # CONFIG_VXFS_FS is not set | 918 | # CONFIG_VXFS_FS is not set |
| 870 | # CONFIG_MINIX_FS is not set | 919 | # CONFIG_MINIX_FS is not set |
| 920 | # CONFIG_OMFS_FS is not set | ||
| 871 | # CONFIG_HPFS_FS is not set | 921 | # CONFIG_HPFS_FS is not set |
| 872 | # CONFIG_QNX4FS_FS is not set | 922 | # CONFIG_QNX4FS_FS is not set |
| 873 | # CONFIG_ROMFS_FS is not set | 923 | # CONFIG_ROMFS_FS is not set |
| @@ -878,14 +928,14 @@ CONFIG_NFS_FS=y | |||
| 878 | CONFIG_NFS_V3=y | 928 | CONFIG_NFS_V3=y |
| 879 | # CONFIG_NFS_V3_ACL is not set | 929 | # CONFIG_NFS_V3_ACL is not set |
| 880 | CONFIG_NFS_V4=y | 930 | CONFIG_NFS_V4=y |
| 881 | # CONFIG_NFSD is not set | ||
| 882 | CONFIG_ROOT_NFS=y | 931 | CONFIG_ROOT_NFS=y |
| 932 | # CONFIG_NFSD is not set | ||
| 883 | CONFIG_LOCKD=y | 933 | CONFIG_LOCKD=y |
| 884 | CONFIG_LOCKD_V4=y | 934 | CONFIG_LOCKD_V4=y |
| 885 | CONFIG_NFS_COMMON=y | 935 | CONFIG_NFS_COMMON=y |
| 886 | CONFIG_SUNRPC=y | 936 | CONFIG_SUNRPC=y |
| 887 | CONFIG_SUNRPC_GSS=y | 937 | CONFIG_SUNRPC_GSS=y |
| 888 | # CONFIG_SUNRPC_BIND34 is not set | 938 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 889 | CONFIG_RPCSEC_GSS_KRB5=y | 939 | CONFIG_RPCSEC_GSS_KRB5=y |
| 890 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 940 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 891 | # CONFIG_SMB_FS is not set | 941 | # CONFIG_SMB_FS is not set |
| @@ -961,9 +1011,9 @@ CONFIG_NLS_ISO8859_1=y | |||
| 961 | # Library routines | 1011 | # Library routines |
| 962 | # | 1012 | # |
| 963 | CONFIG_BITREVERSE=y | 1013 | CONFIG_BITREVERSE=y |
| 964 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 965 | # CONFIG_CRC_CCITT is not set | 1014 | # CONFIG_CRC_CCITT is not set |
| 966 | # CONFIG_CRC16 is not set | 1015 | # CONFIG_CRC16 is not set |
| 1016 | # CONFIG_CRC_T10DIF is not set | ||
| 967 | # CONFIG_CRC_ITU_T is not set | 1017 | # CONFIG_CRC_ITU_T is not set |
| 968 | CONFIG_CRC32=y | 1018 | CONFIG_CRC32=y |
| 969 | # CONFIG_CRC7 is not set | 1019 | # CONFIG_CRC7 is not set |
| @@ -990,9 +1040,12 @@ CONFIG_FRAME_WARN=1024 | |||
| 990 | CONFIG_DEBUG_KERNEL=y | 1040 | CONFIG_DEBUG_KERNEL=y |
| 991 | # CONFIG_DEBUG_SHIRQ is not set | 1041 | # CONFIG_DEBUG_SHIRQ is not set |
| 992 | CONFIG_DETECT_SOFTLOCKUP=y | 1042 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1043 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1044 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 993 | CONFIG_SCHED_DEBUG=y | 1045 | CONFIG_SCHED_DEBUG=y |
| 994 | # CONFIG_SCHEDSTATS is not set | 1046 | # CONFIG_SCHEDSTATS is not set |
| 995 | # CONFIG_TIMER_STATS is not set | 1047 | # CONFIG_TIMER_STATS is not set |
| 1048 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 996 | # CONFIG_SLUB_DEBUG_ON is not set | 1049 | # CONFIG_SLUB_DEBUG_ON is not set |
| 997 | # CONFIG_SLUB_STATS is not set | 1050 | # CONFIG_SLUB_STATS is not set |
| 998 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1051 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1006,16 +1059,37 @@ CONFIG_SCHED_DEBUG=y | |||
| 1006 | CONFIG_DEBUG_INFO=y | 1059 | CONFIG_DEBUG_INFO=y |
| 1007 | # CONFIG_DEBUG_VM is not set | 1060 | # CONFIG_DEBUG_VM is not set |
| 1008 | # CONFIG_DEBUG_WRITECOUNT is not set | 1061 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1062 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1009 | # CONFIG_DEBUG_LIST is not set | 1063 | # CONFIG_DEBUG_LIST is not set |
| 1010 | # CONFIG_DEBUG_SG is not set | 1064 | # CONFIG_DEBUG_SG is not set |
| 1011 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1065 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1066 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1067 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1012 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1068 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1069 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1013 | # CONFIG_FAULT_INJECTION is not set | 1070 | # CONFIG_FAULT_INJECTION is not set |
| 1071 | # CONFIG_LATENCYTOP is not set | ||
| 1072 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1073 | |||
| 1074 | # | ||
| 1075 | # Tracers | ||
| 1076 | # | ||
| 1077 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1078 | # CONFIG_SCHED_TRACER is not set | ||
| 1079 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1080 | # CONFIG_BOOT_TRACER is not set | ||
| 1081 | # CONFIG_STACK_TRACER is not set | ||
| 1082 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1014 | # CONFIG_SAMPLES is not set | 1083 | # CONFIG_SAMPLES is not set |
| 1084 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1085 | # CONFIG_KGDB is not set | ||
| 1015 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1086 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1016 | # CONFIG_DEBUG_STACK_USAGE is not set | 1087 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1017 | # CONFIG_DEBUG_PAGEALLOC is not set | 1088 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1018 | # CONFIG_DEBUGGER is not set | 1089 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1090 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1091 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
| 1092 | # CONFIG_XMON is not set | ||
| 1019 | # CONFIG_IRQSTACKS is not set | 1093 | # CONFIG_IRQSTACKS is not set |
| 1020 | # CONFIG_BDI_SWITCH is not set | 1094 | # CONFIG_BDI_SWITCH is not set |
| 1021 | # CONFIG_BOOTX_TEXT is not set | 1095 | # CONFIG_BOOTX_TEXT is not set |
| @@ -1026,14 +1100,19 @@ CONFIG_DEBUG_INFO=y | |||
| 1026 | # | 1100 | # |
| 1027 | # CONFIG_KEYS is not set | 1101 | # CONFIG_KEYS is not set |
| 1028 | # CONFIG_SECURITY is not set | 1102 | # CONFIG_SECURITY is not set |
| 1103 | # CONFIG_SECURITYFS is not set | ||
| 1029 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1104 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1030 | CONFIG_CRYPTO=y | 1105 | CONFIG_CRYPTO=y |
| 1031 | 1106 | ||
| 1032 | # | 1107 | # |
| 1033 | # Crypto core or helper | 1108 | # Crypto core or helper |
| 1034 | # | 1109 | # |
| 1110 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1035 | CONFIG_CRYPTO_ALGAPI=y | 1111 | CONFIG_CRYPTO_ALGAPI=y |
| 1112 | CONFIG_CRYPTO_AEAD=y | ||
| 1036 | CONFIG_CRYPTO_BLKCIPHER=y | 1113 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1114 | CONFIG_CRYPTO_HASH=y | ||
| 1115 | CONFIG_CRYPTO_RNG=y | ||
| 1037 | CONFIG_CRYPTO_MANAGER=y | 1116 | CONFIG_CRYPTO_MANAGER=y |
| 1038 | # CONFIG_CRYPTO_GF128MUL is not set | 1117 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1039 | # CONFIG_CRYPTO_NULL is not set | 1118 | # CONFIG_CRYPTO_NULL is not set |
| @@ -1071,6 +1150,10 @@ CONFIG_CRYPTO_PCBC=y | |||
| 1071 | # CONFIG_CRYPTO_MD4 is not set | 1150 | # CONFIG_CRYPTO_MD4 is not set |
| 1072 | CONFIG_CRYPTO_MD5=y | 1151 | CONFIG_CRYPTO_MD5=y |
| 1073 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1152 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1153 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1154 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1155 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1156 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1074 | # CONFIG_CRYPTO_SHA1 is not set | 1157 | # CONFIG_CRYPTO_SHA1 is not set |
| 1075 | # CONFIG_CRYPTO_SHA256 is not set | 1158 | # CONFIG_CRYPTO_SHA256 is not set |
| 1076 | # CONFIG_CRYPTO_SHA512 is not set | 1159 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1101,6 +1184,11 @@ CONFIG_CRYPTO_DES=y | |||
| 1101 | # | 1184 | # |
| 1102 | # CONFIG_CRYPTO_DEFLATE is not set | 1185 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1103 | # CONFIG_CRYPTO_LZO is not set | 1186 | # CONFIG_CRYPTO_LZO is not set |
| 1187 | |||
| 1188 | # | ||
| 1189 | # Random Number Generation | ||
| 1190 | # | ||
| 1191 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1104 | CONFIG_CRYPTO_HW=y | 1192 | CONFIG_CRYPTO_HW=y |
| 1105 | CONFIG_PPC_CLOCK=y | 1193 | CONFIG_PPC_CLOCK=y |
| 1106 | CONFIG_PPC_LIB_RHEAP=y | 1194 | CONFIG_PPC_LIB_RHEAP=y |
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig index 9c0caa488b2e..9d0207783d60 100644 --- a/arch/powerpc/configs/52xx/pcm030_defconfig +++ b/arch/powerpc/configs/52xx/pcm030_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.25 | 3 | # Linux kernel version: 2.6.28-rc4 |
| 4 | # Tue Apr 29 07:13:19 2008 | 4 | # Thu Nov 13 02:13:16 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y | |||
| 22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| @@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -104,7 +105,9 @@ CONFIG_SIGNALFD=y | |||
| 104 | CONFIG_TIMERFD=y | 105 | CONFIG_TIMERFD=y |
| 105 | CONFIG_EVENTFD=y | 106 | CONFIG_EVENTFD=y |
| 106 | CONFIG_SHMEM=y | 107 | CONFIG_SHMEM=y |
| 108 | CONFIG_AIO=y | ||
| 107 | # CONFIG_VM_EVENT_COUNTERS is not set | 109 | # CONFIG_VM_EVENT_COUNTERS is not set |
| 110 | CONFIG_PCI_QUIRKS=y | ||
| 108 | CONFIG_SLAB=y | 111 | CONFIG_SLAB=y |
| 109 | # CONFIG_SLUB is not set | 112 | # CONFIG_SLUB is not set |
| 110 | # CONFIG_SLOB is not set | 113 | # CONFIG_SLOB is not set |
| @@ -112,24 +115,30 @@ CONFIG_SLAB=y | |||
| 112 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 114 | # CONFIG_KPROBES is not set | 117 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 119 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 122 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 123 | CONFIG_HAVE_CLK=y | ||
| 124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 118 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 121 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 122 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 123 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 124 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 132 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 125 | # CONFIG_MODVERSIONS is not set | 133 | # CONFIG_MODVERSIONS is not set |
| 126 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 134 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 127 | # CONFIG_KMOD is not set | 135 | CONFIG_KMOD=y |
| 128 | CONFIG_BLOCK=y | 136 | CONFIG_BLOCK=y |
| 129 | # CONFIG_LBD is not set | 137 | # CONFIG_LBD is not set |
| 130 | # CONFIG_BLK_DEV_IO_TRACE is not set | 138 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 131 | # CONFIG_LSF is not set | 139 | # CONFIG_LSF is not set |
| 132 | # CONFIG_BLK_DEV_BSG is not set | 140 | # CONFIG_BLK_DEV_BSG is not set |
| 141 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 133 | 142 | ||
| 134 | # | 143 | # |
| 135 | # IO Schedulers | 144 | # IO Schedulers |
| @@ -144,19 +153,16 @@ CONFIG_IOSCHED_NOOP=y | |||
| 144 | CONFIG_DEFAULT_NOOP=y | 153 | CONFIG_DEFAULT_NOOP=y |
| 145 | CONFIG_DEFAULT_IOSCHED="noop" | 154 | CONFIG_DEFAULT_IOSCHED="noop" |
| 146 | CONFIG_CLASSIC_RCU=y | 155 | CONFIG_CLASSIC_RCU=y |
| 156 | # CONFIG_FREEZER is not set | ||
| 147 | 157 | ||
| 148 | # | 158 | # |
| 149 | # Platform support | 159 | # Platform support |
| 150 | # | 160 | # |
| 151 | CONFIG_PPC_MULTIPLATFORM=y | 161 | CONFIG_PPC_MULTIPLATFORM=y |
| 152 | # CONFIG_PPC_82xx is not set | ||
| 153 | # CONFIG_PPC_83xx is not set | ||
| 154 | # CONFIG_PPC_86xx is not set | ||
| 155 | CONFIG_CLASSIC32=y | 162 | CONFIG_CLASSIC32=y |
| 156 | # CONFIG_PPC_CHRP is not set | 163 | # CONFIG_PPC_CHRP is not set |
| 157 | # CONFIG_PPC_MPC512x is not set | ||
| 158 | # CONFIG_PPC_MPC5121 is not set | ||
| 159 | # CONFIG_MPC5121_ADS is not set | 164 | # CONFIG_MPC5121_ADS is not set |
| 165 | # CONFIG_MPC5121_GENERIC is not set | ||
| 160 | CONFIG_PPC_MPC52xx=y | 166 | CONFIG_PPC_MPC52xx=y |
| 161 | CONFIG_PPC_MPC5200_SIMPLE=y | 167 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 162 | # CONFIG_PPC_EFIKA is not set | 168 | # CONFIG_PPC_EFIKA is not set |
| @@ -166,7 +172,10 @@ CONFIG_PPC_MPC5200_SIMPLE=y | |||
| 166 | # CONFIG_PPC_PMAC is not set | 172 | # CONFIG_PPC_PMAC is not set |
| 167 | # CONFIG_PPC_CELL is not set | 173 | # CONFIG_PPC_CELL is not set |
| 168 | # CONFIG_PPC_CELL_NATIVE is not set | 174 | # CONFIG_PPC_CELL_NATIVE is not set |
| 175 | # CONFIG_PPC_82xx is not set | ||
| 169 | # CONFIG_PQ2ADS is not set | 176 | # CONFIG_PQ2ADS is not set |
| 177 | # CONFIG_PPC_83xx is not set | ||
| 178 | # CONFIG_PPC_86xx is not set | ||
| 170 | # CONFIG_EMBEDDED6xx is not set | 179 | # CONFIG_EMBEDDED6xx is not set |
| 171 | # CONFIG_IPIC is not set | 180 | # CONFIG_IPIC is not set |
| 172 | # CONFIG_MPIC is not set | 181 | # CONFIG_MPIC is not set |
| @@ -199,12 +208,14 @@ CONFIG_HZ_100=y | |||
| 199 | # CONFIG_HZ_300 is not set | 208 | # CONFIG_HZ_300 is not set |
| 200 | # CONFIG_HZ_1000 is not set | 209 | # CONFIG_HZ_1000 is not set |
| 201 | CONFIG_HZ=100 | 210 | CONFIG_HZ=100 |
| 202 | # CONFIG_SCHED_HRTICK is not set | 211 | CONFIG_SCHED_HRTICK=y |
| 203 | # CONFIG_PREEMPT_NONE is not set | 212 | # CONFIG_PREEMPT_NONE is not set |
| 204 | # CONFIG_PREEMPT_VOLUNTARY is not set | 213 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 205 | CONFIG_PREEMPT=y | 214 | CONFIG_PREEMPT=y |
| 206 | # CONFIG_PREEMPT_RCU is not set | 215 | # CONFIG_PREEMPT_RCU is not set |
| 207 | CONFIG_BINFMT_ELF=y | 216 | CONFIG_BINFMT_ELF=y |
| 217 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 218 | # CONFIG_HAVE_AOUT is not set | ||
| 208 | # CONFIG_BINFMT_MISC is not set | 219 | # CONFIG_BINFMT_MISC is not set |
| 209 | # CONFIG_IOMMU_HELPER is not set | 220 | # CONFIG_IOMMU_HELPER is not set |
| 210 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 221 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -219,17 +230,19 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 219 | # CONFIG_SPARSEMEM_MANUAL is not set | 230 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 220 | CONFIG_FLATMEM=y | 231 | CONFIG_FLATMEM=y |
| 221 | CONFIG_FLAT_NODE_MEM_MAP=y | 232 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 222 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | 233 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 234 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 235 | CONFIG_MIGRATION=y | ||
| 226 | # CONFIG_RESOURCES_64BIT is not set | 236 | # CONFIG_RESOURCES_64BIT is not set |
| 237 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 227 | CONFIG_ZONE_DMA_FLAG=1 | 238 | CONFIG_ZONE_DMA_FLAG=1 |
| 228 | CONFIG_BOUNCE=y | 239 | CONFIG_BOUNCE=y |
| 229 | CONFIG_VIRT_TO_BUS=y | 240 | CONFIG_VIRT_TO_BUS=y |
| 241 | CONFIG_UNEVICTABLE_LRU=y | ||
| 230 | CONFIG_FORCE_MAX_ZONEORDER=11 | 242 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 231 | CONFIG_PROC_DEVICETREE=y | 243 | CONFIG_PROC_DEVICETREE=y |
| 232 | # CONFIG_CMDLINE_BOOL is not set | 244 | # CONFIG_CMDLINE_BOOL is not set |
| 245 | CONFIG_EXTRA_TARGETS="" | ||
| 233 | # CONFIG_PM is not set | 246 | # CONFIG_PM is not set |
| 234 | # CONFIG_SECCOMP is not set | 247 | # CONFIG_SECCOMP is not set |
| 235 | CONFIG_ISA_DMA_API=y | 248 | CONFIG_ISA_DMA_API=y |
| @@ -240,7 +253,7 @@ CONFIG_ISA_DMA_API=y | |||
| 240 | CONFIG_ZONE_DMA=y | 253 | CONFIG_ZONE_DMA=y |
| 241 | CONFIG_GENERIC_ISA_DMA=y | 254 | CONFIG_GENERIC_ISA_DMA=y |
| 242 | # CONFIG_PPC_INDIRECT_PCI is not set | 255 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 243 | CONFIG_FSL_SOC=y | 256 | CONFIG_PPC_PCI_CHOICE=y |
| 244 | CONFIG_PCI=y | 257 | CONFIG_PCI=y |
| 245 | CONFIG_PCI_DOMAINS=y | 258 | CONFIG_PCI_DOMAINS=y |
| 246 | CONFIG_PCI_SYSCALL=y | 259 | CONFIG_PCI_SYSCALL=y |
| @@ -265,10 +278,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 265 | CONFIG_KERNEL_START=0xc0000000 | 278 | CONFIG_KERNEL_START=0xc0000000 |
| 266 | CONFIG_PHYSICAL_START=0x00000000 | 279 | CONFIG_PHYSICAL_START=0x00000000 |
| 267 | CONFIG_TASK_SIZE=0xc0000000 | 280 | CONFIG_TASK_SIZE=0xc0000000 |
| 268 | |||
| 269 | # | ||
| 270 | # Networking | ||
| 271 | # | ||
| 272 | CONFIG_NET=y | 281 | CONFIG_NET=y |
| 273 | 282 | ||
| 274 | # | 283 | # |
| @@ -313,6 +322,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 313 | # CONFIG_TIPC is not set | 322 | # CONFIG_TIPC is not set |
| 314 | # CONFIG_ATM is not set | 323 | # CONFIG_ATM is not set |
| 315 | # CONFIG_BRIDGE is not set | 324 | # CONFIG_BRIDGE is not set |
| 325 | # CONFIG_NET_DSA is not set | ||
| 316 | # CONFIG_VLAN_8021Q is not set | 326 | # CONFIG_VLAN_8021Q is not set |
| 317 | # CONFIG_DECNET is not set | 327 | # CONFIG_DECNET is not set |
| 318 | # CONFIG_LLC2 is not set | 328 | # CONFIG_LLC2 is not set |
| @@ -333,14 +343,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 333 | # CONFIG_IRDA is not set | 343 | # CONFIG_IRDA is not set |
| 334 | # CONFIG_BT is not set | 344 | # CONFIG_BT is not set |
| 335 | # CONFIG_AF_RXRPC is not set | 345 | # CONFIG_AF_RXRPC is not set |
| 336 | 346 | # CONFIG_PHONET is not set | |
| 337 | # | 347 | # CONFIG_WIRELESS is not set |
| 338 | # Wireless | ||
| 339 | # | ||
| 340 | # CONFIG_CFG80211 is not set | ||
| 341 | # CONFIG_WIRELESS_EXT is not set | ||
| 342 | # CONFIG_MAC80211 is not set | ||
| 343 | # CONFIG_IEEE80211 is not set | ||
| 344 | # CONFIG_RFKILL is not set | 348 | # CONFIG_RFKILL is not set |
| 345 | # CONFIG_NET_9P is not set | 349 | # CONFIG_NET_9P is not set |
| 346 | 350 | ||
| @@ -484,12 +488,12 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 484 | # CONFIG_SCSI_SAS_LIBSAS is not set | 488 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 485 | # CONFIG_SCSI_SRP_ATTRS is not set | 489 | # CONFIG_SCSI_SRP_ATTRS is not set |
| 486 | # CONFIG_SCSI_LOWLEVEL is not set | 490 | # CONFIG_SCSI_LOWLEVEL is not set |
| 491 | # CONFIG_SCSI_DH is not set | ||
| 487 | CONFIG_ATA=m | 492 | CONFIG_ATA=m |
| 488 | # CONFIG_ATA_NONSTANDARD is not set | 493 | # CONFIG_ATA_NONSTANDARD is not set |
| 489 | CONFIG_SATA_PMP=y | 494 | CONFIG_SATA_PMP=y |
| 490 | # CONFIG_SATA_AHCI is not set | 495 | # CONFIG_SATA_AHCI is not set |
| 491 | # CONFIG_SATA_SIL24 is not set | 496 | # CONFIG_SATA_SIL24 is not set |
| 492 | # CONFIG_SATA_FSL is not set | ||
| 493 | CONFIG_ATA_SFF=y | 497 | CONFIG_ATA_SFF=y |
| 494 | # CONFIG_SATA_SVW is not set | 498 | # CONFIG_SATA_SVW is not set |
| 495 | # CONFIG_ATA_PIIX is not set | 499 | # CONFIG_ATA_PIIX is not set |
| @@ -545,18 +549,22 @@ CONFIG_PATA_MPC52xx=m | |||
| 545 | # CONFIG_PATA_VIA is not set | 549 | # CONFIG_PATA_VIA is not set |
| 546 | # CONFIG_PATA_WINBOND is not set | 550 | # CONFIG_PATA_WINBOND is not set |
| 547 | # CONFIG_PATA_PLATFORM is not set | 551 | # CONFIG_PATA_PLATFORM is not set |
| 552 | # CONFIG_PATA_SCH is not set | ||
| 548 | # CONFIG_MD is not set | 553 | # CONFIG_MD is not set |
| 549 | # CONFIG_FUSION is not set | 554 | # CONFIG_FUSION is not set |
| 550 | 555 | ||
| 551 | # | 556 | # |
| 552 | # IEEE 1394 (FireWire) support | 557 | # IEEE 1394 (FireWire) support |
| 553 | # | 558 | # |
| 559 | |||
| 560 | # | ||
| 561 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 562 | # | ||
| 554 | # CONFIG_FIREWIRE is not set | 563 | # CONFIG_FIREWIRE is not set |
| 555 | # CONFIG_IEEE1394 is not set | 564 | # CONFIG_IEEE1394 is not set |
| 556 | # CONFIG_I2O is not set | 565 | # CONFIG_I2O is not set |
| 557 | # CONFIG_MACINTOSH_DRIVERS is not set | 566 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 558 | CONFIG_NETDEVICES=y | 567 | CONFIG_NETDEVICES=y |
| 559 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 560 | # CONFIG_DUMMY is not set | 568 | # CONFIG_DUMMY is not set |
| 561 | # CONFIG_BONDING is not set | 569 | # CONFIG_BONDING is not set |
| 562 | # CONFIG_MACVLAN is not set | 570 | # CONFIG_MACVLAN is not set |
| @@ -593,10 +601,14 @@ CONFIG_MII=y | |||
| 593 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 601 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 594 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 602 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 595 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 603 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 604 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 605 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 606 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 596 | # CONFIG_NET_PCI is not set | 607 | # CONFIG_NET_PCI is not set |
| 597 | # CONFIG_B44 is not set | 608 | # CONFIG_B44 is not set |
| 598 | CONFIG_FEC_MPC52xx=y | 609 | CONFIG_FEC_MPC52xx=y |
| 599 | CONFIG_FEC_MPC52xx_MDIO=y | 610 | CONFIG_FEC_MPC52xx_MDIO=y |
| 611 | # CONFIG_ATL2 is not set | ||
| 600 | # CONFIG_NETDEV_1000 is not set | 612 | # CONFIG_NETDEV_1000 is not set |
| 601 | # CONFIG_NETDEV_10000 is not set | 613 | # CONFIG_NETDEV_10000 is not set |
| 602 | # CONFIG_TR is not set | 614 | # CONFIG_TR is not set |
| @@ -606,7 +618,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 606 | # | 618 | # |
| 607 | # CONFIG_WLAN_PRE80211 is not set | 619 | # CONFIG_WLAN_PRE80211 is not set |
| 608 | # CONFIG_WLAN_80211 is not set | 620 | # CONFIG_WLAN_80211 is not set |
| 609 | # CONFIG_IWLWIFI is not set | ||
| 610 | # CONFIG_IWLWIFI_LEDS is not set | 621 | # CONFIG_IWLWIFI_LEDS is not set |
| 611 | 622 | ||
| 612 | # | 623 | # |
| @@ -644,6 +655,7 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 644 | # Character devices | 655 | # Character devices |
| 645 | # | 656 | # |
| 646 | # CONFIG_VT is not set | 657 | # CONFIG_VT is not set |
| 658 | CONFIG_DEVKMEM=y | ||
| 647 | # CONFIG_SERIAL_NONSTANDARD is not set | 659 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 648 | # CONFIG_NOZOMI is not set | 660 | # CONFIG_NOZOMI is not set |
| 649 | 661 | ||
| @@ -675,43 +687,64 @@ CONFIG_DEVPORT=y | |||
| 675 | CONFIG_I2C=y | 687 | CONFIG_I2C=y |
| 676 | CONFIG_I2C_BOARDINFO=y | 688 | CONFIG_I2C_BOARDINFO=y |
| 677 | CONFIG_I2C_CHARDEV=y | 689 | CONFIG_I2C_CHARDEV=y |
| 690 | CONFIG_I2C_HELPER_AUTO=y | ||
| 678 | 691 | ||
| 679 | # | 692 | # |
| 680 | # I2C Hardware Bus support | 693 | # I2C Hardware Bus support |
| 681 | # | 694 | # |
| 695 | |||
| 696 | # | ||
| 697 | # PC SMBus host controller drivers | ||
| 698 | # | ||
| 682 | # CONFIG_I2C_ALI1535 is not set | 699 | # CONFIG_I2C_ALI1535 is not set |
| 683 | # CONFIG_I2C_ALI1563 is not set | 700 | # CONFIG_I2C_ALI1563 is not set |
| 684 | # CONFIG_I2C_ALI15X3 is not set | 701 | # CONFIG_I2C_ALI15X3 is not set |
| 685 | # CONFIG_I2C_AMD756 is not set | 702 | # CONFIG_I2C_AMD756 is not set |
| 686 | # CONFIG_I2C_AMD8111 is not set | 703 | # CONFIG_I2C_AMD8111 is not set |
| 687 | # CONFIG_I2C_I801 is not set | 704 | # CONFIG_I2C_I801 is not set |
| 688 | # CONFIG_I2C_I810 is not set | 705 | # CONFIG_I2C_ISCH is not set |
| 689 | # CONFIG_I2C_PIIX4 is not set | 706 | # CONFIG_I2C_PIIX4 is not set |
| 690 | CONFIG_I2C_MPC=y | ||
| 691 | # CONFIG_I2C_NFORCE2 is not set | 707 | # CONFIG_I2C_NFORCE2 is not set |
| 692 | # CONFIG_I2C_OCORES is not set | ||
| 693 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 694 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 695 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 696 | # CONFIG_I2C_SIMTEC is not set | ||
| 697 | # CONFIG_I2C_SIS5595 is not set | 708 | # CONFIG_I2C_SIS5595 is not set |
| 698 | # CONFIG_I2C_SIS630 is not set | 709 | # CONFIG_I2C_SIS630 is not set |
| 699 | # CONFIG_I2C_SIS96X is not set | 710 | # CONFIG_I2C_SIS96X is not set |
| 700 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 701 | # CONFIG_I2C_STUB is not set | ||
| 702 | # CONFIG_I2C_TINY_USB is not set | ||
| 703 | # CONFIG_I2C_VIA is not set | 711 | # CONFIG_I2C_VIA is not set |
| 704 | # CONFIG_I2C_VIAPRO is not set | 712 | # CONFIG_I2C_VIAPRO is not set |
| 713 | |||
| 714 | # | ||
| 715 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 716 | # | ||
| 717 | CONFIG_I2C_MPC=y | ||
| 718 | # CONFIG_I2C_OCORES is not set | ||
| 719 | # CONFIG_I2C_SIMTEC is not set | ||
| 720 | |||
| 721 | # | ||
| 722 | # External I2C/SMBus adapter drivers | ||
| 723 | # | ||
| 724 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 725 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 726 | # CONFIG_I2C_TINY_USB is not set | ||
| 727 | |||
| 728 | # | ||
| 729 | # Graphics adapter I2C/DDC channel drivers | ||
| 730 | # | ||
| 705 | # CONFIG_I2C_VOODOO3 is not set | 731 | # CONFIG_I2C_VOODOO3 is not set |
| 732 | |||
| 733 | # | ||
| 734 | # Other I2C/SMBus bus drivers | ||
| 735 | # | ||
| 706 | # CONFIG_I2C_PCA_PLATFORM is not set | 736 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 737 | # CONFIG_I2C_STUB is not set | ||
| 707 | 738 | ||
| 708 | # | 739 | # |
| 709 | # Miscellaneous I2C Chip support | 740 | # Miscellaneous I2C Chip support |
| 710 | # | 741 | # |
| 711 | # CONFIG_DS1682 is not set | 742 | # CONFIG_DS1682 is not set |
| 743 | # CONFIG_AT24 is not set | ||
| 712 | CONFIG_SENSORS_EEPROM=m | 744 | CONFIG_SENSORS_EEPROM=m |
| 713 | # CONFIG_SENSORS_PCF8574 is not set | 745 | # CONFIG_SENSORS_PCF8574 is not set |
| 714 | # CONFIG_PCF8575 is not set | 746 | # CONFIG_PCF8575 is not set |
| 747 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 715 | # CONFIG_SENSORS_PCF8591 is not set | 748 | # CONFIG_SENSORS_PCF8591 is not set |
| 716 | # CONFIG_SENSORS_MAX6875 is not set | 749 | # CONFIG_SENSORS_MAX6875 is not set |
| 717 | # CONFIG_SENSORS_TSL2550 is not set | 750 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -720,29 +753,47 @@ CONFIG_SENSORS_EEPROM=m | |||
| 720 | # CONFIG_I2C_DEBUG_BUS is not set | 753 | # CONFIG_I2C_DEBUG_BUS is not set |
| 721 | # CONFIG_I2C_DEBUG_CHIP is not set | 754 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 722 | # CONFIG_SPI is not set | 755 | # CONFIG_SPI is not set |
| 756 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 757 | # CONFIG_GPIOLIB is not set | ||
| 723 | # CONFIG_W1 is not set | 758 | # CONFIG_W1 is not set |
| 724 | # CONFIG_POWER_SUPPLY is not set | 759 | # CONFIG_POWER_SUPPLY is not set |
| 725 | # CONFIG_HWMON is not set | 760 | # CONFIG_HWMON is not set |
| 726 | # CONFIG_THERMAL is not set | 761 | # CONFIG_THERMAL is not set |
| 762 | # CONFIG_THERMAL_HWMON is not set | ||
| 727 | # CONFIG_WATCHDOG is not set | 763 | # CONFIG_WATCHDOG is not set |
| 764 | CONFIG_SSB_POSSIBLE=y | ||
| 728 | 765 | ||
| 729 | # | 766 | # |
| 730 | # Sonics Silicon Backplane | 767 | # Sonics Silicon Backplane |
| 731 | # | 768 | # |
| 732 | CONFIG_SSB_POSSIBLE=y | ||
| 733 | # CONFIG_SSB is not set | 769 | # CONFIG_SSB is not set |
| 734 | 770 | ||
| 735 | # | 771 | # |
| 736 | # Multifunction device drivers | 772 | # Multifunction device drivers |
| 737 | # | 773 | # |
| 774 | # CONFIG_MFD_CORE is not set | ||
| 738 | # CONFIG_MFD_SM501 is not set | 775 | # CONFIG_MFD_SM501 is not set |
| 739 | # CONFIG_HTC_PASIC3 is not set | 776 | # CONFIG_HTC_PASIC3 is not set |
| 777 | # CONFIG_MFD_TMIO is not set | ||
| 778 | # CONFIG_PMIC_DA903X is not set | ||
| 779 | # CONFIG_MFD_WM8400 is not set | ||
| 780 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 781 | # CONFIG_REGULATOR is not set | ||
| 740 | 782 | ||
| 741 | # | 783 | # |
| 742 | # Multimedia devices | 784 | # Multimedia devices |
| 743 | # | 785 | # |
| 786 | |||
| 787 | # | ||
| 788 | # Multimedia core support | ||
| 789 | # | ||
| 744 | # CONFIG_VIDEO_DEV is not set | 790 | # CONFIG_VIDEO_DEV is not set |
| 745 | # CONFIG_DVB_CORE is not set | 791 | # CONFIG_DVB_CORE is not set |
| 792 | # CONFIG_VIDEO_MEDIA is not set | ||
| 793 | |||
| 794 | # | ||
| 795 | # Multimedia drivers | ||
| 796 | # | ||
| 746 | # CONFIG_DAB is not set | 797 | # CONFIG_DAB is not set |
| 747 | 798 | ||
| 748 | # | 799 | # |
| @@ -759,10 +810,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 759 | # Display device support | 810 | # Display device support |
| 760 | # | 811 | # |
| 761 | # CONFIG_DISPLAY_SUPPORT is not set | 812 | # CONFIG_DISPLAY_SUPPORT is not set |
| 762 | |||
| 763 | # | ||
| 764 | # Sound | ||
| 765 | # | ||
| 766 | # CONFIG_SOUND is not set | 813 | # CONFIG_SOUND is not set |
| 767 | CONFIG_USB_SUPPORT=y | 814 | CONFIG_USB_SUPPORT=y |
| 768 | CONFIG_USB_ARCH_HAS_HCD=y | 815 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -781,12 +828,17 @@ CONFIG_USB_DEVICEFS=y | |||
| 781 | # CONFIG_USB_OTG is not set | 828 | # CONFIG_USB_OTG is not set |
| 782 | # CONFIG_USB_OTG_WHITELIST is not set | 829 | # CONFIG_USB_OTG_WHITELIST is not set |
| 783 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 830 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 831 | # CONFIG_USB_MON is not set | ||
| 832 | # CONFIG_USB_WUSB is not set | ||
| 833 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 784 | 834 | ||
| 785 | # | 835 | # |
| 786 | # USB Host Controller Drivers | 836 | # USB Host Controller Drivers |
| 787 | # | 837 | # |
| 838 | # CONFIG_USB_C67X00_HCD is not set | ||
| 788 | # CONFIG_USB_EHCI_HCD is not set | 839 | # CONFIG_USB_EHCI_HCD is not set |
| 789 | # CONFIG_USB_ISP116X_HCD is not set | 840 | # CONFIG_USB_ISP116X_HCD is not set |
| 841 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 790 | CONFIG_USB_OHCI_HCD=m | 842 | CONFIG_USB_OHCI_HCD=m |
| 791 | # CONFIG_USB_OHCI_HCD_PPC_SOC is not set | 843 | # CONFIG_USB_OHCI_HCD_PPC_SOC is not set |
| 792 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 844 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| @@ -799,12 +851,17 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 799 | # CONFIG_USB_UHCI_HCD is not set | 851 | # CONFIG_USB_UHCI_HCD is not set |
| 800 | # CONFIG_USB_SL811_HCD is not set | 852 | # CONFIG_USB_SL811_HCD is not set |
| 801 | # CONFIG_USB_R8A66597_HCD is not set | 853 | # CONFIG_USB_R8A66597_HCD is not set |
| 854 | # CONFIG_USB_WHCI_HCD is not set | ||
| 855 | # CONFIG_USB_HWA_HCD is not set | ||
| 856 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 802 | 857 | ||
| 803 | # | 858 | # |
| 804 | # USB Device Class drivers | 859 | # USB Device Class drivers |
| 805 | # | 860 | # |
| 806 | # CONFIG_USB_ACM is not set | 861 | # CONFIG_USB_ACM is not set |
| 807 | # CONFIG_USB_PRINTER is not set | 862 | # CONFIG_USB_PRINTER is not set |
| 863 | # CONFIG_USB_WDM is not set | ||
| 864 | # CONFIG_USB_TMC is not set | ||
| 808 | 865 | ||
| 809 | # | 866 | # |
| 810 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 867 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -833,7 +890,6 @@ CONFIG_USB_STORAGE=m | |||
| 833 | # | 890 | # |
| 834 | # CONFIG_USB_MDC800 is not set | 891 | # CONFIG_USB_MDC800 is not set |
| 835 | # CONFIG_USB_MICROTEK is not set | 892 | # CONFIG_USB_MICROTEK is not set |
| 836 | # CONFIG_USB_MON is not set | ||
| 837 | 893 | ||
| 838 | # | 894 | # |
| 839 | # USB port drivers | 895 | # USB port drivers |
| @@ -846,7 +902,7 @@ CONFIG_USB_STORAGE=m | |||
| 846 | # CONFIG_USB_EMI62 is not set | 902 | # CONFIG_USB_EMI62 is not set |
| 847 | # CONFIG_USB_EMI26 is not set | 903 | # CONFIG_USB_EMI26 is not set |
| 848 | # CONFIG_USB_ADUTUX is not set | 904 | # CONFIG_USB_ADUTUX is not set |
| 849 | # CONFIG_USB_AUERSWALD is not set | 905 | # CONFIG_USB_SEVSEG is not set |
| 850 | # CONFIG_USB_RIO500 is not set | 906 | # CONFIG_USB_RIO500 is not set |
| 851 | # CONFIG_USB_LEGOTOWER is not set | 907 | # CONFIG_USB_LEGOTOWER is not set |
| 852 | # CONFIG_USB_LCD is not set | 908 | # CONFIG_USB_LCD is not set |
| @@ -862,10 +918,14 @@ CONFIG_USB_STORAGE=m | |||
| 862 | # CONFIG_USB_TRANCEVIBRATOR is not set | 918 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 863 | # CONFIG_USB_IOWARRIOR is not set | 919 | # CONFIG_USB_IOWARRIOR is not set |
| 864 | # CONFIG_USB_TEST is not set | 920 | # CONFIG_USB_TEST is not set |
| 921 | # CONFIG_USB_ISIGHTFW is not set | ||
| 922 | # CONFIG_USB_VST is not set | ||
| 865 | # CONFIG_USB_GADGET is not set | 923 | # CONFIG_USB_GADGET is not set |
| 924 | # CONFIG_UWB is not set | ||
| 866 | # CONFIG_MMC is not set | 925 | # CONFIG_MMC is not set |
| 867 | # CONFIG_MEMSTICK is not set | 926 | # CONFIG_MEMSTICK is not set |
| 868 | # CONFIG_NEW_LEDS is not set | 927 | # CONFIG_NEW_LEDS is not set |
| 928 | # CONFIG_ACCESSIBILITY is not set | ||
| 869 | # CONFIG_INFINIBAND is not set | 929 | # CONFIG_INFINIBAND is not set |
| 870 | # CONFIG_EDAC is not set | 930 | # CONFIG_EDAC is not set |
| 871 | CONFIG_RTC_LIB=m | 931 | CONFIG_RTC_LIB=m |
| @@ -894,6 +954,8 @@ CONFIG_RTC_DRV_PCF8563=m | |||
| 894 | # CONFIG_RTC_DRV_PCF8583 is not set | 954 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 895 | # CONFIG_RTC_DRV_M41T80 is not set | 955 | # CONFIG_RTC_DRV_M41T80 is not set |
| 896 | # CONFIG_RTC_DRV_S35390A is not set | 956 | # CONFIG_RTC_DRV_S35390A is not set |
| 957 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 958 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 897 | 959 | ||
| 898 | # | 960 | # |
| 899 | # SPI RTC drivers | 961 | # SPI RTC drivers |
| @@ -903,19 +965,25 @@ CONFIG_RTC_DRV_PCF8563=m | |||
| 903 | # Platform RTC drivers | 965 | # Platform RTC drivers |
| 904 | # | 966 | # |
| 905 | # CONFIG_RTC_DRV_CMOS is not set | 967 | # CONFIG_RTC_DRV_CMOS is not set |
| 968 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 906 | # CONFIG_RTC_DRV_DS1511 is not set | 969 | # CONFIG_RTC_DRV_DS1511 is not set |
| 907 | # CONFIG_RTC_DRV_DS1553 is not set | 970 | # CONFIG_RTC_DRV_DS1553 is not set |
| 908 | # CONFIG_RTC_DRV_DS1742 is not set | 971 | # CONFIG_RTC_DRV_DS1742 is not set |
| 909 | # CONFIG_RTC_DRV_STK17TA8 is not set | 972 | # CONFIG_RTC_DRV_STK17TA8 is not set |
| 910 | # CONFIG_RTC_DRV_M48T86 is not set | 973 | # CONFIG_RTC_DRV_M48T86 is not set |
| 974 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 911 | # CONFIG_RTC_DRV_M48T59 is not set | 975 | # CONFIG_RTC_DRV_M48T59 is not set |
| 976 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 912 | # CONFIG_RTC_DRV_V3020 is not set | 977 | # CONFIG_RTC_DRV_V3020 is not set |
| 913 | 978 | ||
| 914 | # | 979 | # |
| 915 | # on-CPU RTC drivers | 980 | # on-CPU RTC drivers |
| 916 | # | 981 | # |
| 982 | # CONFIG_RTC_DRV_PPC is not set | ||
| 917 | # CONFIG_DMADEVICES is not set | 983 | # CONFIG_DMADEVICES is not set |
| 918 | # CONFIG_UIO is not set | 984 | # CONFIG_UIO is not set |
| 985 | # CONFIG_STAGING is not set | ||
| 986 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 919 | 987 | ||
| 920 | # | 988 | # |
| 921 | # File systems | 989 | # File systems |
| @@ -927,12 +995,13 @@ CONFIG_EXT3_FS=m | |||
| 927 | CONFIG_EXT3_FS_XATTR=y | 995 | CONFIG_EXT3_FS_XATTR=y |
| 928 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 996 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 929 | # CONFIG_EXT3_FS_SECURITY is not set | 997 | # CONFIG_EXT3_FS_SECURITY is not set |
| 930 | # CONFIG_EXT4DEV_FS is not set | 998 | # CONFIG_EXT4_FS is not set |
| 931 | CONFIG_JBD=m | 999 | CONFIG_JBD=m |
| 932 | CONFIG_FS_MBCACHE=m | 1000 | CONFIG_FS_MBCACHE=m |
| 933 | # CONFIG_REISERFS_FS is not set | 1001 | # CONFIG_REISERFS_FS is not set |
| 934 | # CONFIG_JFS_FS is not set | 1002 | # CONFIG_JFS_FS is not set |
| 935 | # CONFIG_FS_POSIX_ACL is not set | 1003 | # CONFIG_FS_POSIX_ACL is not set |
| 1004 | CONFIG_FILE_LOCKING=y | ||
| 936 | # CONFIG_XFS_FS is not set | 1005 | # CONFIG_XFS_FS is not set |
| 937 | # CONFIG_OCFS2_FS is not set | 1006 | # CONFIG_OCFS2_FS is not set |
| 938 | # CONFIG_DNOTIFY is not set | 1007 | # CONFIG_DNOTIFY is not set |
| @@ -964,6 +1033,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 964 | CONFIG_PROC_FS=y | 1033 | CONFIG_PROC_FS=y |
| 965 | # CONFIG_PROC_KCORE is not set | 1034 | # CONFIG_PROC_KCORE is not set |
| 966 | CONFIG_PROC_SYSCTL=y | 1035 | CONFIG_PROC_SYSCTL=y |
| 1036 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 967 | CONFIG_SYSFS=y | 1037 | CONFIG_SYSFS=y |
| 968 | CONFIG_TMPFS=y | 1038 | CONFIG_TMPFS=y |
| 969 | # CONFIG_TMPFS_POSIX_ACL is not set | 1039 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -994,6 +1064,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 994 | # CONFIG_CRAMFS is not set | 1064 | # CONFIG_CRAMFS is not set |
| 995 | # CONFIG_VXFS_FS is not set | 1065 | # CONFIG_VXFS_FS is not set |
| 996 | # CONFIG_MINIX_FS is not set | 1066 | # CONFIG_MINIX_FS is not set |
| 1067 | # CONFIG_OMFS_FS is not set | ||
| 997 | # CONFIG_HPFS_FS is not set | 1068 | # CONFIG_HPFS_FS is not set |
| 998 | # CONFIG_QNX4FS_FS is not set | 1069 | # CONFIG_QNX4FS_FS is not set |
| 999 | # CONFIG_ROMFS_FS is not set | 1070 | # CONFIG_ROMFS_FS is not set |
| @@ -1004,13 +1075,13 @@ CONFIG_NFS_FS=y | |||
| 1004 | CONFIG_NFS_V3=y | 1075 | CONFIG_NFS_V3=y |
| 1005 | # CONFIG_NFS_V3_ACL is not set | 1076 | # CONFIG_NFS_V3_ACL is not set |
| 1006 | # CONFIG_NFS_V4 is not set | 1077 | # CONFIG_NFS_V4 is not set |
| 1007 | # CONFIG_NFSD is not set | ||
| 1008 | CONFIG_ROOT_NFS=y | 1078 | CONFIG_ROOT_NFS=y |
| 1079 | # CONFIG_NFSD is not set | ||
| 1009 | CONFIG_LOCKD=y | 1080 | CONFIG_LOCKD=y |
| 1010 | CONFIG_LOCKD_V4=y | 1081 | CONFIG_LOCKD_V4=y |
| 1011 | CONFIG_NFS_COMMON=y | 1082 | CONFIG_NFS_COMMON=y |
| 1012 | CONFIG_SUNRPC=y | 1083 | CONFIG_SUNRPC=y |
| 1013 | # CONFIG_SUNRPC_BIND34 is not set | 1084 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 1014 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1085 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1015 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1086 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1016 | # CONFIG_SMB_FS is not set | 1087 | # CONFIG_SMB_FS is not set |
| @@ -1070,9 +1141,9 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1070 | # Library routines | 1141 | # Library routines |
| 1071 | # | 1142 | # |
| 1072 | CONFIG_BITREVERSE=y | 1143 | CONFIG_BITREVERSE=y |
| 1073 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1074 | # CONFIG_CRC_CCITT is not set | 1144 | # CONFIG_CRC_CCITT is not set |
| 1075 | # CONFIG_CRC16 is not set | 1145 | # CONFIG_CRC16 is not set |
| 1146 | # CONFIG_CRC_T10DIF is not set | ||
| 1076 | # CONFIG_CRC_ITU_T is not set | 1147 | # CONFIG_CRC_ITU_T is not set |
| 1077 | CONFIG_CRC32=y | 1148 | CONFIG_CRC32=y |
| 1078 | # CONFIG_CRC7 is not set | 1149 | # CONFIG_CRC7 is not set |
| @@ -1098,7 +1169,17 @@ CONFIG_FRAME_WARN=1024 | |||
| 1098 | # CONFIG_HEADERS_CHECK is not set | 1169 | # CONFIG_HEADERS_CHECK is not set |
| 1099 | # CONFIG_DEBUG_KERNEL is not set | 1170 | # CONFIG_DEBUG_KERNEL is not set |
| 1100 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1171 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1172 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1173 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1174 | # CONFIG_LATENCYTOP is not set | ||
| 1175 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1176 | |||
| 1177 | # | ||
| 1178 | # Tracers | ||
| 1179 | # | ||
| 1180 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1101 | # CONFIG_SAMPLES is not set | 1181 | # CONFIG_SAMPLES is not set |
| 1182 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1102 | # CONFIG_IRQSTACKS is not set | 1183 | # CONFIG_IRQSTACKS is not set |
| 1103 | # CONFIG_BOOTX_TEXT is not set | 1184 | # CONFIG_BOOTX_TEXT is not set |
| 1104 | # CONFIG_PPC_EARLY_DEBUG is not set | 1185 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1108,6 +1189,7 @@ CONFIG_FRAME_WARN=1024 | |||
| 1108 | # | 1189 | # |
| 1109 | # CONFIG_KEYS is not set | 1190 | # CONFIG_KEYS is not set |
| 1110 | # CONFIG_SECURITY is not set | 1191 | # CONFIG_SECURITY is not set |
| 1192 | # CONFIG_SECURITYFS is not set | ||
| 1111 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1193 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1112 | # CONFIG_CRYPTO is not set | 1194 | # CONFIG_CRYPTO is not set |
| 1113 | CONFIG_PPC_CLOCK=y | 1195 | CONFIG_PPC_CLOCK=y |
diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig index 7672bfba3566..bc190051e8d5 100644 --- a/arch/powerpc/configs/52xx/tqm5200_defconfig +++ b/arch/powerpc/configs/52xx/tqm5200_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.25 | 3 | # Linux kernel version: 2.6.28-rc4 |
| 4 | # Tue Apr 29 07:12:39 2008 | 4 | # Thu Nov 13 02:09:30 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -22,7 +22,7 @@ CONFIG_PPC_STD_MMU_32=y | |||
| 22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| @@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -102,6 +103,7 @@ CONFIG_SIGNALFD=y | |||
| 102 | CONFIG_TIMERFD=y | 103 | CONFIG_TIMERFD=y |
| 103 | CONFIG_EVENTFD=y | 104 | CONFIG_EVENTFD=y |
| 104 | CONFIG_SHMEM=y | 105 | CONFIG_SHMEM=y |
| 106 | CONFIG_AIO=y | ||
| 105 | CONFIG_VM_EVENT_COUNTERS=y | 107 | CONFIG_VM_EVENT_COUNTERS=y |
| 106 | CONFIG_SLUB_DEBUG=y | 108 | CONFIG_SLUB_DEBUG=y |
| 107 | # CONFIG_SLAB is not set | 109 | # CONFIG_SLAB is not set |
| @@ -110,14 +112,19 @@ CONFIG_SLUB=y | |||
| 110 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
| 111 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
| 112 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 113 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 115 | CONFIG_PROC_PAGE_MONITOR=y | 119 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 120 | CONFIG_HAVE_CLK=y | ||
| 121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 116 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 117 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
| 118 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
| 119 | CONFIG_BASE_SMALL=0 | 125 | CONFIG_BASE_SMALL=0 |
| 120 | CONFIG_MODULES=y | 126 | CONFIG_MODULES=y |
| 127 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 121 | CONFIG_MODULE_UNLOAD=y | 128 | CONFIG_MODULE_UNLOAD=y |
| 122 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 129 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 123 | CONFIG_MODVERSIONS=y | 130 | CONFIG_MODVERSIONS=y |
| @@ -128,6 +135,7 @@ CONFIG_BLOCK=y | |||
| 128 | # CONFIG_BLK_DEV_IO_TRACE is not set | 135 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 129 | # CONFIG_LSF is not set | 136 | # CONFIG_LSF is not set |
| 130 | # CONFIG_BLK_DEV_BSG is not set | 137 | # CONFIG_BLK_DEV_BSG is not set |
| 138 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 131 | 139 | ||
| 132 | # | 140 | # |
| 133 | # IO Schedulers | 141 | # IO Schedulers |
| @@ -142,19 +150,16 @@ CONFIG_DEFAULT_AS=y | |||
| 142 | # CONFIG_DEFAULT_NOOP is not set | 150 | # CONFIG_DEFAULT_NOOP is not set |
| 143 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 151 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 144 | CONFIG_CLASSIC_RCU=y | 152 | CONFIG_CLASSIC_RCU=y |
| 153 | # CONFIG_FREEZER is not set | ||
| 145 | 154 | ||
| 146 | # | 155 | # |
| 147 | # Platform support | 156 | # Platform support |
| 148 | # | 157 | # |
| 149 | CONFIG_PPC_MULTIPLATFORM=y | 158 | CONFIG_PPC_MULTIPLATFORM=y |
| 150 | # CONFIG_PPC_82xx is not set | ||
| 151 | # CONFIG_PPC_83xx is not set | ||
| 152 | # CONFIG_PPC_86xx is not set | ||
| 153 | CONFIG_CLASSIC32=y | 159 | CONFIG_CLASSIC32=y |
| 154 | # CONFIG_PPC_CHRP is not set | 160 | # CONFIG_PPC_CHRP is not set |
| 155 | # CONFIG_PPC_MPC512x is not set | ||
| 156 | # CONFIG_PPC_MPC5121 is not set | ||
| 157 | # CONFIG_MPC5121_ADS is not set | 161 | # CONFIG_MPC5121_ADS is not set |
| 162 | # CONFIG_MPC5121_GENERIC is not set | ||
| 158 | CONFIG_PPC_MPC52xx=y | 163 | CONFIG_PPC_MPC52xx=y |
| 159 | CONFIG_PPC_MPC5200_SIMPLE=y | 164 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 160 | # CONFIG_PPC_EFIKA is not set | 165 | # CONFIG_PPC_EFIKA is not set |
| @@ -164,7 +169,10 @@ CONFIG_PPC_MPC5200_BUGFIX=y | |||
| 164 | # CONFIG_PPC_PMAC is not set | 169 | # CONFIG_PPC_PMAC is not set |
| 165 | # CONFIG_PPC_CELL is not set | 170 | # CONFIG_PPC_CELL is not set |
| 166 | # CONFIG_PPC_CELL_NATIVE is not set | 171 | # CONFIG_PPC_CELL_NATIVE is not set |
| 172 | # CONFIG_PPC_82xx is not set | ||
| 167 | # CONFIG_PQ2ADS is not set | 173 | # CONFIG_PQ2ADS is not set |
| 174 | # CONFIG_PPC_83xx is not set | ||
| 175 | # CONFIG_PPC_86xx is not set | ||
| 168 | # CONFIG_EMBEDDED6xx is not set | 176 | # CONFIG_EMBEDDED6xx is not set |
| 169 | # CONFIG_IPIC is not set | 177 | # CONFIG_IPIC is not set |
| 170 | # CONFIG_MPIC is not set | 178 | # CONFIG_MPIC is not set |
| @@ -188,7 +196,6 @@ CONFIG_PPC_BESTCOMM_FEC=y | |||
| 188 | # Kernel options | 196 | # Kernel options |
| 189 | # | 197 | # |
| 190 | # CONFIG_HIGHMEM is not set | 198 | # CONFIG_HIGHMEM is not set |
| 191 | # CONFIG_TICK_ONESHOT is not set | ||
| 192 | # CONFIG_NO_HZ is not set | 199 | # CONFIG_NO_HZ is not set |
| 193 | # CONFIG_HIGH_RES_TIMERS is not set | 200 | # CONFIG_HIGH_RES_TIMERS is not set |
| 194 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 201 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
| @@ -202,6 +209,8 @@ CONFIG_PREEMPT_NONE=y | |||
| 202 | # CONFIG_PREEMPT_VOLUNTARY is not set | 209 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 203 | # CONFIG_PREEMPT is not set | 210 | # CONFIG_PREEMPT is not set |
| 204 | CONFIG_BINFMT_ELF=y | 211 | CONFIG_BINFMT_ELF=y |
| 212 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 213 | # CONFIG_HAVE_AOUT is not set | ||
| 205 | # CONFIG_BINFMT_MISC is not set | 214 | # CONFIG_BINFMT_MISC is not set |
| 206 | # CONFIG_IOMMU_HELPER is not set | 215 | # CONFIG_IOMMU_HELPER is not set |
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 216 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -216,19 +225,20 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 216 | # CONFIG_SPARSEMEM_MANUAL is not set | 225 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 217 | CONFIG_FLATMEM=y | 226 | CONFIG_FLATMEM=y |
| 218 | CONFIG_FLAT_NODE_MEM_MAP=y | 227 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 219 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 220 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 221 | CONFIG_PAGEFLAGS_EXTENDED=y | 228 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 229 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 230 | CONFIG_MIGRATION=y | ||
| 223 | # CONFIG_RESOURCES_64BIT is not set | 231 | # CONFIG_RESOURCES_64BIT is not set |
| 232 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 224 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
| 225 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
| 226 | CONFIG_VIRT_TO_BUS=y | 235 | CONFIG_VIRT_TO_BUS=y |
| 236 | CONFIG_UNEVICTABLE_LRU=y | ||
| 227 | CONFIG_FORCE_MAX_ZONEORDER=11 | 237 | CONFIG_FORCE_MAX_ZONEORDER=11 |
| 228 | CONFIG_PROC_DEVICETREE=y | 238 | CONFIG_PROC_DEVICETREE=y |
| 229 | # CONFIG_CMDLINE_BOOL is not set | 239 | # CONFIG_CMDLINE_BOOL is not set |
| 240 | CONFIG_EXTRA_TARGETS="" | ||
| 230 | CONFIG_PM=y | 241 | CONFIG_PM=y |
| 231 | # CONFIG_PM_LEGACY is not set | ||
| 232 | # CONFIG_PM_DEBUG is not set | 242 | # CONFIG_PM_DEBUG is not set |
| 233 | CONFIG_SECCOMP=y | 243 | CONFIG_SECCOMP=y |
| 234 | CONFIG_ISA_DMA_API=y | 244 | CONFIG_ISA_DMA_API=y |
| @@ -238,7 +248,7 @@ CONFIG_ISA_DMA_API=y | |||
| 238 | # | 248 | # |
| 239 | CONFIG_ZONE_DMA=y | 249 | CONFIG_ZONE_DMA=y |
| 240 | CONFIG_GENERIC_ISA_DMA=y | 250 | CONFIG_GENERIC_ISA_DMA=y |
| 241 | CONFIG_FSL_SOC=y | 251 | CONFIG_PPC_PCI_CHOICE=y |
| 242 | # CONFIG_PCI is not set | 252 | # CONFIG_PCI is not set |
| 243 | # CONFIG_PCI_DOMAINS is not set | 253 | # CONFIG_PCI_DOMAINS is not set |
| 244 | # CONFIG_PCI_SYSCALL is not set | 254 | # CONFIG_PCI_SYSCALL is not set |
| @@ -259,10 +269,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
| 259 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | 270 | CONFIG_PHYSICAL_START=0x00000000 |
| 261 | CONFIG_TASK_SIZE=0xc0000000 | 271 | CONFIG_TASK_SIZE=0xc0000000 |
| 262 | |||
| 263 | # | ||
| 264 | # Networking | ||
| 265 | # | ||
| 266 | CONFIG_NET=y | 272 | CONFIG_NET=y |
| 267 | 273 | ||
| 268 | # | 274 | # |
| @@ -313,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 313 | # CONFIG_TIPC is not set | 319 | # CONFIG_TIPC is not set |
| 314 | # CONFIG_ATM is not set | 320 | # CONFIG_ATM is not set |
| 315 | # CONFIG_BRIDGE is not set | 321 | # CONFIG_BRIDGE is not set |
| 322 | # CONFIG_NET_DSA is not set | ||
| 316 | # CONFIG_VLAN_8021Q is not set | 323 | # CONFIG_VLAN_8021Q is not set |
| 317 | # CONFIG_DECNET is not set | 324 | # CONFIG_DECNET is not set |
| 318 | # CONFIG_LLC2 is not set | 325 | # CONFIG_LLC2 is not set |
| @@ -333,14 +340,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 333 | # CONFIG_IRDA is not set | 340 | # CONFIG_IRDA is not set |
| 334 | # CONFIG_BT is not set | 341 | # CONFIG_BT is not set |
| 335 | # CONFIG_AF_RXRPC is not set | 342 | # CONFIG_AF_RXRPC is not set |
| 336 | 343 | # CONFIG_PHONET is not set | |
| 337 | # | 344 | # CONFIG_WIRELESS is not set |
| 338 | # Wireless | ||
| 339 | # | ||
| 340 | # CONFIG_CFG80211 is not set | ||
| 341 | # CONFIG_WIRELESS_EXT is not set | ||
| 342 | # CONFIG_MAC80211 is not set | ||
| 343 | # CONFIG_IEEE80211 is not set | ||
| 344 | # CONFIG_RFKILL is not set | 345 | # CONFIG_RFKILL is not set |
| 345 | # CONFIG_NET_9P is not set | 346 | # CONFIG_NET_9P is not set |
| 346 | 347 | ||
| @@ -451,6 +452,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
| 451 | # CONFIG_BLK_DEV_XIP is not set | 452 | # CONFIG_BLK_DEV_XIP is not set |
| 452 | # CONFIG_CDROM_PKTCDVD is not set | 453 | # CONFIG_CDROM_PKTCDVD is not set |
| 453 | # CONFIG_ATA_OVER_ETH is not set | 454 | # CONFIG_ATA_OVER_ETH is not set |
| 455 | # CONFIG_BLK_DEV_HD is not set | ||
| 454 | # CONFIG_MISC_DEVICES is not set | 456 | # CONFIG_MISC_DEVICES is not set |
| 455 | CONFIG_HAVE_IDE=y | 457 | CONFIG_HAVE_IDE=y |
| 456 | # CONFIG_IDE is not set | 458 | # CONFIG_IDE is not set |
| @@ -495,10 +497,10 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 495 | CONFIG_SCSI_LOWLEVEL=y | 497 | CONFIG_SCSI_LOWLEVEL=y |
| 496 | # CONFIG_ISCSI_TCP is not set | 498 | # CONFIG_ISCSI_TCP is not set |
| 497 | # CONFIG_SCSI_DEBUG is not set | 499 | # CONFIG_SCSI_DEBUG is not set |
| 500 | # CONFIG_SCSI_DH is not set | ||
| 498 | CONFIG_ATA=y | 501 | CONFIG_ATA=y |
| 499 | # CONFIG_ATA_NONSTANDARD is not set | 502 | # CONFIG_ATA_NONSTANDARD is not set |
| 500 | CONFIG_SATA_PMP=y | 503 | CONFIG_SATA_PMP=y |
| 501 | # CONFIG_SATA_FSL is not set | ||
| 502 | CONFIG_ATA_SFF=y | 504 | CONFIG_ATA_SFF=y |
| 503 | # CONFIG_SATA_MV is not set | 505 | # CONFIG_SATA_MV is not set |
| 504 | CONFIG_PATA_MPC52xx=y | 506 | CONFIG_PATA_MPC52xx=y |
| @@ -507,7 +509,6 @@ CONFIG_PATA_PLATFORM=y | |||
| 507 | # CONFIG_MD is not set | 509 | # CONFIG_MD is not set |
| 508 | # CONFIG_MACINTOSH_DRIVERS is not set | 510 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 509 | CONFIG_NETDEVICES=y | 511 | CONFIG_NETDEVICES=y |
| 510 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 511 | # CONFIG_DUMMY is not set | 512 | # CONFIG_DUMMY is not set |
| 512 | # CONFIG_BONDING is not set | 513 | # CONFIG_BONDING is not set |
| 513 | # CONFIG_MACVLAN is not set | 514 | # CONFIG_MACVLAN is not set |
| @@ -537,6 +538,9 @@ CONFIG_NET_ETHERNET=y | |||
| 537 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 538 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 538 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 539 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 539 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 540 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 541 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 542 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 543 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 540 | # CONFIG_B44 is not set | 544 | # CONFIG_B44 is not set |
| 541 | CONFIG_FEC_MPC52xx=y | 545 | CONFIG_FEC_MPC52xx=y |
| 542 | CONFIG_FEC_MPC52xx_MDIO=y | 546 | CONFIG_FEC_MPC52xx_MDIO=y |
| @@ -548,7 +552,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 548 | # | 552 | # |
| 549 | # CONFIG_WLAN_PRE80211 is not set | 553 | # CONFIG_WLAN_PRE80211 is not set |
| 550 | # CONFIG_WLAN_80211 is not set | 554 | # CONFIG_WLAN_80211 is not set |
| 551 | # CONFIG_IWLWIFI is not set | ||
| 552 | # CONFIG_IWLWIFI_LEDS is not set | 555 | # CONFIG_IWLWIFI_LEDS is not set |
| 553 | 556 | ||
| 554 | # | 557 | # |
| @@ -583,6 +586,7 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 583 | # Character devices | 586 | # Character devices |
| 584 | # | 587 | # |
| 585 | # CONFIG_VT is not set | 588 | # CONFIG_VT is not set |
| 589 | CONFIG_DEVKMEM=y | ||
| 586 | # CONFIG_SERIAL_NONSTANDARD is not set | 590 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 587 | 591 | ||
| 588 | # | 592 | # |
| @@ -611,26 +615,41 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 611 | CONFIG_I2C=y | 615 | CONFIG_I2C=y |
| 612 | CONFIG_I2C_BOARDINFO=y | 616 | CONFIG_I2C_BOARDINFO=y |
| 613 | CONFIG_I2C_CHARDEV=y | 617 | CONFIG_I2C_CHARDEV=y |
| 618 | CONFIG_I2C_HELPER_AUTO=y | ||
| 614 | 619 | ||
| 615 | # | 620 | # |
| 616 | # I2C Hardware Bus support | 621 | # I2C Hardware Bus support |
| 617 | # | 622 | # |
| 623 | |||
| 624 | # | ||
| 625 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 626 | # | ||
| 618 | CONFIG_I2C_MPC=y | 627 | CONFIG_I2C_MPC=y |
| 619 | # CONFIG_I2C_OCORES is not set | 628 | # CONFIG_I2C_OCORES is not set |
| 620 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 621 | # CONFIG_I2C_SIMTEC is not set | 629 | # CONFIG_I2C_SIMTEC is not set |
| 630 | |||
| 631 | # | ||
| 632 | # External I2C/SMBus adapter drivers | ||
| 633 | # | ||
| 634 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 622 | # CONFIG_I2C_TAOS_EVM is not set | 635 | # CONFIG_I2C_TAOS_EVM is not set |
| 623 | # CONFIG_I2C_STUB is not set | ||
| 624 | # CONFIG_I2C_TINY_USB is not set | 636 | # CONFIG_I2C_TINY_USB is not set |
| 637 | |||
| 638 | # | ||
| 639 | # Other I2C/SMBus bus drivers | ||
| 640 | # | ||
| 625 | # CONFIG_I2C_PCA_PLATFORM is not set | 641 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 642 | # CONFIG_I2C_STUB is not set | ||
| 626 | 643 | ||
| 627 | # | 644 | # |
| 628 | # Miscellaneous I2C Chip support | 645 | # Miscellaneous I2C Chip support |
| 629 | # | 646 | # |
| 630 | # CONFIG_DS1682 is not set | 647 | # CONFIG_DS1682 is not set |
| 648 | # CONFIG_AT24 is not set | ||
| 631 | # CONFIG_SENSORS_EEPROM is not set | 649 | # CONFIG_SENSORS_EEPROM is not set |
| 632 | # CONFIG_SENSORS_PCF8574 is not set | 650 | # CONFIG_SENSORS_PCF8574 is not set |
| 633 | # CONFIG_PCF8575 is not set | 651 | # CONFIG_PCF8575 is not set |
| 652 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 634 | # CONFIG_SENSORS_PCF8591 is not set | 653 | # CONFIG_SENSORS_PCF8591 is not set |
| 635 | # CONFIG_SENSORS_MAX6875 is not set | 654 | # CONFIG_SENSORS_MAX6875 is not set |
| 636 | # CONFIG_SENSORS_TSL2550 is not set | 655 | # CONFIG_SENSORS_TSL2550 is not set |
| @@ -639,10 +658,13 @@ CONFIG_I2C_MPC=y | |||
| 639 | # CONFIG_I2C_DEBUG_BUS is not set | 658 | # CONFIG_I2C_DEBUG_BUS is not set |
| 640 | # CONFIG_I2C_DEBUG_CHIP is not set | 659 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 641 | # CONFIG_SPI is not set | 660 | # CONFIG_SPI is not set |
| 661 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
| 662 | # CONFIG_GPIOLIB is not set | ||
| 642 | # CONFIG_W1 is not set | 663 | # CONFIG_W1 is not set |
| 643 | # CONFIG_POWER_SUPPLY is not set | 664 | # CONFIG_POWER_SUPPLY is not set |
| 644 | CONFIG_HWMON=y | 665 | CONFIG_HWMON=y |
| 645 | # CONFIG_HWMON_VID is not set | 666 | # CONFIG_HWMON_VID is not set |
| 667 | # CONFIG_SENSORS_AD7414 is not set | ||
| 646 | # CONFIG_SENSORS_AD7418 is not set | 668 | # CONFIG_SENSORS_AD7418 is not set |
| 647 | # CONFIG_SENSORS_ADM1021 is not set | 669 | # CONFIG_SENSORS_ADM1021 is not set |
| 648 | # CONFIG_SENSORS_ADM1025 is not set | 670 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -650,6 +672,7 @@ CONFIG_HWMON=y | |||
| 650 | # CONFIG_SENSORS_ADM1029 is not set | 672 | # CONFIG_SENSORS_ADM1029 is not set |
| 651 | # CONFIG_SENSORS_ADM1031 is not set | 673 | # CONFIG_SENSORS_ADM1031 is not set |
| 652 | # CONFIG_SENSORS_ADM9240 is not set | 674 | # CONFIG_SENSORS_ADM9240 is not set |
| 675 | # CONFIG_SENSORS_ADT7462 is not set | ||
| 653 | # CONFIG_SENSORS_ADT7470 is not set | 676 | # CONFIG_SENSORS_ADT7470 is not set |
| 654 | # CONFIG_SENSORS_ADT7473 is not set | 677 | # CONFIG_SENSORS_ADT7473 is not set |
| 655 | # CONFIG_SENSORS_ATXP1 is not set | 678 | # CONFIG_SENSORS_ATXP1 is not set |
| @@ -692,6 +715,7 @@ CONFIG_HWMON=y | |||
| 692 | # CONFIG_SENSORS_W83627EHF is not set | 715 | # CONFIG_SENSORS_W83627EHF is not set |
| 693 | # CONFIG_HWMON_DEBUG_CHIP is not set | 716 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 694 | # CONFIG_THERMAL is not set | 717 | # CONFIG_THERMAL is not set |
| 718 | # CONFIG_THERMAL_HWMON is not set | ||
| 695 | CONFIG_WATCHDOG=y | 719 | CONFIG_WATCHDOG=y |
| 696 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 720 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 697 | 721 | ||
| @@ -705,24 +729,39 @@ CONFIG_WATCHDOG=y | |||
| 705 | # USB-based Watchdog Cards | 729 | # USB-based Watchdog Cards |
| 706 | # | 730 | # |
| 707 | # CONFIG_USBPCWATCHDOG is not set | 731 | # CONFIG_USBPCWATCHDOG is not set |
| 732 | CONFIG_SSB_POSSIBLE=y | ||
| 708 | 733 | ||
| 709 | # | 734 | # |
| 710 | # Sonics Silicon Backplane | 735 | # Sonics Silicon Backplane |
| 711 | # | 736 | # |
| 712 | CONFIG_SSB_POSSIBLE=y | ||
| 713 | # CONFIG_SSB is not set | 737 | # CONFIG_SSB is not set |
| 714 | 738 | ||
| 715 | # | 739 | # |
| 716 | # Multifunction device drivers | 740 | # Multifunction device drivers |
| 717 | # | 741 | # |
| 742 | # CONFIG_MFD_CORE is not set | ||
| 718 | # CONFIG_MFD_SM501 is not set | 743 | # CONFIG_MFD_SM501 is not set |
| 719 | # CONFIG_HTC_PASIC3 is not set | 744 | # CONFIG_HTC_PASIC3 is not set |
| 745 | # CONFIG_MFD_TMIO is not set | ||
| 746 | # CONFIG_PMIC_DA903X is not set | ||
| 747 | # CONFIG_MFD_WM8400 is not set | ||
| 748 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 749 | # CONFIG_REGULATOR is not set | ||
| 720 | 750 | ||
| 721 | # | 751 | # |
| 722 | # Multimedia devices | 752 | # Multimedia devices |
| 723 | # | 753 | # |
| 754 | |||
| 755 | # | ||
| 756 | # Multimedia core support | ||
| 757 | # | ||
| 724 | # CONFIG_VIDEO_DEV is not set | 758 | # CONFIG_VIDEO_DEV is not set |
| 725 | # CONFIG_DVB_CORE is not set | 759 | # CONFIG_DVB_CORE is not set |
| 760 | # CONFIG_VIDEO_MEDIA is not set | ||
| 761 | |||
| 762 | # | ||
| 763 | # Multimedia drivers | ||
| 764 | # | ||
| 726 | # CONFIG_DAB is not set | 765 | # CONFIG_DAB is not set |
| 727 | 766 | ||
| 728 | # | 767 | # |
| @@ -737,10 +776,6 @@ CONFIG_SSB_POSSIBLE=y | |||
| 737 | # Display device support | 776 | # Display device support |
| 738 | # | 777 | # |
| 739 | # CONFIG_DISPLAY_SUPPORT is not set | 778 | # CONFIG_DISPLAY_SUPPORT is not set |
| 740 | |||
| 741 | # | ||
| 742 | # Sound | ||
| 743 | # | ||
| 744 | # CONFIG_SOUND is not set | 779 | # CONFIG_SOUND is not set |
| 745 | CONFIG_USB_SUPPORT=y | 780 | CONFIG_USB_SUPPORT=y |
| 746 | CONFIG_USB_ARCH_HAS_HCD=y | 781 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -760,11 +795,16 @@ CONFIG_USB_DEVICEFS=y | |||
| 760 | # CONFIG_USB_OTG is not set | 795 | # CONFIG_USB_OTG is not set |
| 761 | # CONFIG_USB_OTG_WHITELIST is not set | 796 | # CONFIG_USB_OTG_WHITELIST is not set |
| 762 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 797 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
| 798 | CONFIG_USB_MON=y | ||
| 799 | # CONFIG_USB_WUSB is not set | ||
| 800 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 763 | 801 | ||
| 764 | # | 802 | # |
| 765 | # USB Host Controller Drivers | 803 | # USB Host Controller Drivers |
| 766 | # | 804 | # |
| 805 | # CONFIG_USB_C67X00_HCD is not set | ||
| 767 | # CONFIG_USB_ISP116X_HCD is not set | 806 | # CONFIG_USB_ISP116X_HCD is not set |
| 807 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 768 | CONFIG_USB_OHCI_HCD=y | 808 | CONFIG_USB_OHCI_HCD=y |
| 769 | CONFIG_USB_OHCI_HCD_PPC_SOC=y | 809 | CONFIG_USB_OHCI_HCD_PPC_SOC=y |
| 770 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 810 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| @@ -775,12 +815,16 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
| 775 | # CONFIG_USB_OHCI_LITTLE_ENDIAN is not set | 815 | # CONFIG_USB_OHCI_LITTLE_ENDIAN is not set |
| 776 | # CONFIG_USB_SL811_HCD is not set | 816 | # CONFIG_USB_SL811_HCD is not set |
| 777 | # CONFIG_USB_R8A66597_HCD is not set | 817 | # CONFIG_USB_R8A66597_HCD is not set |
| 818 | # CONFIG_USB_HWA_HCD is not set | ||
| 819 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 778 | 820 | ||
| 779 | # | 821 | # |
| 780 | # USB Device Class drivers | 822 | # USB Device Class drivers |
| 781 | # | 823 | # |
| 782 | # CONFIG_USB_ACM is not set | 824 | # CONFIG_USB_ACM is not set |
| 783 | # CONFIG_USB_PRINTER is not set | 825 | # CONFIG_USB_PRINTER is not set |
| 826 | # CONFIG_USB_WDM is not set | ||
| 827 | # CONFIG_USB_TMC is not set | ||
| 784 | 828 | ||
| 785 | # | 829 | # |
| 786 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 830 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -809,7 +853,6 @@ CONFIG_USB_STORAGE=y | |||
| 809 | # | 853 | # |
| 810 | # CONFIG_USB_MDC800 is not set | 854 | # CONFIG_USB_MDC800 is not set |
| 811 | # CONFIG_USB_MICROTEK is not set | 855 | # CONFIG_USB_MICROTEK is not set |
| 812 | CONFIG_USB_MON=y | ||
| 813 | 856 | ||
| 814 | # | 857 | # |
| 815 | # USB port drivers | 858 | # USB port drivers |
| @@ -822,7 +865,7 @@ CONFIG_USB_MON=y | |||
| 822 | # CONFIG_USB_EMI62 is not set | 865 | # CONFIG_USB_EMI62 is not set |
| 823 | # CONFIG_USB_EMI26 is not set | 866 | # CONFIG_USB_EMI26 is not set |
| 824 | # CONFIG_USB_ADUTUX is not set | 867 | # CONFIG_USB_ADUTUX is not set |
| 825 | # CONFIG_USB_AUERSWALD is not set | 868 | # CONFIG_USB_SEVSEG is not set |
| 826 | # CONFIG_USB_RIO500 is not set | 869 | # CONFIG_USB_RIO500 is not set |
| 827 | # CONFIG_USB_LEGOTOWER is not set | 870 | # CONFIG_USB_LEGOTOWER is not set |
| 828 | # CONFIG_USB_LCD is not set | 871 | # CONFIG_USB_LCD is not set |
| @@ -838,10 +881,13 @@ CONFIG_USB_MON=y | |||
| 838 | # CONFIG_USB_TRANCEVIBRATOR is not set | 881 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 839 | # CONFIG_USB_IOWARRIOR is not set | 882 | # CONFIG_USB_IOWARRIOR is not set |
| 840 | # CONFIG_USB_TEST is not set | 883 | # CONFIG_USB_TEST is not set |
| 884 | # CONFIG_USB_ISIGHTFW is not set | ||
| 885 | # CONFIG_USB_VST is not set | ||
| 841 | # CONFIG_USB_GADGET is not set | 886 | # CONFIG_USB_GADGET is not set |
| 842 | # CONFIG_MMC is not set | 887 | # CONFIG_MMC is not set |
| 843 | # CONFIG_MEMSTICK is not set | 888 | # CONFIG_MEMSTICK is not set |
| 844 | # CONFIG_NEW_LEDS is not set | 889 | # CONFIG_NEW_LEDS is not set |
| 890 | # CONFIG_ACCESSIBILITY is not set | ||
| 845 | # CONFIG_EDAC is not set | 891 | # CONFIG_EDAC is not set |
| 846 | CONFIG_RTC_LIB=y | 892 | CONFIG_RTC_LIB=y |
| 847 | CONFIG_RTC_CLASS=y | 893 | CONFIG_RTC_CLASS=y |
| @@ -872,6 +918,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 872 | # CONFIG_RTC_DRV_PCF8583 is not set | 918 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 873 | # CONFIG_RTC_DRV_M41T80 is not set | 919 | # CONFIG_RTC_DRV_M41T80 is not set |
| 874 | # CONFIG_RTC_DRV_S35390A is not set | 920 | # CONFIG_RTC_DRV_S35390A is not set |
| 921 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 922 | # CONFIG_RTC_DRV_RX8581 is not set | ||
| 875 | 923 | ||
| 876 | # | 924 | # |
| 877 | # SPI RTC drivers | 925 | # SPI RTC drivers |
| @@ -881,19 +929,25 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 881 | # Platform RTC drivers | 929 | # Platform RTC drivers |
| 882 | # | 930 | # |
| 883 | # CONFIG_RTC_DRV_CMOS is not set | 931 | # CONFIG_RTC_DRV_CMOS is not set |
| 932 | # CONFIG_RTC_DRV_DS1286 is not set | ||
| 884 | # CONFIG_RTC_DRV_DS1511 is not set | 933 | # CONFIG_RTC_DRV_DS1511 is not set |
| 885 | # CONFIG_RTC_DRV_DS1553 is not set | 934 | # CONFIG_RTC_DRV_DS1553 is not set |
| 886 | # CONFIG_RTC_DRV_DS1742 is not set | 935 | # CONFIG_RTC_DRV_DS1742 is not set |
| 887 | # CONFIG_RTC_DRV_STK17TA8 is not set | 936 | # CONFIG_RTC_DRV_STK17TA8 is not set |
| 888 | # CONFIG_RTC_DRV_M48T86 is not set | 937 | # CONFIG_RTC_DRV_M48T86 is not set |
| 938 | # CONFIG_RTC_DRV_M48T35 is not set | ||
| 889 | # CONFIG_RTC_DRV_M48T59 is not set | 939 | # CONFIG_RTC_DRV_M48T59 is not set |
| 940 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
| 890 | # CONFIG_RTC_DRV_V3020 is not set | 941 | # CONFIG_RTC_DRV_V3020 is not set |
| 891 | 942 | ||
| 892 | # | 943 | # |
| 893 | # on-CPU RTC drivers | 944 | # on-CPU RTC drivers |
| 894 | # | 945 | # |
| 946 | # CONFIG_RTC_DRV_PPC is not set | ||
| 895 | # CONFIG_DMADEVICES is not set | 947 | # CONFIG_DMADEVICES is not set |
| 896 | # CONFIG_UIO is not set | 948 | # CONFIG_UIO is not set |
| 949 | # CONFIG_STAGING is not set | ||
| 950 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 897 | 951 | ||
| 898 | # | 952 | # |
| 899 | # File systems | 953 | # File systems |
| @@ -905,12 +959,13 @@ CONFIG_EXT3_FS=y | |||
| 905 | CONFIG_EXT3_FS_XATTR=y | 959 | CONFIG_EXT3_FS_XATTR=y |
| 906 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 960 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 907 | # CONFIG_EXT3_FS_SECURITY is not set | 961 | # CONFIG_EXT3_FS_SECURITY is not set |
| 908 | # CONFIG_EXT4DEV_FS is not set | 962 | # CONFIG_EXT4_FS is not set |
| 909 | CONFIG_JBD=y | 963 | CONFIG_JBD=y |
| 910 | CONFIG_FS_MBCACHE=y | 964 | CONFIG_FS_MBCACHE=y |
| 911 | # CONFIG_REISERFS_FS is not set | 965 | # CONFIG_REISERFS_FS is not set |
| 912 | # CONFIG_JFS_FS is not set | 966 | # CONFIG_JFS_FS is not set |
| 913 | # CONFIG_FS_POSIX_ACL is not set | 967 | # CONFIG_FS_POSIX_ACL is not set |
| 968 | CONFIG_FILE_LOCKING=y | ||
| 914 | # CONFIG_XFS_FS is not set | 969 | # CONFIG_XFS_FS is not set |
| 915 | # CONFIG_OCFS2_FS is not set | 970 | # CONFIG_OCFS2_FS is not set |
| 916 | CONFIG_DNOTIFY=y | 971 | CONFIG_DNOTIFY=y |
| @@ -943,6 +998,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 943 | CONFIG_PROC_FS=y | 998 | CONFIG_PROC_FS=y |
| 944 | CONFIG_PROC_KCORE=y | 999 | CONFIG_PROC_KCORE=y |
| 945 | CONFIG_PROC_SYSCTL=y | 1000 | CONFIG_PROC_SYSCTL=y |
| 1001 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 946 | CONFIG_SYSFS=y | 1002 | CONFIG_SYSFS=y |
| 947 | CONFIG_TMPFS=y | 1003 | CONFIG_TMPFS=y |
| 948 | # CONFIG_TMPFS_POSIX_ACL is not set | 1004 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -973,6 +1029,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 973 | CONFIG_CRAMFS=y | 1029 | CONFIG_CRAMFS=y |
| 974 | # CONFIG_VXFS_FS is not set | 1030 | # CONFIG_VXFS_FS is not set |
| 975 | # CONFIG_MINIX_FS is not set | 1031 | # CONFIG_MINIX_FS is not set |
| 1032 | # CONFIG_OMFS_FS is not set | ||
| 976 | # CONFIG_HPFS_FS is not set | 1033 | # CONFIG_HPFS_FS is not set |
| 977 | # CONFIG_QNX4FS_FS is not set | 1034 | # CONFIG_QNX4FS_FS is not set |
| 978 | # CONFIG_ROMFS_FS is not set | 1035 | # CONFIG_ROMFS_FS is not set |
| @@ -983,14 +1040,14 @@ CONFIG_NFS_FS=y | |||
| 983 | CONFIG_NFS_V3=y | 1040 | CONFIG_NFS_V3=y |
| 984 | # CONFIG_NFS_V3_ACL is not set | 1041 | # CONFIG_NFS_V3_ACL is not set |
| 985 | CONFIG_NFS_V4=y | 1042 | CONFIG_NFS_V4=y |
| 986 | # CONFIG_NFSD is not set | ||
| 987 | CONFIG_ROOT_NFS=y | 1043 | CONFIG_ROOT_NFS=y |
| 1044 | # CONFIG_NFSD is not set | ||
| 988 | CONFIG_LOCKD=y | 1045 | CONFIG_LOCKD=y |
| 989 | CONFIG_LOCKD_V4=y | 1046 | CONFIG_LOCKD_V4=y |
| 990 | CONFIG_NFS_COMMON=y | 1047 | CONFIG_NFS_COMMON=y |
| 991 | CONFIG_SUNRPC=y | 1048 | CONFIG_SUNRPC=y |
| 992 | CONFIG_SUNRPC_GSS=y | 1049 | CONFIG_SUNRPC_GSS=y |
| 993 | # CONFIG_SUNRPC_BIND34 is not set | 1050 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 994 | CONFIG_RPCSEC_GSS_KRB5=y | 1051 | CONFIG_RPCSEC_GSS_KRB5=y |
| 995 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1052 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 996 | # CONFIG_SMB_FS is not set | 1053 | # CONFIG_SMB_FS is not set |
| @@ -1066,9 +1123,9 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1066 | # Library routines | 1123 | # Library routines |
| 1067 | # | 1124 | # |
| 1068 | CONFIG_BITREVERSE=y | 1125 | CONFIG_BITREVERSE=y |
| 1069 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1070 | # CONFIG_CRC_CCITT is not set | 1126 | # CONFIG_CRC_CCITT is not set |
| 1071 | # CONFIG_CRC16 is not set | 1127 | # CONFIG_CRC16 is not set |
| 1128 | # CONFIG_CRC_T10DIF is not set | ||
| 1072 | # CONFIG_CRC_ITU_T is not set | 1129 | # CONFIG_CRC_ITU_T is not set |
| 1073 | CONFIG_CRC32=y | 1130 | CONFIG_CRC32=y |
| 1074 | # CONFIG_CRC7 is not set | 1131 | # CONFIG_CRC7 is not set |
| @@ -1095,9 +1152,12 @@ CONFIG_FRAME_WARN=1024 | |||
| 1095 | CONFIG_DEBUG_KERNEL=y | 1152 | CONFIG_DEBUG_KERNEL=y |
| 1096 | # CONFIG_DEBUG_SHIRQ is not set | 1153 | # CONFIG_DEBUG_SHIRQ is not set |
| 1097 | CONFIG_DETECT_SOFTLOCKUP=y | 1154 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1155 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1156 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1098 | CONFIG_SCHED_DEBUG=y | 1157 | CONFIG_SCHED_DEBUG=y |
| 1099 | # CONFIG_SCHEDSTATS is not set | 1158 | # CONFIG_SCHEDSTATS is not set |
| 1100 | # CONFIG_TIMER_STATS is not set | 1159 | # CONFIG_TIMER_STATS is not set |
| 1160 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1101 | # CONFIG_SLUB_DEBUG_ON is not set | 1161 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1102 | # CONFIG_SLUB_STATS is not set | 1162 | # CONFIG_SLUB_STATS is not set |
| 1103 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1163 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1111,17 +1171,37 @@ CONFIG_SCHED_DEBUG=y | |||
| 1111 | CONFIG_DEBUG_INFO=y | 1171 | CONFIG_DEBUG_INFO=y |
| 1112 | # CONFIG_DEBUG_VM is not set | 1172 | # CONFIG_DEBUG_VM is not set |
| 1113 | # CONFIG_DEBUG_WRITECOUNT is not set | 1173 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 1174 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1114 | # CONFIG_DEBUG_LIST is not set | 1175 | # CONFIG_DEBUG_LIST is not set |
| 1115 | # CONFIG_DEBUG_SG is not set | 1176 | # CONFIG_DEBUG_SG is not set |
| 1116 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1177 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1117 | # CONFIG_RCU_TORTURE_TEST is not set | 1178 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1179 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1118 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1180 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1181 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1119 | # CONFIG_FAULT_INJECTION is not set | 1182 | # CONFIG_FAULT_INJECTION is not set |
| 1183 | # CONFIG_LATENCYTOP is not set | ||
| 1184 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1185 | |||
| 1186 | # | ||
| 1187 | # Tracers | ||
| 1188 | # | ||
| 1189 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1190 | # CONFIG_SCHED_TRACER is not set | ||
| 1191 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1192 | # CONFIG_BOOT_TRACER is not set | ||
| 1193 | # CONFIG_STACK_TRACER is not set | ||
| 1194 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1120 | # CONFIG_SAMPLES is not set | 1195 | # CONFIG_SAMPLES is not set |
| 1196 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1197 | # CONFIG_KGDB is not set | ||
| 1121 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1198 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1122 | # CONFIG_DEBUG_STACK_USAGE is not set | 1199 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1123 | # CONFIG_DEBUG_PAGEALLOC is not set | 1200 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1124 | # CONFIG_DEBUGGER is not set | 1201 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1202 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1203 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
| 1204 | # CONFIG_XMON is not set | ||
| 1125 | # CONFIG_IRQSTACKS is not set | 1205 | # CONFIG_IRQSTACKS is not set |
| 1126 | # CONFIG_BDI_SWITCH is not set | 1206 | # CONFIG_BDI_SWITCH is not set |
| 1127 | # CONFIG_BOOTX_TEXT is not set | 1207 | # CONFIG_BOOTX_TEXT is not set |
| @@ -1132,14 +1212,19 @@ CONFIG_DEBUG_INFO=y | |||
| 1132 | # | 1212 | # |
| 1133 | # CONFIG_KEYS is not set | 1213 | # CONFIG_KEYS is not set |
| 1134 | # CONFIG_SECURITY is not set | 1214 | # CONFIG_SECURITY is not set |
| 1215 | # CONFIG_SECURITYFS is not set | ||
| 1135 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1216 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1136 | CONFIG_CRYPTO=y | 1217 | CONFIG_CRYPTO=y |
| 1137 | 1218 | ||
| 1138 | # | 1219 | # |
| 1139 | # Crypto core or helper | 1220 | # Crypto core or helper |
| 1140 | # | 1221 | # |
| 1222 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1141 | CONFIG_CRYPTO_ALGAPI=y | 1223 | CONFIG_CRYPTO_ALGAPI=y |
| 1224 | CONFIG_CRYPTO_AEAD=y | ||
| 1142 | CONFIG_CRYPTO_BLKCIPHER=y | 1225 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1226 | CONFIG_CRYPTO_HASH=y | ||
| 1227 | CONFIG_CRYPTO_RNG=y | ||
| 1143 | CONFIG_CRYPTO_MANAGER=y | 1228 | CONFIG_CRYPTO_MANAGER=y |
| 1144 | # CONFIG_CRYPTO_GF128MUL is not set | 1229 | # CONFIG_CRYPTO_GF128MUL is not set |
| 1145 | # CONFIG_CRYPTO_NULL is not set | 1230 | # CONFIG_CRYPTO_NULL is not set |
| @@ -1178,6 +1263,10 @@ CONFIG_CRYPTO_PCBC=y | |||
| 1178 | # CONFIG_CRYPTO_MD4 is not set | 1263 | # CONFIG_CRYPTO_MD4 is not set |
| 1179 | CONFIG_CRYPTO_MD5=y | 1264 | CONFIG_CRYPTO_MD5=y |
| 1180 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1265 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
| 1266 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1267 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1268 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1269 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1181 | # CONFIG_CRYPTO_SHA1 is not set | 1270 | # CONFIG_CRYPTO_SHA1 is not set |
| 1182 | # CONFIG_CRYPTO_SHA256 is not set | 1271 | # CONFIG_CRYPTO_SHA256 is not set |
| 1183 | # CONFIG_CRYPTO_SHA512 is not set | 1272 | # CONFIG_CRYPTO_SHA512 is not set |
| @@ -1208,6 +1297,11 @@ CONFIG_CRYPTO_DES=y | |||
| 1208 | # | 1297 | # |
| 1209 | # CONFIG_CRYPTO_DEFLATE is not set | 1298 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1210 | # CONFIG_CRYPTO_LZO is not set | 1299 | # CONFIG_CRYPTO_LZO is not set |
| 1300 | |||
| 1301 | # | ||
| 1302 | # Random Number Generation | ||
| 1303 | # | ||
| 1304 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1211 | CONFIG_CRYPTO_HW=y | 1305 | CONFIG_CRYPTO_HW=y |
| 1212 | CONFIG_PPC_CLOCK=y | 1306 | CONFIG_PPC_CLOCK=y |
| 1213 | CONFIG_PPC_LIB_RHEAP=y | 1307 | CONFIG_PPC_LIB_RHEAP=y |
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig index 2da13e00a807..07ccaf89f379 100644 --- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig +++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig | |||
| @@ -838,7 +838,7 @@ CONFIG_PHYLIB=y | |||
| 838 | # | 838 | # |
| 839 | # MII PHY device drivers | 839 | # MII PHY device drivers |
| 840 | # | 840 | # |
| 841 | CONFIG_MARVELL_PHY=y | 841 | # CONFIG_MARVELL_PHY is not set |
| 842 | # CONFIG_DAVICOM_PHY is not set | 842 | # CONFIG_DAVICOM_PHY is not set |
| 843 | # CONFIG_QSEMI_PHY is not set | 843 | # CONFIG_QSEMI_PHY is not set |
| 844 | # CONFIG_LXT_PHY is not set | 844 | # CONFIG_LXT_PHY is not set |
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig index 740c9f2b7de6..15c5604d0b26 100644 --- a/arch/powerpc/configs/mpc5200_defconfig +++ b/arch/powerpc/configs/mpc5200_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.24-rc6 | 3 | # Linux kernel version: 2.6.28-rc4 |
| 4 | # Fri Jan 18 14:19:54 2008 | 4 | # Thu Nov 13 02:09:07 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -22,14 +22,18 @@ CONFIG_PPC_STD_MMU_32=y | |||
| 22 | # CONFIG_SMP is not set | 22 | # CONFIG_SMP is not set |
| 23 | CONFIG_PPC32=y | 23 | CONFIG_PPC32=y |
| 24 | CONFIG_WORD_SIZE=32 | 24 | CONFIG_WORD_SIZE=32 |
| 25 | CONFIG_PPC_MERGE=y | 25 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
| 26 | CONFIG_MMU=y | 26 | CONFIG_MMU=y |
| 27 | CONFIG_GENERIC_CMOS_UPDATE=y | 27 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 28 | CONFIG_GENERIC_TIME=y | 28 | CONFIG_GENERIC_TIME=y |
| 29 | CONFIG_GENERIC_TIME_VSYSCALL=y | 29 | CONFIG_GENERIC_TIME_VSYSCALL=y |
| 30 | CONFIG_GENERIC_CLOCKEVENTS=y | 30 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | ||
| 32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -47,7 +51,8 @@ CONFIG_OF=y | |||
| 47 | # CONFIG_GENERIC_TBSYNC is not set | 51 | # CONFIG_GENERIC_TBSYNC is not set |
| 48 | CONFIG_AUDIT_ARCH=y | 52 | CONFIG_AUDIT_ARCH=y |
| 49 | CONFIG_GENERIC_BUG=y | 53 | CONFIG_GENERIC_BUG=y |
| 50 | # CONFIG_DEFAULT_UIMAGE is not set | 54 | CONFIG_DEFAULT_UIMAGE=y |
| 55 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 51 | # CONFIG_PPC_DCR_NATIVE is not set | 56 | # CONFIG_PPC_DCR_NATIVE is not set |
| 52 | # CONFIG_PPC_DCR_MMIO is not set | 57 | # CONFIG_PPC_DCR_MMIO is not set |
| 53 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 58 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -66,17 +71,15 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 66 | # CONFIG_POSIX_MQUEUE is not set | 71 | # CONFIG_POSIX_MQUEUE is not set |
| 67 | # CONFIG_BSD_PROCESS_ACCT is not set | 72 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 68 | # CONFIG_TASKSTATS is not set | 73 | # CONFIG_TASKSTATS is not set |
| 69 | # CONFIG_USER_NS is not set | ||
| 70 | # CONFIG_PID_NS is not set | ||
| 71 | # CONFIG_AUDIT is not set | 74 | # CONFIG_AUDIT is not set |
| 72 | # CONFIG_IKCONFIG is not set | 75 | # CONFIG_IKCONFIG is not set |
| 73 | CONFIG_LOG_BUF_SHIFT=14 | 76 | CONFIG_LOG_BUF_SHIFT=14 |
| 74 | # CONFIG_CGROUPS is not set | 77 | # CONFIG_CGROUPS is not set |
| 75 | CONFIG_FAIR_GROUP_SCHED=y | 78 | # CONFIG_GROUP_SCHED is not set |
| 76 | CONFIG_FAIR_USER_SCHED=y | ||
| 77 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 78 | CONFIG_SYSFS_DEPRECATED=y | 79 | CONFIG_SYSFS_DEPRECATED=y |
| 80 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 79 | # CONFIG_RELAY is not set | 81 | # CONFIG_RELAY is not set |
| 82 | # CONFIG_NAMESPACES is not set | ||
| 80 | CONFIG_BLK_DEV_INITRD=y | 83 | CONFIG_BLK_DEV_INITRD=y |
| 81 | CONFIG_INITRAMFS_SOURCE="" | 84 | CONFIG_INITRAMFS_SOURCE="" |
| 82 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 85 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| @@ -88,32 +91,49 @@ CONFIG_HOTPLUG=y | |||
| 88 | CONFIG_PRINTK=y | 91 | CONFIG_PRINTK=y |
| 89 | CONFIG_BUG=y | 92 | CONFIG_BUG=y |
| 90 | CONFIG_ELF_CORE=y | 93 | CONFIG_ELF_CORE=y |
| 94 | CONFIG_COMPAT_BRK=y | ||
| 91 | CONFIG_BASE_FULL=y | 95 | CONFIG_BASE_FULL=y |
| 92 | CONFIG_FUTEX=y | 96 | CONFIG_FUTEX=y |
| 93 | CONFIG_ANON_INODES=y | 97 | CONFIG_ANON_INODES=y |
| 94 | # CONFIG_EPOLL is not set | 98 | # CONFIG_EPOLL is not set |
| 95 | CONFIG_SIGNALFD=y | 99 | CONFIG_SIGNALFD=y |
| 100 | CONFIG_TIMERFD=y | ||
| 96 | CONFIG_EVENTFD=y | 101 | CONFIG_EVENTFD=y |
| 97 | CONFIG_SHMEM=y | 102 | CONFIG_SHMEM=y |
| 103 | CONFIG_AIO=y | ||
| 98 | CONFIG_VM_EVENT_COUNTERS=y | 104 | CONFIG_VM_EVENT_COUNTERS=y |
| 105 | CONFIG_PCI_QUIRKS=y | ||
| 99 | CONFIG_SLUB_DEBUG=y | 106 | CONFIG_SLUB_DEBUG=y |
| 100 | # CONFIG_SLAB is not set | 107 | # CONFIG_SLAB is not set |
| 101 | CONFIG_SLUB=y | 108 | CONFIG_SLUB=y |
| 102 | # CONFIG_SLOB is not set | 109 | # CONFIG_SLOB is not set |
| 110 | # CONFIG_PROFILING is not set | ||
| 111 | # CONFIG_MARKERS is not set | ||
| 112 | CONFIG_HAVE_OPROFILE=y | ||
| 113 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
| 114 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 115 | CONFIG_HAVE_KPROBES=y | ||
| 116 | CONFIG_HAVE_KRETPROBES=y | ||
| 117 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
| 118 | CONFIG_HAVE_CLK=y | ||
| 119 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
| 120 | CONFIG_SLABINFO=y | ||
| 103 | CONFIG_RT_MUTEXES=y | 121 | CONFIG_RT_MUTEXES=y |
| 104 | # CONFIG_TINY_SHMEM is not set | 122 | # CONFIG_TINY_SHMEM is not set |
| 105 | CONFIG_BASE_SMALL=0 | 123 | CONFIG_BASE_SMALL=0 |
| 106 | CONFIG_MODULES=y | 124 | CONFIG_MODULES=y |
| 125 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 107 | CONFIG_MODULE_UNLOAD=y | 126 | CONFIG_MODULE_UNLOAD=y |
| 108 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 127 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 109 | # CONFIG_MODVERSIONS is not set | 128 | # CONFIG_MODVERSIONS is not set |
| 110 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 129 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 111 | # CONFIG_KMOD is not set | 130 | CONFIG_KMOD=y |
| 112 | CONFIG_BLOCK=y | 131 | CONFIG_BLOCK=y |
| 113 | # CONFIG_LBD is not set | 132 | # CONFIG_LBD is not set |
| 114 | # CONFIG_BLK_DEV_IO_TRACE is not set | 133 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 115 | # CONFIG_LSF is not set | 134 | # CONFIG_LSF is not set |
| 116 | # CONFIG_BLK_DEV_BSG is not set | 135 | # CONFIG_BLK_DEV_BSG is not set |
| 136 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
| 117 | 137 | ||
| 118 | # | 138 | # |
| 119 | # IO Schedulers | 139 | # IO Schedulers |
| @@ -127,29 +147,34 @@ CONFIG_DEFAULT_AS=y | |||
| 127 | # CONFIG_DEFAULT_CFQ is not set | 147 | # CONFIG_DEFAULT_CFQ is not set |
| 128 | # CONFIG_DEFAULT_NOOP is not set | 148 | # CONFIG_DEFAULT_NOOP is not set |
| 129 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 149 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 150 | CONFIG_CLASSIC_RCU=y | ||
| 151 | CONFIG_FREEZER=y | ||
| 130 | 152 | ||
| 131 | # | 153 | # |
| 132 | # Platform support | 154 | # Platform support |
| 133 | # | 155 | # |
| 134 | CONFIG_PPC_MULTIPLATFORM=y | 156 | CONFIG_PPC_MULTIPLATFORM=y |
| 135 | # CONFIG_PPC_82xx is not set | ||
| 136 | # CONFIG_PPC_83xx is not set | ||
| 137 | # CONFIG_PPC_86xx is not set | ||
| 138 | CONFIG_CLASSIC32=y | 157 | CONFIG_CLASSIC32=y |
| 139 | # CONFIG_PPC_CHRP is not set | 158 | # CONFIG_PPC_CHRP is not set |
| 159 | # CONFIG_MPC5121_ADS is not set | ||
| 160 | # CONFIG_MPC5121_GENERIC is not set | ||
| 140 | CONFIG_PPC_MPC52xx=y | 161 | CONFIG_PPC_MPC52xx=y |
| 141 | CONFIG_PPC_MPC5200=y | ||
| 142 | CONFIG_PPC_MPC5200_BUGFIX=y | ||
| 143 | CONFIG_PPC_MPC5200_SIMPLE=y | 162 | CONFIG_PPC_MPC5200_SIMPLE=y |
| 144 | CONFIG_PPC_EFIKA=y | 163 | CONFIG_PPC_EFIKA=y |
| 145 | CONFIG_PPC_LITE5200=y | 164 | CONFIG_PPC_LITE5200=y |
| 165 | CONFIG_PPC_MPC5200_BUGFIX=y | ||
| 166 | # CONFIG_PPC_MPC5200_GPIO is not set | ||
| 146 | # CONFIG_PPC_PMAC is not set | 167 | # CONFIG_PPC_PMAC is not set |
| 147 | # CONFIG_PPC_CELL is not set | 168 | # CONFIG_PPC_CELL is not set |
| 148 | # CONFIG_PPC_CELL_NATIVE is not set | 169 | # CONFIG_PPC_CELL_NATIVE is not set |
| 170 | # CONFIG_PPC_82xx is not set | ||
| 149 | # CONFIG_PQ2ADS is not set | 171 | # CONFIG_PQ2ADS is not set |
| 172 | # CONFIG_PPC_83xx is not set | ||
| 173 | # CONFIG_PPC_86xx is not set | ||
| 150 | # CONFIG_EMBEDDED6xx is not set | 174 | # CONFIG_EMBEDDED6xx is not set |
| 151 | CONFIG_PPC_NATIVE=y | 175 | CONFIG_PPC_NATIVE=y |
| 152 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 176 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
| 177 | # CONFIG_IPIC is not set | ||
| 153 | # CONFIG_MPIC is not set | 178 | # CONFIG_MPIC is not set |
| 154 | # CONFIG_MPIC_WEIRD is not set | 179 | # CONFIG_MPIC_WEIRD is not set |
| 155 | # CONFIG_PPC_I8259 is not set | 180 | # CONFIG_PPC_I8259 is not set |
| @@ -163,7 +188,6 @@ CONFIG_RTAS_PROC=y | |||
| 163 | # CONFIG_GENERIC_IOMAP is not set | 188 | # CONFIG_GENERIC_IOMAP is not set |
| 164 | # CONFIG_CPU_FREQ is not set | 189 | # CONFIG_CPU_FREQ is not set |
| 165 | # CONFIG_TAU is not set | 190 | # CONFIG_TAU is not set |
| 166 | # CONFIG_CPM2 is not set | ||
| 167 | # CONFIG_FSL_ULI1575 is not set | 191 | # CONFIG_FSL_ULI1575 is not set |
| 168 | CONFIG_PPC_BESTCOMM=y | 192 | CONFIG_PPC_BESTCOMM=y |
| 169 | CONFIG_PPC_BESTCOMM_ATA=y | 193 | CONFIG_PPC_BESTCOMM_ATA=y |
| @@ -183,12 +207,18 @@ CONFIG_HZ_250=y | |||
| 183 | # CONFIG_HZ_300 is not set | 207 | # CONFIG_HZ_300 is not set |
| 184 | # CONFIG_HZ_1000 is not set | 208 | # CONFIG_HZ_1000 is not set |
| 185 | CONFIG_HZ=250 | 209 | CONFIG_HZ=250 |
| 210 | CONFIG_SCHED_HRTICK=y | ||
| 186 | CONFIG_PREEMPT_NONE=y | 211 | CONFIG_PREEMPT_NONE=y |
| 187 | # CONFIG_PREEMPT_VOLUNTARY is not set | 212 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 188 | # CONFIG_PREEMPT is not set | 213 | # CONFIG_PREEMPT is not set |
| 189 | CONFIG_BINFMT_ELF=y | 214 | CONFIG_BINFMT_ELF=y |
| 215 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 216 | # CONFIG_HAVE_AOUT is not set | ||
| 190 | # CONFIG_BINFMT_MISC is not set | 217 | # CONFIG_BINFMT_MISC is not set |
| 218 | # CONFIG_IOMMU_HELPER is not set | ||
| 191 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 219 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 220 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
| 221 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 192 | # CONFIG_KEXEC is not set | 222 | # CONFIG_KEXEC is not set |
| 193 | CONFIG_ARCH_FLATMEM_ENABLE=y | 223 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 194 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 224 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| @@ -198,26 +228,25 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 198 | # CONFIG_SPARSEMEM_MANUAL is not set | 228 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 199 | CONFIG_FLATMEM=y | 229 | CONFIG_FLATMEM=y |
| 200 | CONFIG_FLAT_NODE_MEM_MAP=y | 230 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 201 | # CONFIG_SPARSEMEM_STATIC is not set | 231 | CONFIG_PAGEFLAGS_EXTENDED=y |
| 202 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 203 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 233 | CONFIG_MIGRATION=y | ||
| 204 | # CONFIG_RESOURCES_64BIT is not set | 234 | # CONFIG_RESOURCES_64BIT is not set |
| 235 | # CONFIG_PHYS_ADDR_T_64BIT is not set | ||
| 205 | CONFIG_ZONE_DMA_FLAG=1 | 236 | CONFIG_ZONE_DMA_FLAG=1 |
| 206 | CONFIG_BOUNCE=y | 237 | CONFIG_BOUNCE=y |
| 207 | CONFIG_VIRT_TO_BUS=y | 238 | CONFIG_VIRT_TO_BUS=y |
| 239 | CONFIG_UNEVICTABLE_LRU=y | ||
| 240 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 208 | CONFIG_PROC_DEVICETREE=y | 241 | CONFIG_PROC_DEVICETREE=y |
| 209 | # CONFIG_CMDLINE_BOOL is not set | 242 | # CONFIG_CMDLINE_BOOL is not set |
| 243 | CONFIG_EXTRA_TARGETS="" | ||
| 210 | CONFIG_PM=y | 244 | CONFIG_PM=y |
| 211 | # CONFIG_PM_LEGACY is not set | ||
| 212 | # CONFIG_PM_DEBUG is not set | 245 | # CONFIG_PM_DEBUG is not set |
| 213 | CONFIG_PM_SLEEP=y | 246 | CONFIG_PM_SLEEP=y |
| 214 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 215 | CONFIG_SUSPEND=y | 247 | CONFIG_SUSPEND=y |
| 216 | CONFIG_HIBERNATION_UP_POSSIBLE=y | 248 | CONFIG_SUSPEND_FREEZER=y |
| 217 | # CONFIG_HIBERNATION is not set | ||
| 218 | CONFIG_SECCOMP=y | 249 | CONFIG_SECCOMP=y |
| 219 | CONFIG_WANT_DEVICE_TREE=y | ||
| 220 | CONFIG_DEVICE_TREE="" | ||
| 221 | CONFIG_ISA_DMA_API=y | 250 | CONFIG_ISA_DMA_API=y |
| 222 | 251 | ||
| 223 | # | 252 | # |
| @@ -226,7 +255,7 @@ CONFIG_ISA_DMA_API=y | |||
| 226 | CONFIG_ZONE_DMA=y | 255 | CONFIG_ZONE_DMA=y |
| 227 | CONFIG_GENERIC_ISA_DMA=y | 256 | CONFIG_GENERIC_ISA_DMA=y |
| 228 | # CONFIG_PPC_INDIRECT_PCI is not set | 257 | # CONFIG_PPC_INDIRECT_PCI is not set |
| 229 | CONFIG_FSL_SOC=y | 258 | CONFIG_PPC_PCI_CHOICE=y |
| 230 | CONFIG_PCI=y | 259 | CONFIG_PCI=y |
| 231 | CONFIG_PCI_DOMAINS=y | 260 | CONFIG_PCI_DOMAINS=y |
| 232 | CONFIG_PCI_SYSCALL=y | 261 | CONFIG_PCI_SYSCALL=y |
| @@ -237,6 +266,7 @@ CONFIG_PCI_LEGACY=y | |||
| 237 | # CONFIG_PCI_DEBUG is not set | 266 | # CONFIG_PCI_DEBUG is not set |
| 238 | # CONFIG_PCCARD is not set | 267 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 268 | # CONFIG_HOTPLUG_PCI is not set |
| 269 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 270 | ||
| 241 | # | 271 | # |
| 242 | # Advanced setup | 272 | # Advanced setup |
| @@ -246,15 +276,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 276 | # |
| 247 | # Default settings for advanced configuration options are used | 277 | # Default settings for advanced configuration options are used |
| 248 | # | 278 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 279 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 280 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 281 | CONFIG_KERNEL_START=0xc0000000 |
| 282 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 283 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | |||
| 255 | # | ||
| 256 | # Networking | ||
| 257 | # | ||
| 258 | CONFIG_NET=y | 284 | CONFIG_NET=y |
| 259 | 285 | ||
| 260 | # | 286 | # |
| @@ -267,6 +293,7 @@ CONFIG_XFRM=y | |||
| 267 | CONFIG_XFRM_USER=m | 293 | CONFIG_XFRM_USER=m |
| 268 | # CONFIG_XFRM_SUB_POLICY is not set | 294 | # CONFIG_XFRM_SUB_POLICY is not set |
| 269 | # CONFIG_XFRM_MIGRATE is not set | 295 | # CONFIG_XFRM_MIGRATE is not set |
| 296 | # CONFIG_XFRM_STATISTICS is not set | ||
| 270 | # CONFIG_NET_KEY is not set | 297 | # CONFIG_NET_KEY is not set |
| 271 | CONFIG_INET=y | 298 | CONFIG_INET=y |
| 272 | CONFIG_IP_MULTICAST=y | 299 | CONFIG_IP_MULTICAST=y |
| @@ -297,8 +324,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 297 | CONFIG_DEFAULT_TCP_CONG="cubic" | 324 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 298 | # CONFIG_TCP_MD5SIG is not set | 325 | # CONFIG_TCP_MD5SIG is not set |
| 299 | # CONFIG_IPV6 is not set | 326 | # CONFIG_IPV6 is not set |
| 300 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 301 | # CONFIG_INET6_TUNNEL is not set | ||
| 302 | # CONFIG_NETWORK_SECMARK is not set | 327 | # CONFIG_NETWORK_SECMARK is not set |
| 303 | # CONFIG_NETFILTER is not set | 328 | # CONFIG_NETFILTER is not set |
| 304 | # CONFIG_IP_DCCP is not set | 329 | # CONFIG_IP_DCCP is not set |
| @@ -306,6 +331,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 306 | # CONFIG_TIPC is not set | 331 | # CONFIG_TIPC is not set |
| 307 | # CONFIG_ATM is not set | 332 | # CONFIG_ATM is not set |
| 308 | # CONFIG_BRIDGE is not set | 333 | # CONFIG_BRIDGE is not set |
| 334 | # CONFIG_NET_DSA is not set | ||
| 309 | # CONFIG_VLAN_8021Q is not set | 335 | # CONFIG_VLAN_8021Q is not set |
| 310 | # CONFIG_DECNET is not set | 336 | # CONFIG_DECNET is not set |
| 311 | # CONFIG_LLC2 is not set | 337 | # CONFIG_LLC2 is not set |
| @@ -322,17 +348,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 322 | # | 348 | # |
| 323 | # CONFIG_NET_PKTGEN is not set | 349 | # CONFIG_NET_PKTGEN is not set |
| 324 | # CONFIG_HAMRADIO is not set | 350 | # CONFIG_HAMRADIO is not set |
| 351 | # CONFIG_CAN is not set | ||
| 325 | # CONFIG_IRDA is not set | 352 | # CONFIG_IRDA is not set |
| 326 | # CONFIG_BT is not set | 353 | # CONFIG_BT is not set |
| 327 | # CONFIG_AF_RXRPC is not set | 354 | # CONFIG_AF_RXRPC is not set |
| 328 | 355 | # CONFIG_PHONET is not set | |
| 329 | # | 356 | # CONFIG_WIRELESS is not set |
| 330 | # Wireless | ||
| 331 | # | ||
| 332 | # CONFIG_CFG80211 is not set | ||
| 333 | # CONFIG_WIRELESS_EXT is not set | ||
| 334 | # CONFIG_MAC80211 is not set | ||
| 335 | # CONFIG_IEEE80211 is not set | ||
| 336 | # CONFIG_RFKILL is not set | 357 | # CONFIG_RFKILL is not set |
| 337 | # CONFIG_NET_9P is not set | 358 | # CONFIG_NET_9P is not set |
| 338 | 359 | ||
| @@ -357,6 +378,8 @@ CONFIG_MTD_CONCAT=y | |||
| 357 | CONFIG_MTD_PARTITIONS=y | 378 | CONFIG_MTD_PARTITIONS=y |
| 358 | # CONFIG_MTD_REDBOOT_PARTS is not set | 379 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 359 | CONFIG_MTD_CMDLINE_PARTS=y | 380 | CONFIG_MTD_CMDLINE_PARTS=y |
| 381 | # CONFIG_MTD_OF_PARTS is not set | ||
| 382 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 360 | 383 | ||
| 361 | # | 384 | # |
| 362 | # User Modules And Translation Layers | 385 | # User Modules And Translation Layers |
| @@ -428,6 +451,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 428 | # | 451 | # |
| 429 | # CONFIG_MTD_UBI is not set | 452 | # CONFIG_MTD_UBI is not set |
| 430 | CONFIG_OF_DEVICE=y | 453 | CONFIG_OF_DEVICE=y |
| 454 | CONFIG_OF_I2C=y | ||
| 431 | # CONFIG_PARPORT is not set | 455 | # CONFIG_PARPORT is not set |
| 432 | CONFIG_BLK_DEV=y | 456 | CONFIG_BLK_DEV=y |
| 433 | # CONFIG_BLK_DEV_FD is not set | 457 | # CONFIG_BLK_DEV_FD is not set |
| @@ -444,14 +468,20 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 444 | CONFIG_BLK_DEV_RAM=y | 468 | CONFIG_BLK_DEV_RAM=y |
| 445 | CONFIG_BLK_DEV_RAM_COUNT=16 | 469 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 446 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 470 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
| 447 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 471 | # CONFIG_BLK_DEV_XIP is not set |
| 448 | # CONFIG_CDROM_PKTCDVD is not set | 472 | # CONFIG_CDROM_PKTCDVD is not set |
| 449 | # CONFIG_ATA_OVER_ETH is not set | 473 | # CONFIG_ATA_OVER_ETH is not set |
| 474 | # CONFIG_BLK_DEV_HD is not set | ||
| 450 | CONFIG_MISC_DEVICES=y | 475 | CONFIG_MISC_DEVICES=y |
| 451 | # CONFIG_PHANTOM is not set | 476 | # CONFIG_PHANTOM is not set |
| 452 | # CONFIG_EEPROM_93CX6 is not set | 477 | # CONFIG_EEPROM_93CX6 is not set |
| 453 | # CONFIG_SGI_IOC4 is not set | 478 | # CONFIG_SGI_IOC4 is not set |
| 454 | # CONFIG_TIFM_CORE is not set | 479 | # CONFIG_TIFM_CORE is not set |
| 480 | # CONFIG_ICS932S401 is not set | ||
| 481 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 482 | # CONFIG_HP_ILO is not set | ||
| 483 | # CONFIG_C2PORT is not set | ||
| 484 | CONFIG_HAVE_IDE=y | ||
| 455 | # CONFIG_IDE is not set | 485 | # CONFIG_IDE is not set |
| 456 | 486 | ||
| 457 | # | 487 | # |
| @@ -516,6 +546,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 516 | # CONFIG_SCSI_IPS is not set | 546 | # CONFIG_SCSI_IPS is not set |
| 517 | # CONFIG_SCSI_INITIO is not set | 547 | # CONFIG_SCSI_INITIO is not set |
| 518 | # CONFIG_SCSI_INIA100 is not set | 548 | # CONFIG_SCSI_INIA100 is not set |
| 549 | # CONFIG_SCSI_MVSAS is not set | ||
| 519 | # CONFIG_SCSI_STEX is not set | 550 | # CONFIG_SCSI_STEX is not set |
| 520 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 551 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 521 | # CONFIG_SCSI_IPR is not set | 552 | # CONFIG_SCSI_IPR is not set |
| @@ -528,9 +559,13 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 528 | # CONFIG_SCSI_NSP32 is not set | 559 | # CONFIG_SCSI_NSP32 is not set |
| 529 | # CONFIG_SCSI_DEBUG is not set | 560 | # CONFIG_SCSI_DEBUG is not set |
| 530 | # CONFIG_SCSI_SRP is not set | 561 | # CONFIG_SCSI_SRP is not set |
| 562 | # CONFIG_SCSI_DH is not set | ||
| 531 | CONFIG_ATA=y | 563 | CONFIG_ATA=y |
| 532 | # CONFIG_ATA_NONSTANDARD is not set | 564 | # CONFIG_ATA_NONSTANDARD is not set |
| 565 | CONFIG_SATA_PMP=y | ||
| 533 | # CONFIG_SATA_AHCI is not set | 566 | # CONFIG_SATA_AHCI is not set |
| 567 | # CONFIG_SATA_SIL24 is not set | ||
| 568 | CONFIG_ATA_SFF=y | ||
| 534 | # CONFIG_SATA_SVW is not set | 569 | # CONFIG_SATA_SVW is not set |
| 535 | # CONFIG_ATA_PIIX is not set | 570 | # CONFIG_ATA_PIIX is not set |
| 536 | # CONFIG_SATA_MV is not set | 571 | # CONFIG_SATA_MV is not set |
| @@ -540,7 +575,6 @@ CONFIG_ATA=y | |||
| 540 | # CONFIG_SATA_PROMISE is not set | 575 | # CONFIG_SATA_PROMISE is not set |
| 541 | # CONFIG_SATA_SX4 is not set | 576 | # CONFIG_SATA_SX4 is not set |
| 542 | # CONFIG_SATA_SIL is not set | 577 | # CONFIG_SATA_SIL is not set |
| 543 | # CONFIG_SATA_SIL24 is not set | ||
| 544 | # CONFIG_SATA_SIS is not set | 578 | # CONFIG_SATA_SIS is not set |
| 545 | # CONFIG_SATA_ULI is not set | 579 | # CONFIG_SATA_ULI is not set |
| 546 | # CONFIG_SATA_VIA is not set | 580 | # CONFIG_SATA_VIA is not set |
| @@ -570,6 +604,7 @@ CONFIG_PATA_MPC52xx=y | |||
| 570 | # CONFIG_PATA_MPIIX is not set | 604 | # CONFIG_PATA_MPIIX is not set |
| 571 | # CONFIG_PATA_OLDPIIX is not set | 605 | # CONFIG_PATA_OLDPIIX is not set |
| 572 | # CONFIG_PATA_NETCELL is not set | 606 | # CONFIG_PATA_NETCELL is not set |
| 607 | # CONFIG_PATA_NINJA32 is not set | ||
| 573 | # CONFIG_PATA_NS87410 is not set | 608 | # CONFIG_PATA_NS87410 is not set |
| 574 | # CONFIG_PATA_NS87415 is not set | 609 | # CONFIG_PATA_NS87415 is not set |
| 575 | # CONFIG_PATA_OPTI is not set | 610 | # CONFIG_PATA_OPTI is not set |
| @@ -586,25 +621,28 @@ CONFIG_PATA_MPC52xx=y | |||
| 586 | # CONFIG_PATA_WINBOND is not set | 621 | # CONFIG_PATA_WINBOND is not set |
| 587 | CONFIG_PATA_PLATFORM=y | 622 | CONFIG_PATA_PLATFORM=y |
| 588 | # CONFIG_PATA_OF_PLATFORM is not set | 623 | # CONFIG_PATA_OF_PLATFORM is not set |
| 624 | # CONFIG_PATA_SCH is not set | ||
| 589 | # CONFIG_MD is not set | 625 | # CONFIG_MD is not set |
| 590 | # CONFIG_FUSION is not set | 626 | # CONFIG_FUSION is not set |
| 591 | 627 | ||
| 592 | # | 628 | # |
| 593 | # IEEE 1394 (FireWire) support | 629 | # IEEE 1394 (FireWire) support |
| 594 | # | 630 | # |
| 631 | |||
| 632 | # | ||
| 633 | # Enable only one of the two stacks, unless you know what you are doing | ||
| 634 | # | ||
| 595 | # CONFIG_FIREWIRE is not set | 635 | # CONFIG_FIREWIRE is not set |
| 596 | # CONFIG_IEEE1394 is not set | 636 | # CONFIG_IEEE1394 is not set |
| 597 | # CONFIG_I2O is not set | 637 | # CONFIG_I2O is not set |
| 598 | # CONFIG_MACINTOSH_DRIVERS is not set | 638 | # CONFIG_MACINTOSH_DRIVERS is not set |
| 599 | CONFIG_NETDEVICES=y | 639 | CONFIG_NETDEVICES=y |
| 600 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 601 | # CONFIG_DUMMY is not set | 640 | # CONFIG_DUMMY is not set |
| 602 | # CONFIG_BONDING is not set | 641 | # CONFIG_BONDING is not set |
| 603 | # CONFIG_MACVLAN is not set | 642 | # CONFIG_MACVLAN is not set |
| 604 | # CONFIG_EQUALIZER is not set | 643 | # CONFIG_EQUALIZER is not set |
| 605 | # CONFIG_TUN is not set | 644 | # CONFIG_TUN is not set |
| 606 | # CONFIG_VETH is not set | 645 | # CONFIG_VETH is not set |
| 607 | # CONFIG_IP1000 is not set | ||
| 608 | # CONFIG_ARCNET is not set | 646 | # CONFIG_ARCNET is not set |
| 609 | CONFIG_PHYLIB=y | 647 | CONFIG_PHYLIB=y |
| 610 | 648 | ||
| @@ -620,6 +658,7 @@ CONFIG_PHYLIB=y | |||
| 620 | # CONFIG_SMSC_PHY is not set | 658 | # CONFIG_SMSC_PHY is not set |
| 621 | # CONFIG_BROADCOM_PHY is not set | 659 | # CONFIG_BROADCOM_PHY is not set |
| 622 | # CONFIG_ICPLUS_PHY is not set | 660 | # CONFIG_ICPLUS_PHY is not set |
| 661 | # CONFIG_REALTEK_PHY is not set | ||
| 623 | # CONFIG_FIXED_PHY is not set | 662 | # CONFIG_FIXED_PHY is not set |
| 624 | # CONFIG_MDIO_BITBANG is not set | 663 | # CONFIG_MDIO_BITBANG is not set |
| 625 | CONFIG_NET_ETHERNET=y | 664 | CONFIG_NET_ETHERNET=y |
| @@ -634,10 +673,14 @@ CONFIG_NET_ETHERNET=y | |||
| 634 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 673 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 635 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 674 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 636 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 675 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 676 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 677 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 678 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 637 | # CONFIG_NET_PCI is not set | 679 | # CONFIG_NET_PCI is not set |
| 638 | # CONFIG_B44 is not set | 680 | # CONFIG_B44 is not set |
| 639 | CONFIG_FEC_MPC52xx=y | 681 | CONFIG_FEC_MPC52xx=y |
| 640 | CONFIG_FEC_MPC52xx_MDIO=y | 682 | CONFIG_FEC_MPC52xx_MDIO=y |
| 683 | # CONFIG_ATL2 is not set | ||
| 641 | # CONFIG_NETDEV_1000 is not set | 684 | # CONFIG_NETDEV_1000 is not set |
| 642 | # CONFIG_NETDEV_10000 is not set | 685 | # CONFIG_NETDEV_10000 is not set |
| 643 | # CONFIG_TR is not set | 686 | # CONFIG_TR is not set |
| @@ -647,6 +690,7 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 647 | # | 690 | # |
| 648 | # CONFIG_WLAN_PRE80211 is not set | 691 | # CONFIG_WLAN_PRE80211 is not set |
| 649 | # CONFIG_WLAN_80211 is not set | 692 | # CONFIG_WLAN_80211 is not set |
| 693 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 650 | 694 | ||
| 651 | # | 695 | # |
| 652 | # USB Network Adapters | 696 | # USB Network Adapters |
| @@ -662,7 +706,6 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 662 | # CONFIG_PPP is not set | 706 | # CONFIG_PPP is not set |
| 663 | # CONFIG_SLIP is not set | 707 | # CONFIG_SLIP is not set |
| 664 | # CONFIG_NET_FC is not set | 708 | # CONFIG_NET_FC is not set |
| 665 | # CONFIG_SHAPER is not set | ||
| 666 | # CONFIG_NETCONSOLE is not set | 709 | # CONFIG_NETCONSOLE is not set |
| 667 | # CONFIG_NETPOLL is not set | 710 | # CONFIG_NETPOLL is not set |
| 668 | # CONFIG_NET_POLL_CONTROLLER is not set | 711 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -672,7 +715,30 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 672 | # | 715 | # |
| 673 | # Input device support | 716 | # Input device support |
| 674 | # | 717 | # |
| 675 | # CONFIG_INPUT is not set | 718 | CONFIG_INPUT=y |
| 719 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 720 | # CONFIG_INPUT_POLLDEV is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # Userland interfaces | ||
| 724 | # | ||
| 725 | CONFIG_INPUT_MOUSEDEV=y | ||
| 726 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 727 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 728 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 729 | # CONFIG_INPUT_JOYDEV is not set | ||
| 730 | # CONFIG_INPUT_EVDEV is not set | ||
| 731 | # CONFIG_INPUT_EVBUG is not set | ||
| 732 | |||
| 733 | # | ||
| 734 | # Input Device Drivers | ||
| 735 | # | ||
| 736 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 737 | # CONFIG_INPUT_MOUSE is not set | ||
| 738 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 739 | # CONFIG_INPUT_TABLET is not set | ||
| 740 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 741 | # CONFIG_INPUT_MISC is not set | ||
| 676 | 742 | ||
| 677 | # | 743 | # |
| 678 | # Hardware I/O ports | 744 | # Hardware I/O ports |
| @@ -683,8 +749,14 @@ CONFIG_FEC_MPC52xx_MDIO=y | |||
| 683 | # | 749 | # |
| 684 | # Character devices | 750 | # Character devices |
| 685 | # | 751 | # |
| 686 | # CONFIG_VT is not set | 752 | CONFIG_VT=y |
| 753 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
| 754 | CONFIG_VT_CONSOLE=y | ||
| 755 | CONFIG_HW_CONSOLE=y | ||
| 756 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 757 | CONFIG_DEVKMEM=y | ||
| 687 | # CONFIG_SERIAL_NONSTANDARD is not set | 758 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 759 | # CONFIG_NOZOMI is not set | ||
| 688 | 760 | ||
| 689 | # | 761 | # |
| 690 | # Serial drivers | 762 | # Serial drivers |
| @@ -718,16 +790,15 @@ CONFIG_DEVPORT=y | |||
| 718 | CONFIG_I2C=y | 790 | CONFIG_I2C=y |
| 719 | CONFIG_I2C_BOARDINFO=y | 791 | CONFIG_I2C_BOARDINFO=y |
| 720 | CONFIG_I2C_CHARDEV=y | 792 | CONFIG_I2C_CHARDEV=y |
| 793 | CONFIG_I2C_HELPER_AUTO=y | ||
| 794 | CONFIG_I2C_ALGOBIT=y | ||
| 721 | 795 | ||
| 722 | # | 796 | # |
| 723 | # I2C Algorithms | 797 | # I2C Hardware Bus support |
| 724 | # | 798 | # |
| 725 | # CONFIG_I2C_ALGOBIT is not set | ||
| 726 | # CONFIG_I2C_ALGOPCF is not set | ||
| 727 | # CONFIG_I2C_ALGOPCA is not set | ||
| 728 | 799 | ||
| 729 | # | 800 | # |
| 730 | # I2C Hardware Bus support | 801 | # PC SMBus host controller drivers |
| 731 | # | 802 | # |
| 732 | # CONFIG_I2C_ALI1535 is not set | 803 | # CONFIG_I2C_ALI1535 is not set |
| 733 | # CONFIG_I2C_ALI1563 is not set | 804 | # CONFIG_I2C_ALI1563 is not set |
| @@ -735,52 +806,64 @@ CONFIG_I2C_CHARDEV=y | |||
| 735 | # CONFIG_I2C_AMD756 is not set | 806 | # CONFIG_I2C_AMD756 is not set |
| 736 | # CONFIG_I2C_AMD8111 is not set | 807 | # CONFIG_I2C_AMD8111 is not set |
| 737 | # CONFIG_I2C_I801 is not set | 808 | # CONFIG_I2C_I801 is not set |
| 738 | # CONFIG_I2C_I810 is not set | 809 | # CONFIG_I2C_ISCH is not set |
| 739 | # CONFIG_I2C_PIIX4 is not set | 810 | # CONFIG_I2C_PIIX4 is not set |
| 740 | CONFIG_I2C_MPC=y | ||
| 741 | # CONFIG_I2C_NFORCE2 is not set | 811 | # CONFIG_I2C_NFORCE2 is not set |
| 742 | # CONFIG_I2C_OCORES is not set | ||
| 743 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 744 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 745 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 746 | # CONFIG_I2C_SIMTEC is not set | ||
| 747 | # CONFIG_I2C_SIS5595 is not set | 812 | # CONFIG_I2C_SIS5595 is not set |
| 748 | # CONFIG_I2C_SIS630 is not set | 813 | # CONFIG_I2C_SIS630 is not set |
| 749 | # CONFIG_I2C_SIS96X is not set | 814 | # CONFIG_I2C_SIS96X is not set |
| 750 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 751 | # CONFIG_I2C_STUB is not set | ||
| 752 | # CONFIG_I2C_TINY_USB is not set | ||
| 753 | # CONFIG_I2C_VIA is not set | 815 | # CONFIG_I2C_VIA is not set |
| 754 | # CONFIG_I2C_VIAPRO is not set | 816 | # CONFIG_I2C_VIAPRO is not set |
| 817 | |||
| 818 | # | ||
| 819 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
| 820 | # | ||
| 821 | CONFIG_I2C_MPC=y | ||
| 822 | # CONFIG_I2C_OCORES is not set | ||
| 823 | # CONFIG_I2C_SIMTEC is not set | ||
| 824 | |||
| 825 | # | ||
| 826 | # External I2C/SMBus adapter drivers | ||
| 827 | # | ||
| 828 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 829 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 830 | # CONFIG_I2C_TINY_USB is not set | ||
| 831 | |||
| 832 | # | ||
| 833 | # Graphics adapter I2C/DDC channel drivers | ||
| 834 | # | ||
| 755 | # CONFIG_I2C_VOODOO3 is not set | 835 | # CONFIG_I2C_VOODOO3 is not set |
| 756 | 836 | ||
| 757 | # | 837 | # |
| 838 | # Other I2C/SMBus bus drivers | ||
| 839 | # | ||
| 840 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 841 | # CONFIG_I2C_STUB is not set | ||
| 842 | |||
| 843 | # | ||
| 758 | # Miscellaneous I2C Chip support | 844 | # Miscellaneous I2C Chip support |
| 759 | # | 845 | # |
| 760 | # CONFIG_SENSORS_DS1337 is not set | ||
| 761 | # CONFIG_SENSORS_DS1374 is not set | ||
| 762 | # CONFIG_DS1682 is not set | 846 | # CONFIG_DS1682 is not set |
| 847 | # CONFIG_AT24 is not set | ||
| 763 | # CONFIG_SENSORS_EEPROM is not set | 848 | # CONFIG_SENSORS_EEPROM is not set |
| 764 | # CONFIG_SENSORS_PCF8574 is not set | 849 | # CONFIG_SENSORS_PCF8574 is not set |
| 850 | # CONFIG_PCF8575 is not set | ||
| 765 | # CONFIG_SENSORS_PCA9539 is not set | 851 | # CONFIG_SENSORS_PCA9539 is not set |
| 766 | # CONFIG_SENSORS_PCF8591 is not set | 852 | # CONFIG_SENSORS_PCF8591 is not set |
| 767 | # CONFIG_SENSORS_M41T00 is not set | ||
| 768 | # CONFIG_SENSORS_MAX6875 is not set | 853 | # CONFIG_SENSORS_MAX6875 is not set |
| 769 | # CONFIG_SENSORS_TSL2550 is not set | 854 | # CONFIG_SENSORS_TSL2550 is not set |
| 770 | # CONFIG_I2C_DEBUG_CORE is not set | 855 | # CONFIG_I2C_DEBUG_CORE is not set |
| 771 | # CONFIG_I2C_DEBUG_ALGO is not set | 856 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 772 | # CONFIG_I2C_DEBUG_BUS is not set | 857 | # CONFIG_I2C_DEBUG_BUS is not set |
| 773 | # CONFIG_I2C_DEBUG_CHIP is not set | 858 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 774 | |||
| 775 | # | ||
| 776 | # SPI support | ||
| 777 | # | ||
| 778 | # CONFIG_SPI is not set | 859 | # CONFIG_SPI is not set |
| 779 | # CONFIG_SPI_MASTER is not set | 860 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
| 861 | # CONFIG_GPIOLIB is not set | ||
| 780 | # CONFIG_W1 is not set | 862 | # CONFIG_W1 is not set |
| 781 | # CONFIG_POWER_SUPPLY is not set | 863 | # CONFIG_POWER_SUPPLY is not set |
| 782 | CONFIG_HWMON=y | 864 | CONFIG_HWMON=y |
| 783 | # CONFIG_HWMON_VID is not set | 865 | # CONFIG_HWMON_VID is not set |
| 866 | # CONFIG_SENSORS_AD7414 is not set | ||
| 784 | # CONFIG_SENSORS_AD7418 is not set | 867 | # CONFIG_SENSORS_AD7418 is not set |
| 785 | # CONFIG_SENSORS_ADM1021 is not set | 868 | # CONFIG_SENSORS_ADM1021 is not set |
| 786 | # CONFIG_SENSORS_ADM1025 is not set | 869 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -788,7 +871,9 @@ CONFIG_HWMON=y | |||
| 788 | # CONFIG_SENSORS_ADM1029 is not set | 871 | # CONFIG_SENSORS_ADM1029 is not set |
| 789 | # CONFIG_SENSORS_ADM1031 is not set | 872 | # CONFIG_SENSORS_ADM1031 is not set |
| 790 | # CONFIG_SENSORS_ADM9240 is not set | 873 | # CONFIG_SENSORS_ADM9240 is not set |
| 874 | # CONFIG_SENSORS_ADT7462 is not set | ||
| 791 | # CONFIG_SENSORS_ADT7470 is not set | 875 | # CONFIG_SENSORS_ADT7470 is not set |
| 876 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 792 | # CONFIG_SENSORS_ATXP1 is not set | 877 | # CONFIG_SENSORS_ATXP1 is not set |
| 793 | # CONFIG_SENSORS_DS1621 is not set | 878 | # CONFIG_SENSORS_DS1621 is not set |
| 794 | # CONFIG_SENSORS_I5K_AMB is not set | 879 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -818,6 +903,7 @@ CONFIG_HWMON=y | |||
| 818 | # CONFIG_SENSORS_SMSC47M1 is not set | 903 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 819 | # CONFIG_SENSORS_SMSC47M192 is not set | 904 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 820 | # CONFIG_SENSORS_SMSC47B397 is not set | 905 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 906 | # CONFIG_SENSORS_ADS7828 is not set | ||
| 821 | # CONFIG_SENSORS_THMC50 is not set | 907 | # CONFIG_SENSORS_THMC50 is not set |
| 822 | # CONFIG_SENSORS_VIA686A is not set | 908 | # CONFIG_SENSORS_VIA686A is not set |
| 823 | # CONFIG_SENSORS_VT1211 is not set | 909 | # CONFIG_SENSORS_VT1211 is not set |
| @@ -827,9 +913,12 @@ CONFIG_HWMON=y | |||
| 827 | # CONFIG_SENSORS_W83792D is not set | 913 | # CONFIG_SENSORS_W83792D is not set |
| 828 | # CONFIG_SENSORS_W83793 is not set | 914 | # CONFIG_SENSORS_W83793 is not set |
| 829 | # CONFIG_SENSORS_W83L785TS is not set | 915 | # CONFIG_SENSORS_W83L785TS is not set |
| 916 | # CONFIG_SENSORS_W83L786NG is not set | ||
| 830 | # CONFIG_SENSORS_W83627HF is not set | 917 | # CONFIG_SENSORS_W83627HF is not set |
| 831 | # CONFIG_SENSORS_W83627EHF is not set | 918 | # CONFIG_SENSORS_W83627EHF is not set |
| 832 | # CONFIG_HWMON_DEBUG_CHIP is not set | 919 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 920 | # CONFIG_THERMAL is not set | ||
| 921 | # CONFIG_THERMAL_HWMON is not set | ||
| 833 | CONFIG_WATCHDOG=y | 922 | CONFIG_WATCHDOG=y |
| 834 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 923 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 835 | 924 | ||
| @@ -837,6 +926,7 @@ CONFIG_WATCHDOG=y | |||
| 837 | # Watchdog Device Drivers | 926 | # Watchdog Device Drivers |
| 838 | # | 927 | # |
| 839 | # CONFIG_SOFT_WATCHDOG is not set | 928 | # CONFIG_SOFT_WATCHDOG is not set |
| 929 | # CONFIG_ALIM7101_WDT is not set | ||
| 840 | # CONFIG_MPC5200_WDT is not set | 930 | # CONFIG_MPC5200_WDT is not set |
| 841 | # CONFIG_WATCHDOG_RTAS is not set | 931 | # CONFIG_WATCHDOG_RTAS is not set |
| 842 | 932 | ||
| @@ -850,23 +940,39 @@ CONFIG_WATCHDOG=y | |||
| 850 | # USB-based Watchdog Cards | 940 | # USB-based Watchdog Cards |
| 851 | # | 941 | # |
| 852 | # CONFIG_USBPCWATCHDOG is not set | 942 | # CONFIG_USBPCWATCHDOG is not set |
| 943 | CONFIG_SSB_POSSIBLE=y | ||
| 853 | 944 | ||
| 854 | # | 945 | # |
| 855 | # Sonics Silicon Backplane | 946 | # Sonics Silicon Backplane |
| 856 | # | 947 | # |
| 857 | CONFIG_SSB_POSSIBLE=y | ||
| 858 | # CONFIG_SSB is not set | 948 | # CONFIG_SSB is not set |
| 859 | 949 | ||
| 860 | # | 950 | # |
| 861 | # Multifunction device drivers | 951 | # Multifunction device drivers |
| 862 | # | 952 | # |
| 953 | # CONFIG_MFD_CORE is not set | ||
| 863 | # CONFIG_MFD_SM501 is not set | 954 | # CONFIG_MFD_SM501 is not set |
| 955 | # CONFIG_HTC_PASIC3 is not set | ||
| 956 | # CONFIG_MFD_TMIO is not set | ||
| 957 | # CONFIG_PMIC_DA903X is not set | ||
| 958 | # CONFIG_MFD_WM8400 is not set | ||
| 959 | # CONFIG_MFD_WM8350_I2C is not set | ||
| 960 | # CONFIG_REGULATOR is not set | ||
| 864 | 961 | ||
| 865 | # | 962 | # |
| 866 | # Multimedia devices | 963 | # Multimedia devices |
| 867 | # | 964 | # |
| 965 | |||
| 966 | # | ||
| 967 | # Multimedia core support | ||
| 968 | # | ||
| 868 | # CONFIG_VIDEO_DEV is not set | 969 | # CONFIG_VIDEO_DEV is not set |
| 869 | # CONFIG_DVB_CORE is not set | 970 | # CONFIG_DVB_CORE is not set |
| 971 | # CONFIG_VIDEO_MEDIA is not set | ||
| 972 | |||
| 973 | # | ||
| 974 | # Multimedia drivers | ||
| 975 | # | ||
| 870 | CONFIG_DAB=y | 976 | CONFIG_DAB=y |
| 871 | # CONFIG_USB_DABUSB is not set | 977 | # CONFIG_USB_DABUSB is not set |
| 872 | 978 | ||
| @@ -874,11 +980,78 @@ CONFIG_DAB=y | |||
| 874 | # Graphics support | 980 | # Graphics support |
| 875 | # | 981 | # |
| 876 | # CONFIG_AGP is not set | 982 | # CONFIG_AGP is not set |
| 877 | # CONFIG_DRM is not set | 983 | CONFIG_DRM=y |
| 984 | # CONFIG_DRM_TDFX is not set | ||
| 985 | # CONFIG_DRM_R128 is not set | ||
| 986 | # CONFIG_DRM_RADEON is not set | ||
| 987 | # CONFIG_DRM_MGA is not set | ||
| 988 | # CONFIG_DRM_VIA is not set | ||
| 989 | # CONFIG_DRM_SAVAGE is not set | ||
| 878 | # CONFIG_VGASTATE is not set | 990 | # CONFIG_VGASTATE is not set |
| 879 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 991 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| 880 | # CONFIG_FB is not set | 992 | CONFIG_FB=y |
| 881 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 993 | # CONFIG_FIRMWARE_EDID is not set |
| 994 | CONFIG_FB_DDC=y | ||
| 995 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 996 | CONFIG_FB_CFB_FILLRECT=y | ||
| 997 | CONFIG_FB_CFB_COPYAREA=y | ||
| 998 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 999 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 1000 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 1001 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 1002 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 1003 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1004 | # CONFIG_FB_SYS_FOPS is not set | ||
| 1005 | # CONFIG_FB_SVGALIB is not set | ||
| 1006 | CONFIG_FB_MACMODES=y | ||
| 1007 | CONFIG_FB_BACKLIGHT=y | ||
| 1008 | CONFIG_FB_MODE_HELPERS=y | ||
| 1009 | # CONFIG_FB_TILEBLITTING is not set | ||
| 1010 | |||
| 1011 | # | ||
| 1012 | # Frame buffer hardware drivers | ||
| 1013 | # | ||
| 1014 | # CONFIG_FB_CIRRUS is not set | ||
| 1015 | # CONFIG_FB_PM2 is not set | ||
| 1016 | # CONFIG_FB_CYBER2000 is not set | ||
| 1017 | # CONFIG_FB_OF is not set | ||
| 1018 | # CONFIG_FB_CT65550 is not set | ||
| 1019 | # CONFIG_FB_ASILIANT is not set | ||
| 1020 | # CONFIG_FB_IMSTT is not set | ||
| 1021 | # CONFIG_FB_VGA16 is not set | ||
| 1022 | # CONFIG_FB_S1D13XXX is not set | ||
| 1023 | # CONFIG_FB_NVIDIA is not set | ||
| 1024 | # CONFIG_FB_RIVA is not set | ||
| 1025 | # CONFIG_FB_MATROX is not set | ||
| 1026 | CONFIG_FB_RADEON=y | ||
| 1027 | CONFIG_FB_RADEON_I2C=y | ||
| 1028 | CONFIG_FB_RADEON_BACKLIGHT=y | ||
| 1029 | # CONFIG_FB_RADEON_DEBUG is not set | ||
| 1030 | # CONFIG_FB_ATY128 is not set | ||
| 1031 | # CONFIG_FB_ATY is not set | ||
| 1032 | # CONFIG_FB_S3 is not set | ||
| 1033 | # CONFIG_FB_SAVAGE is not set | ||
| 1034 | # CONFIG_FB_SIS is not set | ||
| 1035 | # CONFIG_FB_VIA is not set | ||
| 1036 | # CONFIG_FB_NEOMAGIC is not set | ||
| 1037 | # CONFIG_FB_KYRO is not set | ||
| 1038 | # CONFIG_FB_3DFX is not set | ||
| 1039 | # CONFIG_FB_VOODOO1 is not set | ||
| 1040 | # CONFIG_FB_VT8623 is not set | ||
| 1041 | # CONFIG_FB_TRIDENT is not set | ||
| 1042 | # CONFIG_FB_ARK is not set | ||
| 1043 | # CONFIG_FB_PM3 is not set | ||
| 1044 | # CONFIG_FB_CARMINE is not set | ||
| 1045 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 1046 | # CONFIG_FB_VIRTUAL is not set | ||
| 1047 | # CONFIG_FB_METRONOME is not set | ||
| 1048 | # CONFIG_FB_MB862XX is not set | ||
| 1049 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| 1050 | CONFIG_LCD_CLASS_DEVICE=m | ||
| 1051 | # CONFIG_LCD_ILI9320 is not set | ||
| 1052 | # CONFIG_LCD_PLATFORM is not set | ||
| 1053 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1054 | # CONFIG_BACKLIGHT_CORGI is not set | ||
| 882 | 1055 | ||
| 883 | # | 1056 | # |
| 884 | # Display device support | 1057 | # Display device support |
| @@ -886,15 +1059,64 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
| 886 | # CONFIG_DISPLAY_SUPPORT is not set | 1059 | # CONFIG_DISPLAY_SUPPORT is not set |
| 887 | 1060 | ||
| 888 | # | 1061 | # |
| 889 | # Sound | 1062 | # Console display driver support |
| 890 | # | 1063 | # |
| 1064 | # CONFIG_VGA_CONSOLE is not set | ||
| 1065 | CONFIG_DUMMY_CONSOLE=y | ||
| 1066 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
| 1067 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1068 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 1069 | # CONFIG_FONTS is not set | ||
| 1070 | CONFIG_FONT_8x8=y | ||
| 1071 | CONFIG_FONT_8x16=y | ||
| 1072 | CONFIG_LOGO=y | ||
| 1073 | CONFIG_LOGO_LINUX_MONO=y | ||
| 1074 | CONFIG_LOGO_LINUX_VGA16=y | ||
| 1075 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 891 | # CONFIG_SOUND is not set | 1076 | # CONFIG_SOUND is not set |
| 1077 | CONFIG_HID_SUPPORT=y | ||
| 1078 | CONFIG_HID=y | ||
| 1079 | # CONFIG_HID_DEBUG is not set | ||
| 1080 | # CONFIG_HIDRAW is not set | ||
| 1081 | |||
| 1082 | # | ||
| 1083 | # USB Input Devices | ||
| 1084 | # | ||
| 1085 | CONFIG_USB_HID=y | ||
| 1086 | # CONFIG_HID_PID is not set | ||
| 1087 | # CONFIG_USB_HIDDEV is not set | ||
| 1088 | |||
| 1089 | # | ||
| 1090 | # Special HID drivers | ||
| 1091 | # | ||
| 1092 | CONFIG_HID_COMPAT=y | ||
| 1093 | CONFIG_HID_A4TECH=y | ||
| 1094 | # CONFIG_HID_APPLE is not set | ||
| 1095 | CONFIG_HID_BELKIN=y | ||
| 1096 | CONFIG_HID_BRIGHT=y | ||
| 1097 | CONFIG_HID_CHERRY=y | ||
| 1098 | # CONFIG_HID_CHICONY is not set | ||
| 1099 | CONFIG_HID_CYPRESS=y | ||
| 1100 | CONFIG_HID_DELL=y | ||
| 1101 | CONFIG_HID_EZKEY=y | ||
| 1102 | # CONFIG_HID_GYRATION is not set | ||
| 1103 | # CONFIG_HID_LOGITECH is not set | ||
| 1104 | # CONFIG_HID_MICROSOFT is not set | ||
| 1105 | # CONFIG_HID_MONTEREY is not set | ||
| 1106 | # CONFIG_HID_PANTHERLORD is not set | ||
| 1107 | # CONFIG_HID_PETALYNX is not set | ||
| 1108 | # CONFIG_HID_SAMSUNG is not set | ||
| 1109 | # CONFIG_HID_SONY is not set | ||
| 1110 | # CONFIG_HID_SUNPLUS is not set | ||
| 1111 | # CONFIG_THRUSTMASTER_FF is not set | ||
| 1112 | # CONFIG_ZEROPLUS_FF is not set | ||
| 892 | CONFIG_USB_SUPPORT=y | 1113 | CONFIG_USB_SUPPORT=y |
| 893 | CONFIG_USB_ARCH_HAS_HCD=y | 1114 | CONFIG_USB_ARCH_HAS_HCD=y |
| 894 | CONFIG_USB_ARCH_HAS_OHCI=y | 1115 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 895 | CONFIG_USB_ARCH_HAS_EHCI=y | 1116 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 896 | CONFIG_USB=y | 1117 | CONFIG_USB=y |
| 897 | # CONFIG_USB_DEBUG is not set | 1118 | # CONFIG_USB_DEBUG is not set |
| 1119 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 898 | 1120 | ||
| 899 | # | 1121 | # |
| 900 | # Miscellaneous USB options | 1122 | # Miscellaneous USB options |
| @@ -903,14 +1125,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 903 | # CONFIG_USB_DEVICE_CLASS is not set | 1125 | # CONFIG_USB_DEVICE_CLASS is not set |
| 904 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1126 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 905 | # CONFIG_USB_SUSPEND is not set | 1127 | # CONFIG_USB_SUSPEND is not set |
| 906 | # CONFIG_USB_PERSIST is not set | ||
| 907 | # CONFIG_USB_OTG is not set | 1128 | # CONFIG_USB_OTG is not set |
| 1129 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1130 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1131 | CONFIG_USB_MON=y | ||
| 1132 | # CONFIG_USB_WUSB is not set | ||
| 1133 | # CONFIG_USB_WUSB_CBAF is not set | ||
| 908 | 1134 | ||
| 909 | # | 1135 | # |
| 910 | # USB Host Controller Drivers | 1136 | # USB Host Controller Drivers |
| 911 | # | 1137 | # |
| 1138 | # CONFIG_USB_C67X00_HCD is not set | ||
| 912 | # CONFIG_USB_EHCI_HCD is not set | 1139 | # CONFIG_USB_EHCI_HCD is not set |
| 913 | # CONFIG_USB_ISP116X_HCD is not set | 1140 | # CONFIG_USB_ISP116X_HCD is not set |
| 1141 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 914 | CONFIG_USB_OHCI_HCD=y | 1142 | CONFIG_USB_OHCI_HCD=y |
| 915 | CONFIG_USB_OHCI_HCD_PPC_SOC=y | 1143 | CONFIG_USB_OHCI_HCD_PPC_SOC=y |
| 916 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1144 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| @@ -923,12 +1151,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 923 | # CONFIG_USB_UHCI_HCD is not set | 1151 | # CONFIG_USB_UHCI_HCD is not set |
| 924 | # CONFIG_USB_SL811_HCD is not set | 1152 | # CONFIG_USB_SL811_HCD is not set |
| 925 | # CONFIG_USB_R8A66597_HCD is not set | 1153 | # CONFIG_USB_R8A66597_HCD is not set |
| 1154 | # CONFIG_USB_WHCI_HCD is not set | ||
| 1155 | # CONFIG_USB_HWA_HCD is not set | ||
| 1156 | # CONFIG_USB_MUSB_HDRC is not set | ||
| 926 | 1157 | ||
| 927 | # | 1158 | # |
| 928 | # USB Device Class drivers | 1159 | # USB Device Class drivers |
| 929 | # | 1160 | # |
| 930 | # CONFIG_USB_ACM is not set | 1161 | # CONFIG_USB_ACM is not set |
| 931 | # CONFIG_USB_PRINTER is not set | 1162 | # CONFIG_USB_PRINTER is not set |
| 1163 | # CONFIG_USB_WDM is not set | ||
| 1164 | # CONFIG_USB_TMC is not set | ||
| 932 | 1165 | ||
| 933 | # | 1166 | # |
| 934 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1167 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -948,7 +1181,9 @@ CONFIG_USB_STORAGE=y | |||
| 948 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1181 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 949 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1182 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 950 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1183 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1184 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 951 | # CONFIG_USB_STORAGE_KARMA is not set | 1185 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1186 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 952 | # CONFIG_USB_LIBUSUAL is not set | 1187 | # CONFIG_USB_LIBUSUAL is not set |
| 953 | 1188 | ||
| 954 | # | 1189 | # |
| @@ -956,15 +1191,10 @@ CONFIG_USB_STORAGE=y | |||
| 956 | # | 1191 | # |
| 957 | # CONFIG_USB_MDC800 is not set | 1192 | # CONFIG_USB_MDC800 is not set |
| 958 | # CONFIG_USB_MICROTEK is not set | 1193 | # CONFIG_USB_MICROTEK is not set |
| 959 | CONFIG_USB_MON=y | ||
| 960 | 1194 | ||
| 961 | # | 1195 | # |
| 962 | # USB port drivers | 1196 | # USB port drivers |
| 963 | # | 1197 | # |
| 964 | |||
| 965 | # | ||
| 966 | # USB Serial Converter support | ||
| 967 | # | ||
| 968 | # CONFIG_USB_SERIAL is not set | 1198 | # CONFIG_USB_SERIAL is not set |
| 969 | 1199 | ||
| 970 | # | 1200 | # |
| @@ -973,7 +1203,7 @@ CONFIG_USB_MON=y | |||
| 973 | # CONFIG_USB_EMI62 is not set | 1203 | # CONFIG_USB_EMI62 is not set |
| 974 | # CONFIG_USB_EMI26 is not set | 1204 | # CONFIG_USB_EMI26 is not set |
| 975 | # CONFIG_USB_ADUTUX is not set | 1205 | # CONFIG_USB_ADUTUX is not set |
| 976 | # CONFIG_USB_AUERSWALD is not set | 1206 | # CONFIG_USB_SEVSEG is not set |
| 977 | # CONFIG_USB_RIO500 is not set | 1207 | # CONFIG_USB_RIO500 is not set |
| 978 | # CONFIG_USB_LEGOTOWER is not set | 1208 | # CONFIG_USB_LEGOTOWER is not set |
| 979 | # CONFIG_USB_LCD is not set | 1209 | # CONFIG_USB_LCD is not set |
| @@ -989,18 +1219,14 @@ CONFIG_USB_MON=y | |||
| 989 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1219 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 990 | # CONFIG_USB_IOWARRIOR is not set | 1220 | # CONFIG_USB_IOWARRIOR is not set |
| 991 | # CONFIG_USB_TEST is not set | 1221 | # CONFIG_USB_TEST is not set |
| 992 | 1222 | # CONFIG_USB_ISIGHTFW is not set | |
| 993 | # | 1223 | # CONFIG_USB_VST is not set |
| 994 | # USB DSL modem support | ||
| 995 | # | ||
| 996 | |||
| 997 | # | ||
| 998 | # USB Gadget Support | ||
| 999 | # | ||
| 1000 | # CONFIG_USB_GADGET is not set | 1224 | # CONFIG_USB_GADGET is not set |
| 1225 | # CONFIG_UWB is not set | ||
| 1001 | # CONFIG_MMC is not set | 1226 | # CONFIG_MMC is not set |
| 1227 | # CONFIG_MEMSTICK is not set | ||
| 1002 | CONFIG_NEW_LEDS=y | 1228 | CONFIG_NEW_LEDS=y |
| 1003 | CONFIG_LEDS_CLASS=y | 1229 | # CONFIG_LEDS_CLASS is not set |
| 1004 | 1230 | ||
| 1005 | # | 1231 | # |
| 1006 | # LED drivers | 1232 | # LED drivers |
| @@ -1009,17 +1235,15 @@ CONFIG_LEDS_CLASS=y | |||
| 1009 | # | 1235 | # |
| 1010 | # LED Triggers | 1236 | # LED Triggers |
| 1011 | # | 1237 | # |
| 1012 | CONFIG_LEDS_TRIGGERS=y | 1238 | # CONFIG_LEDS_TRIGGERS is not set |
| 1013 | CONFIG_LEDS_TRIGGER_TIMER=y | 1239 | # CONFIG_ACCESSIBILITY is not set |
| 1014 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | ||
| 1015 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
| 1016 | # CONFIG_EDAC is not set | 1241 | # CONFIG_EDAC is not set |
| 1017 | # CONFIG_RTC_CLASS is not set | 1242 | # CONFIG_RTC_CLASS is not set |
| 1018 | 1243 | # CONFIG_DMADEVICES is not set | |
| 1019 | # | ||
| 1020 | # Userspace I/O | ||
| 1021 | # | ||
| 1022 | # CONFIG_UIO is not set | 1244 | # CONFIG_UIO is not set |
| 1245 | # CONFIG_STAGING is not set | ||
| 1246 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 1023 | 1247 | ||
| 1024 | # | 1248 | # |
| 1025 | # File systems | 1249 | # File systems |
| @@ -1031,21 +1255,19 @@ CONFIG_EXT3_FS=y | |||
| 1031 | CONFIG_EXT3_FS_XATTR=y | 1255 | CONFIG_EXT3_FS_XATTR=y |
| 1032 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1256 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 1033 | # CONFIG_EXT3_FS_SECURITY is not set | 1257 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1034 | # CONFIG_EXT4DEV_FS is not set | 1258 | # CONFIG_EXT4_FS is not set |
| 1035 | CONFIG_JBD=y | 1259 | CONFIG_JBD=y |
| 1036 | CONFIG_FS_MBCACHE=y | 1260 | CONFIG_FS_MBCACHE=y |
| 1037 | # CONFIG_REISERFS_FS is not set | 1261 | # CONFIG_REISERFS_FS is not set |
| 1038 | # CONFIG_JFS_FS is not set | 1262 | # CONFIG_JFS_FS is not set |
| 1039 | # CONFIG_FS_POSIX_ACL is not set | 1263 | # CONFIG_FS_POSIX_ACL is not set |
| 1264 | CONFIG_FILE_LOCKING=y | ||
| 1040 | # CONFIG_XFS_FS is not set | 1265 | # CONFIG_XFS_FS is not set |
| 1041 | # CONFIG_GFS2_FS is not set | ||
| 1042 | # CONFIG_OCFS2_FS is not set | 1266 | # CONFIG_OCFS2_FS is not set |
| 1043 | # CONFIG_MINIX_FS is not set | 1267 | CONFIG_DNOTIFY=y |
| 1044 | # CONFIG_ROMFS_FS is not set | ||
| 1045 | CONFIG_INOTIFY=y | 1268 | CONFIG_INOTIFY=y |
| 1046 | CONFIG_INOTIFY_USER=y | 1269 | CONFIG_INOTIFY_USER=y |
| 1047 | # CONFIG_QUOTA is not set | 1270 | # CONFIG_QUOTA is not set |
| 1048 | CONFIG_DNOTIFY=y | ||
| 1049 | # CONFIG_AUTOFS_FS is not set | 1271 | # CONFIG_AUTOFS_FS is not set |
| 1050 | # CONFIG_AUTOFS4_FS is not set | 1272 | # CONFIG_AUTOFS4_FS is not set |
| 1051 | # CONFIG_FUSE_FS is not set | 1273 | # CONFIG_FUSE_FS is not set |
| @@ -1072,6 +1294,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1072 | CONFIG_PROC_FS=y | 1294 | CONFIG_PROC_FS=y |
| 1073 | CONFIG_PROC_KCORE=y | 1295 | CONFIG_PROC_KCORE=y |
| 1074 | CONFIG_PROC_SYSCTL=y | 1296 | CONFIG_PROC_SYSCTL=y |
| 1297 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 1075 | CONFIG_SYSFS=y | 1298 | CONFIG_SYSFS=y |
| 1076 | CONFIG_TMPFS=y | 1299 | CONFIG_TMPFS=y |
| 1077 | # CONFIG_TMPFS_POSIX_ACL is not set | 1300 | # CONFIG_TMPFS_POSIX_ACL is not set |
| @@ -1101,8 +1324,11 @@ CONFIG_JFFS2_RTIME=y | |||
| 1101 | # CONFIG_JFFS2_RUBIN is not set | 1324 | # CONFIG_JFFS2_RUBIN is not set |
| 1102 | CONFIG_CRAMFS=y | 1325 | CONFIG_CRAMFS=y |
| 1103 | # CONFIG_VXFS_FS is not set | 1326 | # CONFIG_VXFS_FS is not set |
| 1327 | # CONFIG_MINIX_FS is not set | ||
| 1328 | # CONFIG_OMFS_FS is not set | ||
| 1104 | # CONFIG_HPFS_FS is not set | 1329 | # CONFIG_HPFS_FS is not set |
| 1105 | # CONFIG_QNX4FS_FS is not set | 1330 | # CONFIG_QNX4FS_FS is not set |
| 1331 | # CONFIG_ROMFS_FS is not set | ||
| 1106 | # CONFIG_SYSV_FS is not set | 1332 | # CONFIG_SYSV_FS is not set |
| 1107 | # CONFIG_UFS_FS is not set | 1333 | # CONFIG_UFS_FS is not set |
| 1108 | CONFIG_NETWORK_FILESYSTEMS=y | 1334 | CONFIG_NETWORK_FILESYSTEMS=y |
| @@ -1110,15 +1336,14 @@ CONFIG_NFS_FS=y | |||
| 1110 | CONFIG_NFS_V3=y | 1336 | CONFIG_NFS_V3=y |
| 1111 | # CONFIG_NFS_V3_ACL is not set | 1337 | # CONFIG_NFS_V3_ACL is not set |
| 1112 | CONFIG_NFS_V4=y | 1338 | CONFIG_NFS_V4=y |
| 1113 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1114 | # CONFIG_NFSD is not set | ||
| 1115 | CONFIG_ROOT_NFS=y | 1339 | CONFIG_ROOT_NFS=y |
| 1340 | # CONFIG_NFSD is not set | ||
| 1116 | CONFIG_LOCKD=y | 1341 | CONFIG_LOCKD=y |
| 1117 | CONFIG_LOCKD_V4=y | 1342 | CONFIG_LOCKD_V4=y |
| 1118 | CONFIG_NFS_COMMON=y | 1343 | CONFIG_NFS_COMMON=y |
| 1119 | CONFIG_SUNRPC=y | 1344 | CONFIG_SUNRPC=y |
| 1120 | CONFIG_SUNRPC_GSS=y | 1345 | CONFIG_SUNRPC_GSS=y |
| 1121 | # CONFIG_SUNRPC_BIND34 is not set | 1346 | # CONFIG_SUNRPC_REGISTER_V4 is not set |
| 1122 | CONFIG_RPCSEC_GSS_KRB5=y | 1347 | CONFIG_RPCSEC_GSS_KRB5=y |
| 1123 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1348 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1124 | # CONFIG_SMB_FS is not set | 1349 | # CONFIG_SMB_FS is not set |
| @@ -1173,7 +1398,6 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1173 | # CONFIG_NLS_KOI8_U is not set | 1398 | # CONFIG_NLS_KOI8_U is not set |
| 1174 | # CONFIG_NLS_UTF8 is not set | 1399 | # CONFIG_NLS_UTF8 is not set |
| 1175 | # CONFIG_DLM is not set | 1400 | # CONFIG_DLM is not set |
| 1176 | # CONFIG_UCC_SLOW is not set | ||
| 1177 | 1401 | ||
| 1178 | # | 1402 | # |
| 1179 | # Library routines | 1403 | # Library routines |
| @@ -1181,6 +1405,7 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1181 | CONFIG_BITREVERSE=y | 1405 | CONFIG_BITREVERSE=y |
| 1182 | # CONFIG_CRC_CCITT is not set | 1406 | # CONFIG_CRC_CCITT is not set |
| 1183 | # CONFIG_CRC16 is not set | 1407 | # CONFIG_CRC16 is not set |
| 1408 | # CONFIG_CRC_T10DIF is not set | ||
| 1184 | # CONFIG_CRC_ITU_T is not set | 1409 | # CONFIG_CRC_ITU_T is not set |
| 1185 | CONFIG_CRC32=y | 1410 | CONFIG_CRC32=y |
| 1186 | # CONFIG_CRC7 is not set | 1411 | # CONFIG_CRC7 is not set |
| @@ -1191,7 +1416,7 @@ CONFIG_PLIST=y | |||
| 1191 | CONFIG_HAS_IOMEM=y | 1416 | CONFIG_HAS_IOMEM=y |
| 1192 | CONFIG_HAS_IOPORT=y | 1417 | CONFIG_HAS_IOPORT=y |
| 1193 | CONFIG_HAS_DMA=y | 1418 | CONFIG_HAS_DMA=y |
| 1194 | # CONFIG_INSTRUMENTATION is not set | 1419 | CONFIG_HAVE_LMB=y |
| 1195 | 1420 | ||
| 1196 | # | 1421 | # |
| 1197 | # Kernel hacking | 1422 | # Kernel hacking |
| @@ -1199,6 +1424,7 @@ CONFIG_HAS_DMA=y | |||
| 1199 | CONFIG_PRINTK_TIME=y | 1424 | CONFIG_PRINTK_TIME=y |
| 1200 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1425 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1201 | CONFIG_ENABLE_MUST_CHECK=y | 1426 | CONFIG_ENABLE_MUST_CHECK=y |
| 1427 | CONFIG_FRAME_WARN=1024 | ||
| 1202 | # CONFIG_MAGIC_SYSRQ is not set | 1428 | # CONFIG_MAGIC_SYSRQ is not set |
| 1203 | # CONFIG_UNUSED_SYMBOLS is not set | 1429 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1204 | # CONFIG_DEBUG_FS is not set | 1430 | # CONFIG_DEBUG_FS is not set |
| @@ -1206,10 +1432,14 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1206 | CONFIG_DEBUG_KERNEL=y | 1432 | CONFIG_DEBUG_KERNEL=y |
| 1207 | # CONFIG_DEBUG_SHIRQ is not set | 1433 | # CONFIG_DEBUG_SHIRQ is not set |
| 1208 | CONFIG_DETECT_SOFTLOCKUP=y | 1434 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1435 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
| 1436 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
| 1209 | CONFIG_SCHED_DEBUG=y | 1437 | CONFIG_SCHED_DEBUG=y |
| 1210 | # CONFIG_SCHEDSTATS is not set | 1438 | # CONFIG_SCHEDSTATS is not set |
| 1211 | # CONFIG_TIMER_STATS is not set | 1439 | # CONFIG_TIMER_STATS is not set |
| 1440 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1212 | # CONFIG_SLUB_DEBUG_ON is not set | 1441 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1442 | # CONFIG_SLUB_STATS is not set | ||
| 1213 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1443 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1214 | # CONFIG_RT_MUTEX_TESTER is not set | 1444 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1215 | # CONFIG_DEBUG_SPINLOCK is not set | 1445 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -1220,17 +1450,39 @@ CONFIG_SCHED_DEBUG=y | |||
| 1220 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1450 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1221 | CONFIG_DEBUG_INFO=y | 1451 | CONFIG_DEBUG_INFO=y |
| 1222 | # CONFIG_DEBUG_VM is not set | 1452 | # CONFIG_DEBUG_VM is not set |
| 1453 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1454 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
| 1223 | # CONFIG_DEBUG_LIST is not set | 1455 | # CONFIG_DEBUG_LIST is not set |
| 1224 | # CONFIG_DEBUG_SG is not set | 1456 | # CONFIG_DEBUG_SG is not set |
| 1225 | CONFIG_FORCED_INLINING=y | ||
| 1226 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1457 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1227 | # CONFIG_RCU_TORTURE_TEST is not set | 1458 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1459 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 1460 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1461 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 1228 | # CONFIG_FAULT_INJECTION is not set | 1462 | # CONFIG_FAULT_INJECTION is not set |
| 1463 | # CONFIG_LATENCYTOP is not set | ||
| 1464 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
| 1465 | |||
| 1466 | # | ||
| 1467 | # Tracers | ||
| 1468 | # | ||
| 1469 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1470 | # CONFIG_SCHED_TRACER is not set | ||
| 1471 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 1472 | # CONFIG_BOOT_TRACER is not set | ||
| 1473 | # CONFIG_STACK_TRACER is not set | ||
| 1474 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 1229 | # CONFIG_SAMPLES is not set | 1475 | # CONFIG_SAMPLES is not set |
| 1476 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 1477 | # CONFIG_KGDB is not set | ||
| 1230 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1478 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
| 1231 | # CONFIG_DEBUG_STACK_USAGE is not set | 1479 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1232 | # CONFIG_DEBUG_PAGEALLOC is not set | 1480 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1233 | # CONFIG_DEBUGGER is not set | 1481 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
| 1482 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
| 1483 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
| 1484 | # CONFIG_XMON is not set | ||
| 1485 | # CONFIG_IRQSTACKS is not set | ||
| 1234 | # CONFIG_BDI_SWITCH is not set | 1486 | # CONFIG_BDI_SWITCH is not set |
| 1235 | # CONFIG_BOOTX_TEXT is not set | 1487 | # CONFIG_BOOTX_TEXT is not set |
| 1236 | # CONFIG_PPC_EARLY_DEBUG is not set | 1488 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1240,47 +1492,98 @@ CONFIG_FORCED_INLINING=y | |||
| 1240 | # | 1492 | # |
| 1241 | # CONFIG_KEYS is not set | 1493 | # CONFIG_KEYS is not set |
| 1242 | # CONFIG_SECURITY is not set | 1494 | # CONFIG_SECURITY is not set |
| 1495 | # CONFIG_SECURITYFS is not set | ||
| 1243 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1496 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1244 | CONFIG_CRYPTO=y | 1497 | CONFIG_CRYPTO=y |
| 1498 | |||
| 1499 | # | ||
| 1500 | # Crypto core or helper | ||
| 1501 | # | ||
| 1502 | # CONFIG_CRYPTO_FIPS is not set | ||
| 1245 | CONFIG_CRYPTO_ALGAPI=y | 1503 | CONFIG_CRYPTO_ALGAPI=y |
| 1504 | CONFIG_CRYPTO_AEAD=y | ||
| 1246 | CONFIG_CRYPTO_BLKCIPHER=y | 1505 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1506 | CONFIG_CRYPTO_HASH=y | ||
| 1507 | CONFIG_CRYPTO_RNG=y | ||
| 1247 | CONFIG_CRYPTO_MANAGER=y | 1508 | CONFIG_CRYPTO_MANAGER=y |
| 1509 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1510 | # CONFIG_CRYPTO_NULL is not set | ||
| 1511 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1512 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1513 | # CONFIG_CRYPTO_TEST is not set | ||
| 1514 | |||
| 1515 | # | ||
| 1516 | # Authenticated Encryption with Associated Data | ||
| 1517 | # | ||
| 1518 | # CONFIG_CRYPTO_CCM is not set | ||
| 1519 | # CONFIG_CRYPTO_GCM is not set | ||
| 1520 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1521 | |||
| 1522 | # | ||
| 1523 | # Block modes | ||
| 1524 | # | ||
| 1525 | CONFIG_CRYPTO_CBC=y | ||
| 1526 | # CONFIG_CRYPTO_CTR is not set | ||
| 1527 | # CONFIG_CRYPTO_CTS is not set | ||
| 1528 | # CONFIG_CRYPTO_ECB is not set | ||
| 1529 | # CONFIG_CRYPTO_LRW is not set | ||
| 1530 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1531 | # CONFIG_CRYPTO_XTS is not set | ||
| 1532 | |||
| 1533 | # | ||
| 1534 | # Hash modes | ||
| 1535 | # | ||
| 1248 | # CONFIG_CRYPTO_HMAC is not set | 1536 | # CONFIG_CRYPTO_HMAC is not set |
| 1249 | # CONFIG_CRYPTO_XCBC is not set | 1537 | # CONFIG_CRYPTO_XCBC is not set |
| 1250 | # CONFIG_CRYPTO_NULL is not set | 1538 | |
| 1539 | # | ||
| 1540 | # Digest | ||
| 1541 | # | ||
| 1542 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1251 | # CONFIG_CRYPTO_MD4 is not set | 1543 | # CONFIG_CRYPTO_MD4 is not set |
| 1252 | CONFIG_CRYPTO_MD5=y | 1544 | CONFIG_CRYPTO_MD5=y |
| 1545 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1546 | # CONFIG_CRYPTO_RMD128 is not set | ||
| 1547 | # CONFIG_CRYPTO_RMD160 is not set | ||
| 1548 | # CONFIG_CRYPTO_RMD256 is not set | ||
| 1549 | # CONFIG_CRYPTO_RMD320 is not set | ||
| 1253 | # CONFIG_CRYPTO_SHA1 is not set | 1550 | # CONFIG_CRYPTO_SHA1 is not set |
| 1254 | # CONFIG_CRYPTO_SHA256 is not set | 1551 | # CONFIG_CRYPTO_SHA256 is not set |
| 1255 | # CONFIG_CRYPTO_SHA512 is not set | 1552 | # CONFIG_CRYPTO_SHA512 is not set |
| 1256 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1257 | # CONFIG_CRYPTO_TGR192 is not set | 1553 | # CONFIG_CRYPTO_TGR192 is not set |
| 1258 | # CONFIG_CRYPTO_GF128MUL is not set | 1554 | # CONFIG_CRYPTO_WP512 is not set |
| 1259 | # CONFIG_CRYPTO_ECB is not set | 1555 | |
| 1260 | CONFIG_CRYPTO_CBC=y | 1556 | # |
| 1261 | # CONFIG_CRYPTO_PCBC is not set | 1557 | # Ciphers |
| 1262 | # CONFIG_CRYPTO_LRW is not set | 1558 | # |
| 1263 | # CONFIG_CRYPTO_XTS is not set | ||
| 1264 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1265 | CONFIG_CRYPTO_DES=y | ||
| 1266 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1267 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1268 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1269 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1270 | # CONFIG_CRYPTO_AES is not set | 1559 | # CONFIG_CRYPTO_AES is not set |
| 1560 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1561 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1562 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1563 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1271 | # CONFIG_CRYPTO_CAST5 is not set | 1564 | # CONFIG_CRYPTO_CAST5 is not set |
| 1272 | # CONFIG_CRYPTO_CAST6 is not set | 1565 | # CONFIG_CRYPTO_CAST6 is not set |
| 1273 | # CONFIG_CRYPTO_TEA is not set | 1566 | CONFIG_CRYPTO_DES=y |
| 1274 | # CONFIG_CRYPTO_ARC4 is not set | 1567 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1275 | # CONFIG_CRYPTO_KHAZAD is not set | 1568 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1276 | # CONFIG_CRYPTO_ANUBIS is not set | 1569 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1277 | # CONFIG_CRYPTO_SEED is not set | 1570 | # CONFIG_CRYPTO_SEED is not set |
| 1571 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1572 | # CONFIG_CRYPTO_TEA is not set | ||
| 1573 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1574 | |||
| 1575 | # | ||
| 1576 | # Compression | ||
| 1577 | # | ||
| 1278 | # CONFIG_CRYPTO_DEFLATE is not set | 1578 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1279 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1579 | # CONFIG_CRYPTO_LZO is not set |
| 1280 | # CONFIG_CRYPTO_CRC32C is not set | 1580 | |
| 1281 | # CONFIG_CRYPTO_CAMELLIA is not set | 1581 | # |
| 1282 | # CONFIG_CRYPTO_TEST is not set | 1582 | # Random Number Generation |
| 1283 | # CONFIG_CRYPTO_AUTHENC is not set | 1583 | # |
| 1584 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| 1284 | CONFIG_CRYPTO_HW=y | 1585 | CONFIG_CRYPTO_HW=y |
| 1586 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1285 | CONFIG_PPC_CLOCK=y | 1587 | CONFIG_PPC_CLOCK=y |
| 1286 | CONFIG_PPC_LIB_RHEAP=y | 1588 | CONFIG_PPC_LIB_RHEAP=y |
| 1589 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig index c15c91deb2ab..4256e2c4534b 100644 --- a/arch/powerpc/configs/ppc40x_defconfig +++ b/arch/powerpc/configs/ppc40x_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.28-rc2 | 3 | # Linux kernel version: 2.6.28-rc4 |
| 4 | # Tue Oct 28 08:56:44 2008 | 4 | # Fri Nov 14 09:54:44 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -500,15 +500,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
| 500 | # CONFIG_BLK_DEV_XIP is not set | 500 | # CONFIG_BLK_DEV_XIP is not set |
| 501 | # CONFIG_CDROM_PKTCDVD is not set | 501 | # CONFIG_CDROM_PKTCDVD is not set |
| 502 | # CONFIG_ATA_OVER_ETH is not set | 502 | # CONFIG_ATA_OVER_ETH is not set |
| 503 | # CONFIG_XILINX_SYSACE is not set | 503 | CONFIG_XILINX_SYSACE=m |
| 504 | # CONFIG_BLK_DEV_HD is not set | 504 | # CONFIG_BLK_DEV_HD is not set |
| 505 | CONFIG_MISC_DEVICES=y | 505 | CONFIG_MISC_DEVICES=y |
| 506 | # CONFIG_PHANTOM is not set | 506 | # CONFIG_PHANTOM is not set |
| 507 | # CONFIG_EEPROM_93CX6 is not set | 507 | # CONFIG_EEPROM_93CX6 is not set |
| 508 | # CONFIG_SGI_IOC4 is not set | 508 | # CONFIG_SGI_IOC4 is not set |
| 509 | # CONFIG_TIFM_CORE is not set | 509 | # CONFIG_TIFM_CORE is not set |
| 510 | # CONFIG_ICS932S401 is not set | ||
| 510 | # CONFIG_ENCLOSURE_SERVICES is not set | 511 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 511 | # CONFIG_HP_ILO is not set | 512 | # CONFIG_HP_ILO is not set |
| 513 | # CONFIG_C2PORT is not set | ||
| 512 | CONFIG_HAVE_IDE=y | 514 | CONFIG_HAVE_IDE=y |
| 513 | # CONFIG_IDE is not set | 515 | # CONFIG_IDE is not set |
| 514 | 516 | ||
| @@ -632,7 +634,13 @@ CONFIG_NETDEV_10000=y | |||
| 632 | # | 634 | # |
| 633 | # Hardware I/O ports | 635 | # Hardware I/O ports |
| 634 | # | 636 | # |
| 635 | # CONFIG_SERIO is not set | 637 | CONFIG_SERIO=m |
| 638 | # CONFIG_SERIO_I8042 is not set | ||
| 639 | # CONFIG_SERIO_SERPORT is not set | ||
| 640 | # CONFIG_SERIO_PCIPS2 is not set | ||
| 641 | # CONFIG_SERIO_LIBPS2 is not set | ||
| 642 | # CONFIG_SERIO_RAW is not set | ||
| 643 | CONFIG_SERIO_XILINX_XPS_PS2=m | ||
| 636 | # CONFIG_GAMEPORT is not set | 644 | # CONFIG_GAMEPORT is not set |
| 637 | 645 | ||
| 638 | # | 646 | # |
| @@ -660,7 +668,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
| 660 | # | 668 | # |
| 661 | # Non-8250 serial port support | 669 | # Non-8250 serial port support |
| 662 | # | 670 | # |
| 663 | # CONFIG_SERIAL_UARTLITE is not set | 671 | CONFIG_SERIAL_UARTLITE=y |
| 672 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | ||
| 664 | CONFIG_SERIAL_CORE=y | 673 | CONFIG_SERIAL_CORE=y |
| 665 | CONFIG_SERIAL_CORE_CONSOLE=y | 674 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 666 | # CONFIG_SERIAL_JSM is not set | 675 | # CONFIG_SERIAL_JSM is not set |
| @@ -757,6 +766,11 @@ CONFIG_GPIOLIB=y | |||
| 757 | # CONFIG_GPIO_SYSFS is not set | 766 | # CONFIG_GPIO_SYSFS is not set |
| 758 | 767 | ||
| 759 | # | 768 | # |
| 769 | # Memory mapped GPIO expanders: | ||
| 770 | # | ||
| 771 | CONFIG_GPIO_XILINX=y | ||
| 772 | |||
| 773 | # | ||
| 760 | # I2C GPIO expanders: | 774 | # I2C GPIO expanders: |
| 761 | # | 775 | # |
| 762 | # CONFIG_GPIO_MAX732X is not set | 776 | # CONFIG_GPIO_MAX732X is not set |
| @@ -776,11 +790,11 @@ CONFIG_GPIOLIB=y | |||
| 776 | # CONFIG_HWMON is not set | 790 | # CONFIG_HWMON is not set |
| 777 | CONFIG_THERMAL=y | 791 | CONFIG_THERMAL=y |
| 778 | # CONFIG_WATCHDOG is not set | 792 | # CONFIG_WATCHDOG is not set |
| 793 | CONFIG_SSB_POSSIBLE=y | ||
| 779 | 794 | ||
| 780 | # | 795 | # |
| 781 | # Sonics Silicon Backplane | 796 | # Sonics Silicon Backplane |
| 782 | # | 797 | # |
| 783 | CONFIG_SSB_POSSIBLE=y | ||
| 784 | # CONFIG_SSB is not set | 798 | # CONFIG_SSB is not set |
| 785 | 799 | ||
| 786 | # | 800 | # |
| @@ -792,6 +806,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 792 | # CONFIG_MFD_TMIO is not set | 806 | # CONFIG_MFD_TMIO is not set |
| 793 | # CONFIG_MFD_WM8400 is not set | 807 | # CONFIG_MFD_WM8400 is not set |
| 794 | # CONFIG_MFD_WM8350_I2C is not set | 808 | # CONFIG_MFD_WM8350_I2C is not set |
| 809 | # CONFIG_REGULATOR is not set | ||
| 795 | 810 | ||
| 796 | # | 811 | # |
| 797 | # Multimedia devices | 812 | # Multimedia devices |
| @@ -816,13 +831,65 @@ CONFIG_SSB_POSSIBLE=y | |||
| 816 | # CONFIG_DRM is not set | 831 | # CONFIG_DRM is not set |
| 817 | # CONFIG_VGASTATE is not set | 832 | # CONFIG_VGASTATE is not set |
| 818 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 833 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| 819 | # CONFIG_FB is not set | 834 | CONFIG_FB=m |
| 835 | # CONFIG_FIRMWARE_EDID is not set | ||
| 836 | # CONFIG_FB_DDC is not set | ||
| 837 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 838 | CONFIG_FB_CFB_FILLRECT=m | ||
| 839 | CONFIG_FB_CFB_COPYAREA=m | ||
| 840 | CONFIG_FB_CFB_IMAGEBLIT=m | ||
| 841 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 842 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 843 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 844 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 845 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 846 | # CONFIG_FB_SYS_FOPS is not set | ||
| 847 | # CONFIG_FB_SVGALIB is not set | ||
| 848 | # CONFIG_FB_MACMODES is not set | ||
| 849 | # CONFIG_FB_BACKLIGHT is not set | ||
| 850 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 851 | # CONFIG_FB_TILEBLITTING is not set | ||
| 852 | |||
| 853 | # | ||
| 854 | # Frame buffer hardware drivers | ||
| 855 | # | ||
| 856 | # CONFIG_FB_CIRRUS is not set | ||
| 857 | # CONFIG_FB_PM2 is not set | ||
| 858 | # CONFIG_FB_CYBER2000 is not set | ||
| 859 | # CONFIG_FB_VGA16 is not set | ||
| 860 | # CONFIG_FB_UVESA is not set | ||
| 861 | # CONFIG_FB_S1D13XXX is not set | ||
| 862 | # CONFIG_FB_NVIDIA is not set | ||
| 863 | # CONFIG_FB_RIVA is not set | ||
| 864 | # CONFIG_FB_MATROX is not set | ||
| 865 | # CONFIG_FB_RADEON is not set | ||
| 866 | # CONFIG_FB_ATY128 is not set | ||
| 867 | # CONFIG_FB_ATY is not set | ||
| 868 | # CONFIG_FB_S3 is not set | ||
| 869 | # CONFIG_FB_SAVAGE is not set | ||
| 870 | # CONFIG_FB_SIS is not set | ||
| 871 | # CONFIG_FB_VIA is not set | ||
| 872 | # CONFIG_FB_NEOMAGIC is not set | ||
| 873 | # CONFIG_FB_KYRO is not set | ||
| 874 | # CONFIG_FB_3DFX is not set | ||
| 875 | # CONFIG_FB_VOODOO1 is not set | ||
| 876 | # CONFIG_FB_VT8623 is not set | ||
| 877 | # CONFIG_FB_TRIDENT is not set | ||
| 878 | # CONFIG_FB_ARK is not set | ||
| 879 | # CONFIG_FB_PM3 is not set | ||
| 880 | # CONFIG_FB_CARMINE is not set | ||
| 881 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 882 | CONFIG_FB_XILINX=m | ||
| 883 | # CONFIG_FB_VIRTUAL is not set | ||
| 884 | # CONFIG_FB_METRONOME is not set | ||
| 885 | # CONFIG_FB_MB862XX is not set | ||
| 820 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 886 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 821 | 887 | ||
| 822 | # | 888 | # |
| 823 | # Display device support | 889 | # Display device support |
| 824 | # | 890 | # |
| 825 | # CONFIG_DISPLAY_SUPPORT is not set | 891 | # CONFIG_DISPLAY_SUPPORT is not set |
| 892 | # CONFIG_LOGO is not set | ||
| 826 | # CONFIG_SOUND is not set | 893 | # CONFIG_SOUND is not set |
| 827 | CONFIG_USB_SUPPORT=y | 894 | CONFIG_USB_SUPPORT=y |
| 828 | CONFIG_USB_ARCH_HAS_HCD=y | 895 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -851,6 +918,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 851 | # CONFIG_DMADEVICES is not set | 918 | # CONFIG_DMADEVICES is not set |
| 852 | # CONFIG_UIO is not set | 919 | # CONFIG_UIO is not set |
| 853 | # CONFIG_STAGING is not set | 920 | # CONFIG_STAGING is not set |
| 921 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 854 | 922 | ||
| 855 | # | 923 | # |
| 856 | # File systems | 924 | # File systems |
| @@ -1077,10 +1145,12 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1077 | # CONFIG_FAULT_INJECTION is not set | 1145 | # CONFIG_FAULT_INJECTION is not set |
| 1078 | # CONFIG_LATENCYTOP is not set | 1146 | # CONFIG_LATENCYTOP is not set |
| 1079 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1147 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1080 | CONFIG_NOP_TRACER=y | 1148 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1081 | CONFIG_HAVE_FTRACE=y | 1149 | |
| 1082 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1150 | # |
| 1083 | # CONFIG_FTRACE is not set | 1151 | # Tracers |
| 1152 | # | ||
| 1153 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1084 | # CONFIG_SCHED_TRACER is not set | 1154 | # CONFIG_SCHED_TRACER is not set |
| 1085 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1155 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1086 | # CONFIG_BOOT_TRACER is not set | 1156 | # CONFIG_BOOT_TRACER is not set |
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig index 55edbd545b61..cfc94cfcf4cb 100644 --- a/arch/powerpc/configs/ppc44x_defconfig +++ b/arch/powerpc/configs/ppc44x_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.28-rc2 | 3 | # Linux kernel version: 2.6.28-rc4 |
| 4 | # Tue Oct 28 09:28:58 2008 | 4 | # Fri Nov 14 10:06:19 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -506,15 +506,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 | |||
| 506 | # CONFIG_BLK_DEV_XIP is not set | 506 | # CONFIG_BLK_DEV_XIP is not set |
| 507 | # CONFIG_CDROM_PKTCDVD is not set | 507 | # CONFIG_CDROM_PKTCDVD is not set |
| 508 | # CONFIG_ATA_OVER_ETH is not set | 508 | # CONFIG_ATA_OVER_ETH is not set |
| 509 | # CONFIG_XILINX_SYSACE is not set | 509 | CONFIG_XILINX_SYSACE=m |
| 510 | # CONFIG_BLK_DEV_HD is not set | 510 | # CONFIG_BLK_DEV_HD is not set |
| 511 | CONFIG_MISC_DEVICES=y | 511 | CONFIG_MISC_DEVICES=y |
| 512 | # CONFIG_PHANTOM is not set | 512 | # CONFIG_PHANTOM is not set |
| 513 | # CONFIG_EEPROM_93CX6 is not set | 513 | # CONFIG_EEPROM_93CX6 is not set |
| 514 | # CONFIG_SGI_IOC4 is not set | 514 | # CONFIG_SGI_IOC4 is not set |
| 515 | # CONFIG_TIFM_CORE is not set | 515 | # CONFIG_TIFM_CORE is not set |
| 516 | # CONFIG_ICS932S401 is not set | ||
| 516 | # CONFIG_ENCLOSURE_SERVICES is not set | 517 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 517 | # CONFIG_HP_ILO is not set | 518 | # CONFIG_HP_ILO is not set |
| 519 | # CONFIG_C2PORT is not set | ||
| 518 | CONFIG_HAVE_IDE=y | 520 | CONFIG_HAVE_IDE=y |
| 519 | # CONFIG_IDE is not set | 521 | # CONFIG_IDE is not set |
| 520 | 522 | ||
| @@ -680,7 +682,13 @@ CONFIG_NETDEV_10000=y | |||
| 680 | # | 682 | # |
| 681 | # Hardware I/O ports | 683 | # Hardware I/O ports |
| 682 | # | 684 | # |
| 683 | # CONFIG_SERIO is not set | 685 | CONFIG_SERIO=m |
| 686 | # CONFIG_SERIO_I8042 is not set | ||
| 687 | # CONFIG_SERIO_SERPORT is not set | ||
| 688 | # CONFIG_SERIO_PCIPS2 is not set | ||
| 689 | # CONFIG_SERIO_LIBPS2 is not set | ||
| 690 | # CONFIG_SERIO_RAW is not set | ||
| 691 | CONFIG_SERIO_XILINX_XPS_PS2=m | ||
| 684 | # CONFIG_GAMEPORT is not set | 692 | # CONFIG_GAMEPORT is not set |
| 685 | 693 | ||
| 686 | # | 694 | # |
| @@ -708,7 +716,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
| 708 | # | 716 | # |
| 709 | # Non-8250 serial port support | 717 | # Non-8250 serial port support |
| 710 | # | 718 | # |
| 711 | # CONFIG_SERIAL_UARTLITE is not set | 719 | CONFIG_SERIAL_UARTLITE=y |
| 720 | CONFIG_SERIAL_UARTLITE_CONSOLE=y | ||
| 712 | CONFIG_SERIAL_CORE=y | 721 | CONFIG_SERIAL_CORE=y |
| 713 | CONFIG_SERIAL_CORE_CONSOLE=y | 722 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 714 | # CONFIG_SERIAL_JSM is not set | 723 | # CONFIG_SERIAL_JSM is not set |
| @@ -806,6 +815,11 @@ CONFIG_GPIOLIB=y | |||
| 806 | # CONFIG_GPIO_SYSFS is not set | 815 | # CONFIG_GPIO_SYSFS is not set |
| 807 | 816 | ||
| 808 | # | 817 | # |
| 818 | # Memory mapped GPIO expanders: | ||
| 819 | # | ||
| 820 | CONFIG_GPIO_XILINX=y | ||
| 821 | |||
| 822 | # | ||
| 809 | # I2C GPIO expanders: | 823 | # I2C GPIO expanders: |
| 810 | # | 824 | # |
| 811 | # CONFIG_GPIO_MAX732X is not set | 825 | # CONFIG_GPIO_MAX732X is not set |
| @@ -826,11 +840,11 @@ CONFIG_GPIOLIB=y | |||
| 826 | # CONFIG_THERMAL is not set | 840 | # CONFIG_THERMAL is not set |
| 827 | # CONFIG_THERMAL_HWMON is not set | 841 | # CONFIG_THERMAL_HWMON is not set |
| 828 | # CONFIG_WATCHDOG is not set | 842 | # CONFIG_WATCHDOG is not set |
| 843 | CONFIG_SSB_POSSIBLE=y | ||
| 829 | 844 | ||
| 830 | # | 845 | # |
| 831 | # Sonics Silicon Backplane | 846 | # Sonics Silicon Backplane |
| 832 | # | 847 | # |
| 833 | CONFIG_SSB_POSSIBLE=y | ||
| 834 | # CONFIG_SSB is not set | 848 | # CONFIG_SSB is not set |
| 835 | 849 | ||
| 836 | # | 850 | # |
| @@ -842,6 +856,7 @@ CONFIG_SSB_POSSIBLE=y | |||
| 842 | # CONFIG_MFD_TMIO is not set | 856 | # CONFIG_MFD_TMIO is not set |
| 843 | # CONFIG_MFD_WM8400 is not set | 857 | # CONFIG_MFD_WM8400 is not set |
| 844 | # CONFIG_MFD_WM8350_I2C is not set | 858 | # CONFIG_MFD_WM8350_I2C is not set |
| 859 | # CONFIG_REGULATOR is not set | ||
| 845 | 860 | ||
| 846 | # | 861 | # |
| 847 | # Multimedia devices | 862 | # Multimedia devices |
| @@ -866,13 +881,65 @@ CONFIG_SSB_POSSIBLE=y | |||
| 866 | # CONFIG_DRM is not set | 881 | # CONFIG_DRM is not set |
| 867 | # CONFIG_VGASTATE is not set | 882 | # CONFIG_VGASTATE is not set |
| 868 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 883 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
| 869 | # CONFIG_FB is not set | 884 | CONFIG_FB=m |
| 885 | # CONFIG_FIRMWARE_EDID is not set | ||
| 886 | # CONFIG_FB_DDC is not set | ||
| 887 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
| 888 | CONFIG_FB_CFB_FILLRECT=m | ||
| 889 | CONFIG_FB_CFB_COPYAREA=m | ||
| 890 | CONFIG_FB_CFB_IMAGEBLIT=m | ||
| 891 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 892 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 893 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 894 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 895 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 896 | # CONFIG_FB_SYS_FOPS is not set | ||
| 897 | # CONFIG_FB_SVGALIB is not set | ||
| 898 | # CONFIG_FB_MACMODES is not set | ||
| 899 | # CONFIG_FB_BACKLIGHT is not set | ||
| 900 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 901 | # CONFIG_FB_TILEBLITTING is not set | ||
| 902 | |||
| 903 | # | ||
| 904 | # Frame buffer hardware drivers | ||
| 905 | # | ||
| 906 | # CONFIG_FB_CIRRUS is not set | ||
| 907 | # CONFIG_FB_PM2 is not set | ||
| 908 | # CONFIG_FB_CYBER2000 is not set | ||
| 909 | # CONFIG_FB_VGA16 is not set | ||
| 910 | # CONFIG_FB_UVESA is not set | ||
| 911 | # CONFIG_FB_S1D13XXX is not set | ||
| 912 | # CONFIG_FB_NVIDIA is not set | ||
| 913 | # CONFIG_FB_RIVA is not set | ||
| 914 | # CONFIG_FB_MATROX is not set | ||
| 915 | # CONFIG_FB_RADEON is not set | ||
| 916 | # CONFIG_FB_ATY128 is not set | ||
| 917 | # CONFIG_FB_ATY is not set | ||
| 918 | # CONFIG_FB_S3 is not set | ||
| 919 | # CONFIG_FB_SAVAGE is not set | ||
| 920 | # CONFIG_FB_SIS is not set | ||
| 921 | # CONFIG_FB_VIA is not set | ||
| 922 | # CONFIG_FB_NEOMAGIC is not set | ||
| 923 | # CONFIG_FB_KYRO is not set | ||
| 924 | # CONFIG_FB_3DFX is not set | ||
| 925 | # CONFIG_FB_VOODOO1 is not set | ||
| 926 | # CONFIG_FB_VT8623 is not set | ||
| 927 | # CONFIG_FB_TRIDENT is not set | ||
| 928 | # CONFIG_FB_ARK is not set | ||
| 929 | # CONFIG_FB_PM3 is not set | ||
| 930 | # CONFIG_FB_CARMINE is not set | ||
| 931 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 932 | CONFIG_FB_XILINX=m | ||
| 933 | # CONFIG_FB_VIRTUAL is not set | ||
| 934 | # CONFIG_FB_METRONOME is not set | ||
| 935 | # CONFIG_FB_MB862XX is not set | ||
| 870 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 936 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 871 | 937 | ||
| 872 | # | 938 | # |
| 873 | # Display device support | 939 | # Display device support |
| 874 | # | 940 | # |
| 875 | # CONFIG_DISPLAY_SUPPORT is not set | 941 | # CONFIG_DISPLAY_SUPPORT is not set |
| 942 | # CONFIG_LOGO is not set | ||
| 876 | # CONFIG_SOUND is not set | 943 | # CONFIG_SOUND is not set |
| 877 | CONFIG_USB_SUPPORT=y | 944 | CONFIG_USB_SUPPORT=y |
| 878 | CONFIG_USB_ARCH_HAS_HCD=y | 945 | CONFIG_USB_ARCH_HAS_HCD=y |
| @@ -1002,6 +1069,7 @@ CONFIG_USB_STORAGE=m | |||
| 1002 | # CONFIG_DMADEVICES is not set | 1069 | # CONFIG_DMADEVICES is not set |
| 1003 | # CONFIG_UIO is not set | 1070 | # CONFIG_UIO is not set |
| 1004 | # CONFIG_STAGING is not set | 1071 | # CONFIG_STAGING is not set |
| 1072 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 1005 | 1073 | ||
| 1006 | # | 1074 | # |
| 1007 | # File systems | 1075 | # File systems |
| @@ -1227,10 +1295,12 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1227 | # CONFIG_FAULT_INJECTION is not set | 1295 | # CONFIG_FAULT_INJECTION is not set |
| 1228 | # CONFIG_LATENCYTOP is not set | 1296 | # CONFIG_LATENCYTOP is not set |
| 1229 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1297 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1230 | CONFIG_NOP_TRACER=y | 1298 | CONFIG_HAVE_FUNCTION_TRACER=y |
| 1231 | CONFIG_HAVE_FTRACE=y | 1299 | |
| 1232 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1300 | # |
| 1233 | # CONFIG_FTRACE is not set | 1301 | # Tracers |
| 1302 | # | ||
| 1303 | # CONFIG_FUNCTION_TRACER is not set | ||
| 1234 | # CONFIG_SCHED_TRACER is not set | 1304 | # CONFIG_SCHED_TRACER is not set |
| 1235 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1305 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
| 1236 | # CONFIG_BOOT_TRACER is not set | 1306 | # CONFIG_BOOT_TRACER is not set |
diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h index 5a441742ffba..68b752626808 100644 --- a/arch/powerpc/include/asm/mmu-hash64.h +++ b/arch/powerpc/include/asm/mmu-hash64.h | |||
| @@ -280,7 +280,6 @@ extern int hash_huge_page(struct mm_struct *mm, unsigned long access, | |||
| 280 | extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend, | 280 | extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend, |
| 281 | unsigned long pstart, unsigned long prot, | 281 | unsigned long pstart, unsigned long prot, |
| 282 | int psize, int ssize); | 282 | int psize, int ssize); |
| 283 | extern void set_huge_psize(int psize); | ||
| 284 | extern void add_gpage(unsigned long addr, unsigned long page_size, | 283 | extern void add_gpage(unsigned long addr, unsigned long page_size, |
| 285 | unsigned long number_of_pages); | 284 | unsigned long number_of_pages); |
| 286 | extern void demote_segment_4k(struct mm_struct *mm, unsigned long addr); | 285 | extern void demote_segment_4k(struct mm_struct *mm, unsigned long addr); |
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h index 280a90cc9894..c9c678fb2538 100644 --- a/arch/powerpc/include/asm/ptrace.h +++ b/arch/powerpc/include/asm/ptrace.h | |||
| @@ -55,8 +55,6 @@ struct pt_regs { | |||
| 55 | 55 | ||
| 56 | #ifdef __powerpc64__ | 56 | #ifdef __powerpc64__ |
| 57 | 57 | ||
| 58 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
| 59 | |||
| 60 | #define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */ | 58 | #define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */ |
| 61 | #define STACK_FRAME_LR_SAVE 2 /* Location of LR in stack frame */ | 59 | #define STACK_FRAME_LR_SAVE 2 /* Location of LR in stack frame */ |
| 62 | #define STACK_FRAME_REGS_MARKER ASM_CONST(0x7265677368657265) | 60 | #define STACK_FRAME_REGS_MARKER ASM_CONST(0x7265677368657265) |
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S index 80cac984d85d..31c18b52affb 100644 --- a/arch/powerpc/kernel/cpu_setup_44x.S +++ b/arch/powerpc/kernel/cpu_setup_44x.S | |||
| @@ -34,7 +34,12 @@ _GLOBAL(__setup_cpu_440grx) | |||
| 34 | blr | 34 | blr |
| 35 | _GLOBAL(__setup_cpu_460ex) | 35 | _GLOBAL(__setup_cpu_460ex) |
| 36 | _GLOBAL(__setup_cpu_460gt) | 36 | _GLOBAL(__setup_cpu_460gt) |
| 37 | b __init_fpu_44x | 37 | mflr r4 |
| 38 | bl __init_fpu_44x | ||
| 39 | bl __fixup_440A_mcheck | ||
| 40 | mtlr r4 | ||
| 41 | blr | ||
| 42 | |||
| 38 | _GLOBAL(__setup_cpu_440gx) | 43 | _GLOBAL(__setup_cpu_440gx) |
| 39 | _GLOBAL(__setup_cpu_440spe) | 44 | _GLOBAL(__setup_cpu_440spe) |
| 40 | b __fixup_440A_mcheck | 45 | b __fixup_440A_mcheck |
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index e6d52845854f..e0bcf9354286 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
| @@ -57,12 +57,18 @@ system_call_common: | |||
| 57 | beq- 1f | 57 | beq- 1f |
| 58 | ld r1,PACAKSAVE(r13) | 58 | ld r1,PACAKSAVE(r13) |
| 59 | 1: std r10,0(r1) | 59 | 1: std r10,0(r1) |
| 60 | crclr so | ||
| 61 | std r11,_NIP(r1) | 60 | std r11,_NIP(r1) |
| 62 | std r12,_MSR(r1) | 61 | std r12,_MSR(r1) |
| 63 | std r0,GPR0(r1) | 62 | std r0,GPR0(r1) |
| 64 | std r10,GPR1(r1) | 63 | std r10,GPR1(r1) |
| 65 | ACCOUNT_CPU_USER_ENTRY(r10, r11) | 64 | ACCOUNT_CPU_USER_ENTRY(r10, r11) |
| 65 | /* | ||
| 66 | * This "crclr so" clears CR0.SO, which is the error indication on | ||
| 67 | * return from this system call. There must be no cmp instruction | ||
| 68 | * between it and the "mfcr r9" below, otherwise if XER.SO is set, | ||
| 69 | * CR0.SO will get set, causing all system calls to appear to fail. | ||
| 70 | */ | ||
| 71 | crclr so | ||
| 66 | std r2,GPR2(r1) | 72 | std r2,GPR2(r1) |
| 67 | std r3,GPR3(r1) | 73 | std r3,GPR3(r1) |
| 68 | std r4,GPR4(r1) | 74 | std r4,GPR4(r1) |
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index bc1fb27368af..a11d68976dc8 100644 --- a/arch/powerpc/kernel/prom_parse.c +++ b/arch/powerpc/kernel/prom_parse.c | |||
| @@ -250,8 +250,11 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) | |||
| 250 | * parsing | 250 | * parsing |
| 251 | */ | 251 | */ |
| 252 | dn = pci_device_to_OF_node(pdev); | 252 | dn = pci_device_to_OF_node(pdev); |
| 253 | if (dn) | 253 | if (dn) { |
| 254 | return of_irq_map_one(dn, 0, out_irq); | 254 | rc = of_irq_map_one(dn, 0, out_irq); |
| 255 | if (!rc) | ||
| 256 | return rc; | ||
| 257 | } | ||
| 255 | 258 | ||
| 256 | /* Ok, we don't, time to have fun. Let's start by building up an | 259 | /* Ok, we don't, time to have fun. Let's start by building up an |
| 257 | * interrupt spec. we assume #interrupt-cells is 1, which is standard | 260 | * interrupt spec. we assume #interrupt-cells is 1, which is standard |
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index 86a2ffccef25..20885a38237a 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c | |||
| @@ -717,9 +717,11 @@ static void unregister_cpu_online(unsigned int cpu) | |||
| 717 | 717 | ||
| 718 | BUG_ON(!c->hotpluggable); | 718 | BUG_ON(!c->hotpluggable); |
| 719 | 719 | ||
| 720 | #ifdef CONFIG_PPC64 | ||
| 720 | if (!firmware_has_feature(FW_FEATURE_ISERIES) && | 721 | if (!firmware_has_feature(FW_FEATURE_ISERIES) && |
| 721 | cpu_has_feature(CPU_FTR_SMT)) | 722 | cpu_has_feature(CPU_FTR_SMT)) |
| 722 | sysdev_remove_file(s, &attr_smt_snooze_delay); | 723 | sysdev_remove_file(s, &attr_smt_snooze_delay); |
| 724 | #endif | ||
| 723 | 725 | ||
| 724 | /* PMC stuff */ | 726 | /* PMC stuff */ |
| 725 | switch (cur_cpu_spec->pmc_type) { | 727 | switch (cur_cpu_spec->pmc_type) { |
diff --git a/arch/powerpc/mm/40x_mmu.c b/arch/powerpc/mm/40x_mmu.c index cecbbc76f624..29954dc28942 100644 --- a/arch/powerpc/mm/40x_mmu.c +++ b/arch/powerpc/mm/40x_mmu.c | |||
| @@ -93,7 +93,7 @@ void __init MMU_init_hw(void) | |||
| 93 | 93 | ||
| 94 | unsigned long __init mmu_mapin_ram(void) | 94 | unsigned long __init mmu_mapin_ram(void) |
| 95 | { | 95 | { |
| 96 | unsigned long v, s; | 96 | unsigned long v, s, mapped; |
| 97 | phys_addr_t p; | 97 | phys_addr_t p; |
| 98 | 98 | ||
| 99 | v = KERNELBASE; | 99 | v = KERNELBASE; |
| @@ -130,5 +130,17 @@ unsigned long __init mmu_mapin_ram(void) | |||
| 130 | s -= LARGE_PAGE_SIZE_4M; | 130 | s -= LARGE_PAGE_SIZE_4M; |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | return total_lowmem - s; | 133 | mapped = total_lowmem - s; |
| 134 | |||
| 135 | /* If the size of RAM is not an exact power of two, we may not | ||
| 136 | * have covered RAM in its entirety with 16 and 4 MiB | ||
| 137 | * pages. Consequently, restrict the top end of RAM currently | ||
| 138 | * allocable so that calls to the LMB to allocate PTEs for "tail" | ||
| 139 | * coverage with normal-sized pages (or other reasons) do not | ||
| 140 | * attempt to allocate outside the allowed range. | ||
| 141 | */ | ||
| 142 | |||
| 143 | __initial_memory_limit_addr = memstart_addr + mapped; | ||
| 144 | |||
| 145 | return mapped; | ||
| 134 | } | 146 | } |
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index a117024ab8cd..7bbf4e4ed430 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
| @@ -677,7 +677,7 @@ repeat: | |||
| 677 | return err; | 677 | return err; |
| 678 | } | 678 | } |
| 679 | 679 | ||
| 680 | void set_huge_psize(int psize) | 680 | static void __init set_huge_psize(int psize) |
| 681 | { | 681 | { |
| 682 | /* Check that it is a page size supported by the hardware and | 682 | /* Check that it is a page size supported by the hardware and |
| 683 | * that it fits within pagetable limits. */ | 683 | * that it fits within pagetable limits. */ |
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index eb505ad34a85..a8397bbad3d4 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
| @@ -865,6 +865,67 @@ static struct notifier_block __cpuinitdata ppc64_numa_nb = { | |||
| 865 | .priority = 1 /* Must run before sched domains notifier. */ | 865 | .priority = 1 /* Must run before sched domains notifier. */ |
| 866 | }; | 866 | }; |
| 867 | 867 | ||
| 868 | static void mark_reserved_regions_for_nid(int nid) | ||
| 869 | { | ||
| 870 | struct pglist_data *node = NODE_DATA(nid); | ||
| 871 | int i; | ||
| 872 | |||
| 873 | for (i = 0; i < lmb.reserved.cnt; i++) { | ||
| 874 | unsigned long physbase = lmb.reserved.region[i].base; | ||
| 875 | unsigned long size = lmb.reserved.region[i].size; | ||
| 876 | unsigned long start_pfn = physbase >> PAGE_SHIFT; | ||
| 877 | unsigned long end_pfn = ((physbase + size) >> PAGE_SHIFT); | ||
| 878 | struct node_active_region node_ar; | ||
| 879 | unsigned long node_end_pfn = node->node_start_pfn + | ||
| 880 | node->node_spanned_pages; | ||
| 881 | |||
| 882 | /* | ||
| 883 | * Check to make sure that this lmb.reserved area is | ||
| 884 | * within the bounds of the node that we care about. | ||
| 885 | * Checking the nid of the start and end points is not | ||
| 886 | * sufficient because the reserved area could span the | ||
| 887 | * entire node. | ||
| 888 | */ | ||
| 889 | if (end_pfn <= node->node_start_pfn || | ||
| 890 | start_pfn >= node_end_pfn) | ||
| 891 | continue; | ||
| 892 | |||
| 893 | get_node_active_region(start_pfn, &node_ar); | ||
| 894 | while (start_pfn < end_pfn && | ||
| 895 | node_ar.start_pfn < node_ar.end_pfn) { | ||
| 896 | unsigned long reserve_size = size; | ||
| 897 | /* | ||
| 898 | * if reserved region extends past active region | ||
| 899 | * then trim size to active region | ||
| 900 | */ | ||
| 901 | if (end_pfn > node_ar.end_pfn) | ||
| 902 | reserve_size = (node_ar.end_pfn << PAGE_SHIFT) | ||
| 903 | - (start_pfn << PAGE_SHIFT); | ||
| 904 | dbg("reserve_bootmem %lx %lx nid=%d\n", physbase, | ||
| 905 | reserve_size, node_ar.nid); | ||
| 906 | reserve_bootmem_node(NODE_DATA(node_ar.nid), physbase, | ||
| 907 | reserve_size, BOOTMEM_DEFAULT); | ||
| 908 | /* | ||
| 909 | * if reserved region is contained in the active region | ||
| 910 | * then done. | ||
| 911 | */ | ||
| 912 | if (end_pfn <= node_ar.end_pfn) | ||
| 913 | break; | ||
| 914 | |||
| 915 | /* | ||
| 916 | * reserved region extends past the active region | ||
| 917 | * get next active region that contains this | ||
| 918 | * reserved region | ||
| 919 | */ | ||
| 920 | start_pfn = node_ar.end_pfn; | ||
| 921 | physbase = start_pfn << PAGE_SHIFT; | ||
| 922 | size = size - reserve_size; | ||
| 923 | get_node_active_region(start_pfn, &node_ar); | ||
| 924 | } | ||
| 925 | } | ||
| 926 | } | ||
| 927 | |||
| 928 | |||
| 868 | void __init do_init_bootmem(void) | 929 | void __init do_init_bootmem(void) |
| 869 | { | 930 | { |
| 870 | int nid; | 931 | int nid; |
| @@ -890,7 +951,13 @@ void __init do_init_bootmem(void) | |||
| 890 | 951 | ||
| 891 | get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); | 952 | get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); |
| 892 | 953 | ||
| 893 | /* Allocate the node structure node local if possible */ | 954 | /* |
| 955 | * Allocate the node structure node local if possible | ||
| 956 | * | ||
| 957 | * Be careful moving this around, as it relies on all | ||
| 958 | * previous nodes' bootmem to be initialized and have | ||
| 959 | * all reserved areas marked. | ||
| 960 | */ | ||
| 894 | NODE_DATA(nid) = careful_allocation(nid, | 961 | NODE_DATA(nid) = careful_allocation(nid, |
| 895 | sizeof(struct pglist_data), | 962 | sizeof(struct pglist_data), |
| 896 | SMP_CACHE_BYTES, end_pfn); | 963 | SMP_CACHE_BYTES, end_pfn); |
| @@ -922,53 +989,14 @@ void __init do_init_bootmem(void) | |||
| 922 | start_pfn, end_pfn); | 989 | start_pfn, end_pfn); |
| 923 | 990 | ||
| 924 | free_bootmem_with_active_regions(nid, end_pfn); | 991 | free_bootmem_with_active_regions(nid, end_pfn); |
| 925 | } | 992 | /* |
| 926 | 993 | * Be very careful about moving this around. Future | |
| 927 | /* Mark reserved regions */ | 994 | * calls to careful_allocation() depend on this getting |
| 928 | for (i = 0; i < lmb.reserved.cnt; i++) { | 995 | * done correctly. |
| 929 | unsigned long physbase = lmb.reserved.region[i].base; | 996 | */ |
| 930 | unsigned long size = lmb.reserved.region[i].size; | 997 | mark_reserved_regions_for_nid(nid); |
| 931 | unsigned long start_pfn = physbase >> PAGE_SHIFT; | ||
| 932 | unsigned long end_pfn = ((physbase + size) >> PAGE_SHIFT); | ||
| 933 | struct node_active_region node_ar; | ||
| 934 | |||
| 935 | get_node_active_region(start_pfn, &node_ar); | ||
| 936 | while (start_pfn < end_pfn && | ||
| 937 | node_ar.start_pfn < node_ar.end_pfn) { | ||
| 938 | unsigned long reserve_size = size; | ||
| 939 | /* | ||
| 940 | * if reserved region extends past active region | ||
| 941 | * then trim size to active region | ||
| 942 | */ | ||
| 943 | if (end_pfn > node_ar.end_pfn) | ||
| 944 | reserve_size = (node_ar.end_pfn << PAGE_SHIFT) | ||
| 945 | - (start_pfn << PAGE_SHIFT); | ||
| 946 | dbg("reserve_bootmem %lx %lx nid=%d\n", physbase, | ||
| 947 | reserve_size, node_ar.nid); | ||
| 948 | reserve_bootmem_node(NODE_DATA(node_ar.nid), physbase, | ||
| 949 | reserve_size, BOOTMEM_DEFAULT); | ||
| 950 | /* | ||
| 951 | * if reserved region is contained in the active region | ||
| 952 | * then done. | ||
| 953 | */ | ||
| 954 | if (end_pfn <= node_ar.end_pfn) | ||
| 955 | break; | ||
| 956 | |||
| 957 | /* | ||
| 958 | * reserved region extends past the active region | ||
| 959 | * get next active region that contains this | ||
| 960 | * reserved region | ||
| 961 | */ | ||
| 962 | start_pfn = node_ar.end_pfn; | ||
| 963 | physbase = start_pfn << PAGE_SHIFT; | ||
| 964 | size = size - reserve_size; | ||
| 965 | get_node_active_region(start_pfn, &node_ar); | ||
| 966 | } | ||
| 967 | |||
| 968 | } | ||
| 969 | |||
| 970 | for_each_online_node(nid) | ||
| 971 | sparse_memory_present_with_active_regions(nid); | 998 | sparse_memory_present_with_active_regions(nid); |
| 999 | } | ||
| 972 | } | 1000 | } |
| 973 | 1001 | ||
| 974 | void __init paging_init(void) | 1002 | void __init paging_init(void) |
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index 896548ba1ca1..442cf36aa172 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c | |||
| @@ -95,6 +95,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc) | |||
| 95 | struct axon_msic *msic = get_irq_data(irq); | 95 | struct axon_msic *msic = get_irq_data(irq); |
| 96 | u32 write_offset, msi; | 96 | u32 write_offset, msi; |
| 97 | int idx; | 97 | int idx; |
| 98 | int retry = 0; | ||
| 98 | 99 | ||
| 99 | write_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG); | 100 | write_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG); |
| 100 | pr_debug("axon_msi: original write_offset 0x%x\n", write_offset); | 101 | pr_debug("axon_msi: original write_offset 0x%x\n", write_offset); |
| @@ -102,7 +103,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc) | |||
| 102 | /* write_offset doesn't wrap properly, so we have to mask it */ | 103 | /* write_offset doesn't wrap properly, so we have to mask it */ |
| 103 | write_offset &= MSIC_FIFO_SIZE_MASK; | 104 | write_offset &= MSIC_FIFO_SIZE_MASK; |
| 104 | 105 | ||
| 105 | while (msic->read_offset != write_offset) { | 106 | while (msic->read_offset != write_offset && retry < 100) { |
| 106 | idx = msic->read_offset / sizeof(__le32); | 107 | idx = msic->read_offset / sizeof(__le32); |
| 107 | msi = le32_to_cpu(msic->fifo_virt[idx]); | 108 | msi = le32_to_cpu(msic->fifo_virt[idx]); |
| 108 | msi &= 0xFFFF; | 109 | msi &= 0xFFFF; |
| @@ -110,13 +111,37 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc) | |||
| 110 | pr_debug("axon_msi: woff %x roff %x msi %x\n", | 111 | pr_debug("axon_msi: woff %x roff %x msi %x\n", |
| 111 | write_offset, msic->read_offset, msi); | 112 | write_offset, msic->read_offset, msi); |
| 112 | 113 | ||
| 114 | if (msi < NR_IRQS && irq_map[msi].host == msic->irq_host) { | ||
| 115 | generic_handle_irq(msi); | ||
| 116 | msic->fifo_virt[idx] = cpu_to_le32(0xffffffff); | ||
| 117 | } else { | ||
| 118 | /* | ||
| 119 | * Reading the MSIC_WRITE_OFFSET_REG does not | ||
| 120 | * reliably flush the outstanding DMA to the | ||
| 121 | * FIFO buffer. Here we were reading stale | ||
| 122 | * data, so we need to retry. | ||
| 123 | */ | ||
| 124 | udelay(1); | ||
| 125 | retry++; | ||
| 126 | pr_debug("axon_msi: invalid irq 0x%x!\n", msi); | ||
| 127 | continue; | ||
| 128 | } | ||
| 129 | |||
| 130 | if (retry) { | ||
| 131 | pr_debug("axon_msi: late irq 0x%x, retry %d\n", | ||
| 132 | msi, retry); | ||
| 133 | retry = 0; | ||
| 134 | } | ||
| 135 | |||
| 113 | msic->read_offset += MSIC_FIFO_ENTRY_SIZE; | 136 | msic->read_offset += MSIC_FIFO_ENTRY_SIZE; |
| 114 | msic->read_offset &= MSIC_FIFO_SIZE_MASK; | 137 | msic->read_offset &= MSIC_FIFO_SIZE_MASK; |
| 138 | } | ||
| 115 | 139 | ||
| 116 | if (msi < NR_IRQS && irq_map[msi].host == msic->irq_host) | 140 | if (retry) { |
| 117 | generic_handle_irq(msi); | 141 | printk(KERN_WARNING "axon_msi: irq timed out\n"); |
| 118 | else | 142 | |
| 119 | pr_debug("axon_msi: invalid irq 0x%x!\n", msi); | 143 | msic->read_offset += MSIC_FIFO_ENTRY_SIZE; |
| 144 | msic->read_offset &= MSIC_FIFO_SIZE_MASK; | ||
| 120 | } | 145 | } |
| 121 | 146 | ||
| 122 | desc->chip->eoi(irq); | 147 | desc->chip->eoi(irq); |
| @@ -364,6 +389,7 @@ static int axon_msi_probe(struct of_device *device, | |||
| 364 | dn->full_name); | 389 | dn->full_name); |
| 365 | goto out_free_fifo; | 390 | goto out_free_fifo; |
| 366 | } | 391 | } |
| 392 | memset(msic->fifo_virt, 0xff, MSIC_FIFO_SIZE_BYTES); | ||
| 367 | 393 | ||
| 368 | msic->irq_host = irq_alloc_host(dn, IRQ_HOST_MAP_NOMAP, | 394 | msic->irq_host = irq_alloc_host(dn, IRQ_HOST_MAP_NOMAP, |
| 369 | NR_IRQS, &msic_host_ops, 0); | 395 | NR_IRQS, &msic_host_ops, 0); |
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c index c0d86e1f56ea..9046803c8276 100644 --- a/arch/powerpc/platforms/cell/smp.c +++ b/arch/powerpc/platforms/cell/smp.c | |||
| @@ -129,10 +129,15 @@ static int __init smp_iic_probe(void) | |||
| 129 | return cpus_weight(cpu_possible_map); | 129 | return cpus_weight(cpu_possible_map); |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | static void __devinit smp_iic_setup_cpu(int cpu) | 132 | static void __devinit smp_cell_setup_cpu(int cpu) |
| 133 | { | 133 | { |
| 134 | if (cpu != boot_cpuid) | 134 | if (cpu != boot_cpuid) |
| 135 | iic_setup_cpu(); | 135 | iic_setup_cpu(); |
| 136 | |||
| 137 | /* | ||
| 138 | * change default DABRX to allow user watchpoints | ||
| 139 | */ | ||
| 140 | mtspr(SPRN_DABRX, DABRX_KERNEL | DABRX_USER); | ||
| 136 | } | 141 | } |
| 137 | 142 | ||
| 138 | static DEFINE_SPINLOCK(timebase_lock); | 143 | static DEFINE_SPINLOCK(timebase_lock); |
| @@ -192,7 +197,7 @@ static struct smp_ops_t bpa_iic_smp_ops = { | |||
| 192 | .message_pass = smp_iic_message_pass, | 197 | .message_pass = smp_iic_message_pass, |
| 193 | .probe = smp_iic_probe, | 198 | .probe = smp_iic_probe, |
| 194 | .kick_cpu = smp_cell_kick_cpu, | 199 | .kick_cpu = smp_cell_kick_cpu, |
| 195 | .setup_cpu = smp_iic_setup_cpu, | 200 | .setup_cpu = smp_cell_setup_cpu, |
| 196 | .cpu_bootable = smp_cell_cpu_bootable, | 201 | .cpu_bootable = smp_cell_cpu_bootable, |
| 197 | }; | 202 | }; |
| 198 | 203 | ||
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c index b73c369cc6f1..1b26071a86ca 100644 --- a/arch/powerpc/platforms/cell/spufs/file.c +++ b/arch/powerpc/platforms/cell/spufs/file.c | |||
| @@ -390,6 +390,9 @@ static int spufs_ps_fault(struct vm_area_struct *vma, | |||
| 390 | if (offset >= ps_size) | 390 | if (offset >= ps_size) |
| 391 | return VM_FAULT_SIGBUS; | 391 | return VM_FAULT_SIGBUS; |
| 392 | 392 | ||
| 393 | if (fatal_signal_pending(current)) | ||
| 394 | return VM_FAULT_SIGBUS; | ||
| 395 | |||
| 393 | /* | 396 | /* |
| 394 | * Because we release the mmap_sem, the context may be destroyed while | 397 | * Because we release the mmap_sem, the context may be destroyed while |
| 395 | * we're in spu_wait. Grab an extra reference so it isn't destroyed | 398 | * we're in spu_wait. Grab an extra reference so it isn't destroyed |
diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/arch/powerpc/sysdev/bestcomm/Kconfig index 57cc56562567..0b192a1c429d 100644 --- a/arch/powerpc/sysdev/bestcomm/Kconfig +++ b/arch/powerpc/sysdev/bestcomm/Kconfig | |||
| @@ -17,23 +17,20 @@ config PPC_BESTCOMM | |||
| 17 | answer Y or M. Otherwise say N. | 17 | answer Y or M. Otherwise say N. |
| 18 | 18 | ||
| 19 | config PPC_BESTCOMM_ATA | 19 | config PPC_BESTCOMM_ATA |
| 20 | tristate "Bestcomm ATA task support" | 20 | tristate |
| 21 | depends on PPC_BESTCOMM | 21 | depends on PPC_BESTCOMM |
| 22 | default n | ||
| 23 | help | 22 | help |
| 24 | This option enables the support for the ATA task. | 23 | This option enables the support for the ATA task. |
| 25 | 24 | ||
| 26 | config PPC_BESTCOMM_FEC | 25 | config PPC_BESTCOMM_FEC |
| 27 | tristate "Bestcomm FEC tasks support" | 26 | tristate |
| 28 | depends on PPC_BESTCOMM | 27 | depends on PPC_BESTCOMM |
| 29 | default n | ||
| 30 | help | 28 | help |
| 31 | This option enables the support for the FEC tasks. | 29 | This option enables the support for the FEC tasks. |
| 32 | 30 | ||
| 33 | config PPC_BESTCOMM_GEN_BD | 31 | config PPC_BESTCOMM_GEN_BD |
| 34 | tristate "Bestcomm GenBD tasks support" | 32 | tristate |
| 35 | depends on PPC_BESTCOMM | 33 | depends on PPC_BESTCOMM |
| 36 | default n | ||
| 37 | help | 34 | help |
| 38 | This option enables the support for the GenBD tasks. | 35 | This option enables the support for the GenBD tasks. |
| 39 | 36 | ||
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index f6299cca7814..b24e1d085557 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -1271,6 +1271,7 @@ void __init mpic_set_default_senses(struct mpic *mpic, u8 *senses, int count) | |||
| 1271 | void __init mpic_init(struct mpic *mpic) | 1271 | void __init mpic_init(struct mpic *mpic) |
| 1272 | { | 1272 | { |
| 1273 | int i; | 1273 | int i; |
| 1274 | int cpu; | ||
| 1274 | 1275 | ||
| 1275 | BUG_ON(mpic->num_sources == 0); | 1276 | BUG_ON(mpic->num_sources == 0); |
| 1276 | 1277 | ||
| @@ -1313,6 +1314,11 @@ void __init mpic_init(struct mpic *mpic) | |||
| 1313 | 1314 | ||
| 1314 | mpic_pasemi_msi_init(mpic); | 1315 | mpic_pasemi_msi_init(mpic); |
| 1315 | 1316 | ||
| 1317 | if (mpic->flags & MPIC_PRIMARY) | ||
| 1318 | cpu = hard_smp_processor_id(); | ||
| 1319 | else | ||
| 1320 | cpu = 0; | ||
| 1321 | |||
| 1316 | for (i = 0; i < mpic->num_sources; i++) { | 1322 | for (i = 0; i < mpic->num_sources; i++) { |
| 1317 | /* start with vector = source number, and masked */ | 1323 | /* start with vector = source number, and masked */ |
| 1318 | u32 vecpri = MPIC_VECPRI_MASK | i | | 1324 | u32 vecpri = MPIC_VECPRI_MASK | i | |
| @@ -1323,8 +1329,7 @@ void __init mpic_init(struct mpic *mpic) | |||
| 1323 | continue; | 1329 | continue; |
| 1324 | /* init hw */ | 1330 | /* init hw */ |
| 1325 | mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri); | 1331 | mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri); |
| 1326 | mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), | 1332 | mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu); |
| 1327 | 1 << hard_smp_processor_id()); | ||
| 1328 | } | 1333 | } |
| 1329 | 1334 | ||
| 1330 | /* Init spurious vector */ | 1335 | /* Init spurious vector */ |
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c index b7aefd0d45cb..a22e1a2df1af 100644 --- a/arch/powerpc/sysdev/xilinx_intc.c +++ b/arch/powerpc/sysdev/xilinx_intc.c | |||
| @@ -107,8 +107,8 @@ xilinx_intc_init(struct device_node *np) | |||
| 107 | } | 107 | } |
| 108 | regs = ioremap(res.start, 32); | 108 | regs = ioremap(res.start, 32); |
| 109 | 109 | ||
| 110 | printk(KERN_INFO "Xilinx intc at 0x%08LX mapped to 0x%p\n", | 110 | printk(KERN_INFO "Xilinx intc at 0x%08llx mapped to 0x%p\n", |
| 111 | res.start, regs); | 111 | (unsigned long long) res.start, regs); |
| 112 | 112 | ||
| 113 | /* Setup interrupt controller */ | 113 | /* Setup interrupt controller */ |
| 114 | out_be32(regs + XINTC_IER, 0); /* disable all irqs */ | 114 | out_be32(regs + XINTC_IER, 0); /* disable all irqs */ |
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 9b0bc2c9fba0..a0e748da9909 100644 --- a/arch/s390/defconfig +++ b/arch/s390/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-rc4 | 3 | # Linux kernel version: 2.6.28-rc6 |
| 4 | # Thu Aug 21 19:43:29 2008 | 4 | # Thu Nov 27 11:00:49 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_SCHED_MC=y | 6 | CONFIG_SCHED_MC=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -45,6 +45,7 @@ CONFIG_LOG_BUF_SHIFT=17 | |||
| 45 | CONFIG_CGROUPS=y | 45 | CONFIG_CGROUPS=y |
| 46 | # CONFIG_CGROUP_DEBUG is not set | 46 | # CONFIG_CGROUP_DEBUG is not set |
| 47 | CONFIG_CGROUP_NS=y | 47 | CONFIG_CGROUP_NS=y |
| 48 | # CONFIG_CGROUP_FREEZER is not set | ||
| 48 | # CONFIG_CGROUP_DEVICE is not set | 49 | # CONFIG_CGROUP_DEVICE is not set |
| 49 | # CONFIG_CPUSETS is not set | 50 | # CONFIG_CPUSETS is not set |
| 50 | CONFIG_GROUP_SCHED=y | 51 | CONFIG_GROUP_SCHED=y |
| @@ -84,6 +85,7 @@ CONFIG_SIGNALFD=y | |||
| 84 | CONFIG_TIMERFD=y | 85 | CONFIG_TIMERFD=y |
| 85 | CONFIG_EVENTFD=y | 86 | CONFIG_EVENTFD=y |
| 86 | CONFIG_SHMEM=y | 87 | CONFIG_SHMEM=y |
| 88 | CONFIG_AIO=y | ||
| 87 | CONFIG_VM_EVENT_COUNTERS=y | 89 | CONFIG_VM_EVENT_COUNTERS=y |
| 88 | CONFIG_SLAB=y | 90 | CONFIG_SLAB=y |
| 89 | # CONFIG_SLUB is not set | 91 | # CONFIG_SLUB is not set |
| @@ -92,16 +94,10 @@ CONFIG_SLAB=y | |||
| 92 | # CONFIG_MARKERS is not set | 94 | # CONFIG_MARKERS is not set |
| 93 | CONFIG_HAVE_OPROFILE=y | 95 | CONFIG_HAVE_OPROFILE=y |
| 94 | CONFIG_KPROBES=y | 96 | CONFIG_KPROBES=y |
| 95 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
| 96 | CONFIG_KRETPROBES=y | 97 | CONFIG_KRETPROBES=y |
| 97 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
| 98 | CONFIG_HAVE_KPROBES=y | 98 | CONFIG_HAVE_KPROBES=y |
| 99 | CONFIG_HAVE_KRETPROBES=y | 99 | CONFIG_HAVE_KRETPROBES=y |
| 100 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | 100 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 101 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 102 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
| 103 | # CONFIG_HAVE_CLK is not set | ||
| 104 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 105 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 101 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
| 106 | CONFIG_SLABINFO=y | 102 | CONFIG_SLABINFO=y |
| 107 | CONFIG_RT_MUTEXES=y | 103 | CONFIG_RT_MUTEXES=y |
| @@ -135,6 +131,7 @@ CONFIG_DEFAULT_DEADLINE=y | |||
| 135 | CONFIG_DEFAULT_IOSCHED="deadline" | 131 | CONFIG_DEFAULT_IOSCHED="deadline" |
| 136 | CONFIG_PREEMPT_NOTIFIERS=y | 132 | CONFIG_PREEMPT_NOTIFIERS=y |
| 137 | CONFIG_CLASSIC_RCU=y | 133 | CONFIG_CLASSIC_RCU=y |
| 134 | # CONFIG_FREEZER is not set | ||
| 138 | 135 | ||
| 139 | # | 136 | # |
| 140 | # Base setup | 137 | # Base setup |
| @@ -189,7 +186,6 @@ CONFIG_SELECT_MEMORY_MODEL=y | |||
| 189 | CONFIG_SPARSEMEM_MANUAL=y | 186 | CONFIG_SPARSEMEM_MANUAL=y |
| 190 | CONFIG_SPARSEMEM=y | 187 | CONFIG_SPARSEMEM=y |
| 191 | CONFIG_HAVE_MEMORY_PRESENT=y | 188 | CONFIG_HAVE_MEMORY_PRESENT=y |
| 192 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 193 | CONFIG_SPARSEMEM_EXTREME=y | 189 | CONFIG_SPARSEMEM_EXTREME=y |
| 194 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 190 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 195 | CONFIG_SPARSEMEM_VMEMMAP=y | 191 | CONFIG_SPARSEMEM_VMEMMAP=y |
| @@ -200,9 +196,11 @@ CONFIG_PAGEFLAGS_EXTENDED=y | |||
| 200 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 196 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 201 | CONFIG_MIGRATION=y | 197 | CONFIG_MIGRATION=y |
| 202 | CONFIG_RESOURCES_64BIT=y | 198 | CONFIG_RESOURCES_64BIT=y |
| 199 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
| 203 | CONFIG_ZONE_DMA_FLAG=1 | 200 | CONFIG_ZONE_DMA_FLAG=1 |
| 204 | CONFIG_BOUNCE=y | 201 | CONFIG_BOUNCE=y |
| 205 | CONFIG_VIRT_TO_BUS=y | 202 | CONFIG_VIRT_TO_BUS=y |
| 203 | CONFIG_UNEVICTABLE_LRU=y | ||
| 206 | 204 | ||
| 207 | # | 205 | # |
| 208 | # I/O subsystem configuration | 206 | # I/O subsystem configuration |
| @@ -220,6 +218,8 @@ CONFIG_IPL=y | |||
| 220 | CONFIG_IPL_VM=y | 218 | CONFIG_IPL_VM=y |
| 221 | CONFIG_BINFMT_ELF=y | 219 | CONFIG_BINFMT_ELF=y |
| 222 | CONFIG_COMPAT_BINFMT_ELF=y | 220 | CONFIG_COMPAT_BINFMT_ELF=y |
| 221 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| 222 | # CONFIG_HAVE_AOUT is not set | ||
| 223 | CONFIG_BINFMT_MISC=m | 223 | CONFIG_BINFMT_MISC=m |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=9 | 224 | CONFIG_FORCE_MAX_ZONEORDER=9 |
| 225 | # CONFIG_PROCESS_DEBUG is not set | 225 | # CONFIG_PROCESS_DEBUG is not set |
| @@ -255,7 +255,7 @@ CONFIG_XFRM=y | |||
| 255 | # CONFIG_XFRM_STATISTICS is not set | 255 | # CONFIG_XFRM_STATISTICS is not set |
| 256 | CONFIG_NET_KEY=y | 256 | CONFIG_NET_KEY=y |
| 257 | # CONFIG_NET_KEY_MIGRATE is not set | 257 | # CONFIG_NET_KEY_MIGRATE is not set |
| 258 | CONFIG_IUCV=m | 258 | CONFIG_IUCV=y |
| 259 | CONFIG_AFIUCV=m | 259 | CONFIG_AFIUCV=m |
| 260 | CONFIG_INET=y | 260 | CONFIG_INET=y |
| 261 | CONFIG_IP_MULTICAST=y | 261 | CONFIG_IP_MULTICAST=y |
| @@ -282,7 +282,6 @@ CONFIG_INET_TCP_DIAG=y | |||
| 282 | CONFIG_TCP_CONG_CUBIC=y | 282 | CONFIG_TCP_CONG_CUBIC=y |
| 283 | CONFIG_DEFAULT_TCP_CONG="cubic" | 283 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 284 | # CONFIG_TCP_MD5SIG is not set | 284 | # CONFIG_TCP_MD5SIG is not set |
| 285 | # CONFIG_IP_VS is not set | ||
| 286 | CONFIG_IPV6=y | 285 | CONFIG_IPV6=y |
| 287 | # CONFIG_IPV6_PRIVACY is not set | 286 | # CONFIG_IPV6_PRIVACY is not set |
| 288 | # CONFIG_IPV6_ROUTER_PREF is not set | 287 | # CONFIG_IPV6_ROUTER_PREF is not set |
| @@ -331,10 +330,12 @@ CONFIG_NF_CONNTRACK=m | |||
| 331 | # CONFIG_NF_CONNTRACK_TFTP is not set | 330 | # CONFIG_NF_CONNTRACK_TFTP is not set |
| 332 | # CONFIG_NF_CT_NETLINK is not set | 331 | # CONFIG_NF_CT_NETLINK is not set |
| 333 | # CONFIG_NETFILTER_XTABLES is not set | 332 | # CONFIG_NETFILTER_XTABLES is not set |
| 333 | # CONFIG_IP_VS is not set | ||
| 334 | 334 | ||
| 335 | # | 335 | # |
| 336 | # IP: Netfilter Configuration | 336 | # IP: Netfilter Configuration |
| 337 | # | 337 | # |
| 338 | # CONFIG_NF_DEFRAG_IPV4 is not set | ||
| 338 | # CONFIG_NF_CONNTRACK_IPV4 is not set | 339 | # CONFIG_NF_CONNTRACK_IPV4 is not set |
| 339 | # CONFIG_IP_NF_QUEUE is not set | 340 | # CONFIG_IP_NF_QUEUE is not set |
| 340 | # CONFIG_IP_NF_IPTABLES is not set | 341 | # CONFIG_IP_NF_IPTABLES is not set |
| @@ -374,6 +375,7 @@ CONFIG_NET_SCH_CBQ=m | |||
| 374 | # CONFIG_NET_SCH_HTB is not set | 375 | # CONFIG_NET_SCH_HTB is not set |
| 375 | # CONFIG_NET_SCH_HFSC is not set | 376 | # CONFIG_NET_SCH_HFSC is not set |
| 376 | CONFIG_NET_SCH_PRIO=m | 377 | CONFIG_NET_SCH_PRIO=m |
| 378 | CONFIG_NET_SCH_MULTIQ=y | ||
| 377 | CONFIG_NET_SCH_RED=m | 379 | CONFIG_NET_SCH_RED=m |
| 378 | CONFIG_NET_SCH_SFQ=m | 380 | CONFIG_NET_SCH_SFQ=m |
| 379 | CONFIG_NET_SCH_TEQL=m | 381 | CONFIG_NET_SCH_TEQL=m |
| @@ -406,6 +408,7 @@ CONFIG_NET_ACT_POLICE=y | |||
| 406 | CONFIG_NET_ACT_NAT=m | 408 | CONFIG_NET_ACT_NAT=m |
| 407 | # CONFIG_NET_ACT_PEDIT is not set | 409 | # CONFIG_NET_ACT_PEDIT is not set |
| 408 | # CONFIG_NET_ACT_SIMP is not set | 410 | # CONFIG_NET_ACT_SIMP is not set |
| 411 | # CONFIG_NET_ACT_SKBEDIT is not set | ||
| 409 | # CONFIG_NET_CLS_IND is not set | 412 | # CONFIG_NET_CLS_IND is not set |
| 410 | CONFIG_NET_SCH_FIFO=y | 413 | CONFIG_NET_SCH_FIFO=y |
| 411 | 414 | ||
| @@ -424,6 +427,7 @@ CONFIG_CAN_BCM=m | |||
| 424 | CONFIG_CAN_VCAN=m | 427 | CONFIG_CAN_VCAN=m |
| 425 | # CONFIG_CAN_DEBUG_DEVICES is not set | 428 | # CONFIG_CAN_DEBUG_DEVICES is not set |
| 426 | # CONFIG_AF_RXRPC is not set | 429 | # CONFIG_AF_RXRPC is not set |
| 430 | # CONFIG_PHONET is not set | ||
| 427 | # CONFIG_RFKILL is not set | 431 | # CONFIG_RFKILL is not set |
| 428 | # CONFIG_NET_9P is not set | 432 | # CONFIG_NET_9P is not set |
| 429 | # CONFIG_PCMCIA is not set | 433 | # CONFIG_PCMCIA is not set |
| @@ -473,7 +477,7 @@ CONFIG_VIRTIO_BLK=m | |||
| 473 | CONFIG_MISC_DEVICES=y | 477 | CONFIG_MISC_DEVICES=y |
| 474 | # CONFIG_EEPROM_93CX6 is not set | 478 | # CONFIG_EEPROM_93CX6 is not set |
| 475 | # CONFIG_ENCLOSURE_SERVICES is not set | 479 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 476 | # CONFIG_HAVE_IDE is not set | 480 | # CONFIG_C2PORT is not set |
| 477 | 481 | ||
| 478 | # | 482 | # |
| 479 | # SCSI device support | 483 | # SCSI device support |
| @@ -525,6 +529,7 @@ CONFIG_SCSI_DH_EMC=m | |||
| 525 | CONFIG_SCSI_DH_ALUA=m | 529 | CONFIG_SCSI_DH_ALUA=m |
| 526 | CONFIG_MD=y | 530 | CONFIG_MD=y |
| 527 | CONFIG_BLK_DEV_MD=y | 531 | CONFIG_BLK_DEV_MD=y |
| 532 | CONFIG_MD_AUTODETECT=y | ||
| 528 | CONFIG_MD_LINEAR=m | 533 | CONFIG_MD_LINEAR=m |
| 529 | CONFIG_MD_RAID0=m | 534 | CONFIG_MD_RAID0=m |
| 530 | CONFIG_MD_RAID1=m | 535 | CONFIG_MD_RAID1=m |
| @@ -555,6 +560,9 @@ CONFIG_NET_ETHERNET=y | |||
| 555 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 560 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 556 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 561 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 557 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 562 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 563 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
| 564 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
| 565 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
| 558 | CONFIG_NETDEV_1000=y | 566 | CONFIG_NETDEV_1000=y |
| 559 | CONFIG_NETDEV_10000=y | 567 | CONFIG_NETDEV_10000=y |
| 560 | # CONFIG_TR is not set | 568 | # CONFIG_TR is not set |
| @@ -632,13 +640,12 @@ CONFIG_S390_VMUR=m | |||
| 632 | # CONFIG_THERMAL is not set | 640 | # CONFIG_THERMAL is not set |
| 633 | # CONFIG_THERMAL_HWMON is not set | 641 | # CONFIG_THERMAL_HWMON is not set |
| 634 | # CONFIG_WATCHDOG is not set | 642 | # CONFIG_WATCHDOG is not set |
| 635 | 643 | # CONFIG_REGULATOR is not set | |
| 636 | # | ||
| 637 | # Sonics Silicon Backplane | ||
| 638 | # | ||
| 639 | # CONFIG_MEMSTICK is not set | 644 | # CONFIG_MEMSTICK is not set |
| 640 | # CONFIG_NEW_LEDS is not set | 645 | # CONFIG_NEW_LEDS is not set |
| 641 | CONFIG_ACCESSIBILITY=y | 646 | CONFIG_ACCESSIBILITY=y |
| 647 | # CONFIG_STAGING is not set | ||
| 648 | CONFIG_STAGING_EXCLUDE_BUILD=y | ||
| 642 | 649 | ||
| 643 | # | 650 | # |
| 644 | # File systems | 651 | # File systems |
| @@ -650,13 +657,14 @@ CONFIG_EXT3_FS=y | |||
| 650 | CONFIG_EXT3_FS_XATTR=y | 657 | CONFIG_EXT3_FS_XATTR=y |
| 651 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 658 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
| 652 | # CONFIG_EXT3_FS_SECURITY is not set | 659 | # CONFIG_EXT3_FS_SECURITY is not set |
| 653 | # CONFIG_EXT4DEV_FS is not set | 660 | # CONFIG_EXT4_FS is not set |
| 654 | CONFIG_JBD=y | 661 | CONFIG_JBD=y |
| 655 | # CONFIG_JBD_DEBUG is not set | 662 | # CONFIG_JBD_DEBUG is not set |
| 656 | CONFIG_FS_MBCACHE=y | 663 | CONFIG_FS_MBCACHE=y |
| 657 | # CONFIG_REISERFS_FS is not set | 664 | # CONFIG_REISERFS_FS is not set |
| 658 | # CONFIG_JFS_FS is not set | 665 | # CONFIG_JFS_FS is not set |
| 659 | CONFIG_FS_POSIX_ACL=y | 666 | CONFIG_FS_POSIX_ACL=y |
| 667 | CONFIG_FILE_LOCKING=y | ||
| 660 | # CONFIG_XFS_FS is not set | 668 | # CONFIG_XFS_FS is not set |
| 661 | # CONFIG_GFS2_FS is not set | 669 | # CONFIG_GFS2_FS is not set |
| 662 | # CONFIG_OCFS2_FS is not set | 670 | # CONFIG_OCFS2_FS is not set |
| @@ -688,6 +696,7 @@ CONFIG_GENERIC_ACL=y | |||
| 688 | CONFIG_PROC_FS=y | 696 | CONFIG_PROC_FS=y |
| 689 | CONFIG_PROC_KCORE=y | 697 | CONFIG_PROC_KCORE=y |
| 690 | CONFIG_PROC_SYSCTL=y | 698 | CONFIG_PROC_SYSCTL=y |
| 699 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 691 | CONFIG_SYSFS=y | 700 | CONFIG_SYSFS=y |
| 692 | CONFIG_TMPFS=y | 701 | CONFIG_TMPFS=y |
| 693 | CONFIG_TMPFS_POSIX_ACL=y | 702 | CONFIG_TMPFS_POSIX_ACL=y |
| @@ -728,6 +737,7 @@ CONFIG_LOCKD_V4=y | |||
| 728 | CONFIG_EXPORTFS=y | 737 | CONFIG_EXPORTFS=y |
| 729 | CONFIG_NFS_COMMON=y | 738 | CONFIG_NFS_COMMON=y |
| 730 | CONFIG_SUNRPC=y | 739 | CONFIG_SUNRPC=y |
| 740 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
| 731 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 741 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 732 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 742 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 733 | # CONFIG_SMB_FS is not set | 743 | # CONFIG_SMB_FS is not set |
| @@ -800,12 +810,24 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
| 800 | # CONFIG_DEBUG_SG is not set | 810 | # CONFIG_DEBUG_SG is not set |
| 801 | # CONFIG_FRAME_POINTER is not set | 811 | # CONFIG_FRAME_POINTER is not set |
| 802 | # CONFIG_RCU_TORTURE_TEST is not set | 812 | # CONFIG_RCU_TORTURE_TEST is not set |
| 813 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
| 803 | # CONFIG_KPROBES_SANITY_TEST is not set | 814 | # CONFIG_KPROBES_SANITY_TEST is not set |
| 804 | # CONFIG_BACKTRACE_SELF_TEST is not set | 815 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 816 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
| 805 | # CONFIG_LKDTM is not set | 817 | # CONFIG_LKDTM is not set |
| 806 | # CONFIG_FAULT_INJECTION is not set | 818 | # CONFIG_FAULT_INJECTION is not set |
| 807 | # CONFIG_LATENCYTOP is not set | 819 | # CONFIG_LATENCYTOP is not set |
| 808 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 820 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 821 | |||
| 822 | # | ||
| 823 | # Tracers | ||
| 824 | # | ||
| 825 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 826 | # CONFIG_PREEMPT_TRACER is not set | ||
| 827 | # CONFIG_SCHED_TRACER is not set | ||
| 828 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
| 829 | # CONFIG_BOOT_TRACER is not set | ||
| 830 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
| 809 | CONFIG_SAMPLES=y | 831 | CONFIG_SAMPLES=y |
| 810 | # CONFIG_SAMPLE_KOBJECT is not set | 832 | # CONFIG_SAMPLE_KOBJECT is not set |
| 811 | # CONFIG_SAMPLE_KPROBES is not set | 833 | # CONFIG_SAMPLE_KPROBES is not set |
| @@ -816,16 +838,19 @@ CONFIG_SAMPLES=y | |||
| 816 | # | 838 | # |
| 817 | # CONFIG_KEYS is not set | 839 | # CONFIG_KEYS is not set |
| 818 | # CONFIG_SECURITY is not set | 840 | # CONFIG_SECURITY is not set |
| 841 | # CONFIG_SECURITYFS is not set | ||
| 819 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 842 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 820 | CONFIG_CRYPTO=y | 843 | CONFIG_CRYPTO=y |
| 821 | 844 | ||
| 822 | # | 845 | # |
| 823 | # Crypto core or helper | 846 | # Crypto core or helper |
| 824 | # | 847 | # |
| 848 | CONFIG_CRYPTO_FIPS=y | ||
| 825 | CONFIG_CRYPTO_ALGAPI=y | 849 | CONFIG_CRYPTO_ALGAPI=y |
| 826 | CONFIG_CRYPTO_AEAD=m | 850 | CONFIG_CRYPTO_AEAD=y |
| 827 | CONFIG_CRYPTO_BLKCIPHER=y | 851 | CONFIG_CRYPTO_BLKCIPHER=y |
| 828 | CONFIG_CRYPTO_HASH=m | 852 | CONFIG_CRYPTO_HASH=y |
| 853 | CONFIG_CRYPTO_RNG=y | ||
| 829 | CONFIG_CRYPTO_MANAGER=y | 854 | CONFIG_CRYPTO_MANAGER=y |
| 830 | CONFIG_CRYPTO_GF128MUL=m | 855 | CONFIG_CRYPTO_GF128MUL=m |
| 831 | # CONFIG_CRYPTO_NULL is not set | 856 | # CONFIG_CRYPTO_NULL is not set |
| @@ -877,7 +902,7 @@ CONFIG_CRYPTO_SHA1=m | |||
| 877 | # | 902 | # |
| 878 | # Ciphers | 903 | # Ciphers |
| 879 | # | 904 | # |
| 880 | # CONFIG_CRYPTO_AES is not set | 905 | CONFIG_CRYPTO_AES=m |
| 881 | # CONFIG_CRYPTO_ANUBIS is not set | 906 | # CONFIG_CRYPTO_ANUBIS is not set |
| 882 | # CONFIG_CRYPTO_ARC4 is not set | 907 | # CONFIG_CRYPTO_ARC4 is not set |
| 883 | # CONFIG_CRYPTO_BLOWFISH is not set | 908 | # CONFIG_CRYPTO_BLOWFISH is not set |
| @@ -898,6 +923,11 @@ CONFIG_CRYPTO_SEED=m | |||
| 898 | # | 923 | # |
| 899 | # CONFIG_CRYPTO_DEFLATE is not set | 924 | # CONFIG_CRYPTO_DEFLATE is not set |
| 900 | CONFIG_CRYPTO_LZO=m | 925 | CONFIG_CRYPTO_LZO=m |
| 926 | |||
| 927 | # | ||
| 928 | # Random Number Generation | ||
| 929 | # | ||
| 930 | CONFIG_CRYPTO_ANSI_CPRNG=m | ||
| 901 | CONFIG_CRYPTO_HW=y | 931 | CONFIG_CRYPTO_HW=y |
| 902 | CONFIG_ZCRYPT=m | 932 | CONFIG_ZCRYPT=m |
| 903 | # CONFIG_ZCRYPT_MONOLITHIC is not set | 933 | # CONFIG_ZCRYPT_MONOLITHIC is not set |
| @@ -912,8 +942,6 @@ CONFIG_S390_PRNG=m | |||
| 912 | # Library routines | 942 | # Library routines |
| 913 | # | 943 | # |
| 914 | CONFIG_BITREVERSE=m | 944 | CONFIG_BITREVERSE=m |
| 915 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 916 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 917 | # CONFIG_CRC_CCITT is not set | 945 | # CONFIG_CRC_CCITT is not set |
| 918 | # CONFIG_CRC16 is not set | 946 | # CONFIG_CRC16 is not set |
| 919 | CONFIG_CRC_T10DIF=y | 947 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 7fc76133b3e4..5caddd4f7bed 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h | |||
| @@ -679,8 +679,6 @@ static inline void pmd_clear(pmd_t *pmd) | |||
| 679 | 679 | ||
| 680 | static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | 680 | static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) |
| 681 | { | 681 | { |
| 682 | if (mm->context.has_pgste) | ||
| 683 | ptep_rcp_copy(ptep); | ||
| 684 | pte_val(*ptep) = _PAGE_TYPE_EMPTY; | 682 | pte_val(*ptep) = _PAGE_TYPE_EMPTY; |
| 685 | if (mm->context.noexec) | 683 | if (mm->context.noexec) |
| 686 | pte_val(ptep[PTRS_PER_PTE]) = _PAGE_TYPE_EMPTY; | 684 | pte_val(ptep[PTRS_PER_PTE]) = _PAGE_TYPE_EMPTY; |
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h index a7226f8143fb..5396f9f12263 100644 --- a/arch/s390/include/asm/ptrace.h +++ b/arch/s390/include/asm/ptrace.h | |||
| @@ -321,8 +321,8 @@ struct pt_regs | |||
| 321 | psw_t psw; | 321 | psw_t psw; |
| 322 | unsigned long gprs[NUM_GPRS]; | 322 | unsigned long gprs[NUM_GPRS]; |
| 323 | unsigned long orig_gpr2; | 323 | unsigned long orig_gpr2; |
| 324 | unsigned short svcnr; | ||
| 324 | unsigned short ilc; | 325 | unsigned short ilc; |
| 325 | unsigned short trap; | ||
| 326 | }; | 326 | }; |
| 327 | #endif | 327 | #endif |
| 328 | 328 | ||
| @@ -486,8 +486,6 @@ struct task_struct; | |||
| 486 | extern void user_enable_single_step(struct task_struct *); | 486 | extern void user_enable_single_step(struct task_struct *); |
| 487 | extern void user_disable_single_step(struct task_struct *); | 487 | extern void user_disable_single_step(struct task_struct *); |
| 488 | 488 | ||
| 489 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
| 490 | |||
| 491 | #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0) | 489 | #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0) |
| 492 | #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN) | 490 | #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN) |
| 493 | #define user_stack_pointer(regs)((regs)->gprs[15]) | 491 | #define user_stack_pointer(regs)((regs)->gprs[15]) |
diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h index 6e623971fbb9..2429b87eb28d 100644 --- a/arch/s390/include/asm/syscall.h +++ b/arch/s390/include/asm/syscall.h | |||
| @@ -17,9 +17,7 @@ | |||
| 17 | static inline long syscall_get_nr(struct task_struct *task, | 17 | static inline long syscall_get_nr(struct task_struct *task, |
| 18 | struct pt_regs *regs) | 18 | struct pt_regs *regs) |
| 19 | { | 19 | { |
| 20 | if (regs->trap != __LC_SVC_OLD_PSW) | 20 | return regs->svcnr ? regs->svcnr : -1; |
| 21 | return -1; | ||
| 22 | return regs->gprs[2]; | ||
| 23 | } | 21 | } |
| 24 | 22 | ||
| 25 | static inline void syscall_rollback(struct task_struct *task, | 23 | static inline void syscall_rollback(struct task_struct *task, |
| @@ -52,18 +50,20 @@ static inline void syscall_get_arguments(struct task_struct *task, | |||
| 52 | unsigned int i, unsigned int n, | 50 | unsigned int i, unsigned int n, |
| 53 | unsigned long *args) | 51 | unsigned long *args) |
| 54 | { | 52 | { |
| 53 | unsigned long mask = -1UL; | ||
| 54 | |||
| 55 | BUG_ON(i + n > 6); | 55 | BUG_ON(i + n > 6); |
| 56 | #ifdef CONFIG_COMPAT | 56 | #ifdef CONFIG_COMPAT |
| 57 | if (test_tsk_thread_flag(task, TIF_31BIT)) { | 57 | if (test_tsk_thread_flag(task, TIF_31BIT)) |
| 58 | if (i + n == 6) | 58 | mask = 0xffffffff; |
| 59 | args[--n] = (u32) regs->args[0]; | ||
| 60 | while (n-- > 0) | ||
| 61 | args[n] = (u32) regs->gprs[2 + i + n]; | ||
| 62 | } | ||
| 63 | #endif | 59 | #endif |
| 64 | if (i + n == 6) | 60 | if (i + n == 6) |
| 65 | args[--n] = regs->args[0]; | 61 | args[--n] = regs->args[0] & mask; |
| 66 | memcpy(args, ®s->gprs[2 + i], n * sizeof(args[0])); | 62 | while (n-- > 0) |
| 63 | if (i + n > 0) | ||
| 64 | args[n] = regs->gprs[2 + i + n] & mask; | ||
| 65 | if (i == 0) | ||
| 66 | args[0] = regs->orig_gpr2 & mask; | ||
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | static inline void syscall_set_arguments(struct task_struct *task, | 69 | static inline void syscall_set_arguments(struct task_struct *task, |
| @@ -74,7 +74,11 @@ static inline void syscall_set_arguments(struct task_struct *task, | |||
| 74 | BUG_ON(i + n > 6); | 74 | BUG_ON(i + n > 6); |
| 75 | if (i + n == 6) | 75 | if (i + n == 6) |
| 76 | regs->args[0] = args[--n]; | 76 | regs->args[0] = args[--n]; |
| 77 | memcpy(®s->gprs[2 + i], args, n * sizeof(args[0])); | 77 | while (n-- > 0) |
| 78 | if (i + n > 0) | ||
| 79 | regs->gprs[2 + i + n] = args[n]; | ||
| 80 | if (i == 0) | ||
| 81 | regs->orig_gpr2 = args[0]; | ||
| 78 | } | 82 | } |
| 79 | 83 | ||
| 80 | #endif /* _ASM_SYSCALL_H */ | 84 | #endif /* _ASM_SYSCALL_H */ |
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c index fa28ecae636b..3d144e6020c6 100644 --- a/arch/s390/kernel/asm-offsets.c +++ b/arch/s390/kernel/asm-offsets.c | |||
| @@ -32,7 +32,7 @@ int main(void) | |||
| 32 | DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs)); | 32 | DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs)); |
| 33 | DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2)); | 33 | DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2)); |
| 34 | DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc)); | 34 | DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc)); |
| 35 | DEFINE(__PT_TRAP, offsetof(struct pt_regs, trap)); | 35 | DEFINE(__PT_SVCNR, offsetof(struct pt_regs, svcnr)); |
| 36 | DEFINE(__PT_SIZE, sizeof(struct pt_regs)); | 36 | DEFINE(__PT_SIZE, sizeof(struct pt_regs)); |
| 37 | BLANK(); | 37 | BLANK(); |
| 38 | DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain)); | 38 | DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain)); |
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c index c7f02e777af2..b537cb0e9b55 100644 --- a/arch/s390/kernel/compat_signal.c +++ b/arch/s390/kernel/compat_signal.c | |||
| @@ -340,7 +340,7 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs) | |||
| 340 | return err; | 340 | return err; |
| 341 | 341 | ||
| 342 | restore_fp_regs(¤t->thread.fp_regs); | 342 | restore_fp_regs(¤t->thread.fp_regs); |
| 343 | regs->trap = -1; /* disable syscall checks */ | 343 | regs->svcnr = 0; /* disable syscall checks */ |
| 344 | return 0; | 344 | return 0; |
| 345 | } | 345 | } |
| 346 | 346 | ||
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 08844fc24a2e..198ea18a534d 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
| @@ -46,7 +46,7 @@ SP_R14 = STACK_FRAME_OVERHEAD + __PT_GPRS + 56 | |||
| 46 | SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 60 | 46 | SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 60 |
| 47 | SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2 | 47 | SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2 |
| 48 | SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC | 48 | SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC |
| 49 | SP_TRAP = STACK_FRAME_OVERHEAD + __PT_TRAP | 49 | SP_SVCNR = STACK_FRAME_OVERHEAD + __PT_SVCNR |
| 50 | SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE | 50 | SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE |
| 51 | 51 | ||
| 52 | _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ | 52 | _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ |
| @@ -183,11 +183,10 @@ STACK_SIZE = 1 << STACK_SHIFT | |||
| 183 | .macro CREATE_STACK_FRAME psworg,savearea | 183 | .macro CREATE_STACK_FRAME psworg,savearea |
| 184 | s %r15,BASED(.Lc_spsize) # make room for registers & psw | 184 | s %r15,BASED(.Lc_spsize) # make room for registers & psw |
| 185 | mvc SP_PSW(8,%r15),0(%r12) # move user PSW to stack | 185 | mvc SP_PSW(8,%r15),0(%r12) # move user PSW to stack |
| 186 | la %r12,\psworg | ||
| 187 | st %r2,SP_ORIG_R2(%r15) # store original content of gpr 2 | 186 | st %r2,SP_ORIG_R2(%r15) # store original content of gpr 2 |
| 188 | icm %r12,12,__LC_SVC_ILC | 187 | icm %r12,3,__LC_SVC_ILC |
| 189 | stm %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack | 188 | stm %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack |
| 190 | st %r12,SP_ILC(%r15) | 189 | st %r12,SP_SVCNR(%r15) |
| 191 | mvc SP_R12(16,%r15),\savearea # move %r12-%r15 to stack | 190 | mvc SP_R12(16,%r15),\savearea # move %r12-%r15 to stack |
| 192 | la %r12,0 | 191 | la %r12,0 |
| 193 | st %r12,__SF_BACKCHAIN(%r15) # clear back chain | 192 | st %r12,__SF_BACKCHAIN(%r15) # clear back chain |
| @@ -264,16 +263,17 @@ sysc_update: | |||
| 264 | #endif | 263 | #endif |
| 265 | sysc_do_svc: | 264 | sysc_do_svc: |
| 266 | l %r9,__LC_THREAD_INFO # load pointer to thread_info struct | 265 | l %r9,__LC_THREAD_INFO # load pointer to thread_info struct |
| 267 | sla %r7,2 # *4 and test for svc 0 | 266 | ltr %r7,%r7 # test for svc 0 |
| 268 | bnz BASED(sysc_nr_ok) # svc number > 0 | 267 | bnz BASED(sysc_nr_ok) # svc number > 0 |
| 269 | # svc 0: system call number in %r1 | 268 | # svc 0: system call number in %r1 |
| 270 | cl %r1,BASED(.Lnr_syscalls) | 269 | cl %r1,BASED(.Lnr_syscalls) |
| 271 | bnl BASED(sysc_nr_ok) | 270 | bnl BASED(sysc_nr_ok) |
| 272 | lr %r7,%r1 # copy svc number to %r7 | 271 | lr %r7,%r1 # copy svc number to %r7 |
| 273 | sla %r7,2 # *4 | ||
| 274 | sysc_nr_ok: | 272 | sysc_nr_ok: |
| 275 | mvc SP_ARGS(4,%r15),SP_R7(%r15) | 273 | mvc SP_ARGS(4,%r15),SP_R7(%r15) |
| 276 | sysc_do_restart: | 274 | sysc_do_restart: |
| 275 | sth %r7,SP_SVCNR(%r15) | ||
| 276 | sll %r7,2 # svc number *4 | ||
| 277 | l %r8,BASED(.Lsysc_table) | 277 | l %r8,BASED(.Lsysc_table) |
| 278 | tm __TI_flags+3(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT) | 278 | tm __TI_flags+3(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT) |
| 279 | l %r8,0(%r7,%r8) # get system call addr. | 279 | l %r8,0(%r7,%r8) # get system call addr. |
| @@ -376,7 +376,6 @@ sysc_notify_resume: | |||
| 376 | sysc_restart: | 376 | sysc_restart: |
| 377 | ni __TI_flags+3(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC | 377 | ni __TI_flags+3(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC |
| 378 | l %r7,SP_R2(%r15) # load new svc number | 378 | l %r7,SP_R2(%r15) # load new svc number |
| 379 | sla %r7,2 | ||
| 380 | mvc SP_R2(4,%r15),SP_ORIG_R2(%r15) # restore first argument | 379 | mvc SP_R2(4,%r15),SP_ORIG_R2(%r15) # restore first argument |
| 381 | lm %r2,%r6,SP_R2(%r15) # load svc arguments | 380 | lm %r2,%r6,SP_R2(%r15) # load svc arguments |
| 382 | b BASED(sysc_do_restart) # restart svc | 381 | b BASED(sysc_do_restart) # restart svc |
| @@ -386,7 +385,8 @@ sysc_restart: | |||
| 386 | # | 385 | # |
| 387 | sysc_singlestep: | 386 | sysc_singlestep: |
| 388 | ni __TI_flags+3(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP | 387 | ni __TI_flags+3(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP |
| 389 | mvi SP_TRAP+1(%r15),0x28 # set trap indication to pgm check | 388 | mvi SP_SVCNR(%r15),0xff # set trap indication to pgm check |
| 389 | mvi SP_SVCNR+1(%r15),0xff | ||
| 390 | la %r2,SP_PTREGS(%r15) # address of register-save area | 390 | la %r2,SP_PTREGS(%r15) # address of register-save area |
| 391 | l %r1,BASED(.Lhandle_per) # load adr. of per handler | 391 | l %r1,BASED(.Lhandle_per) # load adr. of per handler |
| 392 | la %r14,BASED(sysc_return) # load adr. of system return | 392 | la %r14,BASED(sysc_return) # load adr. of system return |
| @@ -407,7 +407,7 @@ sysc_tracesys: | |||
| 407 | bnl BASED(sysc_tracenogo) | 407 | bnl BASED(sysc_tracenogo) |
| 408 | l %r8,BASED(.Lsysc_table) | 408 | l %r8,BASED(.Lsysc_table) |
| 409 | lr %r7,%r2 | 409 | lr %r7,%r2 |
| 410 | sll %r7,2 # *4 | 410 | sll %r7,2 # svc number *4 |
| 411 | l %r8,0(%r7,%r8) | 411 | l %r8,0(%r7,%r8) |
| 412 | sysc_tracego: | 412 | sysc_tracego: |
| 413 | lm %r3,%r6,SP_R3(%r15) | 413 | lm %r3,%r6,SP_R3(%r15) |
| @@ -586,7 +586,8 @@ pgm_svcper: | |||
| 586 | # per was called from kernel, must be kprobes | 586 | # per was called from kernel, must be kprobes |
| 587 | # | 587 | # |
| 588 | kernel_per: | 588 | kernel_per: |
| 589 | mvi SP_TRAP+1(%r15),0x28 # set trap indication to pgm check | 589 | mvi SP_SVCNR(%r15),0xff # set trap indication to pgm check |
| 590 | mvi SP_SVCNR+1(%r15),0xff | ||
| 590 | la %r2,SP_PTREGS(%r15) # address of register-save area | 591 | la %r2,SP_PTREGS(%r15) # address of register-save area |
| 591 | l %r1,BASED(.Lhandle_per) # load adr. of per handler | 592 | l %r1,BASED(.Lhandle_per) # load adr. of per handler |
| 592 | la %r14,BASED(sysc_restore)# load adr. of system return | 593 | la %r14,BASED(sysc_restore)# load adr. of system return |
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index 41aca06682aa..89c121ae6339 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
| @@ -46,7 +46,7 @@ SP_R14 = STACK_FRAME_OVERHEAD + __PT_GPRS + 112 | |||
| 46 | SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 120 | 46 | SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 120 |
| 47 | SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2 | 47 | SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2 |
| 48 | SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC | 48 | SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC |
| 49 | SP_TRAP = STACK_FRAME_OVERHEAD + __PT_TRAP | 49 | SP_SVCNR = STACK_FRAME_OVERHEAD + __PT_SVCNR |
| 50 | SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE | 50 | SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE |
| 51 | 51 | ||
| 52 | STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER | 52 | STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER |
| @@ -171,11 +171,10 @@ _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \ | |||
| 171 | .macro CREATE_STACK_FRAME psworg,savearea | 171 | .macro CREATE_STACK_FRAME psworg,savearea |
| 172 | aghi %r15,-SP_SIZE # make room for registers & psw | 172 | aghi %r15,-SP_SIZE # make room for registers & psw |
| 173 | mvc SP_PSW(16,%r15),0(%r12) # move user PSW to stack | 173 | mvc SP_PSW(16,%r15),0(%r12) # move user PSW to stack |
| 174 | la %r12,\psworg | ||
| 175 | stg %r2,SP_ORIG_R2(%r15) # store original content of gpr 2 | 174 | stg %r2,SP_ORIG_R2(%r15) # store original content of gpr 2 |
| 176 | icm %r12,12,__LC_SVC_ILC | 175 | icm %r12,3,__LC_SVC_ILC |
| 177 | stmg %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack | 176 | stmg %r0,%r11,SP_R0(%r15) # store gprs %r0-%r11 to kernel stack |
| 178 | st %r12,SP_ILC(%r15) | 177 | st %r12,SP_SVCNR(%r15) |
| 179 | mvc SP_R12(32,%r15),\savearea # move %r12-%r15 to stack | 178 | mvc SP_R12(32,%r15),\savearea # move %r12-%r15 to stack |
| 180 | la %r12,0 | 179 | la %r12,0 |
| 181 | stg %r12,__SF_BACKCHAIN(%r15) | 180 | stg %r12,__SF_BACKCHAIN(%r15) |
| @@ -250,16 +249,17 @@ sysc_update: | |||
| 250 | #endif | 249 | #endif |
| 251 | sysc_do_svc: | 250 | sysc_do_svc: |
| 252 | lg %r9,__LC_THREAD_INFO # load pointer to thread_info struct | 251 | lg %r9,__LC_THREAD_INFO # load pointer to thread_info struct |
| 253 | slag %r7,%r7,2 # *4 and test for svc 0 | 252 | ltgr %r7,%r7 # test for svc 0 |
| 254 | jnz sysc_nr_ok | 253 | jnz sysc_nr_ok |
| 255 | # svc 0: system call number in %r1 | 254 | # svc 0: system call number in %r1 |
| 256 | cl %r1,BASED(.Lnr_syscalls) | 255 | cl %r1,BASED(.Lnr_syscalls) |
| 257 | jnl sysc_nr_ok | 256 | jnl sysc_nr_ok |
| 258 | lgfr %r7,%r1 # clear high word in r1 | 257 | lgfr %r7,%r1 # clear high word in r1 |
| 259 | slag %r7,%r7,2 # svc 0: system call number in %r1 | ||
| 260 | sysc_nr_ok: | 258 | sysc_nr_ok: |
| 261 | mvc SP_ARGS(8,%r15),SP_R7(%r15) | 259 | mvc SP_ARGS(8,%r15),SP_R7(%r15) |
| 262 | sysc_do_restart: | 260 | sysc_do_restart: |
| 261 | sth %r7,SP_SVCNR(%r15) | ||
| 262 | sllg %r7,%r7,2 # svc number * 4 | ||
| 263 | larl %r10,sys_call_table | 263 | larl %r10,sys_call_table |
| 264 | #ifdef CONFIG_COMPAT | 264 | #ifdef CONFIG_COMPAT |
| 265 | tm __TI_flags+5(%r9),(_TIF_31BIT>>16) # running in 31 bit mode ? | 265 | tm __TI_flags+5(%r9),(_TIF_31BIT>>16) # running in 31 bit mode ? |
| @@ -363,7 +363,6 @@ sysc_notify_resume: | |||
| 363 | sysc_restart: | 363 | sysc_restart: |
| 364 | ni __TI_flags+7(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC | 364 | ni __TI_flags+7(%r9),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC |
| 365 | lg %r7,SP_R2(%r15) # load new svc number | 365 | lg %r7,SP_R2(%r15) # load new svc number |
| 366 | slag %r7,%r7,2 # *4 | ||
| 367 | mvc SP_R2(8,%r15),SP_ORIG_R2(%r15) # restore first argument | 366 | mvc SP_R2(8,%r15),SP_ORIG_R2(%r15) # restore first argument |
| 368 | lmg %r2,%r6,SP_R2(%r15) # load svc arguments | 367 | lmg %r2,%r6,SP_R2(%r15) # load svc arguments |
| 369 | j sysc_do_restart # restart svc | 368 | j sysc_do_restart # restart svc |
| @@ -372,9 +371,8 @@ sysc_restart: | |||
| 372 | # _TIF_SINGLE_STEP is set, call do_single_step | 371 | # _TIF_SINGLE_STEP is set, call do_single_step |
| 373 | # | 372 | # |
| 374 | sysc_singlestep: | 373 | sysc_singlestep: |
| 375 | ni __TI_flags+7(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP | 374 | ni __TI_flags+7(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP |
| 376 | lhi %r0,__LC_PGM_OLD_PSW | 375 | xc SP_SVCNR(2,%r15),SP_SVCNR(%r15) # clear svc number |
| 377 | sth %r0,SP_TRAP(%r15) # set trap indication to pgm check | ||
| 378 | la %r2,SP_PTREGS(%r15) # address of register-save area | 376 | la %r2,SP_PTREGS(%r15) # address of register-save area |
| 379 | larl %r14,sysc_return # load adr. of system return | 377 | larl %r14,sysc_return # load adr. of system return |
| 380 | jg do_single_step # branch to do_sigtrap | 378 | jg do_single_step # branch to do_sigtrap |
| @@ -392,7 +390,7 @@ sysc_tracesys: | |||
| 392 | lghi %r0,NR_syscalls | 390 | lghi %r0,NR_syscalls |
| 393 | clgr %r0,%r2 | 391 | clgr %r0,%r2 |
| 394 | jnh sysc_tracenogo | 392 | jnh sysc_tracenogo |
| 395 | slag %r7,%r2,2 # *4 | 393 | sllg %r7,%r2,2 # svc number *4 |
| 396 | lgf %r8,0(%r7,%r10) | 394 | lgf %r8,0(%r7,%r10) |
| 397 | sysc_tracego: | 395 | sysc_tracego: |
| 398 | lmg %r3,%r6,SP_R3(%r15) | 396 | lmg %r3,%r6,SP_R3(%r15) |
| @@ -567,8 +565,7 @@ pgm_svcper: | |||
| 567 | # per was called from kernel, must be kprobes | 565 | # per was called from kernel, must be kprobes |
| 568 | # | 566 | # |
| 569 | kernel_per: | 567 | kernel_per: |
| 570 | lhi %r0,__LC_PGM_OLD_PSW | 568 | xc SP_SVCNR(2,%r15),SP_SVCNR(%r15) # clear svc number |
| 571 | sth %r0,SP_TRAP(%r15) # set trap indication to pgm check | ||
| 572 | la %r2,SP_PTREGS(%r15) # address of register-save area | 569 | la %r2,SP_PTREGS(%r15) # address of register-save area |
| 573 | larl %r14,sysc_restore # load adr. of system ret, no work | 570 | larl %r14,sysc_restore # load adr. of system ret, no work |
| 574 | jg do_single_step # branch to do_single_step | 571 | jg do_single_step # branch to do_single_step |
diff --git a/arch/s390/kernel/init_task.c b/arch/s390/kernel/init_task.c index 7ad003969251..e80716843619 100644 --- a/arch/s390/kernel/init_task.c +++ b/arch/s390/kernel/init_task.c | |||
| @@ -26,7 +26,7 @@ EXPORT_SYMBOL(init_mm); | |||
| 26 | /* | 26 | /* |
| 27 | * Initial thread structure. | 27 | * Initial thread structure. |
| 28 | * | 28 | * |
| 29 | * We need to make sure that this is 8192-byte aligned due to the | 29 | * We need to make sure that this is THREAD_SIZE aligned due to the |
| 30 | * way process stacks are handled. This is done by having a special | 30 | * way process stacks are handled. This is done by having a special |
| 31 | * "init_task" linker map entry.. | 31 | * "init_task" linker map entry.. |
| 32 | */ | 32 | */ |
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index 1f31be1ecc4b..38ff2bce1203 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c | |||
| @@ -657,7 +657,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) | |||
| 657 | * debugger stored an invalid system call number. Skip | 657 | * debugger stored an invalid system call number. Skip |
| 658 | * the system call and the system call restart handling. | 658 | * the system call and the system call restart handling. |
| 659 | */ | 659 | */ |
| 660 | regs->trap = -1; | 660 | regs->svcnr = 0; |
| 661 | ret = -1; | 661 | ret = -1; |
| 662 | } | 662 | } |
| 663 | 663 | ||
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c index 4f7fc3059a8e..8e6812a22670 100644 --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c | |||
| @@ -160,7 +160,7 @@ static int restore_sigregs(struct pt_regs *regs, _sigregs __user *sregs) | |||
| 160 | current->thread.fp_regs.fpc &= FPC_VALID_MASK; | 160 | current->thread.fp_regs.fpc &= FPC_VALID_MASK; |
| 161 | 161 | ||
| 162 | restore_fp_regs(¤t->thread.fp_regs); | 162 | restore_fp_regs(¤t->thread.fp_regs); |
| 163 | regs->trap = -1; /* disable syscall checks */ | 163 | regs->svcnr = 0; /* disable syscall checks */ |
| 164 | return 0; | 164 | return 0; |
| 165 | } | 165 | } |
| 166 | 166 | ||
| @@ -445,7 +445,7 @@ void do_signal(struct pt_regs *regs) | |||
| 445 | oldset = ¤t->blocked; | 445 | oldset = ¤t->blocked; |
| 446 | 446 | ||
| 447 | /* Are we from a system call? */ | 447 | /* Are we from a system call? */ |
| 448 | if (regs->trap == __LC_SVC_OLD_PSW) { | 448 | if (regs->svcnr) { |
| 449 | continue_addr = regs->psw.addr; | 449 | continue_addr = regs->psw.addr; |
| 450 | restart_addr = continue_addr - regs->ilc; | 450 | restart_addr = continue_addr - regs->ilc; |
| 451 | retval = regs->gprs[2]; | 451 | retval = regs->gprs[2]; |
| @@ -462,7 +462,7 @@ void do_signal(struct pt_regs *regs) | |||
| 462 | case -ERESTART_RESTARTBLOCK: | 462 | case -ERESTART_RESTARTBLOCK: |
| 463 | regs->gprs[2] = -EINTR; | 463 | regs->gprs[2] = -EINTR; |
| 464 | } | 464 | } |
| 465 | regs->trap = -1; /* Don't deal with this again. */ | 465 | regs->svcnr = 0; /* Don't deal with this again. */ |
| 466 | } | 466 | } |
| 467 | 467 | ||
| 468 | /* Get signal to deliver. When running under ptrace, at this point | 468 | /* Get signal to deliver. When running under ptrace, at this point |
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index b94e9e3b694a..eccefbbff887 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | 59 | ||
| 60 | static ext_int_info_t ext_int_info_cc; | 60 | static ext_int_info_t ext_int_info_cc; |
| 61 | static ext_int_info_t ext_int_etr_cc; | 61 | static ext_int_info_t ext_int_etr_cc; |
| 62 | static u64 jiffies_timer_cc; | 62 | static u64 sched_clock_base_cc; |
| 63 | 63 | ||
| 64 | static DEFINE_PER_CPU(struct clock_event_device, comparators); | 64 | static DEFINE_PER_CPU(struct clock_event_device, comparators); |
| 65 | 65 | ||
| @@ -68,7 +68,7 @@ static DEFINE_PER_CPU(struct clock_event_device, comparators); | |||
| 68 | */ | 68 | */ |
| 69 | unsigned long long sched_clock(void) | 69 | unsigned long long sched_clock(void) |
| 70 | { | 70 | { |
| 71 | return ((get_clock_xt() - jiffies_timer_cc) * 125) >> 9; | 71 | return ((get_clock_xt() - sched_clock_base_cc) * 125) >> 9; |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | /* | 74 | /* |
| @@ -229,13 +229,10 @@ static struct clocksource clocksource_tod = { | |||
| 229 | */ | 229 | */ |
| 230 | void __init time_init(void) | 230 | void __init time_init(void) |
| 231 | { | 231 | { |
| 232 | u64 init_timer_cc; | 232 | sched_clock_base_cc = reset_tod_clock(); |
| 233 | |||
| 234 | init_timer_cc = reset_tod_clock(); | ||
| 235 | jiffies_timer_cc = init_timer_cc - jiffies_64 * CLK_TICKS_PER_JIFFY; | ||
| 236 | 233 | ||
| 237 | /* set xtime */ | 234 | /* set xtime */ |
| 238 | tod_to_timeval(init_timer_cc - TOD_UNIX_EPOCH, &xtime); | 235 | tod_to_timeval(sched_clock_base_cc - TOD_UNIX_EPOCH, &xtime); |
| 239 | set_normalized_timespec(&wall_to_monotonic, | 236 | set_normalized_timespec(&wall_to_monotonic, |
| 240 | -xtime.tv_sec, -xtime.tv_nsec); | 237 | -xtime.tv_sec, -xtime.tv_nsec); |
| 241 | 238 | ||
| @@ -289,7 +286,7 @@ static unsigned long long adjust_time(unsigned long long old, | |||
| 289 | delta = -delta; | 286 | delta = -delta; |
| 290 | adjust.offset = -ticks * (1000000 / HZ); | 287 | adjust.offset = -ticks * (1000000 / HZ); |
| 291 | } | 288 | } |
| 292 | jiffies_timer_cc += delta; | 289 | sched_clock_base_cc += delta; |
| 293 | if (adjust.offset != 0) { | 290 | if (adjust.offset != 0) { |
| 294 | printk(KERN_NOTICE "etr: time adjusted by %li micro-seconds\n", | 291 | printk(KERN_NOTICE "etr: time adjusted by %li micro-seconds\n", |
| 295 | adjust.offset); | 292 | adjust.offset); |
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 607bd67a18ce..d796d05c9c01 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | * Written by Martin Schwidefsky (schwidefsky@de.ibm.com) | 2 | * Written by Martin Schwidefsky (schwidefsky@de.ibm.com) |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <asm/thread_info.h> | ||
| 5 | #include <asm/page.h> | 6 | #include <asm/page.h> |
| 6 | #include <asm-generic/vmlinux.lds.h> | 7 | #include <asm-generic/vmlinux.lds.h> |
| 7 | 8 | ||
| @@ -86,7 +87,7 @@ SECTIONS | |||
| 86 | } | 87 | } |
| 87 | _edata = .; /* End of data section */ | 88 | _edata = .; /* End of data section */ |
| 88 | 89 | ||
| 89 | . = ALIGN(2 * PAGE_SIZE); /* init_task */ | 90 | . = ALIGN(THREAD_SIZE); /* init_task */ |
| 90 | .data.init_task : { | 91 | .data.init_task : { |
| 91 | *(.data.init_task) | 92 | *(.data.init_task) |
| 92 | } | 93 | } |
diff --git a/arch/sparc/include/asm/ptrace_64.h b/arch/sparc/include/asm/ptrace_64.h index 3d3e9c161d8b..84e969f06afe 100644 --- a/arch/sparc/include/asm/ptrace_64.h +++ b/arch/sparc/include/asm/ptrace_64.h | |||
| @@ -142,8 +142,6 @@ struct global_reg_snapshot { | |||
| 142 | }; | 142 | }; |
| 143 | extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; | 143 | extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; |
| 144 | 144 | ||
| 145 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
| 146 | |||
| 147 | #define force_successful_syscall_return() \ | 145 | #define force_successful_syscall_return() \ |
| 148 | do { current_thread_info()->syscall_noerror = 1; \ | 146 | do { current_thread_info()->syscall_noerror = 1; \ |
| 149 | } while (0) | 147 | } while (0) |
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c index e7a0edfc1a32..1fc17f59c6bf 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c | |||
| @@ -126,7 +126,7 @@ char *sparc_fpu_type; | |||
| 126 | 126 | ||
| 127 | unsigned int fsr_storage; | 127 | unsigned int fsr_storage; |
| 128 | 128 | ||
| 129 | void __init cpu_probe(void) | 129 | void __cpuinit cpu_probe(void) |
| 130 | { | 130 | { |
| 131 | int psr_impl, psr_vers, fpu_vers; | 131 | int psr_impl, psr_vers, fpu_vers; |
| 132 | int i, psr; | 132 | int i, psr; |
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S index 2d325fd84579..51b40426f9c6 100644 --- a/arch/sparc/kernel/head.S +++ b/arch/sparc/kernel/head.S | |||
| @@ -72,7 +72,7 @@ sun4e_notsup: | |||
| 72 | .align 4 | 72 | .align 4 |
| 73 | 73 | ||
| 74 | /* The Sparc trap table, bootloader gives us control at _start. */ | 74 | /* The Sparc trap table, bootloader gives us control at _start. */ |
| 75 | .text | 75 | .section .text.head,"ax" |
| 76 | .globl start, _stext, _start, __stext | 76 | .globl start, _stext, _start, __stext |
| 77 | .globl trapbase | 77 | .globl trapbase |
| 78 | _start: /* danger danger */ | 78 | _start: /* danger danger */ |
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c index 1619ec15c099..e396c1f17a92 100644 --- a/arch/sparc/kernel/smp.c +++ b/arch/sparc/kernel/smp.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include "irq.h" | 36 | #include "irq.h" |
| 37 | 37 | ||
| 38 | volatile unsigned long cpu_callin_map[NR_CPUS] __initdata = {0,}; | 38 | volatile unsigned long cpu_callin_map[NR_CPUS] __cpuinitdata = {0,}; |
| 39 | unsigned char boot_cpu_id = 0; | 39 | unsigned char boot_cpu_id = 0; |
| 40 | unsigned char boot_cpu_id4 = 0; /* boot_cpu_id << 2 */ | 40 | unsigned char boot_cpu_id4 = 0; /* boot_cpu_id << 2 */ |
| 41 | 41 | ||
| @@ -120,7 +120,7 @@ void cpu_panic(void) | |||
| 120 | panic("SMP bolixed\n"); | 120 | panic("SMP bolixed\n"); |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | struct linux_prom_registers smp_penguin_ctable __initdata = { 0 }; | 123 | struct linux_prom_registers smp_penguin_ctable __cpuinitdata = { 0 }; |
| 124 | 124 | ||
| 125 | void smp_send_reschedule(int cpu) | 125 | void smp_send_reschedule(int cpu) |
| 126 | { | 126 | { |
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index 7a6a5e795928..16ab0cb731c5 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c | |||
| @@ -83,7 +83,7 @@ static inline void show_leds(int cpuid) | |||
| 83 | "i" (ASI_M_CTL)); | 83 | "i" (ASI_M_CTL)); |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | void __init smp4d_callin(void) | 86 | void __cpuinit smp4d_callin(void) |
| 87 | { | 87 | { |
| 88 | int cpuid = hard_smp4d_processor_id(); | 88 | int cpuid = hard_smp4d_processor_id(); |
| 89 | extern spinlock_t sun4d_imsk_lock; | 89 | extern spinlock_t sun4d_imsk_lock; |
| @@ -386,7 +386,7 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs) | |||
| 386 | 386 | ||
| 387 | extern unsigned int lvl14_resolution; | 387 | extern unsigned int lvl14_resolution; |
| 388 | 388 | ||
| 389 | static void __init smp_setup_percpu_timer(void) | 389 | static void __cpuinit smp_setup_percpu_timer(void) |
| 390 | { | 390 | { |
| 391 | int cpu = hard_smp4d_processor_id(); | 391 | int cpu = hard_smp4d_processor_id(); |
| 392 | 392 | ||
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 5fc386d08c47..4f8d60586b07 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
| @@ -343,7 +343,7 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs) | |||
| 343 | 343 | ||
| 344 | extern unsigned int lvl14_resolution; | 344 | extern unsigned int lvl14_resolution; |
| 345 | 345 | ||
| 346 | static void __init smp_setup_percpu_timer(void) | 346 | static void __cpuinit smp_setup_percpu_timer(void) |
| 347 | { | 347 | { |
| 348 | int cpu = smp_processor_id(); | 348 | int cpu = smp_processor_id(); |
| 349 | 349 | ||
diff --git a/arch/sparc/kernel/trampoline.S b/arch/sparc/kernel/trampoline.S index 356c56aebc62..5e235c52d667 100644 --- a/arch/sparc/kernel/trampoline.S +++ b/arch/sparc/kernel/trampoline.S | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | .globl sun4m_cpu_startup, __smp4m_processor_id | 18 | .globl sun4m_cpu_startup, __smp4m_processor_id |
| 19 | .globl sun4d_cpu_startup, __smp4d_processor_id | 19 | .globl sun4d_cpu_startup, __smp4d_processor_id |
| 20 | 20 | ||
| 21 | __INIT | 21 | __CPUINIT |
| 22 | .align 4 | 22 | .align 4 |
| 23 | 23 | ||
| 24 | /* When we start up a cpu for the first time it enters this routine. | 24 | /* When we start up a cpu for the first time it enters this routine. |
| @@ -109,7 +109,7 @@ __smp4d_processor_id: | |||
| 109 | /* CPUID in bootbus can be found at PA 0xff0140000 */ | 109 | /* CPUID in bootbus can be found at PA 0xff0140000 */ |
| 110 | #define SUN4D_BOOTBUS_CPUID 0xf0140000 | 110 | #define SUN4D_BOOTBUS_CPUID 0xf0140000 |
| 111 | 111 | ||
| 112 | __INIT | 112 | __CPUINIT |
| 113 | .align 4 | 113 | .align 4 |
| 114 | 114 | ||
| 115 | sun4d_cpu_startup: | 115 | sun4d_cpu_startup: |
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S index b1002c607196..5b7e69a8c32f 100644 --- a/arch/sparc/kernel/vmlinux.lds.S +++ b/arch/sparc/kernel/vmlinux.lds.S | |||
| @@ -13,6 +13,7 @@ SECTIONS | |||
| 13 | .text 0xf0004000 : | 13 | .text 0xf0004000 : |
| 14 | { | 14 | { |
| 15 | _text = .; | 15 | _text = .; |
| 16 | *(.text.head) | ||
| 16 | TEXT_TEXT | 17 | TEXT_TEXT |
| 17 | SCHED_TEXT | 18 | SCHED_TEXT |
| 18 | LOCK_TEXT | 19 | LOCK_TEXT |
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 6a5d7cabc044..dd8aa36f366c 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c | |||
| @@ -1251,7 +1251,7 @@ static inline void map_kernel(void) | |||
| 1251 | /* Paging initialization on the Sparc Reference MMU. */ | 1251 | /* Paging initialization on the Sparc Reference MMU. */ |
| 1252 | extern void sparc_context_init(int); | 1252 | extern void sparc_context_init(int); |
| 1253 | 1253 | ||
| 1254 | void (*poke_srmmu)(void) __initdata = NULL; | 1254 | void (*poke_srmmu)(void) __cpuinitdata = NULL; |
| 1255 | 1255 | ||
| 1256 | extern unsigned long bootmem_init(unsigned long *pages_avail); | 1256 | extern unsigned long bootmem_init(unsigned long *pages_avail); |
| 1257 | 1257 | ||
| @@ -1446,7 +1446,7 @@ static void __init init_vac_layout(void) | |||
| 1446 | (int)vac_cache_size, (int)vac_line_size); | 1446 | (int)vac_cache_size, (int)vac_line_size); |
| 1447 | } | 1447 | } |
| 1448 | 1448 | ||
| 1449 | static void __init poke_hypersparc(void) | 1449 | static void __cpuinit poke_hypersparc(void) |
| 1450 | { | 1450 | { |
| 1451 | volatile unsigned long clear; | 1451 | volatile unsigned long clear; |
| 1452 | unsigned long mreg = srmmu_get_mmureg(); | 1452 | unsigned long mreg = srmmu_get_mmureg(); |
| @@ -1501,7 +1501,7 @@ static void __init init_hypersparc(void) | |||
| 1501 | hypersparc_setup_blockops(); | 1501 | hypersparc_setup_blockops(); |
| 1502 | } | 1502 | } |
| 1503 | 1503 | ||
| 1504 | static void __init poke_cypress(void) | 1504 | static void __cpuinit poke_cypress(void) |
| 1505 | { | 1505 | { |
| 1506 | unsigned long mreg = srmmu_get_mmureg(); | 1506 | unsigned long mreg = srmmu_get_mmureg(); |
| 1507 | unsigned long faddr, tagval; | 1507 | unsigned long faddr, tagval; |
| @@ -1589,7 +1589,7 @@ static void __init init_cypress_605(unsigned long mrev) | |||
| 1589 | init_cypress_common(); | 1589 | init_cypress_common(); |
| 1590 | } | 1590 | } |
| 1591 | 1591 | ||
| 1592 | static void __init poke_swift(void) | 1592 | static void __cpuinit poke_swift(void) |
| 1593 | { | 1593 | { |
| 1594 | unsigned long mreg; | 1594 | unsigned long mreg; |
| 1595 | 1595 | ||
| @@ -1771,7 +1771,7 @@ static void turbosparc_flush_tlb_page(struct vm_area_struct *vma, unsigned long | |||
| 1771 | } | 1771 | } |
| 1772 | 1772 | ||
| 1773 | 1773 | ||
| 1774 | static void __init poke_turbosparc(void) | 1774 | static void __cpuinit poke_turbosparc(void) |
| 1775 | { | 1775 | { |
| 1776 | unsigned long mreg = srmmu_get_mmureg(); | 1776 | unsigned long mreg = srmmu_get_mmureg(); |
| 1777 | unsigned long ccreg; | 1777 | unsigned long ccreg; |
| @@ -1834,7 +1834,7 @@ static void __init init_turbosparc(void) | |||
| 1834 | poke_srmmu = poke_turbosparc; | 1834 | poke_srmmu = poke_turbosparc; |
| 1835 | } | 1835 | } |
| 1836 | 1836 | ||
| 1837 | static void __init poke_tsunami(void) | 1837 | static void __cpuinit poke_tsunami(void) |
| 1838 | { | 1838 | { |
| 1839 | unsigned long mreg = srmmu_get_mmureg(); | 1839 | unsigned long mreg = srmmu_get_mmureg(); |
| 1840 | 1840 | ||
| @@ -1876,7 +1876,7 @@ static void __init init_tsunami(void) | |||
| 1876 | tsunami_setup_blockops(); | 1876 | tsunami_setup_blockops(); |
| 1877 | } | 1877 | } |
| 1878 | 1878 | ||
| 1879 | static void __init poke_viking(void) | 1879 | static void __cpuinit poke_viking(void) |
| 1880 | { | 1880 | { |
| 1881 | unsigned long mreg = srmmu_get_mmureg(); | 1881 | unsigned long mreg = srmmu_get_mmureg(); |
| 1882 | static int smp_catch; | 1882 | static int smp_catch; |
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index e5627118e613..f500b0618bb0 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
| @@ -282,7 +282,7 @@ static unsigned long kimage_addr_to_ra(void *p) | |||
| 282 | return kern_base + (val - KERNBASE); | 282 | return kern_base + (val - KERNBASE); |
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg) | 285 | static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg) |
| 286 | { | 286 | { |
| 287 | extern unsigned long sparc64_ttable_tl0; | 287 | extern unsigned long sparc64_ttable_tl0; |
| 288 | extern unsigned long kern_locked_tte_data; | 288 | extern unsigned long kern_locked_tte_data; |
| @@ -343,7 +343,7 @@ extern unsigned long sparc64_cpu_startup; | |||
| 343 | */ | 343 | */ |
| 344 | static struct thread_info *cpu_new_thread = NULL; | 344 | static struct thread_info *cpu_new_thread = NULL; |
| 345 | 345 | ||
| 346 | static int __devinit smp_boot_one_cpu(unsigned int cpu) | 346 | static int __cpuinit smp_boot_one_cpu(unsigned int cpu) |
| 347 | { | 347 | { |
| 348 | struct trap_per_cpu *tb = &trap_block[cpu]; | 348 | struct trap_per_cpu *tb = &trap_block[cpu]; |
| 349 | unsigned long entry = | 349 | unsigned long entry = |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 3c10daf8fc01..185f34679110 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -956,7 +956,7 @@ int of_node_to_nid(struct device_node *dp) | |||
| 956 | return nid; | 956 | return nid; |
| 957 | } | 957 | } |
| 958 | 958 | ||
| 959 | static void add_node_ranges(void) | 959 | static void __init add_node_ranges(void) |
| 960 | { | 960 | { |
| 961 | int i; | 961 | int i; |
| 962 | 962 | ||
diff --git a/arch/x86/boot/tty.c b/arch/x86/boot/tty.c index 0be77b39328a..7e8e8b25f5f6 100644 --- a/arch/x86/boot/tty.c +++ b/arch/x86/boot/tty.c | |||
| @@ -74,7 +74,7 @@ static int kbd_pending(void) | |||
| 74 | { | 74 | { |
| 75 | u8 pending; | 75 | u8 pending; |
| 76 | asm volatile("int $0x16; setnz %0" | 76 | asm volatile("int $0x16; setnz %0" |
| 77 | : "=rm" (pending) | 77 | : "=qm" (pending) |
| 78 | : "a" (0x0100)); | 78 | : "a" (0x0100)); |
| 79 | return pending; | 79 | return pending; |
| 80 | } | 80 | } |
diff --git a/arch/x86/include/asm/ds.h b/arch/x86/include/asm/ds.h index 72c5a190bf48..a95008457ea4 100644 --- a/arch/x86/include/asm/ds.h +++ b/arch/x86/include/asm/ds.h | |||
| @@ -23,12 +23,13 @@ | |||
| 23 | #ifndef _ASM_X86_DS_H | 23 | #ifndef _ASM_X86_DS_H |
| 24 | #define _ASM_X86_DS_H | 24 | #define _ASM_X86_DS_H |
| 25 | 25 | ||
| 26 | #ifdef CONFIG_X86_DS | ||
| 27 | 26 | ||
| 28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | 29 | ||
| 31 | 30 | ||
| 31 | #ifdef CONFIG_X86_DS | ||
| 32 | |||
| 32 | struct task_struct; | 33 | struct task_struct; |
| 33 | 34 | ||
| 34 | /* | 35 | /* |
| @@ -232,7 +233,8 @@ extern void ds_free(struct ds_context *context); | |||
| 232 | 233 | ||
| 233 | #else /* CONFIG_X86_DS */ | 234 | #else /* CONFIG_X86_DS */ |
| 234 | 235 | ||
| 235 | #define ds_init_intel(config) do {} while (0) | 236 | struct cpuinfo_x86; |
| 237 | static inline void __cpuinit ds_init_intel(struct cpuinfo_x86 *ignored) {} | ||
| 236 | 238 | ||
| 237 | #endif /* CONFIG_X86_DS */ | 239 | #endif /* CONFIG_X86_DS */ |
| 238 | #endif /* _ASM_X86_DS_H */ | 240 | #endif /* _ASM_X86_DS_H */ |
diff --git a/arch/x86/include/asm/pci_64.h b/arch/x86/include/asm/pci_64.h index 5b28995d664e..d02d936840a3 100644 --- a/arch/x86/include/asm/pci_64.h +++ b/arch/x86/include/asm/pci_64.h | |||
| @@ -34,8 +34,6 @@ extern void pci_iommu_alloc(void); | |||
| 34 | */ | 34 | */ |
| 35 | #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) | 35 | #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) |
| 36 | 36 | ||
| 37 | #if defined(CONFIG_GART_IOMMU) || defined(CONFIG_CALGARY_IOMMU) | ||
| 38 | |||
| 39 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ | 37 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ |
| 40 | dma_addr_t ADDR_NAME; | 38 | dma_addr_t ADDR_NAME; |
| 41 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \ | 39 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \ |
| @@ -49,18 +47,6 @@ extern void pci_iommu_alloc(void); | |||
| 49 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ | 47 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ |
| 50 | (((PTR)->LEN_NAME) = (VAL)) | 48 | (((PTR)->LEN_NAME) = (VAL)) |
| 51 | 49 | ||
| 52 | #else | ||
| 53 | /* No IOMMU */ | ||
| 54 | |||
| 55 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) | ||
| 56 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) | ||
| 57 | #define pci_unmap_addr(PTR, ADDR_NAME) (0) | ||
| 58 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) | ||
| 59 | #define pci_unmap_len(PTR, LEN_NAME) (0) | ||
| 60 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) | ||
| 61 | |||
| 62 | #endif | ||
| 63 | |||
| 64 | #endif /* __KERNEL__ */ | 50 | #endif /* __KERNEL__ */ |
| 65 | 51 | ||
| 66 | #endif /* _ASM_X86_PCI_64_H */ | 52 | #endif /* _ASM_X86_PCI_64_H */ |
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index d1531c8480b7..eefb0594b058 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h | |||
| @@ -271,8 +271,6 @@ extern int do_get_thread_area(struct task_struct *p, int idx, | |||
| 271 | extern int do_set_thread_area(struct task_struct *p, int idx, | 271 | extern int do_set_thread_area(struct task_struct *p, int idx, |
| 272 | struct user_desc __user *info, int can_allocate); | 272 | struct user_desc __user *info, int can_allocate); |
| 273 | 273 | ||
| 274 | #define __ARCH_WANT_COMPAT_SYS_PTRACE | ||
| 275 | |||
| 276 | #endif /* __KERNEL__ */ | 274 | #endif /* __KERNEL__ */ |
| 277 | 275 | ||
| 278 | #endif /* !__ASSEMBLY__ */ | 276 | #endif /* !__ASSEMBLY__ */ |
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index e489ff9cb3e2..b62a7667828e 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -41,7 +41,7 @@ obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o | |||
| 41 | obj-y += process.o | 41 | obj-y += process.o |
| 42 | obj-y += i387.o xsave.o | 42 | obj-y += i387.o xsave.o |
| 43 | obj-y += ptrace.o | 43 | obj-y += ptrace.o |
| 44 | obj-y += ds.o | 44 | obj-$(CONFIG_X86_DS) += ds.o |
| 45 | obj-$(CONFIG_X86_32) += tls.o | 45 | obj-$(CONFIG_X86_32) += tls.o |
| 46 | obj-$(CONFIG_IA32_EMULATION) += tls.o | 46 | obj-$(CONFIG_IA32_EMULATION) += tls.o |
| 47 | obj-y += step.o | 47 | obj-y += step.o |
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 04a7f960bbc0..16f94879b525 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
| @@ -1315,7 +1315,7 @@ void enable_x2apic(void) | |||
| 1315 | } | 1315 | } |
| 1316 | } | 1316 | } |
| 1317 | 1317 | ||
| 1318 | void enable_IR_x2apic(void) | 1318 | void __init enable_IR_x2apic(void) |
| 1319 | { | 1319 | { |
| 1320 | #ifdef CONFIG_INTR_REMAP | 1320 | #ifdef CONFIG_INTR_REMAP |
| 1321 | int ret; | 1321 | int ret; |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index d3dcd58b87cd..7f05f44b97e9 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c | |||
| @@ -115,9 +115,20 @@ static int query_current_values_with_pending_wait(struct powernow_k8_data *data) | |||
| 115 | u32 i = 0; | 115 | u32 i = 0; |
| 116 | 116 | ||
| 117 | if (cpu_family == CPU_HW_PSTATE) { | 117 | if (cpu_family == CPU_HW_PSTATE) { |
| 118 | rdmsr(MSR_PSTATE_STATUS, lo, hi); | 118 | if (data->currpstate == HW_PSTATE_INVALID) { |
| 119 | i = lo & HW_PSTATE_MASK; | 119 | /* read (initial) hw pstate if not yet set */ |
| 120 | data->currpstate = i; | 120 | rdmsr(MSR_PSTATE_STATUS, lo, hi); |
| 121 | i = lo & HW_PSTATE_MASK; | ||
| 122 | |||
| 123 | /* | ||
| 124 | * a workaround for family 11h erratum 311 might cause | ||
| 125 | * an "out-of-range Pstate if the core is in Pstate-0 | ||
| 126 | */ | ||
| 127 | if (i >= data->numps) | ||
| 128 | data->currpstate = HW_PSTATE_0; | ||
| 129 | else | ||
| 130 | data->currpstate = i; | ||
| 131 | } | ||
| 121 | return 0; | 132 | return 0; |
| 122 | } | 133 | } |
| 123 | do { | 134 | do { |
| @@ -1121,6 +1132,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) | |||
| 1121 | } | 1132 | } |
| 1122 | 1133 | ||
| 1123 | data->cpu = pol->cpu; | 1134 | data->cpu = pol->cpu; |
| 1135 | data->currpstate = HW_PSTATE_INVALID; | ||
| 1124 | 1136 | ||
| 1125 | if (powernow_k8_cpu_init_acpi(data)) { | 1137 | if (powernow_k8_cpu_init_acpi(data)) { |
| 1126 | /* | 1138 | /* |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h index ab48cfed4d96..65cfb5d7f77f 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h | |||
| @@ -5,6 +5,19 @@ | |||
| 5 | * http://www.gnu.org/licenses/gpl.html | 5 | * http://www.gnu.org/licenses/gpl.html |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | |||
| 9 | enum pstate { | ||
| 10 | HW_PSTATE_INVALID = 0xff, | ||
| 11 | HW_PSTATE_0 = 0, | ||
| 12 | HW_PSTATE_1 = 1, | ||
| 13 | HW_PSTATE_2 = 2, | ||
| 14 | HW_PSTATE_3 = 3, | ||
| 15 | HW_PSTATE_4 = 4, | ||
| 16 | HW_PSTATE_5 = 5, | ||
| 17 | HW_PSTATE_6 = 6, | ||
| 18 | HW_PSTATE_7 = 7, | ||
| 19 | }; | ||
| 20 | |||
| 8 | struct powernow_k8_data { | 21 | struct powernow_k8_data { |
| 9 | unsigned int cpu; | 22 | unsigned int cpu; |
| 10 | 23 | ||
| @@ -23,7 +36,9 @@ struct powernow_k8_data { | |||
| 23 | u32 exttype; /* extended interface = 1 */ | 36 | u32 exttype; /* extended interface = 1 */ |
| 24 | 37 | ||
| 25 | /* keep track of the current fid / vid or pstate */ | 38 | /* keep track of the current fid / vid or pstate */ |
| 26 | u32 currvid, currfid, currpstate; | 39 | u32 currvid; |
| 40 | u32 currfid; | ||
| 41 | enum pstate currpstate; | ||
| 27 | 42 | ||
| 28 | /* the powernow_table includes all frequency and vid/fid pairings: | 43 | /* the powernow_table includes all frequency and vid/fid pairings: |
| 29 | * fid are the lower 8 bits of the index, vid are the upper 8 bits. | 44 | * fid are the lower 8 bits of the index, vid are the upper 8 bits. |
diff --git a/arch/x86/kernel/ds.c b/arch/x86/kernel/ds.c index d1a121443bde..a2d1176c38ee 100644 --- a/arch/x86/kernel/ds.c +++ b/arch/x86/kernel/ds.c | |||
| @@ -21,8 +21,6 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | #ifdef CONFIG_X86_DS | ||
| 25 | |||
| 26 | #include <asm/ds.h> | 24 | #include <asm/ds.h> |
| 27 | 25 | ||
| 28 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| @@ -211,14 +209,15 @@ static DEFINE_PER_CPU(struct ds_context *, system_context); | |||
| 211 | static inline struct ds_context *ds_get_context(struct task_struct *task) | 209 | static inline struct ds_context *ds_get_context(struct task_struct *task) |
| 212 | { | 210 | { |
| 213 | struct ds_context *context; | 211 | struct ds_context *context; |
| 212 | unsigned long irq; | ||
| 214 | 213 | ||
| 215 | spin_lock(&ds_lock); | 214 | spin_lock_irqsave(&ds_lock, irq); |
| 216 | 215 | ||
| 217 | context = (task ? task->thread.ds_ctx : this_system_context); | 216 | context = (task ? task->thread.ds_ctx : this_system_context); |
| 218 | if (context) | 217 | if (context) |
| 219 | context->count++; | 218 | context->count++; |
| 220 | 219 | ||
| 221 | spin_unlock(&ds_lock); | 220 | spin_unlock_irqrestore(&ds_lock, irq); |
| 222 | 221 | ||
| 223 | return context; | 222 | return context; |
| 224 | } | 223 | } |
| @@ -226,55 +225,46 @@ static inline struct ds_context *ds_get_context(struct task_struct *task) | |||
| 226 | /* | 225 | /* |
| 227 | * Same as ds_get_context, but allocates the context and it's DS | 226 | * Same as ds_get_context, but allocates the context and it's DS |
| 228 | * structure, if necessary; returns NULL; if out of memory. | 227 | * structure, if necessary; returns NULL; if out of memory. |
| 229 | * | ||
| 230 | * pre: requires ds_lock to be held | ||
| 231 | */ | 228 | */ |
| 232 | static inline struct ds_context *ds_alloc_context(struct task_struct *task) | 229 | static inline struct ds_context *ds_alloc_context(struct task_struct *task) |
| 233 | { | 230 | { |
| 234 | struct ds_context **p_context = | 231 | struct ds_context **p_context = |
| 235 | (task ? &task->thread.ds_ctx : &this_system_context); | 232 | (task ? &task->thread.ds_ctx : &this_system_context); |
| 236 | struct ds_context *context = *p_context; | 233 | struct ds_context *context = *p_context; |
| 234 | unsigned long irq; | ||
| 237 | 235 | ||
| 238 | if (!context) { | 236 | if (!context) { |
| 239 | spin_unlock(&ds_lock); | ||
| 240 | |||
| 241 | context = kzalloc(sizeof(*context), GFP_KERNEL); | 237 | context = kzalloc(sizeof(*context), GFP_KERNEL); |
| 242 | 238 | if (!context) | |
| 243 | if (!context) { | ||
| 244 | spin_lock(&ds_lock); | ||
| 245 | return NULL; | 239 | return NULL; |
| 246 | } | ||
| 247 | 240 | ||
| 248 | context->ds = kzalloc(ds_cfg.sizeof_ds, GFP_KERNEL); | 241 | context->ds = kzalloc(ds_cfg.sizeof_ds, GFP_KERNEL); |
| 249 | if (!context->ds) { | 242 | if (!context->ds) { |
| 250 | kfree(context); | 243 | kfree(context); |
| 251 | spin_lock(&ds_lock); | ||
| 252 | return NULL; | 244 | return NULL; |
| 253 | } | 245 | } |
| 254 | 246 | ||
| 255 | spin_lock(&ds_lock); | 247 | spin_lock_irqsave(&ds_lock, irq); |
| 256 | /* | 248 | |
| 257 | * Check for race - another CPU could have allocated | ||
| 258 | * it meanwhile: | ||
| 259 | */ | ||
| 260 | if (*p_context) { | 249 | if (*p_context) { |
| 261 | kfree(context->ds); | 250 | kfree(context->ds); |
| 262 | kfree(context); | 251 | kfree(context); |
| 263 | return *p_context; | ||
| 264 | } | ||
| 265 | 252 | ||
| 266 | *p_context = context; | 253 | context = *p_context; |
| 254 | } else { | ||
| 255 | *p_context = context; | ||
| 267 | 256 | ||
| 268 | context->this = p_context; | 257 | context->this = p_context; |
| 269 | context->task = task; | 258 | context->task = task; |
| 270 | 259 | ||
| 271 | if (task) | 260 | if (task) |
| 272 | set_tsk_thread_flag(task, TIF_DS_AREA_MSR); | 261 | set_tsk_thread_flag(task, TIF_DS_AREA_MSR); |
| 273 | 262 | ||
| 274 | if (!task || (task == current)) | 263 | if (!task || (task == current)) |
| 275 | wrmsr(MSR_IA32_DS_AREA, (unsigned long)context->ds, 0); | 264 | wrmsrl(MSR_IA32_DS_AREA, |
| 276 | 265 | (unsigned long)context->ds); | |
| 277 | get_tracer(task); | 266 | } |
| 267 | spin_unlock_irqrestore(&ds_lock, irq); | ||
| 278 | } | 268 | } |
| 279 | 269 | ||
| 280 | context->count++; | 270 | context->count++; |
| @@ -288,10 +278,12 @@ static inline struct ds_context *ds_alloc_context(struct task_struct *task) | |||
| 288 | */ | 278 | */ |
| 289 | static inline void ds_put_context(struct ds_context *context) | 279 | static inline void ds_put_context(struct ds_context *context) |
| 290 | { | 280 | { |
| 281 | unsigned long irq; | ||
| 282 | |||
| 291 | if (!context) | 283 | if (!context) |
| 292 | return; | 284 | return; |
| 293 | 285 | ||
| 294 | spin_lock(&ds_lock); | 286 | spin_lock_irqsave(&ds_lock, irq); |
| 295 | 287 | ||
| 296 | if (--context->count) | 288 | if (--context->count) |
| 297 | goto out; | 289 | goto out; |
| @@ -313,7 +305,7 @@ static inline void ds_put_context(struct ds_context *context) | |||
| 313 | kfree(context->ds); | 305 | kfree(context->ds); |
| 314 | kfree(context); | 306 | kfree(context); |
| 315 | out: | 307 | out: |
| 316 | spin_unlock(&ds_lock); | 308 | spin_unlock_irqrestore(&ds_lock, irq); |
| 317 | } | 309 | } |
| 318 | 310 | ||
| 319 | 311 | ||
| @@ -384,6 +376,7 @@ static int ds_request(struct task_struct *task, void *base, size_t size, | |||
| 384 | struct ds_context *context; | 376 | struct ds_context *context; |
| 385 | unsigned long buffer, adj; | 377 | unsigned long buffer, adj; |
| 386 | const unsigned long alignment = (1 << 3); | 378 | const unsigned long alignment = (1 << 3); |
| 379 | unsigned long irq; | ||
| 387 | int error = 0; | 380 | int error = 0; |
| 388 | 381 | ||
| 389 | if (!ds_cfg.sizeof_ds) | 382 | if (!ds_cfg.sizeof_ds) |
| @@ -398,26 +391,27 @@ static int ds_request(struct task_struct *task, void *base, size_t size, | |||
| 398 | return -EOPNOTSUPP; | 391 | return -EOPNOTSUPP; |
| 399 | 392 | ||
| 400 | 393 | ||
| 401 | spin_lock(&ds_lock); | ||
| 402 | |||
| 403 | error = -ENOMEM; | ||
| 404 | context = ds_alloc_context(task); | 394 | context = ds_alloc_context(task); |
| 405 | if (!context) | 395 | if (!context) |
| 406 | goto out_unlock; | 396 | return -ENOMEM; |
| 397 | |||
| 398 | spin_lock_irqsave(&ds_lock, irq); | ||
| 407 | 399 | ||
| 408 | error = -EPERM; | 400 | error = -EPERM; |
| 409 | if (!check_tracer(task)) | 401 | if (!check_tracer(task)) |
| 410 | goto out_unlock; | 402 | goto out_unlock; |
| 411 | 403 | ||
| 404 | get_tracer(task); | ||
| 405 | |||
| 412 | error = -EALREADY; | 406 | error = -EALREADY; |
| 413 | if (context->owner[qual] == current) | 407 | if (context->owner[qual] == current) |
| 414 | goto out_unlock; | 408 | goto out_put_tracer; |
| 415 | error = -EPERM; | 409 | error = -EPERM; |
| 416 | if (context->owner[qual] != NULL) | 410 | if (context->owner[qual] != NULL) |
| 417 | goto out_unlock; | 411 | goto out_put_tracer; |
| 418 | context->owner[qual] = current; | 412 | context->owner[qual] = current; |
| 419 | 413 | ||
| 420 | spin_unlock(&ds_lock); | 414 | spin_unlock_irqrestore(&ds_lock, irq); |
| 421 | 415 | ||
| 422 | 416 | ||
| 423 | error = -ENOMEM; | 417 | error = -ENOMEM; |
| @@ -465,10 +459,17 @@ static int ds_request(struct task_struct *task, void *base, size_t size, | |||
| 465 | out_release: | 459 | out_release: |
| 466 | context->owner[qual] = NULL; | 460 | context->owner[qual] = NULL; |
| 467 | ds_put_context(context); | 461 | ds_put_context(context); |
| 462 | put_tracer(task); | ||
| 463 | return error; | ||
| 464 | |||
| 465 | out_put_tracer: | ||
| 466 | spin_unlock_irqrestore(&ds_lock, irq); | ||
| 467 | ds_put_context(context); | ||
| 468 | put_tracer(task); | ||
| 468 | return error; | 469 | return error; |
| 469 | 470 | ||
| 470 | out_unlock: | 471 | out_unlock: |
| 471 | spin_unlock(&ds_lock); | 472 | spin_unlock_irqrestore(&ds_lock, irq); |
| 472 | ds_put_context(context); | 473 | ds_put_context(context); |
| 473 | return error; | 474 | return error; |
| 474 | } | 475 | } |
| @@ -818,13 +819,21 @@ static const struct ds_configuration ds_cfg_var = { | |||
| 818 | .sizeof_ds = sizeof(long) * 12, | 819 | .sizeof_ds = sizeof(long) * 12, |
| 819 | .sizeof_field = sizeof(long), | 820 | .sizeof_field = sizeof(long), |
| 820 | .sizeof_rec[ds_bts] = sizeof(long) * 3, | 821 | .sizeof_rec[ds_bts] = sizeof(long) * 3, |
| 822 | #ifdef __i386__ | ||
| 821 | .sizeof_rec[ds_pebs] = sizeof(long) * 10 | 823 | .sizeof_rec[ds_pebs] = sizeof(long) * 10 |
| 824 | #else | ||
| 825 | .sizeof_rec[ds_pebs] = sizeof(long) * 18 | ||
| 826 | #endif | ||
| 822 | }; | 827 | }; |
| 823 | static const struct ds_configuration ds_cfg_64 = { | 828 | static const struct ds_configuration ds_cfg_64 = { |
| 824 | .sizeof_ds = 8 * 12, | 829 | .sizeof_ds = 8 * 12, |
| 825 | .sizeof_field = 8, | 830 | .sizeof_field = 8, |
| 826 | .sizeof_rec[ds_bts] = 8 * 3, | 831 | .sizeof_rec[ds_bts] = 8 * 3, |
| 832 | #ifdef __i386__ | ||
| 827 | .sizeof_rec[ds_pebs] = 8 * 10 | 833 | .sizeof_rec[ds_pebs] = 8 * 10 |
| 834 | #else | ||
| 835 | .sizeof_rec[ds_pebs] = 8 * 18 | ||
| 836 | #endif | ||
| 828 | }; | 837 | }; |
| 829 | 838 | ||
| 830 | static inline void | 839 | static inline void |
| @@ -878,4 +887,3 @@ void ds_free(struct ds_context *context) | |||
| 878 | while (leftovers--) | 887 | while (leftovers--) |
| 879 | ds_put_context(context); | 888 | ds_put_context(context); |
| 880 | } | 889 | } |
| 881 | #endif /* CONFIG_X86_DS */ | ||
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c index 1f20608d4ca8..b0f61f0dcd0a 100644 --- a/arch/x86/kernel/i387.c +++ b/arch/x86/kernel/i387.c | |||
| @@ -58,7 +58,7 @@ void __cpuinit mxcsr_feature_mask_init(void) | |||
| 58 | stts(); | 58 | stts(); |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | void __init init_thread_xstate(void) | 61 | void __cpuinit init_thread_xstate(void) |
| 62 | { | 62 | { |
| 63 | if (!HAVE_HWFP) { | 63 | if (!HAVE_HWFP) { |
| 64 | xstate_size = sizeof(struct i387_soft_struct); | 64 | xstate_size = sizeof(struct i387_soft_struct); |
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index c9513e1ff28d..9043251210fb 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c | |||
| @@ -3608,27 +3608,7 @@ int __init io_apic_get_redir_entries (int ioapic) | |||
| 3608 | 3608 | ||
| 3609 | int __init probe_nr_irqs(void) | 3609 | int __init probe_nr_irqs(void) |
| 3610 | { | 3610 | { |
| 3611 | int idx; | 3611 | return NR_IRQS; |
| 3612 | int nr = 0; | ||
| 3613 | #ifndef CONFIG_XEN | ||
| 3614 | int nr_min = 32; | ||
| 3615 | #else | ||
| 3616 | int nr_min = NR_IRQS; | ||
| 3617 | #endif | ||
| 3618 | |||
| 3619 | for (idx = 0; idx < nr_ioapics; idx++) | ||
| 3620 | nr += io_apic_get_redir_entries(idx) + 1; | ||
| 3621 | |||
| 3622 | /* double it for hotplug and msi and nmi */ | ||
| 3623 | nr <<= 1; | ||
| 3624 | |||
| 3625 | /* something wrong ? */ | ||
| 3626 | if (nr < nr_min) | ||
| 3627 | nr = nr_min; | ||
| 3628 | if (WARN_ON(nr > NR_IRQS)) | ||
| 3629 | nr = NR_IRQS; | ||
| 3630 | |||
| 3631 | return nr; | ||
| 3632 | } | 3612 | } |
| 3633 | 3613 | ||
| 3634 | /* -------------------------------------------------------------------------- | 3614 | /* -------------------------------------------------------------------------- |
| @@ -3775,7 +3755,9 @@ int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity) | |||
| 3775 | void __init setup_ioapic_dest(void) | 3755 | void __init setup_ioapic_dest(void) |
| 3776 | { | 3756 | { |
| 3777 | int pin, ioapic, irq, irq_entry; | 3757 | int pin, ioapic, irq, irq_entry; |
| 3758 | struct irq_desc *desc; | ||
| 3778 | struct irq_cfg *cfg; | 3759 | struct irq_cfg *cfg; |
| 3760 | cpumask_t mask; | ||
| 3779 | 3761 | ||
| 3780 | if (skip_ioapic_setup == 1) | 3762 | if (skip_ioapic_setup == 1) |
| 3781 | return; | 3763 | return; |
| @@ -3792,16 +3774,30 @@ void __init setup_ioapic_dest(void) | |||
| 3792 | * cpu is online. | 3774 | * cpu is online. |
| 3793 | */ | 3775 | */ |
| 3794 | cfg = irq_cfg(irq); | 3776 | cfg = irq_cfg(irq); |
| 3795 | if (!cfg->vector) | 3777 | if (!cfg->vector) { |
| 3796 | setup_IO_APIC_irq(ioapic, pin, irq, | 3778 | setup_IO_APIC_irq(ioapic, pin, irq, |
| 3797 | irq_trigger(irq_entry), | 3779 | irq_trigger(irq_entry), |
| 3798 | irq_polarity(irq_entry)); | 3780 | irq_polarity(irq_entry)); |
| 3781 | continue; | ||
| 3782 | |||
| 3783 | } | ||
| 3784 | |||
| 3785 | /* | ||
| 3786 | * Honour affinities which have been set in early boot | ||
| 3787 | */ | ||
| 3788 | desc = irq_to_desc(irq); | ||
| 3789 | if (desc->status & | ||
| 3790 | (IRQ_NO_BALANCING | IRQ_AFFINITY_SET)) | ||
| 3791 | mask = desc->affinity; | ||
| 3792 | else | ||
| 3793 | mask = TARGET_CPUS; | ||
| 3794 | |||
| 3799 | #ifdef CONFIG_INTR_REMAP | 3795 | #ifdef CONFIG_INTR_REMAP |
| 3800 | else if (intr_remapping_enabled) | 3796 | if (intr_remapping_enabled) |
| 3801 | set_ir_ioapic_affinity_irq(irq, TARGET_CPUS); | 3797 | set_ir_ioapic_affinity_irq(irq, mask); |
| 3802 | #endif | ||
| 3803 | else | 3798 | else |
| 3804 | set_ioapic_affinity_irq(irq, TARGET_CPUS); | 3799 | #endif |
| 3800 | set_ioapic_affinity_irq(irq, mask); | ||
| 3805 | } | 3801 | } |
| 3806 | 3802 | ||
| 3807 | } | 3803 | } |
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 1c9cc431ea4f..e169ae9b6a62 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c | |||
| @@ -128,7 +128,7 @@ static int kvm_register_clock(char *txt) | |||
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | #ifdef CONFIG_X86_LOCAL_APIC | 130 | #ifdef CONFIG_X86_LOCAL_APIC |
| 131 | static void __devinit kvm_setup_secondary_clock(void) | 131 | static void __cpuinit kvm_setup_secondary_clock(void) |
| 132 | { | 132 | { |
| 133 | /* | 133 | /* |
| 134 | * Now that the first cpu already had this clocksource initialized, | 134 | * Now that the first cpu already had this clocksource initialized, |
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index e1e731d78f38..d28bbdc35e4e 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c | |||
| @@ -1567,7 +1567,7 @@ static int __init calgary_parse_options(char *p) | |||
| 1567 | ++p; | 1567 | ++p; |
| 1568 | if (*p == '\0') | 1568 | if (*p == '\0') |
| 1569 | break; | 1569 | break; |
| 1570 | bridge = simple_strtol(p, &endp, 0); | 1570 | bridge = simple_strtoul(p, &endp, 0); |
| 1571 | if (p == endp) | 1571 | if (p == endp) |
| 1572 | break; | 1572 | break; |
| 1573 | 1573 | ||
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c index b13acb75e822..15c3e6999182 100644 --- a/arch/x86/kernel/xsave.c +++ b/arch/x86/kernel/xsave.c | |||
| @@ -310,7 +310,7 @@ static void __init setup_xstate_init(void) | |||
| 310 | /* | 310 | /* |
| 311 | * Enable and initialize the xsave feature. | 311 | * Enable and initialize the xsave feature. |
| 312 | */ | 312 | */ |
| 313 | void __init xsave_cntxt_init(void) | 313 | void __ref xsave_cntxt_init(void) |
| 314 | { | 314 | { |
| 315 | unsigned int eax, ebx, ecx, edx; | 315 | unsigned int eax, ebx, ecx, edx; |
| 316 | 316 | ||
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index 3f1b81a83e2e..716d26f0e5d4 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c | |||
| @@ -69,7 +69,7 @@ static void ppro_setup_ctrs(struct op_msrs const * const msrs) | |||
| 69 | int i; | 69 | int i; |
| 70 | 70 | ||
| 71 | if (!reset_value) { | 71 | if (!reset_value) { |
| 72 | reset_value = kmalloc(sizeof(unsigned) * num_counters, | 72 | reset_value = kmalloc(sizeof(reset_value[0]) * num_counters, |
| 73 | GFP_ATOMIC); | 73 | GFP_ATOMIC); |
| 74 | if (!reset_value) | 74 | if (!reset_value) |
| 75 | return; | 75 | return; |
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index 3c27a809393b..2051dc96b8e9 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c | |||
| @@ -496,21 +496,24 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SIEMENS, 0x0015, | |||
| 496 | pci_siemens_interrupt_controller); | 496 | pci_siemens_interrupt_controller); |
| 497 | 497 | ||
| 498 | /* | 498 | /* |
| 499 | * Regular PCI devices have 256 bytes, but AMD Family 10h Opteron ext config | 499 | * Regular PCI devices have 256 bytes, but AMD Family 10h/11h CPUs have |
| 500 | * have 4096 bytes. Even if the device is capable, that doesn't mean we can | 500 | * 4096 bytes configuration space for each function of their processor |
| 501 | * access it. Maybe we don't have a way to generate extended config space | 501 | * configuration space. |
| 502 | * accesses. So check it | ||
| 503 | */ | 502 | */ |
| 504 | static void fam10h_pci_cfg_space_size(struct pci_dev *dev) | 503 | static void amd_cpu_pci_cfg_space_size(struct pci_dev *dev) |
| 505 | { | 504 | { |
| 506 | dev->cfg_size = pci_cfg_space_size_ext(dev); | 505 | dev->cfg_size = pci_cfg_space_size_ext(dev); |
| 507 | } | 506 | } |
| 508 | 507 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1200, amd_cpu_pci_cfg_space_size); | |
| 509 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1200, fam10h_pci_cfg_space_size); | 508 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1201, amd_cpu_pci_cfg_space_size); |
| 510 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1201, fam10h_pci_cfg_space_size); | 509 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1202, amd_cpu_pci_cfg_space_size); |
| 511 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1202, fam10h_pci_cfg_space_size); | 510 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1203, amd_cpu_pci_cfg_space_size); |
| 512 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1203, fam10h_pci_cfg_space_size); | 511 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1204, amd_cpu_pci_cfg_space_size); |
| 513 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1204, fam10h_pci_cfg_space_size); | 512 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1300, amd_cpu_pci_cfg_space_size); |
| 513 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1301, amd_cpu_pci_cfg_space_size); | ||
| 514 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1302, amd_cpu_pci_cfg_space_size); | ||
| 515 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1303, amd_cpu_pci_cfg_space_size); | ||
| 516 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1304, amd_cpu_pci_cfg_space_size); | ||
| 514 | 517 | ||
| 515 | /* | 518 | /* |
| 516 | * SB600: Disable BAR1 on device 14.0 to avoid HPET resources from | 519 | * SB600: Disable BAR1 on device 14.0 to avoid HPET resources from |
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 688936044dc9..636ef4caa52d 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -661,12 +661,11 @@ void xen_set_pgd(pgd_t *ptr, pgd_t val) | |||
| 661 | * For 64-bit, we must skip the Xen hole in the middle of the address | 661 | * For 64-bit, we must skip the Xen hole in the middle of the address |
| 662 | * space, just after the big x86-64 virtual hole. | 662 | * space, just after the big x86-64 virtual hole. |
| 663 | */ | 663 | */ |
| 664 | static int xen_pgd_walk(struct mm_struct *mm, | 664 | static int __xen_pgd_walk(struct mm_struct *mm, pgd_t *pgd, |
| 665 | int (*func)(struct mm_struct *mm, struct page *, | 665 | int (*func)(struct mm_struct *mm, struct page *, |
| 666 | enum pt_level), | 666 | enum pt_level), |
| 667 | unsigned long limit) | 667 | unsigned long limit) |
| 668 | { | 668 | { |
| 669 | pgd_t *pgd = mm->pgd; | ||
| 670 | int flush = 0; | 669 | int flush = 0; |
| 671 | unsigned hole_low, hole_high; | 670 | unsigned hole_low, hole_high; |
| 672 | unsigned pgdidx_limit, pudidx_limit, pmdidx_limit; | 671 | unsigned pgdidx_limit, pudidx_limit, pmdidx_limit; |
| @@ -753,6 +752,14 @@ out: | |||
| 753 | return flush; | 752 | return flush; |
| 754 | } | 753 | } |
| 755 | 754 | ||
| 755 | static int xen_pgd_walk(struct mm_struct *mm, | ||
| 756 | int (*func)(struct mm_struct *mm, struct page *, | ||
| 757 | enum pt_level), | ||
| 758 | unsigned long limit) | ||
| 759 | { | ||
| 760 | return __xen_pgd_walk(mm, mm->pgd, func, limit); | ||
| 761 | } | ||
| 762 | |||
| 756 | /* If we're using split pte locks, then take the page's lock and | 763 | /* If we're using split pte locks, then take the page's lock and |
| 757 | return a pointer to it. Otherwise return NULL. */ | 764 | return a pointer to it. Otherwise return NULL. */ |
| 758 | static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm) | 765 | static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm) |
| @@ -854,7 +861,7 @@ static void __xen_pgd_pin(struct mm_struct *mm, pgd_t *pgd) | |||
| 854 | 861 | ||
| 855 | xen_mc_batch(); | 862 | xen_mc_batch(); |
| 856 | 863 | ||
| 857 | if (xen_pgd_walk(mm, xen_pin_page, USER_LIMIT)) { | 864 | if (__xen_pgd_walk(mm, pgd, xen_pin_page, USER_LIMIT)) { |
| 858 | /* re-enable interrupts for flushing */ | 865 | /* re-enable interrupts for flushing */ |
| 859 | xen_mc_issue(0); | 866 | xen_mc_issue(0); |
| 860 | 867 | ||
| @@ -998,7 +1005,7 @@ static void __xen_pgd_unpin(struct mm_struct *mm, pgd_t *pgd) | |||
| 998 | PT_PMD); | 1005 | PT_PMD); |
| 999 | #endif | 1006 | #endif |
| 1000 | 1007 | ||
| 1001 | xen_pgd_walk(mm, xen_unpin_page, USER_LIMIT); | 1008 | __xen_pgd_walk(mm, pgd, xen_unpin_page, USER_LIMIT); |
| 1002 | 1009 | ||
| 1003 | xen_mc_issue(0); | 1010 | xen_mc_issue(0); |
| 1004 | } | 1011 | } |
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index d77da613b1d2..acd9b6705e02 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
| @@ -362,7 +362,7 @@ static void xen_cpu_die(unsigned int cpu) | |||
| 362 | alternatives_smp_switch(0); | 362 | alternatives_smp_switch(0); |
| 363 | } | 363 | } |
| 364 | 364 | ||
| 365 | static void xen_play_dead(void) | 365 | static void __cpuinit xen_play_dead(void) /* used only with CPU_HOTPLUG */ |
| 366 | { | 366 | { |
| 367 | play_dead_common(); | 367 | play_dead_common(); |
| 368 | HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); | 368 | HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); |
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index d7422dc2a55c..9e1afae8461f 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
| @@ -49,7 +49,7 @@ bool xen_vcpu_stolen(int vcpu); | |||
| 49 | 49 | ||
| 50 | void xen_mark_init_mm_pinned(void); | 50 | void xen_mark_init_mm_pinned(void); |
| 51 | 51 | ||
| 52 | void __init xen_setup_vcpu_info_placement(void); | 52 | void xen_setup_vcpu_info_placement(void); |
| 53 | 53 | ||
| 54 | #ifdef CONFIG_SMP | 54 | #ifdef CONFIG_SMP |
| 55 | void xen_smp_init(void); | 55 | void xen_smp_init(void); |
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 1423b0c0cd2e..a0a178dd189c 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -174,6 +174,15 @@ static int acpi_battery_get_property(struct power_supply *psy, | |||
| 174 | break; | 174 | break; |
| 175 | case POWER_SUPPLY_PROP_CURRENT_NOW: | 175 | case POWER_SUPPLY_PROP_CURRENT_NOW: |
| 176 | val->intval = battery->current_now * 1000; | 176 | val->intval = battery->current_now * 1000; |
| 177 | /* if power units are mW, convert to mA by | ||
| 178 | dividing by current voltage (mV/1000) */ | ||
| 179 | if (!battery->power_unit) { | ||
| 180 | if (battery->voltage_now) { | ||
| 181 | val->intval /= battery->voltage_now; | ||
| 182 | val->intval *= 1000; | ||
| 183 | } else | ||
| 184 | val->intval = -1; | ||
| 185 | } | ||
| 177 | break; | 186 | break; |
| 178 | case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: | 187 | case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: |
| 179 | case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: | 188 | case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN: |
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index ea92bac42c53..09c69806c1fc 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c | |||
| @@ -176,16 +176,6 @@ static int __init dmi_enable_osi_linux(const struct dmi_system_id *d) | |||
| 176 | acpi_dmi_osi_linux(1, d); /* enable */ | 176 | acpi_dmi_osi_linux(1, d); /* enable */ |
| 177 | return 0; | 177 | return 0; |
| 178 | } | 178 | } |
| 179 | static int __init dmi_disable_osi_linux(const struct dmi_system_id *d) | ||
| 180 | { | ||
| 181 | acpi_dmi_osi_linux(0, d); /* disable */ | ||
| 182 | return 0; | ||
| 183 | } | ||
| 184 | static int __init dmi_unknown_osi_linux(const struct dmi_system_id *d) | ||
| 185 | { | ||
| 186 | acpi_dmi_osi_linux(-1, d); /* unknown */ | ||
| 187 | return 0; | ||
| 188 | } | ||
| 189 | static int __init dmi_disable_osi_vista(const struct dmi_system_id *d) | 179 | static int __init dmi_disable_osi_vista(const struct dmi_system_id *d) |
| 190 | { | 180 | { |
| 191 | printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident); | 181 | printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident); |
| @@ -193,295 +183,21 @@ static int __init dmi_disable_osi_vista(const struct dmi_system_id *d) | |||
| 193 | return 0; | 183 | return 0; |
| 194 | } | 184 | } |
| 195 | 185 | ||
| 196 | /* | ||
| 197 | * Most BIOS that invoke OSI(Linux) do nothing with it. | ||
| 198 | * But some cause Linux to break. | ||
| 199 | * Only a couple use it to make Linux run better. | ||
| 200 | * | ||
| 201 | * Thus, Linux should continue to disable OSI(Linux) by default, | ||
| 202 | * should continue to discourage BIOS writers from using it, and | ||
| 203 | * should whitelist the few existing systems that require it. | ||
| 204 | * | ||
| 205 | * If it appears clear a vendor isn't using OSI(Linux) | ||
| 206 | * for anything constructive, blacklist them by name to disable | ||
| 207 | * unnecessary dmesg warnings on all of their products. | ||
| 208 | */ | ||
| 209 | |||
| 210 | static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { | 186 | static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { |
| 211 | /* | ||
| 212 | * Disable OSI(Linux) warnings on all "Acer, inc." | ||
| 213 | * | ||
| 214 | * _OSI(Linux) disables the latest Windows BIOS code: | ||
| 215 | * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3100"), | ||
| 216 | * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5050"), | ||
| 217 | * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"), | ||
| 218 | * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5580"), | ||
| 219 | * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 3010"), | ||
| 220 | * _OSI(Linux) effect unknown: | ||
| 221 | * DMI_MATCH(DMI_PRODUCT_NAME, "Ferrari 5000"), | ||
| 222 | */ | ||
| 223 | /* | ||
| 224 | * note that dmi_check_system() uses strstr() | ||
| 225 | * to match sub-strings rather than !strcmp(), | ||
| 226 | * so "Acer" below matches "Acer, inc." above. | ||
| 227 | */ | ||
| 228 | /* | ||
| 229 | * Disable OSI(Linux) warnings on all "Acer" | ||
| 230 | * | ||
| 231 | * _OSI(Linux) effect unknown: | ||
| 232 | * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"), | ||
| 233 | * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7720Z"), | ||
| 234 | * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 5520"), | ||
| 235 | * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 6460"), | ||
| 236 | * DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 7510"), | ||
| 237 | * | ||
| 238 | * _OSI(Linux) is a NOP: | ||
| 239 | * DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5315"), | ||
| 240 | * DMI_MATCH(DMI_PRODUCT_NAME, "Extensa 5220"), | ||
| 241 | */ | ||
| 242 | { | ||
| 243 | .callback = dmi_disable_osi_linux, | ||
| 244 | .ident = "Acer", | ||
| 245 | .matches = { | ||
| 246 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), | ||
| 247 | }, | ||
| 248 | }, | ||
| 249 | /* | ||
| 250 | * Disable OSI(Linux) warnings on all "Apple Computer, Inc." | ||
| 251 | * Disable OSI(Linux) warnings on all "Apple Inc." | ||
| 252 | * | ||
| 253 | * _OSI(Linux) confirmed to be a NOP: | ||
| 254 | * DMI_MATCH(DMI_PRODUCT_NAME, "MacBook1,1"), | ||
| 255 | * DMI_MATCH(DMI_PRODUCT_NAME, "MacBook2,1"), | ||
| 256 | * DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro2,2"), | ||
| 257 | * DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3,1"), | ||
| 258 | * _OSI(Linux) effect unknown: | ||
| 259 | * DMI_MATCH(DMI_PRODUCT_NAME, "MacPro2,1"), | ||
| 260 | * DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro1,1"), | ||
| 261 | */ | ||
| 262 | { | ||
| 263 | .callback = dmi_disable_osi_linux, | ||
| 264 | .ident = "Apple", | ||
| 265 | .matches = { | ||
| 266 | DMI_MATCH(DMI_SYS_VENDOR, "Apple"), | ||
| 267 | }, | ||
| 268 | }, | ||
| 269 | /* | ||
| 270 | * Disable OSI(Linux) warnings on all "BenQ" | ||
| 271 | * | ||
| 272 | * _OSI(Linux) confirmed to be a NOP: | ||
| 273 | * DMI_MATCH(DMI_PRODUCT_NAME, "Joybook S31"), | ||
| 274 | */ | ||
| 275 | { | ||
| 276 | .callback = dmi_disable_osi_linux, | ||
| 277 | .ident = "BenQ", | ||
| 278 | .matches = { | ||
| 279 | DMI_MATCH(DMI_SYS_VENDOR, "BenQ"), | ||
| 280 | }, | ||
| 281 | }, | ||
| 282 | /* | ||
| 283 | * Disable OSI(Linux) warnings on all "Clevo Co." | ||
| 284 | * | ||
| 285 | * _OSI(Linux) confirmed to be a NOP: | ||
| 286 | * DMI_MATCH(DMI_PRODUCT_NAME, "M570RU"), | ||
| 287 | */ | ||
| 288 | { | ||
| 289 | .callback = dmi_disable_osi_linux, | ||
| 290 | .ident = "Clevo", | ||
| 291 | .matches = { | ||
| 292 | DMI_MATCH(DMI_SYS_VENDOR, "Clevo Co."), | ||
| 293 | }, | ||
| 294 | }, | ||
| 295 | /* | ||
| 296 | * Disable OSI(Linux) warnings on all "COMPAL" | ||
| 297 | * | ||
| 298 | * _OSI(Linux) confirmed to be a NOP: | ||
| 299 | * DMI_MATCH(DMI_BOARD_NAME, "HEL8X"), | ||
| 300 | * _OSI(Linux) unknown effect: | ||
| 301 | * DMI_MATCH(DMI_BOARD_NAME, "IFL91"), | ||
| 302 | */ | ||
| 303 | { | ||
| 304 | .callback = dmi_disable_osi_linux, | ||
| 305 | .ident = "Compal", | ||
| 306 | .matches = { | ||
| 307 | DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"), | ||
| 308 | }, | ||
| 309 | }, | ||
| 310 | { /* OSI(Linux) touches USB, unknown side-effect */ | ||
| 311 | .callback = dmi_disable_osi_linux, | ||
| 312 | .ident = "Dell Dimension 5150", | ||
| 313 | .matches = { | ||
| 314 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 315 | DMI_MATCH(DMI_PRODUCT_NAME, "Dell DM051"), | ||
| 316 | }, | ||
| 317 | }, | ||
| 318 | { /* OSI(Linux) is a NOP */ | ||
| 319 | .callback = dmi_disable_osi_linux, | ||
| 320 | .ident = "Dell i1501", | ||
| 321 | .matches = { | ||
| 322 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 323 | DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1501"), | ||
| 324 | }, | ||
| 325 | }, | ||
| 326 | { /* OSI(Linux) effect unknown */ | ||
| 327 | .callback = dmi_unknown_osi_linux, | ||
| 328 | .ident = "Dell Latitude D830", | ||
| 329 | .matches = { | ||
| 330 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 331 | DMI_MATCH(DMI_PRODUCT_NAME, "Latitude D830"), | ||
| 332 | }, | ||
| 333 | }, | ||
| 334 | { /* OSI(Linux) effect unknown */ | ||
| 335 | .callback = dmi_unknown_osi_linux, | ||
| 336 | .ident = "Dell OptiPlex GX620", | ||
| 337 | .matches = { | ||
| 338 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 339 | DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex GX620"), | ||
| 340 | }, | ||
| 341 | }, | ||
| 342 | { /* OSI(Linux) causes some USB initialization to not run */ | ||
| 343 | .callback = dmi_unknown_osi_linux, | ||
| 344 | .ident = "Dell OptiPlex 755", | ||
| 345 | .matches = { | ||
| 346 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 347 | DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 755"), | ||
| 348 | }, | ||
| 349 | }, | ||
| 350 | { /* OSI(Linux) effect unknown */ | ||
| 351 | .callback = dmi_unknown_osi_linux, | ||
| 352 | .ident = "Dell PE 1900", | ||
| 353 | .matches = { | ||
| 354 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 355 | DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 1900"), | ||
| 356 | }, | ||
| 357 | }, | ||
| 358 | { /* OSI(Linux) is a NOP */ | ||
| 359 | .callback = dmi_unknown_osi_linux, | ||
| 360 | .ident = "Dell PE 1950", | ||
| 361 | .matches = { | ||
| 362 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 363 | DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 1950"), | ||
| 364 | }, | ||
| 365 | }, | ||
| 366 | { /* OSI(Linux) is a NOP */ | ||
| 367 | .callback = dmi_disable_osi_linux, | ||
| 368 | .ident = "Dell PE R200", | ||
| 369 | .matches = { | ||
| 370 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 371 | DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R200"), | ||
| 372 | }, | ||
| 373 | }, | ||
| 374 | { /* OSI(Linux) touches USB */ | ||
| 375 | .callback = dmi_disable_osi_linux, | ||
| 376 | .ident = "Dell PR 390", | ||
| 377 | .matches = { | ||
| 378 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 379 | DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation 390"), | ||
| 380 | }, | ||
| 381 | }, | ||
| 382 | { /* OSI(Linux) touches USB */ | ||
| 383 | .callback = dmi_unknown_osi_linux, | ||
| 384 | .ident = "Dell PR 390", | ||
| 385 | .matches = { | ||
| 386 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 387 | DMI_MATCH(DMI_PRODUCT_NAME, "Precision WorkStation 690"), | ||
| 388 | }, | ||
| 389 | }, | ||
| 390 | { /* OSI(Linux) unknown - ASL looks benign, but may effect dock/SMM */ | ||
| 391 | .callback = dmi_unknown_osi_linux, | ||
| 392 | .ident = "Dell PR M4300", | ||
| 393 | .matches = { | ||
| 394 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 395 | DMI_MATCH(DMI_PRODUCT_NAME, "Precision M4300"), | ||
| 396 | }, | ||
| 397 | }, | ||
| 398 | { /* OSI(Linux) is a NOP */ | ||
| 399 | .callback = dmi_disable_osi_linux, | ||
| 400 | .ident = "Dell Vostro 1000", | ||
| 401 | .matches = { | ||
| 402 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 403 | DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1000"), | ||
| 404 | }, | ||
| 405 | }, | ||
| 406 | { /* OSI(Linux) effect unknown */ | ||
| 407 | .callback = dmi_unknown_osi_linux, | ||
| 408 | .ident = "Dell PE SC440", | ||
| 409 | .matches = { | ||
| 410 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 411 | DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge SC440"), | ||
| 412 | }, | ||
| 413 | }, | ||
| 414 | { /* OSI(Linux) effect unknown */ | ||
| 415 | .callback = dmi_unknown_osi_linux, | ||
| 416 | .ident = "Dialogue Flybook V5", | ||
| 417 | .matches = { | ||
| 418 | DMI_MATCH(DMI_SYS_VENDOR, "Dialogue Technology Corporation"), | ||
| 419 | DMI_MATCH(DMI_PRODUCT_NAME, "Flybook V5"), | ||
| 420 | }, | ||
| 421 | }, | ||
| 422 | /* | ||
| 423 | * Disable OSI(Linux) warnings on all "FUJITSU SIEMENS" | ||
| 424 | * | ||
| 425 | * _OSI(Linux) disables latest Windows BIOS code: | ||
| 426 | * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 2510"), | ||
| 427 | * _OSI(Linux) confirmed to be a NOP: | ||
| 428 | * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pi 1536"), | ||
| 429 | * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pi 1556"), | ||
| 430 | * DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 1546"), | ||
| 431 | * DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile V5505"), | ||
| 432 | * _OSI(Linux) unknown effect: | ||
| 433 | * DMI_MATCH(DMI_PRODUCT_NAME, "Amilo M1425"), | ||
| 434 | * DMI_MATCH(DMI_PRODUCT_NAME, "Amilo Si 1520"), | ||
| 435 | */ | ||
| 436 | { | ||
| 437 | .callback = dmi_disable_osi_linux, | ||
| 438 | .ident = "Fujitsu Siemens", | ||
| 439 | .matches = { | ||
| 440 | DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), | ||
| 441 | }, | ||
| 442 | }, | ||
| 443 | { | 187 | { |
| 444 | .callback = dmi_disable_osi_vista, | 188 | .callback = dmi_disable_osi_vista, |
| 445 | .ident = "Fujitsu Siemens", | 189 | .ident = "Fujitsu Siemens", |
| 446 | .matches = { | 190 | .matches = { |
| 447 | DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), | 191 | DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), |
| 448 | DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile V5505"), | 192 | DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile V5505"), |
| 449 | }, | 193 | }, |
| 450 | }, | 194 | }, |
| 195 | |||
| 451 | /* | 196 | /* |
| 452 | * Disable OSI(Linux) warnings on all "Hewlett-Packard" | 197 | * BIOS invocation of _OSI(Linux) is almost always a BIOS bug. |
| 453 | * | 198 | * Linux ignores it, except for the machines enumerated below. |
| 454 | * _OSI(Linux) confirmed to be a NOP: | ||
| 455 | * .ident = "HP Pavilion tx 1000" | ||
| 456 | * DMI_MATCH(DMI_BOARD_NAME, "30BF"), | ||
| 457 | * .ident = "HP Pavilion dv2000" | ||
| 458 | * DMI_MATCH(DMI_BOARD_NAME, "30B5"), | ||
| 459 | * .ident = "HP Pavilion dv5000", | ||
| 460 | * DMI_MATCH(DMI_BOARD_NAME, "30A7"), | ||
| 461 | * .ident = "HP Pavilion dv6300 30BC", | ||
| 462 | * DMI_MATCH(DMI_BOARD_NAME, "30BC"), | ||
| 463 | * .ident = "HP Pavilion dv6000", | ||
| 464 | * DMI_MATCH(DMI_BOARD_NAME, "30B7"), | ||
| 465 | * DMI_MATCH(DMI_BOARD_NAME, "30B8"), | ||
| 466 | * .ident = "HP Pavilion dv9000", | ||
| 467 | * DMI_MATCH(DMI_BOARD_NAME, "30B9"), | ||
| 468 | * .ident = "HP Pavilion dv9500", | ||
| 469 | * DMI_MATCH(DMI_BOARD_NAME, "30CB"), | ||
| 470 | * .ident = "HP/Compaq Presario C500", | ||
| 471 | * DMI_MATCH(DMI_BOARD_NAME, "30C6"), | ||
| 472 | * .ident = "HP/Compaq Presario F500", | ||
| 473 | * DMI_MATCH(DMI_BOARD_NAME, "30D3"), | ||
| 474 | * _OSI(Linux) unknown effect: | ||
| 475 | * .ident = "HP Pavilion dv6500", | ||
| 476 | * DMI_MATCH(DMI_BOARD_NAME, "30D0"), | ||
| 477 | */ | 199 | */ |
| 478 | { | 200 | |
| 479 | .callback = dmi_disable_osi_linux, | ||
| 480 | .ident = "Hewlett-Packard", | ||
| 481 | .matches = { | ||
| 482 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | ||
| 483 | }, | ||
| 484 | }, | ||
| 485 | /* | 201 | /* |
| 486 | * Lenovo has a mix of systems OSI(Linux) situations | 202 | * Lenovo has a mix of systems OSI(Linux) situations |
| 487 | * and thus we can not wildcard the vendor. | 203 | * and thus we can not wildcard the vendor. |
| @@ -519,113 +235,6 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { | |||
| 519 | DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"), | 235 | DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"), |
| 520 | }, | 236 | }, |
| 521 | }, | 237 | }, |
| 522 | { | ||
| 523 | .callback = dmi_disable_osi_linux, | ||
| 524 | .ident = "Lenovo 3000 V100", | ||
| 525 | .matches = { | ||
| 526 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
| 527 | DMI_MATCH(DMI_PRODUCT_VERSION, "LENOVO3000 V100"), | ||
| 528 | }, | ||
| 529 | }, | ||
| 530 | { | ||
| 531 | .callback = dmi_disable_osi_linux, | ||
| 532 | .ident = "Lenovo 3000 N100", | ||
| 533 | .matches = { | ||
| 534 | DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | ||
| 535 | DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"), | ||
| 536 | }, | ||
| 537 | }, | ||
| 538 | /* | ||
| 539 | * Disable OSI(Linux) warnings on all "LG Electronics" | ||
| 540 | * | ||
| 541 | * _OSI(Linux) confirmed to be a NOP: | ||
| 542 | * DMI_MATCH(DMI_PRODUCT_NAME, "P1-J150B"), | ||
| 543 | * with DMI_MATCH(DMI_BOARD_NAME, "ROCKY"), | ||
| 544 | * | ||
| 545 | * unknown: | ||
| 546 | * DMI_MATCH(DMI_PRODUCT_NAME, "S1-MDGDG"), | ||
| 547 | * with DMI_MATCH(DMI_BOARD_NAME, "ROCKY"), | ||
| 548 | */ | ||
| 549 | { | ||
| 550 | .callback = dmi_disable_osi_linux, | ||
| 551 | .ident = "LG", | ||
| 552 | .matches = { | ||
| 553 | DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"), | ||
| 554 | }, | ||
| 555 | }, | ||
| 556 | /* NEC - OSI(Linux) effect unknown */ | ||
| 557 | { | ||
| 558 | .callback = dmi_unknown_osi_linux, | ||
| 559 | .ident = "NEC VERSA M360", | ||
| 560 | .matches = { | ||
| 561 | DMI_MATCH(DMI_SYS_VENDOR, "NEC Computers SAS"), | ||
| 562 | DMI_MATCH(DMI_PRODUCT_NAME, "NEC VERSA M360"), | ||
| 563 | }, | ||
| 564 | }, | ||
| 565 | /* Panasonic */ | ||
| 566 | { | ||
| 567 | .callback = dmi_unknown_osi_linux, | ||
| 568 | .ident = "Panasonic", | ||
| 569 | .matches = { | ||
| 570 | DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"), | ||
| 571 | /* Toughbook CF-52 */ | ||
| 572 | DMI_MATCH(DMI_PRODUCT_NAME, "CF-52CCABVBG"), | ||
| 573 | }, | ||
| 574 | }, | ||
| 575 | /* | ||
| 576 | * Disable OSI(Linux) warnings on all "Samsung Electronics" | ||
| 577 | * | ||
| 578 | * OSI(Linux) disables PNP0C32 and other BIOS code for Windows: | ||
| 579 | * DMI_MATCH(DMI_PRODUCT_NAME, "R40P/R41P"), | ||
| 580 | * DMI_MATCH(DMI_PRODUCT_NAME, "R59P/R60P/R61P"), | ||
| 581 | */ | ||
| 582 | { | ||
| 583 | .callback = dmi_disable_osi_linux, | ||
| 584 | .ident = "Samsung", | ||
| 585 | .matches = { | ||
| 586 | DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), | ||
| 587 | }, | ||
| 588 | }, | ||
| 589 | /* | ||
| 590 | * Disable OSI(Linux) warnings on all "Sony Corporation" | ||
| 591 | * | ||
| 592 | * _OSI(Linux) is a NOP: | ||
| 593 | * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NR11S_S"), | ||
| 594 | * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SZ38GP_C"), | ||
| 595 | * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SZ650N"), | ||
| 596 | * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-TZ21MN_N"), | ||
| 597 | * _OSI(Linux) unknown effect: | ||
| 598 | * DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ11M"), | ||
| 599 | */ | ||
| 600 | { | ||
| 601 | .callback = dmi_disable_osi_linux, | ||
| 602 | .ident = "Sony", | ||
| 603 | .matches = { | ||
| 604 | DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), | ||
| 605 | }, | ||
| 606 | }, | ||
| 607 | /* | ||
| 608 | * Disable OSI(Linux) warnings on all "TOSHIBA" | ||
| 609 | * | ||
| 610 | * _OSI(Linux) breaks sound (bugzilla 7787): | ||
| 611 | * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P100"), | ||
| 612 | * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P105"), | ||
| 613 | * _OSI(Linux) is a NOP: | ||
| 614 | * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A100"), | ||
| 615 | * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A210"), | ||
| 616 | * _OSI(Linux) unknown effect: | ||
| 617 | * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A135"), | ||
| 618 | * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A200"), | ||
| 619 | * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P205"), | ||
| 620 | * DMI_MATCH(DMI_PRODUCT_NAME, "Satellite U305"), | ||
| 621 | */ | ||
| 622 | { | ||
| 623 | .callback = dmi_disable_osi_linux, | ||
| 624 | .ident = "Toshiba", | ||
| 625 | .matches = { | ||
| 626 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | ||
| 627 | }, | ||
| 628 | }, | ||
| 629 | {} | 238 | {} |
| 630 | }; | 239 | }; |
| 631 | 240 | ||
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index cf41f9fc24a7..30f3ef236ecb 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -219,7 +219,8 @@ static void gpe_transaction(struct acpi_ec *ec, u8 status) | |||
| 219 | goto unlock; | 219 | goto unlock; |
| 220 | err: | 220 | err: |
| 221 | /* false interrupt, state didn't change */ | 221 | /* false interrupt, state didn't change */ |
| 222 | ++ec->curr->irq_count; | 222 | if (in_interrupt()) |
| 223 | ++ec->curr->irq_count; | ||
| 223 | unlock: | 224 | unlock: |
| 224 | spin_unlock_irqrestore(&ec->curr_lock, flags); | 225 | spin_unlock_irqrestore(&ec->curr_lock, flags); |
| 225 | } | 226 | } |
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 4be252145cb4..c8111424dcb8 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
| 36 | #include <linux/kmod.h> | 36 | #include <linux/kmod.h> |
| 37 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 38 | #include <linux/dmi.h> | ||
| 39 | #include <linux/workqueue.h> | 38 | #include <linux/workqueue.h> |
| 40 | #include <linux/nmi.h> | 39 | #include <linux/nmi.h> |
| 41 | #include <linux/acpi.h> | 40 | #include <linux/acpi.h> |
| @@ -97,54 +96,44 @@ static DEFINE_SPINLOCK(acpi_res_lock); | |||
| 97 | static char osi_additional_string[OSI_STRING_LENGTH_MAX]; | 96 | static char osi_additional_string[OSI_STRING_LENGTH_MAX]; |
| 98 | 97 | ||
| 99 | /* | 98 | /* |
| 100 | * "Ode to _OSI(Linux)" | 99 | * The story of _OSI(Linux) |
| 101 | * | 100 | * |
| 102 | * osi_linux -- Control response to BIOS _OSI(Linux) query. | 101 | * From pre-history through Linux-2.6.22, |
| 102 | * Linux responded TRUE upon a BIOS OSI(Linux) query. | ||
| 103 | * | 103 | * |
| 104 | * As Linux evolves, the features that it supports change. | 104 | * Unfortunately, reference BIOS writers got wind of this |
| 105 | * So an OSI string such as "Linux" is not specific enough | 105 | * and put OSI(Linux) in their example code, quickly exposing |
| 106 | * to be useful across multiple versions of Linux. It | 106 | * this string as ill-conceived and opening the door to |
| 107 | * doesn't identify any particular feature, interface, | 107 | * an un-bounded number of BIOS incompatibilities. |
| 108 | * or even any particular version of Linux... | ||
| 109 | * | 108 | * |
| 110 | * Unfortunately, Linux-2.6.22 and earlier responded "yes" | 109 | * For example, OSI(Linux) was used on resume to re-POST a |
| 111 | * to a BIOS _OSI(Linux) query. When | 110 | * video card on one system, because Linux at that time |
| 112 | * a reference mobile BIOS started using it, its use | 111 | * could not do a speedy restore in its native driver. |
| 113 | * started to spread to many vendor platforms. | 112 | * But then upon gaining quick native restore capability, |
| 114 | * As it is not supportable, we need to halt that spread. | 113 | * Linux has no way to tell the BIOS to skip the time-consuming |
| 114 | * POST -- putting Linux at a permanent performance disadvantage. | ||
| 115 | * On another system, the BIOS writer used OSI(Linux) | ||
| 116 | * to infer native OS support for IPMI! On other systems, | ||
| 117 | * OSI(Linux) simply got in the way of Linux claiming to | ||
| 118 | * be compatible with other operating systems, exposing | ||
| 119 | * BIOS issues such as skipped device initialization. | ||
| 115 | * | 120 | * |
| 116 | * Today, most BIOS references to _OSI(Linux) are noise -- | 121 | * So "Linux" turned out to be a really poor chose of |
| 117 | * they have no functional effect and are just dead code | 122 | * OSI string, and from Linux-2.6.23 onward we respond FALSE. |
| 118 | * carried over from the reference BIOS. | ||
| 119 | * | ||
| 120 | * The next most common case is that _OSI(Linux) harms Linux, | ||
| 121 | * usually by causing the BIOS to follow paths that are | ||
| 122 | * not tested during Windows validation. | ||
| 123 | * | ||
| 124 | * Finally, there is a short list of platforms | ||
| 125 | * where OSI(Linux) benefits Linux. | ||
| 126 | * | ||
| 127 | * In Linux-2.6.23, OSI(Linux) is first disabled by default. | ||
| 128 | * DMI is used to disable the dmesg warning about OSI(Linux) | ||
| 129 | * on platforms where it is known to have no effect. | ||
| 130 | * But a dmesg warning remains for systems where | ||
| 131 | * we do not know if OSI(Linux) is good or bad for the system. | ||
| 132 | * DMI is also used to enable OSI(Linux) for the machines | ||
| 133 | * that are known to need it. | ||
| 134 | * | 123 | * |
| 135 | * BIOS writers should NOT query _OSI(Linux) on future systems. | 124 | * BIOS writers should NOT query _OSI(Linux) on future systems. |
| 136 | * It will be ignored by default, and to get Linux to | 125 | * Linux will complain on the console when it sees it, and return FALSE. |
| 137 | * not ignore it will require a kernel source update to | 126 | * To get Linux to return TRUE for your system will require |
| 138 | * add a DMI entry, or a boot-time "acpi_osi=Linux" invocation. | 127 | * a kernel source update to add a DMI entry, |
| 128 | * or boot with "acpi_osi=Linux" | ||
| 139 | */ | 129 | */ |
| 140 | #define OSI_LINUX_ENABLE 0 | ||
| 141 | 130 | ||
| 142 | static struct osi_linux { | 131 | static struct osi_linux { |
| 143 | unsigned int enable:1; | 132 | unsigned int enable:1; |
| 144 | unsigned int dmi:1; | 133 | unsigned int dmi:1; |
| 145 | unsigned int cmdline:1; | 134 | unsigned int cmdline:1; |
| 146 | unsigned int known:1; | 135 | unsigned int known:1; |
| 147 | } osi_linux = { OSI_LINUX_ENABLE, 0, 0, 0}; | 136 | } osi_linux = { 0, 0, 0, 0}; |
| 148 | 137 | ||
| 149 | static void __init acpi_request_region (struct acpi_generic_address *addr, | 138 | static void __init acpi_request_region (struct acpi_generic_address *addr, |
| 150 | unsigned int length, char *desc) | 139 | unsigned int length, char *desc) |
| @@ -1296,34 +1285,6 @@ acpi_status acpi_os_release_object(acpi_cache_t * cache, void *object) | |||
| 1296 | return (AE_OK); | 1285 | return (AE_OK); |
| 1297 | } | 1286 | } |
| 1298 | 1287 | ||
| 1299 | /** | ||
| 1300 | * acpi_dmi_dump - dump DMI slots needed for blacklist entry | ||
| 1301 | * | ||
| 1302 | * Returns 0 on success | ||
| 1303 | */ | ||
| 1304 | static int acpi_dmi_dump(void) | ||
| 1305 | { | ||
| 1306 | |||
| 1307 | if (!dmi_available) | ||
| 1308 | return -1; | ||
| 1309 | |||
| 1310 | printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n", | ||
| 1311 | dmi_get_system_info(DMI_SYS_VENDOR)); | ||
| 1312 | printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n", | ||
| 1313 | dmi_get_system_info(DMI_PRODUCT_NAME)); | ||
| 1314 | printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n", | ||
| 1315 | dmi_get_system_info(DMI_PRODUCT_VERSION)); | ||
| 1316 | printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n", | ||
| 1317 | dmi_get_system_info(DMI_BOARD_NAME)); | ||
| 1318 | printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n", | ||
| 1319 | dmi_get_system_info(DMI_BIOS_VENDOR)); | ||
| 1320 | printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n", | ||
| 1321 | dmi_get_system_info(DMI_BIOS_DATE)); | ||
| 1322 | |||
| 1323 | return 0; | ||
| 1324 | } | ||
| 1325 | |||
| 1326 | |||
| 1327 | /****************************************************************************** | 1288 | /****************************************************************************** |
| 1328 | * | 1289 | * |
| 1329 | * FUNCTION: acpi_os_validate_interface | 1290 | * FUNCTION: acpi_os_validate_interface |
| @@ -1350,21 +1311,6 @@ acpi_os_validate_interface (char *interface) | |||
| 1350 | osi_linux.cmdline ? " via cmdline" : | 1311 | osi_linux.cmdline ? " via cmdline" : |
| 1351 | osi_linux.dmi ? " via DMI" : ""); | 1312 | osi_linux.dmi ? " via DMI" : ""); |
| 1352 | 1313 | ||
| 1353 | if (!osi_linux.dmi) { | ||
| 1354 | if (acpi_dmi_dump()) | ||
| 1355 | printk(KERN_NOTICE PREFIX | ||
| 1356 | "[please extract dmidecode output]\n"); | ||
| 1357 | printk(KERN_NOTICE PREFIX | ||
| 1358 | "Please send DMI info above to " | ||
| 1359 | "linux-acpi@vger.kernel.org\n"); | ||
| 1360 | } | ||
| 1361 | if (!osi_linux.known && !osi_linux.cmdline) { | ||
| 1362 | printk(KERN_NOTICE PREFIX | ||
| 1363 | "If \"acpi_osi=%sLinux\" works better, " | ||
| 1364 | "please notify linux-acpi@vger.kernel.org\n", | ||
| 1365 | osi_linux.enable ? "!" : ""); | ||
| 1366 | } | ||
| 1367 | |||
| 1368 | if (osi_linux.enable) | 1314 | if (osi_linux.enable) |
| 1369 | return AE_OK; | 1315 | return AE_OK; |
| 1370 | } | 1316 | } |
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index bd5253ee5c85..39b7233c3485 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -751,16 +751,6 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device) | |||
| 751 | if (!acpi_match_device_ids(device, button_device_ids)) | 751 | if (!acpi_match_device_ids(device, button_device_ids)) |
| 752 | device->wakeup.flags.run_wake = 1; | 752 | device->wakeup.flags.run_wake = 1; |
| 753 | 753 | ||
| 754 | /* | ||
| 755 | * Don't set Power button GPE as run_wake | ||
| 756 | * if Fixed Power button is used | ||
| 757 | */ | ||
| 758 | if (!strcmp(device->pnp.hardware_id, "PNP0C0C") && | ||
| 759 | !(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) { | ||
| 760 | device->wakeup.flags.run_wake = 0; | ||
| 761 | device->wakeup.flags.valid = 0; | ||
| 762 | } | ||
| 763 | |||
| 764 | end: | 754 | end: |
| 765 | if (ACPI_FAILURE(status)) | 755 | if (ACPI_FAILURE(status)) |
| 766 | device->flags.wake_capable = 0; | 756 | device->flags.wake_capable = 0; |
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 80c0868d0480..28a691cc625e 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
| @@ -90,6 +90,18 @@ void __init acpi_old_suspend_ordering(void) | |||
| 90 | old_suspend_ordering = true; | 90 | old_suspend_ordering = true; |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | /* | ||
| 94 | * According to the ACPI specification the BIOS should make sure that ACPI is | ||
| 95 | * enabled and SCI_EN bit is set on wake-up from S1 - S3 sleep states. Still, | ||
| 96 | * some BIOSes don't do that and therefore we use acpi_enable() to enable ACPI | ||
| 97 | * on such systems during resume. Unfortunately that doesn't help in | ||
| 98 | * particularly pathological cases in which SCI_EN has to be set directly on | ||
| 99 | * resume, although the specification states very clearly that this flag is | ||
| 100 | * owned by the hardware. The set_sci_en_on_resume variable will be set in such | ||
| 101 | * cases. | ||
| 102 | */ | ||
| 103 | static bool set_sci_en_on_resume; | ||
| 104 | |||
| 93 | /** | 105 | /** |
| 94 | * acpi_pm_disable_gpes - Disable the GPEs. | 106 | * acpi_pm_disable_gpes - Disable the GPEs. |
| 95 | */ | 107 | */ |
| @@ -235,7 +247,11 @@ static int acpi_suspend_enter(suspend_state_t pm_state) | |||
| 235 | } | 247 | } |
| 236 | 248 | ||
| 237 | /* If ACPI is not enabled by the BIOS, we need to enable it here. */ | 249 | /* If ACPI is not enabled by the BIOS, we need to enable it here. */ |
| 238 | acpi_enable(); | 250 | if (set_sci_en_on_resume) |
| 251 | acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1); | ||
| 252 | else | ||
| 253 | acpi_enable(); | ||
| 254 | |||
| 239 | /* Reprogram control registers and execute _BFS */ | 255 | /* Reprogram control registers and execute _BFS */ |
| 240 | acpi_leave_sleep_state_prep(acpi_state); | 256 | acpi_leave_sleep_state_prep(acpi_state); |
| 241 | 257 | ||
| @@ -323,6 +339,12 @@ static int __init init_old_suspend_ordering(const struct dmi_system_id *d) | |||
| 323 | return 0; | 339 | return 0; |
| 324 | } | 340 | } |
| 325 | 341 | ||
| 342 | static int __init init_set_sci_en_on_resume(const struct dmi_system_id *d) | ||
| 343 | { | ||
| 344 | set_sci_en_on_resume = true; | ||
| 345 | return 0; | ||
| 346 | } | ||
| 347 | |||
| 326 | static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | 348 | static struct dmi_system_id __initdata acpisleep_dmi_table[] = { |
| 327 | { | 349 | { |
| 328 | .callback = init_old_suspend_ordering, | 350 | .callback = init_old_suspend_ordering, |
| @@ -340,6 +362,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
| 340 | DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"), | 362 | DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"), |
| 341 | }, | 363 | }, |
| 342 | }, | 364 | }, |
| 365 | { | ||
| 366 | .callback = init_set_sci_en_on_resume, | ||
| 367 | .ident = "Apple MacBook 1,1", | ||
| 368 | .matches = { | ||
| 369 | DMI_MATCH(DMI_SYS_VENDOR, "Apple Computer, Inc."), | ||
| 370 | DMI_MATCH(DMI_PRODUCT_NAME, "MacBook1,1"), | ||
| 371 | }, | ||
| 372 | }, | ||
| 373 | { | ||
| 374 | .callback = init_set_sci_en_on_resume, | ||
| 375 | .ident = "Apple MacMini 1,1", | ||
| 376 | .matches = { | ||
| 377 | DMI_MATCH(DMI_SYS_VENDOR, "Apple Computer, Inc."), | ||
| 378 | DMI_MATCH(DMI_PRODUCT_NAME, "Macmini1,1"), | ||
| 379 | }, | ||
| 380 | }, | ||
| 343 | {}, | 381 | {}, |
| 344 | }; | 382 | }; |
| 345 | #endif /* CONFIG_SUSPEND */ | 383 | #endif /* CONFIG_SUSPEND */ |
diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c index 66aac06f2ac5..25f531d892de 100644 --- a/drivers/acpi/toshiba_acpi.c +++ b/drivers/acpi/toshiba_acpi.c | |||
| @@ -848,8 +848,6 @@ static int __init toshiba_acpi_init(void) | |||
| 848 | ret = input_register_polled_device(toshiba_acpi.poll_dev); | 848 | ret = input_register_polled_device(toshiba_acpi.poll_dev); |
| 849 | if (ret) { | 849 | if (ret) { |
| 850 | printk(MY_ERR "unable to register kill-switch input device\n"); | 850 | printk(MY_ERR "unable to register kill-switch input device\n"); |
| 851 | rfkill_free(toshiba_acpi.rfk_dev); | ||
| 852 | toshiba_acpi.rfk_dev = NULL; | ||
| 853 | toshiba_acpi_exit(); | 851 | toshiba_acpi_exit(); |
| 854 | return ret; | 852 | return ret; |
| 855 | } | 853 | } |
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index e827be36ee8d..f844941089bb 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c | |||
| @@ -259,34 +259,26 @@ acpi_evaluate_integer(acpi_handle handle, | |||
| 259 | struct acpi_object_list *arguments, unsigned long long *data) | 259 | struct acpi_object_list *arguments, unsigned long long *data) |
| 260 | { | 260 | { |
| 261 | acpi_status status = AE_OK; | 261 | acpi_status status = AE_OK; |
| 262 | union acpi_object *element; | 262 | union acpi_object element; |
| 263 | struct acpi_buffer buffer = { 0, NULL }; | 263 | struct acpi_buffer buffer = { 0, NULL }; |
| 264 | 264 | ||
| 265 | |||
| 266 | if (!data) | 265 | if (!data) |
| 267 | return AE_BAD_PARAMETER; | 266 | return AE_BAD_PARAMETER; |
| 268 | 267 | ||
| 269 | element = kzalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL); | ||
| 270 | if (!element) | ||
| 271 | return AE_NO_MEMORY; | ||
| 272 | |||
| 273 | buffer.length = sizeof(union acpi_object); | 268 | buffer.length = sizeof(union acpi_object); |
| 274 | buffer.pointer = element; | 269 | buffer.pointer = &element; |
| 275 | status = acpi_evaluate_object(handle, pathname, arguments, &buffer); | 270 | status = acpi_evaluate_object(handle, pathname, arguments, &buffer); |
| 276 | if (ACPI_FAILURE(status)) { | 271 | if (ACPI_FAILURE(status)) { |
| 277 | acpi_util_eval_error(handle, pathname, status); | 272 | acpi_util_eval_error(handle, pathname, status); |
| 278 | kfree(element); | ||
| 279 | return status; | 273 | return status; |
| 280 | } | 274 | } |
| 281 | 275 | ||
| 282 | if (element->type != ACPI_TYPE_INTEGER) { | 276 | if (element.type != ACPI_TYPE_INTEGER) { |
| 283 | acpi_util_eval_error(handle, pathname, AE_BAD_DATA); | 277 | acpi_util_eval_error(handle, pathname, AE_BAD_DATA); |
| 284 | kfree(element); | ||
| 285 | return AE_BAD_DATA; | 278 | return AE_BAD_DATA; |
| 286 | } | 279 | } |
| 287 | 280 | ||
| 288 | *data = element->integer.value; | 281 | *data = element.integer.value; |
| 289 | kfree(element); | ||
| 290 | 282 | ||
| 291 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%llu]\n", *data)); | 283 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%llu]\n", *data)); |
| 292 | 284 | ||
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 8e37be19bbf5..d6d97d8f3fa4 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -1066,6 +1066,21 @@ static int piix_broken_suspend(void) | |||
| 1066 | if (dmi_find_device(DMI_DEV_TYPE_OEM_STRING, oemstrs[i], NULL)) | 1066 | if (dmi_find_device(DMI_DEV_TYPE_OEM_STRING, oemstrs[i], NULL)) |
| 1067 | return 1; | 1067 | return 1; |
| 1068 | 1068 | ||
| 1069 | /* TECRA M4 sometimes forgets its identify and reports bogus | ||
| 1070 | * DMI information. As the bogus information is a bit | ||
| 1071 | * generic, match as many entries as possible. This manual | ||
| 1072 | * matching is necessary because dmi_system_id.matches is | ||
| 1073 | * limited to four entries. | ||
| 1074 | */ | ||
| 1075 | if (!strcmp(dmi_get_system_info(DMI_SYS_VENDOR), "TOSHIBA") && | ||
| 1076 | !strcmp(dmi_get_system_info(DMI_PRODUCT_NAME), "000000") && | ||
| 1077 | !strcmp(dmi_get_system_info(DMI_PRODUCT_VERSION), "000000") && | ||
| 1078 | !strcmp(dmi_get_system_info(DMI_PRODUCT_SERIAL), "000000") && | ||
| 1079 | !strcmp(dmi_get_system_info(DMI_BOARD_VENDOR), "TOSHIBA") && | ||
| 1080 | !strcmp(dmi_get_system_info(DMI_BOARD_NAME), "Portable PC") && | ||
| 1081 | !strcmp(dmi_get_system_info(DMI_BOARD_VERSION), "Version A0")) | ||
| 1082 | return 1; | ||
| 1083 | |||
| 1069 | return 0; | 1084 | return 0; |
| 1070 | } | 1085 | } |
| 1071 | 1086 | ||
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 4214bfb13bbd..5e2eb740df46 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -2492,6 +2492,13 @@ int ata_dev_configure(struct ata_device *dev) | |||
| 2492 | } | 2492 | } |
| 2493 | } | 2493 | } |
| 2494 | 2494 | ||
| 2495 | if ((dev->horkage & ATA_HORKAGE_FIRMWARE_WARN) && print_info) { | ||
| 2496 | ata_dev_printk(dev, KERN_WARNING, "WARNING: device requires " | ||
| 2497 | "firmware update to be fully functional.\n"); | ||
| 2498 | ata_dev_printk(dev, KERN_WARNING, " contact the vendor " | ||
| 2499 | "or visit http://ata.wiki.kernel.org.\n"); | ||
| 2500 | } | ||
| 2501 | |||
| 2495 | return 0; | 2502 | return 0; |
| 2496 | 2503 | ||
| 2497 | err_out_nosup: | 2504 | err_out_nosup: |
| @@ -4042,6 +4049,20 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { | |||
| 4042 | { "ST380817AS", "3.42", ATA_HORKAGE_NONCQ }, | 4049 | { "ST380817AS", "3.42", ATA_HORKAGE_NONCQ }, |
| 4043 | { "ST3160023AS", "3.42", ATA_HORKAGE_NONCQ }, | 4050 | { "ST3160023AS", "3.42", ATA_HORKAGE_NONCQ }, |
| 4044 | 4051 | ||
| 4052 | /* Seagate NCQ + FLUSH CACHE firmware bug */ | ||
| 4053 | { "ST31500341AS", "9JU138", ATA_HORKAGE_NONCQ | | ||
| 4054 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4055 | { "ST31000333AS", "9FZ136", ATA_HORKAGE_NONCQ | | ||
| 4056 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4057 | { "ST3640623AS", "9FZ164", ATA_HORKAGE_NONCQ | | ||
| 4058 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4059 | { "ST3640323AS", "9FZ134", ATA_HORKAGE_NONCQ | | ||
| 4060 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4061 | { "ST3320813AS", "9FZ182", ATA_HORKAGE_NONCQ | | ||
| 4062 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4063 | { "ST3320613AS", "9FZ162", ATA_HORKAGE_NONCQ | | ||
| 4064 | ATA_HORKAGE_FIRMWARE_WARN }, | ||
| 4065 | |||
| 4045 | /* Blacklist entries taken from Silicon Image 3124/3132 | 4066 | /* Blacklist entries taken from Silicon Image 3124/3132 |
| 4046 | Windows driver .inf file - also several Linux problem reports */ | 4067 | Windows driver .inf file - also several Linux problem reports */ |
| 4047 | { "HTS541060G9SA00", "MB3OC60D", ATA_HORKAGE_NONCQ, }, | 4068 | { "HTS541060G9SA00", "MB3OC60D", ATA_HORKAGE_NONCQ, }, |
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c index f8b3ffc8ae9e..c2e6fb9f2ef9 100644 --- a/drivers/ata/pata_rb532_cf.c +++ b/drivers/ata/pata_rb532_cf.c | |||
| @@ -39,9 +39,11 @@ | |||
| 39 | #define RB500_CF_MAXPORTS 1 | 39 | #define RB500_CF_MAXPORTS 1 |
| 40 | #define RB500_CF_IO_DELAY 400 | 40 | #define RB500_CF_IO_DELAY 400 |
| 41 | 41 | ||
| 42 | #define RB500_CF_REG_CMD 0x0800 | 42 | #define RB500_CF_REG_BASE 0x0800 |
| 43 | #define RB500_CF_REG_ERR 0x080D | ||
| 43 | #define RB500_CF_REG_CTRL 0x080E | 44 | #define RB500_CF_REG_CTRL 0x080E |
| 44 | #define RB500_CF_REG_DATA 0x0C00 | 45 | /* 32bit buffered data register offset */ |
| 46 | #define RB500_CF_REG_DBUF32 0x0C00 | ||
| 45 | 47 | ||
| 46 | struct rb532_cf_info { | 48 | struct rb532_cf_info { |
| 47 | void __iomem *iobase; | 49 | void __iomem *iobase; |
| @@ -72,11 +74,12 @@ static void rb532_pata_exec_command(struct ata_port *ap, | |||
| 72 | rb532_pata_finish_io(ap); | 74 | rb532_pata_finish_io(ap); |
| 73 | } | 75 | } |
| 74 | 76 | ||
| 75 | static void rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf, | 77 | static unsigned int rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf, |
| 76 | unsigned int buflen, int write_data) | 78 | unsigned int buflen, int write_data) |
| 77 | { | 79 | { |
| 78 | struct ata_port *ap = adev->link->ap; | 80 | struct ata_port *ap = adev->link->ap; |
| 79 | void __iomem *ioaddr = ap->ioaddr.data_addr; | 81 | void __iomem *ioaddr = ap->ioaddr.data_addr; |
| 82 | int retlen = buflen; | ||
| 80 | 83 | ||
| 81 | if (write_data) { | 84 | if (write_data) { |
| 82 | for (; buflen > 0; buflen--, buf++) | 85 | for (; buflen > 0; buflen--, buf++) |
| @@ -87,6 +90,7 @@ static void rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf, | |||
| 87 | } | 90 | } |
| 88 | 91 | ||
| 89 | rb532_pata_finish_io(adev->link->ap); | 92 | rb532_pata_finish_io(adev->link->ap); |
| 93 | return retlen; | ||
| 90 | } | 94 | } |
| 91 | 95 | ||
| 92 | static void rb532_pata_freeze(struct ata_port *ap) | 96 | static void rb532_pata_freeze(struct ata_port *ap) |
| @@ -146,13 +150,14 @@ static void rb532_pata_setup_ports(struct ata_host *ah) | |||
| 146 | ap->pio_mask = 0x1f; /* PIO4 */ | 150 | ap->pio_mask = 0x1f; /* PIO4 */ |
| 147 | ap->flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO; | 151 | ap->flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO; |
| 148 | 152 | ||
| 149 | ap->ioaddr.cmd_addr = info->iobase + RB500_CF_REG_CMD; | 153 | ap->ioaddr.cmd_addr = info->iobase + RB500_CF_REG_BASE; |
| 150 | ap->ioaddr.ctl_addr = info->iobase + RB500_CF_REG_CTRL; | 154 | ap->ioaddr.ctl_addr = info->iobase + RB500_CF_REG_CTRL; |
| 151 | ap->ioaddr.altstatus_addr = info->iobase + RB500_CF_REG_CTRL; | 155 | ap->ioaddr.altstatus_addr = info->iobase + RB500_CF_REG_CTRL; |
| 152 | 156 | ||
| 153 | ata_sff_std_ports(&ap->ioaddr); | 157 | ata_sff_std_ports(&ap->ioaddr); |
| 154 | 158 | ||
| 155 | ap->ioaddr.data_addr = info->iobase + RB500_CF_REG_DATA; | 159 | ap->ioaddr.data_addr = info->iobase + RB500_CF_REG_DBUF32; |
| 160 | ap->ioaddr.error_addr = info->iobase + RB500_CF_REG_ERR; | ||
| 156 | } | 161 | } |
| 157 | 162 | ||
| 158 | static __devinit int rb532_pata_driver_probe(struct platform_device *pdev) | 163 | static __devinit int rb532_pata_driver_probe(struct platform_device *pdev) |
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index ecab9e67d47a..29e1dfafb7c6 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c | |||
| @@ -194,7 +194,7 @@ struct ace_device { | |||
| 194 | int in_irq; | 194 | int in_irq; |
| 195 | 195 | ||
| 196 | /* Details of hardware device */ | 196 | /* Details of hardware device */ |
| 197 | unsigned long physaddr; | 197 | resource_size_t physaddr; |
| 198 | void __iomem *baseaddr; | 198 | void __iomem *baseaddr; |
| 199 | int irq; | 199 | int irq; |
| 200 | int bus_width; /* 0 := 8 bit; 1 := 16 bit */ | 200 | int bus_width; /* 0 := 8 bit; 1 := 16 bit */ |
| @@ -628,8 +628,8 @@ static void ace_fsm_dostate(struct ace_device *ace) | |||
| 628 | 628 | ||
| 629 | /* Okay, it's a data request, set it up for transfer */ | 629 | /* Okay, it's a data request, set it up for transfer */ |
| 630 | dev_dbg(ace->dev, | 630 | dev_dbg(ace->dev, |
| 631 | "request: sec=%lx hcnt=%lx, ccnt=%x, dir=%i\n", | 631 | "request: sec=%llx hcnt=%lx, ccnt=%x, dir=%i\n", |
| 632 | req->sector, req->hard_nr_sectors, | 632 | (unsigned long long) req->sector, req->hard_nr_sectors, |
| 633 | req->current_nr_sectors, rq_data_dir(req)); | 633 | req->current_nr_sectors, rq_data_dir(req)); |
| 634 | 634 | ||
| 635 | ace->req = req; | 635 | ace->req = req; |
| @@ -935,7 +935,8 @@ static int __devinit ace_setup(struct ace_device *ace) | |||
| 935 | int rc; | 935 | int rc; |
| 936 | 936 | ||
| 937 | dev_dbg(ace->dev, "ace_setup(ace=0x%p)\n", ace); | 937 | dev_dbg(ace->dev, "ace_setup(ace=0x%p)\n", ace); |
| 938 | dev_dbg(ace->dev, "physaddr=0x%lx irq=%i\n", ace->physaddr, ace->irq); | 938 | dev_dbg(ace->dev, "physaddr=0x%llx irq=%i\n", |
| 939 | (unsigned long long)ace->physaddr, ace->irq); | ||
| 939 | 940 | ||
| 940 | spin_lock_init(&ace->lock); | 941 | spin_lock_init(&ace->lock); |
| 941 | init_completion(&ace->id_completion); | 942 | init_completion(&ace->id_completion); |
| @@ -1017,8 +1018,8 @@ static int __devinit ace_setup(struct ace_device *ace) | |||
| 1017 | /* Print the identification */ | 1018 | /* Print the identification */ |
| 1018 | dev_info(ace->dev, "Xilinx SystemACE revision %i.%i.%i\n", | 1019 | dev_info(ace->dev, "Xilinx SystemACE revision %i.%i.%i\n", |
| 1019 | (version >> 12) & 0xf, (version >> 8) & 0x0f, version & 0xff); | 1020 | (version >> 12) & 0xf, (version >> 8) & 0x0f, version & 0xff); |
| 1020 | dev_dbg(ace->dev, "physaddr 0x%lx, mapped to 0x%p, irq=%i\n", | 1021 | dev_dbg(ace->dev, "physaddr 0x%llx, mapped to 0x%p, irq=%i\n", |
| 1021 | ace->physaddr, ace->baseaddr, ace->irq); | 1022 | (unsigned long long) ace->physaddr, ace->baseaddr, ace->irq); |
| 1022 | 1023 | ||
| 1023 | ace->media_change = 1; | 1024 | ace->media_change = 1; |
| 1024 | ace_revalidate_disk(ace->gd); | 1025 | ace_revalidate_disk(ace->gd); |
| @@ -1035,8 +1036,8 @@ err_alloc_disk: | |||
| 1035 | err_blk_initq: | 1036 | err_blk_initq: |
| 1036 | iounmap(ace->baseaddr); | 1037 | iounmap(ace->baseaddr); |
| 1037 | err_ioremap: | 1038 | err_ioremap: |
| 1038 | dev_info(ace->dev, "xsysace: error initializing device at 0x%lx\n", | 1039 | dev_info(ace->dev, "xsysace: error initializing device at 0x%llx\n", |
| 1039 | ace->physaddr); | 1040 | (unsigned long long) ace->physaddr); |
| 1040 | return -ENOMEM; | 1041 | return -ENOMEM; |
| 1041 | } | 1042 | } |
| 1042 | 1043 | ||
| @@ -1059,7 +1060,7 @@ static void __devexit ace_teardown(struct ace_device *ace) | |||
| 1059 | } | 1060 | } |
| 1060 | 1061 | ||
| 1061 | static int __devinit | 1062 | static int __devinit |
| 1062 | ace_alloc(struct device *dev, int id, unsigned long physaddr, | 1063 | ace_alloc(struct device *dev, int id, resource_size_t physaddr, |
| 1063 | int irq, int bus_width) | 1064 | int irq, int bus_width) |
| 1064 | { | 1065 | { |
| 1065 | struct ace_device *ace; | 1066 | struct ace_device *ace; |
| @@ -1119,7 +1120,7 @@ static void __devexit ace_free(struct device *dev) | |||
| 1119 | 1120 | ||
| 1120 | static int __devinit ace_probe(struct platform_device *dev) | 1121 | static int __devinit ace_probe(struct platform_device *dev) |
| 1121 | { | 1122 | { |
| 1122 | unsigned long physaddr = 0; | 1123 | resource_size_t physaddr = 0; |
| 1123 | int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */ | 1124 | int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */ |
| 1124 | int id = dev->id; | 1125 | int id = dev->id; |
| 1125 | int irq = NO_IRQ; | 1126 | int irq = NO_IRQ; |
| @@ -1165,7 +1166,7 @@ static int __devinit | |||
| 1165 | ace_of_probe(struct of_device *op, const struct of_device_id *match) | 1166 | ace_of_probe(struct of_device *op, const struct of_device_id *match) |
| 1166 | { | 1167 | { |
| 1167 | struct resource res; | 1168 | struct resource res; |
| 1168 | unsigned long physaddr; | 1169 | resource_size_t physaddr; |
| 1169 | const u32 *id; | 1170 | const u32 *id; |
| 1170 | int irq, bus_width, rc; | 1171 | int irq, bus_width, rc; |
| 1171 | 1172 | ||
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index 0f004b65ec03..03f95ec08f59 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | static int uninorth_rev; | 27 | static int uninorth_rev; |
| 28 | static int is_u3; | 28 | static int is_u3; |
| 29 | 29 | ||
| 30 | static char __devinitdata *aperture = NULL; | 30 | static char *aperture = NULL; |
| 31 | 31 | ||
| 32 | static int uninorth_fetch_size(void) | 32 | static int uninorth_fetch_size(void) |
| 33 | { | 33 | { |
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c index 74e9cd81b5b2..61f0146e215d 100644 --- a/drivers/char/ds1620.c +++ b/drivers/char/ds1620.c | |||
| @@ -43,52 +43,51 @@ static const char *fan_state[] = { "off", "on", "on (hardwired)" }; | |||
| 43 | * chance that the WaveArtist driver could touch these bits to | 43 | * chance that the WaveArtist driver could touch these bits to |
| 44 | * enable or disable the speaker. | 44 | * enable or disable the speaker. |
| 45 | */ | 45 | */ |
| 46 | extern spinlock_t gpio_lock; | ||
| 47 | extern unsigned int system_rev; | 46 | extern unsigned int system_rev; |
| 48 | 47 | ||
| 49 | static inline void netwinder_ds1620_set_clk(int clk) | 48 | static inline void netwinder_ds1620_set_clk(int clk) |
| 50 | { | 49 | { |
| 51 | gpio_modify_op(GPIO_DSCLK, clk ? GPIO_DSCLK : 0); | 50 | nw_gpio_modify_op(GPIO_DSCLK, clk ? GPIO_DSCLK : 0); |
| 52 | } | 51 | } |
| 53 | 52 | ||
| 54 | static inline void netwinder_ds1620_set_data(int dat) | 53 | static inline void netwinder_ds1620_set_data(int dat) |
| 55 | { | 54 | { |
| 56 | gpio_modify_op(GPIO_DATA, dat ? GPIO_DATA : 0); | 55 | nw_gpio_modify_op(GPIO_DATA, dat ? GPIO_DATA : 0); |
| 57 | } | 56 | } |
| 58 | 57 | ||
| 59 | static inline int netwinder_ds1620_get_data(void) | 58 | static inline int netwinder_ds1620_get_data(void) |
| 60 | { | 59 | { |
| 61 | return gpio_read() & GPIO_DATA; | 60 | return nw_gpio_read() & GPIO_DATA; |
| 62 | } | 61 | } |
| 63 | 62 | ||
| 64 | static inline void netwinder_ds1620_set_data_dir(int dir) | 63 | static inline void netwinder_ds1620_set_data_dir(int dir) |
| 65 | { | 64 | { |
| 66 | gpio_modify_io(GPIO_DATA, dir ? GPIO_DATA : 0); | 65 | nw_gpio_modify_io(GPIO_DATA, dir ? GPIO_DATA : 0); |
| 67 | } | 66 | } |
| 68 | 67 | ||
| 69 | static inline void netwinder_ds1620_reset(void) | 68 | static inline void netwinder_ds1620_reset(void) |
| 70 | { | 69 | { |
| 71 | cpld_modify(CPLD_DS_ENABLE, 0); | 70 | nw_cpld_modify(CPLD_DS_ENABLE, 0); |
| 72 | cpld_modify(CPLD_DS_ENABLE, CPLD_DS_ENABLE); | 71 | nw_cpld_modify(CPLD_DS_ENABLE, CPLD_DS_ENABLE); |
| 73 | } | 72 | } |
| 74 | 73 | ||
| 75 | static inline void netwinder_lock(unsigned long *flags) | 74 | static inline void netwinder_lock(unsigned long *flags) |
| 76 | { | 75 | { |
| 77 | spin_lock_irqsave(&gpio_lock, *flags); | 76 | spin_lock_irqsave(&nw_gpio_lock, *flags); |
| 78 | } | 77 | } |
| 79 | 78 | ||
| 80 | static inline void netwinder_unlock(unsigned long *flags) | 79 | static inline void netwinder_unlock(unsigned long *flags) |
| 81 | { | 80 | { |
| 82 | spin_unlock_irqrestore(&gpio_lock, *flags); | 81 | spin_unlock_irqrestore(&nw_gpio_lock, *flags); |
| 83 | } | 82 | } |
| 84 | 83 | ||
| 85 | static inline void netwinder_set_fan(int i) | 84 | static inline void netwinder_set_fan(int i) |
| 86 | { | 85 | { |
| 87 | unsigned long flags; | 86 | unsigned long flags; |
| 88 | 87 | ||
| 89 | spin_lock_irqsave(&gpio_lock, flags); | 88 | spin_lock_irqsave(&nw_gpio_lock, flags); |
| 90 | gpio_modify_op(GPIO_FAN, i ? GPIO_FAN : 0); | 89 | nw_gpio_modify_op(GPIO_FAN, i ? GPIO_FAN : 0); |
| 91 | spin_unlock_irqrestore(&gpio_lock, flags); | 90 | spin_unlock_irqrestore(&nw_gpio_lock, flags); |
| 92 | } | 91 | } |
| 93 | 92 | ||
| 94 | static inline int netwinder_get_fan(void) | 93 | static inline int netwinder_get_fan(void) |
| @@ -96,7 +95,7 @@ static inline int netwinder_get_fan(void) | |||
| 96 | if ((system_rev & 0xf000) == 0x4000) | 95 | if ((system_rev & 0xf000) == 0x4000) |
| 97 | return FAN_ALWAYS_ON; | 96 | return FAN_ALWAYS_ON; |
| 98 | 97 | ||
| 99 | return (gpio_read() & GPIO_FAN) ? FAN_ON : FAN_OFF; | 98 | return (nw_gpio_read() & GPIO_FAN) ? FAN_ON : FAN_OFF; |
| 100 | } | 99 | } |
| 101 | 100 | ||
| 102 | /* | 101 | /* |
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index 44e5d60f517e..4b10770fa937 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c | |||
| @@ -3739,7 +3739,7 @@ static int stli_getbrdnr(void) | |||
| 3739 | * do is go probing around in the usual places hoping we can find it. | 3739 | * do is go probing around in the usual places hoping we can find it. |
| 3740 | */ | 3740 | */ |
| 3741 | 3741 | ||
| 3742 | static int stli_findeisabrds(void) | 3742 | static int __init stli_findeisabrds(void) |
| 3743 | { | 3743 | { |
| 3744 | struct stlibrd *brdp; | 3744 | struct stlibrd *brdp; |
| 3745 | unsigned int iobase, eid, i; | 3745 | unsigned int iobase, eid, i; |
| @@ -3935,7 +3935,7 @@ static struct stlibrd *stli_allocbrd(void) | |||
| 3935 | * can find. | 3935 | * can find. |
| 3936 | */ | 3936 | */ |
| 3937 | 3937 | ||
| 3938 | static int stli_initbrds(void) | 3938 | static int __init stli_initbrds(void) |
| 3939 | { | 3939 | { |
| 3940 | struct stlibrd *brdp, *nxtbrdp; | 3940 | struct stlibrd *brdp, *nxtbrdp; |
| 3941 | struct stlconf conf; | 3941 | struct stlconf conf; |
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c index 006be92ee3f3..8c7df5ba088f 100644 --- a/drivers/char/nwflash.c +++ b/drivers/char/nwflash.c | |||
| @@ -58,8 +58,6 @@ static volatile unsigned char *FLASH_BASE; | |||
| 58 | static int gbFlashSize = KFLASH_SIZE; | 58 | static int gbFlashSize = KFLASH_SIZE; |
| 59 | static DEFINE_MUTEX(nwflash_mutex); | 59 | static DEFINE_MUTEX(nwflash_mutex); |
| 60 | 60 | ||
| 61 | extern spinlock_t gpio_lock; | ||
| 62 | |||
| 63 | static int get_flash_id(void) | 61 | static int get_flash_id(void) |
| 64 | { | 62 | { |
| 65 | volatile unsigned int c1, c2; | 63 | volatile unsigned int c1, c2; |
| @@ -616,9 +614,9 @@ static void kick_open(void) | |||
| 616 | * we want to write a bit pattern XXX1 to Xilinx to enable | 614 | * we want to write a bit pattern XXX1 to Xilinx to enable |
| 617 | * the write gate, which will be open for about the next 2ms. | 615 | * the write gate, which will be open for about the next 2ms. |
| 618 | */ | 616 | */ |
| 619 | spin_lock_irqsave(&gpio_lock, flags); | 617 | spin_lock_irqsave(&nw_gpio_lock, flags); |
| 620 | cpld_modify(1, 1); | 618 | nw_cpld_modify(CPLD_FLASH_WR_ENABLE, CPLD_FLASH_WR_ENABLE); |
| 621 | spin_unlock_irqrestore(&gpio_lock, flags); | 619 | spin_unlock_irqrestore(&nw_gpio_lock, flags); |
| 622 | 620 | ||
| 623 | /* | 621 | /* |
| 624 | * let the ISA bus to catch on... | 622 | * let the ISA bus to catch on... |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 59f472143f08..1412a8d1e58d 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -1795,12 +1795,15 @@ retry_open: | |||
| 1795 | } | 1795 | } |
| 1796 | #endif | 1796 | #endif |
| 1797 | if (device == MKDEV(TTYAUX_MAJOR, 1)) { | 1797 | if (device == MKDEV(TTYAUX_MAJOR, 1)) { |
| 1798 | driver = tty_driver_kref_get(console_device(&index)); | 1798 | struct tty_driver *console_driver = console_device(&index); |
| 1799 | if (driver) { | 1799 | if (console_driver) { |
| 1800 | /* Don't let /dev/console block */ | 1800 | driver = tty_driver_kref_get(console_driver); |
| 1801 | filp->f_flags |= O_NONBLOCK; | 1801 | if (driver) { |
| 1802 | noctty = 1; | 1802 | /* Don't let /dev/console block */ |
| 1803 | goto got_driver; | 1803 | filp->f_flags |= O_NONBLOCK; |
| 1804 | noctty = 1; | ||
| 1805 | goto got_driver; | ||
| 1806 | } | ||
| 1804 | } | 1807 | } |
| 1805 | mutex_unlock(&tty_mutex); | 1808 | mutex_unlock(&tty_mutex); |
| 1806 | return -ENODEV; | 1809 | return -ENODEV; |
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c index ed132fe55d3d..d16131949097 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c | |||
| @@ -626,7 +626,7 @@ static int __devinit hwicap_setup(struct device *dev, int id, | |||
| 626 | if (!request_mem_region(drvdata->mem_start, | 626 | if (!request_mem_region(drvdata->mem_start, |
| 627 | drvdata->mem_size, DRIVER_NAME)) { | 627 | drvdata->mem_size, DRIVER_NAME)) { |
| 628 | dev_err(dev, "Couldn't lock memory region at %Lx\n", | 628 | dev_err(dev, "Couldn't lock memory region at %Lx\n", |
| 629 | regs_res->start); | 629 | (unsigned long long) regs_res->start); |
| 630 | retval = -EBUSY; | 630 | retval = -EBUSY; |
| 631 | goto failed1; | 631 | goto failed1; |
| 632 | } | 632 | } |
| @@ -645,9 +645,10 @@ static int __devinit hwicap_setup(struct device *dev, int id, | |||
| 645 | mutex_init(&drvdata->sem); | 645 | mutex_init(&drvdata->sem); |
| 646 | drvdata->is_open = 0; | 646 | drvdata->is_open = 0; |
| 647 | 647 | ||
| 648 | dev_info(dev, "ioremap %lx to %p with size %Lx\n", | 648 | dev_info(dev, "ioremap %llx to %p with size %llx\n", |
| 649 | (unsigned long int)drvdata->mem_start, | 649 | (unsigned long long) drvdata->mem_start, |
| 650 | drvdata->base_address, drvdata->mem_size); | 650 | drvdata->base_address, |
| 651 | (unsigned long long) drvdata->mem_size); | ||
| 651 | 652 | ||
| 652 | cdev_init(&drvdata->cdev, &hwicap_fops); | 653 | cdev_init(&drvdata->cdev, &hwicap_fops); |
| 653 | drvdata->cdev.owner = THIS_MODULE; | 654 | drvdata->cdev.owner = THIS_MODULE; |
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index b6ad3ac5916e..24607669a52b 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c | |||
| @@ -1357,7 +1357,7 @@ static int hw_supports(struct device *dev, __be32 desc_hdr_template) | |||
| 1357 | return ret; | 1357 | return ret; |
| 1358 | } | 1358 | } |
| 1359 | 1359 | ||
| 1360 | static int __devexit talitos_remove(struct of_device *ofdev) | 1360 | static int talitos_remove(struct of_device *ofdev) |
| 1361 | { | 1361 | { |
| 1362 | struct device *dev = &ofdev->dev; | 1362 | struct device *dev = &ofdev->dev; |
| 1363 | struct talitos_private *priv = dev_get_drvdata(dev); | 1363 | struct talitos_private *priv = dev_get_drvdata(dev); |
| @@ -1622,7 +1622,7 @@ static struct of_platform_driver talitos_driver = { | |||
| 1622 | .name = "talitos", | 1622 | .name = "talitos", |
| 1623 | .match_table = talitos_match, | 1623 | .match_table = talitos_match, |
| 1624 | .probe = talitos_probe, | 1624 | .probe = talitos_probe, |
| 1625 | .remove = __devexit_p(talitos_remove), | 1625 | .remove = talitos_remove, |
| 1626 | }; | 1626 | }; |
| 1627 | 1627 | ||
| 1628 | static int __init talitos_init(void) | 1628 | static int __init talitos_init(void) |
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c index e43bdc43a1bf..ebb037b78758 100644 --- a/drivers/edac/i82875p_edac.c +++ b/drivers/edac/i82875p_edac.c | |||
| @@ -182,8 +182,6 @@ static struct pci_dev *mci_pdev; /* init dev: in case that AGP code has | |||
| 182 | * already registered driver | 182 | * already registered driver |
| 183 | */ | 183 | */ |
| 184 | 184 | ||
| 185 | static int i82875p_registered = 1; | ||
| 186 | |||
| 187 | static struct edac_pci_ctl_info *i82875p_pci; | 185 | static struct edac_pci_ctl_info *i82875p_pci; |
| 188 | 186 | ||
| 189 | static void i82875p_get_error_info(struct mem_ctl_info *mci, | 187 | static void i82875p_get_error_info(struct mem_ctl_info *mci, |
| @@ -295,6 +293,7 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev, | |||
| 295 | "%s(): pci_bus_add_device() Failed\n", | 293 | "%s(): pci_bus_add_device() Failed\n", |
| 296 | __func__); | 294 | __func__); |
| 297 | } | 295 | } |
| 296 | pci_bus_assign_resources(dev->bus); | ||
| 298 | } | 297 | } |
| 299 | 298 | ||
| 300 | *ovrfl_pdev = dev; | 299 | *ovrfl_pdev = dev; |
| @@ -409,6 +408,9 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 409 | goto fail0; | 408 | goto fail0; |
| 410 | } | 409 | } |
| 411 | 410 | ||
| 411 | /* Keeps mci available after edac_mc_del_mc() till edac_mc_free() */ | ||
| 412 | kobject_get(&mci->edac_mci_kobj); | ||
| 413 | |||
| 412 | debugf3("%s(): init mci\n", __func__); | 414 | debugf3("%s(): init mci\n", __func__); |
| 413 | mci->dev = &pdev->dev; | 415 | mci->dev = &pdev->dev; |
| 414 | mci->mtype_cap = MEM_FLAG_DDR; | 416 | mci->mtype_cap = MEM_FLAG_DDR; |
| @@ -451,6 +453,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx) | |||
| 451 | return 0; | 453 | return 0; |
| 452 | 454 | ||
| 453 | fail1: | 455 | fail1: |
| 456 | kobject_put(&mci->edac_mci_kobj); | ||
| 454 | edac_mc_free(mci); | 457 | edac_mc_free(mci); |
| 455 | 458 | ||
| 456 | fail0: | 459 | fail0: |
| @@ -578,12 +581,11 @@ static void __exit i82875p_exit(void) | |||
| 578 | { | 581 | { |
| 579 | debugf3("%s()\n", __func__); | 582 | debugf3("%s()\n", __func__); |
| 580 | 583 | ||
| 584 | i82875p_remove_one(mci_pdev); | ||
| 585 | pci_dev_put(mci_pdev); | ||
| 586 | |||
| 581 | pci_unregister_driver(&i82875p_driver); | 587 | pci_unregister_driver(&i82875p_driver); |
| 582 | 588 | ||
| 583 | if (!i82875p_registered) { | ||
| 584 | i82875p_remove_one(mci_pdev); | ||
| 585 | pci_dev_put(mci_pdev); | ||
| 586 | } | ||
| 587 | } | 589 | } |
| 588 | 590 | ||
| 589 | module_init(i82875p_init); | 591 | module_init(i82875p_init); |
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index 97df6dac3a82..e54403ee59e7 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c | |||
| @@ -372,6 +372,11 @@ static const struct { | |||
| 372 | }, | 372 | }, |
| 373 | /* iPod mini */ { | 373 | /* iPod mini */ { |
| 374 | .firmware_revision = 0x0a2700, | 374 | .firmware_revision = 0x0a2700, |
| 375 | .model = 0x000022, | ||
| 376 | .workarounds = SBP2_WORKAROUND_FIX_CAPACITY, | ||
| 377 | }, | ||
| 378 | /* iPod mini */ { | ||
| 379 | .firmware_revision = 0x0a2700, | ||
| 375 | .model = 0x000023, | 380 | .model = 0x000023, |
| 376 | .workarounds = SBP2_WORKAROUND_FIX_CAPACITY, | 381 | .workarounds = SBP2_WORKAROUND_FIX_CAPACITY, |
| 377 | }, | 382 | }, |
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 3ab1e9cc4692..996097acb5e7 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
| @@ -305,6 +305,8 @@ static void drm_cleanup(struct drm_device * dev) | |||
| 305 | return; | 305 | return; |
| 306 | } | 306 | } |
| 307 | 307 | ||
| 308 | drm_vblank_cleanup(dev); | ||
| 309 | |||
| 308 | drm_lastclose(dev); | 310 | drm_lastclose(dev); |
| 309 | 311 | ||
| 310 | if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) && | 312 | if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) && |
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 15c8dabc3e97..1e787f894b3c 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
| @@ -94,7 +94,7 @@ static void vblank_disable_fn(unsigned long arg) | |||
| 94 | } | 94 | } |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | static void drm_vblank_cleanup(struct drm_device *dev) | 97 | void drm_vblank_cleanup(struct drm_device *dev) |
| 98 | { | 98 | { |
| 99 | /* Bail if the driver didn't call drm_vblank_init() */ | 99 | /* Bail if the driver didn't call drm_vblank_init() */ |
| 100 | if (dev->num_crtcs == 0) | 100 | if (dev->num_crtcs == 0) |
| @@ -278,8 +278,6 @@ int drm_irq_uninstall(struct drm_device * dev) | |||
| 278 | 278 | ||
| 279 | free_irq(dev->pdev->irq, dev); | 279 | free_irq(dev->pdev->irq, dev); |
| 280 | 280 | ||
| 281 | drm_vblank_cleanup(dev); | ||
| 282 | |||
| 283 | return 0; | 281 | return 0; |
| 284 | } | 282 | } |
| 285 | EXPORT_SYMBOL(drm_irq_uninstall); | 283 | EXPORT_SYMBOL(drm_irq_uninstall); |
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 0d215e38606a..ba89b42f790a 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
| @@ -856,6 +856,13 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
| 856 | 856 | ||
| 857 | spin_lock_init(&dev_priv->user_irq_lock); | 857 | spin_lock_init(&dev_priv->user_irq_lock); |
| 858 | 858 | ||
| 859 | ret = drm_vblank_init(dev, I915_NUM_PIPE); | ||
| 860 | |||
| 861 | if (ret) { | ||
| 862 | (void) i915_driver_unload(dev); | ||
| 863 | return ret; | ||
| 864 | } | ||
| 865 | |||
| 859 | return ret; | 866 | return ret; |
| 860 | } | 867 | } |
| 861 | 868 | ||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ef1c0b8f8d07..0a4f39b9a0ec 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -47,6 +47,8 @@ enum pipe { | |||
| 47 | PIPE_B, | 47 | PIPE_B, |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | #define I915_NUM_PIPE 2 | ||
| 51 | |||
| 50 | /* Interface history: | 52 | /* Interface history: |
| 51 | * | 53 | * |
| 52 | * 1.1: Original. | 54 | * 1.1: Original. |
| @@ -132,6 +134,7 @@ typedef struct drm_i915_private { | |||
| 132 | int user_irq_refcount; | 134 | int user_irq_refcount; |
| 133 | /** Cached value of IMR to avoid reads in updating the bitfield */ | 135 | /** Cached value of IMR to avoid reads in updating the bitfield */ |
| 134 | u32 irq_mask_reg; | 136 | u32 irq_mask_reg; |
| 137 | u32 pipestat[2]; | ||
| 135 | 138 | ||
| 136 | int tex_lru_log_granularity; | 139 | int tex_lru_log_granularity; |
| 137 | int allow_batchbuffer; | 140 | int allow_batchbuffer; |
| @@ -147,6 +150,7 @@ typedef struct drm_i915_private { | |||
| 147 | u32 saveDSPBCNTR; | 150 | u32 saveDSPBCNTR; |
| 148 | u32 saveDSPARB; | 151 | u32 saveDSPARB; |
| 149 | u32 saveRENDERSTANDBY; | 152 | u32 saveRENDERSTANDBY; |
| 153 | u32 saveHWS; | ||
| 150 | u32 savePIPEACONF; | 154 | u32 savePIPEACONF; |
| 151 | u32 savePIPEBCONF; | 155 | u32 savePIPEBCONF; |
| 152 | u32 savePIPEASRC; | 156 | u32 savePIPEASRC; |
| @@ -446,6 +450,13 @@ extern int i915_vblank_swap(struct drm_device *dev, void *data, | |||
| 446 | struct drm_file *file_priv); | 450 | struct drm_file *file_priv); |
| 447 | extern void i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask); | 451 | extern void i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask); |
| 448 | 452 | ||
| 453 | void | ||
| 454 | i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask); | ||
| 455 | |||
| 456 | void | ||
| 457 | i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask); | ||
| 458 | |||
| 459 | |||
| 449 | /* i915_mem.c */ | 460 | /* i915_mem.c */ |
| 450 | extern int i915_mem_alloc(struct drm_device *dev, void *data, | 461 | extern int i915_mem_alloc(struct drm_device *dev, void *data, |
| 451 | struct drm_file *file_priv); | 462 | struct drm_file *file_priv); |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6b4a2bd20640..d58ddef468f8 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -31,6 +31,8 @@ | |||
| 31 | #include "i915_drv.h" | 31 | #include "i915_drv.h" |
| 32 | #include <linux/swap.h> | 32 | #include <linux/swap.h> |
| 33 | 33 | ||
| 34 | #define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) | ||
| 35 | |||
| 34 | static int | 36 | static int |
| 35 | i915_gem_object_set_domain(struct drm_gem_object *obj, | 37 | i915_gem_object_set_domain(struct drm_gem_object *obj, |
| 36 | uint32_t read_domains, | 38 | uint32_t read_domains, |
| @@ -83,20 +85,14 @@ int | |||
| 83 | i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data, | 85 | i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data, |
| 84 | struct drm_file *file_priv) | 86 | struct drm_file *file_priv) |
| 85 | { | 87 | { |
| 86 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
| 87 | struct drm_i915_gem_get_aperture *args = data; | 88 | struct drm_i915_gem_get_aperture *args = data; |
| 88 | struct drm_i915_gem_object *obj_priv; | ||
| 89 | 89 | ||
| 90 | if (!(dev->driver->driver_features & DRIVER_GEM)) | 90 | if (!(dev->driver->driver_features & DRIVER_GEM)) |
| 91 | return -ENODEV; | 91 | return -ENODEV; |
| 92 | 92 | ||
| 93 | args->aper_size = dev->gtt_total; | 93 | args->aper_size = dev->gtt_total; |
| 94 | args->aper_available_size = args->aper_size; | 94 | args->aper_available_size = (args->aper_size - |
| 95 | 95 | atomic_read(&dev->pin_memory)); | |
| 96 | list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) { | ||
| 97 | if (obj_priv->pin_count > 0) | ||
| 98 | args->aper_available_size -= obj_priv->obj->size; | ||
| 99 | } | ||
| 100 | 96 | ||
| 101 | return 0; | 97 | return 0; |
| 102 | } | 98 | } |
| @@ -1870,17 +1866,6 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
| 1870 | 1866 | ||
| 1871 | for (i = 0; i < args->buffer_count; i++) { | 1867 | for (i = 0; i < args->buffer_count; i++) { |
| 1872 | struct drm_gem_object *obj = object_list[i]; | 1868 | struct drm_gem_object *obj = object_list[i]; |
| 1873 | struct drm_i915_gem_object *obj_priv = obj->driver_private; | ||
| 1874 | |||
| 1875 | if (obj_priv->gtt_space == NULL) { | ||
| 1876 | /* We evicted the buffer in the process of validating | ||
| 1877 | * our set of buffers in. We could try to recover by | ||
| 1878 | * kicking them everything out and trying again from | ||
| 1879 | * the start. | ||
| 1880 | */ | ||
| 1881 | ret = -ENOMEM; | ||
| 1882 | goto err; | ||
| 1883 | } | ||
| 1884 | 1869 | ||
| 1885 | /* make sure all previous memory operations have passed */ | 1870 | /* make sure all previous memory operations have passed */ |
| 1886 | ret = i915_gem_object_set_domain(obj, | 1871 | ret = i915_gem_object_set_domain(obj, |
| @@ -2299,29 +2284,52 @@ i915_gem_idle(struct drm_device *dev) | |||
| 2299 | 2284 | ||
| 2300 | i915_gem_retire_requests(dev); | 2285 | i915_gem_retire_requests(dev); |
| 2301 | 2286 | ||
| 2302 | /* Active and flushing should now be empty as we've | 2287 | if (!dev_priv->mm.wedged) { |
| 2303 | * waited for a sequence higher than any pending execbuffer | 2288 | /* Active and flushing should now be empty as we've |
| 2304 | */ | 2289 | * waited for a sequence higher than any pending execbuffer |
| 2305 | BUG_ON(!list_empty(&dev_priv->mm.active_list)); | 2290 | */ |
| 2306 | BUG_ON(!list_empty(&dev_priv->mm.flushing_list)); | 2291 | WARN_ON(!list_empty(&dev_priv->mm.active_list)); |
| 2292 | WARN_ON(!list_empty(&dev_priv->mm.flushing_list)); | ||
| 2293 | /* Request should now be empty as we've also waited | ||
| 2294 | * for the last request in the list | ||
| 2295 | */ | ||
| 2296 | WARN_ON(!list_empty(&dev_priv->mm.request_list)); | ||
| 2297 | } | ||
| 2307 | 2298 | ||
| 2308 | /* Request should now be empty as we've also waited | 2299 | /* Empty the active and flushing lists to inactive. If there's |
| 2309 | * for the last request in the list | 2300 | * anything left at this point, it means that we're wedged and |
| 2301 | * nothing good's going to happen by leaving them there. So strip | ||
| 2302 | * the GPU domains and just stuff them onto inactive. | ||
| 2310 | */ | 2303 | */ |
| 2311 | BUG_ON(!list_empty(&dev_priv->mm.request_list)); | 2304 | while (!list_empty(&dev_priv->mm.active_list)) { |
| 2305 | struct drm_i915_gem_object *obj_priv; | ||
| 2306 | |||
| 2307 | obj_priv = list_first_entry(&dev_priv->mm.active_list, | ||
| 2308 | struct drm_i915_gem_object, | ||
| 2309 | list); | ||
| 2310 | obj_priv->obj->write_domain &= ~I915_GEM_GPU_DOMAINS; | ||
| 2311 | i915_gem_object_move_to_inactive(obj_priv->obj); | ||
| 2312 | } | ||
| 2313 | |||
| 2314 | while (!list_empty(&dev_priv->mm.flushing_list)) { | ||
| 2315 | struct drm_i915_gem_object *obj_priv; | ||
| 2316 | |||
| 2317 | obj_priv = list_first_entry(&dev_priv->mm.flushing_list, | ||
| 2318 | struct drm_i915_gem_object, | ||
| 2319 | list); | ||
| 2320 | obj_priv->obj->write_domain &= ~I915_GEM_GPU_DOMAINS; | ||
| 2321 | i915_gem_object_move_to_inactive(obj_priv->obj); | ||
| 2322 | } | ||
| 2312 | 2323 | ||
| 2313 | /* Move all buffers out of the GTT. */ | 2324 | |
| 2325 | /* Move all inactive buffers out of the GTT. */ | ||
| 2314 | ret = i915_gem_evict_from_list(dev, &dev_priv->mm.inactive_list); | 2326 | ret = i915_gem_evict_from_list(dev, &dev_priv->mm.inactive_list); |
| 2327 | WARN_ON(!list_empty(&dev_priv->mm.inactive_list)); | ||
| 2315 | if (ret) { | 2328 | if (ret) { |
| 2316 | mutex_unlock(&dev->struct_mutex); | 2329 | mutex_unlock(&dev->struct_mutex); |
| 2317 | return ret; | 2330 | return ret; |
| 2318 | } | 2331 | } |
| 2319 | 2332 | ||
| 2320 | BUG_ON(!list_empty(&dev_priv->mm.active_list)); | ||
| 2321 | BUG_ON(!list_empty(&dev_priv->mm.flushing_list)); | ||
| 2322 | BUG_ON(!list_empty(&dev_priv->mm.inactive_list)); | ||
| 2323 | BUG_ON(!list_empty(&dev_priv->mm.request_list)); | ||
| 2324 | |||
| 2325 | i915_gem_cleanup_ringbuffer(dev); | 2333 | i915_gem_cleanup_ringbuffer(dev); |
| 2326 | mutex_unlock(&dev->struct_mutex); | 2334 | mutex_unlock(&dev->struct_mutex); |
| 2327 | 2335 | ||
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 82752d6177a4..69b9a42da95e 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
| @@ -33,11 +33,23 @@ | |||
| 33 | 33 | ||
| 34 | #define MAX_NOPID ((u32)~0) | 34 | #define MAX_NOPID ((u32)~0) |
| 35 | 35 | ||
| 36 | /** These are the interrupts used by the driver */ | 36 | /** |
| 37 | #define I915_INTERRUPT_ENABLE_MASK (I915_USER_INTERRUPT | \ | 37 | * Interrupts that are always left unmasked. |
| 38 | I915_ASLE_INTERRUPT | \ | 38 | * |
| 39 | I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | \ | 39 | * Since pipe events are edge-triggered from the PIPESTAT register to IIR, |
| 40 | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) | 40 | * we leave them always unmasked in IMR and then control enabling them through |
| 41 | * PIPESTAT alone. | ||
| 42 | */ | ||
| 43 | #define I915_INTERRUPT_ENABLE_FIX (I915_ASLE_INTERRUPT | \ | ||
| 44 | I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | \ | ||
| 45 | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) | ||
| 46 | |||
| 47 | /** Interrupts that we mask and unmask at runtime. */ | ||
| 48 | #define I915_INTERRUPT_ENABLE_VAR (I915_USER_INTERRUPT) | ||
| 49 | |||
| 50 | /** These are all of the interrupts used by the driver */ | ||
| 51 | #define I915_INTERRUPT_ENABLE_MASK (I915_INTERRUPT_ENABLE_FIX | \ | ||
| 52 | I915_INTERRUPT_ENABLE_VAR) | ||
| 41 | 53 | ||
| 42 | void | 54 | void |
| 43 | i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask) | 55 | i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask) |
| @@ -59,6 +71,41 @@ i915_disable_irq(drm_i915_private_t *dev_priv, u32 mask) | |||
| 59 | } | 71 | } |
| 60 | } | 72 | } |
| 61 | 73 | ||
| 74 | static inline u32 | ||
| 75 | i915_pipestat(int pipe) | ||
| 76 | { | ||
| 77 | if (pipe == 0) | ||
| 78 | return PIPEASTAT; | ||
| 79 | if (pipe == 1) | ||
| 80 | return PIPEBSTAT; | ||
| 81 | BUG(); | ||
| 82 | } | ||
| 83 | |||
| 84 | void | ||
| 85 | i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask) | ||
| 86 | { | ||
| 87 | if ((dev_priv->pipestat[pipe] & mask) != mask) { | ||
| 88 | u32 reg = i915_pipestat(pipe); | ||
| 89 | |||
| 90 | dev_priv->pipestat[pipe] |= mask; | ||
| 91 | /* Enable the interrupt, clear any pending status */ | ||
| 92 | I915_WRITE(reg, dev_priv->pipestat[pipe] | (mask >> 16)); | ||
| 93 | (void) I915_READ(reg); | ||
| 94 | } | ||
| 95 | } | ||
| 96 | |||
| 97 | void | ||
| 98 | i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask) | ||
| 99 | { | ||
| 100 | if ((dev_priv->pipestat[pipe] & mask) != 0) { | ||
| 101 | u32 reg = i915_pipestat(pipe); | ||
| 102 | |||
| 103 | dev_priv->pipestat[pipe] &= ~mask; | ||
| 104 | I915_WRITE(reg, dev_priv->pipestat[pipe]); | ||
| 105 | (void) I915_READ(reg); | ||
| 106 | } | ||
| 107 | } | ||
| 108 | |||
| 62 | /** | 109 | /** |
| 63 | * i915_pipe_enabled - check if a pipe is enabled | 110 | * i915_pipe_enabled - check if a pipe is enabled |
| 64 | * @dev: DRM device | 111 | * @dev: DRM device |
| @@ -121,80 +168,102 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) | |||
| 121 | { | 168 | { |
| 122 | struct drm_device *dev = (struct drm_device *) arg; | 169 | struct drm_device *dev = (struct drm_device *) arg; |
| 123 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 170 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
| 124 | u32 iir; | 171 | u32 iir, new_iir; |
| 125 | u32 pipea_stats, pipeb_stats; | 172 | u32 pipea_stats, pipeb_stats; |
| 173 | u32 vblank_status; | ||
| 174 | u32 vblank_enable; | ||
| 126 | int vblank = 0; | 175 | int vblank = 0; |
| 176 | unsigned long irqflags; | ||
| 177 | int irq_received; | ||
| 178 | int ret = IRQ_NONE; | ||
| 127 | 179 | ||
| 128 | atomic_inc(&dev_priv->irq_received); | 180 | atomic_inc(&dev_priv->irq_received); |
| 129 | 181 | ||
| 130 | if (dev->pdev->msi_enabled) | ||
| 131 | I915_WRITE(IMR, ~0); | ||
| 132 | iir = I915_READ(IIR); | 182 | iir = I915_READ(IIR); |
| 133 | 183 | ||
| 134 | if (iir == 0) { | 184 | if (IS_I965G(dev)) { |
| 135 | if (dev->pdev->msi_enabled) { | 185 | vblank_status = I915_START_VBLANK_INTERRUPT_STATUS; |
| 136 | I915_WRITE(IMR, dev_priv->irq_mask_reg); | 186 | vblank_enable = PIPE_START_VBLANK_INTERRUPT_ENABLE; |
| 137 | (void) I915_READ(IMR); | 187 | } else { |
| 138 | } | 188 | vblank_status = I915_VBLANK_INTERRUPT_STATUS; |
| 139 | return IRQ_NONE; | 189 | vblank_enable = I915_VBLANK_INTERRUPT_ENABLE; |
| 140 | } | 190 | } |
| 141 | 191 | ||
| 142 | /* | 192 | for (;;) { |
| 143 | * Clear the PIPE(A|B)STAT regs before the IIR otherwise | 193 | irq_received = iir != 0; |
| 144 | * we may get extra interrupts. | 194 | |
| 145 | */ | 195 | /* Can't rely on pipestat interrupt bit in iir as it might |
| 146 | if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) { | 196 | * have been cleared after the pipestat interrupt was received. |
| 197 | * It doesn't set the bit in iir again, but it still produces | ||
| 198 | * interrupts (for non-MSI). | ||
| 199 | */ | ||
| 200 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); | ||
| 147 | pipea_stats = I915_READ(PIPEASTAT); | 201 | pipea_stats = I915_READ(PIPEASTAT); |
| 148 | if (!(dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_A)) | 202 | pipeb_stats = I915_READ(PIPEBSTAT); |
| 149 | pipea_stats &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE | | 203 | /* |
| 150 | PIPE_VBLANK_INTERRUPT_ENABLE); | 204 | * Clear the PIPE(A|B)STAT regs before the IIR |
| 151 | else if (pipea_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS| | 205 | */ |
| 152 | PIPE_VBLANK_INTERRUPT_STATUS)) { | 206 | if (pipea_stats & 0x8000ffff) { |
| 207 | I915_WRITE(PIPEASTAT, pipea_stats); | ||
| 208 | irq_received = 1; | ||
| 209 | } | ||
| 210 | |||
| 211 | if (pipeb_stats & 0x8000ffff) { | ||
| 212 | I915_WRITE(PIPEBSTAT, pipeb_stats); | ||
| 213 | irq_received = 1; | ||
| 214 | } | ||
| 215 | spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); | ||
| 216 | |||
| 217 | if (!irq_received) | ||
| 218 | break; | ||
| 219 | |||
| 220 | ret = IRQ_HANDLED; | ||
| 221 | |||
| 222 | I915_WRITE(IIR, iir); | ||
| 223 | new_iir = I915_READ(IIR); /* Flush posted writes */ | ||
| 224 | |||
| 225 | if (dev_priv->sarea_priv) | ||
| 226 | dev_priv->sarea_priv->last_dispatch = | ||
| 227 | READ_BREADCRUMB(dev_priv); | ||
| 228 | |||
| 229 | if (iir & I915_USER_INTERRUPT) { | ||
| 230 | dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev); | ||
| 231 | DRM_WAKEUP(&dev_priv->irq_queue); | ||
| 232 | } | ||
| 233 | |||
| 234 | if (pipea_stats & vblank_status) { | ||
| 153 | vblank++; | 235 | vblank++; |
| 154 | drm_handle_vblank(dev, 0); | 236 | drm_handle_vblank(dev, 0); |
| 155 | } | 237 | } |
| 156 | 238 | ||
| 157 | I915_WRITE(PIPEASTAT, pipea_stats); | 239 | if (pipeb_stats & vblank_status) { |
| 158 | } | ||
| 159 | if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) { | ||
| 160 | pipeb_stats = I915_READ(PIPEBSTAT); | ||
| 161 | /* Ack the event */ | ||
| 162 | I915_WRITE(PIPEBSTAT, pipeb_stats); | ||
| 163 | |||
| 164 | /* The vblank interrupt gets enabled even if we didn't ask for | ||
| 165 | it, so make sure it's shut down again */ | ||
| 166 | if (!(dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B)) | ||
| 167 | pipeb_stats &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE | | ||
| 168 | PIPE_VBLANK_INTERRUPT_ENABLE); | ||
| 169 | else if (pipeb_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS| | ||
| 170 | PIPE_VBLANK_INTERRUPT_STATUS)) { | ||
| 171 | vblank++; | 240 | vblank++; |
| 172 | drm_handle_vblank(dev, 1); | 241 | drm_handle_vblank(dev, 1); |
| 173 | } | 242 | } |
| 174 | 243 | ||
| 175 | if (pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS) | 244 | if ((pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS) || |
| 245 | (iir & I915_ASLE_INTERRUPT)) | ||
| 176 | opregion_asle_intr(dev); | 246 | opregion_asle_intr(dev); |
| 177 | I915_WRITE(PIPEBSTAT, pipeb_stats); | ||
| 178 | } | ||
| 179 | |||
| 180 | I915_WRITE(IIR, iir); | ||
| 181 | if (dev->pdev->msi_enabled) | ||
| 182 | I915_WRITE(IMR, dev_priv->irq_mask_reg); | ||
| 183 | (void) I915_READ(IIR); /* Flush posted writes */ | ||
| 184 | |||
| 185 | if (dev_priv->sarea_priv) | ||
| 186 | dev_priv->sarea_priv->last_dispatch = | ||
| 187 | READ_BREADCRUMB(dev_priv); | ||
| 188 | 247 | ||
| 189 | if (iir & I915_USER_INTERRUPT) { | 248 | /* With MSI, interrupts are only generated when iir |
| 190 | dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev); | 249 | * transitions from zero to nonzero. If another bit got |
| 191 | DRM_WAKEUP(&dev_priv->irq_queue); | 250 | * set while we were handling the existing iir bits, then |
| 251 | * we would never get another interrupt. | ||
| 252 | * | ||
| 253 | * This is fine on non-MSI as well, as if we hit this path | ||
| 254 | * we avoid exiting the interrupt handler only to generate | ||
| 255 | * another one. | ||
| 256 | * | ||
| 257 | * Note that for MSI this could cause a stray interrupt report | ||
| 258 | * if an interrupt landed in the time between writing IIR and | ||
| 259 | * the posting read. This should be rare enough to never | ||
| 260 | * trigger the 99% of 100,000 interrupts test for disabling | ||
| 261 | * stray interrupts. | ||
| 262 | */ | ||
| 263 | iir = new_iir; | ||
| 192 | } | 264 | } |
| 193 | 265 | ||
| 194 | if (iir & I915_ASLE_INTERRUPT) | 266 | return ret; |
| 195 | opregion_asle_intr(dev); | ||
| 196 | |||
| 197 | return IRQ_HANDLED; | ||
| 198 | } | 267 | } |
| 199 | 268 | ||
| 200 | static int i915_emit_irq(struct drm_device * dev) | 269 | static int i915_emit_irq(struct drm_device * dev) |
| @@ -330,48 +399,16 @@ int i915_irq_wait(struct drm_device *dev, void *data, | |||
| 330 | int i915_enable_vblank(struct drm_device *dev, int pipe) | 399 | int i915_enable_vblank(struct drm_device *dev, int pipe) |
| 331 | { | 400 | { |
| 332 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 401 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
| 333 | u32 pipestat_reg = 0; | ||
| 334 | u32 pipestat; | ||
| 335 | u32 interrupt = 0; | ||
| 336 | unsigned long irqflags; | 402 | unsigned long irqflags; |
| 337 | 403 | ||
| 338 | switch (pipe) { | ||
| 339 | case 0: | ||
| 340 | pipestat_reg = PIPEASTAT; | ||
| 341 | interrupt = I915_DISPLAY_PIPE_A_EVENT_INTERRUPT; | ||
| 342 | break; | ||
| 343 | case 1: | ||
| 344 | pipestat_reg = PIPEBSTAT; | ||
| 345 | interrupt = I915_DISPLAY_PIPE_B_EVENT_INTERRUPT; | ||
| 346 | break; | ||
| 347 | default: | ||
| 348 | DRM_ERROR("tried to enable vblank on non-existent pipe %d\n", | ||
| 349 | pipe); | ||
| 350 | return 0; | ||
| 351 | } | ||
| 352 | |||
| 353 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); | 404 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); |
| 354 | /* Enabling vblank events in IMR comes before PIPESTAT write, or | ||
| 355 | * there's a race where the PIPESTAT vblank bit gets set to 1, so | ||
| 356 | * the OR of enabled PIPESTAT bits goes to 1, so the PIPExEVENT in | ||
| 357 | * ISR flashes to 1, but the IIR bit doesn't get set to 1 because | ||
| 358 | * IMR masks it. It doesn't ever get set after we clear the masking | ||
| 359 | * in IMR because the ISR bit is edge, not level-triggered, on the | ||
| 360 | * OR of PIPESTAT bits. | ||
| 361 | */ | ||
| 362 | i915_enable_irq(dev_priv, interrupt); | ||
| 363 | pipestat = I915_READ(pipestat_reg); | ||
| 364 | if (IS_I965G(dev)) | 405 | if (IS_I965G(dev)) |
| 365 | pipestat |= PIPE_START_VBLANK_INTERRUPT_ENABLE; | 406 | i915_enable_pipestat(dev_priv, pipe, |
| 407 | PIPE_START_VBLANK_INTERRUPT_ENABLE); | ||
| 366 | else | 408 | else |
| 367 | pipestat |= PIPE_VBLANK_INTERRUPT_ENABLE; | 409 | i915_enable_pipestat(dev_priv, pipe, |
| 368 | /* Clear any stale interrupt status */ | 410 | PIPE_VBLANK_INTERRUPT_ENABLE); |
| 369 | pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS | | ||
| 370 | PIPE_VBLANK_INTERRUPT_STATUS); | ||
| 371 | I915_WRITE(pipestat_reg, pipestat); | ||
| 372 | (void) I915_READ(pipestat_reg); /* Posting read */ | ||
| 373 | spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); | 411 | spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); |
| 374 | |||
| 375 | return 0; | 412 | return 0; |
| 376 | } | 413 | } |
| 377 | 414 | ||
| @@ -381,37 +418,12 @@ int i915_enable_vblank(struct drm_device *dev, int pipe) | |||
| 381 | void i915_disable_vblank(struct drm_device *dev, int pipe) | 418 | void i915_disable_vblank(struct drm_device *dev, int pipe) |
| 382 | { | 419 | { |
| 383 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 420 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
| 384 | u32 pipestat_reg = 0; | ||
| 385 | u32 pipestat; | ||
| 386 | u32 interrupt = 0; | ||
| 387 | unsigned long irqflags; | 421 | unsigned long irqflags; |
| 388 | 422 | ||
| 389 | switch (pipe) { | ||
| 390 | case 0: | ||
| 391 | pipestat_reg = PIPEASTAT; | ||
| 392 | interrupt = I915_DISPLAY_PIPE_A_EVENT_INTERRUPT; | ||
| 393 | break; | ||
| 394 | case 1: | ||
| 395 | pipestat_reg = PIPEBSTAT; | ||
| 396 | interrupt = I915_DISPLAY_PIPE_B_EVENT_INTERRUPT; | ||
| 397 | break; | ||
| 398 | default: | ||
| 399 | DRM_ERROR("tried to disable vblank on non-existent pipe %d\n", | ||
| 400 | pipe); | ||
| 401 | return; | ||
| 402 | break; | ||
| 403 | } | ||
| 404 | |||
| 405 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); | 423 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); |
| 406 | i915_disable_irq(dev_priv, interrupt); | 424 | i915_disable_pipestat(dev_priv, pipe, |
| 407 | pipestat = I915_READ(pipestat_reg); | 425 | PIPE_VBLANK_INTERRUPT_ENABLE | |
| 408 | pipestat &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE | | 426 | PIPE_START_VBLANK_INTERRUPT_ENABLE); |
| 409 | PIPE_VBLANK_INTERRUPT_ENABLE); | ||
| 410 | /* Clear any stale interrupt status */ | ||
| 411 | pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS | | ||
| 412 | PIPE_VBLANK_INTERRUPT_STATUS); | ||
| 413 | I915_WRITE(pipestat_reg, pipestat); | ||
| 414 | (void) I915_READ(pipestat_reg); /* Posting read */ | ||
| 415 | spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); | 427 | spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); |
| 416 | } | 428 | } |
| 417 | 429 | ||
| @@ -476,32 +488,35 @@ void i915_driver_irq_preinstall(struct drm_device * dev) | |||
| 476 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 488 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
| 477 | 489 | ||
| 478 | I915_WRITE(HWSTAM, 0xeffe); | 490 | I915_WRITE(HWSTAM, 0xeffe); |
| 491 | I915_WRITE(PIPEASTAT, 0); | ||
| 492 | I915_WRITE(PIPEBSTAT, 0); | ||
| 479 | I915_WRITE(IMR, 0xffffffff); | 493 | I915_WRITE(IMR, 0xffffffff); |
| 480 | I915_WRITE(IER, 0x0); | 494 | I915_WRITE(IER, 0x0); |
| 495 | (void) I915_READ(IER); | ||
| 481 | } | 496 | } |
| 482 | 497 | ||
| 483 | int i915_driver_irq_postinstall(struct drm_device *dev) | 498 | int i915_driver_irq_postinstall(struct drm_device *dev) |
| 484 | { | 499 | { |
| 485 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 500 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
| 486 | int ret, num_pipes = 2; | ||
| 487 | |||
| 488 | /* Set initial unmasked IRQs to just the selected vblank pipes. */ | ||
| 489 | dev_priv->irq_mask_reg = ~0; | ||
| 490 | |||
| 491 | ret = drm_vblank_init(dev, num_pipes); | ||
| 492 | if (ret) | ||
| 493 | return ret; | ||
| 494 | 501 | ||
| 495 | dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B; | 502 | dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B; |
| 496 | dev_priv->irq_mask_reg &= ~I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT; | ||
| 497 | dev_priv->irq_mask_reg &= ~I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT; | ||
| 498 | 503 | ||
| 499 | dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ | 504 | dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ |
| 500 | 505 | ||
| 501 | dev_priv->irq_mask_reg &= I915_INTERRUPT_ENABLE_MASK; | 506 | /* Unmask the interrupts that we always want on. */ |
| 507 | dev_priv->irq_mask_reg = ~I915_INTERRUPT_ENABLE_FIX; | ||
| 508 | |||
| 509 | dev_priv->pipestat[0] = 0; | ||
| 510 | dev_priv->pipestat[1] = 0; | ||
| 511 | |||
| 512 | /* Disable pipe interrupt enables, clear pending pipe status */ | ||
| 513 | I915_WRITE(PIPEASTAT, I915_READ(PIPEASTAT) & 0x8000ffff); | ||
| 514 | I915_WRITE(PIPEBSTAT, I915_READ(PIPEBSTAT) & 0x8000ffff); | ||
| 515 | /* Clear pending interrupt status */ | ||
| 516 | I915_WRITE(IIR, I915_READ(IIR)); | ||
| 502 | 517 | ||
| 503 | I915_WRITE(IMR, dev_priv->irq_mask_reg); | ||
| 504 | I915_WRITE(IER, I915_INTERRUPT_ENABLE_MASK); | 518 | I915_WRITE(IER, I915_INTERRUPT_ENABLE_MASK); |
| 519 | I915_WRITE(IMR, dev_priv->irq_mask_reg); | ||
| 505 | (void) I915_READ(IER); | 520 | (void) I915_READ(IER); |
| 506 | 521 | ||
| 507 | opregion_enable_asle(dev); | 522 | opregion_enable_asle(dev); |
| @@ -513,7 +528,6 @@ int i915_driver_irq_postinstall(struct drm_device *dev) | |||
| 513 | void i915_driver_irq_uninstall(struct drm_device * dev) | 528 | void i915_driver_irq_uninstall(struct drm_device * dev) |
| 514 | { | 529 | { |
| 515 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 530 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
| 516 | u32 temp; | ||
| 517 | 531 | ||
| 518 | if (!dev_priv) | 532 | if (!dev_priv) |
| 519 | return; | 533 | return; |
| @@ -521,13 +535,12 @@ void i915_driver_irq_uninstall(struct drm_device * dev) | |||
| 521 | dev_priv->vblank_pipe = 0; | 535 | dev_priv->vblank_pipe = 0; |
| 522 | 536 | ||
| 523 | I915_WRITE(HWSTAM, 0xffffffff); | 537 | I915_WRITE(HWSTAM, 0xffffffff); |
| 538 | I915_WRITE(PIPEASTAT, 0); | ||
| 539 | I915_WRITE(PIPEBSTAT, 0); | ||
| 524 | I915_WRITE(IMR, 0xffffffff); | 540 | I915_WRITE(IMR, 0xffffffff); |
| 525 | I915_WRITE(IER, 0x0); | 541 | I915_WRITE(IER, 0x0); |
| 526 | 542 | ||
| 527 | temp = I915_READ(PIPEASTAT); | 543 | I915_WRITE(PIPEASTAT, I915_READ(PIPEASTAT) & 0x8000ffff); |
| 528 | I915_WRITE(PIPEASTAT, temp); | 544 | I915_WRITE(PIPEBSTAT, I915_READ(PIPEBSTAT) & 0x8000ffff); |
| 529 | temp = I915_READ(PIPEBSTAT); | 545 | I915_WRITE(IIR, I915_READ(IIR)); |
| 530 | I915_WRITE(PIPEBSTAT, temp); | ||
| 531 | temp = I915_READ(IIR); | ||
| 532 | I915_WRITE(IIR, temp); | ||
| 533 | } | 546 | } |
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c index 1787a0c7e3ab..13ae731a33db 100644 --- a/drivers/gpu/drm/i915/i915_opregion.c +++ b/drivers/gpu/drm/i915/i915_opregion.c | |||
| @@ -235,17 +235,15 @@ void opregion_enable_asle(struct drm_device *dev) | |||
| 235 | struct opregion_asle *asle = dev_priv->opregion.asle; | 235 | struct opregion_asle *asle = dev_priv->opregion.asle; |
| 236 | 236 | ||
| 237 | if (asle) { | 237 | if (asle) { |
| 238 | u32 pipeb_stats = I915_READ(PIPEBSTAT); | ||
| 239 | if (IS_MOBILE(dev)) { | 238 | if (IS_MOBILE(dev)) { |
| 240 | /* Many devices trigger events with a write to the | 239 | unsigned long irqflags; |
| 241 | legacy backlight controller, so we need to ensure | 240 | |
| 242 | that it's able to generate interrupts */ | 241 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); |
| 243 | I915_WRITE(PIPEBSTAT, pipeb_stats |= | 242 | i915_enable_pipestat(dev_priv, 1, |
| 244 | I915_LEGACY_BLC_EVENT_ENABLE); | 243 | I915_LEGACY_BLC_EVENT_ENABLE); |
| 245 | i915_enable_irq(dev_priv, I915_ASLE_INTERRUPT | | 244 | spin_unlock_irqrestore(&dev_priv->user_irq_lock, |
| 246 | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT); | 245 | irqflags); |
| 247 | } else | 246 | } |
| 248 | i915_enable_irq(dev_priv, I915_ASLE_INTERRUPT); | ||
| 249 | 247 | ||
| 250 | asle->tche = ASLE_ALS_EN | ASLE_BLC_EN | ASLE_PFIT_EN | | 248 | asle->tche = ASLE_ALS_EN | ASLE_BLC_EN | ASLE_PFIT_EN | |
| 251 | ASLE_PFMB_EN; | 249 | ASLE_PFMB_EN; |
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 5ddc6e595c0c..5d84027ee8f3 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c | |||
| @@ -244,6 +244,9 @@ int i915_save_state(struct drm_device *dev) | |||
| 244 | if (IS_I965G(dev) && IS_MOBILE(dev)) | 244 | if (IS_I965G(dev) && IS_MOBILE(dev)) |
| 245 | dev_priv->saveRENDERSTANDBY = I915_READ(MCHBAR_RENDER_STANDBY); | 245 | dev_priv->saveRENDERSTANDBY = I915_READ(MCHBAR_RENDER_STANDBY); |
| 246 | 246 | ||
| 247 | /* Hardware status page */ | ||
| 248 | dev_priv->saveHWS = I915_READ(HWS_PGA); | ||
| 249 | |||
| 247 | /* Display arbitration control */ | 250 | /* Display arbitration control */ |
| 248 | dev_priv->saveDSPARB = I915_READ(DSPARB); | 251 | dev_priv->saveDSPARB = I915_READ(DSPARB); |
| 249 | 252 | ||
| @@ -373,6 +376,9 @@ int i915_restore_state(struct drm_device *dev) | |||
| 373 | if (IS_I965G(dev) && IS_MOBILE(dev)) | 376 | if (IS_I965G(dev) && IS_MOBILE(dev)) |
| 374 | I915_WRITE(MCHBAR_RENDER_STANDBY, dev_priv->saveRENDERSTANDBY); | 377 | I915_WRITE(MCHBAR_RENDER_STANDBY, dev_priv->saveRENDERSTANDBY); |
| 375 | 378 | ||
| 379 | /* Hardware status page */ | ||
| 380 | I915_WRITE(HWS_PGA, dev_priv->saveHWS); | ||
| 381 | |||
| 376 | /* Display arbitration */ | 382 | /* Display arbitration */ |
| 377 | I915_WRITE(DSPARB, dev_priv->saveDSPARB); | 383 | I915_WRITE(DSPARB, dev_priv->saveDSPARB); |
| 378 | 384 | ||
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c index c1d12dbfa8d8..b49c5ff29585 100644 --- a/drivers/gpu/drm/mga/mga_dma.c +++ b/drivers/gpu/drm/mga/mga_dma.c | |||
| @@ -396,6 +396,7 @@ int mga_freelist_put(struct drm_device * dev, struct drm_buf * buf) | |||
| 396 | int mga_driver_load(struct drm_device * dev, unsigned long flags) | 396 | int mga_driver_load(struct drm_device * dev, unsigned long flags) |
| 397 | { | 397 | { |
| 398 | drm_mga_private_t *dev_priv; | 398 | drm_mga_private_t *dev_priv; |
| 399 | int ret; | ||
| 399 | 400 | ||
| 400 | dev_priv = drm_alloc(sizeof(drm_mga_private_t), DRM_MEM_DRIVER); | 401 | dev_priv = drm_alloc(sizeof(drm_mga_private_t), DRM_MEM_DRIVER); |
| 401 | if (!dev_priv) | 402 | if (!dev_priv) |
| @@ -415,6 +416,13 @@ int mga_driver_load(struct drm_device * dev, unsigned long flags) | |||
| 415 | dev->types[7] = _DRM_STAT_PRIMARY; | 416 | dev->types[7] = _DRM_STAT_PRIMARY; |
| 416 | dev->types[8] = _DRM_STAT_SECONDARY; | 417 | dev->types[8] = _DRM_STAT_SECONDARY; |
| 417 | 418 | ||
| 419 | ret = drm_vblank_init(dev, 1); | ||
| 420 | |||
| 421 | if (ret) { | ||
| 422 | (void) mga_driver_unload(dev); | ||
| 423 | return ret; | ||
| 424 | } | ||
| 425 | |||
| 418 | return 0; | 426 | return 0; |
| 419 | } | 427 | } |
| 420 | 428 | ||
diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c index bab42f41188b..daa6041a483a 100644 --- a/drivers/gpu/drm/mga/mga_irq.c +++ b/drivers/gpu/drm/mga/mga_irq.c | |||
| @@ -152,11 +152,6 @@ void mga_driver_irq_preinstall(struct drm_device * dev) | |||
| 152 | int mga_driver_irq_postinstall(struct drm_device *dev) | 152 | int mga_driver_irq_postinstall(struct drm_device *dev) |
| 153 | { | 153 | { |
| 154 | drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private; | 154 | drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private; |
| 155 | int ret; | ||
| 156 | |||
| 157 | ret = drm_vblank_init(dev, 1); | ||
| 158 | if (ret) | ||
| 159 | return ret; | ||
| 160 | 155 | ||
| 161 | DRM_INIT_WAITQUEUE(&dev_priv->fence_queue); | 156 | DRM_INIT_WAITQUEUE(&dev_priv->fence_queue); |
| 162 | 157 | ||
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c index 3265d53ba91f..601f4c0e5da5 100644 --- a/drivers/gpu/drm/r128/r128_drv.c +++ b/drivers/gpu/drm/r128/r128_drv.c | |||
| @@ -45,6 +45,7 @@ static struct drm_driver driver = { | |||
| 45 | DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | | 45 | DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | |
| 46 | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED, | 46 | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED, |
| 47 | .dev_priv_size = sizeof(drm_r128_buf_priv_t), | 47 | .dev_priv_size = sizeof(drm_r128_buf_priv_t), |
| 48 | .load = r128_driver_load, | ||
| 48 | .preclose = r128_driver_preclose, | 49 | .preclose = r128_driver_preclose, |
| 49 | .lastclose = r128_driver_lastclose, | 50 | .lastclose = r128_driver_lastclose, |
| 50 | .get_vblank_counter = r128_get_vblank_counter, | 51 | .get_vblank_counter = r128_get_vblank_counter, |
| @@ -84,6 +85,11 @@ static struct drm_driver driver = { | |||
| 84 | .patchlevel = DRIVER_PATCHLEVEL, | 85 | .patchlevel = DRIVER_PATCHLEVEL, |
| 85 | }; | 86 | }; |
| 86 | 87 | ||
| 88 | int r128_driver_load(struct drm_device * dev, unsigned long flags) | ||
| 89 | { | ||
| 90 | return drm_vblank_init(dev, 1); | ||
| 91 | } | ||
| 92 | |||
| 87 | static int __init r128_init(void) | 93 | static int __init r128_init(void) |
| 88 | { | 94 | { |
| 89 | driver.num_ioctls = r128_max_ioctl; | 95 | driver.num_ioctls = r128_max_ioctl; |
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h index 5898b274279d..797a26c42dab 100644 --- a/drivers/gpu/drm/r128/r128_drv.h +++ b/drivers/gpu/drm/r128/r128_drv.h | |||
| @@ -159,6 +159,7 @@ extern void r128_driver_irq_preinstall(struct drm_device * dev); | |||
| 159 | extern int r128_driver_irq_postinstall(struct drm_device *dev); | 159 | extern int r128_driver_irq_postinstall(struct drm_device *dev); |
| 160 | extern void r128_driver_irq_uninstall(struct drm_device * dev); | 160 | extern void r128_driver_irq_uninstall(struct drm_device * dev); |
| 161 | extern void r128_driver_lastclose(struct drm_device * dev); | 161 | extern void r128_driver_lastclose(struct drm_device * dev); |
| 162 | extern int r128_driver_load(struct drm_device * dev, unsigned long flags); | ||
| 162 | extern void r128_driver_preclose(struct drm_device * dev, | 163 | extern void r128_driver_preclose(struct drm_device * dev, |
| 163 | struct drm_file *file_priv); | 164 | struct drm_file *file_priv); |
| 164 | 165 | ||
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c index d7349012a680..69810fb8ac49 100644 --- a/drivers/gpu/drm/r128/r128_irq.c +++ b/drivers/gpu/drm/r128/r128_irq.c | |||
| @@ -102,7 +102,7 @@ void r128_driver_irq_preinstall(struct drm_device * dev) | |||
| 102 | 102 | ||
| 103 | int r128_driver_irq_postinstall(struct drm_device *dev) | 103 | int r128_driver_irq_postinstall(struct drm_device *dev) |
| 104 | { | 104 | { |
| 105 | return drm_vblank_init(dev, 1); | 105 | return 0; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | void r128_driver_irq_uninstall(struct drm_device * dev) | 108 | void r128_driver_irq_uninstall(struct drm_device * dev) |
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index abdc1ae38467..dcebb4bee7aa 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
| @@ -1757,6 +1757,12 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) | |||
| 1757 | if (ret != 0) | 1757 | if (ret != 0) |
| 1758 | return ret; | 1758 | return ret; |
| 1759 | 1759 | ||
| 1760 | ret = drm_vblank_init(dev, 2); | ||
| 1761 | if (ret) { | ||
| 1762 | radeon_driver_unload(dev); | ||
| 1763 | return ret; | ||
| 1764 | } | ||
| 1765 | |||
| 1760 | DRM_DEBUG("%s card detected\n", | 1766 | DRM_DEBUG("%s card detected\n", |
| 1761 | ((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI")))); | 1767 | ((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI")))); |
| 1762 | return ret; | 1768 | return ret; |
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c index 5079f7054a2f..97c0599fdb1e 100644 --- a/drivers/gpu/drm/radeon/radeon_irq.c +++ b/drivers/gpu/drm/radeon/radeon_irq.c | |||
| @@ -337,15 +337,10 @@ int radeon_driver_irq_postinstall(struct drm_device *dev) | |||
| 337 | { | 337 | { |
| 338 | drm_radeon_private_t *dev_priv = | 338 | drm_radeon_private_t *dev_priv = |
| 339 | (drm_radeon_private_t *) dev->dev_private; | 339 | (drm_radeon_private_t *) dev->dev_private; |
| 340 | int ret; | ||
| 341 | 340 | ||
| 342 | atomic_set(&dev_priv->swi_emitted, 0); | 341 | atomic_set(&dev_priv->swi_emitted, 0); |
| 343 | DRM_INIT_WAITQUEUE(&dev_priv->swi_queue); | 342 | DRM_INIT_WAITQUEUE(&dev_priv->swi_queue); |
| 344 | 343 | ||
| 345 | ret = drm_vblank_init(dev, 2); | ||
| 346 | if (ret) | ||
| 347 | return ret; | ||
| 348 | |||
| 349 | dev->max_vblank_count = 0x001fffff; | 344 | dev->max_vblank_count = 0x001fffff; |
| 350 | 345 | ||
| 351 | radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1); | 346 | radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1); |
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c index 665d319b927b..c248c1d37268 100644 --- a/drivers/gpu/drm/via/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c | |||
| @@ -314,7 +314,6 @@ int via_driver_irq_postinstall(struct drm_device *dev) | |||
| 314 | if (!dev_priv) | 314 | if (!dev_priv) |
| 315 | return -EINVAL; | 315 | return -EINVAL; |
| 316 | 316 | ||
| 317 | drm_vblank_init(dev, 1); | ||
| 318 | status = VIA_READ(VIA_REG_INTERRUPT); | 317 | status = VIA_READ(VIA_REG_INTERRUPT); |
| 319 | VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL | 318 | VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL |
| 320 | | dev_priv->irq_enable_mask); | 319 | | dev_priv->irq_enable_mask); |
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c index a967556be014..2c4f0b485792 100644 --- a/drivers/gpu/drm/via/via_map.c +++ b/drivers/gpu/drm/via/via_map.c | |||
| @@ -107,8 +107,17 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset) | |||
| 107 | ret = drm_sman_init(&dev_priv->sman, 2, 12, 8); | 107 | ret = drm_sman_init(&dev_priv->sman, 2, 12, 8); |
| 108 | if (ret) { | 108 | if (ret) { |
| 109 | drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER); | 109 | drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER); |
| 110 | return ret; | ||
| 110 | } | 111 | } |
| 111 | return ret; | 112 | |
| 113 | ret = drm_vblank_init(dev, 1); | ||
| 114 | if (ret) { | ||
| 115 | drm_sman_takedown(&dev_priv->sman); | ||
| 116 | drm_free(dev_priv, sizeof(drm_via_private_t), DRM_MEM_DRIVER); | ||
| 117 | return ret; | ||
| 118 | } | ||
| 119 | |||
| 120 | return 0; | ||
| 112 | } | 121 | } |
| 113 | 122 | ||
| 114 | int via_driver_unload(struct drm_device *dev) | 123 | int via_driver_unload(struct drm_device *dev) |
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 9b97795e45ad..aa28aed0e46c 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c | |||
| @@ -400,12 +400,12 @@ static const struct hid_device_id apple_devices[] = { | |||
| 400 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS), | 400 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS), |
| 401 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | | 401 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | |
| 402 | APPLE_RDESC_JIS }, | 402 | APPLE_RDESC_JIS }, |
| 403 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI), | 403 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI), |
| 404 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, | 404 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, |
| 405 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO), | 405 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO), |
| 406 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | | 406 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN | |
| 407 | APPLE_ISO_KEYBOARD }, | 407 | APPLE_ISO_KEYBOARD }, |
| 408 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS), | 408 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS), |
| 409 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, | 409 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, |
| 410 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI), | 410 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI), |
| 411 | .driver_data = APPLE_HAS_FN }, | 411 | .driver_data = APPLE_HAS_FN }, |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 147ec591a806..40df3e1b4bd1 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -1241,9 +1241,9 @@ static const struct hid_device_id hid_blacklist[] = { | |||
| 1241 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) }, | 1241 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) }, |
| 1242 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) }, | 1242 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) }, |
| 1243 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) }, | 1243 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) }, |
| 1244 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI) }, | 1244 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI) }, |
| 1245 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO) }, | 1245 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO) }, |
| 1246 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS) }, | 1246 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS) }, |
| 1247 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) }, | 1247 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) }, |
| 1248 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) }, | 1248 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) }, |
| 1249 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) }, | 1249 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) }, |
| @@ -1266,6 +1266,9 @@ static const struct hid_device_id hid_blacklist[] = { | |||
| 1266 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) }, | 1266 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) }, |
| 1267 | { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) }, | 1267 | { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) }, |
| 1268 | { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) }, | 1268 | { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) }, |
| 1269 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) }, | ||
| 1270 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) }, | ||
| 1271 | { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) }, | ||
| 1269 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, | 1272 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, |
| 1270 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, | 1273 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, |
| 1271 | { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, | 1274 | { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, |
| @@ -1420,7 +1423,6 @@ static const struct hid_device_id hid_ignore_list[] = { | |||
| 1420 | { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) }, | 1423 | { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) }, |
| 1421 | { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, | 1424 | { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, |
| 1422 | { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) }, | 1425 | { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) }, |
| 1423 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) }, | ||
| 1424 | { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) }, | 1426 | { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) }, |
| 1425 | { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) }, | 1427 | { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) }, |
| 1426 | { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) }, | 1428 | { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) }, |
| @@ -1436,7 +1438,6 @@ static const struct hid_device_id hid_ignore_list[] = { | |||
| 1436 | { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2) }, | 1438 | { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2) }, |
| 1437 | { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN) }, | 1439 | { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN) }, |
| 1438 | { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER) }, | 1440 | { HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER) }, |
| 1439 | { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) }, | ||
| 1440 | { HID_USB_DEVICE(USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY) }, | 1441 | { HID_USB_DEVICE(USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY) }, |
| 1441 | { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE) }, | 1442 | { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE) }, |
| 1442 | { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB) }, | 1443 | { HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB) }, |
| @@ -1576,9 +1577,6 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { | |||
| 1576 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) }, | 1577 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) }, |
| 1577 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) }, | 1578 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) }, |
| 1578 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) }, | 1579 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) }, |
| 1579 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) }, | ||
| 1580 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) }, | ||
| 1581 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) }, | ||
| 1582 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, | 1580 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, |
| 1583 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, | 1581 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, |
| 1584 | { } | 1582 | { } |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index d70075dd3d81..39289699c32f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -163,6 +163,7 @@ | |||
| 163 | 163 | ||
| 164 | #define USB_VENDOR_ID_GAMERON 0x0810 | 164 | #define USB_VENDOR_ID_GAMERON 0x0810 |
| 165 | #define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001 | 165 | #define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001 |
| 166 | #define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR 0x0002 | ||
| 166 | 167 | ||
| 167 | #define USB_VENDOR_ID_GENERAL_TOUCH 0x0dfc | 168 | #define USB_VENDOR_ID_GENERAL_TOUCH 0x0dfc |
| 168 | 169 | ||
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c index acd815586182..46941f979b9d 100644 --- a/drivers/hid/hid-pl.c +++ b/drivers/hid/hid-pl.c | |||
| @@ -178,6 +178,8 @@ err: | |||
| 178 | static const struct hid_device_id pl_devices[] = { | 178 | static const struct hid_device_id pl_devices[] = { |
| 179 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR), | 179 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR), |
| 180 | .driver_data = 1 }, /* Twin USB Joystick */ | 180 | .driver_data = 1 }, /* Twin USB Joystick */ |
| 181 | { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR), | ||
| 182 | .driver_data = 1 }, /* Twin USB Joystick */ | ||
| 181 | { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */ | 183 | { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */ |
| 182 | { } | 184 | { } |
| 183 | }; | 185 | }; |
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index d746bf8284dd..606369ea24ca 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c | |||
| @@ -796,7 +796,6 @@ static int usbhid_start(struct hid_device *hid) | |||
| 796 | if (insize > HID_MAX_BUFFER_SIZE) | 796 | if (insize > HID_MAX_BUFFER_SIZE) |
| 797 | insize = HID_MAX_BUFFER_SIZE; | 797 | insize = HID_MAX_BUFFER_SIZE; |
| 798 | 798 | ||
| 799 | mutex_lock(&usbhid->setup); | ||
| 800 | if (hid_alloc_buffers(dev, hid)) { | 799 | if (hid_alloc_buffers(dev, hid)) { |
| 801 | ret = -ENOMEM; | 800 | ret = -ENOMEM; |
| 802 | goto fail; | 801 | goto fail; |
| @@ -876,7 +875,6 @@ static int usbhid_start(struct hid_device *hid) | |||
| 876 | hid_dump_device(hid); | 875 | hid_dump_device(hid); |
| 877 | 876 | ||
| 878 | set_bit(HID_STARTED, &usbhid->iofl); | 877 | set_bit(HID_STARTED, &usbhid->iofl); |
| 879 | mutex_unlock(&usbhid->setup); | ||
| 880 | 878 | ||
| 881 | return 0; | 879 | return 0; |
| 882 | 880 | ||
| @@ -888,7 +886,6 @@ fail: | |||
| 888 | usbhid->urbout = NULL; | 886 | usbhid->urbout = NULL; |
| 889 | usbhid->urbctrl = NULL; | 887 | usbhid->urbctrl = NULL; |
| 890 | hid_free_buffers(dev, hid); | 888 | hid_free_buffers(dev, hid); |
| 891 | mutex_unlock(&usbhid->setup); | ||
| 892 | return ret; | 889 | return ret; |
| 893 | } | 890 | } |
| 894 | 891 | ||
| @@ -899,7 +896,6 @@ static void usbhid_stop(struct hid_device *hid) | |||
| 899 | if (WARN_ON(!usbhid)) | 896 | if (WARN_ON(!usbhid)) |
| 900 | return; | 897 | return; |
| 901 | 898 | ||
| 902 | mutex_lock(&usbhid->setup); | ||
| 903 | clear_bit(HID_STARTED, &usbhid->iofl); | 899 | clear_bit(HID_STARTED, &usbhid->iofl); |
| 904 | spin_lock_irq(&usbhid->inlock); /* Sync with error handler */ | 900 | spin_lock_irq(&usbhid->inlock); /* Sync with error handler */ |
| 905 | set_bit(HID_DISCONNECTED, &usbhid->iofl); | 901 | set_bit(HID_DISCONNECTED, &usbhid->iofl); |
| @@ -928,7 +924,6 @@ static void usbhid_stop(struct hid_device *hid) | |||
| 928 | usbhid->urbout = NULL; | 924 | usbhid->urbout = NULL; |
| 929 | 925 | ||
| 930 | hid_free_buffers(hid_to_usb_dev(hid), hid); | 926 | hid_free_buffers(hid_to_usb_dev(hid), hid); |
| 931 | mutex_unlock(&usbhid->setup); | ||
| 932 | } | 927 | } |
| 933 | 928 | ||
| 934 | static struct hid_ll_driver usb_hid_driver = { | 929 | static struct hid_ll_driver usb_hid_driver = { |
| @@ -1016,7 +1011,6 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
| 1016 | 1011 | ||
| 1017 | hid->driver_data = usbhid; | 1012 | hid->driver_data = usbhid; |
| 1018 | usbhid->hid = hid; | 1013 | usbhid->hid = hid; |
| 1019 | mutex_init(&usbhid->setup); /* needed on suspend/resume */ | ||
| 1020 | 1014 | ||
| 1021 | ret = hid_add_device(hid); | 1015 | ret = hid_add_device(hid); |
| 1022 | if (ret) { | 1016 | if (ret) { |
| @@ -1051,18 +1045,14 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) | |||
| 1051 | struct hid_device *hid = usb_get_intfdata (intf); | 1045 | struct hid_device *hid = usb_get_intfdata (intf); |
| 1052 | struct usbhid_device *usbhid = hid->driver_data; | 1046 | struct usbhid_device *usbhid = hid->driver_data; |
| 1053 | 1047 | ||
| 1054 | mutex_lock(&usbhid->setup); | 1048 | if (!test_bit(HID_STARTED, &usbhid->iofl)) |
| 1055 | if (!test_bit(HID_STARTED, &usbhid->iofl)) { | ||
| 1056 | mutex_unlock(&usbhid->setup); | ||
| 1057 | return 0; | 1049 | return 0; |
| 1058 | } | ||
| 1059 | 1050 | ||
| 1060 | spin_lock_irq(&usbhid->inlock); /* Sync with error handler */ | 1051 | spin_lock_irq(&usbhid->inlock); /* Sync with error handler */ |
| 1061 | set_bit(HID_SUSPENDED, &usbhid->iofl); | 1052 | set_bit(HID_SUSPENDED, &usbhid->iofl); |
| 1062 | spin_unlock_irq(&usbhid->inlock); | 1053 | spin_unlock_irq(&usbhid->inlock); |
| 1063 | del_timer_sync(&usbhid->io_retry); | 1054 | del_timer_sync(&usbhid->io_retry); |
| 1064 | usb_kill_urb(usbhid->urbin); | 1055 | usb_kill_urb(usbhid->urbin); |
| 1065 | mutex_unlock(&usbhid->setup); | ||
| 1066 | dev_dbg(&intf->dev, "suspend\n"); | 1056 | dev_dbg(&intf->dev, "suspend\n"); |
| 1067 | return 0; | 1057 | return 0; |
| 1068 | } | 1058 | } |
| @@ -1073,16 +1063,12 @@ static int hid_resume(struct usb_interface *intf) | |||
| 1073 | struct usbhid_device *usbhid = hid->driver_data; | 1063 | struct usbhid_device *usbhid = hid->driver_data; |
| 1074 | int status; | 1064 | int status; |
| 1075 | 1065 | ||
| 1076 | mutex_lock(&usbhid->setup); | 1066 | if (!test_bit(HID_STARTED, &usbhid->iofl)) |
| 1077 | if (!test_bit(HID_STARTED, &usbhid->iofl)) { | ||
| 1078 | mutex_unlock(&usbhid->setup); | ||
| 1079 | return 0; | 1067 | return 0; |
| 1080 | } | ||
| 1081 | 1068 | ||
| 1082 | clear_bit(HID_SUSPENDED, &usbhid->iofl); | 1069 | clear_bit(HID_SUSPENDED, &usbhid->iofl); |
| 1083 | usbhid->retry_delay = 0; | 1070 | usbhid->retry_delay = 0; |
| 1084 | status = hid_start_in(hid); | 1071 | status = hid_start_in(hid); |
| 1085 | mutex_unlock(&usbhid->setup); | ||
| 1086 | dev_dbg(&intf->dev, "resume status %d\n", status); | 1072 | dev_dbg(&intf->dev, "resume status %d\n", status); |
| 1087 | return status; | 1073 | return status; |
| 1088 | } | 1074 | } |
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h index 55973ff54008..332abcdf9956 100644 --- a/drivers/hid/usbhid/usbhid.h +++ b/drivers/hid/usbhid/usbhid.h | |||
| @@ -74,7 +74,6 @@ struct usbhid_device { | |||
| 74 | dma_addr_t outbuf_dma; /* Output buffer dma */ | 74 | dma_addr_t outbuf_dma; /* Output buffer dma */ |
| 75 | spinlock_t outlock; /* Output fifo spinlock */ | 75 | spinlock_t outlock; /* Output fifo spinlock */ |
| 76 | 76 | ||
| 77 | struct mutex setup; | ||
| 78 | unsigned long iofl; /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */ | 77 | unsigned long iofl; /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */ |
| 79 | struct timer_list io_retry; /* Retry timer */ | 78 | struct timer_list io_retry; /* Retry timer */ |
| 80 | unsigned long stop_retry; /* Time to give up, in jiffies */ | 79 | unsigned long stop_retry; /* Time to give up, in jiffies */ |
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index f7dce8b9f64b..086c2a5cef0b 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
| @@ -1564,3 +1564,4 @@ module_exit(applesmc_exit); | |||
| 1564 | MODULE_AUTHOR("Nicolas Boichat"); | 1564 | MODULE_AUTHOR("Nicolas Boichat"); |
| 1565 | MODULE_DESCRIPTION("Apple SMC"); | 1565 | MODULE_DESCRIPTION("Apple SMC"); |
| 1566 | MODULE_LICENSE("GPL v2"); | 1566 | MODULE_LICENSE("GPL v2"); |
| 1567 | MODULE_DEVICE_TABLE(dmi, applesmc_whitelist); | ||
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c index 59ba2086d2f9..a257cd5cd134 100644 --- a/drivers/i2c/busses/i2c-parport.c +++ b/drivers/i2c/busses/i2c-parport.c | |||
| @@ -189,8 +189,6 @@ static void i2c_parport_attach (struct parport *port) | |||
| 189 | if (adapter_parm[type].init.val) | 189 | if (adapter_parm[type].init.val) |
| 190 | line_set(port, 1, &adapter_parm[type].init); | 190 | line_set(port, 1, &adapter_parm[type].init); |
| 191 | 191 | ||
| 192 | parport_release(adapter->pdev); | ||
| 193 | |||
| 194 | if (i2c_bit_add_bus(&adapter->adapter) < 0) { | 192 | if (i2c_bit_add_bus(&adapter->adapter) < 0) { |
| 195 | printk(KERN_ERR "i2c-parport: Unable to register with I2C\n"); | 193 | printk(KERN_ERR "i2c-parport: Unable to register with I2C\n"); |
| 196 | goto ERROR1; | 194 | goto ERROR1; |
| @@ -202,6 +200,7 @@ static void i2c_parport_attach (struct parport *port) | |||
| 202 | return; | 200 | return; |
| 203 | 201 | ||
| 204 | ERROR1: | 202 | ERROR1: |
| 203 | parport_release(adapter->pdev); | ||
| 205 | parport_unregister_device(adapter->pdev); | 204 | parport_unregister_device(adapter->pdev); |
| 206 | ERROR0: | 205 | ERROR0: |
| 207 | kfree(adapter); | 206 | kfree(adapter); |
| @@ -221,6 +220,7 @@ static void i2c_parport_detach (struct parport *port) | |||
| 221 | if (adapter_parm[type].init.val) | 220 | if (adapter_parm[type].init.val) |
| 222 | line_set(port, 0, &adapter_parm[type].init); | 221 | line_set(port, 0, &adapter_parm[type].init); |
| 223 | 222 | ||
| 223 | parport_release(adapter->pdev); | ||
| 224 | parport_unregister_device(adapter->pdev); | 224 | parport_unregister_device(adapter->pdev); |
| 225 | if (prev) | 225 | if (prev) |
| 226 | prev->next = adapter->next; | 226 | prev->next = adapter->next; |
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 1fac4e233133..fdebd930408e 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
| @@ -40,8 +40,8 @@ | |||
| 40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
| 41 | 41 | ||
| 42 | #include <mach/regs-gpio.h> | 42 | #include <mach/regs-gpio.h> |
| 43 | #include <asm/plat-s3c/regs-iic.h> | 43 | #include <plat/regs-iic.h> |
| 44 | #include <asm/plat-s3c/iic.h> | 44 | #include <plat/iic.h> |
| 45 | 45 | ||
| 46 | /* i2c controller state */ | 46 | /* i2c controller state */ |
| 47 | 47 | ||
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index 28902ebd5539..e0d56ef2bcb0 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/gpio.h> | ||
| 28 | #include <linux/usb/ch9.h> | 29 | #include <linux/usb/ch9.h> |
| 29 | #include <linux/usb/gadget.h> | 30 | #include <linux/usb/gadget.h> |
| 30 | #include <linux/usb.h> | 31 | #include <linux/usb.h> |
| @@ -33,7 +34,10 @@ | |||
| 33 | #include <linux/workqueue.h> | 34 | #include <linux/workqueue.h> |
| 34 | 35 | ||
| 35 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
| 37 | #include <asm/mach-types.h> | ||
| 38 | |||
| 36 | #include <mach/usb.h> | 39 | #include <mach/usb.h> |
| 40 | #include <mach/mux.h> | ||
| 37 | 41 | ||
| 38 | 42 | ||
| 39 | #ifndef DEBUG | 43 | #ifndef DEBUG |
| @@ -88,14 +92,9 @@ struct isp1301 { | |||
| 88 | 92 | ||
| 89 | /*-------------------------------------------------------------------------*/ | 93 | /*-------------------------------------------------------------------------*/ |
| 90 | 94 | ||
| 91 | #ifdef CONFIG_MACH_OMAP_H2 | ||
| 92 | |||
| 93 | /* board-specific PM hooks */ | 95 | /* board-specific PM hooks */ |
| 94 | 96 | ||
| 95 | #include <asm/gpio.h> | 97 | #if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3) |
| 96 | #include <mach/mux.h> | ||
| 97 | #include <asm/mach-types.h> | ||
| 98 | |||
| 99 | 98 | ||
| 100 | #if defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE) | 99 | #if defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE) |
| 101 | 100 | ||
| @@ -135,6 +134,33 @@ static inline void notresponding(struct isp1301 *isp) | |||
| 135 | 134 | ||
| 136 | #endif | 135 | #endif |
| 137 | 136 | ||
| 137 | #if defined(CONFIG_MACH_OMAP_H4) | ||
| 138 | |||
| 139 | static void enable_vbus_draw(struct isp1301 *isp, unsigned mA) | ||
| 140 | { | ||
| 141 | /* H4 controls this by DIP switch S2.4; no soft control. | ||
| 142 | * ON means the charger is always enabled. Leave it OFF | ||
| 143 | * unless the OTG port is used only in B-peripheral mode. | ||
| 144 | */ | ||
| 145 | } | ||
| 146 | |||
| 147 | static void enable_vbus_source(struct isp1301 *isp) | ||
| 148 | { | ||
| 149 | /* this board won't supply more than 8mA vbus power. | ||
| 150 | * some boards can switch a 100ma "unit load" (or more). | ||
| 151 | */ | ||
| 152 | } | ||
| 153 | |||
| 154 | |||
| 155 | /* products will deliver OTG messages with LEDs, GUI, etc */ | ||
| 156 | static inline void notresponding(struct isp1301 *isp) | ||
| 157 | { | ||
| 158 | printk(KERN_NOTICE "OTG device not responding.\n"); | ||
| 159 | } | ||
| 160 | |||
| 161 | |||
| 162 | #endif | ||
| 163 | |||
| 138 | /*-------------------------------------------------------------------------*/ | 164 | /*-------------------------------------------------------------------------*/ |
| 139 | 165 | ||
| 140 | static struct i2c_driver isp1301_driver; | 166 | static struct i2c_driver isp1301_driver; |
| @@ -334,8 +360,7 @@ static int gadget_suspend(struct isp1301 *isp) | |||
| 334 | * NOTE: guaranteeing certain response times might mean we shouldn't | 360 | * NOTE: guaranteeing certain response times might mean we shouldn't |
| 335 | * share keventd's work queue; a realtime task might be safest. | 361 | * share keventd's work queue; a realtime task might be safest. |
| 336 | */ | 362 | */ |
| 337 | void | 363 | static void isp1301_defer_work(struct isp1301 *isp, int work) |
| 338 | isp1301_defer_work(struct isp1301 *isp, int work) | ||
| 339 | { | 364 | { |
| 340 | int status; | 365 | int status; |
| 341 | 366 | ||
| @@ -512,7 +537,6 @@ static void update_otg1(struct isp1301 *isp, u8 int_src) | |||
| 512 | otg_ctrl &= ~OTG_XCEIV_INPUTS; | 537 | otg_ctrl &= ~OTG_XCEIV_INPUTS; |
| 513 | otg_ctrl &= ~(OTG_ID|OTG_ASESSVLD|OTG_VBUSVLD); | 538 | otg_ctrl &= ~(OTG_ID|OTG_ASESSVLD|OTG_VBUSVLD); |
| 514 | 539 | ||
| 515 | |||
| 516 | if (int_src & INTR_SESS_VLD) | 540 | if (int_src & INTR_SESS_VLD) |
| 517 | otg_ctrl |= OTG_ASESSVLD; | 541 | otg_ctrl |= OTG_ASESSVLD; |
| 518 | else if (isp->otg.state == OTG_STATE_A_WAIT_VFALL) { | 542 | else if (isp->otg.state == OTG_STATE_A_WAIT_VFALL) { |
| @@ -886,11 +910,11 @@ static int otg_probe(struct platform_device *dev) | |||
| 886 | 910 | ||
| 887 | static int otg_remove(struct platform_device *dev) | 911 | static int otg_remove(struct platform_device *dev) |
| 888 | { | 912 | { |
| 889 | otg_dev = 0; | 913 | otg_dev = NULL; |
| 890 | return 0; | 914 | return 0; |
| 891 | } | 915 | } |
| 892 | 916 | ||
| 893 | struct platform_driver omap_otg_driver = { | 917 | static struct platform_driver omap_otg_driver = { |
| 894 | .probe = otg_probe, | 918 | .probe = otg_probe, |
| 895 | .remove = otg_remove, | 919 | .remove = otg_remove, |
| 896 | .driver = { | 920 | .driver = { |
| @@ -1212,6 +1236,8 @@ static void isp1301_release(struct device *dev) | |||
| 1212 | 1236 | ||
| 1213 | isp = dev_get_drvdata(dev); | 1237 | isp = dev_get_drvdata(dev); |
| 1214 | 1238 | ||
| 1239 | /* FIXME -- not with a "new style" driver, it doesn't!! */ | ||
| 1240 | |||
| 1215 | /* ugly -- i2c hijacks our memory hook to wait_for_completion() */ | 1241 | /* ugly -- i2c hijacks our memory hook to wait_for_completion() */ |
| 1216 | if (isp->i2c_release) | 1242 | if (isp->i2c_release) |
| 1217 | isp->i2c_release(dev); | 1243 | isp->i2c_release(dev); |
| @@ -1233,7 +1259,7 @@ static int __exit isp1301_remove(struct i2c_client *i2c) | |||
| 1233 | otg_unbind(isp); | 1259 | otg_unbind(isp); |
| 1234 | #endif | 1260 | #endif |
| 1235 | if (machine_is_omap_h2()) | 1261 | if (machine_is_omap_h2()) |
| 1236 | omap_free_gpio(2); | 1262 | gpio_free(2); |
| 1237 | 1263 | ||
| 1238 | isp->timer.data = 0; | 1264 | isp->timer.data = 0; |
| 1239 | set_bit(WORK_STOP, &isp->todo); | 1265 | set_bit(WORK_STOP, &isp->todo); |
| @@ -1241,7 +1267,7 @@ static int __exit isp1301_remove(struct i2c_client *i2c) | |||
| 1241 | flush_scheduled_work(); | 1267 | flush_scheduled_work(); |
| 1242 | 1268 | ||
| 1243 | put_device(&i2c->dev); | 1269 | put_device(&i2c->dev); |
| 1244 | the_transceiver = 0; | 1270 | the_transceiver = NULL; |
| 1245 | 1271 | ||
| 1246 | return 0; | 1272 | return 0; |
| 1247 | } | 1273 | } |
| @@ -1295,7 +1321,7 @@ isp1301_set_host(struct otg_transceiver *otg, struct usb_bus *host) | |||
| 1295 | if (!host) { | 1321 | if (!host) { |
| 1296 | omap_writew(0, OTG_IRQ_EN); | 1322 | omap_writew(0, OTG_IRQ_EN); |
| 1297 | power_down(isp); | 1323 | power_down(isp); |
| 1298 | isp->otg.host = 0; | 1324 | isp->otg.host = NULL; |
| 1299 | return 0; | 1325 | return 0; |
| 1300 | } | 1326 | } |
| 1301 | 1327 | ||
| @@ -1344,7 +1370,9 @@ static int | |||
| 1344 | isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget) | 1370 | isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget) |
| 1345 | { | 1371 | { |
| 1346 | struct isp1301 *isp = container_of(otg, struct isp1301, otg); | 1372 | struct isp1301 *isp = container_of(otg, struct isp1301, otg); |
| 1373 | #ifndef CONFIG_USB_OTG | ||
| 1347 | u32 l; | 1374 | u32 l; |
| 1375 | #endif | ||
| 1348 | 1376 | ||
| 1349 | if (!otg || isp != the_transceiver) | 1377 | if (!otg || isp != the_transceiver) |
| 1350 | return -ENODEV; | 1378 | return -ENODEV; |
| @@ -1354,7 +1382,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget) | |||
| 1354 | if (!isp->otg.default_a) | 1382 | if (!isp->otg.default_a) |
| 1355 | enable_vbus_draw(isp, 0); | 1383 | enable_vbus_draw(isp, 0); |
| 1356 | usb_gadget_vbus_disconnect(isp->otg.gadget); | 1384 | usb_gadget_vbus_disconnect(isp->otg.gadget); |
| 1357 | isp->otg.gadget = 0; | 1385 | isp->otg.gadget = NULL; |
| 1358 | power_down(isp); | 1386 | power_down(isp); |
| 1359 | return 0; | 1387 | return 0; |
| 1360 | } | 1388 | } |
| @@ -1379,7 +1407,7 @@ isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget) | |||
| 1379 | power_up(isp); | 1407 | power_up(isp); |
| 1380 | isp->otg.state = OTG_STATE_B_IDLE; | 1408 | isp->otg.state = OTG_STATE_B_IDLE; |
| 1381 | 1409 | ||
| 1382 | if (machine_is_omap_h2()) | 1410 | if (machine_is_omap_h2() || machine_is_omap_h3()) |
| 1383 | isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0); | 1411 | isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0); |
| 1384 | 1412 | ||
| 1385 | isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING, | 1413 | isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING, |
| @@ -1499,7 +1527,8 @@ isp1301_start_hnp(struct otg_transceiver *dev) | |||
| 1499 | 1527 | ||
| 1500 | /*-------------------------------------------------------------------------*/ | 1528 | /*-------------------------------------------------------------------------*/ |
| 1501 | 1529 | ||
| 1502 | static int __init isp1301_probe(struct i2c_client *i2c) | 1530 | static int __init |
| 1531 | isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id) | ||
| 1503 | { | 1532 | { |
| 1504 | int status; | 1533 | int status; |
| 1505 | struct isp1301 *isp; | 1534 | struct isp1301 *isp; |
| @@ -1647,7 +1676,7 @@ module_init(isp_init); | |||
| 1647 | static void __exit isp_exit(void) | 1676 | static void __exit isp_exit(void) |
| 1648 | { | 1677 | { |
| 1649 | if (the_transceiver) | 1678 | if (the_transceiver) |
| 1650 | otg_set_transceiver(0); | 1679 | otg_set_transceiver(NULL); |
| 1651 | i2c_del_driver(&isp1301_driver); | 1680 | i2c_del_driver(&isp1301_driver); |
| 1652 | } | 1681 | } |
| 1653 | module_exit(isp_exit); | 1682 | module_exit(isp_exit); |
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 5a485c22660a..c6a63f46bc15 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
| @@ -631,7 +631,7 @@ int i2c_del_adapter(struct i2c_adapter *adap) | |||
| 631 | 631 | ||
| 632 | /* detach any active clients. This must be done first, because | 632 | /* detach any active clients. This must be done first, because |
| 633 | * it can fail; in which case we give up. */ | 633 | * it can fail; in which case we give up. */ |
| 634 | list_for_each_entry_safe(client, _n, &adap->clients, list) { | 634 | list_for_each_entry_safe_reverse(client, _n, &adap->clients, list) { |
| 635 | struct i2c_driver *driver; | 635 | struct i2c_driver *driver; |
| 636 | 636 | ||
| 637 | driver = client->driver; | 637 | driver = client->driver; |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 6d7401772a8f..57630402ea67 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -732,7 +732,7 @@ config BLK_DEV_IDE_TX4939 | |||
| 732 | 732 | ||
| 733 | config IDE_ARM | 733 | config IDE_ARM |
| 734 | tristate "ARM IDE support" | 734 | tristate "ARM IDE support" |
| 735 | depends on ARM && (ARCH_CLPS7500 || ARCH_RPC || ARCH_SHARK) | 735 | depends on ARM && (ARCH_RPC || ARCH_SHARK) |
| 736 | default y | 736 | default y |
| 737 | 737 | ||
| 738 | config BLK_DEV_IDE_ICSIDE | 738 | config BLK_DEV_IDE_ICSIDE |
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c index 2d848010499d..81f70caeb40f 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c | |||
| @@ -419,7 +419,7 @@ static void icside_setup_ports(hw_regs_t *hw, void __iomem *base, | |||
| 419 | hw->chipset = ide_acorn; | 419 | hw->chipset = ide_acorn; |
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | static int __init | 422 | static int __devinit |
| 423 | icside_register_v5(struct icside_state *state, struct expansion_card *ec) | 423 | icside_register_v5(struct icside_state *state, struct expansion_card *ec) |
| 424 | { | 424 | { |
| 425 | void __iomem *base; | 425 | void __iomem *base; |
| @@ -473,7 +473,7 @@ static const struct ide_port_info icside_v6_port_info __initdata = { | |||
| 473 | .swdma_mask = ATA_SWDMA2, | 473 | .swdma_mask = ATA_SWDMA2, |
| 474 | }; | 474 | }; |
| 475 | 475 | ||
| 476 | static int __init | 476 | static int __devinit |
| 477 | icside_register_v6(struct icside_state *state, struct expansion_card *ec) | 477 | icside_register_v6(struct icside_state *state, struct expansion_card *ec) |
| 478 | { | 478 | { |
| 479 | void __iomem *ioc_base, *easi_base; | 479 | void __iomem *ioc_base, *easi_base; |
diff --git a/drivers/ide/ide_arm.c b/drivers/ide/ide_arm.c index f728f2927b5a..bdcac94d7c1f 100644 --- a/drivers/ide/ide_arm.c +++ b/drivers/ide/ide_arm.c | |||
| @@ -15,15 +15,8 @@ | |||
| 15 | 15 | ||
| 16 | #define DRV_NAME "ide_arm" | 16 | #define DRV_NAME "ide_arm" |
| 17 | 17 | ||
| 18 | #ifdef CONFIG_ARCH_CLPS7500 | 18 | #define IDE_ARM_IO 0x1f0 |
| 19 | # include <mach/hardware.h> | 19 | #define IDE_ARM_IRQ IRQ_HARDDISK |
| 20 | # | ||
| 21 | # define IDE_ARM_IO (ISASLOT_IO + 0x1f0) | ||
| 22 | # define IDE_ARM_IRQ IRQ_ISA_14 | ||
| 23 | #else | ||
| 24 | # define IDE_ARM_IO 0x1f0 | ||
| 25 | # define IDE_ARM_IRQ IRQ_HARDDISK | ||
| 26 | #endif | ||
| 27 | 20 | ||
| 28 | static int __init ide_arm_init(void) | 21 | static int __init ide_arm_init(void) |
| 29 | { | 22 | { |
diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c index 918ffc4fc8ac..272543a42a43 100644 --- a/drivers/ieee1394/highlevel.c +++ b/drivers/ieee1394/highlevel.c | |||
| @@ -46,10 +46,6 @@ static DEFINE_RWLOCK(hl_irqs_lock); | |||
| 46 | 46 | ||
| 47 | static DEFINE_RWLOCK(addr_space_lock); | 47 | static DEFINE_RWLOCK(addr_space_lock); |
| 48 | 48 | ||
| 49 | /* addr_space list will have zero and max already included as bounds */ | ||
| 50 | static struct hpsb_address_ops dummy_ops = { NULL, NULL, NULL, NULL }; | ||
| 51 | static struct hpsb_address_serve dummy_zero_addr, dummy_max_addr; | ||
| 52 | |||
| 53 | 49 | ||
| 54 | static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl, | 50 | static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl, |
| 55 | struct hpsb_host *host) | 51 | struct hpsb_host *host) |
| @@ -481,20 +477,23 @@ int hpsb_unregister_addrspace(struct hpsb_highlevel *hl, struct hpsb_host *host, | |||
| 481 | return retval; | 477 | return retval; |
| 482 | } | 478 | } |
| 483 | 479 | ||
| 480 | static struct hpsb_address_ops dummy_ops; | ||
| 481 | |||
| 482 | /* dummy address spaces as lower and upper bounds of the host's a.s. list */ | ||
| 484 | static void init_hpsb_highlevel(struct hpsb_host *host) | 483 | static void init_hpsb_highlevel(struct hpsb_host *host) |
| 485 | { | 484 | { |
| 486 | INIT_LIST_HEAD(&dummy_zero_addr.host_list); | 485 | INIT_LIST_HEAD(&host->dummy_zero_addr.host_list); |
| 487 | INIT_LIST_HEAD(&dummy_zero_addr.hl_list); | 486 | INIT_LIST_HEAD(&host->dummy_zero_addr.hl_list); |
| 488 | INIT_LIST_HEAD(&dummy_max_addr.host_list); | 487 | INIT_LIST_HEAD(&host->dummy_max_addr.host_list); |
| 489 | INIT_LIST_HEAD(&dummy_max_addr.hl_list); | 488 | INIT_LIST_HEAD(&host->dummy_max_addr.hl_list); |
| 490 | 489 | ||
| 491 | dummy_zero_addr.op = dummy_max_addr.op = &dummy_ops; | 490 | host->dummy_zero_addr.op = host->dummy_max_addr.op = &dummy_ops; |
| 492 | 491 | ||
| 493 | dummy_zero_addr.start = dummy_zero_addr.end = 0; | 492 | host->dummy_zero_addr.start = host->dummy_zero_addr.end = 0; |
| 494 | dummy_max_addr.start = dummy_max_addr.end = ((u64) 1) << 48; | 493 | host->dummy_max_addr.start = host->dummy_max_addr.end = ((u64) 1) << 48; |
| 495 | 494 | ||
| 496 | list_add_tail(&dummy_zero_addr.host_list, &host->addr_space); | 495 | list_add_tail(&host->dummy_zero_addr.host_list, &host->addr_space); |
| 497 | list_add_tail(&dummy_max_addr.host_list, &host->addr_space); | 496 | list_add_tail(&host->dummy_max_addr.host_list, &host->addr_space); |
| 498 | } | 497 | } |
| 499 | 498 | ||
| 500 | void highlevel_add_host(struct hpsb_host *host) | 499 | void highlevel_add_host(struct hpsb_host *host) |
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h index e4e8aeb4d778..dd229950acca 100644 --- a/drivers/ieee1394/hosts.h +++ b/drivers/ieee1394/hosts.h | |||
| @@ -13,6 +13,7 @@ struct module; | |||
| 13 | 13 | ||
| 14 | #include "ieee1394_types.h" | 14 | #include "ieee1394_types.h" |
| 15 | #include "csr.h" | 15 | #include "csr.h" |
| 16 | #include "highlevel.h" | ||
| 16 | 17 | ||
| 17 | struct hpsb_packet; | 18 | struct hpsb_packet; |
| 18 | struct hpsb_iso; | 19 | struct hpsb_iso; |
| @@ -72,6 +73,9 @@ struct hpsb_host { | |||
| 72 | struct { DECLARE_BITMAP(map, 64); } tl_pool[ALL_NODES]; | 73 | struct { DECLARE_BITMAP(map, 64); } tl_pool[ALL_NODES]; |
| 73 | 74 | ||
| 74 | struct csr_control csr; | 75 | struct csr_control csr; |
| 76 | |||
| 77 | struct hpsb_address_serve dummy_zero_addr; | ||
| 78 | struct hpsb_address_serve dummy_max_addr; | ||
| 75 | }; | 79 | }; |
| 76 | 80 | ||
| 77 | enum devctl_cmd { | 81 | enum devctl_cmd { |
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index c52f6e6e8af2..a373c18cf7b8 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
| @@ -402,6 +402,11 @@ static const struct { | |||
| 402 | }, | 402 | }, |
| 403 | /* iPod mini */ { | 403 | /* iPod mini */ { |
| 404 | .firmware_revision = 0x0a2700, | 404 | .firmware_revision = 0x0a2700, |
| 405 | .model_id = 0x000022, | ||
| 406 | .workarounds = SBP2_WORKAROUND_FIX_CAPACITY, | ||
| 407 | }, | ||
| 408 | /* iPod mini */ { | ||
| 409 | .firmware_revision = 0x0a2700, | ||
| 405 | .model_id = 0x000023, | 410 | .model_id = 0x000023, |
| 406 | .workarounds = SBP2_WORKAROUND_FIX_CAPACITY, | 411 | .workarounds = SBP2_WORKAROUND_FIX_CAPACITY, |
| 407 | }, | 412 | }, |
| @@ -890,12 +895,13 @@ static void sbp2_host_reset(struct hpsb_host *host) | |||
| 890 | return; | 895 | return; |
| 891 | 896 | ||
| 892 | read_lock_irqsave(&sbp2_hi_logical_units_lock, flags); | 897 | read_lock_irqsave(&sbp2_hi_logical_units_lock, flags); |
| 898 | |||
| 893 | list_for_each_entry(lu, &hi->logical_units, lu_list) | 899 | list_for_each_entry(lu, &hi->logical_units, lu_list) |
| 894 | if (likely(atomic_read(&lu->state) != | 900 | if (atomic_cmpxchg(&lu->state, |
| 895 | SBP2LU_STATE_IN_SHUTDOWN)) { | 901 | SBP2LU_STATE_RUNNING, SBP2LU_STATE_IN_RESET) |
| 896 | atomic_set(&lu->state, SBP2LU_STATE_IN_RESET); | 902 | == SBP2LU_STATE_RUNNING) |
| 897 | scsi_block_requests(lu->shost); | 903 | scsi_block_requests(lu->shost); |
| 898 | } | 904 | |
| 899 | read_unlock_irqrestore(&sbp2_hi_logical_units_lock, flags); | 905 | read_unlock_irqrestore(&sbp2_hi_logical_units_lock, flags); |
| 900 | } | 906 | } |
| 901 | 907 | ||
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h index 4df887af66a5..7fc35cf0cddf 100644 --- a/drivers/infiniband/hw/ehca/ehca_classes.h +++ b/drivers/infiniband/hw/ehca/ehca_classes.h | |||
| @@ -163,7 +163,8 @@ struct ehca_mod_qp_parm { | |||
| 163 | /* struct for tracking if cqes have been reported to the application */ | 163 | /* struct for tracking if cqes have been reported to the application */ |
| 164 | struct ehca_qmap_entry { | 164 | struct ehca_qmap_entry { |
| 165 | u16 app_wr_id; | 165 | u16 app_wr_id; |
| 166 | u16 reported; | 166 | u8 reported; |
| 167 | u8 cqe_req; | ||
| 167 | }; | 168 | }; |
| 168 | 169 | ||
| 169 | struct ehca_queue_map { | 170 | struct ehca_queue_map { |
| @@ -171,6 +172,7 @@ struct ehca_queue_map { | |||
| 171 | unsigned int entries; | 172 | unsigned int entries; |
| 172 | unsigned int tail; | 173 | unsigned int tail; |
| 173 | unsigned int left_to_poll; | 174 | unsigned int left_to_poll; |
| 175 | unsigned int next_wqe_idx; /* Idx to first wqe to be flushed */ | ||
| 174 | }; | 176 | }; |
| 175 | 177 | ||
| 176 | struct ehca_qp { | 178 | struct ehca_qp { |
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c index bb02a86aa526..bec7e0249358 100644 --- a/drivers/infiniband/hw/ehca/ehca_main.c +++ b/drivers/infiniband/hw/ehca/ehca_main.c | |||
| @@ -994,8 +994,7 @@ static int ehca_mem_notifier(struct notifier_block *nb, | |||
| 994 | if (printk_timed_ratelimit(&ehca_dmem_warn_time, | 994 | if (printk_timed_ratelimit(&ehca_dmem_warn_time, |
| 995 | 30 * 1000)) | 995 | 30 * 1000)) |
| 996 | ehca_gen_err("DMEM operations are not allowed" | 996 | ehca_gen_err("DMEM operations are not allowed" |
| 997 | "as long as an ehca adapter is" | 997 | "in conjunction with eHCA"); |
| 998 | "attached to the LPAR"); | ||
| 999 | return NOTIFY_BAD; | 998 | return NOTIFY_BAD; |
| 1000 | } | 999 | } |
| 1001 | } | 1000 | } |
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c index 9e05ee2db39b..cadbf0cdd910 100644 --- a/drivers/infiniband/hw/ehca/ehca_qp.c +++ b/drivers/infiniband/hw/ehca/ehca_qp.c | |||
| @@ -435,9 +435,13 @@ static void reset_queue_map(struct ehca_queue_map *qmap) | |||
| 435 | { | 435 | { |
| 436 | int i; | 436 | int i; |
| 437 | 437 | ||
| 438 | qmap->tail = 0; | 438 | qmap->tail = qmap->entries - 1; |
| 439 | for (i = 0; i < qmap->entries; i++) | 439 | qmap->left_to_poll = 0; |
| 440 | qmap->next_wqe_idx = 0; | ||
| 441 | for (i = 0; i < qmap->entries; i++) { | ||
| 440 | qmap->map[i].reported = 1; | 442 | qmap->map[i].reported = 1; |
| 443 | qmap->map[i].cqe_req = 0; | ||
| 444 | } | ||
| 441 | } | 445 | } |
| 442 | 446 | ||
| 443 | /* | 447 | /* |
| @@ -1121,6 +1125,7 @@ static int calc_left_cqes(u64 wqe_p, struct ipz_queue *ipz_queue, | |||
| 1121 | void *wqe_v; | 1125 | void *wqe_v; |
| 1122 | u64 q_ofs; | 1126 | u64 q_ofs; |
| 1123 | u32 wqe_idx; | 1127 | u32 wqe_idx; |
| 1128 | unsigned int tail_idx; | ||
| 1124 | 1129 | ||
| 1125 | /* convert real to abs address */ | 1130 | /* convert real to abs address */ |
| 1126 | wqe_p = wqe_p & (~(1UL << 63)); | 1131 | wqe_p = wqe_p & (~(1UL << 63)); |
| @@ -1133,12 +1138,17 @@ static int calc_left_cqes(u64 wqe_p, struct ipz_queue *ipz_queue, | |||
| 1133 | return -EFAULT; | 1138 | return -EFAULT; |
| 1134 | } | 1139 | } |
| 1135 | 1140 | ||
| 1141 | tail_idx = (qmap->tail + 1) % qmap->entries; | ||
| 1136 | wqe_idx = q_ofs / ipz_queue->qe_size; | 1142 | wqe_idx = q_ofs / ipz_queue->qe_size; |
| 1137 | if (wqe_idx < qmap->tail) | ||
| 1138 | qmap->left_to_poll = (qmap->entries - qmap->tail) + wqe_idx; | ||
| 1139 | else | ||
| 1140 | qmap->left_to_poll = wqe_idx - qmap->tail; | ||
| 1141 | 1143 | ||
| 1144 | /* check all processed wqes, whether a cqe is requested or not */ | ||
| 1145 | while (tail_idx != wqe_idx) { | ||
| 1146 | if (qmap->map[tail_idx].cqe_req) | ||
| 1147 | qmap->left_to_poll++; | ||
| 1148 | tail_idx = (tail_idx + 1) % qmap->entries; | ||
| 1149 | } | ||
| 1150 | /* save index in queue, where we have to start flushing */ | ||
| 1151 | qmap->next_wqe_idx = wqe_idx; | ||
| 1142 | return 0; | 1152 | return 0; |
| 1143 | } | 1153 | } |
| 1144 | 1154 | ||
| @@ -1185,10 +1195,14 @@ static int check_for_left_cqes(struct ehca_qp *my_qp, struct ehca_shca *shca) | |||
| 1185 | } else { | 1195 | } else { |
| 1186 | spin_lock_irqsave(&my_qp->send_cq->spinlock, flags); | 1196 | spin_lock_irqsave(&my_qp->send_cq->spinlock, flags); |
| 1187 | my_qp->sq_map.left_to_poll = 0; | 1197 | my_qp->sq_map.left_to_poll = 0; |
| 1198 | my_qp->sq_map.next_wqe_idx = (my_qp->sq_map.tail + 1) % | ||
| 1199 | my_qp->sq_map.entries; | ||
| 1188 | spin_unlock_irqrestore(&my_qp->send_cq->spinlock, flags); | 1200 | spin_unlock_irqrestore(&my_qp->send_cq->spinlock, flags); |
| 1189 | 1201 | ||
| 1190 | spin_lock_irqsave(&my_qp->recv_cq->spinlock, flags); | 1202 | spin_lock_irqsave(&my_qp->recv_cq->spinlock, flags); |
| 1191 | my_qp->rq_map.left_to_poll = 0; | 1203 | my_qp->rq_map.left_to_poll = 0; |
| 1204 | my_qp->rq_map.next_wqe_idx = (my_qp->rq_map.tail + 1) % | ||
| 1205 | my_qp->rq_map.entries; | ||
| 1192 | spin_unlock_irqrestore(&my_qp->recv_cq->spinlock, flags); | 1206 | spin_unlock_irqrestore(&my_qp->recv_cq->spinlock, flags); |
| 1193 | } | 1207 | } |
| 1194 | 1208 | ||
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c index 64928079eafa..00a648f4316c 100644 --- a/drivers/infiniband/hw/ehca/ehca_reqs.c +++ b/drivers/infiniband/hw/ehca/ehca_reqs.c | |||
| @@ -179,6 +179,7 @@ static inline int ehca_write_swqe(struct ehca_qp *qp, | |||
| 179 | 179 | ||
| 180 | qmap_entry->app_wr_id = get_app_wr_id(send_wr->wr_id); | 180 | qmap_entry->app_wr_id = get_app_wr_id(send_wr->wr_id); |
| 181 | qmap_entry->reported = 0; | 181 | qmap_entry->reported = 0; |
| 182 | qmap_entry->cqe_req = 0; | ||
| 182 | 183 | ||
| 183 | switch (send_wr->opcode) { | 184 | switch (send_wr->opcode) { |
| 184 | case IB_WR_SEND: | 185 | case IB_WR_SEND: |
| @@ -203,8 +204,10 @@ static inline int ehca_write_swqe(struct ehca_qp *qp, | |||
| 203 | 204 | ||
| 204 | if ((send_wr->send_flags & IB_SEND_SIGNALED || | 205 | if ((send_wr->send_flags & IB_SEND_SIGNALED || |
| 205 | qp->init_attr.sq_sig_type == IB_SIGNAL_ALL_WR) | 206 | qp->init_attr.sq_sig_type == IB_SIGNAL_ALL_WR) |
| 206 | && !hidden) | 207 | && !hidden) { |
| 207 | wqe_p->wr_flag |= WQE_WRFLAG_REQ_SIGNAL_COM; | 208 | wqe_p->wr_flag |= WQE_WRFLAG_REQ_SIGNAL_COM; |
| 209 | qmap_entry->cqe_req = 1; | ||
| 210 | } | ||
| 208 | 211 | ||
| 209 | if (send_wr->opcode == IB_WR_SEND_WITH_IMM || | 212 | if (send_wr->opcode == IB_WR_SEND_WITH_IMM || |
| 210 | send_wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) { | 213 | send_wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) { |
| @@ -569,6 +572,7 @@ static int internal_post_recv(struct ehca_qp *my_qp, | |||
| 569 | qmap_entry = &my_qp->rq_map.map[rq_map_idx]; | 572 | qmap_entry = &my_qp->rq_map.map[rq_map_idx]; |
| 570 | qmap_entry->app_wr_id = get_app_wr_id(cur_recv_wr->wr_id); | 573 | qmap_entry->app_wr_id = get_app_wr_id(cur_recv_wr->wr_id); |
| 571 | qmap_entry->reported = 0; | 574 | qmap_entry->reported = 0; |
| 575 | qmap_entry->cqe_req = 1; | ||
| 572 | 576 | ||
| 573 | wqe_cnt++; | 577 | wqe_cnt++; |
| 574 | } /* eof for cur_recv_wr */ | 578 | } /* eof for cur_recv_wr */ |
| @@ -706,27 +710,34 @@ repoll: | |||
| 706 | goto repoll; | 710 | goto repoll; |
| 707 | wc->qp = &my_qp->ib_qp; | 711 | wc->qp = &my_qp->ib_qp; |
| 708 | 712 | ||
| 713 | qmap_tail_idx = get_app_wr_id(cqe->work_request_id); | ||
| 714 | if (!(cqe->w_completion_flags & WC_SEND_RECEIVE_BIT)) | ||
| 715 | /* We got a send completion. */ | ||
| 716 | qmap = &my_qp->sq_map; | ||
| 717 | else | ||
| 718 | /* We got a receive completion. */ | ||
| 719 | qmap = &my_qp->rq_map; | ||
| 720 | |||
| 721 | /* advance the tail pointer */ | ||
| 722 | qmap->tail = qmap_tail_idx; | ||
| 723 | |||
| 709 | if (is_error) { | 724 | if (is_error) { |
| 710 | /* | 725 | /* |
| 711 | * set left_to_poll to 0 because in error state, we will not | 726 | * set left_to_poll to 0 because in error state, we will not |
| 712 | * get any additional CQEs | 727 | * get any additional CQEs |
| 713 | */ | 728 | */ |
| 714 | ehca_add_to_err_list(my_qp, 1); | 729 | my_qp->sq_map.next_wqe_idx = (my_qp->sq_map.tail + 1) % |
| 730 | my_qp->sq_map.entries; | ||
| 715 | my_qp->sq_map.left_to_poll = 0; | 731 | my_qp->sq_map.left_to_poll = 0; |
| 732 | ehca_add_to_err_list(my_qp, 1); | ||
| 716 | 733 | ||
| 734 | my_qp->rq_map.next_wqe_idx = (my_qp->rq_map.tail + 1) % | ||
| 735 | my_qp->rq_map.entries; | ||
| 736 | my_qp->rq_map.left_to_poll = 0; | ||
| 717 | if (HAS_RQ(my_qp)) | 737 | if (HAS_RQ(my_qp)) |
| 718 | ehca_add_to_err_list(my_qp, 0); | 738 | ehca_add_to_err_list(my_qp, 0); |
| 719 | my_qp->rq_map.left_to_poll = 0; | ||
| 720 | } | 739 | } |
| 721 | 740 | ||
| 722 | qmap_tail_idx = get_app_wr_id(cqe->work_request_id); | ||
| 723 | if (!(cqe->w_completion_flags & WC_SEND_RECEIVE_BIT)) | ||
| 724 | /* We got a send completion. */ | ||
| 725 | qmap = &my_qp->sq_map; | ||
| 726 | else | ||
| 727 | /* We got a receive completion. */ | ||
| 728 | qmap = &my_qp->rq_map; | ||
| 729 | |||
| 730 | qmap_entry = &qmap->map[qmap_tail_idx]; | 741 | qmap_entry = &qmap->map[qmap_tail_idx]; |
| 731 | if (qmap_entry->reported) { | 742 | if (qmap_entry->reported) { |
| 732 | ehca_warn(cq->device, "Double cqe on qp_num=%#x", | 743 | ehca_warn(cq->device, "Double cqe on qp_num=%#x", |
| @@ -738,10 +749,6 @@ repoll: | |||
| 738 | wc->wr_id = replace_wr_id(cqe->work_request_id, qmap_entry->app_wr_id); | 749 | wc->wr_id = replace_wr_id(cqe->work_request_id, qmap_entry->app_wr_id); |
| 739 | qmap_entry->reported = 1; | 750 | qmap_entry->reported = 1; |
| 740 | 751 | ||
| 741 | /* this is a proper completion, we need to advance the tail pointer */ | ||
| 742 | if (++qmap->tail == qmap->entries) | ||
| 743 | qmap->tail = 0; | ||
| 744 | |||
| 745 | /* if left_to_poll is decremented to 0, add the QP to the error list */ | 752 | /* if left_to_poll is decremented to 0, add the QP to the error list */ |
| 746 | if (qmap->left_to_poll > 0) { | 753 | if (qmap->left_to_poll > 0) { |
| 747 | qmap->left_to_poll--; | 754 | qmap->left_to_poll--; |
| @@ -805,13 +812,14 @@ static int generate_flush_cqes(struct ehca_qp *my_qp, struct ib_cq *cq, | |||
| 805 | else | 812 | else |
| 806 | qmap = &my_qp->rq_map; | 813 | qmap = &my_qp->rq_map; |
| 807 | 814 | ||
| 808 | qmap_entry = &qmap->map[qmap->tail]; | 815 | qmap_entry = &qmap->map[qmap->next_wqe_idx]; |
| 809 | 816 | ||
| 810 | while ((nr < num_entries) && (qmap_entry->reported == 0)) { | 817 | while ((nr < num_entries) && (qmap_entry->reported == 0)) { |
| 811 | /* generate flush CQE */ | 818 | /* generate flush CQE */ |
| 819 | |||
| 812 | memset(wc, 0, sizeof(*wc)); | 820 | memset(wc, 0, sizeof(*wc)); |
| 813 | 821 | ||
| 814 | offset = qmap->tail * ipz_queue->qe_size; | 822 | offset = qmap->next_wqe_idx * ipz_queue->qe_size; |
| 815 | wqe = (struct ehca_wqe *)ipz_qeit_calc(ipz_queue, offset); | 823 | wqe = (struct ehca_wqe *)ipz_qeit_calc(ipz_queue, offset); |
| 816 | if (!wqe) { | 824 | if (!wqe) { |
| 817 | ehca_err(cq->device, "Invalid wqe offset=%#lx on " | 825 | ehca_err(cq->device, "Invalid wqe offset=%#lx on " |
| @@ -850,11 +858,12 @@ static int generate_flush_cqes(struct ehca_qp *my_qp, struct ib_cq *cq, | |||
| 850 | 858 | ||
| 851 | wc->qp = &my_qp->ib_qp; | 859 | wc->qp = &my_qp->ib_qp; |
| 852 | 860 | ||
| 853 | /* mark as reported and advance tail pointer */ | 861 | /* mark as reported and advance next_wqe pointer */ |
| 854 | qmap_entry->reported = 1; | 862 | qmap_entry->reported = 1; |
| 855 | if (++qmap->tail == qmap->entries) | 863 | qmap->next_wqe_idx++; |
| 856 | qmap->tail = 0; | 864 | if (qmap->next_wqe_idx == qmap->entries) |
| 857 | qmap_entry = &qmap->map[qmap->tail]; | 865 | qmap->next_wqe_idx = 0; |
| 866 | qmap_entry = &qmap->map[qmap->next_wqe_idx]; | ||
| 858 | 867 | ||
| 859 | wc++; nr++; | 868 | wc++; nr++; |
| 860 | } | 869 | } |
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c index d0866a3636e2..18308494a195 100644 --- a/drivers/infiniband/hw/mlx4/cq.c +++ b/drivers/infiniband/hw/mlx4/cq.c | |||
| @@ -343,6 +343,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) | |||
| 343 | { | 343 | { |
| 344 | struct mlx4_ib_dev *dev = to_mdev(ibcq->device); | 344 | struct mlx4_ib_dev *dev = to_mdev(ibcq->device); |
| 345 | struct mlx4_ib_cq *cq = to_mcq(ibcq); | 345 | struct mlx4_ib_cq *cq = to_mcq(ibcq); |
| 346 | struct mlx4_mtt mtt; | ||
| 346 | int outst_cqe; | 347 | int outst_cqe; |
| 347 | int err; | 348 | int err; |
| 348 | 349 | ||
| @@ -376,10 +377,13 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) | |||
| 376 | goto out; | 377 | goto out; |
| 377 | } | 378 | } |
| 378 | 379 | ||
| 380 | mtt = cq->buf.mtt; | ||
| 381 | |||
| 379 | err = mlx4_cq_resize(dev->dev, &cq->mcq, entries, &cq->resize_buf->buf.mtt); | 382 | err = mlx4_cq_resize(dev->dev, &cq->mcq, entries, &cq->resize_buf->buf.mtt); |
| 380 | if (err) | 383 | if (err) |
| 381 | goto err_buf; | 384 | goto err_buf; |
| 382 | 385 | ||
| 386 | mlx4_mtt_cleanup(dev->dev, &mtt); | ||
| 383 | if (ibcq->uobject) { | 387 | if (ibcq->uobject) { |
| 384 | cq->buf = cq->resize_buf->buf; | 388 | cq->buf = cq->resize_buf->buf; |
| 385 | cq->ibcq.cqe = cq->resize_buf->cqe; | 389 | cq->ibcq.cqe = cq->resize_buf->cqe; |
| @@ -406,6 +410,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) | |||
| 406 | goto out; | 410 | goto out; |
| 407 | 411 | ||
| 408 | err_buf: | 412 | err_buf: |
| 413 | mlx4_mtt_cleanup(dev->dev, &cq->resize_buf->buf.mtt); | ||
| 409 | if (!ibcq->uobject) | 414 | if (!ibcq->uobject) |
| 410 | mlx4_ib_free_cq_buf(dev, &cq->resize_buf->buf, | 415 | mlx4_ib_free_cq_buf(dev, &cq->resize_buf->buf, |
| 411 | cq->resize_buf->cqe); | 416 | cq->resize_buf->cqe); |
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c index 6790e975a98c..bc4e40f3ede7 100644 --- a/drivers/input/ff-memless.c +++ b/drivers/input/ff-memless.c | |||
| @@ -397,8 +397,9 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value) | |||
| 397 | { | 397 | { |
| 398 | struct ml_device *ml = dev->ff->private; | 398 | struct ml_device *ml = dev->ff->private; |
| 399 | struct ml_effect_state *state = &ml->states[effect_id]; | 399 | struct ml_effect_state *state = &ml->states[effect_id]; |
| 400 | unsigned long flags; | ||
| 400 | 401 | ||
| 401 | spin_lock_bh(&ml->timer_lock); | 402 | spin_lock_irqsave(&ml->timer_lock, flags); |
| 402 | 403 | ||
| 403 | if (value > 0) { | 404 | if (value > 0) { |
| 404 | debug("initiated play"); | 405 | debug("initiated play"); |
| @@ -424,7 +425,7 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value) | |||
| 424 | ml_play_effects(ml); | 425 | ml_play_effects(ml); |
| 425 | } | 426 | } |
| 426 | 427 | ||
| 427 | spin_unlock_bh(&ml->timer_lock); | 428 | spin_unlock_irqrestore(&ml->timer_lock, flags); |
| 428 | 429 | ||
| 429 | return 0; | 430 | return 0; |
| 430 | } | 431 | } |
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 22016ca15351..379b7ff354ec 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
| @@ -824,7 +824,7 @@ static void atkbd_disconnect(struct serio *serio) | |||
| 824 | atkbd_disable(atkbd); | 824 | atkbd_disable(atkbd); |
| 825 | 825 | ||
| 826 | /* make sure we don't have a command in flight */ | 826 | /* make sure we don't have a command in flight */ |
| 827 | flush_scheduled_work(); | 827 | cancel_delayed_work_sync(&atkbd->event_work); |
| 828 | 828 | ||
| 829 | sysfs_remove_group(&serio->dev.kobj, &atkbd_attribute_group); | 829 | sysfs_remove_group(&serio->dev.kobj, &atkbd_attribute_group); |
| 830 | input_unregister_device(atkbd->dev); | 830 | input_unregister_device(atkbd->dev); |
| @@ -868,6 +868,22 @@ static void atkbd_hp_keymap_fixup(struct atkbd *atkbd) | |||
| 868 | } | 868 | } |
| 869 | 869 | ||
| 870 | /* | 870 | /* |
| 871 | * Inventec system with broken key release on volume keys | ||
| 872 | */ | ||
| 873 | static void atkbd_inventec_keymap_fixup(struct atkbd *atkbd) | ||
| 874 | { | ||
| 875 | const unsigned int forced_release_keys[] = { | ||
| 876 | 0xae, 0xb0, | ||
| 877 | }; | ||
| 878 | int i; | ||
| 879 | |||
| 880 | if (atkbd->set == 2) | ||
| 881 | for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++) | ||
| 882 | __set_bit(forced_release_keys[i], | ||
| 883 | atkbd->force_release_mask); | ||
| 884 | } | ||
| 885 | |||
| 886 | /* | ||
| 871 | * atkbd_set_keycode_table() initializes keyboard's keycode table | 887 | * atkbd_set_keycode_table() initializes keyboard's keycode table |
| 872 | * according to the selected scancode set | 888 | * according to the selected scancode set |
| 873 | */ | 889 | */ |
| @@ -1468,6 +1484,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = { | |||
| 1468 | .callback = atkbd_setup_fixup, | 1484 | .callback = atkbd_setup_fixup, |
| 1469 | .driver_data = atkbd_hp_keymap_fixup, | 1485 | .driver_data = atkbd_hp_keymap_fixup, |
| 1470 | }, | 1486 | }, |
| 1487 | { | ||
| 1488 | .ident = "Inventec Symphony", | ||
| 1489 | .matches = { | ||
| 1490 | DMI_MATCH(DMI_SYS_VENDOR, "INVENTEC"), | ||
| 1491 | DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"), | ||
| 1492 | }, | ||
| 1493 | .callback = atkbd_setup_fixup, | ||
| 1494 | .driver_data = atkbd_inventec_keymap_fixup, | ||
| 1495 | }, | ||
| 1471 | { } | 1496 | { } |
| 1472 | }; | 1497 | }; |
| 1473 | 1498 | ||
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c index bce160f4349b..86457feccfc4 100644 --- a/drivers/input/misc/cm109.c +++ b/drivers/input/misc/cm109.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | 42 | ||
| 43 | static char *phone = "kip1000"; | 43 | static char *phone = "kip1000"; |
| 44 | module_param(phone, charp, S_IRUSR); | 44 | module_param(phone, charp, S_IRUSR); |
| 45 | MODULE_PARM_DESC(phone, "Phone name {kip1000, gtalk, usbph01}"); | 45 | MODULE_PARM_DESC(phone, "Phone name {kip1000, gtalk, usbph01, atcom}"); |
| 46 | 46 | ||
| 47 | enum { | 47 | enum { |
| 48 | /* HID Registers */ | 48 | /* HID Registers */ |
| @@ -258,6 +258,37 @@ static unsigned short keymap_usbph01(int scancode) | |||
| 258 | } | 258 | } |
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | /* | ||
| 262 | * Keymap for ATCom AU-100 | ||
| 263 | * http://www.atcom.cn/En_products_AU100.html | ||
| 264 | * http://www.packetizer.com/products/au100/ | ||
| 265 | * http://www.voip-info.org/wiki/view/AU-100 | ||
| 266 | * | ||
| 267 | * Contributed by daniel@gimpelevich.san-francisco.ca.us | ||
| 268 | */ | ||
| 269 | static unsigned short keymap_atcom(int scancode) | ||
| 270 | { | ||
| 271 | switch (scancode) { /* phone key: */ | ||
| 272 | case 0x82: return KEY_NUMERIC_0; /* 0 */ | ||
| 273 | case 0x11: return KEY_NUMERIC_1; /* 1 */ | ||
| 274 | case 0x12: return KEY_NUMERIC_2; /* 2 */ | ||
| 275 | case 0x14: return KEY_NUMERIC_3; /* 3 */ | ||
| 276 | case 0x21: return KEY_NUMERIC_4; /* 4 */ | ||
| 277 | case 0x22: return KEY_NUMERIC_5; /* 5 */ | ||
| 278 | case 0x24: return KEY_NUMERIC_6; /* 6 */ | ||
| 279 | case 0x41: return KEY_NUMERIC_7; /* 7 */ | ||
| 280 | case 0x42: return KEY_NUMERIC_8; /* 8 */ | ||
| 281 | case 0x44: return KEY_NUMERIC_9; /* 9 */ | ||
| 282 | case 0x84: return KEY_NUMERIC_POUND; /* # */ | ||
| 283 | case 0x81: return KEY_NUMERIC_STAR; /* * */ | ||
| 284 | case 0x18: return KEY_ENTER; /* pickup */ | ||
| 285 | case 0x28: return KEY_ESC; /* hangup */ | ||
| 286 | case 0x48: return KEY_LEFT; /* left arrow */ | ||
| 287 | case 0x88: return KEY_RIGHT; /* right arrow */ | ||
| 288 | default: return special_keymap(scancode); | ||
| 289 | } | ||
| 290 | } | ||
| 291 | |||
| 261 | static unsigned short (*keymap)(int) = keymap_kip1000; | 292 | static unsigned short (*keymap)(int) = keymap_kip1000; |
| 262 | 293 | ||
| 263 | /* | 294 | /* |
| @@ -840,6 +871,10 @@ static int __init cm109_select_keymap(void) | |||
| 840 | keymap = keymap_usbph01; | 871 | keymap = keymap_usbph01; |
| 841 | printk(KERN_INFO KBUILD_MODNAME ": " | 872 | printk(KERN_INFO KBUILD_MODNAME ": " |
| 842 | "Keymap for Allied-Telesis Corega USBPH01 phone loaded\n"); | 873 | "Keymap for Allied-Telesis Corega USBPH01 phone loaded\n"); |
| 874 | } else if (!strcasecmp(phone, "atcom")) { | ||
| 875 | keymap = keymap_atcom; | ||
| 876 | printk(KERN_INFO KBUILD_MODNAME ": " | ||
| 877 | "Keymap for ATCom AU-100 phone loaded\n"); | ||
| 843 | } else { | 878 | } else { |
| 844 | printk(KERN_ERR KBUILD_MODNAME ": " | 879 | printk(KERN_ERR KBUILD_MODNAME ": " |
| 845 | "Unsupported phone: %s\n", phone); | 880 | "Unsupported phone: %s\n", phone); |
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c index e82d34201e97..88f04bf2ad6c 100644 --- a/drivers/input/mouse/hgpk.c +++ b/drivers/input/mouse/hgpk.c | |||
| @@ -125,7 +125,7 @@ static void hgpk_spewing_hack(struct psmouse *psmouse, | |||
| 125 | */ | 125 | */ |
| 126 | static int hgpk_validate_byte(unsigned char *packet) | 126 | static int hgpk_validate_byte(unsigned char *packet) |
| 127 | { | 127 | { |
| 128 | return (packet[0] & 0x0C) == 0x08; | 128 | return (packet[0] & 0x0C) != 0x08; |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | static void hgpk_process_packet(struct psmouse *psmouse) | 131 | static void hgpk_process_packet(struct psmouse *psmouse) |
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 27d70d326ff3..da3c3a5d2689 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig | |||
| @@ -79,7 +79,7 @@ config SERIO_PARKBD | |||
| 79 | 79 | ||
| 80 | config SERIO_RPCKBD | 80 | config SERIO_RPCKBD |
| 81 | tristate "Acorn RiscPC keyboard controller" | 81 | tristate "Acorn RiscPC keyboard controller" |
| 82 | depends on ARCH_ACORN || ARCH_CLPS7500 | 82 | depends on ARCH_ACORN |
| 83 | default y | 83 | default y |
| 84 | help | 84 | help |
| 85 | Say Y here if you have the Acorn RiscPC and want to use an AT | 85 | Say Y here if you have the Acorn RiscPC and want to use an AT |
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index eec375cd10e6..29e686388a2c 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
| @@ -337,6 +337,20 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = { | |||
| 337 | DMI_MATCH(DMI_PRODUCT_NAME, "2656"), | 337 | DMI_MATCH(DMI_PRODUCT_NAME, "2656"), |
| 338 | }, | 338 | }, |
| 339 | }, | 339 | }, |
| 340 | { | ||
| 341 | .ident = "Dell XPS M1530", | ||
| 342 | .matches = { | ||
| 343 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 344 | DMI_MATCH(DMI_PRODUCT_NAME, "XPS M1530"), | ||
| 345 | }, | ||
| 346 | }, | ||
| 347 | { | ||
| 348 | .ident = "Compal HEL80I", | ||
| 349 | .matches = { | ||
| 350 | DMI_MATCH(DMI_SYS_VENDOR, "COMPAL"), | ||
| 351 | DMI_MATCH(DMI_PRODUCT_NAME, "HEL80I"), | ||
| 352 | }, | ||
| 353 | }, | ||
| 340 | { } | 354 | { } |
| 341 | }; | 355 | }; |
| 342 | 356 | ||
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h index ca62ec639f8f..677680e9f54f 100644 --- a/drivers/input/tablet/wacom.h +++ b/drivers/input/tablet/wacom.h | |||
| @@ -66,6 +66,7 @@ | |||
| 66 | * - Support Intuos3 4x6 | 66 | * - Support Intuos3 4x6 |
| 67 | * v1.47 (pc) - Added support for Bamboo | 67 | * v1.47 (pc) - Added support for Bamboo |
| 68 | * v1.48 (pc) - Added support for Bamboo1, BambooFun, and Cintiq 12WX | 68 | * v1.48 (pc) - Added support for Bamboo1, BambooFun, and Cintiq 12WX |
| 69 | * v1.49 (pc) - Added support for USB Tablet PC (0x90, 0x93, and 0x9A) | ||
| 69 | */ | 70 | */ |
| 70 | 71 | ||
| 71 | /* | 72 | /* |
| @@ -86,7 +87,7 @@ | |||
| 86 | /* | 87 | /* |
| 87 | * Version Information | 88 | * Version Information |
| 88 | */ | 89 | */ |
| 89 | #define DRIVER_VERSION "v1.48" | 90 | #define DRIVER_VERSION "v1.49" |
| 90 | #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>" | 91 | #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>" |
| 91 | #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver" | 92 | #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver" |
| 92 | #define DRIVER_LICENSE "GPL" | 93 | #define DRIVER_LICENSE "GPL" |
| @@ -103,15 +104,15 @@ struct wacom { | |||
| 103 | struct usb_device *usbdev; | 104 | struct usb_device *usbdev; |
| 104 | struct usb_interface *intf; | 105 | struct usb_interface *intf; |
| 105 | struct urb *irq; | 106 | struct urb *irq; |
| 106 | struct wacom_wac * wacom_wac; | 107 | struct wacom_wac *wacom_wac; |
| 107 | struct mutex lock; | 108 | struct mutex lock; |
| 108 | unsigned int open:1; | 109 | unsigned int open:1; |
| 109 | char phys[32]; | 110 | char phys[32]; |
| 110 | }; | 111 | }; |
| 111 | 112 | ||
| 112 | struct wacom_combo { | 113 | struct wacom_combo { |
| 113 | struct wacom * wacom; | 114 | struct wacom *wacom; |
| 114 | struct urb * urb; | 115 | struct urb *urb; |
| 115 | }; | 116 | }; |
| 116 | 117 | ||
| 117 | extern int wacom_wac_irq(struct wacom_wac * wacom_wac, void * wcombo); | 118 | extern int wacom_wac_irq(struct wacom_wac * wacom_wac, void * wcombo); |
| @@ -132,7 +133,7 @@ extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wa | |||
| 132 | extern void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac); | 133 | extern void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac); |
| 133 | extern __u16 wacom_le16_to_cpu(unsigned char *data); | 134 | extern __u16 wacom_le16_to_cpu(unsigned char *data); |
| 134 | extern __u16 wacom_be16_to_cpu(unsigned char *data); | 135 | extern __u16 wacom_be16_to_cpu(unsigned char *data); |
| 135 | extern struct wacom_features * get_wacom_feature(const struct usb_device_id *id); | 136 | extern struct wacom_features *get_wacom_feature(const struct usb_device_id *id); |
| 136 | extern const struct usb_device_id * get_device_table(void); | 137 | extern const struct usb_device_id *get_device_table(void); |
| 137 | 138 | ||
| 138 | #endif | 139 | #endif |
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 09e227aa0d49..484496daa0f3 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
| @@ -14,8 +14,41 @@ | |||
| 14 | #include "wacom.h" | 14 | #include "wacom.h" |
| 15 | #include "wacom_wac.h" | 15 | #include "wacom_wac.h" |
| 16 | 16 | ||
| 17 | /* defines to get HID report descriptor */ | ||
| 18 | #define HID_DEVICET_HID (USB_TYPE_CLASS | 0x01) | ||
| 19 | #define HID_DEVICET_REPORT (USB_TYPE_CLASS | 0x02) | ||
| 20 | #define HID_USAGE_UNDEFINED 0x00 | ||
| 21 | #define HID_USAGE_PAGE 0x05 | ||
| 22 | #define HID_USAGE_PAGE_DIGITIZER 0x0d | ||
| 23 | #define HID_USAGE_PAGE_DESKTOP 0x01 | ||
| 24 | #define HID_USAGE 0x09 | ||
| 25 | #define HID_USAGE_X 0x30 | ||
| 26 | #define HID_USAGE_Y 0x31 | ||
| 27 | #define HID_USAGE_X_TILT 0x3d | ||
| 28 | #define HID_USAGE_Y_TILT 0x3e | ||
| 29 | #define HID_USAGE_FINGER 0x22 | ||
| 30 | #define HID_USAGE_STYLUS 0x20 | ||
| 31 | #define HID_COLLECTION 0xc0 | ||
| 32 | |||
| 33 | enum { | ||
| 34 | WCM_UNDEFINED = 0, | ||
| 35 | WCM_DESKTOP, | ||
| 36 | WCM_DIGITIZER, | ||
| 37 | }; | ||
| 38 | |||
| 39 | struct hid_descriptor { | ||
| 40 | struct usb_descriptor_header header; | ||
| 41 | __le16 bcdHID; | ||
| 42 | u8 bCountryCode; | ||
| 43 | u8 bNumDescriptors; | ||
| 44 | u8 bDescriptorType; | ||
| 45 | __le16 wDescriptorLength; | ||
| 46 | } __attribute__ ((packed)); | ||
| 47 | |||
| 48 | /* defines to get/set USB message */ | ||
| 17 | #define USB_REQ_GET_REPORT 0x01 | 49 | #define USB_REQ_GET_REPORT 0x01 |
| 18 | #define USB_REQ_SET_REPORT 0x09 | 50 | #define USB_REQ_SET_REPORT 0x09 |
| 51 | #define WAC_HID_FEATURE_REPORT 0x03 | ||
| 19 | 52 | ||
| 20 | static int usb_get_report(struct usb_interface *intf, unsigned char type, | 53 | static int usb_get_report(struct usb_interface *intf, unsigned char type, |
| 21 | unsigned char id, void *buf, int size) | 54 | unsigned char id, void *buf, int size) |
| @@ -80,25 +113,21 @@ static void wacom_sys_irq(struct urb *urb) | |||
| 80 | void wacom_report_key(void *wcombo, unsigned int key_type, int key_data) | 113 | void wacom_report_key(void *wcombo, unsigned int key_type, int key_data) |
| 81 | { | 114 | { |
| 82 | input_report_key(get_input_dev((struct wacom_combo *)wcombo), key_type, key_data); | 115 | input_report_key(get_input_dev((struct wacom_combo *)wcombo), key_type, key_data); |
| 83 | return; | ||
| 84 | } | 116 | } |
| 85 | 117 | ||
| 86 | void wacom_report_abs(void *wcombo, unsigned int abs_type, int abs_data) | 118 | void wacom_report_abs(void *wcombo, unsigned int abs_type, int abs_data) |
| 87 | { | 119 | { |
| 88 | input_report_abs(get_input_dev((struct wacom_combo *)wcombo), abs_type, abs_data); | 120 | input_report_abs(get_input_dev((struct wacom_combo *)wcombo), abs_type, abs_data); |
| 89 | return; | ||
| 90 | } | 121 | } |
| 91 | 122 | ||
| 92 | void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data) | 123 | void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data) |
| 93 | { | 124 | { |
| 94 | input_report_rel(get_input_dev((struct wacom_combo *)wcombo), rel_type, rel_data); | 125 | input_report_rel(get_input_dev((struct wacom_combo *)wcombo), rel_type, rel_data); |
| 95 | return; | ||
| 96 | } | 126 | } |
| 97 | 127 | ||
| 98 | void wacom_input_event(void *wcombo, unsigned int type, unsigned int code, int value) | 128 | void wacom_input_event(void *wcombo, unsigned int type, unsigned int code, int value) |
| 99 | { | 129 | { |
| 100 | input_event(get_input_dev((struct wacom_combo *)wcombo), type, code, value); | 130 | input_event(get_input_dev((struct wacom_combo *)wcombo), type, code, value); |
| 101 | return; | ||
| 102 | } | 131 | } |
| 103 | 132 | ||
| 104 | __u16 wacom_be16_to_cpu(unsigned char *data) | 133 | __u16 wacom_be16_to_cpu(unsigned char *data) |
| @@ -118,7 +147,6 @@ __u16 wacom_le16_to_cpu(unsigned char *data) | |||
| 118 | void wacom_input_sync(void *wcombo) | 147 | void wacom_input_sync(void *wcombo) |
| 119 | { | 148 | { |
| 120 | input_sync(get_input_dev((struct wacom_combo *)wcombo)); | 149 | input_sync(get_input_dev((struct wacom_combo *)wcombo)); |
| 121 | return; | ||
| 122 | } | 150 | } |
| 123 | 151 | ||
| 124 | static int wacom_open(struct input_dev *dev) | 152 | static int wacom_open(struct input_dev *dev) |
| @@ -160,7 +188,7 @@ static void wacom_close(struct input_dev *dev) | |||
| 160 | 188 | ||
| 161 | void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | 189 | void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac) |
| 162 | { | 190 | { |
| 163 | input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_1) | | 191 | input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_1) | |
| 164 | BIT_MASK(BTN_5); | 192 | BIT_MASK(BTN_5); |
| 165 | input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0); | 193 | input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0); |
| 166 | } | 194 | } |
| @@ -170,7 +198,7 @@ void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | |||
| 170 | input_dev->evbit[0] |= BIT_MASK(EV_MSC); | 198 | input_dev->evbit[0] |= BIT_MASK(EV_MSC); |
| 171 | input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL); | 199 | input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL); |
| 172 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER); | 200 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER); |
| 173 | input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) | | 201 | input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) | |
| 174 | BIT_MASK(BTN_4); | 202 | BIT_MASK(BTN_4); |
| 175 | } | 203 | } |
| 176 | 204 | ||
| @@ -178,7 +206,7 @@ void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | |||
| 178 | { | 206 | { |
| 179 | input_dev->evbit[0] |= BIT_MASK(EV_REL); | 207 | input_dev->evbit[0] |= BIT_MASK(EV_REL); |
| 180 | input_dev->relbit[0] |= BIT_MASK(REL_WHEEL); | 208 | input_dev->relbit[0] |= BIT_MASK(REL_WHEEL); |
| 181 | input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) | | 209 | input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_LEFT) | |
| 182 | BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE); | 210 | BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE); |
| 183 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) | | 211 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) | |
| 184 | BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_STYLUS2); | 212 | BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_STYLUS2); |
| @@ -188,7 +216,7 @@ void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | |||
| 188 | void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | 216 | void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac) |
| 189 | { | 217 | { |
| 190 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER); | 218 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER); |
| 191 | input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) | | 219 | input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) | |
| 192 | BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3); | 220 | BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3); |
| 193 | input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0); | 221 | input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0); |
| 194 | input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); | 222 | input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); |
| @@ -196,14 +224,14 @@ void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | |||
| 196 | 224 | ||
| 197 | void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | 225 | void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac) |
| 198 | { | 226 | { |
| 199 | input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_4) | | 227 | input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_4) | |
| 200 | BIT_MASK(BTN_5) | BIT_MASK(BTN_6) | BIT_MASK(BTN_7); | 228 | BIT_MASK(BTN_5) | BIT_MASK(BTN_6) | BIT_MASK(BTN_7); |
| 201 | input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0); | 229 | input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0); |
| 202 | } | 230 | } |
| 203 | 231 | ||
| 204 | void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | 232 | void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac) |
| 205 | { | 233 | { |
| 206 | input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9); | 234 | input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9); |
| 207 | } | 235 | } |
| 208 | 236 | ||
| 209 | void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | 237 | void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac) |
| @@ -211,7 +239,7 @@ void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | |||
| 211 | input_dev->evbit[0] |= BIT_MASK(EV_MSC) | BIT_MASK(EV_REL); | 239 | input_dev->evbit[0] |= BIT_MASK(EV_MSC) | BIT_MASK(EV_REL); |
| 212 | input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL); | 240 | input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL); |
| 213 | input_dev->relbit[0] |= BIT_MASK(REL_WHEEL); | 241 | input_dev->relbit[0] |= BIT_MASK(REL_WHEEL); |
| 214 | input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) | | 242 | input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_LEFT) | |
| 215 | BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE) | | 243 | BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE) | |
| 216 | BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA); | 244 | BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA); |
| 217 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) | | 245 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) | |
| @@ -228,8 +256,7 @@ void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | |||
| 228 | 256 | ||
| 229 | void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | 257 | void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac) |
| 230 | { | 258 | { |
| 231 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_STYLUS2) | | 259 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_STYLUS2); |
| 232 | BIT_MASK(BTN_TOOL_RUBBER); | ||
| 233 | } | 260 | } |
| 234 | 261 | ||
| 235 | void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | 262 | void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac) |
| @@ -237,15 +264,129 @@ void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac) | |||
| 237 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER); | 264 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER); |
| 238 | } | 265 | } |
| 239 | 266 | ||
| 267 | static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hid_desc, | ||
| 268 | struct wacom_wac *wacom_wac) | ||
| 269 | { | ||
| 270 | struct usb_device *dev = interface_to_usbdev(intf); | ||
| 271 | struct wacom_features *features = wacom_wac->features; | ||
| 272 | char limit = 0, result = 0; | ||
| 273 | int i = 0, usage = WCM_UNDEFINED, finger = 0, pen = 0; | ||
| 274 | unsigned char *report; | ||
| 275 | |||
| 276 | report = kzalloc(hid_desc->wDescriptorLength, GFP_KERNEL); | ||
| 277 | if (!report) | ||
| 278 | return -ENOMEM; | ||
| 279 | |||
| 280 | /* retrive report descriptors */ | ||
| 281 | do { | ||
| 282 | result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), | ||
| 283 | USB_REQ_GET_DESCRIPTOR, | ||
| 284 | USB_RECIP_INTERFACE | USB_DIR_IN, | ||
| 285 | HID_DEVICET_REPORT << 8, | ||
| 286 | intf->altsetting[0].desc.bInterfaceNumber, /* interface */ | ||
| 287 | report, | ||
| 288 | hid_desc->wDescriptorLength, | ||
| 289 | 5000); /* 5 secs */ | ||
| 290 | } while (result < 0 && limit++ < 5); | ||
| 291 | |||
| 292 | if (result < 0) | ||
| 293 | goto out; | ||
| 294 | |||
| 295 | for (i = 0; i < hid_desc->wDescriptorLength; i++) { | ||
| 296 | |||
| 297 | switch (report[i]) { | ||
| 298 | case HID_USAGE_PAGE: | ||
| 299 | switch (report[i + 1]) { | ||
| 300 | case HID_USAGE_PAGE_DIGITIZER: | ||
| 301 | usage = WCM_DIGITIZER; | ||
| 302 | i++; | ||
| 303 | break; | ||
| 304 | |||
| 305 | case HID_USAGE_PAGE_DESKTOP: | ||
| 306 | usage = WCM_DESKTOP; | ||
| 307 | i++; | ||
| 308 | break; | ||
| 309 | } | ||
| 310 | break; | ||
| 311 | |||
| 312 | case HID_USAGE: | ||
| 313 | switch (report[i + 1]) { | ||
| 314 | case HID_USAGE_X: | ||
| 315 | if (usage == WCM_DESKTOP) { | ||
| 316 | if (finger) { | ||
| 317 | features->touch_x_max = | ||
| 318 | features->touch_y_max = | ||
| 319 | wacom_le16_to_cpu(&report[i + 3]); | ||
| 320 | features->x_max = | ||
| 321 | wacom_le16_to_cpu(&report[i + 6]); | ||
| 322 | i += 7; | ||
| 323 | } else if (pen) { | ||
| 324 | features->x_max = | ||
| 325 | wacom_le16_to_cpu(&report[i + 3]); | ||
| 326 | i += 4; | ||
| 327 | } | ||
| 328 | } else if (usage == WCM_DIGITIZER) { | ||
| 329 | /* max pressure isn't reported | ||
| 330 | features->pressure_max = (unsigned short) | ||
| 331 | (report[i+4] << 8 | report[i + 3]); | ||
| 332 | */ | ||
| 333 | features->pressure_max = 255; | ||
| 334 | i += 4; | ||
| 335 | } | ||
| 336 | break; | ||
| 337 | |||
| 338 | case HID_USAGE_Y: | ||
| 339 | if (usage == WCM_DESKTOP) | ||
| 340 | features->y_max = | ||
| 341 | wacom_le16_to_cpu(&report[i + 3]); | ||
| 342 | i += 4; | ||
| 343 | break; | ||
| 344 | |||
| 345 | case HID_USAGE_FINGER: | ||
| 346 | finger = 1; | ||
| 347 | i++; | ||
| 348 | break; | ||
| 349 | |||
| 350 | case HID_USAGE_STYLUS: | ||
| 351 | pen = 1; | ||
| 352 | i++; | ||
| 353 | break; | ||
| 354 | |||
| 355 | case HID_USAGE_UNDEFINED: | ||
| 356 | if (usage == WCM_DESKTOP && finger) /* capacity */ | ||
| 357 | features->pressure_max = | ||
| 358 | wacom_le16_to_cpu(&report[i + 3]); | ||
| 359 | i += 4; | ||
| 360 | break; | ||
| 361 | } | ||
| 362 | break; | ||
| 363 | |||
| 364 | case HID_COLLECTION: | ||
| 365 | /* reset UsagePage ans Finger */ | ||
| 366 | finger = usage = 0; | ||
| 367 | break; | ||
| 368 | } | ||
| 369 | } | ||
| 370 | |||
| 371 | result = 0; | ||
| 372 | |||
| 373 | out: | ||
| 374 | kfree(report); | ||
| 375 | return result; | ||
| 376 | } | ||
| 377 | |||
| 240 | static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id) | 378 | static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id) |
| 241 | { | 379 | { |
| 242 | struct usb_device *dev = interface_to_usbdev(intf); | 380 | struct usb_device *dev = interface_to_usbdev(intf); |
| 381 | struct usb_host_interface *interface = intf->cur_altsetting; | ||
| 243 | struct usb_endpoint_descriptor *endpoint; | 382 | struct usb_endpoint_descriptor *endpoint; |
| 244 | struct wacom *wacom; | 383 | struct wacom *wacom; |
| 245 | struct wacom_wac *wacom_wac; | 384 | struct wacom_wac *wacom_wac; |
| 385 | struct wacom_features *features; | ||
| 246 | struct input_dev *input_dev; | 386 | struct input_dev *input_dev; |
| 247 | int error = -ENOMEM; | 387 | int error = -ENOMEM; |
| 248 | char rep_data[2], limit = 0; | 388 | char rep_data[2], limit = 0; |
| 389 | struct hid_descriptor *hid_desc; | ||
| 249 | 390 | ||
| 250 | wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL); | 391 | wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL); |
| 251 | wacom_wac = kzalloc(sizeof(struct wacom_wac), GFP_KERNEL); | 392 | wacom_wac = kzalloc(sizeof(struct wacom_wac), GFP_KERNEL); |
| @@ -268,8 +409,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
| 268 | usb_make_path(dev, wacom->phys, sizeof(wacom->phys)); | 409 | usb_make_path(dev, wacom->phys, sizeof(wacom->phys)); |
| 269 | strlcat(wacom->phys, "/input0", sizeof(wacom->phys)); | 410 | strlcat(wacom->phys, "/input0", sizeof(wacom->phys)); |
| 270 | 411 | ||
| 271 | wacom_wac->features = get_wacom_feature(id); | 412 | wacom_wac->features = features = get_wacom_feature(id); |
| 272 | BUG_ON(wacom_wac->features->pktlen > 10); | 413 | BUG_ON(features->pktlen > 10); |
| 273 | 414 | ||
| 274 | input_dev->name = wacom_wac->features->name; | 415 | input_dev->name = wacom_wac->features->name; |
| 275 | wacom->wacom_wac = wacom_wac; | 416 | wacom->wacom_wac = wacom_wac; |
| @@ -282,18 +423,37 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
| 282 | input_dev->open = wacom_open; | 423 | input_dev->open = wacom_open; |
| 283 | input_dev->close = wacom_close; | 424 | input_dev->close = wacom_close; |
| 284 | 425 | ||
| 426 | endpoint = &intf->cur_altsetting->endpoint[0].desc; | ||
| 427 | |||
| 428 | /* TabletPC need to retrieve the physical and logical maximum from report descriptor */ | ||
| 429 | if (wacom_wac->features->type == TABLETPC) { | ||
| 430 | if (usb_get_extra_descriptor(interface, HID_DEVICET_HID, &hid_desc)) { | ||
| 431 | if (usb_get_extra_descriptor(&interface->endpoint[0], | ||
| 432 | HID_DEVICET_REPORT, &hid_desc)) { | ||
| 433 | printk("wacom: can not retrive extra class descriptor\n"); | ||
| 434 | goto fail2; | ||
| 435 | } | ||
| 436 | } | ||
| 437 | error = wacom_parse_hid(intf, hid_desc, wacom_wac); | ||
| 438 | if (error) | ||
| 439 | goto fail2; | ||
| 440 | } | ||
| 441 | |||
| 285 | input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); | 442 | input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); |
| 286 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) | | 443 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) | |
| 287 | BIT_MASK(BTN_TOUCH) | BIT_MASK(BTN_STYLUS); | 444 | BIT_MASK(BTN_TOUCH) | BIT_MASK(BTN_STYLUS); |
| 288 | input_set_abs_params(input_dev, ABS_X, 0, wacom_wac->features->x_max, 4, 0); | 445 | input_set_abs_params(input_dev, ABS_X, 0, features->x_max, 4, 0); |
| 289 | input_set_abs_params(input_dev, ABS_Y, 0, wacom_wac->features->y_max, 4, 0); | 446 | input_set_abs_params(input_dev, ABS_Y, 0, features->y_max, 4, 0); |
| 290 | input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom_wac->features->pressure_max, 0, 0); | 447 | input_set_abs_params(input_dev, ABS_PRESSURE, 0, features->pressure_max, 0, 0); |
| 448 | if (features->type == TABLETPC) { | ||
| 449 | input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_DOUBLETAP); | ||
| 450 | input_set_abs_params(input_dev, ABS_RX, 0, features->touch_x_max, 4, 0); | ||
| 451 | input_set_abs_params(input_dev, ABS_RY, 0, features->touch_y_max, 4, 0); | ||
| 452 | } | ||
| 291 | input_dev->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC); | 453 | input_dev->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC); |
| 292 | 454 | ||
| 293 | wacom_init_input_dev(input_dev, wacom_wac); | 455 | wacom_init_input_dev(input_dev, wacom_wac); |
| 294 | 456 | ||
| 295 | endpoint = &intf->cur_altsetting->endpoint[0].desc; | ||
| 296 | |||
| 297 | usb_fill_int_urb(wacom->irq, dev, | 457 | usb_fill_int_urb(wacom->irq, dev, |
| 298 | usb_rcvintpipe(dev, endpoint->bEndpointAddress), | 458 | usb_rcvintpipe(dev, endpoint->bEndpointAddress), |
| 299 | wacom_wac->data, wacom_wac->features->pktlen, | 459 | wacom_wac->data, wacom_wac->features->pktlen, |
| @@ -305,13 +465,22 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
| 305 | if (error) | 465 | if (error) |
| 306 | goto fail3; | 466 | goto fail3; |
| 307 | 467 | ||
| 308 | /* Ask the tablet to report tablet data. Repeat until it succeeds */ | 468 | /* |
| 309 | do { | 469 | * Ask the tablet to report tablet data if it is not a Tablet PC. |
| 310 | rep_data[0] = 2; | 470 | * Repeat until it succeeds |
| 311 | rep_data[1] = 2; | 471 | */ |
| 312 | usb_set_report(intf, 3, 2, rep_data, 2); | 472 | if (wacom_wac->features->type != TABLETPC) { |
| 313 | usb_get_report(intf, 3, 2, rep_data, 2); | 473 | do { |
| 314 | } while (rep_data[1] != 2 && limit++ < 5); | 474 | rep_data[0] = 2; |
| 475 | rep_data[1] = 2; | ||
| 476 | error = usb_set_report(intf, WAC_HID_FEATURE_REPORT, | ||
| 477 | 2, rep_data, 2); | ||
| 478 | if (error >= 0) | ||
| 479 | error = usb_get_report(intf, | ||
| 480 | WAC_HID_FEATURE_REPORT, 2, | ||
| 481 | rep_data, 2); | ||
| 482 | } while ((error < 0 || rep_data[1] != 2) && limit++ < 5); | ||
| 483 | } | ||
| 315 | 484 | ||
| 316 | usb_set_intfdata(intf, wacom); | 485 | usb_set_intfdata(intf, wacom); |
| 317 | return 0; | 486 | return 0; |
| @@ -333,7 +502,8 @@ static void wacom_disconnect(struct usb_interface *intf) | |||
| 333 | usb_kill_urb(wacom->irq); | 502 | usb_kill_urb(wacom->irq); |
| 334 | input_unregister_device(wacom->dev); | 503 | input_unregister_device(wacom->dev); |
| 335 | usb_free_urb(wacom->irq); | 504 | usb_free_urb(wacom->irq); |
| 336 | usb_buffer_free(interface_to_usbdev(intf), 10, wacom->wacom_wac->data, wacom->data_dma); | 505 | usb_buffer_free(interface_to_usbdev(intf), 10, |
| 506 | wacom->wacom_wac->data, wacom->data_dma); | ||
| 337 | kfree(wacom->wacom_wac); | 507 | kfree(wacom->wacom_wac); |
| 338 | kfree(wacom); | 508 | kfree(wacom); |
| 339 | } | 509 | } |
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index bf3d9a8b2c1b..8dc8d1e59bea 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c | |||
| @@ -535,31 +535,147 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo) | |||
| 535 | return 1; | 535 | return 1; |
| 536 | } | 536 | } |
| 537 | 537 | ||
| 538 | int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo) | ||
| 539 | { | ||
| 540 | char *data = wacom->data; | ||
| 541 | int prox = 0, pressure; | ||
| 542 | static int stylusInProx, touchInProx = 1, touchOut; | ||
| 543 | struct urb *urb = ((struct wacom_combo *)wcombo)->urb; | ||
| 544 | |||
| 545 | dbg("wacom_tpc_irq: received report #%d", data[0]); | ||
| 546 | |||
| 547 | if (urb->actual_length == 5 || data[0] == 6) { /* Touch data */ | ||
| 548 | if (urb->actual_length == 5) { /* with touch */ | ||
| 549 | prox = data[0] & 0x03; | ||
| 550 | } else { /* with capacity */ | ||
| 551 | prox = data[1] & 0x03; | ||
| 552 | } | ||
| 553 | |||
| 554 | if (!stylusInProx) { /* stylus not in prox */ | ||
| 555 | if (prox) { | ||
| 556 | if (touchInProx) { | ||
| 557 | wacom->tool[1] = BTN_TOOL_DOUBLETAP; | ||
| 558 | wacom->id[0] = TOUCH_DEVICE_ID; | ||
| 559 | if (urb->actual_length != 5) { | ||
| 560 | wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[2])); | ||
| 561 | wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[4])); | ||
| 562 | wacom_report_abs(wcombo, ABS_PRESSURE, wacom_le16_to_cpu(&data[6])); | ||
| 563 | wacom_report_key(wcombo, BTN_TOUCH, wacom_le16_to_cpu(&data[6])); | ||
| 564 | } else { | ||
| 565 | wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[1])); | ||
| 566 | wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[3])); | ||
| 567 | wacom_report_key(wcombo, BTN_TOUCH, 1); | ||
| 568 | } | ||
| 569 | wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]); | ||
| 570 | wacom_report_key(wcombo, wacom->tool[1], prox & 0x01); | ||
| 571 | touchOut = 1; | ||
| 572 | return 1; | ||
| 573 | } | ||
| 574 | } else { | ||
| 575 | wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]); | ||
| 576 | wacom_report_key(wcombo, wacom->tool[1], prox & 0x01); | ||
| 577 | wacom_report_key(wcombo, BTN_TOUCH, 0); | ||
| 578 | touchOut = 0; | ||
| 579 | touchInProx = 1; | ||
| 580 | return 1; | ||
| 581 | } | ||
| 582 | } else if (touchOut || !prox) { /* force touch out-prox */ | ||
| 583 | wacom_report_abs(wcombo, ABS_MISC, TOUCH_DEVICE_ID); | ||
| 584 | wacom_report_key(wcombo, BTN_TOUCH, 0); | ||
| 585 | touchOut = 0; | ||
| 586 | touchInProx = 1; | ||
| 587 | return 1; | ||
| 588 | } | ||
| 589 | } else if (data[0] == 2) { /* Penabled */ | ||
| 590 | prox = data[1] & 0x20; | ||
| 591 | |||
| 592 | touchInProx = 0; | ||
| 593 | |||
| 594 | wacom->id[0] = ERASER_DEVICE_ID; | ||
| 595 | |||
| 596 | /* | ||
| 597 | * if going from out of proximity into proximity select between the eraser | ||
| 598 | * and the pen based on the state of the stylus2 button, choose eraser if | ||
| 599 | * pressed else choose pen. if not a proximity change from out to in, send | ||
| 600 | * an out of proximity for previous tool then a in for new tool. | ||
| 601 | */ | ||
| 602 | if (prox) { /* in prox */ | ||
| 603 | if (!wacom->tool[0]) { | ||
| 604 | /* Going into proximity select tool */ | ||
| 605 | wacom->tool[1] = (data[1] & 0x08) ? BTN_TOOL_RUBBER : BTN_TOOL_PEN; | ||
| 606 | if (wacom->tool[1] == BTN_TOOL_PEN) | ||
| 607 | wacom->id[0] = STYLUS_DEVICE_ID; | ||
| 608 | } else if (wacom->tool[1] == BTN_TOOL_RUBBER && !(data[1] & 0x08)) { | ||
| 609 | /* | ||
| 610 | * was entered with stylus2 pressed | ||
| 611 | * report out proximity for previous tool | ||
| 612 | */ | ||
| 613 | wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]); | ||
| 614 | wacom_report_key(wcombo, wacom->tool[1], 0); | ||
| 615 | wacom_input_sync(wcombo); | ||
| 616 | |||
| 617 | /* set new tool */ | ||
| 618 | wacom->tool[1] = BTN_TOOL_PEN; | ||
| 619 | wacom->id[0] = STYLUS_DEVICE_ID; | ||
| 620 | return 0; | ||
| 621 | } | ||
| 622 | if (wacom->tool[1] != BTN_TOOL_RUBBER) { | ||
| 623 | /* Unknown tool selected default to pen tool */ | ||
| 624 | wacom->tool[1] = BTN_TOOL_PEN; | ||
| 625 | wacom->id[0] = STYLUS_DEVICE_ID; | ||
| 626 | } | ||
| 627 | wacom_report_key(wcombo, BTN_STYLUS, data[1] & 0x02); | ||
| 628 | wacom_report_key(wcombo, BTN_STYLUS2, data[1] & 0x10); | ||
| 629 | wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[2])); | ||
| 630 | wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[4])); | ||
| 631 | pressure = ((data[7] & 0x01) << 8) | data[6]; | ||
| 632 | if (pressure < 0) | ||
| 633 | pressure = wacom->features->pressure_max + pressure + 1; | ||
| 634 | wacom_report_abs(wcombo, ABS_PRESSURE, pressure); | ||
| 635 | wacom_report_key(wcombo, BTN_TOUCH, pressure); | ||
| 636 | } else { | ||
| 637 | wacom_report_abs(wcombo, ABS_PRESSURE, 0); | ||
| 638 | wacom_report_key(wcombo, BTN_STYLUS, 0); | ||
| 639 | wacom_report_key(wcombo, BTN_STYLUS2, 0); | ||
| 640 | wacom_report_key(wcombo, BTN_TOUCH, 0); | ||
| 641 | } | ||
| 642 | wacom_report_key(wcombo, wacom->tool[1], prox); | ||
| 643 | wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]); | ||
| 644 | stylusInProx = prox; | ||
| 645 | wacom->tool[0] = prox; | ||
| 646 | return 1; | ||
| 647 | } | ||
| 648 | return 0; | ||
| 649 | } | ||
| 650 | |||
| 538 | int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo) | 651 | int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo) |
| 539 | { | 652 | { |
| 540 | switch (wacom_wac->features->type) { | 653 | switch (wacom_wac->features->type) { |
| 541 | case PENPARTNER: | 654 | case PENPARTNER: |
| 542 | return (wacom_penpartner_irq(wacom_wac, wcombo)); | 655 | return wacom_penpartner_irq(wacom_wac, wcombo); |
| 543 | break; | 656 | |
| 544 | case PL: | 657 | case PL: |
| 545 | return (wacom_pl_irq(wacom_wac, wcombo)); | 658 | return wacom_pl_irq(wacom_wac, wcombo); |
| 546 | break; | 659 | |
| 547 | case WACOM_G4: | 660 | case WACOM_G4: |
| 548 | case GRAPHIRE: | 661 | case GRAPHIRE: |
| 549 | case WACOM_MO: | 662 | case WACOM_MO: |
| 550 | return (wacom_graphire_irq(wacom_wac, wcombo)); | 663 | return wacom_graphire_irq(wacom_wac, wcombo); |
| 551 | break; | 664 | |
| 552 | case PTU: | 665 | case PTU: |
| 553 | return (wacom_ptu_irq(wacom_wac, wcombo)); | 666 | return wacom_ptu_irq(wacom_wac, wcombo); |
| 554 | break; | 667 | |
| 555 | case INTUOS: | 668 | case INTUOS: |
| 556 | case INTUOS3S: | 669 | case INTUOS3S: |
| 557 | case INTUOS3: | 670 | case INTUOS3: |
| 558 | case INTUOS3L: | 671 | case INTUOS3L: |
| 559 | case CINTIQ: | 672 | case CINTIQ: |
| 560 | case WACOM_BEE: | 673 | case WACOM_BEE: |
| 561 | return (wacom_intuos_irq(wacom_wac, wcombo)); | 674 | return wacom_intuos_irq(wacom_wac, wcombo); |
| 562 | break; | 675 | |
| 676 | case TABLETPC: | ||
| 677 | return wacom_tpc_irq(wacom_wac, wcombo); | ||
| 678 | |||
| 563 | default: | 679 | default: |
| 564 | return 0; | 680 | return 0; |
| 565 | } | 681 | } |
| @@ -586,13 +702,15 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w | |||
| 586 | /* fall through */ | 702 | /* fall through */ |
| 587 | case INTUOS3S: | 703 | case INTUOS3S: |
| 588 | input_dev_i3s(input_dev, wacom_wac); | 704 | input_dev_i3s(input_dev, wacom_wac); |
| 705 | /* fall through */ | ||
| 589 | case INTUOS: | 706 | case INTUOS: |
| 590 | input_dev_i(input_dev, wacom_wac); | 707 | input_dev_i(input_dev, wacom_wac); |
| 591 | break; | 708 | break; |
| 592 | case PL: | 709 | case PL: |
| 593 | case PTU: | 710 | case PTU: |
| 711 | case TABLETPC: | ||
| 594 | input_dev_pl(input_dev, wacom_wac); | 712 | input_dev_pl(input_dev, wacom_wac); |
| 595 | break; | 713 | /* fall through */ |
| 596 | case PENPARTNER: | 714 | case PENPARTNER: |
| 597 | input_dev_pt(input_dev, wacom_wac); | 715 | input_dev_pt(input_dev, wacom_wac); |
| 598 | break; | 716 | break; |
| @@ -611,6 +729,7 @@ static struct wacom_features wacom_features[] = { | |||
| 611 | { "Wacom Graphire4 6x8", 8, 16704, 12064, 511, 63, WACOM_G4 }, | 729 | { "Wacom Graphire4 6x8", 8, 16704, 12064, 511, 63, WACOM_G4 }, |
| 612 | { "Wacom BambooFun 4x5", 9, 14760, 9225, 511, 63, WACOM_MO }, | 730 | { "Wacom BambooFun 4x5", 9, 14760, 9225, 511, 63, WACOM_MO }, |
| 613 | { "Wacom BambooFun 6x8", 9, 21648, 13530, 511, 63, WACOM_MO }, | 731 | { "Wacom BambooFun 6x8", 9, 21648, 13530, 511, 63, WACOM_MO }, |
| 732 | { "Wacom Bamboo1 Medium",8, 16704, 12064, 511, 63, GRAPHIRE }, | ||
| 614 | { "Wacom Volito", 8, 5104, 3712, 511, 63, GRAPHIRE }, | 733 | { "Wacom Volito", 8, 5104, 3712, 511, 63, GRAPHIRE }, |
| 615 | { "Wacom PenStation2", 8, 3250, 2320, 255, 63, GRAPHIRE }, | 734 | { "Wacom PenStation2", 8, 3250, 2320, 255, 63, GRAPHIRE }, |
| 616 | { "Wacom Volito2 4x5", 8, 5104, 3712, 511, 63, GRAPHIRE }, | 735 | { "Wacom Volito2 4x5", 8, 5104, 3712, 511, 63, GRAPHIRE }, |
| @@ -650,6 +769,10 @@ static struct wacom_features wacom_features[] = { | |||
| 650 | { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ }, | 769 | { "Wacom Cintiq 21UX", 10, 87200, 65600, 1023, 63, CINTIQ }, |
| 651 | { "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, WACOM_BEE }, | 770 | { "Wacom Cintiq 20WSX", 10, 86680, 54180, 1023, 63, WACOM_BEE }, |
| 652 | { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, WACOM_BEE }, | 771 | { "Wacom Cintiq 12WX", 10, 53020, 33440, 1023, 63, WACOM_BEE }, |
| 772 | { "Wacom DTU1931", 8, 37832, 30305, 511, 0, PL }, | ||
| 773 | { "Wacom ISDv4 90", 8, 26202, 16325, 255, 0, TABLETPC }, | ||
| 774 | { "Wacom ISDv4 93", 8, 26202, 16325, 255, 0, TABLETPC }, | ||
| 775 | { "Wacom ISDv4 9A", 8, 26202, 16325, 255, 0, TABLETPC }, | ||
| 653 | { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS }, | 776 | { "Wacom Intuos2 6x8", 10, 20320, 16240, 1023, 31, INTUOS }, |
| 654 | { } | 777 | { } |
| 655 | }; | 778 | }; |
| @@ -665,6 +788,7 @@ static struct usb_device_id wacom_ids[] = { | |||
| 665 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x16) }, | 788 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x16) }, |
| 666 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x17) }, | 789 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x17) }, |
| 667 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x18) }, | 790 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x18) }, |
| 791 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x19) }, | ||
| 668 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) }, | 792 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) }, |
| 669 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x61) }, | 793 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x61) }, |
| 670 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x62) }, | 794 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x62) }, |
| @@ -704,18 +828,26 @@ static struct usb_device_id wacom_ids[] = { | |||
| 704 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) }, | 828 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) }, |
| 705 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) }, | 829 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC5) }, |
| 706 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) }, | 830 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) }, |
| 831 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC7) }, | ||
| 832 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x90) }, | ||
| 833 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x93) }, | ||
| 834 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x9A) }, | ||
| 707 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) }, | 835 | { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) }, |
| 708 | { } | 836 | { } |
| 709 | }; | 837 | }; |
| 710 | 838 | ||
| 711 | const struct usb_device_id * get_device_table(void) { | 839 | const struct usb_device_id *get_device_table(void) |
| 712 | const struct usb_device_id * id_table = wacom_ids; | 840 | { |
| 841 | const struct usb_device_id *id_table = wacom_ids; | ||
| 842 | |||
| 713 | return id_table; | 843 | return id_table; |
| 714 | } | 844 | } |
| 715 | 845 | ||
| 716 | struct wacom_features * get_wacom_feature(const struct usb_device_id * id) { | 846 | struct wacom_features * get_wacom_feature(const struct usb_device_id *id) |
| 847 | { | ||
| 717 | int index = id - wacom_ids; | 848 | int index = id - wacom_ids; |
| 718 | struct wacom_features *wf = &wacom_features[index]; | 849 | struct wacom_features *wf = &wacom_features[index]; |
| 850 | |||
| 719 | return wf; | 851 | return wf; |
| 720 | } | 852 | } |
| 721 | 853 | ||
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h index 3342bc05847d..f9c8b69673b7 100644 --- a/drivers/input/tablet/wacom_wac.h +++ b/drivers/input/tablet/wacom_wac.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #define WACOM_WAC_H | 10 | #define WACOM_WAC_H |
| 11 | 11 | ||
| 12 | #define STYLUS_DEVICE_ID 0x02 | 12 | #define STYLUS_DEVICE_ID 0x02 |
| 13 | #define TOUCH_DEVICE_ID 0x03 | ||
| 13 | #define CURSOR_DEVICE_ID 0x06 | 14 | #define CURSOR_DEVICE_ID 0x06 |
| 14 | #define ERASER_DEVICE_ID 0x0A | 15 | #define ERASER_DEVICE_ID 0x0A |
| 15 | #define PAD_DEVICE_ID 0x0F | 16 | #define PAD_DEVICE_ID 0x0F |
| @@ -27,6 +28,7 @@ enum { | |||
| 27 | CINTIQ, | 28 | CINTIQ, |
| 28 | WACOM_BEE, | 29 | WACOM_BEE, |
| 29 | WACOM_MO, | 30 | WACOM_MO, |
| 31 | TABLETPC, | ||
| 30 | MAX_TYPE | 32 | MAX_TYPE |
| 31 | }; | 33 | }; |
| 32 | 34 | ||
| @@ -38,6 +40,8 @@ struct wacom_features { | |||
| 38 | int pressure_max; | 40 | int pressure_max; |
| 39 | int distance_max; | 41 | int distance_max; |
| 40 | int type; | 42 | int type; |
| 43 | int touch_x_max; | ||
| 44 | int touch_y_max; | ||
| 41 | }; | 45 | }; |
| 42 | 46 | ||
| 43 | struct wacom_wac { | 47 | struct wacom_wac { |
diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c index d20689cdbd5d..8f38c5e55ce6 100644 --- a/drivers/input/touchscreen/elo.c +++ b/drivers/input/touchscreen/elo.c | |||
| @@ -262,7 +262,7 @@ static int elo_setup_10(struct elo *elo) | |||
| 262 | input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0); | 262 | input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0); |
| 263 | 263 | ||
| 264 | printk(KERN_INFO "elo: %sTouch touchscreen, fw: %02x.%02x, " | 264 | printk(KERN_INFO "elo: %sTouch touchscreen, fw: %02x.%02x, " |
| 265 | "features: %x02x, controller: 0x%02x\n", | 265 | "features: 0x%02x, controller: 0x%02x\n", |
| 266 | elo_types[(packet[1] -'0') & 0x03], | 266 | elo_types[(packet[1] -'0') & 0x03], |
| 267 | packet[5], packet[4], packet[3], packet[7]); | 267 | packet[5], packet[4], packet[3], packet[7]); |
| 268 | 268 | ||
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c index ba648750a8d9..1d11e2be9ef8 100644 --- a/drivers/input/touchscreen/mainstone-wm97xx.c +++ b/drivers/input/touchscreen/mainstone-wm97xx.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 32 | #include <linux/wm97xx.h> | 32 | #include <linux/wm97xx.h> |
| 33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
| 34 | #include <mach/pxa-regs.h> | 34 | #include <mach/regs-ac97.h> |
| 35 | 35 | ||
| 36 | #define VERSION "0.13" | 36 | #define VERSION "0.13" |
| 37 | 37 | ||
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c index 3ab6362f043c..928d2ed8865f 100644 --- a/drivers/input/xen-kbdfront.c +++ b/drivers/input/xen-kbdfront.c | |||
| @@ -323,7 +323,7 @@ static struct xenbus_device_id xenkbd_ids[] = { | |||
| 323 | { "" } | 323 | { "" } |
| 324 | }; | 324 | }; |
| 325 | 325 | ||
| 326 | static struct xenbus_driver xenkbd = { | 326 | static struct xenbus_driver xenkbd_driver = { |
| 327 | .name = "vkbd", | 327 | .name = "vkbd", |
| 328 | .owner = THIS_MODULE, | 328 | .owner = THIS_MODULE, |
| 329 | .ids = xenkbd_ids, | 329 | .ids = xenkbd_ids, |
| @@ -342,12 +342,12 @@ static int __init xenkbd_init(void) | |||
| 342 | if (xen_initial_domain()) | 342 | if (xen_initial_domain()) |
| 343 | return -ENODEV; | 343 | return -ENODEV; |
| 344 | 344 | ||
| 345 | return xenbus_register_frontend(&xenkbd); | 345 | return xenbus_register_frontend(&xenkbd_driver); |
| 346 | } | 346 | } |
| 347 | 347 | ||
| 348 | static void __exit xenkbd_cleanup(void) | 348 | static void __exit xenkbd_cleanup(void) |
| 349 | { | 349 | { |
| 350 | xenbus_unregister_driver(&xenkbd); | 350 | xenbus_unregister_driver(&xenkbd_driver); |
| 351 | } | 351 | } |
| 352 | 352 | ||
| 353 | module_init(xenkbd_init); | 353 | module_init(xenkbd_init); |
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 84d75a3f5d17..ded9d0baf607 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c | |||
| @@ -1213,7 +1213,7 @@ static void HiSax_shiftcards(int idx) | |||
| 1213 | memcpy(&cards[i], &cards[i + 1], sizeof(cards[i])); | 1213 | memcpy(&cards[i], &cards[i + 1], sizeof(cards[i])); |
| 1214 | } | 1214 | } |
| 1215 | 1215 | ||
| 1216 | static int HiSax_inithardware(int *busy_flag) | 1216 | static int __init HiSax_inithardware(int *busy_flag) |
| 1217 | { | 1217 | { |
| 1218 | int foundcards = 0; | 1218 | int foundcards = 0; |
| 1219 | int i = 0; | 1219 | int i = 0; |
| @@ -1542,7 +1542,9 @@ static void __exit HiSax_exit(void) | |||
| 1542 | printk(KERN_INFO "HiSax module removed\n"); | 1542 | printk(KERN_INFO "HiSax module removed\n"); |
| 1543 | } | 1543 | } |
| 1544 | 1544 | ||
| 1545 | int hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card) | 1545 | #ifdef CONFIG_HOTPLUG |
| 1546 | |||
| 1547 | int __devinit hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card) | ||
| 1546 | { | 1548 | { |
| 1547 | u_char ids[16]; | 1549 | u_char ids[16]; |
| 1548 | int ret = -1; | 1550 | int ret = -1; |
| @@ -1563,6 +1565,8 @@ error: | |||
| 1563 | } | 1565 | } |
| 1564 | 1566 | ||
| 1565 | EXPORT_SYMBOL(hisax_init_pcmcia); | 1567 | EXPORT_SYMBOL(hisax_init_pcmcia); |
| 1568 | #endif | ||
| 1569 | |||
| 1566 | EXPORT_SYMBOL(HiSax_closecard); | 1570 | EXPORT_SYMBOL(HiSax_closecard); |
| 1567 | 1571 | ||
| 1568 | #include "hisax_if.h" | 1572 | #include "hisax_if.h" |
| @@ -1580,6 +1584,11 @@ static void hisax_bc_close(struct BCState *bcs); | |||
| 1580 | static void hisax_bh(struct work_struct *work); | 1584 | static void hisax_bh(struct work_struct *work); |
| 1581 | static void EChannel_proc_rcv(struct hisax_d_if *d_if); | 1585 | static void EChannel_proc_rcv(struct hisax_d_if *d_if); |
| 1582 | 1586 | ||
| 1587 | static int hisax_setup_card_dynamic(struct IsdnCard *card) | ||
| 1588 | { | ||
| 1589 | return 2; | ||
| 1590 | } | ||
| 1591 | |||
| 1583 | int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[], | 1592 | int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[], |
| 1584 | char *name, int protocol) | 1593 | char *name, int protocol) |
| 1585 | { | 1594 | { |
| @@ -1599,7 +1608,8 @@ int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[], | |||
| 1599 | cards[i].protocol = protocol; | 1608 | cards[i].protocol = protocol; |
| 1600 | sprintf(id, "%s%d", name, i); | 1609 | sprintf(id, "%s%d", name, i); |
| 1601 | nrcards++; | 1610 | nrcards++; |
| 1602 | retval = checkcard(i, id, NULL, hisax_d_if->owner, hisax_cs_setup_card); | 1611 | retval = checkcard(i, id, NULL, hisax_d_if->owner, |
| 1612 | hisax_setup_card_dynamic); | ||
| 1603 | if (retval == 0) { // yuck | 1613 | if (retval == 0) { // yuck |
| 1604 | cards[i].typ = 0; | 1614 | cards[i].typ = 0; |
| 1605 | nrcards--; | 1615 | nrcards--; |
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index 2c21d4f25cc8..a98ab72adf95 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c | |||
| @@ -288,7 +288,7 @@ static void __devexit rackmeter_stop_cpu_sniffer(struct rackmeter *rm) | |||
| 288 | cancel_rearming_delayed_work(&rm->cpu[1].sniffer); | 288 | cancel_rearming_delayed_work(&rm->cpu[1].sniffer); |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | static int rackmeter_setup(struct rackmeter *rm) | 291 | static int __devinit rackmeter_setup(struct rackmeter *rm) |
| 292 | { | 292 | { |
| 293 | pr_debug("rackmeter: setting up i2s..\n"); | 293 | pr_debug("rackmeter: setting up i2s..\n"); |
| 294 | rackmeter_setup_i2s(rm); | 294 | rackmeter_setup_i2s(rm); |
| @@ -582,12 +582,12 @@ static struct of_device_id rackmeter_match[] = { | |||
| 582 | { } | 582 | { } |
| 583 | }; | 583 | }; |
| 584 | 584 | ||
| 585 | static struct macio_driver rackmeter_drv = { | 585 | static struct macio_driver rackmeter_driver = { |
| 586 | .name = "rackmeter", | 586 | .name = "rackmeter", |
| 587 | .owner = THIS_MODULE, | 587 | .owner = THIS_MODULE, |
| 588 | .match_table = rackmeter_match, | 588 | .match_table = rackmeter_match, |
| 589 | .probe = rackmeter_probe, | 589 | .probe = rackmeter_probe, |
| 590 | .remove = rackmeter_remove, | 590 | .remove = __devexit_p(rackmeter_remove), |
| 591 | .shutdown = rackmeter_shutdown, | 591 | .shutdown = rackmeter_shutdown, |
| 592 | }; | 592 | }; |
| 593 | 593 | ||
| @@ -596,14 +596,14 @@ static int __init rackmeter_init(void) | |||
| 596 | { | 596 | { |
| 597 | pr_debug("rackmeter_init()\n"); | 597 | pr_debug("rackmeter_init()\n"); |
| 598 | 598 | ||
| 599 | return macio_register_driver(&rackmeter_drv); | 599 | return macio_register_driver(&rackmeter_driver); |
| 600 | } | 600 | } |
| 601 | 601 | ||
| 602 | static void __exit rackmeter_exit(void) | 602 | static void __exit rackmeter_exit(void) |
| 603 | { | 603 | { |
| 604 | pr_debug("rackmeter_exit()\n"); | 604 | pr_debug("rackmeter_exit()\n"); |
| 605 | 605 | ||
| 606 | macio_unregister_driver(&rackmeter_drv); | 606 | macio_unregister_driver(&rackmeter_driver); |
| 607 | } | 607 | } |
| 608 | 608 | ||
| 609 | module_init(rackmeter_init); | 609 | module_init(rackmeter_init); |
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index 14e627ef6465..c1d92f838ca8 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
| @@ -376,7 +376,7 @@ static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb) | |||
| 376 | pci_free_consistent(dm1105dvb->pdev, 6*DM1105_DMA_BYTES, dm1105dvb->ts_buf, dm1105dvb->dma_addr); | 376 | pci_free_consistent(dm1105dvb->pdev, 6*DM1105_DMA_BYTES, dm1105dvb->ts_buf, dm1105dvb->dma_addr); |
| 377 | } | 377 | } |
| 378 | 378 | ||
| 379 | static void __devinit dm1105dvb_enable_irqs(struct dm1105dvb *dm1105dvb) | 379 | static void dm1105dvb_enable_irqs(struct dm1105dvb *dm1105dvb) |
| 380 | { | 380 | { |
| 381 | outb(INTMAK_ALLMASK, dm_io_mem(DM1105_INTMAK)); | 381 | outb(INTMAK_ALLMASK, dm_io_mem(DM1105_INTMAK)); |
| 382 | outb(1, dm_io_mem(DM1105_CR)); | 382 | outb(1, dm_io_mem(DM1105_CR)); |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index 8557bf12cfb4..7a421e9dba5a 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c | |||
| @@ -585,6 +585,8 @@ restart: | |||
| 585 | if (fe->ops.set_voltage) | 585 | if (fe->ops.set_voltage) |
| 586 | fe->ops.set_voltage(fe, SEC_VOLTAGE_OFF); | 586 | fe->ops.set_voltage(fe, SEC_VOLTAGE_OFF); |
| 587 | if (fe->ops.tuner_ops.sleep) { | 587 | if (fe->ops.tuner_ops.sleep) { |
| 588 | if (fe->ops.i2c_gate_ctrl) | ||
| 589 | fe->ops.i2c_gate_ctrl(fe, 1); | ||
| 588 | fe->ops.tuner_ops.sleep(fe); | 590 | fe->ops.tuner_ops.sleep(fe); |
| 589 | if (fe->ops.i2c_gate_ctrl) | 591 | if (fe->ops.i2c_gate_ctrl) |
| 590 | fe->ops.i2c_gate_ctrl(fe, 0); | 592 | fe->ops.i2c_gate_ctrl(fe, 0); |
| @@ -934,7 +936,8 @@ void dtv_property_dump(struct dtv_property *tvp) | |||
| 934 | int is_legacy_delivery_system(fe_delivery_system_t s) | 936 | int is_legacy_delivery_system(fe_delivery_system_t s) |
| 935 | { | 937 | { |
| 936 | if((s == SYS_UNDEFINED) || (s == SYS_DVBC_ANNEX_AC) || | 938 | if((s == SYS_UNDEFINED) || (s == SYS_DVBC_ANNEX_AC) || |
| 937 | (s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS)) | 939 | (s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS) || |
| 940 | (s == SYS_ATSC)) | ||
| 938 | return 1; | 941 | return 1; |
| 939 | 942 | ||
| 940 | return 0; | 943 | return 0; |
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index 847d8fdd9ec4..e9ab0249d133 100644 --- a/drivers/media/dvb/dvb-usb/af9015.c +++ b/drivers/media/dvb/dvb-usb/af9015.c | |||
| @@ -681,12 +681,6 @@ static int af9015_download_firmware(struct usb_device *udev, | |||
| 681 | goto error; | 681 | goto error; |
| 682 | } | 682 | } |
| 683 | 683 | ||
| 684 | /* firmware is running, reconnect device in the usb bus */ | ||
| 685 | req.cmd = RECONNECT_USB; | ||
| 686 | ret = af9015_rw_udev(udev, &req); | ||
| 687 | if (ret) | ||
| 688 | err("reconnect failed: %d", ret); | ||
| 689 | |||
| 690 | error: | 684 | error: |
| 691 | return ret; | 685 | return ret; |
| 692 | } | 686 | } |
| @@ -1208,6 +1202,7 @@ static struct dvb_usb_device_properties af9015_properties[] = { | |||
| 1208 | .usb_ctrl = DEVICE_SPECIFIC, | 1202 | .usb_ctrl = DEVICE_SPECIFIC, |
| 1209 | .download_firmware = af9015_download_firmware, | 1203 | .download_firmware = af9015_download_firmware, |
| 1210 | .firmware = "dvb-usb-af9015.fw", | 1204 | .firmware = "dvb-usb-af9015.fw", |
| 1205 | .no_reconnect = 1, | ||
| 1211 | 1206 | ||
| 1212 | .size_of_priv = sizeof(struct af9015_state), \ | 1207 | .size_of_priv = sizeof(struct af9015_state), \ |
| 1213 | 1208 | ||
| @@ -1306,6 +1301,7 @@ static struct dvb_usb_device_properties af9015_properties[] = { | |||
| 1306 | .usb_ctrl = DEVICE_SPECIFIC, | 1301 | .usb_ctrl = DEVICE_SPECIFIC, |
| 1307 | .download_firmware = af9015_download_firmware, | 1302 | .download_firmware = af9015_download_firmware, |
| 1308 | .firmware = "dvb-usb-af9015.fw", | 1303 | .firmware = "dvb-usb-af9015.fw", |
| 1304 | .no_reconnect = 1, | ||
| 1309 | 1305 | ||
| 1310 | .size_of_priv = sizeof(struct af9015_state), \ | 1306 | .size_of_priv = sizeof(struct af9015_state), \ |
| 1311 | 1307 | ||
diff --git a/drivers/media/dvb/dvb-usb/dib0700.h b/drivers/media/dvb/dvb-usb/dib0700.h index 739193943c17..8b544fe79b0d 100644 --- a/drivers/media/dvb/dvb-usb/dib0700.h +++ b/drivers/media/dvb/dvb-usb/dib0700.h | |||
| @@ -22,7 +22,7 @@ extern int dvb_usb_dib0700_debug; | |||
| 22 | 22 | ||
| 23 | #define REQUEST_I2C_READ 0x2 | 23 | #define REQUEST_I2C_READ 0x2 |
| 24 | #define REQUEST_I2C_WRITE 0x3 | 24 | #define REQUEST_I2C_WRITE 0x3 |
| 25 | #define REQUEST_POLL_RC 0x4 | 25 | #define REQUEST_POLL_RC 0x4 /* deprecated in firmware v1.20 */ |
| 26 | #define REQUEST_JUMPRAM 0x8 | 26 | #define REQUEST_JUMPRAM 0x8 |
| 27 | #define REQUEST_SET_CLOCK 0xB | 27 | #define REQUEST_SET_CLOCK 0xB |
| 28 | #define REQUEST_SET_GPIO 0xC | 28 | #define REQUEST_SET_GPIO 0xC |
| @@ -40,11 +40,14 @@ struct dib0700_state { | |||
| 40 | u16 mt2060_if1[2]; | 40 | u16 mt2060_if1[2]; |
| 41 | u8 rc_toggle; | 41 | u8 rc_toggle; |
| 42 | u8 rc_counter; | 42 | u8 rc_counter; |
| 43 | u8 rc_func_version; | ||
| 43 | u8 is_dib7000pc; | 44 | u8 is_dib7000pc; |
| 44 | u8 fw_use_new_i2c_api; | 45 | u8 fw_use_new_i2c_api; |
| 45 | u8 disable_streaming_master_mode; | 46 | u8 disable_streaming_master_mode; |
| 46 | }; | 47 | }; |
| 47 | 48 | ||
| 49 | extern int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion, | ||
| 50 | u32 *romversion, u32 *ramversion, u32 *fwtype); | ||
| 48 | extern int dib0700_set_gpio(struct dvb_usb_device *, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val); | 51 | extern int dib0700_set_gpio(struct dvb_usb_device *, enum dib07x0_gpios gpio, u8 gpio_dir, u8 gpio_val); |
| 49 | extern int dib0700_ctrl_clock(struct dvb_usb_device *d, u32 clk_MHz, u8 clock_out_gp3); | 52 | extern int dib0700_ctrl_clock(struct dvb_usb_device *d, u32 clk_MHz, u8 clock_out_gp3); |
| 50 | extern int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen); | 53 | extern int dib0700_ctrl_rd(struct dvb_usb_device *d, u8 *tx, u8 txlen, u8 *rx, u8 rxlen); |
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c index dd53cee3896d..200b215f4d8b 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_core.c +++ b/drivers/media/dvb/dvb-usb/dib0700_core.c | |||
| @@ -19,6 +19,22 @@ MODULE_PARM_DESC(dvb_usb_dib0700_ir_proto, "set ir protocol (0=NEC, 1=RC5 (defau | |||
| 19 | 19 | ||
| 20 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); | 20 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); |
| 21 | 21 | ||
| 22 | |||
| 23 | int dib0700_get_version(struct dvb_usb_device *d, u32 *hwversion, | ||
| 24 | u32 *romversion, u32 *ramversion, u32 *fwtype) | ||
| 25 | { | ||
| 26 | u8 b[16]; | ||
| 27 | int ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), | ||
| 28 | REQUEST_GET_VERSION, | ||
| 29 | USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, | ||
| 30 | b, sizeof(b), USB_CTRL_GET_TIMEOUT); | ||
| 31 | *hwversion = (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]; | ||
| 32 | *romversion = (b[4] << 24) | (b[5] << 16) | (b[6] << 8) | b[7]; | ||
| 33 | *ramversion = (b[8] << 24) | (b[9] << 16) | (b[10] << 8) | b[11]; | ||
| 34 | *fwtype = (b[12] << 24) | (b[13] << 16) | (b[14] << 8) | b[15]; | ||
| 35 | return ret; | ||
| 36 | } | ||
| 37 | |||
| 22 | /* expecting rx buffer: request data[0] data[1] ... data[2] */ | 38 | /* expecting rx buffer: request data[0] data[1] ... data[2] */ |
| 23 | static int dib0700_ctrl_wr(struct dvb_usb_device *d, u8 *tx, u8 txlen) | 39 | static int dib0700_ctrl_wr(struct dvb_usb_device *d, u8 *tx, u8 txlen) |
| 24 | { | 40 | { |
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index 0cfccc24b190..f28d3ae59e04 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c | |||
| @@ -38,6 +38,7 @@ static struct mt2060_config bristol_mt2060_config[2] = { | |||
| 38 | } | 38 | } |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | |||
| 41 | static struct dibx000_agc_config bristol_dib3000p_mt2060_agc_config = { | 42 | static struct dibx000_agc_config bristol_dib3000p_mt2060_agc_config = { |
| 42 | .band_caps = BAND_VHF | BAND_UHF, | 43 | .band_caps = BAND_VHF | BAND_UHF, |
| 43 | .setup = (1 << 8) | (5 << 5) | (0 << 4) | (0 << 3) | (0 << 2) | (2 << 0), | 44 | .setup = (1 << 8) | (5 << 5) | (0 << 4) | (0 << 3) | (0 << 2) | (2 << 0), |
| @@ -451,8 +452,13 @@ static u8 rc_request[] = { REQUEST_POLL_RC, 0 }; | |||
| 451 | 452 | ||
| 452 | /* Number of keypresses to ignore before start repeating */ | 453 | /* Number of keypresses to ignore before start repeating */ |
| 453 | #define RC_REPEAT_DELAY 2 | 454 | #define RC_REPEAT_DELAY 2 |
| 455 | #define RC_REPEAT_DELAY_V1_20 5 | ||
| 454 | 456 | ||
| 455 | static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | 457 | |
| 458 | |||
| 459 | /* Used by firmware versions < 1.20 (deprecated) */ | ||
| 460 | static int dib0700_rc_query_legacy(struct dvb_usb_device *d, u32 *event, | ||
| 461 | int *state) | ||
| 456 | { | 462 | { |
| 457 | u8 key[4]; | 463 | u8 key[4]; |
| 458 | int i; | 464 | int i; |
| @@ -529,6 +535,137 @@ static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | |||
| 529 | return 0; | 535 | return 0; |
| 530 | } | 536 | } |
| 531 | 537 | ||
| 538 | /* This is the structure of the RC response packet starting in firmware 1.20 */ | ||
| 539 | struct dib0700_rc_response { | ||
| 540 | u8 report_id; | ||
| 541 | u8 data_state; | ||
| 542 | u8 system_msb; | ||
| 543 | u8 system_lsb; | ||
| 544 | u8 data; | ||
| 545 | u8 not_data; | ||
| 546 | }; | ||
| 547 | |||
| 548 | /* This supports the new IR response format for firmware v1.20 */ | ||
| 549 | static int dib0700_rc_query_v1_20(struct dvb_usb_device *d, u32 *event, | ||
| 550 | int *state) | ||
| 551 | { | ||
| 552 | struct dvb_usb_rc_key *keymap = d->props.rc_key_map; | ||
| 553 | struct dib0700_state *st = d->priv; | ||
| 554 | struct dib0700_rc_response poll_reply; | ||
| 555 | u8 buf[6]; | ||
| 556 | int i; | ||
| 557 | int status; | ||
| 558 | int actlen; | ||
| 559 | int found = 0; | ||
| 560 | |||
| 561 | /* Set initial results in case we exit the function early */ | ||
| 562 | *event = 0; | ||
| 563 | *state = REMOTE_NO_KEY_PRESSED; | ||
| 564 | |||
| 565 | /* Firmware v1.20 provides RC data via bulk endpoint 1 */ | ||
| 566 | status = usb_bulk_msg(d->udev, usb_rcvbulkpipe(d->udev, 1), buf, | ||
| 567 | sizeof(buf), &actlen, 50); | ||
| 568 | if (status < 0) { | ||
| 569 | /* No data available (meaning no key press) */ | ||
| 570 | return 0; | ||
| 571 | } | ||
| 572 | |||
| 573 | if (actlen != sizeof(buf)) { | ||
| 574 | /* We didn't get back the 6 byte message we expected */ | ||
| 575 | err("Unexpected RC response size [%d]", actlen); | ||
| 576 | return -1; | ||
| 577 | } | ||
| 578 | |||
| 579 | poll_reply.report_id = buf[0]; | ||
| 580 | poll_reply.data_state = buf[1]; | ||
| 581 | poll_reply.system_msb = buf[2]; | ||
| 582 | poll_reply.system_lsb = buf[3]; | ||
| 583 | poll_reply.data = buf[4]; | ||
| 584 | poll_reply.not_data = buf[5]; | ||
| 585 | |||
| 586 | /* | ||
| 587 | info("rid=%02x ds=%02x sm=%02x sl=%02x d=%02x nd=%02x\n", | ||
| 588 | poll_reply.report_id, poll_reply.data_state, | ||
| 589 | poll_reply.system_msb, poll_reply.system_lsb, | ||
| 590 | poll_reply.data, poll_reply.not_data); | ||
| 591 | */ | ||
| 592 | |||
| 593 | if ((poll_reply.data + poll_reply.not_data) != 0xff) { | ||
| 594 | /* Key failed integrity check */ | ||
| 595 | err("key failed integrity check: %02x %02x %02x %02x", | ||
| 596 | poll_reply.system_msb, poll_reply.system_lsb, | ||
| 597 | poll_reply.data, poll_reply.not_data); | ||
| 598 | return -1; | ||
| 599 | } | ||
| 600 | |||
| 601 | /* Find the key in the map */ | ||
| 602 | for (i = 0; i < d->props.rc_key_map_size; i++) { | ||
| 603 | if (keymap[i].custom == poll_reply.system_lsb && | ||
| 604 | keymap[i].data == poll_reply.data) { | ||
| 605 | *event = keymap[i].event; | ||
| 606 | found = 1; | ||
| 607 | break; | ||
| 608 | } | ||
| 609 | } | ||
| 610 | |||
| 611 | if (found == 0) { | ||
| 612 | err("Unknown remote controller key: %02x %02x %02x %02x", | ||
| 613 | poll_reply.system_msb, poll_reply.system_lsb, | ||
| 614 | poll_reply.data, poll_reply.not_data); | ||
| 615 | d->last_event = 0; | ||
| 616 | return 0; | ||
| 617 | } | ||
| 618 | |||
| 619 | if (poll_reply.data_state == 1) { | ||
| 620 | /* New key hit */ | ||
| 621 | st->rc_counter = 0; | ||
| 622 | *event = keymap[i].event; | ||
| 623 | *state = REMOTE_KEY_PRESSED; | ||
| 624 | d->last_event = keymap[i].event; | ||
| 625 | } else if (poll_reply.data_state == 2) { | ||
| 626 | /* Key repeated */ | ||
| 627 | st->rc_counter++; | ||
| 628 | |||
| 629 | /* prevents unwanted double hits */ | ||
| 630 | if (st->rc_counter > RC_REPEAT_DELAY_V1_20) { | ||
| 631 | *event = d->last_event; | ||
| 632 | *state = REMOTE_KEY_PRESSED; | ||
| 633 | st->rc_counter = RC_REPEAT_DELAY_V1_20; | ||
| 634 | } | ||
| 635 | } else { | ||
| 636 | err("Unknown data state [%d]", poll_reply.data_state); | ||
| 637 | } | ||
| 638 | |||
| 639 | return 0; | ||
| 640 | } | ||
| 641 | |||
| 642 | static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | ||
| 643 | { | ||
| 644 | struct dib0700_state *st = d->priv; | ||
| 645 | |||
| 646 | /* Because some people may have improperly named firmware files, | ||
| 647 | let's figure out whether to use the new firmware call or the legacy | ||
| 648 | call based on the firmware version embedded in the file */ | ||
| 649 | if (st->rc_func_version == 0) { | ||
| 650 | u32 hwver, romver, ramver, fwtype; | ||
| 651 | int ret = dib0700_get_version(d, &hwver, &romver, &ramver, | ||
| 652 | &fwtype); | ||
| 653 | if (ret < 0) { | ||
| 654 | err("Could not determine version info"); | ||
| 655 | return -1; | ||
| 656 | } | ||
| 657 | if (ramver < 0x10200) | ||
| 658 | st->rc_func_version = 1; | ||
| 659 | else | ||
| 660 | st->rc_func_version = 2; | ||
| 661 | } | ||
| 662 | |||
| 663 | if (st->rc_func_version == 2) | ||
| 664 | return dib0700_rc_query_v1_20(d, event, state); | ||
| 665 | else | ||
| 666 | return dib0700_rc_query_legacy(d, event, state); | ||
| 667 | } | ||
| 668 | |||
| 532 | static struct dvb_usb_rc_key dib0700_rc_keys[] = { | 669 | static struct dvb_usb_rc_key dib0700_rc_keys[] = { |
| 533 | /* Key codes for the tiny Pinnacle remote*/ | 670 | /* Key codes for the tiny Pinnacle remote*/ |
| 534 | { 0x07, 0x00, KEY_MUTE }, | 671 | { 0x07, 0x00, KEY_MUTE }, |
diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/dvb/dvb-usb/usb-urb.c index 397f51a7b2ad..da93b9e982c0 100644 --- a/drivers/media/dvb/dvb-usb/usb-urb.c +++ b/drivers/media/dvb/dvb-usb/usb-urb.c | |||
| @@ -135,7 +135,7 @@ stream->buf_list[stream->buf_num], (long long)stream->dma_addr[stream->buf_num]) | |||
| 135 | 135 | ||
| 136 | static int usb_bulk_urb_init(struct usb_data_stream *stream) | 136 | static int usb_bulk_urb_init(struct usb_data_stream *stream) |
| 137 | { | 137 | { |
| 138 | int i; | 138 | int i, j; |
| 139 | 139 | ||
| 140 | if ((i = usb_allocate_stream_buffers(stream,stream->props.count, | 140 | if ((i = usb_allocate_stream_buffers(stream,stream->props.count, |
| 141 | stream->props.u.bulk.buffersize)) < 0) | 141 | stream->props.u.bulk.buffersize)) < 0) |
| @@ -143,9 +143,13 @@ static int usb_bulk_urb_init(struct usb_data_stream *stream) | |||
| 143 | 143 | ||
| 144 | /* allocate the URBs */ | 144 | /* allocate the URBs */ |
| 145 | for (i = 0; i < stream->props.count; i++) { | 145 | for (i = 0; i < stream->props.count; i++) { |
| 146 | if ((stream->urb_list[i] = usb_alloc_urb(0,GFP_ATOMIC)) == NULL) | 146 | stream->urb_list[i] = usb_alloc_urb(0, GFP_ATOMIC); |
| 147 | if (!stream->urb_list[i]) { | ||
| 148 | deb_mem("not enough memory for urb_alloc_urb!.\n"); | ||
| 149 | for (j = 0; j < i; j++) | ||
| 150 | usb_free_urb(stream->urb_list[i]); | ||
| 147 | return -ENOMEM; | 151 | return -ENOMEM; |
| 148 | 152 | } | |
| 149 | usb_fill_bulk_urb( stream->urb_list[i], stream->udev, | 153 | usb_fill_bulk_urb( stream->urb_list[i], stream->udev, |
| 150 | usb_rcvbulkpipe(stream->udev,stream->props.endpoint), | 154 | usb_rcvbulkpipe(stream->udev,stream->props.endpoint), |
| 151 | stream->buf_list[i], | 155 | stream->buf_list[i], |
| @@ -170,9 +174,14 @@ static int usb_isoc_urb_init(struct usb_data_stream *stream) | |||
| 170 | for (i = 0; i < stream->props.count; i++) { | 174 | for (i = 0; i < stream->props.count; i++) { |
| 171 | struct urb *urb; | 175 | struct urb *urb; |
| 172 | int frame_offset = 0; | 176 | int frame_offset = 0; |
| 173 | if ((stream->urb_list[i] = | 177 | |
| 174 | usb_alloc_urb(stream->props.u.isoc.framesperurb,GFP_ATOMIC)) == NULL) | 178 | stream->urb_list[i] = usb_alloc_urb(stream->props.u.isoc.framesperurb, GFP_ATOMIC); |
| 179 | if (!stream->urb_list[i]) { | ||
| 180 | deb_mem("not enough memory for urb_alloc_urb!\n"); | ||
| 181 | for (j = 0; j < i; j++) | ||
| 182 | usb_free_urb(stream->urb_list[i]); | ||
| 175 | return -ENOMEM; | 183 | return -ENOMEM; |
| 184 | } | ||
| 176 | 185 | ||
| 177 | urb = stream->urb_list[i]; | 186 | urb = stream->urb_list[i]; |
| 178 | 187 | ||
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c index 6f9b77360440..e98d6caf2c23 100644 --- a/drivers/media/dvb/siano/sms-cards.c +++ b/drivers/media/dvb/siano/sms-cards.c | |||
| @@ -95,7 +95,7 @@ static struct sms_board sms_boards[] = { | |||
| 95 | [SMS1XXX_BOARD_HAUPPAUGE_WINDHAM] = { | 95 | [SMS1XXX_BOARD_HAUPPAUGE_WINDHAM] = { |
| 96 | .name = "Hauppauge WinTV MiniStick", | 96 | .name = "Hauppauge WinTV MiniStick", |
| 97 | .type = SMS_NOVA_B0, | 97 | .type = SMS_NOVA_B0, |
| 98 | .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-01.fw", | 98 | .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw", |
| 99 | }, | 99 | }, |
| 100 | }; | 100 | }; |
| 101 | 101 | ||
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index 66ab0c6e9783..4a3f2b8ea37d 100644 --- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | |||
| @@ -808,6 +808,12 @@ static int ttusb_alloc_iso_urbs(struct ttusb *ttusb) | |||
| 808 | ISO_BUF_COUNT, | 808 | ISO_BUF_COUNT, |
| 809 | &ttusb->iso_dma_handle); | 809 | &ttusb->iso_dma_handle); |
| 810 | 810 | ||
| 811 | if (!ttusb->iso_buffer) { | ||
| 812 | dprintk("%s: pci_alloc_consistent - not enough memory\n", | ||
| 813 | __func__); | ||
| 814 | return -ENOMEM; | ||
| 815 | } | ||
| 816 | |||
| 811 | memset(ttusb->iso_buffer, 0, | 817 | memset(ttusb->iso_buffer, 0, |
| 812 | ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT); | 818 | ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT); |
| 813 | 819 | ||
| @@ -1659,7 +1665,14 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
| 1659 | 1665 | ||
| 1660 | ttusb_setup_interfaces(ttusb); | 1666 | ttusb_setup_interfaces(ttusb); |
| 1661 | 1667 | ||
| 1662 | ttusb_alloc_iso_urbs(ttusb); | 1668 | result = ttusb_alloc_iso_urbs(ttusb); |
| 1669 | if (result < 0) { | ||
| 1670 | dprintk("%s: ttusb_alloc_iso_urbs - failed\n", __func__); | ||
| 1671 | mutex_unlock(&ttusb->semi2c); | ||
| 1672 | kfree(ttusb); | ||
| 1673 | return result; | ||
| 1674 | } | ||
| 1675 | |||
| 1663 | if (ttusb_init_controller(ttusb)) | 1676 | if (ttusb_init_controller(ttusb)) |
| 1664 | printk("ttusb_init_controller: error\n"); | 1677 | printk("ttusb_init_controller: error\n"); |
| 1665 | 1678 | ||
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c index ab33fec8a19f..0aa96df80fc2 100644 --- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c | |||
| @@ -1157,6 +1157,12 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec) | |||
| 1157 | ISO_BUF_COUNT), | 1157 | ISO_BUF_COUNT), |
| 1158 | &dec->iso_dma_handle); | 1158 | &dec->iso_dma_handle); |
| 1159 | 1159 | ||
| 1160 | if (!dec->iso_buffer) { | ||
| 1161 | dprintk("%s: pci_alloc_consistent - not enough memory\n", | ||
| 1162 | __func__); | ||
| 1163 | return -ENOMEM; | ||
| 1164 | } | ||
| 1165 | |||
| 1160 | memset(dec->iso_buffer, 0, | 1166 | memset(dec->iso_buffer, 0, |
| 1161 | ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF * ISO_BUF_COUNT)); | 1167 | ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF * ISO_BUF_COUNT)); |
| 1162 | 1168 | ||
| @@ -1254,6 +1260,7 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec) | |||
| 1254 | dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE, | 1260 | dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE, |
| 1255 | GFP_ATOMIC, &dec->irq_dma_handle); | 1261 | GFP_ATOMIC, &dec->irq_dma_handle); |
| 1256 | if(!dec->irq_buffer) { | 1262 | if(!dec->irq_buffer) { |
| 1263 | usb_free_urb(dec->irq_urb); | ||
| 1257 | return -ENOMEM; | 1264 | return -ENOMEM; |
| 1258 | } | 1265 | } |
| 1259 | usb_fill_int_urb(dec->irq_urb, dec->udev,dec->irq_pipe, | 1266 | usb_fill_int_urb(dec->irq_urb, dec->udev,dec->irq_pipe, |
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c index ac3292d7646c..7a8d49ef646e 100644 --- a/drivers/media/video/em28xx/em28xx-audio.c +++ b/drivers/media/video/em28xx/em28xx-audio.c | |||
| @@ -62,7 +62,7 @@ static int em28xx_isoc_audio_deinit(struct em28xx *dev) | |||
| 62 | 62 | ||
| 63 | dprintk("Stopping isoc\n"); | 63 | dprintk("Stopping isoc\n"); |
| 64 | for (i = 0; i < EM28XX_AUDIO_BUFS; i++) { | 64 | for (i = 0; i < EM28XX_AUDIO_BUFS; i++) { |
| 65 | usb_kill_urb(dev->adev->urb[i]); | 65 | usb_unlink_urb(dev->adev->urb[i]); |
| 66 | usb_free_urb(dev->adev->urb[i]); | 66 | usb_free_urb(dev->adev->urb[i]); |
| 67 | dev->adev->urb[i] = NULL; | 67 | dev->adev->urb[i] = NULL; |
| 68 | } | 68 | } |
| @@ -75,7 +75,6 @@ static void em28xx_audio_isocirq(struct urb *urb) | |||
| 75 | struct em28xx *dev = urb->context; | 75 | struct em28xx *dev = urb->context; |
| 76 | int i; | 76 | int i; |
| 77 | unsigned int oldptr; | 77 | unsigned int oldptr; |
| 78 | unsigned long flags; | ||
| 79 | int period_elapsed = 0; | 78 | int period_elapsed = 0; |
| 80 | int status; | 79 | int status; |
| 81 | unsigned char *cp; | 80 | unsigned char *cp; |
| @@ -96,9 +95,21 @@ static void em28xx_audio_isocirq(struct urb *urb) | |||
| 96 | if (!length) | 95 | if (!length) |
| 97 | continue; | 96 | continue; |
| 98 | 97 | ||
| 99 | spin_lock_irqsave(&dev->adev->slock, flags); | ||
| 100 | |||
| 101 | oldptr = dev->adev->hwptr_done_capture; | 98 | oldptr = dev->adev->hwptr_done_capture; |
| 99 | if (oldptr + length >= runtime->buffer_size) { | ||
| 100 | unsigned int cnt = | ||
| 101 | runtime->buffer_size - oldptr; | ||
| 102 | memcpy(runtime->dma_area + oldptr * stride, cp, | ||
| 103 | cnt * stride); | ||
| 104 | memcpy(runtime->dma_area, cp + cnt * stride, | ||
| 105 | length * stride - cnt * stride); | ||
| 106 | } else { | ||
| 107 | memcpy(runtime->dma_area + oldptr * stride, cp, | ||
| 108 | length * stride); | ||
| 109 | } | ||
| 110 | |||
| 111 | snd_pcm_stream_lock(substream); | ||
| 112 | |||
| 102 | dev->adev->hwptr_done_capture += length; | 113 | dev->adev->hwptr_done_capture += length; |
| 103 | if (dev->adev->hwptr_done_capture >= | 114 | if (dev->adev->hwptr_done_capture >= |
| 104 | runtime->buffer_size) | 115 | runtime->buffer_size) |
| @@ -113,19 +124,7 @@ static void em28xx_audio_isocirq(struct urb *urb) | |||
| 113 | period_elapsed = 1; | 124 | period_elapsed = 1; |
| 114 | } | 125 | } |
| 115 | 126 | ||
| 116 | spin_unlock_irqrestore(&dev->adev->slock, flags); | 127 | snd_pcm_stream_unlock(substream); |
| 117 | |||
| 118 | if (oldptr + length >= runtime->buffer_size) { | ||
| 119 | unsigned int cnt = | ||
| 120 | runtime->buffer_size - oldptr; | ||
| 121 | memcpy(runtime->dma_area + oldptr * stride, cp, | ||
| 122 | cnt * stride); | ||
| 123 | memcpy(runtime->dma_area, cp + cnt * stride, | ||
| 124 | length * stride - cnt * stride); | ||
| 125 | } else { | ||
| 126 | memcpy(runtime->dma_area + oldptr * stride, cp, | ||
| 127 | length * stride); | ||
| 128 | } | ||
| 129 | } | 128 | } |
| 130 | if (period_elapsed) | 129 | if (period_elapsed) |
| 131 | snd_pcm_period_elapsed(substream); | 130 | snd_pcm_period_elapsed(substream); |
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index 5d837c16ee22..15e2b525310d 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
| @@ -69,19 +69,33 @@ int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg, | |||
| 69 | int ret, byte; | 69 | int ret, byte; |
| 70 | 70 | ||
| 71 | if (dev->state & DEV_DISCONNECTED) | 71 | if (dev->state & DEV_DISCONNECTED) |
| 72 | return(-ENODEV); | 72 | return -ENODEV; |
| 73 | |||
| 74 | if (len > URB_MAX_CTRL_SIZE) | ||
| 75 | return -EINVAL; | ||
| 73 | 76 | ||
| 74 | em28xx_regdbg("req=%02x, reg=%02x ", req, reg); | 77 | em28xx_regdbg("req=%02x, reg=%02x ", req, reg); |
| 75 | 78 | ||
| 79 | mutex_lock(&dev->ctrl_urb_lock); | ||
| 76 | ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req, | 80 | ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req, |
| 77 | USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | 81 | USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
| 78 | 0x0000, reg, buf, len, HZ); | 82 | 0x0000, reg, dev->urb_buf, len, HZ); |
| 83 | if (ret < 0) { | ||
| 84 | if (reg_debug) | ||
| 85 | printk(" failed!\n"); | ||
| 86 | mutex_unlock(&dev->ctrl_urb_lock); | ||
| 87 | return ret; | ||
| 88 | } | ||
| 89 | |||
| 90 | if (len) | ||
| 91 | memcpy(buf, dev->urb_buf, len); | ||
| 92 | |||
| 93 | mutex_unlock(&dev->ctrl_urb_lock); | ||
| 79 | 94 | ||
| 80 | if (reg_debug) { | 95 | if (reg_debug) { |
| 81 | printk(ret < 0 ? " failed!\n" : "%02x values: ", ret); | 96 | printk("%02x values: ", ret); |
| 82 | for (byte = 0; byte < len; byte++) | 97 | for (byte = 0; byte < len; byte++) |
| 83 | printk(" %02x", (unsigned char)buf[byte]); | 98 | printk(" %02x", (unsigned char)buf[byte]); |
| 84 | |||
| 85 | printk("\n"); | 99 | printk("\n"); |
| 86 | } | 100 | } |
| 87 | 101 | ||
| @@ -102,16 +116,20 @@ int em28xx_read_reg_req(struct em28xx *dev, u8 req, u16 reg) | |||
| 102 | 116 | ||
| 103 | em28xx_regdbg("req=%02x, reg=%02x:", req, reg); | 117 | em28xx_regdbg("req=%02x, reg=%02x:", req, reg); |
| 104 | 118 | ||
| 119 | mutex_lock(&dev->ctrl_urb_lock); | ||
| 105 | ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req, | 120 | ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), req, |
| 106 | USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | 121 | USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
| 107 | 0x0000, reg, &val, 1, HZ); | 122 | 0x0000, reg, dev->urb_buf, 1, HZ); |
| 108 | 123 | val = dev->urb_buf[0]; | |
| 109 | if (reg_debug) | 124 | mutex_unlock(&dev->ctrl_urb_lock); |
| 110 | printk(ret < 0 ? " failed!\n" : | ||
| 111 | "%02x\n", (unsigned char) val); | ||
| 112 | 125 | ||
| 113 | if (ret < 0) | 126 | if (ret < 0) { |
| 127 | printk(" failed!\n"); | ||
| 114 | return ret; | 128 | return ret; |
| 129 | } | ||
| 130 | |||
| 131 | if (reg_debug) | ||
| 132 | printk("%02x\n", (unsigned char) val); | ||
| 115 | 133 | ||
| 116 | return val; | 134 | return val; |
| 117 | } | 135 | } |
| @@ -130,19 +148,13 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf, | |||
| 130 | { | 148 | { |
| 131 | int ret; | 149 | int ret; |
| 132 | 150 | ||
| 133 | /*usb_control_msg seems to expect a kmalloced buffer */ | ||
| 134 | unsigned char *bufs; | ||
| 135 | |||
| 136 | if (dev->state & DEV_DISCONNECTED) | 151 | if (dev->state & DEV_DISCONNECTED) |
| 137 | return -ENODEV; | 152 | return -ENODEV; |
| 138 | 153 | ||
| 139 | if (len < 1) | 154 | if ((len < 1) || (len > URB_MAX_CTRL_SIZE)) |
| 140 | return -EINVAL; | 155 | return -EINVAL; |
| 141 | 156 | ||
| 142 | bufs = kmalloc(len, GFP_KERNEL); | ||
| 143 | |||
| 144 | em28xx_regdbg("req=%02x reg=%02x:", req, reg); | 157 | em28xx_regdbg("req=%02x reg=%02x:", req, reg); |
| 145 | |||
| 146 | if (reg_debug) { | 158 | if (reg_debug) { |
| 147 | int i; | 159 | int i; |
| 148 | for (i = 0; i < len; ++i) | 160 | for (i = 0; i < len; ++i) |
| @@ -150,16 +162,16 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf, | |||
| 150 | printk("\n"); | 162 | printk("\n"); |
| 151 | } | 163 | } |
| 152 | 164 | ||
| 153 | if (!bufs) | 165 | mutex_lock(&dev->ctrl_urb_lock); |
| 154 | return -ENOMEM; | 166 | memcpy(dev->urb_buf, buf, len); |
| 155 | memcpy(bufs, buf, len); | ||
| 156 | ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), req, | 167 | ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), req, |
| 157 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | 168 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
| 158 | 0x0000, reg, bufs, len, HZ); | 169 | 0x0000, reg, dev->urb_buf, len, HZ); |
| 170 | mutex_unlock(&dev->ctrl_urb_lock); | ||
| 171 | |||
| 159 | if (dev->wait_after_write) | 172 | if (dev->wait_after_write) |
| 160 | msleep(dev->wait_after_write); | 173 | msleep(dev->wait_after_write); |
| 161 | 174 | ||
| 162 | kfree(bufs); | ||
| 163 | return ret; | 175 | return ret; |
| 164 | } | 176 | } |
| 165 | 177 | ||
| @@ -270,6 +282,8 @@ static int em28xx_set_audio_source(struct em28xx *dev) | |||
| 270 | break; | 282 | break; |
| 271 | case EM28XX_AMUX_LINE_IN: | 283 | case EM28XX_AMUX_LINE_IN: |
| 272 | input = EM28XX_AUDIO_SRC_LINE; | 284 | input = EM28XX_AUDIO_SRC_LINE; |
| 285 | video = disable; | ||
| 286 | line = enable; | ||
| 273 | break; | 287 | break; |
| 274 | case EM28XX_AMUX_AC97_VIDEO: | 288 | case EM28XX_AMUX_AC97_VIDEO: |
| 275 | input = EM28XX_AUDIO_SRC_LINE; | 289 | input = EM28XX_AUDIO_SRC_LINE; |
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index 3bab56b997fc..2360c61ddca9 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
| @@ -337,9 +337,9 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len) | |||
| 337 | /* Check if board has eeprom */ | 337 | /* Check if board has eeprom */ |
| 338 | err = i2c_master_recv(&dev->i2c_client, &buf, 0); | 338 | err = i2c_master_recv(&dev->i2c_client, &buf, 0); |
| 339 | if (err < 0) { | 339 | if (err < 0) { |
| 340 | em28xx_errdev("%s: i2c_master_recv failed! err [%d]\n", | 340 | em28xx_errdev("board has no eeprom\n"); |
| 341 | __func__, err); | 341 | memset(eedata, 0, len); |
| 342 | return err; | 342 | return -ENODEV; |
| 343 | } | 343 | } |
| 344 | 344 | ||
| 345 | buf = 0; | 345 | buf = 0; |
| @@ -609,14 +609,16 @@ int em28xx_i2c_register(struct em28xx *dev) | |||
| 609 | dev->i2c_client.adapter = &dev->i2c_adap; | 609 | dev->i2c_client.adapter = &dev->i2c_adap; |
| 610 | 610 | ||
| 611 | retval = em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata)); | 611 | retval = em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata)); |
| 612 | if (retval < 0) { | 612 | if ((retval < 0) && (retval != -ENODEV)) { |
| 613 | em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n", | 613 | em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n", |
| 614 | __func__, retval); | 614 | __func__, retval); |
| 615 | |||
| 615 | return retval; | 616 | return retval; |
| 616 | } | 617 | } |
| 617 | 618 | ||
| 618 | if (i2c_scan) | 619 | if (i2c_scan) |
| 619 | em28xx_do_i2c_scan(dev); | 620 | em28xx_do_i2c_scan(dev); |
| 621 | |||
| 620 | return 0; | 622 | return 0; |
| 621 | } | 623 | } |
| 622 | 624 | ||
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index a1ab2ef45578..610f535a257c 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
| @@ -73,6 +73,7 @@ MODULE_DESCRIPTION(DRIVER_DESC); | |||
| 73 | MODULE_LICENSE("GPL"); | 73 | MODULE_LICENSE("GPL"); |
| 74 | 74 | ||
| 75 | static LIST_HEAD(em28xx_devlist); | 75 | static LIST_HEAD(em28xx_devlist); |
| 76 | static DEFINE_MUTEX(em28xx_devlist_mutex); | ||
| 76 | 77 | ||
| 77 | static unsigned int card[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET }; | 78 | static unsigned int card[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET }; |
| 78 | static unsigned int video_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET }; | 79 | static unsigned int video_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = UNSET }; |
| @@ -1519,7 +1520,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp) | |||
| 1519 | struct em28xx_fh *fh; | 1520 | struct em28xx_fh *fh; |
| 1520 | enum v4l2_buf_type fh_type = 0; | 1521 | enum v4l2_buf_type fh_type = 0; |
| 1521 | 1522 | ||
| 1522 | lock_kernel(); | 1523 | mutex_lock(&em28xx_devlist_mutex); |
| 1523 | list_for_each_entry(h, &em28xx_devlist, devlist) { | 1524 | list_for_each_entry(h, &em28xx_devlist, devlist) { |
| 1524 | if (h->vdev->minor == minor) { | 1525 | if (h->vdev->minor == minor) { |
| 1525 | dev = h; | 1526 | dev = h; |
| @@ -1535,10 +1536,11 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp) | |||
| 1535 | dev = h; | 1536 | dev = h; |
| 1536 | } | 1537 | } |
| 1537 | } | 1538 | } |
| 1538 | if (NULL == dev) { | 1539 | mutex_unlock(&em28xx_devlist_mutex); |
| 1539 | unlock_kernel(); | 1540 | if (NULL == dev) |
| 1540 | return -ENODEV; | 1541 | return -ENODEV; |
| 1541 | } | 1542 | |
| 1543 | mutex_lock(&dev->lock); | ||
| 1542 | 1544 | ||
| 1543 | em28xx_videodbg("open minor=%d type=%s users=%d\n", | 1545 | em28xx_videodbg("open minor=%d type=%s users=%d\n", |
| 1544 | minor, v4l2_type_names[fh_type], dev->users); | 1546 | minor, v4l2_type_names[fh_type], dev->users); |
| @@ -1547,10 +1549,9 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp) | |||
| 1547 | fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL); | 1549 | fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL); |
| 1548 | if (!fh) { | 1550 | if (!fh) { |
| 1549 | em28xx_errdev("em28xx-video.c: Out of memory?!\n"); | 1551 | em28xx_errdev("em28xx-video.c: Out of memory?!\n"); |
| 1550 | unlock_kernel(); | 1552 | mutex_unlock(&dev->lock); |
| 1551 | return -ENOMEM; | 1553 | return -ENOMEM; |
| 1552 | } | 1554 | } |
| 1553 | mutex_lock(&dev->lock); | ||
| 1554 | fh->dev = dev; | 1555 | fh->dev = dev; |
| 1555 | fh->radio = radio; | 1556 | fh->radio = radio; |
| 1556 | fh->type = fh_type; | 1557 | fh->type = fh_type; |
| @@ -1584,7 +1585,6 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp) | |||
| 1584 | sizeof(struct em28xx_buffer), fh); | 1585 | sizeof(struct em28xx_buffer), fh); |
| 1585 | 1586 | ||
| 1586 | mutex_unlock(&dev->lock); | 1587 | mutex_unlock(&dev->lock); |
| 1587 | unlock_kernel(); | ||
| 1588 | 1588 | ||
| 1589 | return errCode; | 1589 | return errCode; |
| 1590 | } | 1590 | } |
| @@ -1871,6 +1871,7 @@ int em28xx_register_extension(struct em28xx_ops *ops) | |||
| 1871 | { | 1871 | { |
| 1872 | struct em28xx *dev = NULL; | 1872 | struct em28xx *dev = NULL; |
| 1873 | 1873 | ||
| 1874 | mutex_lock(&em28xx_devlist_mutex); | ||
| 1874 | mutex_lock(&em28xx_extension_devlist_lock); | 1875 | mutex_lock(&em28xx_extension_devlist_lock); |
| 1875 | list_add_tail(&ops->next, &em28xx_extension_devlist); | 1876 | list_add_tail(&ops->next, &em28xx_extension_devlist); |
| 1876 | list_for_each_entry(dev, &em28xx_devlist, devlist) { | 1877 | list_for_each_entry(dev, &em28xx_devlist, devlist) { |
| @@ -1879,6 +1880,7 @@ int em28xx_register_extension(struct em28xx_ops *ops) | |||
| 1879 | } | 1880 | } |
| 1880 | printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name); | 1881 | printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name); |
| 1881 | mutex_unlock(&em28xx_extension_devlist_lock); | 1882 | mutex_unlock(&em28xx_extension_devlist_lock); |
| 1883 | mutex_unlock(&em28xx_devlist_mutex); | ||
| 1882 | return 0; | 1884 | return 0; |
| 1883 | } | 1885 | } |
| 1884 | EXPORT_SYMBOL(em28xx_register_extension); | 1886 | EXPORT_SYMBOL(em28xx_register_extension); |
| @@ -1887,6 +1889,7 @@ void em28xx_unregister_extension(struct em28xx_ops *ops) | |||
| 1887 | { | 1889 | { |
| 1888 | struct em28xx *dev = NULL; | 1890 | struct em28xx *dev = NULL; |
| 1889 | 1891 | ||
| 1892 | mutex_lock(&em28xx_devlist_mutex); | ||
| 1890 | list_for_each_entry(dev, &em28xx_devlist, devlist) { | 1893 | list_for_each_entry(dev, &em28xx_devlist, devlist) { |
| 1891 | if (dev) | 1894 | if (dev) |
| 1892 | ops->fini(dev); | 1895 | ops->fini(dev); |
| @@ -1896,6 +1899,7 @@ void em28xx_unregister_extension(struct em28xx_ops *ops) | |||
| 1896 | printk(KERN_INFO "Em28xx: Removed (%s) extension\n", ops->name); | 1899 | printk(KERN_INFO "Em28xx: Removed (%s) extension\n", ops->name); |
| 1897 | list_del(&ops->next); | 1900 | list_del(&ops->next); |
| 1898 | mutex_unlock(&em28xx_extension_devlist_lock); | 1901 | mutex_unlock(&em28xx_extension_devlist_lock); |
| 1902 | mutex_unlock(&em28xx_devlist_mutex); | ||
| 1899 | } | 1903 | } |
| 1900 | EXPORT_SYMBOL(em28xx_unregister_extension); | 1904 | EXPORT_SYMBOL(em28xx_unregister_extension); |
| 1901 | 1905 | ||
| @@ -1921,6 +1925,60 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev, | |||
| 1921 | } | 1925 | } |
| 1922 | 1926 | ||
| 1923 | 1927 | ||
| 1928 | static int register_analog_devices(struct em28xx *dev) | ||
| 1929 | { | ||
| 1930 | int ret; | ||
| 1931 | |||
| 1932 | /* allocate and fill video video_device struct */ | ||
| 1933 | dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video"); | ||
| 1934 | if (!dev->vdev) { | ||
| 1935 | em28xx_errdev("cannot allocate video_device.\n"); | ||
| 1936 | return -ENODEV; | ||
| 1937 | } | ||
| 1938 | |||
| 1939 | /* register v4l2 video video_device */ | ||
| 1940 | ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER, | ||
| 1941 | video_nr[dev->devno]); | ||
| 1942 | if (ret) { | ||
| 1943 | em28xx_errdev("unable to register video device (error=%i).\n", | ||
| 1944 | ret); | ||
| 1945 | return ret; | ||
| 1946 | } | ||
| 1947 | |||
| 1948 | /* Allocate and fill vbi video_device struct */ | ||
| 1949 | dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi"); | ||
| 1950 | |||
| 1951 | /* register v4l2 vbi video_device */ | ||
| 1952 | ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI, | ||
| 1953 | vbi_nr[dev->devno]); | ||
| 1954 | if (ret < 0) { | ||
| 1955 | em28xx_errdev("unable to register vbi device\n"); | ||
| 1956 | return ret; | ||
| 1957 | } | ||
| 1958 | |||
| 1959 | if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) { | ||
| 1960 | dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, "radio"); | ||
| 1961 | if (!dev->radio_dev) { | ||
| 1962 | em28xx_errdev("cannot allocate video_device.\n"); | ||
| 1963 | return -ENODEV; | ||
| 1964 | } | ||
| 1965 | ret = video_register_device(dev->radio_dev, VFL_TYPE_RADIO, | ||
| 1966 | radio_nr[dev->devno]); | ||
| 1967 | if (ret < 0) { | ||
| 1968 | em28xx_errdev("can't register radio device\n"); | ||
| 1969 | return ret; | ||
| 1970 | } | ||
| 1971 | em28xx_info("Registered radio device as /dev/radio%d\n", | ||
| 1972 | dev->radio_dev->num); | ||
| 1973 | } | ||
| 1974 | |||
| 1975 | em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n", | ||
| 1976 | dev->vdev->num, dev->vbi_dev->num); | ||
| 1977 | |||
| 1978 | return 0; | ||
| 1979 | } | ||
| 1980 | |||
| 1981 | |||
| 1924 | /* | 1982 | /* |
| 1925 | * em28xx_init_dev() | 1983 | * em28xx_init_dev() |
| 1926 | * allocates and inits the device structs, registers i2c bus and v4l device | 1984 | * allocates and inits the device structs, registers i2c bus and v4l device |
| @@ -1936,6 +1994,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
| 1936 | 1994 | ||
| 1937 | dev->udev = udev; | 1995 | dev->udev = udev; |
| 1938 | mutex_init(&dev->lock); | 1996 | mutex_init(&dev->lock); |
| 1997 | mutex_init(&dev->ctrl_urb_lock); | ||
| 1939 | spin_lock_init(&dev->slock); | 1998 | spin_lock_init(&dev->slock); |
| 1940 | init_waitqueue_head(&dev->open); | 1999 | init_waitqueue_head(&dev->open); |
| 1941 | init_waitqueue_head(&dev->wait_frame); | 2000 | init_waitqueue_head(&dev->wait_frame); |
| @@ -1953,8 +2012,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
| 1953 | errCode = em28xx_config(dev); | 2012 | errCode = em28xx_config(dev); |
| 1954 | if (errCode) { | 2013 | if (errCode) { |
| 1955 | em28xx_errdev("error configuring device\n"); | 2014 | em28xx_errdev("error configuring device\n"); |
| 1956 | em28xx_devused &= ~(1<<dev->devno); | ||
| 1957 | kfree(dev); | ||
| 1958 | return -ENOMEM; | 2015 | return -ENOMEM; |
| 1959 | } | 2016 | } |
| 1960 | 2017 | ||
| @@ -2001,50 +2058,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
| 2001 | return errCode; | 2058 | return errCode; |
| 2002 | } | 2059 | } |
| 2003 | 2060 | ||
| 2004 | list_add_tail(&dev->devlist, &em28xx_devlist); | ||
| 2005 | |||
| 2006 | /* allocate and fill video video_device struct */ | ||
| 2007 | dev->vdev = em28xx_vdev_init(dev, &em28xx_video_template, "video"); | ||
| 2008 | if (NULL == dev->vdev) { | ||
| 2009 | em28xx_errdev("cannot allocate video_device.\n"); | ||
| 2010 | goto fail_unreg; | ||
| 2011 | } | ||
| 2012 | |||
| 2013 | /* register v4l2 video video_device */ | ||
| 2014 | retval = video_register_device(dev->vdev, VFL_TYPE_GRABBER, | ||
| 2015 | video_nr[dev->devno]); | ||
| 2016 | if (retval) { | ||
| 2017 | em28xx_errdev("unable to register video device (error=%i).\n", | ||
| 2018 | retval); | ||
| 2019 | goto fail_unreg; | ||
| 2020 | } | ||
| 2021 | |||
| 2022 | /* Allocate and fill vbi video_device struct */ | ||
| 2023 | dev->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template, "vbi"); | ||
| 2024 | /* register v4l2 vbi video_device */ | ||
| 2025 | if (video_register_device(dev->vbi_dev, VFL_TYPE_VBI, | ||
| 2026 | vbi_nr[dev->devno]) < 0) { | ||
| 2027 | em28xx_errdev("unable to register vbi device\n"); | ||
| 2028 | retval = -ENODEV; | ||
| 2029 | goto fail_unreg; | ||
| 2030 | } | ||
| 2031 | |||
| 2032 | if (em28xx_boards[dev->model].radio.type == EM28XX_RADIO) { | ||
| 2033 | dev->radio_dev = em28xx_vdev_init(dev, &em28xx_radio_template, "radio"); | ||
| 2034 | if (NULL == dev->radio_dev) { | ||
| 2035 | em28xx_errdev("cannot allocate video_device.\n"); | ||
| 2036 | goto fail_unreg; | ||
| 2037 | } | ||
| 2038 | retval = video_register_device(dev->radio_dev, VFL_TYPE_RADIO, | ||
| 2039 | radio_nr[dev->devno]); | ||
| 2040 | if (retval < 0) { | ||
| 2041 | em28xx_errdev("can't register radio device\n"); | ||
| 2042 | goto fail_unreg; | ||
| 2043 | } | ||
| 2044 | em28xx_info("Registered radio device as /dev/radio%d\n", | ||
| 2045 | dev->radio_dev->num); | ||
| 2046 | } | ||
| 2047 | |||
| 2048 | /* init video dma queues */ | 2061 | /* init video dma queues */ |
| 2049 | INIT_LIST_HEAD(&dev->vidq.active); | 2062 | INIT_LIST_HEAD(&dev->vidq.active); |
| 2050 | INIT_LIST_HEAD(&dev->vidq.queued); | 2063 | INIT_LIST_HEAD(&dev->vidq.queued); |
| @@ -2071,8 +2084,14 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
| 2071 | 2084 | ||
| 2072 | video_mux(dev, 0); | 2085 | video_mux(dev, 0); |
| 2073 | 2086 | ||
| 2074 | em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n", | 2087 | mutex_lock(&em28xx_devlist_mutex); |
| 2075 | dev->vdev->num, dev->vbi_dev->num); | 2088 | list_add_tail(&dev->devlist, &em28xx_devlist); |
| 2089 | retval = register_analog_devices(dev); | ||
| 2090 | if (retval < 0) { | ||
| 2091 | em28xx_release_resources(dev); | ||
| 2092 | mutex_unlock(&em28xx_devlist_mutex); | ||
| 2093 | goto fail_reg_devices; | ||
| 2094 | } | ||
| 2076 | 2095 | ||
| 2077 | mutex_lock(&em28xx_extension_devlist_lock); | 2096 | mutex_lock(&em28xx_extension_devlist_lock); |
| 2078 | if (!list_empty(&em28xx_extension_devlist)) { | 2097 | if (!list_empty(&em28xx_extension_devlist)) { |
| @@ -2082,13 +2101,12 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
| 2082 | } | 2101 | } |
| 2083 | } | 2102 | } |
| 2084 | mutex_unlock(&em28xx_extension_devlist_lock); | 2103 | mutex_unlock(&em28xx_extension_devlist_lock); |
| 2104 | mutex_unlock(&em28xx_devlist_mutex); | ||
| 2085 | 2105 | ||
| 2086 | return 0; | 2106 | return 0; |
| 2087 | 2107 | ||
| 2088 | fail_unreg: | 2108 | fail_reg_devices: |
| 2089 | em28xx_release_resources(dev); | ||
| 2090 | mutex_unlock(&dev->lock); | 2109 | mutex_unlock(&dev->lock); |
| 2091 | kfree(dev); | ||
| 2092 | return retval; | 2110 | return retval; |
| 2093 | } | 2111 | } |
| 2094 | 2112 | ||
| @@ -2231,8 +2249,12 @@ static int em28xx_usb_probe(struct usb_interface *interface, | |||
| 2231 | 2249 | ||
| 2232 | /* allocate device struct */ | 2250 | /* allocate device struct */ |
| 2233 | retval = em28xx_init_dev(&dev, udev, nr); | 2251 | retval = em28xx_init_dev(&dev, udev, nr); |
| 2234 | if (retval) | 2252 | if (retval) { |
| 2253 | em28xx_devused &= ~(1<<dev->devno); | ||
| 2254 | kfree(dev); | ||
| 2255 | |||
| 2235 | return retval; | 2256 | return retval; |
| 2257 | } | ||
| 2236 | 2258 | ||
| 2237 | em28xx_info("Found %s\n", em28xx_boards[dev->model].name); | 2259 | em28xx_info("Found %s\n", em28xx_boards[dev->model].name); |
| 2238 | 2260 | ||
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 82781178e0a3..5956e9b3062f 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
| @@ -102,6 +102,9 @@ | |||
| 102 | #define EM28XX_MIN_BUF 4 | 102 | #define EM28XX_MIN_BUF 4 |
| 103 | #define EM28XX_DEF_BUF 8 | 103 | #define EM28XX_DEF_BUF 8 |
| 104 | 104 | ||
| 105 | /*Limits the max URB message size */ | ||
| 106 | #define URB_MAX_CTRL_SIZE 80 | ||
| 107 | |||
| 105 | /* Params for validated field */ | 108 | /* Params for validated field */ |
| 106 | #define EM28XX_BOARD_NOT_VALIDATED 1 | 109 | #define EM28XX_BOARD_NOT_VALIDATED 1 |
| 107 | #define EM28XX_BOARD_VALIDATED 0 | 110 | #define EM28XX_BOARD_VALIDATED 0 |
| @@ -430,6 +433,7 @@ struct em28xx { | |||
| 430 | 433 | ||
| 431 | /* locks */ | 434 | /* locks */ |
| 432 | struct mutex lock; | 435 | struct mutex lock; |
| 436 | struct mutex ctrl_urb_lock; /* protects urb_buf */ | ||
| 433 | /* spinlock_t queue_lock; */ | 437 | /* spinlock_t queue_lock; */ |
| 434 | struct list_head inqueue, outqueue; | 438 | struct list_head inqueue, outqueue; |
| 435 | wait_queue_head_t open, wait_frame, wait_stream; | 439 | wait_queue_head_t open, wait_frame, wait_stream; |
| @@ -451,6 +455,8 @@ struct em28xx { | |||
| 451 | unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */ | 455 | unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */ |
| 452 | struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */ | 456 | struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */ |
| 453 | char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */ | 457 | char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */ |
| 458 | char urb_buf[URB_MAX_CTRL_SIZE]; /* urb control msg buffer */ | ||
| 459 | |||
| 454 | /* helper funcs that call usb_control_msg */ | 460 | /* helper funcs that call usb_control_msg */ |
| 455 | int (*em28xx_write_regs) (struct em28xx *dev, u16 reg, | 461 | int (*em28xx_write_regs) (struct em28xx *dev, u16 reg, |
| 456 | char *buf, int len); | 462 | char *buf, int len); |
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c index a9d51ba7c57c..de28354ea5ba 100644 --- a/drivers/media/video/gspca/conex.c +++ b/drivers/media/video/gspca/conex.c | |||
| @@ -846,10 +846,13 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
| 846 | return 0; | 846 | return 0; |
| 847 | } | 847 | } |
| 848 | 848 | ||
| 849 | /* called on streamoff with alt 0 and on disconnect */ | ||
| 849 | static void sd_stop0(struct gspca_dev *gspca_dev) | 850 | static void sd_stop0(struct gspca_dev *gspca_dev) |
| 850 | { | 851 | { |
| 851 | int retry = 50; | 852 | int retry = 50; |
| 852 | 853 | ||
| 854 | if (!gspca_dev->present) | ||
| 855 | return; | ||
| 853 | reg_w_val(gspca_dev, 0x0000, 0x00); | 856 | reg_w_val(gspca_dev, 0x0000, 0x00); |
| 854 | reg_r(gspca_dev, 0x0002, 1); | 857 | reg_r(gspca_dev, 0x0002, 1); |
| 855 | reg_w_val(gspca_dev, 0x0053, 0x00); | 858 | reg_w_val(gspca_dev, 0x0053, 0x00); |
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c index 65d3cbfe6b27..607942fd7970 100644 --- a/drivers/media/video/gspca/finepix.c +++ b/drivers/media/video/gspca/finepix.c | |||
| @@ -276,6 +276,12 @@ static void sd_stopN(struct gspca_dev *gspca_dev) | |||
| 276 | /* Stop the state machine */ | 276 | /* Stop the state machine */ |
| 277 | if (dev->state != FPIX_NOP) | 277 | if (dev->state != FPIX_NOP) |
| 278 | wait_for_completion(&dev->can_close); | 278 | wait_for_completion(&dev->can_close); |
| 279 | } | ||
| 280 | |||
| 281 | /* called on streamoff with alt 0 and disconnect */ | ||
| 282 | static void sd_stop0(struct gspca_dev *gspca_dev) | ||
| 283 | { | ||
| 284 | struct usb_fpix *dev = (struct usb_fpix *) gspca_dev; | ||
| 279 | 285 | ||
| 280 | usb_free_urb(dev->control_urb); | 286 | usb_free_urb(dev->control_urb); |
| 281 | dev->control_urb = NULL; | 287 | dev->control_urb = NULL; |
| @@ -385,6 +391,7 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
| 385 | error: | 391 | error: |
| 386 | /* Free the ressources */ | 392 | /* Free the ressources */ |
| 387 | sd_stopN(gspca_dev); | 393 | sd_stopN(gspca_dev); |
| 394 | sd_stop0(gspca_dev); | ||
| 388 | return ret; | 395 | return ret; |
| 389 | } | 396 | } |
| 390 | 397 | ||
| @@ -425,6 +432,7 @@ static const struct sd_desc sd_desc = { | |||
| 425 | .init = sd_init, | 432 | .init = sd_init, |
| 426 | .start = sd_start, | 433 | .start = sd_start, |
| 427 | .stopN = sd_stopN, | 434 | .stopN = sd_stopN, |
| 435 | .stop0 = sd_stop0, | ||
| 428 | }; | 436 | }; |
| 429 | 437 | ||
| 430 | /* -- device connect -- */ | 438 | /* -- device connect -- */ |
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index e48fbfc8ad05..748a87e82e44 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c | |||
| @@ -646,15 +646,14 @@ static void gspca_stream_off(struct gspca_dev *gspca_dev) | |||
| 646 | { | 646 | { |
| 647 | gspca_dev->streaming = 0; | 647 | gspca_dev->streaming = 0; |
| 648 | atomic_set(&gspca_dev->nevent, 0); | 648 | atomic_set(&gspca_dev->nevent, 0); |
| 649 | if (gspca_dev->present) { | 649 | if (gspca_dev->present |
| 650 | if (gspca_dev->sd_desc->stopN) | 650 | && gspca_dev->sd_desc->stopN) |
| 651 | gspca_dev->sd_desc->stopN(gspca_dev); | 651 | gspca_dev->sd_desc->stopN(gspca_dev); |
| 652 | destroy_urbs(gspca_dev); | 652 | destroy_urbs(gspca_dev); |
| 653 | gspca_set_alt0(gspca_dev); | 653 | gspca_set_alt0(gspca_dev); |
| 654 | if (gspca_dev->sd_desc->stop0) | 654 | if (gspca_dev->sd_desc->stop0) |
| 655 | gspca_dev->sd_desc->stop0(gspca_dev); | 655 | gspca_dev->sd_desc->stop0(gspca_dev); |
| 656 | PDEBUG(D_STREAM, "stream off OK"); | 656 | PDEBUG(D_STREAM, "stream off OK"); |
| 657 | } | ||
| 658 | } | 657 | } |
| 659 | 658 | ||
| 660 | static void gspca_set_default_mode(struct gspca_dev *gspca_dev) | 659 | static void gspca_set_default_mode(struct gspca_dev *gspca_dev) |
| @@ -863,7 +862,7 @@ static int dev_open(struct inode *inode, struct file *file) | |||
| 863 | int ret; | 862 | int ret; |
| 864 | 863 | ||
| 865 | PDEBUG(D_STREAM, "%s open", current->comm); | 864 | PDEBUG(D_STREAM, "%s open", current->comm); |
| 866 | gspca_dev = (struct gspca_dev *) video_devdata(file); | 865 | gspca_dev = video_drvdata(file); |
| 867 | if (mutex_lock_interruptible(&gspca_dev->queue_lock)) | 866 | if (mutex_lock_interruptible(&gspca_dev->queue_lock)) |
| 868 | return -ERESTARTSYS; | 867 | return -ERESTARTSYS; |
| 869 | if (!gspca_dev->present) { | 868 | if (!gspca_dev->present) { |
| @@ -875,6 +874,13 @@ static int dev_open(struct inode *inode, struct file *file) | |||
| 875 | ret = -EBUSY; | 874 | ret = -EBUSY; |
| 876 | goto out; | 875 | goto out; |
| 877 | } | 876 | } |
| 877 | |||
| 878 | /* protect the subdriver against rmmod */ | ||
| 879 | if (!try_module_get(gspca_dev->module)) { | ||
| 880 | ret = -ENODEV; | ||
| 881 | goto out; | ||
| 882 | } | ||
| 883 | |||
| 878 | gspca_dev->users++; | 884 | gspca_dev->users++; |
| 879 | 885 | ||
| 880 | /* one more user */ | 886 | /* one more user */ |
| @@ -884,10 +890,10 @@ static int dev_open(struct inode *inode, struct file *file) | |||
| 884 | #ifdef GSPCA_DEBUG | 890 | #ifdef GSPCA_DEBUG |
| 885 | /* activate the v4l2 debug */ | 891 | /* activate the v4l2 debug */ |
| 886 | if (gspca_debug & D_V4L2) | 892 | if (gspca_debug & D_V4L2) |
| 887 | gspca_dev->vdev.debug |= V4L2_DEBUG_IOCTL | 893 | gspca_dev->vdev->debug |= V4L2_DEBUG_IOCTL |
| 888 | | V4L2_DEBUG_IOCTL_ARG; | 894 | | V4L2_DEBUG_IOCTL_ARG; |
| 889 | else | 895 | else |
| 890 | gspca_dev->vdev.debug &= ~(V4L2_DEBUG_IOCTL | 896 | gspca_dev->vdev->debug &= ~(V4L2_DEBUG_IOCTL |
| 891 | | V4L2_DEBUG_IOCTL_ARG); | 897 | | V4L2_DEBUG_IOCTL_ARG); |
| 892 | #endif | 898 | #endif |
| 893 | ret = 0; | 899 | ret = 0; |
| @@ -921,6 +927,7 @@ static int dev_close(struct inode *inode, struct file *file) | |||
| 921 | gspca_dev->memory = GSPCA_MEMORY_NO; | 927 | gspca_dev->memory = GSPCA_MEMORY_NO; |
| 922 | } | 928 | } |
| 923 | file->private_data = NULL; | 929 | file->private_data = NULL; |
| 930 | module_put(gspca_dev->module); | ||
| 924 | mutex_unlock(&gspca_dev->queue_lock); | 931 | mutex_unlock(&gspca_dev->queue_lock); |
| 925 | 932 | ||
| 926 | PDEBUG(D_STREAM, "close done"); | 933 | PDEBUG(D_STREAM, "close done"); |
| @@ -1748,11 +1755,6 @@ out: | |||
| 1748 | return ret; | 1755 | return ret; |
| 1749 | } | 1756 | } |
| 1750 | 1757 | ||
| 1751 | static void dev_release(struct video_device *vfd) | ||
| 1752 | { | ||
| 1753 | /* nothing */ | ||
| 1754 | } | ||
| 1755 | |||
| 1756 | static struct file_operations dev_fops = { | 1758 | static struct file_operations dev_fops = { |
| 1757 | .owner = THIS_MODULE, | 1759 | .owner = THIS_MODULE, |
| 1758 | .open = dev_open, | 1760 | .open = dev_open, |
| @@ -1800,7 +1802,7 @@ static struct video_device gspca_template = { | |||
| 1800 | .name = "gspca main driver", | 1802 | .name = "gspca main driver", |
| 1801 | .fops = &dev_fops, | 1803 | .fops = &dev_fops, |
| 1802 | .ioctl_ops = &dev_ioctl_ops, | 1804 | .ioctl_ops = &dev_ioctl_ops, |
| 1803 | .release = dev_release, /* mandatory */ | 1805 | .release = video_device_release, |
| 1804 | .minor = -1, | 1806 | .minor = -1, |
| 1805 | }; | 1807 | }; |
| 1806 | 1808 | ||
| @@ -1869,17 +1871,18 @@ int gspca_dev_probe(struct usb_interface *intf, | |||
| 1869 | init_waitqueue_head(&gspca_dev->wq); | 1871 | init_waitqueue_head(&gspca_dev->wq); |
| 1870 | 1872 | ||
| 1871 | /* init video stuff */ | 1873 | /* init video stuff */ |
| 1872 | memcpy(&gspca_dev->vdev, &gspca_template, sizeof gspca_template); | 1874 | gspca_dev->vdev = video_device_alloc(); |
| 1873 | gspca_dev->vdev.parent = &dev->dev; | 1875 | memcpy(gspca_dev->vdev, &gspca_template, sizeof gspca_template); |
| 1874 | memcpy(&gspca_dev->fops, &dev_fops, sizeof gspca_dev->fops); | 1876 | gspca_dev->vdev->parent = &dev->dev; |
| 1875 | gspca_dev->vdev.fops = &gspca_dev->fops; | 1877 | gspca_dev->module = module; |
| 1876 | gspca_dev->fops.owner = module; /* module protection */ | ||
| 1877 | gspca_dev->present = 1; | 1878 | gspca_dev->present = 1; |
| 1878 | ret = video_register_device(&gspca_dev->vdev, | 1879 | video_set_drvdata(gspca_dev->vdev, gspca_dev); |
| 1880 | ret = video_register_device(gspca_dev->vdev, | ||
| 1879 | VFL_TYPE_GRABBER, | 1881 | VFL_TYPE_GRABBER, |
| 1880 | video_nr); | 1882 | video_nr); |
| 1881 | if (ret < 0) { | 1883 | if (ret < 0) { |
| 1882 | err("video_register_device err %d", ret); | 1884 | err("video_register_device err %d", ret); |
| 1885 | video_device_release(gspca_dev->vdev); | ||
| 1883 | goto out; | 1886 | goto out; |
| 1884 | } | 1887 | } |
| 1885 | 1888 | ||
| @@ -1887,7 +1890,8 @@ int gspca_dev_probe(struct usb_interface *intf, | |||
| 1887 | PDEBUG(D_PROBE, "probe ok"); | 1890 | PDEBUG(D_PROBE, "probe ok"); |
| 1888 | return 0; | 1891 | return 0; |
| 1889 | out: | 1892 | out: |
| 1890 | kref_put(&gspca_dev->kref, gspca_delete); | 1893 | kfree(gspca_dev->usb_buf); |
| 1894 | kfree(gspca_dev); | ||
| 1891 | return ret; | 1895 | return ret; |
| 1892 | } | 1896 | } |
| 1893 | EXPORT_SYMBOL(gspca_dev_probe); | 1897 | EXPORT_SYMBOL(gspca_dev_probe); |
| @@ -1905,7 +1909,7 @@ void gspca_disconnect(struct usb_interface *intf) | |||
| 1905 | usb_set_intfdata(intf, NULL); | 1909 | usb_set_intfdata(intf, NULL); |
| 1906 | 1910 | ||
| 1907 | /* We don't want people trying to open up the device */ | 1911 | /* We don't want people trying to open up the device */ |
| 1908 | video_unregister_device(&gspca_dev->vdev); | 1912 | video_unregister_device(gspca_dev->vdev); |
| 1909 | 1913 | ||
| 1910 | gspca_dev->present = 0; | 1914 | gspca_dev->present = 0; |
| 1911 | gspca_dev->streaming = 0; | 1915 | gspca_dev->streaming = 0; |
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h index 1d9dc90b4791..d25e8d69373b 100644 --- a/drivers/media/video/gspca/gspca.h +++ b/drivers/media/video/gspca/gspca.h | |||
| @@ -97,7 +97,7 @@ struct sd_desc { | |||
| 97 | cam_pkt_op pkt_scan; | 97 | cam_pkt_op pkt_scan; |
| 98 | /* optional operations */ | 98 | /* optional operations */ |
| 99 | cam_v_op stopN; /* called on stream off - main alt */ | 99 | cam_v_op stopN; /* called on stream off - main alt */ |
| 100 | cam_v_op stop0; /* called on stream off - alt 0 */ | 100 | cam_v_op stop0; /* called on stream off & disconnect - alt 0 */ |
| 101 | cam_v_op dq_callback; /* called when a frame has been dequeued */ | 101 | cam_v_op dq_callback; /* called when a frame has been dequeued */ |
| 102 | cam_jpg_op get_jcomp; | 102 | cam_jpg_op get_jcomp; |
| 103 | cam_jpg_op set_jcomp; | 103 | cam_jpg_op set_jcomp; |
| @@ -120,8 +120,8 @@ struct gspca_frame { | |||
| 120 | }; | 120 | }; |
| 121 | 121 | ||
| 122 | struct gspca_dev { | 122 | struct gspca_dev { |
| 123 | struct video_device vdev; /* !! must be the first item */ | 123 | struct video_device *vdev; |
| 124 | struct file_operations fops; | 124 | struct module *module; /* subdriver handling the device */ |
| 125 | struct usb_device *dev; | 125 | struct usb_device *dev; |
| 126 | struct kref kref; | 126 | struct kref kref; |
| 127 | struct file *capt_file; /* file doing video capture */ | 127 | struct file *capt_file; /* file doing video capture */ |
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c index e5ff9a6199ef..fbd45e235d97 100644 --- a/drivers/media/video/gspca/pac7311.c +++ b/drivers/media/video/gspca/pac7311.c | |||
| @@ -749,10 +749,13 @@ static void sd_stopN(struct gspca_dev *gspca_dev) | |||
| 749 | reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */ | 749 | reg_w(gspca_dev, 0x78, 0x44); /* Bit_0=start stream, Bit_6=LED */ |
| 750 | } | 750 | } |
| 751 | 751 | ||
| 752 | /* called on streamoff with alt 0 and on disconnect */ | ||
| 752 | static void sd_stop0(struct gspca_dev *gspca_dev) | 753 | static void sd_stop0(struct gspca_dev *gspca_dev) |
| 753 | { | 754 | { |
| 754 | struct sd *sd = (struct sd *) gspca_dev; | 755 | struct sd *sd = (struct sd *) gspca_dev; |
| 755 | 756 | ||
| 757 | if (!gspca_dev->present) | ||
| 758 | return; | ||
| 756 | if (sd->sensor == SENSOR_PAC7302) { | 759 | if (sd->sensor == SENSOR_PAC7302) { |
| 757 | reg_w(gspca_dev, 0xff, 0x01); | 760 | reg_w(gspca_dev, 0xff, 0x01); |
| 758 | reg_w(gspca_dev, 0x78, 0x40); | 761 | reg_w(gspca_dev, 0x78, 0x40); |
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c index b742f260c7ca..e29954c1c38c 100644 --- a/drivers/media/video/gspca/spca501.c +++ b/drivers/media/video/gspca/spca501.c | |||
| @@ -2022,8 +2022,11 @@ static void sd_stopN(struct gspca_dev *gspca_dev) | |||
| 2022 | reg_write(gspca_dev->dev, SPCA501_REG_CTLRL, 0x01, 0x00); | 2022 | reg_write(gspca_dev->dev, SPCA501_REG_CTLRL, 0x01, 0x00); |
| 2023 | } | 2023 | } |
| 2024 | 2024 | ||
| 2025 | /* called on streamoff with alt 0 and on disconnect */ | ||
| 2025 | static void sd_stop0(struct gspca_dev *gspca_dev) | 2026 | static void sd_stop0(struct gspca_dev *gspca_dev) |
| 2026 | { | 2027 | { |
| 2028 | if (!gspca_dev->present) | ||
| 2029 | return; | ||
| 2027 | reg_write(gspca_dev->dev, SPCA501_REG_CTLRL, 0x05, 0x00); | 2030 | reg_write(gspca_dev->dev, SPCA501_REG_CTLRL, 0x05, 0x00); |
| 2028 | } | 2031 | } |
| 2029 | 2032 | ||
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c index b345749213cf..895b9fe4018c 100644 --- a/drivers/media/video/gspca/spca505.c +++ b/drivers/media/video/gspca/spca505.c | |||
| @@ -742,8 +742,12 @@ static void sd_stopN(struct gspca_dev *gspca_dev) | |||
| 742 | reg_write(gspca_dev->dev, 0x02, 0x00, 0x00); | 742 | reg_write(gspca_dev->dev, 0x02, 0x00, 0x00); |
| 743 | } | 743 | } |
| 744 | 744 | ||
| 745 | /* called on streamoff with alt 0 and on disconnect */ | ||
| 745 | static void sd_stop0(struct gspca_dev *gspca_dev) | 746 | static void sd_stop0(struct gspca_dev *gspca_dev) |
| 746 | { | 747 | { |
| 748 | if (!gspca_dev->present) | ||
| 749 | return; | ||
| 750 | |||
| 747 | /* This maybe reset or power control */ | 751 | /* This maybe reset or power control */ |
| 748 | reg_write(gspca_dev->dev, 0x03, 0x03, 0x20); | 752 | reg_write(gspca_dev->dev, 0x03, 0x03, 0x20); |
| 749 | reg_write(gspca_dev->dev, 0x03, 0x01, 0x0); | 753 | reg_write(gspca_dev->dev, 0x03, 0x01, 0x0); |
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c index 020a03c466c1..c3de4e44123d 100644 --- a/drivers/media/video/gspca/spca561.c +++ b/drivers/media/video/gspca/spca561.c | |||
| @@ -766,10 +766,13 @@ static void sd_stopN(struct gspca_dev *gspca_dev) | |||
| 766 | } | 766 | } |
| 767 | } | 767 | } |
| 768 | 768 | ||
| 769 | /* called on streamoff with alt 0 and on disconnect */ | ||
| 769 | static void sd_stop0(struct gspca_dev *gspca_dev) | 770 | static void sd_stop0(struct gspca_dev *gspca_dev) |
| 770 | { | 771 | { |
| 771 | struct sd *sd = (struct sd *) gspca_dev; | 772 | struct sd *sd = (struct sd *) gspca_dev; |
| 772 | 773 | ||
| 774 | if (!gspca_dev->present) | ||
| 775 | return; | ||
| 773 | if (sd->chip_revision == Rev012A) { | 776 | if (sd->chip_revision == Rev012A) { |
| 774 | reg_w_val(gspca_dev->dev, 0x8118, 0x29); | 777 | reg_w_val(gspca_dev->dev, 0x8118, 0x29); |
| 775 | reg_w_val(gspca_dev->dev, 0x8114, 0x08); | 778 | reg_w_val(gspca_dev->dev, 0x8114, 0x08); |
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c index be46d9232540..17af353ddd1c 100644 --- a/drivers/media/video/gspca/vc032x.c +++ b/drivers/media/video/gspca/vc032x.c | |||
| @@ -1633,10 +1633,13 @@ static void sd_stopN(struct gspca_dev *gspca_dev) | |||
| 1633 | reg_w(dev, 0xa0, 0x09, 0xb003); | 1633 | reg_w(dev, 0xa0, 0x09, 0xb003); |
| 1634 | } | 1634 | } |
| 1635 | 1635 | ||
| 1636 | /* called on streamoff with alt 0 and on disconnect */ | ||
| 1636 | static void sd_stop0(struct gspca_dev *gspca_dev) | 1637 | static void sd_stop0(struct gspca_dev *gspca_dev) |
| 1637 | { | 1638 | { |
| 1638 | struct usb_device *dev = gspca_dev->dev; | 1639 | struct usb_device *dev = gspca_dev->dev; |
| 1639 | 1640 | ||
| 1641 | if (!gspca_dev->present) | ||
| 1642 | return; | ||
| 1640 | reg_w(dev, 0x89, 0xffff, 0xffff); | 1643 | reg_w(dev, 0x89, 0xffff, 0xffff); |
| 1641 | } | 1644 | } |
| 1642 | 1645 | ||
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index 8b3101d347c3..0befacf49855 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
| @@ -7336,10 +7336,13 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
| 7336 | return 0; | 7336 | return 0; |
| 7337 | } | 7337 | } |
| 7338 | 7338 | ||
| 7339 | /* called on streamoff with alt 0 and on disconnect */ | ||
| 7339 | static void sd_stop0(struct gspca_dev *gspca_dev) | 7340 | static void sd_stop0(struct gspca_dev *gspca_dev) |
| 7340 | { | 7341 | { |
| 7341 | struct sd *sd = (struct sd *) gspca_dev; | 7342 | struct sd *sd = (struct sd *) gspca_dev; |
| 7342 | 7343 | ||
| 7344 | if (!gspca_dev->present) | ||
| 7345 | return; | ||
| 7343 | send_unknown(gspca_dev->dev, sd->sensor); | 7346 | send_unknown(gspca_dev->dev, sd->sensor); |
| 7344 | } | 7347 | } |
| 7345 | 7348 | ||
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 6586f0b13363..70a77625107d 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
| @@ -39,6 +39,8 @@ | |||
| 39 | #include <mach/pxa-regs.h> | 39 | #include <mach/pxa-regs.h> |
| 40 | #include <mach/camera.h> | 40 | #include <mach/camera.h> |
| 41 | 41 | ||
| 42 | #include "pxa_camera.h" | ||
| 43 | |||
| 42 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) | 44 | #define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5) |
| 43 | #define PXA_CAM_DRV_NAME "pxa27x-camera" | 45 | #define PXA_CAM_DRV_NAME "pxa27x-camera" |
| 44 | 46 | ||
diff --git a/drivers/media/video/pxa_camera.h b/drivers/media/video/pxa_camera.h new file mode 100644 index 000000000000..89cbfc9a35c5 --- /dev/null +++ b/drivers/media/video/pxa_camera.h | |||
| @@ -0,0 +1,95 @@ | |||
| 1 | /* Camera Interface */ | ||
| 2 | #define CICR0 __REG(0x50000000) | ||
| 3 | #define CICR1 __REG(0x50000004) | ||
| 4 | #define CICR2 __REG(0x50000008) | ||
| 5 | #define CICR3 __REG(0x5000000C) | ||
| 6 | #define CICR4 __REG(0x50000010) | ||
| 7 | #define CISR __REG(0x50000014) | ||
| 8 | #define CIFR __REG(0x50000018) | ||
| 9 | #define CITOR __REG(0x5000001C) | ||
| 10 | #define CIBR0 __REG(0x50000028) | ||
| 11 | #define CIBR1 __REG(0x50000030) | ||
| 12 | #define CIBR2 __REG(0x50000038) | ||
| 13 | |||
| 14 | #define CICR0_DMAEN (1 << 31) /* DMA request enable */ | ||
| 15 | #define CICR0_PAR_EN (1 << 30) /* Parity enable */ | ||
| 16 | #define CICR0_SL_CAP_EN (1 << 29) /* Capture enable for slave mode */ | ||
| 17 | #define CICR0_ENB (1 << 28) /* Camera interface enable */ | ||
| 18 | #define CICR0_DIS (1 << 27) /* Camera interface disable */ | ||
| 19 | #define CICR0_SIM (0x7 << 24) /* Sensor interface mode mask */ | ||
| 20 | #define CICR0_TOM (1 << 9) /* Time-out mask */ | ||
| 21 | #define CICR0_RDAVM (1 << 8) /* Receive-data-available mask */ | ||
| 22 | #define CICR0_FEM (1 << 7) /* FIFO-empty mask */ | ||
| 23 | #define CICR0_EOLM (1 << 6) /* End-of-line mask */ | ||
| 24 | #define CICR0_PERRM (1 << 5) /* Parity-error mask */ | ||
| 25 | #define CICR0_QDM (1 << 4) /* Quick-disable mask */ | ||
| 26 | #define CICR0_CDM (1 << 3) /* Disable-done mask */ | ||
| 27 | #define CICR0_SOFM (1 << 2) /* Start-of-frame mask */ | ||
| 28 | #define CICR0_EOFM (1 << 1) /* End-of-frame mask */ | ||
| 29 | #define CICR0_FOM (1 << 0) /* FIFO-overrun mask */ | ||
| 30 | |||
| 31 | #define CICR1_TBIT (1 << 31) /* Transparency bit */ | ||
| 32 | #define CICR1_RGBT_CONV (0x3 << 29) /* RGBT conversion mask */ | ||
| 33 | #define CICR1_PPL (0x7ff << 15) /* Pixels per line mask */ | ||
| 34 | #define CICR1_RGB_CONV (0x7 << 12) /* RGB conversion mask */ | ||
| 35 | #define CICR1_RGB_F (1 << 11) /* RGB format */ | ||
| 36 | #define CICR1_YCBCR_F (1 << 10) /* YCbCr format */ | ||
| 37 | #define CICR1_RGB_BPP (0x7 << 7) /* RGB bis per pixel mask */ | ||
| 38 | #define CICR1_RAW_BPP (0x3 << 5) /* Raw bis per pixel mask */ | ||
| 39 | #define CICR1_COLOR_SP (0x3 << 3) /* Color space mask */ | ||
| 40 | #define CICR1_DW (0x7 << 0) /* Data width mask */ | ||
| 41 | |||
| 42 | #define CICR2_BLW (0xff << 24) /* Beginning-of-line pixel clock | ||
| 43 | wait count mask */ | ||
| 44 | #define CICR2_ELW (0xff << 16) /* End-of-line pixel clock | ||
| 45 | wait count mask */ | ||
| 46 | #define CICR2_HSW (0x3f << 10) /* Horizontal sync pulse width mask */ | ||
| 47 | #define CICR2_BFPW (0x3f << 3) /* Beginning-of-frame pixel clock | ||
| 48 | wait count mask */ | ||
| 49 | #define CICR2_FSW (0x7 << 0) /* Frame stabilization | ||
| 50 | wait count mask */ | ||
| 51 | |||
| 52 | #define CICR3_BFW (0xff << 24) /* Beginning-of-frame line clock | ||
| 53 | wait count mask */ | ||
| 54 | #define CICR3_EFW (0xff << 16) /* End-of-frame line clock | ||
| 55 | wait count mask */ | ||
| 56 | #define CICR3_VSW (0x3f << 10) /* Vertical sync pulse width mask */ | ||
| 57 | #define CICR3_BFPW (0x3f << 3) /* Beginning-of-frame pixel clock | ||
| 58 | wait count mask */ | ||
| 59 | #define CICR3_LPF (0x7ff << 0) /* Lines per frame mask */ | ||
| 60 | |||
| 61 | #define CICR4_MCLK_DLY (0x3 << 24) /* MCLK Data Capture Delay mask */ | ||
| 62 | #define CICR4_PCLK_EN (1 << 23) /* Pixel clock enable */ | ||
| 63 | #define CICR4_PCP (1 << 22) /* Pixel clock polarity */ | ||
| 64 | #define CICR4_HSP (1 << 21) /* Horizontal sync polarity */ | ||
| 65 | #define CICR4_VSP (1 << 20) /* Vertical sync polarity */ | ||
| 66 | #define CICR4_MCLK_EN (1 << 19) /* MCLK enable */ | ||
| 67 | #define CICR4_FR_RATE (0x7 << 8) /* Frame rate mask */ | ||
| 68 | #define CICR4_DIV (0xff << 0) /* Clock divisor mask */ | ||
| 69 | |||
| 70 | #define CISR_FTO (1 << 15) /* FIFO time-out */ | ||
| 71 | #define CISR_RDAV_2 (1 << 14) /* Channel 2 receive data available */ | ||
| 72 | #define CISR_RDAV_1 (1 << 13) /* Channel 1 receive data available */ | ||
| 73 | #define CISR_RDAV_0 (1 << 12) /* Channel 0 receive data available */ | ||
| 74 | #define CISR_FEMPTY_2 (1 << 11) /* Channel 2 FIFO empty */ | ||
| 75 | #define CISR_FEMPTY_1 (1 << 10) /* Channel 1 FIFO empty */ | ||
| 76 | #define CISR_FEMPTY_0 (1 << 9) /* Channel 0 FIFO empty */ | ||
| 77 | #define CISR_EOL (1 << 8) /* End of line */ | ||
| 78 | #define CISR_PAR_ERR (1 << 7) /* Parity error */ | ||
| 79 | #define CISR_CQD (1 << 6) /* Camera interface quick disable */ | ||
| 80 | #define CISR_CDD (1 << 5) /* Camera interface disable done */ | ||
| 81 | #define CISR_SOF (1 << 4) /* Start of frame */ | ||
| 82 | #define CISR_EOF (1 << 3) /* End of frame */ | ||
| 83 | #define CISR_IFO_2 (1 << 2) /* FIFO overrun for Channel 2 */ | ||
| 84 | #define CISR_IFO_1 (1 << 1) /* FIFO overrun for Channel 1 */ | ||
| 85 | #define CISR_IFO_0 (1 << 0) /* FIFO overrun for Channel 0 */ | ||
| 86 | |||
| 87 | #define CIFR_FLVL2 (0x7f << 23) /* FIFO 2 level mask */ | ||
| 88 | #define CIFR_FLVL1 (0x7f << 16) /* FIFO 1 level mask */ | ||
| 89 | #define CIFR_FLVL0 (0xff << 8) /* FIFO 0 level mask */ | ||
| 90 | #define CIFR_THL_0 (0x3 << 4) /* Threshold Level for Channel 0 FIFO */ | ||
| 91 | #define CIFR_RESET_F (1 << 3) /* Reset input FIFOs */ | ||
| 92 | #define CIFR_FEN2 (1 << 2) /* FIFO enable for channel 2 */ | ||
| 93 | #define CIFR_FEN1 (1 << 1) /* FIFO enable for channel 1 */ | ||
| 94 | #define CIFR_FEN0 (1 << 0) /* FIFO enable for channel 0 */ | ||
| 95 | |||
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index 5272926db73e..3c3f8cf73108 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c | |||
| @@ -192,7 +192,7 @@ struct s2255_dmaqueue { | |||
| 192 | #define S2255_FW_FAILED 3 | 192 | #define S2255_FW_FAILED 3 |
| 193 | #define S2255_FW_DISCONNECTING 4 | 193 | #define S2255_FW_DISCONNECTING 4 |
| 194 | 194 | ||
| 195 | #define S2255_FW_MARKER 0x22552f2f | 195 | #define S2255_FW_MARKER cpu_to_le32(0x22552f2f) |
| 196 | /* 2255 read states */ | 196 | /* 2255 read states */ |
| 197 | #define S2255_READ_IDLE 0 | 197 | #define S2255_READ_IDLE 0 |
| 198 | #define S2255_READ_FRAME 1 | 198 | #define S2255_READ_FRAME 1 |
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index e4c0db4dc7b1..9e485459f63b 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c | |||
| @@ -474,9 +474,9 @@ static __init int asic3_gpio_probe(struct platform_device *pdev, | |||
| 474 | u16 dir_reg[ASIC3_NUM_GPIO_BANKS]; | 474 | u16 dir_reg[ASIC3_NUM_GPIO_BANKS]; |
| 475 | int i; | 475 | int i; |
| 476 | 476 | ||
| 477 | memzero(alt_reg, ASIC3_NUM_GPIO_BANKS * sizeof(u16)); | 477 | memset(alt_reg, 0, ASIC3_NUM_GPIO_BANKS * sizeof(u16)); |
| 478 | memzero(out_reg, ASIC3_NUM_GPIO_BANKS * sizeof(u16)); | 478 | memset(out_reg, 0, ASIC3_NUM_GPIO_BANKS * sizeof(u16)); |
| 479 | memzero(dir_reg, ASIC3_NUM_GPIO_BANKS * sizeof(u16)); | 479 | memset(dir_reg, 0, ASIC3_NUM_GPIO_BANKS * sizeof(u16)); |
| 480 | 480 | ||
| 481 | /* Enable all GPIOs */ | 481 | /* Enable all GPIOs */ |
| 482 | asic3_write_register(asic, ASIC3_GPIO_OFFSET(A, MASK), 0xffff); | 482 | asic3_write_register(asic, ASIC3_GPIO_OFFSET(A, MASK), 0xffff); |
diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c index b4ed57e02729..6063dc2b52e8 100644 --- a/drivers/mfd/mcp-core.c +++ b/drivers/mfd/mcp-core.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <linux/string.h> | 19 | #include <linux/string.h> |
| 20 | 20 | ||
| 21 | #include <asm/dma.h> | 21 | #include <mach/dma.h> |
| 22 | #include <asm/system.h> | 22 | #include <asm/system.h> |
| 23 | 23 | ||
| 24 | #include "mcp.h" | 24 | #include "mcp.h" |
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c index 28380b20bc70..62b32dabf629 100644 --- a/drivers/mfd/mcp-sa11x0.c +++ b/drivers/mfd/mcp-sa11x0.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | 22 | ||
| 23 | #include <asm/dma.h> | 23 | #include <mach/dma.h> |
| 24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 25 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
| 26 | #include <asm/system.h> | 26 | #include <asm/system.h> |
diff --git a/drivers/mfd/ucb1x00-assabet.c b/drivers/mfd/ucb1x00-assabet.c index 61aeaf79640d..86fed4870f93 100644 --- a/drivers/mfd/ucb1x00-assabet.c +++ b/drivers/mfd/ucb1x00-assabet.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <linux/proc_fs.h> | 15 | #include <linux/proc_fs.h> |
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | 17 | ||
| 18 | #include <asm/dma.h> | 18 | #include <mach/dma.h> |
| 19 | 19 | ||
| 20 | #include "ucb1x00.h" | 20 | #include "ucb1x00.h" |
| 21 | 21 | ||
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index a316f1b75933..6860c924f364 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/device.h> | 25 | #include <linux/device.h> |
| 26 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
| 27 | 27 | ||
| 28 | #include <asm/dma.h> | 28 | #include <mach/dma.h> |
| 29 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
| 30 | 30 | ||
| 31 | #include "ucb1x00.h" | 31 | #include "ucb1x00.h" |
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index 44762ca86a8d..61b7d3eb9a2f 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
| 32 | #include <linux/kthread.h> | 32 | #include <linux/kthread.h> |
| 33 | 33 | ||
| 34 | #include <asm/dma.h> | 34 | #include <mach/dma.h> |
| 35 | #include <mach/collie.h> | 35 | #include <mach/collie.h> |
| 36 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
| 37 | 37 | ||
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 7bcb81002dcf..571b211608d1 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
| @@ -1038,8 +1038,8 @@ static int sony_nc_add(struct acpi_device *device) | |||
| 1038 | goto outinput; | 1038 | goto outinput; |
| 1039 | } | 1039 | } |
| 1040 | 1040 | ||
| 1041 | if (!acpi_video_backlight_support()) { | 1041 | if (acpi_video_backlight_support()) { |
| 1042 | printk(KERN_INFO DRV_PFX "Sony: Brightness ignored, must be " | 1042 | printk(KERN_INFO DRV_PFX "brightness ignored, must be " |
| 1043 | "controlled by ACPI video driver\n"); | 1043 | "controlled by ACPI video driver\n"); |
| 1044 | } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", | 1044 | } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", |
| 1045 | &handle))) { | 1045 | &handle))) { |
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 7a4a26b0edd2..899766e16fa8 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
| @@ -5318,6 +5318,7 @@ static enum fan_control_commands fan_control_commands; | |||
| 5318 | 5318 | ||
| 5319 | static u8 fan_control_initial_status; | 5319 | static u8 fan_control_initial_status; |
| 5320 | static u8 fan_control_desired_level; | 5320 | static u8 fan_control_desired_level; |
| 5321 | static u8 fan_control_resume_level; | ||
| 5321 | static int fan_watchdog_maxinterval; | 5322 | static int fan_watchdog_maxinterval; |
| 5322 | 5323 | ||
| 5323 | static struct mutex fan_mutex; | 5324 | static struct mutex fan_mutex; |
| @@ -5440,8 +5441,8 @@ static int fan_set_level(int level) | |||
| 5440 | 5441 | ||
| 5441 | case TPACPI_FAN_WR_ACPI_FANS: | 5442 | case TPACPI_FAN_WR_ACPI_FANS: |
| 5442 | case TPACPI_FAN_WR_TPEC: | 5443 | case TPACPI_FAN_WR_TPEC: |
| 5443 | if ((level != TP_EC_FAN_AUTO) && | 5444 | if (!(level & TP_EC_FAN_AUTO) && |
| 5444 | (level != TP_EC_FAN_FULLSPEED) && | 5445 | !(level & TP_EC_FAN_FULLSPEED) && |
| 5445 | ((level < 0) || (level > 7))) | 5446 | ((level < 0) || (level > 7))) |
| 5446 | return -EINVAL; | 5447 | return -EINVAL; |
| 5447 | 5448 | ||
| @@ -6005,38 +6006,67 @@ static void fan_exit(void) | |||
| 6005 | 6006 | ||
| 6006 | static void fan_suspend(pm_message_t state) | 6007 | static void fan_suspend(pm_message_t state) |
| 6007 | { | 6008 | { |
| 6009 | int rc; | ||
| 6010 | |||
| 6008 | if (!fan_control_allowed) | 6011 | if (!fan_control_allowed) |
| 6009 | return; | 6012 | return; |
| 6010 | 6013 | ||
| 6011 | /* Store fan status in cache */ | 6014 | /* Store fan status in cache */ |
| 6012 | fan_get_status_safe(NULL); | 6015 | fan_control_resume_level = 0; |
| 6016 | rc = fan_get_status_safe(&fan_control_resume_level); | ||
| 6017 | if (rc < 0) | ||
| 6018 | printk(TPACPI_NOTICE | ||
| 6019 | "failed to read fan level for later " | ||
| 6020 | "restore during resume: %d\n", rc); | ||
| 6021 | |||
| 6022 | /* if it is undefined, don't attempt to restore it. | ||
| 6023 | * KEEP THIS LAST */ | ||
| 6013 | if (tp_features.fan_ctrl_status_undef) | 6024 | if (tp_features.fan_ctrl_status_undef) |
| 6014 | fan_control_desired_level = TP_EC_FAN_AUTO; | 6025 | fan_control_resume_level = 0; |
| 6015 | } | 6026 | } |
| 6016 | 6027 | ||
| 6017 | static void fan_resume(void) | 6028 | static void fan_resume(void) |
| 6018 | { | 6029 | { |
| 6019 | u8 saved_fan_level; | ||
| 6020 | u8 current_level = 7; | 6030 | u8 current_level = 7; |
| 6021 | bool do_set = false; | 6031 | bool do_set = false; |
| 6032 | int rc; | ||
| 6022 | 6033 | ||
| 6023 | /* DSDT *always* updates status on resume */ | 6034 | /* DSDT *always* updates status on resume */ |
| 6024 | tp_features.fan_ctrl_status_undef = 0; | 6035 | tp_features.fan_ctrl_status_undef = 0; |
| 6025 | 6036 | ||
| 6026 | saved_fan_level = fan_control_desired_level; | ||
| 6027 | if (!fan_control_allowed || | 6037 | if (!fan_control_allowed || |
| 6038 | !fan_control_resume_level || | ||
| 6028 | (fan_get_status_safe(¤t_level) < 0)) | 6039 | (fan_get_status_safe(¤t_level) < 0)) |
| 6029 | return; | 6040 | return; |
| 6030 | 6041 | ||
| 6031 | switch (fan_control_access_mode) { | 6042 | switch (fan_control_access_mode) { |
| 6032 | case TPACPI_FAN_WR_ACPI_SFAN: | 6043 | case TPACPI_FAN_WR_ACPI_SFAN: |
| 6033 | do_set = (saved_fan_level > current_level); | 6044 | /* never decrease fan level */ |
| 6045 | do_set = (fan_control_resume_level > current_level); | ||
| 6034 | break; | 6046 | break; |
| 6035 | case TPACPI_FAN_WR_ACPI_FANS: | 6047 | case TPACPI_FAN_WR_ACPI_FANS: |
| 6036 | case TPACPI_FAN_WR_TPEC: | 6048 | case TPACPI_FAN_WR_TPEC: |
| 6037 | do_set = ((saved_fan_level & TP_EC_FAN_FULLSPEED) || | 6049 | /* never decrease fan level, scale is: |
| 6038 | (saved_fan_level == 7 && | 6050 | * TP_EC_FAN_FULLSPEED > 7 >= TP_EC_FAN_AUTO |
| 6039 | !(current_level & TP_EC_FAN_FULLSPEED))); | 6051 | * |
| 6052 | * We expect the firmware to set either 7 or AUTO, but we | ||
| 6053 | * handle FULLSPEED out of paranoia. | ||
| 6054 | * | ||
| 6055 | * So, we can safely only restore FULLSPEED or 7, anything | ||
| 6056 | * else could slow the fan. Restoring AUTO is useless, at | ||
| 6057 | * best that's exactly what the DSDT already set (it is the | ||
| 6058 | * slower it uses). | ||
| 6059 | * | ||
| 6060 | * Always keep in mind that the DSDT *will* have set the | ||
| 6061 | * fans to what the vendor supposes is the best level. We | ||
| 6062 | * muck with it only to speed the fan up. | ||
| 6063 | */ | ||
| 6064 | if (fan_control_resume_level != 7 && | ||
| 6065 | !(fan_control_resume_level & TP_EC_FAN_FULLSPEED)) | ||
| 6066 | return; | ||
| 6067 | else | ||
| 6068 | do_set = !(current_level & TP_EC_FAN_FULLSPEED) && | ||
| 6069 | (current_level != fan_control_resume_level); | ||
| 6040 | break; | 6070 | break; |
| 6041 | default: | 6071 | default: |
| 6042 | return; | 6072 | return; |
| @@ -6044,8 +6074,11 @@ static void fan_resume(void) | |||
| 6044 | if (do_set) { | 6074 | if (do_set) { |
| 6045 | printk(TPACPI_NOTICE | 6075 | printk(TPACPI_NOTICE |
| 6046 | "restoring fan level to 0x%02x\n", | 6076 | "restoring fan level to 0x%02x\n", |
| 6047 | saved_fan_level); | 6077 | fan_control_resume_level); |
| 6048 | fan_set_level_safe(saved_fan_level); | 6078 | rc = fan_set_level_safe(fan_control_resume_level); |
| 6079 | if (rc < 0) | ||
| 6080 | printk(TPACPI_NOTICE | ||
| 6081 | "failed to restore fan level: %d\n", rc); | ||
| 6049 | } | 6082 | } |
| 6050 | } | 6083 | } |
| 6051 | 6084 | ||
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 2fadf323c696..1bcbdd6763ac 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
| @@ -500,7 +500,7 @@ static int mmci_probe(struct amba_device *dev, void *id) | |||
| 500 | } | 500 | } |
| 501 | 501 | ||
| 502 | host = mmc_priv(mmc); | 502 | host = mmc_priv(mmc); |
| 503 | host->clk = clk_get(&dev->dev, "MCLK"); | 503 | host->clk = clk_get(&dev->dev, NULL); |
| 504 | if (IS_ERR(host->clk)) { | 504 | if (IS_ERR(host->clk)) { |
| 505 | ret = PTR_ERR(host->clk); | 505 | ret = PTR_ERR(host->clk); |
| 506 | host->clk = NULL; | 506 | host->clk = NULL; |
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index a1700a80e2fd..f88cc7406354 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
| @@ -26,11 +26,12 @@ | |||
| 26 | #include <linux/clk.h> | 26 | #include <linux/clk.h> |
| 27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
| 28 | #include <linux/mmc/host.h> | 28 | #include <linux/mmc/host.h> |
| 29 | #include <linux/io.h> | ||
| 29 | 30 | ||
| 30 | #include <asm/dma.h> | ||
| 31 | #include <asm/io.h> | ||
| 32 | #include <asm/sizes.h> | 31 | #include <asm/sizes.h> |
| 33 | 32 | ||
| 33 | #include <mach/dma.h> | ||
| 34 | #include <mach/hardware.h> | ||
| 34 | #include <mach/pxa-regs.h> | 35 | #include <mach/pxa-regs.h> |
| 35 | #include <mach/mmc.h> | 36 | #include <mach/mmc.h> |
| 36 | 37 | ||
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 3b2085b57769..fcc98a4cce3c 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <mach/regs-sdi.h> | 25 | #include <mach/regs-sdi.h> |
| 26 | #include <mach/regs-gpio.h> | 26 | #include <mach/regs-gpio.h> |
| 27 | 27 | ||
| 28 | #include <asm/plat-s3c24xx/mci.h> | 28 | #include <plat/mci.h> |
| 29 | 29 | ||
| 30 | #include "s3cmci.h" | 30 | #include "s3cmci.h" |
| 31 | 31 | ||
diff --git a/drivers/mtd/maps/dc21285.c b/drivers/mtd/maps/dc21285.c index 3aa018c092f8..42969fe051b2 100644 --- a/drivers/mtd/maps/dc21285.c +++ b/drivers/mtd/maps/dc21285.c | |||
| @@ -32,16 +32,15 @@ static struct mtd_info *dc21285_mtd; | |||
| 32 | */ | 32 | */ |
| 33 | static void nw_en_write(void) | 33 | static void nw_en_write(void) |
| 34 | { | 34 | { |
| 35 | extern spinlock_t gpio_lock; | ||
| 36 | unsigned long flags; | 35 | unsigned long flags; |
| 37 | 36 | ||
| 38 | /* | 37 | /* |
| 39 | * we want to write a bit pattern XXX1 to Xilinx to enable | 38 | * we want to write a bit pattern XXX1 to Xilinx to enable |
| 40 | * the write gate, which will be open for about the next 2ms. | 39 | * the write gate, which will be open for about the next 2ms. |
| 41 | */ | 40 | */ |
| 42 | spin_lock_irqsave(&gpio_lock, flags); | 41 | spin_lock_irqsave(&nw_gpio_lock, flags); |
| 43 | cpld_modify(1, 1); | 42 | nw_cpld_modify(CPLD_FLASH_WR_ENABLE, CPLD_FLASH_WR_ENABLE); |
| 44 | spin_unlock_irqrestore(&gpio_lock, flags); | 43 | spin_unlock_irqrestore(&nw_gpio_lock, flags); |
| 45 | 44 | ||
| 46 | /* | 45 | /* |
| 47 | * let the ISA bus to catch on... | 46 | * let the ISA bus to catch on... |
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c index dcdb1f17577d..3ea1de9be720 100644 --- a/drivers/mtd/maps/ixp2000.c +++ b/drivers/mtd/maps/ixp2000.c | |||
| @@ -170,7 +170,7 @@ static int ixp2000_flash_probe(struct platform_device *dev) | |||
| 170 | err = -ENOMEM; | 170 | err = -ENOMEM; |
| 171 | goto Error; | 171 | goto Error; |
| 172 | } | 172 | } |
| 173 | memzero(info, sizeof(struct ixp2000_flash_info)); | 173 | memset(info, 0, sizeof(struct ixp2000_flash_info)); |
| 174 | 174 | ||
| 175 | platform_set_drvdata(dev, info); | 175 | platform_set_drvdata(dev, info); |
| 176 | 176 | ||
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c index 9c7a5fbd4e51..16555cbeaea4 100644 --- a/drivers/mtd/maps/ixp4xx.c +++ b/drivers/mtd/maps/ixp4xx.c | |||
| @@ -201,7 +201,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev) | |||
| 201 | err = -ENOMEM; | 201 | err = -ENOMEM; |
| 202 | goto Error; | 202 | goto Error; |
| 203 | } | 203 | } |
| 204 | memzero(info, sizeof(struct ixp4xx_flash_info)); | 204 | memset(info, 0, sizeof(struct ixp4xx_flash_info)); |
| 205 | 205 | ||
| 206 | platform_set_drvdata(dev, info); | 206 | platform_set_drvdata(dev, info); |
| 207 | 207 | ||
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 61c922a8356f..ce5752ab579d 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
| @@ -20,8 +20,8 @@ | |||
| 20 | #include <linux/mtd/partitions.h> | 20 | #include <linux/mtd/partitions.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
| 23 | #include <asm/dma.h> | ||
| 24 | 23 | ||
| 24 | #include <mach/dma.h> | ||
| 25 | #include <mach/pxa-regs.h> | 25 | #include <mach/pxa-regs.h> |
| 26 | #include <mach/pxa3xx_nand.h> | 26 | #include <mach/pxa3xx_nand.h> |
| 27 | 27 | ||
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 556139ed1fdf..8e375d5fe231 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
| @@ -45,8 +45,8 @@ | |||
| 45 | 45 | ||
| 46 | #include <asm/io.h> | 46 | #include <asm/io.h> |
| 47 | 47 | ||
| 48 | #include <asm/plat-s3c/regs-nand.h> | 48 | #include <plat/regs-nand.h> |
| 49 | #include <asm/plat-s3c/nand.h> | 49 | #include <plat/nand.h> |
| 50 | 50 | ||
| 51 | #ifdef CONFIG_MTD_NAND_S3C2410_HWECC | 51 | #ifdef CONFIG_MTD_NAND_S3C2410_HWECC |
| 52 | static int hardware_ecc = 1; | 52 | static int hardware_ecc = 1; |
| @@ -818,7 +818,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, | |||
| 818 | goto exit_error; | 818 | goto exit_error; |
| 819 | } | 819 | } |
| 820 | 820 | ||
| 821 | memzero(info, sizeof(*info)); | 821 | memset(info, 0, sizeof(*info)); |
| 822 | platform_set_drvdata(pdev, info); | 822 | platform_set_drvdata(pdev, info); |
| 823 | 823 | ||
| 824 | spin_lock_init(&info->controller.lock); | 824 | spin_lock_init(&info->controller.lock); |
| @@ -883,7 +883,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, | |||
| 883 | goto exit_error; | 883 | goto exit_error; |
| 884 | } | 884 | } |
| 885 | 885 | ||
| 886 | memzero(info->mtds, size); | 886 | memset(info->mtds, 0, size); |
| 887 | 887 | ||
| 888 | /* initialise all possible chips */ | 888 | /* initialise all possible chips */ |
| 889 | 889 | ||
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index e04bcf1dff87..d8966bae0e0b 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c | |||
| @@ -1022,7 +1022,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to, | |||
| 1022 | } | 1022 | } |
| 1023 | 1023 | ||
| 1024 | /* | 1024 | /* |
| 1025 | * OK, now the LEB is locked and we can safely start moving iy. Since | 1025 | * OK, now the LEB is locked and we can safely start moving it. Since |
| 1026 | * this function utilizes thie @ubi->peb1_buf buffer which is shared | 1026 | * this function utilizes thie @ubi->peb1_buf buffer which is shared |
| 1027 | * with some other functions, so lock the buffer by taking the | 1027 | * with some other functions, so lock the buffer by taking the |
| 1028 | * @ubi->buf_mutex. | 1028 | * @ubi->buf_mutex. |
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index 4f2daa5bbecf..41d47e1cf15c 100644 --- a/drivers/mtd/ubi/scan.c +++ b/drivers/mtd/ubi/scan.c | |||
| @@ -320,7 +320,7 @@ static int compare_lebs(struct ubi_device *ubi, const struct ubi_scan_leb *seb, | |||
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | err = ubi_io_read_data(ubi, buf, pnum, 0, len); | 322 | err = ubi_io_read_data(ubi, buf, pnum, 0, len); |
| 323 | if (err && err != UBI_IO_BITFLIPS) | 323 | if (err && err != UBI_IO_BITFLIPS && err != -EBADMSG) |
| 324 | goto out_free_buf; | 324 | goto out_free_buf; |
| 325 | 325 | ||
| 326 | data_crc = be32_to_cpu(vid_hdr->data_crc); | 326 | data_crc = be32_to_cpu(vid_hdr->data_crc); |
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 05d70937b543..dcb6dac1dc54 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c | |||
| @@ -1396,7 +1396,8 @@ int ubi_thread(void *u) | |||
| 1396 | ubi_msg("%s: %d consecutive failures", | 1396 | ubi_msg("%s: %d consecutive failures", |
| 1397 | ubi->bgt_name, WL_MAX_FAILURES); | 1397 | ubi->bgt_name, WL_MAX_FAILURES); |
| 1398 | ubi_ro_mode(ubi); | 1398 | ubi_ro_mode(ubi); |
| 1399 | break; | 1399 | ubi->thread_enabled = 0; |
| 1400 | continue; | ||
| 1400 | } | 1401 | } |
| 1401 | } else | 1402 | } else |
| 1402 | failures = 0; | 1403 | failures = 0; |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 11f143f4adf6..231eeaf1d552 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1825,9 +1825,10 @@ config FEC2 | |||
| 1825 | 1825 | ||
| 1826 | config FEC_MPC52xx | 1826 | config FEC_MPC52xx |
| 1827 | tristate "MPC52xx FEC driver" | 1827 | tristate "MPC52xx FEC driver" |
| 1828 | depends on PPC_MPC52xx && PPC_BESTCOMM_FEC | 1828 | depends on PPC_MPC52xx && PPC_BESTCOMM |
| 1829 | select CRC32 | 1829 | select CRC32 |
| 1830 | select PHYLIB | 1830 | select PHYLIB |
| 1831 | select PPC_BESTCOMM_FEC | ||
| 1831 | ---help--- | 1832 | ---help--- |
| 1832 | This option enables support for the MPC5200's on-chip | 1833 | This option enables support for the MPC5200's on-chip |
| 1833 | Fast Ethernet Controller | 1834 | Fast Ethernet Controller |
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 7107620f615d..0b729f7d91fc 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
| @@ -170,11 +170,7 @@ static char version[] __initdata = | |||
| 170 | /* The cs8900 has 4 IRQ pins, software selectable. cs8900_irq_map maps | 170 | /* The cs8900 has 4 IRQ pins, software selectable. cs8900_irq_map maps |
| 171 | them to system IRQ numbers. This mapping is card specific and is set to | 171 | them to system IRQ numbers. This mapping is card specific and is set to |
| 172 | the configuration of the Cirrus Eval board for this chip. */ | 172 | the configuration of the Cirrus Eval board for this chip. */ |
| 173 | #ifdef CONFIG_ARCH_CLPS7500 | 173 | #if defined(CONFIG_SH_HICOSH4) |
| 174 | static unsigned int netcard_portlist[] __used __initdata = | ||
| 175 | { 0x80090303, 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0}; | ||
| 176 | static unsigned int cs8900_irq_map[] = {12,0,0,0}; | ||
| 177 | #elif defined(CONFIG_SH_HICOSH4) | ||
| 178 | static unsigned int netcard_portlist[] __used __initdata = | 174 | static unsigned int netcard_portlist[] __used __initdata = |
| 179 | { 0x0300, 0}; | 175 | { 0x0300, 0}; |
| 180 | static unsigned int cs8900_irq_map[] = {1,0,0,0}; | 176 | static unsigned int cs8900_irq_map[] = {1,0,0,0}; |
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index c5b02b66f756..0e081292f4f7 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c | |||
| @@ -22,9 +22,53 @@ | |||
| 22 | #include <net/irda/wrapper.h> | 22 | #include <net/irda/wrapper.h> |
| 23 | #include <net/irda/irda_device.h> | 23 | #include <net/irda/irda_device.h> |
| 24 | 24 | ||
| 25 | #include <asm/dma.h> | 25 | #include <mach/dma.h> |
| 26 | #include <mach/irda.h> | 26 | #include <mach/irda.h> |
| 27 | #include <mach/hardware.h> | ||
| 27 | #include <mach/pxa-regs.h> | 28 | #include <mach/pxa-regs.h> |
| 29 | #include <mach/regs-uart.h> | ||
| 30 | |||
| 31 | #define FICP __REG(0x40800000) /* Start of FICP area */ | ||
| 32 | #define ICCR0 __REG(0x40800000) /* ICP Control Register 0 */ | ||
| 33 | #define ICCR1 __REG(0x40800004) /* ICP Control Register 1 */ | ||
| 34 | #define ICCR2 __REG(0x40800008) /* ICP Control Register 2 */ | ||
| 35 | #define ICDR __REG(0x4080000c) /* ICP Data Register */ | ||
| 36 | #define ICSR0 __REG(0x40800014) /* ICP Status Register 0 */ | ||
| 37 | #define ICSR1 __REG(0x40800018) /* ICP Status Register 1 */ | ||
| 38 | |||
| 39 | #define ICCR0_AME (1 << 7) /* Address match enable */ | ||
| 40 | #define ICCR0_TIE (1 << 6) /* Transmit FIFO interrupt enable */ | ||
| 41 | #define ICCR0_RIE (1 << 5) /* Recieve FIFO interrupt enable */ | ||
| 42 | #define ICCR0_RXE (1 << 4) /* Receive enable */ | ||
| 43 | #define ICCR0_TXE (1 << 3) /* Transmit enable */ | ||
| 44 | #define ICCR0_TUS (1 << 2) /* Transmit FIFO underrun select */ | ||
| 45 | #define ICCR0_LBM (1 << 1) /* Loopback mode */ | ||
| 46 | #define ICCR0_ITR (1 << 0) /* IrDA transmission */ | ||
| 47 | |||
| 48 | #define ICCR2_RXP (1 << 3) /* Receive Pin Polarity select */ | ||
| 49 | #define ICCR2_TXP (1 << 2) /* Transmit Pin Polarity select */ | ||
| 50 | #define ICCR2_TRIG (3 << 0) /* Receive FIFO Trigger threshold */ | ||
| 51 | #define ICCR2_TRIG_8 (0 << 0) /* >= 8 bytes */ | ||
| 52 | #define ICCR2_TRIG_16 (1 << 0) /* >= 16 bytes */ | ||
| 53 | #define ICCR2_TRIG_32 (2 << 0) /* >= 32 bytes */ | ||
| 54 | |||
| 55 | #ifdef CONFIG_PXA27x | ||
| 56 | #define ICSR0_EOC (1 << 6) /* DMA End of Descriptor Chain */ | ||
| 57 | #endif | ||
| 58 | #define ICSR0_FRE (1 << 5) /* Framing error */ | ||
| 59 | #define ICSR0_RFS (1 << 4) /* Receive FIFO service request */ | ||
| 60 | #define ICSR0_TFS (1 << 3) /* Transnit FIFO service request */ | ||
| 61 | #define ICSR0_RAB (1 << 2) /* Receiver abort */ | ||
| 62 | #define ICSR0_TUR (1 << 1) /* Trunsmit FIFO underun */ | ||
| 63 | #define ICSR0_EIF (1 << 0) /* End/Error in FIFO */ | ||
| 64 | |||
| 65 | #define ICSR1_ROR (1 << 6) /* Receiver FIFO underrun */ | ||
| 66 | #define ICSR1_CRE (1 << 5) /* CRC error */ | ||
| 67 | #define ICSR1_EOF (1 << 4) /* End of frame */ | ||
| 68 | #define ICSR1_TNF (1 << 3) /* Transmit FIFO not full */ | ||
| 69 | #define ICSR1_RNE (1 << 2) /* Receive FIFO not empty */ | ||
| 70 | #define ICSR1_TBY (1 << 1) /* Tramsmiter busy flag */ | ||
| 71 | #define ICSR1_RSY (1 << 0) /* Recevier synchronized flag */ | ||
| 28 | 72 | ||
| 29 | #define IrSR_RXPL_NEG_IS_ZERO (1<<4) | 73 | #define IrSR_RXPL_NEG_IS_ZERO (1<<4) |
| 30 | #define IrSR_RXPL_POS_IS_ZERO 0x0 | 74 | #define IrSR_RXPL_POS_IS_ZERO 0x0 |
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index a95188948de7..0813b5295f52 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #include <net/irda/irda_device.h> | 36 | #include <net/irda/irda_device.h> |
| 37 | 37 | ||
| 38 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
| 39 | #include <asm/dma.h> | 39 | #include <mach/dma.h> |
| 40 | #include <mach/hardware.h> | 40 | #include <mach/hardware.h> |
| 41 | #include <asm/mach/irda.h> | 41 | #include <asm/mach/irda.h> |
| 42 | 42 | ||
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 36f2bb666bf7..8ed823ae639e 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -2330,7 +2330,7 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter, | |||
| 2330 | * Once we know the feature-set enabled for the device, we'll cache | 2330 | * Once we know the feature-set enabled for the device, we'll cache |
| 2331 | * the register offset the descriptor ring is assigned to. | 2331 | * the register offset the descriptor ring is assigned to. |
| 2332 | **/ | 2332 | **/ |
| 2333 | static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) | 2333 | static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) |
| 2334 | { | 2334 | { |
| 2335 | int feature_mask = 0, rss_i; | 2335 | int feature_mask = 0, rss_i; |
| 2336 | int i, txr_idx, rxr_idx; | 2336 | int i, txr_idx, rxr_idx; |
| @@ -2367,7 +2367,7 @@ static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) | |||
| 2367 | * number of queues at compile-time. The polling_netdev array is | 2367 | * number of queues at compile-time. The polling_netdev array is |
| 2368 | * intended for Multiqueue, but should work fine with a single queue. | 2368 | * intended for Multiqueue, but should work fine with a single queue. |
| 2369 | **/ | 2369 | **/ |
| 2370 | static int __devinit ixgbe_alloc_queues(struct ixgbe_adapter *adapter) | 2370 | static int ixgbe_alloc_queues(struct ixgbe_adapter *adapter) |
| 2371 | { | 2371 | { |
| 2372 | int i; | 2372 | int i; |
| 2373 | 2373 | ||
| @@ -2408,8 +2408,7 @@ err_tx_ring_allocation: | |||
| 2408 | * Attempt to configure the interrupts using the best available | 2408 | * Attempt to configure the interrupts using the best available |
| 2409 | * capabilities of the hardware and the kernel. | 2409 | * capabilities of the hardware and the kernel. |
| 2410 | **/ | 2410 | **/ |
| 2411 | static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter | 2411 | static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) |
| 2412 | *adapter) | ||
| 2413 | { | 2412 | { |
| 2414 | int err = 0; | 2413 | int err = 0; |
| 2415 | int vector, v_budget; | 2414 | int vector, v_budget; |
| @@ -2501,7 +2500,7 @@ static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter) | |||
| 2501 | * - Hardware queue count (num_*_queues) | 2500 | * - Hardware queue count (num_*_queues) |
| 2502 | * - defined by miscellaneous hardware support/features (RSS, etc.) | 2501 | * - defined by miscellaneous hardware support/features (RSS, etc.) |
| 2503 | **/ | 2502 | **/ |
| 2504 | static int __devinit ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter) | 2503 | static int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter) |
| 2505 | { | 2504 | { |
| 2506 | int err; | 2505 | int err; |
| 2507 | 2506 | ||
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 468921b8f4b6..90a0281d15ea 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c | |||
| @@ -753,6 +753,7 @@ static int mlx4_setup_hca(struct mlx4_dev *dev) | |||
| 753 | struct mlx4_priv *priv = mlx4_priv(dev); | 753 | struct mlx4_priv *priv = mlx4_priv(dev); |
| 754 | int err; | 754 | int err; |
| 755 | int port; | 755 | int port; |
| 756 | __be32 ib_port_default_caps; | ||
| 756 | 757 | ||
| 757 | err = mlx4_init_uar_table(dev); | 758 | err = mlx4_init_uar_table(dev); |
| 758 | if (err) { | 759 | if (err) { |
| @@ -852,6 +853,13 @@ static int mlx4_setup_hca(struct mlx4_dev *dev) | |||
| 852 | } | 853 | } |
| 853 | 854 | ||
| 854 | for (port = 1; port <= dev->caps.num_ports; port++) { | 855 | for (port = 1; port <= dev->caps.num_ports; port++) { |
| 856 | ib_port_default_caps = 0; | ||
| 857 | err = mlx4_get_port_ib_caps(dev, port, &ib_port_default_caps); | ||
| 858 | if (err) | ||
| 859 | mlx4_warn(dev, "failed to get port %d default " | ||
| 860 | "ib capabilities (%d). Continuing with " | ||
| 861 | "caps = 0\n", port, err); | ||
| 862 | dev->caps.ib_port_def_cap[port] = ib_port_default_caps; | ||
| 855 | err = mlx4_SET_PORT(dev, port); | 863 | err = mlx4_SET_PORT(dev, port); |
| 856 | if (err) { | 864 | if (err) { |
| 857 | mlx4_err(dev, "Failed to set port %d, aborting\n", | 865 | mlx4_err(dev, "Failed to set port %d, aborting\n", |
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index 56a2e213fe62..34c909deaff3 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h | |||
| @@ -385,5 +385,6 @@ void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table); | |||
| 385 | void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table); | 385 | void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table); |
| 386 | 386 | ||
| 387 | int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port); | 387 | int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port); |
| 388 | int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps); | ||
| 388 | 389 | ||
| 389 | #endif /* MLX4_H */ | 390 | #endif /* MLX4_H */ |
diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c index e2fdab42c4ce..0a057e5dc63b 100644 --- a/drivers/net/mlx4/port.c +++ b/drivers/net/mlx4/port.c | |||
| @@ -258,6 +258,42 @@ out: | |||
| 258 | } | 258 | } |
| 259 | EXPORT_SYMBOL_GPL(mlx4_unregister_vlan); | 259 | EXPORT_SYMBOL_GPL(mlx4_unregister_vlan); |
| 260 | 260 | ||
| 261 | int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps) | ||
| 262 | { | ||
| 263 | struct mlx4_cmd_mailbox *inmailbox, *outmailbox; | ||
| 264 | u8 *inbuf, *outbuf; | ||
| 265 | int err; | ||
| 266 | |||
| 267 | inmailbox = mlx4_alloc_cmd_mailbox(dev); | ||
| 268 | if (IS_ERR(inmailbox)) | ||
| 269 | return PTR_ERR(inmailbox); | ||
| 270 | |||
| 271 | outmailbox = mlx4_alloc_cmd_mailbox(dev); | ||
| 272 | if (IS_ERR(outmailbox)) { | ||
| 273 | mlx4_free_cmd_mailbox(dev, inmailbox); | ||
| 274 | return PTR_ERR(outmailbox); | ||
| 275 | } | ||
| 276 | |||
| 277 | inbuf = inmailbox->buf; | ||
| 278 | outbuf = outmailbox->buf; | ||
| 279 | memset(inbuf, 0, 256); | ||
| 280 | memset(outbuf, 0, 256); | ||
| 281 | inbuf[0] = 1; | ||
| 282 | inbuf[1] = 1; | ||
| 283 | inbuf[2] = 1; | ||
| 284 | inbuf[3] = 1; | ||
| 285 | *(__be16 *) (&inbuf[16]) = cpu_to_be16(0x0015); | ||
| 286 | *(__be32 *) (&inbuf[20]) = cpu_to_be32(port); | ||
| 287 | |||
| 288 | err = mlx4_cmd_box(dev, inmailbox->dma, outmailbox->dma, port, 3, | ||
| 289 | MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C); | ||
| 290 | if (!err) | ||
| 291 | *caps = *(__be32 *) (outbuf + 84); | ||
| 292 | mlx4_free_cmd_mailbox(dev, inmailbox); | ||
| 293 | mlx4_free_cmd_mailbox(dev, outmailbox); | ||
| 294 | return err; | ||
| 295 | } | ||
| 296 | |||
| 261 | int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port) | 297 | int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port) |
| 262 | { | 298 | { |
| 263 | struct mlx4_cmd_mailbox *mailbox; | 299 | struct mlx4_cmd_mailbox *mailbox; |
| @@ -273,7 +309,8 @@ int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port) | |||
| 273 | ((u8 *) mailbox->buf)[3] = 6; | 309 | ((u8 *) mailbox->buf)[3] = 6; |
| 274 | ((__be16 *) mailbox->buf)[4] = cpu_to_be16(1 << 15); | 310 | ((__be16 *) mailbox->buf)[4] = cpu_to_be16(1 << 15); |
| 275 | ((__be16 *) mailbox->buf)[6] = cpu_to_be16(1 << 15); | 311 | ((__be16 *) mailbox->buf)[6] = cpu_to_be16(1 << 15); |
| 276 | } | 312 | } else |
| 313 | ((__be32 *) mailbox->buf)[1] = dev->caps.ib_port_def_cap[port]; | ||
| 277 | err = mlx4_cmd(dev, mailbox->dma, port, is_eth, MLX4_CMD_SET_PORT, | 314 | err = mlx4_cmd(dev, mailbox->dma, port, is_eth, MLX4_CMD_SET_PORT, |
| 278 | MLX4_CMD_TIME_CLASS_B); | 315 | MLX4_CMD_TIME_CLASS_B); |
| 279 | 316 | ||
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index cf3cca4642f2..f51944b28cfa 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
| @@ -349,7 +349,7 @@ static int ibmtr_suspend(struct pcmcia_device *link) | |||
| 349 | return 0; | 349 | return 0; |
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | static int ibmtr_resume(struct pcmcia_device *link) | 352 | static int __devinit ibmtr_resume(struct pcmcia_device *link) |
| 353 | { | 353 | { |
| 354 | ibmtr_dev_t *info = link->priv; | 354 | ibmtr_dev_t *info = link->priv; |
| 355 | struct net_device *dev = info->dev; | 355 | struct net_device *dev = info->dev; |
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index b185cd12269c..9a16a79b67d0 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
| @@ -1735,7 +1735,7 @@ static const struct ethtool_ops smc911x_ethtool_ops = { | |||
| 1735 | * This routine has a simple purpose -- make the SMC chip generate an | 1735 | * This routine has a simple purpose -- make the SMC chip generate an |
| 1736 | * interrupt, so an auto-detect routine can detect it, and find the IRQ, | 1736 | * interrupt, so an auto-detect routine can detect it, and find the IRQ, |
| 1737 | */ | 1737 | */ |
| 1738 | static int __init smc911x_findirq(struct net_device *dev) | 1738 | static int __devinit smc911x_findirq(struct net_device *dev) |
| 1739 | { | 1739 | { |
| 1740 | struct smc911x_local *lp = netdev_priv(dev); | 1740 | struct smc911x_local *lp = netdev_priv(dev); |
| 1741 | int timeout = 20; | 1741 | int timeout = 20; |
| @@ -1799,7 +1799,7 @@ static int __init smc911x_findirq(struct net_device *dev) | |||
| 1799 | * o actually GRAB the irq. | 1799 | * o actually GRAB the irq. |
| 1800 | * o GRAB the region | 1800 | * o GRAB the region |
| 1801 | */ | 1801 | */ |
| 1802 | static int __init smc911x_probe(struct net_device *dev) | 1802 | static int __devinit smc911x_probe(struct net_device *dev) |
| 1803 | { | 1803 | { |
| 1804 | struct smc911x_local *lp = netdev_priv(dev); | 1804 | struct smc911x_local *lp = netdev_priv(dev); |
| 1805 | int i, retval; | 1805 | int i, retval; |
| @@ -2048,7 +2048,7 @@ err_out: | |||
| 2048 | * 0 --> there is a device | 2048 | * 0 --> there is a device |
| 2049 | * anything else, error | 2049 | * anything else, error |
| 2050 | */ | 2050 | */ |
| 2051 | static int smc911x_drv_probe(struct platform_device *pdev) | 2051 | static int __devinit smc911x_drv_probe(struct platform_device *pdev) |
| 2052 | { | 2052 | { |
| 2053 | #ifdef SMC_DYNAMIC_BUS_CONFIG | 2053 | #ifdef SMC_DYNAMIC_BUS_CONFIG |
| 2054 | struct smc911x_platdata *pd = pdev->dev.platform_data; | 2054 | struct smc911x_platdata *pd = pdev->dev.platform_data; |
| @@ -2124,7 +2124,7 @@ out: | |||
| 2124 | return ret; | 2124 | return ret; |
| 2125 | } | 2125 | } |
| 2126 | 2126 | ||
| 2127 | static int smc911x_drv_remove(struct platform_device *pdev) | 2127 | static int __devexit smc911x_drv_remove(struct platform_device *pdev) |
| 2128 | { | 2128 | { |
| 2129 | struct net_device *ndev = platform_get_drvdata(pdev); | 2129 | struct net_device *ndev = platform_get_drvdata(pdev); |
| 2130 | struct smc911x_local *lp = netdev_priv(ndev); | 2130 | struct smc911x_local *lp = netdev_priv(ndev); |
| @@ -2195,7 +2195,7 @@ static int smc911x_drv_resume(struct platform_device *dev) | |||
| 2195 | 2195 | ||
| 2196 | static struct platform_driver smc911x_driver = { | 2196 | static struct platform_driver smc911x_driver = { |
| 2197 | .probe = smc911x_drv_probe, | 2197 | .probe = smc911x_drv_probe, |
| 2198 | .remove = smc911x_drv_remove, | 2198 | .remove = __devexit_p(smc911x_drv_remove), |
| 2199 | .suspend = smc911x_drv_suspend, | 2199 | .suspend = smc911x_drv_suspend, |
| 2200 | .resume = smc911x_drv_resume, | 2200 | .resume = smc911x_drv_resume, |
| 2201 | .driver = { | 2201 | .driver = { |
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index cc7d85bdfb3e..870b4c33f108 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h | |||
| @@ -200,6 +200,9 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg, | |||
| 200 | 200 | ||
| 201 | 201 | ||
| 202 | #ifdef SMC_USE_PXA_DMA | 202 | #ifdef SMC_USE_PXA_DMA |
| 203 | |||
| 204 | #include <mach/dma.h> | ||
| 205 | |||
| 203 | /* | 206 | /* |
| 204 | * Define the request and free functions | 207 | * Define the request and free functions |
| 205 | * These are unfortunately architecture specific as no generic allocation | 208 | * These are unfortunately architecture specific as no generic allocation |
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index fc80f250da31..35c56abf4113 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
| @@ -1696,7 +1696,7 @@ static const struct ethtool_ops smc_ethtool_ops = { | |||
| 1696 | * I just deleted auto_irq.c, since it was never built... | 1696 | * I just deleted auto_irq.c, since it was never built... |
| 1697 | * --jgarzik | 1697 | * --jgarzik |
| 1698 | */ | 1698 | */ |
| 1699 | static int __init smc_findirq(struct smc_local *lp) | 1699 | static int __devinit smc_findirq(struct smc_local *lp) |
| 1700 | { | 1700 | { |
| 1701 | void __iomem *ioaddr = lp->base; | 1701 | void __iomem *ioaddr = lp->base; |
| 1702 | int timeout = 20; | 1702 | int timeout = 20; |
| @@ -1770,7 +1770,7 @@ static int __init smc_findirq(struct smc_local *lp) | |||
| 1770 | * o actually GRAB the irq. | 1770 | * o actually GRAB the irq. |
| 1771 | * o GRAB the region | 1771 | * o GRAB the region |
| 1772 | */ | 1772 | */ |
| 1773 | static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr, | 1773 | static int __devinit smc_probe(struct net_device *dev, void __iomem *ioaddr, |
| 1774 | unsigned long irq_flags) | 1774 | unsigned long irq_flags) |
| 1775 | { | 1775 | { |
| 1776 | struct smc_local *lp = netdev_priv(dev); | 1776 | struct smc_local *lp = netdev_priv(dev); |
| @@ -2126,7 +2126,7 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device * | |||
| 2126 | * 0 --> there is a device | 2126 | * 0 --> there is a device |
| 2127 | * anything else, error | 2127 | * anything else, error |
| 2128 | */ | 2128 | */ |
| 2129 | static int smc_drv_probe(struct platform_device *pdev) | 2129 | static int __devinit smc_drv_probe(struct platform_device *pdev) |
| 2130 | { | 2130 | { |
| 2131 | struct smc91x_platdata *pd = pdev->dev.platform_data; | 2131 | struct smc91x_platdata *pd = pdev->dev.platform_data; |
| 2132 | struct smc_local *lp; | 2132 | struct smc_local *lp; |
| @@ -2240,7 +2240,7 @@ static int smc_drv_probe(struct platform_device *pdev) | |||
| 2240 | return ret; | 2240 | return ret; |
| 2241 | } | 2241 | } |
| 2242 | 2242 | ||
| 2243 | static int smc_drv_remove(struct platform_device *pdev) | 2243 | static int __devexit smc_drv_remove(struct platform_device *pdev) |
| 2244 | { | 2244 | { |
| 2245 | struct net_device *ndev = platform_get_drvdata(pdev); | 2245 | struct net_device *ndev = platform_get_drvdata(pdev); |
| 2246 | struct smc_local *lp = netdev_priv(ndev); | 2246 | struct smc_local *lp = netdev_priv(ndev); |
| @@ -2305,7 +2305,7 @@ static int smc_drv_resume(struct platform_device *dev) | |||
| 2305 | 2305 | ||
| 2306 | static struct platform_driver smc_driver = { | 2306 | static struct platform_driver smc_driver = { |
| 2307 | .probe = smc_drv_probe, | 2307 | .probe = smc_drv_probe, |
| 2308 | .remove = smc_drv_remove, | 2308 | .remove = __devexit_p(smc_drv_remove), |
| 2309 | .suspend = smc_drv_suspend, | 2309 | .suspend = smc_drv_suspend, |
| 2310 | .resume = smc_drv_resume, | 2310 | .resume = smc_drv_resume, |
| 2311 | .driver = { | 2311 | .driver = { |
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index a07cc9351c6b..37e2cb4f4f88 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
| @@ -527,7 +527,8 @@ struct smc_local { | |||
| 527 | * as RX which can overrun memory and lose packets. | 527 | * as RX which can overrun memory and lose packets. |
| 528 | */ | 528 | */ |
| 529 | #include <linux/dma-mapping.h> | 529 | #include <linux/dma-mapping.h> |
| 530 | #include <asm/dma.h> | 530 | #include <mach/dma.h> |
| 531 | #include <mach/hardware.h> | ||
| 531 | #include <mach/pxa-regs.h> | 532 | #include <mach/pxa-regs.h> |
| 532 | 533 | ||
| 533 | #ifdef SMC_insl | 534 | #ifdef SMC_insl |
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index c6948d8f53f6..6d017adc914a 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -1785,7 +1785,7 @@ static int __devexit xennet_remove(struct xenbus_device *dev) | |||
| 1785 | return 0; | 1785 | return 0; |
| 1786 | } | 1786 | } |
| 1787 | 1787 | ||
| 1788 | static struct xenbus_driver netfront = { | 1788 | static struct xenbus_driver netfront_driver = { |
| 1789 | .name = "vif", | 1789 | .name = "vif", |
| 1790 | .owner = THIS_MODULE, | 1790 | .owner = THIS_MODULE, |
| 1791 | .ids = netfront_ids, | 1791 | .ids = netfront_ids, |
| @@ -1805,7 +1805,7 @@ static int __init netif_init(void) | |||
| 1805 | 1805 | ||
| 1806 | printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n"); | 1806 | printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n"); |
| 1807 | 1807 | ||
| 1808 | return xenbus_register_frontend(&netfront); | 1808 | return xenbus_register_frontend(&netfront_driver); |
| 1809 | } | 1809 | } |
| 1810 | module_init(netif_init); | 1810 | module_init(netif_init); |
| 1811 | 1811 | ||
| @@ -1815,7 +1815,7 @@ static void __exit netif_exit(void) | |||
| 1815 | if (xen_initial_domain()) | 1815 | if (xen_initial_domain()) |
| 1816 | return; | 1816 | return; |
| 1817 | 1817 | ||
| 1818 | xenbus_unregister_driver(&netfront); | 1818 | xenbus_unregister_driver(&netfront_driver); |
| 1819 | } | 1819 | } |
| 1820 | module_exit(netif_exit); | 1820 | module_exit(netif_exit); |
| 1821 | 1821 | ||
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c index e2e95b36a603..101ed49a2d15 100644 --- a/drivers/parport/parport_serial.c +++ b/drivers/parport/parport_serial.c | |||
| @@ -70,6 +70,8 @@ static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc | |||
| 70 | * parallel ports and <S> is the number of serial ports. | 70 | * parallel ports and <S> is the number of serial ports. |
| 71 | */ | 71 | */ |
| 72 | card->numports = (dev->subsystem_device & 0xf0) >> 4; | 72 | card->numports = (dev->subsystem_device & 0xf0) >> 4; |
| 73 | if (card->numports > ARRAY_SIZE(card->addr)) | ||
| 74 | card->numports = ARRAY_SIZE(card->addr); | ||
| 73 | return 0; | 75 | return 0; |
| 74 | } | 76 | } |
| 75 | 77 | ||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 28af496b441e..061d1ee0046a 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -2042,7 +2042,7 @@ static int __devinit pci_init(void) | |||
| 2042 | return 0; | 2042 | return 0; |
| 2043 | } | 2043 | } |
| 2044 | 2044 | ||
| 2045 | static int __devinit pci_setup(char *str) | 2045 | static int __init pci_setup(char *str) |
| 2046 | { | 2046 | { |
| 2047 | while (str) { | 2047 | while (str) { |
| 2048 | char *k = strchr(str, ','); | 2048 | char *k = strchr(str, ','); |
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c index a926c896475e..643a6b98462b 100644 --- a/drivers/rapidio/rio-scan.c +++ b/drivers/rapidio/rio-scan.c | |||
| @@ -879,7 +879,7 @@ static void rio_update_route_tables(struct rio_mport *port) | |||
| 879 | * link, then start recursive peer enumeration. Returns %0 if | 879 | * link, then start recursive peer enumeration. Returns %0 if |
| 880 | * enumeration succeeds or %-EBUSY if enumeration fails. | 880 | * enumeration succeeds or %-EBUSY if enumeration fails. |
| 881 | */ | 881 | */ |
| 882 | int rio_enum_mport(struct rio_mport *mport) | 882 | int __devinit rio_enum_mport(struct rio_mport *mport) |
| 883 | { | 883 | { |
| 884 | struct rio_net *net = NULL; | 884 | struct rio_net *net = NULL; |
| 885 | int rc = 0; | 885 | int rc = 0; |
| @@ -972,7 +972,7 @@ static void rio_enum_timeout(unsigned long data) | |||
| 972 | * peer discovery. Returns %0 if discovery succeeds or %-EBUSY | 972 | * peer discovery. Returns %0 if discovery succeeds or %-EBUSY |
| 973 | * on failure. | 973 | * on failure. |
| 974 | */ | 974 | */ |
| 975 | int rio_disc_mport(struct rio_mport *mport) | 975 | int __devinit rio_disc_mport(struct rio_mport *mport) |
| 976 | { | 976 | { |
| 977 | struct rio_net *net = NULL; | 977 | struct rio_net *net = NULL; |
| 978 | int enum_timeout_flag = 0; | 978 | int enum_timeout_flag = 0; |
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index 680661abbc4b..6395c780008b 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c | |||
| @@ -467,7 +467,7 @@ static int __devinit rio_init(void) | |||
| 467 | 467 | ||
| 468 | device_initcall(rio_init); | 468 | device_initcall(rio_init); |
| 469 | 469 | ||
| 470 | int rio_init_mports(void) | 470 | int __devinit rio_init_mports(void) |
| 471 | { | 471 | { |
| 472 | int rc = 0; | 472 | int rc = 0; |
| 473 | struct rio_mport *port; | 473 | struct rio_mport *port; |
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c index 2133f37906f2..d5e4e637ddec 100644 --- a/drivers/rtc/rtc-at91sam9.c +++ b/drivers/rtc/rtc-at91sam9.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <mach/board.h> | 22 | #include <mach/board.h> |
| 23 | #include <mach/at91_rtt.h> | 23 | #include <mach/at91_rtt.h> |
| 24 | #include <mach/cpu.h> | ||
| 24 | 25 | ||
| 25 | 26 | ||
| 26 | /* | 27 | /* |
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index f59277bbedaa..7a568beba3f0 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
| 27 | #include <asm/io.h> | 27 | #include <asm/io.h> |
| 28 | #include <asm/irq.h> | 28 | #include <asm/irq.h> |
| 29 | #include <asm/plat-s3c/regs-rtc.h> | 29 | #include <plat/regs-rtc.h> |
| 30 | 30 | ||
| 31 | /* I have yet to find an S3C implementation with more than one | 31 | /* I have yet to find an S3C implementation with more than one |
| 32 | * of these rtc blocks in */ | 32 | * of these rtc blocks in */ |
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 218777bfc143..399fe559e4de 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
| @@ -13872,8 +13872,10 @@ static int __devinit advansys_board_found(struct Scsi_Host *shost, | |||
| 13872 | advansys_wide_free_mem(boardp); | 13872 | advansys_wide_free_mem(boardp); |
| 13873 | free_irq(boardp->irq, shost); | 13873 | free_irq(boardp->irq, shost); |
| 13874 | err_free_dma: | 13874 | err_free_dma: |
| 13875 | #ifdef CONFIG_ISA | ||
| 13875 | if (shost->dma_channel != NO_ISA_DMA) | 13876 | if (shost->dma_channel != NO_ISA_DMA) |
| 13876 | free_dma(shost->dma_channel); | 13877 | free_dma(shost->dma_channel); |
| 13878 | #endif | ||
| 13877 | err_free_proc: | 13879 | err_free_proc: |
| 13878 | kfree(boardp->prtbuf); | 13880 | kfree(boardp->prtbuf); |
| 13879 | err_unmap: | 13881 | err_unmap: |
| @@ -13894,10 +13896,12 @@ static int advansys_release(struct Scsi_Host *shost) | |||
| 13894 | ASC_DBG(1, "begin\n"); | 13896 | ASC_DBG(1, "begin\n"); |
| 13895 | scsi_remove_host(shost); | 13897 | scsi_remove_host(shost); |
| 13896 | free_irq(board->irq, shost); | 13898 | free_irq(board->irq, shost); |
| 13899 | #ifdef CONFIG_ISA | ||
| 13897 | if (shost->dma_channel != NO_ISA_DMA) { | 13900 | if (shost->dma_channel != NO_ISA_DMA) { |
| 13898 | ASC_DBG(1, "free_dma()\n"); | 13901 | ASC_DBG(1, "free_dma()\n"); |
| 13899 | free_dma(shost->dma_channel); | 13902 | free_dma(shost->dma_channel); |
| 13900 | } | 13903 | } |
| 13904 | #endif | ||
| 13901 | if (ASC_NARROW_BOARD(board)) { | 13905 | if (ASC_NARROW_BOARD(board)) { |
| 13902 | dma_unmap_single(board->dev, | 13906 | dma_unmap_single(board->dev, |
| 13903 | board->dvc_var.asc_dvc_var.overrun_dma, | 13907 | board->dvc_var.asc_dvc_var.overrun_dma, |
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index c387c15a2128..fb247fdfa2bd 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c | |||
| @@ -588,7 +588,7 @@ static struct pci_driver gdth_pci_driver = { | |||
| 588 | .remove = gdth_pci_remove_one, | 588 | .remove = gdth_pci_remove_one, |
| 589 | }; | 589 | }; |
| 590 | 590 | ||
| 591 | static void gdth_pci_remove_one(struct pci_dev *pdev) | 591 | static void __devexit gdth_pci_remove_one(struct pci_dev *pdev) |
| 592 | { | 592 | { |
| 593 | gdth_ha_str *ha = pci_get_drvdata(pdev); | 593 | gdth_ha_str *ha = pci_get_drvdata(pdev); |
| 594 | 594 | ||
| @@ -600,7 +600,7 @@ static void gdth_pci_remove_one(struct pci_dev *pdev) | |||
| 600 | pci_disable_device(pdev); | 600 | pci_disable_device(pdev); |
| 601 | } | 601 | } |
| 602 | 602 | ||
| 603 | static int gdth_pci_init_one(struct pci_dev *pdev, | 603 | static int __devinit gdth_pci_init_one(struct pci_dev *pdev, |
| 604 | const struct pci_device_id *ent) | 604 | const struct pci_device_id *ent) |
| 605 | { | 605 | { |
| 606 | ushort vendor = pdev->vendor; | 606 | ushort vendor = pdev->vendor; |
| @@ -853,7 +853,7 @@ static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) | |||
| 853 | #endif /* CONFIG_ISA */ | 853 | #endif /* CONFIG_ISA */ |
| 854 | 854 | ||
| 855 | #ifdef CONFIG_PCI | 855 | #ifdef CONFIG_PCI |
| 856 | static int gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr, | 856 | static int __devinit gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr, |
| 857 | gdth_ha_str *ha) | 857 | gdth_ha_str *ha) |
| 858 | { | 858 | { |
| 859 | register gdt6_dpram_str __iomem *dp6_ptr; | 859 | register gdt6_dpram_str __iomem *dp6_ptr; |
| @@ -1237,7 +1237,7 @@ static int gdth_init_pci(struct pci_dev *pdev, gdth_pci_str *pcistr, | |||
| 1237 | 1237 | ||
| 1238 | /* controller protocol functions */ | 1238 | /* controller protocol functions */ |
| 1239 | 1239 | ||
| 1240 | static void __init gdth_enable_int(gdth_ha_str *ha) | 1240 | static void __devinit gdth_enable_int(gdth_ha_str *ha) |
| 1241 | { | 1241 | { |
| 1242 | ulong flags; | 1242 | ulong flags; |
| 1243 | gdt2_dpram_str __iomem *dp2_ptr; | 1243 | gdt2_dpram_str __iomem *dp2_ptr; |
| @@ -1553,7 +1553,7 @@ static int gdth_internal_cmd(gdth_ha_str *ha, unchar service, ushort opcode, | |||
| 1553 | 1553 | ||
| 1554 | /* search for devices */ | 1554 | /* search for devices */ |
| 1555 | 1555 | ||
| 1556 | static int __init gdth_search_drives(gdth_ha_str *ha) | 1556 | static int __devinit gdth_search_drives(gdth_ha_str *ha) |
| 1557 | { | 1557 | { |
| 1558 | ushort cdev_cnt, i; | 1558 | ushort cdev_cnt, i; |
| 1559 | int ok; | 1559 | int ok; |
| @@ -4935,7 +4935,7 @@ static int __init gdth_eisa_probe_one(ushort eisa_slot) | |||
| 4935 | #endif /* CONFIG_EISA */ | 4935 | #endif /* CONFIG_EISA */ |
| 4936 | 4936 | ||
| 4937 | #ifdef CONFIG_PCI | 4937 | #ifdef CONFIG_PCI |
| 4938 | static int gdth_pci_probe_one(gdth_pci_str *pcistr, | 4938 | static int __devinit gdth_pci_probe_one(gdth_pci_str *pcistr, |
| 4939 | gdth_ha_str **ha_out) | 4939 | gdth_ha_str **ha_out) |
| 4940 | { | 4940 | { |
| 4941 | struct Scsi_Host *shp; | 4941 | struct Scsi_Host *shp; |
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 71562689116f..e3a5ad5ef1d6 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
| @@ -692,7 +692,7 @@ static int pl010_probe(struct amba_device *dev, void *id) | |||
| 692 | goto free; | 692 | goto free; |
| 693 | } | 693 | } |
| 694 | 694 | ||
| 695 | uap->clk = clk_get(&dev->dev, "UARTCLK"); | 695 | uap->clk = clk_get(&dev->dev, NULL); |
| 696 | if (IS_ERR(uap->clk)) { | 696 | if (IS_ERR(uap->clk)) { |
| 697 | ret = PTR_ERR(uap->clk); | 697 | ret = PTR_ERR(uap->clk); |
| 698 | goto unmap; | 698 | goto unmap; |
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index b7180046f8db..8b2b9700f3e4 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c | |||
| @@ -756,7 +756,7 @@ static int pl011_probe(struct amba_device *dev, void *id) | |||
| 756 | goto free; | 756 | goto free; |
| 757 | } | 757 | } |
| 758 | 758 | ||
| 759 | uap->clk = clk_get(&dev->dev, "UARTCLK"); | 759 | uap->clk = clk_get(&dev->dev, NULL); |
| 760 | if (IS_ERR(uap->clk)) { | 760 | if (IS_ERR(uap->clk)) { |
| 761 | ret = PTR_ERR(uap->clk); | 761 | ret = PTR_ERR(uap->clk); |
| 762 | goto unmap; | 762 | goto unmap; |
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 8ea314bc00c1..f6e3b86bb0be 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <mach/hardware.h> | 48 | #include <mach/hardware.h> |
| 49 | #include <asm/irq.h> | 49 | #include <asm/irq.h> |
| 50 | #include <mach/pxa-regs.h> | 50 | #include <mach/pxa-regs.h> |
| 51 | #include <mach/regs-uart.h> | ||
| 51 | 52 | ||
| 52 | 53 | ||
| 53 | struct uart_pxa_port { | 54 | struct uart_pxa_port { |
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 61dc8b3daa26..a7bf024a8286 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c | |||
| @@ -41,9 +41,10 @@ | |||
| 41 | #include <linux/tty_flip.h> | 41 | #include <linux/tty_flip.h> |
| 42 | #include <linux/serial_core.h> | 42 | #include <linux/serial_core.h> |
| 43 | #include <linux/serial.h> | 43 | #include <linux/serial.h> |
| 44 | #include <linux/io.h> | ||
| 44 | 45 | ||
| 45 | #include <asm/io.h> | ||
| 46 | #include <asm/irq.h> | 46 | #include <asm/irq.h> |
| 47 | #include <mach/hardware.h> | ||
| 47 | 48 | ||
| 48 | #define DEV_MAJOR 204 | 49 | #define DEV_MAJOR 204 |
| 49 | #define DEV_MINOR 16 | 50 | #define DEV_MINOR 16 |
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c index 6a3f8fb0c9dd..3317148a4b93 100644 --- a/drivers/serial/uartlite.c +++ b/drivers/serial/uartlite.c | |||
| @@ -286,8 +286,8 @@ static void ulite_release_port(struct uart_port *port) | |||
| 286 | 286 | ||
| 287 | static int ulite_request_port(struct uart_port *port) | 287 | static int ulite_request_port(struct uart_port *port) |
| 288 | { | 288 | { |
| 289 | pr_debug("ulite console: port=%p; port->mapbase=%x\n", | 289 | pr_debug("ulite console: port=%p; port->mapbase=%llx\n", |
| 290 | port, port->mapbase); | 290 | port, (unsigned long long) port->mapbase); |
| 291 | 291 | ||
| 292 | if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) { | 292 | if (!request_mem_region(port->mapbase, ULITE_REGION, "uartlite")) { |
| 293 | dev_err(port->dev, "Memory region busy\n"); | 293 | dev_err(port->dev, "Memory region busy\n"); |
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c index 87b73e0169c5..b02f25c702fd 100644 --- a/drivers/spi/au1550_spi.c +++ b/drivers/spi/au1550_spi.c | |||
| @@ -369,10 +369,23 @@ static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t) | |||
| 369 | dma_rx_addr = t->rx_dma; | 369 | dma_rx_addr = t->rx_dma; |
| 370 | 370 | ||
| 371 | /* | 371 | /* |
| 372 | * check if buffers are already dma mapped, map them otherwise | 372 | * check if buffers are already dma mapped, map them otherwise: |
| 373 | * - first map the TX buffer, so cache data gets written to memory | ||
| 374 | * - then map the RX buffer, so that cache entries (with | ||
| 375 | * soon-to-be-stale data) get removed | ||
| 373 | * use rx buffer in place of tx if tx buffer was not provided | 376 | * use rx buffer in place of tx if tx buffer was not provided |
| 374 | * use temp rx buffer (preallocated or realloc to fit) for rx dma | 377 | * use temp rx buffer (preallocated or realloc to fit) for rx dma |
| 375 | */ | 378 | */ |
| 379 | if (t->tx_buf) { | ||
| 380 | if (t->tx_dma == 0) { /* if DMA_ADDR_INVALID, map it */ | ||
| 381 | dma_tx_addr = dma_map_single(hw->dev, | ||
| 382 | (void *)t->tx_buf, | ||
| 383 | t->len, DMA_TO_DEVICE); | ||
| 384 | if (dma_mapping_error(hw->dev, dma_tx_addr)) | ||
| 385 | dev_err(hw->dev, "tx dma map error\n"); | ||
| 386 | } | ||
| 387 | } | ||
| 388 | |||
| 376 | if (t->rx_buf) { | 389 | if (t->rx_buf) { |
| 377 | if (t->rx_dma == 0) { /* if DMA_ADDR_INVALID, map it */ | 390 | if (t->rx_dma == 0) { /* if DMA_ADDR_INVALID, map it */ |
| 378 | dma_rx_addr = dma_map_single(hw->dev, | 391 | dma_rx_addr = dma_map_single(hw->dev, |
| @@ -396,15 +409,8 @@ static int au1550_spi_dma_txrxb(struct spi_device *spi, struct spi_transfer *t) | |||
| 396 | dma_sync_single_for_device(hw->dev, dma_rx_addr, | 409 | dma_sync_single_for_device(hw->dev, dma_rx_addr, |
| 397 | t->len, DMA_FROM_DEVICE); | 410 | t->len, DMA_FROM_DEVICE); |
| 398 | } | 411 | } |
| 399 | if (t->tx_buf) { | 412 | |
| 400 | if (t->tx_dma == 0) { /* if DMA_ADDR_INVALID, map it */ | 413 | if (!t->tx_buf) { |
| 401 | dma_tx_addr = dma_map_single(hw->dev, | ||
| 402 | (void *)t->tx_buf, | ||
| 403 | t->len, DMA_TO_DEVICE); | ||
| 404 | if (dma_mapping_error(hw->dev, dma_tx_addr)) | ||
| 405 | dev_err(hw->dev, "tx dma map error\n"); | ||
| 406 | } | ||
| 407 | } else { | ||
| 408 | dma_sync_single_for_device(hw->dev, dma_rx_addr, | 414 | dma_sync_single_for_device(hw->dev, dma_rx_addr, |
| 409 | t->len, DMA_BIDIRECTIONAL); | 415 | t->len, DMA_BIDIRECTIONAL); |
| 410 | hw->tx = hw->rx; | 416 | hw->tx = hw->rx; |
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c index 0debe11b67b4..3b97803e1d11 100644 --- a/drivers/spi/mpc52xx_psc_spi.c +++ b/drivers/spi/mpc52xx_psc_spi.c | |||
| @@ -142,6 +142,7 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi, | |||
| 142 | unsigned rfalarm; | 142 | unsigned rfalarm; |
| 143 | unsigned send_at_once = MPC52xx_PSC_BUFSIZE; | 143 | unsigned send_at_once = MPC52xx_PSC_BUFSIZE; |
| 144 | unsigned recv_at_once; | 144 | unsigned recv_at_once; |
| 145 | int last_block = 0; | ||
| 145 | 146 | ||
| 146 | if (!t->tx_buf && !t->rx_buf && t->len) | 147 | if (!t->tx_buf && !t->rx_buf && t->len) |
| 147 | return -EINVAL; | 148 | return -EINVAL; |
| @@ -151,15 +152,17 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi, | |||
| 151 | while (rb < t->len) { | 152 | while (rb < t->len) { |
| 152 | if (t->len - rb > MPC52xx_PSC_BUFSIZE) { | 153 | if (t->len - rb > MPC52xx_PSC_BUFSIZE) { |
| 153 | rfalarm = MPC52xx_PSC_RFALARM; | 154 | rfalarm = MPC52xx_PSC_RFALARM; |
| 155 | last_block = 0; | ||
| 154 | } else { | 156 | } else { |
| 155 | send_at_once = t->len - sb; | 157 | send_at_once = t->len - sb; |
| 156 | rfalarm = MPC52xx_PSC_BUFSIZE - (t->len - rb); | 158 | rfalarm = MPC52xx_PSC_BUFSIZE - (t->len - rb); |
| 159 | last_block = 1; | ||
| 157 | } | 160 | } |
| 158 | 161 | ||
| 159 | dev_dbg(&spi->dev, "send %d bytes...\n", send_at_once); | 162 | dev_dbg(&spi->dev, "send %d bytes...\n", send_at_once); |
| 160 | for (; send_at_once; sb++, send_at_once--) { | 163 | for (; send_at_once; sb++, send_at_once--) { |
| 161 | /* set EOF flag before the last word is sent */ | 164 | /* set EOF flag before the last word is sent */ |
| 162 | if (send_at_once == 1) | 165 | if (send_at_once == 1 && last_block) |
| 163 | out_8(&psc->ircr2, 0x01); | 166 | out_8(&psc->ircr2, 0x01); |
| 164 | 167 | ||
| 165 | if (tx_buf) | 168 | if (tx_buf) |
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index cf12f2d84be2..6104f461a3cd 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
| @@ -32,8 +32,8 @@ | |||
| 32 | #include <asm/io.h> | 32 | #include <asm/io.h> |
| 33 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
| 34 | #include <asm/delay.h> | 34 | #include <asm/delay.h> |
| 35 | #include <asm/dma.h> | ||
| 36 | 35 | ||
| 36 | #include <mach/dma.h> | ||
| 37 | #include <mach/hardware.h> | 37 | #include <mach/hardware.h> |
| 38 | #include <mach/pxa-regs.h> | 38 | #include <mach/pxa-regs.h> |
| 39 | #include <mach/regs-ssp.h> | 39 | #include <mach/regs-ssp.h> |
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 0b4db0ce78d6..269a55ec52ef 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c | |||
| @@ -1456,7 +1456,7 @@ static int __init spi_imx_probe(struct platform_device *pdev) | |||
| 1456 | struct device *dev = &pdev->dev; | 1456 | struct device *dev = &pdev->dev; |
| 1457 | struct spi_imx_master *platform_info; | 1457 | struct spi_imx_master *platform_info; |
| 1458 | struct spi_master *master; | 1458 | struct spi_master *master; |
| 1459 | struct driver_data *drv_data = NULL; | 1459 | struct driver_data *drv_data; |
| 1460 | struct resource *res; | 1460 | struct resource *res; |
| 1461 | int irq, status = 0; | 1461 | int irq, status = 0; |
| 1462 | 1462 | ||
| @@ -1467,14 +1467,6 @@ static int __init spi_imx_probe(struct platform_device *pdev) | |||
| 1467 | goto err_no_pdata; | 1467 | goto err_no_pdata; |
| 1468 | } | 1468 | } |
| 1469 | 1469 | ||
| 1470 | drv_data->clk = clk_get(&pdev->dev, "perclk2"); | ||
| 1471 | if (IS_ERR(drv_data->clk)) { | ||
| 1472 | dev_err(&pdev->dev, "probe - cannot get get\n"); | ||
| 1473 | status = PTR_ERR(drv_data->clk); | ||
| 1474 | goto err_no_clk; | ||
| 1475 | } | ||
| 1476 | clk_enable(drv_data->clk); | ||
| 1477 | |||
| 1478 | /* Allocate master with space for drv_data */ | 1470 | /* Allocate master with space for drv_data */ |
| 1479 | master = spi_alloc_master(dev, sizeof(struct driver_data)); | 1471 | master = spi_alloc_master(dev, sizeof(struct driver_data)); |
| 1480 | if (!master) { | 1472 | if (!master) { |
| @@ -1495,6 +1487,14 @@ static int __init spi_imx_probe(struct platform_device *pdev) | |||
| 1495 | 1487 | ||
| 1496 | drv_data->dummy_dma_buf = SPI_DUMMY_u32; | 1488 | drv_data->dummy_dma_buf = SPI_DUMMY_u32; |
| 1497 | 1489 | ||
| 1490 | drv_data->clk = clk_get(&pdev->dev, "perclk2"); | ||
| 1491 | if (IS_ERR(drv_data->clk)) { | ||
| 1492 | dev_err(&pdev->dev, "probe - cannot get clock\n"); | ||
| 1493 | status = PTR_ERR(drv_data->clk); | ||
| 1494 | goto err_no_clk; | ||
| 1495 | } | ||
| 1496 | clk_enable(drv_data->clk); | ||
| 1497 | |||
| 1498 | /* Find and map resources */ | 1498 | /* Find and map resources */ |
| 1499 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1499 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 1500 | if (!res) { | 1500 | if (!res) { |
| @@ -1630,12 +1630,13 @@ err_no_iomap: | |||
| 1630 | kfree(drv_data->ioarea); | 1630 | kfree(drv_data->ioarea); |
| 1631 | 1631 | ||
| 1632 | err_no_iores: | 1632 | err_no_iores: |
| 1633 | spi_master_put(master); | ||
| 1634 | |||
| 1635 | err_no_pdata: | ||
| 1636 | clk_disable(drv_data->clk); | 1633 | clk_disable(drv_data->clk); |
| 1637 | clk_put(drv_data->clk); | 1634 | clk_put(drv_data->clk); |
| 1635 | |||
| 1638 | err_no_clk: | 1636 | err_no_clk: |
| 1637 | spi_master_put(master); | ||
| 1638 | |||
| 1639 | err_no_pdata: | ||
| 1639 | err_no_mem: | 1640 | err_no_mem: |
| 1640 | return status; | 1641 | return status; |
| 1641 | } | 1642 | } |
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index c252cbac00f1..256d18395a23 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
| 29 | 29 | ||
| 30 | #include <mach/regs-gpio.h> | 30 | #include <mach/regs-gpio.h> |
| 31 | #include <asm/plat-s3c24xx/regs-spi.h> | 31 | #include <plat/regs-spi.h> |
| 32 | #include <mach/spi.h> | 32 | #include <mach/spi.h> |
| 33 | 33 | ||
| 34 | struct s3c24xx_spi { | 34 | struct s3c24xx_spi { |
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c index cc1f647f579b..f2447a5476bb 100644 --- a/drivers/spi/spi_s3c24xx_gpio.c +++ b/drivers/spi/spi_s3c24xx_gpio.c | |||
| @@ -34,7 +34,7 @@ struct s3c2410_spigpio { | |||
| 34 | 34 | ||
| 35 | static inline struct s3c2410_spigpio *spidev_to_sg(struct spi_device *spi) | 35 | static inline struct s3c2410_spigpio *spidev_to_sg(struct spi_device *spi) |
| 36 | { | 36 | { |
| 37 | return spi->controller_data; | 37 | return spi_master_get_devdata(spi->master); |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | static inline void setsck(struct spi_device *dev, int on) | 40 | static inline void setsck(struct spi_device *dev, int on) |
| @@ -118,6 +118,7 @@ static int s3c2410_spigpio_probe(struct platform_device *dev) | |||
| 118 | /* setup spi bitbang adaptor */ | 118 | /* setup spi bitbang adaptor */ |
| 119 | sp->bitbang.master = spi_master_get(master); | 119 | sp->bitbang.master = spi_master_get(master); |
| 120 | sp->bitbang.master->bus_num = info->bus_num; | 120 | sp->bitbang.master->bus_num = info->bus_num; |
| 121 | sp->bitbang.master->num_chipselect = info->num_chipselect; | ||
| 121 | sp->bitbang.chipselect = s3c2410_spigpio_chipselect; | 122 | sp->bitbang.chipselect = s3c2410_spigpio_chipselect; |
| 122 | 123 | ||
| 123 | sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0; | 124 | sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0; |
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 89a43755a453..5d869c4d3eb2 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c | |||
| @@ -597,7 +597,9 @@ static int spidev_probe(struct spi_device *spi) | |||
| 597 | } | 597 | } |
| 598 | mutex_unlock(&device_list_lock); | 598 | mutex_unlock(&device_list_lock); |
| 599 | 599 | ||
| 600 | if (status != 0) | 600 | if (status == 0) |
| 601 | spi_set_drvdata(spi, spidev); | ||
| 602 | else | ||
| 601 | kfree(spidev); | 603 | kfree(spidev); |
| 602 | 604 | ||
| 603 | return status; | 605 | return status; |
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c index 1fe8b44787b3..b3408ff39fba 100644 --- a/drivers/usb/gadget/fsl_qe_udc.c +++ b/drivers/usb/gadget/fsl_qe_udc.c | |||
| @@ -2363,6 +2363,9 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) | |||
| 2363 | nuke(loop_ep, -ESHUTDOWN); | 2363 | nuke(loop_ep, -ESHUTDOWN); |
| 2364 | spin_unlock_irqrestore(&udc_controller->lock, flags); | 2364 | spin_unlock_irqrestore(&udc_controller->lock, flags); |
| 2365 | 2365 | ||
| 2366 | /* report disconnect; the controller is already quiesced */ | ||
| 2367 | driver->disconnect(&udc_controller->gadget); | ||
| 2368 | |||
| 2366 | /* unbind gadget and unhook driver. */ | 2369 | /* unbind gadget and unhook driver. */ |
| 2367 | driver->unbind(&udc_controller->gadget); | 2370 | driver->unbind(&udc_controller->gadget); |
| 2368 | udc_controller->gadget.dev.driver = NULL; | 2371 | udc_controller->gadget.dev.driver = NULL; |
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c index 091bb55c9aa7..f3c6703cffda 100644 --- a/drivers/usb/gadget/fsl_usb2_udc.c +++ b/drivers/usb/gadget/fsl_usb2_udc.c | |||
| @@ -1836,6 +1836,9 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) | |||
| 1836 | nuke(loop_ep, -ESHUTDOWN); | 1836 | nuke(loop_ep, -ESHUTDOWN); |
| 1837 | spin_unlock_irqrestore(&udc_controller->lock, flags); | 1837 | spin_unlock_irqrestore(&udc_controller->lock, flags); |
| 1838 | 1838 | ||
| 1839 | /* report disconnect; the controller is already quiesced */ | ||
| 1840 | driver->disconnect(&udc_controller->gadget); | ||
| 1841 | |||
| 1839 | /* unbind gadget and unhook driver. */ | 1842 | /* unbind gadget and unhook driver. */ |
| 1840 | driver->unbind(&udc_controller->gadget); | 1843 | driver->unbind(&udc_controller->gadget); |
| 1841 | udc_controller->gadget.dev.driver = NULL; | 1844 | udc_controller->gadget.dev.driver = NULL; |
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index a4790f3c7cd3..8c5026be79d4 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
| @@ -141,7 +141,11 @@ static int is_vbus_present(void) | |||
| 141 | 141 | ||
| 142 | if (mach->gpio_vbus) { | 142 | if (mach->gpio_vbus) { |
| 143 | int value = gpio_get_value(mach->gpio_vbus); | 143 | int value = gpio_get_value(mach->gpio_vbus); |
| 144 | return mach->gpio_vbus_inverted ? !value : value; | 144 | |
| 145 | if (mach->gpio_vbus_inverted) | ||
| 146 | return !value; | ||
| 147 | else | ||
| 148 | return !!value; | ||
| 145 | } | 149 | } |
| 146 | if (mach->udc_is_connected) | 150 | if (mach->udc_is_connected) |
| 147 | return mach->udc_is_connected(); | 151 | return mach->udc_is_connected(); |
| @@ -982,7 +986,7 @@ static int pxa25x_udc_vbus_session(struct usb_gadget *_gadget, int is_active) | |||
| 982 | struct pxa25x_udc *udc; | 986 | struct pxa25x_udc *udc; |
| 983 | 987 | ||
| 984 | udc = container_of(_gadget, struct pxa25x_udc, gadget); | 988 | udc = container_of(_gadget, struct pxa25x_udc, gadget); |
| 985 | udc->vbus = (is_active != 0); | 989 | udc->vbus = is_active; |
| 986 | DMSG("vbus %s\n", is_active ? "supplied" : "inactive"); | 990 | DMSG("vbus %s\n", is_active ? "supplied" : "inactive"); |
| 987 | pullup(udc); | 991 | pullup(udc); |
| 988 | return 0; | 992 | return 0; |
| @@ -1399,12 +1403,8 @@ lubbock_vbus_irq(int irq, void *_dev) | |||
| 1399 | static irqreturn_t udc_vbus_irq(int irq, void *_dev) | 1403 | static irqreturn_t udc_vbus_irq(int irq, void *_dev) |
| 1400 | { | 1404 | { |
| 1401 | struct pxa25x_udc *dev = _dev; | 1405 | struct pxa25x_udc *dev = _dev; |
| 1402 | int vbus = gpio_get_value(dev->mach->gpio_vbus); | ||
| 1403 | 1406 | ||
| 1404 | if (dev->mach->gpio_vbus_inverted) | 1407 | pxa25x_udc_vbus_session(&dev->gadget, is_vbus_present()); |
| 1405 | vbus = !vbus; | ||
| 1406 | |||
| 1407 | pxa25x_udc_vbus_session(&dev->gadget, vbus); | ||
| 1408 | return IRQ_HANDLED; | 1408 | return IRQ_HANDLED; |
| 1409 | } | 1409 | } |
| 1410 | 1410 | ||
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index 00ba06b44752..8d8d65165983 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c | |||
| @@ -53,8 +53,8 @@ | |||
| 53 | #include <mach/hardware.h> | 53 | #include <mach/hardware.h> |
| 54 | #include <mach/regs-gpio.h> | 54 | #include <mach/regs-gpio.h> |
| 55 | 55 | ||
| 56 | #include <asm/plat-s3c24xx/regs-udc.h> | 56 | #include <plat/regs-udc.h> |
| 57 | #include <asm/plat-s3c24xx/udc.h> | 57 | #include <plat/udc.h> |
| 58 | 58 | ||
| 59 | 59 | ||
| 60 | #include "s3c2410_udc.h" | 60 | #include "s3c2410_udc.h" |
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 5416cf969005..9d487908012e 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
| @@ -33,8 +33,9 @@ | |||
| 33 | /* | 33 | /* |
| 34 | * Implement Orion USB controller specification guidelines | 34 | * Implement Orion USB controller specification guidelines |
| 35 | */ | 35 | */ |
| 36 | static void orion_usb_setup(struct usb_hcd *hcd) | 36 | static void orion_usb_phy_v1_setup(struct usb_hcd *hcd) |
| 37 | { | 37 | { |
| 38 | /* The below GLs are according to the Orion Errata document */ | ||
| 38 | /* | 39 | /* |
| 39 | * Clear interrupt cause and mask | 40 | * Clear interrupt cause and mask |
| 40 | */ | 41 | */ |
| @@ -258,9 +259,19 @@ static int __init ehci_orion_drv_probe(struct platform_device *pdev) | |||
| 258 | ehci_orion_conf_mbus_windows(hcd, pd->dram); | 259 | ehci_orion_conf_mbus_windows(hcd, pd->dram); |
| 259 | 260 | ||
| 260 | /* | 261 | /* |
| 261 | * setup Orion USB controller | 262 | * setup Orion USB controller. |
| 262 | */ | 263 | */ |
| 263 | orion_usb_setup(hcd); | 264 | switch (pd->phy_version) { |
| 265 | case EHCI_PHY_NA: /* dont change USB phy settings */ | ||
| 266 | break; | ||
| 267 | case EHCI_PHY_ORION: | ||
| 268 | orion_usb_phy_v1_setup(hcd); | ||
| 269 | break; | ||
| 270 | case EHCI_PHY_DD: | ||
| 271 | case EHCI_PHY_KW: | ||
| 272 | default: | ||
| 273 | printk(KERN_WARNING "Orion ehci -USB phy version isn't supported.\n"); | ||
| 274 | } | ||
| 264 | 275 | ||
| 265 | err = usb_add_hcd(hcd, irq, IRQF_SHARED | IRQF_DISABLED); | 276 | err = usb_add_hcd(hcd, irq, IRQF_SHARED | IRQF_DISABLED); |
| 266 | if (err) | 277 | if (err) |
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 9d0ea573aef6..36864f958444 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c | |||
| @@ -169,18 +169,21 @@ static int ehci_pci_setup(struct usb_hcd *hcd) | |||
| 169 | } | 169 | } |
| 170 | break; | 170 | break; |
| 171 | case PCI_VENDOR_ID_ATI: | 171 | case PCI_VENDOR_ID_ATI: |
| 172 | /* SB700 old version has a bug in EHCI controller, | 172 | /* SB600 and old version of SB700 have a bug in EHCI controller, |
| 173 | * which causes usb devices lose response in some cases. | 173 | * which causes usb devices lose response in some cases. |
| 174 | */ | 174 | */ |
| 175 | if (pdev->device == 0x4396) { | 175 | if ((pdev->device == 0x4386) || (pdev->device == 0x4396)) { |
| 176 | p_smbus = pci_get_device(PCI_VENDOR_ID_ATI, | 176 | p_smbus = pci_get_device(PCI_VENDOR_ID_ATI, |
| 177 | PCI_DEVICE_ID_ATI_SBX00_SMBUS, | 177 | PCI_DEVICE_ID_ATI_SBX00_SMBUS, |
| 178 | NULL); | 178 | NULL); |
| 179 | if (!p_smbus) | 179 | if (!p_smbus) |
| 180 | break; | 180 | break; |
| 181 | rev = p_smbus->revision; | 181 | rev = p_smbus->revision; |
| 182 | if ((rev == 0x3a) || (rev == 0x3b)) { | 182 | if ((pdev->device == 0x4386) || (rev == 0x3a) |
| 183 | || (rev == 0x3b)) { | ||
| 183 | u8 tmp; | 184 | u8 tmp; |
| 185 | ehci_info(ehci, "applying AMD SB600/SB700 USB " | ||
| 186 | "freeze workaround\n"); | ||
| 184 | pci_read_config_byte(pdev, 0x53, &tmp); | 187 | pci_read_config_byte(pdev, 0x53, &tmp); |
| 185 | pci_write_config_byte(pdev, 0x53, tmp | (1<<3)); | 188 | pci_write_config_byte(pdev, 0x53, tmp | (1<<3)); |
| 186 | } | 189 | } |
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index b11798d17ae5..c7d4b5a06bdb 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
| @@ -183,16 +183,14 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action) | |||
| 183 | * the async ring; just the I/O watchdog. Note that if a | 183 | * the async ring; just the I/O watchdog. Note that if a |
| 184 | * SHRINK were pending, OFF would never be requested. | 184 | * SHRINK were pending, OFF would never be requested. |
| 185 | */ | 185 | */ |
| 186 | enum ehci_timer_action oldactions = ehci->actions; | 186 | if (timer_pending(&ehci->watchdog) |
| 187 | && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF)) | ||
| 188 | & ehci->actions)) | ||
| 189 | return; | ||
| 187 | 190 | ||
| 188 | if (!test_and_set_bit (action, &ehci->actions)) { | 191 | if (!test_and_set_bit (action, &ehci->actions)) { |
| 189 | unsigned long t; | 192 | unsigned long t; |
| 190 | 193 | ||
| 191 | if (timer_pending(&ehci->watchdog) | ||
| 192 | && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF)) | ||
| 193 | & oldactions)) | ||
| 194 | return; | ||
| 195 | |||
| 196 | switch (action) { | 194 | switch (action) { |
| 197 | case TIMER_IO_WATCHDOG: | 195 | case TIMER_IO_WATCHDOG: |
| 198 | t = EHCI_IO_JIFFIES; | 196 | t = EHCI_IO_JIFFIES; |
| @@ -208,7 +206,7 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action) | |||
| 208 | t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1; | 206 | t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1; |
| 209 | break; | 207 | break; |
| 210 | } | 208 | } |
| 211 | mod_timer(&ehci->watchdog, round_jiffies(t + jiffies)); | 209 | mod_timer(&ehci->watchdog, t + jiffies); |
| 212 | } | 210 | } |
| 213 | } | 211 | } |
| 214 | 212 | ||
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c index 5b20de130e08..5b95009d2fbb 100644 --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c | |||
| @@ -135,6 +135,7 @@ static int usb_console_setup(struct console *co, char *options) | |||
| 135 | err("no more memory"); | 135 | err("no more memory"); |
| 136 | goto reset_open_count; | 136 | goto reset_open_count; |
| 137 | } | 137 | } |
| 138 | kref_init(&tty->kref); | ||
| 138 | termios = kzalloc(sizeof(*termios), GFP_KERNEL); | 139 | termios = kzalloc(sizeof(*termios), GFP_KERNEL); |
| 139 | if (!termios) { | 140 | if (!termios) { |
| 140 | retval = -ENOMEM; | 141 | retval = -ENOMEM; |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 6fa1ec441b61..809697b3c7fc 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -224,6 +224,7 @@ static int option_send_setup(struct tty_struct *tty, struct usb_serial_port *po | |||
| 224 | #define ONDA_VENDOR_ID 0x19d2 | 224 | #define ONDA_VENDOR_ID 0x19d2 |
| 225 | #define ONDA_PRODUCT_MSA501HS 0x0001 | 225 | #define ONDA_PRODUCT_MSA501HS 0x0001 |
| 226 | #define ONDA_PRODUCT_ET502HS 0x0002 | 226 | #define ONDA_PRODUCT_ET502HS 0x0002 |
| 227 | #define ONDA_PRODUCT_MT503HS 0x0200 | ||
| 227 | 228 | ||
| 228 | #define BANDRICH_VENDOR_ID 0x1A8D | 229 | #define BANDRICH_VENDOR_ID 0x1A8D |
| 229 | #define BANDRICH_PRODUCT_C100_1 0x1002 | 230 | #define BANDRICH_PRODUCT_C100_1 0x1002 |
| @@ -413,6 +414,40 @@ static struct usb_device_id option_ids[] = { | |||
| 413 | { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) }, | 414 | { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) }, |
| 414 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) }, | 415 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) }, |
| 415 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) }, | 416 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) }, |
| 417 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0003) }, | ||
| 418 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0004) }, | ||
| 419 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0005) }, | ||
| 420 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0006) }, | ||
| 421 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0007) }, | ||
| 422 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0008) }, | ||
| 423 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0009) }, | ||
| 424 | { USB_DEVICE(ONDA_VENDOR_ID, 0x000a) }, | ||
| 425 | { USB_DEVICE(ONDA_VENDOR_ID, 0x000b) }, | ||
| 426 | { USB_DEVICE(ONDA_VENDOR_ID, 0x000c) }, | ||
| 427 | { USB_DEVICE(ONDA_VENDOR_ID, 0x000d) }, | ||
| 428 | { USB_DEVICE(ONDA_VENDOR_ID, 0x000e) }, | ||
| 429 | { USB_DEVICE(ONDA_VENDOR_ID, 0x000f) }, | ||
| 430 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0010) }, | ||
| 431 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0011) }, | ||
| 432 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0012) }, | ||
| 433 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0013) }, | ||
| 434 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0014) }, | ||
| 435 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0015) }, | ||
| 436 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0016) }, | ||
| 437 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0017) }, | ||
| 438 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0018) }, | ||
| 439 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0019) }, | ||
| 440 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0020) }, | ||
| 441 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0021) }, | ||
| 442 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0022) }, | ||
| 443 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0023) }, | ||
| 444 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0024) }, | ||
| 445 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0025) }, | ||
| 446 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0026) }, | ||
| 447 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0027) }, | ||
| 448 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0028) }, | ||
| 449 | { USB_DEVICE(ONDA_VENDOR_ID, 0x0029) }, | ||
| 450 | { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MT503HS) }, | ||
| 416 | { USB_DEVICE(YISO_VENDOR_ID, YISO_PRODUCT_U893) }, | 451 | { USB_DEVICE(YISO_VENDOR_ID, YISO_PRODUCT_U893) }, |
| 417 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, | 452 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, |
| 418 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, | 453 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 6da9a7a962a8..e61f2bfc64ad 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -318,6 +318,18 @@ UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x0101, | |||
| 318 | US_SC_SCSI, US_PR_KARMA, rio_karma_init, 0), | 318 | US_SC_SCSI, US_PR_KARMA, rio_karma_init, 0), |
| 319 | #endif | 319 | #endif |
| 320 | 320 | ||
| 321 | /* Reported by Tamas Kerecsen <kerecsen@bigfoot.com> | ||
| 322 | * Obviously the PROM has not been customized by the VAR; | ||
| 323 | * the Vendor and Product string descriptors are: | ||
| 324 | * Generic Mass Storage (PROTOTYPE--Remember to change idVendor) | ||
| 325 | * Generic Manufacturer (PROTOTYPE--Remember to change idVendor) | ||
| 326 | */ | ||
| 327 | UNUSUAL_DEV( 0x045e, 0xffff, 0x0000, 0x0000, | ||
| 328 | "Mitac", | ||
| 329 | "GPS", | ||
| 330 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 331 | US_FL_MAX_SECTORS_64 ), | ||
| 332 | |||
| 321 | /* | 333 | /* |
| 322 | * This virtual floppy is found in Sun equipment (x4600, x4200m2, etc.) | 334 | * This virtual floppy is found in Sun equipment (x4600, x4200m2, etc.) |
| 323 | * Reported by Pete Zaitcev <zaitcev@redhat.com> | 335 | * Reported by Pete Zaitcev <zaitcev@redhat.com> |
| @@ -377,6 +389,13 @@ UNUSUAL_DEV( 0x04b0, 0x0401, 0x0200, 0x0200, | |||
| 377 | US_SC_DEVICE, US_PR_DEVICE, NULL, | 389 | US_SC_DEVICE, US_PR_DEVICE, NULL, |
| 378 | US_FL_FIX_CAPACITY), | 390 | US_FL_FIX_CAPACITY), |
| 379 | 391 | ||
| 392 | /* Reported by Tobias Kunze Briseno <t-linux@fictive.com> */ | ||
| 393 | UNUSUAL_DEV( 0x04b0, 0x0403, 0x0200, 0x0200, | ||
| 394 | "NIKON", | ||
| 395 | "NIKON DSC D2H", | ||
| 396 | US_SC_DEVICE, US_PR_DEVICE, NULL, | ||
| 397 | US_FL_FIX_CAPACITY), | ||
| 398 | |||
| 380 | /* Reported by Milinevsky Dmitry <niam.niam@gmail.com> */ | 399 | /* Reported by Milinevsky Dmitry <niam.niam@gmail.com> */ |
| 381 | UNUSUAL_DEV( 0x04b0, 0x0409, 0x0100, 0x0100, | 400 | UNUSUAL_DEV( 0x04b0, 0x0409, 0x0100, 0x0100, |
| 382 | "NIKON", | 401 | "NIKON", |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 3f3ce13fef43..237301849075 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -362,7 +362,7 @@ endchoice | |||
| 362 | 362 | ||
| 363 | config FB_ACORN | 363 | config FB_ACORN |
| 364 | bool "Acorn VIDC support" | 364 | bool "Acorn VIDC support" |
| 365 | depends on (FB = y) && ARM && (ARCH_ACORN || ARCH_CLPS7500) | 365 | depends on (FB = y) && ARM && ARCH_ACORN |
| 366 | select FB_CFB_FILLRECT | 366 | select FB_CFB_FILLRECT |
| 367 | select FB_CFB_COPYAREA | 367 | select FB_CFB_COPYAREA |
| 368 | select FB_CFB_IMAGEBLIT | 368 | select FB_CFB_IMAGEBLIT |
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index a7a1c891bfa2..2ac52fd8cc11 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c | |||
| @@ -343,14 +343,14 @@ static int clcdfb_register(struct clcd_fb *fb) | |||
| 343 | { | 343 | { |
| 344 | int ret; | 344 | int ret; |
| 345 | 345 | ||
| 346 | fb->clk = clk_get(&fb->dev->dev, "CLCDCLK"); | 346 | fb->clk = clk_get(&fb->dev->dev, NULL); |
| 347 | if (IS_ERR(fb->clk)) { | 347 | if (IS_ERR(fb->clk)) { |
| 348 | ret = PTR_ERR(fb->clk); | 348 | ret = PTR_ERR(fb->clk); |
| 349 | goto out; | 349 | goto out; |
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | fb->fb.fix.mmio_start = fb->dev->res.start; | 352 | fb->fb.fix.mmio_start = fb->dev->res.start; |
| 353 | fb->fb.fix.mmio_len = SZ_4K; | 353 | fb->fb.fix.mmio_len = 4096; |
| 354 | 354 | ||
| 355 | fb->regs = ioremap(fb->fb.fix.mmio_start, fb->fb.fix.mmio_len); | 355 | fb->regs = ioremap(fb->fb.fix.mmio_start, fb->fb.fix.mmio_len); |
| 356 | if (!fb->regs) { | 356 | if (!fb->regs) { |
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c index 8718f7349d6b..a547e5d4c8bf 100644 --- a/drivers/video/aty/radeon_accel.c +++ b/drivers/video/aty/radeon_accel.c | |||
| @@ -174,12 +174,12 @@ static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo, | |||
| 174 | const struct fb_image *image, | 174 | const struct fb_image *image, |
| 175 | u32 fg, u32 bg) | 175 | u32 fg, u32 bg) |
| 176 | { | 176 | { |
| 177 | unsigned int src_bytes, dwords; | 177 | unsigned int dwords; |
| 178 | u32 *bits; | 178 | u32 *bits; |
| 179 | 179 | ||
| 180 | radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache, | 180 | radeonfb_set_creg(rinfo, DP_GUI_MASTER_CNTL, &rinfo->dp_gui_mc_cache, |
| 181 | rinfo->dp_gui_mc_base | | 181 | rinfo->dp_gui_mc_base | |
| 182 | GMC_BRUSH_NONE | | 182 | GMC_BRUSH_NONE | GMC_DST_CLIP_LEAVE | |
| 183 | GMC_SRC_DATATYPE_MONO_FG_BG | | 183 | GMC_SRC_DATATYPE_MONO_FG_BG | |
| 184 | ROP3_S | | 184 | ROP3_S | |
| 185 | GMC_BYTE_ORDER_MSB_TO_LSB | | 185 | GMC_BYTE_ORDER_MSB_TO_LSB | |
| @@ -189,9 +189,6 @@ static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo, | |||
| 189 | radeonfb_set_creg(rinfo, DP_SRC_FRGD_CLR, &rinfo->dp_src_fg_cache, fg); | 189 | radeonfb_set_creg(rinfo, DP_SRC_FRGD_CLR, &rinfo->dp_src_fg_cache, fg); |
| 190 | radeonfb_set_creg(rinfo, DP_SRC_BKGD_CLR, &rinfo->dp_src_bg_cache, bg); | 190 | radeonfb_set_creg(rinfo, DP_SRC_BKGD_CLR, &rinfo->dp_src_bg_cache, bg); |
| 191 | 191 | ||
| 192 | radeon_fifo_wait(rinfo, 1); | ||
| 193 | OUTREG(DST_Y_X, (image->dy << 16) | image->dx); | ||
| 194 | |||
| 195 | /* Ensure the dst cache is flushed and the engine idle before | 192 | /* Ensure the dst cache is flushed and the engine idle before |
| 196 | * issuing the operation. | 193 | * issuing the operation. |
| 197 | * | 194 | * |
| @@ -205,13 +202,19 @@ static void radeonfb_prim_imageblit(struct radeonfb_info *rinfo, | |||
| 205 | 202 | ||
| 206 | /* X here pads width to a multiple of 32 and uses the clipper to | 203 | /* X here pads width to a multiple of 32 and uses the clipper to |
| 207 | * adjust the result. Is that really necessary ? Things seem to | 204 | * adjust the result. Is that really necessary ? Things seem to |
| 208 | * work ok for me without that and the doco doesn't seem to imply | 205 | * work ok for me without that and the doco doesn't seem to imply] |
| 209 | * there is such a restriction. | 206 | * there is such a restriction. |
| 210 | */ | 207 | */ |
| 211 | OUTREG(DST_WIDTH_HEIGHT, (image->width << 16) | image->height); | 208 | radeon_fifo_wait(rinfo, 4); |
| 209 | OUTREG(SC_TOP_LEFT, (image->dy << 16) | image->dx); | ||
| 210 | OUTREG(SC_BOTTOM_RIGHT, ((image->dy + image->height) << 16) | | ||
| 211 | (image->dx + image->width)); | ||
| 212 | OUTREG(DST_Y_X, (image->dy << 16) | image->dx); | ||
| 213 | |||
| 214 | OUTREG(DST_HEIGHT_WIDTH, (image->height << 16) | ((image->width + 31) & ~31)); | ||
| 212 | 215 | ||
| 213 | src_bytes = (((image->width * image->depth) + 7) / 8) * image->height; | 216 | dwords = (image->width + 31) >> 5; |
| 214 | dwords = (src_bytes + 3) / 4; | 217 | dwords *= image->height; |
| 215 | bits = (u32*)(image->data); | 218 | bits = (u32*)(image->data); |
| 216 | 219 | ||
| 217 | while(dwords >= 8) { | 220 | while(dwords >= 8) { |
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 9a5821c65ebf..b3ffe8205d2b 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
| @@ -1875,6 +1875,7 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo) | |||
| 1875 | info->fbops = &radeonfb_ops; | 1875 | info->fbops = &radeonfb_ops; |
| 1876 | info->screen_base = rinfo->fb_base; | 1876 | info->screen_base = rinfo->fb_base; |
| 1877 | info->screen_size = rinfo->mapped_vram; | 1877 | info->screen_size = rinfo->mapped_vram; |
| 1878 | |||
| 1878 | /* Fill fix common fields */ | 1879 | /* Fill fix common fields */ |
| 1879 | strlcpy(info->fix.id, rinfo->name, sizeof(info->fix.id)); | 1880 | strlcpy(info->fix.id, rinfo->name, sizeof(info->fix.id)); |
| 1880 | info->fix.smem_start = rinfo->fb_base_phys; | 1881 | info->fix.smem_start = rinfo->fb_base_phys; |
| @@ -1889,8 +1890,25 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo) | |||
| 1889 | info->fix.mmio_len = RADEON_REGSIZE; | 1890 | info->fix.mmio_len = RADEON_REGSIZE; |
| 1890 | info->fix.accel = FB_ACCEL_ATI_RADEON; | 1891 | info->fix.accel = FB_ACCEL_ATI_RADEON; |
| 1891 | 1892 | ||
| 1893 | /* Allocate colormap */ | ||
| 1892 | fb_alloc_cmap(&info->cmap, 256, 0); | 1894 | fb_alloc_cmap(&info->cmap, 256, 0); |
| 1893 | 1895 | ||
| 1896 | /* Setup pixmap used for acceleration */ | ||
| 1897 | #define PIXMAP_SIZE (2048 * 4) | ||
| 1898 | |||
| 1899 | info->pixmap.addr = kmalloc(PIXMAP_SIZE, GFP_KERNEL); | ||
| 1900 | if (!info->pixmap.addr) { | ||
| 1901 | printk(KERN_ERR "radeonfb: Failed to allocate pixmap !\n"); | ||
| 1902 | noaccel = 1; | ||
| 1903 | goto bail; | ||
| 1904 | } | ||
| 1905 | info->pixmap.size = PIXMAP_SIZE; | ||
| 1906 | info->pixmap.flags = FB_PIXMAP_SYSTEM; | ||
| 1907 | info->pixmap.scan_align = 4; | ||
| 1908 | info->pixmap.buf_align = 4; | ||
| 1909 | info->pixmap.access_align = 32; | ||
| 1910 | |||
| 1911 | bail: | ||
| 1894 | if (noaccel) | 1912 | if (noaccel) |
| 1895 | info->flags |= FBINFO_HWACCEL_DISABLED; | 1913 | info->flags |= FBINFO_HWACCEL_DISABLED; |
| 1896 | 1914 | ||
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index b92947d62ad6..67ff370d80af 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
| @@ -2389,16 +2389,13 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch) | |||
| 2389 | 2389 | ||
| 2390 | if (!fbcon_is_inactive(vc, info)) { | 2390 | if (!fbcon_is_inactive(vc, info)) { |
| 2391 | if (ops->blank_state != blank) { | 2391 | if (ops->blank_state != blank) { |
| 2392 | int ret = 1; | ||
| 2393 | |||
| 2394 | ops->blank_state = blank; | 2392 | ops->blank_state = blank; |
| 2395 | fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW); | 2393 | fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW); |
| 2396 | ops->cursor_flash = (!blank); | 2394 | ops->cursor_flash = (!blank); |
| 2397 | 2395 | ||
| 2398 | if (info->fbops->fb_blank) | 2396 | if (!(info->flags & FBINFO_MISC_USEREVENT)) |
| 2399 | ret = info->fbops->fb_blank(blank, info); | 2397 | if (fb_blank(info, blank)) |
| 2400 | if (ret) | 2398 | fbcon_generic_blank(vc, info, blank); |
| 2401 | fbcon_generic_blank(vc, info, blank); | ||
| 2402 | } | 2399 | } |
| 2403 | 2400 | ||
| 2404 | if (!blank) | 2401 | if (!blank) |
diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile index 99da8b6d2c36..ed13889c1162 100644 --- a/drivers/video/omap/Makefile +++ b/drivers/video/omap/Makefile | |||
| @@ -23,7 +23,6 @@ objs-y$(CONFIG_MACH_OMAP_PALMZ71) += lcd_palmz71.o | |||
| 23 | objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o | 23 | objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o |
| 24 | objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o | 24 | objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o |
| 25 | objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o | 25 | objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o |
| 26 | objs-y$(CONFIG_MACH_SX1) += lcd_sx1.o | ||
| 27 | 26 | ||
| 28 | omapfb-objs := $(objs-yy) | 27 | omapfb-objs := $(objs-yy) |
| 29 | 28 | ||
diff --git a/drivers/video/omap/lcd_sx1.c b/drivers/video/omap/lcd_sx1.c deleted file mode 100644 index e55de201b8ff..000000000000 --- a/drivers/video/omap/lcd_sx1.c +++ /dev/null | |||
| @@ -1,327 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * LCD panel support for the Siemens SX1 mobile phone | ||
| 3 | * | ||
| 4 | * Current version : Vovan888@gmail.com, great help from FCA00000 | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify it | ||
| 7 | * under the terms of the GNU General Public License as published by the | ||
| 8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 9 | * option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, but | ||
| 12 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 14 | * General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License along | ||
| 17 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
| 18 | * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| 19 | */ | ||
| 20 | |||
| 21 | #include <linux/module.h> | ||
| 22 | #include <linux/platform_device.h> | ||
| 23 | #include <linux/delay.h> | ||
| 24 | #include <linux/io.h> | ||
| 25 | |||
| 26 | #include <mach/gpio.h> | ||
| 27 | #include <mach/omapfb.h> | ||
| 28 | #include <mach/mcbsp.h> | ||
| 29 | #include <mach/mux.h> | ||
| 30 | |||
| 31 | /* | ||
| 32 | * OMAP310 GPIO registers | ||
| 33 | */ | ||
| 34 | #define GPIO_DATA_INPUT 0xfffce000 | ||
| 35 | #define GPIO_DATA_OUTPUT 0xfffce004 | ||
| 36 | #define GPIO_DIR_CONTROL 0xfffce008 | ||
| 37 | #define GPIO_INT_CONTROL 0xfffce00c | ||
| 38 | #define GPIO_INT_MASK 0xfffce010 | ||
| 39 | #define GPIO_INT_STATUS 0xfffce014 | ||
| 40 | #define GPIO_PIN_CONTROL 0xfffce018 | ||
| 41 | |||
| 42 | |||
| 43 | #define A_LCD_SSC_RD 3 | ||
| 44 | #define A_LCD_SSC_SD 7 | ||
| 45 | #define _A_LCD_RESET 9 | ||
| 46 | #define _A_LCD_SSC_CS 12 | ||
| 47 | #define _A_LCD_SSC_A0 13 | ||
| 48 | |||
| 49 | #define DSP_REG 0xE1017024 | ||
| 50 | |||
| 51 | const unsigned char INIT_1[12] = { | ||
| 52 | 0x1C, 0x02, 0x88, 0x00, 0x1E, 0xE0, 0x00, 0xDC, 0x00, 0x02, 0x00 | ||
| 53 | }; | ||
| 54 | |||
| 55 | const unsigned char INIT_2[127] = { | ||
| 56 | 0x15, 0x00, 0x29, 0x00, 0x3E, 0x00, 0x51, 0x00, | ||
| 57 | 0x65, 0x00, 0x7A, 0x00, 0x8D, 0x00, 0xA1, 0x00, | ||
| 58 | 0xB6, 0x00, 0xC7, 0x00, 0xD8, 0x00, 0xEB, 0x00, | ||
| 59 | 0xFB, 0x00, 0x0B, 0x01, 0x1B, 0x01, 0x27, 0x01, | ||
| 60 | 0x34, 0x01, 0x41, 0x01, 0x4C, 0x01, 0x55, 0x01, | ||
| 61 | 0x5F, 0x01, 0x68, 0x01, 0x70, 0x01, 0x78, 0x01, | ||
| 62 | 0x7E, 0x01, 0x86, 0x01, 0x8C, 0x01, 0x94, 0x01, | ||
| 63 | 0x9B, 0x01, 0xA1, 0x01, 0xA4, 0x01, 0xA9, 0x01, | ||
| 64 | 0xAD, 0x01, 0xB2, 0x01, 0xB7, 0x01, 0xBC, 0x01, | ||
| 65 | 0xC0, 0x01, 0xC4, 0x01, 0xC8, 0x01, 0xCB, 0x01, | ||
| 66 | 0xCF, 0x01, 0xD2, 0x01, 0xD5, 0x01, 0xD8, 0x01, | ||
| 67 | 0xDB, 0x01, 0xE0, 0x01, 0xE3, 0x01, 0xE6, 0x01, | ||
| 68 | 0xE8, 0x01, 0xEB, 0x01, 0xEE, 0x01, 0xF1, 0x01, | ||
| 69 | 0xF3, 0x01, 0xF8, 0x01, 0xF9, 0x01, 0xFC, 0x01, | ||
| 70 | 0x00, 0x02, 0x03, 0x02, 0x07, 0x02, 0x09, 0x02, | ||
| 71 | 0x0E, 0x02, 0x13, 0x02, 0x1C, 0x02, 0x00 | ||
| 72 | }; | ||
| 73 | |||
| 74 | const unsigned char INIT_3[15] = { | ||
| 75 | 0x14, 0x26, 0x33, 0x3D, 0x45, 0x4D, 0x53, 0x59, | ||
| 76 | 0x5E, 0x63, 0x67, 0x6D, 0x71, 0x78, 0xFF | ||
| 77 | }; | ||
| 78 | |||
| 79 | static void epson_sendbyte(int flag, unsigned char byte) | ||
| 80 | { | ||
| 81 | int i, shifter = 0x80; | ||
| 82 | |||
| 83 | if (!flag) | ||
| 84 | gpio_set_value(_A_LCD_SSC_A0, 0); | ||
| 85 | mdelay(2); | ||
| 86 | gpio_set_value(A_LCD_SSC_RD, 1); | ||
| 87 | |||
| 88 | gpio_set_value(A_LCD_SSC_SD, flag); | ||
| 89 | |||
| 90 | OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200); | ||
| 91 | OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202); | ||
| 92 | for (i = 0; i < 8; i++) { | ||
| 93 | OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200); | ||
| 94 | gpio_set_value(A_LCD_SSC_SD, shifter & byte); | ||
| 95 | OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202); | ||
| 96 | shifter >>= 1; | ||
| 97 | } | ||
| 98 | gpio_set_value(_A_LCD_SSC_A0, 1); | ||
| 99 | } | ||
| 100 | |||
| 101 | static void init_system(void) | ||
| 102 | { | ||
| 103 | omap_mcbsp_request(OMAP_MCBSP3); | ||
| 104 | omap_mcbsp_stop(OMAP_MCBSP3); | ||
| 105 | } | ||
| 106 | |||
| 107 | static void setup_GPIO(void) | ||
| 108 | { | ||
| 109 | /* new wave */ | ||
| 110 | gpio_request(A_LCD_SSC_RD, "lcd_ssc_rd"); | ||
| 111 | gpio_request(A_LCD_SSC_SD, "lcd_ssc_sd"); | ||
| 112 | gpio_request(_A_LCD_RESET, "lcd_reset"); | ||
| 113 | gpio_request(_A_LCD_SSC_CS, "lcd_ssc_cs"); | ||
| 114 | gpio_request(_A_LCD_SSC_A0, "lcd_ssc_a0"); | ||
| 115 | |||
| 116 | /* set GPIOs to output, with initial data */ | ||
| 117 | gpio_direction_output(A_LCD_SSC_RD, 1); | ||
| 118 | gpio_direction_output(A_LCD_SSC_SD, 0); | ||
| 119 | gpio_direction_output(_A_LCD_RESET, 0); | ||
| 120 | gpio_direction_output(_A_LCD_SSC_CS, 1); | ||
| 121 | gpio_direction_output(_A_LCD_SSC_A0, 1); | ||
| 122 | } | ||
| 123 | |||
| 124 | static void display_init(void) | ||
| 125 | { | ||
| 126 | int i; | ||
| 127 | |||
| 128 | omap_cfg_reg(MCBSP3_CLKX); | ||
| 129 | |||
| 130 | mdelay(2); | ||
| 131 | setup_GPIO(); | ||
| 132 | mdelay(2); | ||
| 133 | |||
| 134 | /* reset LCD */ | ||
| 135 | gpio_set_value(A_LCD_SSC_SD, 1); | ||
| 136 | epson_sendbyte(0, 0x25); | ||
| 137 | |||
| 138 | gpio_set_value(_A_LCD_RESET, 0); | ||
| 139 | mdelay(10); | ||
| 140 | gpio_set_value(_A_LCD_RESET, 1); | ||
| 141 | |||
| 142 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 143 | mdelay(2); | ||
| 144 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 145 | |||
| 146 | /* init LCD, phase 1 */ | ||
| 147 | epson_sendbyte(0, 0xCA); | ||
| 148 | for (i = 0; i < 10; i++) | ||
| 149 | epson_sendbyte(1, INIT_1[i]); | ||
| 150 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 151 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 152 | |||
| 153 | /* init LCD phase 2 */ | ||
| 154 | epson_sendbyte(0, 0xCB); | ||
| 155 | for (i = 0; i < 125; i++) | ||
| 156 | epson_sendbyte(1, INIT_2[i]); | ||
| 157 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 158 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 159 | |||
| 160 | /* init LCD phase 2a */ | ||
| 161 | epson_sendbyte(0, 0xCC); | ||
| 162 | for (i = 0; i < 14; i++) | ||
| 163 | epson_sendbyte(1, INIT_3[i]); | ||
| 164 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 165 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 166 | |||
| 167 | /* init LCD phase 3 */ | ||
| 168 | epson_sendbyte(0, 0xBC); | ||
| 169 | epson_sendbyte(1, 0x08); | ||
| 170 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 171 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 172 | |||
| 173 | /* init LCD phase 4 */ | ||
| 174 | epson_sendbyte(0, 0x07); | ||
| 175 | epson_sendbyte(1, 0x05); | ||
| 176 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 177 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 178 | |||
| 179 | /* init LCD phase 5 */ | ||
| 180 | epson_sendbyte(0, 0x94); | ||
| 181 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 182 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 183 | |||
| 184 | /* init LCD phase 6 */ | ||
| 185 | epson_sendbyte(0, 0xC6); | ||
| 186 | epson_sendbyte(1, 0x80); | ||
| 187 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 188 | mdelay(100); /* used to be 1000 */ | ||
| 189 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 190 | |||
| 191 | /* init LCD phase 7 */ | ||
| 192 | epson_sendbyte(0, 0x16); | ||
| 193 | epson_sendbyte(1, 0x02); | ||
| 194 | epson_sendbyte(1, 0x00); | ||
| 195 | epson_sendbyte(1, 0xB1); | ||
| 196 | epson_sendbyte(1, 0x00); | ||
| 197 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 198 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 199 | |||
| 200 | /* init LCD phase 8 */ | ||
| 201 | epson_sendbyte(0, 0x76); | ||
| 202 | epson_sendbyte(1, 0x00); | ||
| 203 | epson_sendbyte(1, 0x00); | ||
| 204 | epson_sendbyte(1, 0xDB); | ||
| 205 | epson_sendbyte(1, 0x00); | ||
| 206 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 207 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 208 | |||
| 209 | /* init LCD phase 9 */ | ||
| 210 | epson_sendbyte(0, 0xAF); | ||
| 211 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 212 | } | ||
| 213 | |||
| 214 | static int sx1_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) | ||
| 215 | { | ||
| 216 | return 0; | ||
| 217 | } | ||
| 218 | |||
| 219 | static void sx1_panel_cleanup(struct lcd_panel *panel) | ||
| 220 | { | ||
| 221 | } | ||
| 222 | |||
| 223 | static void sx1_panel_disable(struct lcd_panel *panel) | ||
| 224 | { | ||
| 225 | printk(KERN_INFO "SX1: LCD panel disable\n"); | ||
| 226 | sx1_setmmipower(0); | ||
| 227 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 228 | |||
| 229 | epson_sendbyte(0, 0x25); | ||
| 230 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 231 | |||
| 232 | epson_sendbyte(0, 0xAE); | ||
| 233 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 234 | mdelay(100); | ||
| 235 | gpio_set_value(_A_LCD_SSC_CS, 0); | ||
| 236 | |||
| 237 | epson_sendbyte(0, 0x95); | ||
| 238 | gpio_set_value(_A_LCD_SSC_CS, 1); | ||
| 239 | } | ||
| 240 | |||
| 241 | static int sx1_panel_enable(struct lcd_panel *panel) | ||
| 242 | { | ||
| 243 | printk(KERN_INFO "lcd_sx1: LCD panel enable\n"); | ||
| 244 | init_system(); | ||
| 245 | display_init(); | ||
| 246 | |||
| 247 | sx1_setmmipower(1); | ||
| 248 | sx1_setbacklight(0x18); | ||
| 249 | sx1_setkeylight (0x06); | ||
| 250 | return 0; | ||
| 251 | } | ||
| 252 | |||
| 253 | |||
| 254 | static unsigned long sx1_panel_get_caps(struct lcd_panel *panel) | ||
| 255 | { | ||
| 256 | return 0; | ||
| 257 | } | ||
| 258 | |||
| 259 | struct lcd_panel sx1_panel = { | ||
| 260 | .name = "sx1", | ||
| 261 | .config = OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC | | ||
| 262 | OMAP_LCDC_INV_HSYNC | OMAP_LCDC_INV_PIX_CLOCK | | ||
| 263 | OMAP_LCDC_INV_OUTPUT_EN, | ||
| 264 | |||
| 265 | .x_res = 176, | ||
| 266 | .y_res = 220, | ||
| 267 | .data_lines = 16, | ||
| 268 | .bpp = 16, | ||
| 269 | .hsw = 5, | ||
| 270 | .hfp = 5, | ||
| 271 | .hbp = 5, | ||
| 272 | .vsw = 2, | ||
| 273 | .vfp = 1, | ||
| 274 | .vbp = 1, | ||
| 275 | .pixel_clock = 1500, | ||
| 276 | |||
| 277 | .init = sx1_panel_init, | ||
| 278 | .cleanup = sx1_panel_cleanup, | ||
| 279 | .enable = sx1_panel_enable, | ||
| 280 | .disable = sx1_panel_disable, | ||
| 281 | .get_caps = sx1_panel_get_caps, | ||
| 282 | }; | ||
| 283 | |||
| 284 | static int sx1_panel_probe(struct platform_device *pdev) | ||
| 285 | { | ||
| 286 | omapfb_register_panel(&sx1_panel); | ||
| 287 | return 0; | ||
| 288 | } | ||
| 289 | |||
| 290 | static int sx1_panel_remove(struct platform_device *pdev) | ||
| 291 | { | ||
| 292 | return 0; | ||
| 293 | } | ||
| 294 | |||
| 295 | static int sx1_panel_suspend(struct platform_device *pdev, pm_message_t mesg) | ||
| 296 | { | ||
| 297 | return 0; | ||
| 298 | } | ||
| 299 | |||
| 300 | static int sx1_panel_resume(struct platform_device *pdev) | ||
| 301 | { | ||
| 302 | return 0; | ||
| 303 | } | ||
| 304 | |||
| 305 | struct platform_driver sx1_panel_driver = { | ||
| 306 | .probe = sx1_panel_probe, | ||
| 307 | .remove = sx1_panel_remove, | ||
| 308 | .suspend = sx1_panel_suspend, | ||
| 309 | .resume = sx1_panel_resume, | ||
| 310 | .driver = { | ||
| 311 | .name = "lcd_sx1", | ||
| 312 | .owner = THIS_MODULE, | ||
| 313 | }, | ||
| 314 | }; | ||
| 315 | |||
| 316 | static int sx1_panel_drv_init(void) | ||
| 317 | { | ||
| 318 | return platform_driver_register(&sx1_panel_driver); | ||
| 319 | } | ||
| 320 | |||
| 321 | static void sx1_panel_drv_cleanup(void) | ||
| 322 | { | ||
| 323 | platform_driver_unregister(&sx1_panel_driver); | ||
| 324 | } | ||
| 325 | |||
| 326 | module_init(sx1_panel_drv_init); | ||
| 327 | module_exit(sx1_panel_drv_cleanup); | ||
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 0bc2c5a127b9..afe7a65c5603 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -69,9 +69,6 @@ | |||
| 69 | #define LCCR3_INVALID_CONFIG_MASK (LCCR3_HSP | LCCR3_VSP |\ | 69 | #define LCCR3_INVALID_CONFIG_MASK (LCCR3_HSP | LCCR3_VSP |\ |
| 70 | LCCR3_PCD | LCCR3_BPP) | 70 | LCCR3_PCD | LCCR3_BPP) |
| 71 | 71 | ||
| 72 | static void (*pxafb_backlight_power)(int); | ||
| 73 | static void (*pxafb_lcd_power)(int, struct fb_var_screeninfo *); | ||
| 74 | |||
| 75 | static int pxafb_activate_var(struct fb_var_screeninfo *var, | 72 | static int pxafb_activate_var(struct fb_var_screeninfo *var, |
| 76 | struct pxafb_info *); | 73 | struct pxafb_info *); |
| 77 | static void set_ctrlr_state(struct pxafb_info *fbi, u_int state); | 74 | static void set_ctrlr_state(struct pxafb_info *fbi, u_int state); |
| @@ -814,6 +811,7 @@ static int pxafb_smart_init(struct pxafb_info *fbi) | |||
| 814 | __func__); | 811 | __func__); |
| 815 | return PTR_ERR(fbi->smart_thread); | 812 | return PTR_ERR(fbi->smart_thread); |
| 816 | } | 813 | } |
| 814 | |||
| 817 | return 0; | 815 | return 0; |
| 818 | } | 816 | } |
| 819 | #else | 817 | #else |
| @@ -976,16 +974,16 @@ static inline void __pxafb_backlight_power(struct pxafb_info *fbi, int on) | |||
| 976 | { | 974 | { |
| 977 | pr_debug("pxafb: backlight o%s\n", on ? "n" : "ff"); | 975 | pr_debug("pxafb: backlight o%s\n", on ? "n" : "ff"); |
| 978 | 976 | ||
| 979 | if (pxafb_backlight_power) | 977 | if (fbi->backlight_power) |
| 980 | pxafb_backlight_power(on); | 978 | fbi->backlight_power(on); |
| 981 | } | 979 | } |
| 982 | 980 | ||
| 983 | static inline void __pxafb_lcd_power(struct pxafb_info *fbi, int on) | 981 | static inline void __pxafb_lcd_power(struct pxafb_info *fbi, int on) |
| 984 | { | 982 | { |
| 985 | pr_debug("pxafb: LCD power o%s\n", on ? "n" : "ff"); | 983 | pr_debug("pxafb: LCD power o%s\n", on ? "n" : "ff"); |
| 986 | 984 | ||
| 987 | if (pxafb_lcd_power) | 985 | if (fbi->lcd_power) |
| 988 | pxafb_lcd_power(on, &fbi->fb.var); | 986 | fbi->lcd_power(on, &fbi->fb.var); |
| 989 | } | 987 | } |
| 990 | 988 | ||
| 991 | static void pxafb_setup_gpio(struct pxafb_info *fbi) | 989 | static void pxafb_setup_gpio(struct pxafb_info *fbi) |
| @@ -1748,8 +1746,7 @@ static int __devinit pxafb_probe(struct platform_device *dev) | |||
| 1748 | ret = -EINVAL; | 1746 | ret = -EINVAL; |
| 1749 | goto failed; | 1747 | goto failed; |
| 1750 | } | 1748 | } |
| 1751 | pxafb_backlight_power = inf->pxafb_backlight_power; | 1749 | |
| 1752 | pxafb_lcd_power = inf->pxafb_lcd_power; | ||
| 1753 | fbi = pxafb_init_fbinfo(&dev->dev); | 1750 | fbi = pxafb_init_fbinfo(&dev->dev); |
| 1754 | if (!fbi) { | 1751 | if (!fbi) { |
| 1755 | /* only reason for pxafb_init_fbinfo to fail is kmalloc */ | 1752 | /* only reason for pxafb_init_fbinfo to fail is kmalloc */ |
| @@ -1758,6 +1755,9 @@ static int __devinit pxafb_probe(struct platform_device *dev) | |||
| 1758 | goto failed; | 1755 | goto failed; |
| 1759 | } | 1756 | } |
| 1760 | 1757 | ||
| 1758 | fbi->backlight_power = inf->pxafb_backlight_power; | ||
| 1759 | fbi->lcd_power = inf->pxafb_lcd_power; | ||
| 1760 | |||
| 1761 | r = platform_get_resource(dev, IORESOURCE_MEM, 0); | 1761 | r = platform_get_resource(dev, IORESOURCE_MEM, 0); |
| 1762 | if (r == NULL) { | 1762 | if (r == NULL) { |
| 1763 | dev_err(&dev->dev, "no I/O memory resource defined\n"); | 1763 | dev_err(&dev->dev, "no I/O memory resource defined\n"); |
diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h index 31541b86f13d..d8eb93fa03a3 100644 --- a/drivers/video/pxafb.h +++ b/drivers/video/pxafb.h | |||
| @@ -124,6 +124,9 @@ struct pxafb_info { | |||
| 124 | struct notifier_block freq_transition; | 124 | struct notifier_block freq_transition; |
| 125 | struct notifier_block freq_policy; | 125 | struct notifier_block freq_policy; |
| 126 | #endif | 126 | #endif |
| 127 | |||
| 128 | void (*lcd_power)(int, struct fb_var_screeninfo *); | ||
| 129 | void (*backlight_power)(int); | ||
| 127 | }; | 130 | }; |
| 128 | 131 | ||
| 129 | #define TO_INF(ptr,member) container_of(ptr,struct pxafb_info,member) | 132 | #define TO_INF(ptr,member) container_of(ptr,struct pxafb_info,member) |
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index c052bd4c0b06..076f946fa0f5 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
| @@ -114,7 +114,7 @@ | |||
| 114 | * - convert dma address types to dma_addr_t | 114 | * - convert dma address types to dma_addr_t |
| 115 | * - remove unused 'montype' stuff | 115 | * - remove unused 'montype' stuff |
| 116 | * - remove redundant zero inits of init_var after the initial | 116 | * - remove redundant zero inits of init_var after the initial |
| 117 | * memzero. | 117 | * memset. |
| 118 | * - remove allow_modeset (acornfb idea does not belong here) | 118 | * - remove allow_modeset (acornfb idea does not belong here) |
| 119 | * | 119 | * |
| 120 | * 2001/05/28: <rmk@arm.linux.org.uk> | 120 | * 2001/05/28: <rmk@arm.linux.org.uk> |
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c index a463b3dd837b..2493f05e9f61 100644 --- a/drivers/video/xen-fbfront.c +++ b/drivers/video/xen-fbfront.c | |||
| @@ -668,7 +668,7 @@ static struct xenbus_device_id xenfb_ids[] = { | |||
| 668 | { "" } | 668 | { "" } |
| 669 | }; | 669 | }; |
| 670 | 670 | ||
| 671 | static struct xenbus_driver xenfb = { | 671 | static struct xenbus_driver xenfb_driver = { |
| 672 | .name = "vfb", | 672 | .name = "vfb", |
| 673 | .owner = THIS_MODULE, | 673 | .owner = THIS_MODULE, |
| 674 | .ids = xenfb_ids, | 674 | .ids = xenfb_ids, |
| @@ -687,12 +687,12 @@ static int __init xenfb_init(void) | |||
| 687 | if (xen_initial_domain()) | 687 | if (xen_initial_domain()) |
| 688 | return -ENODEV; | 688 | return -ENODEV; |
| 689 | 689 | ||
| 690 | return xenbus_register_frontend(&xenfb); | 690 | return xenbus_register_frontend(&xenfb_driver); |
| 691 | } | 691 | } |
| 692 | 692 | ||
| 693 | static void __exit xenfb_cleanup(void) | 693 | static void __exit xenfb_cleanup(void) |
| 694 | { | 694 | { |
| 695 | xenbus_unregister_driver(&xenfb); | 695 | xenbus_unregister_driver(&xenfb_driver); |
| 696 | } | 696 | } |
| 697 | 697 | ||
| 698 | module_init(xenfb_init); | 698 | module_init(xenfb_init); |
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index 5da3d2423cc0..40a3a2afbfe7 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c | |||
| @@ -298,8 +298,9 @@ static int xilinxfb_assign(struct device *dev, unsigned long physaddr, | |||
| 298 | 298 | ||
| 299 | /* Put a banner in the log (for DEBUG) */ | 299 | /* Put a banner in the log (for DEBUG) */ |
| 300 | dev_dbg(dev, "regs: phys=%lx, virt=%p\n", physaddr, drvdata->regs); | 300 | dev_dbg(dev, "regs: phys=%lx, virt=%p\n", physaddr, drvdata->regs); |
| 301 | dev_dbg(dev, "fb: phys=%p, virt=%p, size=%x\n", | 301 | dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n", |
| 302 | (void*)drvdata->fb_phys, drvdata->fb_virt, fbsize); | 302 | (unsigned long long) drvdata->fb_phys, drvdata->fb_virt, |
| 303 | fbsize); | ||
| 303 | 304 | ||
| 304 | return 0; /* success */ | 305 | return 0; /* success */ |
| 305 | 306 | ||
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig index a14d5b6e4c7c..90616822cd20 100644 --- a/drivers/w1/masters/Kconfig +++ b/drivers/w1/masters/Kconfig | |||
| @@ -36,7 +36,7 @@ config W1_MASTER_DS2482 | |||
| 36 | 36 | ||
| 37 | config W1_MASTER_DS1WM | 37 | config W1_MASTER_DS1WM |
| 38 | tristate "Maxim DS1WM 1-wire busmaster" | 38 | tristate "Maxim DS1WM 1-wire busmaster" |
| 39 | depends on W1 && ARM | 39 | depends on W1 && ARM && HAVE_CLK |
| 40 | help | 40 | help |
| 41 | Say Y here to enable the DS1WM 1-wire driver, such as that | 41 | Say Y here to enable the DS1WM 1-wire driver, such as that |
| 42 | in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like | 42 | in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like |
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index f7f6ce82a5e2..e31925ee8346 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #undef S3C_VA_WATCHDOG | 42 | #undef S3C_VA_WATCHDOG |
| 43 | #define S3C_VA_WATCHDOG (0) | 43 | #define S3C_VA_WATCHDOG (0) |
| 44 | 44 | ||
| 45 | #include <asm/plat-s3c/regs-watchdog.h> | 45 | #include <plat/regs-watchdog.h> |
| 46 | 46 | ||
| 47 | #define PFX "s3c2410-wdt: " | 47 | #define PFX "s3c2410-wdt: " |
| 48 | 48 | ||
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index ed01e4c2beff..d6fbb4657210 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/bitops.h> | 28 | #include <linux/bitops.h> |
| 29 | #include <linux/uaccess.h> | 29 | #include <linux/uaccess.h> |
| 30 | #include <linux/timex.h> | ||
| 30 | 31 | ||
| 31 | #ifdef CONFIG_ARCH_PXA | 32 | #ifdef CONFIG_ARCH_PXA |
| 32 | #include <mach/pxa-regs.h> | 33 | #include <mach/pxa-regs.h> |
diff --git a/fs/buffer.c b/fs/buffer.c index 6569fda5cfed..10179cfa1152 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -878,6 +878,7 @@ void invalidate_inode_buffers(struct inode *inode) | |||
| 878 | spin_unlock(&buffer_mapping->private_lock); | 878 | spin_unlock(&buffer_mapping->private_lock); |
| 879 | } | 879 | } |
| 880 | } | 880 | } |
| 881 | EXPORT_SYMBOL(invalidate_inode_buffers); | ||
| 881 | 882 | ||
| 882 | /* | 883 | /* |
| 883 | * Remove any clean buffers from the inode's buffer list. This is called | 884 | * Remove any clean buffers from the inode's buffer list. This is called |
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index b691b893a848..f0a81e631ae6 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
| @@ -1475,7 +1475,11 @@ static int cifs_write_end(struct file *file, struct address_space *mapping, | |||
| 1475 | cFYI(1, ("write_end for page %p from pos %lld with %d bytes", | 1475 | cFYI(1, ("write_end for page %p from pos %lld with %d bytes", |
| 1476 | page, pos, copied)); | 1476 | page, pos, copied)); |
| 1477 | 1477 | ||
| 1478 | if (!PageUptodate(page) && copied == PAGE_CACHE_SIZE) | 1478 | if (PageChecked(page)) { |
| 1479 | if (copied == len) | ||
| 1480 | SetPageUptodate(page); | ||
| 1481 | ClearPageChecked(page); | ||
| 1482 | } else if (!PageUptodate(page) && copied == PAGE_CACHE_SIZE) | ||
| 1479 | SetPageUptodate(page); | 1483 | SetPageUptodate(page); |
| 1480 | 1484 | ||
| 1481 | if (!PageUptodate(page)) { | 1485 | if (!PageUptodate(page)) { |
| @@ -2062,39 +2066,70 @@ static int cifs_write_begin(struct file *file, struct address_space *mapping, | |||
| 2062 | { | 2066 | { |
| 2063 | pgoff_t index = pos >> PAGE_CACHE_SHIFT; | 2067 | pgoff_t index = pos >> PAGE_CACHE_SHIFT; |
| 2064 | loff_t offset = pos & (PAGE_CACHE_SIZE - 1); | 2068 | loff_t offset = pos & (PAGE_CACHE_SIZE - 1); |
| 2069 | loff_t page_start = pos & PAGE_MASK; | ||
| 2070 | loff_t i_size; | ||
| 2071 | struct page *page; | ||
| 2072 | int rc = 0; | ||
| 2065 | 2073 | ||
| 2066 | cFYI(1, ("write_begin from %lld len %d", (long long)pos, len)); | 2074 | cFYI(1, ("write_begin from %lld len %d", (long long)pos, len)); |
| 2067 | 2075 | ||
| 2068 | *pagep = __grab_cache_page(mapping, index); | 2076 | page = __grab_cache_page(mapping, index); |
| 2069 | if (!*pagep) | 2077 | if (!page) { |
| 2070 | return -ENOMEM; | 2078 | rc = -ENOMEM; |
| 2071 | 2079 | goto out; | |
| 2072 | if (PageUptodate(*pagep)) | 2080 | } |
| 2073 | return 0; | ||
| 2074 | 2081 | ||
| 2075 | /* If we are writing a full page it will be up to date, | 2082 | if (PageUptodate(page)) |
| 2076 | no need to read from the server */ | 2083 | goto out; |
| 2077 | if (len == PAGE_CACHE_SIZE && flags & AOP_FLAG_UNINTERRUPTIBLE) | ||
| 2078 | return 0; | ||
| 2079 | 2084 | ||
| 2080 | if ((file->f_flags & O_ACCMODE) != O_WRONLY) { | 2085 | /* |
| 2081 | int rc; | 2086 | * If we write a full page it will be up to date, no need to read from |
| 2087 | * the server. If the write is short, we'll end up doing a sync write | ||
| 2088 | * instead. | ||
| 2089 | */ | ||
| 2090 | if (len == PAGE_CACHE_SIZE) | ||
| 2091 | goto out; | ||
| 2082 | 2092 | ||
| 2083 | /* might as well read a page, it is fast enough */ | 2093 | /* |
| 2084 | rc = cifs_readpage_worker(file, *pagep, &offset); | 2094 | * optimize away the read when we have an oplock, and we're not |
| 2095 | * expecting to use any of the data we'd be reading in. That | ||
| 2096 | * is, when the page lies beyond the EOF, or straddles the EOF | ||
| 2097 | * and the write will cover all of the existing data. | ||
| 2098 | */ | ||
| 2099 | if (CIFS_I(mapping->host)->clientCanCacheRead) { | ||
| 2100 | i_size = i_size_read(mapping->host); | ||
| 2101 | if (page_start >= i_size || | ||
| 2102 | (offset == 0 && (pos + len) >= i_size)) { | ||
| 2103 | zero_user_segments(page, 0, offset, | ||
| 2104 | offset + len, | ||
| 2105 | PAGE_CACHE_SIZE); | ||
| 2106 | /* | ||
| 2107 | * PageChecked means that the parts of the page | ||
| 2108 | * to which we're not writing are considered up | ||
| 2109 | * to date. Once the data is copied to the | ||
| 2110 | * page, it can be set uptodate. | ||
| 2111 | */ | ||
| 2112 | SetPageChecked(page); | ||
| 2113 | goto out; | ||
| 2114 | } | ||
| 2115 | } | ||
| 2085 | 2116 | ||
| 2086 | /* we do not need to pass errors back | 2117 | if ((file->f_flags & O_ACCMODE) != O_WRONLY) { |
| 2087 | e.g. if we do not have read access to the file | 2118 | /* |
| 2088 | because cifs_write_end will attempt synchronous writes | 2119 | * might as well read a page, it is fast enough. If we get |
| 2089 | -- shaggy */ | 2120 | * an error, we don't need to return it. cifs_write_end will |
| 2121 | * do a sync write instead since PG_uptodate isn't set. | ||
| 2122 | */ | ||
| 2123 | cifs_readpage_worker(file, page, &page_start); | ||
| 2090 | } else { | 2124 | } else { |
| 2091 | /* we could try using another file handle if there is one - | 2125 | /* we could try using another file handle if there is one - |
| 2092 | but how would we lock it to prevent close of that handle | 2126 | but how would we lock it to prevent close of that handle |
| 2093 | racing with this read? In any case | 2127 | racing with this read? In any case |
| 2094 | this will be written out by write_end so is fine */ | 2128 | this will be written out by write_end so is fine */ |
| 2095 | } | 2129 | } |
| 2096 | 2130 | out: | |
| 2097 | return 0; | 2131 | *pagep = page; |
| 2132 | return rc; | ||
| 2098 | } | 2133 | } |
| 2099 | 2134 | ||
| 2100 | const struct address_space_operations cifs_addr_ops = { | 2135 | const struct address_space_operations cifs_addr_ops = { |
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index aec5c13f6341..96355d505347 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
| @@ -102,6 +102,8 @@ | |||
| 102 | 102 | ||
| 103 | #define EP_UNACTIVE_PTR ((void *) -1L) | 103 | #define EP_UNACTIVE_PTR ((void *) -1L) |
| 104 | 104 | ||
| 105 | #define EP_ITEM_COST (sizeof(struct epitem) + sizeof(struct eppoll_entry)) | ||
| 106 | |||
| 105 | struct epoll_filefd { | 107 | struct epoll_filefd { |
| 106 | struct file *file; | 108 | struct file *file; |
| 107 | int fd; | 109 | int fd; |
| @@ -200,6 +202,9 @@ struct eventpoll { | |||
| 200 | * holding ->lock. | 202 | * holding ->lock. |
| 201 | */ | 203 | */ |
| 202 | struct epitem *ovflist; | 204 | struct epitem *ovflist; |
| 205 | |||
| 206 | /* The user that created the eventpoll descriptor */ | ||
| 207 | struct user_struct *user; | ||
| 203 | }; | 208 | }; |
| 204 | 209 | ||
| 205 | /* Wait structure used by the poll hooks */ | 210 | /* Wait structure used by the poll hooks */ |
| @@ -227,9 +232,17 @@ struct ep_pqueue { | |||
| 227 | }; | 232 | }; |
| 228 | 233 | ||
| 229 | /* | 234 | /* |
| 235 | * Configuration options available inside /proc/sys/fs/epoll/ | ||
| 236 | */ | ||
| 237 | /* Maximum number of epoll devices, per user */ | ||
| 238 | static int max_user_instances __read_mostly; | ||
| 239 | /* Maximum number of epoll watched descriptors, per user */ | ||
| 240 | static int max_user_watches __read_mostly; | ||
| 241 | |||
| 242 | /* | ||
| 230 | * This mutex is used to serialize ep_free() and eventpoll_release_file(). | 243 | * This mutex is used to serialize ep_free() and eventpoll_release_file(). |
| 231 | */ | 244 | */ |
| 232 | static struct mutex epmutex; | 245 | static DEFINE_MUTEX(epmutex); |
| 233 | 246 | ||
| 234 | /* Safe wake up implementation */ | 247 | /* Safe wake up implementation */ |
| 235 | static struct poll_safewake psw; | 248 | static struct poll_safewake psw; |
| @@ -240,6 +253,33 @@ static struct kmem_cache *epi_cache __read_mostly; | |||
| 240 | /* Slab cache used to allocate "struct eppoll_entry" */ | 253 | /* Slab cache used to allocate "struct eppoll_entry" */ |
| 241 | static struct kmem_cache *pwq_cache __read_mostly; | 254 | static struct kmem_cache *pwq_cache __read_mostly; |
| 242 | 255 | ||
| 256 | #ifdef CONFIG_SYSCTL | ||
| 257 | |||
| 258 | #include <linux/sysctl.h> | ||
| 259 | |||
| 260 | static int zero; | ||
| 261 | |||
| 262 | ctl_table epoll_table[] = { | ||
| 263 | { | ||
| 264 | .procname = "max_user_instances", | ||
| 265 | .data = &max_user_instances, | ||
| 266 | .maxlen = sizeof(int), | ||
| 267 | .mode = 0644, | ||
| 268 | .proc_handler = &proc_dointvec_minmax, | ||
| 269 | .extra1 = &zero, | ||
| 270 | }, | ||
| 271 | { | ||
| 272 | .procname = "max_user_watches", | ||
| 273 | .data = &max_user_watches, | ||
| 274 | .maxlen = sizeof(int), | ||
| 275 | .mode = 0644, | ||
| 276 | .proc_handler = &proc_dointvec_minmax, | ||
| 277 | .extra1 = &zero, | ||
| 278 | }, | ||
| 279 | { .ctl_name = 0 } | ||
| 280 | }; | ||
| 281 | #endif /* CONFIG_SYSCTL */ | ||
| 282 | |||
| 243 | 283 | ||
| 244 | /* Setup the structure that is used as key for the RB tree */ | 284 | /* Setup the structure that is used as key for the RB tree */ |
| 245 | static inline void ep_set_ffd(struct epoll_filefd *ffd, | 285 | static inline void ep_set_ffd(struct epoll_filefd *ffd, |
| @@ -402,6 +442,8 @@ static int ep_remove(struct eventpoll *ep, struct epitem *epi) | |||
| 402 | /* At this point it is safe to free the eventpoll item */ | 442 | /* At this point it is safe to free the eventpoll item */ |
| 403 | kmem_cache_free(epi_cache, epi); | 443 | kmem_cache_free(epi_cache, epi); |
| 404 | 444 | ||
| 445 | atomic_dec(&ep->user->epoll_watches); | ||
| 446 | |||
| 405 | DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_remove(%p, %p)\n", | 447 | DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_remove(%p, %p)\n", |
| 406 | current, ep, file)); | 448 | current, ep, file)); |
| 407 | 449 | ||
| @@ -449,6 +491,8 @@ static void ep_free(struct eventpoll *ep) | |||
| 449 | 491 | ||
| 450 | mutex_unlock(&epmutex); | 492 | mutex_unlock(&epmutex); |
| 451 | mutex_destroy(&ep->mtx); | 493 | mutex_destroy(&ep->mtx); |
| 494 | atomic_dec(&ep->user->epoll_devs); | ||
| 495 | free_uid(ep->user); | ||
| 452 | kfree(ep); | 496 | kfree(ep); |
| 453 | } | 497 | } |
| 454 | 498 | ||
| @@ -532,10 +576,19 @@ void eventpoll_release_file(struct file *file) | |||
| 532 | 576 | ||
| 533 | static int ep_alloc(struct eventpoll **pep) | 577 | static int ep_alloc(struct eventpoll **pep) |
| 534 | { | 578 | { |
| 535 | struct eventpoll *ep = kzalloc(sizeof(*ep), GFP_KERNEL); | 579 | int error; |
| 580 | struct user_struct *user; | ||
| 581 | struct eventpoll *ep; | ||
| 536 | 582 | ||
| 537 | if (!ep) | 583 | user = get_current_user(); |
| 538 | return -ENOMEM; | 584 | error = -EMFILE; |
| 585 | if (unlikely(atomic_read(&user->epoll_devs) >= | ||
| 586 | max_user_instances)) | ||
| 587 | goto free_uid; | ||
| 588 | error = -ENOMEM; | ||
| 589 | ep = kzalloc(sizeof(*ep), GFP_KERNEL); | ||
| 590 | if (unlikely(!ep)) | ||
| 591 | goto free_uid; | ||
| 539 | 592 | ||
| 540 | spin_lock_init(&ep->lock); | 593 | spin_lock_init(&ep->lock); |
| 541 | mutex_init(&ep->mtx); | 594 | mutex_init(&ep->mtx); |
| @@ -544,12 +597,17 @@ static int ep_alloc(struct eventpoll **pep) | |||
| 544 | INIT_LIST_HEAD(&ep->rdllist); | 597 | INIT_LIST_HEAD(&ep->rdllist); |
| 545 | ep->rbr = RB_ROOT; | 598 | ep->rbr = RB_ROOT; |
| 546 | ep->ovflist = EP_UNACTIVE_PTR; | 599 | ep->ovflist = EP_UNACTIVE_PTR; |
| 600 | ep->user = user; | ||
| 547 | 601 | ||
| 548 | *pep = ep; | 602 | *pep = ep; |
| 549 | 603 | ||
| 550 | DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_alloc() ep=%p\n", | 604 | DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_alloc() ep=%p\n", |
| 551 | current, ep)); | 605 | current, ep)); |
| 552 | return 0; | 606 | return 0; |
| 607 | |||
| 608 | free_uid: | ||
| 609 | free_uid(user); | ||
| 610 | return error; | ||
| 553 | } | 611 | } |
| 554 | 612 | ||
| 555 | /* | 613 | /* |
| @@ -703,9 +761,11 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event, | |||
| 703 | struct epitem *epi; | 761 | struct epitem *epi; |
| 704 | struct ep_pqueue epq; | 762 | struct ep_pqueue epq; |
| 705 | 763 | ||
| 706 | error = -ENOMEM; | 764 | if (unlikely(atomic_read(&ep->user->epoll_watches) >= |
| 765 | max_user_watches)) | ||
| 766 | return -ENOSPC; | ||
| 707 | if (!(epi = kmem_cache_alloc(epi_cache, GFP_KERNEL))) | 767 | if (!(epi = kmem_cache_alloc(epi_cache, GFP_KERNEL))) |
| 708 | goto error_return; | 768 | return -ENOMEM; |
| 709 | 769 | ||
| 710 | /* Item initialization follow here ... */ | 770 | /* Item initialization follow here ... */ |
| 711 | INIT_LIST_HEAD(&epi->rdllink); | 771 | INIT_LIST_HEAD(&epi->rdllink); |
| @@ -735,6 +795,7 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event, | |||
| 735 | * install process. Namely an allocation for a wait queue failed due | 795 | * install process. Namely an allocation for a wait queue failed due |
| 736 | * high memory pressure. | 796 | * high memory pressure. |
| 737 | */ | 797 | */ |
| 798 | error = -ENOMEM; | ||
| 738 | if (epi->nwait < 0) | 799 | if (epi->nwait < 0) |
| 739 | goto error_unregister; | 800 | goto error_unregister; |
| 740 | 801 | ||
| @@ -765,6 +826,8 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event, | |||
| 765 | 826 | ||
| 766 | spin_unlock_irqrestore(&ep->lock, flags); | 827 | spin_unlock_irqrestore(&ep->lock, flags); |
| 767 | 828 | ||
| 829 | atomic_inc(&ep->user->epoll_watches); | ||
| 830 | |||
| 768 | /* We have to call this outside the lock */ | 831 | /* We have to call this outside the lock */ |
| 769 | if (pwake) | 832 | if (pwake) |
| 770 | ep_poll_safewake(&psw, &ep->poll_wait); | 833 | ep_poll_safewake(&psw, &ep->poll_wait); |
| @@ -789,7 +852,7 @@ error_unregister: | |||
| 789 | spin_unlock_irqrestore(&ep->lock, flags); | 852 | spin_unlock_irqrestore(&ep->lock, flags); |
| 790 | 853 | ||
| 791 | kmem_cache_free(epi_cache, epi); | 854 | kmem_cache_free(epi_cache, epi); |
| 792 | error_return: | 855 | |
| 793 | return error; | 856 | return error; |
| 794 | } | 857 | } |
| 795 | 858 | ||
| @@ -1078,6 +1141,7 @@ asmlinkage long sys_epoll_create1(int flags) | |||
| 1078 | flags & O_CLOEXEC); | 1141 | flags & O_CLOEXEC); |
| 1079 | if (fd < 0) | 1142 | if (fd < 0) |
| 1080 | ep_free(ep); | 1143 | ep_free(ep); |
| 1144 | atomic_inc(&ep->user->epoll_devs); | ||
| 1081 | 1145 | ||
| 1082 | error_return: | 1146 | error_return: |
| 1083 | DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n", | 1147 | DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n", |
| @@ -1299,7 +1363,12 @@ asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events, | |||
| 1299 | 1363 | ||
| 1300 | static int __init eventpoll_init(void) | 1364 | static int __init eventpoll_init(void) |
| 1301 | { | 1365 | { |
| 1302 | mutex_init(&epmutex); | 1366 | struct sysinfo si; |
| 1367 | |||
| 1368 | si_meminfo(&si); | ||
| 1369 | max_user_instances = 128; | ||
| 1370 | max_user_watches = (((si.totalram - si.totalhigh) / 32) << PAGE_SHIFT) / | ||
| 1371 | EP_ITEM_COST; | ||
| 1303 | 1372 | ||
| 1304 | /* Initialize the structure used to perform safe poll wait head wake ups */ | 1373 | /* Initialize the structure used to perform safe poll wait head wake ups */ |
| 1305 | ep_poll_safewake_init(&psw); | 1374 | ep_poll_safewake_init(&psw); |
diff --git a/fs/ntfs/debug.h b/fs/ntfs/debug.h index 5e6724c1afd1..2142b1c68b61 100644 --- a/fs/ntfs/debug.h +++ b/fs/ntfs/debug.h | |||
| @@ -30,7 +30,8 @@ | |||
| 30 | 30 | ||
| 31 | extern int debug_msgs; | 31 | extern int debug_msgs; |
| 32 | 32 | ||
| 33 | #if 0 /* Fool kernel-doc since it doesn't do macros yet */ | 33 | extern void __ntfs_debug(const char *file, int line, const char *function, |
| 34 | const char *format, ...) __attribute__ ((format (printf, 4, 5))); | ||
| 34 | /** | 35 | /** |
| 35 | * ntfs_debug - write a debug level message to syslog | 36 | * ntfs_debug - write a debug level message to syslog |
| 36 | * @f: a printf format string containing the message | 37 | * @f: a printf format string containing the message |
| @@ -39,11 +40,6 @@ extern int debug_msgs; | |||
| 39 | * ntfs_debug() writes a DEBUG level message to the syslog but only if the | 40 | * ntfs_debug() writes a DEBUG level message to the syslog but only if the |
| 40 | * driver was compiled with -DDEBUG. Otherwise, the call turns into a NOP. | 41 | * driver was compiled with -DDEBUG. Otherwise, the call turns into a NOP. |
| 41 | */ | 42 | */ |
| 42 | static void ntfs_debug(const char *f, ...); | ||
| 43 | #endif | ||
| 44 | |||
| 45 | extern void __ntfs_debug (const char *file, int line, const char *function, | ||
| 46 | const char *format, ...) __attribute__ ((format (printf, 4, 5))); | ||
| 47 | #define ntfs_debug(f, a...) \ | 43 | #define ntfs_debug(f, a...) \ |
| 48 | __ntfs_debug(__FILE__, __LINE__, __func__, f, ##a) | 44 | __ntfs_debug(__FILE__, __LINE__, __func__, f, ##a) |
| 49 | 45 | ||
diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c index 7e947c672469..3a178ec48d7c 100644 --- a/fs/ocfs2/buffer_head_io.c +++ b/fs/ocfs2/buffer_head_io.c | |||
| @@ -112,7 +112,7 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block, | |||
| 112 | bh = bhs[i]; | 112 | bh = bhs[i]; |
| 113 | 113 | ||
| 114 | if (buffer_jbd(bh)) { | 114 | if (buffer_jbd(bh)) { |
| 115 | mlog(ML_ERROR, | 115 | mlog(ML_BH_IO, |
| 116 | "trying to sync read a jbd " | 116 | "trying to sync read a jbd " |
| 117 | "managed bh (blocknr = %llu), skipping\n", | 117 | "managed bh (blocknr = %llu), skipping\n", |
| 118 | (unsigned long long)bh->b_blocknr); | 118 | (unsigned long long)bh->b_blocknr); |
| @@ -147,15 +147,10 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block, | |||
| 147 | for (i = nr; i > 0; i--) { | 147 | for (i = nr; i > 0; i--) { |
| 148 | bh = bhs[i - 1]; | 148 | bh = bhs[i - 1]; |
| 149 | 149 | ||
| 150 | if (buffer_jbd(bh)) { | 150 | /* No need to wait on the buffer if it's managed by JBD. */ |
| 151 | mlog(ML_ERROR, | 151 | if (!buffer_jbd(bh)) |
| 152 | "the journal got the buffer while it was " | 152 | wait_on_buffer(bh); |
| 153 | "locked for io! (blocknr = %llu)\n", | ||
| 154 | (unsigned long long)bh->b_blocknr); | ||
| 155 | BUG(); | ||
| 156 | } | ||
| 157 | 153 | ||
| 158 | wait_on_buffer(bh); | ||
| 159 | if (!buffer_uptodate(bh)) { | 154 | if (!buffer_uptodate(bh)) { |
| 160 | /* Status won't be cleared from here on out, | 155 | /* Status won't be cleared from here on out, |
| 161 | * so we can safely record this and loop back | 156 | * so we can safely record this and loop back |
| @@ -251,8 +246,6 @@ int ocfs2_read_blocks(struct inode *inode, u64 block, int nr, | |||
| 251 | ignore_cache = 1; | 246 | ignore_cache = 1; |
| 252 | } | 247 | } |
| 253 | 248 | ||
| 254 | /* XXX: Can we ever get this and *not* have the cached | ||
| 255 | * flag set? */ | ||
| 256 | if (buffer_jbd(bh)) { | 249 | if (buffer_jbd(bh)) { |
| 257 | if (ignore_cache) | 250 | if (ignore_cache) |
| 258 | mlog(ML_BH_IO, "trying to sync read a jbd " | 251 | mlog(ML_BH_IO, "trying to sync read a jbd " |
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c index 533a789c3ef8..ba962d71b34d 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlm/dlmfs.c | |||
| @@ -608,8 +608,10 @@ static int __init init_dlmfs_fs(void) | |||
| 608 | 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| | 608 | 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| |
| 609 | SLAB_MEM_SPREAD), | 609 | SLAB_MEM_SPREAD), |
| 610 | dlmfs_init_once); | 610 | dlmfs_init_once); |
| 611 | if (!dlmfs_inode_cache) | 611 | if (!dlmfs_inode_cache) { |
| 612 | status = -ENOMEM; | ||
| 612 | goto bail; | 613 | goto bail; |
| 614 | } | ||
| 613 | cleanup_inode = 1; | 615 | cleanup_inode = 1; |
| 614 | 616 | ||
| 615 | user_dlm_worker = create_singlethread_workqueue("user_dlm"); | 617 | user_dlm_worker = create_singlethread_workqueue("user_dlm"); |
diff --git a/fs/ocfs2/dlm/userdlm.h b/fs/ocfs2/dlm/userdlm.h index 39ec27738499..0c3cc03c61fa 100644 --- a/fs/ocfs2/dlm/userdlm.h +++ b/fs/ocfs2/dlm/userdlm.h | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | #include <linux/workqueue.h> | 33 | #include <linux/workqueue.h> |
| 34 | 34 | ||
| 35 | /* user_lock_res->l_flags flags. */ | 35 | /* user_lock_res->l_flags flags. */ |
| 36 | #define USER_LOCK_ATTACHED (0x00000001) /* have we initialized | 36 | #define USER_LOCK_ATTACHED (0x00000001) /* we have initialized |
| 37 | * the lvb */ | 37 | * the lvb */ |
| 38 | #define USER_LOCK_BUSY (0x00000002) /* we are currently in | 38 | #define USER_LOCK_BUSY (0x00000002) /* we are currently in |
| 39 | * dlm_lock */ | 39 | * dlm_lock */ |
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index ec684426034b..6e6cc0a2e5f7 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c | |||
| @@ -2841,9 +2841,8 @@ static void ocfs2_unlock_ast(void *opaque, int error) | |||
| 2841 | 2841 | ||
| 2842 | lockres_clear_flags(lockres, OCFS2_LOCK_BUSY); | 2842 | lockres_clear_flags(lockres, OCFS2_LOCK_BUSY); |
| 2843 | lockres->l_unlock_action = OCFS2_UNLOCK_INVALID; | 2843 | lockres->l_unlock_action = OCFS2_UNLOCK_INVALID; |
| 2844 | spin_unlock_irqrestore(&lockres->l_lock, flags); | ||
| 2845 | |||
| 2846 | wake_up(&lockres->l_event); | 2844 | wake_up(&lockres->l_event); |
| 2845 | spin_unlock_irqrestore(&lockres->l_lock, flags); | ||
| 2847 | 2846 | ||
| 2848 | mlog_exit_void(); | 2847 | mlog_exit_void(); |
| 2849 | } | 2848 | } |
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index fef7ece32376..3fed9e3d8992 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h | |||
| @@ -85,7 +85,7 @@ enum ocfs2_unlock_action { | |||
| 85 | }; | 85 | }; |
| 86 | 86 | ||
| 87 | /* ocfs2_lock_res->l_flags flags. */ | 87 | /* ocfs2_lock_res->l_flags flags. */ |
| 88 | #define OCFS2_LOCK_ATTACHED (0x00000001) /* have we initialized | 88 | #define OCFS2_LOCK_ATTACHED (0x00000001) /* we have initialized |
| 89 | * the lvb */ | 89 | * the lvb */ |
| 90 | #define OCFS2_LOCK_BUSY (0x00000002) /* we are currently in | 90 | #define OCFS2_LOCK_BUSY (0x00000002) /* we are currently in |
| 91 | * dlm_lock */ | 91 | * dlm_lock */ |
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c index faec2d879357..9b76d41a8ac6 100644 --- a/fs/ocfs2/stack_user.c +++ b/fs/ocfs2/stack_user.c | |||
| @@ -740,6 +740,9 @@ static int user_dlm_lock_status(union ocfs2_dlm_lksb *lksb) | |||
| 740 | 740 | ||
| 741 | static void *user_dlm_lvb(union ocfs2_dlm_lksb *lksb) | 741 | static void *user_dlm_lvb(union ocfs2_dlm_lksb *lksb) |
| 742 | { | 742 | { |
| 743 | if (!lksb->lksb_fsdlm.sb_lvbptr) | ||
| 744 | lksb->lksb_fsdlm.sb_lvbptr = (char *)lksb + | ||
| 745 | sizeof(struct dlm_lksb); | ||
| 743 | return (void *)(lksb->lksb_fsdlm.sb_lvbptr); | 746 | return (void *)(lksb->lksb_fsdlm.sb_lvbptr); |
| 744 | } | 747 | } |
| 745 | 748 | ||
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 6e74b117aaf0..30ebde490f7f 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
| @@ -106,6 +106,7 @@ void udf_clear_inode(struct inode *inode) | |||
| 106 | udf_truncate_tail_extent(inode); | 106 | udf_truncate_tail_extent(inode); |
| 107 | unlock_kernel(); | 107 | unlock_kernel(); |
| 108 | write_inode_now(inode, 0); | 108 | write_inode_now(inode, 0); |
| 109 | invalidate_inode_buffers(inode); | ||
| 109 | } | 110 | } |
| 110 | iinfo = UDF_I(inode); | 111 | iinfo = UDF_I(inode); |
| 111 | kfree(iinfo->i_ext.i_data); | 112 | kfree(iinfo->i_ext.i_data); |
diff --git a/include/acpi/acpredef.h b/include/acpi/acpredef.h index 619fb75f8861..16a9ca9a66e4 100644 --- a/include/acpi/acpredef.h +++ b/include/acpi/acpredef.h | |||
| @@ -167,7 +167,7 @@ static const union acpi_predefined_info predefined_names[] = { | |||
| 167 | {.info = {"_BFS", 1, 0}}, | 167 | {.info = {"_BFS", 1, 0}}, |
| 168 | {.info = {"_BIF", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, | 168 | {.info = {"_BIF", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, |
| 169 | 9, | 169 | 9, |
| 170 | ACPI_RTYPE_STRING, 4, 0}}, /* fixed (9 Int),(4 Str) */ | 170 | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER, 4, 0}}, /* fixed (9 Int),(4 Str) */ |
| 171 | {.info = {"_BLT", 3, 0}}, | 171 | {.info = {"_BLT", 3, 0}}, |
| 172 | {.info = {"_BMC", 1, 0}}, | 172 | {.info = {"_BMC", 1, 0}}, |
| 173 | {.info = {"_BMD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 5, 0, 0, 0}}, /* fixed (5 Int) */ | 173 | {.info = {"_BMD", 0, ACPI_RTYPE_PACKAGE}}, {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 5, 0, 0, 0}}, /* fixed (5 Int) */ |
| @@ -346,7 +346,7 @@ static const union acpi_predefined_info predefined_names[] = { | |||
| 346 | 346 | ||
| 347 | /* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */ | 347 | /* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */ |
| 348 | 348 | ||
| 349 | {.info = {"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_PACKAGE}}, | 349 | {.info = {"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}}, |
| 350 | {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0}}, /* fixed (2 Int), but is optional */ | 350 | {.ret_info = {ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0}}, /* fixed (2 Int), but is optional */ |
| 351 | {.ret_info = {0, 0, 0, 0, 0, 0}} /* Table terminator */ | 351 | {.ret_info = {0, 0, 0, 0, 0, 0}} /* Table terminator */ |
| 352 | }; | 352 | }; |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 28c7f1679d49..d5e8e5c89548 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
| @@ -1151,6 +1151,7 @@ extern u32 drm_vblank_count(struct drm_device *dev, int crtc); | |||
| 1151 | extern void drm_handle_vblank(struct drm_device *dev, int crtc); | 1151 | extern void drm_handle_vblank(struct drm_device *dev, int crtc); |
| 1152 | extern int drm_vblank_get(struct drm_device *dev, int crtc); | 1152 | extern int drm_vblank_get(struct drm_device *dev, int crtc); |
| 1153 | extern void drm_vblank_put(struct drm_device *dev, int crtc); | 1153 | extern void drm_vblank_put(struct drm_device *dev, int crtc); |
| 1154 | extern void drm_vblank_cleanup(struct drm_device *dev); | ||
| 1154 | /* Modesetting support */ | 1155 | /* Modesetting support */ |
| 1155 | extern int drm_modeset_ctl(struct drm_device *dev, void *data, | 1156 | extern int drm_modeset_ctl(struct drm_device *dev, void *data, |
| 1156 | struct drm_file *file_priv); | 1157 | struct drm_file *file_priv); |
diff --git a/include/linux/compat.h b/include/linux/compat.h index f061a1ea1b74..e88f3ecf38b4 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h | |||
| @@ -252,12 +252,10 @@ extern int compat_ptrace_request(struct task_struct *child, | |||
| 252 | compat_long_t request, | 252 | compat_long_t request, |
| 253 | compat_ulong_t addr, compat_ulong_t data); | 253 | compat_ulong_t addr, compat_ulong_t data); |
| 254 | 254 | ||
| 255 | #ifdef __ARCH_WANT_COMPAT_SYS_PTRACE | ||
| 256 | extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request, | 255 | extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request, |
| 257 | compat_ulong_t addr, compat_ulong_t data); | 256 | compat_ulong_t addr, compat_ulong_t data); |
| 258 | asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, | 257 | asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, |
| 259 | compat_long_t addr, compat_long_t data); | 258 | compat_long_t addr, compat_long_t data); |
| 260 | #endif /* __ARCH_WANT_COMPAT_SYS_PTRACE */ | ||
| 261 | 259 | ||
| 262 | /* | 260 | /* |
| 263 | * epoll (fs/eventpoll.c) compat bits follow ... | 261 | * epoll (fs/eventpoll.c) compat bits follow ... |
diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 7dcbc82f3b7b..13875ce9112a 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h | |||
| @@ -63,12 +63,14 @@ static inline void *kmap_atomic(struct page *page, enum km_type idx) | |||
| 63 | #endif /* CONFIG_HIGHMEM */ | 63 | #endif /* CONFIG_HIGHMEM */ |
| 64 | 64 | ||
| 65 | /* when CONFIG_HIGHMEM is not set these will be plain clear/copy_page */ | 65 | /* when CONFIG_HIGHMEM is not set these will be plain clear/copy_page */ |
| 66 | #ifndef clear_user_highpage | ||
| 66 | static inline void clear_user_highpage(struct page *page, unsigned long vaddr) | 67 | static inline void clear_user_highpage(struct page *page, unsigned long vaddr) |
| 67 | { | 68 | { |
| 68 | void *addr = kmap_atomic(page, KM_USER0); | 69 | void *addr = kmap_atomic(page, KM_USER0); |
| 69 | clear_user_page(addr, vaddr, page); | 70 | clear_user_page(addr, vaddr, page); |
| 70 | kunmap_atomic(addr, KM_USER0); | 71 | kunmap_atomic(addr, KM_USER0); |
| 71 | } | 72 | } |
| 73 | #endif | ||
| 72 | 74 | ||
| 73 | #ifndef __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE | 75 | #ifndef __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE |
| 74 | /** | 76 | /** |
diff --git a/include/linux/idr.h b/include/linux/idr.h index fa035f96f2a3..dd846df8cd32 100644 --- a/include/linux/idr.h +++ b/include/linux/idr.h | |||
| @@ -52,13 +52,14 @@ struct idr_layer { | |||
| 52 | unsigned long bitmap; /* A zero bit means "space here" */ | 52 | unsigned long bitmap; /* A zero bit means "space here" */ |
| 53 | struct idr_layer *ary[1<<IDR_BITS]; | 53 | struct idr_layer *ary[1<<IDR_BITS]; |
| 54 | int count; /* When zero, we can release it */ | 54 | int count; /* When zero, we can release it */ |
| 55 | int layer; /* distance from leaf */ | ||
| 55 | struct rcu_head rcu_head; | 56 | struct rcu_head rcu_head; |
| 56 | }; | 57 | }; |
| 57 | 58 | ||
| 58 | struct idr { | 59 | struct idr { |
| 59 | struct idr_layer *top; | 60 | struct idr_layer *top; |
| 60 | struct idr_layer *id_free; | 61 | struct idr_layer *id_free; |
| 61 | int layers; | 62 | int layers; /* only valid without concurrent changes */ |
| 62 | int id_free_cnt; | 63 | int id_free_cnt; |
| 63 | spinlock_t lock; | 64 | spinlock_t lock; |
| 64 | }; | 65 | }; |
diff --git a/include/linux/irq.h b/include/linux/irq.h index d058c57be02d..3dddfa703ebd 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
| @@ -63,7 +63,8 @@ typedef void (*irq_flow_handler_t)(unsigned int irq, | |||
| 63 | #define IRQ_MOVE_PENDING 0x00200000 /* need to re-target IRQ destination */ | 63 | #define IRQ_MOVE_PENDING 0x00200000 /* need to re-target IRQ destination */ |
| 64 | #define IRQ_NO_BALANCING 0x00400000 /* IRQ is excluded from balancing */ | 64 | #define IRQ_NO_BALANCING 0x00400000 /* IRQ is excluded from balancing */ |
| 65 | #define IRQ_SPURIOUS_DISABLED 0x00800000 /* IRQ was disabled by the spurious trap */ | 65 | #define IRQ_SPURIOUS_DISABLED 0x00800000 /* IRQ was disabled by the spurious trap */ |
| 66 | #define IRQ_MOVE_PCNTXT 0x01000000 /* IRQ migration from process context */ | 66 | #define IRQ_MOVE_PCNTXT 0x01000000 /* IRQ migration from process context */ |
| 67 | #define IRQ_AFFINITY_SET 0x02000000 /* IRQ affinity was set from userspace*/ | ||
| 67 | 68 | ||
| 68 | #ifdef CONFIG_IRQ_PER_CPU | 69 | #ifdef CONFIG_IRQ_PER_CPU |
| 69 | # define CHECK_IRQ_PER_CPU(var) ((var) & IRQ_PER_CPU) | 70 | # define CHECK_IRQ_PER_CPU(var) ((var) & IRQ_PER_CPU) |
| @@ -130,7 +131,7 @@ struct irq_chip { | |||
| 130 | 131 | ||
| 131 | /** | 132 | /** |
| 132 | * struct irq_desc - interrupt descriptor | 133 | * struct irq_desc - interrupt descriptor |
| 133 | * | 134 | * @irq: interrupt number for this descriptor |
| 134 | * @handle_irq: highlevel irq-events handler [if NULL, __do_IRQ()] | 135 | * @handle_irq: highlevel irq-events handler [if NULL, __do_IRQ()] |
| 135 | * @chip: low level interrupt hardware access | 136 | * @chip: low level interrupt hardware access |
| 136 | * @msi_desc: MSI descriptor | 137 | * @msi_desc: MSI descriptor |
| @@ -149,7 +150,6 @@ struct irq_chip { | |||
| 149 | * @cpu: cpu index useful for balancing | 150 | * @cpu: cpu index useful for balancing |
| 150 | * @pending_mask: pending rebalanced interrupts | 151 | * @pending_mask: pending rebalanced interrupts |
| 151 | * @dir: /proc/irq/ procfs entry | 152 | * @dir: /proc/irq/ procfs entry |
| 152 | * @affinity_entry: /proc/irq/smp_affinity procfs entry on SMP | ||
| 153 | * @name: flow handler name for /proc/interrupts output | 153 | * @name: flow handler name for /proc/interrupts output |
| 154 | */ | 154 | */ |
| 155 | struct irq_desc { | 155 | struct irq_desc { |
| @@ -210,7 +210,6 @@ extern int setup_irq(unsigned int irq, struct irqaction *new); | |||
| 210 | 210 | ||
| 211 | #ifdef CONFIG_GENERIC_PENDING_IRQ | 211 | #ifdef CONFIG_GENERIC_PENDING_IRQ |
| 212 | 212 | ||
| 213 | void set_pending_irq(unsigned int irq, cpumask_t mask); | ||
| 214 | void move_native_irq(int irq); | 213 | void move_native_irq(int irq); |
| 215 | void move_masked_irq(int irq); | 214 | void move_masked_irq(int irq); |
| 216 | 215 | ||
| @@ -228,10 +227,6 @@ static inline void move_masked_irq(int irq) | |||
| 228 | { | 227 | { |
| 229 | } | 228 | } |
| 230 | 229 | ||
| 231 | static inline void set_pending_irq(unsigned int irq, cpumask_t mask) | ||
| 232 | { | ||
| 233 | } | ||
| 234 | |||
| 235 | #endif /* CONFIG_GENERIC_PENDING_IRQ */ | 230 | #endif /* CONFIG_GENERIC_PENDING_IRQ */ |
| 236 | 231 | ||
| 237 | #else /* CONFIG_SMP */ | 232 | #else /* CONFIG_SMP */ |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 59b0f1c807b5..ed3f26eb5df1 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -375,6 +375,7 @@ enum { | |||
| 375 | ATA_HORKAGE_BRIDGE_OK = (1 << 10), /* no bridge limits */ | 375 | ATA_HORKAGE_BRIDGE_OK = (1 << 10), /* no bridge limits */ |
| 376 | ATA_HORKAGE_ATAPI_MOD16_DMA = (1 << 11), /* use ATAPI DMA for commands | 376 | ATA_HORKAGE_ATAPI_MOD16_DMA = (1 << 11), /* use ATAPI DMA for commands |
| 377 | not multiple of 16 bytes */ | 377 | not multiple of 16 bytes */ |
| 378 | ATA_HORKAGE_FIRMWARE_WARN = (1 << 12), /* firwmare update warning */ | ||
| 378 | 379 | ||
| 379 | /* DMA mask for user DMA control: User visible values; DO NOT | 380 | /* DMA mask for user DMA control: User visible values; DO NOT |
| 380 | renumber */ | 381 | renumber */ |
diff --git a/include/linux/memory.h b/include/linux/memory.h index 2f5f8a5ef2a0..36c82c9e6ea7 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h | |||
| @@ -91,7 +91,7 @@ extern int memory_notify(unsigned long val, void *v); | |||
| 91 | 91 | ||
| 92 | #ifdef CONFIG_MEMORY_HOTPLUG | 92 | #ifdef CONFIG_MEMORY_HOTPLUG |
| 93 | #define hotplug_memory_notifier(fn, pri) { \ | 93 | #define hotplug_memory_notifier(fn, pri) { \ |
| 94 | static struct notifier_block fn##_mem_nb = \ | 94 | static __meminitdata struct notifier_block fn##_mem_nb =\ |
| 95 | { .notifier_call = fn, .priority = pri }; \ | 95 | { .notifier_call = fn, .priority = pri }; \ |
| 96 | register_memory_notifier(&fn##_mem_nb); \ | 96 | register_memory_notifier(&fn##_mem_nb); \ |
| 97 | } | 97 | } |
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index bd9977b89490..371086fd946f 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h | |||
| @@ -179,6 +179,7 @@ struct mlx4_caps { | |||
| 179 | int num_ports; | 179 | int num_ports; |
| 180 | int vl_cap[MLX4_MAX_PORTS + 1]; | 180 | int vl_cap[MLX4_MAX_PORTS + 1]; |
| 181 | int ib_mtu_cap[MLX4_MAX_PORTS + 1]; | 181 | int ib_mtu_cap[MLX4_MAX_PORTS + 1]; |
| 182 | __be32 ib_port_def_cap[MLX4_MAX_PORTS + 1]; | ||
| 182 | u64 def_mac[MLX4_MAX_PORTS + 1]; | 183 | u64 def_mac[MLX4_MAX_PORTS + 1]; |
| 183 | int eth_mtu_cap[MLX4_MAX_PORTS + 1]; | 184 | int eth_mtu_cap[MLX4_MAX_PORTS + 1]; |
| 184 | int gid_table_len[MLX4_MAX_PORTS + 1]; | 185 | int gid_table_len[MLX4_MAX_PORTS + 1]; |
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h index f546ad6fc028..1e6d34bfa094 100644 --- a/include/linux/page_cgroup.h +++ b/include/linux/page_cgroup.h | |||
| @@ -17,7 +17,7 @@ struct page_cgroup { | |||
| 17 | struct list_head lru; /* per cgroup LRU list */ | 17 | struct list_head lru; /* per cgroup LRU list */ |
| 18 | }; | 18 | }; |
| 19 | 19 | ||
| 20 | void __init pgdat_page_cgroup_init(struct pglist_data *pgdat); | 20 | void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat); |
| 21 | void __init page_cgroup_init(void); | 21 | void __init page_cgroup_init(void); |
| 22 | struct page_cgroup *lookup_page_cgroup(struct page *page); | 22 | struct page_cgroup *lookup_page_cgroup(struct page *page); |
| 23 | 23 | ||
| @@ -91,7 +91,7 @@ static inline void unlock_page_cgroup(struct page_cgroup *pc) | |||
| 91 | #else /* CONFIG_CGROUP_MEM_RES_CTLR */ | 91 | #else /* CONFIG_CGROUP_MEM_RES_CTLR */ |
| 92 | struct page_cgroup; | 92 | struct page_cgroup; |
| 93 | 93 | ||
| 94 | static inline void pgdat_page_cgroup_init(struct pglist_data *pgdat) | 94 | static inline void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat) |
| 95 | { | 95 | { |
| 96 | } | 96 | } |
| 97 | 97 | ||
diff --git a/include/linux/sched.h b/include/linux/sched.h index 644ffbda17ca..55e30d114477 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -630,6 +630,10 @@ struct user_struct { | |||
| 630 | atomic_t inotify_watches; /* How many inotify watches does this user have? */ | 630 | atomic_t inotify_watches; /* How many inotify watches does this user have? */ |
| 631 | atomic_t inotify_devs; /* How many inotify devs does this user have opened? */ | 631 | atomic_t inotify_devs; /* How many inotify devs does this user have opened? */ |
| 632 | #endif | 632 | #endif |
| 633 | #ifdef CONFIG_EPOLL | ||
| 634 | atomic_t epoll_devs; /* The number of epoll descriptors currently open */ | ||
| 635 | atomic_t epoll_watches; /* The number of file descriptors currently watched */ | ||
| 636 | #endif | ||
| 633 | #ifdef CONFIG_POSIX_MQUEUE | 637 | #ifdef CONFIG_POSIX_MQUEUE |
| 634 | /* protected by mq_lock */ | 638 | /* protected by mq_lock */ |
| 635 | unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */ | 639 | unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */ |
diff --git a/kernel/cpu.c b/kernel/cpu.c index 5a732c5ef08b..8ea32e8d68b0 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
| @@ -462,7 +462,7 @@ out: | |||
| 462 | * It must be called by the arch code on the new cpu, before the new cpu | 462 | * It must be called by the arch code on the new cpu, before the new cpu |
| 463 | * enables interrupts and before the "boot" cpu returns from __cpu_up(). | 463 | * enables interrupts and before the "boot" cpu returns from __cpu_up(). |
| 464 | */ | 464 | */ |
| 465 | void notify_cpu_starting(unsigned int cpu) | 465 | void __cpuinit notify_cpu_starting(unsigned int cpu) |
| 466 | { | 466 | { |
| 467 | unsigned long val = CPU_STARTING; | 467 | unsigned long val = CPU_STARTING; |
| 468 | 468 | ||
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index da7ff6137f37..96c0ba13b8cd 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
| @@ -585,7 +585,7 @@ static int generate_sched_domains(cpumask_t **domains, | |||
| 585 | int i, j, k; /* indices for partition finding loops */ | 585 | int i, j, k; /* indices for partition finding loops */ |
| 586 | cpumask_t *doms; /* resulting partition; i.e. sched domains */ | 586 | cpumask_t *doms; /* resulting partition; i.e. sched domains */ |
| 587 | struct sched_domain_attr *dattr; /* attributes for custom domains */ | 587 | struct sched_domain_attr *dattr; /* attributes for custom domains */ |
| 588 | int ndoms; /* number of sched domains in result */ | 588 | int ndoms = 0; /* number of sched domains in result */ |
| 589 | int nslot; /* next empty doms[] cpumask_t slot */ | 589 | int nslot; /* next empty doms[] cpumask_t slot */ |
| 590 | 590 | ||
| 591 | doms = NULL; | 591 | doms = NULL; |
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index c9767e641980..64c1c7253dae 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h | |||
| @@ -25,6 +25,8 @@ static inline void unregister_handler_proc(unsigned int irq, | |||
| 25 | struct irqaction *action) { } | 25 | struct irqaction *action) { } |
| 26 | #endif | 26 | #endif |
| 27 | 27 | ||
| 28 | extern int irq_select_affinity_usr(unsigned int irq); | ||
| 29 | |||
| 28 | /* | 30 | /* |
| 29 | * Debugging printout: | 31 | * Debugging printout: |
| 30 | */ | 32 | */ |
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index c498a1b8c621..801addda3c43 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -82,24 +82,27 @@ int irq_can_set_affinity(unsigned int irq) | |||
| 82 | int irq_set_affinity(unsigned int irq, cpumask_t cpumask) | 82 | int irq_set_affinity(unsigned int irq, cpumask_t cpumask) |
| 83 | { | 83 | { |
| 84 | struct irq_desc *desc = irq_to_desc(irq); | 84 | struct irq_desc *desc = irq_to_desc(irq); |
| 85 | unsigned long flags; | ||
| 85 | 86 | ||
| 86 | if (!desc->chip->set_affinity) | 87 | if (!desc->chip->set_affinity) |
| 87 | return -EINVAL; | 88 | return -EINVAL; |
| 88 | 89 | ||
| 90 | spin_lock_irqsave(&desc->lock, flags); | ||
| 91 | |||
| 89 | #ifdef CONFIG_GENERIC_PENDING_IRQ | 92 | #ifdef CONFIG_GENERIC_PENDING_IRQ |
| 90 | if (desc->status & IRQ_MOVE_PCNTXT || desc->status & IRQ_DISABLED) { | 93 | if (desc->status & IRQ_MOVE_PCNTXT || desc->status & IRQ_DISABLED) { |
| 91 | unsigned long flags; | ||
| 92 | |||
| 93 | spin_lock_irqsave(&desc->lock, flags); | ||
| 94 | desc->affinity = cpumask; | 94 | desc->affinity = cpumask; |
| 95 | desc->chip->set_affinity(irq, cpumask); | 95 | desc->chip->set_affinity(irq, cpumask); |
| 96 | spin_unlock_irqrestore(&desc->lock, flags); | 96 | } else { |
| 97 | } else | 97 | desc->status |= IRQ_MOVE_PENDING; |
| 98 | set_pending_irq(irq, cpumask); | 98 | desc->pending_mask = cpumask; |
| 99 | } | ||
| 99 | #else | 100 | #else |
| 100 | desc->affinity = cpumask; | 101 | desc->affinity = cpumask; |
| 101 | desc->chip->set_affinity(irq, cpumask); | 102 | desc->chip->set_affinity(irq, cpumask); |
| 102 | #endif | 103 | #endif |
| 104 | desc->status |= IRQ_AFFINITY_SET; | ||
| 105 | spin_unlock_irqrestore(&desc->lock, flags); | ||
| 103 | return 0; | 106 | return 0; |
| 104 | } | 107 | } |
| 105 | 108 | ||
| @@ -107,24 +110,59 @@ int irq_set_affinity(unsigned int irq, cpumask_t cpumask) | |||
| 107 | /* | 110 | /* |
| 108 | * Generic version of the affinity autoselector. | 111 | * Generic version of the affinity autoselector. |
| 109 | */ | 112 | */ |
| 110 | int irq_select_affinity(unsigned int irq) | 113 | int do_irq_select_affinity(unsigned int irq, struct irq_desc *desc) |
| 111 | { | 114 | { |
| 112 | cpumask_t mask; | 115 | cpumask_t mask; |
| 113 | struct irq_desc *desc; | ||
| 114 | 116 | ||
| 115 | if (!irq_can_set_affinity(irq)) | 117 | if (!irq_can_set_affinity(irq)) |
| 116 | return 0; | 118 | return 0; |
| 117 | 119 | ||
| 118 | cpus_and(mask, cpu_online_map, irq_default_affinity); | 120 | cpus_and(mask, cpu_online_map, irq_default_affinity); |
| 119 | 121 | ||
| 120 | desc = irq_to_desc(irq); | 122 | /* |
| 123 | * Preserve an userspace affinity setup, but make sure that | ||
| 124 | * one of the targets is online. | ||
| 125 | */ | ||
| 126 | if (desc->status & (IRQ_AFFINITY_SET | IRQ_NO_BALANCING)) { | ||
| 127 | if (cpus_intersects(desc->affinity, cpu_online_map)) | ||
| 128 | mask = desc->affinity; | ||
| 129 | else | ||
| 130 | desc->status &= ~IRQ_AFFINITY_SET; | ||
| 131 | } | ||
| 132 | |||
| 121 | desc->affinity = mask; | 133 | desc->affinity = mask; |
| 122 | desc->chip->set_affinity(irq, mask); | 134 | desc->chip->set_affinity(irq, mask); |
| 123 | 135 | ||
| 124 | return 0; | 136 | return 0; |
| 125 | } | 137 | } |
| 138 | #else | ||
| 139 | static inline int do_irq_select_affinity(unsigned int irq, struct irq_desc *d) | ||
| 140 | { | ||
| 141 | return irq_select_affinity(irq); | ||
| 142 | } | ||
| 126 | #endif | 143 | #endif |
| 127 | 144 | ||
| 145 | /* | ||
| 146 | * Called when affinity is set via /proc/irq | ||
| 147 | */ | ||
| 148 | int irq_select_affinity_usr(unsigned int irq) | ||
| 149 | { | ||
| 150 | struct irq_desc *desc = irq_to_desc(irq); | ||
| 151 | unsigned long flags; | ||
| 152 | int ret; | ||
| 153 | |||
| 154 | spin_lock_irqsave(&desc->lock, flags); | ||
| 155 | ret = do_irq_select_affinity(irq, desc); | ||
| 156 | spin_unlock_irqrestore(&desc->lock, flags); | ||
| 157 | |||
| 158 | return ret; | ||
| 159 | } | ||
| 160 | |||
| 161 | #else | ||
| 162 | static inline int do_irq_select_affinity(int irq, struct irq_desc *desc) | ||
| 163 | { | ||
| 164 | return 0; | ||
| 165 | } | ||
| 128 | #endif | 166 | #endif |
| 129 | 167 | ||
| 130 | /** | 168 | /** |
| @@ -327,7 +365,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, | |||
| 327 | * IRQF_TRIGGER_* but the PIC does not support multiple | 365 | * IRQF_TRIGGER_* but the PIC does not support multiple |
| 328 | * flow-types? | 366 | * flow-types? |
| 329 | */ | 367 | */ |
| 330 | pr_warning("No set_type function for IRQ %d (%s)\n", irq, | 368 | pr_debug("No set_type function for IRQ %d (%s)\n", irq, |
| 331 | chip ? (chip->name ? : "unknown") : "unknown"); | 369 | chip ? (chip->name ? : "unknown") : "unknown"); |
| 332 | return 0; | 370 | return 0; |
| 333 | } | 371 | } |
| @@ -445,8 +483,12 @@ __setup_irq(unsigned int irq, struct irq_desc * desc, struct irqaction *new) | |||
| 445 | /* Undo nested disables: */ | 483 | /* Undo nested disables: */ |
| 446 | desc->depth = 1; | 484 | desc->depth = 1; |
| 447 | 485 | ||
| 486 | /* Exclude IRQ from balancing if requested */ | ||
| 487 | if (new->flags & IRQF_NOBALANCING) | ||
| 488 | desc->status |= IRQ_NO_BALANCING; | ||
| 489 | |||
| 448 | /* Set default affinity mask once everything is setup */ | 490 | /* Set default affinity mask once everything is setup */ |
| 449 | irq_select_affinity(irq); | 491 | do_irq_select_affinity(irq, desc); |
| 450 | 492 | ||
| 451 | } else if ((new->flags & IRQF_TRIGGER_MASK) | 493 | } else if ((new->flags & IRQF_TRIGGER_MASK) |
| 452 | && (new->flags & IRQF_TRIGGER_MASK) | 494 | && (new->flags & IRQF_TRIGGER_MASK) |
| @@ -459,10 +501,6 @@ __setup_irq(unsigned int irq, struct irq_desc * desc, struct irqaction *new) | |||
| 459 | 501 | ||
| 460 | *p = new; | 502 | *p = new; |
| 461 | 503 | ||
| 462 | /* Exclude IRQ from balancing */ | ||
| 463 | if (new->flags & IRQF_NOBALANCING) | ||
| 464 | desc->status |= IRQ_NO_BALANCING; | ||
| 465 | |||
| 466 | /* Reset broken irq detection when installing new handler */ | 504 | /* Reset broken irq detection when installing new handler */ |
| 467 | desc->irq_count = 0; | 505 | desc->irq_count = 0; |
| 468 | desc->irqs_unhandled = 0; | 506 | desc->irqs_unhandled = 0; |
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index 90b920d3f52b..9db681d95814 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c | |||
| @@ -1,17 +1,6 @@ | |||
| 1 | 1 | ||
| 2 | #include <linux/irq.h> | 2 | #include <linux/irq.h> |
| 3 | 3 | ||
| 4 | void set_pending_irq(unsigned int irq, cpumask_t mask) | ||
| 5 | { | ||
| 6 | struct irq_desc *desc = irq_to_desc(irq); | ||
| 7 | unsigned long flags; | ||
| 8 | |||
| 9 | spin_lock_irqsave(&desc->lock, flags); | ||
| 10 | desc->status |= IRQ_MOVE_PENDING; | ||
| 11 | desc->pending_mask = mask; | ||
| 12 | spin_unlock_irqrestore(&desc->lock, flags); | ||
| 13 | } | ||
| 14 | |||
| 15 | void move_masked_irq(int irq) | 4 | void move_masked_irq(int irq) |
| 16 | { | 5 | { |
| 17 | struct irq_desc *desc = irq_to_desc(irq); | 6 | struct irq_desc *desc = irq_to_desc(irq); |
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c index 4d161c70ba55..d257e7d6a8a4 100644 --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c | |||
| @@ -62,7 +62,7 @@ static ssize_t irq_affinity_proc_write(struct file *file, | |||
| 62 | if (!cpus_intersects(new_value, cpu_online_map)) | 62 | if (!cpus_intersects(new_value, cpu_online_map)) |
| 63 | /* Special case for empty set - allow the architecture | 63 | /* Special case for empty set - allow the architecture |
| 64 | code to set default SMP affinity. */ | 64 | code to set default SMP affinity. */ |
| 65 | return irq_select_affinity(irq) ? -EINVAL : count; | 65 | return irq_select_affinity_usr(irq) ? -EINVAL : count; |
| 66 | 66 | ||
| 67 | irq_set_affinity(irq, new_value); | 67 | irq_set_affinity(irq, new_value); |
| 68 | 68 | ||
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 06e157119d2b..46a404173db2 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
| @@ -3276,10 +3276,10 @@ void __init lockdep_info(void) | |||
| 3276 | { | 3276 | { |
| 3277 | printk("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar\n"); | 3277 | printk("Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar\n"); |
| 3278 | 3278 | ||
| 3279 | printk("... MAX_LOCKDEP_SUBCLASSES: %lu\n", MAX_LOCKDEP_SUBCLASSES); | 3279 | printk("... MAX_LOCKDEP_SUBCLASSES: %lu\n", MAX_LOCKDEP_SUBCLASSES); |
| 3280 | printk("... MAX_LOCK_DEPTH: %lu\n", MAX_LOCK_DEPTH); | 3280 | printk("... MAX_LOCK_DEPTH: %lu\n", MAX_LOCK_DEPTH); |
| 3281 | printk("... MAX_LOCKDEP_KEYS: %lu\n", MAX_LOCKDEP_KEYS); | 3281 | printk("... MAX_LOCKDEP_KEYS: %lu\n", MAX_LOCKDEP_KEYS); |
| 3282 | printk("... CLASSHASH_SIZE: %lu\n", CLASSHASH_SIZE); | 3282 | printk("... CLASSHASH_SIZE: %lu\n", CLASSHASH_SIZE); |
| 3283 | printk("... MAX_LOCKDEP_ENTRIES: %lu\n", MAX_LOCKDEP_ENTRIES); | 3283 | printk("... MAX_LOCKDEP_ENTRIES: %lu\n", MAX_LOCKDEP_ENTRIES); |
| 3284 | printk("... MAX_LOCKDEP_CHAINS: %lu\n", MAX_LOCKDEP_CHAINS); | 3284 | printk("... MAX_LOCKDEP_CHAINS: %lu\n", MAX_LOCKDEP_CHAINS); |
| 3285 | printk("... CHAINHASH_SIZE: %lu\n", CHAINHASH_SIZE); | 3285 | printk("... CHAINHASH_SIZE: %lu\n", CHAINHASH_SIZE); |
diff --git a/kernel/panic.c b/kernel/panic.c index 6513aac8e992..4d5088355bfe 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
| @@ -167,6 +167,7 @@ static const struct tnt tnts[] = { | |||
| 167 | * 'M' - System experienced a machine check exception. | 167 | * 'M' - System experienced a machine check exception. |
| 168 | * 'B' - System has hit bad_page. | 168 | * 'B' - System has hit bad_page. |
| 169 | * 'U' - Userspace-defined naughtiness. | 169 | * 'U' - Userspace-defined naughtiness. |
| 170 | * 'D' - Kernel has oopsed before | ||
| 170 | * 'A' - ACPI table overridden. | 171 | * 'A' - ACPI table overridden. |
| 171 | * 'W' - Taint on warning. | 172 | * 'W' - Taint on warning. |
| 172 | * 'C' - modules from drivers/staging are loaded. | 173 | * 'C' - modules from drivers/staging are loaded. |
diff --git a/kernel/profile.c b/kernel/profile.c index 5b7d1ac7124c..dc41827fbfee 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
| @@ -351,7 +351,7 @@ out: | |||
| 351 | put_cpu(); | 351 | put_cpu(); |
| 352 | } | 352 | } |
| 353 | 353 | ||
| 354 | static int __devinit profile_cpu_callback(struct notifier_block *info, | 354 | static int __cpuinit profile_cpu_callback(struct notifier_block *info, |
| 355 | unsigned long action, void *__cpu) | 355 | unsigned long action, void *__cpu) |
| 356 | { | 356 | { |
| 357 | int node, cpu = (unsigned long)__cpu; | 357 | int node, cpu = (unsigned long)__cpu; |
| @@ -596,7 +596,7 @@ out_cleanup: | |||
| 596 | #define create_hash_tables() ({ 0; }) | 596 | #define create_hash_tables() ({ 0; }) |
| 597 | #endif | 597 | #endif |
| 598 | 598 | ||
| 599 | int create_proc_profile(void) | 599 | int __ref create_proc_profile(void) /* false positive from hotcpu_notifier */ |
| 600 | { | 600 | { |
| 601 | struct proc_dir_entry *entry; | 601 | struct proc_dir_entry *entry; |
| 602 | 602 | ||
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 1e68e4c39e2c..4c8bcd7dd8e0 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
| @@ -612,7 +612,7 @@ int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) | |||
| 612 | return (copied == sizeof(data)) ? 0 : -EIO; | 612 | return (copied == sizeof(data)) ? 0 : -EIO; |
| 613 | } | 613 | } |
| 614 | 614 | ||
| 615 | #if defined CONFIG_COMPAT && defined __ARCH_WANT_COMPAT_SYS_PTRACE | 615 | #if defined CONFIG_COMPAT |
| 616 | #include <linux/compat.h> | 616 | #include <linux/compat.h> |
| 617 | 617 | ||
| 618 | int compat_ptrace_request(struct task_struct *child, compat_long_t request, | 618 | int compat_ptrace_request(struct task_struct *child, compat_long_t request, |
| @@ -709,4 +709,4 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, | |||
| 709 | unlock_kernel(); | 709 | unlock_kernel(); |
| 710 | return ret; | 710 | return ret; |
| 711 | } | 711 | } |
| 712 | #endif /* CONFIG_COMPAT && __ARCH_WANT_COMPAT_SYS_PTRACE */ | 712 | #endif /* CONFIG_COMPAT */ |
diff --git a/kernel/sched.c b/kernel/sched.c index 9b1e79371c20..b7480fb5c3dc 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -1453,9 +1453,10 @@ static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd); | |||
| 1453 | static unsigned long cpu_avg_load_per_task(int cpu) | 1453 | static unsigned long cpu_avg_load_per_task(int cpu) |
| 1454 | { | 1454 | { |
| 1455 | struct rq *rq = cpu_rq(cpu); | 1455 | struct rq *rq = cpu_rq(cpu); |
| 1456 | unsigned long nr_running = ACCESS_ONCE(rq->nr_running); | ||
| 1456 | 1457 | ||
| 1457 | if (rq->nr_running) | 1458 | if (nr_running) |
| 1458 | rq->avg_load_per_task = rq->load.weight / rq->nr_running; | 1459 | rq->avg_load_per_task = rq->load.weight / nr_running; |
| 1459 | else | 1460 | else |
| 1460 | rq->avg_load_per_task = 0; | 1461 | rq->avg_load_per_task = 0; |
| 1461 | 1462 | ||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 9d048fa2d902..3d56fe7570da 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -176,6 +176,9 @@ extern struct ctl_table random_table[]; | |||
| 176 | #ifdef CONFIG_INOTIFY_USER | 176 | #ifdef CONFIG_INOTIFY_USER |
| 177 | extern struct ctl_table inotify_table[]; | 177 | extern struct ctl_table inotify_table[]; |
| 178 | #endif | 178 | #endif |
| 179 | #ifdef CONFIG_EPOLL | ||
| 180 | extern struct ctl_table epoll_table[]; | ||
| 181 | #endif | ||
| 179 | 182 | ||
| 180 | #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT | 183 | #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT |
| 181 | int sysctl_legacy_va_layout; | 184 | int sysctl_legacy_va_layout; |
| @@ -1325,6 +1328,13 @@ static struct ctl_table fs_table[] = { | |||
| 1325 | .child = inotify_table, | 1328 | .child = inotify_table, |
| 1326 | }, | 1329 | }, |
| 1327 | #endif | 1330 | #endif |
| 1331 | #ifdef CONFIG_EPOLL | ||
| 1332 | { | ||
| 1333 | .procname = "epoll", | ||
| 1334 | .mode = 0555, | ||
| 1335 | .child = epoll_table, | ||
| 1336 | }, | ||
| 1337 | #endif | ||
| 1328 | #endif | 1338 | #endif |
| 1329 | { | 1339 | { |
| 1330 | .ctl_name = KERN_SETUID_DUMPABLE, | 1340 | .ctl_name = KERN_SETUID_DUMPABLE, |
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index f780e9552f91..668bbb5ef2bd 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -1215,7 +1215,7 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer, | |||
| 1215 | 1215 | ||
| 1216 | out: | 1216 | out: |
| 1217 | if (resched) | 1217 | if (resched) |
| 1218 | preempt_enable_notrace(); | 1218 | preempt_enable_no_resched_notrace(); |
| 1219 | else | 1219 | else |
| 1220 | preempt_enable_notrace(); | 1220 | preempt_enable_notrace(); |
| 1221 | return NULL; | 1221 | return NULL; |
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c index f28484618ff0..e62cbf78eab6 100644 --- a/kernel/trace/trace_mmiotrace.c +++ b/kernel/trace/trace_mmiotrace.c | |||
| @@ -18,12 +18,14 @@ struct header_iter { | |||
| 18 | 18 | ||
| 19 | static struct trace_array *mmio_trace_array; | 19 | static struct trace_array *mmio_trace_array; |
| 20 | static bool overrun_detected; | 20 | static bool overrun_detected; |
| 21 | static unsigned long prev_overruns; | ||
| 21 | 22 | ||
| 22 | static void mmio_reset_data(struct trace_array *tr) | 23 | static void mmio_reset_data(struct trace_array *tr) |
| 23 | { | 24 | { |
| 24 | int cpu; | 25 | int cpu; |
| 25 | 26 | ||
| 26 | overrun_detected = false; | 27 | overrun_detected = false; |
| 28 | prev_overruns = 0; | ||
| 27 | tr->time_start = ftrace_now(tr->cpu); | 29 | tr->time_start = ftrace_now(tr->cpu); |
| 28 | 30 | ||
| 29 | for_each_online_cpu(cpu) | 31 | for_each_online_cpu(cpu) |
| @@ -128,16 +130,12 @@ static void mmio_close(struct trace_iterator *iter) | |||
| 128 | 130 | ||
| 129 | static unsigned long count_overruns(struct trace_iterator *iter) | 131 | static unsigned long count_overruns(struct trace_iterator *iter) |
| 130 | { | 132 | { |
| 131 | int cpu; | ||
| 132 | unsigned long cnt = 0; | 133 | unsigned long cnt = 0; |
| 133 | /* FIXME: */ | 134 | unsigned long over = ring_buffer_overruns(iter->tr->buffer); |
| 134 | #if 0 | 135 | |
| 135 | for_each_online_cpu(cpu) { | 136 | if (over > prev_overruns) |
| 136 | cnt += iter->overrun[cpu]; | 137 | cnt = over - prev_overruns; |
| 137 | iter->overrun[cpu] = 0; | 138 | prev_overruns = over; |
| 138 | } | ||
| 139 | #endif | ||
| 140 | (void)cpu; | ||
| 141 | return cnt; | 139 | return cnt; |
| 142 | } | 140 | } |
| 143 | 141 | ||
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index be682b62fe58..3bdb44bde4b7 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c | |||
| @@ -184,11 +184,16 @@ static struct file_operations stack_max_size_fops = { | |||
| 184 | static void * | 184 | static void * |
| 185 | t_next(struct seq_file *m, void *v, loff_t *pos) | 185 | t_next(struct seq_file *m, void *v, loff_t *pos) |
| 186 | { | 186 | { |
| 187 | long i = (long)m->private; | 187 | long i; |
| 188 | 188 | ||
| 189 | (*pos)++; | 189 | (*pos)++; |
| 190 | 190 | ||
| 191 | i++; | 191 | if (v == SEQ_START_TOKEN) |
| 192 | i = 0; | ||
| 193 | else { | ||
| 194 | i = *(long *)v; | ||
| 195 | i++; | ||
| 196 | } | ||
| 192 | 197 | ||
| 193 | if (i >= max_stack_trace.nr_entries || | 198 | if (i >= max_stack_trace.nr_entries || |
| 194 | stack_dump_trace[i] == ULONG_MAX) | 199 | stack_dump_trace[i] == ULONG_MAX) |
| @@ -201,12 +206,15 @@ t_next(struct seq_file *m, void *v, loff_t *pos) | |||
| 201 | 206 | ||
| 202 | static void *t_start(struct seq_file *m, loff_t *pos) | 207 | static void *t_start(struct seq_file *m, loff_t *pos) |
| 203 | { | 208 | { |
| 204 | void *t = &m->private; | 209 | void *t = SEQ_START_TOKEN; |
| 205 | loff_t l = 0; | 210 | loff_t l = 0; |
| 206 | 211 | ||
| 207 | local_irq_disable(); | 212 | local_irq_disable(); |
| 208 | __raw_spin_lock(&max_stack_lock); | 213 | __raw_spin_lock(&max_stack_lock); |
| 209 | 214 | ||
| 215 | if (*pos == 0) | ||
| 216 | return SEQ_START_TOKEN; | ||
| 217 | |||
| 210 | for (; t && l < *pos; t = t_next(m, t, &l)) | 218 | for (; t && l < *pos; t = t_next(m, t, &l)) |
| 211 | ; | 219 | ; |
| 212 | 220 | ||
| @@ -235,10 +243,10 @@ static int trace_lookup_stack(struct seq_file *m, long i) | |||
| 235 | 243 | ||
| 236 | static int t_show(struct seq_file *m, void *v) | 244 | static int t_show(struct seq_file *m, void *v) |
| 237 | { | 245 | { |
| 238 | long i = *(long *)v; | 246 | long i; |
| 239 | int size; | 247 | int size; |
| 240 | 248 | ||
| 241 | if (i < 0) { | 249 | if (v == SEQ_START_TOKEN) { |
| 242 | seq_printf(m, " Depth Size Location" | 250 | seq_printf(m, " Depth Size Location" |
| 243 | " (%d entries)\n" | 251 | " (%d entries)\n" |
| 244 | " ----- ---- --------\n", | 252 | " ----- ---- --------\n", |
| @@ -246,6 +254,8 @@ static int t_show(struct seq_file *m, void *v) | |||
| 246 | return 0; | 254 | return 0; |
| 247 | } | 255 | } |
| 248 | 256 | ||
| 257 | i = *(long *)v; | ||
| 258 | |||
| 249 | if (i >= max_stack_trace.nr_entries || | 259 | if (i >= max_stack_trace.nr_entries || |
| 250 | stack_dump_trace[i] == ULONG_MAX) | 260 | stack_dump_trace[i] == ULONG_MAX) |
| 251 | return 0; | 261 | return 0; |
| @@ -275,10 +285,6 @@ static int stack_trace_open(struct inode *inode, struct file *file) | |||
| 275 | int ret; | 285 | int ret; |
| 276 | 286 | ||
| 277 | ret = seq_open(file, &stack_trace_seq_ops); | 287 | ret = seq_open(file, &stack_trace_seq_ops); |
| 278 | if (!ret) { | ||
| 279 | struct seq_file *m = file->private_data; | ||
| 280 | m->private = (void *)-1; | ||
| 281 | } | ||
| 282 | 288 | ||
| 283 | return ret; | 289 | return ret; |
| 284 | } | 290 | } |
| @@ -185,6 +185,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa) | |||
| 185 | new = get_from_free_list(idp); | 185 | new = get_from_free_list(idp); |
| 186 | if (!new) | 186 | if (!new) |
| 187 | return -1; | 187 | return -1; |
| 188 | new->layer = l-1; | ||
| 188 | rcu_assign_pointer(p->ary[m], new); | 189 | rcu_assign_pointer(p->ary[m], new); |
| 189 | p->count++; | 190 | p->count++; |
| 190 | } | 191 | } |
| @@ -210,6 +211,7 @@ build_up: | |||
| 210 | if (unlikely(!p)) { | 211 | if (unlikely(!p)) { |
| 211 | if (!(p = get_from_free_list(idp))) | 212 | if (!(p = get_from_free_list(idp))) |
| 212 | return -1; | 213 | return -1; |
| 214 | p->layer = 0; | ||
| 213 | layers = 1; | 215 | layers = 1; |
| 214 | } | 216 | } |
| 215 | /* | 217 | /* |
| @@ -237,6 +239,7 @@ build_up: | |||
| 237 | } | 239 | } |
| 238 | new->ary[0] = p; | 240 | new->ary[0] = p; |
| 239 | new->count = 1; | 241 | new->count = 1; |
| 242 | new->layer = layers-1; | ||
| 240 | if (p->bitmap == IDR_FULL) | 243 | if (p->bitmap == IDR_FULL) |
| 241 | __set_bit(0, &new->bitmap); | 244 | __set_bit(0, &new->bitmap); |
| 242 | p = new; | 245 | p = new; |
| @@ -493,17 +496,21 @@ void *idr_find(struct idr *idp, int id) | |||
| 493 | int n; | 496 | int n; |
| 494 | struct idr_layer *p; | 497 | struct idr_layer *p; |
| 495 | 498 | ||
| 496 | n = idp->layers * IDR_BITS; | ||
| 497 | p = rcu_dereference(idp->top); | 499 | p = rcu_dereference(idp->top); |
| 500 | if (!p) | ||
| 501 | return NULL; | ||
| 502 | n = (p->layer+1) * IDR_BITS; | ||
| 498 | 503 | ||
| 499 | /* Mask off upper bits we don't use for the search. */ | 504 | /* Mask off upper bits we don't use for the search. */ |
| 500 | id &= MAX_ID_MASK; | 505 | id &= MAX_ID_MASK; |
| 501 | 506 | ||
| 502 | if (id >= (1 << n)) | 507 | if (id >= (1 << n)) |
| 503 | return NULL; | 508 | return NULL; |
| 509 | BUG_ON(n == 0); | ||
| 504 | 510 | ||
| 505 | while (n > 0 && p) { | 511 | while (n > 0 && p) { |
| 506 | n -= IDR_BITS; | 512 | n -= IDR_BITS; |
| 513 | BUG_ON(n != p->layer*IDR_BITS); | ||
| 507 | p = rcu_dereference(p->ary[(id >> n) & IDR_MASK]); | 514 | p = rcu_dereference(p->ary[(id >> n) & IDR_MASK]); |
| 508 | } | 515 | } |
| 509 | return((void *)p); | 516 | return((void *)p); |
| @@ -582,8 +589,11 @@ void *idr_replace(struct idr *idp, void *ptr, int id) | |||
| 582 | int n; | 589 | int n; |
| 583 | struct idr_layer *p, *old_p; | 590 | struct idr_layer *p, *old_p; |
| 584 | 591 | ||
| 585 | n = idp->layers * IDR_BITS; | ||
| 586 | p = idp->top; | 592 | p = idp->top; |
| 593 | if (!p) | ||
| 594 | return ERR_PTR(-EINVAL); | ||
| 595 | |||
| 596 | n = (p->layer+1) * IDR_BITS; | ||
| 587 | 597 | ||
| 588 | id &= MAX_ID_MASK; | 598 | id &= MAX_ID_MASK; |
| 589 | 599 | ||
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index b5b2b15085a8..b17371185468 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
| @@ -189,7 +189,7 @@ static void grow_pgdat_span(struct pglist_data *pgdat, unsigned long start_pfn, | |||
| 189 | pgdat->node_start_pfn; | 189 | pgdat->node_start_pfn; |
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) | 192 | static int __meminit __add_zone(struct zone *zone, unsigned long phys_start_pfn) |
| 193 | { | 193 | { |
| 194 | struct pglist_data *pgdat = zone->zone_pgdat; | 194 | struct pglist_data *pgdat = zone->zone_pgdat; |
| 195 | int nr_pages = PAGES_PER_SECTION; | 195 | int nr_pages = PAGES_PER_SECTION; |
| @@ -216,7 +216,7 @@ static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) | |||
| 216 | return 0; | 216 | return 0; |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | static int __add_section(struct zone *zone, unsigned long phys_start_pfn) | 219 | static int __meminit __add_section(struct zone *zone, unsigned long phys_start_pfn) |
| 220 | { | 220 | { |
| 221 | int nr_pages = PAGES_PER_SECTION; | 221 | int nr_pages = PAGES_PER_SECTION; |
| 222 | int ret; | 222 | int ret; |
| @@ -273,7 +273,7 @@ static int __remove_section(struct zone *zone, struct mem_section *ms) | |||
| 273 | * call this function after deciding the zone to which to | 273 | * call this function after deciding the zone to which to |
| 274 | * add the new pages. | 274 | * add the new pages. |
| 275 | */ | 275 | */ |
| 276 | int __add_pages(struct zone *zone, unsigned long phys_start_pfn, | 276 | int __ref __add_pages(struct zone *zone, unsigned long phys_start_pfn, |
| 277 | unsigned long nr_pages) | 277 | unsigned long nr_pages) |
| 278 | { | 278 | { |
| 279 | unsigned long i; | 279 | unsigned long i; |
| @@ -470,7 +470,8 @@ static void rollback_node_hotadd(int nid, pg_data_t *pgdat) | |||
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | 472 | ||
| 473 | int add_memory(int nid, u64 start, u64 size) | 473 | /* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ |
| 474 | int __ref add_memory(int nid, u64 start, u64 size) | ||
| 474 | { | 475 | { |
| 475 | pg_data_t *pgdat = NULL; | 476 | pg_data_t *pgdat = NULL; |
| 476 | int new_pgdat = 0; | 477 | int new_pgdat = 0; |
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 1223d927904d..0b3cbf090a67 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c | |||
| @@ -21,7 +21,7 @@ static unsigned long total_usage; | |||
| 21 | #if !defined(CONFIG_SPARSEMEM) | 21 | #if !defined(CONFIG_SPARSEMEM) |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | void __init pgdat_page_cgroup_init(struct pglist_data *pgdat) | 24 | void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat) |
| 25 | { | 25 | { |
| 26 | pgdat->node_page_cgroup = NULL; | 26 | pgdat->node_page_cgroup = NULL; |
| 27 | } | 27 | } |
| @@ -97,7 +97,8 @@ struct page_cgroup *lookup_page_cgroup(struct page *page) | |||
| 97 | return section->page_cgroup + pfn; | 97 | return section->page_cgroup + pfn; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | int __meminit init_section_page_cgroup(unsigned long pfn) | 100 | /* __alloc_bootmem...() is protected by !slab_available() */ |
| 101 | int __init_refok init_section_page_cgroup(unsigned long pfn) | ||
| 101 | { | 102 | { |
| 102 | struct mem_section *section; | 103 | struct mem_section *section; |
| 103 | struct page_cgroup *base, *pc; | 104 | struct page_cgroup *base, *pc; |
| @@ -106,19 +107,29 @@ int __meminit init_section_page_cgroup(unsigned long pfn) | |||
| 106 | 107 | ||
| 107 | section = __pfn_to_section(pfn); | 108 | section = __pfn_to_section(pfn); |
| 108 | 109 | ||
| 109 | if (section->page_cgroup) | 110 | if (!section->page_cgroup) { |
| 110 | return 0; | 111 | nid = page_to_nid(pfn_to_page(pfn)); |
| 111 | 112 | table_size = sizeof(struct page_cgroup) * PAGES_PER_SECTION; | |
| 112 | nid = page_to_nid(pfn_to_page(pfn)); | 113 | if (slab_is_available()) { |
| 113 | 114 | base = kmalloc_node(table_size, GFP_KERNEL, nid); | |
| 114 | table_size = sizeof(struct page_cgroup) * PAGES_PER_SECTION; | 115 | if (!base) |
| 115 | if (slab_is_available()) { | 116 | base = vmalloc_node(table_size, nid); |
| 116 | base = kmalloc_node(table_size, GFP_KERNEL, nid); | 117 | } else { |
| 117 | if (!base) | 118 | base = __alloc_bootmem_node_nopanic(NODE_DATA(nid), |
| 118 | base = vmalloc_node(table_size, nid); | 119 | table_size, |
| 119 | } else { | ||
| 120 | base = __alloc_bootmem_node_nopanic(NODE_DATA(nid), table_size, | ||
| 121 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS)); | 120 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS)); |
| 121 | } | ||
| 122 | } else { | ||
| 123 | /* | ||
| 124 | * We don't have to allocate page_cgroup again, but | ||
| 125 | * address of memmap may be changed. So, we have to initialize | ||
| 126 | * again. | ||
| 127 | */ | ||
| 128 | base = section->page_cgroup + pfn; | ||
| 129 | table_size = 0; | ||
| 130 | /* check address of memmap is changed or not. */ | ||
| 131 | if (base->page == pfn_to_page(pfn)) | ||
| 132 | return 0; | ||
| 122 | } | 133 | } |
| 123 | 134 | ||
| 124 | if (!base) { | 135 | if (!base) { |
| @@ -158,7 +169,7 @@ void __free_page_cgroup(unsigned long pfn) | |||
| 158 | } | 169 | } |
| 159 | } | 170 | } |
| 160 | 171 | ||
| 161 | int online_page_cgroup(unsigned long start_pfn, | 172 | int __meminit online_page_cgroup(unsigned long start_pfn, |
| 162 | unsigned long nr_pages, | 173 | unsigned long nr_pages, |
| 163 | int nid) | 174 | int nid) |
| 164 | { | 175 | { |
| @@ -183,7 +194,7 @@ int online_page_cgroup(unsigned long start_pfn, | |||
| 183 | return -ENOMEM; | 194 | return -ENOMEM; |
| 184 | } | 195 | } |
| 185 | 196 | ||
| 186 | int offline_page_cgroup(unsigned long start_pfn, | 197 | int __meminit offline_page_cgroup(unsigned long start_pfn, |
| 187 | unsigned long nr_pages, int nid) | 198 | unsigned long nr_pages, int nid) |
| 188 | { | 199 | { |
| 189 | unsigned long start, end, pfn; | 200 | unsigned long start, end, pfn; |
| @@ -197,7 +208,7 @@ int offline_page_cgroup(unsigned long start_pfn, | |||
| 197 | 208 | ||
| 198 | } | 209 | } |
| 199 | 210 | ||
| 200 | static int page_cgroup_callback(struct notifier_block *self, | 211 | static int __meminit page_cgroup_callback(struct notifier_block *self, |
| 201 | unsigned long action, void *arg) | 212 | unsigned long action, void *arg) |
| 202 | { | 213 | { |
| 203 | struct memory_notify *mn = arg; | 214 | struct memory_notify *mn = arg; |
| @@ -207,18 +218,23 @@ static int page_cgroup_callback(struct notifier_block *self, | |||
| 207 | ret = online_page_cgroup(mn->start_pfn, | 218 | ret = online_page_cgroup(mn->start_pfn, |
| 208 | mn->nr_pages, mn->status_change_nid); | 219 | mn->nr_pages, mn->status_change_nid); |
| 209 | break; | 220 | break; |
| 210 | case MEM_CANCEL_ONLINE: | ||
| 211 | case MEM_OFFLINE: | 221 | case MEM_OFFLINE: |
| 212 | offline_page_cgroup(mn->start_pfn, | 222 | offline_page_cgroup(mn->start_pfn, |
| 213 | mn->nr_pages, mn->status_change_nid); | 223 | mn->nr_pages, mn->status_change_nid); |
| 214 | break; | 224 | break; |
| 225 | case MEM_CANCEL_ONLINE: | ||
| 215 | case MEM_GOING_OFFLINE: | 226 | case MEM_GOING_OFFLINE: |
| 216 | break; | 227 | break; |
| 217 | case MEM_ONLINE: | 228 | case MEM_ONLINE: |
| 218 | case MEM_CANCEL_OFFLINE: | 229 | case MEM_CANCEL_OFFLINE: |
| 219 | break; | 230 | break; |
| 220 | } | 231 | } |
| 221 | ret = notifier_from_errno(ret); | 232 | |
| 233 | if (ret) | ||
| 234 | ret = notifier_from_errno(ret); | ||
| 235 | else | ||
| 236 | ret = NOTIFY_OK; | ||
| 237 | |||
| 222 | return ret; | 238 | return ret; |
| 223 | } | 239 | } |
| 224 | 240 | ||
| @@ -248,7 +264,7 @@ void __init page_cgroup_init(void) | |||
| 248 | " want\n"); | 264 | " want\n"); |
| 249 | } | 265 | } |
| 250 | 266 | ||
| 251 | void __init pgdat_page_cgroup_init(struct pglist_data *pgdat) | 267 | void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat) |
| 252 | { | 268 | { |
| 253 | return; | 269 | return; |
| 254 | } | 270 | } |
| @@ -2931,8 +2931,10 @@ static int slab_memory_callback(struct notifier_block *self, | |||
| 2931 | case MEM_CANCEL_OFFLINE: | 2931 | case MEM_CANCEL_OFFLINE: |
| 2932 | break; | 2932 | break; |
| 2933 | } | 2933 | } |
| 2934 | 2934 | if (ret) | |
| 2935 | ret = notifier_from_errno(ret); | 2935 | ret = notifier_from_errno(ret); |
| 2936 | else | ||
| 2937 | ret = NOTIFY_OK; | ||
| 2936 | return ret; | 2938 | return ret; |
| 2937 | } | 2939 | } |
| 2938 | 2940 | ||
diff --git a/mm/sparse.c b/mm/sparse.c index 39db301b920d..083f5b63e7a8 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
| @@ -570,7 +570,7 @@ static void free_section_usemap(struct page *memmap, unsigned long *usemap) | |||
| 570 | * set. If this is <=0, then that means that the passed-in | 570 | * set. If this is <=0, then that means that the passed-in |
| 571 | * map was not consumed and must be freed. | 571 | * map was not consumed and must be freed. |
| 572 | */ | 572 | */ |
| 573 | int sparse_add_one_section(struct zone *zone, unsigned long start_pfn, | 573 | int __meminit sparse_add_one_section(struct zone *zone, unsigned long start_pfn, |
| 574 | int nr_pages) | 574 | int nr_pages) |
| 575 | { | 575 | { |
| 576 | unsigned long section_nr = pfn_to_section_nr(start_pfn); | 576 | unsigned long section_nr = pfn_to_section_nr(start_pfn); |
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 30f826d484f0..f3f6e0758562 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
| @@ -77,7 +77,6 @@ static void vunmap_page_range(unsigned long addr, unsigned long end) | |||
| 77 | 77 | ||
| 78 | BUG_ON(addr >= end); | 78 | BUG_ON(addr >= end); |
| 79 | pgd = pgd_offset_k(addr); | 79 | pgd = pgd_offset_k(addr); |
| 80 | flush_cache_vunmap(addr, end); | ||
| 81 | do { | 80 | do { |
| 82 | next = pgd_addr_end(addr, end); | 81 | next = pgd_addr_end(addr, end); |
| 83 | if (pgd_none_or_clear_bad(pgd)) | 82 | if (pgd_none_or_clear_bad(pgd)) |
| @@ -543,9 +542,10 @@ static void purge_vmap_area_lazy(void) | |||
| 543 | } | 542 | } |
| 544 | 543 | ||
| 545 | /* | 544 | /* |
| 546 | * Free and unmap a vmap area | 545 | * Free and unmap a vmap area, caller ensuring flush_cache_vunmap had been |
| 546 | * called for the correct range previously. | ||
| 547 | */ | 547 | */ |
| 548 | static void free_unmap_vmap_area(struct vmap_area *va) | 548 | static void free_unmap_vmap_area_noflush(struct vmap_area *va) |
| 549 | { | 549 | { |
| 550 | va->flags |= VM_LAZY_FREE; | 550 | va->flags |= VM_LAZY_FREE; |
| 551 | atomic_add((va->va_end - va->va_start) >> PAGE_SHIFT, &vmap_lazy_nr); | 551 | atomic_add((va->va_end - va->va_start) >> PAGE_SHIFT, &vmap_lazy_nr); |
| @@ -553,6 +553,15 @@ static void free_unmap_vmap_area(struct vmap_area *va) | |||
| 553 | try_purge_vmap_area_lazy(); | 553 | try_purge_vmap_area_lazy(); |
| 554 | } | 554 | } |
| 555 | 555 | ||
| 556 | /* | ||
| 557 | * Free and unmap a vmap area | ||
| 558 | */ | ||
| 559 | static void free_unmap_vmap_area(struct vmap_area *va) | ||
| 560 | { | ||
| 561 | flush_cache_vunmap(va->va_start, va->va_end); | ||
| 562 | free_unmap_vmap_area_noflush(va); | ||
| 563 | } | ||
| 564 | |||
| 556 | static struct vmap_area *find_vmap_area(unsigned long addr) | 565 | static struct vmap_area *find_vmap_area(unsigned long addr) |
| 557 | { | 566 | { |
| 558 | struct vmap_area *va; | 567 | struct vmap_area *va; |
| @@ -734,7 +743,7 @@ static void free_vmap_block(struct vmap_block *vb) | |||
| 734 | spin_unlock(&vmap_block_tree_lock); | 743 | spin_unlock(&vmap_block_tree_lock); |
| 735 | BUG_ON(tmp != vb); | 744 | BUG_ON(tmp != vb); |
| 736 | 745 | ||
| 737 | free_unmap_vmap_area(vb->va); | 746 | free_unmap_vmap_area_noflush(vb->va); |
| 738 | call_rcu(&vb->rcu_head, rcu_free_vb); | 747 | call_rcu(&vb->rcu_head, rcu_free_vb); |
| 739 | } | 748 | } |
| 740 | 749 | ||
| @@ -796,6 +805,9 @@ static void vb_free(const void *addr, unsigned long size) | |||
| 796 | 805 | ||
| 797 | BUG_ON(size & ~PAGE_MASK); | 806 | BUG_ON(size & ~PAGE_MASK); |
| 798 | BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC); | 807 | BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC); |
| 808 | |||
| 809 | flush_cache_vunmap((unsigned long)addr, (unsigned long)addr + size); | ||
| 810 | |||
| 799 | order = get_order(size); | 811 | order = get_order(size); |
| 800 | 812 | ||
| 801 | offset = (unsigned long)addr & (VMAP_BLOCK_SIZE - 1); | 813 | offset = (unsigned long)addr & (VMAP_BLOCK_SIZE - 1); |
diff --git a/mm/vmscan.c b/mm/vmscan.c index 7ea1440b53db..62e7f62fb559 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -1248,6 +1248,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone, | |||
| 1248 | list_add(&page->lru, &l_inactive); | 1248 | list_add(&page->lru, &l_inactive); |
| 1249 | } | 1249 | } |
| 1250 | 1250 | ||
| 1251 | spin_lock_irq(&zone->lru_lock); | ||
| 1251 | /* | 1252 | /* |
| 1252 | * Count referenced pages from currently used mappings as | 1253 | * Count referenced pages from currently used mappings as |
| 1253 | * rotated, even though they are moved to the inactive list. | 1254 | * rotated, even though they are moved to the inactive list. |
| @@ -1263,7 +1264,6 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone, | |||
| 1263 | 1264 | ||
| 1264 | pgmoved = 0; | 1265 | pgmoved = 0; |
| 1265 | lru = LRU_BASE + file * LRU_FILE; | 1266 | lru = LRU_BASE + file * LRU_FILE; |
| 1266 | spin_lock_irq(&zone->lru_lock); | ||
| 1267 | while (!list_empty(&l_inactive)) { | 1267 | while (!list_empty(&l_inactive)) { |
| 1268 | page = lru_to_page(&l_inactive); | 1268 | page = lru_to_page(&l_inactive); |
| 1269 | prefetchw_prev_lru_page(page, &l_inactive, flags); | 1269 | prefetchw_prev_lru_page(page, &l_inactive, flags); |
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index a53e2fc8dfb5..d27aad78e1d8 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -378,6 +378,10 @@ sub dump_section { | |||
| 378 | # print STDERR "parameter def '$1' = '$contents'\n"; | 378 | # print STDERR "parameter def '$1' = '$contents'\n"; |
| 379 | $name = $1; | 379 | $name = $1; |
| 380 | $parameterdescs{$name} = $contents; | 380 | $parameterdescs{$name} = $contents; |
| 381 | } elsif ($name eq "@\.\.\.") { | ||
| 382 | # print STDERR "parameter def '...' = '$contents'\n"; | ||
| 383 | $name = "..."; | ||
| 384 | $parameterdescs{$name} = $contents; | ||
| 381 | } else { | 385 | } else { |
| 382 | # print STDERR "other section '$name' = '$contents'\n"; | 386 | # print STDERR "other section '$name' = '$contents'\n"; |
| 383 | if (defined($sections{$name}) && ($sections{$name} ne "")) { | 387 | if (defined($sections{$name}) && ($sections{$name} ne "")) { |
| @@ -1588,12 +1592,12 @@ sub push_parameter($$$) { | |||
| 1588 | 1592 | ||
| 1589 | if ($type eq "" && $param =~ /\.\.\.$/) | 1593 | if ($type eq "" && $param =~ /\.\.\.$/) |
| 1590 | { | 1594 | { |
| 1591 | $type=""; | 1595 | if (!defined $parameterdescs{$param} || $parameterdescs{$param} eq "") { |
| 1592 | $parameterdescs{$param} = "variable arguments"; | 1596 | $parameterdescs{$param} = "variable arguments"; |
| 1597 | } | ||
| 1593 | } | 1598 | } |
| 1594 | elsif ($type eq "" && ($param eq "" or $param eq "void")) | 1599 | elsif ($type eq "" && ($param eq "" or $param eq "void")) |
| 1595 | { | 1600 | { |
| 1596 | $type=""; | ||
| 1597 | $param="void"; | 1601 | $param="void"; |
| 1598 | $parameterdescs{void} = "no arguments"; | 1602 | $parameterdescs{void} = "no arguments"; |
| 1599 | } | 1603 | } |
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index 34c1d94f921e..ef6539eea579 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
| 24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 25 | #include <mach/pxa-regs.h> | 25 | #include <mach/regs-ac97.h> |
| 26 | #include <mach/pxa2xx-gpio.h> | 26 | #include <mach/pxa2xx-gpio.h> |
| 27 | #include <mach/audio.h> | 27 | #include <mach/audio.h> |
| 28 | 28 | ||
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index c2635beb4c88..85cf591d4e11 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 24 | #include <mach/pxa-regs.h> | 24 | #include <mach/pxa-regs.h> |
| 25 | #include <mach/regs-ac97.h> | ||
| 25 | #include <mach/audio.h> | 26 | #include <mach/audio.h> |
| 26 | 27 | ||
| 27 | #include "pxa2xx-pcm.h" | 28 | #include "pxa2xx-pcm.h" |
diff --git a/sound/arm/pxa2xx-pcm.h b/sound/arm/pxa2xx-pcm.h index 5c4a4d38a083..65f86b56ba42 100644 --- a/sound/arm/pxa2xx-pcm.h +++ b/sound/arm/pxa2xx-pcm.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | #include <asm/dma.h> | 12 | #include <mach/dma.h> |
| 13 | 13 | ||
| 14 | struct pxa2xx_runtime_data { | 14 | struct pxa2xx_runtime_data { |
| 15 | int dma_ch; | 15 | int dma_ch; |
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index c47842fad657..2c63bb9da74a 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c | |||
| @@ -1483,16 +1483,14 @@ static void __exit unload_waveartist(struct address_info *hw) | |||
| 1483 | #define VNC_HANDSET_DETECT 0x40 | 1483 | #define VNC_HANDSET_DETECT 0x40 |
| 1484 | #define VNC_DISABLE_AUTOSWITCH 0x80 | 1484 | #define VNC_DISABLE_AUTOSWITCH 0x80 |
| 1485 | 1485 | ||
| 1486 | extern spinlock_t gpio_lock; | ||
| 1487 | |||
| 1488 | static inline void | 1486 | static inline void |
| 1489 | vnc_mute_spkr(wavnc_info *devc) | 1487 | vnc_mute_spkr(wavnc_info *devc) |
| 1490 | { | 1488 | { |
| 1491 | unsigned long flags; | 1489 | unsigned long flags; |
| 1492 | 1490 | ||
| 1493 | spin_lock_irqsave(&gpio_lock, flags); | 1491 | spin_lock_irqsave(&nw_gpio_lock, flags); |
| 1494 | cpld_modify(CPLD_UNMUTE, devc->spkr_mute_state ? 0 : CPLD_UNMUTE); | 1492 | nw_cpld_modify(CPLD_UNMUTE, devc->spkr_mute_state ? 0 : CPLD_UNMUTE); |
| 1495 | spin_unlock_irqrestore(&gpio_lock, flags); | 1493 | spin_unlock_irqrestore(&nw_gpio_lock, flags); |
| 1496 | } | 1494 | } |
| 1497 | 1495 | ||
| 1498 | static void | 1496 | static void |
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index ba1ab737b55f..eb9164176dab 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
| @@ -1436,12 +1436,12 @@ static void set_dig_out(struct hda_codec *codec, hda_nid_t nid, | |||
| 1436 | { | 1436 | { |
| 1437 | hda_nid_t *d; | 1437 | hda_nid_t *d; |
| 1438 | 1438 | ||
| 1439 | snd_hda_codec_write(codec, nid, 0, verb, val); | 1439 | snd_hda_codec_write_cache(codec, nid, 0, verb, val); |
| 1440 | d = codec->slave_dig_outs; | 1440 | d = codec->slave_dig_outs; |
| 1441 | if (!d) | 1441 | if (!d) |
| 1442 | return; | 1442 | return; |
| 1443 | for (; *d; d++) | 1443 | for (; *d; d++) |
| 1444 | snd_hda_codec_write(codec, *d, 0, verb, val); | 1444 | snd_hda_codec_write_cache(codec, *d, 0, verb, val); |
| 1445 | } | 1445 | } |
| 1446 | 1446 | ||
| 1447 | static inline void set_dig_out_convert(struct hda_codec *codec, hda_nid_t nid, | 1447 | static inline void set_dig_out_convert(struct hda_codec *codec, hda_nid_t nid, |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 9563b5bbb272..5dd3e89f620a 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -70,7 +70,9 @@ enum { | |||
| 70 | 70 | ||
| 71 | enum { | 71 | enum { |
| 72 | STAC_92HD73XX_REF, | 72 | STAC_92HD73XX_REF, |
| 73 | STAC_DELL_M6, | 73 | STAC_DELL_M6_AMIC, |
| 74 | STAC_DELL_M6_DMIC, | ||
| 75 | STAC_DELL_M6_BOTH, | ||
| 74 | STAC_DELL_EQ, | 76 | STAC_DELL_EQ, |
| 75 | STAC_92HD73XX_MODELS | 77 | STAC_92HD73XX_MODELS |
| 76 | }; | 78 | }; |
| @@ -84,6 +86,7 @@ enum { | |||
| 84 | STAC_92HD71BXX_REF, | 86 | STAC_92HD71BXX_REF, |
| 85 | STAC_DELL_M4_1, | 87 | STAC_DELL_M4_1, |
| 86 | STAC_DELL_M4_2, | 88 | STAC_DELL_M4_2, |
| 89 | STAC_DELL_M4_3, | ||
| 87 | STAC_HP_M4, | 90 | STAC_HP_M4, |
| 88 | STAC_92HD71BXX_MODELS | 91 | STAC_92HD71BXX_MODELS |
| 89 | }; | 92 | }; |
| @@ -137,6 +140,7 @@ struct sigmatel_spec { | |||
| 137 | unsigned int num_mixers; | 140 | unsigned int num_mixers; |
| 138 | 141 | ||
| 139 | int board_config; | 142 | int board_config; |
| 143 | unsigned int eapd_switch: 1; | ||
| 140 | unsigned int surr_switch: 1; | 144 | unsigned int surr_switch: 1; |
| 141 | unsigned int line_switch: 1; | 145 | unsigned int line_switch: 1; |
| 142 | unsigned int mic_switch: 1; | 146 | unsigned int mic_switch: 1; |
| @@ -1600,13 +1604,17 @@ static unsigned int dell_m6_pin_configs[13] = { | |||
| 1600 | 1604 | ||
| 1601 | static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = { | 1605 | static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = { |
| 1602 | [STAC_92HD73XX_REF] = ref92hd73xx_pin_configs, | 1606 | [STAC_92HD73XX_REF] = ref92hd73xx_pin_configs, |
| 1603 | [STAC_DELL_M6] = dell_m6_pin_configs, | 1607 | [STAC_DELL_M6_AMIC] = dell_m6_pin_configs, |
| 1608 | [STAC_DELL_M6_DMIC] = dell_m6_pin_configs, | ||
| 1609 | [STAC_DELL_M6_BOTH] = dell_m6_pin_configs, | ||
| 1604 | [STAC_DELL_EQ] = dell_m6_pin_configs, | 1610 | [STAC_DELL_EQ] = dell_m6_pin_configs, |
| 1605 | }; | 1611 | }; |
| 1606 | 1612 | ||
| 1607 | static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { | 1613 | static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { |
| 1608 | [STAC_92HD73XX_REF] = "ref", | 1614 | [STAC_92HD73XX_REF] = "ref", |
| 1609 | [STAC_DELL_M6] = "dell-m6", | 1615 | [STAC_DELL_M6_AMIC] = "dell-m6-amic", |
| 1616 | [STAC_DELL_M6_DMIC] = "dell-m6-dmic", | ||
| 1617 | [STAC_DELL_M6_BOTH] = "dell-m6", | ||
| 1610 | [STAC_DELL_EQ] = "dell-eq", | 1618 | [STAC_DELL_EQ] = "dell-eq", |
| 1611 | }; | 1619 | }; |
| 1612 | 1620 | ||
| @@ -1615,19 +1623,23 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = { | |||
| 1615 | SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, | 1623 | SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, |
| 1616 | "DFI LanParty", STAC_92HD73XX_REF), | 1624 | "DFI LanParty", STAC_92HD73XX_REF), |
| 1617 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254, | 1625 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0254, |
| 1618 | "unknown Dell", STAC_DELL_M6), | 1626 | "Dell Studio 1535", STAC_DELL_M6_DMIC), |
| 1619 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255, | 1627 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0255, |
| 1620 | "unknown Dell", STAC_DELL_M6), | 1628 | "unknown Dell", STAC_DELL_M6_DMIC), |
| 1621 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0256, | 1629 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0256, |
| 1622 | "unknown Dell", STAC_DELL_M6), | 1630 | "unknown Dell", STAC_DELL_M6_BOTH), |
| 1623 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0257, | 1631 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0257, |
| 1624 | "unknown Dell", STAC_DELL_M6), | 1632 | "unknown Dell", STAC_DELL_M6_BOTH), |
| 1625 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025e, | 1633 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025e, |
| 1626 | "unknown Dell", STAC_DELL_M6), | 1634 | "unknown Dell", STAC_DELL_M6_AMIC), |
| 1627 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025f, | 1635 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x025f, |
| 1628 | "unknown Dell", STAC_DELL_M6), | 1636 | "unknown Dell", STAC_DELL_M6_AMIC), |
| 1629 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0271, | 1637 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0271, |
| 1630 | "unknown Dell", STAC_DELL_M6), | 1638 | "unknown Dell", STAC_DELL_M6_DMIC), |
| 1639 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0272, | ||
| 1640 | "unknown Dell", STAC_DELL_M6_DMIC), | ||
| 1641 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x029f, | ||
| 1642 | "Dell Studio 1537", STAC_DELL_M6_DMIC), | ||
| 1631 | {} /* terminator */ | 1643 | {} /* terminator */ |
| 1632 | }; | 1644 | }; |
| 1633 | 1645 | ||
| @@ -1670,10 +1682,17 @@ static unsigned int dell_m4_2_pin_configs[11] = { | |||
| 1670 | 0x40f000f0, 0x044413b0, 0x044413b0, | 1682 | 0x40f000f0, 0x044413b0, 0x044413b0, |
| 1671 | }; | 1683 | }; |
| 1672 | 1684 | ||
| 1685 | static unsigned int dell_m4_3_pin_configs[11] = { | ||
| 1686 | 0x0421101f, 0x04a11221, 0x90a70330, 0x90170110, | ||
| 1687 | 0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a000f0, | ||
| 1688 | 0x40f000f0, 0x044413b0, 0x044413b0, | ||
| 1689 | }; | ||
| 1690 | |||
| 1673 | static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { | 1691 | static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { |
| 1674 | [STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs, | 1692 | [STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs, |
| 1675 | [STAC_DELL_M4_1] = dell_m4_1_pin_configs, | 1693 | [STAC_DELL_M4_1] = dell_m4_1_pin_configs, |
| 1676 | [STAC_DELL_M4_2] = dell_m4_2_pin_configs, | 1694 | [STAC_DELL_M4_2] = dell_m4_2_pin_configs, |
| 1695 | [STAC_DELL_M4_3] = dell_m4_3_pin_configs, | ||
| 1677 | [STAC_HP_M4] = NULL, | 1696 | [STAC_HP_M4] = NULL, |
| 1678 | }; | 1697 | }; |
| 1679 | 1698 | ||
| @@ -1681,6 +1700,7 @@ static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = { | |||
| 1681 | [STAC_92HD71BXX_REF] = "ref", | 1700 | [STAC_92HD71BXX_REF] = "ref", |
| 1682 | [STAC_DELL_M4_1] = "dell-m4-1", | 1701 | [STAC_DELL_M4_1] = "dell-m4-1", |
| 1683 | [STAC_DELL_M4_2] = "dell-m4-2", | 1702 | [STAC_DELL_M4_2] = "dell-m4-2", |
| 1703 | [STAC_DELL_M4_3] = "dell-m4-3", | ||
| 1684 | [STAC_HP_M4] = "hp-m4", | 1704 | [STAC_HP_M4] = "hp-m4", |
| 1685 | }; | 1705 | }; |
| 1686 | 1706 | ||
| @@ -1716,6 +1736,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { | |||
| 1716 | "unknown Dell", STAC_DELL_M4_2), | 1736 | "unknown Dell", STAC_DELL_M4_2), |
| 1717 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0264, | 1737 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0264, |
| 1718 | "unknown Dell", STAC_DELL_M4_2), | 1738 | "unknown Dell", STAC_DELL_M4_2), |
| 1739 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02aa, | ||
| 1740 | "unknown Dell", STAC_DELL_M4_3), | ||
| 1719 | {} /* terminator */ | 1741 | {} /* terminator */ |
| 1720 | }; | 1742 | }; |
| 1721 | 1743 | ||
| @@ -2877,7 +2899,7 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec, | |||
| 2877 | cfg->hp_outs && !spec->multiout.hp_nid) | 2899 | cfg->hp_outs && !spec->multiout.hp_nid) |
| 2878 | spec->multiout.hp_nid = nid; | 2900 | spec->multiout.hp_nid = nid; |
| 2879 | 2901 | ||
| 2880 | if (cfg->hp_outs > 1) { | 2902 | if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) { |
| 2881 | err = stac92xx_add_control(spec, | 2903 | err = stac92xx_add_control(spec, |
| 2882 | STAC_CTL_WIDGET_HP_SWITCH, | 2904 | STAC_CTL_WIDGET_HP_SWITCH, |
| 2883 | "Headphone as Line Out Switch", | 2905 | "Headphone as Line Out Switch", |
| @@ -3683,10 +3705,14 @@ static void stac92xx_power_down(struct hda_codec *codec) | |||
| 3683 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); | 3705 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); |
| 3684 | } | 3706 | } |
| 3685 | 3707 | ||
| 3708 | static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid, | ||
| 3709 | int enable); | ||
| 3710 | |||
| 3686 | static int stac92xx_init(struct hda_codec *codec) | 3711 | static int stac92xx_init(struct hda_codec *codec) |
| 3687 | { | 3712 | { |
| 3688 | struct sigmatel_spec *spec = codec->spec; | 3713 | struct sigmatel_spec *spec = codec->spec; |
| 3689 | struct auto_pin_cfg *cfg = &spec->autocfg; | 3714 | struct auto_pin_cfg *cfg = &spec->autocfg; |
| 3715 | unsigned int gpio; | ||
| 3690 | int i; | 3716 | int i; |
| 3691 | 3717 | ||
| 3692 | snd_hda_sequence_write(codec, spec->init); | 3718 | snd_hda_sequence_write(codec, spec->init); |
| @@ -3697,6 +3723,16 @@ static int stac92xx_init(struct hda_codec *codec) | |||
| 3697 | snd_hda_codec_write_cache(codec, | 3723 | snd_hda_codec_write_cache(codec, |
| 3698 | spec->adc_nids[i], 0, | 3724 | spec->adc_nids[i], 0, |
| 3699 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); | 3725 | AC_VERB_SET_POWER_STATE, AC_PWRST_D3); |
| 3726 | |||
| 3727 | /* set up GPIO */ | ||
| 3728 | gpio = spec->gpio_data; | ||
| 3729 | /* turn on EAPD statically when spec->eapd_switch isn't set. | ||
| 3730 | * otherwise, unsol event will turn it on/off dynamically | ||
| 3731 | */ | ||
| 3732 | if (!spec->eapd_switch) | ||
| 3733 | gpio |= spec->eapd_mask; | ||
| 3734 | stac_gpio_set(codec, spec->gpio_mask, spec->gpio_dir, gpio); | ||
| 3735 | |||
| 3700 | /* set up pins */ | 3736 | /* set up pins */ |
| 3701 | if (spec->hp_detect) { | 3737 | if (spec->hp_detect) { |
| 3702 | /* Enable unsolicited responses on the HP widget */ | 3738 | /* Enable unsolicited responses on the HP widget */ |
| @@ -3736,39 +3772,43 @@ static int stac92xx_init(struct hda_codec *codec) | |||
| 3736 | for (i = 0; i < spec->num_dmics; i++) | 3772 | for (i = 0; i < spec->num_dmics; i++) |
| 3737 | stac92xx_auto_set_pinctl(codec, spec->dmic_nids[i], | 3773 | stac92xx_auto_set_pinctl(codec, spec->dmic_nids[i], |
| 3738 | AC_PINCTL_IN_EN); | 3774 | AC_PINCTL_IN_EN); |
| 3775 | if (cfg->dig_out_pin) | ||
| 3776 | stac92xx_auto_set_pinctl(codec, cfg->dig_out_pin, | ||
| 3777 | AC_PINCTL_OUT_EN); | ||
| 3778 | if (cfg->dig_in_pin) | ||
| 3779 | stac92xx_auto_set_pinctl(codec, cfg->dig_in_pin, | ||
| 3780 | AC_PINCTL_IN_EN); | ||
| 3739 | for (i = 0; i < spec->num_pwrs; i++) { | 3781 | for (i = 0; i < spec->num_pwrs; i++) { |
| 3740 | int event = is_nid_hp_pin(cfg, spec->pwr_nids[i]) | 3782 | hda_nid_t nid = spec->pwr_nids[i]; |
| 3741 | ? STAC_HP_EVENT : STAC_PWR_EVENT; | 3783 | int pinctl, def_conf; |
| 3742 | int pinctl = snd_hda_codec_read(codec, spec->pwr_nids[i], | 3784 | int event = STAC_PWR_EVENT; |
| 3743 | 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0); | 3785 | |
| 3744 | int def_conf = snd_hda_codec_read(codec, spec->pwr_nids[i], | 3786 | if (is_nid_hp_pin(cfg, nid) && spec->hp_detect) |
| 3745 | 0, AC_VERB_GET_CONFIG_DEFAULT, 0); | 3787 | continue; /* already has an unsol event */ |
| 3746 | def_conf = get_defcfg_connect(def_conf); | 3788 | |
| 3789 | pinctl = snd_hda_codec_read(codec, nid, 0, | ||
| 3790 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); | ||
| 3747 | /* outputs are only ports capable of power management | 3791 | /* outputs are only ports capable of power management |
| 3748 | * any attempts on powering down a input port cause the | 3792 | * any attempts on powering down a input port cause the |
| 3749 | * referenced VREF to act quirky. | 3793 | * referenced VREF to act quirky. |
| 3750 | */ | 3794 | */ |
| 3751 | if (pinctl & AC_PINCTL_IN_EN) | 3795 | if (pinctl & AC_PINCTL_IN_EN) |
| 3752 | continue; | 3796 | continue; |
| 3797 | def_conf = snd_hda_codec_read(codec, nid, 0, | ||
| 3798 | AC_VERB_GET_CONFIG_DEFAULT, 0); | ||
| 3799 | def_conf = get_defcfg_connect(def_conf); | ||
| 3753 | /* skip any ports that don't have jacks since presence | 3800 | /* skip any ports that don't have jacks since presence |
| 3754 | * detection is useless */ | 3801 | * detection is useless */ |
| 3755 | if (def_conf && def_conf != AC_JACK_PORT_FIXED) | 3802 | if (def_conf != AC_JACK_PORT_COMPLEX) { |
| 3803 | if (def_conf != AC_JACK_PORT_NONE) | ||
| 3804 | stac_toggle_power_map(codec, nid, 1); | ||
| 3756 | continue; | 3805 | continue; |
| 3806 | } | ||
| 3757 | enable_pin_detect(codec, spec->pwr_nids[i], event | i); | 3807 | enable_pin_detect(codec, spec->pwr_nids[i], event | i); |
| 3758 | codec->patch_ops.unsol_event(codec, (event | i) << 26); | 3808 | codec->patch_ops.unsol_event(codec, (event | i) << 26); |
| 3759 | } | 3809 | } |
| 3760 | if (spec->dac_list) | 3810 | if (spec->dac_list) |
| 3761 | stac92xx_power_down(codec); | 3811 | stac92xx_power_down(codec); |
| 3762 | if (cfg->dig_out_pin) | ||
| 3763 | stac92xx_auto_set_pinctl(codec, cfg->dig_out_pin, | ||
| 3764 | AC_PINCTL_OUT_EN); | ||
| 3765 | if (cfg->dig_in_pin) | ||
| 3766 | stac92xx_auto_set_pinctl(codec, cfg->dig_in_pin, | ||
| 3767 | AC_PINCTL_IN_EN); | ||
| 3768 | |||
| 3769 | stac_gpio_set(codec, spec->gpio_mask, | ||
| 3770 | spec->gpio_dir, spec->gpio_data); | ||
| 3771 | |||
| 3772 | return 0; | 3812 | return 0; |
| 3773 | } | 3813 | } |
| 3774 | 3814 | ||
| @@ -3901,7 +3941,7 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res) | |||
| 3901 | for (i = 0; i < cfg->speaker_outs; i++) | 3941 | for (i = 0; i < cfg->speaker_outs; i++) |
| 3902 | stac92xx_reset_pinctl(codec, cfg->speaker_pins[i], | 3942 | stac92xx_reset_pinctl(codec, cfg->speaker_pins[i], |
| 3903 | AC_PINCTL_OUT_EN); | 3943 | AC_PINCTL_OUT_EN); |
| 3904 | if (spec->eapd_mask) | 3944 | if (spec->eapd_mask && spec->eapd_switch) |
| 3905 | stac_gpio_set(codec, spec->gpio_mask, | 3945 | stac_gpio_set(codec, spec->gpio_mask, |
| 3906 | spec->gpio_dir, spec->gpio_data & | 3946 | spec->gpio_dir, spec->gpio_data & |
| 3907 | ~spec->eapd_mask); | 3947 | ~spec->eapd_mask); |
| @@ -3916,7 +3956,7 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res) | |||
| 3916 | for (i = 0; i < cfg->speaker_outs; i++) | 3956 | for (i = 0; i < cfg->speaker_outs; i++) |
| 3917 | stac92xx_set_pinctl(codec, cfg->speaker_pins[i], | 3957 | stac92xx_set_pinctl(codec, cfg->speaker_pins[i], |
| 3918 | AC_PINCTL_OUT_EN); | 3958 | AC_PINCTL_OUT_EN); |
| 3919 | if (spec->eapd_mask) | 3959 | if (spec->eapd_mask && spec->eapd_switch) |
| 3920 | stac_gpio_set(codec, spec->gpio_mask, | 3960 | stac_gpio_set(codec, spec->gpio_mask, |
| 3921 | spec->gpio_dir, spec->gpio_data | | 3961 | spec->gpio_dir, spec->gpio_data | |
| 3922 | spec->eapd_mask); | 3962 | spec->eapd_mask); |
| @@ -3933,14 +3973,18 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res) | |||
| 3933 | } | 3973 | } |
| 3934 | } | 3974 | } |
| 3935 | 3975 | ||
| 3936 | static void stac92xx_pin_sense(struct hda_codec *codec, int idx) | 3976 | static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid, |
| 3977 | int enable) | ||
| 3937 | { | 3978 | { |
| 3938 | struct sigmatel_spec *spec = codec->spec; | 3979 | struct sigmatel_spec *spec = codec->spec; |
| 3939 | hda_nid_t nid = spec->pwr_nids[idx]; | 3980 | unsigned int idx, val; |
| 3940 | int presence, val; | 3981 | |
| 3941 | val = snd_hda_codec_read(codec, codec->afg, 0, 0x0fec, 0x0) | 3982 | for (idx = 0; idx < spec->num_pwrs; idx++) { |
| 3942 | & 0x000000ff; | 3983 | if (spec->pwr_nids[idx] == nid) |
| 3943 | presence = get_hp_pin_presence(codec, nid); | 3984 | break; |
| 3985 | } | ||
| 3986 | if (idx >= spec->num_pwrs) | ||
| 3987 | return; | ||
| 3944 | 3988 | ||
| 3945 | /* several codecs have two power down bits */ | 3989 | /* several codecs have two power down bits */ |
| 3946 | if (spec->pwr_mapping) | 3990 | if (spec->pwr_mapping) |
| @@ -3948,14 +3992,20 @@ static void stac92xx_pin_sense(struct hda_codec *codec, int idx) | |||
| 3948 | else | 3992 | else |
| 3949 | idx = 1 << idx; | 3993 | idx = 1 << idx; |
| 3950 | 3994 | ||
| 3951 | if (presence) | 3995 | val = snd_hda_codec_read(codec, codec->afg, 0, 0x0fec, 0x0) & 0xff; |
| 3996 | if (enable) | ||
| 3952 | val &= ~idx; | 3997 | val &= ~idx; |
| 3953 | else | 3998 | else |
| 3954 | val |= idx; | 3999 | val |= idx; |
| 3955 | 4000 | ||
| 3956 | /* power down unused output ports */ | 4001 | /* power down unused output ports */ |
| 3957 | snd_hda_codec_write(codec, codec->afg, 0, 0x7ec, val); | 4002 | snd_hda_codec_write(codec, codec->afg, 0, 0x7ec, val); |
| 3958 | }; | 4003 | } |
| 4004 | |||
| 4005 | static void stac92xx_pin_sense(struct hda_codec *codec, hda_nid_t nid) | ||
| 4006 | { | ||
| 4007 | stac_toggle_power_map(codec, nid, get_hp_pin_presence(codec, nid)); | ||
| 4008 | } | ||
| 3959 | 4009 | ||
| 3960 | static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res) | 4010 | static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res) |
| 3961 | { | 4011 | { |
| @@ -4239,31 +4289,29 @@ again: | |||
| 4239 | case STAC_DELL_EQ: | 4289 | case STAC_DELL_EQ: |
| 4240 | spec->init = dell_eq_core_init; | 4290 | spec->init = dell_eq_core_init; |
| 4241 | /* fallthru */ | 4291 | /* fallthru */ |
| 4242 | case STAC_DELL_M6: | 4292 | case STAC_DELL_M6_AMIC: |
| 4293 | case STAC_DELL_M6_DMIC: | ||
| 4294 | case STAC_DELL_M6_BOTH: | ||
| 4243 | spec->num_smuxes = 0; | 4295 | spec->num_smuxes = 0; |
| 4244 | spec->mixer = &stac92hd73xx_6ch_mixer[DELL_M6_MIXER]; | 4296 | spec->mixer = &stac92hd73xx_6ch_mixer[DELL_M6_MIXER]; |
| 4245 | spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP]; | 4297 | spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP]; |
| 4298 | spec->eapd_switch = 0; | ||
| 4246 | spec->num_amps = 1; | 4299 | spec->num_amps = 1; |
| 4247 | 4300 | ||
| 4248 | if (!spec->init) | 4301 | if (!spec->init) |
| 4249 | spec->init = dell_m6_core_init; | 4302 | spec->init = dell_m6_core_init; |
| 4250 | switch (codec->subsystem_id) { | 4303 | switch (spec->board_config) { |
| 4251 | case 0x1028025e: /* Analog Mics */ | 4304 | case STAC_DELL_M6_AMIC: /* Analog Mics */ |
| 4252 | case 0x1028025f: | ||
| 4253 | stac92xx_set_config_reg(codec, 0x0b, 0x90A70170); | 4305 | stac92xx_set_config_reg(codec, 0x0b, 0x90A70170); |
| 4254 | spec->num_dmics = 0; | 4306 | spec->num_dmics = 0; |
| 4255 | spec->private_dimux.num_items = 1; | 4307 | spec->private_dimux.num_items = 1; |
| 4256 | break; | 4308 | break; |
| 4257 | case 0x10280271: /* Digital Mics */ | 4309 | case STAC_DELL_M6_DMIC: /* Digital Mics */ |
| 4258 | case 0x10280272: | ||
| 4259 | case 0x10280254: | ||
| 4260 | case 0x10280255: | ||
| 4261 | stac92xx_set_config_reg(codec, 0x13, 0x90A60160); | 4310 | stac92xx_set_config_reg(codec, 0x13, 0x90A60160); |
| 4262 | spec->num_dmics = 1; | 4311 | spec->num_dmics = 1; |
| 4263 | spec->private_dimux.num_items = 2; | 4312 | spec->private_dimux.num_items = 2; |
| 4264 | break; | 4313 | break; |
| 4265 | case 0x10280256: /* Both */ | 4314 | case STAC_DELL_M6_BOTH: /* Both */ |
| 4266 | case 0x10280057: | ||
| 4267 | stac92xx_set_config_reg(codec, 0x0b, 0x90A70170); | 4315 | stac92xx_set_config_reg(codec, 0x0b, 0x90A70170); |
| 4268 | stac92xx_set_config_reg(codec, 0x13, 0x90A60160); | 4316 | stac92xx_set_config_reg(codec, 0x13, 0x90A60160); |
| 4269 | spec->num_dmics = 1; | 4317 | spec->num_dmics = 1; |
| @@ -4274,6 +4322,7 @@ again: | |||
| 4274 | default: | 4322 | default: |
| 4275 | spec->num_dmics = STAC92HD73XX_NUM_DMICS; | 4323 | spec->num_dmics = STAC92HD73XX_NUM_DMICS; |
| 4276 | spec->num_smuxes = ARRAY_SIZE(stac92hd73xx_smux_nids); | 4324 | spec->num_smuxes = ARRAY_SIZE(stac92hd73xx_smux_nids); |
| 4325 | spec->eapd_switch = 1; | ||
| 4277 | } | 4326 | } |
| 4278 | if (spec->board_config > STAC_92HD73XX_REF) { | 4327 | if (spec->board_config > STAC_92HD73XX_REF) { |
| 4279 | /* GPIO0 High = Enable EAPD */ | 4328 | /* GPIO0 High = Enable EAPD */ |
| @@ -4419,7 +4468,13 @@ static int stac92hd71xx_resume(struct hda_codec *codec) | |||
| 4419 | 4468 | ||
| 4420 | static int stac92hd71xx_suspend(struct hda_codec *codec, pm_message_t state) | 4469 | static int stac92hd71xx_suspend(struct hda_codec *codec, pm_message_t state) |
| 4421 | { | 4470 | { |
| 4471 | struct sigmatel_spec *spec = codec->spec; | ||
| 4472 | |||
| 4422 | stac92hd71xx_set_power_state(codec, AC_PWRST_D3); | 4473 | stac92hd71xx_set_power_state(codec, AC_PWRST_D3); |
| 4474 | if (spec->eapd_mask) | ||
| 4475 | stac_gpio_set(codec, spec->gpio_mask, | ||
| 4476 | spec->gpio_dir, spec->gpio_data & | ||
| 4477 | ~spec->eapd_mask); | ||
| 4423 | return 0; | 4478 | return 0; |
| 4424 | }; | 4479 | }; |
| 4425 | 4480 | ||
| @@ -4562,14 +4617,21 @@ again: | |||
| 4562 | 4617 | ||
| 4563 | switch (spec->board_config) { | 4618 | switch (spec->board_config) { |
| 4564 | case STAC_HP_M4: | 4619 | case STAC_HP_M4: |
| 4565 | spec->num_dmics = 0; | ||
| 4566 | spec->num_smuxes = 0; | ||
| 4567 | spec->num_dmuxes = 0; | ||
| 4568 | |||
| 4569 | /* enable internal microphone */ | 4620 | /* enable internal microphone */ |
| 4570 | stac92xx_set_config_reg(codec, 0x0e, 0x01813040); | 4621 | stac92xx_set_config_reg(codec, 0x0e, 0x01813040); |
| 4571 | stac92xx_auto_set_pinctl(codec, 0x0e, | 4622 | stac92xx_auto_set_pinctl(codec, 0x0e, |
| 4572 | AC_PINCTL_IN_EN | AC_PINCTL_VREF_80); | 4623 | AC_PINCTL_IN_EN | AC_PINCTL_VREF_80); |
| 4624 | /* fallthru */ | ||
| 4625 | case STAC_DELL_M4_2: | ||
| 4626 | spec->num_dmics = 0; | ||
| 4627 | spec->num_smuxes = 0; | ||
| 4628 | spec->num_dmuxes = 0; | ||
| 4629 | break; | ||
| 4630 | case STAC_DELL_M4_1: | ||
| 4631 | case STAC_DELL_M4_3: | ||
| 4632 | spec->num_dmics = 1; | ||
| 4633 | spec->num_smuxes = 0; | ||
| 4634 | spec->num_dmuxes = 0; | ||
| 4573 | break; | 4635 | break; |
| 4574 | default: | 4636 | default: |
| 4575 | spec->num_dmics = STAC92HD71BXX_NUM_DMICS; | 4637 | spec->num_dmics = STAC92HD71BXX_NUM_DMICS; |
| @@ -4806,6 +4868,7 @@ static int patch_stac927x(struct hda_codec *codec) | |||
| 4806 | spec->num_pwrs = 0; | 4868 | spec->num_pwrs = 0; |
| 4807 | spec->aloopback_mask = 0x40; | 4869 | spec->aloopback_mask = 0x40; |
| 4808 | spec->aloopback_shift = 0; | 4870 | spec->aloopback_shift = 0; |
| 4871 | spec->eapd_switch = 1; | ||
| 4809 | 4872 | ||
| 4810 | err = stac92xx_parse_auto_config(codec, 0x1e, 0x20); | 4873 | err = stac92xx_parse_auto_config(codec, 0x1e, 0x20); |
| 4811 | if (!err) { | 4874 | if (!err) { |
| @@ -4886,6 +4949,7 @@ static int patch_stac9205(struct hda_codec *codec) | |||
| 4886 | 4949 | ||
| 4887 | spec->aloopback_mask = 0x40; | 4950 | spec->aloopback_mask = 0x40; |
| 4888 | spec->aloopback_shift = 0; | 4951 | spec->aloopback_shift = 0; |
| 4952 | spec->eapd_switch = 1; | ||
| 4889 | spec->multiout.dac_nids = spec->dac_nids; | 4953 | spec->multiout.dac_nids = spec->dac_nids; |
| 4890 | 4954 | ||
| 4891 | switch (spec->board_config){ | 4955 | switch (spec->board_config){ |
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index bba9546ba5f5..8d73edc56102 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig | |||
| @@ -20,7 +20,8 @@ config SND_SOC_MPC8610_HPCD | |||
| 20 | 20 | ||
| 21 | config SND_SOC_MPC5200_I2S | 21 | config SND_SOC_MPC5200_I2S |
| 22 | tristate "Freescale MPC5200 PSC in I2S mode driver" | 22 | tristate "Freescale MPC5200 PSC in I2S mode driver" |
| 23 | depends on SND_SOC && PPC_MPC52xx && PPC_BESTCOMM | ||
| 23 | select SND_SOC_OF_SIMPLE | 24 | select SND_SOC_OF_SIMPLE |
| 24 | depends on SND_SOC && PPC_MPC52xx | 25 | select PPC_BESTCOMM_GEN_BD |
| 25 | help | 26 | help |
| 26 | Say Y here to support the MPC5200 PSCs in I2S mode. | 27 | Say Y here to support the MPC5200 PSCs in I2S mode. |
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index a7a3a9c5c6ff..5e727393cfd4 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
| 23 | #include <mach/pxa-regs.h> | 23 | #include <mach/pxa-regs.h> |
| 24 | #include <mach/regs-ac97.h> | ||
| 24 | 25 | ||
| 25 | #include "pxa2xx-pcm.h" | 26 | #include "pxa2xx-pcm.h" |
| 26 | #include "pxa2xx-ac97.h" | 27 | #include "pxa2xx-ac97.h" |
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index 19c5c3cf5d8c..c473a3b97b55 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <sound/soc.h> | 28 | #include <sound/soc.h> |
| 29 | 29 | ||
| 30 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
| 31 | #include <asm/plat-s3c/regs-ac97.h> | 31 | #include <plat/regs-ac97.h> |
| 32 | #include <mach/regs-gpio.h> | 32 | #include <mach/regs-gpio.h> |
| 33 | #include <mach/regs-clock.h> | 33 | #include <mach/regs-clock.h> |
| 34 | #include <mach/audio.h> | 34 | #include <mach/audio.h> |
diff --git a/sound/sound_core.c b/sound/sound_core.c index a75b289a5d78..10ba4218161b 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c | |||
| @@ -457,7 +457,7 @@ EXPORT_SYMBOL(unregister_sound_mixer); | |||
| 457 | 457 | ||
| 458 | void unregister_sound_midi(int unit) | 458 | void unregister_sound_midi(int unit) |
| 459 | { | 459 | { |
| 460 | return sound_remove_unit(&chains[2], unit); | 460 | sound_remove_unit(&chains[2], unit); |
| 461 | } | 461 | } |
| 462 | 462 | ||
| 463 | EXPORT_SYMBOL(unregister_sound_midi); | 463 | EXPORT_SYMBOL(unregister_sound_midi); |
| @@ -474,7 +474,7 @@ EXPORT_SYMBOL(unregister_sound_midi); | |||
| 474 | 474 | ||
| 475 | void unregister_sound_dsp(int unit) | 475 | void unregister_sound_dsp(int unit) |
| 476 | { | 476 | { |
| 477 | return sound_remove_unit(&chains[3], unit); | 477 | sound_remove_unit(&chains[3], unit); |
| 478 | } | 478 | } |
| 479 | 479 | ||
| 480 | 480 | ||
| @@ -507,7 +507,7 @@ static struct sound_unit *__look_for_unit(int chain, int unit) | |||
| 507 | return NULL; | 507 | return NULL; |
| 508 | } | 508 | } |
| 509 | 509 | ||
| 510 | int soundcore_open(struct inode *inode, struct file *file) | 510 | static int soundcore_open(struct inode *inode, struct file *file) |
| 511 | { | 511 | { |
| 512 | int chain; | 512 | int chain; |
| 513 | int unit = iminor(inode); | 513 | int unit = iminor(inode); |