diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/cacheflush.h | 38 | ||||
| -rw-r--r-- | arch/arm/include/asm/clkdev.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/irq.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/outercache.h | 75 | ||||
| -rw-r--r-- | arch/arm/include/asm/system.h | 16 | ||||
| -rw-r--r-- | arch/arm/kernel/kprobes.c | 10 | ||||
| -rw-r--r-- | arch/arm/lib/memmove.S | 4 | ||||
| -rw-r--r-- | arch/arm/mm/Kconfig | 13 | ||||
| -rw-r--r-- | arch/arm/mm/cache-l2x0.c | 10 | ||||
| -rw-r--r-- | arch/arm/vfp/vfpmodule.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 2 | ||||
| -rw-r--r-- | arch/sh/configs/ecovec24_defconfig | 236 | ||||
| -rw-r--r-- | arch/sh/include/asm/elf.h | 6 | ||||
| -rw-r--r-- | arch/sh/include/cpu-sh4/cpu/mmu_context.h | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/cpufreq.c | 4 | ||||
| -rw-r--r-- | arch/sh/kernel/return_address.c | 3 | ||||
| -rw-r--r-- | arch/sh/kernel/smp.c | 1 | ||||
| -rw-r--r-- | arch/sh/mm/tlb-pteaex.c | 28 | ||||
| -rw-r--r-- | arch/sh/mm/tlb-sh3.c | 19 | ||||
| -rw-r--r-- | arch/sh/mm/tlb-sh4.c | 28 | ||||
| -rw-r--r-- | arch/sh/mm/tlb-urb.c | 22 | ||||
| -rw-r--r-- | arch/sh/mm/tlbflush_32.c | 28 |
22 files changed, 419 insertions, 130 deletions
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 72da7e045c6b..0d08d4170b64 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <asm/glue.h> | 15 | #include <asm/glue.h> |
| 16 | #include <asm/shmparam.h> | 16 | #include <asm/shmparam.h> |
| 17 | #include <asm/cachetype.h> | 17 | #include <asm/cachetype.h> |
| 18 | #include <asm/outercache.h> | ||
| 18 | 19 | ||
| 19 | #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) | 20 | #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) |
| 20 | 21 | ||
| @@ -219,12 +220,6 @@ struct cpu_cache_fns { | |||
| 219 | void (*dma_flush_range)(const void *, const void *); | 220 | void (*dma_flush_range)(const void *, const void *); |
| 220 | }; | 221 | }; |
| 221 | 222 | ||
| 222 | struct outer_cache_fns { | ||
| 223 | void (*inv_range)(unsigned long, unsigned long); | ||
| 224 | void (*clean_range)(unsigned long, unsigned long); | ||
| 225 | void (*flush_range)(unsigned long, unsigned long); | ||
| 226 | }; | ||
| 227 | |||
| 228 | /* | 223 | /* |
| 229 | * Select the calling method | 224 | * Select the calling method |
| 230 | */ | 225 | */ |
| @@ -281,37 +276,6 @@ extern void dmac_flush_range(const void *, const void *); | |||
| 281 | 276 | ||
| 282 | #endif | 277 | #endif |
| 283 | 278 | ||
| 284 | #ifdef CONFIG_OUTER_CACHE | ||
| 285 | |||
| 286 | extern struct outer_cache_fns outer_cache; | ||
| 287 | |||
| 288 | static inline void outer_inv_range(unsigned long start, unsigned long end) | ||
| 289 | { | ||
| 290 | if (outer_cache.inv_range) | ||
| 291 | outer_cache.inv_range(start, end); | ||
| 292 | } | ||
| 293 | static inline void outer_clean_range(unsigned long start, unsigned long end) | ||
| 294 | { | ||
| 295 | if (outer_cache.clean_range) | ||
| 296 | outer_cache.clean_range(start, end); | ||
| 297 | } | ||
| 298 | static inline void outer_flush_range(unsigned long start, unsigned long end) | ||
| 299 | { | ||
| 300 | if (outer_cache.flush_range) | ||
| 301 | outer_cache.flush_range(start, end); | ||
| 302 | } | ||
| 303 | |||
| 304 | #else | ||
| 305 | |||
| 306 | static inline void outer_inv_range(unsigned long start, unsigned long end) | ||
| 307 | { } | ||
| 308 | static inline void outer_clean_range(unsigned long start, unsigned long end) | ||
| 309 | { } | ||
| 310 | static inline void outer_flush_range(unsigned long start, unsigned long end) | ||
| 311 | { } | ||
| 312 | |||
| 313 | #endif | ||
| 314 | |||
| 315 | /* | 279 | /* |
| 316 | * Copy user data from/to a page which is mapped into a different | 280 | * Copy user data from/to a page which is mapped into a different |
| 317 | * processes address space. Really, we want to allow our "user | 281 | * processes address space. Really, we want to allow our "user |
diff --git a/arch/arm/include/asm/clkdev.h b/arch/arm/include/asm/clkdev.h index 7a0690da5e63..b56c1389b6fa 100644 --- a/arch/arm/include/asm/clkdev.h +++ b/arch/arm/include/asm/clkdev.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #define __ASM_CLKDEV_H | 13 | #define __ASM_CLKDEV_H |
| 14 | 14 | ||
| 15 | struct clk; | 15 | struct clk; |
| 16 | struct device; | ||
| 16 | 17 | ||
| 17 | struct clk_lookup { | 18 | struct clk_lookup { |
| 18 | struct list_head node; | 19 | struct list_head node; |
diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 328f14a8b790..237282f7c762 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #ifndef __ASSEMBLY__ | 18 | #ifndef __ASSEMBLY__ |
| 19 | struct irqaction; | 19 | struct irqaction; |
| 20 | struct pt_regs; | ||
| 20 | extern void migrate_irqs(void); | 21 | extern void migrate_irqs(void); |
| 21 | 22 | ||
| 22 | extern void asm_do_IRQ(unsigned int, struct pt_regs *); | 23 | extern void asm_do_IRQ(unsigned int, struct pt_regs *); |
diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h new file mode 100644 index 000000000000..25f76bae57ab --- /dev/null +++ b/arch/arm/include/asm/outercache.h | |||
| @@ -0,0 +1,75 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/include/asm/outercache.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2010 ARM Ltd. | ||
| 5 | * Written by Catalin Marinas <catalin.marinas@arm.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | * | ||
| 11 | * 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 | */ | ||
| 20 | |||
| 21 | #ifndef __ASM_OUTERCACHE_H | ||
| 22 | #define __ASM_OUTERCACHE_H | ||
| 23 | |||
| 24 | struct outer_cache_fns { | ||
| 25 | void (*inv_range)(unsigned long, unsigned long); | ||
| 26 | void (*clean_range)(unsigned long, unsigned long); | ||
| 27 | void (*flush_range)(unsigned long, unsigned long); | ||
| 28 | #ifdef CONFIG_OUTER_CACHE_SYNC | ||
| 29 | void (*sync)(void); | ||
| 30 | #endif | ||
| 31 | }; | ||
| 32 | |||
| 33 | #ifdef CONFIG_OUTER_CACHE | ||
| 34 | |||
| 35 | extern struct outer_cache_fns outer_cache; | ||
| 36 | |||
| 37 | static inline void outer_inv_range(unsigned long start, unsigned long end) | ||
| 38 | { | ||
| 39 | if (outer_cache.inv_range) | ||
| 40 | outer_cache.inv_range(start, end); | ||
| 41 | } | ||
| 42 | static inline void outer_clean_range(unsigned long start, unsigned long end) | ||
| 43 | { | ||
| 44 | if (outer_cache.clean_range) | ||
| 45 | outer_cache.clean_range(start, end); | ||
| 46 | } | ||
| 47 | static inline void outer_flush_range(unsigned long start, unsigned long end) | ||
| 48 | { | ||
| 49 | if (outer_cache.flush_range) | ||
| 50 | outer_cache.flush_range(start, end); | ||
| 51 | } | ||
| 52 | |||
| 53 | #else | ||
| 54 | |||
| 55 | static inline void outer_inv_range(unsigned long start, unsigned long end) | ||
| 56 | { } | ||
| 57 | static inline void outer_clean_range(unsigned long start, unsigned long end) | ||
| 58 | { } | ||
| 59 | static inline void outer_flush_range(unsigned long start, unsigned long end) | ||
| 60 | { } | ||
| 61 | |||
| 62 | #endif | ||
| 63 | |||
| 64 | #ifdef CONFIG_OUTER_CACHE_SYNC | ||
| 65 | static inline void outer_sync(void) | ||
| 66 | { | ||
| 67 | if (outer_cache.sync) | ||
| 68 | outer_cache.sync(); | ||
| 69 | } | ||
| 70 | #else | ||
| 71 | static inline void outer_sync(void) | ||
| 72 | { } | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #endif /* __ASM_OUTERCACHE_H */ | ||
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index ca88e6a84707..4ace45ec3ef8 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h | |||
| @@ -60,6 +60,8 @@ | |||
| 60 | #include <linux/linkage.h> | 60 | #include <linux/linkage.h> |
| 61 | #include <linux/irqflags.h> | 61 | #include <linux/irqflags.h> |
| 62 | 62 | ||
| 63 | #include <asm/outercache.h> | ||
| 64 | |||
| 63 | #define __exception __attribute__((section(".exception.text"))) | 65 | #define __exception __attribute__((section(".exception.text"))) |
| 64 | 66 | ||
| 65 | struct thread_info; | 67 | struct thread_info; |
| @@ -137,10 +139,12 @@ extern unsigned int user_debug; | |||
| 137 | #define dmb() __asm__ __volatile__ ("" : : : "memory") | 139 | #define dmb() __asm__ __volatile__ ("" : : : "memory") |
| 138 | #endif | 140 | #endif |
| 139 | 141 | ||
| 140 | #if __LINUX_ARM_ARCH__ >= 7 || defined(CONFIG_SMP) | 142 | #ifdef CONFIG_ARCH_HAS_BARRIERS |
| 141 | #define mb() dmb() | 143 | #include <mach/barriers.h> |
| 144 | #elif __LINUX_ARM_ARCH__ >= 7 || defined(CONFIG_SMP) | ||
| 145 | #define mb() do { dsb(); outer_sync(); } while (0) | ||
| 142 | #define rmb() dmb() | 146 | #define rmb() dmb() |
| 143 | #define wmb() dmb() | 147 | #define wmb() mb() |
| 144 | #else | 148 | #else |
| 145 | #define mb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0) | 149 | #define mb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0) |
| 146 | #define rmb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0) | 150 | #define rmb() do { if (arch_is_coherent()) dmb(); else barrier(); } while (0) |
| @@ -152,9 +156,9 @@ extern unsigned int user_debug; | |||
| 152 | #define smp_rmb() barrier() | 156 | #define smp_rmb() barrier() |
| 153 | #define smp_wmb() barrier() | 157 | #define smp_wmb() barrier() |
| 154 | #else | 158 | #else |
| 155 | #define smp_mb() mb() | 159 | #define smp_mb() dmb() |
| 156 | #define smp_rmb() rmb() | 160 | #define smp_rmb() dmb() |
| 157 | #define smp_wmb() wmb() | 161 | #define smp_wmb() dmb() |
| 158 | #endif | 162 | #endif |
| 159 | 163 | ||
| 160 | #define read_barrier_depends() do { } while(0) | 164 | #define read_barrier_depends() do { } while(0) |
diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/kernel/kprobes.c index 60c62c377fa9..610e0f561c32 100644 --- a/arch/arm/kernel/kprobes.c +++ b/arch/arm/kernel/kprobes.c | |||
| @@ -393,6 +393,14 @@ void __kprobes jprobe_return(void) | |||
| 393 | /* | 393 | /* |
| 394 | * Setup an empty pt_regs. Fill SP and PC fields as | 394 | * Setup an empty pt_regs. Fill SP and PC fields as |
| 395 | * they're needed by longjmp_break_handler. | 395 | * they're needed by longjmp_break_handler. |
| 396 | * | ||
| 397 | * We allocate some slack between the original SP and start of | ||
| 398 | * our fabricated regs. To be precise we want to have worst case | ||
| 399 | * covered which is STMFD with all 16 regs so we allocate 2 * | ||
| 400 | * sizeof(struct_pt_regs)). | ||
| 401 | * | ||
| 402 | * This is to prevent any simulated instruction from writing | ||
| 403 | * over the regs when they are accessing the stack. | ||
| 396 | */ | 404 | */ |
| 397 | "sub sp, %0, %1 \n\t" | 405 | "sub sp, %0, %1 \n\t" |
| 398 | "ldr r0, ="__stringify(JPROBE_MAGIC_ADDR)"\n\t" | 406 | "ldr r0, ="__stringify(JPROBE_MAGIC_ADDR)"\n\t" |
| @@ -410,7 +418,7 @@ void __kprobes jprobe_return(void) | |||
| 410 | "ldmia sp, {r0 - pc} \n\t" | 418 | "ldmia sp, {r0 - pc} \n\t" |
| 411 | : | 419 | : |
| 412 | : "r" (kcb->jprobe_saved_regs.ARM_sp), | 420 | : "r" (kcb->jprobe_saved_regs.ARM_sp), |
| 413 | "I" (sizeof(struct pt_regs)), | 421 | "I" (sizeof(struct pt_regs) * 2), |
| 414 | "J" (offsetof(struct pt_regs, ARM_sp)), | 422 | "J" (offsetof(struct pt_regs, ARM_sp)), |
| 415 | "J" (offsetof(struct pt_regs, ARM_pc)), | 423 | "J" (offsetof(struct pt_regs, ARM_pc)), |
| 416 | "J" (offsetof(struct pt_regs, ARM_cpsr)) | 424 | "J" (offsetof(struct pt_regs, ARM_cpsr)) |
diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S index 5025c863713d..938fc14f962d 100644 --- a/arch/arm/lib/memmove.S +++ b/arch/arm/lib/memmove.S | |||
| @@ -74,7 +74,7 @@ ENTRY(memmove) | |||
| 74 | rsb ip, ip, #32 | 74 | rsb ip, ip, #32 |
| 75 | addne pc, pc, ip @ C is always clear here | 75 | addne pc, pc, ip @ C is always clear here |
| 76 | b 7f | 76 | b 7f |
| 77 | 6: nop | 77 | 6: W(nop) |
| 78 | W(ldr) r3, [r1, #-4]! | 78 | W(ldr) r3, [r1, #-4]! |
| 79 | W(ldr) r4, [r1, #-4]! | 79 | W(ldr) r4, [r1, #-4]! |
| 80 | W(ldr) r5, [r1, #-4]! | 80 | W(ldr) r5, [r1, #-4]! |
| @@ -85,7 +85,7 @@ ENTRY(memmove) | |||
| 85 | 85 | ||
| 86 | add pc, pc, ip | 86 | add pc, pc, ip |
| 87 | nop | 87 | nop |
| 88 | nop | 88 | W(nop) |
| 89 | W(str) r3, [r0, #-4]! | 89 | W(str) r3, [r0, #-4]! |
| 90 | W(str) r4, [r0, #-4]! | 90 | W(str) r4, [r0, #-4]! |
| 91 | W(str) r5, [r0, #-4]! | 91 | W(str) r5, [r0, #-4]! |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index c4ed9f93f646..5bd7c89a6045 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -736,6 +736,12 @@ config NEEDS_SYSCALL_FOR_CMPXCHG | |||
| 736 | config OUTER_CACHE | 736 | config OUTER_CACHE |
| 737 | bool | 737 | bool |
| 738 | 738 | ||
| 739 | config OUTER_CACHE_SYNC | ||
| 740 | bool | ||
| 741 | help | ||
| 742 | The outer cache has a outer_cache_fns.sync function pointer | ||
| 743 | that can be used to drain the write buffer of the outer cache. | ||
| 744 | |||
| 739 | config CACHE_FEROCEON_L2 | 745 | config CACHE_FEROCEON_L2 |
| 740 | bool "Enable the Feroceon L2 cache controller" | 746 | bool "Enable the Feroceon L2 cache controller" |
| 741 | depends on ARCH_KIRKWOOD || ARCH_MV78XX0 | 747 | depends on ARCH_KIRKWOOD || ARCH_MV78XX0 |
| @@ -757,6 +763,7 @@ config CACHE_L2X0 | |||
| 757 | REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || ARCH_NOMADIK || ARCH_OMAP4 | 763 | REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || ARCH_NOMADIK || ARCH_OMAP4 |
| 758 | default y | 764 | default y |
| 759 | select OUTER_CACHE | 765 | select OUTER_CACHE |
| 766 | select OUTER_CACHE_SYNC | ||
| 760 | help | 767 | help |
| 761 | This option enables the L2x0 PrimeCell. | 768 | This option enables the L2x0 PrimeCell. |
| 762 | 769 | ||
| @@ -781,3 +788,9 @@ config ARM_L1_CACHE_SHIFT | |||
| 781 | int | 788 | int |
| 782 | default 6 if ARM_L1_CACHE_SHIFT_6 | 789 | default 6 if ARM_L1_CACHE_SHIFT_6 |
| 783 | default 5 | 790 | default 5 |
| 791 | |||
| 792 | config ARCH_HAS_BARRIERS | ||
| 793 | bool | ||
| 794 | help | ||
| 795 | This option allows the use of custom mandatory barriers | ||
| 796 | included via the mach/barriers.h file. | ||
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 07334632d3e2..21ad68ba22ba 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c | |||
| @@ -93,6 +93,15 @@ static inline void l2x0_flush_line(unsigned long addr) | |||
| 93 | } | 93 | } |
| 94 | #endif | 94 | #endif |
| 95 | 95 | ||
| 96 | static void l2x0_cache_sync(void) | ||
| 97 | { | ||
| 98 | unsigned long flags; | ||
| 99 | |||
| 100 | spin_lock_irqsave(&l2x0_lock, flags); | ||
| 101 | cache_sync(); | ||
| 102 | spin_unlock_irqrestore(&l2x0_lock, flags); | ||
| 103 | } | ||
| 104 | |||
| 96 | static inline void l2x0_inv_all(void) | 105 | static inline void l2x0_inv_all(void) |
| 97 | { | 106 | { |
| 98 | unsigned long flags; | 107 | unsigned long flags; |
| @@ -225,6 +234,7 @@ void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask) | |||
| 225 | outer_cache.inv_range = l2x0_inv_range; | 234 | outer_cache.inv_range = l2x0_inv_range; |
| 226 | outer_cache.clean_range = l2x0_clean_range; | 235 | outer_cache.clean_range = l2x0_clean_range; |
| 227 | outer_cache.flush_range = l2x0_flush_range; | 236 | outer_cache.flush_range = l2x0_flush_range; |
| 237 | outer_cache.sync = l2x0_cache_sync; | ||
| 228 | 238 | ||
| 229 | printk(KERN_INFO "L2X0 cache controller enabled\n"); | 239 | printk(KERN_INFO "L2X0 cache controller enabled\n"); |
| 230 | } | 240 | } |
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 7f3f59fcaa21..a420cb949328 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c | |||
| @@ -545,7 +545,7 @@ static int __init vfp_init(void) | |||
| 545 | */ | 545 | */ |
| 546 | elf_hwcap |= HWCAP_VFP; | 546 | elf_hwcap |= HWCAP_VFP; |
| 547 | #ifdef CONFIG_VFPv3 | 547 | #ifdef CONFIG_VFPv3 |
| 548 | if (VFP_arch >= 3) { | 548 | if (VFP_arch >= 2) { |
| 549 | elf_hwcap |= HWCAP_VFPv3; | 549 | elf_hwcap |= HWCAP_VFPv3; |
| 550 | 550 | ||
| 551 | /* | 551 | /* |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c index 929d017535a3..d4f8be307cd5 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | |||
| @@ -481,6 +481,8 @@ mpc52xx_lpbfifo_probe(struct of_device *op, const struct of_device_id *match) | |||
| 481 | if (rc) | 481 | if (rc) |
| 482 | goto err_bcom_rx_irq; | 482 | goto err_bcom_rx_irq; |
| 483 | 483 | ||
| 484 | lpbfifo.dma_irqs_enabled = 1; | ||
| 485 | |||
| 484 | /* Request the Bestcomm transmit (memory --> fifo) task and IRQ */ | 486 | /* Request the Bestcomm transmit (memory --> fifo) task and IRQ */ |
| 485 | lpbfifo.bcom_tx_task = | 487 | lpbfifo.bcom_tx_task = |
| 486 | bcom_gen_bd_tx_init(2, res.start + LPBFIFO_REG_FIFO_DATA, | 488 | bcom_gen_bd_tx_init(2, res.start + LPBFIFO_REG_FIFO_DATA, |
diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig index 18e3356406f3..6041c66dd10e 100644 --- a/arch/sh/configs/ecovec24_defconfig +++ b/arch/sh/configs/ecovec24_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.33-rc2 | 3 | # Linux kernel version: 2.6.34-rc2 |
| 4 | # Mon Jan 4 11:20:36 2010 | 4 | # Mon Mar 29 02:21:58 2010 |
| 5 | # | 5 | # |
| 6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
| 7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
| @@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 13 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_HARDIRQS=y | 14 | CONFIG_GENERIC_HARDIRQS=y |
| 15 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 15 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 16 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 17 | CONFIG_IRQ_PER_CPU=y | 16 | CONFIG_IRQ_PER_CPU=y |
| 17 | CONFIG_SPARSE_IRQ=y | ||
| 18 | CONFIG_GENERIC_GPIO=y | 18 | CONFIG_GENERIC_GPIO=y |
| 19 | CONFIG_GENERIC_TIME=y | 19 | CONFIG_GENERIC_TIME=y |
| 20 | CONFIG_GENERIC_CLOCKEVENTS=y | 20 | CONFIG_GENERIC_CLOCKEVENTS=y |
| @@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y | |||
| 32 | CONFIG_ARCH_HAS_DEFAULT_IDLE=y | 32 | CONFIG_ARCH_HAS_DEFAULT_IDLE=y |
| 33 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y | 33 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y |
| 34 | CONFIG_DMA_NONCOHERENT=y | 34 | CONFIG_DMA_NONCOHERENT=y |
| 35 | CONFIG_NEED_DMA_MAP_STATE=y | ||
| 35 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 36 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 36 | CONFIG_CONSTRUCTORS=y | 37 | CONFIG_CONSTRUCTORS=y |
| 37 | 38 | ||
| @@ -47,9 +48,11 @@ CONFIG_LOCALVERSION="" | |||
| 47 | CONFIG_HAVE_KERNEL_GZIP=y | 48 | CONFIG_HAVE_KERNEL_GZIP=y |
| 48 | CONFIG_HAVE_KERNEL_BZIP2=y | 49 | CONFIG_HAVE_KERNEL_BZIP2=y |
| 49 | CONFIG_HAVE_KERNEL_LZMA=y | 50 | CONFIG_HAVE_KERNEL_LZMA=y |
| 51 | CONFIG_HAVE_KERNEL_LZO=y | ||
| 50 | CONFIG_KERNEL_GZIP=y | 52 | CONFIG_KERNEL_GZIP=y |
| 51 | # CONFIG_KERNEL_BZIP2 is not set | 53 | # CONFIG_KERNEL_BZIP2 is not set |
| 52 | # CONFIG_KERNEL_LZMA is not set | 54 | # CONFIG_KERNEL_LZMA is not set |
| 55 | # CONFIG_KERNEL_LZO is not set | ||
| 53 | CONFIG_SWAP=y | 56 | CONFIG_SWAP=y |
| 54 | CONFIG_SYSVIPC=y | 57 | CONFIG_SYSVIPC=y |
| 55 | CONFIG_SYSVIPC_SYSCTL=y | 58 | CONFIG_SYSVIPC_SYSCTL=y |
| @@ -71,14 +74,8 @@ CONFIG_RCU_FANOUT=32 | |||
| 71 | # CONFIG_TREE_RCU_TRACE is not set | 74 | # CONFIG_TREE_RCU_TRACE 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_GROUP_SCHED=y | ||
| 75 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 76 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 77 | CONFIG_USER_SCHED=y | ||
| 78 | # CONFIG_CGROUP_SCHED is not set | ||
| 79 | # CONFIG_CGROUPS is not set | 77 | # CONFIG_CGROUPS is not set |
| 80 | CONFIG_SYSFS_DEPRECATED=y | 78 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
| 81 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 82 | # CONFIG_RELAY is not set | 79 | # CONFIG_RELAY is not set |
| 83 | # CONFIG_NAMESPACES is not set | 80 | # CONFIG_NAMESPACES is not set |
| 84 | # CONFIG_BLK_DEV_INITRD is not set | 81 | # CONFIG_BLK_DEV_INITRD is not set |
| @@ -107,7 +104,7 @@ CONFIG_PERF_USE_VMALLOC=y | |||
| 107 | # | 104 | # |
| 108 | # Kernel Performance Events And Counters | 105 | # Kernel Performance Events And Counters |
| 109 | # | 106 | # |
| 110 | # CONFIG_PERF_EVENTS is not set | 107 | CONFIG_PERF_EVENTS=y |
| 111 | # CONFIG_PERF_COUNTERS is not set | 108 | # CONFIG_PERF_COUNTERS is not set |
| 112 | CONFIG_VM_EVENT_COUNTERS=y | 109 | CONFIG_VM_EVENT_COUNTERS=y |
| 113 | CONFIG_COMPAT_BRK=y | 110 | CONFIG_COMPAT_BRK=y |
| @@ -116,13 +113,13 @@ CONFIG_SLAB=y | |||
| 116 | # CONFIG_SLOB is not set | 113 | # CONFIG_SLOB is not set |
| 117 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
| 118 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
| 119 | CONFIG_HAVE_IOREMAP_PROT=y | ||
| 120 | CONFIG_HAVE_KPROBES=y | 116 | CONFIG_HAVE_KPROBES=y |
| 121 | CONFIG_HAVE_KRETPROBES=y | 117 | CONFIG_HAVE_KRETPROBES=y |
| 122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | 118 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
| 123 | CONFIG_HAVE_DMA_ATTRS=y | 119 | CONFIG_HAVE_DMA_ATTRS=y |
| 124 | CONFIG_HAVE_CLK=y | 120 | CONFIG_HAVE_CLK=y |
| 125 | CONFIG_HAVE_DMA_API_DEBUG=y | 121 | CONFIG_HAVE_DMA_API_DEBUG=y |
| 122 | CONFIG_HAVE_HW_BREAKPOINT=y | ||
| 126 | 123 | ||
| 127 | # | 124 | # |
| 128 | # GCOV-based kernel profiling | 125 | # GCOV-based kernel profiling |
| @@ -234,12 +231,12 @@ CONFIG_CPU_SUBTYPE_SH7724=y | |||
| 234 | CONFIG_QUICKLIST=y | 231 | CONFIG_QUICKLIST=y |
| 235 | CONFIG_MMU=y | 232 | CONFIG_MMU=y |
| 236 | CONFIG_PAGE_OFFSET=0x80000000 | 233 | CONFIG_PAGE_OFFSET=0x80000000 |
| 237 | CONFIG_FORCE_MAX_ZONEORDER=11 | 234 | CONFIG_FORCE_MAX_ZONEORDER=12 |
| 238 | CONFIG_MEMORY_START=0x08000000 | 235 | CONFIG_MEMORY_START=0x08000000 |
| 239 | CONFIG_MEMORY_SIZE=0x10000000 | 236 | CONFIG_MEMORY_SIZE=0x10000000 |
| 240 | CONFIG_29BIT=y | 237 | CONFIG_29BIT=y |
| 241 | # CONFIG_PMB_ENABLE is not set | 238 | # CONFIG_PMB is not set |
| 242 | # CONFIG_X2TLB is not set | 239 | CONFIG_X2TLB=y |
| 243 | CONFIG_VSYSCALL=y | 240 | CONFIG_VSYSCALL=y |
| 244 | CONFIG_ARCH_FLATMEM_ENABLE=y | 241 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 245 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 242 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| @@ -247,6 +244,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y | |||
| 247 | CONFIG_MAX_ACTIVE_REGIONS=1 | 244 | CONFIG_MAX_ACTIVE_REGIONS=1 |
| 248 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 245 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 249 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 246 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 247 | CONFIG_IOREMAP_FIXED=y | ||
| 248 | CONFIG_UNCACHED_MAPPING=y | ||
| 250 | CONFIG_PAGE_SIZE_4KB=y | 249 | CONFIG_PAGE_SIZE_4KB=y |
| 251 | # CONFIG_PAGE_SIZE_8KB is not set | 250 | # CONFIG_PAGE_SIZE_8KB is not set |
| 252 | # CONFIG_PAGE_SIZE_16KB is not set | 251 | # CONFIG_PAGE_SIZE_16KB is not set |
| @@ -262,7 +261,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y | |||
| 262 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 261 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 263 | # CONFIG_PHYS_ADDR_T_64BIT is not set | 262 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
| 264 | CONFIG_ZONE_DMA_FLAG=0 | 263 | CONFIG_ZONE_DMA_FLAG=0 |
| 265 | CONFIG_NR_QUICK=2 | 264 | CONFIG_NR_QUICK=1 |
| 266 | # CONFIG_KSM is not set | 265 | # CONFIG_KSM is not set |
| 267 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | 266 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
| 268 | 267 | ||
| @@ -337,7 +336,6 @@ CONFIG_SECCOMP=y | |||
| 337 | # CONFIG_PREEMPT_VOLUNTARY is not set | 336 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 338 | CONFIG_PREEMPT=y | 337 | CONFIG_PREEMPT=y |
| 339 | CONFIG_GUSA=y | 338 | CONFIG_GUSA=y |
| 340 | # CONFIG_SPARSE_IRQ is not set | ||
| 341 | 339 | ||
| 342 | # | 340 | # |
| 343 | # Boot options | 341 | # Boot options |
| @@ -347,7 +345,7 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000 | |||
| 347 | CONFIG_ENTRY_OFFSET=0x00001000 | 345 | CONFIG_ENTRY_OFFSET=0x00001000 |
| 348 | CONFIG_CMDLINE_OVERWRITE=y | 346 | CONFIG_CMDLINE_OVERWRITE=y |
| 349 | # CONFIG_CMDLINE_EXTEND is not set | 347 | # CONFIG_CMDLINE_EXTEND is not set |
| 350 | CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 root=/dev/nfs ip=dhcp mem=120M memchunk.vpu=4m" | 348 | CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 root=/dev/nfs ip=dhcp mem=248M memchunk.vpu=8m memchunk.veu0=4m" |
| 351 | 349 | ||
| 352 | # | 350 | # |
| 353 | # Bus options | 351 | # Bus options |
| @@ -373,6 +371,7 @@ CONFIG_SUSPEND=y | |||
| 373 | CONFIG_SUSPEND_FREEZER=y | 371 | CONFIG_SUSPEND_FREEZER=y |
| 374 | # CONFIG_HIBERNATION is not set | 372 | # CONFIG_HIBERNATION is not set |
| 375 | CONFIG_PM_RUNTIME=y | 373 | CONFIG_PM_RUNTIME=y |
| 374 | CONFIG_PM_OPS=y | ||
| 376 | # CONFIG_CPU_IDLE is not set | 375 | # CONFIG_CPU_IDLE is not set |
| 377 | CONFIG_NET=y | 376 | CONFIG_NET=y |
| 378 | 377 | ||
| @@ -380,7 +379,6 @@ CONFIG_NET=y | |||
| 380 | # Networking options | 379 | # Networking options |
| 381 | # | 380 | # |
| 382 | CONFIG_PACKET=y | 381 | CONFIG_PACKET=y |
| 383 | # CONFIG_PACKET_MMAP is not set | ||
| 384 | CONFIG_UNIX=y | 382 | CONFIG_UNIX=y |
| 385 | # CONFIG_NET_KEY is not set | 383 | # CONFIG_NET_KEY is not set |
| 386 | CONFIG_INET=y | 384 | CONFIG_INET=y |
| @@ -445,7 +443,45 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 445 | # CONFIG_NET_PKTGEN is not set | 443 | # CONFIG_NET_PKTGEN is not set |
| 446 | # CONFIG_HAMRADIO is not set | 444 | # CONFIG_HAMRADIO is not set |
| 447 | # CONFIG_CAN is not set | 445 | # CONFIG_CAN is not set |
| 448 | # CONFIG_IRDA is not set | 446 | CONFIG_IRDA=y |
| 447 | |||
| 448 | # | ||
| 449 | # IrDA protocols | ||
| 450 | # | ||
| 451 | # CONFIG_IRLAN is not set | ||
| 452 | # CONFIG_IRCOMM is not set | ||
| 453 | # CONFIG_IRDA_ULTRA is not set | ||
| 454 | |||
| 455 | # | ||
| 456 | # IrDA options | ||
| 457 | # | ||
| 458 | # CONFIG_IRDA_CACHE_LAST_LSAP is not set | ||
| 459 | # CONFIG_IRDA_FAST_RR is not set | ||
| 460 | # CONFIG_IRDA_DEBUG is not set | ||
| 461 | |||
| 462 | # | ||
| 463 | # Infrared-port device drivers | ||
| 464 | # | ||
| 465 | |||
| 466 | # | ||
| 467 | # SIR device drivers | ||
| 468 | # | ||
| 469 | # CONFIG_IRTTY_SIR is not set | ||
| 470 | |||
| 471 | # | ||
| 472 | # Dongle support | ||
| 473 | # | ||
| 474 | CONFIG_SH_SIR=y | ||
| 475 | # CONFIG_KINGSUN_DONGLE is not set | ||
| 476 | # CONFIG_KSDAZZLE_DONGLE is not set | ||
| 477 | # CONFIG_KS959_DONGLE is not set | ||
| 478 | |||
| 479 | # | ||
| 480 | # FIR device drivers | ||
| 481 | # | ||
| 482 | # CONFIG_USB_IRDA is not set | ||
| 483 | # CONFIG_SIGMATEL_FIR is not set | ||
| 484 | # CONFIG_MCS_FIR is not set | ||
| 449 | # CONFIG_BT is not set | 485 | # CONFIG_BT is not set |
| 450 | # CONFIG_AF_RXRPC is not set | 486 | # CONFIG_AF_RXRPC is not set |
| 451 | CONFIG_WIRELESS=y | 487 | CONFIG_WIRELESS=y |
| @@ -556,6 +592,7 @@ CONFIG_MTD_NAND_IDS=y | |||
| 556 | # CONFIG_MTD_NAND_NANDSIM is not set | 592 | # CONFIG_MTD_NAND_NANDSIM is not set |
| 557 | # CONFIG_MTD_NAND_PLATFORM is not set | 593 | # CONFIG_MTD_NAND_PLATFORM is not set |
| 558 | # CONFIG_MTD_ALAUDA is not set | 594 | # CONFIG_MTD_ALAUDA is not set |
| 595 | # CONFIG_MTD_NAND_SH_FLCTL is not set | ||
| 559 | # CONFIG_MTD_ONENAND is not set | 596 | # CONFIG_MTD_ONENAND is not set |
| 560 | 597 | ||
| 561 | # | 598 | # |
| @@ -597,6 +634,7 @@ CONFIG_MISC_DEVICES=y | |||
| 597 | # CONFIG_ICS932S401 is not set | 634 | # CONFIG_ICS932S401 is not set |
| 598 | # CONFIG_ENCLOSURE_SERVICES is not set | 635 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 599 | # CONFIG_ISL29003 is not set | 636 | # CONFIG_ISL29003 is not set |
| 637 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 600 | # CONFIG_DS1682 is not set | 638 | # CONFIG_DS1682 is not set |
| 601 | # CONFIG_TI_DAC7512 is not set | 639 | # CONFIG_TI_DAC7512 is not set |
| 602 | # CONFIG_C2PORT is not set | 640 | # CONFIG_C2PORT is not set |
| @@ -616,6 +654,7 @@ CONFIG_HAVE_IDE=y | |||
| 616 | # | 654 | # |
| 617 | # SCSI device support | 655 | # SCSI device support |
| 618 | # | 656 | # |
| 657 | CONFIG_SCSI_MOD=y | ||
| 619 | # CONFIG_RAID_ATTRS is not set | 658 | # CONFIG_RAID_ATTRS is not set |
| 620 | CONFIG_SCSI=y | 659 | CONFIG_SCSI=y |
| 621 | CONFIG_SCSI_DMA=y | 660 | CONFIG_SCSI_DMA=y |
| @@ -768,7 +807,29 @@ CONFIG_KEYBOARD_SH_KEYSC=y | |||
| 768 | # CONFIG_INPUT_MOUSE is not set | 807 | # CONFIG_INPUT_MOUSE is not set |
| 769 | # CONFIG_INPUT_JOYSTICK is not set | 808 | # CONFIG_INPUT_JOYSTICK is not set |
| 770 | # CONFIG_INPUT_TABLET is not set | 809 | # CONFIG_INPUT_TABLET is not set |
| 771 | # CONFIG_INPUT_TOUCHSCREEN is not set | 810 | CONFIG_INPUT_TOUCHSCREEN=y |
| 811 | # CONFIG_TOUCHSCREEN_ADS7846 is not set | ||
| 812 | # CONFIG_TOUCHSCREEN_AD7877 is not set | ||
| 813 | # CONFIG_TOUCHSCREEN_AD7879_I2C is not set | ||
| 814 | # CONFIG_TOUCHSCREEN_AD7879_SPI is not set | ||
| 815 | # CONFIG_TOUCHSCREEN_AD7879 is not set | ||
| 816 | # CONFIG_TOUCHSCREEN_DYNAPRO is not set | ||
| 817 | # CONFIG_TOUCHSCREEN_EETI is not set | ||
| 818 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 819 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 820 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 821 | # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set | ||
| 822 | # CONFIG_TOUCHSCREEN_MCS5000 is not set | ||
| 823 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 824 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
| 825 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 826 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 827 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 828 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 829 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
| 830 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
| 831 | CONFIG_TOUCHSCREEN_TSC2007=y | ||
| 832 | # CONFIG_TOUCHSCREEN_W90X900 is not set | ||
| 772 | # CONFIG_INPUT_MISC is not set | 833 | # CONFIG_INPUT_MISC is not set |
| 773 | 834 | ||
| 774 | # | 835 | # |
| @@ -802,10 +863,10 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6 | |||
| 802 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | 863 | CONFIG_SERIAL_SH_SCI_CONSOLE=y |
| 803 | CONFIG_SERIAL_CORE=y | 864 | CONFIG_SERIAL_CORE=y |
| 804 | CONFIG_SERIAL_CORE_CONSOLE=y | 865 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 866 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
| 805 | CONFIG_UNIX98_PTYS=y | 867 | CONFIG_UNIX98_PTYS=y |
| 806 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 868 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| 807 | CONFIG_LEGACY_PTYS=y | 869 | # CONFIG_LEGACY_PTYS is not set |
| 808 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 809 | # CONFIG_IPMI_HANDLER is not set | 870 | # CONFIG_IPMI_HANDLER is not set |
| 810 | CONFIG_HW_RANDOM=y | 871 | CONFIG_HW_RANDOM=y |
| 811 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set | 872 | # CONFIG_HW_RANDOM_TIMERIOMEM is not set |
| @@ -830,6 +891,7 @@ CONFIG_I2C_HELPER_AUTO=y | |||
| 830 | # CONFIG_I2C_OCORES is not set | 891 | # CONFIG_I2C_OCORES is not set |
| 831 | CONFIG_I2C_SH_MOBILE=y | 892 | CONFIG_I2C_SH_MOBILE=y |
| 832 | # CONFIG_I2C_SIMTEC is not set | 893 | # CONFIG_I2C_SIMTEC is not set |
| 894 | # CONFIG_I2C_XILINX is not set | ||
| 833 | 895 | ||
| 834 | # | 896 | # |
| 835 | # External I2C/SMBus adapter drivers | 897 | # External I2C/SMBus adapter drivers |
| @@ -843,15 +905,9 @@ CONFIG_I2C_SH_MOBILE=y | |||
| 843 | # | 905 | # |
| 844 | # CONFIG_I2C_PCA_PLATFORM is not set | 906 | # CONFIG_I2C_PCA_PLATFORM is not set |
| 845 | # CONFIG_I2C_STUB is not set | 907 | # CONFIG_I2C_STUB is not set |
| 846 | |||
| 847 | # | ||
| 848 | # Miscellaneous I2C Chip support | ||
| 849 | # | ||
| 850 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 851 | # CONFIG_I2C_DEBUG_CORE is not set | 908 | # CONFIG_I2C_DEBUG_CORE is not set |
| 852 | # CONFIG_I2C_DEBUG_ALGO is not set | 909 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 853 | # CONFIG_I2C_DEBUG_BUS is not set | 910 | # CONFIG_I2C_DEBUG_BUS is not set |
| 854 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 855 | CONFIG_SPI=y | 911 | CONFIG_SPI=y |
| 856 | CONFIG_SPI_MASTER=y | 912 | CONFIG_SPI_MASTER=y |
| 857 | 913 | ||
| @@ -882,13 +938,16 @@ CONFIG_GPIOLIB=y | |||
| 882 | # | 938 | # |
| 883 | # Memory mapped GPIO expanders: | 939 | # Memory mapped GPIO expanders: |
| 884 | # | 940 | # |
| 941 | # CONFIG_GPIO_IT8761E is not set | ||
| 885 | 942 | ||
| 886 | # | 943 | # |
| 887 | # I2C GPIO expanders: | 944 | # I2C GPIO expanders: |
| 888 | # | 945 | # |
| 946 | # CONFIG_GPIO_MAX7300 is not set | ||
| 889 | # CONFIG_GPIO_MAX732X is not set | 947 | # CONFIG_GPIO_MAX732X is not set |
| 890 | # CONFIG_GPIO_PCA953X is not set | 948 | # CONFIG_GPIO_PCA953X is not set |
| 891 | # CONFIG_GPIO_PCF857X is not set | 949 | # CONFIG_GPIO_PCF857X is not set |
| 950 | # CONFIG_GPIO_ADP5588 is not set | ||
| 892 | 951 | ||
| 893 | # | 952 | # |
| 894 | # PCI GPIO expanders: | 953 | # PCI GPIO expanders: |
| @@ -919,23 +978,26 @@ CONFIG_SSB_POSSIBLE=y | |||
| 919 | # | 978 | # |
| 920 | # Multifunction device drivers | 979 | # Multifunction device drivers |
| 921 | # | 980 | # |
| 922 | # CONFIG_MFD_CORE is not set | 981 | CONFIG_MFD_CORE=y |
| 982 | # CONFIG_MFD_88PM860X is not set | ||
| 923 | # CONFIG_MFD_SM501 is not set | 983 | # CONFIG_MFD_SM501 is not set |
| 924 | # CONFIG_MFD_SH_MOBILE_SDHI is not set | 984 | CONFIG_MFD_SH_MOBILE_SDHI=y |
| 925 | # CONFIG_HTC_PASIC3 is not set | 985 | # CONFIG_HTC_PASIC3 is not set |
| 986 | # CONFIG_HTC_I2CPLD is not set | ||
| 926 | # CONFIG_TPS65010 is not set | 987 | # CONFIG_TPS65010 is not set |
| 927 | # CONFIG_TWL4030_CORE is not set | 988 | # CONFIG_TWL4030_CORE is not set |
| 928 | # CONFIG_MFD_TMIO is not set | 989 | # CONFIG_MFD_TMIO is not set |
| 929 | # CONFIG_PMIC_DA903X is not set | 990 | # CONFIG_PMIC_DA903X is not set |
| 930 | # CONFIG_PMIC_ADP5520 is not set | 991 | # CONFIG_PMIC_ADP5520 is not set |
| 992 | # CONFIG_MFD_MAX8925 is not set | ||
| 931 | # CONFIG_MFD_WM8400 is not set | 993 | # CONFIG_MFD_WM8400 is not set |
| 932 | # CONFIG_MFD_WM831X is not set | 994 | # CONFIG_MFD_WM831X is not set |
| 933 | # CONFIG_MFD_WM8350_I2C is not set | 995 | # CONFIG_MFD_WM8350_I2C is not set |
| 996 | # CONFIG_MFD_WM8994 is not set | ||
| 934 | # CONFIG_MFD_PCF50633 is not set | 997 | # CONFIG_MFD_PCF50633 is not set |
| 935 | # CONFIG_MFD_MC13783 is not set | 998 | # CONFIG_MFD_MC13783 is not set |
| 936 | # CONFIG_AB3100_CORE is not set | 999 | # CONFIG_AB3100_CORE is not set |
| 937 | # CONFIG_EZX_PCAP is not set | 1000 | # CONFIG_EZX_PCAP is not set |
| 938 | # CONFIG_MFD_88PM8607 is not set | ||
| 939 | # CONFIG_AB4500_CORE is not set | 1001 | # CONFIG_AB4500_CORE is not set |
| 940 | # CONFIG_REGULATOR is not set | 1002 | # CONFIG_REGULATOR is not set |
| 941 | CONFIG_MEDIA_SUPPORT=y | 1003 | CONFIG_MEDIA_SUPPORT=y |
| @@ -985,10 +1047,10 @@ CONFIG_SOC_CAMERA=y | |||
| 985 | # CONFIG_SOC_CAMERA_MT9M001 is not set | 1047 | # CONFIG_SOC_CAMERA_MT9M001 is not set |
| 986 | # CONFIG_SOC_CAMERA_MT9M111 is not set | 1048 | # CONFIG_SOC_CAMERA_MT9M111 is not set |
| 987 | # CONFIG_SOC_CAMERA_MT9T031 is not set | 1049 | # CONFIG_SOC_CAMERA_MT9T031 is not set |
| 988 | # CONFIG_SOC_CAMERA_MT9T112 is not set | 1050 | CONFIG_SOC_CAMERA_MT9T112=y |
| 989 | # CONFIG_SOC_CAMERA_MT9V022 is not set | 1051 | # CONFIG_SOC_CAMERA_MT9V022 is not set |
| 990 | # CONFIG_SOC_CAMERA_RJ54N1 is not set | 1052 | # CONFIG_SOC_CAMERA_RJ54N1 is not set |
| 991 | # CONFIG_SOC_CAMERA_TW9910 is not set | 1053 | CONFIG_SOC_CAMERA_TW9910=y |
| 992 | # CONFIG_SOC_CAMERA_PLATFORM is not set | 1054 | # CONFIG_SOC_CAMERA_PLATFORM is not set |
| 993 | # CONFIG_SOC_CAMERA_OV772X is not set | 1055 | # CONFIG_SOC_CAMERA_OV772X is not set |
| 994 | # CONFIG_SOC_CAMERA_OV9640 is not set | 1056 | # CONFIG_SOC_CAMERA_OV9640 is not set |
| @@ -1001,6 +1063,7 @@ CONFIG_RADIO_ADAPTERS=y | |||
| 1001 | # CONFIG_RADIO_SI470X is not set | 1063 | # CONFIG_RADIO_SI470X is not set |
| 1002 | # CONFIG_USB_MR800 is not set | 1064 | # CONFIG_USB_MR800 is not set |
| 1003 | # CONFIG_RADIO_TEA5764 is not set | 1065 | # CONFIG_RADIO_TEA5764 is not set |
| 1066 | # CONFIG_RADIO_SAA7706H is not set | ||
| 1004 | # CONFIG_RADIO_TEF6862 is not set | 1067 | # CONFIG_RADIO_TEF6862 is not set |
| 1005 | # CONFIG_DAB is not set | 1068 | # CONFIG_DAB is not set |
| 1006 | 1069 | ||
| @@ -1034,6 +1097,7 @@ CONFIG_FB_DEFERRED_IO=y | |||
| 1034 | # | 1097 | # |
| 1035 | # CONFIG_FB_S1D13XXX is not set | 1098 | # CONFIG_FB_S1D13XXX is not set |
| 1036 | CONFIG_FB_SH_MOBILE_LCDC=y | 1099 | CONFIG_FB_SH_MOBILE_LCDC=y |
| 1100 | # CONFIG_FB_TMIO is not set | ||
| 1037 | # CONFIG_FB_VIRTUAL is not set | 1101 | # CONFIG_FB_VIRTUAL is not set |
| 1038 | # CONFIG_FB_METRONOME is not set | 1102 | # CONFIG_FB_METRONOME is not set |
| 1039 | # CONFIG_FB_MB862XX is not set | 1103 | # CONFIG_FB_MB862XX is not set |
| @@ -1062,7 +1126,46 @@ CONFIG_LOGO=y | |||
| 1062 | # CONFIG_LOGO_SUPERH_MONO is not set | 1126 | # CONFIG_LOGO_SUPERH_MONO is not set |
| 1063 | # CONFIG_LOGO_SUPERH_VGA16 is not set | 1127 | # CONFIG_LOGO_SUPERH_VGA16 is not set |
| 1064 | CONFIG_LOGO_SUPERH_CLUT224=y | 1128 | CONFIG_LOGO_SUPERH_CLUT224=y |
| 1065 | # CONFIG_SOUND is not set | 1129 | CONFIG_SOUND=y |
| 1130 | CONFIG_SOUND_OSS_CORE=y | ||
| 1131 | CONFIG_SOUND_OSS_CORE_PRECLAIM=y | ||
| 1132 | CONFIG_SND=y | ||
| 1133 | CONFIG_SND_TIMER=y | ||
| 1134 | CONFIG_SND_PCM=y | ||
| 1135 | CONFIG_SND_JACK=y | ||
| 1136 | CONFIG_SND_SEQUENCER=y | ||
| 1137 | CONFIG_SND_SEQ_DUMMY=y | ||
| 1138 | CONFIG_SND_OSSEMUL=y | ||
| 1139 | CONFIG_SND_MIXER_OSS=y | ||
| 1140 | CONFIG_SND_PCM_OSS=y | ||
| 1141 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 1142 | # CONFIG_SND_SEQUENCER_OSS is not set | ||
| 1143 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 1144 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 1145 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 1146 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 1147 | # CONFIG_SND_DEBUG is not set | ||
| 1148 | # CONFIG_SND_RAWMIDI_SEQ is not set | ||
| 1149 | # CONFIG_SND_OPL3_LIB_SEQ is not set | ||
| 1150 | # CONFIG_SND_OPL4_LIB_SEQ is not set | ||
| 1151 | # CONFIG_SND_SBAWE_SEQ is not set | ||
| 1152 | # CONFIG_SND_EMU10K1_SEQ is not set | ||
| 1153 | # CONFIG_SND_DRIVERS is not set | ||
| 1154 | # CONFIG_SND_SPI is not set | ||
| 1155 | CONFIG_SND_SUPERH=y | ||
| 1156 | # CONFIG_SND_USB is not set | ||
| 1157 | CONFIG_SND_SOC=y | ||
| 1158 | |||
| 1159 | # | ||
| 1160 | # SoC Audio support for SuperH | ||
| 1161 | # | ||
| 1162 | CONFIG_SND_SOC_SH4_FSI=y | ||
| 1163 | # CONFIG_SND_FSI_AK4642 is not set | ||
| 1164 | CONFIG_SND_FSI_DA7210=y | ||
| 1165 | CONFIG_SND_SOC_I2C_AND_SPI=y | ||
| 1166 | # CONFIG_SND_SOC_ALL_CODECS is not set | ||
| 1167 | CONFIG_SND_SOC_DA7210=y | ||
| 1168 | # CONFIG_SOUND_PRIME is not set | ||
| 1066 | CONFIG_HID_SUPPORT=y | 1169 | CONFIG_HID_SUPPORT=y |
| 1067 | CONFIG_HID=y | 1170 | CONFIG_HID=y |
| 1068 | # CONFIG_HIDRAW is not set | 1171 | # CONFIG_HIDRAW is not set |
| @@ -1077,6 +1180,7 @@ CONFIG_USB_HID=y | |||
| 1077 | # | 1180 | # |
| 1078 | # Special HID drivers | 1181 | # Special HID drivers |
| 1079 | # | 1182 | # |
| 1183 | # CONFIG_HID_3M_PCT is not set | ||
| 1080 | # CONFIG_HID_A4TECH is not set | 1184 | # CONFIG_HID_A4TECH is not set |
| 1081 | # CONFIG_HID_APPLE is not set | 1185 | # CONFIG_HID_APPLE is not set |
| 1082 | # CONFIG_HID_BELKIN is not set | 1186 | # CONFIG_HID_BELKIN is not set |
| @@ -1091,12 +1195,16 @@ CONFIG_USB_HID=y | |||
| 1091 | # CONFIG_HID_KENSINGTON is not set | 1195 | # CONFIG_HID_KENSINGTON is not set |
| 1092 | # CONFIG_HID_LOGITECH is not set | 1196 | # CONFIG_HID_LOGITECH is not set |
| 1093 | # CONFIG_HID_MICROSOFT is not set | 1197 | # CONFIG_HID_MICROSOFT is not set |
| 1198 | # CONFIG_HID_MOSART is not set | ||
| 1094 | # CONFIG_HID_MONTEREY is not set | 1199 | # CONFIG_HID_MONTEREY is not set |
| 1095 | # CONFIG_HID_NTRIG is not set | 1200 | # CONFIG_HID_NTRIG is not set |
| 1201 | # CONFIG_HID_ORTEK is not set | ||
| 1096 | # CONFIG_HID_PANTHERLORD is not set | 1202 | # CONFIG_HID_PANTHERLORD is not set |
| 1097 | # CONFIG_HID_PETALYNX is not set | 1203 | # CONFIG_HID_PETALYNX is not set |
| 1204 | # CONFIG_HID_QUANTA is not set | ||
| 1098 | # CONFIG_HID_SAMSUNG is not set | 1205 | # CONFIG_HID_SAMSUNG is not set |
| 1099 | # CONFIG_HID_SONY is not set | 1206 | # CONFIG_HID_SONY is not set |
| 1207 | # CONFIG_HID_STANTUM is not set | ||
| 1100 | # CONFIG_HID_SUNPLUS is not set | 1208 | # CONFIG_HID_SUNPLUS is not set |
| 1101 | # CONFIG_HID_GREENASIA is not set | 1209 | # CONFIG_HID_GREENASIA is not set |
| 1102 | # CONFIG_HID_SMARTJOYPLUS is not set | 1210 | # CONFIG_HID_SMARTJOYPLUS is not set |
| @@ -1136,6 +1244,7 @@ CONFIG_USB_MON=y | |||
| 1136 | # CONFIG_USB_SL811_HCD is not set | 1244 | # CONFIG_USB_SL811_HCD is not set |
| 1137 | CONFIG_USB_R8A66597_HCD=y | 1245 | CONFIG_USB_R8A66597_HCD=y |
| 1138 | # CONFIG_USB_HWA_HCD is not set | 1246 | # CONFIG_USB_HWA_HCD is not set |
| 1247 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
| 1139 | 1248 | ||
| 1140 | # | 1249 | # |
| 1141 | # USB Device Class drivers | 1250 | # USB Device Class drivers |
| @@ -1188,7 +1297,6 @@ CONFIG_USB_STORAGE=y | |||
| 1188 | # CONFIG_USB_RIO500 is not set | 1297 | # CONFIG_USB_RIO500 is not set |
| 1189 | # CONFIG_USB_LEGOTOWER is not set | 1298 | # CONFIG_USB_LEGOTOWER is not set |
| 1190 | # CONFIG_USB_LCD is not set | 1299 | # CONFIG_USB_LCD is not set |
| 1191 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1192 | # CONFIG_USB_LED is not set | 1300 | # CONFIG_USB_LED is not set |
| 1193 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1301 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1194 | # CONFIG_USB_CYTHERM is not set | 1302 | # CONFIG_USB_CYTHERM is not set |
| @@ -1200,8 +1308,45 @@ CONFIG_USB_STORAGE=y | |||
| 1200 | # CONFIG_USB_IOWARRIOR is not set | 1308 | # CONFIG_USB_IOWARRIOR is not set |
| 1201 | # CONFIG_USB_TEST is not set | 1309 | # CONFIG_USB_TEST is not set |
| 1202 | # CONFIG_USB_ISIGHTFW is not set | 1310 | # CONFIG_USB_ISIGHTFW is not set |
| 1203 | # CONFIG_USB_VST is not set | 1311 | CONFIG_USB_GADGET=y |
| 1204 | # CONFIG_USB_GADGET is not set | 1312 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| 1313 | # CONFIG_USB_GADGET_DEBUG_FS is not set | ||
| 1314 | CONFIG_USB_GADGET_VBUS_DRAW=2 | ||
| 1315 | CONFIG_USB_GADGET_SELECTED=y | ||
| 1316 | # CONFIG_USB_GADGET_AT91 is not set | ||
| 1317 | # CONFIG_USB_GADGET_ATMEL_USBA is not set | ||
| 1318 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
| 1319 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
| 1320 | # CONFIG_USB_GADGET_OMAP is not set | ||
| 1321 | # CONFIG_USB_GADGET_PXA25X is not set | ||
| 1322 | CONFIG_USB_GADGET_R8A66597=y | ||
| 1323 | CONFIG_USB_R8A66597=y | ||
| 1324 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 1325 | # CONFIG_USB_GADGET_S3C_HSOTG is not set | ||
| 1326 | # CONFIG_USB_GADGET_IMX is not set | ||
| 1327 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
| 1328 | # CONFIG_USB_GADGET_M66592 is not set | ||
| 1329 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
| 1330 | # CONFIG_USB_GADGET_FSL_QE is not set | ||
| 1331 | # CONFIG_USB_GADGET_CI13XXX is not set | ||
| 1332 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 1333 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 1334 | # CONFIG_USB_GADGET_LANGWELL is not set | ||
| 1335 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
| 1336 | CONFIG_USB_GADGET_DUALSPEED=y | ||
| 1337 | # CONFIG_USB_ZERO is not set | ||
| 1338 | # CONFIG_USB_AUDIO is not set | ||
| 1339 | # CONFIG_USB_ETH is not set | ||
| 1340 | # CONFIG_USB_GADGETFS is not set | ||
| 1341 | CONFIG_USB_FILE_STORAGE=m | ||
| 1342 | # CONFIG_USB_FILE_STORAGE_TEST is not set | ||
| 1343 | # CONFIG_USB_MASS_STORAGE is not set | ||
| 1344 | # CONFIG_USB_G_SERIAL is not set | ||
| 1345 | # CONFIG_USB_MIDI_GADGET is not set | ||
| 1346 | # CONFIG_USB_G_PRINTER is not set | ||
| 1347 | # CONFIG_USB_CDC_COMPOSITE is not set | ||
| 1348 | # CONFIG_USB_G_NOKIA is not set | ||
| 1349 | # CONFIG_USB_G_MULTI is not set | ||
| 1205 | 1350 | ||
| 1206 | # | 1351 | # |
| 1207 | # OTG and related infrastructure | 1352 | # OTG and related infrastructure |
| @@ -1224,10 +1369,8 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
| 1224 | # MMC/SD/SDIO Host Controller Drivers | 1369 | # MMC/SD/SDIO Host Controller Drivers |
| 1225 | # | 1370 | # |
| 1226 | # CONFIG_MMC_SDHCI is not set | 1371 | # CONFIG_MMC_SDHCI is not set |
| 1227 | # CONFIG_MMC_AT91 is not set | ||
| 1228 | # CONFIG_MMC_ATMELMCI is not set | ||
| 1229 | CONFIG_MMC_SPI=y | 1372 | CONFIG_MMC_SPI=y |
| 1230 | # CONFIG_MMC_TMIO is not set | 1373 | CONFIG_MMC_TMIO=y |
| 1231 | # CONFIG_MEMSTICK is not set | 1374 | # CONFIG_MEMSTICK is not set |
| 1232 | # CONFIG_NEW_LEDS is not set | 1375 | # CONFIG_NEW_LEDS is not set |
| 1233 | # CONFIG_ACCESSIBILITY is not set | 1376 | # CONFIG_ACCESSIBILITY is not set |
| @@ -1253,10 +1396,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1253 | # CONFIG_RTC_DRV_DS1374 is not set | 1396 | # CONFIG_RTC_DRV_DS1374 is not set |
| 1254 | # CONFIG_RTC_DRV_DS1672 is not set | 1397 | # CONFIG_RTC_DRV_DS1672 is not set |
| 1255 | # CONFIG_RTC_DRV_MAX6900 is not set | 1398 | # CONFIG_RTC_DRV_MAX6900 is not set |
| 1256 | # CONFIG_RTC_DRV_RS5C372 is not set | 1399 | CONFIG_RTC_DRV_RS5C372=y |
| 1257 | # CONFIG_RTC_DRV_ISL1208 is not set | 1400 | # CONFIG_RTC_DRV_ISL1208 is not set |
| 1258 | # CONFIG_RTC_DRV_X1205 is not set | 1401 | # CONFIG_RTC_DRV_X1205 is not set |
| 1259 | CONFIG_RTC_DRV_PCF8563=y | 1402 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 1260 | # CONFIG_RTC_DRV_PCF8583 is not set | 1403 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1261 | # CONFIG_RTC_DRV_M41T80 is not set | 1404 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1262 | # CONFIG_RTC_DRV_BQ32K is not set | 1405 | # CONFIG_RTC_DRV_BQ32K is not set |
| @@ -1303,8 +1446,6 @@ CONFIG_RTC_DRV_PCF8563=y | |||
| 1303 | CONFIG_UIO=y | 1446 | CONFIG_UIO=y |
| 1304 | # CONFIG_UIO_PDRV is not set | 1447 | # CONFIG_UIO_PDRV is not set |
| 1305 | CONFIG_UIO_PDRV_GENIRQ=y | 1448 | CONFIG_UIO_PDRV_GENIRQ=y |
| 1306 | # CONFIG_UIO_SMX is not set | ||
| 1307 | # CONFIG_UIO_SERCOS3 is not set | ||
| 1308 | 1449 | ||
| 1309 | # | 1450 | # |
| 1310 | # TI VLYNQ | 1451 | # TI VLYNQ |
| @@ -1390,6 +1531,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
| 1390 | # CONFIG_EFS_FS is not set | 1531 | # CONFIG_EFS_FS is not set |
| 1391 | # CONFIG_JFFS2_FS is not set | 1532 | # CONFIG_JFFS2_FS is not set |
| 1392 | # CONFIG_UBIFS_FS is not set | 1533 | # CONFIG_UBIFS_FS is not set |
| 1534 | # CONFIG_LOGFS is not set | ||
| 1393 | # CONFIG_CRAMFS is not set | 1535 | # CONFIG_CRAMFS is not set |
| 1394 | # CONFIG_SQUASHFS is not set | 1536 | # CONFIG_SQUASHFS is not set |
| 1395 | # CONFIG_VXFS_FS is not set | 1537 | # CONFIG_VXFS_FS is not set |
| @@ -1418,6 +1560,7 @@ CONFIG_SUNRPC=y | |||
| 1418 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1560 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1419 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1561 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1420 | # CONFIG_SMB_FS is not set | 1562 | # CONFIG_SMB_FS is not set |
| 1563 | # CONFIG_CEPH_FS is not set | ||
| 1421 | # CONFIG_CIFS is not set | 1564 | # CONFIG_CIFS is not set |
| 1422 | # CONFIG_NCP_FS is not set | 1565 | # CONFIG_NCP_FS is not set |
| 1423 | # CONFIG_CODA_FS is not set | 1566 | # CONFIG_CODA_FS is not set |
| @@ -1487,6 +1630,7 @@ CONFIG_DEBUG_FS=y | |||
| 1487 | CONFIG_DEBUG_BUGVERBOSE=y | 1630 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1488 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1631 | # CONFIG_DEBUG_MEMORY_INIT is not set |
| 1489 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 1632 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |
| 1633 | # CONFIG_LKDTM is not set | ||
| 1490 | # CONFIG_LATENCYTOP is not set | 1634 | # CONFIG_LATENCYTOP is not set |
| 1491 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 1635 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
| 1492 | CONFIG_HAVE_FUNCTION_TRACER=y | 1636 | CONFIG_HAVE_FUNCTION_TRACER=y |
| @@ -1618,7 +1762,7 @@ CONFIG_CRYPTO_HW=y | |||
| 1618 | # | 1762 | # |
| 1619 | CONFIG_BITREVERSE=y | 1763 | CONFIG_BITREVERSE=y |
| 1620 | CONFIG_GENERIC_FIND_LAST_BIT=y | 1764 | CONFIG_GENERIC_FIND_LAST_BIT=y |
| 1621 | # CONFIG_CRC_CCITT is not set | 1765 | CONFIG_CRC_CCITT=y |
| 1622 | # CONFIG_CRC16 is not set | 1766 | # CONFIG_CRC16 is not set |
| 1623 | CONFIG_CRC_T10DIF=y | 1767 | CONFIG_CRC_T10DIF=y |
| 1624 | CONFIG_CRC_ITU_T=y | 1768 | CONFIG_CRC_ITU_T=y |
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index ac04255022b6..ce830faeebbf 100644 --- a/arch/sh/include/asm/elf.h +++ b/arch/sh/include/asm/elf.h | |||
| @@ -211,7 +211,9 @@ extern void __kernel_vsyscall; | |||
| 211 | 211 | ||
| 212 | #define VSYSCALL_AUX_ENT \ | 212 | #define VSYSCALL_AUX_ENT \ |
| 213 | if (vdso_enabled) \ | 213 | if (vdso_enabled) \ |
| 214 | NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); | 214 | NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); \ |
| 215 | else \ | ||
| 216 | NEW_AUX_ENT(AT_IGNORE, 0); | ||
| 215 | #else | 217 | #else |
| 216 | #define VSYSCALL_AUX_ENT | 218 | #define VSYSCALL_AUX_ENT |
| 217 | #endif /* CONFIG_VSYSCALL */ | 219 | #endif /* CONFIG_VSYSCALL */ |
| @@ -219,7 +221,7 @@ extern void __kernel_vsyscall; | |||
| 219 | #ifdef CONFIG_SH_FPU | 221 | #ifdef CONFIG_SH_FPU |
| 220 | #define FPU_AUX_ENT NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT) | 222 | #define FPU_AUX_ENT NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT) |
| 221 | #else | 223 | #else |
| 222 | #define FPU_AUX_ENT | 224 | #define FPU_AUX_ENT NEW_AUX_ENT(AT_IGNORE, 0) |
| 223 | #endif | 225 | #endif |
| 224 | 226 | ||
| 225 | extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape; | 227 | extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape; |
diff --git a/arch/sh/include/cpu-sh4/cpu/mmu_context.h b/arch/sh/include/cpu-sh4/cpu/mmu_context.h index 310ec92f2759..5963124c1d4a 100644 --- a/arch/sh/include/cpu-sh4/cpu/mmu_context.h +++ b/arch/sh/include/cpu-sh4/cpu/mmu_context.h | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | #define MMUCR_URB 0x00FC0000 | 30 | #define MMUCR_URB 0x00FC0000 |
| 31 | #define MMUCR_URB_SHIFT 18 | 31 | #define MMUCR_URB_SHIFT 18 |
| 32 | #define MMUCR_URB_NENTRIES 64 | 32 | #define MMUCR_URB_NENTRIES 64 |
| 33 | #define MMUCR_URC 0x0000FC00 | ||
| 34 | #define MMUCR_URC_SHIFT 10 | ||
| 33 | 35 | ||
| 34 | #if defined(CONFIG_32BIT) && defined(CONFIG_CPU_SUBTYPE_ST40) | 36 | #if defined(CONFIG_32BIT) && defined(CONFIG_CPU_SUBTYPE_ST40) |
| 35 | #define MMUCR_SE (1 << 4) | 37 | #define MMUCR_SE (1 << 4) |
diff --git a/arch/sh/kernel/cpufreq.c b/arch/sh/kernel/cpufreq.c index dce4f3ff0932..0fffacea6ed9 100644 --- a/arch/sh/kernel/cpufreq.c +++ b/arch/sh/kernel/cpufreq.c | |||
| @@ -48,7 +48,7 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy, | |||
| 48 | return -ENODEV; | 48 | return -ENODEV; |
| 49 | 49 | ||
| 50 | cpus_allowed = current->cpus_allowed; | 50 | cpus_allowed = current->cpus_allowed; |
| 51 | set_cpus_allowed(current, cpumask_of_cpu(cpu)); | 51 | set_cpus_allowed_ptr(current, cpumask_of(cpu)); |
| 52 | 52 | ||
| 53 | BUG_ON(smp_processor_id() != cpu); | 53 | BUG_ON(smp_processor_id() != cpu); |
| 54 | 54 | ||
| @@ -66,7 +66,7 @@ static int sh_cpufreq_target(struct cpufreq_policy *policy, | |||
| 66 | freqs.flags = 0; | 66 | freqs.flags = 0; |
| 67 | 67 | ||
| 68 | cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); | 68 | cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); |
| 69 | set_cpus_allowed(current, cpus_allowed); | 69 | set_cpus_allowed_ptr(current, &cpus_allowed); |
| 70 | clk_set_rate(cpuclk, freq); | 70 | clk_set_rate(cpuclk, freq); |
| 71 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); | 71 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); |
| 72 | 72 | ||
diff --git a/arch/sh/kernel/return_address.c b/arch/sh/kernel/return_address.c index df3ab5811074..cbf1dd5372b2 100644 --- a/arch/sh/kernel/return_address.c +++ b/arch/sh/kernel/return_address.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * for more details. | 9 | * for more details. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/module.h> | ||
| 12 | #include <asm/dwarf.h> | 13 | #include <asm/dwarf.h> |
| 13 | 14 | ||
| 14 | #ifdef CONFIG_DWARF_UNWINDER | 15 | #ifdef CONFIG_DWARF_UNWINDER |
| @@ -52,3 +53,5 @@ void *return_address(unsigned int depth) | |||
| 52 | } | 53 | } |
| 53 | 54 | ||
| 54 | #endif | 55 | #endif |
| 56 | |||
| 57 | EXPORT_SYMBOL_GPL(return_address); | ||
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c index e124cf7008df..002cc612deef 100644 --- a/arch/sh/kernel/smp.c +++ b/arch/sh/kernel/smp.c | |||
| @@ -69,6 +69,7 @@ asmlinkage void __cpuinit start_secondary(void) | |||
| 69 | unsigned int cpu; | 69 | unsigned int cpu; |
| 70 | struct mm_struct *mm = &init_mm; | 70 | struct mm_struct *mm = &init_mm; |
| 71 | 71 | ||
| 72 | enable_mmu(); | ||
| 72 | atomic_inc(&mm->mm_count); | 73 | atomic_inc(&mm->mm_count); |
| 73 | atomic_inc(&mm->mm_users); | 74 | atomic_inc(&mm->mm_users); |
| 74 | current->active_mm = mm; | 75 | current->active_mm = mm; |
diff --git a/arch/sh/mm/tlb-pteaex.c b/arch/sh/mm/tlb-pteaex.c index bdd0982b56ee..b71db6af8060 100644 --- a/arch/sh/mm/tlb-pteaex.c +++ b/arch/sh/mm/tlb-pteaex.c | |||
| @@ -77,3 +77,31 @@ void local_flush_tlb_one(unsigned long asid, unsigned long page) | |||
| 77 | __raw_writel(asid, MMU_ITLB_ADDRESS_ARRAY2 | MMU_PAGE_ASSOC_BIT); | 77 | __raw_writel(asid, MMU_ITLB_ADDRESS_ARRAY2 | MMU_PAGE_ASSOC_BIT); |
| 78 | back_to_cached(); | 78 | back_to_cached(); |
| 79 | } | 79 | } |
| 80 | |||
| 81 | void local_flush_tlb_all(void) | ||
| 82 | { | ||
| 83 | unsigned long flags, status; | ||
| 84 | int i; | ||
| 85 | |||
| 86 | /* | ||
| 87 | * Flush all the TLB. | ||
| 88 | */ | ||
| 89 | local_irq_save(flags); | ||
| 90 | jump_to_uncached(); | ||
| 91 | |||
| 92 | status = __raw_readl(MMUCR); | ||
| 93 | status = ((status & MMUCR_URB) >> MMUCR_URB_SHIFT); | ||
| 94 | |||
| 95 | if (status == 0) | ||
| 96 | status = MMUCR_URB_NENTRIES; | ||
| 97 | |||
| 98 | for (i = 0; i < status; i++) | ||
| 99 | __raw_writel(0x0, MMU_UTLB_ADDRESS_ARRAY | (i << 8)); | ||
| 100 | |||
| 101 | for (i = 0; i < 4; i++) | ||
| 102 | __raw_writel(0x0, MMU_ITLB_ADDRESS_ARRAY | (i << 8)); | ||
| 103 | |||
| 104 | back_to_cached(); | ||
| 105 | ctrl_barrier(); | ||
| 106 | local_irq_restore(flags); | ||
| 107 | } | ||
diff --git a/arch/sh/mm/tlb-sh3.c b/arch/sh/mm/tlb-sh3.c index 4f5f7cbdd508..7a940dbfc2e9 100644 --- a/arch/sh/mm/tlb-sh3.c +++ b/arch/sh/mm/tlb-sh3.c | |||
| @@ -77,3 +77,22 @@ void local_flush_tlb_one(unsigned long asid, unsigned long page) | |||
| 77 | for (i = 0; i < ways; i++) | 77 | for (i = 0; i < ways; i++) |
| 78 | __raw_writel(data, addr + (i << 8)); | 78 | __raw_writel(data, addr + (i << 8)); |
| 79 | } | 79 | } |
| 80 | |||
| 81 | void local_flush_tlb_all(void) | ||
| 82 | { | ||
| 83 | unsigned long flags, status; | ||
| 84 | |||
| 85 | /* | ||
| 86 | * Flush all the TLB. | ||
| 87 | * | ||
| 88 | * Write to the MMU control register's bit: | ||
| 89 | * TF-bit for SH-3, TI-bit for SH-4. | ||
| 90 | * It's same position, bit #2. | ||
| 91 | */ | ||
| 92 | local_irq_save(flags); | ||
| 93 | status = __raw_readl(MMUCR); | ||
| 94 | status |= 0x04; | ||
| 95 | __raw_writel(status, MMUCR); | ||
| 96 | ctrl_barrier(); | ||
| 97 | local_irq_restore(flags); | ||
| 98 | } | ||
diff --git a/arch/sh/mm/tlb-sh4.c b/arch/sh/mm/tlb-sh4.c index ccac77f504a8..cfdf7930d294 100644 --- a/arch/sh/mm/tlb-sh4.c +++ b/arch/sh/mm/tlb-sh4.c | |||
| @@ -80,3 +80,31 @@ void local_flush_tlb_one(unsigned long asid, unsigned long page) | |||
| 80 | __raw_writel(data, addr); | 80 | __raw_writel(data, addr); |
| 81 | back_to_cached(); | 81 | back_to_cached(); |
| 82 | } | 82 | } |
| 83 | |||
| 84 | void local_flush_tlb_all(void) | ||
| 85 | { | ||
| 86 | unsigned long flags, status; | ||
| 87 | int i; | ||
| 88 | |||
| 89 | /* | ||
| 90 | * Flush all the TLB. | ||
| 91 | */ | ||
| 92 | local_irq_save(flags); | ||
| 93 | jump_to_uncached(); | ||
| 94 | |||
| 95 | status = __raw_readl(MMUCR); | ||
| 96 | status = ((status & MMUCR_URB) >> MMUCR_URB_SHIFT); | ||
| 97 | |||
| 98 | if (status == 0) | ||
| 99 | status = MMUCR_URB_NENTRIES; | ||
| 100 | |||
| 101 | for (i = 0; i < status; i++) | ||
| 102 | __raw_writel(0x0, MMU_UTLB_ADDRESS_ARRAY | (i << 8)); | ||
| 103 | |||
| 104 | for (i = 0; i < 4; i++) | ||
| 105 | __raw_writel(0x0, MMU_ITLB_ADDRESS_ARRAY | (i << 8)); | ||
| 106 | |||
| 107 | back_to_cached(); | ||
| 108 | ctrl_barrier(); | ||
| 109 | local_irq_restore(flags); | ||
| 110 | } | ||
diff --git a/arch/sh/mm/tlb-urb.c b/arch/sh/mm/tlb-urb.c index bb5b9098956d..c92ce20db39b 100644 --- a/arch/sh/mm/tlb-urb.c +++ b/arch/sh/mm/tlb-urb.c | |||
| @@ -24,13 +24,9 @@ void tlb_wire_entry(struct vm_area_struct *vma, unsigned long addr, pte_t pte) | |||
| 24 | 24 | ||
| 25 | local_irq_save(flags); | 25 | local_irq_save(flags); |
| 26 | 26 | ||
| 27 | /* Load the entry into the TLB */ | ||
| 28 | __update_tlb(vma, addr, pte); | ||
| 29 | |||
| 30 | /* ... and wire it up. */ | ||
| 31 | status = __raw_readl(MMUCR); | 27 | status = __raw_readl(MMUCR); |
| 32 | urb = (status & MMUCR_URB) >> MMUCR_URB_SHIFT; | 28 | urb = (status & MMUCR_URB) >> MMUCR_URB_SHIFT; |
| 33 | status &= ~MMUCR_URB; | 29 | status &= ~MMUCR_URC; |
| 34 | 30 | ||
| 35 | /* | 31 | /* |
| 36 | * Make sure we're not trying to wire the last TLB entry slot. | 32 | * Make sure we're not trying to wire the last TLB entry slot. |
| @@ -39,7 +35,23 @@ void tlb_wire_entry(struct vm_area_struct *vma, unsigned long addr, pte_t pte) | |||
| 39 | 35 | ||
| 40 | urb = urb % MMUCR_URB_NENTRIES; | 36 | urb = urb % MMUCR_URB_NENTRIES; |
| 41 | 37 | ||
| 38 | /* | ||
| 39 | * Insert this entry into the highest non-wired TLB slot (via | ||
| 40 | * the URC field). | ||
| 41 | */ | ||
| 42 | status |= (urb << MMUCR_URC_SHIFT); | ||
| 43 | __raw_writel(status, MMUCR); | ||
| 44 | ctrl_barrier(); | ||
| 45 | |||
| 46 | /* Load the entry into the TLB */ | ||
| 47 | __update_tlb(vma, addr, pte); | ||
| 48 | |||
| 49 | /* ... and wire it up. */ | ||
| 50 | status = __raw_readl(MMUCR); | ||
| 51 | |||
| 52 | status &= ~MMUCR_URB; | ||
| 42 | status |= (urb << MMUCR_URB_SHIFT); | 53 | status |= (urb << MMUCR_URB_SHIFT); |
| 54 | |||
| 43 | __raw_writel(status, MMUCR); | 55 | __raw_writel(status, MMUCR); |
| 44 | ctrl_barrier(); | 56 | ctrl_barrier(); |
| 45 | 57 | ||
diff --git a/arch/sh/mm/tlbflush_32.c b/arch/sh/mm/tlbflush_32.c index 77dc5efa7127..3fbe03ce8fe3 100644 --- a/arch/sh/mm/tlbflush_32.c +++ b/arch/sh/mm/tlbflush_32.c | |||
| @@ -119,31 +119,3 @@ void local_flush_tlb_mm(struct mm_struct *mm) | |||
| 119 | local_irq_restore(flags); | 119 | local_irq_restore(flags); |
| 120 | } | 120 | } |
| 121 | } | 121 | } |
| 122 | |||
| 123 | void local_flush_tlb_all(void) | ||
| 124 | { | ||
| 125 | unsigned long flags, status; | ||
| 126 | int i; | ||
| 127 | |||
| 128 | /* | ||
| 129 | * Flush all the TLB. | ||
| 130 | */ | ||
| 131 | local_irq_save(flags); | ||
| 132 | jump_to_uncached(); | ||
| 133 | |||
| 134 | status = __raw_readl(MMUCR); | ||
| 135 | status = ((status & MMUCR_URB) >> MMUCR_URB_SHIFT); | ||
| 136 | |||
| 137 | if (status == 0) | ||
| 138 | status = MMUCR_URB_NENTRIES; | ||
| 139 | |||
| 140 | for (i = 0; i < status; i++) | ||
| 141 | __raw_writel(0x0, MMU_UTLB_ADDRESS_ARRAY | (i << 8)); | ||
| 142 | |||
| 143 | for (i = 0; i < 4; i++) | ||
| 144 | __raw_writel(0x0, MMU_ITLB_ADDRESS_ARRAY | (i << 8)); | ||
| 145 | |||
| 146 | back_to_cached(); | ||
| 147 | ctrl_barrier(); | ||
| 148 | local_irq_restore(flags); | ||
| 149 | } | ||
