aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/DocBook/sh.tmpl10
-rw-r--r--arch/sh/Kconfig36
-rw-r--r--arch/sh/Makefile1
-rw-r--r--arch/sh/boards/board-urquell.c3
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c26
-rw-r--r--arch/sh/boards/mach-highlander/setup.c12
-rw-r--r--arch/sh/boards/mach-sdk7786/setup.c17
-rw-r--r--arch/sh/boards/mach-se/7724/setup.c20
-rw-r--r--arch/sh/boards/mach-x3proto/setup.c7
-rw-r--r--arch/sh/boot/compressed/Makefile6
-rw-r--r--arch/sh/boot/compressed/head_32.S4
-rw-r--r--arch/sh/configs/ap325rxa_defconfig56
-rw-r--r--arch/sh/configs/cayman_defconfig46
-rw-r--r--arch/sh/configs/dreamcast_defconfig29
-rw-r--r--arch/sh/configs/ecovec24-romimage_defconfig54
-rw-r--r--arch/sh/configs/ecovec24_defconfig7
-rw-r--r--arch/sh/configs/edosk7705_defconfig21
-rw-r--r--arch/sh/configs/edosk7760_defconfig38
-rw-r--r--arch/sh/configs/espt_defconfig42
-rw-r--r--arch/sh/configs/hp6xx_defconfig24
-rw-r--r--arch/sh/configs/kfr2r09-romimage_defconfig50
-rw-r--r--arch/sh/configs/kfr2r09_defconfig57
-rw-r--r--arch/sh/configs/landisk_defconfig45
-rw-r--r--arch/sh/configs/lboxre2_defconfig35
-rw-r--r--arch/sh/configs/magicpanelr2_defconfig28
-rw-r--r--arch/sh/configs/microdev_defconfig23
-rw-r--r--arch/sh/configs/migor_defconfig60
-rw-r--r--arch/sh/configs/polaris_defconfig31
-rw-r--r--arch/sh/configs/r7780mp_defconfig72
-rw-r--r--arch/sh/configs/r7785rp_defconfig76
-rw-r--r--arch/sh/configs/rsk7201_defconfig31
-rw-r--r--arch/sh/configs/rsk7203_defconfig49
-rw-r--r--arch/sh/configs/rts7751r2d1_defconfig54
-rw-r--r--arch/sh/configs/rts7751r2dplus_defconfig54
-rw-r--r--arch/sh/configs/sdk7780_defconfig53
-rw-r--r--arch/sh/configs/sdk7786_defconfig644
-rw-r--r--arch/sh/configs/se7206_defconfig38
-rw-r--r--arch/sh/configs/se7343_defconfig53
-rw-r--r--arch/sh/configs/se7619_defconfig22
-rw-r--r--arch/sh/configs/se7705_defconfig25
-rw-r--r--arch/sh/configs/se7712_defconfig28
-rw-r--r--arch/sh/configs/se7721_defconfig40
-rw-r--r--arch/sh/configs/se7722_defconfig29
-rw-r--r--arch/sh/configs/se7724_defconfig78
-rw-r--r--arch/sh/configs/se7750_defconfig24
-rw-r--r--arch/sh/configs/se7751_defconfig25
-rw-r--r--arch/sh/configs/se7780_defconfig39
-rw-r--r--arch/sh/configs/sh03_defconfig43
-rw-r--r--arch/sh/configs/sh7710voipgw_defconfig29
-rw-r--r--arch/sh/configs/sh7724_generic_defconfig58
-rw-r--r--arch/sh/configs/sh7763rdp_defconfig45
-rw-r--r--arch/sh/configs/sh7770_generic_defconfig54
-rw-r--r--arch/sh/configs/sh7785lcr_32bit_defconfig75
-rw-r--r--arch/sh/configs/sh7785lcr_defconfig62
-rw-r--r--arch/sh/configs/shmin_defconfig23
-rw-r--r--arch/sh/configs/shx3_defconfig67
-rw-r--r--arch/sh/configs/snapgear_defconfig31
-rw-r--r--arch/sh/configs/systemh_defconfig23
-rw-r--r--arch/sh/configs/titan_defconfig49
-rw-r--r--arch/sh/configs/ul2_defconfig38
-rw-r--r--arch/sh/configs/urquell_defconfig82
-rw-r--r--arch/sh/include/asm/cache.h4
-rw-r--r--arch/sh/include/asm/clkdev.h35
-rw-r--r--arch/sh/include/asm/clock.h161
-rw-r--r--arch/sh/include/asm/dmaengine.h63
-rw-r--r--arch/sh/include/asm/hw_breakpoint.h1
-rw-r--r--arch/sh/include/asm/hwblk.h12
-rw-r--r--arch/sh/include/asm/io_generic.h1
-rw-r--r--arch/sh/include/asm/irq.h19
-rw-r--r--arch/sh/include/asm/kexec.h8
-rw-r--r--arch/sh/include/asm/machvec.h2
-rw-r--r--arch/sh/include/asm/mmzone.h3
-rw-r--r--arch/sh/include/asm/page.h15
-rw-r--r--arch/sh/include/asm/processor.h7
-rw-r--r--arch/sh/include/asm/processor_32.h2
-rw-r--r--arch/sh/include/asm/setup.h1
-rw-r--r--arch/sh/include/asm/siu.h8
-rw-r--r--arch/sh/include/asm/smp-ops.h51
-rw-r--r--arch/sh/include/asm/smp.h40
-rw-r--r--arch/sh/include/cpu-sh4/cpu/dma-register.h3
-rw-r--r--arch/sh/include/cpu-sh4/cpu/mmu_context.h18
-rw-r--r--arch/sh/include/mach-sdk7786/mach/fpga.h9
-rw-r--r--arch/sh/kernel/Makefile2
-rw-r--r--arch/sh/kernel/clkdev.c169
-rw-r--r--arch/sh/kernel/cpu/Makefile2
-rw-r--r--arch/sh/kernel/cpu/clock-cpg.c312
-rw-r--r--arch/sh/kernel/cpu/clock.c630
-rw-r--r--arch/sh/kernel/cpu/hwblk.c5
-rw-r--r--arch/sh/kernel/cpu/init.c24
-rw-r--r--arch/sh/kernel/cpu/sh2/probe.c5
-rw-r--r--arch/sh/kernel/cpu/sh2/setup-sh7619.c6
-rw-r--r--arch/sh/kernel/cpu/sh2a/probe.c4
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-mxg.c9
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7201.c9
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7203.c12
-rw-r--r--arch/sh/kernel/cpu/sh2a/setup-sh7206.c15
-rw-r--r--arch/sh/kernel/cpu/sh3/probe.c4
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7705.c9
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh770x.c9
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7710.c9
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7720.c24
-rw-r--r--arch/sh/kernel/cpu/sh4/clock-sh4-202.c17
-rw-r--r--arch/sh/kernel/cpu/sh4/probe.c4
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh4-202.c9
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh7750.c15
-rw-r--r--arch/sh/kernel/cpu/sh4/setup-sh7760.c9
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7343.c231
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7366.c210
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7722.c177
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7723.c279
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7724.c295
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7757.c11
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7763.c12
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7780.c12
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7785.c176
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7786.c223
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-shx3.c13
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7343.c16
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7366.c13
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7722.c21
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7723.c27
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7724.c81
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7757.c6
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7763.c18
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7770.c27
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7780.c24
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7785.c30
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7786.c157
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-shx3.c18
-rw-r--r--arch/sh/kernel/cpu/sh4a/smp-shx3.c74
-rw-r--r--arch/sh/kernel/cpu/sh5/probe.c4
-rw-r--r--arch/sh/kernel/cpu/sh5/setup-sh5.c9
-rw-r--r--arch/sh/kernel/crash_dump.c20
-rw-r--r--arch/sh/kernel/dwarf.c1
-rw-r--r--arch/sh/kernel/head_32.S7
-rw-r--r--arch/sh/kernel/hw_breakpoint.c5
-rw-r--r--arch/sh/kernel/idle.c8
-rw-r--r--arch/sh/kernel/irq.c91
-rw-r--r--arch/sh/kernel/localtimer.c6
-rw-r--r--arch/sh/kernel/machine_kexec.c62
-rw-r--r--arch/sh/kernel/machvec.c1
-rw-r--r--arch/sh/kernel/process.c2
-rw-r--r--arch/sh/kernel/setup.c298
-rw-r--r--arch/sh/kernel/smp.c160
-rw-r--r--arch/sh/kernel/topology.c6
-rw-r--r--arch/sh/kernel/traps_64.c5
-rw-r--r--arch/sh/mm/Makefile9
-rw-r--r--arch/sh/mm/cache-shx3.c44
-rw-r--r--arch/sh/mm/cache.c7
-rw-r--r--arch/sh/mm/fault_32.c14
-rw-r--r--arch/sh/mm/init.c173
-rw-r--r--arch/sh/mm/numa.c38
-rw-r--r--arch/sh/mm/pmb.c4
-rw-r--r--arch/sh/mm/tlb-debugfs.c179
-rw-r--r--arch/sh/mm/tlbflush_64.c20
-rw-r--r--drivers/base/platform.c20
-rw-r--r--drivers/clocksource/sh_cmt.c45
-rw-r--r--drivers/clocksource/sh_mtu2.c37
-rw-r--r--drivers/clocksource/sh_tmu.c41
-rw-r--r--drivers/dma/shdma.c25
-rw-r--r--drivers/dma/shdma.h4
-rw-r--r--drivers/serial/sh-sci.c189
-rw-r--r--drivers/sh/Kconfig24
-rw-r--r--drivers/sh/Makefile2
-rw-r--r--drivers/sh/clk-cpg.c298
-rw-r--r--drivers/sh/clk.c545
-rw-r--r--drivers/sh/intc.c333
-rw-r--r--include/linux/device.h4
-rw-r--r--include/linux/serial_sci.h4
-rw-r--r--include/linux/sh_clk.h150
-rw-r--r--include/linux/sh_dma.h102
-rw-r--r--include/linux/sh_intc.h26
172 files changed, 6107 insertions, 3743 deletions
diff --git a/Documentation/DocBook/sh.tmpl b/Documentation/DocBook/sh.tmpl
index 0c3dc4c69dd..d858d92cf6d 100644
--- a/Documentation/DocBook/sh.tmpl
+++ b/Documentation/DocBook/sh.tmpl
@@ -19,13 +19,17 @@
19 </authorgroup> 19 </authorgroup>
20 20
21 <copyright> 21 <copyright>
22 <year>2008</year> 22 <year>2008-2010</year>
23 <holder>Paul Mundt</holder> 23 <holder>Paul Mundt</holder>
24 </copyright> 24 </copyright>
25 <copyright> 25 <copyright>
26 <year>2008</year> 26 <year>2008-2010</year>
27 <holder>Renesas Technology Corp.</holder> 27 <holder>Renesas Technology Corp.</holder>
28 </copyright> 28 </copyright>
29 <copyright>
30 <year>2010</year>
31 <holder>Renesas Electronics Corp.</holder>
32 </copyright>
29 33
30 <legalnotice> 34 <legalnotice>
31 <para> 35 <para>
@@ -77,7 +81,7 @@
77 </chapter> 81 </chapter>
78 <chapter id="clk"> 82 <chapter id="clk">
79 <title>Clock Framework Extensions</title> 83 <title>Clock Framework Extensions</title>
80!Iarch/sh/include/asm/clock.h 84!Iinclude/linux/sh_clk.h
81 </chapter> 85 </chapter>
82 <chapter id="mach"> 86 <chapter id="mach">
83 <title>Machine Specific Interfaces</title> 87 <title>Machine Specific Interfaces</title>
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index e6d8ab5cfa9..0e318c905ee 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -158,7 +158,6 @@ config LOCKDEP_SUPPORT
158 158
159config HAVE_LATENCYTOP_SUPPORT 159config HAVE_LATENCYTOP_SUPPORT
160 def_bool y 160 def_bool y
161 depends on !SMP
162 161
163config ARCH_HAS_ILOG2_U32 162config ARCH_HAS_ILOG2_U32
164 def_bool n 163 def_bool n
@@ -238,6 +237,8 @@ config CPU_SHX2
238config CPU_SHX3 237config CPU_SHX3
239 bool 238 bool
240 select DMA_COHERENT 239 select DMA_COHERENT
240 select SYS_SUPPORTS_SMP
241 select SYS_SUPPORTS_NUMA
241 242
242config ARCH_SHMOBILE 243config ARCH_SHMOBILE
243 bool 244 bool
@@ -454,18 +455,12 @@ config CPU_SUBTYPE_SH7786
454 select CPU_SH4A 455 select CPU_SH4A
455 select CPU_SHX3 456 select CPU_SHX3
456 select CPU_HAS_PTEAEX 457 select CPU_HAS_PTEAEX
457 select ARCH_SPARSEMEM_ENABLE
458 select SYS_SUPPORTS_NUMA
459 select SYS_SUPPORTS_SMP
460 select GENERIC_CLOCKEVENTS_BROADCAST if SMP 458 select GENERIC_CLOCKEVENTS_BROADCAST if SMP
461 459
462config CPU_SUBTYPE_SHX3 460config CPU_SUBTYPE_SHX3
463 bool "Support SH-X3 processor" 461 bool "Support SH-X3 processor"
464 select CPU_SH4A 462 select CPU_SH4A
465 select CPU_SHX3 463 select CPU_SHX3
466 select ARCH_SPARSEMEM_ENABLE
467 select SYS_SUPPORTS_NUMA
468 select SYS_SUPPORTS_SMP
469 select GENERIC_CLOCKEVENTS_BROADCAST if SMP 464 select GENERIC_CLOCKEVENTS_BROADCAST if SMP
470 465
471# SH4AL-DSP Processor Support 466# SH4AL-DSP Processor Support
@@ -635,7 +630,7 @@ config KEXEC
635 630
636config CRASH_DUMP 631config CRASH_DUMP
637 bool "kernel crash dumps (EXPERIMENTAL)" 632 bool "kernel crash dumps (EXPERIMENTAL)"
638 depends on SUPERH32 && EXPERIMENTAL 633 depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP
639 help 634 help
640 Generate crash dump after being started by kexec. 635 Generate crash dump after being started by kexec.
641 This should be normally only set in special crash dump kernels 636 This should be normally only set in special crash dump kernels
@@ -707,6 +702,13 @@ config NR_CPUS
707 This is purely to save memory - each supported CPU adds 702 This is purely to save memory - each supported CPU adds
708 approximately eight kilobytes to the kernel image. 703 approximately eight kilobytes to the kernel image.
709 704
705config HOTPLUG_CPU
706 bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
707 depends on SMP && HOTPLUG && EXPERIMENTAL
708 help
709 Say Y here to experiment with turning CPUs off and on. CPUs
710 can be controlled through /sys/devices/system/cpu.
711
710source "kernel/Kconfig.preempt" 712source "kernel/Kconfig.preempt"
711 713
712config GUSA 714config GUSA
@@ -733,6 +735,8 @@ config GUSA_RB
733 LLSC, this should be more efficient than the other alternative of 735 LLSC, this should be more efficient than the other alternative of
734 disabling interrupts around the atomic sequence. 736 disabling interrupts around the atomic sequence.
735 737
738source "drivers/sh/Kconfig"
739
736endmenu 740endmenu
737 741
738menu "Boot options" 742menu "Boot options"
@@ -864,4 +868,20 @@ source "security/Kconfig"
864 868
865source "crypto/Kconfig" 869source "crypto/Kconfig"
866 870
871menuconfig VIRTUALIZATION
872 bool "Virtualization"
873 default n
874 ---help---
875 Say Y here to get to see options for using your Linux host to run other
876 operating systems inside virtual machines (guests).
877 This option alone does not add any kernel code.
878
879 If you say N, all options in this submenu will be skipped and disabled.
880
881if VIRTUALIZATION
882
883source drivers/virtio/Kconfig
884
885endif # VIRTUALIZATION
886
867source "lib/Kconfig" 887source "lib/Kconfig"
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 588579ac2e3..307b3a4a790 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -83,7 +83,6 @@ defaultimage-$(CONFIG_SH_AP325RXA) := uImage
83defaultimage-$(CONFIG_SH_7724_SOLUTION_ENGINE) := uImage 83defaultimage-$(CONFIG_SH_7724_SOLUTION_ENGINE) := uImage
84defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE) := vmlinux 84defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE) := vmlinux
85defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE) := vmlinux 85defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE) := vmlinux
86defaultimage-$(CONFIG_SH_SDK7786) := vmlinux.bin
87 86
88# Set some sensible Kbuild defaults 87# Set some sensible Kbuild defaults
89KBUILD_IMAGE := $(defaultimage-y) 88KBUILD_IMAGE := $(defaultimage-y)
diff --git a/arch/sh/boards/board-urquell.c b/arch/sh/boards/board-urquell.c
index a9bd6e3ee10..d81c609decc 100644
--- a/arch/sh/boards/board-urquell.c
+++ b/arch/sh/boards/board-urquell.c
@@ -24,6 +24,7 @@
24#include <cpu/sh7786.h> 24#include <cpu/sh7786.h>
25#include <asm/heartbeat.h> 25#include <asm/heartbeat.h>
26#include <asm/sizes.h> 26#include <asm/sizes.h>
27#include <asm/smp-ops.h>
27 28
28/* 29/*
29 * bit 1234 5678 30 * bit 1234 5678
@@ -203,6 +204,8 @@ static void __init urquell_setup(char **cmdline_p)
203 printk(KERN_INFO "Renesas Technology Corp. Urquell support.\n"); 204 printk(KERN_INFO "Renesas Technology Corp. Urquell support.\n");
204 205
205 pm_power_off = urquell_power_off; 206 pm_power_off = urquell_power_off;
207
208 register_smp_ops(&shx3_smp_ops);
206} 209}
207 210
208/* 211/*
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 6c13b92742e..62123885a6f 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -710,8 +710,6 @@ static struct clk_ops fsimck_clk_ops = {
710}; 710};
711 711
712static struct clk fsimckb_clk = { 712static struct clk fsimckb_clk = {
713 .name = "fsimckb_clk",
714 .id = -1,
715 .ops = &fsimck_clk_ops, 713 .ops = &fsimck_clk_ops,
716 .enable_reg = (void __iomem *)FCLKBCR, 714 .enable_reg = (void __iomem *)FCLKBCR,
717 .rate = 0, /* unknown */ 715 .rate = 0, /* unknown */
@@ -1138,16 +1136,20 @@ static int __init arch_setup(void)
1138 1136
1139 /* set SPU2 clock to 83.4 MHz */ 1137 /* set SPU2 clock to 83.4 MHz */
1140 clk = clk_get(NULL, "spu_clk"); 1138 clk = clk_get(NULL, "spu_clk");
1141 clk_set_rate(clk, clk_round_rate(clk, 83333333)); 1139 if (clk) {
1142 clk_put(clk); 1140 clk_set_rate(clk, clk_round_rate(clk, 83333333));
1141 clk_put(clk);
1142 }
1143 1143
1144 /* change parent of FSI B */ 1144 /* change parent of FSI B */
1145 clk = clk_get(NULL, "fsib_clk"); 1145 clk = clk_get(NULL, "fsib_clk");
1146 clk_register(&fsimckb_clk); 1146 if (clk) {
1147 clk_set_parent(clk, &fsimckb_clk); 1147 clk_register(&fsimckb_clk);
1148 clk_set_rate(clk, 11000); 1148 clk_set_parent(clk, &fsimckb_clk);
1149 clk_set_rate(&fsimckb_clk, 11000); 1149 clk_set_rate(clk, 11000);
1150 clk_put(clk); 1150 clk_set_rate(&fsimckb_clk, 11000);
1151 clk_put(clk);
1152 }
1151 1153
1152 gpio_request(GPIO_PTU0, NULL); 1154 gpio_request(GPIO_PTU0, NULL);
1153 gpio_direction_output(GPIO_PTU0, 0); 1155 gpio_direction_output(GPIO_PTU0, 0);
@@ -1159,8 +1161,10 @@ static int __init arch_setup(void)
1159 1161
1160 /* set VPU clock to 166 MHz */ 1162 /* set VPU clock to 166 MHz */
1161 clk = clk_get(NULL, "vpu_clk"); 1163 clk = clk_get(NULL, "vpu_clk");
1162 clk_set_rate(clk, clk_round_rate(clk, 166000000)); 1164 if (clk) {
1163 clk_put(clk); 1165 clk_set_rate(clk, clk_round_rate(clk, 166000000));
1166 clk_put(clk);
1167 }
1164 1168
1165 /* enable IrDA */ 1169 /* enable IrDA */
1166 gpio_request(GPIO_FN_IRDA_OUT, NULL); 1170 gpio_request(GPIO_FN_IRDA_OUT, NULL);
diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c
index affd66747ba..a5ecfbacaf3 100644
--- a/arch/sh/boards/mach-highlander/setup.c
+++ b/arch/sh/boards/mach-highlander/setup.c
@@ -14,6 +14,7 @@
14 * for more details. 14 * for more details.
15 */ 15 */
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/io.h>
17#include <linux/platform_device.h> 18#include <linux/platform_device.h>
18#include <linux/ata_platform.h> 19#include <linux/ata_platform.h>
19#include <linux/types.h> 20#include <linux/types.h>
@@ -26,6 +27,7 @@
26#include <net/ax88796.h> 27#include <net/ax88796.h>
27#include <asm/machvec.h> 28#include <asm/machvec.h>
28#include <mach/highlander.h> 29#include <mach/highlander.h>
30#include <asm/clkdev.h>
29#include <asm/clock.h> 31#include <asm/clock.h>
30#include <asm/heartbeat.h> 32#include <asm/heartbeat.h>
31#include <asm/io.h> 33#include <asm/io.h>
@@ -326,7 +328,6 @@ static struct clk_ops ivdr_clk_ops = {
326}; 328};
327 329
328static struct clk ivdr_clk = { 330static struct clk ivdr_clk = {
329 .name = "ivdr_clk",
330 .ops = &ivdr_clk_ops, 331 .ops = &ivdr_clk_ops,
331}; 332};
332 333
@@ -334,6 +335,13 @@ static struct clk *r7780rp_clocks[] = {
334 &ivdr_clk, 335 &ivdr_clk,
335}; 336};
336 337
338#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
339
340static struct clk_lookup lookups[] = {
341 /* main clocks */
342 CLKDEV_CON_ID("ivdr_clk", &ivdr_clk),
343};
344
337static void r7780rp_power_off(void) 345static void r7780rp_power_off(void)
338{ 346{
339 if (mach_is_r7780mp() || mach_is_r7785rp()) 347 if (mach_is_r7780mp() || mach_is_r7785rp())
@@ -370,6 +378,8 @@ static void __init highlander_setup(char **cmdline_p)
370 clk_enable(clk); 378 clk_enable(clk);
371 } 379 }
372 380
381 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
382
373 __raw_writew(0x0000, PA_OBLED); /* Clear LED. */ 383 __raw_writew(0x0000, PA_OBLED); /* Clear LED. */
374 384
375 if (mach_is_r7780rp()) 385 if (mach_is_r7780rp())
diff --git a/arch/sh/boards/mach-sdk7786/setup.c b/arch/sh/boards/mach-sdk7786/setup.c
index f094ea2ee78..2ec1ea5cf8e 100644
--- a/arch/sh/boards/mach-sdk7786/setup.c
+++ b/arch/sh/boards/mach-sdk7786/setup.c
@@ -21,6 +21,7 @@
21#include <asm/heartbeat.h> 21#include <asm/heartbeat.h>
22#include <asm/sizes.h> 22#include <asm/sizes.h>
23#include <asm/reboot.h> 23#include <asm/reboot.h>
24#include <asm/smp-ops.h>
24 25
25static struct resource heartbeat_resource = { 26static struct resource heartbeat_resource = {
26 .start = 0x07fff8b0, 27 .start = 0x07fff8b0,
@@ -165,6 +166,19 @@ static void sdk7786_restart(char *cmd)
165 fpga_write_reg(0xa5a5, SRSTR); 166 fpga_write_reg(0xa5a5, SRSTR);
166} 167}
167 168
169static void sdk7786_power_off(void)
170{
171 fpga_write_reg(fpga_read_reg(PWRCR) | PWRCR_PDWNREQ, PWRCR);
172
173 /*
174 * It can take up to 20us for the R8C to do its job, back off and
175 * wait a bit until we've been shut off. Even though newer FPGA
176 * versions don't set the ACK bit, the latency issue remains.
177 */
178 while ((fpga_read_reg(PWRCR) & PWRCR_PDWNACK) == 0)
179 cpu_sleep();
180}
181
168/* Initialize the board */ 182/* Initialize the board */
169static void __init sdk7786_setup(char **cmdline_p) 183static void __init sdk7786_setup(char **cmdline_p)
170{ 184{
@@ -175,6 +189,9 @@ static void __init sdk7786_setup(char **cmdline_p)
175 pr_info("\tPCB revision:\t%d\n", fpga_read_reg(PCBRR) & 0xf); 189 pr_info("\tPCB revision:\t%d\n", fpga_read_reg(PCBRR) & 0xf);
176 190
177 machine_ops.restart = sdk7786_restart; 191 machine_ops.restart = sdk7786_restart;
192 pm_power_off = sdk7786_power_off;
193
194 register_smp_ops(&shx3_smp_ops);
178} 195}
179 196
180/* 197/*
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index ccaa290e9ab..e74ae7b0d8b 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -276,8 +276,6 @@ static struct clk_ops fsimck_clk_ops = {
276}; 276};
277 277
278static struct clk fsimcka_clk = { 278static struct clk fsimcka_clk = {
279 .name = "fsimcka_clk",
280 .id = -1,
281 .ops = &fsimck_clk_ops, 279 .ops = &fsimck_clk_ops,
282 .enable_reg = (void __iomem *)FCLKACR, 280 .enable_reg = (void __iomem *)FCLKACR,
283 .rate = 0, /* unknown */ 281 .rate = 0, /* unknown */
@@ -771,16 +769,20 @@ static int __init devices_setup(void)
771 769
772 /* set SPU2 clock to 83.4 MHz */ 770 /* set SPU2 clock to 83.4 MHz */
773 clk = clk_get(NULL, "spu_clk"); 771 clk = clk_get(NULL, "spu_clk");
774 clk_set_rate(clk, clk_round_rate(clk, 83333333)); 772 if (clk) {
775 clk_put(clk); 773 clk_set_rate(clk, clk_round_rate(clk, 83333333));
774 clk_put(clk);
775 }
776 776
777 /* change parent of FSI A */ 777 /* change parent of FSI A */
778 clk = clk_get(NULL, "fsia_clk"); 778 clk = clk_get(NULL, "fsia_clk");
779 clk_register(&fsimcka_clk); 779 if (clk) {
780 clk_set_parent(clk, &fsimcka_clk); 780 clk_register(&fsimcka_clk);
781 clk_set_rate(clk, 11000); 781 clk_set_parent(clk, &fsimcka_clk);
782 clk_set_rate(&fsimcka_clk, 11000); 782 clk_set_rate(clk, 11000);
783 clk_put(clk); 783 clk_set_rate(&fsimcka_clk, 11000);
784 clk_put(clk);
785 }
784 786
785 /* SDHI0 connected to cn7 */ 787 /* SDHI0 connected to cn7 */
786 gpio_request(GPIO_FN_SDHI0CD, NULL); 788 gpio_request(GPIO_FN_SDHI0CD, NULL);
diff --git a/arch/sh/boards/mach-x3proto/setup.c b/arch/sh/boards/mach-x3proto/setup.c
index e284592fd42..102bf56befb 100644
--- a/arch/sh/boards/mach-x3proto/setup.c
+++ b/arch/sh/boards/mach-x3proto/setup.c
@@ -19,6 +19,7 @@
19#include <linux/usb/r8a66597.h> 19#include <linux/usb/r8a66597.h>
20#include <linux/usb/m66592.h> 20#include <linux/usb/m66592.h>
21#include <asm/ilsel.h> 21#include <asm/ilsel.h>
22#include <asm/smp-ops.h>
22 23
23static struct resource heartbeat_resources[] = { 24static struct resource heartbeat_resources[] = {
24 [0] = { 25 [0] = {
@@ -152,7 +153,13 @@ static void __init x3proto_init_irq(void)
152 __raw_writel(__raw_readl(0xfe410000) | (1 << 21), 0xfe410000); 153 __raw_writel(__raw_readl(0xfe410000) | (1 << 21), 0xfe410000);
153} 154}
154 155
156static void __init x3proto_setup(char **cmdline_p)
157{
158 register_smp_ops(&shx3_smp_ops);
159}
160
155static struct sh_machine_vector mv_x3proto __initmv = { 161static struct sh_machine_vector mv_x3proto __initmv = {
156 .mv_name = "x3proto", 162 .mv_name = "x3proto",
163 .mv_setup = x3proto_setup,
157 .mv_init_irq = x3proto_init_irq, 164 .mv_init_irq = x3proto_init_irq,
158}; 165};
diff --git a/arch/sh/boot/compressed/Makefile b/arch/sh/boot/compressed/Makefile
index 5d660b90943..cfa5a087a88 100644
--- a/arch/sh/boot/compressed/Makefile
+++ b/arch/sh/boot/compressed/Makefile
@@ -14,10 +14,16 @@ OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o
14# 14#
15# IMAGE_OFFSET is the load offset of the compression loader 15# IMAGE_OFFSET is the load offset of the compression loader
16# 16#
17ifeq ($(CONFIG_32BIT),y)
18IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \
19 $$[$(CONFIG_MEMORY_START) + \
20 $(CONFIG_BOOT_LINK_OFFSET)]')
21else
17IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \ 22IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \
18 $$[$(CONFIG_PAGE_OFFSET) + \ 23 $$[$(CONFIG_PAGE_OFFSET) + \
19 $(KERNEL_MEMORY) + \ 24 $(KERNEL_MEMORY) + \
20 $(CONFIG_BOOT_LINK_OFFSET)]') 25 $(CONFIG_BOOT_LINK_OFFSET)]')
26endif
21 27
22LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) 28LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
23 29
diff --git a/arch/sh/boot/compressed/head_32.S b/arch/sh/boot/compressed/head_32.S
index 02a30935f0b..200c1d4f1ef 100644
--- a/arch/sh/boot/compressed/head_32.S
+++ b/arch/sh/boot/compressed/head_32.S
@@ -97,7 +97,11 @@ init_stack_addr:
97decompress_kernel_addr: 97decompress_kernel_addr:
98 .long decompress_kernel 98 .long decompress_kernel
99kernel_start_addr: 99kernel_start_addr:
100#ifdef CONFIG_32BIT
101 .long ___pa(_text+PAGE_SIZE)
102#else
100 .long _text+PAGE_SIZE 103 .long _text+PAGE_SIZE
104#endif
101 105
102 .align 9 106 .align 9
103fake_headers_as_bzImage: 107fake_headers_as_bzImage:
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig
index 8931a60e37a..7fefa2b9e28 100644
--- a/arch/sh/configs/ap325rxa_defconfig
+++ b/arch/sh/configs/ap325rxa_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-rc5
4# Mon Jan 4 11:10:59 2010 4# Tue May 18 15:04:35 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION=""
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_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
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -71,11 +74,6 @@ 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
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
79# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -107,7 +105,7 @@ CONFIG_PERF_USE_VMALLOC=y
107# 105#
108# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
109# 107#
110# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
112CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
@@ -116,13 +114,13 @@ CONFIG_SLAB=y
116# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
118CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_IOREMAP_PROT=y
120CONFIG_HAVE_KPROBES=y 117CONFIG_HAVE_KPROBES=y
121CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
122CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
124CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
125CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
126 124
127# 125#
128# GCOV-based kernel profiling 126# GCOV-based kernel profiling
@@ -237,8 +235,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_MEMORY_START=0x08000000 235CONFIG_MEMORY_START=0x08000000
238CONFIG_MEMORY_SIZE=0x08000000 236CONFIG_MEMORY_SIZE=0x08000000
239CONFIG_29BIT=y 237CONFIG_29BIT=y
240# CONFIG_PMB_ENABLE is not set 238# CONFIG_PMB is not set
241# CONFIG_X2TLB is not set 239CONFIG_X2TLB=y
242CONFIG_VSYSCALL=y 240CONFIG_VSYSCALL=y
243CONFIG_ARCH_FLATMEM_ENABLE=y 241CONFIG_ARCH_FLATMEM_ENABLE=y
244CONFIG_ARCH_SPARSEMEM_ENABLE=y 242CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -246,6 +244,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
246CONFIG_MAX_ACTIVE_REGIONS=1 244CONFIG_MAX_ACTIVE_REGIONS=1
247CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_ARCH_SELECT_MEMORY_MODEL=y 246CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_IOREMAP_FIXED=y
248CONFIG_UNCACHED_MAPPING=y
249CONFIG_PAGE_SIZE_4KB=y 249CONFIG_PAGE_SIZE_4KB=y
250# CONFIG_PAGE_SIZE_8KB is not set 250# CONFIG_PAGE_SIZE_8KB is not set
251# CONFIG_PAGE_SIZE_16KB is not set 251# CONFIG_PAGE_SIZE_16KB is not set
@@ -261,7 +261,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 261CONFIG_SPLIT_PTLOCK_CPUS=4
262# CONFIG_PHYS_ADDR_T_64BIT is not set 262# CONFIG_PHYS_ADDR_T_64BIT is not set
263CONFIG_ZONE_DMA_FLAG=0 263CONFIG_ZONE_DMA_FLAG=0
264CONFIG_NR_QUICK=2 264CONFIG_NR_QUICK=1
265# CONFIG_KSM is not set 265# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267 267
@@ -335,7 +335,7 @@ CONFIG_SECCOMP=y
335# CONFIG_PREEMPT_VOLUNTARY is not set 335# CONFIG_PREEMPT_VOLUNTARY is not set
336CONFIG_PREEMPT=y 336CONFIG_PREEMPT=y
337CONFIG_GUSA=y 337CONFIG_GUSA=y
338# CONFIG_SPARSE_IRQ is not set 338# CONFIG_INTC_USERIMASK is not set
339 339
340# 340#
341# Boot options 341# Boot options
@@ -371,6 +371,7 @@ CONFIG_SUSPEND=y
371CONFIG_SUSPEND_FREEZER=y 371CONFIG_SUSPEND_FREEZER=y
372# CONFIG_HIBERNATION is not set 372# CONFIG_HIBERNATION is not set
373CONFIG_PM_RUNTIME=y 373CONFIG_PM_RUNTIME=y
374CONFIG_PM_OPS=y
374# CONFIG_CPU_IDLE is not set 375# CONFIG_CPU_IDLE is not set
375CONFIG_NET=y 376CONFIG_NET=y
376 377
@@ -378,7 +379,6 @@ CONFIG_NET=y
378# Networking options 379# Networking options
379# 380#
380CONFIG_PACKET=y 381CONFIG_PACKET=y
381# CONFIG_PACKET_MMAP is not set
382CONFIG_UNIX=y 382CONFIG_UNIX=y
383# CONFIG_NET_KEY is not set 383# CONFIG_NET_KEY is not set
384CONFIG_INET=y 384CONFIG_INET=y
@@ -594,6 +594,7 @@ CONFIG_MISC_DEVICES=y
594# CONFIG_ICS932S401 is not set 594# CONFIG_ICS932S401 is not set
595# CONFIG_ENCLOSURE_SERVICES is not set 595# CONFIG_ENCLOSURE_SERVICES is not set
596# CONFIG_ISL29003 is not set 596# CONFIG_ISL29003 is not set
597# CONFIG_SENSORS_TSL2550 is not set
597# CONFIG_DS1682 is not set 598# CONFIG_DS1682 is not set
598# CONFIG_TI_DAC7512 is not set 599# CONFIG_TI_DAC7512 is not set
599# CONFIG_C2PORT is not set 600# CONFIG_C2PORT is not set
@@ -613,6 +614,7 @@ CONFIG_HAVE_IDE=y
613# 614#
614# SCSI device support 615# SCSI device support
615# 616#
617CONFIG_SCSI_MOD=y
616# CONFIG_RAID_ATTRS is not set 618# CONFIG_RAID_ATTRS is not set
617CONFIG_SCSI=y 619CONFIG_SCSI=y
618CONFIG_SCSI_DMA=y 620CONFIG_SCSI_DMA=y
@@ -774,6 +776,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
774CONFIG_SERIAL_SH_SCI_CONSOLE=y 776CONFIG_SERIAL_SH_SCI_CONSOLE=y
775CONFIG_SERIAL_CORE=y 777CONFIG_SERIAL_CORE=y
776CONFIG_SERIAL_CORE_CONSOLE=y 778CONFIG_SERIAL_CORE_CONSOLE=y
779# CONFIG_SERIAL_TIMBERDALE is not set
777CONFIG_UNIX98_PTYS=y 780CONFIG_UNIX98_PTYS=y
778# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 781# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
779CONFIG_LEGACY_PTYS=y 782CONFIG_LEGACY_PTYS=y
@@ -802,6 +805,7 @@ CONFIG_I2C_HELPER_AUTO=y
802# CONFIG_I2C_OCORES is not set 805# CONFIG_I2C_OCORES is not set
803CONFIG_I2C_SH_MOBILE=y 806CONFIG_I2C_SH_MOBILE=y
804# CONFIG_I2C_SIMTEC is not set 807# CONFIG_I2C_SIMTEC is not set
808# CONFIG_I2C_XILINX is not set
805 809
806# 810#
807# External I2C/SMBus adapter drivers 811# External I2C/SMBus adapter drivers
@@ -814,15 +818,9 @@ CONFIG_I2C_SH_MOBILE=y
814# 818#
815# CONFIG_I2C_PCA_PLATFORM is not set 819# CONFIG_I2C_PCA_PLATFORM is not set
816# CONFIG_I2C_STUB is not set 820# CONFIG_I2C_STUB is not set
817
818#
819# Miscellaneous I2C Chip support
820#
821# CONFIG_SENSORS_TSL2550 is not set
822# CONFIG_I2C_DEBUG_CORE is not set 821# CONFIG_I2C_DEBUG_CORE is not set
823# CONFIG_I2C_DEBUG_ALGO is not set 822# CONFIG_I2C_DEBUG_ALGO is not set
824# CONFIG_I2C_DEBUG_BUS is not set 823# CONFIG_I2C_DEBUG_BUS is not set
825# CONFIG_I2C_DEBUG_CHIP is not set
826CONFIG_SPI=y 824CONFIG_SPI=y
827CONFIG_SPI_MASTER=y 825CONFIG_SPI_MASTER=y
828 826
@@ -853,13 +851,16 @@ CONFIG_GPIOLIB=y
853# 851#
854# Memory mapped GPIO expanders: 852# Memory mapped GPIO expanders:
855# 853#
854# CONFIG_GPIO_IT8761E is not set
856 855
857# 856#
858# I2C GPIO expanders: 857# I2C GPIO expanders:
859# 858#
859# CONFIG_GPIO_MAX7300 is not set
860# CONFIG_GPIO_MAX732X is not set 860# CONFIG_GPIO_MAX732X is not set
861# CONFIG_GPIO_PCA953X is not set 861# CONFIG_GPIO_PCA953X is not set
862# CONFIG_GPIO_PCF857X is not set 862# CONFIG_GPIO_PCF857X is not set
863# CONFIG_GPIO_ADP5588 is not set
863 864
864# 865#
865# PCI GPIO expanders: 866# PCI GPIO expanders:
@@ -891,22 +892,25 @@ CONFIG_SSB_POSSIBLE=y
891# Multifunction device drivers 892# Multifunction device drivers
892# 893#
893# CONFIG_MFD_CORE is not set 894# CONFIG_MFD_CORE is not set
895# CONFIG_MFD_88PM860X is not set
894# CONFIG_MFD_SM501 is not set 896# CONFIG_MFD_SM501 is not set
895# CONFIG_MFD_SH_MOBILE_SDHI is not set 897# CONFIG_MFD_SH_MOBILE_SDHI is not set
896# CONFIG_HTC_PASIC3 is not set 898# CONFIG_HTC_PASIC3 is not set
899# CONFIG_HTC_I2CPLD is not set
897# CONFIG_TPS65010 is not set 900# CONFIG_TPS65010 is not set
898# CONFIG_TWL4030_CORE is not set 901# CONFIG_TWL4030_CORE is not set
899# CONFIG_MFD_TMIO is not set 902# CONFIG_MFD_TMIO is not set
900# CONFIG_PMIC_DA903X is not set 903# CONFIG_PMIC_DA903X is not set
901# CONFIG_PMIC_ADP5520 is not set 904# CONFIG_PMIC_ADP5520 is not set
905# CONFIG_MFD_MAX8925 is not set
902# CONFIG_MFD_WM8400 is not set 906# CONFIG_MFD_WM8400 is not set
903# CONFIG_MFD_WM831X is not set 907# CONFIG_MFD_WM831X is not set
904# CONFIG_MFD_WM8350_I2C is not set 908# CONFIG_MFD_WM8350_I2C is not set
909# CONFIG_MFD_WM8994 is not set
905# CONFIG_MFD_PCF50633 is not set 910# CONFIG_MFD_PCF50633 is not set
906# CONFIG_MFD_MC13783 is not set 911# CONFIG_MFD_MC13783 is not set
907# CONFIG_AB3100_CORE is not set 912# CONFIG_AB3100_CORE is not set
908# CONFIG_EZX_PCAP is not set 913# CONFIG_EZX_PCAP is not set
909# CONFIG_MFD_88PM8607 is not set
910# CONFIG_AB4500_CORE is not set 914# CONFIG_AB4500_CORE is not set
911# CONFIG_REGULATOR is not set 915# CONFIG_REGULATOR is not set
912CONFIG_MEDIA_SUPPORT=y 916CONFIG_MEDIA_SUPPORT=y
@@ -1041,10 +1045,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1041# MMC/SD/SDIO Host Controller Drivers 1045# MMC/SD/SDIO Host Controller Drivers
1042# 1046#
1043# CONFIG_MMC_SDHCI is not set 1047# CONFIG_MMC_SDHCI is not set
1044# CONFIG_MMC_AT91 is not set
1045# CONFIG_MMC_ATMELMCI is not set
1046CONFIG_MMC_SPI=y 1048CONFIG_MMC_SPI=y
1047# CONFIG_MMC_TMIO is not set
1048# CONFIG_MEMSTICK is not set 1049# CONFIG_MEMSTICK is not set
1049# CONFIG_NEW_LEDS is not set 1050# CONFIG_NEW_LEDS is not set
1050# CONFIG_ACCESSIBILITY is not set 1051# CONFIG_ACCESSIBILITY is not set
@@ -1120,8 +1121,6 @@ CONFIG_RTC_DRV_PCF8563=y
1120CONFIG_UIO=y 1121CONFIG_UIO=y
1121# CONFIG_UIO_PDRV is not set 1122# CONFIG_UIO_PDRV is not set
1122CONFIG_UIO_PDRV_GENIRQ=y 1123CONFIG_UIO_PDRV_GENIRQ=y
1123# CONFIG_UIO_SMX is not set
1124# CONFIG_UIO_SERCOS3 is not set
1125 1124
1126# 1125#
1127# TI VLYNQ 1126# TI VLYNQ
@@ -1206,6 +1205,7 @@ CONFIG_MISC_FILESYSTEMS=y
1206# CONFIG_EFS_FS is not set 1205# CONFIG_EFS_FS is not set
1207# CONFIG_JFFS2_FS is not set 1206# CONFIG_JFFS2_FS is not set
1208# CONFIG_UBIFS_FS is not set 1207# CONFIG_UBIFS_FS is not set
1208# CONFIG_LOGFS is not set
1209# CONFIG_CRAMFS is not set 1209# CONFIG_CRAMFS is not set
1210# CONFIG_SQUASHFS is not set 1210# CONFIG_SQUASHFS is not set
1211# CONFIG_VXFS_FS is not set 1211# CONFIG_VXFS_FS is not set
@@ -1234,6 +1234,7 @@ CONFIG_SUNRPC=y
1234# CONFIG_RPCSEC_GSS_KRB5 is not set 1234# CONFIG_RPCSEC_GSS_KRB5 is not set
1235# CONFIG_RPCSEC_GSS_SPKM3 is not set 1235# CONFIG_RPCSEC_GSS_SPKM3 is not set
1236# CONFIG_SMB_FS is not set 1236# CONFIG_SMB_FS is not set
1237# CONFIG_CEPH_FS is not set
1237# CONFIG_CIFS is not set 1238# CONFIG_CIFS is not set
1238# CONFIG_NCP_FS is not set 1239# CONFIG_NCP_FS is not set
1239# CONFIG_CODA_FS is not set 1240# CONFIG_CODA_FS is not set
@@ -1426,6 +1427,7 @@ CONFIG_CRYPTO_CBC=y
1426# 1427#
1427# CONFIG_CRYPTO_ANSI_CPRNG is not set 1428# CONFIG_CRYPTO_ANSI_CPRNG is not set
1428CONFIG_CRYPTO_HW=y 1429CONFIG_CRYPTO_HW=y
1430# CONFIG_VIRTUALIZATION is not set
1429# CONFIG_BINARY_PRINTF is not set 1431# CONFIG_BINARY_PRINTF is not set
1430 1432
1431# 1433#
diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig
index 92589a950d0..edae0a6830d 100644
--- a/arch/sh/configs/cayman_defconfig
+++ b/arch/sh/configs/cayman_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-rc5
4# Mon Jan 4 11:14:50 2010 4# Tue May 18 18:01:02 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7# CONFIG_SUPERH32 is not set 7# CONFIG_SUPERH32 is not set
@@ -13,7 +13,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
18# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
@@ -32,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
37 37
@@ -47,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
51# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
52# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
53CONFIG_SWAP=y 55CONFIG_SWAP=y
54# CONFIG_SYSVIPC is not set 56# CONFIG_SYSVIPC is not set
55CONFIG_POSIX_MQUEUE=y 57CONFIG_POSIX_MQUEUE=y
@@ -70,7 +72,6 @@ CONFIG_RCU_FANOUT=32
70# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
71# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_GROUP_SCHED is not set
74# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
75CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
76CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -114,7 +115,6 @@ CONFIG_SLAB=y
114# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
116CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
117CONFIG_HAVE_IOREMAP_PROT=y
118CONFIG_HAVE_ARCH_TRACEHOOK=y 118CONFIG_HAVE_ARCH_TRACEHOOK=y
119CONFIG_HAVE_DMA_ATTRS=y 119CONFIG_HAVE_DMA_ATTRS=y
120CONFIG_HAVE_CLK=y 120CONFIG_HAVE_CLK=y
@@ -204,6 +204,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
204CONFIG_MAX_ACTIVE_REGIONS=1 204CONFIG_MAX_ACTIVE_REGIONS=1
205CONFIG_ARCH_POPULATES_NODE_MAP=y 205CONFIG_ARCH_POPULATES_NODE_MAP=y
206CONFIG_ARCH_SELECT_MEMORY_MODEL=y 206CONFIG_ARCH_SELECT_MEMORY_MODEL=y
207CONFIG_IOREMAP_FIXED=y
207CONFIG_PAGE_SIZE_4KB=y 208CONFIG_PAGE_SIZE_4KB=y
208# CONFIG_PAGE_SIZE_8KB is not set 209# CONFIG_PAGE_SIZE_8KB is not set
209# CONFIG_PAGE_SIZE_16KB is not set 210# CONFIG_PAGE_SIZE_16KB is not set
@@ -225,7 +226,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 226CONFIG_SPLIT_PTLOCK_CPUS=4
226# CONFIG_PHYS_ADDR_T_64BIT is not set 227# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=0 228CONFIG_ZONE_DMA_FLAG=0
228CONFIG_NR_QUICK=2 229CONFIG_NR_QUICK=1
229# CONFIG_KSM is not set 230# CONFIG_KSM is not set
230CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 231CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
231 232
@@ -294,7 +295,6 @@ CONFIG_HZ=250
294# CONFIG_PREEMPT_NONE is not set 295# CONFIG_PREEMPT_NONE is not set
295# CONFIG_PREEMPT_VOLUNTARY is not set 296# CONFIG_PREEMPT_VOLUNTARY is not set
296CONFIG_PREEMPT=y 297CONFIG_PREEMPT=y
297# CONFIG_SPARSE_IRQ is not set
298 298
299# 299#
300# Boot options 300# Boot options
@@ -309,9 +309,9 @@ CONFIG_ENTRY_OFFSET=0x00001000
309# Bus options 309# Bus options
310# 310#
311CONFIG_PCI=y 311CONFIG_PCI=y
312CONFIG_PCI_DOMAINS=y
312# CONFIG_PCIEPORTBUS is not set 313# CONFIG_PCIEPORTBUS is not set
313# CONFIG_ARCH_SUPPORTS_MSI is not set 314# CONFIG_ARCH_SUPPORTS_MSI is not set
314CONFIG_PCI_LEGACY=y
315# CONFIG_PCI_DEBUG is not set 315# CONFIG_PCI_DEBUG is not set
316# CONFIG_PCI_STUB is not set 316# CONFIG_PCI_STUB is not set
317# CONFIG_PCI_IOV is not set 317# CONFIG_PCI_IOV is not set
@@ -337,7 +337,6 @@ CONFIG_NET=y
337# Networking options 337# Networking options
338# 338#
339CONFIG_PACKET=y 339CONFIG_PACKET=y
340# CONFIG_PACKET_MMAP is not set
341CONFIG_UNIX=y 340CONFIG_UNIX=y
342CONFIG_XFRM=y 341CONFIG_XFRM=y
343# CONFIG_XFRM_USER is not set 342# CONFIG_XFRM_USER is not set
@@ -463,6 +462,7 @@ CONFIG_MISC_DEVICES=y
463# CONFIG_ENCLOSURE_SERVICES is not set 462# CONFIG_ENCLOSURE_SERVICES is not set
464# CONFIG_HP_ILO is not set 463# CONFIG_HP_ILO is not set
465# CONFIG_ISL29003 is not set 464# CONFIG_ISL29003 is not set
465# CONFIG_SENSORS_TSL2550 is not set
466# CONFIG_DS1682 is not set 466# CONFIG_DS1682 is not set
467# CONFIG_C2PORT is not set 467# CONFIG_C2PORT is not set
468 468
@@ -480,6 +480,7 @@ CONFIG_HAVE_IDE=y
480# 480#
481# SCSI device support 481# SCSI device support
482# 482#
483CONFIG_SCSI_MOD=y
483# CONFIG_RAID_ATTRS is not set 484# CONFIG_RAID_ATTRS is not set
484CONFIG_SCSI=y 485CONFIG_SCSI=y
485CONFIG_SCSI_DMA=y 486CONFIG_SCSI_DMA=y
@@ -569,7 +570,7 @@ CONFIG_SCSI_LOWLEVEL=y
569# 570#
570 571
571# 572#
572# See the help texts for more information. 573# The newer stack is recommended.
573# 574#
574# CONFIG_FIREWIRE is not set 575# CONFIG_FIREWIRE is not set
575# CONFIG_IEEE1394 is not set 576# CONFIG_IEEE1394 is not set
@@ -638,6 +639,8 @@ CONFIG_NETDEV_10000=y
638# CONFIG_CHELSIO_T1 is not set 639# CONFIG_CHELSIO_T1 is not set
639CONFIG_CHELSIO_T3_DEPENDS=y 640CONFIG_CHELSIO_T3_DEPENDS=y
640# CONFIG_CHELSIO_T3 is not set 641# CONFIG_CHELSIO_T3 is not set
642CONFIG_CHELSIO_T4_DEPENDS=y
643# CONFIG_CHELSIO_T4 is not set
641# CONFIG_ENIC is not set 644# CONFIG_ENIC is not set
642# CONFIG_IXGBE is not set 645# CONFIG_IXGBE is not set
643# CONFIG_IXGB is not set 646# CONFIG_IXGB is not set
@@ -650,6 +653,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
650# CONFIG_MLX4_CORE is not set 653# CONFIG_MLX4_CORE is not set
651# CONFIG_TEHUTI is not set 654# CONFIG_TEHUTI is not set
652# CONFIG_BNX2X is not set 655# CONFIG_BNX2X is not set
656# CONFIG_QLCNIC is not set
653# CONFIG_QLGE is not set 657# CONFIG_QLGE is not set
654# CONFIG_SFC is not set 658# CONFIG_SFC is not set
655# CONFIG_BE2NET is not set 659# CONFIG_BE2NET is not set
@@ -732,6 +736,7 @@ CONFIG_DEVKMEM=y
732# 736#
733# CONFIG_SERIAL_SH_SCI is not set 737# CONFIG_SERIAL_SH_SCI is not set
734# CONFIG_SERIAL_JSM is not set 738# CONFIG_SERIAL_JSM is not set
739# CONFIG_SERIAL_TIMBERDALE is not set
735CONFIG_UNIX98_PTYS=y 740CONFIG_UNIX98_PTYS=y
736# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 741# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
737CONFIG_LEGACY_PTYS=y 742CONFIG_LEGACY_PTYS=y
@@ -779,6 +784,7 @@ CONFIG_I2C_HELPER_AUTO=y
779# CONFIG_I2C_OCORES is not set 784# CONFIG_I2C_OCORES is not set
780# CONFIG_I2C_SH_MOBILE is not set 785# CONFIG_I2C_SH_MOBILE is not set
781# CONFIG_I2C_SIMTEC is not set 786# CONFIG_I2C_SIMTEC is not set
787# CONFIG_I2C_XILINX is not set
782 788
783# 789#
784# External I2C/SMBus adapter drivers 790# External I2C/SMBus adapter drivers
@@ -791,15 +797,9 @@ CONFIG_I2C_HELPER_AUTO=y
791# 797#
792# CONFIG_I2C_PCA_PLATFORM is not set 798# CONFIG_I2C_PCA_PLATFORM is not set
793# CONFIG_I2C_STUB is not set 799# CONFIG_I2C_STUB is not set
794
795#
796# Miscellaneous I2C Chip support
797#
798# CONFIG_SENSORS_TSL2550 is not set
799# CONFIG_I2C_DEBUG_CORE is not set 800# CONFIG_I2C_DEBUG_CORE is not set
800# CONFIG_I2C_DEBUG_ALGO is not set 801# CONFIG_I2C_DEBUG_ALGO is not set
801# CONFIG_I2C_DEBUG_BUS is not set 802# CONFIG_I2C_DEBUG_BUS is not set
802# CONFIG_I2C_DEBUG_CHIP is not set
803# CONFIG_SPI is not set 803# CONFIG_SPI is not set
804 804
805# 805#
@@ -823,10 +823,11 @@ CONFIG_HWMON=y
823# CONFIG_SENSORS_ADM1029 is not set 823# CONFIG_SENSORS_ADM1029 is not set
824# CONFIG_SENSORS_ADM1031 is not set 824# CONFIG_SENSORS_ADM1031 is not set
825# CONFIG_SENSORS_ADM9240 is not set 825# CONFIG_SENSORS_ADM9240 is not set
826# CONFIG_SENSORS_ADT7411 is not set
826# CONFIG_SENSORS_ADT7462 is not set 827# CONFIG_SENSORS_ADT7462 is not set
827# CONFIG_SENSORS_ADT7470 is not set 828# CONFIG_SENSORS_ADT7470 is not set
828# CONFIG_SENSORS_ADT7473 is not set
829# CONFIG_SENSORS_ADT7475 is not set 829# CONFIG_SENSORS_ADT7475 is not set
830# CONFIG_SENSORS_ASC7621 is not set
830# CONFIG_SENSORS_ATXP1 is not set 831# CONFIG_SENSORS_ATXP1 is not set
831# CONFIG_SENSORS_DS1621 is not set 832# CONFIG_SENSORS_DS1621 is not set
832# CONFIG_SENSORS_I5K_AMB is not set 833# CONFIG_SENSORS_I5K_AMB is not set
@@ -863,6 +864,7 @@ CONFIG_HWMON=y
863# CONFIG_SENSORS_SMSC47M192 is not set 864# CONFIG_SENSORS_SMSC47M192 is not set
864# CONFIG_SENSORS_SMSC47B397 is not set 865# CONFIG_SENSORS_SMSC47B397 is not set
865# CONFIG_SENSORS_ADS7828 is not set 866# CONFIG_SENSORS_ADS7828 is not set
867# CONFIG_SENSORS_AMC6821 is not set
866# CONFIG_SENSORS_THMC50 is not set 868# CONFIG_SENSORS_THMC50 is not set
867# CONFIG_SENSORS_TMP401 is not set 869# CONFIG_SENSORS_TMP401 is not set
868# CONFIG_SENSORS_TMP421 is not set 870# CONFIG_SENSORS_TMP421 is not set
@@ -909,9 +911,9 @@ CONFIG_SSB_POSSIBLE=y
909# CONFIG_HTC_PASIC3 is not set 911# CONFIG_HTC_PASIC3 is not set
910# CONFIG_MFD_TMIO is not set 912# CONFIG_MFD_TMIO is not set
911# CONFIG_MFD_WM8400 is not set 913# CONFIG_MFD_WM8400 is not set
912# CONFIG_MFD_WM8350_I2C is not set 914# CONFIG_MFD_WM8994 is not set
913# CONFIG_MFD_PCF50633 is not set 915# CONFIG_MFD_PCF50633 is not set
914# CONFIG_AB3100_CORE is not set 916# CONFIG_LPC_SCH is not set
915# CONFIG_REGULATOR is not set 917# CONFIG_REGULATOR is not set
916# CONFIG_MEDIA_SUPPORT is not set 918# CONFIG_MEDIA_SUPPORT is not set
917 919
@@ -919,6 +921,7 @@ CONFIG_SSB_POSSIBLE=y
919# Graphics support 921# Graphics support
920# 922#
921CONFIG_VGA_ARB=y 923CONFIG_VGA_ARB=y
924CONFIG_VGA_ARB_MAX_GPUS=16
922# CONFIG_DRM is not set 925# CONFIG_DRM is not set
923# CONFIG_VGASTATE is not set 926# CONFIG_VGASTATE is not set
924CONFIG_VIDEO_OUTPUT_CONTROL=y 927CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -1125,6 +1128,7 @@ CONFIG_MISC_FILESYSTEMS=y
1125# CONFIG_BEFS_FS is not set 1128# CONFIG_BEFS_FS is not set
1126# CONFIG_BFS_FS is not set 1129# CONFIG_BFS_FS is not set
1127# CONFIG_EFS_FS is not set 1130# CONFIG_EFS_FS is not set
1131# CONFIG_LOGFS is not set
1128# CONFIG_CRAMFS is not set 1132# CONFIG_CRAMFS is not set
1129# CONFIG_SQUASHFS is not set 1133# CONFIG_SQUASHFS is not set
1130# CONFIG_VXFS_FS is not set 1134# CONFIG_VXFS_FS is not set
@@ -1153,6 +1157,7 @@ CONFIG_SUNRPC=y
1153# CONFIG_RPCSEC_GSS_KRB5 is not set 1157# CONFIG_RPCSEC_GSS_KRB5 is not set
1154# CONFIG_RPCSEC_GSS_SPKM3 is not set 1158# CONFIG_RPCSEC_GSS_SPKM3 is not set
1155# CONFIG_SMB_FS is not set 1159# CONFIG_SMB_FS is not set
1160# CONFIG_CEPH_FS is not set
1156# CONFIG_CIFS is not set 1161# CONFIG_CIFS is not set
1157# CONFIG_NCP_FS is not set 1162# CONFIG_NCP_FS is not set
1158# CONFIG_CODA_FS is not set 1163# CONFIG_CODA_FS is not set
@@ -1208,6 +1213,7 @@ CONFIG_SCHEDSTATS=y
1208# CONFIG_TIMER_STATS is not set 1213# CONFIG_TIMER_STATS is not set
1209# CONFIG_DEBUG_OBJECTS is not set 1214# CONFIG_DEBUG_OBJECTS is not set
1210# CONFIG_DEBUG_SLAB is not set 1215# CONFIG_DEBUG_SLAB is not set
1216# CONFIG_DEBUG_KMEMLEAK is not set
1211CONFIG_DEBUG_PREEMPT=y 1217CONFIG_DEBUG_PREEMPT=y
1212# CONFIG_DEBUG_RT_MUTEXES is not set 1218# CONFIG_DEBUG_RT_MUTEXES is not set
1213# CONFIG_RT_MUTEX_TESTER is not set 1219# CONFIG_RT_MUTEX_TESTER is not set
@@ -1234,6 +1240,7 @@ CONFIG_FRAME_POINTER=y
1234# CONFIG_BACKTRACE_SELF_TEST is not set 1240# CONFIG_BACKTRACE_SELF_TEST is not set
1235# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1241# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1236# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1242# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1243# CONFIG_LKDTM is not set
1237# CONFIG_FAULT_INJECTION is not set 1244# CONFIG_FAULT_INJECTION is not set
1238# CONFIG_LATENCYTOP is not set 1245# CONFIG_LATENCYTOP is not set
1239# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1246# CONFIG_SYSCTL_SYSCALL_CHECK is not set
@@ -1361,6 +1368,7 @@ CONFIG_CRYPTO=y
1361# CONFIG_CRYPTO_ANSI_CPRNG is not set 1368# CONFIG_CRYPTO_ANSI_CPRNG is not set
1362CONFIG_CRYPTO_HW=y 1369CONFIG_CRYPTO_HW=y
1363# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1370# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1371# CONFIG_VIRTUALIZATION is not set
1364# CONFIG_BINARY_PRINTF is not set 1372# CONFIG_BINARY_PRINTF is not set
1365 1373
1366# 1374#
diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig
index 55f652be954..b96bf3d2cd0 100644
--- a/arch/sh/configs/dreamcast_defconfig
+++ b/arch/sh/configs/dreamcast_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-rc5
4# Mon Jan 4 11:17:35 2010 4# Tue May 18 15:11:55 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -72,7 +75,6 @@ CONFIG_RCU_FANOUT=32
72# CONFIG_TREE_RCU_TRACE is not set 75# CONFIG_TREE_RCU_TRACE is not set
73# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_GROUP_SCHED is not set
76# CONFIG_CGROUPS is not set 78# CONFIG_CGROUPS is not set
77CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
78CONFIG_SYSFS_DEPRECATED_V2=y 80CONFIG_SYSFS_DEPRECATED_V2=y
@@ -124,6 +126,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 126CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 128CONFIG_HAVE_DMA_API_DEBUG=y
129CONFIG_HAVE_HW_BREAKPOINT=y
127 130
128# 131#
129# GCOV-based kernel profiling 132# GCOV-based kernel profiling
@@ -242,6 +245,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
242CONFIG_MAX_ACTIVE_REGIONS=1 245CONFIG_MAX_ACTIVE_REGIONS=1
243CONFIG_ARCH_POPULATES_NODE_MAP=y 246CONFIG_ARCH_POPULATES_NODE_MAP=y
244CONFIG_ARCH_SELECT_MEMORY_MODEL=y 247CONFIG_ARCH_SELECT_MEMORY_MODEL=y
248CONFIG_UNCACHED_MAPPING=y
245CONFIG_PAGE_SIZE_4KB=y 249CONFIG_PAGE_SIZE_4KB=y
246# CONFIG_PAGE_SIZE_8KB is not set 250# CONFIG_PAGE_SIZE_8KB is not set
247# CONFIG_PAGE_SIZE_16KB is not set 251# CONFIG_PAGE_SIZE_16KB is not set
@@ -263,7 +267,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
263CONFIG_SPLIT_PTLOCK_CPUS=4 267CONFIG_SPLIT_PTLOCK_CPUS=4
264# CONFIG_PHYS_ADDR_T_64BIT is not set 268# CONFIG_PHYS_ADDR_T_64BIT is not set
265CONFIG_ZONE_DMA_FLAG=0 269CONFIG_ZONE_DMA_FLAG=0
266CONFIG_NR_QUICK=2 270CONFIG_NR_QUICK=1
267# CONFIG_KSM is not set 271# CONFIG_KSM is not set
268CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
269 273
@@ -360,7 +364,6 @@ CONFIG_SECCOMP=y
360CONFIG_PREEMPT=y 364CONFIG_PREEMPT=y
361CONFIG_GUSA=y 365CONFIG_GUSA=y
362# CONFIG_GUSA_RB is not set 366# CONFIG_GUSA_RB is not set
363# CONFIG_SPARSE_IRQ is not set
364 367
365# 368#
366# Boot options 369# Boot options
@@ -377,9 +380,9 @@ CONFIG_CMDLINE="console=ttySC1,115200 panic=3"
377# 380#
378CONFIG_MAPLE=y 381CONFIG_MAPLE=y
379CONFIG_PCI=y 382CONFIG_PCI=y
383CONFIG_PCI_DOMAINS=y
380# CONFIG_PCIEPORTBUS is not set 384# CONFIG_PCIEPORTBUS is not set
381# CONFIG_ARCH_SUPPORTS_MSI is not set 385# CONFIG_ARCH_SUPPORTS_MSI is not set
382CONFIG_PCI_LEGACY=y
383# CONFIG_PCI_STUB is not set 386# CONFIG_PCI_STUB is not set
384# CONFIG_PCI_IOV is not set 387# CONFIG_PCI_IOV is not set
385# CONFIG_PCCARD is not set 388# CONFIG_PCCARD is not set
@@ -404,7 +407,6 @@ CONFIG_NET=y
404# Networking options 407# Networking options
405# 408#
406CONFIG_PACKET=y 409CONFIG_PACKET=y
407# CONFIG_PACKET_MMAP is not set
408CONFIG_UNIX=y 410CONFIG_UNIX=y
409CONFIG_XFRM=y 411CONFIG_XFRM=y
410# CONFIG_XFRM_USER is not set 412# CONFIG_XFRM_USER is not set
@@ -532,6 +534,7 @@ CONFIG_HAVE_IDE=y
532# 534#
533# SCSI device support 535# SCSI device support
534# 536#
537CONFIG_SCSI_MOD=y
535# CONFIG_RAID_ATTRS is not set 538# CONFIG_RAID_ATTRS is not set
536# CONFIG_SCSI is not set 539# CONFIG_SCSI is not set
537# CONFIG_SCSI_DMA is not set 540# CONFIG_SCSI_DMA is not set
@@ -549,7 +552,7 @@ CONFIG_HAVE_IDE=y
549# 552#
550 553
551# 554#
552# See the help texts for more information. 555# The newer stack is recommended.
553# 556#
554# CONFIG_FIREWIRE is not set 557# CONFIG_FIREWIRE is not set
555# CONFIG_IEEE1394 is not set 558# CONFIG_IEEE1394 is not set
@@ -589,6 +592,7 @@ CONFIG_NET_PCI=y
589# CONFIG_PCNET32 is not set 592# CONFIG_PCNET32 is not set
590# CONFIG_AMD8111_ETH is not set 593# CONFIG_AMD8111_ETH is not set
591# CONFIG_ADAPTEC_STARFIRE is not set 594# CONFIG_ADAPTEC_STARFIRE is not set
595# CONFIG_KSZ884X_PCI is not set
592# CONFIG_B44 is not set 596# CONFIG_B44 is not set
593# CONFIG_FORCEDETH is not set 597# CONFIG_FORCEDETH is not set
594# CONFIG_E100 is not set 598# CONFIG_E100 is not set
@@ -717,6 +721,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
717CONFIG_SERIAL_CORE=y 721CONFIG_SERIAL_CORE=y
718CONFIG_SERIAL_CORE_CONSOLE=y 722CONFIG_SERIAL_CORE_CONSOLE=y
719# CONFIG_SERIAL_JSM is not set 723# CONFIG_SERIAL_JSM is not set
724# CONFIG_SERIAL_TIMBERDALE is not set
720CONFIG_UNIX98_PTYS=y 725CONFIG_UNIX98_PTYS=y
721# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 726# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
722CONFIG_LEGACY_PTYS=y 727CONFIG_LEGACY_PTYS=y
@@ -771,6 +776,7 @@ CONFIG_SSB_POSSIBLE=y
771# CONFIG_MFD_SH_MOBILE_SDHI is not set 776# CONFIG_MFD_SH_MOBILE_SDHI is not set
772# CONFIG_HTC_PASIC3 is not set 777# CONFIG_HTC_PASIC3 is not set
773# CONFIG_MFD_TMIO is not set 778# CONFIG_MFD_TMIO is not set
779# CONFIG_LPC_SCH is not set
774# CONFIG_REGULATOR is not set 780# CONFIG_REGULATOR is not set
775# CONFIG_MEDIA_SUPPORT is not set 781# CONFIG_MEDIA_SUPPORT is not set
776 782
@@ -778,6 +784,7 @@ CONFIG_SSB_POSSIBLE=y
778# Graphics support 784# Graphics support
779# 785#
780CONFIG_VGA_ARB=y 786CONFIG_VGA_ARB=y
787CONFIG_VGA_ARB_MAX_GPUS=16
781# CONFIG_DRM is not set 788# CONFIG_DRM is not set
782# CONFIG_VGASTATE is not set 789# CONFIG_VGASTATE is not set
783CONFIG_VIDEO_OUTPUT_CONTROL=m 790CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -918,7 +925,6 @@ CONFIG_RTC_LIB=y
918# CONFIG_EXT2_FS is not set 925# CONFIG_EXT2_FS is not set
919# CONFIG_EXT3_FS is not set 926# CONFIG_EXT3_FS is not set
920# CONFIG_EXT4_FS is not set 927# CONFIG_EXT4_FS is not set
921CONFIG_EXT4_USE_FOR_EXT23=y
922# CONFIG_REISERFS_FS is not set 928# CONFIG_REISERFS_FS is not set
923# CONFIG_JFS_FS is not set 929# CONFIG_JFS_FS is not set
924# CONFIG_FS_POSIX_ACL is not set 930# CONFIG_FS_POSIX_ACL is not set
@@ -976,6 +982,7 @@ CONFIG_MISC_FILESYSTEMS=y
976# CONFIG_BEFS_FS is not set 982# CONFIG_BEFS_FS is not set
977# CONFIG_BFS_FS is not set 983# CONFIG_BFS_FS is not set
978# CONFIG_EFS_FS is not set 984# CONFIG_EFS_FS is not set
985# CONFIG_LOGFS is not set
979# CONFIG_CRAMFS is not set 986# CONFIG_CRAMFS is not set
980# CONFIG_SQUASHFS is not set 987# CONFIG_SQUASHFS is not set
981# CONFIG_VXFS_FS is not set 988# CONFIG_VXFS_FS is not set
@@ -990,6 +997,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
990# CONFIG_NFS_FS is not set 997# CONFIG_NFS_FS is not set
991# CONFIG_NFSD is not set 998# CONFIG_NFSD is not set
992# CONFIG_SMB_FS is not set 999# CONFIG_SMB_FS is not set
1000# CONFIG_CEPH_FS is not set
993# CONFIG_CIFS is not set 1001# CONFIG_CIFS is not set
994# CONFIG_NCP_FS is not set 1002# CONFIG_NCP_FS is not set
995# CONFIG_CODA_FS is not set 1003# CONFIG_CODA_FS is not set
@@ -1135,6 +1143,7 @@ CONFIG_CRYPTO=y
1135# CONFIG_CRYPTO_ANSI_CPRNG is not set 1143# CONFIG_CRYPTO_ANSI_CPRNG is not set
1136CONFIG_CRYPTO_HW=y 1144CONFIG_CRYPTO_HW=y
1137# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1145# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1146# CONFIG_VIRTUALIZATION is not set
1138# CONFIG_BINARY_PRINTF is not set 1147# CONFIG_BINARY_PRINTF is not set
1139 1148
1140# 1149#
diff --git a/arch/sh/configs/ecovec24-romimage_defconfig b/arch/sh/configs/ecovec24-romimage_defconfig
index 662c1ad2049..58aec9dd563 100644
--- a/arch/sh/configs/ecovec24-romimage_defconfig
+++ b/arch/sh/configs/ecovec24-romimage_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-rc5
4# Mon Jan 4 11:18:17 2010 4# Tue May 18 15:14:56 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION=""
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -71,11 +74,6 @@ CONFIG_RCU_FANOUT=32
71CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
79# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -86,6 +84,7 @@ CONFIG_INITRAMFS_SOURCE=""
86CONFIG_RD_GZIP=y 84CONFIG_RD_GZIP=y
87# CONFIG_RD_BZIP2 is not set 85# CONFIG_RD_BZIP2 is not set
88# CONFIG_RD_LZMA is not set 86# CONFIG_RD_LZMA is not set
87# CONFIG_RD_LZO is not set
89CONFIG_CC_OPTIMIZE_FOR_SIZE=y 88CONFIG_CC_OPTIMIZE_FOR_SIZE=y
90CONFIG_SYSCTL=y 89CONFIG_SYSCTL=y
91CONFIG_ANON_INODES=y 90CONFIG_ANON_INODES=y
@@ -111,7 +110,7 @@ CONFIG_PERF_USE_VMALLOC=y
111# 110#
112# Kernel Performance Events And Counters 111# Kernel Performance Events And Counters
113# 112#
114# CONFIG_PERF_EVENTS is not set 113CONFIG_PERF_EVENTS=y
115# CONFIG_PERF_COUNTERS is not set 114# CONFIG_PERF_COUNTERS is not set
116CONFIG_VM_EVENT_COUNTERS=y 115CONFIG_VM_EVENT_COUNTERS=y
117CONFIG_COMPAT_BRK=y 116CONFIG_COMPAT_BRK=y
@@ -120,13 +119,13 @@ CONFIG_SLAB=y
120# CONFIG_SLOB is not set 119# CONFIG_SLOB is not set
121# CONFIG_PROFILING is not set 120# CONFIG_PROFILING is not set
122CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
123CONFIG_HAVE_IOREMAP_PROT=y
124CONFIG_HAVE_KPROBES=y 122CONFIG_HAVE_KPROBES=y
125CONFIG_HAVE_KRETPROBES=y 123CONFIG_HAVE_KRETPROBES=y
126CONFIG_HAVE_ARCH_TRACEHOOK=y 124CONFIG_HAVE_ARCH_TRACEHOOK=y
127CONFIG_HAVE_DMA_ATTRS=y 125CONFIG_HAVE_DMA_ATTRS=y
128CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
129CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128CONFIG_HAVE_HW_BREAKPOINT=y
130 129
131# 130#
132# GCOV-based kernel profiling 131# GCOV-based kernel profiling
@@ -237,8 +236,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_MEMORY_START=0x08000000 236CONFIG_MEMORY_START=0x08000000
238CONFIG_MEMORY_SIZE=0x10000000 237CONFIG_MEMORY_SIZE=0x10000000
239CONFIG_29BIT=y 238CONFIG_29BIT=y
240# CONFIG_PMB_ENABLE is not set 239# CONFIG_PMB is not set
241# CONFIG_X2TLB is not set 240CONFIG_X2TLB=y
242CONFIG_VSYSCALL=y 241CONFIG_VSYSCALL=y
243CONFIG_ARCH_FLATMEM_ENABLE=y 242CONFIG_ARCH_FLATMEM_ENABLE=y
244CONFIG_ARCH_SPARSEMEM_ENABLE=y 243CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -246,6 +245,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
246CONFIG_MAX_ACTIVE_REGIONS=1 245CONFIG_MAX_ACTIVE_REGIONS=1
247CONFIG_ARCH_POPULATES_NODE_MAP=y 246CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_ARCH_SELECT_MEMORY_MODEL=y 247CONFIG_ARCH_SELECT_MEMORY_MODEL=y
248CONFIG_IOREMAP_FIXED=y
249CONFIG_UNCACHED_MAPPING=y
249CONFIG_PAGE_SIZE_4KB=y 250CONFIG_PAGE_SIZE_4KB=y
250# CONFIG_PAGE_SIZE_8KB is not set 251# CONFIG_PAGE_SIZE_8KB is not set
251# CONFIG_PAGE_SIZE_16KB is not set 252# CONFIG_PAGE_SIZE_16KB is not set
@@ -261,7 +262,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 262CONFIG_SPLIT_PTLOCK_CPUS=4
262# CONFIG_PHYS_ADDR_T_64BIT is not set 263# CONFIG_PHYS_ADDR_T_64BIT is not set
263CONFIG_ZONE_DMA_FLAG=0 264CONFIG_ZONE_DMA_FLAG=0
264CONFIG_NR_QUICK=2 265CONFIG_NR_QUICK=1
265# CONFIG_KSM is not set 266# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 267CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267 268
@@ -336,7 +337,7 @@ CONFIG_PREEMPT_NONE=y
336# CONFIG_PREEMPT_VOLUNTARY is not set 337# CONFIG_PREEMPT_VOLUNTARY is not set
337# CONFIG_PREEMPT is not set 338# CONFIG_PREEMPT is not set
338CONFIG_GUSA=y 339CONFIG_GUSA=y
339# CONFIG_SPARSE_IRQ is not set 340# CONFIG_INTC_USERIMASK is not set
340 341
341# 342#
342# Boot options 343# Boot options
@@ -370,6 +371,7 @@ CONFIG_PM=y
370# CONFIG_SUSPEND is not set 371# CONFIG_SUSPEND is not set
371# CONFIG_HIBERNATION is not set 372# CONFIG_HIBERNATION is not set
372CONFIG_PM_RUNTIME=y 373CONFIG_PM_RUNTIME=y
374CONFIG_PM_OPS=y
373# CONFIG_CPU_IDLE is not set 375# CONFIG_CPU_IDLE is not set
374CONFIG_NET=y 376CONFIG_NET=y
375 377
@@ -377,7 +379,6 @@ CONFIG_NET=y
377# Networking options 379# Networking options
378# 380#
379CONFIG_PACKET=y 381CONFIG_PACKET=y
380CONFIG_PACKET_MMAP=y
381CONFIG_UNIX=y 382CONFIG_UNIX=y
382# CONFIG_NET_KEY is not set 383# CONFIG_NET_KEY is not set
383CONFIG_INET=y 384CONFIG_INET=y
@@ -485,6 +486,7 @@ CONFIG_HAVE_IDE=y
485# 486#
486# SCSI device support 487# SCSI device support
487# 488#
489CONFIG_SCSI_MOD=y
488# CONFIG_RAID_ATTRS is not set 490# CONFIG_RAID_ATTRS is not set
489CONFIG_SCSI=y 491CONFIG_SCSI=y
490CONFIG_SCSI_DMA=y 492CONFIG_SCSI_DMA=y
@@ -585,6 +587,7 @@ CONFIG_WLAN=y
585# CONFIG_USB_PEGASUS is not set 587# CONFIG_USB_PEGASUS is not set
586# CONFIG_USB_RTL8150 is not set 588# CONFIG_USB_RTL8150 is not set
587# CONFIG_USB_USBNET is not set 589# CONFIG_USB_USBNET is not set
590# CONFIG_USB_IPHETH is not set
588# CONFIG_WAN is not set 591# CONFIG_WAN is not set
589# CONFIG_PPP is not set 592# CONFIG_PPP is not set
590# CONFIG_SLIP is not set 593# CONFIG_SLIP is not set
@@ -650,6 +653,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
650CONFIG_SERIAL_SH_SCI_CONSOLE=y 653CONFIG_SERIAL_SH_SCI_CONSOLE=y
651CONFIG_SERIAL_CORE=y 654CONFIG_SERIAL_CORE=y
652CONFIG_SERIAL_CORE_CONSOLE=y 655CONFIG_SERIAL_CORE_CONSOLE=y
656# CONFIG_SERIAL_TIMBERDALE is not set
653CONFIG_UNIX98_PTYS=y 657CONFIG_UNIX98_PTYS=y
654# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 658# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
655CONFIG_LEGACY_PTYS=y 659CONFIG_LEGACY_PTYS=y
@@ -678,6 +682,7 @@ CONFIG_I2C_HELPER_AUTO=y
678# CONFIG_I2C_OCORES is not set 682# CONFIG_I2C_OCORES is not set
679CONFIG_I2C_SH_MOBILE=y 683CONFIG_I2C_SH_MOBILE=y
680# CONFIG_I2C_SIMTEC is not set 684# CONFIG_I2C_SIMTEC is not set
685# CONFIG_I2C_XILINX is not set
681 686
682# 687#
683# External I2C/SMBus adapter drivers 688# External I2C/SMBus adapter drivers
@@ -690,15 +695,9 @@ CONFIG_I2C_SH_MOBILE=y
690# Other I2C/SMBus bus drivers 695# Other I2C/SMBus bus drivers
691# 696#
692# CONFIG_I2C_PCA_PLATFORM is not set 697# CONFIG_I2C_PCA_PLATFORM is not set
693
694#
695# Miscellaneous I2C Chip support
696#
697# CONFIG_SENSORS_TSL2550 is not set
698# CONFIG_I2C_DEBUG_CORE is not set 698# CONFIG_I2C_DEBUG_CORE is not set
699# CONFIG_I2C_DEBUG_ALGO is not set 699# CONFIG_I2C_DEBUG_ALGO is not set
700# CONFIG_I2C_DEBUG_BUS is not set 700# CONFIG_I2C_DEBUG_BUS is not set
701# CONFIG_I2C_DEBUG_CHIP is not set
702# CONFIG_SPI is not set 701# CONFIG_SPI is not set
703 702
704# 703#
@@ -712,13 +711,16 @@ CONFIG_GPIO_SYSFS=y
712# 711#
713# Memory mapped GPIO expanders: 712# Memory mapped GPIO expanders:
714# 713#
714# CONFIG_GPIO_IT8761E is not set
715 715
716# 716#
717# I2C GPIO expanders: 717# I2C GPIO expanders:
718# 718#
719# CONFIG_GPIO_MAX7300 is not set
719# CONFIG_GPIO_MAX732X is not set 720# CONFIG_GPIO_MAX732X is not set
720# CONFIG_GPIO_PCA953X is not set 721# CONFIG_GPIO_PCA953X is not set
721# CONFIG_GPIO_PCF857X is not set 722# CONFIG_GPIO_PCF857X is not set
723# CONFIG_GPIO_ADP5588 is not set
722 724
723# 725#
724# PCI GPIO expanders: 726# PCI GPIO expanders:
@@ -747,20 +749,23 @@ CONFIG_SSB_POSSIBLE=y
747# Multifunction device drivers 749# Multifunction device drivers
748# 750#
749# CONFIG_MFD_CORE is not set 751# CONFIG_MFD_CORE is not set
752# CONFIG_MFD_88PM860X is not set
750# CONFIG_MFD_SM501 is not set 753# CONFIG_MFD_SM501 is not set
751# CONFIG_MFD_SH_MOBILE_SDHI is not set 754# CONFIG_MFD_SH_MOBILE_SDHI is not set
752# CONFIG_HTC_PASIC3 is not set 755# CONFIG_HTC_PASIC3 is not set
756# CONFIG_HTC_I2CPLD is not set
753# CONFIG_TPS65010 is not set 757# CONFIG_TPS65010 is not set
754# CONFIG_TWL4030_CORE is not set 758# CONFIG_TWL4030_CORE is not set
755# CONFIG_MFD_TMIO is not set 759# CONFIG_MFD_TMIO is not set
756# CONFIG_PMIC_DA903X is not set 760# CONFIG_PMIC_DA903X is not set
757# CONFIG_PMIC_ADP5520 is not set 761# CONFIG_PMIC_ADP5520 is not set
762# CONFIG_MFD_MAX8925 is not set
758# CONFIG_MFD_WM8400 is not set 763# CONFIG_MFD_WM8400 is not set
759# CONFIG_MFD_WM831X is not set 764# CONFIG_MFD_WM831X is not set
760# CONFIG_MFD_WM8350_I2C is not set 765# CONFIG_MFD_WM8350_I2C is not set
766# CONFIG_MFD_WM8994 is not set
761# CONFIG_MFD_PCF50633 is not set 767# CONFIG_MFD_PCF50633 is not set
762# CONFIG_AB3100_CORE is not set 768# CONFIG_AB3100_CORE is not set
763# CONFIG_MFD_88PM8607 is not set
764# CONFIG_REGULATOR is not set 769# CONFIG_REGULATOR is not set
765# CONFIG_MEDIA_SUPPORT is not set 770# CONFIG_MEDIA_SUPPORT is not set
766 771
@@ -868,7 +873,6 @@ CONFIG_USB_STORAGE=y
868# CONFIG_USB_RIO500 is not set 873# CONFIG_USB_RIO500 is not set
869# CONFIG_USB_LEGOTOWER is not set 874# CONFIG_USB_LEGOTOWER is not set
870# CONFIG_USB_LCD is not set 875# CONFIG_USB_LCD is not set
871# CONFIG_USB_BERRY_CHARGE is not set
872# CONFIG_USB_LED is not set 876# CONFIG_USB_LED is not set
873# CONFIG_USB_CYPRESS_CY7C63 is not set 877# CONFIG_USB_CYPRESS_CY7C63 is not set
874# CONFIG_USB_CYTHERM is not set 878# CONFIG_USB_CYTHERM is not set
@@ -880,7 +884,6 @@ CONFIG_USB_STORAGE=y
880# CONFIG_USB_IOWARRIOR is not set 884# CONFIG_USB_IOWARRIOR is not set
881# CONFIG_USB_TEST is not set 885# CONFIG_USB_TEST is not set
882# CONFIG_USB_ISIGHTFW is not set 886# CONFIG_USB_ISIGHTFW is not set
883# CONFIG_USB_VST is not set
884# CONFIG_USB_GADGET is not set 887# CONFIG_USB_GADGET is not set
885 888
886# 889#
@@ -911,7 +914,6 @@ CONFIG_EXT2_FS=y
911# CONFIG_EXT2_FS_XIP is not set 914# CONFIG_EXT2_FS_XIP is not set
912# CONFIG_EXT3_FS is not set 915# CONFIG_EXT3_FS is not set
913# CONFIG_EXT4_FS is not set 916# CONFIG_EXT4_FS is not set
914CONFIG_EXT4_USE_FOR_EXT23=y
915# CONFIG_REISERFS_FS is not set 917# CONFIG_REISERFS_FS is not set
916# CONFIG_JFS_FS is not set 918# CONFIG_JFS_FS is not set
917# CONFIG_FS_POSIX_ACL is not set 919# CONFIG_FS_POSIX_ACL is not set
@@ -1027,6 +1029,7 @@ CONFIG_DEBUG_FS=y
1027CONFIG_DEBUG_BUGVERBOSE=y 1029CONFIG_DEBUG_BUGVERBOSE=y
1028# CONFIG_DEBUG_MEMORY_INIT is not set 1030# CONFIG_DEBUG_MEMORY_INIT is not set
1029# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1031# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1032# CONFIG_LKDTM is not set
1030# CONFIG_LATENCYTOP is not set 1033# CONFIG_LATENCYTOP is not set
1031# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1034# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1032CONFIG_HAVE_FUNCTION_TRACER=y 1035CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1056,6 +1059,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1056CONFIG_DEFAULT_SECURITY_DAC=y 1059CONFIG_DEFAULT_SECURITY_DAC=y
1057CONFIG_DEFAULT_SECURITY="" 1060CONFIG_DEFAULT_SECURITY=""
1058# CONFIG_CRYPTO is not set 1061# CONFIG_CRYPTO is not set
1062# CONFIG_VIRTUALIZATION is not set
1059# CONFIG_BINARY_PRINTF is not set 1063# CONFIG_BINARY_PRINTF is not set
1060 1064
1061# 1065#
diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig
index 6041c66dd10..67c665671c6 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.34-rc2 3# Linux kernel version: 2.6.34-rc5
4# Mon Mar 29 02:21:58 2010 4# Tue May 18 15:17:28 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -336,6 +336,7 @@ CONFIG_SECCOMP=y
336# CONFIG_PREEMPT_VOLUNTARY is not set 336# CONFIG_PREEMPT_VOLUNTARY is not set
337CONFIG_PREEMPT=y 337CONFIG_PREEMPT=y
338CONFIG_GUSA=y 338CONFIG_GUSA=y
339# CONFIG_INTC_USERIMASK is not set
339 340
340# 341#
341# Boot options 342# Boot options
@@ -762,6 +763,7 @@ CONFIG_WLAN=y
762# CONFIG_USB_PEGASUS is not set 763# CONFIG_USB_PEGASUS is not set
763# CONFIG_USB_RTL8150 is not set 764# CONFIG_USB_RTL8150 is not set
764# CONFIG_USB_USBNET is not set 765# CONFIG_USB_USBNET is not set
766# CONFIG_USB_IPHETH is not set
765# CONFIG_WAN is not set 767# CONFIG_WAN is not set
766# CONFIG_PPP is not set 768# CONFIG_PPP is not set
767# CONFIG_SLIP is not set 769# CONFIG_SLIP is not set
@@ -1755,6 +1757,7 @@ CONFIG_CRYPTO_CBC=y
1755# 1757#
1756# CONFIG_CRYPTO_ANSI_CPRNG is not set 1758# CONFIG_CRYPTO_ANSI_CPRNG is not set
1757CONFIG_CRYPTO_HW=y 1759CONFIG_CRYPTO_HW=y
1760# CONFIG_VIRTUALIZATION is not set
1758# CONFIG_BINARY_PRINTF is not set 1761# CONFIG_BINARY_PRINTF is not set
1759 1762
1760# 1763#
diff --git a/arch/sh/configs/edosk7705_defconfig b/arch/sh/configs/edosk7705_defconfig
index 72f8718dd73..0883d873ea6 100644
--- a/arch/sh/configs/edosk7705_defconfig
+++ b/arch/sh/configs/edosk7705_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-rc5
4# Mon Jan 4 11:24:26 2010 4# Tue May 18 15:21:52 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -12,8 +12,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y 12CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
15CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_IRQ_PER_CPU=y 15CONFIG_IRQ_PER_CPU=y
16CONFIG_SPARSE_IRQ=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,6 +29,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DMA_NONCOHERENT=y 31CONFIG_DMA_NONCOHERENT=y
32CONFIG_NEED_DMA_MAP_STATE=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y 34CONFIG_CONSTRUCTORS=y
34 35
@@ -43,9 +44,11 @@ CONFIG_LOCALVERSION=""
43CONFIG_HAVE_KERNEL_GZIP=y 44CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y 45CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y 46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_HAVE_KERNEL_LZO=y
46CONFIG_KERNEL_GZIP=y 48CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set 49# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set 50# CONFIG_KERNEL_LZMA is not set
51# CONFIG_KERNEL_LZO is not set
49# CONFIG_SYSVIPC is not set 52# CONFIG_SYSVIPC is not set
50# CONFIG_BSD_PROCESS_ACCT is not set 53# CONFIG_BSD_PROCESS_ACCT is not set
51 54
@@ -61,11 +64,11 @@ CONFIG_RCU_FANOUT=32
61# CONFIG_TREE_RCU_TRACE is not set 64# CONFIG_TREE_RCU_TRACE is not set
62# CONFIG_IKCONFIG is not set 65# CONFIG_IKCONFIG is not set
63CONFIG_LOG_BUF_SHIFT=17 66CONFIG_LOG_BUF_SHIFT=17
64# CONFIG_CGROUPS is not set
65# CONFIG_RELAY is not set 67# CONFIG_RELAY is not set
66# CONFIG_NAMESPACES is not set 68# CONFIG_NAMESPACES is not set
67# CONFIG_BLK_DEV_INITRD is not set 69# CONFIG_BLK_DEV_INITRD is not set
68# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 70# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
71CONFIG_ANON_INODES=y
69CONFIG_EMBEDDED=y 72CONFIG_EMBEDDED=y
70# CONFIG_UID16 is not set 73# CONFIG_UID16 is not set
71# CONFIG_KALLSYMS is not set 74# CONFIG_KALLSYMS is not set
@@ -87,7 +90,7 @@ CONFIG_PERF_USE_VMALLOC=y
87# 90#
88# Kernel Performance Events And Counters 91# Kernel Performance Events And Counters
89# 92#
90# CONFIG_PERF_EVENTS is not set 93CONFIG_PERF_EVENTS=y
91# CONFIG_PERF_COUNTERS is not set 94# CONFIG_PERF_COUNTERS is not set
92# CONFIG_VM_EVENT_COUNTERS is not set 95# CONFIG_VM_EVENT_COUNTERS is not set
93# CONFIG_COMPAT_BRK is not set 96# CONFIG_COMPAT_BRK is not set
@@ -103,6 +106,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
103CONFIG_HAVE_DMA_ATTRS=y 106CONFIG_HAVE_DMA_ATTRS=y
104CONFIG_HAVE_CLK=y 107CONFIG_HAVE_CLK=y
105CONFIG_HAVE_DMA_API_DEBUG=y 108CONFIG_HAVE_DMA_API_DEBUG=y
109CONFIG_HAVE_HW_BREAKPOINT=y
106 110
107# 111#
108# GCOV-based kernel profiling 112# GCOV-based kernel profiling
@@ -202,6 +206,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
202CONFIG_ARCH_SELECT_MEMORY_MODEL=y 206CONFIG_ARCH_SELECT_MEMORY_MODEL=y
203CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 207CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
204CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 208CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
209CONFIG_UNCACHED_MAPPING=y
205CONFIG_PAGE_SIZE_4KB=y 210CONFIG_PAGE_SIZE_4KB=y
206# CONFIG_PAGE_SIZE_8KB is not set 211# CONFIG_PAGE_SIZE_8KB is not set
207# CONFIG_PAGE_SIZE_16KB is not set 212# CONFIG_PAGE_SIZE_16KB is not set
@@ -217,7 +222,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
217CONFIG_MIGRATION=y 222CONFIG_MIGRATION=y
218# CONFIG_PHYS_ADDR_T_64BIT is not set 223# CONFIG_PHYS_ADDR_T_64BIT is not set
219CONFIG_ZONE_DMA_FLAG=0 224CONFIG_ZONE_DMA_FLAG=0
220CONFIG_NR_QUICK=2 225CONFIG_NR_QUICK=1
221# CONFIG_KSM is not set 226# CONFIG_KSM is not set
222CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 227CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
223 228
@@ -330,6 +335,7 @@ CONFIG_HAVE_IDE=y
330# 335#
331# SCSI device support 336# SCSI device support
332# 337#
338CONFIG_SCSI_MOD=y
333# CONFIG_SCSI_DMA is not set 339# CONFIG_SCSI_DMA is not set
334# CONFIG_SCSI_NETLINK is not set 340# CONFIG_SCSI_NETLINK is not set
335# CONFIG_PHONE is not set 341# CONFIG_PHONE is not set
@@ -361,6 +367,7 @@ CONFIG_HAVE_IDE=y
361# Non-8250 serial port support 367# Non-8250 serial port support
362# 368#
363# CONFIG_SERIAL_SH_SCI is not set 369# CONFIG_SERIAL_SH_SCI is not set
370# CONFIG_SERIAL_TIMBERDALE is not set
364# CONFIG_UNIX98_PTYS is not set 371# CONFIG_UNIX98_PTYS is not set
365# CONFIG_LEGACY_PTYS is not set 372# CONFIG_LEGACY_PTYS is not set
366# CONFIG_IPMI_HANDLER is not set 373# CONFIG_IPMI_HANDLER is not set
@@ -440,6 +447,7 @@ CONFIG_INOTIFY_USER=y
440# 447#
441# Caches 448# Caches
442# 449#
450# CONFIG_FSCACHE is not set
443 451
444# 452#
445# Pseudo filesystems 453# Pseudo filesystems
@@ -491,6 +499,7 @@ CONFIG_HAVE_ARCH_KGDB=y
491CONFIG_DEFAULT_SECURITY_DAC=y 499CONFIG_DEFAULT_SECURITY_DAC=y
492CONFIG_DEFAULT_SECURITY="" 500CONFIG_DEFAULT_SECURITY=""
493# CONFIG_CRYPTO is not set 501# CONFIG_CRYPTO is not set
502# CONFIG_VIRTUALIZATION is not set
494# CONFIG_BINARY_PRINTF is not set 503# CONFIG_BINARY_PRINTF is not set
495 504
496# 505#
diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig
index 0932e6d656e..8257f577637 100644
--- a/arch/sh/configs/edosk7760_defconfig
+++ b/arch/sh/configs/edosk7760_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-rc5
4# Mon Jan 4 11:24:44 2010 4# Tue May 18 15:23:10 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -72,7 +75,6 @@ CONFIG_RCU_FANOUT=32
72CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
73CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
74CONFIG_LOG_BUF_SHIFT=17 77CONFIG_LOG_BUF_SHIFT=17
75# CONFIG_GROUP_SCHED is not set
76# CONFIG_CGROUPS is not set 78# CONFIG_CGROUPS is not set
77CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
78CONFIG_SYSFS_DEPRECATED_V2=y 80CONFIG_SYSFS_DEPRECATED_V2=y
@@ -83,6 +85,7 @@ CONFIG_INITRAMFS_SOURCE=""
83CONFIG_RD_GZIP=y 85CONFIG_RD_GZIP=y
84# CONFIG_RD_BZIP2 is not set 86# CONFIG_RD_BZIP2 is not set
85# CONFIG_RD_LZMA is not set 87# CONFIG_RD_LZMA is not set
88# CONFIG_RD_LZO is not set
86CONFIG_CC_OPTIMIZE_FOR_SIZE=y 89CONFIG_CC_OPTIMIZE_FOR_SIZE=y
87CONFIG_SYSCTL=y 90CONFIG_SYSCTL=y
88CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
@@ -110,8 +113,9 @@ CONFIG_PERF_USE_VMALLOC=y
110# 113#
111# Kernel Performance Events And Counters 114# Kernel Performance Events And Counters
112# 115#
113# CONFIG_PERF_EVENTS is not set 116CONFIG_PERF_EVENTS=y
114# CONFIG_PERF_COUNTERS is not set 117# CONFIG_PERF_COUNTERS is not set
118# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
115CONFIG_VM_EVENT_COUNTERS=y 119CONFIG_VM_EVENT_COUNTERS=y
116CONFIG_SLUB_DEBUG=y 120CONFIG_SLUB_DEBUG=y
117CONFIG_COMPAT_BRK=y 121CONFIG_COMPAT_BRK=y
@@ -128,6 +132,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_DMA_ATTRS=y 132CONFIG_HAVE_DMA_ATTRS=y
129CONFIG_HAVE_CLK=y 133CONFIG_HAVE_CLK=y
130CONFIG_HAVE_DMA_API_DEBUG=y 134CONFIG_HAVE_DMA_API_DEBUG=y
135CONFIG_HAVE_HW_BREAKPOINT=y
131 136
132# 137#
133# GCOV-based kernel profiling 138# GCOV-based kernel profiling
@@ -246,6 +251,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
246CONFIG_MAX_ACTIVE_REGIONS=1 251CONFIG_MAX_ACTIVE_REGIONS=1
247CONFIG_ARCH_POPULATES_NODE_MAP=y 252CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_ARCH_SELECT_MEMORY_MODEL=y 253CONFIG_ARCH_SELECT_MEMORY_MODEL=y
254CONFIG_UNCACHED_MAPPING=y
249CONFIG_PAGE_SIZE_4KB=y 255CONFIG_PAGE_SIZE_4KB=y
250# CONFIG_PAGE_SIZE_8KB is not set 256# CONFIG_PAGE_SIZE_8KB is not set
251# CONFIG_PAGE_SIZE_16KB is not set 257# CONFIG_PAGE_SIZE_16KB is not set
@@ -261,7 +267,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 267CONFIG_SPLIT_PTLOCK_CPUS=4
262# CONFIG_PHYS_ADDR_T_64BIT is not set 268# CONFIG_PHYS_ADDR_T_64BIT is not set
263CONFIG_ZONE_DMA_FLAG=0 269CONFIG_ZONE_DMA_FLAG=0
264CONFIG_NR_QUICK=2 270CONFIG_NR_QUICK=1
265# CONFIG_KSM is not set 271# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267 273
@@ -342,7 +348,6 @@ CONFIG_SCHED_HRTICK=y
342CONFIG_PREEMPT=y 348CONFIG_PREEMPT=y
343CONFIG_GUSA=y 349CONFIG_GUSA=y
344# CONFIG_GUSA_RB is not set 350# CONFIG_GUSA_RB is not set
345# CONFIG_SPARSE_IRQ is not set
346 351
347# 352#
348# Boot options 353# Boot options
@@ -379,7 +384,6 @@ CONFIG_NET=y
379# Networking options 384# Networking options
380# 385#
381CONFIG_PACKET=y 386CONFIG_PACKET=y
382# CONFIG_PACKET_MMAP is not set
383CONFIG_UNIX=y 387CONFIG_UNIX=y
384# CONFIG_NET_KEY is not set 388# CONFIG_NET_KEY is not set
385CONFIG_INET=y 389CONFIG_INET=y
@@ -579,6 +583,7 @@ CONFIG_HAVE_IDE=y
579# 583#
580# SCSI device support 584# SCSI device support
581# 585#
586CONFIG_SCSI_MOD=y
582# CONFIG_RAID_ATTRS is not set 587# CONFIG_RAID_ATTRS is not set
583# CONFIG_SCSI is not set 588# CONFIG_SCSI is not set
584# CONFIG_SCSI_DMA is not set 589# CONFIG_SCSI_DMA is not set
@@ -685,6 +690,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
685CONFIG_SERIAL_SH_SCI_CONSOLE=y 690CONFIG_SERIAL_SH_SCI_CONSOLE=y
686CONFIG_SERIAL_CORE=y 691CONFIG_SERIAL_CORE=y
687CONFIG_SERIAL_CORE_CONSOLE=y 692CONFIG_SERIAL_CORE_CONSOLE=y
693# CONFIG_SERIAL_TIMBERDALE is not set
688CONFIG_UNIX98_PTYS=y 694CONFIG_UNIX98_PTYS=y
689# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 695# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
690CONFIG_LEGACY_PTYS=y 696CONFIG_LEGACY_PTYS=y
@@ -713,6 +719,7 @@ CONFIG_I2C_HELPER_AUTO=y
713CONFIG_I2C_SH7760=y 719CONFIG_I2C_SH7760=y
714# CONFIG_I2C_SH_MOBILE is not set 720# CONFIG_I2C_SH_MOBILE is not set
715# CONFIG_I2C_SIMTEC is not set 721# CONFIG_I2C_SIMTEC is not set
722# CONFIG_I2C_XILINX is not set
716 723
717# 724#
718# External I2C/SMBus adapter drivers 725# External I2C/SMBus adapter drivers
@@ -725,15 +732,9 @@ CONFIG_I2C_SH7760=y
725# 732#
726# CONFIG_I2C_PCA_PLATFORM is not set 733# CONFIG_I2C_PCA_PLATFORM is not set
727# CONFIG_I2C_STUB is not set 734# CONFIG_I2C_STUB is not set
728
729#
730# Miscellaneous I2C Chip support
731#
732# CONFIG_SENSORS_TSL2550 is not set
733CONFIG_I2C_DEBUG_CORE=y 735CONFIG_I2C_DEBUG_CORE=y
734CONFIG_I2C_DEBUG_ALGO=y 736CONFIG_I2C_DEBUG_ALGO=y
735CONFIG_I2C_DEBUG_BUS=y 737CONFIG_I2C_DEBUG_BUS=y
736CONFIG_I2C_DEBUG_CHIP=y
737# CONFIG_SPI is not set 738# CONFIG_SPI is not set
738 739
739# 740#
@@ -756,6 +757,7 @@ CONFIG_SSB_POSSIBLE=y
756# Multifunction device drivers 757# Multifunction device drivers
757# 758#
758# CONFIG_MFD_CORE is not set 759# CONFIG_MFD_CORE is not set
760# CONFIG_MFD_88PM860X is not set
759# CONFIG_MFD_SM501 is not set 761# CONFIG_MFD_SM501 is not set
760# CONFIG_MFD_SH_MOBILE_SDHI is not set 762# CONFIG_MFD_SH_MOBILE_SDHI is not set
761# CONFIG_HTC_PASIC3 is not set 763# CONFIG_HTC_PASIC3 is not set
@@ -763,12 +765,13 @@ CONFIG_SSB_POSSIBLE=y
763# CONFIG_MFD_TMIO is not set 765# CONFIG_MFD_TMIO is not set
764# CONFIG_PMIC_DA903X is not set 766# CONFIG_PMIC_DA903X is not set
765# CONFIG_PMIC_ADP5520 is not set 767# CONFIG_PMIC_ADP5520 is not set
768# CONFIG_MFD_MAX8925 is not set
766# CONFIG_MFD_WM8400 is not set 769# CONFIG_MFD_WM8400 is not set
767# CONFIG_MFD_WM831X is not set 770# CONFIG_MFD_WM831X is not set
768# CONFIG_MFD_WM8350_I2C is not set 771# CONFIG_MFD_WM8350_I2C is not set
772# CONFIG_MFD_WM8994 is not set
769# CONFIG_MFD_PCF50633 is not set 773# CONFIG_MFD_PCF50633 is not set
770# CONFIG_AB3100_CORE is not set 774# CONFIG_AB3100_CORE is not set
771# CONFIG_MFD_88PM8607 is not set
772# CONFIG_REGULATOR is not set 775# CONFIG_REGULATOR is not set
773# CONFIG_MEDIA_SUPPORT is not set 776# CONFIG_MEDIA_SUPPORT is not set
774 777
@@ -947,6 +950,7 @@ CONFIG_MISC_FILESYSTEMS=y
947# CONFIG_BFS_FS is not set 950# CONFIG_BFS_FS is not set
948# CONFIG_EFS_FS is not set 951# CONFIG_EFS_FS is not set
949# CONFIG_JFFS2_FS is not set 952# CONFIG_JFFS2_FS is not set
953# CONFIG_LOGFS is not set
950# CONFIG_CRAMFS is not set 954# CONFIG_CRAMFS is not set
951# CONFIG_SQUASHFS is not set 955# CONFIG_SQUASHFS is not set
952# CONFIG_VXFS_FS is not set 956# CONFIG_VXFS_FS is not set
@@ -969,6 +973,7 @@ CONFIG_SUNRPC=y
969# CONFIG_RPCSEC_GSS_KRB5 is not set 973# CONFIG_RPCSEC_GSS_KRB5 is not set
970# CONFIG_RPCSEC_GSS_SPKM3 is not set 974# CONFIG_RPCSEC_GSS_SPKM3 is not set
971# CONFIG_SMB_FS is not set 975# CONFIG_SMB_FS is not set
976# CONFIG_CEPH_FS is not set
972# CONFIG_CIFS is not set 977# CONFIG_CIFS is not set
973# CONFIG_NCP_FS is not set 978# CONFIG_NCP_FS is not set
974# CONFIG_CODA_FS is not set 979# CONFIG_CODA_FS is not set
@@ -1048,6 +1053,7 @@ CONFIG_TIMER_STATS=y
1048# CONFIG_DEBUG_OBJECTS is not set 1053# CONFIG_DEBUG_OBJECTS is not set
1049# CONFIG_SLUB_DEBUG_ON is not set 1054# CONFIG_SLUB_DEBUG_ON is not set
1050# CONFIG_SLUB_STATS is not set 1055# CONFIG_SLUB_STATS is not set
1056# CONFIG_DEBUG_KMEMLEAK is not set
1051CONFIG_DEBUG_PREEMPT=y 1057CONFIG_DEBUG_PREEMPT=y
1052# CONFIG_DEBUG_RT_MUTEXES is not set 1058# CONFIG_DEBUG_RT_MUTEXES is not set
1053# CONFIG_RT_MUTEX_TESTER is not set 1059# CONFIG_RT_MUTEX_TESTER is not set
@@ -1096,6 +1102,7 @@ CONFIG_FTRACE=y
1096CONFIG_BRANCH_PROFILE_NONE=y 1102CONFIG_BRANCH_PROFILE_NONE=y
1097# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1103# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1098# CONFIG_PROFILE_ALL_BRANCHES is not set 1104# CONFIG_PROFILE_ALL_BRANCHES is not set
1105# CONFIG_KSYM_TRACER is not set
1099# CONFIG_STACK_TRACER is not set 1106# CONFIG_STACK_TRACER is not set
1100# CONFIG_KMEMTRACE is not set 1107# CONFIG_KMEMTRACE is not set
1101# CONFIG_WORKQUEUE_TRACER is not set 1108# CONFIG_WORKQUEUE_TRACER is not set
@@ -1214,6 +1221,7 @@ CONFIG_CRYPTO_DES=y
1214# 1221#
1215# CONFIG_CRYPTO_ANSI_CPRNG is not set 1222# CONFIG_CRYPTO_ANSI_CPRNG is not set
1216CONFIG_CRYPTO_HW=y 1223CONFIG_CRYPTO_HW=y
1224# CONFIG_VIRTUALIZATION is not set
1217# CONFIG_BINARY_PRINTF is not set 1225# CONFIG_BINARY_PRINTF is not set
1218 1226
1219# 1227#
diff --git a/arch/sh/configs/espt_defconfig b/arch/sh/configs/espt_defconfig
index f899e5613f8..8acdc374d03 100644
--- a/arch/sh/configs/espt_defconfig
+++ b/arch/sh/configs/espt_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-rc5
4# Mon Jan 4 11:26:55 2010 4# Tue May 18 15:27:14 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -69,11 +72,6 @@ CONFIG_RCU_FANOUT=32
69CONFIG_IKCONFIG=y 72CONFIG_IKCONFIG=y
70CONFIG_IKCONFIG_PROC=y 73CONFIG_IKCONFIG_PROC=y
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_GROUP_SCHED=y
73CONFIG_FAIR_GROUP_SCHED=y
74# CONFIG_RT_GROUP_SCHED is not set
75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -112,7 +110,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
113# 111#
114CONFIG_PERF_EVENTS=y 112CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
117CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
@@ -120,7 +117,6 @@ CONFIG_SLAB=y
120# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
121# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
122CONFIG_PROFILING=y 119CONFIG_PROFILING=y
123CONFIG_TRACEPOINTS=y
124CONFIG_OPROFILE=y 120CONFIG_OPROFILE=y
125CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
@@ -131,6 +127,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
131CONFIG_HAVE_DMA_ATTRS=y 127CONFIG_HAVE_DMA_ATTRS=y
132CONFIG_HAVE_CLK=y 128CONFIG_HAVE_CLK=y
133CONFIG_HAVE_DMA_API_DEBUG=y 129CONFIG_HAVE_DMA_API_DEBUG=y
130CONFIG_HAVE_HW_BREAKPOINT=y
134 131
135# 132#
136# GCOV-based kernel profiling 133# GCOV-based kernel profiling
@@ -243,7 +240,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
243CONFIG_MEMORY_START=0x0c000000 240CONFIG_MEMORY_START=0x0c000000
244CONFIG_MEMORY_SIZE=0x04000000 241CONFIG_MEMORY_SIZE=0x04000000
245CONFIG_29BIT=y 242CONFIG_29BIT=y
246# CONFIG_PMB_ENABLE is not set 243# CONFIG_PMB is not set
247CONFIG_VSYSCALL=y 244CONFIG_VSYSCALL=y
248CONFIG_ARCH_FLATMEM_ENABLE=y 245CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_SPARSEMEM_ENABLE=y 246CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -253,6 +250,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
253CONFIG_ARCH_SELECT_MEMORY_MODEL=y 250CONFIG_ARCH_SELECT_MEMORY_MODEL=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
255CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
253CONFIG_UNCACHED_MAPPING=y
256CONFIG_PAGE_SIZE_4KB=y 254CONFIG_PAGE_SIZE_4KB=y
257# CONFIG_PAGE_SIZE_8KB is not set 255# CONFIG_PAGE_SIZE_8KB is not set
258# CONFIG_PAGE_SIZE_16KB is not set 256# CONFIG_PAGE_SIZE_16KB is not set
@@ -269,7 +267,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
269CONFIG_MIGRATION=y 267CONFIG_MIGRATION=y
270# CONFIG_PHYS_ADDR_T_64BIT is not set 268# CONFIG_PHYS_ADDR_T_64BIT is not set
271CONFIG_ZONE_DMA_FLAG=0 269CONFIG_ZONE_DMA_FLAG=0
272CONFIG_NR_QUICK=2 270CONFIG_NR_QUICK=1
273# CONFIG_KSM is not set 271# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275 273
@@ -344,7 +342,7 @@ CONFIG_PREEMPT_NONE=y
344# CONFIG_PREEMPT_VOLUNTARY is not set 342# CONFIG_PREEMPT_VOLUNTARY is not set
345# CONFIG_PREEMPT is not set 343# CONFIG_PREEMPT is not set
346CONFIG_GUSA=y 344CONFIG_GUSA=y
347# CONFIG_SPARSE_IRQ is not set 345# CONFIG_INTC_USERIMASK is not set
348 346
349# 347#
350# Boot options 348# Boot options
@@ -381,7 +379,6 @@ CONFIG_NET=y
381# Networking options 379# Networking options
382# 380#
383CONFIG_PACKET=y 381CONFIG_PACKET=y
384# CONFIG_PACKET_MMAP is not set
385CONFIG_UNIX=y 382CONFIG_UNIX=y
386CONFIG_XFRM=y 383CONFIG_XFRM=y
387# CONFIG_XFRM_USER is not set 384# CONFIG_XFRM_USER is not set
@@ -444,7 +441,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
444# Network testing 441# Network testing
445# 442#
446# CONFIG_NET_PKTGEN is not set 443# CONFIG_NET_PKTGEN is not set
447# CONFIG_NET_DROP_MONITOR is not set
448# CONFIG_HAMRADIO is not set 444# CONFIG_HAMRADIO is not set
449# CONFIG_CAN is not set 445# CONFIG_CAN is not set
450# CONFIG_IRDA is not set 446# CONFIG_IRDA is not set
@@ -584,6 +580,7 @@ CONFIG_HAVE_IDE=y
584# 580#
585# SCSI device support 581# SCSI device support
586# 582#
583CONFIG_SCSI_MOD=y
587# CONFIG_RAID_ATTRS is not set 584# CONFIG_RAID_ATTRS is not set
588CONFIG_SCSI=y 585CONFIG_SCSI=y
589CONFIG_SCSI_DMA=y 586CONFIG_SCSI_DMA=y
@@ -688,6 +685,7 @@ CONFIG_WLAN=y
688# CONFIG_USB_PEGASUS is not set 685# CONFIG_USB_PEGASUS is not set
689# CONFIG_USB_RTL8150 is not set 686# CONFIG_USB_RTL8150 is not set
690# CONFIG_USB_USBNET is not set 687# CONFIG_USB_USBNET is not set
688# CONFIG_USB_IPHETH is not set
691# CONFIG_WAN is not set 689# CONFIG_WAN is not set
692# CONFIG_PPP is not set 690# CONFIG_PPP is not set
693# CONFIG_SLIP is not set 691# CONFIG_SLIP is not set
@@ -753,6 +751,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
753CONFIG_SERIAL_SH_SCI_CONSOLE=y 751CONFIG_SERIAL_SH_SCI_CONSOLE=y
754CONFIG_SERIAL_CORE=y 752CONFIG_SERIAL_CORE=y
755CONFIG_SERIAL_CORE_CONSOLE=y 753CONFIG_SERIAL_CORE_CONSOLE=y
754# CONFIG_SERIAL_TIMBERDALE is not set
756CONFIG_UNIX98_PTYS=y 755CONFIG_UNIX98_PTYS=y
757# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 756# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
758CONFIG_LEGACY_PTYS=y 757CONFIG_LEGACY_PTYS=y
@@ -944,7 +943,6 @@ CONFIG_USB_STORAGE=y
944# CONFIG_USB_RIO500 is not set 943# CONFIG_USB_RIO500 is not set
945# CONFIG_USB_LEGOTOWER is not set 944# CONFIG_USB_LEGOTOWER is not set
946# CONFIG_USB_LCD is not set 945# CONFIG_USB_LCD is not set
947# CONFIG_USB_BERRY_CHARGE is not set
948# CONFIG_USB_LED is not set 946# CONFIG_USB_LED is not set
949# CONFIG_USB_CYPRESS_CY7C63 is not set 947# CONFIG_USB_CYPRESS_CY7C63 is not set
950# CONFIG_USB_CYTHERM is not set 948# CONFIG_USB_CYTHERM is not set
@@ -956,7 +954,6 @@ CONFIG_USB_STORAGE=y
956# CONFIG_USB_IOWARRIOR is not set 954# CONFIG_USB_IOWARRIOR is not set
957# CONFIG_USB_TEST is not set 955# CONFIG_USB_TEST is not set
958# CONFIG_USB_ISIGHTFW is not set 956# CONFIG_USB_ISIGHTFW is not set
959# CONFIG_USB_VST is not set
960# CONFIG_USB_GADGET is not set 957# CONFIG_USB_GADGET is not set
961 958
962# 959#
@@ -1052,6 +1049,7 @@ CONFIG_MISC_FILESYSTEMS=y
1052# CONFIG_BFS_FS is not set 1049# CONFIG_BFS_FS is not set
1053# CONFIG_EFS_FS is not set 1050# CONFIG_EFS_FS is not set
1054# CONFIG_JFFS2_FS is not set 1051# CONFIG_JFFS2_FS is not set
1052# CONFIG_LOGFS is not set
1055CONFIG_CRAMFS=y 1053CONFIG_CRAMFS=y
1056# CONFIG_SQUASHFS is not set 1054# CONFIG_SQUASHFS is not set
1057# CONFIG_VXFS_FS is not set 1055# CONFIG_VXFS_FS is not set
@@ -1078,6 +1076,7 @@ CONFIG_SUNRPC=y
1078# CONFIG_RPCSEC_GSS_KRB5 is not set 1076# CONFIG_RPCSEC_GSS_KRB5 is not set
1079# CONFIG_RPCSEC_GSS_SPKM3 is not set 1077# CONFIG_RPCSEC_GSS_SPKM3 is not set
1080# CONFIG_SMB_FS is not set 1078# CONFIG_SMB_FS is not set
1079# CONFIG_CEPH_FS is not set
1081# CONFIG_CIFS is not set 1080# CONFIG_CIFS is not set
1082# CONFIG_NCP_FS is not set 1081# CONFIG_NCP_FS is not set
1083# CONFIG_CODA_FS is not set 1082# CONFIG_CODA_FS is not set
@@ -1144,13 +1143,12 @@ CONFIG_FRAME_WARN=1024
1144CONFIG_DEBUG_FS=y 1143CONFIG_DEBUG_FS=y
1145# CONFIG_HEADERS_CHECK is not set 1144# CONFIG_HEADERS_CHECK is not set
1146# CONFIG_DEBUG_KERNEL is not set 1145# CONFIG_DEBUG_KERNEL is not set
1147CONFIG_STACKTRACE=y
1148CONFIG_DEBUG_BUGVERBOSE=y 1146CONFIG_DEBUG_BUGVERBOSE=y
1149# CONFIG_DEBUG_MEMORY_INIT is not set 1147# CONFIG_DEBUG_MEMORY_INIT is not set
1150# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1148# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1149# CONFIG_LKDTM is not set
1151# CONFIG_LATENCYTOP is not set 1150# CONFIG_LATENCYTOP is not set
1152# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1151# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1153CONFIG_NOP_TRACER=y
1154CONFIG_HAVE_FUNCTION_TRACER=y 1152CONFIG_HAVE_FUNCTION_TRACER=y
1155CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1153CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1156CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1154CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1158,10 +1156,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1158CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1156CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1159CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1157CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1160CONFIG_RING_BUFFER=y 1158CONFIG_RING_BUFFER=y
1161CONFIG_EVENT_TRACING=y
1162CONFIG_CONTEXT_SWITCH_TRACER=y
1163CONFIG_RING_BUFFER_ALLOW_SWAP=y 1159CONFIG_RING_BUFFER_ALLOW_SWAP=y
1164CONFIG_TRACING=y
1165CONFIG_TRACING_SUPPORT=y 1160CONFIG_TRACING_SUPPORT=y
1166# CONFIG_FTRACE is not set 1161# CONFIG_FTRACE is not set
1167# CONFIG_DYNAMIC_DEBUG is not set 1162# CONFIG_DYNAMIC_DEBUG is not set
@@ -1269,7 +1264,8 @@ CONFIG_CRYPTO=y
1269# 1264#
1270# CONFIG_CRYPTO_ANSI_CPRNG is not set 1265# CONFIG_CRYPTO_ANSI_CPRNG is not set
1271CONFIG_CRYPTO_HW=y 1266CONFIG_CRYPTO_HW=y
1272CONFIG_BINARY_PRINTF=y 1267# CONFIG_VIRTUALIZATION is not set
1268# CONFIG_BINARY_PRINTF is not set
1273 1269
1274# 1270#
1275# Library routines 1271# Library routines
diff --git a/arch/sh/configs/hp6xx_defconfig b/arch/sh/configs/hp6xx_defconfig
index 06644908631..f894bdc97a6 100644
--- a/arch/sh/configs/hp6xx_defconfig
+++ b/arch/sh/configs/hp6xx_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-rc5
4# Mon Jan 4 11:30:31 2010 4# Tue May 18 15:30:50 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52# CONFIG_SYSVIPC is not set 55# CONFIG_SYSVIPC is not set
53CONFIG_BSD_PROCESS_ACCT=y 56CONFIG_BSD_PROCESS_ACCT=y
@@ -66,7 +69,6 @@ CONFIG_RCU_FANOUT=32
66CONFIG_IKCONFIG=y 69CONFIG_IKCONFIG=y
67CONFIG_IKCONFIG_PROC=y 70CONFIG_IKCONFIG_PROC=y
68CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
69# CONFIG_GROUP_SCHED is not set
70# CONFIG_CGROUPS is not set 72# CONFIG_CGROUPS is not set
71CONFIG_SYSFS_DEPRECATED=y 73CONFIG_SYSFS_DEPRECATED=y
72CONFIG_SYSFS_DEPRECATED_V2=y 74CONFIG_SYSFS_DEPRECATED_V2=y
@@ -99,7 +101,7 @@ CONFIG_PERF_USE_VMALLOC=y
99# 101#
100# Kernel Performance Events And Counters 102# Kernel Performance Events And Counters
101# 103#
102# CONFIG_PERF_EVENTS is not set 104CONFIG_PERF_EVENTS=y
103# CONFIG_PERF_COUNTERS is not set 105# CONFIG_PERF_COUNTERS is not set
104CONFIG_VM_EVENT_COUNTERS=y 106CONFIG_VM_EVENT_COUNTERS=y
105CONFIG_COMPAT_BRK=y 107CONFIG_COMPAT_BRK=y
@@ -115,6 +117,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
115CONFIG_HAVE_DMA_ATTRS=y 117CONFIG_HAVE_DMA_ATTRS=y
116CONFIG_HAVE_CLK=y 118CONFIG_HAVE_CLK=y
117CONFIG_HAVE_DMA_API_DEBUG=y 119CONFIG_HAVE_DMA_API_DEBUG=y
120CONFIG_HAVE_HW_BREAKPOINT=y
118 121
119# 122#
120# GCOV-based kernel profiling 123# GCOV-based kernel profiling
@@ -228,6 +231,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
228CONFIG_MAX_ACTIVE_REGIONS=1 231CONFIG_MAX_ACTIVE_REGIONS=1
229CONFIG_ARCH_POPULATES_NODE_MAP=y 232CONFIG_ARCH_POPULATES_NODE_MAP=y
230CONFIG_ARCH_SELECT_MEMORY_MODEL=y 233CONFIG_ARCH_SELECT_MEMORY_MODEL=y
234CONFIG_UNCACHED_MAPPING=y
231CONFIG_PAGE_SIZE_4KB=y 235CONFIG_PAGE_SIZE_4KB=y
232# CONFIG_PAGE_SIZE_8KB is not set 236# CONFIG_PAGE_SIZE_8KB is not set
233# CONFIG_PAGE_SIZE_16KB is not set 237# CONFIG_PAGE_SIZE_16KB is not set
@@ -243,7 +247,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
243CONFIG_SPLIT_PTLOCK_CPUS=4 247CONFIG_SPLIT_PTLOCK_CPUS=4
244# CONFIG_PHYS_ADDR_T_64BIT is not set 248# CONFIG_PHYS_ADDR_T_64BIT is not set
245CONFIG_ZONE_DMA_FLAG=0 249CONFIG_ZONE_DMA_FLAG=0
246CONFIG_NR_QUICK=2 250CONFIG_NR_QUICK=1
247# CONFIG_KSM is not set 251# CONFIG_KSM is not set
248CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 252CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
249 253
@@ -326,7 +330,6 @@ CONFIG_PREEMPT_NONE=y
326# CONFIG_PREEMPT is not set 330# CONFIG_PREEMPT is not set
327CONFIG_GUSA=y 331CONFIG_GUSA=y
328# CONFIG_GUSA_RB is not set 332# CONFIG_GUSA_RB is not set
329# CONFIG_SPARSE_IRQ is not set
330 333
331# 334#
332# Boot options 335# Boot options
@@ -344,7 +347,6 @@ CONFIG_ENTRY_OFFSET=0x00001000
344CONFIG_PCCARD=y 347CONFIG_PCCARD=y
345CONFIG_PCMCIA=y 348CONFIG_PCMCIA=y
346CONFIG_PCMCIA_LOAD_CIS=y 349CONFIG_PCMCIA_LOAD_CIS=y
347CONFIG_PCMCIA_IOCTL=y
348 350
349# 351#
350# PC-card bridges 352# PC-card bridges
@@ -369,6 +371,7 @@ CONFIG_SUSPEND_FREEZER=y
369# CONFIG_HIBERNATION is not set 371# CONFIG_HIBERNATION is not set
370CONFIG_APM_EMULATION=y 372CONFIG_APM_EMULATION=y
371# CONFIG_PM_RUNTIME is not set 373# CONFIG_PM_RUNTIME is not set
374CONFIG_PM_OPS=y
372# CONFIG_CPU_IDLE is not set 375# CONFIG_CPU_IDLE is not set
373# CONFIG_NET is not set 376# CONFIG_NET is not set
374 377
@@ -412,6 +415,7 @@ CONFIG_HAVE_IDE=y
412# 415#
413# SCSI device support 416# SCSI device support
414# 417#
418CONFIG_SCSI_MOD=y
415# CONFIG_RAID_ATTRS is not set 419# CONFIG_RAID_ATTRS is not set
416CONFIG_SCSI=y 420CONFIG_SCSI=y
417CONFIG_SCSI_DMA=y 421CONFIG_SCSI_DMA=y
@@ -544,6 +548,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
544CONFIG_SERIAL_SH_SCI_CONSOLE=y 548CONFIG_SERIAL_SH_SCI_CONSOLE=y
545CONFIG_SERIAL_CORE=y 549CONFIG_SERIAL_CORE=y
546CONFIG_SERIAL_CORE_CONSOLE=y 550CONFIG_SERIAL_CORE_CONSOLE=y
551# CONFIG_SERIAL_TIMBERDALE is not set
547CONFIG_UNIX98_PTYS=y 552CONFIG_UNIX98_PTYS=y
548# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 553# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
549CONFIG_LEGACY_PTYS=y 554CONFIG_LEGACY_PTYS=y
@@ -722,7 +727,6 @@ CONFIG_EXT2_FS=y
722# CONFIG_EXT2_FS_XIP is not set 727# CONFIG_EXT2_FS_XIP is not set
723# CONFIG_EXT3_FS is not set 728# CONFIG_EXT3_FS is not set
724# CONFIG_EXT4_FS is not set 729# CONFIG_EXT4_FS is not set
725CONFIG_EXT4_USE_FOR_EXT23=y
726# CONFIG_REISERFS_FS is not set 730# CONFIG_REISERFS_FS is not set
727# CONFIG_JFS_FS is not set 731# CONFIG_JFS_FS is not set
728# CONFIG_FS_POSIX_ACL is not set 732# CONFIG_FS_POSIX_ACL is not set
@@ -780,6 +784,7 @@ CONFIG_MISC_FILESYSTEMS=y
780# CONFIG_BEFS_FS is not set 784# CONFIG_BEFS_FS is not set
781# CONFIG_BFS_FS is not set 785# CONFIG_BFS_FS is not set
782# CONFIG_EFS_FS is not set 786# CONFIG_EFS_FS is not set
787# CONFIG_LOGFS is not set
783# CONFIG_CRAMFS is not set 788# CONFIG_CRAMFS is not set
784# CONFIG_SQUASHFS is not set 789# CONFIG_SQUASHFS is not set
785# CONFIG_VXFS_FS is not set 790# CONFIG_VXFS_FS is not set
@@ -977,6 +982,7 @@ CONFIG_CRYPTO_MD5=y
977# 982#
978# CONFIG_CRYPTO_ANSI_CPRNG is not set 983# CONFIG_CRYPTO_ANSI_CPRNG is not set
979# CONFIG_CRYPTO_HW is not set 984# CONFIG_CRYPTO_HW is not set
985# CONFIG_VIRTUALIZATION is not set
980# CONFIG_BINARY_PRINTF is not set 986# CONFIG_BINARY_PRINTF is not set
981 987
982# 988#
diff --git a/arch/sh/configs/kfr2r09-romimage_defconfig b/arch/sh/configs/kfr2r09-romimage_defconfig
index 3d834e59e8f..8c54e1620e9 100644
--- a/arch/sh/configs/kfr2r09-romimage_defconfig
+++ b/arch/sh/configs/kfr2r09-romimage_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-rc5
4# Mon Jan 4 11:31:09 2010 4# Tue May 18 15:33:23 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION=""
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
54# CONFIG_POSIX_MQUEUE is not set 57# CONFIG_POSIX_MQUEUE is not set
@@ -70,11 +73,6 @@ CONFIG_RCU_FANOUT=32
70CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
71CONFIG_IKCONFIG_PROC=y 74CONFIG_IKCONFIG_PROC=y
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73CONFIG_GROUP_SCHED=y
74CONFIG_FAIR_GROUP_SCHED=y
75# CONFIG_RT_GROUP_SCHED is not set
76CONFIG_USER_SCHED=y
77# CONFIG_CGROUP_SCHED is not set
78# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 78CONFIG_SYSFS_DEPRECATED_V2=y
@@ -85,6 +83,7 @@ CONFIG_INITRAMFS_SOURCE=""
85CONFIG_RD_GZIP=y 83CONFIG_RD_GZIP=y
86# CONFIG_RD_BZIP2 is not set 84# CONFIG_RD_BZIP2 is not set
87# CONFIG_RD_LZMA is not set 85# CONFIG_RD_LZMA is not set
86# CONFIG_RD_LZO is not set
88CONFIG_CC_OPTIMIZE_FOR_SIZE=y 87CONFIG_CC_OPTIMIZE_FOR_SIZE=y
89CONFIG_SYSCTL=y 88CONFIG_SYSCTL=y
90CONFIG_ANON_INODES=y 89CONFIG_ANON_INODES=y
@@ -110,7 +109,7 @@ CONFIG_PERF_USE_VMALLOC=y
110# 109#
111# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
112# 111#
113# CONFIG_PERF_EVENTS is not set 112CONFIG_PERF_EVENTS=y
114# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
115CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
116CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
@@ -119,13 +118,13 @@ CONFIG_SLAB=y
119# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
120# CONFIG_PROFILING is not set 119# CONFIG_PROFILING is not set
121CONFIG_HAVE_OPROFILE=y 120CONFIG_HAVE_OPROFILE=y
122CONFIG_HAVE_IOREMAP_PROT=y
123CONFIG_HAVE_KPROBES=y 121CONFIG_HAVE_KPROBES=y
124CONFIG_HAVE_KRETPROBES=y 122CONFIG_HAVE_KRETPROBES=y
125CONFIG_HAVE_ARCH_TRACEHOOK=y 123CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_DMA_ATTRS=y 124CONFIG_HAVE_DMA_ATTRS=y
127CONFIG_HAVE_CLK=y 125CONFIG_HAVE_CLK=y
128CONFIG_HAVE_DMA_API_DEBUG=y 126CONFIG_HAVE_DMA_API_DEBUG=y
127CONFIG_HAVE_HW_BREAKPOINT=y
129 128
130# 129#
131# GCOV-based kernel profiling 130# GCOV-based kernel profiling
@@ -222,8 +221,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
222CONFIG_MEMORY_START=0x08000000 221CONFIG_MEMORY_START=0x08000000
223CONFIG_MEMORY_SIZE=0x08000000 222CONFIG_MEMORY_SIZE=0x08000000
224CONFIG_29BIT=y 223CONFIG_29BIT=y
225# CONFIG_PMB_ENABLE is not set 224# CONFIG_PMB is not set
226# CONFIG_X2TLB is not set 225CONFIG_X2TLB=y
227CONFIG_VSYSCALL=y 226CONFIG_VSYSCALL=y
228CONFIG_ARCH_FLATMEM_ENABLE=y 227CONFIG_ARCH_FLATMEM_ENABLE=y
229CONFIG_ARCH_SPARSEMEM_ENABLE=y 228CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -231,6 +230,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
231CONFIG_MAX_ACTIVE_REGIONS=1 230CONFIG_MAX_ACTIVE_REGIONS=1
232CONFIG_ARCH_POPULATES_NODE_MAP=y 231CONFIG_ARCH_POPULATES_NODE_MAP=y
233CONFIG_ARCH_SELECT_MEMORY_MODEL=y 232CONFIG_ARCH_SELECT_MEMORY_MODEL=y
233CONFIG_IOREMAP_FIXED=y
234CONFIG_UNCACHED_MAPPING=y
234CONFIG_PAGE_SIZE_4KB=y 235CONFIG_PAGE_SIZE_4KB=y
235# CONFIG_PAGE_SIZE_8KB is not set 236# CONFIG_PAGE_SIZE_8KB is not set
236# CONFIG_PAGE_SIZE_16KB is not set 237# CONFIG_PAGE_SIZE_16KB is not set
@@ -246,7 +247,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
246CONFIG_SPLIT_PTLOCK_CPUS=4 247CONFIG_SPLIT_PTLOCK_CPUS=4
247# CONFIG_PHYS_ADDR_T_64BIT is not set 248# CONFIG_PHYS_ADDR_T_64BIT is not set
248CONFIG_ZONE_DMA_FLAG=0 249CONFIG_ZONE_DMA_FLAG=0
249CONFIG_NR_QUICK=2 250CONFIG_NR_QUICK=1
250# CONFIG_KSM is not set 251# CONFIG_KSM is not set
251CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 252CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
252 253
@@ -321,7 +322,7 @@ CONFIG_PREEMPT_NONE=y
321# CONFIG_PREEMPT_VOLUNTARY is not set 322# CONFIG_PREEMPT_VOLUNTARY is not set
322# CONFIG_PREEMPT is not set 323# CONFIG_PREEMPT is not set
323CONFIG_GUSA=y 324CONFIG_GUSA=y
324# CONFIG_SPARSE_IRQ is not set 325# CONFIG_INTC_USERIMASK is not set
325 326
326# 327#
327# Boot options 328# Boot options
@@ -354,6 +355,7 @@ CONFIG_PM=y
354# CONFIG_PM_DEBUG is not set 355# CONFIG_PM_DEBUG is not set
355# CONFIG_SUSPEND is not set 356# CONFIG_SUSPEND is not set
356CONFIG_PM_RUNTIME=y 357CONFIG_PM_RUNTIME=y
358CONFIG_PM_OPS=y
357# CONFIG_CPU_IDLE is not set 359# CONFIG_CPU_IDLE is not set
358CONFIG_NET=y 360CONFIG_NET=y
359 361
@@ -361,7 +363,6 @@ CONFIG_NET=y
361# Networking options 363# Networking options
362# 364#
363CONFIG_PACKET=y 365CONFIG_PACKET=y
364CONFIG_PACKET_MMAP=y
365CONFIG_UNIX=y 366CONFIG_UNIX=y
366# CONFIG_NET_KEY is not set 367# CONFIG_NET_KEY is not set
367CONFIG_INET=y 368CONFIG_INET=y
@@ -449,6 +450,7 @@ CONFIG_HAVE_IDE=y
449# 450#
450# SCSI device support 451# SCSI device support
451# 452#
453CONFIG_SCSI_MOD=y
452# CONFIG_SCSI_DMA is not set 454# CONFIG_SCSI_DMA is not set
453# CONFIG_SCSI_NETLINK is not set 455# CONFIG_SCSI_NETLINK is not set
454# CONFIG_NETDEVICES is not set 456# CONFIG_NETDEVICES is not set
@@ -511,6 +513,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
511CONFIG_SERIAL_SH_SCI_CONSOLE=y 513CONFIG_SERIAL_SH_SCI_CONSOLE=y
512CONFIG_SERIAL_CORE=y 514CONFIG_SERIAL_CORE=y
513CONFIG_SERIAL_CORE_CONSOLE=y 515CONFIG_SERIAL_CORE_CONSOLE=y
516# CONFIG_SERIAL_TIMBERDALE is not set
514CONFIG_UNIX98_PTYS=y 517CONFIG_UNIX98_PTYS=y
515# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 518# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
516CONFIG_LEGACY_PTYS=y 519CONFIG_LEGACY_PTYS=y
@@ -538,6 +541,7 @@ CONFIG_I2C_HELPER_AUTO=y
538# CONFIG_I2C_OCORES is not set 541# CONFIG_I2C_OCORES is not set
539CONFIG_I2C_SH_MOBILE=y 542CONFIG_I2C_SH_MOBILE=y
540# CONFIG_I2C_SIMTEC is not set 543# CONFIG_I2C_SIMTEC is not set
544# CONFIG_I2C_XILINX is not set
541 545
542# 546#
543# External I2C/SMBus adapter drivers 547# External I2C/SMBus adapter drivers
@@ -549,15 +553,9 @@ CONFIG_I2C_SH_MOBILE=y
549# Other I2C/SMBus bus drivers 553# Other I2C/SMBus bus drivers
550# 554#
551# CONFIG_I2C_PCA_PLATFORM is not set 555# CONFIG_I2C_PCA_PLATFORM is not set
552
553#
554# Miscellaneous I2C Chip support
555#
556# CONFIG_SENSORS_TSL2550 is not set
557# CONFIG_I2C_DEBUG_CORE is not set 556# CONFIG_I2C_DEBUG_CORE is not set
558# CONFIG_I2C_DEBUG_ALGO is not set 557# CONFIG_I2C_DEBUG_ALGO is not set
559# CONFIG_I2C_DEBUG_BUS is not set 558# CONFIG_I2C_DEBUG_BUS is not set
560# CONFIG_I2C_DEBUG_CHIP is not set
561# CONFIG_SPI is not set 559# CONFIG_SPI is not set
562 560
563# 561#
@@ -571,13 +569,16 @@ CONFIG_GPIO_SYSFS=y
571# 569#
572# Memory mapped GPIO expanders: 570# Memory mapped GPIO expanders:
573# 571#
572# CONFIG_GPIO_IT8761E is not set
574 573
575# 574#
576# I2C GPIO expanders: 575# I2C GPIO expanders:
577# 576#
577# CONFIG_GPIO_MAX7300 is not set
578# CONFIG_GPIO_MAX732X is not set 578# CONFIG_GPIO_MAX732X is not set
579# CONFIG_GPIO_PCA953X is not set 579# CONFIG_GPIO_PCA953X is not set
580# CONFIG_GPIO_PCF857X is not set 580# CONFIG_GPIO_PCF857X is not set
581# CONFIG_GPIO_ADP5588 is not set
581 582
582# 583#
583# PCI GPIO expanders: 584# PCI GPIO expanders:
@@ -606,20 +607,23 @@ CONFIG_SSB_POSSIBLE=y
606# Multifunction device drivers 607# Multifunction device drivers
607# 608#
608# CONFIG_MFD_CORE is not set 609# CONFIG_MFD_CORE is not set
610# CONFIG_MFD_88PM860X is not set
609# CONFIG_MFD_SM501 is not set 611# CONFIG_MFD_SM501 is not set
610# CONFIG_MFD_SH_MOBILE_SDHI is not set 612# CONFIG_MFD_SH_MOBILE_SDHI is not set
611# CONFIG_HTC_PASIC3 is not set 613# CONFIG_HTC_PASIC3 is not set
614# CONFIG_HTC_I2CPLD is not set
612# CONFIG_TPS65010 is not set 615# CONFIG_TPS65010 is not set
613# CONFIG_TWL4030_CORE is not set 616# CONFIG_TWL4030_CORE is not set
614# CONFIG_MFD_TMIO is not set 617# CONFIG_MFD_TMIO is not set
615# CONFIG_PMIC_DA903X is not set 618# CONFIG_PMIC_DA903X is not set
616# CONFIG_PMIC_ADP5520 is not set 619# CONFIG_PMIC_ADP5520 is not set
620# CONFIG_MFD_MAX8925 is not set
617# CONFIG_MFD_WM8400 is not set 621# CONFIG_MFD_WM8400 is not set
618# CONFIG_MFD_WM831X is not set 622# CONFIG_MFD_WM831X is not set
619# CONFIG_MFD_WM8350_I2C is not set 623# CONFIG_MFD_WM8350_I2C is not set
624# CONFIG_MFD_WM8994 is not set
620# CONFIG_MFD_PCF50633 is not set 625# CONFIG_MFD_PCF50633 is not set
621# CONFIG_AB3100_CORE is not set 626# CONFIG_AB3100_CORE is not set
622# CONFIG_MFD_88PM8607 is not set
623# CONFIG_REGULATOR is not set 627# CONFIG_REGULATOR is not set
624# CONFIG_MEDIA_SUPPORT is not set 628# CONFIG_MEDIA_SUPPORT is not set
625 629
@@ -690,6 +694,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
690# CONFIG_USB_MIDI_GADGET is not set 694# CONFIG_USB_MIDI_GADGET is not set
691# CONFIG_USB_G_PRINTER is not set 695# CONFIG_USB_G_PRINTER is not set
692CONFIG_USB_CDC_COMPOSITE=y 696CONFIG_USB_CDC_COMPOSITE=y
697# CONFIG_USB_G_NOKIA is not set
693# CONFIG_USB_G_MULTI is not set 698# CONFIG_USB_G_MULTI is not set
694 699
695# 700#
@@ -794,6 +799,7 @@ CONFIG_HAVE_ARCH_KGDB=y
794CONFIG_DEFAULT_SECURITY_DAC=y 799CONFIG_DEFAULT_SECURITY_DAC=y
795CONFIG_DEFAULT_SECURITY="" 800CONFIG_DEFAULT_SECURITY=""
796# CONFIG_CRYPTO is not set 801# CONFIG_CRYPTO is not set
802# CONFIG_VIRTUALIZATION is not set
797# CONFIG_BINARY_PRINTF is not set 803# CONFIG_BINARY_PRINTF is not set
798 804
799# 805#
diff --git a/arch/sh/configs/kfr2r09_defconfig b/arch/sh/configs/kfr2r09_defconfig
index f22be494ed9..2e74b08ca14 100644
--- a/arch/sh/configs/kfr2r09_defconfig
+++ b/arch/sh/configs/kfr2r09_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-rc5
4# Mon Jan 4 11:32:55 2010 4# Tue May 18 15:35:20 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION=""
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_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
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -72,11 +75,6 @@ CONFIG_RCU_FANOUT=32
72CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
73CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
74CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y
77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set 78# CONFIG_CGROUPS is not set
81CONFIG_SYSFS_DEPRECATED=y 79CONFIG_SYSFS_DEPRECATED=y
82CONFIG_SYSFS_DEPRECATED_V2=y 80CONFIG_SYSFS_DEPRECATED_V2=y
@@ -87,6 +85,7 @@ CONFIG_INITRAMFS_SOURCE=""
87CONFIG_RD_GZIP=y 85CONFIG_RD_GZIP=y
88# CONFIG_RD_BZIP2 is not set 86# CONFIG_RD_BZIP2 is not set
89# CONFIG_RD_LZMA is not set 87# CONFIG_RD_LZMA is not set
88# CONFIG_RD_LZO is not set
90CONFIG_CC_OPTIMIZE_FOR_SIZE=y 89CONFIG_CC_OPTIMIZE_FOR_SIZE=y
91CONFIG_SYSCTL=y 90CONFIG_SYSCTL=y
92CONFIG_ANON_INODES=y 91CONFIG_ANON_INODES=y
@@ -112,7 +111,7 @@ CONFIG_PERF_USE_VMALLOC=y
112# 111#
113# Kernel Performance Events And Counters 112# Kernel Performance Events And Counters
114# 113#
115# CONFIG_PERF_EVENTS is not set 114CONFIG_PERF_EVENTS=y
116# CONFIG_PERF_COUNTERS is not set 115# CONFIG_PERF_COUNTERS is not set
117CONFIG_VM_EVENT_COUNTERS=y 116CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_COMPAT_BRK=y 117CONFIG_COMPAT_BRK=y
@@ -121,13 +120,13 @@ CONFIG_SLAB=y
121# CONFIG_SLOB is not set 120# CONFIG_SLOB is not set
122# CONFIG_PROFILING is not set 121# CONFIG_PROFILING is not set
123CONFIG_HAVE_OPROFILE=y 122CONFIG_HAVE_OPROFILE=y
124CONFIG_HAVE_IOREMAP_PROT=y
125CONFIG_HAVE_KPROBES=y 123CONFIG_HAVE_KPROBES=y
126CONFIG_HAVE_KRETPROBES=y 124CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 125CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_DMA_ATTRS=y 126CONFIG_HAVE_DMA_ATTRS=y
129CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
130CONFIG_HAVE_DMA_API_DEBUG=y 128CONFIG_HAVE_DMA_API_DEBUG=y
129CONFIG_HAVE_HW_BREAKPOINT=y
131 130
132# 131#
133# GCOV-based kernel profiling 132# GCOV-based kernel profiling
@@ -243,8 +242,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
243CONFIG_MEMORY_START=0x08000000 242CONFIG_MEMORY_START=0x08000000
244CONFIG_MEMORY_SIZE=0x08000000 243CONFIG_MEMORY_SIZE=0x08000000
245CONFIG_29BIT=y 244CONFIG_29BIT=y
246# CONFIG_PMB_ENABLE is not set 245# CONFIG_PMB is not set
247# CONFIG_X2TLB is not set 246CONFIG_X2TLB=y
248CONFIG_VSYSCALL=y 247CONFIG_VSYSCALL=y
249CONFIG_ARCH_FLATMEM_ENABLE=y 248CONFIG_ARCH_FLATMEM_ENABLE=y
250CONFIG_ARCH_SPARSEMEM_ENABLE=y 249CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -252,6 +251,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
252CONFIG_MAX_ACTIVE_REGIONS=1 251CONFIG_MAX_ACTIVE_REGIONS=1
253CONFIG_ARCH_POPULATES_NODE_MAP=y 252CONFIG_ARCH_POPULATES_NODE_MAP=y
254CONFIG_ARCH_SELECT_MEMORY_MODEL=y 253CONFIG_ARCH_SELECT_MEMORY_MODEL=y
254CONFIG_IOREMAP_FIXED=y
255CONFIG_UNCACHED_MAPPING=y
255CONFIG_PAGE_SIZE_4KB=y 256CONFIG_PAGE_SIZE_4KB=y
256# CONFIG_PAGE_SIZE_8KB is not set 257# CONFIG_PAGE_SIZE_8KB is not set
257# CONFIG_PAGE_SIZE_16KB is not set 258# CONFIG_PAGE_SIZE_16KB is not set
@@ -267,7 +268,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
267CONFIG_SPLIT_PTLOCK_CPUS=4 268CONFIG_SPLIT_PTLOCK_CPUS=4
268# CONFIG_PHYS_ADDR_T_64BIT is not set 269# CONFIG_PHYS_ADDR_T_64BIT is not set
269CONFIG_ZONE_DMA_FLAG=0 270CONFIG_ZONE_DMA_FLAG=0
270CONFIG_NR_QUICK=2 271CONFIG_NR_QUICK=1
271# CONFIG_KSM is not set 272# CONFIG_KSM is not set
272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
273 274
@@ -343,7 +344,7 @@ CONFIG_KEXEC=y
343# CONFIG_PREEMPT_VOLUNTARY is not set 344# CONFIG_PREEMPT_VOLUNTARY is not set
344CONFIG_PREEMPT=y 345CONFIG_PREEMPT=y
345CONFIG_GUSA=y 346CONFIG_GUSA=y
346# CONFIG_SPARSE_IRQ is not set 347# CONFIG_INTC_USERIMASK is not set
347 348
348# 349#
349# Boot options 350# Boot options
@@ -377,6 +378,7 @@ CONFIG_PM=y
377# CONFIG_SUSPEND is not set 378# CONFIG_SUSPEND is not set
378# CONFIG_HIBERNATION is not set 379# CONFIG_HIBERNATION is not set
379CONFIG_PM_RUNTIME=y 380CONFIG_PM_RUNTIME=y
381CONFIG_PM_OPS=y
380CONFIG_CPU_IDLE=y 382CONFIG_CPU_IDLE=y
381CONFIG_CPU_IDLE_GOV_LADDER=y 383CONFIG_CPU_IDLE_GOV_LADDER=y
382CONFIG_CPU_IDLE_GOV_MENU=y 384CONFIG_CPU_IDLE_GOV_MENU=y
@@ -386,7 +388,6 @@ CONFIG_NET=y
386# Networking options 388# Networking options
387# 389#
388CONFIG_PACKET=y 390CONFIG_PACKET=y
389CONFIG_PACKET_MMAP=y
390CONFIG_UNIX=y 391CONFIG_UNIX=y
391# CONFIG_NET_KEY is not set 392# CONFIG_NET_KEY is not set
392CONFIG_INET=y 393CONFIG_INET=y
@@ -580,6 +581,7 @@ CONFIG_HAVE_IDE=y
580# 581#
581# SCSI device support 582# SCSI device support
582# 583#
584CONFIG_SCSI_MOD=y
583# CONFIG_RAID_ATTRS is not set 585# CONFIG_RAID_ATTRS is not set
584# CONFIG_SCSI is not set 586# CONFIG_SCSI is not set
585# CONFIG_SCSI_DMA is not set 587# CONFIG_SCSI_DMA is not set
@@ -659,6 +661,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
659CONFIG_SERIAL_SH_SCI_CONSOLE=y 661CONFIG_SERIAL_SH_SCI_CONSOLE=y
660CONFIG_SERIAL_CORE=y 662CONFIG_SERIAL_CORE=y
661CONFIG_SERIAL_CORE_CONSOLE=y 663CONFIG_SERIAL_CORE_CONSOLE=y
664# CONFIG_SERIAL_TIMBERDALE is not set
662CONFIG_UNIX98_PTYS=y 665CONFIG_UNIX98_PTYS=y
663# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 666# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
664CONFIG_LEGACY_PTYS=y 667CONFIG_LEGACY_PTYS=y
@@ -687,6 +690,7 @@ CONFIG_I2C_HELPER_AUTO=y
687# CONFIG_I2C_OCORES is not set 690# CONFIG_I2C_OCORES is not set
688CONFIG_I2C_SH_MOBILE=y 691CONFIG_I2C_SH_MOBILE=y
689# CONFIG_I2C_SIMTEC is not set 692# CONFIG_I2C_SIMTEC is not set
693# CONFIG_I2C_XILINX is not set
690 694
691# 695#
692# External I2C/SMBus adapter drivers 696# External I2C/SMBus adapter drivers
@@ -699,15 +703,9 @@ CONFIG_I2C_SH_MOBILE=y
699# 703#
700# CONFIG_I2C_PCA_PLATFORM is not set 704# CONFIG_I2C_PCA_PLATFORM is not set
701# CONFIG_I2C_STUB is not set 705# CONFIG_I2C_STUB is not set
702
703#
704# Miscellaneous I2C Chip support
705#
706# CONFIG_SENSORS_TSL2550 is not set
707# CONFIG_I2C_DEBUG_CORE is not set 706# CONFIG_I2C_DEBUG_CORE is not set
708# CONFIG_I2C_DEBUG_ALGO is not set 707# CONFIG_I2C_DEBUG_ALGO is not set
709# CONFIG_I2C_DEBUG_BUS is not set 708# CONFIG_I2C_DEBUG_BUS is not set
710# CONFIG_I2C_DEBUG_CHIP is not set
711# CONFIG_SPI is not set 709# CONFIG_SPI is not set
712 710
713# 711#
@@ -721,13 +719,16 @@ CONFIG_GPIO_SYSFS=y
721# 719#
722# Memory mapped GPIO expanders: 720# Memory mapped GPIO expanders:
723# 721#
722# CONFIG_GPIO_IT8761E is not set
724 723
725# 724#
726# I2C GPIO expanders: 725# I2C GPIO expanders:
727# 726#
727# CONFIG_GPIO_MAX7300 is not set
728# CONFIG_GPIO_MAX732X is not set 728# CONFIG_GPIO_MAX732X is not set
729# CONFIG_GPIO_PCA953X is not set 729# CONFIG_GPIO_PCA953X is not set
730# CONFIG_GPIO_PCF857X is not set 730# CONFIG_GPIO_PCF857X is not set
731# CONFIG_GPIO_ADP5588 is not set
731 732
732# 733#
733# PCI GPIO expanders: 734# PCI GPIO expanders:
@@ -756,20 +757,23 @@ CONFIG_SSB_POSSIBLE=y
756# Multifunction device drivers 757# Multifunction device drivers
757# 758#
758# CONFIG_MFD_CORE is not set 759# CONFIG_MFD_CORE is not set
760# CONFIG_MFD_88PM860X is not set
759# CONFIG_MFD_SM501 is not set 761# CONFIG_MFD_SM501 is not set
760# CONFIG_MFD_SH_MOBILE_SDHI is not set 762# CONFIG_MFD_SH_MOBILE_SDHI is not set
761# CONFIG_HTC_PASIC3 is not set 763# CONFIG_HTC_PASIC3 is not set
764# CONFIG_HTC_I2CPLD is not set
762# CONFIG_TPS65010 is not set 765# CONFIG_TPS65010 is not set
763# CONFIG_TWL4030_CORE is not set 766# CONFIG_TWL4030_CORE is not set
764# CONFIG_MFD_TMIO is not set 767# CONFIG_MFD_TMIO is not set
765# CONFIG_PMIC_DA903X is not set 768# CONFIG_PMIC_DA903X is not set
766# CONFIG_PMIC_ADP5520 is not set 769# CONFIG_PMIC_ADP5520 is not set
770# CONFIG_MFD_MAX8925 is not set
767# CONFIG_MFD_WM8400 is not set 771# CONFIG_MFD_WM8400 is not set
768# CONFIG_MFD_WM831X is not set 772# CONFIG_MFD_WM831X is not set
769# CONFIG_MFD_WM8350_I2C is not set 773# CONFIG_MFD_WM8350_I2C is not set
774# CONFIG_MFD_WM8994 is not set
770# CONFIG_MFD_PCF50633 is not set 775# CONFIG_MFD_PCF50633 is not set
771# CONFIG_AB3100_CORE is not set 776# CONFIG_AB3100_CORE is not set
772# CONFIG_MFD_88PM8607 is not set
773# CONFIG_REGULATOR is not set 777# CONFIG_REGULATOR is not set
774# CONFIG_MEDIA_SUPPORT is not set 778# CONFIG_MEDIA_SUPPORT is not set
775 779
@@ -889,6 +893,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
889# CONFIG_USB_MIDI_GADGET is not set 893# CONFIG_USB_MIDI_GADGET is not set
890# CONFIG_USB_G_PRINTER is not set 894# CONFIG_USB_G_PRINTER is not set
891CONFIG_USB_CDC_COMPOSITE=m 895CONFIG_USB_CDC_COMPOSITE=m
896# CONFIG_USB_G_NOKIA is not set
892# CONFIG_USB_G_MULTI is not set 897# CONFIG_USB_G_MULTI is not set
893 898
894# 899#
@@ -912,9 +917,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
912# MMC/SD/SDIO Host Controller Drivers 917# MMC/SD/SDIO Host Controller Drivers
913# 918#
914# CONFIG_MMC_SDHCI is not set 919# CONFIG_MMC_SDHCI is not set
915# CONFIG_MMC_AT91 is not set
916# CONFIG_MMC_ATMELMCI is not set
917# CONFIG_MMC_TMIO is not set
918# CONFIG_MEMSTICK is not set 920# CONFIG_MEMSTICK is not set
919# CONFIG_NEW_LEDS is not set 921# CONFIG_NEW_LEDS is not set
920# CONFIG_ACCESSIBILITY is not set 922# CONFIG_ACCESSIBILITY is not set
@@ -982,8 +984,6 @@ CONFIG_RTC_DRV_SH=y
982CONFIG_UIO=y 984CONFIG_UIO=y
983# CONFIG_UIO_PDRV is not set 985# CONFIG_UIO_PDRV is not set
984CONFIG_UIO_PDRV_GENIRQ=y 986CONFIG_UIO_PDRV_GENIRQ=y
985# CONFIG_UIO_SMX is not set
986# CONFIG_UIO_SERCOS3 is not set
987 987
988# 988#
989# TI VLYNQ 989# TI VLYNQ
@@ -996,7 +996,6 @@ CONFIG_UIO_PDRV_GENIRQ=y
996# CONFIG_EXT2_FS is not set 996# CONFIG_EXT2_FS is not set
997# CONFIG_EXT3_FS is not set 997# CONFIG_EXT3_FS is not set
998# CONFIG_EXT4_FS is not set 998# CONFIG_EXT4_FS is not set
999CONFIG_EXT4_USE_FOR_EXT23=y
1000# CONFIG_REISERFS_FS is not set 999# CONFIG_REISERFS_FS is not set
1001# CONFIG_JFS_FS is not set 1000# CONFIG_JFS_FS is not set
1002# CONFIG_FS_POSIX_ACL is not set 1001# CONFIG_FS_POSIX_ACL is not set
@@ -1074,6 +1073,7 @@ CONFIG_DEBUG_FS=y
1074CONFIG_DEBUG_BUGVERBOSE=y 1073CONFIG_DEBUG_BUGVERBOSE=y
1075# CONFIG_DEBUG_MEMORY_INIT is not set 1074# CONFIG_DEBUG_MEMORY_INIT is not set
1076# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1075# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1076# CONFIG_LKDTM is not set
1077# CONFIG_LATENCYTOP is not set 1077# CONFIG_LATENCYTOP is not set
1078# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1078# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1079CONFIG_HAVE_FUNCTION_TRACER=y 1079CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1103,6 +1103,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1103CONFIG_DEFAULT_SECURITY_DAC=y 1103CONFIG_DEFAULT_SECURITY_DAC=y
1104CONFIG_DEFAULT_SECURITY="" 1104CONFIG_DEFAULT_SECURITY=""
1105# CONFIG_CRYPTO is not set 1105# CONFIG_CRYPTO is not set
1106# CONFIG_VIRTUALIZATION is not set
1106# CONFIG_BINARY_PRINTF is not set 1107# CONFIG_BINARY_PRINTF is not set
1107 1108
1108# 1109#
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig
index 2a42d4977fe..87789345d47 100644
--- a/arch/sh/configs/landisk_defconfig
+++ b/arch/sh/configs/landisk_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-rc5
4# Mon Jan 4 11:35:31 2010 4# Tue May 18 15:38:08 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -69,7 +72,6 @@ CONFIG_RCU_FANOUT=32
69# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_GROUP_SCHED is not set
73# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
74CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
75CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -102,7 +104,7 @@ CONFIG_PERF_USE_VMALLOC=y
102# 104#
103# Kernel Performance Events And Counters 105# Kernel Performance Events And Counters
104# 106#
105# CONFIG_PERF_EVENTS is not set 107CONFIG_PERF_EVENTS=y
106# CONFIG_PERF_COUNTERS is not set 108# CONFIG_PERF_COUNTERS is not set
107CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y 110CONFIG_PCI_QUIRKS=y
@@ -120,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
120CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
121CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
122CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
123 126
124# 127#
125# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -238,6 +241,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
238CONFIG_MAX_ACTIVE_REGIONS=1 241CONFIG_MAX_ACTIVE_REGIONS=1
239CONFIG_ARCH_POPULATES_NODE_MAP=y 242CONFIG_ARCH_POPULATES_NODE_MAP=y
240CONFIG_ARCH_SELECT_MEMORY_MODEL=y 243CONFIG_ARCH_SELECT_MEMORY_MODEL=y
244CONFIG_UNCACHED_MAPPING=y
241CONFIG_PAGE_SIZE_4KB=y 245CONFIG_PAGE_SIZE_4KB=y
242# CONFIG_PAGE_SIZE_8KB is not set 246# CONFIG_PAGE_SIZE_8KB is not set
243# CONFIG_PAGE_SIZE_16KB is not set 247# CONFIG_PAGE_SIZE_16KB is not set
@@ -253,7 +257,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
253CONFIG_SPLIT_PTLOCK_CPUS=4 257CONFIG_SPLIT_PTLOCK_CPUS=4
254# CONFIG_PHYS_ADDR_T_64BIT is not set 258# CONFIG_PHYS_ADDR_T_64BIT is not set
255CONFIG_ZONE_DMA_FLAG=0 259CONFIG_ZONE_DMA_FLAG=0
256CONFIG_NR_QUICK=2 260CONFIG_NR_QUICK=1
257# CONFIG_KSM is not set 261# CONFIG_KSM is not set
258CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
259 263
@@ -333,7 +337,6 @@ CONFIG_PREEMPT_NONE=y
333# CONFIG_PREEMPT is not set 337# CONFIG_PREEMPT is not set
334CONFIG_GUSA=y 338CONFIG_GUSA=y
335# CONFIG_GUSA_RB is not set 339# CONFIG_GUSA_RB is not set
336# CONFIG_SPARSE_IRQ is not set
337 340
338# 341#
339# Boot options 342# Boot options
@@ -348,15 +351,14 @@ CONFIG_ENTRY_OFFSET=0x00001000
348# Bus options 351# Bus options
349# 352#
350CONFIG_PCI=y 353CONFIG_PCI=y
354CONFIG_PCI_DOMAINS=y
351# CONFIG_PCIEPORTBUS is not set 355# CONFIG_PCIEPORTBUS is not set
352# CONFIG_ARCH_SUPPORTS_MSI is not set 356# CONFIG_ARCH_SUPPORTS_MSI is not set
353CONFIG_PCI_LEGACY=y
354# CONFIG_PCI_STUB is not set 357# CONFIG_PCI_STUB is not set
355# CONFIG_PCI_IOV is not set 358# CONFIG_PCI_IOV is not set
356CONFIG_PCCARD=y 359CONFIG_PCCARD=y
357CONFIG_PCMCIA=y 360CONFIG_PCMCIA=y
358CONFIG_PCMCIA_LOAD_CIS=y 361CONFIG_PCMCIA_LOAD_CIS=y
359CONFIG_PCMCIA_IOCTL=y
360CONFIG_CARDBUS=y 362CONFIG_CARDBUS=y
361 363
362# 364#
@@ -392,7 +394,6 @@ CONFIG_NET=y
392# Networking options 394# Networking options
393# 395#
394CONFIG_PACKET=y 396CONFIG_PACKET=y
395# CONFIG_PACKET_MMAP is not set
396CONFIG_UNIX=y 397CONFIG_UNIX=y
397CONFIG_XFRM=y 398CONFIG_XFRM=y
398# CONFIG_XFRM_USER is not set 399# CONFIG_XFRM_USER is not set
@@ -612,6 +613,7 @@ CONFIG_BLK_DEV_IDEDMA=y
612# 613#
613# SCSI device support 614# SCSI device support
614# 615#
616CONFIG_SCSI_MOD=y
615# CONFIG_RAID_ATTRS is not set 617# CONFIG_RAID_ATTRS is not set
616CONFIG_SCSI=y 618CONFIG_SCSI=y
617CONFIG_SCSI_DMA=y 619CONFIG_SCSI_DMA=y
@@ -711,7 +713,7 @@ CONFIG_MD_RAID1=m
711# 713#
712 714
713# 715#
714# See the help texts for more information. 716# The newer stack is recommended.
715# 717#
716# CONFIG_FIREWIRE is not set 718# CONFIG_FIREWIRE is not set
717# CONFIG_IEEE1394 is not set 719# CONFIG_IEEE1394 is not set
@@ -751,6 +753,7 @@ CONFIG_NET_PCI=y
751# CONFIG_PCNET32 is not set 753# CONFIG_PCNET32 is not set
752# CONFIG_AMD8111_ETH is not set 754# CONFIG_AMD8111_ETH is not set
753# CONFIG_ADAPTEC_STARFIRE is not set 755# CONFIG_ADAPTEC_STARFIRE is not set
756# CONFIG_KSZ884X_PCI is not set
754# CONFIG_B44 is not set 757# CONFIG_B44 is not set
755# CONFIG_FORCEDETH is not set 758# CONFIG_FORCEDETH is not set
756# CONFIG_E100 is not set 759# CONFIG_E100 is not set
@@ -798,6 +801,8 @@ CONFIG_NETDEV_10000=y
798# CONFIG_CHELSIO_T1 is not set 801# CONFIG_CHELSIO_T1 is not set
799CONFIG_CHELSIO_T3_DEPENDS=y 802CONFIG_CHELSIO_T3_DEPENDS=y
800# CONFIG_CHELSIO_T3 is not set 803# CONFIG_CHELSIO_T3 is not set
804CONFIG_CHELSIO_T4_DEPENDS=y
805# CONFIG_CHELSIO_T4 is not set
801# CONFIG_ENIC is not set 806# CONFIG_ENIC is not set
802# CONFIG_IXGBE is not set 807# CONFIG_IXGBE is not set
803# CONFIG_IXGB is not set 808# CONFIG_IXGB is not set
@@ -810,6 +815,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
810# CONFIG_MLX4_CORE is not set 815# CONFIG_MLX4_CORE is not set
811# CONFIG_TEHUTI is not set 816# CONFIG_TEHUTI is not set
812# CONFIG_BNX2X is not set 817# CONFIG_BNX2X is not set
818# CONFIG_QLCNIC is not set
813# CONFIG_QLGE is not set 819# CONFIG_QLGE is not set
814# CONFIG_SFC is not set 820# CONFIG_SFC is not set
815# CONFIG_BE2NET is not set 821# CONFIG_BE2NET is not set
@@ -835,6 +841,7 @@ CONFIG_WLAN=y
835CONFIG_USB_PEGASUS=m 841CONFIG_USB_PEGASUS=m
836CONFIG_USB_RTL8150=m 842CONFIG_USB_RTL8150=m
837# CONFIG_USB_USBNET is not set 843# CONFIG_USB_USBNET is not set
844# CONFIG_USB_IPHETH is not set
838# CONFIG_NET_PCMCIA is not set 845# CONFIG_NET_PCMCIA is not set
839# CONFIG_WAN is not set 846# CONFIG_WAN is not set
840# CONFIG_FDDI is not set 847# CONFIG_FDDI is not set
@@ -910,6 +917,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
910CONFIG_SERIAL_CORE=y 917CONFIG_SERIAL_CORE=y
911CONFIG_SERIAL_CORE_CONSOLE=y 918CONFIG_SERIAL_CORE_CONSOLE=y
912# CONFIG_SERIAL_JSM is not set 919# CONFIG_SERIAL_JSM is not set
920# CONFIG_SERIAL_TIMBERDALE is not set
913CONFIG_UNIX98_PTYS=y 921CONFIG_UNIX98_PTYS=y
914# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 922# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
915CONFIG_LEGACY_PTYS=y 923CONFIG_LEGACY_PTYS=y
@@ -977,6 +985,7 @@ CONFIG_SSB_POSSIBLE=y
977# CONFIG_MFD_SH_MOBILE_SDHI is not set 985# CONFIG_MFD_SH_MOBILE_SDHI is not set
978# CONFIG_HTC_PASIC3 is not set 986# CONFIG_HTC_PASIC3 is not set
979# CONFIG_MFD_TMIO is not set 987# CONFIG_MFD_TMIO is not set
988# CONFIG_LPC_SCH is not set
980# CONFIG_REGULATOR is not set 989# CONFIG_REGULATOR is not set
981# CONFIG_MEDIA_SUPPORT is not set 990# CONFIG_MEDIA_SUPPORT is not set
982 991
@@ -984,6 +993,7 @@ CONFIG_SSB_POSSIBLE=y
984# Graphics support 993# Graphics support
985# 994#
986CONFIG_VGA_ARB=y 995CONFIG_VGA_ARB=y
996CONFIG_VGA_ARB_MAX_GPUS=16
987# CONFIG_DRM is not set 997# CONFIG_DRM is not set
988# CONFIG_VGASTATE is not set 998# CONFIG_VGASTATE is not set
989# CONFIG_VIDEO_OUTPUT_CONTROL is not set 999# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1025,6 +1035,7 @@ CONFIG_USB_HID=m
1025# 1035#
1026# Special HID drivers 1036# Special HID drivers
1027# 1037#
1038# CONFIG_HID_3M_PCT is not set
1028CONFIG_HID_A4TECH=m 1039CONFIG_HID_A4TECH=m
1029CONFIG_HID_APPLE=m 1040CONFIG_HID_APPLE=m
1030CONFIG_HID_BELKIN=m 1041CONFIG_HID_BELKIN=m
@@ -1040,14 +1051,19 @@ CONFIG_HID_GYRATION=m
1040CONFIG_HID_LOGITECH=m 1051CONFIG_HID_LOGITECH=m
1041# CONFIG_LOGITECH_FF is not set 1052# CONFIG_LOGITECH_FF is not set
1042# CONFIG_LOGIRUMBLEPAD2_FF is not set 1053# CONFIG_LOGIRUMBLEPAD2_FF is not set
1054# CONFIG_LOGIG940_FF is not set
1043CONFIG_HID_MICROSOFT=m 1055CONFIG_HID_MICROSOFT=m
1056# CONFIG_HID_MOSART is not set
1044CONFIG_HID_MONTEREY=m 1057CONFIG_HID_MONTEREY=m
1045# CONFIG_HID_NTRIG is not set 1058# CONFIG_HID_NTRIG is not set
1059# CONFIG_HID_ORTEK is not set
1046CONFIG_HID_PANTHERLORD=m 1060CONFIG_HID_PANTHERLORD=m
1047# CONFIG_PANTHERLORD_FF is not set 1061# CONFIG_PANTHERLORD_FF is not set
1048CONFIG_HID_PETALYNX=m 1062CONFIG_HID_PETALYNX=m
1063# CONFIG_HID_QUANTA is not set
1049CONFIG_HID_SAMSUNG=m 1064CONFIG_HID_SAMSUNG=m
1050CONFIG_HID_SONY=m 1065CONFIG_HID_SONY=m
1066# CONFIG_HID_STANTUM is not set
1051CONFIG_HID_SUNPLUS=m 1067CONFIG_HID_SUNPLUS=m
1052# CONFIG_HID_GREENASIA is not set 1068# CONFIG_HID_GREENASIA is not set
1053# CONFIG_HID_SMARTJOYPLUS is not set 1069# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1169,6 +1185,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
1169# CONFIG_USB_SERIAL_NAVMAN is not set 1185# CONFIG_USB_SERIAL_NAVMAN is not set
1170CONFIG_USB_SERIAL_PL2303=m 1186CONFIG_USB_SERIAL_PL2303=m
1171# CONFIG_USB_SERIAL_OTI6858 is not set 1187# CONFIG_USB_SERIAL_OTI6858 is not set
1188# CONFIG_USB_SERIAL_QCAUX is not set
1172# CONFIG_USB_SERIAL_QUALCOMM is not set 1189# CONFIG_USB_SERIAL_QUALCOMM is not set
1173# CONFIG_USB_SERIAL_SPCP8X5 is not set 1190# CONFIG_USB_SERIAL_SPCP8X5 is not set
1174# CONFIG_USB_SERIAL_HP4X is not set 1191# CONFIG_USB_SERIAL_HP4X is not set
@@ -1182,6 +1199,7 @@ CONFIG_USB_SERIAL_PL2303=m
1182# CONFIG_USB_SERIAL_OPTION is not set 1199# CONFIG_USB_SERIAL_OPTION is not set
1183# CONFIG_USB_SERIAL_OMNINET is not set 1200# CONFIG_USB_SERIAL_OMNINET is not set
1184# CONFIG_USB_SERIAL_OPTICON is not set 1201# CONFIG_USB_SERIAL_OPTICON is not set
1202# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
1185# CONFIG_USB_SERIAL_DEBUG is not set 1203# CONFIG_USB_SERIAL_DEBUG is not set
1186 1204
1187# 1205#
@@ -1194,7 +1212,6 @@ CONFIG_USB_EMI26=m
1194# CONFIG_USB_RIO500 is not set 1212# CONFIG_USB_RIO500 is not set
1195# CONFIG_USB_LEGOTOWER is not set 1213# CONFIG_USB_LEGOTOWER is not set
1196# CONFIG_USB_LCD is not set 1214# CONFIG_USB_LCD is not set
1197# CONFIG_USB_BERRY_CHARGE is not set
1198# CONFIG_USB_LED is not set 1215# CONFIG_USB_LED is not set
1199# CONFIG_USB_CYPRESS_CY7C63 is not set 1216# CONFIG_USB_CYPRESS_CY7C63 is not set
1200# CONFIG_USB_CYTHERM is not set 1217# CONFIG_USB_CYTHERM is not set
@@ -1208,7 +1225,6 @@ CONFIG_USB_SISUSBVGA_CON=y
1208# CONFIG_USB_IOWARRIOR is not set 1225# CONFIG_USB_IOWARRIOR is not set
1209# CONFIG_USB_TEST is not set 1226# CONFIG_USB_TEST is not set
1210# CONFIG_USB_ISIGHTFW is not set 1227# CONFIG_USB_ISIGHTFW is not set
1211# CONFIG_USB_VST is not set
1212# CONFIG_USB_GADGET is not set 1228# CONFIG_USB_GADGET is not set
1213 1229
1214# 1230#
@@ -1313,6 +1329,7 @@ CONFIG_MISC_FILESYSTEMS=y
1313# CONFIG_BEFS_FS is not set 1329# CONFIG_BEFS_FS is not set
1314# CONFIG_BFS_FS is not set 1330# CONFIG_BFS_FS is not set
1315# CONFIG_EFS_FS is not set 1331# CONFIG_EFS_FS is not set
1332# CONFIG_LOGFS is not set
1316# CONFIG_CRAMFS is not set 1333# CONFIG_CRAMFS is not set
1317# CONFIG_SQUASHFS is not set 1334# CONFIG_SQUASHFS is not set
1318# CONFIG_VXFS_FS is not set 1335# CONFIG_VXFS_FS is not set
@@ -1347,6 +1364,7 @@ CONFIG_SUNRPC=m
1347# CONFIG_RPCSEC_GSS_SPKM3 is not set 1364# CONFIG_RPCSEC_GSS_SPKM3 is not set
1348CONFIG_SMB_FS=m 1365CONFIG_SMB_FS=m
1349# CONFIG_SMB_NLS_DEFAULT is not set 1366# CONFIG_SMB_NLS_DEFAULT is not set
1367# CONFIG_CEPH_FS is not set
1350# CONFIG_CIFS is not set 1368# CONFIG_CIFS is not set
1351# CONFIG_NCP_FS is not set 1369# CONFIG_NCP_FS is not set
1352# CONFIG_CODA_FS is not set 1370# CONFIG_CODA_FS is not set
@@ -1531,6 +1549,7 @@ CONFIG_CRYPTO=y
1531# CONFIG_CRYPTO_ANSI_CPRNG is not set 1549# CONFIG_CRYPTO_ANSI_CPRNG is not set
1532CONFIG_CRYPTO_HW=y 1550CONFIG_CRYPTO_HW=y
1533# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1551# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1552# CONFIG_VIRTUALIZATION is not set
1534# CONFIG_BINARY_PRINTF is not set 1553# CONFIG_BINARY_PRINTF is not set
1535 1554
1536# 1555#
diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig
index f2f1f8c73b2..6088a76bd21 100644
--- a/arch/sh/configs/lboxre2_defconfig
+++ b/arch/sh/configs/lboxre2_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-rc5
4# Mon Jan 4 11:37:01 2010 4# Tue May 18 15:42:57 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -69,7 +72,6 @@ CONFIG_RCU_FANOUT=32
69# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_GROUP_SCHED is not set
73# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
74CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
75CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -102,7 +104,7 @@ CONFIG_PERF_USE_VMALLOC=y
102# 104#
103# Kernel Performance Events And Counters 105# Kernel Performance Events And Counters
104# 106#
105# CONFIG_PERF_EVENTS is not set 107CONFIG_PERF_EVENTS=y
106# CONFIG_PERF_COUNTERS is not set 108# CONFIG_PERF_COUNTERS is not set
107CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_PCI_QUIRKS=y 110CONFIG_PCI_QUIRKS=y
@@ -120,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
120CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
121CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
122CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
123 126
124# 127#
125# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -238,6 +241,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
238CONFIG_MAX_ACTIVE_REGIONS=1 241CONFIG_MAX_ACTIVE_REGIONS=1
239CONFIG_ARCH_POPULATES_NODE_MAP=y 242CONFIG_ARCH_POPULATES_NODE_MAP=y
240CONFIG_ARCH_SELECT_MEMORY_MODEL=y 243CONFIG_ARCH_SELECT_MEMORY_MODEL=y
244CONFIG_UNCACHED_MAPPING=y
241CONFIG_PAGE_SIZE_4KB=y 245CONFIG_PAGE_SIZE_4KB=y
242# CONFIG_PAGE_SIZE_8KB is not set 246# CONFIG_PAGE_SIZE_8KB is not set
243# CONFIG_PAGE_SIZE_16KB is not set 247# CONFIG_PAGE_SIZE_16KB is not set
@@ -253,7 +257,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
253CONFIG_SPLIT_PTLOCK_CPUS=4 257CONFIG_SPLIT_PTLOCK_CPUS=4
254# CONFIG_PHYS_ADDR_T_64BIT is not set 258# CONFIG_PHYS_ADDR_T_64BIT is not set
255CONFIG_ZONE_DMA_FLAG=0 259CONFIG_ZONE_DMA_FLAG=0
256CONFIG_NR_QUICK=2 260CONFIG_NR_QUICK=1
257# CONFIG_KSM is not set 261# CONFIG_KSM is not set
258CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
259 263
@@ -333,7 +337,6 @@ CONFIG_PREEMPT_NONE=y
333# CONFIG_PREEMPT is not set 337# CONFIG_PREEMPT is not set
334CONFIG_GUSA=y 338CONFIG_GUSA=y
335# CONFIG_GUSA_RB is not set 339# CONFIG_GUSA_RB is not set
336# CONFIG_SPARSE_IRQ is not set
337 340
338# 341#
339# Boot options 342# Boot options
@@ -349,15 +352,14 @@ CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/sda1"
349# Bus options 352# Bus options
350# 353#
351CONFIG_PCI=y 354CONFIG_PCI=y
355CONFIG_PCI_DOMAINS=y
352# CONFIG_PCIEPORTBUS is not set 356# CONFIG_PCIEPORTBUS is not set
353# CONFIG_ARCH_SUPPORTS_MSI is not set 357# CONFIG_ARCH_SUPPORTS_MSI is not set
354CONFIG_PCI_LEGACY=y
355# CONFIG_PCI_STUB is not set 358# CONFIG_PCI_STUB is not set
356# CONFIG_PCI_IOV is not set 359# CONFIG_PCI_IOV is not set
357CONFIG_PCCARD=y 360CONFIG_PCCARD=y
358CONFIG_PCMCIA=y 361CONFIG_PCMCIA=y
359CONFIG_PCMCIA_LOAD_CIS=y 362CONFIG_PCMCIA_LOAD_CIS=y
360CONFIG_PCMCIA_IOCTL=y
361CONFIG_CARDBUS=y 363CONFIG_CARDBUS=y
362 364
363# 365#
@@ -392,7 +394,6 @@ CONFIG_NET=y
392# Networking options 394# Networking options
393# 395#
394CONFIG_PACKET=y 396CONFIG_PACKET=y
395# CONFIG_PACKET_MMAP is not set
396CONFIG_UNIX=y 397CONFIG_UNIX=y
397CONFIG_XFRM=y 398CONFIG_XFRM=y
398# CONFIG_XFRM_USER is not set 399# CONFIG_XFRM_USER is not set
@@ -552,6 +553,7 @@ CONFIG_HAVE_IDE=y
552# 553#
553# SCSI device support 554# SCSI device support
554# 555#
556CONFIG_SCSI_MOD=y
555# CONFIG_RAID_ATTRS is not set 557# CONFIG_RAID_ATTRS is not set
556CONFIG_SCSI=y 558CONFIG_SCSI=y
557CONFIG_SCSI_DMA=y 559CONFIG_SCSI_DMA=y
@@ -670,6 +672,7 @@ CONFIG_ATA_SFF=y
670# CONFIG_PATA_IT821X is not set 672# CONFIG_PATA_IT821X is not set
671# CONFIG_PATA_IT8213 is not set 673# CONFIG_PATA_IT8213 is not set
672# CONFIG_PATA_JMICRON is not set 674# CONFIG_PATA_JMICRON is not set
675# CONFIG_PATA_LEGACY is not set
673# CONFIG_PATA_TRIFLEX is not set 676# CONFIG_PATA_TRIFLEX is not set
674# CONFIG_PATA_MARVELL is not set 677# CONFIG_PATA_MARVELL is not set
675# CONFIG_PATA_MPIIX is not set 678# CONFIG_PATA_MPIIX is not set
@@ -707,7 +710,7 @@ CONFIG_PATA_PLATFORM=y
707# 710#
708 711
709# 712#
710# See the help texts for more information. 713# The newer stack is recommended.
711# 714#
712# CONFIG_FIREWIRE is not set 715# CONFIG_FIREWIRE is not set
713# CONFIG_IEEE1394 is not set 716# CONFIG_IEEE1394 is not set
@@ -747,6 +750,7 @@ CONFIG_NET_PCI=y
747# CONFIG_PCNET32 is not set 750# CONFIG_PCNET32 is not set
748# CONFIG_AMD8111_ETH is not set 751# CONFIG_AMD8111_ETH is not set
749# CONFIG_ADAPTEC_STARFIRE is not set 752# CONFIG_ADAPTEC_STARFIRE is not set
753# CONFIG_KSZ884X_PCI is not set
750# CONFIG_B44 is not set 754# CONFIG_B44 is not set
751# CONFIG_FORCEDETH is not set 755# CONFIG_FORCEDETH is not set
752# CONFIG_E100 is not set 756# CONFIG_E100 is not set
@@ -798,6 +802,8 @@ CONFIG_NETDEV_10000=y
798# CONFIG_CHELSIO_T1 is not set 802# CONFIG_CHELSIO_T1 is not set
799CONFIG_CHELSIO_T3_DEPENDS=y 803CONFIG_CHELSIO_T3_DEPENDS=y
800# CONFIG_CHELSIO_T3 is not set 804# CONFIG_CHELSIO_T3 is not set
805CONFIG_CHELSIO_T4_DEPENDS=y
806# CONFIG_CHELSIO_T4 is not set
801# CONFIG_ENIC is not set 807# CONFIG_ENIC is not set
802# CONFIG_IXGBE is not set 808# CONFIG_IXGBE is not set
803# CONFIG_IXGB is not set 809# CONFIG_IXGB is not set
@@ -810,6 +816,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
810# CONFIG_MLX4_CORE is not set 816# CONFIG_MLX4_CORE is not set
811# CONFIG_TEHUTI is not set 817# CONFIG_TEHUTI is not set
812# CONFIG_BNX2X is not set 818# CONFIG_BNX2X is not set
819# CONFIG_QLCNIC is not set
813# CONFIG_QLGE is not set 820# CONFIG_QLGE is not set
814# CONFIG_SFC is not set 821# CONFIG_SFC is not set
815# CONFIG_BE2NET is not set 822# CONFIG_BE2NET is not set
@@ -908,6 +915,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
908CONFIG_SERIAL_CORE=y 915CONFIG_SERIAL_CORE=y
909CONFIG_SERIAL_CORE_CONSOLE=y 916CONFIG_SERIAL_CORE_CONSOLE=y
910# CONFIG_SERIAL_JSM is not set 917# CONFIG_SERIAL_JSM is not set
918# CONFIG_SERIAL_TIMBERDALE is not set
911CONFIG_UNIX98_PTYS=y 919CONFIG_UNIX98_PTYS=y
912# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 920# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
913CONFIG_LEGACY_PTYS=y 921CONFIG_LEGACY_PTYS=y
@@ -975,6 +983,7 @@ CONFIG_SSB_POSSIBLE=y
975# CONFIG_MFD_SH_MOBILE_SDHI is not set 983# CONFIG_MFD_SH_MOBILE_SDHI is not set
976# CONFIG_HTC_PASIC3 is not set 984# CONFIG_HTC_PASIC3 is not set
977# CONFIG_MFD_TMIO is not set 985# CONFIG_MFD_TMIO is not set
986# CONFIG_LPC_SCH is not set
978# CONFIG_REGULATOR is not set 987# CONFIG_REGULATOR is not set
979# CONFIG_MEDIA_SUPPORT is not set 988# CONFIG_MEDIA_SUPPORT is not set
980 989
@@ -982,6 +991,7 @@ CONFIG_SSB_POSSIBLE=y
982# Graphics support 991# Graphics support
983# 992#
984CONFIG_VGA_ARB=y 993CONFIG_VGA_ARB=y
994CONFIG_VGA_ARB_MAX_GPUS=16
985# CONFIG_DRM is not set 995# CONFIG_DRM is not set
986# CONFIG_VGASTATE is not set 996# CONFIG_VGASTATE is not set
987# CONFIG_VIDEO_OUTPUT_CONTROL is not set 997# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1155,6 +1165,7 @@ CONFIG_MISC_FILESYSTEMS=y
1155# CONFIG_BEFS_FS is not set 1165# CONFIG_BEFS_FS is not set
1156# CONFIG_BFS_FS is not set 1166# CONFIG_BFS_FS is not set
1157# CONFIG_EFS_FS is not set 1167# CONFIG_EFS_FS is not set
1168# CONFIG_LOGFS is not set
1158# CONFIG_CRAMFS is not set 1169# CONFIG_CRAMFS is not set
1159# CONFIG_SQUASHFS is not set 1170# CONFIG_SQUASHFS is not set
1160# CONFIG_VXFS_FS is not set 1171# CONFIG_VXFS_FS is not set
@@ -1173,6 +1184,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
1173# CONFIG_NFS_FS is not set 1184# CONFIG_NFS_FS is not set
1174# CONFIG_NFSD is not set 1185# CONFIG_NFSD is not set
1175# CONFIG_SMB_FS is not set 1186# CONFIG_SMB_FS is not set
1187# CONFIG_CEPH_FS is not set
1176# CONFIG_CIFS is not set 1188# CONFIG_CIFS is not set
1177# CONFIG_NCP_FS is not set 1189# CONFIG_NCP_FS is not set
1178# CONFIG_CODA_FS is not set 1190# CONFIG_CODA_FS is not set
@@ -1357,6 +1369,7 @@ CONFIG_CRYPTO=y
1357# CONFIG_CRYPTO_ANSI_CPRNG is not set 1369# CONFIG_CRYPTO_ANSI_CPRNG is not set
1358CONFIG_CRYPTO_HW=y 1370CONFIG_CRYPTO_HW=y
1359# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1371# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1372# CONFIG_VIRTUALIZATION is not set
1360# CONFIG_BINARY_PRINTF is not set 1373# CONFIG_BINARY_PRINTF is not set
1361 1374
1362# 1375#
diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magicpanelr2_defconfig
index a7a16ce357a..28c104da0ba 100644
--- a/arch/sh/configs/magicpanelr2_defconfig
+++ b/arch/sh/configs/magicpanelr2_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-rc5
4# Mon Jan 4 11:37:42 2010 4# Tue May 18 15:44:00 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION=""
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -71,7 +74,6 @@ 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
73CONFIG_LOG_BUF_SHIFT=17 76CONFIG_LOG_BUF_SHIFT=17
74# CONFIG_GROUP_SCHED is not set
75# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
76CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
77CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -82,6 +84,7 @@ CONFIG_INITRAMFS_SOURCE=""
82CONFIG_RD_GZIP=y 84CONFIG_RD_GZIP=y
83# CONFIG_RD_BZIP2 is not set 85# CONFIG_RD_BZIP2 is not set
84# CONFIG_RD_LZMA is not set 86# CONFIG_RD_LZMA is not set
87# CONFIG_RD_LZO is not set
85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 88# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
86CONFIG_SYSCTL=y 89CONFIG_SYSCTL=y
87CONFIG_ANON_INODES=y 90CONFIG_ANON_INODES=y
@@ -109,8 +112,9 @@ CONFIG_PERF_USE_VMALLOC=y
109# 112#
110# Kernel Performance Events And Counters 113# Kernel Performance Events And Counters
111# 114#
112# CONFIG_PERF_EVENTS is not set 115CONFIG_PERF_EVENTS=y
113# CONFIG_PERF_COUNTERS is not set 116# CONFIG_PERF_COUNTERS is not set
117# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
114CONFIG_VM_EVENT_COUNTERS=y 118CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_COMPAT_BRK=y 119CONFIG_COMPAT_BRK=y
116CONFIG_SLAB=y 120CONFIG_SLAB=y
@@ -126,6 +130,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_DMA_ATTRS=y 130CONFIG_HAVE_DMA_ATTRS=y
127CONFIG_HAVE_CLK=y 131CONFIG_HAVE_CLK=y
128CONFIG_HAVE_DMA_API_DEBUG=y 132CONFIG_HAVE_DMA_API_DEBUG=y
133CONFIG_HAVE_HW_BREAKPOINT=y
129 134
130# 135#
131# GCOV-based kernel profiling 136# GCOV-based kernel profiling
@@ -244,6 +249,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
244CONFIG_MAX_ACTIVE_REGIONS=1 249CONFIG_MAX_ACTIVE_REGIONS=1
245CONFIG_ARCH_POPULATES_NODE_MAP=y 250CONFIG_ARCH_POPULATES_NODE_MAP=y
246CONFIG_ARCH_SELECT_MEMORY_MODEL=y 251CONFIG_ARCH_SELECT_MEMORY_MODEL=y
252CONFIG_UNCACHED_MAPPING=y
247CONFIG_PAGE_SIZE_4KB=y 253CONFIG_PAGE_SIZE_4KB=y
248# CONFIG_PAGE_SIZE_8KB is not set 254# CONFIG_PAGE_SIZE_8KB is not set
249# CONFIG_PAGE_SIZE_16KB is not set 255# CONFIG_PAGE_SIZE_16KB is not set
@@ -259,7 +265,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
259CONFIG_SPLIT_PTLOCK_CPUS=4 265CONFIG_SPLIT_PTLOCK_CPUS=4
260# CONFIG_PHYS_ADDR_T_64BIT is not set 266# CONFIG_PHYS_ADDR_T_64BIT is not set
261CONFIG_ZONE_DMA_FLAG=0 267CONFIG_ZONE_DMA_FLAG=0
262CONFIG_NR_QUICK=2 268CONFIG_NR_QUICK=1
263# CONFIG_KSM is not set 269# CONFIG_KSM is not set
264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
265 271
@@ -344,7 +350,6 @@ CONFIG_PREEMPT_NONE=y
344# CONFIG_PREEMPT is not set 350# CONFIG_PREEMPT is not set
345CONFIG_GUSA=y 351CONFIG_GUSA=y
346# CONFIG_GUSA_RB is not set 352# CONFIG_GUSA_RB is not set
347# CONFIG_SPARSE_IRQ is not set
348 353
349# 354#
350# Boot options 355# Boot options
@@ -380,7 +385,6 @@ CONFIG_NET=y
380# Networking options 385# Networking options
381# 386#
382CONFIG_PACKET=y 387CONFIG_PACKET=y
383CONFIG_PACKET_MMAP=y
384CONFIG_UNIX=y 388CONFIG_UNIX=y
385# CONFIG_NET_KEY is not set 389# CONFIG_NET_KEY is not set
386CONFIG_INET=y 390CONFIG_INET=y
@@ -586,6 +590,7 @@ CONFIG_HAVE_IDE=y
586# 590#
587# SCSI device support 591# SCSI device support
588# 592#
593CONFIG_SCSI_MOD=y
589# CONFIG_RAID_ATTRS is not set 594# CONFIG_RAID_ATTRS is not set
590# CONFIG_SCSI is not set 595# CONFIG_SCSI is not set
591# CONFIG_SCSI_DMA is not set 596# CONFIG_SCSI_DMA is not set
@@ -741,6 +746,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
741CONFIG_SERIAL_SH_SCI_CONSOLE=y 746CONFIG_SERIAL_SH_SCI_CONSOLE=y
742CONFIG_SERIAL_CORE=y 747CONFIG_SERIAL_CORE=y
743CONFIG_SERIAL_CORE_CONSOLE=y 748CONFIG_SERIAL_CORE_CONSOLE=y
749# CONFIG_SERIAL_TIMBERDALE is not set
744CONFIG_UNIX98_PTYS=y 750CONFIG_UNIX98_PTYS=y
745# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 751# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
746CONFIG_LEGACY_PTYS=y 752CONFIG_LEGACY_PTYS=y
@@ -765,6 +771,7 @@ CONFIG_GPIOLIB=y
765# 771#
766# Memory mapped GPIO expanders: 772# Memory mapped GPIO expanders:
767# 773#
774# CONFIG_GPIO_IT8761E is not set
768 775
769# 776#
770# I2C GPIO expanders: 777# I2C GPIO expanders:
@@ -953,6 +960,7 @@ CONFIG_JFFS2_ZLIB=y
953# CONFIG_JFFS2_LZO is not set 960# CONFIG_JFFS2_LZO is not set
954CONFIG_JFFS2_RTIME=y 961CONFIG_JFFS2_RTIME=y
955# CONFIG_JFFS2_RUBIN is not set 962# CONFIG_JFFS2_RUBIN is not set
963# CONFIG_LOGFS is not set
956# CONFIG_CRAMFS is not set 964# CONFIG_CRAMFS is not set
957# CONFIG_SQUASHFS is not set 965# CONFIG_SQUASHFS is not set
958# CONFIG_VXFS_FS is not set 966# CONFIG_VXFS_FS is not set
@@ -977,6 +985,7 @@ CONFIG_SUNRPC=y
977# CONFIG_RPCSEC_GSS_KRB5 is not set 985# CONFIG_RPCSEC_GSS_KRB5 is not set
978# CONFIG_RPCSEC_GSS_SPKM3 is not set 986# CONFIG_RPCSEC_GSS_SPKM3 is not set
979# CONFIG_SMB_FS is not set 987# CONFIG_SMB_FS is not set
988# CONFIG_CEPH_FS is not set
980# CONFIG_CIFS is not set 989# CONFIG_CIFS is not set
981# CONFIG_NCP_FS is not set 990# CONFIG_NCP_FS is not set
982# CONFIG_CODA_FS is not set 991# CONFIG_CODA_FS is not set
@@ -1051,6 +1060,7 @@ CONFIG_DEBUG_KERNEL=y
1051# CONFIG_TIMER_STATS is not set 1060# CONFIG_TIMER_STATS is not set
1052# CONFIG_DEBUG_OBJECTS is not set 1061# CONFIG_DEBUG_OBJECTS is not set
1053# CONFIG_DEBUG_SLAB is not set 1062# CONFIG_DEBUG_SLAB is not set
1063# CONFIG_DEBUG_KMEMLEAK is not set
1054# CONFIG_DEBUG_RT_MUTEXES is not set 1064# CONFIG_DEBUG_RT_MUTEXES is not set
1055# CONFIG_RT_MUTEX_TESTER is not set 1065# CONFIG_RT_MUTEX_TESTER is not set
1056# CONFIG_DEBUG_SPINLOCK is not set 1066# CONFIG_DEBUG_SPINLOCK is not set
@@ -1097,6 +1107,7 @@ CONFIG_FTRACE=y
1097CONFIG_BRANCH_PROFILE_NONE=y 1107CONFIG_BRANCH_PROFILE_NONE=y
1098# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1108# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1099# CONFIG_PROFILE_ALL_BRANCHES is not set 1109# CONFIG_PROFILE_ALL_BRANCHES is not set
1110# CONFIG_KSYM_TRACER is not set
1100# CONFIG_STACK_TRACER is not set 1111# CONFIG_STACK_TRACER is not set
1101# CONFIG_KMEMTRACE is not set 1112# CONFIG_KMEMTRACE is not set
1102# CONFIG_WORKQUEUE_TRACER is not set 1113# CONFIG_WORKQUEUE_TRACER is not set
@@ -1125,6 +1136,7 @@ CONFIG_DUMP_CODE=y
1125CONFIG_DEFAULT_SECURITY_DAC=y 1136CONFIG_DEFAULT_SECURITY_DAC=y
1126CONFIG_DEFAULT_SECURITY="" 1137CONFIG_DEFAULT_SECURITY=""
1127# CONFIG_CRYPTO is not set 1138# CONFIG_CRYPTO is not set
1139# CONFIG_VIRTUALIZATION is not set
1128# CONFIG_BINARY_PRINTF is not set 1140# CONFIG_BINARY_PRINTF is not set
1129 1141
1130# 1142#
diff --git a/arch/sh/configs/microdev_defconfig b/arch/sh/configs/microdev_defconfig
index 7d43fabdc07..41cefa490ec 100644
--- a/arch/sh/configs/microdev_defconfig
+++ b/arch/sh/configs/microdev_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-rc5
4# Mon Jan 4 11:40:41 2010 4# Tue May 18 15:48:22 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53# CONFIG_SYSVIPC is not set 56# CONFIG_SYSVIPC is not set
54# CONFIG_POSIX_MQUEUE is not set 57# CONFIG_POSIX_MQUEUE is not set
@@ -69,7 +72,6 @@ CONFIG_RCU_FANOUT=32
69# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_GROUP_SCHED is not set
73# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
74CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
75CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -80,6 +82,7 @@ CONFIG_INITRAMFS_SOURCE=""
80CONFIG_RD_GZIP=y 82CONFIG_RD_GZIP=y
81# CONFIG_RD_BZIP2 is not set 83# CONFIG_RD_BZIP2 is not set
82# CONFIG_RD_LZMA is not set 84# CONFIG_RD_LZMA is not set
85# CONFIG_RD_LZO is not set
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
85CONFIG_ANON_INODES=y 88CONFIG_ANON_INODES=y
@@ -106,7 +109,7 @@ CONFIG_PERF_USE_VMALLOC=y
106# 109#
107# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
108# 111#
109# CONFIG_PERF_EVENTS is not set 112CONFIG_PERF_EVENTS=y
110# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
111CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
@@ -122,6 +125,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122CONFIG_HAVE_DMA_ATTRS=y 125CONFIG_HAVE_DMA_ATTRS=y
123CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
124CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128CONFIG_HAVE_HW_BREAKPOINT=y
125 129
126# 130#
127# GCOV-based kernel profiling 131# GCOV-based kernel profiling
@@ -235,6 +239,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
235CONFIG_MAX_ACTIVE_REGIONS=1 239CONFIG_MAX_ACTIVE_REGIONS=1
236CONFIG_ARCH_POPULATES_NODE_MAP=y 240CONFIG_ARCH_POPULATES_NODE_MAP=y
237CONFIG_ARCH_SELECT_MEMORY_MODEL=y 241CONFIG_ARCH_SELECT_MEMORY_MODEL=y
242CONFIG_UNCACHED_MAPPING=y
238CONFIG_PAGE_SIZE_4KB=y 243CONFIG_PAGE_SIZE_4KB=y
239# CONFIG_PAGE_SIZE_8KB is not set 244# CONFIG_PAGE_SIZE_8KB is not set
240# CONFIG_PAGE_SIZE_16KB is not set 245# CONFIG_PAGE_SIZE_16KB is not set
@@ -256,7 +261,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
256CONFIG_SPLIT_PTLOCK_CPUS=4 261CONFIG_SPLIT_PTLOCK_CPUS=4
257# CONFIG_PHYS_ADDR_T_64BIT is not set 262# CONFIG_PHYS_ADDR_T_64BIT is not set
258CONFIG_ZONE_DMA_FLAG=0 263CONFIG_ZONE_DMA_FLAG=0
259CONFIG_NR_QUICK=2 264CONFIG_NR_QUICK=1
260# CONFIG_KSM is not set 265# CONFIG_KSM is not set
261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
262 267
@@ -334,7 +339,6 @@ CONFIG_HZ=250
334CONFIG_PREEMPT=y 339CONFIG_PREEMPT=y
335CONFIG_GUSA=y 340CONFIG_GUSA=y
336# CONFIG_GUSA_RB is not set 341# CONFIG_GUSA_RB is not set
337# CONFIG_SPARSE_IRQ is not set
338 342
339# 343#
340# Boot options 344# Boot options
@@ -515,6 +519,7 @@ CONFIG_IDE_PROC_FS=y
515# 519#
516# SCSI device support 520# SCSI device support
517# 521#
522CONFIG_SCSI_MOD=y
518# CONFIG_RAID_ATTRS is not set 523# CONFIG_RAID_ATTRS is not set
519# CONFIG_SCSI is not set 524# CONFIG_SCSI is not set
520# CONFIG_SCSI_DMA is not set 525# CONFIG_SCSI_DMA is not set
@@ -596,6 +601,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
596CONFIG_SERIAL_SH_SCI_CONSOLE=y 601CONFIG_SERIAL_SH_SCI_CONSOLE=y
597CONFIG_SERIAL_CORE=y 602CONFIG_SERIAL_CORE=y
598CONFIG_SERIAL_CORE_CONSOLE=y 603CONFIG_SERIAL_CORE_CONSOLE=y
604# CONFIG_SERIAL_TIMBERDALE is not set
599CONFIG_UNIX98_PTYS=y 605CONFIG_UNIX98_PTYS=y
600# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 606# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
601CONFIG_LEGACY_PTYS=y 607CONFIG_LEGACY_PTYS=y
@@ -774,6 +780,7 @@ CONFIG_MISC_FILESYSTEMS=y
774# CONFIG_BEFS_FS is not set 780# CONFIG_BEFS_FS is not set
775# CONFIG_BFS_FS is not set 781# CONFIG_BFS_FS is not set
776# CONFIG_EFS_FS is not set 782# CONFIG_EFS_FS is not set
783# CONFIG_LOGFS is not set
777# CONFIG_CRAMFS is not set 784# CONFIG_CRAMFS is not set
778# CONFIG_SQUASHFS is not set 785# CONFIG_SQUASHFS is not set
779# CONFIG_VXFS_FS is not set 786# CONFIG_VXFS_FS is not set
@@ -800,6 +807,7 @@ CONFIG_SUNRPC_GSS=y
800CONFIG_RPCSEC_GSS_KRB5=y 807CONFIG_RPCSEC_GSS_KRB5=y
801# CONFIG_RPCSEC_GSS_SPKM3 is not set 808# CONFIG_RPCSEC_GSS_SPKM3 is not set
802# CONFIG_SMB_FS is not set 809# CONFIG_SMB_FS is not set
810# CONFIG_CEPH_FS is not set
803# CONFIG_CIFS is not set 811# CONFIG_CIFS is not set
804# CONFIG_NCP_FS is not set 812# CONFIG_NCP_FS is not set
805# CONFIG_CODA_FS is not set 813# CONFIG_CODA_FS is not set
@@ -992,6 +1000,7 @@ CONFIG_CRYPTO_DES=y
992# 1000#
993# CONFIG_CRYPTO_ANSI_CPRNG is not set 1001# CONFIG_CRYPTO_ANSI_CPRNG is not set
994CONFIG_CRYPTO_HW=y 1002CONFIG_CRYPTO_HW=y
1003# CONFIG_VIRTUALIZATION is not set
995# CONFIG_BINARY_PRINTF is not set 1004# CONFIG_BINARY_PRINTF is not set
996 1005
997# 1006#
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig
index d2b18311777..1c889b74cd5 100644
--- a/arch/sh/configs/migor_defconfig
+++ b/arch/sh/configs/migor_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-rc5
4# Mon Jan 4 11:41:41 2010 4# Tue May 18 18:01:29 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_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
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -71,7 +74,6 @@ CONFIG_RCU_FANOUT=32
71CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_GROUP_SCHED is not set
75# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
76CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
77CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -82,6 +84,7 @@ CONFIG_INITRAMFS_SOURCE=""
82CONFIG_RD_GZIP=y 84CONFIG_RD_GZIP=y
83# CONFIG_RD_BZIP2 is not set 85# CONFIG_RD_BZIP2 is not set
84# CONFIG_RD_LZMA is not set 86# CONFIG_RD_LZMA is not set
87# CONFIG_RD_LZO is not set
85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 88# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
86CONFIG_SYSCTL=y 89CONFIG_SYSCTL=y
87CONFIG_ANON_INODES=y 90CONFIG_ANON_INODES=y
@@ -109,7 +112,6 @@ CONFIG_PERF_USE_VMALLOC=y
109# Kernel Performance Events And Counters 112# Kernel Performance Events And Counters
110# 113#
111CONFIG_PERF_EVENTS=y 114CONFIG_PERF_EVENTS=y
112CONFIG_EVENT_PROFILE=y
113# CONFIG_PERF_COUNTERS is not set 115# CONFIG_PERF_COUNTERS is not set
114CONFIG_VM_EVENT_COUNTERS=y 116CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_COMPAT_BRK=y 117CONFIG_COMPAT_BRK=y
@@ -117,17 +119,16 @@ CONFIG_SLAB=y
117# CONFIG_SLUB is not set 119# CONFIG_SLUB is not set
118# CONFIG_SLOB is not set 120# CONFIG_SLOB is not set
119CONFIG_PROFILING=y 121CONFIG_PROFILING=y
120CONFIG_TRACEPOINTS=y
121CONFIG_OPROFILE=y 122CONFIG_OPROFILE=y
122CONFIG_HAVE_OPROFILE=y 123CONFIG_HAVE_OPROFILE=y
123# CONFIG_KPROBES is not set 124# CONFIG_KPROBES is not set
124CONFIG_HAVE_IOREMAP_PROT=y
125CONFIG_HAVE_KPROBES=y 125CONFIG_HAVE_KPROBES=y
126CONFIG_HAVE_KRETPROBES=y 126CONFIG_HAVE_KRETPROBES=y
127CONFIG_HAVE_ARCH_TRACEHOOK=y 127CONFIG_HAVE_ARCH_TRACEHOOK=y
128CONFIG_HAVE_DMA_ATTRS=y 128CONFIG_HAVE_DMA_ATTRS=y
129CONFIG_HAVE_CLK=y 129CONFIG_HAVE_CLK=y
130CONFIG_HAVE_DMA_API_DEBUG=y 130CONFIG_HAVE_DMA_API_DEBUG=y
131CONFIG_HAVE_HW_BREAKPOINT=y
131 132
132# 133#
133# GCOV-based kernel profiling 134# GCOV-based kernel profiling
@@ -243,7 +244,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
243CONFIG_MEMORY_START=0x0c000000 244CONFIG_MEMORY_START=0x0c000000
244CONFIG_MEMORY_SIZE=0x04000000 245CONFIG_MEMORY_SIZE=0x04000000
245CONFIG_29BIT=y 246CONFIG_29BIT=y
246# CONFIG_X2TLB is not set 247CONFIG_X2TLB=y
247CONFIG_VSYSCALL=y 248CONFIG_VSYSCALL=y
248CONFIG_NUMA=y 249CONFIG_NUMA=y
249CONFIG_NODES_SHIFT=1 250CONFIG_NODES_SHIFT=1
@@ -254,6 +255,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
254CONFIG_ARCH_SELECT_MEMORY_MODEL=y 255CONFIG_ARCH_SELECT_MEMORY_MODEL=y
255CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 256CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
258CONFIG_IOREMAP_FIXED=y
259CONFIG_UNCACHED_MAPPING=y
257CONFIG_PAGE_SIZE_4KB=y 260CONFIG_PAGE_SIZE_4KB=y
258# CONFIG_PAGE_SIZE_8KB is not set 261# CONFIG_PAGE_SIZE_8KB is not set
259# CONFIG_PAGE_SIZE_16KB is not set 262# CONFIG_PAGE_SIZE_16KB is not set
@@ -271,7 +274,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
271# CONFIG_MIGRATION is not set 274# CONFIG_MIGRATION is not set
272# CONFIG_PHYS_ADDR_T_64BIT is not set 275# CONFIG_PHYS_ADDR_T_64BIT is not set
273CONFIG_ZONE_DMA_FLAG=0 276CONFIG_ZONE_DMA_FLAG=0
274CONFIG_NR_QUICK=2 277CONFIG_NR_QUICK=1
275# CONFIG_KSM is not set 278# CONFIG_KSM is not set
276CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 279CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
277 280
@@ -348,7 +351,7 @@ CONFIG_PREEMPT_NONE=y
348# CONFIG_PREEMPT_VOLUNTARY is not set 351# CONFIG_PREEMPT_VOLUNTARY is not set
349# CONFIG_PREEMPT is not set 352# CONFIG_PREEMPT is not set
350CONFIG_GUSA=y 353CONFIG_GUSA=y
351# CONFIG_SPARSE_IRQ is not set 354# CONFIG_INTC_USERIMASK is not set
352 355
353# 356#
354# Boot options 357# Boot options
@@ -384,6 +387,7 @@ CONFIG_SUSPEND=y
384CONFIG_SUSPEND_FREEZER=y 387CONFIG_SUSPEND_FREEZER=y
385# CONFIG_HIBERNATION is not set 388# CONFIG_HIBERNATION is not set
386CONFIG_PM_RUNTIME=y 389CONFIG_PM_RUNTIME=y
390CONFIG_PM_OPS=y
387# CONFIG_CPU_IDLE is not set 391# CONFIG_CPU_IDLE is not set
388CONFIG_NET=y 392CONFIG_NET=y
389 393
@@ -391,7 +395,6 @@ CONFIG_NET=y
391# Networking options 395# Networking options
392# 396#
393CONFIG_PACKET=y 397CONFIG_PACKET=y
394# CONFIG_PACKET_MMAP is not set
395CONFIG_UNIX=y 398CONFIG_UNIX=y
396CONFIG_XFRM=y 399CONFIG_XFRM=y
397# CONFIG_XFRM_USER is not set 400# CONFIG_XFRM_USER is not set
@@ -454,7 +457,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
454# Network testing 457# Network testing
455# 458#
456# CONFIG_NET_PKTGEN is not set 459# CONFIG_NET_PKTGEN is not set
457# CONFIG_NET_DROP_MONITOR is not set
458# CONFIG_HAMRADIO is not set 460# CONFIG_HAMRADIO is not set
459# CONFIG_CAN is not set 461# CONFIG_CAN is not set
460# CONFIG_IRDA is not set 462# CONFIG_IRDA is not set
@@ -564,6 +566,7 @@ CONFIG_MTD_NAND_IDS=y
564# CONFIG_MTD_NAND_DISKONCHIP is not set 566# CONFIG_MTD_NAND_DISKONCHIP is not set
565# CONFIG_MTD_NAND_NANDSIM is not set 567# CONFIG_MTD_NAND_NANDSIM is not set
566CONFIG_MTD_NAND_PLATFORM=y 568CONFIG_MTD_NAND_PLATFORM=y
569# CONFIG_MTD_NAND_SH_FLCTL is not set
567# CONFIG_MTD_ONENAND is not set 570# CONFIG_MTD_ONENAND is not set
568 571
569# 572#
@@ -596,6 +599,7 @@ CONFIG_MISC_DEVICES=y
596# CONFIG_ICS932S401 is not set 599# CONFIG_ICS932S401 is not set
597# CONFIG_ENCLOSURE_SERVICES is not set 600# CONFIG_ENCLOSURE_SERVICES is not set
598# CONFIG_ISL29003 is not set 601# CONFIG_ISL29003 is not set
602# CONFIG_SENSORS_TSL2550 is not set
599# CONFIG_DS1682 is not set 603# CONFIG_DS1682 is not set
600# CONFIG_C2PORT is not set 604# CONFIG_C2PORT is not set
601 605
@@ -612,6 +616,7 @@ CONFIG_HAVE_IDE=y
612# 616#
613# SCSI device support 617# SCSI device support
614# 618#
619CONFIG_SCSI_MOD=y
615# CONFIG_RAID_ATTRS is not set 620# CONFIG_RAID_ATTRS is not set
616CONFIG_SCSI=y 621CONFIG_SCSI=y
617CONFIG_SCSI_DMA=y 622CONFIG_SCSI_DMA=y
@@ -764,6 +769,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
764CONFIG_SERIAL_SH_SCI_CONSOLE=y 769CONFIG_SERIAL_SH_SCI_CONSOLE=y
765CONFIG_SERIAL_CORE=y 770CONFIG_SERIAL_CORE=y
766CONFIG_SERIAL_CORE_CONSOLE=y 771CONFIG_SERIAL_CORE_CONSOLE=y
772# CONFIG_SERIAL_TIMBERDALE is not set
767CONFIG_UNIX98_PTYS=y 773CONFIG_UNIX98_PTYS=y
768# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 774# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
769CONFIG_LEGACY_PTYS=y 775CONFIG_LEGACY_PTYS=y
@@ -792,6 +798,7 @@ CONFIG_I2C_HELPER_AUTO=y
792# CONFIG_I2C_OCORES is not set 798# CONFIG_I2C_OCORES is not set
793CONFIG_I2C_SH_MOBILE=y 799CONFIG_I2C_SH_MOBILE=y
794# CONFIG_I2C_SIMTEC is not set 800# CONFIG_I2C_SIMTEC is not set
801# CONFIG_I2C_XILINX is not set
795 802
796# 803#
797# External I2C/SMBus adapter drivers 804# External I2C/SMBus adapter drivers
@@ -804,15 +811,9 @@ CONFIG_I2C_SH_MOBILE=y
804# 811#
805# CONFIG_I2C_PCA_PLATFORM is not set 812# CONFIG_I2C_PCA_PLATFORM is not set
806# CONFIG_I2C_STUB is not set 813# CONFIG_I2C_STUB is not set
807
808#
809# Miscellaneous I2C Chip support
810#
811# CONFIG_SENSORS_TSL2550 is not set
812# CONFIG_I2C_DEBUG_CORE is not set 814# CONFIG_I2C_DEBUG_CORE is not set
813# CONFIG_I2C_DEBUG_ALGO is not set 815# CONFIG_I2C_DEBUG_ALGO is not set
814# CONFIG_I2C_DEBUG_BUS is not set 816# CONFIG_I2C_DEBUG_BUS is not set
815# CONFIG_I2C_DEBUG_CHIP is not set
816# CONFIG_SPI is not set 817# CONFIG_SPI is not set
817 818
818# 819#
@@ -826,13 +827,16 @@ CONFIG_GPIOLIB=y
826# 827#
827# Memory mapped GPIO expanders: 828# Memory mapped GPIO expanders:
828# 829#
830# CONFIG_GPIO_IT8761E is not set
829 831
830# 832#
831# I2C GPIO expanders: 833# I2C GPIO expanders:
832# 834#
835# CONFIG_GPIO_MAX7300 is not set
833# CONFIG_GPIO_MAX732X is not set 836# CONFIG_GPIO_MAX732X is not set
834# CONFIG_GPIO_PCA953X is not set 837# CONFIG_GPIO_PCA953X is not set
835# CONFIG_GPIO_PCF857X is not set 838# CONFIG_GPIO_PCF857X is not set
839# CONFIG_GPIO_ADP5588 is not set
836 840
837# 841#
838# PCI GPIO expanders: 842# PCI GPIO expanders:
@@ -861,20 +865,23 @@ CONFIG_SSB_POSSIBLE=y
861# Multifunction device drivers 865# Multifunction device drivers
862# 866#
863# CONFIG_MFD_CORE is not set 867# CONFIG_MFD_CORE is not set
868# CONFIG_MFD_88PM860X is not set
864# CONFIG_MFD_SM501 is not set 869# CONFIG_MFD_SM501 is not set
865# CONFIG_MFD_SH_MOBILE_SDHI is not set 870# CONFIG_MFD_SH_MOBILE_SDHI is not set
866# CONFIG_HTC_PASIC3 is not set 871# CONFIG_HTC_PASIC3 is not set
872# CONFIG_HTC_I2CPLD is not set
867# CONFIG_TPS65010 is not set 873# CONFIG_TPS65010 is not set
868# CONFIG_TWL4030_CORE is not set 874# CONFIG_TWL4030_CORE is not set
869# CONFIG_MFD_TMIO is not set 875# CONFIG_MFD_TMIO is not set
870# CONFIG_PMIC_DA903X is not set 876# CONFIG_PMIC_DA903X is not set
871# CONFIG_PMIC_ADP5520 is not set 877# CONFIG_PMIC_ADP5520 is not set
878# CONFIG_MFD_MAX8925 is not set
872# CONFIG_MFD_WM8400 is not set 879# CONFIG_MFD_WM8400 is not set
873# CONFIG_MFD_WM831X is not set 880# CONFIG_MFD_WM831X is not set
874# CONFIG_MFD_WM8350_I2C is not set 881# CONFIG_MFD_WM8350_I2C is not set
882# CONFIG_MFD_WM8994 is not set
875# CONFIG_MFD_PCF50633 is not set 883# CONFIG_MFD_PCF50633 is not set
876# CONFIG_AB3100_CORE is not set 884# CONFIG_AB3100_CORE is not set
877# CONFIG_MFD_88PM8607 is not set
878# CONFIG_REGULATOR is not set 885# CONFIG_REGULATOR is not set
879CONFIG_MEDIA_SUPPORT=y 886CONFIG_MEDIA_SUPPORT=y
880 887
@@ -1054,6 +1061,7 @@ CONFIG_USB_G_SERIAL=m
1054# CONFIG_USB_MIDI_GADGET is not set 1061# CONFIG_USB_MIDI_GADGET is not set
1055# CONFIG_USB_G_PRINTER is not set 1062# CONFIG_USB_G_PRINTER is not set
1056# CONFIG_USB_CDC_COMPOSITE is not set 1063# CONFIG_USB_CDC_COMPOSITE is not set
1064# CONFIG_USB_G_NOKIA is not set
1057# CONFIG_USB_G_MULTI is not set 1065# CONFIG_USB_G_MULTI is not set
1058 1066
1059# 1067#
@@ -1129,8 +1137,6 @@ CONFIG_RTC_DRV_SH=y
1129CONFIG_UIO=y 1137CONFIG_UIO=y
1130# CONFIG_UIO_PDRV is not set 1138# CONFIG_UIO_PDRV is not set
1131CONFIG_UIO_PDRV_GENIRQ=y 1139CONFIG_UIO_PDRV_GENIRQ=y
1132# CONFIG_UIO_SMX is not set
1133# CONFIG_UIO_SERCOS3 is not set
1134 1140
1135# 1141#
1136# TI VLYNQ 1142# TI VLYNQ
@@ -1143,7 +1149,6 @@ CONFIG_UIO_PDRV_GENIRQ=y
1143# CONFIG_EXT2_FS is not set 1149# CONFIG_EXT2_FS is not set
1144# CONFIG_EXT3_FS is not set 1150# CONFIG_EXT3_FS is not set
1145# CONFIG_EXT4_FS is not set 1151# CONFIG_EXT4_FS is not set
1146CONFIG_EXT4_USE_FOR_EXT23=y
1147# CONFIG_REISERFS_FS is not set 1152# CONFIG_REISERFS_FS is not set
1148# CONFIG_JFS_FS is not set 1153# CONFIG_JFS_FS is not set
1149# CONFIG_FS_POSIX_ACL is not set 1154# CONFIG_FS_POSIX_ACL is not set
@@ -1202,6 +1207,7 @@ CONFIG_MISC_FILESYSTEMS=y
1202# CONFIG_BFS_FS is not set 1207# CONFIG_BFS_FS is not set
1203# CONFIG_EFS_FS is not set 1208# CONFIG_EFS_FS is not set
1204# CONFIG_JFFS2_FS is not set 1209# CONFIG_JFFS2_FS is not set
1210# CONFIG_LOGFS is not set
1205# CONFIG_CRAMFS is not set 1211# CONFIG_CRAMFS is not set
1206# CONFIG_SQUASHFS is not set 1212# CONFIG_SQUASHFS is not set
1207# CONFIG_VXFS_FS is not set 1213# CONFIG_VXFS_FS is not set
@@ -1224,6 +1230,7 @@ CONFIG_SUNRPC=y
1224# CONFIG_RPCSEC_GSS_KRB5 is not set 1230# CONFIG_RPCSEC_GSS_KRB5 is not set
1225# CONFIG_RPCSEC_GSS_SPKM3 is not set 1231# CONFIG_RPCSEC_GSS_SPKM3 is not set
1226# CONFIG_SMB_FS is not set 1232# CONFIG_SMB_FS is not set
1233# CONFIG_CEPH_FS is not set
1227# CONFIG_CIFS is not set 1234# CONFIG_CIFS is not set
1228# CONFIG_NCP_FS is not set 1235# CONFIG_NCP_FS is not set
1229# CONFIG_CODA_FS is not set 1236# CONFIG_CODA_FS is not set
@@ -1251,13 +1258,12 @@ CONFIG_FRAME_WARN=1024
1251CONFIG_DEBUG_FS=y 1258CONFIG_DEBUG_FS=y
1252# CONFIG_HEADERS_CHECK is not set 1259# CONFIG_HEADERS_CHECK is not set
1253# CONFIG_DEBUG_KERNEL is not set 1260# CONFIG_DEBUG_KERNEL is not set
1254CONFIG_STACKTRACE=y
1255CONFIG_DEBUG_BUGVERBOSE=y 1261CONFIG_DEBUG_BUGVERBOSE=y
1256# CONFIG_DEBUG_MEMORY_INIT is not set 1262# CONFIG_DEBUG_MEMORY_INIT is not set
1257# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1263# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1264# CONFIG_LKDTM is not set
1258# CONFIG_LATENCYTOP is not set 1265# CONFIG_LATENCYTOP is not set
1259# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1266# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1260CONFIG_NOP_TRACER=y
1261CONFIG_HAVE_FUNCTION_TRACER=y 1267CONFIG_HAVE_FUNCTION_TRACER=y
1262CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1268CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1263CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1269CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1265,10 +1271,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1265CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1271CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1266CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1272CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1267CONFIG_RING_BUFFER=y 1273CONFIG_RING_BUFFER=y
1268CONFIG_EVENT_TRACING=y
1269CONFIG_CONTEXT_SWITCH_TRACER=y
1270CONFIG_RING_BUFFER_ALLOW_SWAP=y 1274CONFIG_RING_BUFFER_ALLOW_SWAP=y
1271CONFIG_TRACING=y
1272CONFIG_TRACING_SUPPORT=y 1275CONFIG_TRACING_SUPPORT=y
1273# CONFIG_FTRACE is not set 1276# CONFIG_FTRACE is not set
1274# CONFIG_DYNAMIC_DEBUG is not set 1277# CONFIG_DYNAMIC_DEBUG is not set
@@ -1383,7 +1386,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
1383# 1386#
1384# CONFIG_CRYPTO_ANSI_CPRNG is not set 1387# CONFIG_CRYPTO_ANSI_CPRNG is not set
1385# CONFIG_CRYPTO_HW is not set 1388# CONFIG_CRYPTO_HW is not set
1386CONFIG_BINARY_PRINTF=y 1389# CONFIG_VIRTUALIZATION is not set
1390# CONFIG_BINARY_PRINTF is not set
1387 1391
1388# 1392#
1389# Library routines 1393# Library routines
diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig
index d50c0314281..826b1198959 100644
--- a/arch/sh/configs/polaris_defconfig
+++ b/arch/sh/configs/polaris_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-rc5
4# Mon Jan 4 11:45:25 2010 4# Tue May 18 15:53:51 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION=""
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51# CONFIG_SWAP is not set 54# CONFIG_SWAP is not set
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -71,11 +74,6 @@ 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
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
79# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -109,8 +107,9 @@ CONFIG_PERF_USE_VMALLOC=y
109# 107#
110# Kernel Performance Events And Counters 108# Kernel Performance Events And Counters
111# 109#
112# CONFIG_PERF_EVENTS is not set 110CONFIG_PERF_EVENTS=y
113# CONFIG_PERF_COUNTERS is not set 111# CONFIG_PERF_COUNTERS is not set
112# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
114CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_COMPAT_BRK=y 114CONFIG_COMPAT_BRK=y
116CONFIG_SLAB=y 115CONFIG_SLAB=y
@@ -126,6 +125,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_DMA_ATTRS=y 125CONFIG_HAVE_DMA_ATTRS=y
127CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
128CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128CONFIG_HAVE_HW_BREAKPOINT=y
129 129
130# 130#
131# GCOV-based kernel profiling 131# GCOV-based kernel profiling
@@ -244,6 +244,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
244CONFIG_MAX_ACTIVE_REGIONS=1 244CONFIG_MAX_ACTIVE_REGIONS=1
245CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
246CONFIG_ARCH_SELECT_MEMORY_MODEL=y 246CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_UNCACHED_MAPPING=y
247CONFIG_PAGE_SIZE_4KB=y 248CONFIG_PAGE_SIZE_4KB=y
248# CONFIG_PAGE_SIZE_8KB is not set 249# CONFIG_PAGE_SIZE_8KB is not set
249# CONFIG_PAGE_SIZE_16KB is not set 250# CONFIG_PAGE_SIZE_16KB is not set
@@ -259,7 +260,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
259CONFIG_SPLIT_PTLOCK_CPUS=999999 260CONFIG_SPLIT_PTLOCK_CPUS=999999
260# CONFIG_PHYS_ADDR_T_64BIT is not set 261# CONFIG_PHYS_ADDR_T_64BIT is not set
261CONFIG_ZONE_DMA_FLAG=0 262CONFIG_ZONE_DMA_FLAG=0
262CONFIG_NR_QUICK=2 263CONFIG_NR_QUICK=1
263# CONFIG_KSM is not set 264# CONFIG_KSM is not set
264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
265 266
@@ -340,7 +341,6 @@ CONFIG_SCHED_HRTICK=y
340CONFIG_PREEMPT=y 341CONFIG_PREEMPT=y
341CONFIG_GUSA=y 342CONFIG_GUSA=y
342# CONFIG_GUSA_RB is not set 343# CONFIG_GUSA_RB is not set
343# CONFIG_SPARSE_IRQ is not set
344 344
345# 345#
346# Boot options 346# Boot options
@@ -377,7 +377,6 @@ CONFIG_NET=y
377# Networking options 377# Networking options
378# 378#
379CONFIG_PACKET=y 379CONFIG_PACKET=y
380CONFIG_PACKET_MMAP=y
381CONFIG_UNIX=y 380CONFIG_UNIX=y
382# CONFIG_NET_KEY is not set 381# CONFIG_NET_KEY is not set
383CONFIG_INET=y 382CONFIG_INET=y
@@ -583,6 +582,7 @@ CONFIG_HAVE_IDE=y
583# 582#
584# SCSI device support 583# SCSI device support
585# 584#
585CONFIG_SCSI_MOD=y
586# CONFIG_RAID_ATTRS is not set 586# CONFIG_RAID_ATTRS is not set
587# CONFIG_SCSI is not set 587# CONFIG_SCSI is not set
588# CONFIG_SCSI_DMA is not set 588# CONFIG_SCSI_DMA is not set
@@ -712,6 +712,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
712CONFIG_SERIAL_SH_SCI_CONSOLE=y 712CONFIG_SERIAL_SH_SCI_CONSOLE=y
713CONFIG_SERIAL_CORE=y 713CONFIG_SERIAL_CORE=y
714CONFIG_SERIAL_CORE_CONSOLE=y 714CONFIG_SERIAL_CORE_CONSOLE=y
715# CONFIG_SERIAL_TIMBERDALE is not set
715CONFIG_UNIX98_PTYS=y 716CONFIG_UNIX98_PTYS=y
716# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 717# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
717# CONFIG_LEGACY_PTYS is not set 718# CONFIG_LEGACY_PTYS is not set
@@ -829,7 +830,6 @@ CONFIG_RTC_DRV_SH=y
829# CONFIG_EXT2_FS is not set 830# CONFIG_EXT2_FS is not set
830# CONFIG_EXT3_FS is not set 831# CONFIG_EXT3_FS is not set
831# CONFIG_EXT4_FS is not set 832# CONFIG_EXT4_FS is not set
832CONFIG_EXT4_USE_FOR_EXT23=y
833# CONFIG_REISERFS_FS is not set 833# CONFIG_REISERFS_FS is not set
834# CONFIG_JFS_FS is not set 834# CONFIG_JFS_FS is not set
835# CONFIG_FS_POSIX_ACL is not set 835# CONFIG_FS_POSIX_ACL is not set
@@ -896,6 +896,7 @@ CONFIG_JFFS2_ZLIB=y
896# CONFIG_JFFS2_LZO is not set 896# CONFIG_JFFS2_LZO is not set
897CONFIG_JFFS2_RTIME=y 897CONFIG_JFFS2_RTIME=y
898# CONFIG_JFFS2_RUBIN is not set 898# CONFIG_JFFS2_RUBIN is not set
899# CONFIG_LOGFS is not set
899# CONFIG_CRAMFS is not set 900# CONFIG_CRAMFS is not set
900# CONFIG_SQUASHFS is not set 901# CONFIG_SQUASHFS is not set
901# CONFIG_VXFS_FS is not set 902# CONFIG_VXFS_FS is not set
@@ -919,6 +920,7 @@ CONFIG_SUNRPC=y
919# CONFIG_RPCSEC_GSS_KRB5 is not set 920# CONFIG_RPCSEC_GSS_KRB5 is not set
920# CONFIG_RPCSEC_GSS_SPKM3 is not set 921# CONFIG_RPCSEC_GSS_SPKM3 is not set
921# CONFIG_SMB_FS is not set 922# CONFIG_SMB_FS is not set
923# CONFIG_CEPH_FS is not set
922# CONFIG_CIFS is not set 924# CONFIG_CIFS is not set
923# CONFIG_NCP_FS is not set 925# CONFIG_NCP_FS is not set
924# CONFIG_CODA_FS is not set 926# CONFIG_CODA_FS is not set
@@ -958,6 +960,7 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
958# CONFIG_TIMER_STATS is not set 960# CONFIG_TIMER_STATS is not set
959# CONFIG_DEBUG_OBJECTS is not set 961# CONFIG_DEBUG_OBJECTS is not set
960# CONFIG_DEBUG_SLAB is not set 962# CONFIG_DEBUG_SLAB is not set
963# CONFIG_DEBUG_KMEMLEAK is not set
961CONFIG_DEBUG_PREEMPT=y 964CONFIG_DEBUG_PREEMPT=y
962CONFIG_DEBUG_RT_MUTEXES=y 965CONFIG_DEBUG_RT_MUTEXES=y
963CONFIG_DEBUG_PI_LIST=y 966CONFIG_DEBUG_PI_LIST=y
@@ -1010,6 +1013,7 @@ CONFIG_FTRACE=y
1010CONFIG_BRANCH_PROFILE_NONE=y 1013CONFIG_BRANCH_PROFILE_NONE=y
1011# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1014# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1012# CONFIG_PROFILE_ALL_BRANCHES is not set 1015# CONFIG_PROFILE_ALL_BRANCHES is not set
1016# CONFIG_KSYM_TRACER is not set
1013# CONFIG_STACK_TRACER is not set 1017# CONFIG_STACK_TRACER is not set
1014# CONFIG_KMEMTRACE is not set 1018# CONFIG_KMEMTRACE is not set
1015# CONFIG_WORKQUEUE_TRACER is not set 1019# CONFIG_WORKQUEUE_TRACER is not set
@@ -1038,6 +1042,7 @@ CONFIG_DUMP_CODE=y
1038CONFIG_DEFAULT_SECURITY_DAC=y 1042CONFIG_DEFAULT_SECURITY_DAC=y
1039CONFIG_DEFAULT_SECURITY="" 1043CONFIG_DEFAULT_SECURITY=""
1040# CONFIG_CRYPTO is not set 1044# CONFIG_CRYPTO is not set
1045# CONFIG_VIRTUALIZATION is not set
1041# CONFIG_BINARY_PRINTF is not set 1046# CONFIG_BINARY_PRINTF is not set
1042 1047
1043# 1048#
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
index efda63d4070..4b751bd37e2 100644
--- a/arch/sh/configs/r7780mp_defconfig
+++ b/arch/sh/configs/r7780mp_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-rc5
4# Mon Jan 4 13:16:13 2010 4# Tue May 18 15:58:09 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_IO_TRAPPED=y 34CONFIG_IO_TRAPPED=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -73,11 +76,6 @@ CONFIG_RCU_FANOUT=32
73CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
76CONFIG_GROUP_SCHED=y
77CONFIG_FAIR_GROUP_SCHED=y
78# CONFIG_RT_GROUP_SCHED is not set
79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set
81# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
82CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -112,7 +110,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
113# 111#
114CONFIG_PERF_EVENTS=y 112CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
117# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 114# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
118CONFIG_VM_EVENT_COUNTERS=y 115CONFIG_VM_EVENT_COUNTERS=y
@@ -122,7 +119,6 @@ CONFIG_SLAB=y
122# CONFIG_SLUB is not set 119# CONFIG_SLUB is not set
123# CONFIG_SLOB is not set 120# CONFIG_SLOB is not set
124CONFIG_PROFILING=y 121CONFIG_PROFILING=y
125CONFIG_TRACEPOINTS=y
126CONFIG_OPROFILE=m 122CONFIG_OPROFILE=m
127CONFIG_HAVE_OPROFILE=y 123CONFIG_HAVE_OPROFILE=y
128# CONFIG_KPROBES is not set 124# CONFIG_KPROBES is not set
@@ -133,6 +129,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
133CONFIG_HAVE_DMA_ATTRS=y 129CONFIG_HAVE_DMA_ATTRS=y
134CONFIG_HAVE_CLK=y 130CONFIG_HAVE_CLK=y
135CONFIG_HAVE_DMA_API_DEBUG=y 131CONFIG_HAVE_DMA_API_DEBUG=y
132CONFIG_HAVE_HW_BREAKPOINT=y
136 133
137# 134#
138# GCOV-based kernel profiling 135# GCOV-based kernel profiling
@@ -245,11 +242,8 @@ CONFIG_PAGE_OFFSET=0x80000000
245CONFIG_FORCE_MAX_ZONEORDER=11 242CONFIG_FORCE_MAX_ZONEORDER=11
246CONFIG_MEMORY_START=0x08000000 243CONFIG_MEMORY_START=0x08000000
247CONFIG_MEMORY_SIZE=0x08000000 244CONFIG_MEMORY_SIZE=0x08000000
248# CONFIG_29BIT is not set 245CONFIG_29BIT=y
249CONFIG_32BIT=y
250CONFIG_PMB_ENABLE=y
251# CONFIG_PMB is not set 246# CONFIG_PMB is not set
252CONFIG_PMB_FIXED=y
253CONFIG_VSYSCALL=y 247CONFIG_VSYSCALL=y
254CONFIG_ARCH_FLATMEM_ENABLE=y 248CONFIG_ARCH_FLATMEM_ENABLE=y
255CONFIG_ARCH_SPARSEMEM_ENABLE=y 249CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -257,6 +251,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
257CONFIG_MAX_ACTIVE_REGIONS=1 251CONFIG_MAX_ACTIVE_REGIONS=1
258CONFIG_ARCH_POPULATES_NODE_MAP=y 252CONFIG_ARCH_POPULATES_NODE_MAP=y
259CONFIG_ARCH_SELECT_MEMORY_MODEL=y 253CONFIG_ARCH_SELECT_MEMORY_MODEL=y
254CONFIG_UNCACHED_MAPPING=y
260CONFIG_PAGE_SIZE_4KB=y 255CONFIG_PAGE_SIZE_4KB=y
261# CONFIG_PAGE_SIZE_8KB is not set 256# CONFIG_PAGE_SIZE_8KB is not set
262# CONFIG_PAGE_SIZE_16KB is not set 257# CONFIG_PAGE_SIZE_16KB is not set
@@ -278,7 +273,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
278CONFIG_SPLIT_PTLOCK_CPUS=4 273CONFIG_SPLIT_PTLOCK_CPUS=4
279# CONFIG_PHYS_ADDR_T_64BIT is not set 274# CONFIG_PHYS_ADDR_T_64BIT is not set
280CONFIG_ZONE_DMA_FLAG=0 275CONFIG_ZONE_DMA_FLAG=0
281CONFIG_NR_QUICK=2 276CONFIG_NR_QUICK=1
282# CONFIG_KSM is not set 277# CONFIG_KSM is not set
283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 278CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
284 279
@@ -358,7 +353,7 @@ CONFIG_KEXEC=y
358# CONFIG_PREEMPT_VOLUNTARY is not set 353# CONFIG_PREEMPT_VOLUNTARY is not set
359CONFIG_PREEMPT=y 354CONFIG_PREEMPT=y
360CONFIG_GUSA=y 355CONFIG_GUSA=y
361# CONFIG_SPARSE_IRQ is not set 356# CONFIG_INTC_USERIMASK is not set
362 357
363# 358#
364# Boot options 359# Boot options
@@ -374,9 +369,9 @@ CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
374# Bus options 369# Bus options
375# 370#
376CONFIG_PCI=y 371CONFIG_PCI=y
372CONFIG_PCI_DOMAINS=y
377# CONFIG_PCIEPORTBUS is not set 373# CONFIG_PCIEPORTBUS is not set
378# CONFIG_ARCH_SUPPORTS_MSI is not set 374# CONFIG_ARCH_SUPPORTS_MSI is not set
379CONFIG_PCI_LEGACY=y
380# CONFIG_PCI_DEBUG is not set 375# CONFIG_PCI_DEBUG is not set
381# CONFIG_PCI_STUB is not set 376# CONFIG_PCI_STUB is not set
382# CONFIG_PCI_IOV is not set 377# CONFIG_PCI_IOV is not set
@@ -402,7 +397,6 @@ CONFIG_NET=y
402# Networking options 397# Networking options
403# 398#
404CONFIG_PACKET=y 399CONFIG_PACKET=y
405# CONFIG_PACKET_MMAP is not set
406CONFIG_UNIX=y 400CONFIG_UNIX=y
407CONFIG_XFRM=y 401CONFIG_XFRM=y
408# CONFIG_XFRM_USER is not set 402# CONFIG_XFRM_USER is not set
@@ -452,6 +446,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
452# CONFIG_ATM is not set 446# CONFIG_ATM is not set
453CONFIG_STP=m 447CONFIG_STP=m
454CONFIG_BRIDGE=m 448CONFIG_BRIDGE=m
449CONFIG_BRIDGE_IGMP_SNOOPING=y
455# CONFIG_NET_DSA is not set 450# CONFIG_NET_DSA is not set
456# CONFIG_VLAN_8021Q is not set 451# CONFIG_VLAN_8021Q is not set
457# CONFIG_DECNET is not set 452# CONFIG_DECNET is not set
@@ -472,7 +467,6 @@ CONFIG_LLC=m
472# Network testing 467# Network testing
473# 468#
474# CONFIG_NET_PKTGEN is not set 469# CONFIG_NET_PKTGEN is not set
475# CONFIG_NET_DROP_MONITOR is not set
476# CONFIG_HAMRADIO is not set 470# CONFIG_HAMRADIO is not set
477# CONFIG_CAN is not set 471# CONFIG_CAN is not set
478# CONFIG_IRDA is not set 472# CONFIG_IRDA is not set
@@ -621,6 +615,7 @@ CONFIG_MISC_DEVICES=y
621# CONFIG_ENCLOSURE_SERVICES is not set 615# CONFIG_ENCLOSURE_SERVICES is not set
622# CONFIG_HP_ILO is not set 616# CONFIG_HP_ILO is not set
623# CONFIG_ISL29003 is not set 617# CONFIG_ISL29003 is not set
618# CONFIG_SENSORS_TSL2550 is not set
624# CONFIG_DS1682 is not set 619# CONFIG_DS1682 is not set
625# CONFIG_C2PORT is not set 620# CONFIG_C2PORT is not set
626 621
@@ -638,6 +633,7 @@ CONFIG_HAVE_IDE=y
638# 633#
639# SCSI device support 634# SCSI device support
640# 635#
636CONFIG_SCSI_MOD=y
641# CONFIG_RAID_ATTRS is not set 637# CONFIG_RAID_ATTRS is not set
642CONFIG_SCSI=y 638CONFIG_SCSI=y
643CONFIG_SCSI_DMA=y 639CONFIG_SCSI_DMA=y
@@ -755,6 +751,7 @@ CONFIG_SATA_SIL=y
755# CONFIG_PATA_IT821X is not set 751# CONFIG_PATA_IT821X is not set
756# CONFIG_PATA_IT8213 is not set 752# CONFIG_PATA_IT8213 is not set
757# CONFIG_PATA_JMICRON is not set 753# CONFIG_PATA_JMICRON is not set
754# CONFIG_PATA_LEGACY is not set
758# CONFIG_PATA_TRIFLEX is not set 755# CONFIG_PATA_TRIFLEX is not set
759# CONFIG_PATA_MARVELL is not set 756# CONFIG_PATA_MARVELL is not set
760# CONFIG_PATA_MPIIX is not set 757# CONFIG_PATA_MPIIX is not set
@@ -791,7 +788,7 @@ CONFIG_PATA_PLATFORM=y
791# 788#
792 789
793# 790#
794# See the help texts for more information. 791# The newer stack is recommended.
795# 792#
796# CONFIG_FIREWIRE is not set 793# CONFIG_FIREWIRE is not set
797# CONFIG_IEEE1394 is not set 794# CONFIG_IEEE1394 is not set
@@ -832,6 +829,7 @@ CONFIG_NET_PCI=y
832CONFIG_PCNET32=m 829CONFIG_PCNET32=m
833# CONFIG_AMD8111_ETH is not set 830# CONFIG_AMD8111_ETH is not set
834# CONFIG_ADAPTEC_STARFIRE is not set 831# CONFIG_ADAPTEC_STARFIRE is not set
832# CONFIG_KSZ884X_PCI is not set
835# CONFIG_B44 is not set 833# CONFIG_B44 is not set
836# CONFIG_FORCEDETH is not set 834# CONFIG_FORCEDETH is not set
837# CONFIG_E100 is not set 835# CONFIG_E100 is not set
@@ -884,6 +882,8 @@ CONFIG_NETDEV_10000=y
884# CONFIG_CHELSIO_T1 is not set 882# CONFIG_CHELSIO_T1 is not set
885CONFIG_CHELSIO_T3_DEPENDS=y 883CONFIG_CHELSIO_T3_DEPENDS=y
886# CONFIG_CHELSIO_T3 is not set 884# CONFIG_CHELSIO_T3 is not set
885CONFIG_CHELSIO_T4_DEPENDS=y
886# CONFIG_CHELSIO_T4 is not set
887# CONFIG_ENIC is not set 887# CONFIG_ENIC is not set
888# CONFIG_IXGBE is not set 888# CONFIG_IXGBE is not set
889# CONFIG_IXGB is not set 889# CONFIG_IXGB is not set
@@ -896,6 +896,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
896# CONFIG_MLX4_CORE is not set 896# CONFIG_MLX4_CORE is not set
897# CONFIG_TEHUTI is not set 897# CONFIG_TEHUTI is not set
898# CONFIG_BNX2X is not set 898# CONFIG_BNX2X is not set
899# CONFIG_QLCNIC is not set
899# CONFIG_QLGE is not set 900# CONFIG_QLGE is not set
900# CONFIG_SFC is not set 901# CONFIG_SFC is not set
901# CONFIG_BE2NET is not set 902# CONFIG_BE2NET is not set
@@ -995,6 +996,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
995CONFIG_SERIAL_CORE=y 996CONFIG_SERIAL_CORE=y
996CONFIG_SERIAL_CORE_CONSOLE=y 997CONFIG_SERIAL_CORE_CONSOLE=y
997# CONFIG_SERIAL_JSM is not set 998# CONFIG_SERIAL_JSM is not set
999# CONFIG_SERIAL_TIMBERDALE is not set
998CONFIG_UNIX98_PTYS=y 1000CONFIG_UNIX98_PTYS=y
999# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1001# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1000CONFIG_LEGACY_PTYS=y 1002CONFIG_LEGACY_PTYS=y
@@ -1043,6 +1045,7 @@ CONFIG_I2C_HIGHLANDER=y
1043# CONFIG_I2C_OCORES is not set 1045# CONFIG_I2C_OCORES is not set
1044# CONFIG_I2C_SH_MOBILE is not set 1046# CONFIG_I2C_SH_MOBILE is not set
1045# CONFIG_I2C_SIMTEC is not set 1047# CONFIG_I2C_SIMTEC is not set
1048# CONFIG_I2C_XILINX is not set
1046 1049
1047# 1050#
1048# External I2C/SMBus adapter drivers 1051# External I2C/SMBus adapter drivers
@@ -1055,15 +1058,9 @@ CONFIG_I2C_HIGHLANDER=y
1055# 1058#
1056# CONFIG_I2C_PCA_PLATFORM is not set 1059# CONFIG_I2C_PCA_PLATFORM is not set
1057# CONFIG_I2C_STUB is not set 1060# CONFIG_I2C_STUB is not set
1058
1059#
1060# Miscellaneous I2C Chip support
1061#
1062# CONFIG_SENSORS_TSL2550 is not set
1063# CONFIG_I2C_DEBUG_CORE is not set 1061# CONFIG_I2C_DEBUG_CORE is not set
1064# CONFIG_I2C_DEBUG_ALGO is not set 1062# CONFIG_I2C_DEBUG_ALGO is not set
1065# CONFIG_I2C_DEBUG_BUS is not set 1063# CONFIG_I2C_DEBUG_BUS is not set
1066# CONFIG_I2C_DEBUG_CHIP is not set
1067# CONFIG_SPI is not set 1064# CONFIG_SPI is not set
1068 1065
1069# 1066#
@@ -1087,10 +1084,11 @@ CONFIG_HWMON=y
1087# CONFIG_SENSORS_ADM1029 is not set 1084# CONFIG_SENSORS_ADM1029 is not set
1088# CONFIG_SENSORS_ADM1031 is not set 1085# CONFIG_SENSORS_ADM1031 is not set
1089# CONFIG_SENSORS_ADM9240 is not set 1086# CONFIG_SENSORS_ADM9240 is not set
1087# CONFIG_SENSORS_ADT7411 is not set
1090# CONFIG_SENSORS_ADT7462 is not set 1088# CONFIG_SENSORS_ADT7462 is not set
1091# CONFIG_SENSORS_ADT7470 is not set 1089# CONFIG_SENSORS_ADT7470 is not set
1092# CONFIG_SENSORS_ADT7473 is not set
1093# CONFIG_SENSORS_ADT7475 is not set 1090# CONFIG_SENSORS_ADT7475 is not set
1091# CONFIG_SENSORS_ASC7621 is not set
1094# CONFIG_SENSORS_ATXP1 is not set 1092# CONFIG_SENSORS_ATXP1 is not set
1095# CONFIG_SENSORS_DS1621 is not set 1093# CONFIG_SENSORS_DS1621 is not set
1096# CONFIG_SENSORS_I5K_AMB is not set 1094# CONFIG_SENSORS_I5K_AMB is not set
@@ -1127,6 +1125,7 @@ CONFIG_HWMON=y
1127# CONFIG_SENSORS_SMSC47M192 is not set 1125# CONFIG_SENSORS_SMSC47M192 is not set
1128# CONFIG_SENSORS_SMSC47B397 is not set 1126# CONFIG_SENSORS_SMSC47B397 is not set
1129# CONFIG_SENSORS_ADS7828 is not set 1127# CONFIG_SENSORS_ADS7828 is not set
1128# CONFIG_SENSORS_AMC6821 is not set
1130# CONFIG_SENSORS_THMC50 is not set 1129# CONFIG_SENSORS_THMC50 is not set
1131# CONFIG_SENSORS_TMP401 is not set 1130# CONFIG_SENSORS_TMP401 is not set
1132# CONFIG_SENSORS_TMP421 is not set 1131# CONFIG_SENSORS_TMP421 is not set
@@ -1156,6 +1155,7 @@ CONFIG_SSB_POSSIBLE=y
1156# Multifunction device drivers 1155# Multifunction device drivers
1157# 1156#
1158# CONFIG_MFD_CORE is not set 1157# CONFIG_MFD_CORE is not set
1158# CONFIG_MFD_88PM860X is not set
1159# CONFIG_MFD_SM501 is not set 1159# CONFIG_MFD_SM501 is not set
1160# CONFIG_MFD_SH_MOBILE_SDHI is not set 1160# CONFIG_MFD_SH_MOBILE_SDHI is not set
1161# CONFIG_HTC_PASIC3 is not set 1161# CONFIG_HTC_PASIC3 is not set
@@ -1163,12 +1163,14 @@ CONFIG_SSB_POSSIBLE=y
1163# CONFIG_MFD_TMIO is not set 1163# CONFIG_MFD_TMIO is not set
1164# CONFIG_PMIC_DA903X is not set 1164# CONFIG_PMIC_DA903X is not set
1165# CONFIG_PMIC_ADP5520 is not set 1165# CONFIG_PMIC_ADP5520 is not set
1166# CONFIG_MFD_MAX8925 is not set
1166# CONFIG_MFD_WM8400 is not set 1167# CONFIG_MFD_WM8400 is not set
1167# CONFIG_MFD_WM831X is not set 1168# CONFIG_MFD_WM831X is not set
1168# CONFIG_MFD_WM8350_I2C is not set 1169# CONFIG_MFD_WM8350_I2C is not set
1170# CONFIG_MFD_WM8994 is not set
1169# CONFIG_MFD_PCF50633 is not set 1171# CONFIG_MFD_PCF50633 is not set
1170# CONFIG_AB3100_CORE is not set 1172# CONFIG_AB3100_CORE is not set
1171# CONFIG_MFD_88PM8607 is not set 1173# CONFIG_LPC_SCH is not set
1172# CONFIG_REGULATOR is not set 1174# CONFIG_REGULATOR is not set
1173# CONFIG_MEDIA_SUPPORT is not set 1175# CONFIG_MEDIA_SUPPORT is not set
1174 1176
@@ -1176,6 +1178,7 @@ CONFIG_SSB_POSSIBLE=y
1176# Graphics support 1178# Graphics support
1177# 1179#
1178CONFIG_VGA_ARB=y 1180CONFIG_VGA_ARB=y
1181CONFIG_VGA_ARB_MAX_GPUS=16
1179# CONFIG_DRM is not set 1182# CONFIG_DRM is not set
1180# CONFIG_VGASTATE is not set 1183# CONFIG_VGASTATE is not set
1181# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1184# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1372,6 +1375,7 @@ CONFIG_MISC_FILESYSTEMS=y
1372# CONFIG_BFS_FS is not set 1375# CONFIG_BFS_FS is not set
1373# CONFIG_EFS_FS is not set 1376# CONFIG_EFS_FS is not set
1374# CONFIG_JFFS2_FS is not set 1377# CONFIG_JFFS2_FS is not set
1378# CONFIG_LOGFS is not set
1375# CONFIG_CRAMFS is not set 1379# CONFIG_CRAMFS is not set
1376# CONFIG_SQUASHFS is not set 1380# CONFIG_SQUASHFS is not set
1377# CONFIG_VXFS_FS is not set 1381# CONFIG_VXFS_FS is not set
@@ -1402,6 +1406,7 @@ CONFIG_SUNRPC_GSS=y
1402CONFIG_RPCSEC_GSS_KRB5=y 1406CONFIG_RPCSEC_GSS_KRB5=y
1403# CONFIG_RPCSEC_GSS_SPKM3 is not set 1407# CONFIG_RPCSEC_GSS_SPKM3 is not set
1404# CONFIG_SMB_FS is not set 1408# CONFIG_SMB_FS is not set
1409# CONFIG_CEPH_FS is not set
1405# CONFIG_CIFS is not set 1410# CONFIG_CIFS is not set
1406# CONFIG_NCP_FS is not set 1411# CONFIG_NCP_FS is not set
1407# CONFIG_CODA_FS is not set 1412# CONFIG_CODA_FS is not set
@@ -1480,6 +1485,7 @@ CONFIG_SCHED_DEBUG=y
1480# CONFIG_TIMER_STATS is not set 1485# CONFIG_TIMER_STATS is not set
1481# CONFIG_DEBUG_OBJECTS is not set 1486# CONFIG_DEBUG_OBJECTS is not set
1482# CONFIG_DEBUG_SLAB is not set 1487# CONFIG_DEBUG_SLAB is not set
1488# CONFIG_DEBUG_KMEMLEAK is not set
1483# CONFIG_DEBUG_PREEMPT is not set 1489# CONFIG_DEBUG_PREEMPT is not set
1484# CONFIG_DEBUG_RT_MUTEXES is not set 1490# CONFIG_DEBUG_RT_MUTEXES is not set
1485# CONFIG_RT_MUTEX_TESTER is not set 1491# CONFIG_RT_MUTEX_TESTER is not set
@@ -1490,7 +1496,6 @@ CONFIG_SCHED_DEBUG=y
1490# CONFIG_LOCK_STAT is not set 1496# CONFIG_LOCK_STAT is not set
1491# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1497# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1492# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1498# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1493CONFIG_STACKTRACE=y
1494# CONFIG_DEBUG_KOBJECT is not set 1499# CONFIG_DEBUG_KOBJECT is not set
1495CONFIG_DEBUG_BUGVERBOSE=y 1500CONFIG_DEBUG_BUGVERBOSE=y
1496CONFIG_DEBUG_INFO=y 1501CONFIG_DEBUG_INFO=y
@@ -1507,11 +1512,11 @@ CONFIG_DEBUG_INFO=y
1507# CONFIG_BACKTRACE_SELF_TEST is not set 1512# CONFIG_BACKTRACE_SELF_TEST is not set
1508# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1513# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1509# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1514# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1515# CONFIG_LKDTM is not set
1510# CONFIG_FAULT_INJECTION is not set 1516# CONFIG_FAULT_INJECTION is not set
1511# CONFIG_LATENCYTOP is not set 1517# CONFIG_LATENCYTOP is not set
1512# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1518# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1513# CONFIG_PAGE_POISONING is not set 1519# CONFIG_PAGE_POISONING is not set
1514CONFIG_NOP_TRACER=y
1515CONFIG_HAVE_FUNCTION_TRACER=y 1520CONFIG_HAVE_FUNCTION_TRACER=y
1516CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1521CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1517CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1522CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1519,10 +1524,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1519CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1524CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1520CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1525CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1521CONFIG_RING_BUFFER=y 1526CONFIG_RING_BUFFER=y
1522CONFIG_EVENT_TRACING=y
1523CONFIG_CONTEXT_SWITCH_TRACER=y
1524CONFIG_RING_BUFFER_ALLOW_SWAP=y 1527CONFIG_RING_BUFFER_ALLOW_SWAP=y
1525CONFIG_TRACING=y
1526CONFIG_TRACING_SUPPORT=y 1528CONFIG_TRACING_SUPPORT=y
1527CONFIG_FTRACE=y 1529CONFIG_FTRACE=y
1528# CONFIG_FUNCTION_TRACER is not set 1530# CONFIG_FUNCTION_TRACER is not set
@@ -1535,6 +1537,7 @@ CONFIG_FTRACE=y
1535CONFIG_BRANCH_PROFILE_NONE=y 1537CONFIG_BRANCH_PROFILE_NONE=y
1536# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1538# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1537# CONFIG_PROFILE_ALL_BRANCHES is not set 1539# CONFIG_PROFILE_ALL_BRANCHES is not set
1540# CONFIG_KSYM_TRACER is not set
1538# CONFIG_STACK_TRACER is not set 1541# CONFIG_STACK_TRACER is not set
1539# CONFIG_KMEMTRACE is not set 1542# CONFIG_KMEMTRACE is not set
1540# CONFIG_WORKQUEUE_TRACER is not set 1543# CONFIG_WORKQUEUE_TRACER is not set
@@ -1662,7 +1665,8 @@ CONFIG_CRYPTO_DES=y
1662# CONFIG_CRYPTO_ANSI_CPRNG is not set 1665# CONFIG_CRYPTO_ANSI_CPRNG is not set
1663CONFIG_CRYPTO_HW=y 1666CONFIG_CRYPTO_HW=y
1664# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1667# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1665CONFIG_BINARY_PRINTF=y 1668# CONFIG_VIRTUALIZATION is not set
1669# CONFIG_BINARY_PRINTF is not set
1666 1670
1667# 1671#
1668# Library routines 1672# Library routines
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index f4b00451dce..f5e3819469e 100644
--- a/arch/sh/configs/r7785rp_defconfig
+++ b/arch/sh/configs/r7785rp_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-rc5
4# Mon Jan 4 13:19:35 2010 4# Tue May 18 16:03:27 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -34,6 +34,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_IO_TRAPPED=y 35CONFIG_IO_TRAPPED=y
36CONFIG_DMA_NONCOHERENT=y 36CONFIG_DMA_NONCOHERENT=y
37CONFIG_NEED_DMA_MAP_STATE=y
37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 38CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
38CONFIG_CONSTRUCTORS=y 39CONFIG_CONSTRUCTORS=y
39 40
@@ -49,9 +50,11 @@ CONFIG_LOCALVERSION_AUTO=y
49CONFIG_HAVE_KERNEL_GZIP=y 50CONFIG_HAVE_KERNEL_GZIP=y
50CONFIG_HAVE_KERNEL_BZIP2=y 51CONFIG_HAVE_KERNEL_BZIP2=y
51CONFIG_HAVE_KERNEL_LZMA=y 52CONFIG_HAVE_KERNEL_LZMA=y
53CONFIG_HAVE_KERNEL_LZO=y
52CONFIG_KERNEL_GZIP=y 54CONFIG_KERNEL_GZIP=y
53# CONFIG_KERNEL_BZIP2 is not set 55# CONFIG_KERNEL_BZIP2 is not set
54# CONFIG_KERNEL_LZMA is not set 56# CONFIG_KERNEL_LZMA is not set
57# CONFIG_KERNEL_LZO is not set
55CONFIG_SWAP=y 58CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
57CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
@@ -77,7 +80,6 @@ CONFIG_TREE_RCU_TRACE=y
77CONFIG_IKCONFIG=y 80CONFIG_IKCONFIG=y
78CONFIG_IKCONFIG_PROC=y 81CONFIG_IKCONFIG_PROC=y
79CONFIG_LOG_BUF_SHIFT=14 82CONFIG_LOG_BUF_SHIFT=14
80# CONFIG_GROUP_SCHED is not set
81# CONFIG_CGROUPS is not set 83# CONFIG_CGROUPS is not set
82CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
@@ -112,7 +114,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 114# Kernel Performance Events And Counters
113# 115#
114CONFIG_PERF_EVENTS=y 116CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116# CONFIG_PERF_COUNTERS is not set 117# CONFIG_PERF_COUNTERS is not set
117# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 118# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
118CONFIG_VM_EVENT_COUNTERS=y 119CONFIG_VM_EVENT_COUNTERS=y
@@ -122,18 +123,17 @@ CONFIG_SLAB=y
122# CONFIG_SLUB is not set 123# CONFIG_SLUB is not set
123# CONFIG_SLOB is not set 124# CONFIG_SLOB is not set
124CONFIG_PROFILING=y 125CONFIG_PROFILING=y
125CONFIG_TRACEPOINTS=y
126CONFIG_OPROFILE=y 126CONFIG_OPROFILE=y
127CONFIG_HAVE_OPROFILE=y 127CONFIG_HAVE_OPROFILE=y
128CONFIG_KPROBES=y 128CONFIG_KPROBES=y
129CONFIG_KRETPROBES=y 129CONFIG_KRETPROBES=y
130CONFIG_HAVE_IOREMAP_PROT=y
131CONFIG_HAVE_KPROBES=y 130CONFIG_HAVE_KPROBES=y
132CONFIG_HAVE_KRETPROBES=y 131CONFIG_HAVE_KRETPROBES=y
133CONFIG_HAVE_ARCH_TRACEHOOK=y 132CONFIG_HAVE_ARCH_TRACEHOOK=y
134CONFIG_HAVE_DMA_ATTRS=y 133CONFIG_HAVE_DMA_ATTRS=y
135CONFIG_HAVE_CLK=y 134CONFIG_HAVE_CLK=y
136CONFIG_HAVE_DMA_API_DEBUG=y 135CONFIG_HAVE_DMA_API_DEBUG=y
136CONFIG_HAVE_HW_BREAKPOINT=y
137 137
138# 138#
139# GCOV-based kernel profiling 139# GCOV-based kernel profiling
@@ -247,12 +247,9 @@ CONFIG_PAGE_OFFSET=0x80000000
247CONFIG_FORCE_MAX_ZONEORDER=11 247CONFIG_FORCE_MAX_ZONEORDER=11
248CONFIG_MEMORY_START=0x08000000 248CONFIG_MEMORY_START=0x08000000
249CONFIG_MEMORY_SIZE=0x08000000 249CONFIG_MEMORY_SIZE=0x08000000
250# CONFIG_29BIT is not set 250CONFIG_29BIT=y
251CONFIG_32BIT=y
252CONFIG_PMB_ENABLE=y
253# CONFIG_PMB is not set 251# CONFIG_PMB is not set
254CONFIG_PMB_FIXED=y 252CONFIG_X2TLB=y
255# CONFIG_X2TLB is not set
256CONFIG_VSYSCALL=y 253CONFIG_VSYSCALL=y
257# CONFIG_NUMA is not set 254# CONFIG_NUMA is not set
258CONFIG_ARCH_FLATMEM_ENABLE=y 255CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -263,6 +260,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
263CONFIG_ARCH_SELECT_MEMORY_MODEL=y 260CONFIG_ARCH_SELECT_MEMORY_MODEL=y
264CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 261CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
265CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 262CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
263CONFIG_IOREMAP_FIXED=y
264CONFIG_UNCACHED_MAPPING=y
266CONFIG_PAGE_SIZE_4KB=y 265CONFIG_PAGE_SIZE_4KB=y
267# CONFIG_PAGE_SIZE_8KB is not set 266# CONFIG_PAGE_SIZE_8KB is not set
268# CONFIG_PAGE_SIZE_16KB is not set 267# CONFIG_PAGE_SIZE_16KB is not set
@@ -285,7 +284,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=999999
285CONFIG_MIGRATION=y 284CONFIG_MIGRATION=y
286# CONFIG_PHYS_ADDR_T_64BIT is not set 285# CONFIG_PHYS_ADDR_T_64BIT is not set
287CONFIG_ZONE_DMA_FLAG=0 286CONFIG_ZONE_DMA_FLAG=0
288CONFIG_NR_QUICK=2 287CONFIG_NR_QUICK=1
289# CONFIG_KSM is not set 288# CONFIG_KSM is not set
290CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 289CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
291 290
@@ -303,6 +302,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
303# CONFIG_CPU_BIG_ENDIAN is not set 302# CONFIG_CPU_BIG_ENDIAN is not set
304CONFIG_SH_FPU=y 303CONFIG_SH_FPU=y
305CONFIG_SH_STORE_QUEUES=y 304CONFIG_SH_STORE_QUEUES=y
305# CONFIG_SPECULATIVE_EXECUTION is not set
306CONFIG_CPU_HAS_INTEVT=y 306CONFIG_CPU_HAS_INTEVT=y
307CONFIG_CPU_HAS_SR_RB=y 307CONFIG_CPU_HAS_SR_RB=y
308CONFIG_CPU_HAS_FPU=y 308CONFIG_CPU_HAS_FPU=y
@@ -377,7 +377,7 @@ CONFIG_KEXEC=y
377# CONFIG_PREEMPT_VOLUNTARY is not set 377# CONFIG_PREEMPT_VOLUNTARY is not set
378CONFIG_PREEMPT=y 378CONFIG_PREEMPT=y
379CONFIG_GUSA=y 379CONFIG_GUSA=y
380# CONFIG_SPARSE_IRQ is not set 380# CONFIG_INTC_USERIMASK is not set
381 381
382# 382#
383# Boot options 383# Boot options
@@ -393,9 +393,9 @@ CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
393# Bus options 393# Bus options
394# 394#
395CONFIG_PCI=y 395CONFIG_PCI=y
396CONFIG_PCI_DOMAINS=y
396# CONFIG_PCIEPORTBUS is not set 397# CONFIG_PCIEPORTBUS is not set
397# CONFIG_ARCH_SUPPORTS_MSI is not set 398# CONFIG_ARCH_SUPPORTS_MSI is not set
398# CONFIG_PCI_LEGACY is not set
399# CONFIG_PCI_DEBUG is not set 399# CONFIG_PCI_DEBUG is not set
400# CONFIG_PCI_STUB is not set 400# CONFIG_PCI_STUB is not set
401# CONFIG_PCI_IOV is not set 401# CONFIG_PCI_IOV is not set
@@ -421,7 +421,6 @@ CONFIG_NET=y
421# Networking options 421# Networking options
422# 422#
423CONFIG_PACKET=y 423CONFIG_PACKET=y
424# CONFIG_PACKET_MMAP is not set
425CONFIG_UNIX=y 424CONFIG_UNIX=y
426CONFIG_XFRM=y 425CONFIG_XFRM=y
427# CONFIG_XFRM_USER is not set 426# CONFIG_XFRM_USER is not set
@@ -471,6 +470,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
471# CONFIG_ATM is not set 470# CONFIG_ATM is not set
472CONFIG_STP=m 471CONFIG_STP=m
473CONFIG_BRIDGE=m 472CONFIG_BRIDGE=m
473CONFIG_BRIDGE_IGMP_SNOOPING=y
474# CONFIG_NET_DSA is not set 474# CONFIG_NET_DSA is not set
475# CONFIG_VLAN_8021Q is not set 475# CONFIG_VLAN_8021Q is not set
476# CONFIG_DECNET is not set 476# CONFIG_DECNET is not set
@@ -492,7 +492,6 @@ CONFIG_LLC=m
492# 492#
493# CONFIG_NET_PKTGEN is not set 493# CONFIG_NET_PKTGEN is not set
494# CONFIG_NET_TCPPROBE is not set 494# CONFIG_NET_TCPPROBE is not set
495# CONFIG_NET_DROP_MONITOR is not set
496# CONFIG_HAMRADIO is not set 495# CONFIG_HAMRADIO is not set
497# CONFIG_CAN is not set 496# CONFIG_CAN is not set
498# CONFIG_IRDA is not set 497# CONFIG_IRDA is not set
@@ -557,6 +556,7 @@ CONFIG_MISC_DEVICES=y
557# CONFIG_ENCLOSURE_SERVICES is not set 556# CONFIG_ENCLOSURE_SERVICES is not set
558# CONFIG_HP_ILO is not set 557# CONFIG_HP_ILO is not set
559# CONFIG_ISL29003 is not set 558# CONFIG_ISL29003 is not set
559# CONFIG_SENSORS_TSL2550 is not set
560# CONFIG_DS1682 is not set 560# CONFIG_DS1682 is not set
561# CONFIG_C2PORT is not set 561# CONFIG_C2PORT is not set
562 562
@@ -574,6 +574,7 @@ CONFIG_HAVE_IDE=y
574# 574#
575# SCSI device support 575# SCSI device support
576# 576#
577CONFIG_SCSI_MOD=y
577# CONFIG_RAID_ATTRS is not set 578# CONFIG_RAID_ATTRS is not set
578CONFIG_SCSI=y 579CONFIG_SCSI=y
579CONFIG_SCSI_DMA=y 580CONFIG_SCSI_DMA=y
@@ -691,6 +692,7 @@ CONFIG_SATA_SIL=y
691# CONFIG_PATA_IT821X is not set 692# CONFIG_PATA_IT821X is not set
692# CONFIG_PATA_IT8213 is not set 693# CONFIG_PATA_IT8213 is not set
693# CONFIG_PATA_JMICRON is not set 694# CONFIG_PATA_JMICRON is not set
695# CONFIG_PATA_LEGACY is not set
694# CONFIG_PATA_TRIFLEX is not set 696# CONFIG_PATA_TRIFLEX is not set
695# CONFIG_PATA_MARVELL is not set 697# CONFIG_PATA_MARVELL is not set
696# CONFIG_PATA_MPIIX is not set 698# CONFIG_PATA_MPIIX is not set
@@ -727,7 +729,7 @@ CONFIG_PATA_PLATFORM=y
727# 729#
728 730
729# 731#
730# See the help texts for more information. 732# The newer stack is recommended.
731# 733#
732# CONFIG_FIREWIRE is not set 734# CONFIG_FIREWIRE is not set
733# CONFIG_IEEE1394 is not set 735# CONFIG_IEEE1394 is not set
@@ -797,6 +799,8 @@ CONFIG_NETDEV_10000=y
797# CONFIG_CHELSIO_T1 is not set 799# CONFIG_CHELSIO_T1 is not set
798CONFIG_CHELSIO_T3_DEPENDS=y 800CONFIG_CHELSIO_T3_DEPENDS=y
799# CONFIG_CHELSIO_T3 is not set 801# CONFIG_CHELSIO_T3 is not set
802CONFIG_CHELSIO_T4_DEPENDS=y
803# CONFIG_CHELSIO_T4 is not set
800# CONFIG_ENIC is not set 804# CONFIG_ENIC is not set
801# CONFIG_IXGBE is not set 805# CONFIG_IXGBE is not set
802# CONFIG_IXGB is not set 806# CONFIG_IXGB is not set
@@ -809,6 +813,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
809# CONFIG_MLX4_CORE is not set 813# CONFIG_MLX4_CORE is not set
810# CONFIG_TEHUTI is not set 814# CONFIG_TEHUTI is not set
811# CONFIG_BNX2X is not set 815# CONFIG_BNX2X is not set
816# CONFIG_QLCNIC is not set
812# CONFIG_QLGE is not set 817# CONFIG_QLGE is not set
813# CONFIG_SFC is not set 818# CONFIG_SFC is not set
814# CONFIG_BE2NET is not set 819# CONFIG_BE2NET is not set
@@ -910,6 +915,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
910CONFIG_SERIAL_CORE=y 915CONFIG_SERIAL_CORE=y
911CONFIG_SERIAL_CORE_CONSOLE=y 916CONFIG_SERIAL_CORE_CONSOLE=y
912# CONFIG_SERIAL_JSM is not set 917# CONFIG_SERIAL_JSM is not set
918# CONFIG_SERIAL_TIMBERDALE is not set
913CONFIG_UNIX98_PTYS=y 919CONFIG_UNIX98_PTYS=y
914# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 920# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
915CONFIG_LEGACY_PTYS=y 921CONFIG_LEGACY_PTYS=y
@@ -959,6 +965,7 @@ CONFIG_I2C_HIGHLANDER=y
959# CONFIG_I2C_OCORES is not set 965# CONFIG_I2C_OCORES is not set
960# CONFIG_I2C_SH_MOBILE is not set 966# CONFIG_I2C_SH_MOBILE is not set
961# CONFIG_I2C_SIMTEC is not set 967# CONFIG_I2C_SIMTEC is not set
968# CONFIG_I2C_XILINX is not set
962 969
963# 970#
964# External I2C/SMBus adapter drivers 971# External I2C/SMBus adapter drivers
@@ -971,15 +978,9 @@ CONFIG_I2C_HIGHLANDER=y
971# 978#
972# CONFIG_I2C_PCA_PLATFORM is not set 979# CONFIG_I2C_PCA_PLATFORM is not set
973# CONFIG_I2C_STUB is not set 980# CONFIG_I2C_STUB is not set
974
975#
976# Miscellaneous I2C Chip support
977#
978# CONFIG_SENSORS_TSL2550 is not set
979# CONFIG_I2C_DEBUG_CORE is not set 981# CONFIG_I2C_DEBUG_CORE is not set
980# CONFIG_I2C_DEBUG_ALGO is not set 982# CONFIG_I2C_DEBUG_ALGO is not set
981# CONFIG_I2C_DEBUG_BUS is not set 983# CONFIG_I2C_DEBUG_BUS is not set
982# CONFIG_I2C_DEBUG_CHIP is not set
983# CONFIG_SPI is not set 984# CONFIG_SPI is not set
984 985
985# 986#
@@ -994,13 +995,17 @@ CONFIG_GPIOLIB=y
994# 995#
995# Memory mapped GPIO expanders: 996# Memory mapped GPIO expanders:
996# 997#
998# CONFIG_GPIO_IT8761E is not set
999# CONFIG_GPIO_SCH is not set
997 1000
998# 1001#
999# I2C GPIO expanders: 1002# I2C GPIO expanders:
1000# 1003#
1004# CONFIG_GPIO_MAX7300 is not set
1001# CONFIG_GPIO_MAX732X is not set 1005# CONFIG_GPIO_MAX732X is not set
1002# CONFIG_GPIO_PCA953X is not set 1006# CONFIG_GPIO_PCA953X is not set
1003# CONFIG_GPIO_PCF857X is not set 1007# CONFIG_GPIO_PCF857X is not set
1008# CONFIG_GPIO_ADP5588 is not set
1004 1009
1005# 1010#
1006# PCI GPIO expanders: 1011# PCI GPIO expanders:
@@ -1033,10 +1038,11 @@ CONFIG_HWMON=y
1033# CONFIG_SENSORS_ADM1029 is not set 1038# CONFIG_SENSORS_ADM1029 is not set
1034# CONFIG_SENSORS_ADM1031 is not set 1039# CONFIG_SENSORS_ADM1031 is not set
1035# CONFIG_SENSORS_ADM9240 is not set 1040# CONFIG_SENSORS_ADM9240 is not set
1041# CONFIG_SENSORS_ADT7411 is not set
1036# CONFIG_SENSORS_ADT7462 is not set 1042# CONFIG_SENSORS_ADT7462 is not set
1037# CONFIG_SENSORS_ADT7470 is not set 1043# CONFIG_SENSORS_ADT7470 is not set
1038# CONFIG_SENSORS_ADT7473 is not set
1039# CONFIG_SENSORS_ADT7475 is not set 1044# CONFIG_SENSORS_ADT7475 is not set
1045# CONFIG_SENSORS_ASC7621 is not set
1040# CONFIG_SENSORS_ATXP1 is not set 1046# CONFIG_SENSORS_ATXP1 is not set
1041# CONFIG_SENSORS_DS1621 is not set 1047# CONFIG_SENSORS_DS1621 is not set
1042# CONFIG_SENSORS_I5K_AMB is not set 1048# CONFIG_SENSORS_I5K_AMB is not set
@@ -1074,6 +1080,7 @@ CONFIG_HWMON=y
1074# CONFIG_SENSORS_SMSC47M192 is not set 1080# CONFIG_SENSORS_SMSC47M192 is not set
1075# CONFIG_SENSORS_SMSC47B397 is not set 1081# CONFIG_SENSORS_SMSC47B397 is not set
1076# CONFIG_SENSORS_ADS7828 is not set 1082# CONFIG_SENSORS_ADS7828 is not set
1083# CONFIG_SENSORS_AMC6821 is not set
1077# CONFIG_SENSORS_THMC50 is not set 1084# CONFIG_SENSORS_THMC50 is not set
1078# CONFIG_SENSORS_TMP401 is not set 1085# CONFIG_SENSORS_TMP401 is not set
1079# CONFIG_SENSORS_TMP421 is not set 1086# CONFIG_SENSORS_TMP421 is not set
@@ -1102,20 +1109,25 @@ CONFIG_SSB_POSSIBLE=y
1102# Multifunction device drivers 1109# Multifunction device drivers
1103# 1110#
1104# CONFIG_MFD_CORE is not set 1111# CONFIG_MFD_CORE is not set
1112# CONFIG_MFD_88PM860X is not set
1105# CONFIG_MFD_SM501 is not set 1113# CONFIG_MFD_SM501 is not set
1106# CONFIG_MFD_SH_MOBILE_SDHI is not set 1114# CONFIG_MFD_SH_MOBILE_SDHI is not set
1107# CONFIG_HTC_PASIC3 is not set 1115# CONFIG_HTC_PASIC3 is not set
1116# CONFIG_HTC_I2CPLD is not set
1108# CONFIG_TPS65010 is not set 1117# CONFIG_TPS65010 is not set
1109# CONFIG_TWL4030_CORE is not set 1118# CONFIG_TWL4030_CORE is not set
1110# CONFIG_MFD_TMIO is not set 1119# CONFIG_MFD_TMIO is not set
1111# CONFIG_PMIC_DA903X is not set 1120# CONFIG_PMIC_DA903X is not set
1112# CONFIG_PMIC_ADP5520 is not set 1121# CONFIG_PMIC_ADP5520 is not set
1122# CONFIG_MFD_MAX8925 is not set
1113# CONFIG_MFD_WM8400 is not set 1123# CONFIG_MFD_WM8400 is not set
1114# CONFIG_MFD_WM831X is not set 1124# CONFIG_MFD_WM831X is not set
1115# CONFIG_MFD_WM8350_I2C is not set 1125# CONFIG_MFD_WM8350_I2C is not set
1126# CONFIG_MFD_WM8994 is not set
1116# CONFIG_MFD_PCF50633 is not set 1127# CONFIG_MFD_PCF50633 is not set
1117# CONFIG_AB3100_CORE is not set 1128# CONFIG_AB3100_CORE is not set
1118# CONFIG_MFD_88PM8607 is not set 1129# CONFIG_MFD_TIMBERDALE is not set
1130# CONFIG_LPC_SCH is not set
1119# CONFIG_REGULATOR is not set 1131# CONFIG_REGULATOR is not set
1120# CONFIG_MEDIA_SUPPORT is not set 1132# CONFIG_MEDIA_SUPPORT is not set
1121 1133
@@ -1123,6 +1135,7 @@ CONFIG_SSB_POSSIBLE=y
1123# Graphics support 1135# Graphics support
1124# 1136#
1125CONFIG_VGA_ARB=y 1137CONFIG_VGA_ARB=y
1138CONFIG_VGA_ARB_MAX_GPUS=16
1126# CONFIG_DRM is not set 1139# CONFIG_DRM is not set
1127# CONFIG_VGASTATE is not set 1140# CONFIG_VGASTATE is not set
1128# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1141# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1371,6 +1384,7 @@ CONFIG_MISC_FILESYSTEMS=y
1371# CONFIG_BEFS_FS is not set 1384# CONFIG_BEFS_FS is not set
1372# CONFIG_BFS_FS is not set 1385# CONFIG_BFS_FS is not set
1373# CONFIG_EFS_FS is not set 1386# CONFIG_EFS_FS is not set
1387# CONFIG_LOGFS is not set
1374# CONFIG_CRAMFS is not set 1388# CONFIG_CRAMFS is not set
1375# CONFIG_SQUASHFS is not set 1389# CONFIG_SQUASHFS is not set
1376# CONFIG_VXFS_FS is not set 1390# CONFIG_VXFS_FS is not set
@@ -1401,6 +1415,7 @@ CONFIG_SUNRPC_GSS=y
1401CONFIG_RPCSEC_GSS_KRB5=y 1415CONFIG_RPCSEC_GSS_KRB5=y
1402# CONFIG_RPCSEC_GSS_SPKM3 is not set 1416# CONFIG_RPCSEC_GSS_SPKM3 is not set
1403# CONFIG_SMB_FS is not set 1417# CONFIG_SMB_FS is not set
1418# CONFIG_CEPH_FS is not set
1404# CONFIG_CIFS is not set 1419# CONFIG_CIFS is not set
1405# CONFIG_NCP_FS is not set 1420# CONFIG_NCP_FS is not set
1406# CONFIG_CODA_FS is not set 1421# CONFIG_CODA_FS is not set
@@ -1475,6 +1490,7 @@ CONFIG_SCHED_DEBUG=y
1475# CONFIG_TIMER_STATS is not set 1490# CONFIG_TIMER_STATS is not set
1476# CONFIG_DEBUG_OBJECTS is not set 1491# CONFIG_DEBUG_OBJECTS is not set
1477# CONFIG_DEBUG_SLAB is not set 1492# CONFIG_DEBUG_SLAB is not set
1493# CONFIG_DEBUG_KMEMLEAK is not set
1478# CONFIG_DEBUG_PREEMPT is not set 1494# CONFIG_DEBUG_PREEMPT is not set
1479# CONFIG_DEBUG_RT_MUTEXES is not set 1495# CONFIG_DEBUG_RT_MUTEXES is not set
1480# CONFIG_RT_MUTEX_TESTER is not set 1496# CONFIG_RT_MUTEX_TESTER is not set
@@ -1510,7 +1526,6 @@ CONFIG_FRAME_POINTER=y
1510# CONFIG_LATENCYTOP is not set 1526# CONFIG_LATENCYTOP is not set
1511# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1527# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1512# CONFIG_PAGE_POISONING is not set 1528# CONFIG_PAGE_POISONING is not set
1513CONFIG_NOP_TRACER=y
1514CONFIG_HAVE_FUNCTION_TRACER=y 1529CONFIG_HAVE_FUNCTION_TRACER=y
1515CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1530CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1516CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1531CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1518,10 +1533,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1518CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1533CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1519CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1534CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1520CONFIG_RING_BUFFER=y 1535CONFIG_RING_BUFFER=y
1521CONFIG_EVENT_TRACING=y
1522CONFIG_CONTEXT_SWITCH_TRACER=y
1523CONFIG_RING_BUFFER_ALLOW_SWAP=y 1536CONFIG_RING_BUFFER_ALLOW_SWAP=y
1524CONFIG_TRACING=y
1525CONFIG_TRACING_SUPPORT=y 1537CONFIG_TRACING_SUPPORT=y
1526CONFIG_FTRACE=y 1538CONFIG_FTRACE=y
1527# CONFIG_FUNCTION_TRACER is not set 1539# CONFIG_FUNCTION_TRACER is not set
@@ -1534,6 +1546,7 @@ CONFIG_FTRACE=y
1534CONFIG_BRANCH_PROFILE_NONE=y 1546CONFIG_BRANCH_PROFILE_NONE=y
1535# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1547# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1536# CONFIG_PROFILE_ALL_BRANCHES is not set 1548# CONFIG_PROFILE_ALL_BRANCHES is not set
1549# CONFIG_KSYM_TRACER is not set
1537# CONFIG_STACK_TRACER is not set 1550# CONFIG_STACK_TRACER is not set
1538# CONFIG_KMEMTRACE is not set 1551# CONFIG_KMEMTRACE is not set
1539# CONFIG_WORKQUEUE_TRACER is not set 1552# CONFIG_WORKQUEUE_TRACER is not set
@@ -1661,7 +1674,8 @@ CONFIG_CRYPTO_DES=y
1661# CONFIG_CRYPTO_ANSI_CPRNG is not set 1674# CONFIG_CRYPTO_ANSI_CPRNG is not set
1662CONFIG_CRYPTO_HW=y 1675CONFIG_CRYPTO_HW=y
1663# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1676# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1664CONFIG_BINARY_PRINTF=y 1677# CONFIG_VIRTUALIZATION is not set
1678# CONFIG_BINARY_PRINTF is not set
1665 1679
1666# 1680#
1667# Library routines 1681# Library routines
diff --git a/arch/sh/configs/rsk7201_defconfig b/arch/sh/configs/rsk7201_defconfig
index 2fc635a5a8c..80e7b41ca62 100644
--- a/arch/sh/configs/rsk7201_defconfig
+++ b/arch/sh/configs/rsk7201_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-rc5
4# Mon Jan 4 13:23:12 2010 4# Tue May 18 16:09:18 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -44,9 +45,11 @@ CONFIG_LOCALVERSION=""
44CONFIG_HAVE_KERNEL_GZIP=y 45CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y 46CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y 47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_HAVE_KERNEL_LZO=y
47CONFIG_KERNEL_GZIP=y 49CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set 50# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set 51# CONFIG_KERNEL_LZMA is not set
52# CONFIG_KERNEL_LZO is not set
50CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
51CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
52CONFIG_BSD_PROCESS_ACCT=y 55CONFIG_BSD_PROCESS_ACCT=y
@@ -65,7 +68,6 @@ CONFIG_RCU_FANOUT=32
65CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
66# CONFIG_IKCONFIG_PROC is not set 69# CONFIG_IKCONFIG_PROC is not set
67CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
68# CONFIG_GROUP_SCHED is not set
69# CONFIG_CGROUPS is not set 71# CONFIG_CGROUPS is not set
70# CONFIG_SYSFS_DEPRECATED_V2 is not set 72# CONFIG_SYSFS_DEPRECATED_V2 is not set
71# CONFIG_RELAY is not set 73# CONFIG_RELAY is not set
@@ -79,6 +81,7 @@ CONFIG_INITRAMFS_SOURCE=""
79CONFIG_RD_GZIP=y 81CONFIG_RD_GZIP=y
80# CONFIG_RD_BZIP2 is not set 82# CONFIG_RD_BZIP2 is not set
81# CONFIG_RD_LZMA is not set 83# CONFIG_RD_LZMA is not set
84# CONFIG_RD_LZO is not set
82CONFIG_CC_OPTIMIZE_FOR_SIZE=y 85CONFIG_CC_OPTIMIZE_FOR_SIZE=y
83CONFIG_SYSCTL=y 86CONFIG_SYSCTL=y
84CONFIG_ANON_INODES=y 87CONFIG_ANON_INODES=y
@@ -105,7 +108,6 @@ CONFIG_PERF_USE_VMALLOC=y
105# Kernel Performance Events And Counters 108# Kernel Performance Events And Counters
106# 109#
107CONFIG_PERF_EVENTS=y 110CONFIG_PERF_EVENTS=y
108CONFIG_EVENT_PROFILE=y
109# CONFIG_PERF_COUNTERS is not set 111# CONFIG_PERF_COUNTERS is not set
110CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_COMPAT_BRK=y 113CONFIG_COMPAT_BRK=y
@@ -114,7 +116,6 @@ CONFIG_COMPAT_BRK=y
114CONFIG_SLOB=y 116CONFIG_SLOB=y
115# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set 117# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set
116CONFIG_PROFILING=y 118CONFIG_PROFILING=y
117CONFIG_TRACEPOINTS=y
118CONFIG_OPROFILE=y 119CONFIG_OPROFILE=y
119CONFIG_HAVE_OPROFILE=y 120CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 121# CONFIG_KPROBES is not set
@@ -124,6 +125,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 125CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128CONFIG_HAVE_HW_BREAKPOINT=y
127 129
128# 130#
129# GCOV-based kernel profiling 131# GCOV-based kernel profiling
@@ -240,6 +242,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
240CONFIG_MAX_ACTIVE_REGIONS=1 242CONFIG_MAX_ACTIVE_REGIONS=1
241CONFIG_ARCH_POPULATES_NODE_MAP=y 243CONFIG_ARCH_POPULATES_NODE_MAP=y
242CONFIG_ARCH_SELECT_MEMORY_MODEL=y 244CONFIG_ARCH_SELECT_MEMORY_MODEL=y
245CONFIG_UNCACHED_MAPPING=y
243CONFIG_PAGE_SIZE_4KB=y 246CONFIG_PAGE_SIZE_4KB=y
244# CONFIG_PAGE_SIZE_8KB is not set 247# CONFIG_PAGE_SIZE_8KB is not set
245# CONFIG_PAGE_SIZE_16KB is not set 248# CONFIG_PAGE_SIZE_16KB is not set
@@ -255,7 +258,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
255CONFIG_SPLIT_PTLOCK_CPUS=4 258CONFIG_SPLIT_PTLOCK_CPUS=4
256# CONFIG_PHYS_ADDR_T_64BIT is not set 259# CONFIG_PHYS_ADDR_T_64BIT is not set
257CONFIG_ZONE_DMA_FLAG=0 260CONFIG_ZONE_DMA_FLAG=0
258CONFIG_NR_QUICK=2 261CONFIG_NR_QUICK=1
259CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 262CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
260 263
261# 264#
@@ -326,7 +329,6 @@ CONFIG_PREEMPT_NONE=y
326# CONFIG_PREEMPT_VOLUNTARY is not set 329# CONFIG_PREEMPT_VOLUNTARY is not set
327# CONFIG_PREEMPT is not set 330# CONFIG_PREEMPT is not set
328CONFIG_GUSA=y 331CONFIG_GUSA=y
329# CONFIG_SPARSE_IRQ is not set
330 332
331# 333#
332# Boot options 334# Boot options
@@ -485,6 +487,7 @@ CONFIG_HAVE_IDE=y
485# 487#
486# SCSI device support 488# SCSI device support
487# 489#
490CONFIG_SCSI_MOD=y
488# CONFIG_RAID_ATTRS is not set 491# CONFIG_RAID_ATTRS is not set
489# CONFIG_SCSI is not set 492# CONFIG_SCSI is not set
490# CONFIG_SCSI_DMA is not set 493# CONFIG_SCSI_DMA is not set
@@ -545,6 +548,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=8
545CONFIG_SERIAL_SH_SCI_CONSOLE=y 548CONFIG_SERIAL_SH_SCI_CONSOLE=y
546CONFIG_SERIAL_CORE=y 549CONFIG_SERIAL_CORE=y
547CONFIG_SERIAL_CORE_CONSOLE=y 550CONFIG_SERIAL_CORE_CONSOLE=y
551# CONFIG_SERIAL_TIMBERDALE is not set
548# CONFIG_UNIX98_PTYS is not set 552# CONFIG_UNIX98_PTYS is not set
549# CONFIG_LEGACY_PTYS is not set 553# CONFIG_LEGACY_PTYS is not set
550# CONFIG_IPMI_HANDLER is not set 554# CONFIG_IPMI_HANDLER is not set
@@ -657,7 +661,6 @@ CONFIG_EXT2_FS=y
657# CONFIG_EXT2_FS_XATTR is not set 661# CONFIG_EXT2_FS_XATTR is not set
658# CONFIG_EXT3_FS is not set 662# CONFIG_EXT3_FS is not set
659# CONFIG_EXT4_FS is not set 663# CONFIG_EXT4_FS is not set
660CONFIG_EXT4_USE_FOR_EXT23=y
661# CONFIG_REISERFS_FS is not set 664# CONFIG_REISERFS_FS is not set
662# CONFIG_JFS_FS is not set 665# CONFIG_JFS_FS is not set
663# CONFIG_FS_POSIX_ACL is not set 666# CONFIG_FS_POSIX_ACL is not set
@@ -720,6 +723,7 @@ CONFIG_JFFS2_ZLIB=y
720# CONFIG_JFFS2_LZO is not set 723# CONFIG_JFFS2_LZO is not set
721CONFIG_JFFS2_RTIME=y 724CONFIG_JFFS2_RTIME=y
722# CONFIG_JFFS2_RUBIN is not set 725# CONFIG_JFFS2_RUBIN is not set
726# CONFIG_LOGFS is not set
723# CONFIG_CRAMFS is not set 727# CONFIG_CRAMFS is not set
724# CONFIG_SQUASHFS is not set 728# CONFIG_SQUASHFS is not set
725# CONFIG_VXFS_FS is not set 729# CONFIG_VXFS_FS is not set
@@ -756,13 +760,12 @@ CONFIG_MAGIC_SYSRQ=y
756CONFIG_DEBUG_FS=y 760CONFIG_DEBUG_FS=y
757# CONFIG_HEADERS_CHECK is not set 761# CONFIG_HEADERS_CHECK is not set
758# CONFIG_DEBUG_KERNEL is not set 762# CONFIG_DEBUG_KERNEL is not set
759CONFIG_STACKTRACE=y
760CONFIG_DEBUG_BUGVERBOSE=y 763CONFIG_DEBUG_BUGVERBOSE=y
761# CONFIG_DEBUG_MEMORY_INIT is not set 764# CONFIG_DEBUG_MEMORY_INIT is not set
762# CONFIG_RCU_CPU_STALL_DETECTOR is not set 765# CONFIG_RCU_CPU_STALL_DETECTOR is not set
766# CONFIG_LKDTM is not set
763# CONFIG_LATENCYTOP is not set 767# CONFIG_LATENCYTOP is not set
764CONFIG_SYSCTL_SYSCALL_CHECK=y 768CONFIG_SYSCTL_SYSCALL_CHECK=y
765CONFIG_NOP_TRACER=y
766CONFIG_HAVE_FUNCTION_TRACER=y 769CONFIG_HAVE_FUNCTION_TRACER=y
767CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 770CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
768CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 771CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -770,10 +773,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
770CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 773CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
771CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 774CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
772CONFIG_RING_BUFFER=y 775CONFIG_RING_BUFFER=y
773CONFIG_EVENT_TRACING=y
774CONFIG_CONTEXT_SWITCH_TRACER=y
775CONFIG_RING_BUFFER_ALLOW_SWAP=y 776CONFIG_RING_BUFFER_ALLOW_SWAP=y
776CONFIG_TRACING=y
777CONFIG_TRACING_SUPPORT=y 777CONFIG_TRACING_SUPPORT=y
778# CONFIG_FTRACE is not set 778# CONFIG_FTRACE is not set
779# CONFIG_DYNAMIC_DEBUG is not set 779# CONFIG_DYNAMIC_DEBUG is not set
@@ -795,7 +795,8 @@ CONFIG_HAVE_ARCH_KGDB=y
795CONFIG_DEFAULT_SECURITY_DAC=y 795CONFIG_DEFAULT_SECURITY_DAC=y
796CONFIG_DEFAULT_SECURITY="" 796CONFIG_DEFAULT_SECURITY=""
797# CONFIG_CRYPTO is not set 797# CONFIG_CRYPTO is not set
798CONFIG_BINARY_PRINTF=y 798# CONFIG_VIRTUALIZATION is not set
799# CONFIG_BINARY_PRINTF is not set
799 800
800# 801#
801# Library routines 802# Library routines
diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig
index 0169e60e094..66eb7d7dad4 100644
--- a/arch/sh/configs/rsk7203_defconfig
+++ b/arch/sh/configs/rsk7203_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-rc5
4# Mon Jan 4 13:23:54 2010 4# Tue May 18 16:11:37 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION=""
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
52CONFIG_SYSVIPC_SYSCTL=y 55CONFIG_SYSVIPC_SYSCTL=y
53CONFIG_POSIX_MQUEUE=y 56CONFIG_POSIX_MQUEUE=y
@@ -70,7 +73,6 @@ CONFIG_RCU_FANOUT=32
70CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
71# CONFIG_IKCONFIG_PROC is not set 74# CONFIG_IKCONFIG_PROC is not set
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_GROUP_SCHED is not set
74# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
75# CONFIG_SYSFS_DEPRECATED_V2 is not set 77# CONFIG_SYSFS_DEPRECATED_V2 is not set
76# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
@@ -85,6 +87,7 @@ CONFIG_INITRAMFS_SOURCE=""
85CONFIG_RD_GZIP=y 87CONFIG_RD_GZIP=y
86# CONFIG_RD_BZIP2 is not set 88# CONFIG_RD_BZIP2 is not set
87# CONFIG_RD_LZMA is not set 89# CONFIG_RD_LZMA is not set
90# CONFIG_RD_LZO is not set
88CONFIG_CC_OPTIMIZE_FOR_SIZE=y 91CONFIG_CC_OPTIMIZE_FOR_SIZE=y
89CONFIG_SYSCTL=y 92CONFIG_SYSCTL=y
90CONFIG_ANON_INODES=y 93CONFIG_ANON_INODES=y
@@ -112,7 +115,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 115# Kernel Performance Events And Counters
113# 116#
114CONFIG_PERF_EVENTS=y 117CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116# CONFIG_PERF_COUNTERS is not set 118# CONFIG_PERF_COUNTERS is not set
117# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 119# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
118CONFIG_VM_EVENT_COUNTERS=y 120CONFIG_VM_EVENT_COUNTERS=y
@@ -122,7 +124,6 @@ CONFIG_COMPAT_BRK=y
122CONFIG_SLOB=y 124CONFIG_SLOB=y
123# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set 125# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set
124CONFIG_PROFILING=y 126CONFIG_PROFILING=y
125CONFIG_TRACEPOINTS=y
126CONFIG_OPROFILE=y 127CONFIG_OPROFILE=y
127CONFIG_HAVE_OPROFILE=y 128CONFIG_HAVE_OPROFILE=y
128# CONFIG_KPROBES is not set 129# CONFIG_KPROBES is not set
@@ -132,6 +133,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
132CONFIG_HAVE_DMA_ATTRS=y 133CONFIG_HAVE_DMA_ATTRS=y
133CONFIG_HAVE_CLK=y 134CONFIG_HAVE_CLK=y
134CONFIG_HAVE_DMA_API_DEBUG=y 135CONFIG_HAVE_DMA_API_DEBUG=y
136CONFIG_HAVE_HW_BREAKPOINT=y
135 137
136# 138#
137# GCOV-based kernel profiling 139# GCOV-based kernel profiling
@@ -248,6 +250,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
248CONFIG_MAX_ACTIVE_REGIONS=1 250CONFIG_MAX_ACTIVE_REGIONS=1
249CONFIG_ARCH_POPULATES_NODE_MAP=y 251CONFIG_ARCH_POPULATES_NODE_MAP=y
250CONFIG_ARCH_SELECT_MEMORY_MODEL=y 252CONFIG_ARCH_SELECT_MEMORY_MODEL=y
253CONFIG_UNCACHED_MAPPING=y
251CONFIG_PAGE_SIZE_4KB=y 254CONFIG_PAGE_SIZE_4KB=y
252# CONFIG_PAGE_SIZE_8KB is not set 255# CONFIG_PAGE_SIZE_8KB is not set
253# CONFIG_PAGE_SIZE_16KB is not set 256# CONFIG_PAGE_SIZE_16KB is not set
@@ -263,7 +266,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
263CONFIG_SPLIT_PTLOCK_CPUS=4 266CONFIG_SPLIT_PTLOCK_CPUS=4
264# CONFIG_PHYS_ADDR_T_64BIT is not set 267# CONFIG_PHYS_ADDR_T_64BIT is not set
265CONFIG_ZONE_DMA_FLAG=0 268CONFIG_ZONE_DMA_FLAG=0
266CONFIG_NR_QUICK=2 269CONFIG_NR_QUICK=1
267CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 270CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
268 271
269# 272#
@@ -350,7 +353,6 @@ CONFIG_PREEMPT_NONE=y
350# CONFIG_PREEMPT_VOLUNTARY is not set 353# CONFIG_PREEMPT_VOLUNTARY is not set
351# CONFIG_PREEMPT is not set 354# CONFIG_PREEMPT is not set
352CONFIG_GUSA=y 355CONFIG_GUSA=y
353# CONFIG_SPARSE_IRQ is not set
354 356
355# 357#
356# Boot options 358# Boot options
@@ -448,7 +450,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
448# Network testing 450# Network testing
449# 451#
450# CONFIG_NET_PKTGEN is not set 452# CONFIG_NET_PKTGEN is not set
451# CONFIG_NET_DROP_MONITOR is not set
452# CONFIG_HAMRADIO is not set 453# CONFIG_HAMRADIO is not set
453# CONFIG_CAN is not set 454# CONFIG_CAN is not set
454# CONFIG_IRDA is not set 455# CONFIG_IRDA is not set
@@ -592,6 +593,7 @@ CONFIG_HAVE_IDE=y
592# 593#
593# SCSI device support 594# SCSI device support
594# 595#
596CONFIG_SCSI_MOD=y
595# CONFIG_RAID_ATTRS is not set 597# CONFIG_RAID_ATTRS is not set
596# CONFIG_SCSI is not set 598# CONFIG_SCSI is not set
597# CONFIG_SCSI_DMA is not set 599# CONFIG_SCSI_DMA is not set
@@ -662,6 +664,7 @@ CONFIG_WLAN=y
662# CONFIG_USB_PEGASUS is not set 664# CONFIG_USB_PEGASUS is not set
663# CONFIG_USB_RTL8150 is not set 665# CONFIG_USB_RTL8150 is not set
664# CONFIG_USB_USBNET is not set 666# CONFIG_USB_USBNET is not set
667# CONFIG_USB_IPHETH is not set
665# CONFIG_WAN is not set 668# CONFIG_WAN is not set
666# CONFIG_PPP is not set 669# CONFIG_PPP is not set
667# CONFIG_SLIP is not set 670# CONFIG_SLIP is not set
@@ -723,6 +726,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=4
723CONFIG_SERIAL_SH_SCI_CONSOLE=y 726CONFIG_SERIAL_SH_SCI_CONSOLE=y
724CONFIG_SERIAL_CORE=y 727CONFIG_SERIAL_CORE=y
725CONFIG_SERIAL_CORE_CONSOLE=y 728CONFIG_SERIAL_CORE_CONSOLE=y
729# CONFIG_SERIAL_TIMBERDALE is not set
726# CONFIG_UNIX98_PTYS is not set 730# CONFIG_UNIX98_PTYS is not set
727# CONFIG_LEGACY_PTYS is not set 731# CONFIG_LEGACY_PTYS is not set
728# CONFIG_IPMI_HANDLER is not set 732# CONFIG_IPMI_HANDLER is not set
@@ -745,6 +749,7 @@ CONFIG_GPIOLIB=y
745# 749#
746# Memory mapped GPIO expanders: 750# Memory mapped GPIO expanders:
747# 751#
752# CONFIG_GPIO_IT8761E is not set
748 753
749# 754#
750# I2C GPIO expanders: 755# I2C GPIO expanders:
@@ -783,6 +788,7 @@ CONFIG_SSB_POSSIBLE=y
783# CONFIG_MFD_TMIO is not set 788# CONFIG_MFD_TMIO is not set
784CONFIG_REGULATOR=y 789CONFIG_REGULATOR=y
785# CONFIG_REGULATOR_DEBUG is not set 790# CONFIG_REGULATOR_DEBUG is not set
791# CONFIG_REGULATOR_DUMMY is not set
786# CONFIG_REGULATOR_FIXED_VOLTAGE is not set 792# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
787# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set 793# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
788# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set 794# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
@@ -816,6 +822,7 @@ CONFIG_USB_HID=y
816# 822#
817# Special HID drivers 823# Special HID drivers
818# 824#
825# CONFIG_HID_3M_PCT is not set
819CONFIG_HID_A4TECH=y 826CONFIG_HID_A4TECH=y
820CONFIG_HID_APPLE=y 827CONFIG_HID_APPLE=y
821CONFIG_HID_BELKIN=y 828CONFIG_HID_BELKIN=y
@@ -831,14 +838,19 @@ CONFIG_HID_GYRATION=y
831CONFIG_HID_LOGITECH=y 838CONFIG_HID_LOGITECH=y
832# CONFIG_LOGITECH_FF is not set 839# CONFIG_LOGITECH_FF is not set
833# CONFIG_LOGIRUMBLEPAD2_FF is not set 840# CONFIG_LOGIRUMBLEPAD2_FF is not set
841# CONFIG_LOGIG940_FF is not set
834CONFIG_HID_MICROSOFT=y 842CONFIG_HID_MICROSOFT=y
843# CONFIG_HID_MOSART is not set
835CONFIG_HID_MONTEREY=y 844CONFIG_HID_MONTEREY=y
836# CONFIG_HID_NTRIG is not set 845# CONFIG_HID_NTRIG is not set
846# CONFIG_HID_ORTEK is not set
837CONFIG_HID_PANTHERLORD=y 847CONFIG_HID_PANTHERLORD=y
838# CONFIG_PANTHERLORD_FF is not set 848# CONFIG_PANTHERLORD_FF is not set
839CONFIG_HID_PETALYNX=y 849CONFIG_HID_PETALYNX=y
850# CONFIG_HID_QUANTA is not set
840CONFIG_HID_SAMSUNG=y 851CONFIG_HID_SAMSUNG=y
841CONFIG_HID_SONY=y 852CONFIG_HID_SONY=y
853# CONFIG_HID_STANTUM is not set
842CONFIG_HID_SUNPLUS=y 854CONFIG_HID_SUNPLUS=y
843# CONFIG_HID_GREENASIA is not set 855# CONFIG_HID_GREENASIA is not set
844# CONFIG_HID_SMARTJOYPLUS is not set 856# CONFIG_HID_SMARTJOYPLUS is not set
@@ -859,7 +871,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
859CONFIG_USB_DEVICEFS=y 871CONFIG_USB_DEVICEFS=y
860CONFIG_USB_DEVICE_CLASS=y 872CONFIG_USB_DEVICE_CLASS=y
861# CONFIG_USB_DYNAMIC_MINORS is not set 873# CONFIG_USB_DYNAMIC_MINORS is not set
862# CONFIG_USB_SUSPEND is not set
863# CONFIG_USB_OTG is not set 874# CONFIG_USB_OTG is not set
864# CONFIG_USB_OTG_WHITELIST is not set 875# CONFIG_USB_OTG_WHITELIST is not set
865# CONFIG_USB_OTG_BLACKLIST_HUB is not set 876# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -916,7 +927,6 @@ CONFIG_USB_R8A66597_HCD=y
916# CONFIG_USB_RIO500 is not set 927# CONFIG_USB_RIO500 is not set
917# CONFIG_USB_LEGOTOWER is not set 928# CONFIG_USB_LEGOTOWER is not set
918# CONFIG_USB_LCD is not set 929# CONFIG_USB_LCD is not set
919# CONFIG_USB_BERRY_CHARGE is not set
920# CONFIG_USB_LED is not set 930# CONFIG_USB_LED is not set
921# CONFIG_USB_CYPRESS_CY7C63 is not set 931# CONFIG_USB_CYPRESS_CY7C63 is not set
922# CONFIG_USB_CYTHERM is not set 932# CONFIG_USB_CYTHERM is not set
@@ -928,7 +938,6 @@ CONFIG_USB_R8A66597_HCD=y
928# CONFIG_USB_IOWARRIOR is not set 938# CONFIG_USB_IOWARRIOR is not set
929# CONFIG_USB_TEST is not set 939# CONFIG_USB_TEST is not set
930# CONFIG_USB_ISIGHTFW is not set 940# CONFIG_USB_ISIGHTFW is not set
931# CONFIG_USB_VST is not set
932# CONFIG_USB_GADGET is not set 941# CONFIG_USB_GADGET is not set
933 942
934# 943#
@@ -948,11 +957,11 @@ CONFIG_LEDS_GPIO=y
948CONFIG_LEDS_GPIO_PLATFORM=y 957CONFIG_LEDS_GPIO_PLATFORM=y
949# CONFIG_LEDS_REGULATOR is not set 958# CONFIG_LEDS_REGULATOR is not set
950# CONFIG_LEDS_LT3593 is not set 959# CONFIG_LEDS_LT3593 is not set
960CONFIG_LEDS_TRIGGERS=y
951 961
952# 962#
953# LED Triggers 963# LED Triggers
954# 964#
955CONFIG_LEDS_TRIGGERS=y
956CONFIG_LEDS_TRIGGER_TIMER=y 965CONFIG_LEDS_TRIGGER_TIMER=y
957CONFIG_LEDS_TRIGGER_HEARTBEAT=y 966CONFIG_LEDS_TRIGGER_HEARTBEAT=y
958CONFIG_LEDS_TRIGGER_BACKLIGHT=y 967CONFIG_LEDS_TRIGGER_BACKLIGHT=y
@@ -1018,7 +1027,6 @@ CONFIG_RTC_DRV_SH=y
1018# CONFIG_EXT2_FS is not set 1027# CONFIG_EXT2_FS is not set
1019# CONFIG_EXT3_FS is not set 1028# CONFIG_EXT3_FS is not set
1020# CONFIG_EXT4_FS is not set 1029# CONFIG_EXT4_FS is not set
1021CONFIG_EXT4_USE_FOR_EXT23=y
1022# CONFIG_REISERFS_FS is not set 1030# CONFIG_REISERFS_FS is not set
1023# CONFIG_JFS_FS is not set 1031# CONFIG_JFS_FS is not set
1024# CONFIG_FS_POSIX_ACL is not set 1032# CONFIG_FS_POSIX_ACL is not set
@@ -1072,6 +1080,7 @@ CONFIG_MISC_FILESYSTEMS=y
1072# CONFIG_BFS_FS is not set 1080# CONFIG_BFS_FS is not set
1073# CONFIG_EFS_FS is not set 1081# CONFIG_EFS_FS is not set
1074# CONFIG_JFFS2_FS is not set 1082# CONFIG_JFFS2_FS is not set
1083# CONFIG_LOGFS is not set
1075# CONFIG_CRAMFS is not set 1084# CONFIG_CRAMFS is not set
1076# CONFIG_SQUASHFS is not set 1085# CONFIG_SQUASHFS is not set
1077# CONFIG_VXFS_FS is not set 1086# CONFIG_VXFS_FS is not set
@@ -1098,6 +1107,7 @@ CONFIG_SUNRPC=y
1098# CONFIG_RPCSEC_GSS_KRB5 is not set 1107# CONFIG_RPCSEC_GSS_KRB5 is not set
1099# CONFIG_RPCSEC_GSS_SPKM3 is not set 1108# CONFIG_RPCSEC_GSS_SPKM3 is not set
1100# CONFIG_SMB_FS is not set 1109# CONFIG_SMB_FS is not set
1110# CONFIG_CEPH_FS is not set
1101# CONFIG_CIFS is not set 1111# CONFIG_CIFS is not set
1102# CONFIG_NCP_FS is not set 1112# CONFIG_NCP_FS is not set
1103# CONFIG_CODA_FS is not set 1113# CONFIG_CODA_FS is not set
@@ -1180,6 +1190,7 @@ CONFIG_DEBUG_OBJECTS=y
1180# CONFIG_DEBUG_OBJECTS_TIMERS is not set 1190# CONFIG_DEBUG_OBJECTS_TIMERS is not set
1181# CONFIG_DEBUG_OBJECTS_WORK is not set 1191# CONFIG_DEBUG_OBJECTS_WORK is not set
1182CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 1192CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
1193# CONFIG_DEBUG_KMEMLEAK is not set
1183# CONFIG_DEBUG_RT_MUTEXES is not set 1194# CONFIG_DEBUG_RT_MUTEXES is not set
1184# CONFIG_RT_MUTEX_TESTER is not set 1195# CONFIG_RT_MUTEX_TESTER is not set
1185# CONFIG_DEBUG_SPINLOCK is not set 1196# CONFIG_DEBUG_SPINLOCK is not set
@@ -1189,7 +1200,6 @@ CONFIG_DEBUG_MUTEXES=y
1189# CONFIG_LOCK_STAT is not set 1200# CONFIG_LOCK_STAT is not set
1190CONFIG_DEBUG_SPINLOCK_SLEEP=y 1201CONFIG_DEBUG_SPINLOCK_SLEEP=y
1191# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1202# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1192CONFIG_STACKTRACE=y
1193# CONFIG_DEBUG_KOBJECT is not set 1203# CONFIG_DEBUG_KOBJECT is not set
1194CONFIG_DEBUG_BUGVERBOSE=y 1204CONFIG_DEBUG_BUGVERBOSE=y
1195CONFIG_DEBUG_INFO=y 1205CONFIG_DEBUG_INFO=y
@@ -1207,11 +1217,11 @@ CONFIG_FRAME_POINTER=y
1207# CONFIG_BACKTRACE_SELF_TEST is not set 1217# CONFIG_BACKTRACE_SELF_TEST is not set
1208# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1218# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1209# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1219# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1220# CONFIG_LKDTM is not set
1210# CONFIG_FAULT_INJECTION is not set 1221# CONFIG_FAULT_INJECTION is not set
1211# CONFIG_LATENCYTOP is not set 1222# CONFIG_LATENCYTOP is not set
1212CONFIG_SYSCTL_SYSCALL_CHECK=y 1223CONFIG_SYSCTL_SYSCALL_CHECK=y
1213# CONFIG_PAGE_POISONING is not set 1224# CONFIG_PAGE_POISONING is not set
1214CONFIG_NOP_TRACER=y
1215CONFIG_HAVE_FUNCTION_TRACER=y 1225CONFIG_HAVE_FUNCTION_TRACER=y
1216CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1226CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1217CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1227CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1219,10 +1229,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1219CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1229CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1220CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1230CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1221CONFIG_RING_BUFFER=y 1231CONFIG_RING_BUFFER=y
1222CONFIG_EVENT_TRACING=y
1223CONFIG_CONTEXT_SWITCH_TRACER=y
1224CONFIG_RING_BUFFER_ALLOW_SWAP=y 1232CONFIG_RING_BUFFER_ALLOW_SWAP=y
1225CONFIG_TRACING=y
1226CONFIG_TRACING_SUPPORT=y 1233CONFIG_TRACING_SUPPORT=y
1227CONFIG_FTRACE=y 1234CONFIG_FTRACE=y
1228# CONFIG_FUNCTION_TRACER is not set 1235# CONFIG_FUNCTION_TRACER is not set
@@ -1234,6 +1241,7 @@ CONFIG_FTRACE=y
1234CONFIG_BRANCH_PROFILE_NONE=y 1241CONFIG_BRANCH_PROFILE_NONE=y
1235# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1242# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1236# CONFIG_PROFILE_ALL_BRANCHES is not set 1243# CONFIG_PROFILE_ALL_BRANCHES is not set
1244# CONFIG_KSYM_TRACER is not set
1237# CONFIG_STACK_TRACER is not set 1245# CONFIG_STACK_TRACER is not set
1238# CONFIG_KMEMTRACE is not set 1246# CONFIG_KMEMTRACE is not set
1239# CONFIG_WORKQUEUE_TRACER is not set 1247# CONFIG_WORKQUEUE_TRACER is not set
@@ -1263,7 +1271,8 @@ CONFIG_DUMP_CODE=y
1263CONFIG_DEFAULT_SECURITY_DAC=y 1271CONFIG_DEFAULT_SECURITY_DAC=y
1264CONFIG_DEFAULT_SECURITY="" 1272CONFIG_DEFAULT_SECURITY=""
1265# CONFIG_CRYPTO is not set 1273# CONFIG_CRYPTO is not set
1266CONFIG_BINARY_PRINTF=y 1274# CONFIG_VIRTUALIZATION is not set
1275# CONFIG_BINARY_PRINTF is not set
1267 1276
1268# 1277#
1269# Library routines 1278# Library routines
diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig
index dba024d72a8..6bd3d95d151 100644
--- a/arch/sh/configs/rts7751r2d1_defconfig
+++ b/arch/sh/configs/rts7751r2d1_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-rc5
4# Mon Jan 4 13:25:36 2010 4# Tue May 18 16:15:07 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_IO_TRAPPED=y 34CONFIG_IO_TRAPPED=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_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
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -70,7 +73,6 @@ CONFIG_RCU_FANOUT=32
70# CONFIG_TREE_RCU_TRACE is not set 73# CONFIG_TREE_RCU_TRACE is not set
71# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_GROUP_SCHED is not set
74# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
75CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
76CONFIG_SYSFS_DEPRECATED_V2=y 78CONFIG_SYSFS_DEPRECATED_V2=y
@@ -104,7 +106,6 @@ CONFIG_PERF_USE_VMALLOC=y
104# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
105# 107#
106CONFIG_PERF_EVENTS=y 108CONFIG_PERF_EVENTS=y
107CONFIG_EVENT_PROFILE=y
108# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
109CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y 111CONFIG_PCI_QUIRKS=y
@@ -113,7 +114,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
115CONFIG_PROFILING=y 116CONFIG_PROFILING=y
116CONFIG_TRACEPOINTS=y
117CONFIG_OPROFILE=y 117CONFIG_OPROFILE=y
118CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
@@ -124,6 +124,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 124CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 125CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 126CONFIG_HAVE_DMA_API_DEBUG=y
127CONFIG_HAVE_HW_BREAKPOINT=y
127 128
128# 129#
129# GCOV-based kernel profiling 130# GCOV-based kernel profiling
@@ -242,6 +243,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
242CONFIG_MAX_ACTIVE_REGIONS=1 243CONFIG_MAX_ACTIVE_REGIONS=1
243CONFIG_ARCH_POPULATES_NODE_MAP=y 244CONFIG_ARCH_POPULATES_NODE_MAP=y
244CONFIG_ARCH_SELECT_MEMORY_MODEL=y 245CONFIG_ARCH_SELECT_MEMORY_MODEL=y
246CONFIG_UNCACHED_MAPPING=y
245CONFIG_PAGE_SIZE_4KB=y 247CONFIG_PAGE_SIZE_4KB=y
246# CONFIG_PAGE_SIZE_8KB is not set 248# CONFIG_PAGE_SIZE_8KB is not set
247# CONFIG_PAGE_SIZE_16KB is not set 249# CONFIG_PAGE_SIZE_16KB is not set
@@ -257,7 +259,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
257CONFIG_SPLIT_PTLOCK_CPUS=4 259CONFIG_SPLIT_PTLOCK_CPUS=4
258# CONFIG_PHYS_ADDR_T_64BIT is not set 260# CONFIG_PHYS_ADDR_T_64BIT is not set
259CONFIG_ZONE_DMA_FLAG=0 261CONFIG_ZONE_DMA_FLAG=0
260CONFIG_NR_QUICK=2 262CONFIG_NR_QUICK=1
261# CONFIG_KSM is not set 263# CONFIG_KSM is not set
262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
263 265
@@ -343,7 +345,6 @@ CONFIG_PREEMPT_NONE=y
343# CONFIG_PREEMPT is not set 345# CONFIG_PREEMPT is not set
344CONFIG_GUSA=y 346CONFIG_GUSA=y
345# CONFIG_GUSA_RB is not set 347# CONFIG_GUSA_RB is not set
346# CONFIG_SPARSE_IRQ is not set
347 348
348# 349#
349# Boot options 350# Boot options
@@ -359,9 +360,9 @@ CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 root=/dev/sda1"
359# Bus options 360# Bus options
360# 361#
361CONFIG_PCI=y 362CONFIG_PCI=y
363CONFIG_PCI_DOMAINS=y
362# CONFIG_PCIEPORTBUS is not set 364# CONFIG_PCIEPORTBUS is not set
363# CONFIG_ARCH_SUPPORTS_MSI is not set 365# CONFIG_ARCH_SUPPORTS_MSI is not set
364CONFIG_PCI_LEGACY=y
365# CONFIG_PCI_STUB is not set 366# CONFIG_PCI_STUB is not set
366# CONFIG_PCI_IOV is not set 367# CONFIG_PCI_IOV is not set
367# CONFIG_PCCARD is not set 368# CONFIG_PCCARD is not set
@@ -389,7 +390,6 @@ CONFIG_NET=y
389# Networking options 390# Networking options
390# 391#
391CONFIG_PACKET=y 392CONFIG_PACKET=y
392# CONFIG_PACKET_MMAP is not set
393CONFIG_UNIX=y 393CONFIG_UNIX=y
394CONFIG_XFRM=y 394CONFIG_XFRM=y
395# CONFIG_XFRM_USER is not set 395# CONFIG_XFRM_USER is not set
@@ -449,7 +449,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
449# Network testing 449# Network testing
450# 450#
451# CONFIG_NET_PKTGEN is not set 451# CONFIG_NET_PKTGEN is not set
452# CONFIG_NET_DROP_MONITOR is not set
453# CONFIG_HAMRADIO is not set 452# CONFIG_HAMRADIO is not set
454# CONFIG_CAN is not set 453# CONFIG_CAN is not set
455# CONFIG_IRDA is not set 454# CONFIG_IRDA is not set
@@ -525,6 +524,7 @@ CONFIG_HAVE_IDE=y
525# 524#
526# SCSI device support 525# SCSI device support
527# 526#
527CONFIG_SCSI_MOD=y
528# CONFIG_RAID_ATTRS is not set 528# CONFIG_RAID_ATTRS is not set
529CONFIG_SCSI=y 529CONFIG_SCSI=y
530CONFIG_SCSI_DMA=y 530CONFIG_SCSI_DMA=y
@@ -642,6 +642,7 @@ CONFIG_ATA_SFF=y
642# CONFIG_PATA_IT821X is not set 642# CONFIG_PATA_IT821X is not set
643# CONFIG_PATA_IT8213 is not set 643# CONFIG_PATA_IT8213 is not set
644# CONFIG_PATA_JMICRON is not set 644# CONFIG_PATA_JMICRON is not set
645# CONFIG_PATA_LEGACY is not set
645# CONFIG_PATA_TRIFLEX is not set 646# CONFIG_PATA_TRIFLEX is not set
646# CONFIG_PATA_MARVELL is not set 647# CONFIG_PATA_MARVELL is not set
647# CONFIG_PATA_MPIIX is not set 648# CONFIG_PATA_MPIIX is not set
@@ -678,7 +679,7 @@ CONFIG_PATA_PLATFORM=y
678# 679#
679 680
680# 681#
681# See the help texts for more information. 682# The newer stack is recommended.
682# 683#
683# CONFIG_FIREWIRE is not set 684# CONFIG_FIREWIRE is not set
684# CONFIG_IEEE1394 is not set 685# CONFIG_IEEE1394 is not set
@@ -719,6 +720,7 @@ CONFIG_NET_PCI=y
719# CONFIG_PCNET32 is not set 720# CONFIG_PCNET32 is not set
720# CONFIG_AMD8111_ETH is not set 721# CONFIG_AMD8111_ETH is not set
721# CONFIG_ADAPTEC_STARFIRE is not set 722# CONFIG_ADAPTEC_STARFIRE is not set
723# CONFIG_KSZ884X_PCI is not set
722# CONFIG_B44 is not set 724# CONFIG_B44 is not set
723# CONFIG_FORCEDETH is not set 725# CONFIG_FORCEDETH is not set
724# CONFIG_E100 is not set 726# CONFIG_E100 is not set
@@ -771,6 +773,8 @@ CONFIG_NETDEV_10000=y
771# CONFIG_CHELSIO_T1 is not set 773# CONFIG_CHELSIO_T1 is not set
772CONFIG_CHELSIO_T3_DEPENDS=y 774CONFIG_CHELSIO_T3_DEPENDS=y
773# CONFIG_CHELSIO_T3 is not set 775# CONFIG_CHELSIO_T3 is not set
776CONFIG_CHELSIO_T4_DEPENDS=y
777# CONFIG_CHELSIO_T4 is not set
774# CONFIG_ENIC is not set 778# CONFIG_ENIC is not set
775# CONFIG_IXGBE is not set 779# CONFIG_IXGBE is not set
776# CONFIG_IXGB is not set 780# CONFIG_IXGB is not set
@@ -783,6 +787,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
783# CONFIG_MLX4_CORE is not set 787# CONFIG_MLX4_CORE is not set
784# CONFIG_TEHUTI is not set 788# CONFIG_TEHUTI is not set
785# CONFIG_BNX2X is not set 789# CONFIG_BNX2X is not set
790# CONFIG_QLCNIC is not set
786# CONFIG_QLGE is not set 791# CONFIG_QLGE is not set
787# CONFIG_SFC is not set 792# CONFIG_SFC is not set
788# CONFIG_BE2NET is not set 793# CONFIG_BE2NET is not set
@@ -805,6 +810,7 @@ CONFIG_WLAN=y
805# CONFIG_USB_PEGASUS is not set 810# CONFIG_USB_PEGASUS is not set
806# CONFIG_USB_RTL8150 is not set 811# CONFIG_USB_RTL8150 is not set
807# CONFIG_USB_USBNET is not set 812# CONFIG_USB_USBNET is not set
813# CONFIG_USB_IPHETH is not set
808# CONFIG_WAN is not set 814# CONFIG_WAN is not set
809# CONFIG_FDDI is not set 815# CONFIG_FDDI is not set
810# CONFIG_HIPPI is not set 816# CONFIG_HIPPI is not set
@@ -882,6 +888,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
882CONFIG_SERIAL_CORE=y 888CONFIG_SERIAL_CORE=y
883CONFIG_SERIAL_CORE_CONSOLE=y 889CONFIG_SERIAL_CORE_CONSOLE=y
884# CONFIG_SERIAL_JSM is not set 890# CONFIG_SERIAL_JSM is not set
891# CONFIG_SERIAL_TIMBERDALE is not set
885CONFIG_UNIX98_PTYS=y 892CONFIG_UNIX98_PTYS=y
886# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 893# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
887CONFIG_LEGACY_PTYS=y 894CONFIG_LEGACY_PTYS=y
@@ -964,6 +971,7 @@ CONFIG_MFD_SM501=y
964# CONFIG_MFD_MC13783 is not set 971# CONFIG_MFD_MC13783 is not set
965# CONFIG_EZX_PCAP is not set 972# CONFIG_EZX_PCAP is not set
966# CONFIG_AB4500_CORE is not set 973# CONFIG_AB4500_CORE is not set
974# CONFIG_LPC_SCH is not set
967# CONFIG_REGULATOR is not set 975# CONFIG_REGULATOR is not set
968# CONFIG_MEDIA_SUPPORT is not set 976# CONFIG_MEDIA_SUPPORT is not set
969 977
@@ -971,6 +979,7 @@ CONFIG_MFD_SM501=y
971# Graphics support 979# Graphics support
972# 980#
973CONFIG_VGA_ARB=y 981CONFIG_VGA_ARB=y
982CONFIG_VGA_ARB_MAX_GPUS=16
974# CONFIG_DRM is not set 983# CONFIG_DRM is not set
975# CONFIG_VGASTATE is not set 984# CONFIG_VGASTATE is not set
976CONFIG_VIDEO_OUTPUT_CONTROL=m 985CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1152,6 +1161,7 @@ CONFIG_SND_SPI=y
1152CONFIG_SND_SUPERH=y 1161CONFIG_SND_SUPERH=y
1153CONFIG_SND_USB=y 1162CONFIG_SND_USB=y
1154# CONFIG_SND_USB_AUDIO is not set 1163# CONFIG_SND_USB_AUDIO is not set
1164# CONFIG_SND_USB_UA101 is not set
1155# CONFIG_SND_USB_CAIAQ is not set 1165# CONFIG_SND_USB_CAIAQ is not set
1156# CONFIG_SND_SOC is not set 1166# CONFIG_SND_SOC is not set
1157CONFIG_SOUND_PRIME=m 1167CONFIG_SOUND_PRIME=m
@@ -1170,6 +1180,7 @@ CONFIG_USB_HID=y
1170# 1180#
1171# Special HID drivers 1181# Special HID drivers
1172# 1182#
1183# CONFIG_HID_3M_PCT is not set
1173CONFIG_HID_A4TECH=y 1184CONFIG_HID_A4TECH=y
1174CONFIG_HID_APPLE=y 1185CONFIG_HID_APPLE=y
1175CONFIG_HID_BELKIN=y 1186CONFIG_HID_BELKIN=y
@@ -1185,14 +1196,19 @@ CONFIG_HID_GYRATION=y
1185CONFIG_HID_LOGITECH=y 1196CONFIG_HID_LOGITECH=y
1186# CONFIG_LOGITECH_FF is not set 1197# CONFIG_LOGITECH_FF is not set
1187# CONFIG_LOGIRUMBLEPAD2_FF is not set 1198# CONFIG_LOGIRUMBLEPAD2_FF is not set
1199# CONFIG_LOGIG940_FF is not set
1188CONFIG_HID_MICROSOFT=y 1200CONFIG_HID_MICROSOFT=y
1201# CONFIG_HID_MOSART is not set
1189CONFIG_HID_MONTEREY=y 1202CONFIG_HID_MONTEREY=y
1190# CONFIG_HID_NTRIG is not set 1203# CONFIG_HID_NTRIG is not set
1204# CONFIG_HID_ORTEK is not set
1191CONFIG_HID_PANTHERLORD=y 1205CONFIG_HID_PANTHERLORD=y
1192# CONFIG_PANTHERLORD_FF is not set 1206# CONFIG_PANTHERLORD_FF is not set
1193CONFIG_HID_PETALYNX=y 1207CONFIG_HID_PETALYNX=y
1208# CONFIG_HID_QUANTA is not set
1194CONFIG_HID_SAMSUNG=y 1209CONFIG_HID_SAMSUNG=y
1195CONFIG_HID_SONY=y 1210CONFIG_HID_SONY=y
1211# CONFIG_HID_STANTUM is not set
1196CONFIG_HID_SUNPLUS=y 1212CONFIG_HID_SUNPLUS=y
1197# CONFIG_HID_GREENASIA is not set 1213# CONFIG_HID_GREENASIA is not set
1198# CONFIG_HID_SMARTJOYPLUS is not set 1214# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1291,7 +1307,6 @@ CONFIG_USB_LIBUSUAL=y
1291# CONFIG_USB_RIO500 is not set 1307# CONFIG_USB_RIO500 is not set
1292# CONFIG_USB_LEGOTOWER is not set 1308# CONFIG_USB_LEGOTOWER is not set
1293# CONFIG_USB_LCD is not set 1309# CONFIG_USB_LCD is not set
1294# CONFIG_USB_BERRY_CHARGE is not set
1295# CONFIG_USB_LED is not set 1310# CONFIG_USB_LED is not set
1296# CONFIG_USB_CYPRESS_CY7C63 is not set 1311# CONFIG_USB_CYPRESS_CY7C63 is not set
1297# CONFIG_USB_CYTHERM is not set 1312# CONFIG_USB_CYTHERM is not set
@@ -1303,7 +1318,6 @@ CONFIG_USB_LIBUSUAL=y
1303# CONFIG_USB_IOWARRIOR is not set 1318# CONFIG_USB_IOWARRIOR is not set
1304# CONFIG_USB_TEST is not set 1319# CONFIG_USB_TEST is not set
1305# CONFIG_USB_ISIGHTFW is not set 1320# CONFIG_USB_ISIGHTFW is not set
1306# CONFIG_USB_VST is not set
1307# CONFIG_USB_GADGET is not set 1321# CONFIG_USB_GADGET is not set
1308 1322
1309# 1323#
@@ -1381,7 +1395,6 @@ CONFIG_EXT2_FS=y
1381# CONFIG_EXT2_FS_XIP is not set 1395# CONFIG_EXT2_FS_XIP is not set
1382# CONFIG_EXT3_FS is not set 1396# CONFIG_EXT3_FS is not set
1383# CONFIG_EXT4_FS is not set 1397# CONFIG_EXT4_FS is not set
1384CONFIG_EXT4_USE_FOR_EXT23=y
1385# CONFIG_REISERFS_FS is not set 1398# CONFIG_REISERFS_FS is not set
1386# CONFIG_JFS_FS is not set 1399# CONFIG_JFS_FS is not set
1387# CONFIG_FS_POSIX_ACL is not set 1400# CONFIG_FS_POSIX_ACL is not set
@@ -1442,6 +1455,7 @@ CONFIG_MISC_FILESYSTEMS=y
1442# CONFIG_BEFS_FS is not set 1455# CONFIG_BEFS_FS is not set
1443# CONFIG_BFS_FS is not set 1456# CONFIG_BFS_FS is not set
1444# CONFIG_EFS_FS is not set 1457# CONFIG_EFS_FS is not set
1458# CONFIG_LOGFS is not set
1445# CONFIG_CRAMFS is not set 1459# CONFIG_CRAMFS is not set
1446# CONFIG_SQUASHFS is not set 1460# CONFIG_SQUASHFS is not set
1447# CONFIG_VXFS_FS is not set 1461# CONFIG_VXFS_FS is not set
@@ -1456,6 +1470,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
1456# CONFIG_NFS_FS is not set 1470# CONFIG_NFS_FS is not set
1457# CONFIG_NFSD is not set 1471# CONFIG_NFSD is not set
1458# CONFIG_SMB_FS is not set 1472# CONFIG_SMB_FS is not set
1473# CONFIG_CEPH_FS is not set
1459# CONFIG_CIFS is not set 1474# CONFIG_CIFS is not set
1460# CONFIG_NCP_FS is not set 1475# CONFIG_NCP_FS is not set
1461# CONFIG_CODA_FS is not set 1476# CONFIG_CODA_FS is not set
@@ -1522,13 +1537,12 @@ CONFIG_FRAME_WARN=1024
1522CONFIG_DEBUG_FS=y 1537CONFIG_DEBUG_FS=y
1523# CONFIG_HEADERS_CHECK is not set 1538# CONFIG_HEADERS_CHECK is not set
1524# CONFIG_DEBUG_KERNEL is not set 1539# CONFIG_DEBUG_KERNEL is not set
1525CONFIG_STACKTRACE=y
1526CONFIG_DEBUG_BUGVERBOSE=y 1540CONFIG_DEBUG_BUGVERBOSE=y
1527# CONFIG_DEBUG_MEMORY_INIT is not set 1541# CONFIG_DEBUG_MEMORY_INIT is not set
1528# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1542# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1543# CONFIG_LKDTM is not set
1529# CONFIG_LATENCYTOP is not set 1544# CONFIG_LATENCYTOP is not set
1530# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1545# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1531CONFIG_NOP_TRACER=y
1532CONFIG_HAVE_FUNCTION_TRACER=y 1546CONFIG_HAVE_FUNCTION_TRACER=y
1533CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1547CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1534CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1548CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1536,10 +1550,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1536CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1550CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1537CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1551CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1538CONFIG_RING_BUFFER=y 1552CONFIG_RING_BUFFER=y
1539CONFIG_EVENT_TRACING=y
1540CONFIG_CONTEXT_SWITCH_TRACER=y
1541CONFIG_RING_BUFFER_ALLOW_SWAP=y 1553CONFIG_RING_BUFFER_ALLOW_SWAP=y
1542CONFIG_TRACING=y
1543CONFIG_TRACING_SUPPORT=y 1554CONFIG_TRACING_SUPPORT=y
1544# CONFIG_FTRACE is not set 1555# CONFIG_FTRACE is not set
1545# CONFIG_DYNAMIC_DEBUG is not set 1556# CONFIG_DYNAMIC_DEBUG is not set
@@ -1648,7 +1659,8 @@ CONFIG_CRYPTO=y
1648# CONFIG_CRYPTO_ANSI_CPRNG is not set 1659# CONFIG_CRYPTO_ANSI_CPRNG is not set
1649CONFIG_CRYPTO_HW=y 1660CONFIG_CRYPTO_HW=y
1650# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1661# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1651CONFIG_BINARY_PRINTF=y 1662# CONFIG_VIRTUALIZATION is not set
1663# CONFIG_BINARY_PRINTF is not set
1652 1664
1653# 1665#
1654# Library routines 1666# Library routines
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig
index 6d511d06cbf..487abcc4d4e 100644
--- a/arch/sh/configs/rts7751r2dplus_defconfig
+++ b/arch/sh/configs/rts7751r2dplus_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-rc5
4# Mon Jan 4 13:26:39 2010 4# Tue May 18 16:20:00 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_IO_TRAPPED=y 34CONFIG_IO_TRAPPED=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_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
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -70,7 +73,6 @@ CONFIG_RCU_FANOUT=32
70# CONFIG_TREE_RCU_TRACE is not set 73# CONFIG_TREE_RCU_TRACE is not set
71# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_GROUP_SCHED is not set
74# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
75CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
76CONFIG_SYSFS_DEPRECATED_V2=y 78CONFIG_SYSFS_DEPRECATED_V2=y
@@ -104,7 +106,6 @@ CONFIG_PERF_USE_VMALLOC=y
104# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
105# 107#
106CONFIG_PERF_EVENTS=y 108CONFIG_PERF_EVENTS=y
107CONFIG_EVENT_PROFILE=y
108# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
109CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
110CONFIG_PCI_QUIRKS=y 111CONFIG_PCI_QUIRKS=y
@@ -113,7 +114,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
115CONFIG_PROFILING=y 116CONFIG_PROFILING=y
116CONFIG_TRACEPOINTS=y
117CONFIG_OPROFILE=y 117CONFIG_OPROFILE=y
118CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
@@ -124,6 +124,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 124CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 125CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 126CONFIG_HAVE_DMA_API_DEBUG=y
127CONFIG_HAVE_HW_BREAKPOINT=y
127 128
128# 129#
129# GCOV-based kernel profiling 130# GCOV-based kernel profiling
@@ -242,6 +243,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
242CONFIG_MAX_ACTIVE_REGIONS=1 243CONFIG_MAX_ACTIVE_REGIONS=1
243CONFIG_ARCH_POPULATES_NODE_MAP=y 244CONFIG_ARCH_POPULATES_NODE_MAP=y
244CONFIG_ARCH_SELECT_MEMORY_MODEL=y 245CONFIG_ARCH_SELECT_MEMORY_MODEL=y
246CONFIG_UNCACHED_MAPPING=y
245CONFIG_PAGE_SIZE_4KB=y 247CONFIG_PAGE_SIZE_4KB=y
246# CONFIG_PAGE_SIZE_8KB is not set 248# CONFIG_PAGE_SIZE_8KB is not set
247# CONFIG_PAGE_SIZE_16KB is not set 249# CONFIG_PAGE_SIZE_16KB is not set
@@ -257,7 +259,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
257CONFIG_SPLIT_PTLOCK_CPUS=4 259CONFIG_SPLIT_PTLOCK_CPUS=4
258# CONFIG_PHYS_ADDR_T_64BIT is not set 260# CONFIG_PHYS_ADDR_T_64BIT is not set
259CONFIG_ZONE_DMA_FLAG=0 261CONFIG_ZONE_DMA_FLAG=0
260CONFIG_NR_QUICK=2 262CONFIG_NR_QUICK=1
261# CONFIG_KSM is not set 263# CONFIG_KSM is not set
262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
263 265
@@ -343,7 +345,6 @@ CONFIG_PREEMPT_NONE=y
343# CONFIG_PREEMPT is not set 345# CONFIG_PREEMPT is not set
344CONFIG_GUSA=y 346CONFIG_GUSA=y
345# CONFIG_GUSA_RB is not set 347# CONFIG_GUSA_RB is not set
346# CONFIG_SPARSE_IRQ is not set
347 348
348# 349#
349# Boot options 350# Boot options
@@ -359,9 +360,9 @@ CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 root=/dev/sda1"
359# Bus options 360# Bus options
360# 361#
361CONFIG_PCI=y 362CONFIG_PCI=y
363CONFIG_PCI_DOMAINS=y
362# CONFIG_PCIEPORTBUS is not set 364# CONFIG_PCIEPORTBUS is not set
363# CONFIG_ARCH_SUPPORTS_MSI is not set 365# CONFIG_ARCH_SUPPORTS_MSI is not set
364CONFIG_PCI_LEGACY=y
365# CONFIG_PCI_STUB is not set 366# CONFIG_PCI_STUB is not set
366# CONFIG_PCI_IOV is not set 367# CONFIG_PCI_IOV is not set
367# CONFIG_PCCARD is not set 368# CONFIG_PCCARD is not set
@@ -389,7 +390,6 @@ CONFIG_NET=y
389# Networking options 390# Networking options
390# 391#
391CONFIG_PACKET=y 392CONFIG_PACKET=y
392# CONFIG_PACKET_MMAP is not set
393CONFIG_UNIX=y 393CONFIG_UNIX=y
394CONFIG_XFRM=y 394CONFIG_XFRM=y
395# CONFIG_XFRM_USER is not set 395# CONFIG_XFRM_USER is not set
@@ -449,7 +449,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
449# Network testing 449# Network testing
450# 450#
451# CONFIG_NET_PKTGEN is not set 451# CONFIG_NET_PKTGEN is not set
452# CONFIG_NET_DROP_MONITOR is not set
453# CONFIG_HAMRADIO is not set 452# CONFIG_HAMRADIO is not set
454# CONFIG_CAN is not set 453# CONFIG_CAN is not set
455# CONFIG_IRDA is not set 454# CONFIG_IRDA is not set
@@ -611,6 +610,7 @@ CONFIG_HAVE_IDE=y
611# 610#
612# SCSI device support 611# SCSI device support
613# 612#
613CONFIG_SCSI_MOD=y
614# CONFIG_RAID_ATTRS is not set 614# CONFIG_RAID_ATTRS is not set
615CONFIG_SCSI=y 615CONFIG_SCSI=y
616CONFIG_SCSI_DMA=y 616CONFIG_SCSI_DMA=y
@@ -728,6 +728,7 @@ CONFIG_ATA_SFF=y
728# CONFIG_PATA_IT821X is not set 728# CONFIG_PATA_IT821X is not set
729# CONFIG_PATA_IT8213 is not set 729# CONFIG_PATA_IT8213 is not set
730# CONFIG_PATA_JMICRON is not set 730# CONFIG_PATA_JMICRON is not set
731# CONFIG_PATA_LEGACY is not set
731# CONFIG_PATA_TRIFLEX is not set 732# CONFIG_PATA_TRIFLEX is not set
732# CONFIG_PATA_MARVELL is not set 733# CONFIG_PATA_MARVELL is not set
733# CONFIG_PATA_MPIIX is not set 734# CONFIG_PATA_MPIIX is not set
@@ -764,7 +765,7 @@ CONFIG_PATA_PLATFORM=y
764# 765#
765 766
766# 767#
767# See the help texts for more information. 768# The newer stack is recommended.
768# 769#
769# CONFIG_FIREWIRE is not set 770# CONFIG_FIREWIRE is not set
770# CONFIG_IEEE1394 is not set 771# CONFIG_IEEE1394 is not set
@@ -805,6 +806,7 @@ CONFIG_NET_PCI=y
805# CONFIG_PCNET32 is not set 806# CONFIG_PCNET32 is not set
806# CONFIG_AMD8111_ETH is not set 807# CONFIG_AMD8111_ETH is not set
807# CONFIG_ADAPTEC_STARFIRE is not set 808# CONFIG_ADAPTEC_STARFIRE is not set
809# CONFIG_KSZ884X_PCI is not set
808# CONFIG_B44 is not set 810# CONFIG_B44 is not set
809# CONFIG_FORCEDETH is not set 811# CONFIG_FORCEDETH is not set
810# CONFIG_E100 is not set 812# CONFIG_E100 is not set
@@ -857,6 +859,8 @@ CONFIG_NETDEV_10000=y
857# CONFIG_CHELSIO_T1 is not set 859# CONFIG_CHELSIO_T1 is not set
858CONFIG_CHELSIO_T3_DEPENDS=y 860CONFIG_CHELSIO_T3_DEPENDS=y
859# CONFIG_CHELSIO_T3 is not set 861# CONFIG_CHELSIO_T3 is not set
862CONFIG_CHELSIO_T4_DEPENDS=y
863# CONFIG_CHELSIO_T4 is not set
860# CONFIG_ENIC is not set 864# CONFIG_ENIC is not set
861# CONFIG_IXGBE is not set 865# CONFIG_IXGBE is not set
862# CONFIG_IXGB is not set 866# CONFIG_IXGB is not set
@@ -869,6 +873,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
869# CONFIG_MLX4_CORE is not set 873# CONFIG_MLX4_CORE is not set
870# CONFIG_TEHUTI is not set 874# CONFIG_TEHUTI is not set
871# CONFIG_BNX2X is not set 875# CONFIG_BNX2X is not set
876# CONFIG_QLCNIC is not set
872# CONFIG_QLGE is not set 877# CONFIG_QLGE is not set
873# CONFIG_SFC is not set 878# CONFIG_SFC is not set
874# CONFIG_BE2NET is not set 879# CONFIG_BE2NET is not set
@@ -891,6 +896,7 @@ CONFIG_WLAN=y
891# CONFIG_USB_PEGASUS is not set 896# CONFIG_USB_PEGASUS is not set
892# CONFIG_USB_RTL8150 is not set 897# CONFIG_USB_RTL8150 is not set
893# CONFIG_USB_USBNET is not set 898# CONFIG_USB_USBNET is not set
899# CONFIG_USB_IPHETH is not set
894# CONFIG_WAN is not set 900# CONFIG_WAN is not set
895# CONFIG_FDDI is not set 901# CONFIG_FDDI is not set
896# CONFIG_HIPPI is not set 902# CONFIG_HIPPI is not set
@@ -968,6 +974,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
968CONFIG_SERIAL_CORE=y 974CONFIG_SERIAL_CORE=y
969CONFIG_SERIAL_CORE_CONSOLE=y 975CONFIG_SERIAL_CORE_CONSOLE=y
970# CONFIG_SERIAL_JSM is not set 976# CONFIG_SERIAL_JSM is not set
977# CONFIG_SERIAL_TIMBERDALE is not set
971CONFIG_UNIX98_PTYS=y 978CONFIG_UNIX98_PTYS=y
972# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 979# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
973CONFIG_LEGACY_PTYS=y 980CONFIG_LEGACY_PTYS=y
@@ -1050,6 +1057,7 @@ CONFIG_MFD_SM501=y
1050# CONFIG_MFD_MC13783 is not set 1057# CONFIG_MFD_MC13783 is not set
1051# CONFIG_EZX_PCAP is not set 1058# CONFIG_EZX_PCAP is not set
1052# CONFIG_AB4500_CORE is not set 1059# CONFIG_AB4500_CORE is not set
1060# CONFIG_LPC_SCH is not set
1053# CONFIG_REGULATOR is not set 1061# CONFIG_REGULATOR is not set
1054# CONFIG_MEDIA_SUPPORT is not set 1062# CONFIG_MEDIA_SUPPORT is not set
1055 1063
@@ -1057,6 +1065,7 @@ CONFIG_MFD_SM501=y
1057# Graphics support 1065# Graphics support
1058# 1066#
1059CONFIG_VGA_ARB=y 1067CONFIG_VGA_ARB=y
1068CONFIG_VGA_ARB_MAX_GPUS=16
1060# CONFIG_DRM is not set 1069# CONFIG_DRM is not set
1061# CONFIG_VGASTATE is not set 1070# CONFIG_VGASTATE is not set
1062CONFIG_VIDEO_OUTPUT_CONTROL=m 1071CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1238,6 +1247,7 @@ CONFIG_SND_SPI=y
1238CONFIG_SND_SUPERH=y 1247CONFIG_SND_SUPERH=y
1239CONFIG_SND_USB=y 1248CONFIG_SND_USB=y
1240# CONFIG_SND_USB_AUDIO is not set 1249# CONFIG_SND_USB_AUDIO is not set
1250# CONFIG_SND_USB_UA101 is not set
1241# CONFIG_SND_USB_CAIAQ is not set 1251# CONFIG_SND_USB_CAIAQ is not set
1242# CONFIG_SND_SOC is not set 1252# CONFIG_SND_SOC is not set
1243CONFIG_SOUND_PRIME=m 1253CONFIG_SOUND_PRIME=m
@@ -1256,6 +1266,7 @@ CONFIG_USB_HID=y
1256# 1266#
1257# Special HID drivers 1267# Special HID drivers
1258# 1268#
1269# CONFIG_HID_3M_PCT is not set
1259CONFIG_HID_A4TECH=y 1270CONFIG_HID_A4TECH=y
1260CONFIG_HID_APPLE=y 1271CONFIG_HID_APPLE=y
1261CONFIG_HID_BELKIN=y 1272CONFIG_HID_BELKIN=y
@@ -1271,14 +1282,19 @@ CONFIG_HID_GYRATION=y
1271CONFIG_HID_LOGITECH=y 1282CONFIG_HID_LOGITECH=y
1272# CONFIG_LOGITECH_FF is not set 1283# CONFIG_LOGITECH_FF is not set
1273# CONFIG_LOGIRUMBLEPAD2_FF is not set 1284# CONFIG_LOGIRUMBLEPAD2_FF is not set
1285# CONFIG_LOGIG940_FF is not set
1274CONFIG_HID_MICROSOFT=y 1286CONFIG_HID_MICROSOFT=y
1287# CONFIG_HID_MOSART is not set
1275CONFIG_HID_MONTEREY=y 1288CONFIG_HID_MONTEREY=y
1276# CONFIG_HID_NTRIG is not set 1289# CONFIG_HID_NTRIG is not set
1290# CONFIG_HID_ORTEK is not set
1277CONFIG_HID_PANTHERLORD=y 1291CONFIG_HID_PANTHERLORD=y
1278# CONFIG_PANTHERLORD_FF is not set 1292# CONFIG_PANTHERLORD_FF is not set
1279CONFIG_HID_PETALYNX=y 1293CONFIG_HID_PETALYNX=y
1294# CONFIG_HID_QUANTA is not set
1280CONFIG_HID_SAMSUNG=y 1295CONFIG_HID_SAMSUNG=y
1281CONFIG_HID_SONY=y 1296CONFIG_HID_SONY=y
1297# CONFIG_HID_STANTUM is not set
1282CONFIG_HID_SUNPLUS=y 1298CONFIG_HID_SUNPLUS=y
1283# CONFIG_HID_GREENASIA is not set 1299# CONFIG_HID_GREENASIA is not set
1284# CONFIG_HID_SMARTJOYPLUS is not set 1300# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1377,7 +1393,6 @@ CONFIG_USB_LIBUSUAL=y
1377# CONFIG_USB_RIO500 is not set 1393# CONFIG_USB_RIO500 is not set
1378# CONFIG_USB_LEGOTOWER is not set 1394# CONFIG_USB_LEGOTOWER is not set
1379# CONFIG_USB_LCD is not set 1395# CONFIG_USB_LCD is not set
1380# CONFIG_USB_BERRY_CHARGE is not set
1381# CONFIG_USB_LED is not set 1396# CONFIG_USB_LED is not set
1382# CONFIG_USB_CYPRESS_CY7C63 is not set 1397# CONFIG_USB_CYPRESS_CY7C63 is not set
1383# CONFIG_USB_CYTHERM is not set 1398# CONFIG_USB_CYTHERM is not set
@@ -1389,7 +1404,6 @@ CONFIG_USB_LIBUSUAL=y
1389# CONFIG_USB_IOWARRIOR is not set 1404# CONFIG_USB_IOWARRIOR is not set
1390# CONFIG_USB_TEST is not set 1405# CONFIG_USB_TEST is not set
1391# CONFIG_USB_ISIGHTFW is not set 1406# CONFIG_USB_ISIGHTFW is not set
1392# CONFIG_USB_VST is not set
1393# CONFIG_USB_GADGET is not set 1407# CONFIG_USB_GADGET is not set
1394 1408
1395# 1409#
@@ -1467,7 +1481,6 @@ CONFIG_EXT2_FS=y
1467# CONFIG_EXT2_FS_XIP is not set 1481# CONFIG_EXT2_FS_XIP is not set
1468# CONFIG_EXT3_FS is not set 1482# CONFIG_EXT3_FS is not set
1469# CONFIG_EXT4_FS is not set 1483# CONFIG_EXT4_FS is not set
1470CONFIG_EXT4_USE_FOR_EXT23=y
1471# CONFIG_REISERFS_FS is not set 1484# CONFIG_REISERFS_FS is not set
1472# CONFIG_JFS_FS is not set 1485# CONFIG_JFS_FS is not set
1473# CONFIG_FS_POSIX_ACL is not set 1486# CONFIG_FS_POSIX_ACL is not set
@@ -1529,6 +1542,7 @@ CONFIG_MISC_FILESYSTEMS=y
1529# CONFIG_BFS_FS is not set 1542# CONFIG_BFS_FS is not set
1530# CONFIG_EFS_FS is not set 1543# CONFIG_EFS_FS is not set
1531# CONFIG_JFFS2_FS is not set 1544# CONFIG_JFFS2_FS is not set
1545# CONFIG_LOGFS is not set
1532# CONFIG_CRAMFS is not set 1546# CONFIG_CRAMFS is not set
1533# CONFIG_SQUASHFS is not set 1547# CONFIG_SQUASHFS is not set
1534# CONFIG_VXFS_FS is not set 1548# CONFIG_VXFS_FS is not set
@@ -1543,6 +1557,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
1543# CONFIG_NFS_FS is not set 1557# CONFIG_NFS_FS is not set
1544# CONFIG_NFSD is not set 1558# CONFIG_NFSD is not set
1545# CONFIG_SMB_FS is not set 1559# CONFIG_SMB_FS is not set
1560# CONFIG_CEPH_FS is not set
1546# CONFIG_CIFS is not set 1561# CONFIG_CIFS is not set
1547# CONFIG_NCP_FS is not set 1562# CONFIG_NCP_FS is not set
1548# CONFIG_CODA_FS is not set 1563# CONFIG_CODA_FS is not set
@@ -1609,13 +1624,12 @@ CONFIG_FRAME_WARN=1024
1609CONFIG_DEBUG_FS=y 1624CONFIG_DEBUG_FS=y
1610# CONFIG_HEADERS_CHECK is not set 1625# CONFIG_HEADERS_CHECK is not set
1611# CONFIG_DEBUG_KERNEL is not set 1626# CONFIG_DEBUG_KERNEL is not set
1612CONFIG_STACKTRACE=y
1613CONFIG_DEBUG_BUGVERBOSE=y 1627CONFIG_DEBUG_BUGVERBOSE=y
1614# CONFIG_DEBUG_MEMORY_INIT is not set 1628# CONFIG_DEBUG_MEMORY_INIT is not set
1615# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1629# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1630# CONFIG_LKDTM is not set
1616# CONFIG_LATENCYTOP is not set 1631# CONFIG_LATENCYTOP is not set
1617# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1632# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1618CONFIG_NOP_TRACER=y
1619CONFIG_HAVE_FUNCTION_TRACER=y 1633CONFIG_HAVE_FUNCTION_TRACER=y
1620CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1634CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1621CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1635CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1623,10 +1637,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1623CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1637CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1624CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1638CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1625CONFIG_RING_BUFFER=y 1639CONFIG_RING_BUFFER=y
1626CONFIG_EVENT_TRACING=y
1627CONFIG_CONTEXT_SWITCH_TRACER=y
1628CONFIG_RING_BUFFER_ALLOW_SWAP=y 1640CONFIG_RING_BUFFER_ALLOW_SWAP=y
1629CONFIG_TRACING=y
1630CONFIG_TRACING_SUPPORT=y 1641CONFIG_TRACING_SUPPORT=y
1631# CONFIG_FTRACE is not set 1642# CONFIG_FTRACE is not set
1632# CONFIG_DYNAMIC_DEBUG is not set 1643# CONFIG_DYNAMIC_DEBUG is not set
@@ -1735,7 +1746,8 @@ CONFIG_CRYPTO=y
1735# CONFIG_CRYPTO_ANSI_CPRNG is not set 1746# CONFIG_CRYPTO_ANSI_CPRNG is not set
1736CONFIG_CRYPTO_HW=y 1747CONFIG_CRYPTO_HW=y
1737# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1748# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1738CONFIG_BINARY_PRINTF=y 1749# CONFIG_VIRTUALIZATION is not set
1750# CONFIG_BINARY_PRINTF is not set
1739 1751
1740# 1752#
1741# Library routines 1753# Library routines
diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig
index 1859ba09994..fe923142c2c 100644
--- a/arch/sh/configs/sdk7780_defconfig
+++ b/arch/sh/configs/sdk7780_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-rc5
4# Mon Jan 4 13:27:20 2010 4# Tue May 18 16:21:00 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION_AUTO=y
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_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
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -73,7 +76,6 @@ CONFIG_RCU_FANOUT=32
73CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=18 78CONFIG_LOG_BUF_SHIFT=18
76# CONFIG_GROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -107,8 +109,9 @@ CONFIG_PERF_USE_VMALLOC=y
107# 109#
108# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
109# 111#
110# CONFIG_PERF_EVENTS is not set 112CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
114# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
112CONFIG_VM_EVENT_COUNTERS=y 115CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_PCI_QUIRKS=y 116CONFIG_PCI_QUIRKS=y
114CONFIG_SLUB_DEBUG=y 117CONFIG_SLUB_DEBUG=y
@@ -126,6 +129,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126CONFIG_HAVE_DMA_ATTRS=y 129CONFIG_HAVE_DMA_ATTRS=y
127CONFIG_HAVE_CLK=y 130CONFIG_HAVE_CLK=y
128CONFIG_HAVE_DMA_API_DEBUG=y 131CONFIG_HAVE_DMA_API_DEBUG=y
132CONFIG_HAVE_HW_BREAKPOINT=y
129 133
130# 134#
131# GCOV-based kernel profiling 135# GCOV-based kernel profiling
@@ -237,11 +241,8 @@ CONFIG_PAGE_OFFSET=0x80000000
237CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_MEMORY_START=0x08000000 242CONFIG_MEMORY_START=0x08000000
239CONFIG_MEMORY_SIZE=0x08000000 243CONFIG_MEMORY_SIZE=0x08000000
240# CONFIG_29BIT is not set 244CONFIG_29BIT=y
241CONFIG_32BIT=y
242CONFIG_PMB_ENABLE=y
243# CONFIG_PMB is not set 245# CONFIG_PMB is not set
244CONFIG_PMB_FIXED=y
245CONFIG_VSYSCALL=y 246CONFIG_VSYSCALL=y
246CONFIG_ARCH_FLATMEM_ENABLE=y 247CONFIG_ARCH_FLATMEM_ENABLE=y
247CONFIG_ARCH_SPARSEMEM_ENABLE=y 248CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -249,6 +250,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
249CONFIG_MAX_ACTIVE_REGIONS=1 250CONFIG_MAX_ACTIVE_REGIONS=1
250CONFIG_ARCH_POPULATES_NODE_MAP=y 251CONFIG_ARCH_POPULATES_NODE_MAP=y
251CONFIG_ARCH_SELECT_MEMORY_MODEL=y 252CONFIG_ARCH_SELECT_MEMORY_MODEL=y
253CONFIG_UNCACHED_MAPPING=y
252CONFIG_PAGE_SIZE_4KB=y 254CONFIG_PAGE_SIZE_4KB=y
253# CONFIG_PAGE_SIZE_8KB is not set 255# CONFIG_PAGE_SIZE_8KB is not set
254# CONFIG_PAGE_SIZE_16KB is not set 256# CONFIG_PAGE_SIZE_16KB is not set
@@ -270,7 +272,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
270CONFIG_SPLIT_PTLOCK_CPUS=4 272CONFIG_SPLIT_PTLOCK_CPUS=4
271# CONFIG_PHYS_ADDR_T_64BIT is not set 273# CONFIG_PHYS_ADDR_T_64BIT is not set
272CONFIG_ZONE_DMA_FLAG=0 274CONFIG_ZONE_DMA_FLAG=0
273CONFIG_NR_QUICK=2 275CONFIG_NR_QUICK=1
274# CONFIG_KSM is not set 276# CONFIG_KSM is not set
275CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 277CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
276 278
@@ -353,7 +355,7 @@ CONFIG_SCHED_HRTICK=y
353# CONFIG_PREEMPT_VOLUNTARY is not set 355# CONFIG_PREEMPT_VOLUNTARY is not set
354CONFIG_PREEMPT=y 356CONFIG_PREEMPT=y
355CONFIG_GUSA=y 357CONFIG_GUSA=y
356# CONFIG_SPARSE_IRQ is not set 358# CONFIG_INTC_USERIMASK is not set
357 359
358# 360#
359# Boot options 361# Boot options
@@ -369,16 +371,15 @@ CONFIG_CMDLINE="mem=128M console=tty0 console=ttySC0,115200 ip=bootp root=/dev/n
369# Bus options 371# Bus options
370# 372#
371CONFIG_PCI=y 373CONFIG_PCI=y
374CONFIG_PCI_DOMAINS=y
372# CONFIG_PCIEPORTBUS is not set 375# CONFIG_PCIEPORTBUS is not set
373# CONFIG_ARCH_SUPPORTS_MSI is not set 376# CONFIG_ARCH_SUPPORTS_MSI is not set
374# CONFIG_PCI_LEGACY is not set
375CONFIG_PCI_DEBUG=y 377CONFIG_PCI_DEBUG=y
376# CONFIG_PCI_STUB is not set 378# CONFIG_PCI_STUB is not set
377# CONFIG_PCI_IOV is not set 379# CONFIG_PCI_IOV is not set
378CONFIG_PCCARD=y 380CONFIG_PCCARD=y
379CONFIG_PCMCIA=y 381CONFIG_PCMCIA=y
380CONFIG_PCMCIA_LOAD_CIS=y 382CONFIG_PCMCIA_LOAD_CIS=y
381CONFIG_PCMCIA_IOCTL=y
382CONFIG_CARDBUS=y 383CONFIG_CARDBUS=y
383 384
384# 385#
@@ -417,7 +418,6 @@ CONFIG_NET=y
417# Networking options 418# Networking options
418# 419#
419CONFIG_PACKET=y 420CONFIG_PACKET=y
420# CONFIG_PACKET_MMAP is not set
421CONFIG_UNIX=y 421CONFIG_UNIX=y
422CONFIG_XFRM=y 422CONFIG_XFRM=y
423# CONFIG_XFRM_USER is not set 423# CONFIG_XFRM_USER is not set
@@ -659,6 +659,7 @@ CONFIG_BLK_DEV_GENERIC=y
659# 659#
660# SCSI device support 660# SCSI device support
661# 661#
662CONFIG_SCSI_MOD=y
662# CONFIG_RAID_ATTRS is not set 663# CONFIG_RAID_ATTRS is not set
663CONFIG_SCSI=y 664CONFIG_SCSI=y
664CONFIG_SCSI_DMA=y 665CONFIG_SCSI_DMA=y
@@ -777,6 +778,7 @@ CONFIG_ATA_SFF=y
777# CONFIG_PATA_IT821X is not set 778# CONFIG_PATA_IT821X is not set
778# CONFIG_PATA_IT8213 is not set 779# CONFIG_PATA_IT8213 is not set
779# CONFIG_PATA_JMICRON is not set 780# CONFIG_PATA_JMICRON is not set
781# CONFIG_PATA_LEGACY is not set
780# CONFIG_PATA_TRIFLEX is not set 782# CONFIG_PATA_TRIFLEX is not set
781# CONFIG_PATA_MARVELL is not set 783# CONFIG_PATA_MARVELL is not set
782# CONFIG_PATA_MPIIX is not set 784# CONFIG_PATA_MPIIX is not set
@@ -824,7 +826,7 @@ CONFIG_BLK_DEV_DM=y
824# 826#
825 827
826# 828#
827# See the help texts for more information. 829# The newer stack is recommended.
828# 830#
829# CONFIG_FIREWIRE is not set 831# CONFIG_FIREWIRE is not set
830# CONFIG_IEEE1394 is not set 832# CONFIG_IEEE1394 is not set
@@ -890,6 +892,7 @@ CONFIG_WLAN=y
890# CONFIG_USB_PEGASUS is not set 892# CONFIG_USB_PEGASUS is not set
891# CONFIG_USB_RTL8150 is not set 893# CONFIG_USB_RTL8150 is not set
892# CONFIG_USB_USBNET is not set 894# CONFIG_USB_USBNET is not set
895# CONFIG_USB_IPHETH is not set
893# CONFIG_NET_PCMCIA is not set 896# CONFIG_NET_PCMCIA is not set
894# CONFIG_WAN is not set 897# CONFIG_WAN is not set
895# CONFIG_FDDI is not set 898# CONFIG_FDDI is not set
@@ -995,6 +998,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
995CONFIG_SERIAL_CORE=y 998CONFIG_SERIAL_CORE=y
996CONFIG_SERIAL_CORE_CONSOLE=y 999CONFIG_SERIAL_CORE_CONSOLE=y
997# CONFIG_SERIAL_JSM is not set 1000# CONFIG_SERIAL_JSM is not set
1001# CONFIG_SERIAL_TIMBERDALE is not set
998CONFIG_UNIX98_PTYS=y 1002CONFIG_UNIX98_PTYS=y
999# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1003# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1000CONFIG_LEGACY_PTYS=y 1004CONFIG_LEGACY_PTYS=y
@@ -1057,6 +1061,7 @@ CONFIG_SSB_DRIVER_PCICORE=y
1057# CONFIG_MFD_SH_MOBILE_SDHI is not set 1061# CONFIG_MFD_SH_MOBILE_SDHI is not set
1058# CONFIG_HTC_PASIC3 is not set 1062# CONFIG_HTC_PASIC3 is not set
1059# CONFIG_MFD_TMIO is not set 1063# CONFIG_MFD_TMIO is not set
1064# CONFIG_LPC_SCH is not set
1060# CONFIG_REGULATOR is not set 1065# CONFIG_REGULATOR is not set
1061# CONFIG_MEDIA_SUPPORT is not set 1066# CONFIG_MEDIA_SUPPORT is not set
1062 1067
@@ -1064,6 +1069,7 @@ CONFIG_SSB_DRIVER_PCICORE=y
1064# Graphics support 1069# Graphics support
1065# 1070#
1066CONFIG_VGA_ARB=y 1071CONFIG_VGA_ARB=y
1072CONFIG_VGA_ARB_MAX_GPUS=16
1067# CONFIG_DRM is not set 1073# CONFIG_DRM is not set
1068# CONFIG_VGASTATE is not set 1074# CONFIG_VGASTATE is not set
1069# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1075# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1167,6 +1173,7 @@ CONFIG_USB_HID=y
1167# 1173#
1168# Special HID drivers 1174# Special HID drivers
1169# 1175#
1176# CONFIG_HID_3M_PCT is not set
1170CONFIG_HID_A4TECH=y 1177CONFIG_HID_A4TECH=y
1171CONFIG_HID_APPLE=y 1178CONFIG_HID_APPLE=y
1172CONFIG_HID_BELKIN=y 1179CONFIG_HID_BELKIN=y
@@ -1182,14 +1189,19 @@ CONFIG_HID_GYRATION=y
1182CONFIG_HID_LOGITECH=y 1189CONFIG_HID_LOGITECH=y
1183# CONFIG_LOGITECH_FF is not set 1190# CONFIG_LOGITECH_FF is not set
1184# CONFIG_LOGIRUMBLEPAD2_FF is not set 1191# CONFIG_LOGIRUMBLEPAD2_FF is not set
1192# CONFIG_LOGIG940_FF is not set
1185CONFIG_HID_MICROSOFT=y 1193CONFIG_HID_MICROSOFT=y
1194# CONFIG_HID_MOSART is not set
1186CONFIG_HID_MONTEREY=y 1195CONFIG_HID_MONTEREY=y
1187# CONFIG_HID_NTRIG is not set 1196# CONFIG_HID_NTRIG is not set
1197# CONFIG_HID_ORTEK is not set
1188CONFIG_HID_PANTHERLORD=y 1198CONFIG_HID_PANTHERLORD=y
1189# CONFIG_PANTHERLORD_FF is not set 1199# CONFIG_PANTHERLORD_FF is not set
1190CONFIG_HID_PETALYNX=y 1200CONFIG_HID_PETALYNX=y
1201# CONFIG_HID_QUANTA is not set
1191CONFIG_HID_SAMSUNG=y 1202CONFIG_HID_SAMSUNG=y
1192CONFIG_HID_SONY=y 1203CONFIG_HID_SONY=y
1204# CONFIG_HID_STANTUM is not set
1193CONFIG_HID_SUNPLUS=y 1205CONFIG_HID_SUNPLUS=y
1194# CONFIG_HID_GREENASIA is not set 1206# CONFIG_HID_GREENASIA is not set
1195# CONFIG_HID_SMARTJOYPLUS is not set 1207# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1288,7 +1300,6 @@ CONFIG_USB_STORAGE=y
1288# CONFIG_USB_RIO500 is not set 1300# CONFIG_USB_RIO500 is not set
1289# CONFIG_USB_LEGOTOWER is not set 1301# CONFIG_USB_LEGOTOWER is not set
1290# CONFIG_USB_LCD is not set 1302# CONFIG_USB_LCD is not set
1291# CONFIG_USB_BERRY_CHARGE is not set
1292# CONFIG_USB_LED is not set 1303# CONFIG_USB_LED is not set
1293# CONFIG_USB_CYPRESS_CY7C63 is not set 1304# CONFIG_USB_CYPRESS_CY7C63 is not set
1294# CONFIG_USB_CYTHERM is not set 1305# CONFIG_USB_CYTHERM is not set
@@ -1301,7 +1312,6 @@ CONFIG_USB_STORAGE=y
1301# CONFIG_USB_IOWARRIOR is not set 1312# CONFIG_USB_IOWARRIOR is not set
1302# CONFIG_USB_TEST is not set 1313# CONFIG_USB_TEST is not set
1303# CONFIG_USB_ISIGHTFW is not set 1314# CONFIG_USB_ISIGHTFW is not set
1304# CONFIG_USB_VST is not set
1305# CONFIG_USB_GADGET is not set 1315# CONFIG_USB_GADGET is not set
1306 1316
1307# 1317#
@@ -1317,10 +1327,6 @@ CONFIG_LEDS_CLASS=y
1317# 1327#
1318# LED drivers 1328# LED drivers
1319# 1329#
1320
1321#
1322# LED Triggers
1323#
1324# CONFIG_LEDS_TRIGGERS is not set 1330# CONFIG_LEDS_TRIGGERS is not set
1325# CONFIG_ACCESSIBILITY is not set 1331# CONFIG_ACCESSIBILITY is not set
1326# CONFIG_INFINIBAND is not set 1332# CONFIG_INFINIBAND is not set
@@ -1416,6 +1422,7 @@ CONFIG_MISC_FILESYSTEMS=y
1416# CONFIG_BEFS_FS is not set 1422# CONFIG_BEFS_FS is not set
1417# CONFIG_BFS_FS is not set 1423# CONFIG_BFS_FS is not set
1418# CONFIG_EFS_FS is not set 1424# CONFIG_EFS_FS is not set
1425# CONFIG_LOGFS is not set
1419# CONFIG_CRAMFS is not set 1426# CONFIG_CRAMFS is not set
1420# CONFIG_SQUASHFS is not set 1427# CONFIG_SQUASHFS is not set
1421# CONFIG_VXFS_FS is not set 1428# CONFIG_VXFS_FS is not set
@@ -1444,6 +1451,7 @@ CONFIG_SUNRPC=y
1444# CONFIG_RPCSEC_GSS_KRB5 is not set 1451# CONFIG_RPCSEC_GSS_KRB5 is not set
1445# CONFIG_RPCSEC_GSS_SPKM3 is not set 1452# CONFIG_RPCSEC_GSS_SPKM3 is not set
1446# CONFIG_SMB_FS is not set 1453# CONFIG_SMB_FS is not set
1454# CONFIG_CEPH_FS is not set
1447# CONFIG_CIFS is not set 1455# CONFIG_CIFS is not set
1448# CONFIG_NCP_FS is not set 1456# CONFIG_NCP_FS is not set
1449# CONFIG_CODA_FS is not set 1457# CONFIG_CODA_FS is not set
@@ -1523,6 +1531,7 @@ CONFIG_TIMER_STATS=y
1523# CONFIG_DEBUG_OBJECTS is not set 1531# CONFIG_DEBUG_OBJECTS is not set
1524# CONFIG_SLUB_DEBUG_ON is not set 1532# CONFIG_SLUB_DEBUG_ON is not set
1525# CONFIG_SLUB_STATS is not set 1533# CONFIG_SLUB_STATS is not set
1534# CONFIG_DEBUG_KMEMLEAK is not set
1526CONFIG_DEBUG_PREEMPT=y 1535CONFIG_DEBUG_PREEMPT=y
1527# CONFIG_DEBUG_RT_MUTEXES is not set 1536# CONFIG_DEBUG_RT_MUTEXES is not set
1528# CONFIG_RT_MUTEX_TESTER is not set 1537# CONFIG_RT_MUTEX_TESTER is not set
@@ -1571,6 +1580,7 @@ CONFIG_FTRACE=y
1571CONFIG_BRANCH_PROFILE_NONE=y 1580CONFIG_BRANCH_PROFILE_NONE=y
1572# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1581# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1573# CONFIG_PROFILE_ALL_BRANCHES is not set 1582# CONFIG_PROFILE_ALL_BRANCHES is not set
1583# CONFIG_KSYM_TRACER is not set
1574# CONFIG_STACK_TRACER is not set 1584# CONFIG_STACK_TRACER is not set
1575# CONFIG_KMEMTRACE is not set 1585# CONFIG_KMEMTRACE is not set
1576# CONFIG_WORKQUEUE_TRACER is not set 1586# CONFIG_WORKQUEUE_TRACER is not set
@@ -1690,6 +1700,7 @@ CONFIG_CRYPTO_DES=y
1690# CONFIG_CRYPTO_ANSI_CPRNG is not set 1700# CONFIG_CRYPTO_ANSI_CPRNG is not set
1691CONFIG_CRYPTO_HW=y 1701CONFIG_CRYPTO_HW=y
1692# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1702# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1703# CONFIG_VIRTUALIZATION is not set
1693# CONFIG_BINARY_PRINTF is not set 1704# CONFIG_BINARY_PRINTF is not set
1694 1705
1695# 1706#
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig
index 9b331eab968..26982459852 100644
--- a/arch/sh/configs/sdk7786_defconfig
+++ b/arch/sh/configs/sdk7786_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-rc7 3# Linux kernel version: 2.6.34-rc5
4# Tue Feb 9 15:27:06 2010 4# Tue May 18 18:03:37 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -18,6 +18,8 @@ CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
21CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
22CONFIG_GENERIC_LOCKBREAK=y
21# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 23# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
22CONFIG_ARCH_HIBERNATION_POSSIBLE=y 24CONFIG_ARCH_HIBERNATION_POSSIBLE=y
23CONFIG_SYS_SUPPORTS_HUGETLBFS=y 25CONFIG_SYS_SUPPORTS_HUGETLBFS=y
@@ -35,6 +37,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
35CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 37CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
36CONFIG_DMA_COHERENT=y 38CONFIG_DMA_COHERENT=y
37# CONFIG_DMA_NONCOHERENT is not set 39# CONFIG_DMA_NONCOHERENT is not set
40# CONFIG_NEED_DMA_MAP_STATE is not set
38CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 41CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
39CONFIG_CONSTRUCTORS=y 42CONFIG_CONSTRUCTORS=y
40 43
@@ -42,7 +45,6 @@ CONFIG_CONSTRUCTORS=y
42# General setup 45# General setup
43# 46#
44CONFIG_EXPERIMENTAL=y 47CONFIG_EXPERIMENTAL=y
45CONFIG_BROKEN_ON_SMP=y
46CONFIG_LOCK_KERNEL=y 48CONFIG_LOCK_KERNEL=y
47CONFIG_INIT_ENV_ARG_LIMIT=32 49CONFIG_INIT_ENV_ARG_LIMIT=32
48CONFIG_LOCALVERSION="" 50CONFIG_LOCALVERSION=""
@@ -51,25 +53,27 @@ CONFIG_HAVE_KERNEL_GZIP=y
51CONFIG_HAVE_KERNEL_BZIP2=y 53CONFIG_HAVE_KERNEL_BZIP2=y
52CONFIG_HAVE_KERNEL_LZMA=y 54CONFIG_HAVE_KERNEL_LZMA=y
53CONFIG_HAVE_KERNEL_LZO=y 55CONFIG_HAVE_KERNEL_LZO=y
54CONFIG_KERNEL_GZIP=y 56# CONFIG_KERNEL_GZIP is not set
55# CONFIG_KERNEL_BZIP2 is not set 57# CONFIG_KERNEL_BZIP2 is not set
56# CONFIG_KERNEL_LZMA is not set 58# CONFIG_KERNEL_LZMA is not set
57# CONFIG_KERNEL_LZO is not set 59CONFIG_KERNEL_LZO=y
58CONFIG_SWAP=y 60CONFIG_SWAP=y
59CONFIG_SYSVIPC=y 61CONFIG_SYSVIPC=y
60CONFIG_SYSVIPC_SYSCTL=y 62CONFIG_SYSVIPC_SYSCTL=y
61CONFIG_POSIX_MQUEUE=y 63CONFIG_POSIX_MQUEUE=y
62CONFIG_POSIX_MQUEUE_SYSCTL=y 64CONFIG_POSIX_MQUEUE_SYSCTL=y
63CONFIG_BSD_PROCESS_ACCT=y 65CONFIG_BSD_PROCESS_ACCT=y
64# CONFIG_BSD_PROCESS_ACCT_V3 is not set 66CONFIG_BSD_PROCESS_ACCT_V3=y
65# CONFIG_TASKSTATS is not set 67# CONFIG_TASKSTATS is not set
66# CONFIG_AUDIT is not set 68CONFIG_AUDIT=y
69CONFIG_AUDITSYSCALL=y
70CONFIG_AUDIT_TREE=y
67 71
68# 72#
69# RCU Subsystem 73# RCU Subsystem
70# 74#
71CONFIG_TREE_RCU=y 75# CONFIG_TREE_RCU is not set
72# CONFIG_TREE_PREEMPT_RCU is not set 76CONFIG_TREE_PREEMPT_RCU=y
73# CONFIG_TINY_RCU is not set 77# CONFIG_TINY_RCU is not set
74CONFIG_RCU_TRACE=y 78CONFIG_RCU_TRACE=y
75CONFIG_RCU_FANOUT=32 79CONFIG_RCU_FANOUT=32
@@ -77,32 +81,36 @@ CONFIG_RCU_FANOUT=32
77CONFIG_TREE_RCU_TRACE=y 81CONFIG_TREE_RCU_TRACE=y
78CONFIG_IKCONFIG=y 82CONFIG_IKCONFIG=y
79CONFIG_IKCONFIG_PROC=y 83CONFIG_IKCONFIG_PROC=y
80CONFIG_LOG_BUF_SHIFT=14 84CONFIG_LOG_BUF_SHIFT=17
81CONFIG_GROUP_SCHED=y
82CONFIG_FAIR_GROUP_SCHED=y
83CONFIG_RT_GROUP_SCHED=y
84CONFIG_USER_SCHED=y
85# CONFIG_CGROUP_SCHED is not set
86CONFIG_CGROUPS=y 85CONFIG_CGROUPS=y
87# CONFIG_CGROUP_DEBUG is not set 86CONFIG_CGROUP_DEBUG=y
88CONFIG_CGROUP_NS=y 87CONFIG_CGROUP_NS=y
89CONFIG_CGROUP_FREEZER=y 88CONFIG_CGROUP_FREEZER=y
90CONFIG_CGROUP_DEVICE=y 89CONFIG_CGROUP_DEVICE=y
91# CONFIG_CPUSETS is not set 90CONFIG_CPUSETS=y
91# CONFIG_PROC_PID_CPUSET is not set
92CONFIG_CGROUP_CPUACCT=y 92CONFIG_CGROUP_CPUACCT=y
93CONFIG_RESOURCE_COUNTERS=y 93CONFIG_RESOURCE_COUNTERS=y
94CONFIG_CGROUP_MEM_RES_CTLR=y 94CONFIG_CGROUP_MEM_RES_CTLR=y
95# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set 95CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
96CONFIG_CGROUP_SCHED=y
97CONFIG_FAIR_GROUP_SCHED=y
98CONFIG_RT_GROUP_SCHED=y
96CONFIG_MM_OWNER=y 99CONFIG_MM_OWNER=y
97# CONFIG_SYSFS_DEPRECATED_V2 is not set 100# CONFIG_SYSFS_DEPRECATED_V2 is not set
98# CONFIG_RELAY is not set 101CONFIG_RELAY=y
99CONFIG_NAMESPACES=y 102CONFIG_NAMESPACES=y
100CONFIG_UTS_NS=y 103CONFIG_UTS_NS=y
101CONFIG_IPC_NS=y 104CONFIG_IPC_NS=y
102CONFIG_USER_NS=y 105CONFIG_USER_NS=y
103CONFIG_PID_NS=y 106CONFIG_PID_NS=y
104CONFIG_NET_NS=y 107CONFIG_NET_NS=y
105# CONFIG_BLK_DEV_INITRD is not set 108CONFIG_BLK_DEV_INITRD=y
109CONFIG_INITRAMFS_SOURCE=""
110CONFIG_RD_GZIP=y
111CONFIG_RD_BZIP2=y
112CONFIG_RD_LZMA=y
113CONFIG_RD_LZO=y
106CONFIG_CC_OPTIMIZE_FOR_SIZE=y 114CONFIG_CC_OPTIMIZE_FOR_SIZE=y
107CONFIG_SYSCTL=y 115CONFIG_SYSCTL=y
108CONFIG_ANON_INODES=y 116CONFIG_ANON_INODES=y
@@ -131,7 +139,6 @@ CONFIG_PERF_USE_VMALLOC=y
131# Kernel Performance Events And Counters 139# Kernel Performance Events And Counters
132# 140#
133CONFIG_PERF_EVENTS=y 141CONFIG_PERF_EVENTS=y
134CONFIG_EVENT_PROFILE=y
135# CONFIG_PERF_COUNTERS is not set 142# CONFIG_PERF_COUNTERS is not set
136# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 143# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
137CONFIG_VM_EVENT_COUNTERS=y 144CONFIG_VM_EVENT_COUNTERS=y
@@ -142,13 +149,15 @@ CONFIG_SLAB=y
142# CONFIG_SLOB is not set 149# CONFIG_SLOB is not set
143CONFIG_PROFILING=y 150CONFIG_PROFILING=y
144CONFIG_TRACEPOINTS=y 151CONFIG_TRACEPOINTS=y
145# CONFIG_OPROFILE is not set 152CONFIG_OPROFILE=m
146CONFIG_HAVE_OPROFILE=y 153CONFIG_HAVE_OPROFILE=y
147# CONFIG_KPROBES is not set 154CONFIG_KPROBES=y
155CONFIG_KRETPROBES=y
148CONFIG_HAVE_KPROBES=y 156CONFIG_HAVE_KPROBES=y
149CONFIG_HAVE_KRETPROBES=y 157CONFIG_HAVE_KRETPROBES=y
150CONFIG_HAVE_ARCH_TRACEHOOK=y 158CONFIG_HAVE_ARCH_TRACEHOOK=y
151CONFIG_HAVE_DMA_ATTRS=y 159CONFIG_HAVE_DMA_ATTRS=y
160CONFIG_USE_GENERIC_SMP_HELPERS=y
152CONFIG_HAVE_CLK=y 161CONFIG_HAVE_CLK=y
153CONFIG_HAVE_DMA_API_DEBUG=y 162CONFIG_HAVE_DMA_API_DEBUG=y
154CONFIG_HAVE_HW_BREAKPOINT=y 163CONFIG_HAVE_HW_BREAKPOINT=y
@@ -157,7 +166,8 @@ CONFIG_HAVE_HW_BREAKPOINT=y
157# GCOV-based kernel profiling 166# GCOV-based kernel profiling
158# 167#
159# CONFIG_GCOV_KERNEL is not set 168# CONFIG_GCOV_KERNEL is not set
160# CONFIG_SLOW_WORK is not set 169CONFIG_SLOW_WORK=y
170CONFIG_SLOW_WORK_DEBUG=y
161CONFIG_HAVE_GENERIC_DMA_COHERENT=y 171CONFIG_HAVE_GENERIC_DMA_COHERENT=y
162CONFIG_SLABINFO=y 172CONFIG_SLABINFO=y
163CONFIG_RT_MUTEXES=y 173CONFIG_RT_MUTEXES=y
@@ -168,9 +178,10 @@ CONFIG_MODULE_UNLOAD=y
168# CONFIG_MODULE_FORCE_UNLOAD is not set 178# CONFIG_MODULE_FORCE_UNLOAD is not set
169# CONFIG_MODVERSIONS is not set 179# CONFIG_MODVERSIONS is not set
170# CONFIG_MODULE_SRCVERSION_ALL is not set 180# CONFIG_MODULE_SRCVERSION_ALL is not set
181CONFIG_STOP_MACHINE=y
171CONFIG_BLOCK=y 182CONFIG_BLOCK=y
172# CONFIG_LBDAF is not set 183CONFIG_LBDAF=y
173# CONFIG_BLK_DEV_BSG is not set 184CONFIG_BLK_DEV_BSG=y
174# CONFIG_BLK_DEV_INTEGRITY is not set 185# CONFIG_BLK_DEV_INTEGRITY is not set
175CONFIG_BLK_CGROUP=y 186CONFIG_BLK_CGROUP=y
176# CONFIG_DEBUG_BLK_CGROUP is not set 187# CONFIG_DEBUG_BLK_CGROUP is not set
@@ -215,7 +226,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
215# CONFIG_INLINE_WRITE_UNLOCK_BH is not set 226# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
216# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set 227# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
217# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set 228# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
218# CONFIG_MUTEX_SPIN_ON_OWNER is not set 229CONFIG_MUTEX_SPIN_ON_OWNER=y
219CONFIG_FREEZER=y 230CONFIG_FREEZER=y
220 231
221# 232#
@@ -267,16 +278,15 @@ CONFIG_QUICKLIST=y
267CONFIG_MMU=y 278CONFIG_MMU=y
268CONFIG_PAGE_OFFSET=0x80000000 279CONFIG_PAGE_OFFSET=0x80000000
269CONFIG_FORCE_MAX_ZONEORDER=11 280CONFIG_FORCE_MAX_ZONEORDER=11
270CONFIG_MEMORY_START=0x60000000 281CONFIG_MEMORY_START=0x40000000
271CONFIG_MEMORY_SIZE=0x20000000 282CONFIG_MEMORY_SIZE=0x20000000
272# CONFIG_29BIT is not set 283# CONFIG_29BIT is not set
273CONFIG_32BIT=y 284CONFIG_32BIT=y
274CONFIG_PMB=y 285CONFIG_PMB=y
275# CONFIG_PMB_LEGACY is not set
276CONFIG_X2TLB=y 286CONFIG_X2TLB=y
277CONFIG_VSYSCALL=y 287CONFIG_VSYSCALL=y
278# CONFIG_NUMA is not set 288CONFIG_NUMA=y
279CONFIG_ARCH_FLATMEM_ENABLE=y 289CONFIG_NODES_SHIFT=1
280CONFIG_ARCH_SPARSEMEM_ENABLE=y 290CONFIG_ARCH_SPARSEMEM_ENABLE=y
281CONFIG_ARCH_SPARSEMEM_DEFAULT=y 291CONFIG_ARCH_SPARSEMEM_DEFAULT=y
282CONFIG_MAX_ACTIVE_REGIONS=1 292CONFIG_MAX_ACTIVE_REGIONS=1
@@ -286,21 +296,23 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
286CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 296CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
287CONFIG_ARCH_MEMORY_PROBE=y 297CONFIG_ARCH_MEMORY_PROBE=y
288CONFIG_IOREMAP_FIXED=y 298CONFIG_IOREMAP_FIXED=y
299CONFIG_UNCACHED_MAPPING=y
289CONFIG_PAGE_SIZE_4KB=y 300CONFIG_PAGE_SIZE_4KB=y
290# CONFIG_PAGE_SIZE_8KB is not set 301# CONFIG_PAGE_SIZE_8KB is not set
291# CONFIG_PAGE_SIZE_16KB is not set 302# CONFIG_PAGE_SIZE_16KB is not set
292# CONFIG_PAGE_SIZE_64KB is not set 303# CONFIG_PAGE_SIZE_64KB is not set
293# CONFIG_HUGETLB_PAGE_SIZE_64K is not set 304# CONFIG_HUGETLB_PAGE_SIZE_64K is not set
294# CONFIG_HUGETLB_PAGE_SIZE_256K is not set 305# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
295CONFIG_HUGETLB_PAGE_SIZE_1MB=y 306# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
296# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set 307# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
297# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set 308CONFIG_HUGETLB_PAGE_SIZE_64MB=y
298# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set 309# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
299CONFIG_SELECT_MEMORY_MODEL=y 310CONFIG_SELECT_MEMORY_MODEL=y
300# CONFIG_FLATMEM_MANUAL is not set 311# CONFIG_FLATMEM_MANUAL is not set
301# CONFIG_DISCONTIGMEM_MANUAL is not set 312# CONFIG_DISCONTIGMEM_MANUAL is not set
302CONFIG_SPARSEMEM_MANUAL=y 313CONFIG_SPARSEMEM_MANUAL=y
303CONFIG_SPARSEMEM=y 314CONFIG_SPARSEMEM=y
315CONFIG_NEED_MULTIPLE_NODES=y
304CONFIG_HAVE_MEMORY_PRESENT=y 316CONFIG_HAVE_MEMORY_PRESENT=y
305CONFIG_SPARSEMEM_STATIC=y 317CONFIG_SPARSEMEM_STATIC=y
306CONFIG_MEMORY_HOTPLUG=y 318CONFIG_MEMORY_HOTPLUG=y
@@ -313,6 +325,7 @@ CONFIG_ZONE_DMA_FLAG=0
313CONFIG_NR_QUICK=1 325CONFIG_NR_QUICK=1
314CONFIG_KSM=y 326CONFIG_KSM=y
315CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 327CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
328CONFIG_SCHED_MC=y
316 329
317# 330#
318# Cache configuration 331# Cache configuration
@@ -328,6 +341,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
328# CONFIG_CPU_BIG_ENDIAN is not set 341# CONFIG_CPU_BIG_ENDIAN is not set
329CONFIG_SH_FPU=y 342CONFIG_SH_FPU=y
330CONFIG_SH_STORE_QUEUES=y 343CONFIG_SH_STORE_QUEUES=y
344CONFIG_SPECULATIVE_EXECUTION=y
331CONFIG_CPU_HAS_INTEVT=y 345CONFIG_CPU_HAS_INTEVT=y
332CONFIG_CPU_HAS_SR_RB=y 346CONFIG_CPU_HAS_SR_RB=y
333CONFIG_CPU_HAS_PTEAEX=y 347CONFIG_CPU_HAS_PTEAEX=y
@@ -372,7 +386,10 @@ CONFIG_SH_CPU_FREQ=y
372# 386#
373# DMA support 387# DMA support
374# 388#
375# CONFIG_SH_DMA is not set 389CONFIG_SH_DMA=y
390# CONFIG_SH_DMA_API is not set
391CONFIG_NR_ONCHIP_DMA_CHANNELS=6
392# CONFIG_NR_DMA_CHANNELS_BOOL is not set
376 393
377# 394#
378# Companion Chips 395# Companion Chips
@@ -388,19 +405,21 @@ CONFIG_HEARTBEAT=y
388# Kernel features 405# Kernel features
389# 406#
390# CONFIG_HZ_100 is not set 407# CONFIG_HZ_100 is not set
391CONFIG_HZ_250=y 408# CONFIG_HZ_250 is not set
392# CONFIG_HZ_300 is not set 409# CONFIG_HZ_300 is not set
393# CONFIG_HZ_1000 is not set 410CONFIG_HZ_1000=y
394CONFIG_HZ=250 411CONFIG_HZ=1000
395CONFIG_SCHED_HRTICK=y 412CONFIG_SCHED_HRTICK=y
396CONFIG_KEXEC=y 413CONFIG_KEXEC=y
397# CONFIG_CRASH_DUMP is not set
398CONFIG_SECCOMP=y 414CONFIG_SECCOMP=y
399# CONFIG_SMP is not set 415CONFIG_SMP=y
416CONFIG_NR_CPUS=2
417CONFIG_HOTPLUG_CPU=y
400# CONFIG_PREEMPT_NONE is not set 418# CONFIG_PREEMPT_NONE is not set
401# CONFIG_PREEMPT_VOLUNTARY is not set 419# CONFIG_PREEMPT_VOLUNTARY is not set
402CONFIG_PREEMPT=y 420CONFIG_PREEMPT=y
403CONFIG_GUSA=y 421CONFIG_INTC_USERIMASK=y
422CONFIG_INTC_BALANCING=y
404 423
405# 424#
406# Boot options 425# Boot options
@@ -410,7 +429,7 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000
410CONFIG_ENTRY_OFFSET=0x00001000 429CONFIG_ENTRY_OFFSET=0x00001000
411CONFIG_CMDLINE_OVERWRITE=y 430CONFIG_CMDLINE_OVERWRITE=y
412# CONFIG_CMDLINE_EXTEND is not set 431# CONFIG_CMDLINE_EXTEND is not set
413CONFIG_CMDLINE="console=ttySC1,115200 earlyprintk=sh-sci.1,115200 root=/dev/sda1 nmi_debug=state,debounce rootdelay=10" 432CONFIG_CMDLINE="console=ttySC1,115200 earlyprintk=sh-sci.1,115200 root=/dev/sda1 nmi_debug=state,debounce rootdelay=5 pmb=iomap ignore_loglevel"
414 433
415# 434#
416# Bus options 435# Bus options
@@ -424,8 +443,7 @@ CONFIG_PCIEAER_INJECT=y
424CONFIG_PCIEASPM=y 443CONFIG_PCIEASPM=y
425CONFIG_PCIEASPM_DEBUG=y 444CONFIG_PCIEASPM_DEBUG=y
426# CONFIG_ARCH_SUPPORTS_MSI is not set 445# CONFIG_ARCH_SUPPORTS_MSI is not set
427# CONFIG_PCI_LEGACY is not set 446# CONFIG_PCI_DEBUG is not set
428CONFIG_PCI_DEBUG=y
429# CONFIG_PCI_STUB is not set 447# CONFIG_PCI_STUB is not set
430# CONFIG_PCI_IOV is not set 448# CONFIG_PCI_IOV is not set
431# CONFIG_PCCARD is not set 449# CONFIG_PCCARD is not set
@@ -435,7 +453,7 @@ CONFIG_PCI_DEBUG=y
435# Executable file formats 453# Executable file formats
436# 454#
437CONFIG_BINFMT_ELF=y 455CONFIG_BINFMT_ELF=y
438# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 456CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
439# CONFIG_HAVE_AOUT is not set 457# CONFIG_HAVE_AOUT is not set
440CONFIG_BINFMT_MISC=y 458CONFIG_BINFMT_MISC=y
441 459
@@ -444,9 +462,11 @@ CONFIG_BINFMT_MISC=y
444# 462#
445CONFIG_PM=y 463CONFIG_PM=y
446CONFIG_PM_DEBUG=y 464CONFIG_PM_DEBUG=y
465# CONFIG_PM_ADVANCED_DEBUG is not set
447CONFIG_PM_VERBOSE=y 466CONFIG_PM_VERBOSE=y
448# CONFIG_HIBERNATION is not set 467# CONFIG_HIBERNATION is not set
449CONFIG_PM_RUNTIME=y 468CONFIG_PM_RUNTIME=y
469CONFIG_PM_OPS=y
450CONFIG_CPU_IDLE=y 470CONFIG_CPU_IDLE=y
451CONFIG_CPU_IDLE_GOV_LADDER=y 471CONFIG_CPU_IDLE_GOV_LADDER=y
452CONFIG_CPU_IDLE_GOV_MENU=y 472CONFIG_CPU_IDLE_GOV_MENU=y
@@ -456,7 +476,6 @@ CONFIG_NET=y
456# Networking options 476# Networking options
457# 477#
458CONFIG_PACKET=y 478CONFIG_PACKET=y
459CONFIG_PACKET_MMAP=y
460CONFIG_UNIX=y 479CONFIG_UNIX=y
461CONFIG_XFRM=y 480CONFIG_XFRM=y
462# CONFIG_XFRM_USER is not set 481# CONFIG_XFRM_USER is not set
@@ -520,19 +539,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
520# Network testing 539# Network testing
521# 540#
522# CONFIG_NET_PKTGEN is not set 541# CONFIG_NET_PKTGEN is not set
542# CONFIG_NET_TCPPROBE is not set
523# CONFIG_NET_DROP_MONITOR is not set 543# CONFIG_NET_DROP_MONITOR is not set
524# CONFIG_HAMRADIO is not set 544# CONFIG_HAMRADIO is not set
525# CONFIG_CAN is not set 545# CONFIG_CAN is not set
526# CONFIG_IRDA is not set 546# CONFIG_IRDA is not set
527# CONFIG_BT is not set 547# CONFIG_BT is not set
528# CONFIG_AF_RXRPC is not set 548# CONFIG_AF_RXRPC is not set
529CONFIG_WIRELESS=y 549# CONFIG_WIRELESS is not set
530# CONFIG_CFG80211 is not set
531# CONFIG_LIB80211 is not set
532
533#
534# CFG80211 needs to be enabled for MAC80211
535#
536# CONFIG_WIMAX is not set 550# CONFIG_WIMAX is not set
537# CONFIG_RFKILL is not set 551# CONFIG_RFKILL is not set
538# CONFIG_NET_9P is not set 552# CONFIG_NET_9P is not set
@@ -553,14 +567,118 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
553# CONFIG_DEBUG_DEVRES is not set 567# CONFIG_DEBUG_DEVRES is not set
554# CONFIG_SYS_HYPERVISOR is not set 568# CONFIG_SYS_HYPERVISOR is not set
555# CONFIG_CONNECTOR is not set 569# CONFIG_CONNECTOR is not set
556# CONFIG_MTD is not set 570CONFIG_MTD=y
571# CONFIG_MTD_DEBUG is not set
572# CONFIG_MTD_TESTS is not set
573# CONFIG_MTD_CONCAT is not set
574CONFIG_MTD_PARTITIONS=y
575# CONFIG_MTD_REDBOOT_PARTS is not set
576CONFIG_MTD_CMDLINE_PARTS=y
577# CONFIG_MTD_AR7_PARTS is not set
578
579#
580# User Modules And Translation Layers
581#
582# CONFIG_MTD_CHAR is not set
583CONFIG_MTD_BLKDEVS=y
584CONFIG_MTD_BLOCK=y
585CONFIG_FTL=y
586CONFIG_NFTL=y
587# CONFIG_NFTL_RW is not set
588# CONFIG_INFTL is not set
589# CONFIG_RFD_FTL is not set
590# CONFIG_SSFDC is not set
591CONFIG_MTD_OOPS=m
592
593#
594# RAM/ROM/Flash chip drivers
595#
596CONFIG_MTD_CFI=y
597CONFIG_MTD_JEDECPROBE=y
598CONFIG_MTD_GEN_PROBE=y
599# CONFIG_MTD_CFI_ADV_OPTIONS is not set
600CONFIG_MTD_MAP_BANK_WIDTH_1=y
601CONFIG_MTD_MAP_BANK_WIDTH_2=y
602CONFIG_MTD_MAP_BANK_WIDTH_4=y
603# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
604# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
605# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
606CONFIG_MTD_CFI_I1=y
607CONFIG_MTD_CFI_I2=y
608# CONFIG_MTD_CFI_I4 is not set
609# CONFIG_MTD_CFI_I8 is not set
610CONFIG_MTD_CFI_INTELEXT=m
611CONFIG_MTD_CFI_AMDSTD=m
612CONFIG_MTD_CFI_STAA=m
613CONFIG_MTD_CFI_UTIL=y
614CONFIG_MTD_RAM=y
615CONFIG_MTD_ROM=m
616CONFIG_MTD_ABSENT=m
617
618#
619# Mapping drivers for chip access
620#
621# CONFIG_MTD_COMPLEX_MAPPINGS is not set
622# CONFIG_MTD_PHYSMAP is not set
623# CONFIG_MTD_INTEL_VR_NOR is not set
624CONFIG_MTD_PLATRAM=y
625
626#
627# Self-contained MTD device drivers
628#
629# CONFIG_MTD_PMC551 is not set
630# CONFIG_MTD_DATAFLASH is not set
631# CONFIG_MTD_M25P80 is not set
632# CONFIG_MTD_SST25L is not set
633# CONFIG_MTD_SLRAM is not set
634CONFIG_MTD_PHRAM=y
635# CONFIG_MTD_MTDRAM is not set
636# CONFIG_MTD_BLOCK2MTD is not set
637
638#
639# Disk-On-Chip Device Drivers
640#
641# CONFIG_MTD_DOC2000 is not set
642# CONFIG_MTD_DOC2001 is not set
643# CONFIG_MTD_DOC2001PLUS is not set
644CONFIG_MTD_NAND=y
645# CONFIG_MTD_NAND_VERIFY_WRITE is not set
646# CONFIG_MTD_NAND_ECC_SMC is not set
647# CONFIG_MTD_NAND_MUSEUM_IDS is not set
648CONFIG_MTD_NAND_IDS=y
649# CONFIG_MTD_NAND_DISKONCHIP is not set
650# CONFIG_MTD_NAND_CAFE is not set
651# CONFIG_MTD_NAND_NANDSIM is not set
652CONFIG_MTD_NAND_PLATFORM=y
653# CONFIG_MTD_ALAUDA is not set
654CONFIG_MTD_NAND_SH_FLCTL=m
655# CONFIG_MTD_ONENAND is not set
656
657#
658# LPDDR flash memory drivers
659#
660# CONFIG_MTD_LPDDR is not set
661
662#
663# UBI - Unsorted block images
664#
665CONFIG_MTD_UBI=y
666CONFIG_MTD_UBI_WL_THRESHOLD=4096
667CONFIG_MTD_UBI_BEB_RESERVE=1
668CONFIG_MTD_UBI_GLUEBI=m
669
670#
671# UBI debugging options
672#
673# CONFIG_MTD_UBI_DEBUG is not set
557# CONFIG_PARPORT is not set 674# CONFIG_PARPORT is not set
558CONFIG_BLK_DEV=y 675CONFIG_BLK_DEV=y
559# CONFIG_BLK_CPQ_CISS_DA is not set 676# CONFIG_BLK_CPQ_CISS_DA is not set
560# CONFIG_BLK_DEV_DAC960 is not set 677# CONFIG_BLK_DEV_DAC960 is not set
561# CONFIG_BLK_DEV_UMEM is not set 678# CONFIG_BLK_DEV_UMEM is not set
562# CONFIG_BLK_DEV_COW_COMMON is not set 679# CONFIG_BLK_DEV_COW_COMMON is not set
563# CONFIG_BLK_DEV_LOOP is not set 680CONFIG_BLK_DEV_LOOP=y
681CONFIG_BLK_DEV_CRYPTOLOOP=y
564 682
565# 683#
566# DRBD disabled because PROC_FS, INET or CONNECTOR not selected 684# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
@@ -575,34 +693,63 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
575# CONFIG_CDROM_PKTCDVD is not set 693# CONFIG_CDROM_PKTCDVD is not set
576# CONFIG_ATA_OVER_ETH is not set 694# CONFIG_ATA_OVER_ETH is not set
577# CONFIG_BLK_DEV_HD is not set 695# CONFIG_BLK_DEV_HD is not set
578CONFIG_MISC_DEVICES=y 696# CONFIG_MISC_DEVICES is not set
579# CONFIG_AD525X_DPOT is not set
580# CONFIG_PHANTOM is not set
581# CONFIG_SGI_IOC4 is not set
582# CONFIG_TIFM_CORE is not set
583# CONFIG_ICS932S401 is not set
584# CONFIG_ENCLOSURE_SERVICES is not set
585# CONFIG_HP_ILO is not set
586# CONFIG_ISL29003 is not set
587# CONFIG_DS1682 is not set
588# CONFIG_TI_DAC7512 is not set
589# CONFIG_C2PORT is not set
590
591#
592# EEPROM support
593#
594# CONFIG_EEPROM_AT24 is not set
595# CONFIG_EEPROM_AT25 is not set
596# CONFIG_EEPROM_LEGACY is not set
597# CONFIG_EEPROM_MAX6875 is not set
598# CONFIG_EEPROM_93CX6 is not set
599# CONFIG_CB710_CORE is not set
600CONFIG_HAVE_IDE=y 697CONFIG_HAVE_IDE=y
601# CONFIG_IDE is not set 698CONFIG_IDE=y
699
700#
701# Please see Documentation/ide/ide.txt for help/info on IDE drives
702#
703CONFIG_IDE_ATAPI=y
704# CONFIG_BLK_DEV_IDE_SATA is not set
705CONFIG_IDE_GD=y
706CONFIG_IDE_GD_ATA=y
707# CONFIG_IDE_GD_ATAPI is not set
708CONFIG_BLK_DEV_IDECD=y
709CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
710# CONFIG_BLK_DEV_IDETAPE is not set
711# CONFIG_IDE_TASK_IOCTL is not set
712CONFIG_IDE_PROC_FS=y
713
714#
715# IDE chipset support/bugfixes
716#
717CONFIG_BLK_DEV_PLATFORM=y
718
719#
720# PCI IDE chipsets support
721#
722# CONFIG_BLK_DEV_GENERIC is not set
723# CONFIG_BLK_DEV_OPTI621 is not set
724# CONFIG_BLK_DEV_AEC62XX is not set
725# CONFIG_BLK_DEV_ALI15X3 is not set
726# CONFIG_BLK_DEV_AMD74XX is not set
727# CONFIG_BLK_DEV_CMD64X is not set
728# CONFIG_BLK_DEV_TRIFLEX is not set
729# CONFIG_BLK_DEV_CS5520 is not set
730# CONFIG_BLK_DEV_CS5530 is not set
731# CONFIG_BLK_DEV_HPT366 is not set
732# CONFIG_BLK_DEV_JMICRON is not set
733# CONFIG_BLK_DEV_SC1200 is not set
734# CONFIG_BLK_DEV_PIIX is not set
735# CONFIG_BLK_DEV_IT8172 is not set
736# CONFIG_BLK_DEV_IT8213 is not set
737# CONFIG_BLK_DEV_IT821X is not set
738# CONFIG_BLK_DEV_NS87415 is not set
739# CONFIG_BLK_DEV_PDC202XX_OLD is not set
740# CONFIG_BLK_DEV_PDC202XX_NEW is not set
741# CONFIG_BLK_DEV_SVWKS is not set
742# CONFIG_BLK_DEV_SIIMAGE is not set
743# CONFIG_BLK_DEV_SLC90E66 is not set
744# CONFIG_BLK_DEV_TRM290 is not set
745# CONFIG_BLK_DEV_VIA82CXXX is not set
746# CONFIG_BLK_DEV_TC86C001 is not set
747# CONFIG_BLK_DEV_IDEDMA is not set
602 748
603# 749#
604# SCSI device support 750# SCSI device support
605# 751#
752CONFIG_SCSI_MOD=y
606# CONFIG_RAID_ATTRS is not set 753# CONFIG_RAID_ATTRS is not set
607CONFIG_SCSI=y 754CONFIG_SCSI=y
608CONFIG_SCSI_DMA=y 755CONFIG_SCSI_DMA=y
@@ -616,11 +763,12 @@ CONFIG_SCSI_PROC_FS=y
616CONFIG_BLK_DEV_SD=y 763CONFIG_BLK_DEV_SD=y
617# CONFIG_CHR_DEV_ST is not set 764# CONFIG_CHR_DEV_ST is not set
618# CONFIG_CHR_DEV_OSST is not set 765# CONFIG_CHR_DEV_OSST is not set
619# CONFIG_BLK_DEV_SR is not set 766CONFIG_BLK_DEV_SR=y
767# CONFIG_BLK_DEV_SR_VENDOR is not set
620# CONFIG_CHR_DEV_SG is not set 768# CONFIG_CHR_DEV_SG is not set
621# CONFIG_CHR_DEV_SCH is not set 769# CONFIG_CHR_DEV_SCH is not set
622# CONFIG_SCSI_MULTI_LUN is not set 770CONFIG_SCSI_MULTI_LUN=y
623# CONFIG_SCSI_CONSTANTS is not set 771CONFIG_SCSI_CONSTANTS=y
624# CONFIG_SCSI_LOGGING is not set 772# CONFIG_SCSI_LOGGING is not set
625# CONFIG_SCSI_SCAN_ASYNC is not set 773# CONFIG_SCSI_SCAN_ASYNC is not set
626CONFIG_SCSI_WAIT_SCAN=m 774CONFIG_SCSI_WAIT_SCAN=m
@@ -631,52 +779,10 @@ CONFIG_SCSI_WAIT_SCAN=m
631# CONFIG_SCSI_SPI_ATTRS is not set 779# CONFIG_SCSI_SPI_ATTRS is not set
632# CONFIG_SCSI_FC_ATTRS is not set 780# CONFIG_SCSI_FC_ATTRS is not set
633# CONFIG_SCSI_ISCSI_ATTRS is not set 781# CONFIG_SCSI_ISCSI_ATTRS is not set
782# CONFIG_SCSI_SAS_ATTRS is not set
634# CONFIG_SCSI_SAS_LIBSAS is not set 783# CONFIG_SCSI_SAS_LIBSAS is not set
635# CONFIG_SCSI_SRP_ATTRS is not set 784# CONFIG_SCSI_SRP_ATTRS is not set
636CONFIG_SCSI_LOWLEVEL=y 785# CONFIG_SCSI_LOWLEVEL is not set
637# CONFIG_ISCSI_TCP is not set
638# CONFIG_SCSI_BNX2_ISCSI is not set
639# CONFIG_BE2ISCSI is not set
640# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
641# CONFIG_SCSI_HPSA is not set
642# CONFIG_SCSI_3W_9XXX is not set
643# CONFIG_SCSI_3W_SAS is not set
644# CONFIG_SCSI_ACARD is not set
645# CONFIG_SCSI_AACRAID is not set
646# CONFIG_SCSI_AIC7XXX is not set
647# CONFIG_SCSI_AIC7XXX_OLD is not set
648# CONFIG_SCSI_AIC79XX is not set
649# CONFIG_SCSI_AIC94XX is not set
650# CONFIG_SCSI_MVSAS is not set
651# CONFIG_SCSI_ARCMSR is not set
652# CONFIG_MEGARAID_NEWGEN is not set
653# CONFIG_MEGARAID_LEGACY is not set
654# CONFIG_MEGARAID_SAS is not set
655# CONFIG_SCSI_MPT2SAS is not set
656# CONFIG_SCSI_HPTIOP is not set
657# CONFIG_LIBFC is not set
658# CONFIG_LIBFCOE is not set
659# CONFIG_FCOE is not set
660# CONFIG_SCSI_DMX3191D is not set
661# CONFIG_SCSI_FUTURE_DOMAIN is not set
662# CONFIG_SCSI_IPS is not set
663# CONFIG_SCSI_INITIO is not set
664# CONFIG_SCSI_INIA100 is not set
665# CONFIG_SCSI_STEX is not set
666# CONFIG_SCSI_SYM53C8XX_2 is not set
667# CONFIG_SCSI_IPR is not set
668# CONFIG_SCSI_QLOGIC_1280 is not set
669# CONFIG_SCSI_QLA_FC is not set
670# CONFIG_SCSI_QLA_ISCSI is not set
671# CONFIG_SCSI_LPFC is not set
672# CONFIG_SCSI_DC395x is not set
673# CONFIG_SCSI_DC390T is not set
674# CONFIG_SCSI_NSP32 is not set
675# CONFIG_SCSI_DEBUG is not set
676# CONFIG_SCSI_PMCRAID is not set
677# CONFIG_SCSI_PM8001 is not set
678# CONFIG_SCSI_SRP is not set
679# CONFIG_SCSI_BFA_FC is not set
680# CONFIG_SCSI_DH is not set 786# CONFIG_SCSI_DH is not set
681# CONFIG_SCSI_OSD_INITIATOR is not set 787# CONFIG_SCSI_OSD_INITIATOR is not set
682CONFIG_ATA=y 788CONFIG_ATA=y
@@ -719,6 +825,7 @@ CONFIG_ATA_SFF=y
719# CONFIG_PATA_IT821X is not set 825# CONFIG_PATA_IT821X is not set
720# CONFIG_PATA_IT8213 is not set 826# CONFIG_PATA_IT8213 is not set
721# CONFIG_PATA_JMICRON is not set 827# CONFIG_PATA_JMICRON is not set
828# CONFIG_PATA_LEGACY is not set
722# CONFIG_PATA_TRIFLEX is not set 829# CONFIG_PATA_TRIFLEX is not set
723# CONFIG_PATA_MARVELL is not set 830# CONFIG_PATA_MARVELL is not set
724# CONFIG_PATA_MPIIX is not set 831# CONFIG_PATA_MPIIX is not set
@@ -743,7 +850,17 @@ CONFIG_ATA_SFF=y
743# CONFIG_PATA_WINBOND is not set 850# CONFIG_PATA_WINBOND is not set
744CONFIG_PATA_PLATFORM=y 851CONFIG_PATA_PLATFORM=y
745# CONFIG_PATA_SCH is not set 852# CONFIG_PATA_SCH is not set
746# CONFIG_MD is not set 853CONFIG_MD=y
854# CONFIG_BLK_DEV_MD is not set
855CONFIG_BLK_DEV_DM=y
856CONFIG_DM_DEBUG=y
857# CONFIG_DM_CRYPT is not set
858# CONFIG_DM_SNAPSHOT is not set
859# CONFIG_DM_MIRROR is not set
860# CONFIG_DM_ZERO is not set
861# CONFIG_DM_MULTIPATH is not set
862# CONFIG_DM_DELAY is not set
863CONFIG_DM_UEVENT=y
747# CONFIG_FUSION is not set 864# CONFIG_FUSION is not set
748 865
749# 866#
@@ -820,11 +937,7 @@ CONFIG_SMSC911X=y
820# CONFIG_NETDEV_1000 is not set 937# CONFIG_NETDEV_1000 is not set
821# CONFIG_NETDEV_10000 is not set 938# CONFIG_NETDEV_10000 is not set
822# CONFIG_TR is not set 939# CONFIG_TR is not set
823CONFIG_WLAN=y 940# CONFIG_WLAN is not set
824# CONFIG_ATMEL is not set
825# CONFIG_PRISM54 is not set
826# CONFIG_USB_ZD1201 is not set
827# CONFIG_HOSTAP is not set
828 941
829# 942#
830# Enable WiMAX (Networking options) to see the WiMAX drivers 943# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -838,6 +951,7 @@ CONFIG_WLAN=y
838# CONFIG_USB_PEGASUS is not set 951# CONFIG_USB_PEGASUS is not set
839# CONFIG_USB_RTL8150 is not set 952# CONFIG_USB_RTL8150 is not set
840# CONFIG_USB_USBNET is not set 953# CONFIG_USB_USBNET is not set
954# CONFIG_USB_IPHETH is not set
841# CONFIG_WAN is not set 955# CONFIG_WAN is not set
842# CONFIG_FDDI is not set 956# CONFIG_FDDI is not set
843# CONFIG_HIPPI is not set 957# CONFIG_HIPPI is not set
@@ -923,7 +1037,7 @@ CONFIG_VT=y
923CONFIG_CONSOLE_TRANSLATIONS=y 1037CONFIG_CONSOLE_TRANSLATIONS=y
924CONFIG_VT_CONSOLE=y 1038CONFIG_VT_CONSOLE=y
925CONFIG_HW_CONSOLE=y 1039CONFIG_HW_CONSOLE=y
926# CONFIG_VT_HW_CONSOLE_BINDING is not set 1040CONFIG_VT_HW_CONSOLE_BINDING=y
927CONFIG_DEVKMEM=y 1041CONFIG_DEVKMEM=y
928# CONFIG_SERIAL_NONSTANDARD is not set 1042# CONFIG_SERIAL_NONSTANDARD is not set
929# CONFIG_NOZOMI is not set 1043# CONFIG_NOZOMI is not set
@@ -940,9 +1054,11 @@ CONFIG_DEVKMEM=y
940CONFIG_SERIAL_SH_SCI=y 1054CONFIG_SERIAL_SH_SCI=y
941CONFIG_SERIAL_SH_SCI_NR_UARTS=6 1055CONFIG_SERIAL_SH_SCI_NR_UARTS=6
942CONFIG_SERIAL_SH_SCI_CONSOLE=y 1056CONFIG_SERIAL_SH_SCI_CONSOLE=y
1057CONFIG_SERIAL_SH_SCI_DMA=y
943CONFIG_SERIAL_CORE=y 1058CONFIG_SERIAL_CORE=y
944CONFIG_SERIAL_CORE_CONSOLE=y 1059CONFIG_SERIAL_CORE_CONSOLE=y
945# CONFIG_SERIAL_JSM is not set 1060# CONFIG_SERIAL_JSM is not set
1061# CONFIG_SERIAL_TIMBERDALE is not set
946CONFIG_UNIX98_PTYS=y 1062CONFIG_UNIX98_PTYS=y
947# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1063# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
948# CONFIG_LEGACY_PTYS is not set 1064# CONFIG_LEGACY_PTYS is not set
@@ -988,6 +1104,7 @@ CONFIG_I2C_HELPER_AUTO=y
988# CONFIG_I2C_OCORES is not set 1104# CONFIG_I2C_OCORES is not set
989# CONFIG_I2C_SH_MOBILE is not set 1105# CONFIG_I2C_SH_MOBILE is not set
990# CONFIG_I2C_SIMTEC is not set 1106# CONFIG_I2C_SIMTEC is not set
1107# CONFIG_I2C_XILINX is not set
991 1108
992# 1109#
993# External I2C/SMBus adapter drivers 1110# External I2C/SMBus adapter drivers
@@ -1001,15 +1118,9 @@ CONFIG_I2C_HELPER_AUTO=y
1001# 1118#
1002# CONFIG_I2C_PCA_PLATFORM is not set 1119# CONFIG_I2C_PCA_PLATFORM is not set
1003# CONFIG_I2C_STUB is not set 1120# CONFIG_I2C_STUB is not set
1004
1005#
1006# Miscellaneous I2C Chip support
1007#
1008# CONFIG_SENSORS_TSL2550 is not set
1009# CONFIG_I2C_DEBUG_CORE is not set 1121# CONFIG_I2C_DEBUG_CORE is not set
1010# CONFIG_I2C_DEBUG_ALGO is not set 1122# CONFIG_I2C_DEBUG_ALGO is not set
1011# CONFIG_I2C_DEBUG_BUS is not set 1123# CONFIG_I2C_DEBUG_BUS is not set
1012# CONFIG_I2C_DEBUG_CHIP is not set
1013CONFIG_SPI=y 1124CONFIG_SPI=y
1014# CONFIG_SPI_DEBUG is not set 1125# CONFIG_SPI_DEBUG is not set
1015CONFIG_SPI_MASTER=y 1126CONFIG_SPI_MASTER=y
@@ -1045,7 +1156,8 @@ CONFIG_WATCHDOG=y
1045# 1156#
1046# CONFIG_SOFT_WATCHDOG is not set 1157# CONFIG_SOFT_WATCHDOG is not set
1047# CONFIG_ALIM7101_WDT is not set 1158# CONFIG_ALIM7101_WDT is not set
1048# CONFIG_SH_WDT is not set 1159CONFIG_SH_WDT=y
1160# CONFIG_SH_WDT_MMAP is not set
1049 1161
1050# 1162#
1051# PCI-based Watchdog Cards 1163# PCI-based Watchdog Cards
@@ -1068,6 +1180,7 @@ CONFIG_SSB_POSSIBLE=y
1068# Multifunction device drivers 1180# Multifunction device drivers
1069# 1181#
1070# CONFIG_MFD_CORE is not set 1182# CONFIG_MFD_CORE is not set
1183# CONFIG_MFD_88PM860X is not set
1071# CONFIG_MFD_SM501 is not set 1184# CONFIG_MFD_SM501 is not set
1072# CONFIG_MFD_SH_MOBILE_SDHI is not set 1185# CONFIG_MFD_SH_MOBILE_SDHI is not set
1073# CONFIG_HTC_PASIC3 is not set 1186# CONFIG_HTC_PASIC3 is not set
@@ -1075,15 +1188,17 @@ CONFIG_SSB_POSSIBLE=y
1075# CONFIG_MFD_TMIO is not set 1188# CONFIG_MFD_TMIO is not set
1076# CONFIG_PMIC_DA903X is not set 1189# CONFIG_PMIC_DA903X is not set
1077# CONFIG_PMIC_ADP5520 is not set 1190# CONFIG_PMIC_ADP5520 is not set
1191# CONFIG_MFD_MAX8925 is not set
1078# CONFIG_MFD_WM8400 is not set 1192# CONFIG_MFD_WM8400 is not set
1079# CONFIG_MFD_WM831X is not set 1193# CONFIG_MFD_WM831X is not set
1080# CONFIG_MFD_WM8350_I2C is not set 1194# CONFIG_MFD_WM8350_I2C is not set
1195# CONFIG_MFD_WM8994 is not set
1081# CONFIG_MFD_PCF50633 is not set 1196# CONFIG_MFD_PCF50633 is not set
1082# CONFIG_MFD_MC13783 is not set 1197# CONFIG_MFD_MC13783 is not set
1083# CONFIG_AB3100_CORE is not set 1198# CONFIG_AB3100_CORE is not set
1084# CONFIG_EZX_PCAP is not set 1199# CONFIG_EZX_PCAP is not set
1085# CONFIG_MFD_88PM8607 is not set
1086# CONFIG_AB4500_CORE is not set 1200# CONFIG_AB4500_CORE is not set
1201# CONFIG_LPC_SCH is not set
1087# CONFIG_REGULATOR is not set 1202# CONFIG_REGULATOR is not set
1088# CONFIG_MEDIA_SUPPORT is not set 1203# CONFIG_MEDIA_SUPPORT is not set
1089 1204
@@ -1091,6 +1206,7 @@ CONFIG_SSB_POSSIBLE=y
1091# Graphics support 1206# Graphics support
1092# 1207#
1093CONFIG_VGA_ARB=y 1208CONFIG_VGA_ARB=y
1209CONFIG_VGA_ARB_MAX_GPUS=16
1094# CONFIG_DRM is not set 1210# CONFIG_DRM is not set
1095# CONFIG_VGASTATE is not set 1211# CONFIG_VGASTATE is not set
1096CONFIG_VIDEO_OUTPUT_CONTROL=m 1212CONFIG_VIDEO_OUTPUT_CONTROL=m
@@ -1121,6 +1237,7 @@ CONFIG_USB_HID=y
1121# 1237#
1122# Special HID drivers 1238# Special HID drivers
1123# 1239#
1240# CONFIG_HID_3M_PCT is not set
1124# CONFIG_HID_A4TECH is not set 1241# CONFIG_HID_A4TECH is not set
1125# CONFIG_HID_APPLE is not set 1242# CONFIG_HID_APPLE is not set
1126# CONFIG_HID_BELKIN is not set 1243# CONFIG_HID_BELKIN is not set
@@ -1135,12 +1252,16 @@ CONFIG_USB_HID=y
1135# CONFIG_HID_KENSINGTON is not set 1252# CONFIG_HID_KENSINGTON is not set
1136# CONFIG_HID_LOGITECH is not set 1253# CONFIG_HID_LOGITECH is not set
1137# CONFIG_HID_MICROSOFT is not set 1254# CONFIG_HID_MICROSOFT is not set
1255# CONFIG_HID_MOSART is not set
1138# CONFIG_HID_MONTEREY is not set 1256# CONFIG_HID_MONTEREY is not set
1139# CONFIG_HID_NTRIG is not set 1257# CONFIG_HID_NTRIG is not set
1258# CONFIG_HID_ORTEK is not set
1140# CONFIG_HID_PANTHERLORD is not set 1259# CONFIG_HID_PANTHERLORD is not set
1141# CONFIG_HID_PETALYNX is not set 1260# CONFIG_HID_PETALYNX is not set
1261# CONFIG_HID_QUANTA is not set
1142# CONFIG_HID_SAMSUNG is not set 1262# CONFIG_HID_SAMSUNG is not set
1143# CONFIG_HID_SONY is not set 1263# CONFIG_HID_SONY is not set
1264# CONFIG_HID_STANTUM is not set
1144# CONFIG_HID_SUNPLUS is not set 1265# CONFIG_HID_SUNPLUS is not set
1145# CONFIG_HID_GREENASIA is not set 1266# CONFIG_HID_GREENASIA is not set
1146# CONFIG_HID_SMARTJOYPLUS is not set 1267# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1241,7 +1362,6 @@ CONFIG_USB_STORAGE=y
1241# CONFIG_USB_RIO500 is not set 1362# CONFIG_USB_RIO500 is not set
1242# CONFIG_USB_LEGOTOWER is not set 1363# CONFIG_USB_LEGOTOWER is not set
1243# CONFIG_USB_LCD is not set 1364# CONFIG_USB_LCD is not set
1244# CONFIG_USB_BERRY_CHARGE is not set
1245# CONFIG_USB_LED is not set 1365# CONFIG_USB_LED is not set
1246# CONFIG_USB_CYPRESS_CY7C63 is not set 1366# CONFIG_USB_CYPRESS_CY7C63 is not set
1247# CONFIG_USB_CYTHERM is not set 1367# CONFIG_USB_CYTHERM is not set
@@ -1253,7 +1373,6 @@ CONFIG_USB_STORAGE=y
1253# CONFIG_USB_IOWARRIOR is not set 1373# CONFIG_USB_IOWARRIOR is not set
1254# CONFIG_USB_TEST is not set 1374# CONFIG_USB_TEST is not set
1255# CONFIG_USB_ISIGHTFW is not set 1375# CONFIG_USB_ISIGHTFW is not set
1256# CONFIG_USB_VST is not set
1257CONFIG_USB_GADGET=y 1376CONFIG_USB_GADGET=y
1258# CONFIG_USB_GADGET_DEBUG is not set 1377# CONFIG_USB_GADGET_DEBUG is not set
1259# CONFIG_USB_GADGET_DEBUG_FILES is not set 1378# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -1291,6 +1410,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
1291# CONFIG_USB_MIDI_GADGET is not set 1410# CONFIG_USB_MIDI_GADGET is not set
1292# CONFIG_USB_G_PRINTER is not set 1411# CONFIG_USB_G_PRINTER is not set
1293# CONFIG_USB_CDC_COMPOSITE is not set 1412# CONFIG_USB_CDC_COMPOSITE is not set
1413# CONFIG_USB_G_NOKIA is not set
1294# CONFIG_USB_G_MULTI is not set 1414# CONFIG_USB_G_MULTI is not set
1295 1415
1296# 1416#
@@ -1370,43 +1490,102 @@ CONFIG_RTC_DRV_MAX6900=y
1370# 1490#
1371CONFIG_RTC_DRV_SH=y 1491CONFIG_RTC_DRV_SH=y
1372# CONFIG_RTC_DRV_GENERIC is not set 1492# CONFIG_RTC_DRV_GENERIC is not set
1373# CONFIG_DMADEVICES is not set 1493CONFIG_DMADEVICES=y
1494# CONFIG_DMADEVICES_DEBUG is not set
1495
1496#
1497# DMA Devices
1498#
1499CONFIG_SH_DMAE=y
1500CONFIG_DMA_ENGINE=y
1501
1502#
1503# DMA Clients
1504#
1505# CONFIG_NET_DMA is not set
1506# CONFIG_ASYNC_TX_DMA is not set
1507# CONFIG_DMATEST is not set
1374# CONFIG_AUXDISPLAY is not set 1508# CONFIG_AUXDISPLAY is not set
1375CONFIG_UIO=m 1509CONFIG_UIO=m
1376# CONFIG_UIO_CIF is not set 1510# CONFIG_UIO_CIF is not set
1377# CONFIG_UIO_PDRV is not set 1511CONFIG_UIO_PDRV=m
1378# CONFIG_UIO_PDRV_GENIRQ is not set 1512CONFIG_UIO_PDRV_GENIRQ=m
1379# CONFIG_UIO_SMX is not set
1380# CONFIG_UIO_AEC is not set 1513# CONFIG_UIO_AEC is not set
1381# CONFIG_UIO_SERCOS3 is not set 1514# CONFIG_UIO_SERCOS3 is not set
1382# CONFIG_UIO_PCI_GENERIC is not set 1515CONFIG_UIO_PCI_GENERIC=m
1516# CONFIG_UIO_NETX is not set
1383 1517
1384# 1518#
1385# TI VLYNQ 1519# TI VLYNQ
1386# 1520#
1387# CONFIG_STAGING is not set 1521CONFIG_STAGING=y
1522# CONFIG_STAGING_EXCLUDE_BUILD is not set
1523# CONFIG_USB_IP_COMMON is not set
1524# CONFIG_ECHO is not set
1525# CONFIG_POCH is not set
1526# CONFIG_COMEDI is not set
1527# CONFIG_ASUS_OLED is not set
1528# CONFIG_TRANZPORT is not set
1529
1530#
1531# Qualcomm MSM Camera And Video
1532#
1533
1534#
1535# Camera Sensor Selection
1536#
1537# CONFIG_INPUT_GPIO is not set
1538# CONFIG_POHMELFS is not set
1539# CONFIG_IDE_PHISON is not set
1540# CONFIG_VME_BUS is not set
1541
1542#
1543# RAR Register Driver
1544#
1545# CONFIG_RAR_REGISTER is not set
1546# CONFIG_IIO is not set
1547CONFIG_RAMZSWAP=m
1548CONFIG_RAMZSWAP_STATS=y
1549# CONFIG_BATMAN_ADV is not set
1550# CONFIG_STRIP is not set
1551# CONFIG_DT3155 is not set
1552# CONFIG_CRYSTALHD is not set
1388 1553
1389# 1554#
1390# File systems 1555# File systems
1391# 1556#
1392CONFIG_EXT2_FS=y 1557CONFIG_EXT2_FS=y
1393# CONFIG_EXT2_FS_XATTR is not set 1558CONFIG_EXT2_FS_XATTR=y
1559# CONFIG_EXT2_FS_POSIX_ACL is not set
1560# CONFIG_EXT2_FS_SECURITY is not set
1394# CONFIG_EXT2_FS_XIP is not set 1561# CONFIG_EXT2_FS_XIP is not set
1395CONFIG_EXT3_FS=y 1562CONFIG_EXT3_FS=y
1396# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 1563# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
1397CONFIG_EXT3_FS_XATTR=y 1564CONFIG_EXT3_FS_XATTR=y
1398# CONFIG_EXT3_FS_POSIX_ACL is not set 1565# CONFIG_EXT3_FS_POSIX_ACL is not set
1399# CONFIG_EXT3_FS_SECURITY is not set 1566# CONFIG_EXT3_FS_SECURITY is not set
1400# CONFIG_EXT4_FS is not set 1567CONFIG_EXT4_FS=y
1568CONFIG_EXT4_FS_XATTR=y
1569# CONFIG_EXT4_FS_POSIX_ACL is not set
1570# CONFIG_EXT4_FS_SECURITY is not set
1571# CONFIG_EXT4_DEBUG is not set
1401CONFIG_JBD=y 1572CONFIG_JBD=y
1402# CONFIG_JBD_DEBUG is not set 1573# CONFIG_JBD_DEBUG is not set
1574CONFIG_JBD2=y
1575# CONFIG_JBD2_DEBUG is not set
1403CONFIG_FS_MBCACHE=y 1576CONFIG_FS_MBCACHE=y
1404# CONFIG_REISERFS_FS is not set 1577# CONFIG_REISERFS_FS is not set
1405# CONFIG_JFS_FS is not set 1578# CONFIG_JFS_FS is not set
1406# CONFIG_FS_POSIX_ACL is not set 1579CONFIG_FS_POSIX_ACL=y
1407# CONFIG_XFS_FS is not set 1580CONFIG_XFS_FS=y
1581# CONFIG_XFS_QUOTA is not set
1582# CONFIG_XFS_POSIX_ACL is not set
1583# CONFIG_XFS_RT is not set
1584# CONFIG_XFS_DEBUG is not set
1585# CONFIG_GFS2_FS is not set
1408# CONFIG_OCFS2_FS is not set 1586# CONFIG_OCFS2_FS is not set
1409# CONFIG_BTRFS_FS is not set 1587CONFIG_BTRFS_FS=y
1588# CONFIG_BTRFS_FS_POSIX_ACL is not set
1410# CONFIG_NILFS2_FS is not set 1589# CONFIG_NILFS2_FS is not set
1411CONFIG_FILE_LOCKING=y 1590CONFIG_FILE_LOCKING=y
1412CONFIG_FSNOTIFY=y 1591CONFIG_FSNOTIFY=y
@@ -1415,19 +1594,30 @@ CONFIG_INOTIFY=y
1415CONFIG_INOTIFY_USER=y 1594CONFIG_INOTIFY_USER=y
1416# CONFIG_QUOTA is not set 1595# CONFIG_QUOTA is not set
1417# CONFIG_AUTOFS_FS is not set 1596# CONFIG_AUTOFS_FS is not set
1418# CONFIG_AUTOFS4_FS is not set 1597CONFIG_AUTOFS4_FS=m
1419# CONFIG_FUSE_FS is not set 1598CONFIG_FUSE_FS=y
1599CONFIG_CUSE=m
1420 1600
1421# 1601#
1422# Caches 1602# Caches
1423# 1603#
1424# CONFIG_FSCACHE is not set 1604CONFIG_FSCACHE=m
1605# CONFIG_FSCACHE_STATS is not set
1606# CONFIG_FSCACHE_HISTOGRAM is not set
1607# CONFIG_FSCACHE_DEBUG is not set
1608# CONFIG_FSCACHE_OBJECT_LIST is not set
1609CONFIG_CACHEFILES=m
1610# CONFIG_CACHEFILES_DEBUG is not set
1611# CONFIG_CACHEFILES_HISTOGRAM is not set
1425 1612
1426# 1613#
1427# CD-ROM/DVD Filesystems 1614# CD-ROM/DVD Filesystems
1428# 1615#
1429# CONFIG_ISO9660_FS is not set 1616CONFIG_ISO9660_FS=m
1430# CONFIG_UDF_FS is not set 1617CONFIG_JOLIET=y
1618CONFIG_ZISOFS=y
1619CONFIG_UDF_FS=m
1620CONFIG_UDF_NLS=y
1431 1621
1432# 1622#
1433# DOS/FAT/NT Filesystems 1623# DOS/FAT/NT Filesystems
@@ -1448,7 +1638,7 @@ CONFIG_TMPFS=y
1448# CONFIG_TMPFS_POSIX_ACL is not set 1638# CONFIG_TMPFS_POSIX_ACL is not set
1449CONFIG_HUGETLBFS=y 1639CONFIG_HUGETLBFS=y
1450CONFIG_HUGETLB_PAGE=y 1640CONFIG_HUGETLB_PAGE=y
1451# CONFIG_CONFIGFS_FS is not set 1641CONFIG_CONFIGFS_FS=y
1452CONFIG_MISC_FILESYSTEMS=y 1642CONFIG_MISC_FILESYSTEMS=y
1453# CONFIG_ADFS_FS is not set 1643# CONFIG_ADFS_FS is not set
1454# CONFIG_AFFS_FS is not set 1644# CONFIG_AFFS_FS is not set
@@ -1457,30 +1647,60 @@ CONFIG_MISC_FILESYSTEMS=y
1457# CONFIG_BEFS_FS is not set 1647# CONFIG_BEFS_FS is not set
1458# CONFIG_BFS_FS is not set 1648# CONFIG_BFS_FS is not set
1459# CONFIG_EFS_FS is not set 1649# CONFIG_EFS_FS is not set
1460# CONFIG_CRAMFS is not set 1650CONFIG_JFFS2_FS=m
1461# CONFIG_SQUASHFS is not set 1651CONFIG_JFFS2_FS_DEBUG=0
1652CONFIG_JFFS2_FS_WRITEBUFFER=y
1653# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
1654# CONFIG_JFFS2_SUMMARY is not set
1655CONFIG_JFFS2_FS_XATTR=y
1656CONFIG_JFFS2_FS_POSIX_ACL=y
1657CONFIG_JFFS2_FS_SECURITY=y
1658# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1659CONFIG_JFFS2_ZLIB=y
1660# CONFIG_JFFS2_LZO is not set
1661CONFIG_JFFS2_RTIME=y
1662# CONFIG_JFFS2_RUBIN is not set
1663CONFIG_UBIFS_FS=m
1664# CONFIG_UBIFS_FS_XATTR is not set
1665# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
1666CONFIG_UBIFS_FS_LZO=y
1667CONFIG_UBIFS_FS_ZLIB=y
1668# CONFIG_UBIFS_FS_DEBUG is not set
1669CONFIG_LOGFS=m
1670CONFIG_CRAMFS=m
1671CONFIG_SQUASHFS=m
1672# CONFIG_SQUASHFS_EMBEDDED is not set
1673CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
1462# CONFIG_VXFS_FS is not set 1674# CONFIG_VXFS_FS is not set
1463# CONFIG_MINIX_FS is not set 1675# CONFIG_MINIX_FS is not set
1464# CONFIG_OMFS_FS is not set 1676# CONFIG_OMFS_FS is not set
1465# CONFIG_HPFS_FS is not set 1677# CONFIG_HPFS_FS is not set
1466# CONFIG_QNX4FS_FS is not set 1678# CONFIG_QNX4FS_FS is not set
1467# CONFIG_ROMFS_FS is not set 1679CONFIG_ROMFS_FS=m
1680CONFIG_ROMFS_BACKED_BY_BLOCK=y
1681# CONFIG_ROMFS_BACKED_BY_MTD is not set
1682# CONFIG_ROMFS_BACKED_BY_BOTH is not set
1683CONFIG_ROMFS_ON_BLOCK=y
1468# CONFIG_SYSV_FS is not set 1684# CONFIG_SYSV_FS is not set
1469# CONFIG_UFS_FS is not set 1685# CONFIG_UFS_FS is not set
1470CONFIG_NETWORK_FILESYSTEMS=y 1686CONFIG_NETWORK_FILESYSTEMS=y
1471CONFIG_NFS_FS=y 1687CONFIG_NFS_FS=y
1472CONFIG_NFS_V3=y 1688CONFIG_NFS_V3=y
1473# CONFIG_NFS_V3_ACL is not set 1689# CONFIG_NFS_V3_ACL is not set
1474# CONFIG_NFS_V4 is not set 1690CONFIG_NFS_V4=y
1691# CONFIG_NFS_V4_1 is not set
1475CONFIG_ROOT_NFS=y 1692CONFIG_ROOT_NFS=y
1476# CONFIG_NFSD is not set 1693# CONFIG_NFSD is not set
1477CONFIG_LOCKD=y 1694CONFIG_LOCKD=y
1478CONFIG_LOCKD_V4=y 1695CONFIG_LOCKD_V4=y
1696CONFIG_EXPORTFS=y
1479CONFIG_NFS_COMMON=y 1697CONFIG_NFS_COMMON=y
1480CONFIG_SUNRPC=y 1698CONFIG_SUNRPC=y
1481# CONFIG_RPCSEC_GSS_KRB5 is not set 1699CONFIG_SUNRPC_GSS=y
1700CONFIG_RPCSEC_GSS_KRB5=y
1482# CONFIG_RPCSEC_GSS_SPKM3 is not set 1701# CONFIG_RPCSEC_GSS_SPKM3 is not set
1483# CONFIG_SMB_FS is not set 1702# CONFIG_SMB_FS is not set
1703# CONFIG_CEPH_FS is not set
1484# CONFIG_CIFS is not set 1704# CONFIG_CIFS is not set
1485# CONFIG_NCP_FS is not set 1705# CONFIG_NCP_FS is not set
1486# CONFIG_CODA_FS is not set 1706# CONFIG_CODA_FS is not set
@@ -1493,7 +1713,7 @@ CONFIG_SUNRPC=y
1493CONFIG_MSDOS_PARTITION=y 1713CONFIG_MSDOS_PARTITION=y
1494CONFIG_NLS=y 1714CONFIG_NLS=y
1495CONFIG_NLS_DEFAULT="iso8859-1" 1715CONFIG_NLS_DEFAULT="iso8859-1"
1496# CONFIG_NLS_CODEPAGE_437 is not set 1716CONFIG_NLS_CODEPAGE_437=y
1497# CONFIG_NLS_CODEPAGE_737 is not set 1717# CONFIG_NLS_CODEPAGE_737 is not set
1498# CONFIG_NLS_CODEPAGE_775 is not set 1718# CONFIG_NLS_CODEPAGE_775 is not set
1499# CONFIG_NLS_CODEPAGE_850 is not set 1719# CONFIG_NLS_CODEPAGE_850 is not set
@@ -1508,16 +1728,16 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1508# CONFIG_NLS_CODEPAGE_865 is not set 1728# CONFIG_NLS_CODEPAGE_865 is not set
1509# CONFIG_NLS_CODEPAGE_866 is not set 1729# CONFIG_NLS_CODEPAGE_866 is not set
1510# CONFIG_NLS_CODEPAGE_869 is not set 1730# CONFIG_NLS_CODEPAGE_869 is not set
1511# CONFIG_NLS_CODEPAGE_936 is not set 1731CONFIG_NLS_CODEPAGE_936=m
1512# CONFIG_NLS_CODEPAGE_950 is not set 1732CONFIG_NLS_CODEPAGE_950=m
1513# CONFIG_NLS_CODEPAGE_932 is not set 1733CONFIG_NLS_CODEPAGE_932=y
1514# CONFIG_NLS_CODEPAGE_949 is not set 1734CONFIG_NLS_CODEPAGE_949=m
1515# CONFIG_NLS_CODEPAGE_874 is not set 1735# CONFIG_NLS_CODEPAGE_874 is not set
1516# CONFIG_NLS_ISO8859_8 is not set 1736# CONFIG_NLS_ISO8859_8 is not set
1517# CONFIG_NLS_CODEPAGE_1250 is not set 1737# CONFIG_NLS_CODEPAGE_1250 is not set
1518# CONFIG_NLS_CODEPAGE_1251 is not set 1738# CONFIG_NLS_CODEPAGE_1251 is not set
1519# CONFIG_NLS_ASCII is not set 1739CONFIG_NLS_ASCII=m
1520# CONFIG_NLS_ISO8859_1 is not set 1740CONFIG_NLS_ISO8859_1=y
1521# CONFIG_NLS_ISO8859_2 is not set 1741# CONFIG_NLS_ISO8859_2 is not set
1522# CONFIG_NLS_ISO8859_3 is not set 1742# CONFIG_NLS_ISO8859_3 is not set
1523# CONFIG_NLS_ISO8859_4 is not set 1743# CONFIG_NLS_ISO8859_4 is not set
@@ -1527,10 +1747,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1527# CONFIG_NLS_ISO8859_9 is not set 1747# CONFIG_NLS_ISO8859_9 is not set
1528# CONFIG_NLS_ISO8859_13 is not set 1748# CONFIG_NLS_ISO8859_13 is not set
1529# CONFIG_NLS_ISO8859_14 is not set 1749# CONFIG_NLS_ISO8859_14 is not set
1530# CONFIG_NLS_ISO8859_15 is not set 1750CONFIG_NLS_ISO8859_15=m
1531# CONFIG_NLS_KOI8_R is not set 1751# CONFIG_NLS_KOI8_R is not set
1532# CONFIG_NLS_KOI8_U is not set 1752# CONFIG_NLS_KOI8_U is not set
1533# CONFIG_NLS_UTF8 is not set 1753CONFIG_NLS_UTF8=m
1534# CONFIG_DLM is not set 1754# CONFIG_DLM is not set
1535 1755
1536# 1756#
@@ -1538,7 +1758,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1538# 1758#
1539CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1759CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1540CONFIG_PRINTK_TIME=y 1760CONFIG_PRINTK_TIME=y
1541CONFIG_ENABLE_WARN_DEPRECATED=y 1761# CONFIG_ENABLE_WARN_DEPRECATED is not set
1542# CONFIG_ENABLE_MUST_CHECK is not set 1762# CONFIG_ENABLE_MUST_CHECK is not set
1543CONFIG_FRAME_WARN=1024 1763CONFIG_FRAME_WARN=1024
1544CONFIG_MAGIC_SYSRQ=y 1764CONFIG_MAGIC_SYSRQ=y
@@ -1547,7 +1767,7 @@ CONFIG_MAGIC_SYSRQ=y
1547CONFIG_DEBUG_FS=y 1767CONFIG_DEBUG_FS=y
1548# CONFIG_HEADERS_CHECK is not set 1768# CONFIG_HEADERS_CHECK is not set
1549CONFIG_DEBUG_KERNEL=y 1769CONFIG_DEBUG_KERNEL=y
1550CONFIG_DEBUG_SHIRQ=y 1770# CONFIG_DEBUG_SHIRQ is not set
1551CONFIG_DETECT_SOFTLOCKUP=y 1771CONFIG_DETECT_SOFTLOCKUP=y
1552# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1772# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1553CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1773CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
@@ -1555,8 +1775,8 @@ CONFIG_DETECT_HUNG_TASK=y
1555# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set 1775# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1556CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 1776CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1557CONFIG_SCHED_DEBUG=y 1777CONFIG_SCHED_DEBUG=y
1558# CONFIG_SCHEDSTATS is not set 1778CONFIG_SCHEDSTATS=y
1559# CONFIG_TIMER_STATS is not set 1779CONFIG_TIMER_STATS=y
1560# CONFIG_DEBUG_OBJECTS is not set 1780# CONFIG_DEBUG_OBJECTS is not set
1561# CONFIG_DEBUG_SLAB is not set 1781# CONFIG_DEBUG_SLAB is not set
1562CONFIG_DEBUG_PREEMPT=y 1782CONFIG_DEBUG_PREEMPT=y
@@ -1573,24 +1793,28 @@ CONFIG_STACKTRACE=y
1573# CONFIG_DEBUG_KOBJECT is not set 1793# CONFIG_DEBUG_KOBJECT is not set
1574CONFIG_DEBUG_BUGVERBOSE=y 1794CONFIG_DEBUG_BUGVERBOSE=y
1575# CONFIG_DEBUG_INFO is not set 1795# CONFIG_DEBUG_INFO is not set
1576CONFIG_DEBUG_VM=y 1796# CONFIG_DEBUG_VM is not set
1577# CONFIG_DEBUG_WRITECOUNT is not set 1797# CONFIG_DEBUG_WRITECOUNT is not set
1578# CONFIG_DEBUG_MEMORY_INIT is not set 1798CONFIG_DEBUG_MEMORY_INIT=y
1579# CONFIG_DEBUG_LIST is not set 1799# CONFIG_DEBUG_LIST is not set
1580# CONFIG_DEBUG_SG is not set 1800# CONFIG_DEBUG_SG is not set
1581# CONFIG_DEBUG_NOTIFIERS is not set 1801# CONFIG_DEBUG_NOTIFIERS is not set
1582# CONFIG_DEBUG_CREDENTIALS is not set 1802# CONFIG_DEBUG_CREDENTIALS is not set
1583CONFIG_FRAME_POINTER=y 1803CONFIG_FRAME_POINTER=y
1584# CONFIG_RCU_TORTURE_TEST is not set 1804# CONFIG_RCU_TORTURE_TEST is not set
1585# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1805CONFIG_RCU_CPU_STALL_DETECTOR=y
1806# CONFIG_RCU_CPU_STALL_VERBOSE is not set
1807# CONFIG_KPROBES_SANITY_TEST is not set
1586# CONFIG_BACKTRACE_SELF_TEST is not set 1808# CONFIG_BACKTRACE_SELF_TEST is not set
1587# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1809# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1588# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1810# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1811# CONFIG_LKDTM is not set
1589# CONFIG_FAULT_INJECTION is not set 1812# CONFIG_FAULT_INJECTION is not set
1590# CONFIG_LATENCYTOP is not set 1813CONFIG_LATENCYTOP=y
1591# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1814CONFIG_SYSCTL_SYSCALL_CHECK=y
1592# CONFIG_PAGE_POISONING is not set 1815# CONFIG_PAGE_POISONING is not set
1593CONFIG_NOP_TRACER=y 1816CONFIG_NOP_TRACER=y
1817CONFIG_HAVE_FTRACE_NMI_ENTER=y
1594CONFIG_HAVE_FUNCTION_TRACER=y 1818CONFIG_HAVE_FUNCTION_TRACER=y
1595CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1819CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1596CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1820CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1598,16 +1822,19 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1598CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1822CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1599CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1823CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1600CONFIG_RING_BUFFER=y 1824CONFIG_RING_BUFFER=y
1825CONFIG_FTRACE_NMI_ENTER=y
1601CONFIG_EVENT_TRACING=y 1826CONFIG_EVENT_TRACING=y
1602CONFIG_CONTEXT_SWITCH_TRACER=y 1827CONFIG_CONTEXT_SWITCH_TRACER=y
1828CONFIG_RING_BUFFER_ALLOW_SWAP=y
1603CONFIG_TRACING=y 1829CONFIG_TRACING=y
1830CONFIG_GENERIC_TRACER=y
1604CONFIG_TRACING_SUPPORT=y 1831CONFIG_TRACING_SUPPORT=y
1605CONFIG_FTRACE=y 1832CONFIG_FTRACE=y
1606# CONFIG_FUNCTION_TRACER is not set 1833CONFIG_FUNCTION_TRACER=y
1834# CONFIG_FUNCTION_GRAPH_TRACER is not set
1607# CONFIG_IRQSOFF_TRACER is not set 1835# CONFIG_IRQSOFF_TRACER is not set
1608# CONFIG_PREEMPT_TRACER is not set 1836# CONFIG_PREEMPT_TRACER is not set
1609# CONFIG_SCHED_TRACER is not set 1837# CONFIG_SCHED_TRACER is not set
1610# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1611# CONFIG_FTRACE_SYSCALLS is not set 1838# CONFIG_FTRACE_SYSCALLS is not set
1612# CONFIG_BOOT_TRACER is not set 1839# CONFIG_BOOT_TRACER is not set
1613CONFIG_BRANCH_PROFILE_NONE=y 1840CONFIG_BRANCH_PROFILE_NONE=y
@@ -1619,9 +1846,13 @@ CONFIG_KSYM_TRACER=y
1619# CONFIG_KMEMTRACE is not set 1846# CONFIG_KMEMTRACE is not set
1620# CONFIG_WORKQUEUE_TRACER is not set 1847# CONFIG_WORKQUEUE_TRACER is not set
1621# CONFIG_BLK_DEV_IO_TRACE is not set 1848# CONFIG_BLK_DEV_IO_TRACE is not set
1849CONFIG_DYNAMIC_FTRACE=y
1850# CONFIG_FUNCTION_PROFILER is not set
1851CONFIG_FTRACE_MCOUNT_RECORD=y
1852# CONFIG_FTRACE_STARTUP_TEST is not set
1622# CONFIG_RING_BUFFER_BENCHMARK is not set 1853# CONFIG_RING_BUFFER_BENCHMARK is not set
1623# CONFIG_DYNAMIC_DEBUG is not set 1854# CONFIG_DYNAMIC_DEBUG is not set
1624# CONFIG_DMA_API_DEBUG is not set 1855CONFIG_DMA_API_DEBUG=y
1625# CONFIG_SAMPLES is not set 1856# CONFIG_SAMPLES is not set
1626CONFIG_HAVE_ARCH_KGDB=y 1857CONFIG_HAVE_ARCH_KGDB=y
1627# CONFIG_KGDB is not set 1858# CONFIG_KGDB is not set
@@ -1632,6 +1863,7 @@ CONFIG_DEBUG_STACK_USAGE=y
1632CONFIG_DUMP_CODE=y 1863CONFIG_DUMP_CODE=y
1633CONFIG_DWARF_UNWINDER=y 1864CONFIG_DWARF_UNWINDER=y
1634# CONFIG_SH_NO_BSS_INIT is not set 1865# CONFIG_SH_NO_BSS_INIT is not set
1866CONFIG_MCOUNT=y
1635 1867
1636# 1868#
1637# Security options 1869# Security options
@@ -1649,10 +1881,21 @@ CONFIG_CRYPTO=y
1649# 1881#
1650# Crypto core or helper 1882# Crypto core or helper
1651# 1883#
1652# CONFIG_CRYPTO_MANAGER is not set 1884CONFIG_CRYPTO_ALGAPI=y
1653# CONFIG_CRYPTO_MANAGER2 is not set 1885CONFIG_CRYPTO_ALGAPI2=y
1886CONFIG_CRYPTO_AEAD2=y
1887CONFIG_CRYPTO_BLKCIPHER=y
1888CONFIG_CRYPTO_BLKCIPHER2=y
1889CONFIG_CRYPTO_HASH=y
1890CONFIG_CRYPTO_HASH2=y
1891CONFIG_CRYPTO_RNG2=y
1892CONFIG_CRYPTO_PCOMP=y
1893CONFIG_CRYPTO_MANAGER=y
1894CONFIG_CRYPTO_MANAGER2=y
1654# CONFIG_CRYPTO_GF128MUL is not set 1895# CONFIG_CRYPTO_GF128MUL is not set
1655# CONFIG_CRYPTO_NULL is not set 1896# CONFIG_CRYPTO_NULL is not set
1897# CONFIG_CRYPTO_PCRYPT is not set
1898CONFIG_CRYPTO_WORKQUEUE=y
1656# CONFIG_CRYPTO_CRYPTD is not set 1899# CONFIG_CRYPTO_CRYPTD is not set
1657# CONFIG_CRYPTO_AUTHENC is not set 1900# CONFIG_CRYPTO_AUTHENC is not set
1658# CONFIG_CRYPTO_TEST is not set 1901# CONFIG_CRYPTO_TEST is not set
@@ -1667,7 +1910,7 @@ CONFIG_CRYPTO=y
1667# 1910#
1668# Block modes 1911# Block modes
1669# 1912#
1670# CONFIG_CRYPTO_CBC is not set 1913CONFIG_CRYPTO_CBC=y
1671# CONFIG_CRYPTO_CTR is not set 1914# CONFIG_CRYPTO_CTR is not set
1672# CONFIG_CRYPTO_CTS is not set 1915# CONFIG_CRYPTO_CTS is not set
1673# CONFIG_CRYPTO_ECB is not set 1916# CONFIG_CRYPTO_ECB is not set
@@ -1685,10 +1928,10 @@ CONFIG_CRYPTO=y
1685# 1928#
1686# Digest 1929# Digest
1687# 1930#
1688# CONFIG_CRYPTO_CRC32C is not set 1931CONFIG_CRYPTO_CRC32C=y
1689# CONFIG_CRYPTO_GHASH is not set 1932# CONFIG_CRYPTO_GHASH is not set
1690# CONFIG_CRYPTO_MD4 is not set 1933# CONFIG_CRYPTO_MD4 is not set
1691# CONFIG_CRYPTO_MD5 is not set 1934CONFIG_CRYPTO_MD5=y
1692# CONFIG_CRYPTO_MICHAEL_MIC is not set 1935# CONFIG_CRYPTO_MICHAEL_MIC is not set
1693# CONFIG_CRYPTO_RMD128 is not set 1936# CONFIG_CRYPTO_RMD128 is not set
1694# CONFIG_CRYPTO_RMD160 is not set 1937# CONFIG_CRYPTO_RMD160 is not set
@@ -1710,7 +1953,7 @@ CONFIG_CRYPTO=y
1710# CONFIG_CRYPTO_CAMELLIA is not set 1953# CONFIG_CRYPTO_CAMELLIA is not set
1711# CONFIG_CRYPTO_CAST5 is not set 1954# CONFIG_CRYPTO_CAST5 is not set
1712# CONFIG_CRYPTO_CAST6 is not set 1955# CONFIG_CRYPTO_CAST6 is not set
1713# CONFIG_CRYPTO_DES is not set 1956CONFIG_CRYPTO_DES=y
1714# CONFIG_CRYPTO_FCRYPT is not set 1957# CONFIG_CRYPTO_FCRYPT is not set
1715# CONFIG_CRYPTO_KHAZAD is not set 1958# CONFIG_CRYPTO_KHAZAD is not set
1716# CONFIG_CRYPTO_SALSA20 is not set 1959# CONFIG_CRYPTO_SALSA20 is not set
@@ -1722,9 +1965,9 @@ CONFIG_CRYPTO=y
1722# 1965#
1723# Compression 1966# Compression
1724# 1967#
1725# CONFIG_CRYPTO_DEFLATE is not set 1968CONFIG_CRYPTO_DEFLATE=m
1726# CONFIG_CRYPTO_ZLIB is not set 1969# CONFIG_CRYPTO_ZLIB is not set
1727# CONFIG_CRYPTO_LZO is not set 1970CONFIG_CRYPTO_LZO=m
1728 1971
1729# 1972#
1730# Random Number Generation 1973# Random Number Generation
@@ -1732,6 +1975,7 @@ CONFIG_CRYPTO=y
1732# CONFIG_CRYPTO_ANSI_CPRNG is not set 1975# CONFIG_CRYPTO_ANSI_CPRNG is not set
1733CONFIG_CRYPTO_HW=y 1976CONFIG_CRYPTO_HW=y
1734# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1977# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1978# CONFIG_VIRTUALIZATION is not set
1735CONFIG_BINARY_PRINTF=y 1979CONFIG_BINARY_PRINTF=y
1736 1980
1737# 1981#
@@ -1740,12 +1984,22 @@ CONFIG_BINARY_PRINTF=y
1740CONFIG_BITREVERSE=y 1984CONFIG_BITREVERSE=y
1741CONFIG_GENERIC_FIND_LAST_BIT=y 1985CONFIG_GENERIC_FIND_LAST_BIT=y
1742# CONFIG_CRC_CCITT is not set 1986# CONFIG_CRC_CCITT is not set
1743# CONFIG_CRC16 is not set 1987CONFIG_CRC16=y
1744# CONFIG_CRC_T10DIF is not set 1988# CONFIG_CRC_T10DIF is not set
1745# CONFIG_CRC_ITU_T is not set 1989CONFIG_CRC_ITU_T=m
1746CONFIG_CRC32=y 1990CONFIG_CRC32=y
1747# CONFIG_CRC7 is not set 1991# CONFIG_CRC7 is not set
1748# CONFIG_LIBCRC32C is not set 1992CONFIG_LIBCRC32C=y
1993CONFIG_AUDIT_GENERIC=y
1994CONFIG_ZLIB_INFLATE=y
1995CONFIG_ZLIB_DEFLATE=y
1996CONFIG_LZO_COMPRESS=m
1997CONFIG_LZO_DECOMPRESS=y
1998CONFIG_DECOMPRESS_GZIP=y
1999CONFIG_DECOMPRESS_BZIP2=y
2000CONFIG_DECOMPRESS_LZMA=y
2001CONFIG_DECOMPRESS_LZO=y
2002CONFIG_BTREE=y
1749CONFIG_HAS_IOMEM=y 2003CONFIG_HAS_IOMEM=y
1750CONFIG_HAS_IOPORT=y 2004CONFIG_HAS_IOPORT=y
1751CONFIG_HAS_DMA=y 2005CONFIG_HAS_DMA=y
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index 43e6780a89d..910eaec934c 100644
--- a/arch/sh/configs/se7206_defconfig
+++ b/arch/sh/configs/se7206_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-rc5
4# Mon Jan 4 13:30:00 2010 4# Tue May 18 16:34:06 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
54CONFIG_POSIX_MQUEUE=y 57CONFIG_POSIX_MQUEUE=y
@@ -72,7 +75,6 @@ CONFIG_RCU_FANOUT=32
72CONFIG_TREE_RCU_TRACE=y 75CONFIG_TREE_RCU_TRACE=y
73# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_GROUP_SCHED is not set
76CONFIG_CGROUPS=y 78CONFIG_CGROUPS=y
77CONFIG_CGROUP_DEBUG=y 79CONFIG_CGROUP_DEBUG=y
78CONFIG_CGROUP_NS=y 80CONFIG_CGROUP_NS=y
@@ -82,6 +84,7 @@ CONFIG_CGROUP_DEVICE=y
82CONFIG_CGROUP_CPUACCT=y 84CONFIG_CGROUP_CPUACCT=y
83CONFIG_RESOURCE_COUNTERS=y 85CONFIG_RESOURCE_COUNTERS=y
84CONFIG_CGROUP_MEM_RES_CTLR=y 86CONFIG_CGROUP_MEM_RES_CTLR=y
87# CONFIG_CGROUP_SCHED is not set
85CONFIG_MM_OWNER=y 88CONFIG_MM_OWNER=y
86# CONFIG_SYSFS_DEPRECATED_V2 is not set 89# CONFIG_SYSFS_DEPRECATED_V2 is not set
87CONFIG_RELAY=y 90CONFIG_RELAY=y
@@ -96,6 +99,7 @@ CONFIG_INITRAMFS_SOURCE=""
96CONFIG_RD_GZIP=y 99CONFIG_RD_GZIP=y
97# CONFIG_RD_BZIP2 is not set 100# CONFIG_RD_BZIP2 is not set
98# CONFIG_RD_LZMA is not set 101# CONFIG_RD_LZMA is not set
102# CONFIG_RD_LZO is not set
99CONFIG_CC_OPTIMIZE_FOR_SIZE=y 103CONFIG_CC_OPTIMIZE_FOR_SIZE=y
100CONFIG_SYSCTL=y 104CONFIG_SYSCTL=y
101CONFIG_ANON_INODES=y 105CONFIG_ANON_INODES=y
@@ -123,7 +127,6 @@ CONFIG_PERF_USE_VMALLOC=y
123# Kernel Performance Events And Counters 127# Kernel Performance Events And Counters
124# 128#
125CONFIG_PERF_EVENTS=y 129CONFIG_PERF_EVENTS=y
126CONFIG_EVENT_PROFILE=y
127# CONFIG_PERF_COUNTERS is not set 130# CONFIG_PERF_COUNTERS is not set
128# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 131# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
129CONFIG_VM_EVENT_COUNTERS=y 132CONFIG_VM_EVENT_COUNTERS=y
@@ -133,7 +136,6 @@ CONFIG_VM_EVENT_COUNTERS=y
133CONFIG_SLOB=y 136CONFIG_SLOB=y
134# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set 137# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set
135CONFIG_PROFILING=y 138CONFIG_PROFILING=y
136CONFIG_TRACEPOINTS=y
137CONFIG_OPROFILE=y 139CONFIG_OPROFILE=y
138CONFIG_HAVE_OPROFILE=y 140CONFIG_HAVE_OPROFILE=y
139# CONFIG_KPROBES is not set 141# CONFIG_KPROBES is not set
@@ -143,6 +145,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
143CONFIG_HAVE_DMA_ATTRS=y 145CONFIG_HAVE_DMA_ATTRS=y
144CONFIG_HAVE_CLK=y 146CONFIG_HAVE_CLK=y
145CONFIG_HAVE_DMA_API_DEBUG=y 147CONFIG_HAVE_DMA_API_DEBUG=y
148CONFIG_HAVE_HW_BREAKPOINT=y
146 149
147# 150#
148# GCOV-based kernel profiling 151# GCOV-based kernel profiling
@@ -162,7 +165,6 @@ CONFIG_BLOCK=y
162CONFIG_LBDAF=y 165CONFIG_LBDAF=y
163# CONFIG_BLK_DEV_BSG is not set 166# CONFIG_BLK_DEV_BSG is not set
164# CONFIG_BLK_DEV_INTEGRITY is not set 167# CONFIG_BLK_DEV_INTEGRITY is not set
165# CONFIG_BLK_CGROUP is not set
166 168
167# 169#
168# IO Schedulers 170# IO Schedulers
@@ -261,6 +263,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
261CONFIG_MAX_ACTIVE_REGIONS=1 263CONFIG_MAX_ACTIVE_REGIONS=1
262CONFIG_ARCH_POPULATES_NODE_MAP=y 264CONFIG_ARCH_POPULATES_NODE_MAP=y
263CONFIG_ARCH_SELECT_MEMORY_MODEL=y 265CONFIG_ARCH_SELECT_MEMORY_MODEL=y
266CONFIG_UNCACHED_MAPPING=y
264CONFIG_PAGE_SIZE_4KB=y 267CONFIG_PAGE_SIZE_4KB=y
265# CONFIG_PAGE_SIZE_8KB is not set 268# CONFIG_PAGE_SIZE_8KB is not set
266# CONFIG_PAGE_SIZE_16KB is not set 269# CONFIG_PAGE_SIZE_16KB is not set
@@ -276,7 +279,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
276CONFIG_SPLIT_PTLOCK_CPUS=4 279CONFIG_SPLIT_PTLOCK_CPUS=4
277# CONFIG_PHYS_ADDR_T_64BIT is not set 280# CONFIG_PHYS_ADDR_T_64BIT is not set
278CONFIG_ZONE_DMA_FLAG=0 281CONFIG_ZONE_DMA_FLAG=0
279CONFIG_NR_QUICK=2 282CONFIG_NR_QUICK=1
280CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 283CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
281 284
282# 285#
@@ -361,7 +364,6 @@ CONFIG_HZ=1000
361# CONFIG_PREEMPT_VOLUNTARY is not set 364# CONFIG_PREEMPT_VOLUNTARY is not set
362CONFIG_PREEMPT=y 365CONFIG_PREEMPT=y
363CONFIG_GUSA=y 366CONFIG_GUSA=y
364# CONFIG_SPARSE_IRQ is not set
365 367
366# 368#
367# Boot options 369# Boot options
@@ -400,7 +402,6 @@ CONFIG_NET=y
400# Networking options 402# Networking options
401# 403#
402CONFIG_PACKET=y 404CONFIG_PACKET=y
403# CONFIG_PACKET_MMAP is not set
404CONFIG_UNIX=y 405CONFIG_UNIX=y
405CONFIG_XFRM=y 406CONFIG_XFRM=y
406# CONFIG_XFRM_USER is not set 407# CONFIG_XFRM_USER is not set
@@ -463,7 +464,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
463# Network testing 464# Network testing
464# 465#
465# CONFIG_NET_PKTGEN is not set 466# CONFIG_NET_PKTGEN is not set
466# CONFIG_NET_DROP_MONITOR is not set
467# CONFIG_HAMRADIO is not set 467# CONFIG_HAMRADIO is not set
468# CONFIG_CAN is not set 468# CONFIG_CAN is not set
469# CONFIG_IRDA is not set 469# CONFIG_IRDA is not set
@@ -607,6 +607,7 @@ CONFIG_HAVE_IDE=y
607# 607#
608# SCSI device support 608# SCSI device support
609# 609#
610CONFIG_SCSI_MOD=y
610# CONFIG_RAID_ATTRS is not set 611# CONFIG_RAID_ATTRS is not set
611# CONFIG_SCSI is not set 612# CONFIG_SCSI is not set
612# CONFIG_SCSI_DMA is not set 613# CONFIG_SCSI_DMA is not set
@@ -688,6 +689,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=4
688CONFIG_SERIAL_SH_SCI_CONSOLE=y 689CONFIG_SERIAL_SH_SCI_CONSOLE=y
689CONFIG_SERIAL_CORE=y 690CONFIG_SERIAL_CORE=y
690CONFIG_SERIAL_CORE_CONSOLE=y 691CONFIG_SERIAL_CORE_CONSOLE=y
692# CONFIG_SERIAL_TIMBERDALE is not set
691# CONFIG_UNIX98_PTYS is not set 693# CONFIG_UNIX98_PTYS is not set
692# CONFIG_LEGACY_PTYS is not set 694# CONFIG_LEGACY_PTYS is not set
693# CONFIG_IPMI_HANDLER is not set 695# CONFIG_IPMI_HANDLER is not set
@@ -799,7 +801,6 @@ CONFIG_EXT2_FS=y
799# CONFIG_EXT2_FS_XATTR is not set 801# CONFIG_EXT2_FS_XATTR is not set
800# CONFIG_EXT3_FS is not set 802# CONFIG_EXT3_FS is not set
801# CONFIG_EXT4_FS is not set 803# CONFIG_EXT4_FS is not set
802CONFIG_EXT4_USE_FOR_EXT23=y
803# CONFIG_REISERFS_FS is not set 804# CONFIG_REISERFS_FS is not set
804# CONFIG_JFS_FS is not set 805# CONFIG_JFS_FS is not set
805# CONFIG_FS_POSIX_ACL is not set 806# CONFIG_FS_POSIX_ACL is not set
@@ -853,6 +854,7 @@ CONFIG_MISC_FILESYSTEMS=y
853# CONFIG_BFS_FS is not set 854# CONFIG_BFS_FS is not set
854# CONFIG_EFS_FS is not set 855# CONFIG_EFS_FS is not set
855# CONFIG_JFFS2_FS is not set 856# CONFIG_JFFS2_FS is not set
857# CONFIG_LOGFS is not set
856CONFIG_CRAMFS=y 858CONFIG_CRAMFS=y
857# CONFIG_SQUASHFS is not set 859# CONFIG_SQUASHFS is not set
858# CONFIG_VXFS_FS is not set 860# CONFIG_VXFS_FS is not set
@@ -881,6 +883,7 @@ CONFIG_SUNRPC=y
881# CONFIG_RPCSEC_GSS_KRB5 is not set 883# CONFIG_RPCSEC_GSS_KRB5 is not set
882# CONFIG_RPCSEC_GSS_SPKM3 is not set 884# CONFIG_RPCSEC_GSS_SPKM3 is not set
883# CONFIG_SMB_FS is not set 885# CONFIG_SMB_FS is not set
886# CONFIG_CEPH_FS is not set
884# CONFIG_CIFS is not set 887# CONFIG_CIFS is not set
885# CONFIG_NCP_FS is not set 888# CONFIG_NCP_FS is not set
886# CONFIG_CODA_FS is not set 889# CONFIG_CODA_FS is not set
@@ -919,6 +922,7 @@ CONFIG_SCHED_DEBUG=y
919# CONFIG_SCHEDSTATS is not set 922# CONFIG_SCHEDSTATS is not set
920# CONFIG_TIMER_STATS is not set 923# CONFIG_TIMER_STATS is not set
921# CONFIG_DEBUG_OBJECTS is not set 924# CONFIG_DEBUG_OBJECTS is not set
925# CONFIG_DEBUG_KMEMLEAK is not set
922CONFIG_DEBUG_PREEMPT=y 926CONFIG_DEBUG_PREEMPT=y
923# CONFIG_DEBUG_RT_MUTEXES is not set 927# CONFIG_DEBUG_RT_MUTEXES is not set
924# CONFIG_RT_MUTEX_TESTER is not set 928# CONFIG_RT_MUTEX_TESTER is not set
@@ -929,7 +933,6 @@ CONFIG_DEBUG_PREEMPT=y
929# CONFIG_LOCK_STAT is not set 933# CONFIG_LOCK_STAT is not set
930CONFIG_DEBUG_SPINLOCK_SLEEP=y 934CONFIG_DEBUG_SPINLOCK_SLEEP=y
931# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 935# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
932CONFIG_STACKTRACE=y
933# CONFIG_DEBUG_KOBJECT is not set 936# CONFIG_DEBUG_KOBJECT is not set
934CONFIG_DEBUG_BUGVERBOSE=y 937CONFIG_DEBUG_BUGVERBOSE=y
935# CONFIG_DEBUG_INFO is not set 938# CONFIG_DEBUG_INFO is not set
@@ -947,11 +950,11 @@ CONFIG_FRAME_POINTER=y
947# CONFIG_BACKTRACE_SELF_TEST is not set 950# CONFIG_BACKTRACE_SELF_TEST is not set
948# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 951# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
949# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 952# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
953# CONFIG_LKDTM is not set
950# CONFIG_FAULT_INJECTION is not set 954# CONFIG_FAULT_INJECTION is not set
951# CONFIG_LATENCYTOP is not set 955# CONFIG_LATENCYTOP is not set
952# CONFIG_SYSCTL_SYSCALL_CHECK is not set 956# CONFIG_SYSCTL_SYSCALL_CHECK is not set
953# CONFIG_PAGE_POISONING is not set 957# CONFIG_PAGE_POISONING is not set
954CONFIG_NOP_TRACER=y
955CONFIG_HAVE_FUNCTION_TRACER=y 958CONFIG_HAVE_FUNCTION_TRACER=y
956CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 959CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
957CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 960CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -959,10 +962,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
959CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 962CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
960CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 963CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
961CONFIG_RING_BUFFER=y 964CONFIG_RING_BUFFER=y
962CONFIG_EVENT_TRACING=y
963CONFIG_CONTEXT_SWITCH_TRACER=y
964CONFIG_RING_BUFFER_ALLOW_SWAP=y 965CONFIG_RING_BUFFER_ALLOW_SWAP=y
965CONFIG_TRACING=y
966CONFIG_TRACING_SUPPORT=y 966CONFIG_TRACING_SUPPORT=y
967CONFIG_FTRACE=y 967CONFIG_FTRACE=y
968# CONFIG_FUNCTION_TRACER is not set 968# CONFIG_FUNCTION_TRACER is not set
@@ -975,6 +975,7 @@ CONFIG_FTRACE=y
975CONFIG_BRANCH_PROFILE_NONE=y 975CONFIG_BRANCH_PROFILE_NONE=y
976# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 976# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
977# CONFIG_PROFILE_ALL_BRANCHES is not set 977# CONFIG_PROFILE_ALL_BRANCHES is not set
978# CONFIG_KSYM_TRACER is not set
978# CONFIG_STACK_TRACER is not set 979# CONFIG_STACK_TRACER is not set
979# CONFIG_KMEMTRACE is not set 980# CONFIG_KMEMTRACE is not set
980# CONFIG_WORKQUEUE_TRACER is not set 981# CONFIG_WORKQUEUE_TRACER is not set
@@ -1094,7 +1095,8 @@ CONFIG_CRYPTO_LZO=y
1094# 1095#
1095# CONFIG_CRYPTO_ANSI_CPRNG is not set 1096# CONFIG_CRYPTO_ANSI_CPRNG is not set
1096# CONFIG_CRYPTO_HW is not set 1097# CONFIG_CRYPTO_HW is not set
1097CONFIG_BINARY_PRINTF=y 1098# CONFIG_VIRTUALIZATION is not set
1099# CONFIG_BINARY_PRINTF is not set
1098 1100
1099# 1101#
1100# Library routines 1102# Library routines
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
index ec494e32fa2..586cb1e02be 100644
--- a/arch/sh/configs/se7343_defconfig
+++ b/arch/sh/configs/se7343_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-rc5
4# Mon Jan 4 13:30:41 2010 4# Tue May 18 16:37:31 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52# CONFIG_SWAP is not set 55# CONFIG_SWAP is not set
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -70,11 +73,6 @@ CONFIG_RCU_FANOUT=32
70# CONFIG_TREE_RCU_TRACE is not set 73# CONFIG_TREE_RCU_TRACE is not set
71# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73CONFIG_GROUP_SCHED=y
74CONFIG_FAIR_GROUP_SCHED=y
75# CONFIG_RT_GROUP_SCHED is not set
76CONFIG_USER_SCHED=y
77# CONFIG_CGROUP_SCHED is not set
78# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 78CONFIG_SYSFS_DEPRECATED_V2=y
@@ -107,7 +105,7 @@ CONFIG_PERF_USE_VMALLOC=y
107# 105#
108# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
109# 107#
110# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
112CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
@@ -124,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
127 126
128# 127#
129# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -245,6 +244,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
245CONFIG_MAX_ACTIVE_REGIONS=1 244CONFIG_MAX_ACTIVE_REGIONS=1
246CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
247CONFIG_ARCH_SELECT_MEMORY_MODEL=y 246CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_UNCACHED_MAPPING=y
248CONFIG_PAGE_SIZE_4KB=y 248CONFIG_PAGE_SIZE_4KB=y
249# CONFIG_PAGE_SIZE_8KB is not set 249# CONFIG_PAGE_SIZE_8KB is not set
250# CONFIG_PAGE_SIZE_16KB is not set 250# CONFIG_PAGE_SIZE_16KB is not set
@@ -260,7 +260,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
260CONFIG_SPLIT_PTLOCK_CPUS=4 260CONFIG_SPLIT_PTLOCK_CPUS=4
261# CONFIG_PHYS_ADDR_T_64BIT is not set 261# CONFIG_PHYS_ADDR_T_64BIT is not set
262CONFIG_ZONE_DMA_FLAG=0 262CONFIG_ZONE_DMA_FLAG=0
263CONFIG_NR_QUICK=2 263CONFIG_NR_QUICK=1
264# CONFIG_KSM is not set 264# CONFIG_KSM is not set
265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
266 266
@@ -335,7 +335,7 @@ CONFIG_PREEMPT_NONE=y
335# CONFIG_PREEMPT_VOLUNTARY is not set 335# CONFIG_PREEMPT_VOLUNTARY is not set
336# CONFIG_PREEMPT is not set 336# CONFIG_PREEMPT is not set
337CONFIG_GUSA=y 337CONFIG_GUSA=y
338# CONFIG_SPARSE_IRQ is not set 338# CONFIG_INTC_USERIMASK is not set
339 339
340# 340#
341# Boot options 341# Boot options
@@ -370,6 +370,7 @@ CONFIG_PM_SLEEP=y
370CONFIG_SUSPEND=y 370CONFIG_SUSPEND=y
371CONFIG_SUSPEND_FREEZER=y 371CONFIG_SUSPEND_FREEZER=y
372CONFIG_PM_RUNTIME=y 372CONFIG_PM_RUNTIME=y
373CONFIG_PM_OPS=y
373# CONFIG_CPU_IDLE is not set 374# CONFIG_CPU_IDLE is not set
374CONFIG_NET=y 375CONFIG_NET=y
375 376
@@ -377,7 +378,6 @@ CONFIG_NET=y
377# Networking options 378# Networking options
378# 379#
379CONFIG_PACKET=y 380CONFIG_PACKET=y
380CONFIG_PACKET_MMAP=y
381CONFIG_UNIX=y 381CONFIG_UNIX=y
382CONFIG_XFRM=y 382CONFIG_XFRM=y
383# CONFIG_XFRM_USER is not set 383# CONFIG_XFRM_USER is not set
@@ -569,6 +569,7 @@ CONFIG_HAVE_IDE=y
569# 569#
570# SCSI device support 570# SCSI device support
571# 571#
572CONFIG_SCSI_MOD=y
572# CONFIG_RAID_ATTRS is not set 573# CONFIG_RAID_ATTRS is not set
573CONFIG_SCSI=y 574CONFIG_SCSI=y
574CONFIG_SCSI_DMA=y 575CONFIG_SCSI_DMA=y
@@ -635,6 +636,7 @@ CONFIG_USB_USBNET=y
635CONFIG_USB_NET_CDCETHER=y 636CONFIG_USB_NET_CDCETHER=y
636# CONFIG_USB_NET_CDC_EEM is not set 637# CONFIG_USB_NET_CDC_EEM is not set
637CONFIG_USB_NET_DM9601=y 638CONFIG_USB_NET_DM9601=y
639# CONFIG_USB_NET_SMSC75XX is not set
638# CONFIG_USB_NET_SMSC95XX is not set 640# CONFIG_USB_NET_SMSC95XX is not set
639# CONFIG_USB_NET_GL620A is not set 641# CONFIG_USB_NET_GL620A is not set
640# CONFIG_USB_NET_NET1080 is not set 642# CONFIG_USB_NET_NET1080 is not set
@@ -644,6 +646,7 @@ CONFIG_USB_NET_DM9601=y
644# CONFIG_USB_NET_CDC_SUBSET is not set 646# CONFIG_USB_NET_CDC_SUBSET is not set
645# CONFIG_USB_NET_ZAURUS is not set 647# CONFIG_USB_NET_ZAURUS is not set
646# CONFIG_USB_NET_INT51X1 is not set 648# CONFIG_USB_NET_INT51X1 is not set
649# CONFIG_USB_IPHETH is not set
647# CONFIG_WAN is not set 650# CONFIG_WAN is not set
648# CONFIG_PPP is not set 651# CONFIG_PPP is not set
649# CONFIG_SLIP is not set 652# CONFIG_SLIP is not set
@@ -713,6 +716,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=4
713CONFIG_SERIAL_SH_SCI_CONSOLE=y 716CONFIG_SERIAL_SH_SCI_CONSOLE=y
714CONFIG_SERIAL_CORE=y 717CONFIG_SERIAL_CORE=y
715CONFIG_SERIAL_CORE_CONSOLE=y 718CONFIG_SERIAL_CORE_CONSOLE=y
719# CONFIG_SERIAL_TIMBERDALE is not set
716# CONFIG_UNIX98_PTYS is not set 720# CONFIG_UNIX98_PTYS is not set
717CONFIG_LEGACY_PTYS=y 721CONFIG_LEGACY_PTYS=y
718CONFIG_LEGACY_PTY_COUNT=256 722CONFIG_LEGACY_PTY_COUNT=256
@@ -739,6 +743,7 @@ CONFIG_I2C_HELPER_AUTO=y
739# CONFIG_I2C_OCORES is not set 743# CONFIG_I2C_OCORES is not set
740CONFIG_I2C_SH_MOBILE=y 744CONFIG_I2C_SH_MOBILE=y
741# CONFIG_I2C_SIMTEC is not set 745# CONFIG_I2C_SIMTEC is not set
746# CONFIG_I2C_XILINX is not set
742 747
743# 748#
744# External I2C/SMBus adapter drivers 749# External I2C/SMBus adapter drivers
@@ -752,15 +757,9 @@ CONFIG_I2C_SH_MOBILE=y
752# 757#
753# CONFIG_I2C_PCA_PLATFORM is not set 758# CONFIG_I2C_PCA_PLATFORM is not set
754# CONFIG_I2C_STUB is not set 759# CONFIG_I2C_STUB is not set
755
756#
757# Miscellaneous I2C Chip support
758#
759# CONFIG_SENSORS_TSL2550 is not set
760# CONFIG_I2C_DEBUG_CORE is not set 760# CONFIG_I2C_DEBUG_CORE is not set
761# CONFIG_I2C_DEBUG_ALGO is not set 761# CONFIG_I2C_DEBUG_ALGO is not set
762# CONFIG_I2C_DEBUG_BUS is not set 762# CONFIG_I2C_DEBUG_BUS is not set
763# CONFIG_I2C_DEBUG_CHIP is not set
764# CONFIG_SPI is not set 763# CONFIG_SPI is not set
765 764
766# 765#
@@ -783,6 +782,7 @@ CONFIG_SSB_POSSIBLE=y
783# Multifunction device drivers 782# Multifunction device drivers
784# 783#
785# CONFIG_MFD_CORE is not set 784# CONFIG_MFD_CORE is not set
785# CONFIG_MFD_88PM860X is not set
786# CONFIG_MFD_SM501 is not set 786# CONFIG_MFD_SM501 is not set
787# CONFIG_MFD_SH_MOBILE_SDHI is not set 787# CONFIG_MFD_SH_MOBILE_SDHI is not set
788# CONFIG_HTC_PASIC3 is not set 788# CONFIG_HTC_PASIC3 is not set
@@ -790,12 +790,13 @@ CONFIG_SSB_POSSIBLE=y
790# CONFIG_MFD_TMIO is not set 790# CONFIG_MFD_TMIO is not set
791# CONFIG_PMIC_DA903X is not set 791# CONFIG_PMIC_DA903X is not set
792# CONFIG_PMIC_ADP5520 is not set 792# CONFIG_PMIC_ADP5520 is not set
793# CONFIG_MFD_MAX8925 is not set
793# CONFIG_MFD_WM8400 is not set 794# CONFIG_MFD_WM8400 is not set
794# CONFIG_MFD_WM831X is not set 795# CONFIG_MFD_WM831X is not set
795# CONFIG_MFD_WM8350_I2C is not set 796# CONFIG_MFD_WM8350_I2C is not set
797# CONFIG_MFD_WM8994 is not set
796# CONFIG_MFD_PCF50633 is not set 798# CONFIG_MFD_PCF50633 is not set
797# CONFIG_AB3100_CORE is not set 799# CONFIG_AB3100_CORE is not set
798# CONFIG_MFD_88PM8607 is not set
799# CONFIG_REGULATOR is not set 800# CONFIG_REGULATOR is not set
800# CONFIG_MEDIA_SUPPORT is not set 801# CONFIG_MEDIA_SUPPORT is not set
801 802
@@ -878,6 +879,7 @@ CONFIG_SND_DRIVERS=y
878CONFIG_SND_SUPERH=y 879CONFIG_SND_SUPERH=y
879CONFIG_SND_USB=y 880CONFIG_SND_USB=y
880# CONFIG_SND_USB_AUDIO is not set 881# CONFIG_SND_USB_AUDIO is not set
882# CONFIG_SND_USB_UA101 is not set
881# CONFIG_SND_USB_CAIAQ is not set 883# CONFIG_SND_USB_CAIAQ is not set
882# CONFIG_SND_SOC is not set 884# CONFIG_SND_SOC is not set
883# CONFIG_SOUND_PRIME is not set 885# CONFIG_SOUND_PRIME is not set
@@ -895,6 +897,7 @@ CONFIG_USB_HID=y
895# 897#
896# Special HID drivers 898# Special HID drivers
897# 899#
900# CONFIG_HID_3M_PCT is not set
898CONFIG_HID_A4TECH=y 901CONFIG_HID_A4TECH=y
899CONFIG_HID_APPLE=y 902CONFIG_HID_APPLE=y
900CONFIG_HID_BELKIN=y 903CONFIG_HID_BELKIN=y
@@ -910,14 +913,19 @@ CONFIG_HID_GYRATION=y
910CONFIG_HID_LOGITECH=y 913CONFIG_HID_LOGITECH=y
911# CONFIG_LOGITECH_FF is not set 914# CONFIG_LOGITECH_FF is not set
912# CONFIG_LOGIRUMBLEPAD2_FF is not set 915# CONFIG_LOGIRUMBLEPAD2_FF is not set
916# CONFIG_LOGIG940_FF is not set
913CONFIG_HID_MICROSOFT=y 917CONFIG_HID_MICROSOFT=y
918# CONFIG_HID_MOSART is not set
914CONFIG_HID_MONTEREY=y 919CONFIG_HID_MONTEREY=y
915# CONFIG_HID_NTRIG is not set 920# CONFIG_HID_NTRIG is not set
921# CONFIG_HID_ORTEK is not set
916CONFIG_HID_PANTHERLORD=y 922CONFIG_HID_PANTHERLORD=y
917# CONFIG_PANTHERLORD_FF is not set 923# CONFIG_PANTHERLORD_FF is not set
918CONFIG_HID_PETALYNX=y 924CONFIG_HID_PETALYNX=y
925# CONFIG_HID_QUANTA is not set
919CONFIG_HID_SAMSUNG=y 926CONFIG_HID_SAMSUNG=y
920CONFIG_HID_SONY=y 927CONFIG_HID_SONY=y
928# CONFIG_HID_STANTUM is not set
921CONFIG_HID_SUNPLUS=y 929CONFIG_HID_SUNPLUS=y
922# CONFIG_HID_GREENASIA is not set 930# CONFIG_HID_GREENASIA is not set
923# CONFIG_HID_SMARTJOYPLUS is not set 931# CONFIG_HID_SMARTJOYPLUS is not set
@@ -997,7 +1005,6 @@ CONFIG_USB_ISP116X_HCD=y
997# CONFIG_USB_RIO500 is not set 1005# CONFIG_USB_RIO500 is not set
998# CONFIG_USB_LEGOTOWER is not set 1006# CONFIG_USB_LEGOTOWER is not set
999# CONFIG_USB_LCD is not set 1007# CONFIG_USB_LCD is not set
1000# CONFIG_USB_BERRY_CHARGE is not set
1001# CONFIG_USB_LED is not set 1008# CONFIG_USB_LED is not set
1002# CONFIG_USB_CYPRESS_CY7C63 is not set 1009# CONFIG_USB_CYPRESS_CY7C63 is not set
1003# CONFIG_USB_CYTHERM is not set 1010# CONFIG_USB_CYTHERM is not set
@@ -1009,7 +1016,6 @@ CONFIG_USB_ISP116X_HCD=y
1009# CONFIG_USB_IOWARRIOR is not set 1016# CONFIG_USB_IOWARRIOR is not set
1010# CONFIG_USB_TEST is not set 1017# CONFIG_USB_TEST is not set
1011# CONFIG_USB_ISIGHTFW is not set 1018# CONFIG_USB_ISIGHTFW is not set
1012# CONFIG_USB_VST is not set
1013# CONFIG_USB_GADGET is not set 1019# CONFIG_USB_GADGET is not set
1014 1020
1015# 1021#
@@ -1027,8 +1033,6 @@ CONFIG_RTC_LIB=y
1027CONFIG_UIO=y 1033CONFIG_UIO=y
1028# CONFIG_UIO_PDRV is not set 1034# CONFIG_UIO_PDRV is not set
1029# CONFIG_UIO_PDRV_GENIRQ is not set 1035# CONFIG_UIO_PDRV_GENIRQ is not set
1030# CONFIG_UIO_SMX is not set
1031# CONFIG_UIO_SERCOS3 is not set
1032 1036
1033# 1037#
1034# TI VLYNQ 1038# TI VLYNQ
@@ -1115,6 +1119,7 @@ CONFIG_JFFS2_ZLIB=y
1115# CONFIG_JFFS2_LZO is not set 1119# CONFIG_JFFS2_LZO is not set
1116CONFIG_JFFS2_RTIME=y 1120CONFIG_JFFS2_RTIME=y
1117# CONFIG_JFFS2_RUBIN is not set 1121# CONFIG_JFFS2_RUBIN is not set
1122# CONFIG_LOGFS is not set
1118CONFIG_CRAMFS=y 1123CONFIG_CRAMFS=y
1119# CONFIG_SQUASHFS is not set 1124# CONFIG_SQUASHFS is not set
1120# CONFIG_VXFS_FS is not set 1125# CONFIG_VXFS_FS is not set
@@ -1141,6 +1146,7 @@ CONFIG_SUNRPC=y
1141# CONFIG_RPCSEC_GSS_KRB5 is not set 1146# CONFIG_RPCSEC_GSS_KRB5 is not set
1142# CONFIG_RPCSEC_GSS_SPKM3 is not set 1147# CONFIG_RPCSEC_GSS_SPKM3 is not set
1143# CONFIG_SMB_FS is not set 1148# CONFIG_SMB_FS is not set
1149# CONFIG_CEPH_FS is not set
1144# CONFIG_CIFS is not set 1150# CONFIG_CIFS is not set
1145# CONFIG_NCP_FS is not set 1151# CONFIG_NCP_FS is not set
1146# CONFIG_CODA_FS is not set 1152# CONFIG_CODA_FS is not set
@@ -1324,6 +1330,7 @@ CONFIG_CRYPTO=y
1324# 1330#
1325# CONFIG_CRYPTO_ANSI_CPRNG is not set 1331# CONFIG_CRYPTO_ANSI_CPRNG is not set
1326CONFIG_CRYPTO_HW=y 1332CONFIG_CRYPTO_HW=y
1333# CONFIG_VIRTUALIZATION is not set
1327# CONFIG_BINARY_PRINTF is not set 1334# CONFIG_BINARY_PRINTF is not set
1328 1335
1329# 1336#
diff --git a/arch/sh/configs/se7619_defconfig b/arch/sh/configs/se7619_defconfig
index ee87e2b2168..acb3e02a712 100644
--- a/arch/sh/configs/se7619_defconfig
+++ b/arch/sh/configs/se7619_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-rc5
4# Mon Jan 4 13:34:15 2010 4# Tue May 18 16:41:13 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -44,9 +45,11 @@ CONFIG_LOCALVERSION=""
44CONFIG_HAVE_KERNEL_GZIP=y 45CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y 46CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y 47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_HAVE_KERNEL_LZO=y
47CONFIG_KERNEL_GZIP=y 49CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set 50# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set 51# CONFIG_KERNEL_LZMA is not set
52# CONFIG_KERNEL_LZO is not set
50# CONFIG_SYSVIPC is not set 53# CONFIG_SYSVIPC is not set
51# CONFIG_BSD_PROCESS_ACCT is not set 54# CONFIG_BSD_PROCESS_ACCT is not set
52 55
@@ -62,7 +65,6 @@ CONFIG_RCU_FANOUT=32
62# CONFIG_TREE_RCU_TRACE is not set 65# CONFIG_TREE_RCU_TRACE is not set
63# CONFIG_IKCONFIG is not set 66# CONFIG_IKCONFIG is not set
64CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
65# CONFIG_GROUP_SCHED is not set
66# CONFIG_CGROUPS is not set 68# CONFIG_CGROUPS is not set
67# CONFIG_RELAY is not set 69# CONFIG_RELAY is not set
68# CONFIG_NAMESPACES is not set 70# CONFIG_NAMESPACES is not set
@@ -91,7 +93,7 @@ CONFIG_PERF_USE_VMALLOC=y
91# 93#
92# Kernel Performance Events And Counters 94# Kernel Performance Events And Counters
93# 95#
94# CONFIG_PERF_EVENTS is not set 96CONFIG_PERF_EVENTS=y
95# CONFIG_PERF_COUNTERS is not set 97# CONFIG_PERF_COUNTERS is not set
96# CONFIG_VM_EVENT_COUNTERS is not set 98# CONFIG_VM_EVENT_COUNTERS is not set
97CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
@@ -107,6 +109,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
107CONFIG_HAVE_DMA_ATTRS=y 109CONFIG_HAVE_DMA_ATTRS=y
108CONFIG_HAVE_CLK=y 110CONFIG_HAVE_CLK=y
109CONFIG_HAVE_DMA_API_DEBUG=y 111CONFIG_HAVE_DMA_API_DEBUG=y
112CONFIG_HAVE_HW_BREAKPOINT=y
110 113
111# 114#
112# GCOV-based kernel profiling 115# GCOV-based kernel profiling
@@ -217,6 +220,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
217CONFIG_MAX_ACTIVE_REGIONS=1 220CONFIG_MAX_ACTIVE_REGIONS=1
218CONFIG_ARCH_POPULATES_NODE_MAP=y 221CONFIG_ARCH_POPULATES_NODE_MAP=y
219CONFIG_ARCH_SELECT_MEMORY_MODEL=y 222CONFIG_ARCH_SELECT_MEMORY_MODEL=y
223CONFIG_UNCACHED_MAPPING=y
220CONFIG_PAGE_SIZE_4KB=y 224CONFIG_PAGE_SIZE_4KB=y
221# CONFIG_PAGE_SIZE_8KB is not set 225# CONFIG_PAGE_SIZE_8KB is not set
222# CONFIG_PAGE_SIZE_16KB is not set 226# CONFIG_PAGE_SIZE_16KB is not set
@@ -232,7 +236,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
232CONFIG_SPLIT_PTLOCK_CPUS=4 236CONFIG_SPLIT_PTLOCK_CPUS=4
233# CONFIG_PHYS_ADDR_T_64BIT is not set 237# CONFIG_PHYS_ADDR_T_64BIT is not set
234CONFIG_ZONE_DMA_FLAG=0 238CONFIG_ZONE_DMA_FLAG=0
235CONFIG_NR_QUICK=2 239CONFIG_NR_QUICK=1
236CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 240CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
237 241
238# 242#
@@ -301,7 +305,6 @@ CONFIG_PREEMPT_NONE=y
301# CONFIG_PREEMPT_VOLUNTARY is not set 305# CONFIG_PREEMPT_VOLUNTARY is not set
302# CONFIG_PREEMPT is not set 306# CONFIG_PREEMPT is not set
303CONFIG_GUSA=y 307CONFIG_GUSA=y
304# CONFIG_SPARSE_IRQ is not set
305 308
306# 309#
307# Boot options 310# Boot options
@@ -453,6 +456,7 @@ CONFIG_HAVE_IDE=y
453# 456#
454# SCSI device support 457# SCSI device support
455# 458#
459CONFIG_SCSI_MOD=y
456# CONFIG_RAID_ATTRS is not set 460# CONFIG_RAID_ATTRS is not set
457# CONFIG_SCSI is not set 461# CONFIG_SCSI is not set
458# CONFIG_SCSI_DMA is not set 462# CONFIG_SCSI_DMA is not set
@@ -513,6 +517,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
513CONFIG_SERIAL_SH_SCI_CONSOLE=y 517CONFIG_SERIAL_SH_SCI_CONSOLE=y
514CONFIG_SERIAL_CORE=y 518CONFIG_SERIAL_CORE=y
515CONFIG_SERIAL_CORE_CONSOLE=y 519CONFIG_SERIAL_CORE_CONSOLE=y
520# CONFIG_SERIAL_TIMBERDALE is not set
516# CONFIG_UNIX98_PTYS is not set 521# CONFIG_UNIX98_PTYS is not set
517# CONFIG_LEGACY_PTYS is not set 522# CONFIG_LEGACY_PTYS is not set
518# CONFIG_IPMI_HANDLER is not set 523# CONFIG_IPMI_HANDLER is not set
@@ -612,7 +617,6 @@ CONFIG_RTC_LIB=y
612# CONFIG_EXT2_FS is not set 617# CONFIG_EXT2_FS is not set
613# CONFIG_EXT3_FS is not set 618# CONFIG_EXT3_FS is not set
614# CONFIG_EXT4_FS is not set 619# CONFIG_EXT4_FS is not set
615CONFIG_EXT4_USE_FOR_EXT23=y
616# CONFIG_REISERFS_FS is not set 620# CONFIG_REISERFS_FS is not set
617# CONFIG_JFS_FS is not set 621# CONFIG_JFS_FS is not set
618# CONFIG_FS_POSIX_ACL is not set 622# CONFIG_FS_POSIX_ACL is not set
@@ -664,6 +668,7 @@ CONFIG_MISC_FILESYSTEMS=y
664# CONFIG_BFS_FS is not set 668# CONFIG_BFS_FS is not set
665# CONFIG_EFS_FS is not set 669# CONFIG_EFS_FS is not set
666# CONFIG_JFFS2_FS is not set 670# CONFIG_JFFS2_FS is not set
671# CONFIG_LOGFS is not set
667# CONFIG_CRAMFS is not set 672# CONFIG_CRAMFS is not set
668# CONFIG_SQUASHFS is not set 673# CONFIG_SQUASHFS is not set
669# CONFIG_VXFS_FS is not set 674# CONFIG_VXFS_FS is not set
@@ -729,6 +734,7 @@ CONFIG_HAVE_ARCH_KGDB=y
729CONFIG_DEFAULT_SECURITY_DAC=y 734CONFIG_DEFAULT_SECURITY_DAC=y
730CONFIG_DEFAULT_SECURITY="" 735CONFIG_DEFAULT_SECURITY=""
731# CONFIG_CRYPTO is not set 736# CONFIG_CRYPTO is not set
737# CONFIG_VIRTUALIZATION is not set
732# CONFIG_BINARY_PRINTF is not set 738# CONFIG_BINARY_PRINTF is not set
733 739
734# 740#
diff --git a/arch/sh/configs/se7705_defconfig b/arch/sh/configs/se7705_defconfig
index 03f4219f208..084fec9e905 100644
--- a/arch/sh/configs/se7705_defconfig
+++ b/arch/sh/configs/se7705_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-rc5
4# Mon Jan 4 13:34:37 2010 4# Tue May 18 16:42:43 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51# CONFIG_SWAP is not set 54# CONFIG_SWAP is not set
52# CONFIG_SYSVIPC is not set 55# CONFIG_SYSVIPC is not set
53# CONFIG_POSIX_MQUEUE is not set 56# CONFIG_POSIX_MQUEUE is not set
@@ -67,7 +70,6 @@ CONFIG_RCU_FANOUT=32
67# CONFIG_TREE_RCU_TRACE is not set 70# CONFIG_TREE_RCU_TRACE is not set
68# CONFIG_IKCONFIG is not set 71# CONFIG_IKCONFIG is not set
69CONFIG_LOG_BUF_SHIFT=14 72CONFIG_LOG_BUF_SHIFT=14
70# CONFIG_GROUP_SCHED is not set
71# CONFIG_CGROUPS is not set 73# CONFIG_CGROUPS is not set
72# CONFIG_RELAY is not set 74# CONFIG_RELAY is not set
73# CONFIG_NAMESPACES is not set 75# CONFIG_NAMESPACES is not set
@@ -76,6 +78,7 @@ CONFIG_INITRAMFS_SOURCE=""
76CONFIG_RD_GZIP=y 78CONFIG_RD_GZIP=y
77# CONFIG_RD_BZIP2 is not set 79# CONFIG_RD_BZIP2 is not set
78# CONFIG_RD_LZMA is not set 80# CONFIG_RD_LZMA is not set
81# CONFIG_RD_LZO is not set
79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
80CONFIG_SYSCTL=y 83CONFIG_SYSCTL=y
81CONFIG_ANON_INODES=y 84CONFIG_ANON_INODES=y
@@ -101,7 +104,7 @@ CONFIG_PERF_USE_VMALLOC=y
101# 104#
102# Kernel Performance Events And Counters 105# Kernel Performance Events And Counters
103# 106#
104# CONFIG_PERF_EVENTS is not set 107CONFIG_PERF_EVENTS=y
105# CONFIG_PERF_COUNTERS is not set 108# CONFIG_PERF_COUNTERS is not set
106CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
107CONFIG_COMPAT_BRK=y 110CONFIG_COMPAT_BRK=y
@@ -117,6 +120,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
117CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
118CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
119CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
120 124
121# 125#
122# GCOV-based kernel profiling 126# GCOV-based kernel profiling
@@ -234,6 +238,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
234CONFIG_MAX_ACTIVE_REGIONS=1 238CONFIG_MAX_ACTIVE_REGIONS=1
235CONFIG_ARCH_POPULATES_NODE_MAP=y 239CONFIG_ARCH_POPULATES_NODE_MAP=y
236CONFIG_ARCH_SELECT_MEMORY_MODEL=y 240CONFIG_ARCH_SELECT_MEMORY_MODEL=y
241CONFIG_UNCACHED_MAPPING=y
237CONFIG_PAGE_SIZE_4KB=y 242CONFIG_PAGE_SIZE_4KB=y
238# CONFIG_PAGE_SIZE_8KB is not set 243# CONFIG_PAGE_SIZE_8KB is not set
239# CONFIG_PAGE_SIZE_16KB is not set 244# CONFIG_PAGE_SIZE_16KB is not set
@@ -249,7 +254,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
249CONFIG_SPLIT_PTLOCK_CPUS=4 254CONFIG_SPLIT_PTLOCK_CPUS=4
250# CONFIG_PHYS_ADDR_T_64BIT is not set 255# CONFIG_PHYS_ADDR_T_64BIT is not set
251CONFIG_ZONE_DMA_FLAG=0 256CONFIG_ZONE_DMA_FLAG=0
252CONFIG_NR_QUICK=2 257CONFIG_NR_QUICK=1
253# CONFIG_KSM is not set 258# CONFIG_KSM is not set
254CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 259CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
255 260
@@ -327,7 +332,6 @@ CONFIG_HZ=250
327CONFIG_PREEMPT=y 332CONFIG_PREEMPT=y
328CONFIG_GUSA=y 333CONFIG_GUSA=y
329# CONFIG_GUSA_RB is not set 334# CONFIG_GUSA_RB is not set
330# CONFIG_SPARSE_IRQ is not set
331 335
332# 336#
333# Boot options 337# Boot options
@@ -362,7 +366,6 @@ CONFIG_NET=y
362# Networking options 366# Networking options
363# 367#
364CONFIG_PACKET=y 368CONFIG_PACKET=y
365# CONFIG_PACKET_MMAP is not set
366CONFIG_UNIX=y 369CONFIG_UNIX=y
367CONFIG_XFRM=y 370CONFIG_XFRM=y
368# CONFIG_XFRM_USER is not set 371# CONFIG_XFRM_USER is not set
@@ -562,6 +565,7 @@ CONFIG_HAVE_IDE=y
562# 565#
563# SCSI device support 566# SCSI device support
564# 567#
568CONFIG_SCSI_MOD=y
565# CONFIG_RAID_ATTRS is not set 569# CONFIG_RAID_ATTRS is not set
566# CONFIG_SCSI is not set 570# CONFIG_SCSI is not set
567# CONFIG_SCSI_DMA is not set 571# CONFIG_SCSI_DMA is not set
@@ -679,6 +683,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
679CONFIG_SERIAL_SH_SCI_CONSOLE=y 683CONFIG_SERIAL_SH_SCI_CONSOLE=y
680CONFIG_SERIAL_CORE=y 684CONFIG_SERIAL_CORE=y
681CONFIG_SERIAL_CORE_CONSOLE=y 685CONFIG_SERIAL_CORE_CONSOLE=y
686# CONFIG_SERIAL_TIMBERDALE is not set
682CONFIG_UNIX98_PTYS=y 687CONFIG_UNIX98_PTYS=y
683# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 688# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
684# CONFIG_LEGACY_PTYS is not set 689# CONFIG_LEGACY_PTYS is not set
@@ -798,7 +803,6 @@ CONFIG_EXT2_FS=y
798# CONFIG_EXT2_FS_XIP is not set 803# CONFIG_EXT2_FS_XIP is not set
799# CONFIG_EXT3_FS is not set 804# CONFIG_EXT3_FS is not set
800# CONFIG_EXT4_FS is not set 805# CONFIG_EXT4_FS is not set
801CONFIG_EXT4_USE_FOR_EXT23=y
802# CONFIG_REISERFS_FS is not set 806# CONFIG_REISERFS_FS is not set
803# CONFIG_JFS_FS is not set 807# CONFIG_JFS_FS is not set
804# CONFIG_FS_POSIX_ACL is not set 808# CONFIG_FS_POSIX_ACL is not set
@@ -863,6 +867,7 @@ CONFIG_JFFS2_ZLIB=y
863# CONFIG_JFFS2_LZO is not set 867# CONFIG_JFFS2_LZO is not set
864CONFIG_JFFS2_RTIME=y 868CONFIG_JFFS2_RTIME=y
865# CONFIG_JFFS2_RUBIN is not set 869# CONFIG_JFFS2_RUBIN is not set
870# CONFIG_LOGFS is not set
866# CONFIG_CRAMFS is not set 871# CONFIG_CRAMFS is not set
867# CONFIG_SQUASHFS is not set 872# CONFIG_SQUASHFS is not set
868# CONFIG_VXFS_FS is not set 873# CONFIG_VXFS_FS is not set
@@ -885,6 +890,7 @@ CONFIG_SUNRPC=y
885# CONFIG_RPCSEC_GSS_KRB5 is not set 890# CONFIG_RPCSEC_GSS_KRB5 is not set
886# CONFIG_RPCSEC_GSS_SPKM3 is not set 891# CONFIG_RPCSEC_GSS_SPKM3 is not set
887# CONFIG_SMB_FS is not set 892# CONFIG_SMB_FS is not set
893# CONFIG_CEPH_FS is not set
888# CONFIG_CIFS is not set 894# CONFIG_CIFS is not set
889# CONFIG_NCP_FS is not set 895# CONFIG_NCP_FS is not set
890# CONFIG_CODA_FS is not set 896# CONFIG_CODA_FS is not set
@@ -1026,6 +1032,7 @@ CONFIG_CRYPTO=y
1026# 1032#
1027# CONFIG_CRYPTO_ANSI_CPRNG is not set 1033# CONFIG_CRYPTO_ANSI_CPRNG is not set
1028CONFIG_CRYPTO_HW=y 1034CONFIG_CRYPTO_HW=y
1035# CONFIG_VIRTUALIZATION is not set
1029# CONFIG_BINARY_PRINTF is not set 1036# CONFIG_BINARY_PRINTF is not set
1030 1037
1031# 1038#
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig
index cfa58199a36..4487a230466 100644
--- a/arch/sh/configs/se7712_defconfig
+++ b/arch/sh/configs/se7712_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-rc5
4# Mon Jan 4 13:44:56 2010 4# Tue May 18 18:05:15 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -12,8 +12,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y 12CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
15CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_IRQ_PER_CPU=y 15CONFIG_IRQ_PER_CPU=y
16CONFIG_SPARSE_IRQ=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,6 +29,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DMA_NONCOHERENT=y 31CONFIG_DMA_NONCOHERENT=y
32CONFIG_NEED_DMA_MAP_STATE=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y 34CONFIG_CONSTRUCTORS=y
34 35
@@ -43,9 +44,11 @@ CONFIG_LOCALVERSION=""
43CONFIG_HAVE_KERNEL_GZIP=y 44CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y 45CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y 46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_HAVE_KERNEL_LZO=y
46CONFIG_KERNEL_GZIP=y 48CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set 49# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set 50# CONFIG_KERNEL_LZMA is not set
51# CONFIG_KERNEL_LZO is not set
49# CONFIG_SWAP is not set 52# CONFIG_SWAP is not set
50CONFIG_SYSVIPC=y 53CONFIG_SYSVIPC=y
51CONFIG_SYSVIPC_SYSCTL=y 54CONFIG_SYSVIPC_SYSCTL=y
@@ -68,7 +71,6 @@ CONFIG_RCU_FANOUT=32
68# CONFIG_TREE_RCU_TRACE is not set 71# CONFIG_TREE_RCU_TRACE is not set
69# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_GROUP_SCHED is not set
72# CONFIG_CGROUPS is not set 74# CONFIG_CGROUPS is not set
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74CONFIG_SYSFS_DEPRECATED_V2=y 76CONFIG_SYSFS_DEPRECATED_V2=y
@@ -102,8 +104,9 @@ CONFIG_PERF_USE_VMALLOC=y
102# 104#
103# Kernel Performance Events And Counters 105# Kernel Performance Events And Counters
104# 106#
105# CONFIG_PERF_EVENTS is not set 107CONFIG_PERF_EVENTS=y
106# CONFIG_PERF_COUNTERS is not set 108# CONFIG_PERF_COUNTERS is not set
109# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
107CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
109CONFIG_SLAB=y 112CONFIG_SLAB=y
@@ -119,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
119CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
120CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
121CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
122 126
123# 127#
124# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -236,6 +240,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
236CONFIG_MAX_ACTIVE_REGIONS=1 240CONFIG_MAX_ACTIVE_REGIONS=1
237CONFIG_ARCH_POPULATES_NODE_MAP=y 241CONFIG_ARCH_POPULATES_NODE_MAP=y
238CONFIG_ARCH_SELECT_MEMORY_MODEL=y 242CONFIG_ARCH_SELECT_MEMORY_MODEL=y
243CONFIG_UNCACHED_MAPPING=y
239CONFIG_PAGE_SIZE_4KB=y 244CONFIG_PAGE_SIZE_4KB=y
240# CONFIG_PAGE_SIZE_8KB is not set 245# CONFIG_PAGE_SIZE_8KB is not set
241# CONFIG_PAGE_SIZE_16KB is not set 246# CONFIG_PAGE_SIZE_16KB is not set
@@ -251,7 +256,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
251CONFIG_SPLIT_PTLOCK_CPUS=4 256CONFIG_SPLIT_PTLOCK_CPUS=4
252# CONFIG_PHYS_ADDR_T_64BIT is not set 257# CONFIG_PHYS_ADDR_T_64BIT is not set
253CONFIG_ZONE_DMA_FLAG=0 258CONFIG_ZONE_DMA_FLAG=0
254CONFIG_NR_QUICK=2 259CONFIG_NR_QUICK=1
255# CONFIG_KSM is not set 260# CONFIG_KSM is not set
256CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
257 262
@@ -329,7 +334,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
329# CONFIG_PREEMPT is not set 334# CONFIG_PREEMPT is not set
330CONFIG_GUSA=y 335CONFIG_GUSA=y
331# CONFIG_GUSA_RB is not set 336# CONFIG_GUSA_RB is not set
332# CONFIG_SPARSE_IRQ is not set
333 337
334# 338#
335# Boot options 339# Boot options
@@ -366,7 +370,6 @@ CONFIG_NET=y
366# Networking options 370# Networking options
367# 371#
368CONFIG_PACKET=y 372CONFIG_PACKET=y
369CONFIG_PACKET_MMAP=y
370CONFIG_UNIX=y 373CONFIG_UNIX=y
371CONFIG_XFRM=y 374CONFIG_XFRM=y
372# CONFIG_XFRM_USER is not set 375# CONFIG_XFRM_USER is not set
@@ -614,6 +617,7 @@ CONFIG_HAVE_IDE=y
614# 617#
615# SCSI device support 618# SCSI device support
616# 619#
620CONFIG_SCSI_MOD=y
617# CONFIG_RAID_ATTRS is not set 621# CONFIG_RAID_ATTRS is not set
618CONFIG_SCSI=y 622CONFIG_SCSI=y
619CONFIG_SCSI_DMA=y 623CONFIG_SCSI_DMA=y
@@ -754,6 +758,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
754CONFIG_SERIAL_SH_SCI_CONSOLE=y 758CONFIG_SERIAL_SH_SCI_CONSOLE=y
755CONFIG_SERIAL_CORE=y 759CONFIG_SERIAL_CORE=y
756CONFIG_SERIAL_CORE_CONSOLE=y 760CONFIG_SERIAL_CORE_CONSOLE=y
761# CONFIG_SERIAL_TIMBERDALE is not set
757CONFIG_UNIX98_PTYS=y 762CONFIG_UNIX98_PTYS=y
758# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 763# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
759# CONFIG_LEGACY_PTYS is not set 764# CONFIG_LEGACY_PTYS is not set
@@ -834,11 +839,11 @@ CONFIG_LEDS_CLASS=y
834# 839#
835# LED drivers 840# LED drivers
836# 841#
842CONFIG_LEDS_TRIGGERS=y
837 843
838# 844#
839# LED Triggers 845# LED Triggers
840# 846#
841CONFIG_LEDS_TRIGGERS=y
842# CONFIG_LEDS_TRIGGER_TIMER is not set 847# CONFIG_LEDS_TRIGGER_TIMER is not set
843# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 848# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
844# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 849# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
@@ -940,6 +945,7 @@ CONFIG_JFFS2_ZLIB=y
940# CONFIG_JFFS2_LZO is not set 945# CONFIG_JFFS2_LZO is not set
941CONFIG_JFFS2_RTIME=y 946CONFIG_JFFS2_RTIME=y
942# CONFIG_JFFS2_RUBIN is not set 947# CONFIG_JFFS2_RUBIN is not set
948# CONFIG_LOGFS is not set
943CONFIG_CRAMFS=y 949CONFIG_CRAMFS=y
944# CONFIG_SQUASHFS is not set 950# CONFIG_SQUASHFS is not set
945# CONFIG_VXFS_FS is not set 951# CONFIG_VXFS_FS is not set
@@ -962,6 +968,7 @@ CONFIG_SUNRPC=y
962# CONFIG_RPCSEC_GSS_KRB5 is not set 968# CONFIG_RPCSEC_GSS_KRB5 is not set
963# CONFIG_RPCSEC_GSS_SPKM3 is not set 969# CONFIG_RPCSEC_GSS_SPKM3 is not set
964# CONFIG_SMB_FS is not set 970# CONFIG_SMB_FS is not set
971# CONFIG_CEPH_FS is not set
965# CONFIG_CIFS is not set 972# CONFIG_CIFS is not set
966# CONFIG_NCP_FS is not set 973# CONFIG_NCP_FS is not set
967# CONFIG_CODA_FS is not set 974# CONFIG_CODA_FS is not set
@@ -997,6 +1004,7 @@ CONFIG_SCHED_DEBUG=y
997# CONFIG_TIMER_STATS is not set 1004# CONFIG_TIMER_STATS is not set
998# CONFIG_DEBUG_OBJECTS is not set 1005# CONFIG_DEBUG_OBJECTS is not set
999# CONFIG_DEBUG_SLAB is not set 1006# CONFIG_DEBUG_SLAB is not set
1007# CONFIG_DEBUG_KMEMLEAK is not set
1000# CONFIG_DEBUG_RT_MUTEXES is not set 1008# CONFIG_DEBUG_RT_MUTEXES is not set
1001# CONFIG_RT_MUTEX_TESTER is not set 1009# CONFIG_RT_MUTEX_TESTER is not set
1002# CONFIG_DEBUG_SPINLOCK is not set 1010# CONFIG_DEBUG_SPINLOCK is not set
@@ -1042,6 +1050,7 @@ CONFIG_FTRACE=y
1042CONFIG_BRANCH_PROFILE_NONE=y 1050CONFIG_BRANCH_PROFILE_NONE=y
1043# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1051# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1044# CONFIG_PROFILE_ALL_BRANCHES is not set 1052# CONFIG_PROFILE_ALL_BRANCHES is not set
1053# CONFIG_KSYM_TRACER is not set
1045# CONFIG_STACK_TRACER is not set 1054# CONFIG_STACK_TRACER is not set
1046# CONFIG_KMEMTRACE is not set 1055# CONFIG_KMEMTRACE is not set
1047# CONFIG_WORKQUEUE_TRACER is not set 1056# CONFIG_WORKQUEUE_TRACER is not set
@@ -1167,6 +1176,7 @@ CONFIG_CRYPTO_DEFLATE=y
1167# 1176#
1168# CONFIG_CRYPTO_ANSI_CPRNG is not set 1177# CONFIG_CRYPTO_ANSI_CPRNG is not set
1169CONFIG_CRYPTO_HW=y 1178CONFIG_CRYPTO_HW=y
1179# CONFIG_VIRTUALIZATION is not set
1170# CONFIG_BINARY_PRINTF is not set 1180# CONFIG_BINARY_PRINTF is not set
1171 1181
1172# 1182#
diff --git a/arch/sh/configs/se7721_defconfig b/arch/sh/configs/se7721_defconfig
index 201283c829a..7c06b5c0b49 100644
--- a/arch/sh/configs/se7721_defconfig
+++ b/arch/sh/configs/se7721_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-rc5
4# Mon Jan 4 13:46:58 2010 4# Tue May 18 18:06:03 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -12,8 +12,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y 12CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
15CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_IRQ_PER_CPU=y 15CONFIG_IRQ_PER_CPU=y
16CONFIG_SPARSE_IRQ=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -44,9 +45,11 @@ CONFIG_LOCALVERSION=""
44CONFIG_HAVE_KERNEL_GZIP=y 45CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y 46CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y 47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_HAVE_KERNEL_LZO=y
47CONFIG_KERNEL_GZIP=y 49CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set 50# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set 51# CONFIG_KERNEL_LZMA is not set
52# CONFIG_KERNEL_LZO is not set
50# CONFIG_SWAP is not set 53# CONFIG_SWAP is not set
51CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
52CONFIG_SYSVIPC_SYSCTL=y 55CONFIG_SYSVIPC_SYSCTL=y
@@ -69,11 +72,6 @@ CONFIG_RCU_FANOUT=32
69# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_GROUP_SCHED=y
73CONFIG_FAIR_GROUP_SCHED=y
74# CONFIG_RT_GROUP_SCHED is not set
75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -107,8 +105,9 @@ CONFIG_PERF_USE_VMALLOC=y
107# 105#
108# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
109# 107#
110# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
110# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
112CONFIG_VM_EVENT_COUNTERS=y 111CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_COMPAT_BRK=y 112CONFIG_COMPAT_BRK=y
114CONFIG_SLAB=y 113CONFIG_SLAB=y
@@ -124,6 +123,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 123CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 124CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 125CONFIG_HAVE_DMA_API_DEBUG=y
126CONFIG_HAVE_HW_BREAKPOINT=y
127 127
128# 128#
129# GCOV-based kernel profiling 129# GCOV-based kernel profiling
@@ -241,6 +241,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
241CONFIG_MAX_ACTIVE_REGIONS=1 241CONFIG_MAX_ACTIVE_REGIONS=1
242CONFIG_ARCH_POPULATES_NODE_MAP=y 242CONFIG_ARCH_POPULATES_NODE_MAP=y
243CONFIG_ARCH_SELECT_MEMORY_MODEL=y 243CONFIG_ARCH_SELECT_MEMORY_MODEL=y
244CONFIG_UNCACHED_MAPPING=y
244CONFIG_PAGE_SIZE_4KB=y 245CONFIG_PAGE_SIZE_4KB=y
245# CONFIG_PAGE_SIZE_8KB is not set 246# CONFIG_PAGE_SIZE_8KB is not set
246# CONFIG_PAGE_SIZE_16KB is not set 247# CONFIG_PAGE_SIZE_16KB is not set
@@ -256,7 +257,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
256CONFIG_SPLIT_PTLOCK_CPUS=4 257CONFIG_SPLIT_PTLOCK_CPUS=4
257# CONFIG_PHYS_ADDR_T_64BIT is not set 258# CONFIG_PHYS_ADDR_T_64BIT is not set
258CONFIG_ZONE_DMA_FLAG=0 259CONFIG_ZONE_DMA_FLAG=0
259CONFIG_NR_QUICK=2 260CONFIG_NR_QUICK=1
260# CONFIG_KSM is not set 261# CONFIG_KSM is not set
261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
262 263
@@ -334,7 +335,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
334# CONFIG_PREEMPT is not set 335# CONFIG_PREEMPT is not set
335CONFIG_GUSA=y 336CONFIG_GUSA=y
336# CONFIG_GUSA_RB is not set 337# CONFIG_GUSA_RB is not set
337# CONFIG_SPARSE_IRQ is not set
338 338
339# 339#
340# Boot options 340# Boot options
@@ -371,7 +371,6 @@ CONFIG_NET=y
371# Networking options 371# Networking options
372# 372#
373CONFIG_PACKET=y 373CONFIG_PACKET=y
374CONFIG_PACKET_MMAP=y
375CONFIG_UNIX=y 374CONFIG_UNIX=y
376CONFIG_XFRM=y 375CONFIG_XFRM=y
377# CONFIG_XFRM_USER is not set 376# CONFIG_XFRM_USER is not set
@@ -620,6 +619,7 @@ CONFIG_HAVE_IDE=y
620# 619#
621# SCSI device support 620# SCSI device support
622# 621#
622CONFIG_SCSI_MOD=y
623# CONFIG_RAID_ATTRS is not set 623# CONFIG_RAID_ATTRS is not set
624CONFIG_SCSI=y 624CONFIG_SCSI=y
625CONFIG_SCSI_DMA=y 625CONFIG_SCSI_DMA=y
@@ -687,6 +687,7 @@ CONFIG_WLAN=y
687# CONFIG_USB_PEGASUS is not set 687# CONFIG_USB_PEGASUS is not set
688# CONFIG_USB_RTL8150 is not set 688# CONFIG_USB_RTL8150 is not set
689# CONFIG_USB_USBNET is not set 689# CONFIG_USB_USBNET is not set
690# CONFIG_USB_IPHETH is not set
690# CONFIG_WAN is not set 691# CONFIG_WAN is not set
691# CONFIG_PPP is not set 692# CONFIG_PPP is not set
692# CONFIG_SLIP is not set 693# CONFIG_SLIP is not set
@@ -764,6 +765,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
764CONFIG_SERIAL_SH_SCI_CONSOLE=y 765CONFIG_SERIAL_SH_SCI_CONSOLE=y
765CONFIG_SERIAL_CORE=y 766CONFIG_SERIAL_CORE=y
766CONFIG_SERIAL_CORE_CONSOLE=y 767CONFIG_SERIAL_CORE_CONSOLE=y
768# CONFIG_SERIAL_TIMBERDALE is not set
767CONFIG_UNIX98_PTYS=y 769CONFIG_UNIX98_PTYS=y
768# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 770# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
769# CONFIG_LEGACY_PTYS is not set 771# CONFIG_LEGACY_PTYS is not set
@@ -829,6 +831,7 @@ CONFIG_USB_HID=y
829# 831#
830# Special HID drivers 832# Special HID drivers
831# 833#
834# CONFIG_HID_3M_PCT is not set
832CONFIG_HID_A4TECH=y 835CONFIG_HID_A4TECH=y
833CONFIG_HID_APPLE=y 836CONFIG_HID_APPLE=y
834CONFIG_HID_BELKIN=y 837CONFIG_HID_BELKIN=y
@@ -844,14 +847,19 @@ CONFIG_HID_GYRATION=y
844CONFIG_HID_LOGITECH=y 847CONFIG_HID_LOGITECH=y
845# CONFIG_LOGITECH_FF is not set 848# CONFIG_LOGITECH_FF is not set
846# CONFIG_LOGIRUMBLEPAD2_FF is not set 849# CONFIG_LOGIRUMBLEPAD2_FF is not set
850# CONFIG_LOGIG940_FF is not set
847CONFIG_HID_MICROSOFT=y 851CONFIG_HID_MICROSOFT=y
852# CONFIG_HID_MOSART is not set
848CONFIG_HID_MONTEREY=y 853CONFIG_HID_MONTEREY=y
849# CONFIG_HID_NTRIG is not set 854# CONFIG_HID_NTRIG is not set
855# CONFIG_HID_ORTEK is not set
850CONFIG_HID_PANTHERLORD=y 856CONFIG_HID_PANTHERLORD=y
851# CONFIG_PANTHERLORD_FF is not set 857# CONFIG_PANTHERLORD_FF is not set
852CONFIG_HID_PETALYNX=y 858CONFIG_HID_PETALYNX=y
859# CONFIG_HID_QUANTA is not set
853CONFIG_HID_SAMSUNG=y 860CONFIG_HID_SAMSUNG=y
854CONFIG_HID_SONY=y 861CONFIG_HID_SONY=y
862# CONFIG_HID_STANTUM is not set
855CONFIG_HID_SUNPLUS=y 863CONFIG_HID_SUNPLUS=y
856# CONFIG_HID_GREENASIA is not set 864# CONFIG_HID_GREENASIA is not set
857# CONFIG_HID_SMARTJOYPLUS is not set 865# CONFIG_HID_SMARTJOYPLUS is not set
@@ -946,7 +954,6 @@ CONFIG_USB_STORAGE=y
946# CONFIG_USB_RIO500 is not set 954# CONFIG_USB_RIO500 is not set
947# CONFIG_USB_LEGOTOWER is not set 955# CONFIG_USB_LEGOTOWER is not set
948# CONFIG_USB_LCD is not set 956# CONFIG_USB_LCD is not set
949# CONFIG_USB_BERRY_CHARGE is not set
950# CONFIG_USB_LED is not set 957# CONFIG_USB_LED is not set
951# CONFIG_USB_CYPRESS_CY7C63 is not set 958# CONFIG_USB_CYPRESS_CY7C63 is not set
952# CONFIG_USB_CYTHERM is not set 959# CONFIG_USB_CYTHERM is not set
@@ -958,7 +965,6 @@ CONFIG_USB_STORAGE=y
958# CONFIG_USB_IOWARRIOR is not set 965# CONFIG_USB_IOWARRIOR is not set
959# CONFIG_USB_TEST is not set 966# CONFIG_USB_TEST is not set
960# CONFIG_USB_ISIGHTFW is not set 967# CONFIG_USB_ISIGHTFW is not set
961# CONFIG_USB_VST is not set
962# CONFIG_USB_GADGET is not set 968# CONFIG_USB_GADGET is not set
963 969
964# 970#
@@ -973,11 +979,11 @@ CONFIG_LEDS_CLASS=y
973# 979#
974# LED drivers 980# LED drivers
975# 981#
982CONFIG_LEDS_TRIGGERS=y
976 983
977# 984#
978# LED Triggers 985# LED Triggers
979# 986#
980CONFIG_LEDS_TRIGGERS=y
981# CONFIG_LEDS_TRIGGER_TIMER is not set 987# CONFIG_LEDS_TRIGGER_TIMER is not set
982# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set 988# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
983# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set 989# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
@@ -1082,6 +1088,7 @@ CONFIG_JFFS2_ZLIB=y
1082# CONFIG_JFFS2_LZO is not set 1088# CONFIG_JFFS2_LZO is not set
1083CONFIG_JFFS2_RTIME=y 1089CONFIG_JFFS2_RTIME=y
1084# CONFIG_JFFS2_RUBIN is not set 1090# CONFIG_JFFS2_RUBIN is not set
1091# CONFIG_LOGFS is not set
1085CONFIG_CRAMFS=y 1092CONFIG_CRAMFS=y
1086# CONFIG_SQUASHFS is not set 1093# CONFIG_SQUASHFS is not set
1087# CONFIG_VXFS_FS is not set 1094# CONFIG_VXFS_FS is not set
@@ -1163,6 +1170,7 @@ CONFIG_SCHED_DEBUG=y
1163# CONFIG_TIMER_STATS is not set 1170# CONFIG_TIMER_STATS is not set
1164# CONFIG_DEBUG_OBJECTS is not set 1171# CONFIG_DEBUG_OBJECTS is not set
1165# CONFIG_DEBUG_SLAB is not set 1172# CONFIG_DEBUG_SLAB is not set
1173# CONFIG_DEBUG_KMEMLEAK is not set
1166# CONFIG_DEBUG_RT_MUTEXES is not set 1174# CONFIG_DEBUG_RT_MUTEXES is not set
1167# CONFIG_RT_MUTEX_TESTER is not set 1175# CONFIG_RT_MUTEX_TESTER is not set
1168# CONFIG_DEBUG_SPINLOCK is not set 1176# CONFIG_DEBUG_SPINLOCK is not set
@@ -1208,6 +1216,7 @@ CONFIG_FTRACE=y
1208CONFIG_BRANCH_PROFILE_NONE=y 1216CONFIG_BRANCH_PROFILE_NONE=y
1209# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1217# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1210# CONFIG_PROFILE_ALL_BRANCHES is not set 1218# CONFIG_PROFILE_ALL_BRANCHES is not set
1219# CONFIG_KSYM_TRACER is not set
1211# CONFIG_STACK_TRACER is not set 1220# CONFIG_STACK_TRACER is not set
1212# CONFIG_KMEMTRACE is not set 1221# CONFIG_KMEMTRACE is not set
1213# CONFIG_WORKQUEUE_TRACER is not set 1222# CONFIG_WORKQUEUE_TRACER is not set
@@ -1333,6 +1342,7 @@ CONFIG_CRYPTO_DEFLATE=y
1333# 1342#
1334# CONFIG_CRYPTO_ANSI_CPRNG is not set 1343# CONFIG_CRYPTO_ANSI_CPRNG is not set
1335CONFIG_CRYPTO_HW=y 1344CONFIG_CRYPTO_HW=y
1345# CONFIG_VIRTUALIZATION is not set
1336# CONFIG_BINARY_PRINTF is not set 1346# CONFIG_BINARY_PRINTF is not set
1337 1347
1338# 1348#
diff --git a/arch/sh/configs/se7722_defconfig b/arch/sh/configs/se7722_defconfig
index 4a4efd261d0..42782e7ff8b 100644
--- a/arch/sh/configs/se7722_defconfig
+++ b/arch/sh/configs/se7722_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-rc5
4# Mon Jan 4 13:49:15 2010 4# Tue May 18 18:07:07 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -73,7 +76,6 @@ CONFIG_RCU_FANOUT=32
73CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_GROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -84,6 +86,7 @@ CONFIG_INITRAMFS_SOURCE=""
84CONFIG_RD_GZIP=y 86CONFIG_RD_GZIP=y
85# CONFIG_RD_BZIP2 is not set 87# CONFIG_RD_BZIP2 is not set
86# CONFIG_RD_LZMA is not set 88# CONFIG_RD_LZMA is not set
89# CONFIG_RD_LZO is not set
87CONFIG_CC_OPTIMIZE_FOR_SIZE=y 90CONFIG_CC_OPTIMIZE_FOR_SIZE=y
88CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
89CONFIG_ANON_INODES=y 92CONFIG_ANON_INODES=y
@@ -122,13 +125,13 @@ CONFIG_PROFILING=y
122# CONFIG_OPROFILE is not set 125# CONFIG_OPROFILE is not set
123CONFIG_HAVE_OPROFILE=y 126CONFIG_HAVE_OPROFILE=y
124# CONFIG_KPROBES is not set 127# CONFIG_KPROBES is not set
125CONFIG_HAVE_IOREMAP_PROT=y
126CONFIG_HAVE_KPROBES=y 128CONFIG_HAVE_KPROBES=y
127CONFIG_HAVE_KRETPROBES=y 129CONFIG_HAVE_KRETPROBES=y
128CONFIG_HAVE_ARCH_TRACEHOOK=y 130CONFIG_HAVE_ARCH_TRACEHOOK=y
129CONFIG_HAVE_DMA_ATTRS=y 131CONFIG_HAVE_DMA_ATTRS=y
130CONFIG_HAVE_CLK=y 132CONFIG_HAVE_CLK=y
131CONFIG_HAVE_DMA_API_DEBUG=y 133CONFIG_HAVE_DMA_API_DEBUG=y
134CONFIG_HAVE_HW_BREAKPOINT=y
132 135
133# 136#
134# GCOV-based kernel profiling 137# GCOV-based kernel profiling
@@ -245,7 +248,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
245CONFIG_MEMORY_START=0x0c000000 248CONFIG_MEMORY_START=0x0c000000
246CONFIG_MEMORY_SIZE=0x04000000 249CONFIG_MEMORY_SIZE=0x04000000
247CONFIG_29BIT=y 250CONFIG_29BIT=y
248# CONFIG_X2TLB is not set 251CONFIG_X2TLB=y
249CONFIG_VSYSCALL=y 252CONFIG_VSYSCALL=y
250CONFIG_NUMA=y 253CONFIG_NUMA=y
251CONFIG_NODES_SHIFT=1 254CONFIG_NODES_SHIFT=1
@@ -256,6 +259,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
256CONFIG_ARCH_SELECT_MEMORY_MODEL=y 259CONFIG_ARCH_SELECT_MEMORY_MODEL=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 260CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 261CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
262CONFIG_IOREMAP_FIXED=y
263CONFIG_UNCACHED_MAPPING=y
259CONFIG_PAGE_SIZE_4KB=y 264CONFIG_PAGE_SIZE_4KB=y
260# CONFIG_PAGE_SIZE_8KB is not set 265# CONFIG_PAGE_SIZE_8KB is not set
261# CONFIG_PAGE_SIZE_16KB is not set 266# CONFIG_PAGE_SIZE_16KB is not set
@@ -279,7 +284,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
279CONFIG_MIGRATION=y 284CONFIG_MIGRATION=y
280# CONFIG_PHYS_ADDR_T_64BIT is not set 285# CONFIG_PHYS_ADDR_T_64BIT is not set
281CONFIG_ZONE_DMA_FLAG=0 286CONFIG_ZONE_DMA_FLAG=0
282CONFIG_NR_QUICK=2 287CONFIG_NR_QUICK=1
283# CONFIG_KSM is not set 288# CONFIG_KSM is not set
284CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 289CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
285 290
@@ -356,7 +361,7 @@ CONFIG_KEXEC=y
356# CONFIG_PREEMPT_VOLUNTARY is not set 361# CONFIG_PREEMPT_VOLUNTARY is not set
357CONFIG_PREEMPT=y 362CONFIG_PREEMPT=y
358CONFIG_GUSA=y 363CONFIG_GUSA=y
359# CONFIG_SPARSE_IRQ is not set 364# CONFIG_INTC_USERIMASK is not set
360 365
361# 366#
362# Boot options 367# Boot options
@@ -391,6 +396,7 @@ CONFIG_SUSPEND=y
391CONFIG_SUSPEND_FREEZER=y 396CONFIG_SUSPEND_FREEZER=y
392# CONFIG_HIBERNATION is not set 397# CONFIG_HIBERNATION is not set
393CONFIG_PM_RUNTIME=y 398CONFIG_PM_RUNTIME=y
399CONFIG_PM_OPS=y
394# CONFIG_CPU_IDLE is not set 400# CONFIG_CPU_IDLE is not set
395CONFIG_NET=y 401CONFIG_NET=y
396 402
@@ -398,7 +404,6 @@ CONFIG_NET=y
398# Networking options 404# Networking options
399# 405#
400CONFIG_PACKET=y 406CONFIG_PACKET=y
401CONFIG_PACKET_MMAP=y
402CONFIG_UNIX=y 407CONFIG_UNIX=y
403CONFIG_XFRM=y 408CONFIG_XFRM=y
404# CONFIG_XFRM_USER is not set 409# CONFIG_XFRM_USER is not set
@@ -519,6 +524,7 @@ CONFIG_HAVE_IDE=y
519# 524#
520# SCSI device support 525# SCSI device support
521# 526#
527CONFIG_SCSI_MOD=y
522# CONFIG_RAID_ATTRS is not set 528# CONFIG_RAID_ATTRS is not set
523CONFIG_SCSI=y 529CONFIG_SCSI=y
524CONFIG_SCSI_DMA=y 530CONFIG_SCSI_DMA=y
@@ -676,6 +682,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
676CONFIG_SERIAL_SH_SCI_CONSOLE=y 682CONFIG_SERIAL_SH_SCI_CONSOLE=y
677CONFIG_SERIAL_CORE=y 683CONFIG_SERIAL_CORE=y
678CONFIG_SERIAL_CORE_CONSOLE=y 684CONFIG_SERIAL_CORE_CONSOLE=y
685# CONFIG_SERIAL_TIMBERDALE is not set
679CONFIG_UNIX98_PTYS=y 686CONFIG_UNIX98_PTYS=y
680# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 687# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
681CONFIG_LEGACY_PTYS=y 688CONFIG_LEGACY_PTYS=y
@@ -898,6 +905,7 @@ CONFIG_MISC_FILESYSTEMS=y
898# CONFIG_BEFS_FS is not set 905# CONFIG_BEFS_FS is not set
899# CONFIG_BFS_FS is not set 906# CONFIG_BFS_FS is not set
900# CONFIG_EFS_FS is not set 907# CONFIG_EFS_FS is not set
908# CONFIG_LOGFS is not set
901# CONFIG_CRAMFS is not set 909# CONFIG_CRAMFS is not set
902# CONFIG_SQUASHFS is not set 910# CONFIG_SQUASHFS is not set
903# CONFIG_VXFS_FS is not set 911# CONFIG_VXFS_FS is not set
@@ -912,6 +920,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
912# CONFIG_NFS_FS is not set 920# CONFIG_NFS_FS is not set
913# CONFIG_NFSD is not set 921# CONFIG_NFSD is not set
914# CONFIG_SMB_FS is not set 922# CONFIG_SMB_FS is not set
923# CONFIG_CEPH_FS is not set
915# CONFIG_CIFS is not set 924# CONFIG_CIFS is not set
916# CONFIG_NCP_FS is not set 925# CONFIG_NCP_FS is not set
917# CONFIG_CODA_FS is not set 926# CONFIG_CODA_FS is not set
@@ -944,6 +953,7 @@ CONFIG_DEBUG_FS=y
944CONFIG_DEBUG_BUGVERBOSE=y 953CONFIG_DEBUG_BUGVERBOSE=y
945# CONFIG_DEBUG_MEMORY_INIT is not set 954# CONFIG_DEBUG_MEMORY_INIT is not set
946# CONFIG_RCU_CPU_STALL_DETECTOR is not set 955# CONFIG_RCU_CPU_STALL_DETECTOR is not set
956# CONFIG_LKDTM is not set
947# CONFIG_LATENCYTOP is not set 957# CONFIG_LATENCYTOP is not set
948# CONFIG_SYSCTL_SYSCALL_CHECK is not set 958# CONFIG_SYSCTL_SYSCALL_CHECK is not set
949CONFIG_HAVE_FUNCTION_TRACER=y 959CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1059,6 +1069,7 @@ CONFIG_CRYPTO=y
1059# 1069#
1060# CONFIG_CRYPTO_ANSI_CPRNG is not set 1070# CONFIG_CRYPTO_ANSI_CPRNG is not set
1061CONFIG_CRYPTO_HW=y 1071CONFIG_CRYPTO_HW=y
1072# CONFIG_VIRTUALIZATION is not set
1062# CONFIG_BINARY_PRINTF is not set 1073# CONFIG_BINARY_PRINTF is not set
1063 1074
1064# 1075#
diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig
index ab371afe359..ebb4ac4a7d8 100644
--- a/arch/sh/configs/se7724_defconfig
+++ b/arch/sh/configs/se7724_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-rc5
4# Mon Jan 4 14:36:56 2010 4# Tue May 18 16:55:41 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -47,9 +48,11 @@ CONFIG_LOCALVERSION=""
47CONFIG_HAVE_KERNEL_GZIP=y 48CONFIG_HAVE_KERNEL_GZIP=y
48CONFIG_HAVE_KERNEL_BZIP2=y 49CONFIG_HAVE_KERNEL_BZIP2=y
49CONFIG_HAVE_KERNEL_LZMA=y 50CONFIG_HAVE_KERNEL_LZMA=y
51CONFIG_HAVE_KERNEL_LZO=y
50CONFIG_KERNEL_GZIP=y 52CONFIG_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
53CONFIG_SWAP=y 56CONFIG_SWAP=y
54CONFIG_SYSVIPC=y 57CONFIG_SYSVIPC=y
55CONFIG_SYSVIPC_SYSCTL=y 58CONFIG_SYSVIPC_SYSCTL=y
@@ -71,11 +74,6 @@ 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
73CONFIG_LOG_BUF_SHIFT=14 76CONFIG_LOG_BUF_SHIFT=14
74CONFIG_GROUP_SCHED=y
75CONFIG_FAIR_GROUP_SCHED=y
76# CONFIG_RT_GROUP_SCHED is not set
77CONFIG_USER_SCHED=y
78# CONFIG_CGROUP_SCHED is not set
79# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -107,7 +105,7 @@ CONFIG_PERF_USE_VMALLOC=y
107# 105#
108# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
109# 107#
110# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
111# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
112CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
@@ -116,13 +114,13 @@ CONFIG_SLAB=y
116# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
118CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_IOREMAP_PROT=y
120CONFIG_HAVE_KPROBES=y 117CONFIG_HAVE_KPROBES=y
121CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
122CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
124CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
125CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
126 124
127# 125#
128# GCOV-based kernel profiling 126# GCOV-based kernel profiling
@@ -237,8 +235,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_MEMORY_START=0x08000000 235CONFIG_MEMORY_START=0x08000000
238CONFIG_MEMORY_SIZE=0x08000000 236CONFIG_MEMORY_SIZE=0x08000000
239CONFIG_29BIT=y 237CONFIG_29BIT=y
240# CONFIG_PMB_ENABLE is not set 238# CONFIG_PMB is not set
241# CONFIG_X2TLB is not set 239CONFIG_X2TLB=y
242CONFIG_VSYSCALL=y 240CONFIG_VSYSCALL=y
243CONFIG_ARCH_FLATMEM_ENABLE=y 241CONFIG_ARCH_FLATMEM_ENABLE=y
244CONFIG_ARCH_SPARSEMEM_ENABLE=y 242CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -246,6 +244,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
246CONFIG_MAX_ACTIVE_REGIONS=1 244CONFIG_MAX_ACTIVE_REGIONS=1
247CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
248CONFIG_ARCH_SELECT_MEMORY_MODEL=y 246CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_IOREMAP_FIXED=y
248CONFIG_UNCACHED_MAPPING=y
249CONFIG_PAGE_SIZE_4KB=y 249CONFIG_PAGE_SIZE_4KB=y
250# CONFIG_PAGE_SIZE_8KB is not set 250# CONFIG_PAGE_SIZE_8KB is not set
251# CONFIG_PAGE_SIZE_16KB is not set 251# CONFIG_PAGE_SIZE_16KB is not set
@@ -261,7 +261,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
261CONFIG_SPLIT_PTLOCK_CPUS=4 261CONFIG_SPLIT_PTLOCK_CPUS=4
262# CONFIG_PHYS_ADDR_T_64BIT is not set 262# CONFIG_PHYS_ADDR_T_64BIT is not set
263CONFIG_ZONE_DMA_FLAG=0 263CONFIG_ZONE_DMA_FLAG=0
264CONFIG_NR_QUICK=2 264CONFIG_NR_QUICK=1
265# CONFIG_KSM is not set 265# CONFIG_KSM is not set
266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 266CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
267 267
@@ -340,7 +340,7 @@ CONFIG_SECCOMP=y
340# CONFIG_PREEMPT_VOLUNTARY is not set 340# CONFIG_PREEMPT_VOLUNTARY is not set
341CONFIG_PREEMPT=y 341CONFIG_PREEMPT=y
342CONFIG_GUSA=y 342CONFIG_GUSA=y
343# CONFIG_SPARSE_IRQ is not set 343# CONFIG_INTC_USERIMASK is not set
344 344
345# 345#
346# Boot options 346# Boot options
@@ -376,6 +376,7 @@ CONFIG_SUSPEND=y
376CONFIG_SUSPEND_FREEZER=y 376CONFIG_SUSPEND_FREEZER=y
377# CONFIG_HIBERNATION is not set 377# CONFIG_HIBERNATION is not set
378CONFIG_PM_RUNTIME=y 378CONFIG_PM_RUNTIME=y
379CONFIG_PM_OPS=y
379# CONFIG_CPU_IDLE is not set 380# CONFIG_CPU_IDLE is not set
380CONFIG_NET=y 381CONFIG_NET=y
381 382
@@ -383,7 +384,6 @@ CONFIG_NET=y
383# Networking options 384# Networking options
384# 385#
385CONFIG_PACKET=y 386CONFIG_PACKET=y
386# CONFIG_PACKET_MMAP is not set
387CONFIG_UNIX=y 387CONFIG_UNIX=y
388# CONFIG_NET_KEY is not set 388# CONFIG_NET_KEY is not set
389CONFIG_INET=y 389CONFIG_INET=y
@@ -559,6 +559,7 @@ CONFIG_MTD_NAND_IDS=y
559# CONFIG_MTD_NAND_NANDSIM is not set 559# CONFIG_MTD_NAND_NANDSIM is not set
560# CONFIG_MTD_NAND_PLATFORM is not set 560# CONFIG_MTD_NAND_PLATFORM is not set
561# CONFIG_MTD_ALAUDA is not set 561# CONFIG_MTD_ALAUDA is not set
562# CONFIG_MTD_NAND_SH_FLCTL is not set
562# CONFIG_MTD_ONENAND is not set 563# CONFIG_MTD_ONENAND is not set
563 564
564# 565#
@@ -600,6 +601,7 @@ CONFIG_MISC_DEVICES=y
600# CONFIG_ICS932S401 is not set 601# CONFIG_ICS932S401 is not set
601# CONFIG_ENCLOSURE_SERVICES is not set 602# CONFIG_ENCLOSURE_SERVICES is not set
602# CONFIG_ISL29003 is not set 603# CONFIG_ISL29003 is not set
604# CONFIG_SENSORS_TSL2550 is not set
603# CONFIG_DS1682 is not set 605# CONFIG_DS1682 is not set
604# CONFIG_TI_DAC7512 is not set 606# CONFIG_TI_DAC7512 is not set
605# CONFIG_C2PORT is not set 607# CONFIG_C2PORT is not set
@@ -619,6 +621,7 @@ CONFIG_HAVE_IDE=y
619# 621#
620# SCSI device support 622# SCSI device support
621# 623#
624CONFIG_SCSI_MOD=y
622# CONFIG_RAID_ATTRS is not set 625# CONFIG_RAID_ATTRS is not set
623CONFIG_SCSI=y 626CONFIG_SCSI=y
624CONFIG_SCSI_DMA=y 627CONFIG_SCSI_DMA=y
@@ -726,6 +729,7 @@ CONFIG_WLAN=y
726# CONFIG_USB_PEGASUS is not set 729# CONFIG_USB_PEGASUS is not set
727# CONFIG_USB_RTL8150 is not set 730# CONFIG_USB_RTL8150 is not set
728# CONFIG_USB_USBNET is not set 731# CONFIG_USB_USBNET is not set
732# CONFIG_USB_IPHETH is not set
729# CONFIG_WAN is not set 733# CONFIG_WAN is not set
730# CONFIG_PPP is not set 734# CONFIG_PPP is not set
731# CONFIG_SLIP is not set 735# CONFIG_SLIP is not set
@@ -805,6 +809,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
805CONFIG_SERIAL_SH_SCI_CONSOLE=y 809CONFIG_SERIAL_SH_SCI_CONSOLE=y
806CONFIG_SERIAL_CORE=y 810CONFIG_SERIAL_CORE=y
807CONFIG_SERIAL_CORE_CONSOLE=y 811CONFIG_SERIAL_CORE_CONSOLE=y
812# CONFIG_SERIAL_TIMBERDALE is not set
808CONFIG_UNIX98_PTYS=y 813CONFIG_UNIX98_PTYS=y
809# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 814# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
810CONFIG_LEGACY_PTYS=y 815CONFIG_LEGACY_PTYS=y
@@ -833,6 +838,7 @@ CONFIG_I2C_HELPER_AUTO=y
833# CONFIG_I2C_OCORES is not set 838# CONFIG_I2C_OCORES is not set
834CONFIG_I2C_SH_MOBILE=y 839CONFIG_I2C_SH_MOBILE=y
835# CONFIG_I2C_SIMTEC is not set 840# CONFIG_I2C_SIMTEC is not set
841# CONFIG_I2C_XILINX is not set
836 842
837# 843#
838# External I2C/SMBus adapter drivers 844# External I2C/SMBus adapter drivers
@@ -846,15 +852,9 @@ CONFIG_I2C_SH_MOBILE=y
846# 852#
847# CONFIG_I2C_PCA_PLATFORM is not set 853# CONFIG_I2C_PCA_PLATFORM is not set
848# CONFIG_I2C_STUB is not set 854# CONFIG_I2C_STUB is not set
849
850#
851# Miscellaneous I2C Chip support
852#
853# CONFIG_SENSORS_TSL2550 is not set
854# CONFIG_I2C_DEBUG_CORE is not set 855# CONFIG_I2C_DEBUG_CORE is not set
855# CONFIG_I2C_DEBUG_ALGO is not set 856# CONFIG_I2C_DEBUG_ALGO is not set
856# CONFIG_I2C_DEBUG_BUS is not set 857# CONFIG_I2C_DEBUG_BUS is not set
857# CONFIG_I2C_DEBUG_CHIP is not set
858CONFIG_SPI=y 858CONFIG_SPI=y
859CONFIG_SPI_MASTER=y 859CONFIG_SPI_MASTER=y
860 860
@@ -885,13 +885,16 @@ CONFIG_GPIOLIB=y
885# 885#
886# Memory mapped GPIO expanders: 886# Memory mapped GPIO expanders:
887# 887#
888# CONFIG_GPIO_IT8761E is not set
888 889
889# 890#
890# I2C GPIO expanders: 891# I2C GPIO expanders:
891# 892#
893# CONFIG_GPIO_MAX7300 is not set
892# CONFIG_GPIO_MAX732X is not set 894# CONFIG_GPIO_MAX732X is not set
893# CONFIG_GPIO_PCA953X is not set 895# CONFIG_GPIO_PCA953X is not set
894# CONFIG_GPIO_PCF857X is not set 896# CONFIG_GPIO_PCF857X is not set
897# CONFIG_GPIO_ADP5588 is not set
895 898
896# 899#
897# PCI GPIO expanders: 900# PCI GPIO expanders:
@@ -923,22 +926,25 @@ CONFIG_SSB_POSSIBLE=y
923# Multifunction device drivers 926# Multifunction device drivers
924# 927#
925# CONFIG_MFD_CORE is not set 928# CONFIG_MFD_CORE is not set
929# CONFIG_MFD_88PM860X is not set
926# CONFIG_MFD_SM501 is not set 930# CONFIG_MFD_SM501 is not set
927# CONFIG_MFD_SH_MOBILE_SDHI is not set 931# CONFIG_MFD_SH_MOBILE_SDHI is not set
928# CONFIG_HTC_PASIC3 is not set 932# CONFIG_HTC_PASIC3 is not set
933# CONFIG_HTC_I2CPLD is not set
929# CONFIG_TPS65010 is not set 934# CONFIG_TPS65010 is not set
930# CONFIG_TWL4030_CORE is not set 935# CONFIG_TWL4030_CORE is not set
931# CONFIG_MFD_TMIO is not set 936# CONFIG_MFD_TMIO is not set
932# CONFIG_PMIC_DA903X is not set 937# CONFIG_PMIC_DA903X is not set
933# CONFIG_PMIC_ADP5520 is not set 938# CONFIG_PMIC_ADP5520 is not set
939# CONFIG_MFD_MAX8925 is not set
934# CONFIG_MFD_WM8400 is not set 940# CONFIG_MFD_WM8400 is not set
935# CONFIG_MFD_WM831X is not set 941# CONFIG_MFD_WM831X is not set
936# CONFIG_MFD_WM8350_I2C is not set 942# CONFIG_MFD_WM8350_I2C is not set
943# CONFIG_MFD_WM8994 is not set
937# CONFIG_MFD_PCF50633 is not set 944# CONFIG_MFD_PCF50633 is not set
938# CONFIG_MFD_MC13783 is not set 945# CONFIG_MFD_MC13783 is not set
939# CONFIG_AB3100_CORE is not set 946# CONFIG_AB3100_CORE is not set
940# CONFIG_EZX_PCAP is not set 947# CONFIG_EZX_PCAP is not set
941# CONFIG_MFD_88PM8607 is not set
942# CONFIG_AB4500_CORE is not set 948# CONFIG_AB4500_CORE is not set
943# CONFIG_REGULATOR is not set 949# CONFIG_REGULATOR is not set
944CONFIG_MEDIA_SUPPORT=y 950CONFIG_MEDIA_SUPPORT=y
@@ -1001,7 +1007,9 @@ CONFIG_USB_GSPCA=m
1001# CONFIG_USB_M5602 is not set 1007# CONFIG_USB_M5602 is not set
1002# CONFIG_USB_STV06XX is not set 1008# CONFIG_USB_STV06XX is not set
1003# CONFIG_USB_GL860 is not set 1009# CONFIG_USB_GL860 is not set
1010# CONFIG_USB_GSPCA_BENQ is not set
1004# CONFIG_USB_GSPCA_CONEX is not set 1011# CONFIG_USB_GSPCA_CONEX is not set
1012# CONFIG_USB_GSPCA_CPIA1 is not set
1005# CONFIG_USB_GSPCA_ETOMS is not set 1013# CONFIG_USB_GSPCA_ETOMS is not set
1006# CONFIG_USB_GSPCA_FINEPIX is not set 1014# CONFIG_USB_GSPCA_FINEPIX is not set
1007# CONFIG_USB_GSPCA_JEILINJ is not set 1015# CONFIG_USB_GSPCA_JEILINJ is not set
@@ -1009,9 +1017,11 @@ CONFIG_USB_GSPCA=m
1009# CONFIG_USB_GSPCA_MR97310A is not set 1017# CONFIG_USB_GSPCA_MR97310A is not set
1010# CONFIG_USB_GSPCA_OV519 is not set 1018# CONFIG_USB_GSPCA_OV519 is not set
1011# CONFIG_USB_GSPCA_OV534 is not set 1019# CONFIG_USB_GSPCA_OV534 is not set
1020# CONFIG_USB_GSPCA_OV534_9 is not set
1012# CONFIG_USB_GSPCA_PAC207 is not set 1021# CONFIG_USB_GSPCA_PAC207 is not set
1013# CONFIG_USB_GSPCA_PAC7302 is not set 1022# CONFIG_USB_GSPCA_PAC7302 is not set
1014# CONFIG_USB_GSPCA_PAC7311 is not set 1023# CONFIG_USB_GSPCA_PAC7311 is not set
1024# CONFIG_USB_GSPCA_SN9C2028 is not set
1015# CONFIG_USB_GSPCA_SN9C20X is not set 1025# CONFIG_USB_GSPCA_SN9C20X is not set
1016# CONFIG_USB_GSPCA_SONIXB is not set 1026# CONFIG_USB_GSPCA_SONIXB is not set
1017# CONFIG_USB_GSPCA_SONIXJ is not set 1027# CONFIG_USB_GSPCA_SONIXJ is not set
@@ -1033,6 +1043,7 @@ CONFIG_USB_GSPCA=m
1033# CONFIG_VIDEO_PVRUSB2 is not set 1043# CONFIG_VIDEO_PVRUSB2 is not set
1034# CONFIG_VIDEO_HDPVR is not set 1044# CONFIG_VIDEO_HDPVR is not set
1035# CONFIG_VIDEO_EM28XX is not set 1045# CONFIG_VIDEO_EM28XX is not set
1046# CONFIG_VIDEO_TLG2300 is not set
1036# CONFIG_VIDEO_CX231XX is not set 1047# CONFIG_VIDEO_CX231XX is not set
1037# CONFIG_VIDEO_USBVISION is not set 1048# CONFIG_VIDEO_USBVISION is not set
1038# CONFIG_USB_ET61X251 is not set 1049# CONFIG_USB_ET61X251 is not set
@@ -1147,6 +1158,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1147# CONFIG_SND_SUPERH is not set 1158# CONFIG_SND_SUPERH is not set
1148CONFIG_SND_USB=y 1159CONFIG_SND_USB=y
1149# CONFIG_SND_USB_AUDIO is not set 1160# CONFIG_SND_USB_AUDIO is not set
1161# CONFIG_SND_USB_UA101 is not set
1150# CONFIG_SND_USB_CAIAQ is not set 1162# CONFIG_SND_USB_CAIAQ is not set
1151CONFIG_SND_SOC=m 1163CONFIG_SND_SOC=m
1152 1164
@@ -1155,6 +1167,7 @@ CONFIG_SND_SOC=m
1155# 1167#
1156CONFIG_SND_SOC_SH4_FSI=m 1168CONFIG_SND_SOC_SH4_FSI=m
1157CONFIG_SND_FSI_AK4642=y 1169CONFIG_SND_FSI_AK4642=y
1170# CONFIG_SND_FSI_DA7210 is not set
1158CONFIG_SND_SOC_I2C_AND_SPI=m 1171CONFIG_SND_SOC_I2C_AND_SPI=m
1159CONFIG_SND_SOC_ALL_CODECS=m 1172CONFIG_SND_SOC_ALL_CODECS=m
1160CONFIG_SND_SOC_WM_HUBS=m 1173CONFIG_SND_SOC_WM_HUBS=m
@@ -1167,6 +1180,7 @@ CONFIG_SND_SOC_AK4535=m
1167CONFIG_SND_SOC_AK4642=m 1180CONFIG_SND_SOC_AK4642=m
1168CONFIG_SND_SOC_AK4671=m 1181CONFIG_SND_SOC_AK4671=m
1169CONFIG_SND_SOC_CS4270=m 1182CONFIG_SND_SOC_CS4270=m
1183CONFIG_SND_SOC_DA7210=m
1170CONFIG_SND_SOC_L3=m 1184CONFIG_SND_SOC_L3=m
1171CONFIG_SND_SOC_PCM3008=m 1185CONFIG_SND_SOC_PCM3008=m
1172CONFIG_SND_SOC_SPDIF=m 1186CONFIG_SND_SOC_SPDIF=m
@@ -1189,17 +1203,21 @@ CONFIG_SND_SOC_WM8753=m
1189CONFIG_SND_SOC_WM8776=m 1203CONFIG_SND_SOC_WM8776=m
1190CONFIG_SND_SOC_WM8900=m 1204CONFIG_SND_SOC_WM8900=m
1191CONFIG_SND_SOC_WM8903=m 1205CONFIG_SND_SOC_WM8903=m
1206CONFIG_SND_SOC_WM8904=m
1192CONFIG_SND_SOC_WM8940=m 1207CONFIG_SND_SOC_WM8940=m
1208CONFIG_SND_SOC_WM8955=m
1193CONFIG_SND_SOC_WM8960=m 1209CONFIG_SND_SOC_WM8960=m
1194CONFIG_SND_SOC_WM8961=m 1210CONFIG_SND_SOC_WM8961=m
1195CONFIG_SND_SOC_WM8971=m 1211CONFIG_SND_SOC_WM8971=m
1196CONFIG_SND_SOC_WM8974=m 1212CONFIG_SND_SOC_WM8974=m
1213CONFIG_SND_SOC_WM8978=m
1197CONFIG_SND_SOC_WM8988=m 1214CONFIG_SND_SOC_WM8988=m
1198CONFIG_SND_SOC_WM8990=m 1215CONFIG_SND_SOC_WM8990=m
1199CONFIG_SND_SOC_WM8993=m 1216CONFIG_SND_SOC_WM8993=m
1200CONFIG_SND_SOC_WM9081=m 1217CONFIG_SND_SOC_WM9081=m
1201CONFIG_SND_SOC_MAX9877=m 1218CONFIG_SND_SOC_MAX9877=m
1202CONFIG_SND_SOC_TPA6130A2=m 1219CONFIG_SND_SOC_TPA6130A2=m
1220CONFIG_SND_SOC_WM2000=m
1203# CONFIG_SOUND_PRIME is not set 1221# CONFIG_SOUND_PRIME is not set
1204CONFIG_HID_SUPPORT=y 1222CONFIG_HID_SUPPORT=y
1205CONFIG_HID=y 1223CONFIG_HID=y
@@ -1215,6 +1233,7 @@ CONFIG_USB_HID=y
1215# 1233#
1216# Special HID drivers 1234# Special HID drivers
1217# 1235#
1236# CONFIG_HID_3M_PCT is not set
1218# CONFIG_HID_A4TECH is not set 1237# CONFIG_HID_A4TECH is not set
1219# CONFIG_HID_APPLE is not set 1238# CONFIG_HID_APPLE is not set
1220# CONFIG_HID_BELKIN is not set 1239# CONFIG_HID_BELKIN is not set
@@ -1229,12 +1248,16 @@ CONFIG_USB_HID=y
1229# CONFIG_HID_KENSINGTON is not set 1248# CONFIG_HID_KENSINGTON is not set
1230# CONFIG_HID_LOGITECH is not set 1249# CONFIG_HID_LOGITECH is not set
1231# CONFIG_HID_MICROSOFT is not set 1250# CONFIG_HID_MICROSOFT is not set
1251# CONFIG_HID_MOSART is not set
1232# CONFIG_HID_MONTEREY is not set 1252# CONFIG_HID_MONTEREY is not set
1233# CONFIG_HID_NTRIG is not set 1253# CONFIG_HID_NTRIG is not set
1254# CONFIG_HID_ORTEK is not set
1234# CONFIG_HID_PANTHERLORD is not set 1255# CONFIG_HID_PANTHERLORD is not set
1235# CONFIG_HID_PETALYNX is not set 1256# CONFIG_HID_PETALYNX is not set
1257# CONFIG_HID_QUANTA is not set
1236# CONFIG_HID_SAMSUNG is not set 1258# CONFIG_HID_SAMSUNG is not set
1237# CONFIG_HID_SONY is not set 1259# CONFIG_HID_SONY is not set
1260# CONFIG_HID_STANTUM is not set
1238# CONFIG_HID_SUNPLUS is not set 1261# CONFIG_HID_SUNPLUS is not set
1239# CONFIG_HID_GREENASIA is not set 1262# CONFIG_HID_GREENASIA is not set
1240# CONFIG_HID_SMARTJOYPLUS is not set 1263# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1327,7 +1350,6 @@ CONFIG_USB_STORAGE=y
1327# CONFIG_USB_RIO500 is not set 1350# CONFIG_USB_RIO500 is not set
1328# CONFIG_USB_LEGOTOWER is not set 1351# CONFIG_USB_LEGOTOWER is not set
1329# CONFIG_USB_LCD is not set 1352# CONFIG_USB_LCD is not set
1330# CONFIG_USB_BERRY_CHARGE is not set
1331# CONFIG_USB_LED is not set 1353# CONFIG_USB_LED is not set
1332# CONFIG_USB_CYPRESS_CY7C63 is not set 1354# CONFIG_USB_CYPRESS_CY7C63 is not set
1333# CONFIG_USB_CYTHERM is not set 1355# CONFIG_USB_CYTHERM is not set
@@ -1339,7 +1361,6 @@ CONFIG_USB_STORAGE=y
1339# CONFIG_USB_IOWARRIOR is not set 1361# CONFIG_USB_IOWARRIOR is not set
1340# CONFIG_USB_TEST is not set 1362# CONFIG_USB_TEST is not set
1341# CONFIG_USB_ISIGHTFW is not set 1363# CONFIG_USB_ISIGHTFW is not set
1342# CONFIG_USB_VST is not set
1343CONFIG_USB_GADGET=y 1364CONFIG_USB_GADGET=y
1344# CONFIG_USB_GADGET_DEBUG_FILES is not set 1365# CONFIG_USB_GADGET_DEBUG_FILES is not set
1345CONFIG_USB_GADGET_VBUS_DRAW=2 1366CONFIG_USB_GADGET_VBUS_DRAW=2
@@ -1378,6 +1399,7 @@ CONFIG_USB_G_SERIAL=m
1378# CONFIG_USB_MIDI_GADGET is not set 1399# CONFIG_USB_MIDI_GADGET is not set
1379# CONFIG_USB_G_PRINTER is not set 1400# CONFIG_USB_G_PRINTER is not set
1380# CONFIG_USB_CDC_COMPOSITE is not set 1401# CONFIG_USB_CDC_COMPOSITE is not set
1402# CONFIG_USB_G_NOKIA is not set
1381# CONFIG_USB_G_MULTI is not set 1403# CONFIG_USB_G_MULTI is not set
1382 1404
1383# 1405#
@@ -1401,10 +1423,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1401# MMC/SD/SDIO Host Controller Drivers 1423# MMC/SD/SDIO Host Controller Drivers
1402# 1424#
1403# CONFIG_MMC_SDHCI is not set 1425# CONFIG_MMC_SDHCI is not set
1404# CONFIG_MMC_AT91 is not set
1405# CONFIG_MMC_ATMELMCI is not set
1406CONFIG_MMC_SPI=y 1426CONFIG_MMC_SPI=y
1407# CONFIG_MMC_TMIO is not set
1408# CONFIG_MEMSTICK is not set 1427# CONFIG_MEMSTICK is not set
1409# CONFIG_NEW_LEDS is not set 1428# CONFIG_NEW_LEDS is not set
1410# CONFIG_ACCESSIBILITY is not set 1429# CONFIG_ACCESSIBILITY is not set
@@ -1480,8 +1499,6 @@ CONFIG_RTC_DRV_PCF8563=y
1480CONFIG_UIO=y 1499CONFIG_UIO=y
1481# CONFIG_UIO_PDRV is not set 1500# CONFIG_UIO_PDRV is not set
1482CONFIG_UIO_PDRV_GENIRQ=y 1501CONFIG_UIO_PDRV_GENIRQ=y
1483# CONFIG_UIO_SMX is not set
1484# CONFIG_UIO_SERCOS3 is not set
1485 1502
1486# 1503#
1487# TI VLYNQ 1504# TI VLYNQ
@@ -1566,6 +1583,7 @@ CONFIG_MISC_FILESYSTEMS=y
1566# CONFIG_EFS_FS is not set 1583# CONFIG_EFS_FS is not set
1567# CONFIG_JFFS2_FS is not set 1584# CONFIG_JFFS2_FS is not set
1568# CONFIG_UBIFS_FS is not set 1585# CONFIG_UBIFS_FS is not set
1586# CONFIG_LOGFS is not set
1569# CONFIG_CRAMFS is not set 1587# CONFIG_CRAMFS is not set
1570# CONFIG_SQUASHFS is not set 1588# CONFIG_SQUASHFS is not set
1571# CONFIG_VXFS_FS is not set 1589# CONFIG_VXFS_FS is not set
@@ -1594,6 +1612,7 @@ CONFIG_SUNRPC=y
1594# CONFIG_RPCSEC_GSS_KRB5 is not set 1612# CONFIG_RPCSEC_GSS_KRB5 is not set
1595# CONFIG_RPCSEC_GSS_SPKM3 is not set 1613# CONFIG_RPCSEC_GSS_SPKM3 is not set
1596# CONFIG_SMB_FS is not set 1614# CONFIG_SMB_FS is not set
1615# CONFIG_CEPH_FS is not set
1597# CONFIG_CIFS is not set 1616# CONFIG_CIFS is not set
1598# CONFIG_NCP_FS is not set 1617# CONFIG_NCP_FS is not set
1599# CONFIG_CODA_FS is not set 1618# CONFIG_CODA_FS is not set
@@ -1786,6 +1805,7 @@ CONFIG_CRYPTO_CBC=y
1786# 1805#
1787# CONFIG_CRYPTO_ANSI_CPRNG is not set 1806# CONFIG_CRYPTO_ANSI_CPRNG is not set
1788CONFIG_CRYPTO_HW=y 1807CONFIG_CRYPTO_HW=y
1808# CONFIG_VIRTUALIZATION is not set
1789# CONFIG_BINARY_PRINTF is not set 1809# CONFIG_BINARY_PRINTF is not set
1790 1810
1791# 1811#
diff --git a/arch/sh/configs/se7750_defconfig b/arch/sh/configs/se7750_defconfig
index b15a44e2ec4..e096c3e7e18 100644
--- a/arch/sh/configs/se7750_defconfig
+++ b/arch/sh/configs/se7750_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-rc5
4# Mon Jan 4 14:39:10 2010 4# Tue May 18 17:00:16 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51# CONFIG_SWAP is not set 54# CONFIG_SWAP is not set
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -70,7 +73,6 @@ CONFIG_RCU_FANOUT=32
70CONFIG_IKCONFIG=y 73CONFIG_IKCONFIG=y
71CONFIG_IKCONFIG_PROC=y 74CONFIG_IKCONFIG_PROC=y
72CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
73# CONFIG_GROUP_SCHED is not set
74# CONFIG_CGROUPS is not set 76# CONFIG_CGROUPS is not set
75CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
76CONFIG_SYSFS_DEPRECATED_V2=y 78CONFIG_SYSFS_DEPRECATED_V2=y
@@ -103,7 +105,7 @@ CONFIG_PERF_USE_VMALLOC=y
103# 105#
104# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
105# 107#
106# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
107# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
108CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
109CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
@@ -120,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
120CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
121CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
122CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
123 126
124# 127#
125# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -237,6 +240,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
237CONFIG_MAX_ACTIVE_REGIONS=1 240CONFIG_MAX_ACTIVE_REGIONS=1
238CONFIG_ARCH_POPULATES_NODE_MAP=y 241CONFIG_ARCH_POPULATES_NODE_MAP=y
239CONFIG_ARCH_SELECT_MEMORY_MODEL=y 242CONFIG_ARCH_SELECT_MEMORY_MODEL=y
243CONFIG_UNCACHED_MAPPING=y
240CONFIG_PAGE_SIZE_4KB=y 244CONFIG_PAGE_SIZE_4KB=y
241# CONFIG_PAGE_SIZE_8KB is not set 245# CONFIG_PAGE_SIZE_8KB is not set
242# CONFIG_PAGE_SIZE_16KB is not set 246# CONFIG_PAGE_SIZE_16KB is not set
@@ -252,7 +256,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
252CONFIG_SPLIT_PTLOCK_CPUS=4 256CONFIG_SPLIT_PTLOCK_CPUS=4
253# CONFIG_PHYS_ADDR_T_64BIT is not set 257# CONFIG_PHYS_ADDR_T_64BIT is not set
254CONFIG_ZONE_DMA_FLAG=0 258CONFIG_ZONE_DMA_FLAG=0
255CONFIG_NR_QUICK=2 259CONFIG_NR_QUICK=1
256# CONFIG_KSM is not set 260# CONFIG_KSM is not set
257CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 261CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
258 262
@@ -329,7 +333,6 @@ CONFIG_PREEMPT_NONE=y
329# CONFIG_PREEMPT is not set 333# CONFIG_PREEMPT is not set
330CONFIG_GUSA=y 334CONFIG_GUSA=y
331# CONFIG_GUSA_RB is not set 335# CONFIG_GUSA_RB is not set
332# CONFIG_SPARSE_IRQ is not set
333 336
334# 337#
335# Boot options 338# Boot options
@@ -364,7 +367,6 @@ CONFIG_NET=y
364# Networking options 367# Networking options
365# 368#
366CONFIG_PACKET=y 369CONFIG_PACKET=y
367# CONFIG_PACKET_MMAP is not set
368CONFIG_UNIX=y 370CONFIG_UNIX=y
369CONFIG_XFRM=y 371CONFIG_XFRM=y
370# CONFIG_XFRM_USER is not set 372# CONFIG_XFRM_USER is not set
@@ -580,6 +582,7 @@ CONFIG_IDE_PROC_FS=y
580# 582#
581# SCSI device support 583# SCSI device support
582# 584#
585CONFIG_SCSI_MOD=y
583# CONFIG_RAID_ATTRS is not set 586# CONFIG_RAID_ATTRS is not set
584CONFIG_SCSI=y 587CONFIG_SCSI=y
585CONFIG_SCSI_DMA=y 588CONFIG_SCSI_DMA=y
@@ -698,6 +701,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
698CONFIG_SERIAL_SH_SCI_CONSOLE=y 701CONFIG_SERIAL_SH_SCI_CONSOLE=y
699CONFIG_SERIAL_CORE=y 702CONFIG_SERIAL_CORE=y
700CONFIG_SERIAL_CORE_CONSOLE=y 703CONFIG_SERIAL_CORE_CONSOLE=y
704# CONFIG_SERIAL_TIMBERDALE is not set
701CONFIG_UNIX98_PTYS=y 705CONFIG_UNIX98_PTYS=y
702# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 706# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
703CONFIG_LEGACY_PTYS=y 707CONFIG_LEGACY_PTYS=y
@@ -816,7 +820,6 @@ CONFIG_RTC_LIB=y
816# CONFIG_EXT2_FS is not set 820# CONFIG_EXT2_FS is not set
817# CONFIG_EXT3_FS is not set 821# CONFIG_EXT3_FS is not set
818# CONFIG_EXT4_FS is not set 822# CONFIG_EXT4_FS is not set
819CONFIG_EXT4_USE_FOR_EXT23=y
820# CONFIG_REISERFS_FS is not set 823# CONFIG_REISERFS_FS is not set
821# CONFIG_JFS_FS is not set 824# CONFIG_JFS_FS is not set
822# CONFIG_FS_POSIX_ACL is not set 825# CONFIG_FS_POSIX_ACL is not set
@@ -885,6 +888,7 @@ CONFIG_JFFS2_ZLIB=y
885# CONFIG_JFFS2_LZO is not set 888# CONFIG_JFFS2_LZO is not set
886CONFIG_JFFS2_RTIME=y 889CONFIG_JFFS2_RTIME=y
887# CONFIG_JFFS2_RUBIN is not set 890# CONFIG_JFFS2_RUBIN is not set
891# CONFIG_LOGFS is not set
888# CONFIG_CRAMFS is not set 892# CONFIG_CRAMFS is not set
889# CONFIG_SQUASHFS is not set 893# CONFIG_SQUASHFS is not set
890# CONFIG_VXFS_FS is not set 894# CONFIG_VXFS_FS is not set
@@ -907,6 +911,7 @@ CONFIG_SUNRPC=y
907# CONFIG_RPCSEC_GSS_KRB5 is not set 911# CONFIG_RPCSEC_GSS_KRB5 is not set
908# CONFIG_RPCSEC_GSS_SPKM3 is not set 912# CONFIG_RPCSEC_GSS_SPKM3 is not set
909# CONFIG_SMB_FS is not set 913# CONFIG_SMB_FS is not set
914# CONFIG_CEPH_FS is not set
910# CONFIG_CIFS is not set 915# CONFIG_CIFS is not set
911# CONFIG_NCP_FS is not set 916# CONFIG_NCP_FS is not set
912# CONFIG_CODA_FS is not set 917# CONFIG_CODA_FS is not set
@@ -1063,6 +1068,7 @@ CONFIG_CRYPTO=y
1063# 1068#
1064# CONFIG_CRYPTO_ANSI_CPRNG is not set 1069# CONFIG_CRYPTO_ANSI_CPRNG is not set
1065CONFIG_CRYPTO_HW=y 1070CONFIG_CRYPTO_HW=y
1071# CONFIG_VIRTUALIZATION is not set
1066# CONFIG_BINARY_PRINTF is not set 1072# CONFIG_BINARY_PRINTF is not set
1067 1073
1068# 1074#
diff --git a/arch/sh/configs/se7751_defconfig b/arch/sh/configs/se7751_defconfig
index d1effdeaa41..84d3facf6a3 100644
--- a/arch/sh/configs/se7751_defconfig
+++ b/arch/sh/configs/se7751_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-rc5
4# Mon Jan 4 14:39:56 2010 4# Tue May 18 17:03:26 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -69,7 +72,6 @@ CONFIG_RCU_FANOUT=32
69# CONFIG_TREE_RCU_TRACE is not set 72# CONFIG_TREE_RCU_TRACE is not set
70# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72# CONFIG_GROUP_SCHED is not set
73# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
74CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
75CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -80,6 +82,7 @@ CONFIG_INITRAMFS_SOURCE=""
80CONFIG_RD_GZIP=y 82CONFIG_RD_GZIP=y
81# CONFIG_RD_BZIP2 is not set 83# CONFIG_RD_BZIP2 is not set
82# CONFIG_RD_LZMA is not set 84# CONFIG_RD_LZMA is not set
85# CONFIG_RD_LZO is not set
83# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 86# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
84CONFIG_SYSCTL=y 87CONFIG_SYSCTL=y
85CONFIG_ANON_INODES=y 88CONFIG_ANON_INODES=y
@@ -106,7 +109,7 @@ CONFIG_PERF_USE_VMALLOC=y
106# 109#
107# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
108# 111#
109# CONFIG_PERF_EVENTS is not set 112CONFIG_PERF_EVENTS=y
110# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
111CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
112CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
@@ -123,6 +126,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_HAVE_DMA_ATTRS=y 126CONFIG_HAVE_DMA_ATTRS=y
124CONFIG_HAVE_CLK=y 127CONFIG_HAVE_CLK=y
125CONFIG_HAVE_DMA_API_DEBUG=y 128CONFIG_HAVE_DMA_API_DEBUG=y
129CONFIG_HAVE_HW_BREAKPOINT=y
126 130
127# 131#
128# GCOV-based kernel profiling 132# GCOV-based kernel profiling
@@ -240,6 +244,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
240CONFIG_MAX_ACTIVE_REGIONS=1 244CONFIG_MAX_ACTIVE_REGIONS=1
241CONFIG_ARCH_POPULATES_NODE_MAP=y 245CONFIG_ARCH_POPULATES_NODE_MAP=y
242CONFIG_ARCH_SELECT_MEMORY_MODEL=y 246CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_UNCACHED_MAPPING=y
243CONFIG_PAGE_SIZE_4KB=y 248CONFIG_PAGE_SIZE_4KB=y
244# CONFIG_PAGE_SIZE_8KB is not set 249# CONFIG_PAGE_SIZE_8KB is not set
245# CONFIG_PAGE_SIZE_16KB is not set 250# CONFIG_PAGE_SIZE_16KB is not set
@@ -255,7 +260,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
255CONFIG_SPLIT_PTLOCK_CPUS=4 260CONFIG_SPLIT_PTLOCK_CPUS=4
256# CONFIG_PHYS_ADDR_T_64BIT is not set 261# CONFIG_PHYS_ADDR_T_64BIT is not set
257CONFIG_ZONE_DMA_FLAG=0 262CONFIG_ZONE_DMA_FLAG=0
258CONFIG_NR_QUICK=2 263CONFIG_NR_QUICK=1
259# CONFIG_KSM is not set 264# CONFIG_KSM is not set
260CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
261 266
@@ -333,7 +338,6 @@ CONFIG_PREEMPT_NONE=y
333# CONFIG_PREEMPT is not set 338# CONFIG_PREEMPT is not set
334CONFIG_GUSA=y 339CONFIG_GUSA=y
335# CONFIG_GUSA_RB is not set 340# CONFIG_GUSA_RB is not set
336# CONFIG_SPARSE_IRQ is not set
337 341
338# 342#
339# Boot options 343# Boot options
@@ -369,7 +373,6 @@ CONFIG_NET=y
369# Networking options 373# Networking options
370# 374#
371CONFIG_PACKET=y 375CONFIG_PACKET=y
372# CONFIG_PACKET_MMAP is not set
373CONFIG_UNIX=y 376CONFIG_UNIX=y
374CONFIG_XFRM=y 377CONFIG_XFRM=y
375# CONFIG_XFRM_USER is not set 378# CONFIG_XFRM_USER is not set
@@ -589,6 +592,7 @@ CONFIG_HAVE_IDE=y
589# 592#
590# SCSI device support 593# SCSI device support
591# 594#
595CONFIG_SCSI_MOD=y
592# CONFIG_RAID_ATTRS is not set 596# CONFIG_RAID_ATTRS is not set
593# CONFIG_SCSI is not set 597# CONFIG_SCSI is not set
594# CONFIG_SCSI_DMA is not set 598# CONFIG_SCSI_DMA is not set
@@ -666,6 +670,7 @@ CONFIG_DEVKMEM=y
666# Non-8250 serial port support 670# Non-8250 serial port support
667# 671#
668# CONFIG_SERIAL_SH_SCI is not set 672# CONFIG_SERIAL_SH_SCI is not set
673# CONFIG_SERIAL_TIMBERDALE is not set
669CONFIG_UNIX98_PTYS=y 674CONFIG_UNIX98_PTYS=y
670# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 675# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
671CONFIG_LEGACY_PTYS=y 676CONFIG_LEGACY_PTYS=y
@@ -785,7 +790,6 @@ CONFIG_EXT2_FS=y
785# CONFIG_EXT2_FS_XIP is not set 790# CONFIG_EXT2_FS_XIP is not set
786# CONFIG_EXT3_FS is not set 791# CONFIG_EXT3_FS is not set
787# CONFIG_EXT4_FS is not set 792# CONFIG_EXT4_FS is not set
788CONFIG_EXT4_USE_FOR_EXT23=y
789# CONFIG_REISERFS_FS is not set 793# CONFIG_REISERFS_FS is not set
790# CONFIG_JFS_FS is not set 794# CONFIG_JFS_FS is not set
791# CONFIG_FS_POSIX_ACL is not set 795# CONFIG_FS_POSIX_ACL is not set
@@ -854,6 +858,7 @@ CONFIG_JFFS2_ZLIB=y
854# CONFIG_JFFS2_LZO is not set 858# CONFIG_JFFS2_LZO is not set
855CONFIG_JFFS2_RTIME=y 859CONFIG_JFFS2_RTIME=y
856# CONFIG_JFFS2_RUBIN is not set 860# CONFIG_JFFS2_RUBIN is not set
861# CONFIG_LOGFS is not set
857# CONFIG_CRAMFS is not set 862# CONFIG_CRAMFS is not set
858# CONFIG_SQUASHFS is not set 863# CONFIG_SQUASHFS is not set
859# CONFIG_VXFS_FS is not set 864# CONFIG_VXFS_FS is not set
@@ -868,6 +873,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
868# CONFIG_NFS_FS is not set 873# CONFIG_NFS_FS is not set
869# CONFIG_NFSD is not set 874# CONFIG_NFSD is not set
870# CONFIG_SMB_FS is not set 875# CONFIG_SMB_FS is not set
876# CONFIG_CEPH_FS is not set
871# CONFIG_CIFS is not set 877# CONFIG_CIFS is not set
872# CONFIG_NCP_FS is not set 878# CONFIG_NCP_FS is not set
873# CONFIG_CODA_FS is not set 879# CONFIG_CODA_FS is not set
@@ -1012,6 +1018,7 @@ CONFIG_CRYPTO=y
1012# 1018#
1013# CONFIG_CRYPTO_ANSI_CPRNG is not set 1019# CONFIG_CRYPTO_ANSI_CPRNG is not set
1014CONFIG_CRYPTO_HW=y 1020CONFIG_CRYPTO_HW=y
1021# CONFIG_VIRTUALIZATION is not set
1015# CONFIG_BINARY_PRINTF is not set 1022# CONFIG_BINARY_PRINTF is not set
1016 1023
1017# 1024#
diff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defconfig
index 58533d50f06..f0d7e679e75 100644
--- a/arch/sh/configs/se7780_defconfig
+++ b/arch/sh/configs/se7780_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-rc5
4# Mon Jan 4 14:40:32 2010 4# Tue May 18 17:06:12 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52# CONFIG_SWAP is not set 55# CONFIG_SWAP is not set
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -100,7 +103,7 @@ CONFIG_PERF_USE_VMALLOC=y
100# 103#
101# Kernel Performance Events And Counters 104# Kernel Performance Events And Counters
102# 105#
103# CONFIG_PERF_EVENTS is not set 106CONFIG_PERF_EVENTS=y
104# CONFIG_PERF_COUNTERS is not set 107# CONFIG_PERF_COUNTERS is not set
105CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
106CONFIG_PCI_QUIRKS=y 109CONFIG_PCI_QUIRKS=y
@@ -117,6 +120,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
117CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
118CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
119CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
120 124
121# 125#
122# GCOV-based kernel profiling 126# GCOV-based kernel profiling
@@ -238,6 +242,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
238CONFIG_ARCH_SELECT_MEMORY_MODEL=y 242CONFIG_ARCH_SELECT_MEMORY_MODEL=y
239CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 243CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
240CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
245CONFIG_UNCACHED_MAPPING=y
241CONFIG_PAGE_SIZE_4KB=y 246CONFIG_PAGE_SIZE_4KB=y
242# CONFIG_PAGE_SIZE_8KB is not set 247# CONFIG_PAGE_SIZE_8KB is not set
243# CONFIG_PAGE_SIZE_16KB is not set 248# CONFIG_PAGE_SIZE_16KB is not set
@@ -253,7 +258,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
253CONFIG_MIGRATION=y 258CONFIG_MIGRATION=y
254# CONFIG_PHYS_ADDR_T_64BIT is not set 259# CONFIG_PHYS_ADDR_T_64BIT is not set
255CONFIG_ZONE_DMA_FLAG=0 260CONFIG_ZONE_DMA_FLAG=0
256CONFIG_NR_QUICK=2 261CONFIG_NR_QUICK=1
257# CONFIG_KSM is not set 262# CONFIG_KSM is not set
258CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
259 264
@@ -328,6 +333,7 @@ CONFIG_PREEMPT_NONE=y
328# CONFIG_PREEMPT_VOLUNTARY is not set 333# CONFIG_PREEMPT_VOLUNTARY is not set
329# CONFIG_PREEMPT is not set 334# CONFIG_PREEMPT is not set
330CONFIG_GUSA=y 335CONFIG_GUSA=y
336# CONFIG_INTC_USERIMASK is not set
331 337
332# 338#
333# Boot options 339# Boot options
@@ -343,9 +349,9 @@ CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
343# Bus options 349# Bus options
344# 350#
345CONFIG_PCI=y 351CONFIG_PCI=y
352CONFIG_PCI_DOMAINS=y
346# CONFIG_PCIEPORTBUS is not set 353# CONFIG_PCIEPORTBUS is not set
347# CONFIG_ARCH_SUPPORTS_MSI is not set 354# CONFIG_ARCH_SUPPORTS_MSI is not set
348CONFIG_PCI_LEGACY=y
349# CONFIG_PCI_STUB is not set 355# CONFIG_PCI_STUB is not set
350# CONFIG_PCI_IOV is not set 356# CONFIG_PCI_IOV is not set
351 357
@@ -362,7 +368,6 @@ CONFIG_NET=y
362# Networking options 368# Networking options
363# 369#
364CONFIG_PACKET=y 370CONFIG_PACKET=y
365# CONFIG_PACKET_MMAP is not set
366CONFIG_UNIX=y 371CONFIG_UNIX=y
367CONFIG_XFRM=y 372CONFIG_XFRM=y
368# CONFIG_XFRM_USER is not set 373# CONFIG_XFRM_USER is not set
@@ -571,6 +576,7 @@ CONFIG_HAVE_IDE=y
571# 576#
572# SCSI device support 577# SCSI device support
573# 578#
579CONFIG_SCSI_MOD=y
574# CONFIG_RAID_ATTRS is not set 580# CONFIG_RAID_ATTRS is not set
575CONFIG_SCSI=y 581CONFIG_SCSI=y
576CONFIG_SCSI_DMA=y 582CONFIG_SCSI_DMA=y
@@ -714,7 +720,7 @@ CONFIG_SATA_SIL=y
714# 720#
715 721
716# 722#
717# See the help texts for more information. 723# The newer stack is recommended.
718# 724#
719# CONFIG_FIREWIRE is not set 725# CONFIG_FIREWIRE is not set
720# CONFIG_IEEE1394 is not set 726# CONFIG_IEEE1394 is not set
@@ -772,6 +778,7 @@ CONFIG_NET_PCI=y
772# CONFIG_PCNET32 is not set 778# CONFIG_PCNET32 is not set
773# CONFIG_AMD8111_ETH is not set 779# CONFIG_AMD8111_ETH is not set
774# CONFIG_ADAPTEC_STARFIRE is not set 780# CONFIG_ADAPTEC_STARFIRE is not set
781# CONFIG_KSZ884X_PCI is not set
775# CONFIG_B44 is not set 782# CONFIG_B44 is not set
776# CONFIG_FORCEDETH is not set 783# CONFIG_FORCEDETH is not set
777# CONFIG_E100 is not set 784# CONFIG_E100 is not set
@@ -807,6 +814,7 @@ CONFIG_WLAN=y
807# CONFIG_USB_KAWETH is not set 814# CONFIG_USB_KAWETH is not set
808# CONFIG_USB_PEGASUS is not set 815# CONFIG_USB_PEGASUS is not set
809# CONFIG_USB_USBNET is not set 816# CONFIG_USB_USBNET is not set
817# CONFIG_USB_IPHETH is not set
810# CONFIG_WAN is not set 818# CONFIG_WAN is not set
811# CONFIG_FDDI is not set 819# CONFIG_FDDI is not set
812# CONFIG_PPP is not set 820# CONFIG_PPP is not set
@@ -878,6 +886,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
878CONFIG_SERIAL_CORE=y 886CONFIG_SERIAL_CORE=y
879CONFIG_SERIAL_CORE_CONSOLE=y 887CONFIG_SERIAL_CORE_CONSOLE=y
880# CONFIG_SERIAL_JSM is not set 888# CONFIG_SERIAL_JSM is not set
889# CONFIG_SERIAL_TIMBERDALE is not set
881CONFIG_UNIX98_PTYS=y 890CONFIG_UNIX98_PTYS=y
882# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 891# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
883# CONFIG_LEGACY_PTYS is not set 892# CONFIG_LEGACY_PTYS is not set
@@ -928,6 +937,7 @@ CONFIG_SSB_POSSIBLE=y
928# CONFIG_MFD_SH_MOBILE_SDHI is not set 937# CONFIG_MFD_SH_MOBILE_SDHI is not set
929# CONFIG_HTC_PASIC3 is not set 938# CONFIG_HTC_PASIC3 is not set
930# CONFIG_MFD_TMIO is not set 939# CONFIG_MFD_TMIO is not set
940# CONFIG_LPC_SCH is not set
931# CONFIG_REGULATOR is not set 941# CONFIG_REGULATOR is not set
932# CONFIG_MEDIA_SUPPORT is not set 942# CONFIG_MEDIA_SUPPORT is not set
933 943
@@ -935,6 +945,7 @@ CONFIG_SSB_POSSIBLE=y
935# Graphics support 945# Graphics support
936# 946#
937CONFIG_VGA_ARB=y 947CONFIG_VGA_ARB=y
948CONFIG_VGA_ARB_MAX_GPUS=16
938# CONFIG_DRM is not set 949# CONFIG_DRM is not set
939# CONFIG_VGASTATE is not set 950# CONFIG_VGASTATE is not set
940# CONFIG_VIDEO_OUTPUT_CONTROL is not set 951# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1032,6 +1043,7 @@ CONFIG_USB_HID=y
1032# 1043#
1033# Special HID drivers 1044# Special HID drivers
1034# 1045#
1046# CONFIG_HID_3M_PCT is not set
1035CONFIG_HID_A4TECH=y 1047CONFIG_HID_A4TECH=y
1036CONFIG_HID_APPLE=y 1048CONFIG_HID_APPLE=y
1037CONFIG_HID_BELKIN=y 1049CONFIG_HID_BELKIN=y
@@ -1047,14 +1059,19 @@ CONFIG_HID_GYRATION=y
1047CONFIG_HID_LOGITECH=y 1059CONFIG_HID_LOGITECH=y
1048# CONFIG_LOGITECH_FF is not set 1060# CONFIG_LOGITECH_FF is not set
1049# CONFIG_LOGIRUMBLEPAD2_FF is not set 1061# CONFIG_LOGIRUMBLEPAD2_FF is not set
1062# CONFIG_LOGIG940_FF is not set
1050CONFIG_HID_MICROSOFT=y 1063CONFIG_HID_MICROSOFT=y
1064# CONFIG_HID_MOSART is not set
1051CONFIG_HID_MONTEREY=y 1065CONFIG_HID_MONTEREY=y
1052# CONFIG_HID_NTRIG is not set 1066# CONFIG_HID_NTRIG is not set
1067# CONFIG_HID_ORTEK is not set
1053CONFIG_HID_PANTHERLORD=y 1068CONFIG_HID_PANTHERLORD=y
1054# CONFIG_PANTHERLORD_FF is not set 1069# CONFIG_PANTHERLORD_FF is not set
1055CONFIG_HID_PETALYNX=y 1070CONFIG_HID_PETALYNX=y
1071# CONFIG_HID_QUANTA is not set
1056CONFIG_HID_SAMSUNG=y 1072CONFIG_HID_SAMSUNG=y
1057CONFIG_HID_SONY=y 1073CONFIG_HID_SONY=y
1074# CONFIG_HID_STANTUM is not set
1058CONFIG_HID_SUNPLUS=y 1075CONFIG_HID_SUNPLUS=y
1059# CONFIG_HID_GREENASIA is not set 1076# CONFIG_HID_GREENASIA is not set
1060# CONFIG_HID_SMARTJOYPLUS is not set 1077# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1148,7 +1165,6 @@ CONFIG_USB_STORAGE=y
1148# CONFIG_USB_RIO500 is not set 1165# CONFIG_USB_RIO500 is not set
1149# CONFIG_USB_LEGOTOWER is not set 1166# CONFIG_USB_LEGOTOWER is not set
1150# CONFIG_USB_LCD is not set 1167# CONFIG_USB_LCD is not set
1151# CONFIG_USB_BERRY_CHARGE is not set
1152# CONFIG_USB_LED is not set 1168# CONFIG_USB_LED is not set
1153# CONFIG_USB_CYPRESS_CY7C63 is not set 1169# CONFIG_USB_CYPRESS_CY7C63 is not set
1154# CONFIG_USB_CYTHERM is not set 1170# CONFIG_USB_CYTHERM is not set
@@ -1161,7 +1177,6 @@ CONFIG_USB_STORAGE=y
1161# CONFIG_USB_IOWARRIOR is not set 1177# CONFIG_USB_IOWARRIOR is not set
1162# CONFIG_USB_TEST is not set 1178# CONFIG_USB_TEST is not set
1163# CONFIG_USB_ISIGHTFW is not set 1179# CONFIG_USB_ISIGHTFW is not set
1164# CONFIG_USB_VST is not set
1165# CONFIG_USB_GADGET is not set 1180# CONFIG_USB_GADGET is not set
1166 1181
1167# 1182#
@@ -1192,7 +1207,6 @@ CONFIG_EXT2_FS=y
1192# CONFIG_EXT2_FS_XIP is not set 1207# CONFIG_EXT2_FS_XIP is not set
1193# CONFIG_EXT3_FS is not set 1208# CONFIG_EXT3_FS is not set
1194# CONFIG_EXT4_FS is not set 1209# CONFIG_EXT4_FS is not set
1195CONFIG_EXT4_USE_FOR_EXT23=y
1196# CONFIG_REISERFS_FS is not set 1210# CONFIG_REISERFS_FS is not set
1197# CONFIG_JFS_FS is not set 1211# CONFIG_JFS_FS is not set
1198# CONFIG_FS_POSIX_ACL is not set 1212# CONFIG_FS_POSIX_ACL is not set
@@ -1211,6 +1225,7 @@ CONFIG_INOTIFY_USER=y
1211# 1225#
1212# Caches 1226# Caches
1213# 1227#
1228# CONFIG_FSCACHE is not set
1214 1229
1215# 1230#
1216# CD-ROM/DVD Filesystems 1231# CD-ROM/DVD Filesystems
@@ -1332,6 +1347,7 @@ CONFIG_DEBUG_FS=y
1332CONFIG_DEBUG_BUGVERBOSE=y 1347CONFIG_DEBUG_BUGVERBOSE=y
1333# CONFIG_DEBUG_MEMORY_INIT is not set 1348# CONFIG_DEBUG_MEMORY_INIT is not set
1334# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1349# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1350# CONFIG_LKDTM is not set
1335# CONFIG_LATENCYTOP is not set 1351# CONFIG_LATENCYTOP is not set
1336# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1352# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1337CONFIG_HAVE_FUNCTION_TRACER=y 1353CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1442,6 +1458,7 @@ CONFIG_CRYPTO=y
1442# CONFIG_CRYPTO_ANSI_CPRNG is not set 1458# CONFIG_CRYPTO_ANSI_CPRNG is not set
1443CONFIG_CRYPTO_HW=y 1459CONFIG_CRYPTO_HW=y
1444# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1460# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1461# CONFIG_VIRTUALIZATION is not set
1445# CONFIG_BINARY_PRINTF is not set 1462# CONFIG_BINARY_PRINTF is not set
1446 1463
1447# 1464#
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig
index 666fde110b2..562147d333e 100644
--- a/arch/sh/configs/sh03_defconfig
+++ b/arch/sh/configs/sh03_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-rc5
4# Mon Jan 4 14:41:25 2010 4# Tue May 18 17:10:00 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -73,7 +76,6 @@ CONFIG_RCU_FANOUT=32
73# CONFIG_TREE_RCU_TRACE is not set 76# CONFIG_TREE_RCU_TRACE is not set
74# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
75CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_GROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -84,6 +86,7 @@ CONFIG_INITRAMFS_SOURCE=""
84CONFIG_RD_GZIP=y 86CONFIG_RD_GZIP=y
85# CONFIG_RD_BZIP2 is not set 87# CONFIG_RD_BZIP2 is not set
86# CONFIG_RD_LZMA is not set 88# CONFIG_RD_LZMA is not set
89# CONFIG_RD_LZO is not set
87CONFIG_CC_OPTIMIZE_FOR_SIZE=y 90CONFIG_CC_OPTIMIZE_FOR_SIZE=y
88CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
89CONFIG_ANON_INODES=y 92CONFIG_ANON_INODES=y
@@ -111,7 +114,6 @@ CONFIG_PERF_USE_VMALLOC=y
111# Kernel Performance Events And Counters 114# Kernel Performance Events And Counters
112# 115#
113CONFIG_PERF_EVENTS=y 116CONFIG_PERF_EVENTS=y
114CONFIG_EVENT_PROFILE=y
115# CONFIG_PERF_COUNTERS is not set 117# CONFIG_PERF_COUNTERS is not set
116CONFIG_VM_EVENT_COUNTERS=y 118CONFIG_VM_EVENT_COUNTERS=y
117CONFIG_PCI_QUIRKS=y 119CONFIG_PCI_QUIRKS=y
@@ -120,7 +122,6 @@ CONFIG_SLAB=y
120# CONFIG_SLUB is not set 122# CONFIG_SLUB is not set
121# CONFIG_SLOB is not set 123# CONFIG_SLOB is not set
122CONFIG_PROFILING=y 124CONFIG_PROFILING=y
123CONFIG_TRACEPOINTS=y
124CONFIG_OPROFILE=m 125CONFIG_OPROFILE=m
125CONFIG_HAVE_OPROFILE=y 126CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 127# CONFIG_KPROBES is not set
@@ -131,6 +132,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
131CONFIG_HAVE_DMA_ATTRS=y 132CONFIG_HAVE_DMA_ATTRS=y
132CONFIG_HAVE_CLK=y 133CONFIG_HAVE_CLK=y
133CONFIG_HAVE_DMA_API_DEBUG=y 134CONFIG_HAVE_DMA_API_DEBUG=y
135CONFIG_HAVE_HW_BREAKPOINT=y
134 136
135# 137#
136# GCOV-based kernel profiling 138# GCOV-based kernel profiling
@@ -250,6 +252,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
250CONFIG_MAX_ACTIVE_REGIONS=1 252CONFIG_MAX_ACTIVE_REGIONS=1
251CONFIG_ARCH_POPULATES_NODE_MAP=y 253CONFIG_ARCH_POPULATES_NODE_MAP=y
252CONFIG_ARCH_SELECT_MEMORY_MODEL=y 254CONFIG_ARCH_SELECT_MEMORY_MODEL=y
255CONFIG_UNCACHED_MAPPING=y
253CONFIG_PAGE_SIZE_4KB=y 256CONFIG_PAGE_SIZE_4KB=y
254# CONFIG_PAGE_SIZE_8KB is not set 257# CONFIG_PAGE_SIZE_8KB is not set
255# CONFIG_PAGE_SIZE_16KB is not set 258# CONFIG_PAGE_SIZE_16KB is not set
@@ -265,7 +268,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
265CONFIG_SPLIT_PTLOCK_CPUS=4 268CONFIG_SPLIT_PTLOCK_CPUS=4
266# CONFIG_PHYS_ADDR_T_64BIT is not set 269# CONFIG_PHYS_ADDR_T_64BIT is not set
267CONFIG_ZONE_DMA_FLAG=0 270CONFIG_ZONE_DMA_FLAG=0
268CONFIG_NR_QUICK=2 271CONFIG_NR_QUICK=1
269# CONFIG_KSM is not set 272# CONFIG_KSM is not set
270CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 273CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
271 274
@@ -342,7 +345,6 @@ CONFIG_HZ=250
342CONFIG_PREEMPT=y 345CONFIG_PREEMPT=y
343CONFIG_GUSA=y 346CONFIG_GUSA=y
344# CONFIG_GUSA_RB is not set 347# CONFIG_GUSA_RB is not set
345# CONFIG_SPARSE_IRQ is not set
346 348
347# 349#
348# Boot options 350# Boot options
@@ -358,9 +360,9 @@ CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs"
358# Bus options 360# Bus options
359# 361#
360CONFIG_PCI=y 362CONFIG_PCI=y
363CONFIG_PCI_DOMAINS=y
361# CONFIG_PCIEPORTBUS is not set 364# CONFIG_PCIEPORTBUS is not set
362# CONFIG_ARCH_SUPPORTS_MSI is not set 365# CONFIG_ARCH_SUPPORTS_MSI is not set
363CONFIG_PCI_LEGACY=y
364# CONFIG_PCI_STUB is not set 366# CONFIG_PCI_STUB is not set
365# CONFIG_PCI_IOV is not set 367# CONFIG_PCI_IOV is not set
366# CONFIG_PCCARD is not set 368# CONFIG_PCCARD is not set
@@ -388,7 +390,6 @@ CONFIG_NET=y
388# Networking options 390# Networking options
389# 391#
390CONFIG_PACKET=y 392CONFIG_PACKET=y
391# CONFIG_PACKET_MMAP is not set
392CONFIG_UNIX=y 393CONFIG_UNIX=y
393CONFIG_XFRM=y 394CONFIG_XFRM=y
394# CONFIG_XFRM_USER is not set 395# CONFIG_XFRM_USER is not set
@@ -453,7 +454,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
453# Network testing 454# Network testing
454# 455#
455# CONFIG_NET_PKTGEN is not set 456# CONFIG_NET_PKTGEN is not set
456# CONFIG_NET_DROP_MONITOR is not set
457# CONFIG_HAMRADIO is not set 457# CONFIG_HAMRADIO is not set
458# CONFIG_CAN is not set 458# CONFIG_CAN is not set
459# CONFIG_IRDA is not set 459# CONFIG_IRDA is not set
@@ -574,6 +574,7 @@ CONFIG_IDE_PROC_FS=y
574# 574#
575# SCSI device support 575# SCSI device support
576# 576#
577CONFIG_SCSI_MOD=m
577# CONFIG_RAID_ATTRS is not set 578# CONFIG_RAID_ATTRS is not set
578CONFIG_SCSI=m 579CONFIG_SCSI=m
579CONFIG_SCSI_DMA=y 580CONFIG_SCSI_DMA=y
@@ -664,7 +665,7 @@ CONFIG_SCSI_LOWLEVEL=y
664# 665#
665 666
666# 667#
667# See the help texts for more information. 668# The newer stack is recommended.
668# 669#
669# CONFIG_FIREWIRE is not set 670# CONFIG_FIREWIRE is not set
670# CONFIG_IEEE1394 is not set 671# CONFIG_IEEE1394 is not set
@@ -704,6 +705,7 @@ CONFIG_NET_PCI=y
704# CONFIG_PCNET32 is not set 705# CONFIG_PCNET32 is not set
705# CONFIG_AMD8111_ETH is not set 706# CONFIG_AMD8111_ETH is not set
706# CONFIG_ADAPTEC_STARFIRE is not set 707# CONFIG_ADAPTEC_STARFIRE is not set
708# CONFIG_KSZ884X_PCI is not set
707# CONFIG_B44 is not set 709# CONFIG_B44 is not set
708# CONFIG_FORCEDETH is not set 710# CONFIG_FORCEDETH is not set
709# CONFIG_E100 is not set 711# CONFIG_E100 is not set
@@ -751,6 +753,8 @@ CONFIG_NETDEV_10000=y
751# CONFIG_CHELSIO_T1 is not set 753# CONFIG_CHELSIO_T1 is not set
752CONFIG_CHELSIO_T3_DEPENDS=y 754CONFIG_CHELSIO_T3_DEPENDS=y
753# CONFIG_CHELSIO_T3 is not set 755# CONFIG_CHELSIO_T3 is not set
756CONFIG_CHELSIO_T4_DEPENDS=y
757# CONFIG_CHELSIO_T4 is not set
754# CONFIG_ENIC is not set 758# CONFIG_ENIC is not set
755# CONFIG_IXGBE is not set 759# CONFIG_IXGBE is not set
756# CONFIG_IXGB is not set 760# CONFIG_IXGB is not set
@@ -763,6 +767,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
763# CONFIG_MLX4_CORE is not set 767# CONFIG_MLX4_CORE is not set
764# CONFIG_TEHUTI is not set 768# CONFIG_TEHUTI is not set
765# CONFIG_BNX2X is not set 769# CONFIG_BNX2X is not set
770# CONFIG_QLCNIC is not set
766# CONFIG_QLGE is not set 771# CONFIG_QLGE is not set
767# CONFIG_SFC is not set 772# CONFIG_SFC is not set
768# CONFIG_BE2NET is not set 773# CONFIG_BE2NET is not set
@@ -853,6 +858,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
853CONFIG_SERIAL_CORE=y 858CONFIG_SERIAL_CORE=y
854CONFIG_SERIAL_CORE_CONSOLE=y 859CONFIG_SERIAL_CORE_CONSOLE=y
855# CONFIG_SERIAL_JSM is not set 860# CONFIG_SERIAL_JSM is not set
861# CONFIG_SERIAL_TIMBERDALE is not set
856CONFIG_UNIX98_PTYS=y 862CONFIG_UNIX98_PTYS=y
857# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 863# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
858CONFIG_LEGACY_PTYS=y 864CONFIG_LEGACY_PTYS=y
@@ -927,6 +933,7 @@ CONFIG_SSB_POSSIBLE=y
927# CONFIG_MFD_SH_MOBILE_SDHI is not set 933# CONFIG_MFD_SH_MOBILE_SDHI is not set
928# CONFIG_HTC_PASIC3 is not set 934# CONFIG_HTC_PASIC3 is not set
929# CONFIG_MFD_TMIO is not set 935# CONFIG_MFD_TMIO is not set
936# CONFIG_LPC_SCH is not set
930# CONFIG_REGULATOR is not set 937# CONFIG_REGULATOR is not set
931# CONFIG_MEDIA_SUPPORT is not set 938# CONFIG_MEDIA_SUPPORT is not set
932 939
@@ -934,6 +941,7 @@ CONFIG_SSB_POSSIBLE=y
934# Graphics support 941# Graphics support
935# 942#
936CONFIG_VGA_ARB=y 943CONFIG_VGA_ARB=y
944CONFIG_VGA_ARB_MAX_GPUS=16
937# CONFIG_DRM is not set 945# CONFIG_DRM is not set
938# CONFIG_VGASTATE is not set 946# CONFIG_VGASTATE is not set
939# CONFIG_VIDEO_OUTPUT_CONTROL is not set 947# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1075,6 +1083,7 @@ CONFIG_MISC_FILESYSTEMS=y
1075# CONFIG_BEFS_FS is not set 1083# CONFIG_BEFS_FS is not set
1076# CONFIG_BFS_FS is not set 1084# CONFIG_BFS_FS is not set
1077# CONFIG_EFS_FS is not set 1085# CONFIG_EFS_FS is not set
1086# CONFIG_LOGFS is not set
1078# CONFIG_CRAMFS is not set 1087# CONFIG_CRAMFS is not set
1079# CONFIG_SQUASHFS is not set 1088# CONFIG_SQUASHFS is not set
1080# CONFIG_VXFS_FS is not set 1089# CONFIG_VXFS_FS is not set
@@ -1105,6 +1114,7 @@ CONFIG_SUNRPC_GSS=y
1105CONFIG_RPCSEC_GSS_KRB5=y 1114CONFIG_RPCSEC_GSS_KRB5=y
1106# CONFIG_RPCSEC_GSS_SPKM3 is not set 1115# CONFIG_RPCSEC_GSS_SPKM3 is not set
1107# CONFIG_SMB_FS is not set 1116# CONFIG_SMB_FS is not set
1117# CONFIG_CEPH_FS is not set
1108# CONFIG_CIFS is not set 1118# CONFIG_CIFS is not set
1109# CONFIG_NCP_FS is not set 1119# CONFIG_NCP_FS is not set
1110# CONFIG_CODA_FS is not set 1120# CONFIG_CODA_FS is not set
@@ -1187,13 +1197,12 @@ CONFIG_FRAME_WARN=1024
1187CONFIG_DEBUG_FS=y 1197CONFIG_DEBUG_FS=y
1188# CONFIG_HEADERS_CHECK is not set 1198# CONFIG_HEADERS_CHECK is not set
1189# CONFIG_DEBUG_KERNEL is not set 1199# CONFIG_DEBUG_KERNEL is not set
1190CONFIG_STACKTRACE=y
1191CONFIG_DEBUG_BUGVERBOSE=y 1200CONFIG_DEBUG_BUGVERBOSE=y
1192# CONFIG_DEBUG_MEMORY_INIT is not set 1201# CONFIG_DEBUG_MEMORY_INIT is not set
1193# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1202# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1203# CONFIG_LKDTM is not set
1194# CONFIG_LATENCYTOP is not set 1204# CONFIG_LATENCYTOP is not set
1195# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1205# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1196CONFIG_NOP_TRACER=y
1197CONFIG_HAVE_FUNCTION_TRACER=y 1206CONFIG_HAVE_FUNCTION_TRACER=y
1198CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1207CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1199CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1208CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1201,10 +1210,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1201CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1210CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1202CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1211CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1203CONFIG_RING_BUFFER=y 1212CONFIG_RING_BUFFER=y
1204CONFIG_EVENT_TRACING=y
1205CONFIG_CONTEXT_SWITCH_TRACER=y
1206CONFIG_RING_BUFFER_ALLOW_SWAP=y 1213CONFIG_RING_BUFFER_ALLOW_SWAP=y
1207CONFIG_TRACING=y
1208CONFIG_TRACING_SUPPORT=y 1214CONFIG_TRACING_SUPPORT=y
1209# CONFIG_FTRACE is not set 1215# CONFIG_FTRACE is not set
1210# CONFIG_DYNAMIC_DEBUG is not set 1216# CONFIG_DYNAMIC_DEBUG is not set
@@ -1323,7 +1329,8 @@ CONFIG_CRYPTO_DEFLATE=y
1323# CONFIG_CRYPTO_ANSI_CPRNG is not set 1329# CONFIG_CRYPTO_ANSI_CPRNG is not set
1324CONFIG_CRYPTO_HW=y 1330CONFIG_CRYPTO_HW=y
1325# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1331# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1326CONFIG_BINARY_PRINTF=y 1332# CONFIG_VIRTUALIZATION is not set
1333# CONFIG_BINARY_PRINTF is not set
1327 1334
1328# 1335#
1329# Library routines 1336# Library routines
diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh7710voipgw_defconfig
index 35a3beeba18..98485ca4639 100644
--- a/arch/sh/configs/sh7710voipgw_defconfig
+++ b/arch/sh/configs/sh7710voipgw_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-rc5
4# Mon Jan 4 14:43:04 2010 4# Tue May 18 17:14:59 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -30,6 +30,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
30CONFIG_ARCH_HAS_DEFAULT_IDLE=y 30CONFIG_ARCH_HAS_DEFAULT_IDLE=y
31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 31CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
32CONFIG_DMA_NONCOHERENT=y 32CONFIG_DMA_NONCOHERENT=y
33CONFIG_NEED_DMA_MAP_STATE=y
33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34CONFIG_CONSTRUCTORS=y 35CONFIG_CONSTRUCTORS=y
35 36
@@ -44,9 +45,11 @@ CONFIG_LOCALVERSION_AUTO=y
44CONFIG_HAVE_KERNEL_GZIP=y 45CONFIG_HAVE_KERNEL_GZIP=y
45CONFIG_HAVE_KERNEL_BZIP2=y 46CONFIG_HAVE_KERNEL_BZIP2=y
46CONFIG_HAVE_KERNEL_LZMA=y 47CONFIG_HAVE_KERNEL_LZMA=y
48CONFIG_HAVE_KERNEL_LZO=y
47CONFIG_KERNEL_GZIP=y 49CONFIG_KERNEL_GZIP=y
48# CONFIG_KERNEL_BZIP2 is not set 50# CONFIG_KERNEL_BZIP2 is not set
49# CONFIG_KERNEL_LZMA is not set 51# CONFIG_KERNEL_LZMA is not set
52# CONFIG_KERNEL_LZO is not set
50# CONFIG_SWAP is not set 53# CONFIG_SWAP is not set
51CONFIG_SYSVIPC=y 54CONFIG_SYSVIPC=y
52CONFIG_SYSVIPC_SYSCTL=y 55CONFIG_SYSVIPC_SYSCTL=y
@@ -68,11 +71,6 @@ CONFIG_RCU_FANOUT=32
68# CONFIG_TREE_RCU_TRACE is not set 71# CONFIG_TREE_RCU_TRACE is not set
69# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
71CONFIG_GROUP_SCHED=y
72CONFIG_FAIR_GROUP_SCHED=y
73# CONFIG_RT_GROUP_SCHED is not set
74CONFIG_USER_SCHED=y
75# CONFIG_CGROUP_SCHED is not set
76# CONFIG_CGROUPS is not set 74# CONFIG_CGROUPS is not set
77CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
78CONFIG_SYSFS_DEPRECATED_V2=y 76CONFIG_SYSFS_DEPRECATED_V2=y
@@ -105,7 +103,7 @@ CONFIG_PERF_USE_VMALLOC=y
105# 103#
106# Kernel Performance Events And Counters 104# Kernel Performance Events And Counters
107# 105#
108# CONFIG_PERF_EVENTS is not set 106CONFIG_PERF_EVENTS=y
109# CONFIG_PERF_COUNTERS is not set 107# CONFIG_PERF_COUNTERS is not set
110CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_COMPAT_BRK=y 109CONFIG_COMPAT_BRK=y
@@ -122,6 +120,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
123CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
124CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
125 124
126# 125#
127# GCOV-based kernel profiling 126# GCOV-based kernel profiling
@@ -240,6 +239,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
240CONFIG_MAX_ACTIVE_REGIONS=1 239CONFIG_MAX_ACTIVE_REGIONS=1
241CONFIG_ARCH_POPULATES_NODE_MAP=y 240CONFIG_ARCH_POPULATES_NODE_MAP=y
242CONFIG_ARCH_SELECT_MEMORY_MODEL=y 241CONFIG_ARCH_SELECT_MEMORY_MODEL=y
242CONFIG_UNCACHED_MAPPING=y
243CONFIG_PAGE_SIZE_4KB=y 243CONFIG_PAGE_SIZE_4KB=y
244# CONFIG_PAGE_SIZE_8KB is not set 244# CONFIG_PAGE_SIZE_8KB is not set
245# CONFIG_PAGE_SIZE_16KB is not set 245# CONFIG_PAGE_SIZE_16KB is not set
@@ -255,7 +255,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
255CONFIG_SPLIT_PTLOCK_CPUS=4 255CONFIG_SPLIT_PTLOCK_CPUS=4
256# CONFIG_PHYS_ADDR_T_64BIT is not set 256# CONFIG_PHYS_ADDR_T_64BIT is not set
257CONFIG_ZONE_DMA_FLAG=0 257CONFIG_ZONE_DMA_FLAG=0
258CONFIG_NR_QUICK=2 258CONFIG_NR_QUICK=1
259# CONFIG_KSM is not set 259# CONFIG_KSM is not set
260CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 260CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
261 261
@@ -331,7 +331,6 @@ CONFIG_PREEMPT_NONE=y
331# CONFIG_PREEMPT is not set 331# CONFIG_PREEMPT is not set
332CONFIG_GUSA=y 332CONFIG_GUSA=y
333# CONFIG_GUSA_RB is not set 333# CONFIG_GUSA_RB is not set
334# CONFIG_SPARSE_IRQ is not set
335 334
336# 335#
337# Boot options 336# Boot options
@@ -367,7 +366,6 @@ CONFIG_NET=y
367# Networking options 366# Networking options
368# 367#
369CONFIG_PACKET=y 368CONFIG_PACKET=y
370# CONFIG_PACKET_MMAP is not set
371CONFIG_UNIX=y 369CONFIG_UNIX=y
372CONFIG_XFRM=y 370CONFIG_XFRM=y
373# CONFIG_XFRM_USER is not set 371# CONFIG_XFRM_USER is not set
@@ -620,6 +618,7 @@ CONFIG_HAVE_IDE=y
620# 618#
621# SCSI device support 619# SCSI device support
622# 620#
621CONFIG_SCSI_MOD=y
623# CONFIG_RAID_ATTRS is not set 622# CONFIG_RAID_ATTRS is not set
624# CONFIG_SCSI is not set 623# CONFIG_SCSI is not set
625# CONFIG_SCSI_DMA is not set 624# CONFIG_SCSI_DMA is not set
@@ -723,6 +722,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
723CONFIG_SERIAL_SH_SCI_CONSOLE=y 722CONFIG_SERIAL_SH_SCI_CONSOLE=y
724CONFIG_SERIAL_CORE=y 723CONFIG_SERIAL_CORE=y
725CONFIG_SERIAL_CORE_CONSOLE=y 724CONFIG_SERIAL_CORE_CONSOLE=y
725# CONFIG_SERIAL_TIMBERDALE is not set
726# CONFIG_UNIX98_PTYS is not set 726# CONFIG_UNIX98_PTYS is not set
727CONFIG_LEGACY_PTYS=y 727CONFIG_LEGACY_PTYS=y
728CONFIG_LEGACY_PTY_COUNT=256 728CONFIG_LEGACY_PTY_COUNT=256
@@ -824,7 +824,6 @@ CONFIG_RTC_LIB=y
824# CONFIG_EXT2_FS is not set 824# CONFIG_EXT2_FS is not set
825# CONFIG_EXT3_FS is not set 825# CONFIG_EXT3_FS is not set
826# CONFIG_EXT4_FS is not set 826# CONFIG_EXT4_FS is not set
827CONFIG_EXT4_USE_FOR_EXT23=y
828# CONFIG_REISERFS_FS is not set 827# CONFIG_REISERFS_FS is not set
829# CONFIG_JFS_FS is not set 828# CONFIG_JFS_FS is not set
830# CONFIG_FS_POSIX_ACL is not set 829# CONFIG_FS_POSIX_ACL is not set
@@ -890,6 +889,7 @@ CONFIG_JFFS2_ZLIB=y
890# CONFIG_JFFS2_LZO is not set 889# CONFIG_JFFS2_LZO is not set
891CONFIG_JFFS2_RTIME=y 890CONFIG_JFFS2_RTIME=y
892# CONFIG_JFFS2_RUBIN is not set 891# CONFIG_JFFS2_RUBIN is not set
892# CONFIG_LOGFS is not set
893# CONFIG_CRAMFS is not set 893# CONFIG_CRAMFS is not set
894# CONFIG_SQUASHFS is not set 894# CONFIG_SQUASHFS is not set
895# CONFIG_VXFS_FS is not set 895# CONFIG_VXFS_FS is not set
@@ -904,6 +904,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
904# CONFIG_NFS_FS is not set 904# CONFIG_NFS_FS is not set
905# CONFIG_NFSD is not set 905# CONFIG_NFSD is not set
906# CONFIG_SMB_FS is not set 906# CONFIG_SMB_FS is not set
907# CONFIG_CEPH_FS is not set
907# CONFIG_CIFS is not set 908# CONFIG_CIFS is not set
908# CONFIG_NCP_FS is not set 909# CONFIG_NCP_FS is not set
909# CONFIG_CODA_FS is not set 910# CONFIG_CODA_FS is not set
@@ -934,6 +935,7 @@ CONFIG_DEBUG_FS=y
934CONFIG_DEBUG_BUGVERBOSE=y 935CONFIG_DEBUG_BUGVERBOSE=y
935# CONFIG_DEBUG_MEMORY_INIT is not set 936# CONFIG_DEBUG_MEMORY_INIT is not set
936# CONFIG_RCU_CPU_STALL_DETECTOR is not set 937# CONFIG_RCU_CPU_STALL_DETECTOR is not set
938# CONFIG_LKDTM is not set
937# CONFIG_LATENCYTOP is not set 939# CONFIG_LATENCYTOP is not set
938# CONFIG_SYSCTL_SYSCALL_CHECK is not set 940# CONFIG_SYSCTL_SYSCALL_CHECK is not set
939CONFIG_HAVE_FUNCTION_TRACER=y 941CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1049,6 +1051,7 @@ CONFIG_CRYPTO=y
1049# 1051#
1050# CONFIG_CRYPTO_ANSI_CPRNG is not set 1052# CONFIG_CRYPTO_ANSI_CPRNG is not set
1051CONFIG_CRYPTO_HW=y 1053CONFIG_CRYPTO_HW=y
1054# CONFIG_VIRTUALIZATION is not set
1052# CONFIG_BINARY_PRINTF is not set 1055# CONFIG_BINARY_PRINTF is not set
1053 1056
1054# 1057#
diff --git a/arch/sh/configs/sh7724_generic_defconfig b/arch/sh/configs/sh7724_generic_defconfig
index a3056b69d2b..a6a9e6887ef 100644
--- a/arch/sh/configs/sh7724_generic_defconfig
+++ b/arch/sh/configs/sh7724_generic_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-rc5
4# Mon Jan 4 15:03:45 2010 4# Tue May 18 17:17:36 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION=""
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54# CONFIG_BSD_PROCESS_ACCT is not set 57# CONFIG_BSD_PROCESS_ACCT is not set
@@ -65,11 +68,6 @@ CONFIG_RCU_FANOUT=32
65# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
66# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=17 70CONFIG_LOG_BUF_SHIFT=17
68CONFIG_GROUP_SCHED=y
69CONFIG_FAIR_GROUP_SCHED=y
70CONFIG_RT_GROUP_SCHED=y
71CONFIG_USER_SCHED=y
72# CONFIG_CGROUP_SCHED is not set
73CONFIG_CGROUPS=y 71CONFIG_CGROUPS=y
74# CONFIG_CGROUP_DEBUG is not set 72# CONFIG_CGROUP_DEBUG is not set
75# CONFIG_CGROUP_NS is not set 73# CONFIG_CGROUP_NS is not set
@@ -78,6 +76,7 @@ CONFIG_CGROUPS=y
78# CONFIG_CPUSETS is not set 76# CONFIG_CPUSETS is not set
79# CONFIG_CGROUP_CPUACCT is not set 77# CONFIG_CGROUP_CPUACCT is not set
80# CONFIG_RESOURCE_COUNTERS is not set 78# CONFIG_RESOURCE_COUNTERS is not set
79# CONFIG_CGROUP_SCHED is not set
81# CONFIG_RELAY is not set 80# CONFIG_RELAY is not set
82# CONFIG_NAMESPACES is not set 81# CONFIG_NAMESPACES is not set
83# CONFIG_BLK_DEV_INITRD is not set 82# CONFIG_BLK_DEV_INITRD is not set
@@ -106,7 +105,6 @@ CONFIG_PERF_USE_VMALLOC=y
106# Kernel Performance Events And Counters 105# Kernel Performance Events And Counters
107# 106#
108CONFIG_PERF_EVENTS=y 107CONFIG_PERF_EVENTS=y
109CONFIG_EVENT_PROFILE=y
110# CONFIG_PERF_COUNTERS is not set 108# CONFIG_PERF_COUNTERS is not set
111CONFIG_VM_EVENT_COUNTERS=y 109CONFIG_VM_EVENT_COUNTERS=y
112# CONFIG_COMPAT_BRK is not set 110# CONFIG_COMPAT_BRK is not set
@@ -114,21 +112,19 @@ CONFIG_VM_EVENT_COUNTERS=y
114CONFIG_SLUB=y 112CONFIG_SLUB=y
115# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
116CONFIG_PROFILING=y 114CONFIG_PROFILING=y
117CONFIG_TRACEPOINTS=y
118CONFIG_OPROFILE=y 115CONFIG_OPROFILE=y
119CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
120CONFIG_HAVE_IOREMAP_PROT=y
121CONFIG_HAVE_KPROBES=y 117CONFIG_HAVE_KPROBES=y
122CONFIG_HAVE_KRETPROBES=y 118CONFIG_HAVE_KRETPROBES=y
123CONFIG_HAVE_ARCH_TRACEHOOK=y 119CONFIG_HAVE_ARCH_TRACEHOOK=y
124CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
125CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
126CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
127 124
128# 125#
129# GCOV-based kernel profiling 126# GCOV-based kernel profiling
130# 127#
131# CONFIG_GCOV_KERNEL is not set
132# CONFIG_SLOW_WORK is not set 128# CONFIG_SLOW_WORK is not set
133CONFIG_HAVE_GENERIC_DMA_COHERENT=y 129CONFIG_HAVE_GENERIC_DMA_COHERENT=y
134CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
@@ -138,7 +134,6 @@ CONFIG_BLOCK=y
138CONFIG_LBDAF=y 134CONFIG_LBDAF=y
139# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
141# CONFIG_BLK_CGROUP is not set
142 137
143# 138#
144# IO Schedulers 139# IO Schedulers
@@ -235,8 +230,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
235CONFIG_MEMORY_START=0x08000000 230CONFIG_MEMORY_START=0x08000000
236CONFIG_MEMORY_SIZE=0x04000000 231CONFIG_MEMORY_SIZE=0x04000000
237CONFIG_29BIT=y 232CONFIG_29BIT=y
238# CONFIG_PMB_ENABLE is not set 233# CONFIG_PMB is not set
239# CONFIG_X2TLB is not set 234CONFIG_X2TLB=y
240CONFIG_VSYSCALL=y 235CONFIG_VSYSCALL=y
241CONFIG_ARCH_FLATMEM_ENABLE=y 236CONFIG_ARCH_FLATMEM_ENABLE=y
242CONFIG_ARCH_SPARSEMEM_ENABLE=y 237CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -246,6 +241,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
246CONFIG_ARCH_SELECT_MEMORY_MODEL=y 241CONFIG_ARCH_SELECT_MEMORY_MODEL=y
247CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 242CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
248CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 243CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
244CONFIG_IOREMAP_FIXED=y
245CONFIG_UNCACHED_MAPPING=y
249CONFIG_PAGE_SIZE_4KB=y 246CONFIG_PAGE_SIZE_4KB=y
250# CONFIG_PAGE_SIZE_8KB is not set 247# CONFIG_PAGE_SIZE_8KB is not set
251# CONFIG_PAGE_SIZE_16KB is not set 248# CONFIG_PAGE_SIZE_16KB is not set
@@ -262,7 +259,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
262CONFIG_MIGRATION=y 259CONFIG_MIGRATION=y
263# CONFIG_PHYS_ADDR_T_64BIT is not set 260# CONFIG_PHYS_ADDR_T_64BIT is not set
264CONFIG_ZONE_DMA_FLAG=0 261CONFIG_ZONE_DMA_FLAG=0
265CONFIG_NR_QUICK=2 262CONFIG_NR_QUICK=1
266# CONFIG_KSM is not set 263# CONFIG_KSM is not set
267CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 264CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
268 265
@@ -353,7 +350,7 @@ CONFIG_PREEMPT_NONE=y
353# CONFIG_PREEMPT_VOLUNTARY is not set 350# CONFIG_PREEMPT_VOLUNTARY is not set
354# CONFIG_PREEMPT is not set 351# CONFIG_PREEMPT is not set
355CONFIG_GUSA=y 352CONFIG_GUSA=y
356# CONFIG_SPARSE_IRQ is not set 353# CONFIG_INTC_USERIMASK is not set
357 354
358# 355#
359# Boot options 356# Boot options
@@ -390,6 +387,7 @@ CONFIG_HIBERNATION_NVS=y
390CONFIG_HIBERNATION=y 387CONFIG_HIBERNATION=y
391CONFIG_PM_STD_PARTITION="" 388CONFIG_PM_STD_PARTITION=""
392CONFIG_PM_RUNTIME=y 389CONFIG_PM_RUNTIME=y
390CONFIG_PM_OPS=y
393CONFIG_CPU_IDLE=y 391CONFIG_CPU_IDLE=y
394CONFIG_CPU_IDLE_GOV_LADDER=y 392CONFIG_CPU_IDLE_GOV_LADDER=y
395CONFIG_CPU_IDLE_GOV_MENU=y 393CONFIG_CPU_IDLE_GOV_MENU=y
@@ -428,6 +426,7 @@ CONFIG_HAVE_IDE=y
428# 426#
429# SCSI device support 427# SCSI device support
430# 428#
429CONFIG_SCSI_MOD=y
431# CONFIG_RAID_ATTRS is not set 430# CONFIG_RAID_ATTRS is not set
432# CONFIG_SCSI is not set 431# CONFIG_SCSI is not set
433# CONFIG_SCSI_DMA is not set 432# CONFIG_SCSI_DMA is not set
@@ -467,6 +466,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
467CONFIG_SERIAL_SH_SCI_CONSOLE=y 466CONFIG_SERIAL_SH_SCI_CONSOLE=y
468CONFIG_SERIAL_CORE=y 467CONFIG_SERIAL_CORE=y
469CONFIG_SERIAL_CORE_CONSOLE=y 468CONFIG_SERIAL_CORE_CONSOLE=y
469# CONFIG_SERIAL_TIMBERDALE is not set
470# CONFIG_UNIX98_PTYS is not set 470# CONFIG_UNIX98_PTYS is not set
471# CONFIG_LEGACY_PTYS is not set 471# CONFIG_LEGACY_PTYS is not set
472# CONFIG_IPMI_HANDLER is not set 472# CONFIG_IPMI_HANDLER is not set
@@ -491,6 +491,7 @@ CONFIG_I2C_HELPER_AUTO=y
491# CONFIG_I2C_OCORES is not set 491# CONFIG_I2C_OCORES is not set
492CONFIG_I2C_SH_MOBILE=y 492CONFIG_I2C_SH_MOBILE=y
493# CONFIG_I2C_SIMTEC is not set 493# CONFIG_I2C_SIMTEC is not set
494# CONFIG_I2C_XILINX is not set
494 495
495# 496#
496# External I2C/SMBus adapter drivers 497# External I2C/SMBus adapter drivers
@@ -502,15 +503,9 @@ CONFIG_I2C_SH_MOBILE=y
502# Other I2C/SMBus bus drivers 503# Other I2C/SMBus bus drivers
503# 504#
504# CONFIG_I2C_PCA_PLATFORM is not set 505# CONFIG_I2C_PCA_PLATFORM is not set
505
506#
507# Miscellaneous I2C Chip support
508#
509# CONFIG_SENSORS_TSL2550 is not set
510# CONFIG_I2C_DEBUG_CORE is not set 506# CONFIG_I2C_DEBUG_CORE is not set
511# CONFIG_I2C_DEBUG_ALGO is not set 507# CONFIG_I2C_DEBUG_ALGO is not set
512# CONFIG_I2C_DEBUG_BUS is not set 508# CONFIG_I2C_DEBUG_BUS is not set
513# CONFIG_I2C_DEBUG_CHIP is not set
514# CONFIG_SPI is not set 509# CONFIG_SPI is not set
515 510
516# 511#
@@ -533,6 +528,7 @@ CONFIG_SSB_POSSIBLE=y
533# Multifunction device drivers 528# Multifunction device drivers
534# 529#
535# CONFIG_MFD_CORE is not set 530# CONFIG_MFD_CORE is not set
531# CONFIG_MFD_88PM860X is not set
536# CONFIG_MFD_SM501 is not set 532# CONFIG_MFD_SM501 is not set
537# CONFIG_MFD_SH_MOBILE_SDHI is not set 533# CONFIG_MFD_SH_MOBILE_SDHI is not set
538# CONFIG_HTC_PASIC3 is not set 534# CONFIG_HTC_PASIC3 is not set
@@ -540,12 +536,13 @@ CONFIG_SSB_POSSIBLE=y
540# CONFIG_MFD_TMIO is not set 536# CONFIG_MFD_TMIO is not set
541# CONFIG_PMIC_DA903X is not set 537# CONFIG_PMIC_DA903X is not set
542# CONFIG_PMIC_ADP5520 is not set 538# CONFIG_PMIC_ADP5520 is not set
539# CONFIG_MFD_MAX8925 is not set
543# CONFIG_MFD_WM8400 is not set 540# CONFIG_MFD_WM8400 is not set
544# CONFIG_MFD_WM831X is not set 541# CONFIG_MFD_WM831X is not set
545# CONFIG_MFD_WM8350_I2C is not set 542# CONFIG_MFD_WM8350_I2C is not set
543# CONFIG_MFD_WM8994 is not set
546# CONFIG_MFD_PCF50633 is not set 544# CONFIG_MFD_PCF50633 is not set
547# CONFIG_AB3100_CORE is not set 545# CONFIG_AB3100_CORE is not set
548# CONFIG_MFD_88PM8607 is not set
549# CONFIG_REGULATOR is not set 546# CONFIG_REGULATOR is not set
550# CONFIG_MEDIA_SUPPORT is not set 547# CONFIG_MEDIA_SUPPORT is not set
551 548
@@ -629,8 +626,6 @@ CONFIG_RTC_DRV_SH=y
629CONFIG_UIO=y 626CONFIG_UIO=y
630# CONFIG_UIO_PDRV is not set 627# CONFIG_UIO_PDRV is not set
631CONFIG_UIO_PDRV_GENIRQ=y 628CONFIG_UIO_PDRV_GENIRQ=y
632# CONFIG_UIO_SMX is not set
633# CONFIG_UIO_SERCOS3 is not set
634 629
635# 630#
636# TI VLYNQ 631# TI VLYNQ
@@ -643,7 +638,6 @@ CONFIG_UIO_PDRV_GENIRQ=y
643# CONFIG_EXT2_FS is not set 638# CONFIG_EXT2_FS is not set
644# CONFIG_EXT3_FS is not set 639# CONFIG_EXT3_FS is not set
645# CONFIG_EXT4_FS is not set 640# CONFIG_EXT4_FS is not set
646CONFIG_EXT4_USE_FOR_EXT23=y
647# CONFIG_REISERFS_FS is not set 641# CONFIG_REISERFS_FS is not set
648# CONFIG_JFS_FS is not set 642# CONFIG_JFS_FS is not set
649# CONFIG_FS_POSIX_ACL is not set 643# CONFIG_FS_POSIX_ACL is not set
@@ -707,15 +701,12 @@ CONFIG_FRAME_WARN=1024
707# CONFIG_MAGIC_SYSRQ is not set 701# CONFIG_MAGIC_SYSRQ is not set
708# CONFIG_STRIP_ASM_SYMS is not set 702# CONFIG_STRIP_ASM_SYMS is not set
709# CONFIG_UNUSED_SYMBOLS is not set 703# CONFIG_UNUSED_SYMBOLS is not set
710CONFIG_DEBUG_FS=y
711# CONFIG_HEADERS_CHECK is not set 704# CONFIG_HEADERS_CHECK is not set
712# CONFIG_DEBUG_KERNEL is not set 705# CONFIG_DEBUG_KERNEL is not set
713CONFIG_STACKTRACE=y
714CONFIG_DEBUG_BUGVERBOSE=y 706CONFIG_DEBUG_BUGVERBOSE=y
715# CONFIG_DEBUG_MEMORY_INIT is not set 707# CONFIG_DEBUG_MEMORY_INIT is not set
716# CONFIG_RCU_CPU_STALL_DETECTOR is not set 708# CONFIG_RCU_CPU_STALL_DETECTOR is not set
717# CONFIG_LATENCYTOP is not set 709# CONFIG_LATENCYTOP is not set
718CONFIG_NOP_TRACER=y
719CONFIG_HAVE_FUNCTION_TRACER=y 710CONFIG_HAVE_FUNCTION_TRACER=y
720CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 711CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
721CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 712CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -723,13 +714,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
723CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 714CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
724CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 715CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
725CONFIG_RING_BUFFER=y 716CONFIG_RING_BUFFER=y
726CONFIG_EVENT_TRACING=y
727CONFIG_CONTEXT_SWITCH_TRACER=y
728CONFIG_RING_BUFFER_ALLOW_SWAP=y 717CONFIG_RING_BUFFER_ALLOW_SWAP=y
729CONFIG_TRACING=y
730CONFIG_TRACING_SUPPORT=y 718CONFIG_TRACING_SUPPORT=y
731# CONFIG_FTRACE is not set 719# CONFIG_FTRACE is not set
732# CONFIG_DYNAMIC_DEBUG is not set
733# CONFIG_DMA_API_DEBUG is not set 720# CONFIG_DMA_API_DEBUG is not set
734# CONFIG_SAMPLES is not set 721# CONFIG_SAMPLES is not set
735CONFIG_HAVE_ARCH_KGDB=y 722CONFIG_HAVE_ARCH_KGDB=y
@@ -747,7 +734,8 @@ CONFIG_HAVE_ARCH_KGDB=y
747CONFIG_DEFAULT_SECURITY_DAC=y 734CONFIG_DEFAULT_SECURITY_DAC=y
748CONFIG_DEFAULT_SECURITY="" 735CONFIG_DEFAULT_SECURITY=""
749# CONFIG_CRYPTO is not set 736# CONFIG_CRYPTO is not set
750CONFIG_BINARY_PRINTF=y 737# CONFIG_VIRTUALIZATION is not set
738# CONFIG_BINARY_PRINTF is not set
751 739
752# 740#
753# Library routines 741# Library routines
diff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig
index 04b841b2942..6f308b71f81 100644
--- a/arch/sh/configs/sh7763rdp_defconfig
+++ b/arch/sh/configs/sh7763rdp_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-rc5
4# Mon Jan 4 15:05:29 2010 4# Tue May 18 17:19:21 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION_AUTO=y
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53CONFIG_SYSVIPC_SYSCTL=y 56CONFIG_SYSVIPC_SYSCTL=y
@@ -69,11 +72,6 @@ CONFIG_RCU_FANOUT=32
69CONFIG_IKCONFIG=y 72CONFIG_IKCONFIG=y
70CONFIG_IKCONFIG_PROC=y 73CONFIG_IKCONFIG_PROC=y
71CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
72CONFIG_GROUP_SCHED=y
73CONFIG_FAIR_GROUP_SCHED=y
74# CONFIG_RT_GROUP_SCHED is not set
75CONFIG_USER_SCHED=y
76# CONFIG_CGROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 75# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 77CONFIG_SYSFS_DEPRECATED_V2=y
@@ -112,7 +110,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
113# 111#
114CONFIG_PERF_EVENTS=y 112CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116# CONFIG_PERF_COUNTERS is not set 113# CONFIG_PERF_COUNTERS is not set
117CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_COMPAT_BRK=y 115CONFIG_COMPAT_BRK=y
@@ -120,7 +117,6 @@ CONFIG_SLAB=y
120# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
121# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
122CONFIG_PROFILING=y 119CONFIG_PROFILING=y
123CONFIG_TRACEPOINTS=y
124CONFIG_OPROFILE=y 120CONFIG_OPROFILE=y
125CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
@@ -131,6 +127,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
131CONFIG_HAVE_DMA_ATTRS=y 127CONFIG_HAVE_DMA_ATTRS=y
132CONFIG_HAVE_CLK=y 128CONFIG_HAVE_CLK=y
133CONFIG_HAVE_DMA_API_DEBUG=y 129CONFIG_HAVE_DMA_API_DEBUG=y
130CONFIG_HAVE_HW_BREAKPOINT=y
134 131
135# 132#
136# GCOV-based kernel profiling 133# GCOV-based kernel profiling
@@ -243,7 +240,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
243CONFIG_MEMORY_START=0x0c000000 240CONFIG_MEMORY_START=0x0c000000
244CONFIG_MEMORY_SIZE=0x04000000 241CONFIG_MEMORY_SIZE=0x04000000
245CONFIG_29BIT=y 242CONFIG_29BIT=y
246# CONFIG_PMB_ENABLE is not set 243# CONFIG_PMB is not set
247CONFIG_VSYSCALL=y 244CONFIG_VSYSCALL=y
248CONFIG_ARCH_FLATMEM_ENABLE=y 245CONFIG_ARCH_FLATMEM_ENABLE=y
249CONFIG_ARCH_SPARSEMEM_ENABLE=y 246CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -253,6 +250,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
253CONFIG_ARCH_SELECT_MEMORY_MODEL=y 250CONFIG_ARCH_SELECT_MEMORY_MODEL=y
254CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 251CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
255CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 252CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
253CONFIG_UNCACHED_MAPPING=y
256CONFIG_PAGE_SIZE_4KB=y 254CONFIG_PAGE_SIZE_4KB=y
257# CONFIG_PAGE_SIZE_8KB is not set 255# CONFIG_PAGE_SIZE_8KB is not set
258# CONFIG_PAGE_SIZE_16KB is not set 256# CONFIG_PAGE_SIZE_16KB is not set
@@ -269,7 +267,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
269CONFIG_MIGRATION=y 267CONFIG_MIGRATION=y
270# CONFIG_PHYS_ADDR_T_64BIT is not set 268# CONFIG_PHYS_ADDR_T_64BIT is not set
271CONFIG_ZONE_DMA_FLAG=0 269CONFIG_ZONE_DMA_FLAG=0
272CONFIG_NR_QUICK=2 270CONFIG_NR_QUICK=1
273# CONFIG_KSM is not set 271# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 272CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275 273
@@ -344,7 +342,7 @@ CONFIG_PREEMPT_NONE=y
344# CONFIG_PREEMPT_VOLUNTARY is not set 342# CONFIG_PREEMPT_VOLUNTARY is not set
345# CONFIG_PREEMPT is not set 343# CONFIG_PREEMPT is not set
346CONFIG_GUSA=y 344CONFIG_GUSA=y
347# CONFIG_SPARSE_IRQ is not set 345# CONFIG_INTC_USERIMASK is not set
348 346
349# 347#
350# Boot options 348# Boot options
@@ -381,7 +379,6 @@ CONFIG_NET=y
381# Networking options 379# Networking options
382# 380#
383CONFIG_PACKET=y 381CONFIG_PACKET=y
384# CONFIG_PACKET_MMAP is not set
385CONFIG_UNIX=y 382CONFIG_UNIX=y
386CONFIG_XFRM=y 383CONFIG_XFRM=y
387# CONFIG_XFRM_USER is not set 384# CONFIG_XFRM_USER is not set
@@ -444,7 +441,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
444# Network testing 441# Network testing
445# 442#
446# CONFIG_NET_PKTGEN is not set 443# CONFIG_NET_PKTGEN is not set
447# CONFIG_NET_DROP_MONITOR is not set
448# CONFIG_HAMRADIO is not set 444# CONFIG_HAMRADIO is not set
449# CONFIG_CAN is not set 445# CONFIG_CAN is not set
450# CONFIG_IRDA is not set 446# CONFIG_IRDA is not set
@@ -585,6 +581,7 @@ CONFIG_HAVE_IDE=y
585# 581#
586# SCSI device support 582# SCSI device support
587# 583#
584CONFIG_SCSI_MOD=y
588# CONFIG_RAID_ATTRS is not set 585# CONFIG_RAID_ATTRS is not set
589CONFIG_SCSI=y 586CONFIG_SCSI=y
590CONFIG_SCSI_DMA=y 587CONFIG_SCSI_DMA=y
@@ -689,6 +686,7 @@ CONFIG_WLAN=y
689# CONFIG_USB_PEGASUS is not set 686# CONFIG_USB_PEGASUS is not set
690# CONFIG_USB_RTL8150 is not set 687# CONFIG_USB_RTL8150 is not set
691# CONFIG_USB_USBNET is not set 688# CONFIG_USB_USBNET is not set
689# CONFIG_USB_IPHETH is not set
692# CONFIG_WAN is not set 690# CONFIG_WAN is not set
693# CONFIG_PPP is not set 691# CONFIG_PPP is not set
694# CONFIG_SLIP is not set 692# CONFIG_SLIP is not set
@@ -754,6 +752,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=3
754CONFIG_SERIAL_SH_SCI_CONSOLE=y 752CONFIG_SERIAL_SH_SCI_CONSOLE=y
755CONFIG_SERIAL_CORE=y 753CONFIG_SERIAL_CORE=y
756CONFIG_SERIAL_CORE_CONSOLE=y 754CONFIG_SERIAL_CORE_CONSOLE=y
755# CONFIG_SERIAL_TIMBERDALE is not set
757CONFIG_UNIX98_PTYS=y 756CONFIG_UNIX98_PTYS=y
758# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 757# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
759CONFIG_LEGACY_PTYS=y 758CONFIG_LEGACY_PTYS=y
@@ -945,7 +944,6 @@ CONFIG_USB_STORAGE=y
945# CONFIG_USB_RIO500 is not set 944# CONFIG_USB_RIO500 is not set
946# CONFIG_USB_LEGOTOWER is not set 945# CONFIG_USB_LEGOTOWER is not set
947# CONFIG_USB_LCD is not set 946# CONFIG_USB_LCD is not set
948# CONFIG_USB_BERRY_CHARGE is not set
949# CONFIG_USB_LED is not set 947# CONFIG_USB_LED is not set
950# CONFIG_USB_CYPRESS_CY7C63 is not set 948# CONFIG_USB_CYPRESS_CY7C63 is not set
951# CONFIG_USB_CYTHERM is not set 949# CONFIG_USB_CYTHERM is not set
@@ -957,7 +955,6 @@ CONFIG_USB_STORAGE=y
957# CONFIG_USB_IOWARRIOR is not set 955# CONFIG_USB_IOWARRIOR is not set
958# CONFIG_USB_TEST is not set 956# CONFIG_USB_TEST is not set
959# CONFIG_USB_ISIGHTFW is not set 957# CONFIG_USB_ISIGHTFW is not set
960# CONFIG_USB_VST is not set
961# CONFIG_USB_GADGET is not set 958# CONFIG_USB_GADGET is not set
962 959
963# 960#
@@ -980,9 +977,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
980# MMC/SD/SDIO Host Controller Drivers 977# MMC/SD/SDIO Host Controller Drivers
981# 978#
982# CONFIG_MMC_SDHCI is not set 979# CONFIG_MMC_SDHCI is not set
983# CONFIG_MMC_AT91 is not set
984# CONFIG_MMC_ATMELMCI is not set
985# CONFIG_MMC_TMIO is not set
986# CONFIG_MEMSTICK is not set 980# CONFIG_MEMSTICK is not set
987# CONFIG_NEW_LEDS is not set 981# CONFIG_NEW_LEDS is not set
988# CONFIG_ACCESSIBILITY is not set 982# CONFIG_ACCESSIBILITY is not set
@@ -1074,6 +1068,7 @@ CONFIG_MISC_FILESYSTEMS=y
1074# CONFIG_BFS_FS is not set 1068# CONFIG_BFS_FS is not set
1075# CONFIG_EFS_FS is not set 1069# CONFIG_EFS_FS is not set
1076# CONFIG_JFFS2_FS is not set 1070# CONFIG_JFFS2_FS is not set
1071# CONFIG_LOGFS is not set
1077# CONFIG_CRAMFS is not set 1072# CONFIG_CRAMFS is not set
1078# CONFIG_SQUASHFS is not set 1073# CONFIG_SQUASHFS is not set
1079# CONFIG_VXFS_FS is not set 1074# CONFIG_VXFS_FS is not set
@@ -1096,6 +1091,7 @@ CONFIG_SUNRPC=y
1096# CONFIG_RPCSEC_GSS_KRB5 is not set 1091# CONFIG_RPCSEC_GSS_KRB5 is not set
1097# CONFIG_RPCSEC_GSS_SPKM3 is not set 1092# CONFIG_RPCSEC_GSS_SPKM3 is not set
1098# CONFIG_SMB_FS is not set 1093# CONFIG_SMB_FS is not set
1094# CONFIG_CEPH_FS is not set
1099# CONFIG_CIFS is not set 1095# CONFIG_CIFS is not set
1100# CONFIG_NCP_FS is not set 1096# CONFIG_NCP_FS is not set
1101# CONFIG_CODA_FS is not set 1097# CONFIG_CODA_FS is not set
@@ -1162,13 +1158,12 @@ CONFIG_FRAME_WARN=1024
1162CONFIG_DEBUG_FS=y 1158CONFIG_DEBUG_FS=y
1163# CONFIG_HEADERS_CHECK is not set 1159# CONFIG_HEADERS_CHECK is not set
1164# CONFIG_DEBUG_KERNEL is not set 1160# CONFIG_DEBUG_KERNEL is not set
1165CONFIG_STACKTRACE=y
1166CONFIG_DEBUG_BUGVERBOSE=y 1161CONFIG_DEBUG_BUGVERBOSE=y
1167# CONFIG_DEBUG_MEMORY_INIT is not set 1162# CONFIG_DEBUG_MEMORY_INIT is not set
1168# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1163# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1164# CONFIG_LKDTM is not set
1169# CONFIG_LATENCYTOP is not set 1165# CONFIG_LATENCYTOP is not set
1170# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1166# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1171CONFIG_NOP_TRACER=y
1172CONFIG_HAVE_FUNCTION_TRACER=y 1167CONFIG_HAVE_FUNCTION_TRACER=y
1173CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1168CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1174CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1169CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1176,10 +1171,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1176CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1171CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1177CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1172CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1178CONFIG_RING_BUFFER=y 1173CONFIG_RING_BUFFER=y
1179CONFIG_EVENT_TRACING=y
1180CONFIG_CONTEXT_SWITCH_TRACER=y
1181CONFIG_RING_BUFFER_ALLOW_SWAP=y 1174CONFIG_RING_BUFFER_ALLOW_SWAP=y
1182CONFIG_TRACING=y
1183CONFIG_TRACING_SUPPORT=y 1175CONFIG_TRACING_SUPPORT=y
1184# CONFIG_FTRACE is not set 1176# CONFIG_FTRACE is not set
1185# CONFIG_DYNAMIC_DEBUG is not set 1177# CONFIG_DYNAMIC_DEBUG is not set
@@ -1287,7 +1279,8 @@ CONFIG_CRYPTO=y
1287# 1279#
1288# CONFIG_CRYPTO_ANSI_CPRNG is not set 1280# CONFIG_CRYPTO_ANSI_CPRNG is not set
1289CONFIG_CRYPTO_HW=y 1281CONFIG_CRYPTO_HW=y
1290CONFIG_BINARY_PRINTF=y 1282# CONFIG_VIRTUALIZATION is not set
1283# CONFIG_BINARY_PRINTF is not set
1291 1284
1292# 1285#
1293# Library routines 1286# Library routines
diff --git a/arch/sh/configs/sh7770_generic_defconfig b/arch/sh/configs/sh7770_generic_defconfig
index 7b247053ece..4327f898baa 100644
--- a/arch/sh/configs/sh7770_generic_defconfig
+++ b/arch/sh/configs/sh7770_generic_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-rc5
4# Mon Jan 4 15:06:28 2010 4# Tue May 18 17:20:25 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -45,9 +46,11 @@ CONFIG_LOCALVERSION=""
45CONFIG_HAVE_KERNEL_GZIP=y 46CONFIG_HAVE_KERNEL_GZIP=y
46CONFIG_HAVE_KERNEL_BZIP2=y 47CONFIG_HAVE_KERNEL_BZIP2=y
47CONFIG_HAVE_KERNEL_LZMA=y 48CONFIG_HAVE_KERNEL_LZMA=y
49CONFIG_HAVE_KERNEL_LZO=y
48CONFIG_KERNEL_GZIP=y 50CONFIG_KERNEL_GZIP=y
49# CONFIG_KERNEL_BZIP2 is not set 51# CONFIG_KERNEL_BZIP2 is not set
50# CONFIG_KERNEL_LZMA is not set 52# CONFIG_KERNEL_LZMA is not set
53# CONFIG_KERNEL_LZO is not set
51CONFIG_SWAP=y 54CONFIG_SWAP=y
52CONFIG_SYSVIPC=y 55CONFIG_SYSVIPC=y
53# CONFIG_BSD_PROCESS_ACCT is not set 56# CONFIG_BSD_PROCESS_ACCT is not set
@@ -64,11 +67,6 @@ CONFIG_RCU_FANOUT=32
64# CONFIG_TREE_RCU_TRACE is not set 67# CONFIG_TREE_RCU_TRACE is not set
65# CONFIG_IKCONFIG is not set 68# CONFIG_IKCONFIG is not set
66CONFIG_LOG_BUF_SHIFT=17 69CONFIG_LOG_BUF_SHIFT=17
67CONFIG_GROUP_SCHED=y
68CONFIG_FAIR_GROUP_SCHED=y
69CONFIG_RT_GROUP_SCHED=y
70CONFIG_USER_SCHED=y
71# CONFIG_CGROUP_SCHED is not set
72CONFIG_CGROUPS=y 70CONFIG_CGROUPS=y
73# CONFIG_CGROUP_DEBUG is not set 71# CONFIG_CGROUP_DEBUG is not set
74# CONFIG_CGROUP_NS is not set 72# CONFIG_CGROUP_NS is not set
@@ -77,6 +75,7 @@ CONFIG_CGROUPS=y
77# CONFIG_CPUSETS is not set 75# CONFIG_CPUSETS is not set
78# CONFIG_CGROUP_CPUACCT is not set 76# CONFIG_CGROUP_CPUACCT is not set
79# CONFIG_RESOURCE_COUNTERS is not set 77# CONFIG_RESOURCE_COUNTERS is not set
78# CONFIG_CGROUP_SCHED is not set
80# CONFIG_RELAY is not set 79# CONFIG_RELAY is not set
81# CONFIG_NAMESPACES is not set 80# CONFIG_NAMESPACES is not set
82# CONFIG_BLK_DEV_INITRD is not set 81# CONFIG_BLK_DEV_INITRD is not set
@@ -105,7 +104,6 @@ CONFIG_PERF_USE_VMALLOC=y
105# Kernel Performance Events And Counters 104# Kernel Performance Events And Counters
106# 105#
107CONFIG_PERF_EVENTS=y 106CONFIG_PERF_EVENTS=y
108CONFIG_EVENT_PROFILE=y
109# CONFIG_PERF_COUNTERS is not set 107# CONFIG_PERF_COUNTERS is not set
110CONFIG_VM_EVENT_COUNTERS=y 108CONFIG_VM_EVENT_COUNTERS=y
111# CONFIG_COMPAT_BRK is not set 109# CONFIG_COMPAT_BRK is not set
@@ -113,7 +111,6 @@ CONFIG_VM_EVENT_COUNTERS=y
113CONFIG_SLUB=y 111CONFIG_SLUB=y
114# CONFIG_SLOB is not set 112# CONFIG_SLOB is not set
115CONFIG_PROFILING=y 113CONFIG_PROFILING=y
116CONFIG_TRACEPOINTS=y
117CONFIG_OPROFILE=y 114CONFIG_OPROFILE=y
118CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
119CONFIG_HAVE_IOREMAP_PROT=y 116CONFIG_HAVE_IOREMAP_PROT=y
@@ -123,11 +120,11 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123CONFIG_HAVE_DMA_ATTRS=y 120CONFIG_HAVE_DMA_ATTRS=y
124CONFIG_HAVE_CLK=y 121CONFIG_HAVE_CLK=y
125CONFIG_HAVE_DMA_API_DEBUG=y 122CONFIG_HAVE_DMA_API_DEBUG=y
123CONFIG_HAVE_HW_BREAKPOINT=y
126 124
127# 125#
128# GCOV-based kernel profiling 126# GCOV-based kernel profiling
129# 127#
130# CONFIG_GCOV_KERNEL is not set
131# CONFIG_SLOW_WORK is not set 128# CONFIG_SLOW_WORK is not set
132CONFIG_HAVE_GENERIC_DMA_COHERENT=y 129CONFIG_HAVE_GENERIC_DMA_COHERENT=y
133CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
@@ -137,7 +134,6 @@ CONFIG_BLOCK=y
137CONFIG_LBDAF=y 134CONFIG_LBDAF=y
138# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
140# CONFIG_BLK_CGROUP is not set
141 137
142# 138#
143# IO Schedulers 139# IO Schedulers
@@ -232,7 +228,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_MEMORY_START=0x08000000 228CONFIG_MEMORY_START=0x08000000
233CONFIG_MEMORY_SIZE=0x04000000 229CONFIG_MEMORY_SIZE=0x04000000
234CONFIG_29BIT=y 230CONFIG_29BIT=y
235# CONFIG_PMB_ENABLE is not set 231# CONFIG_PMB is not set
236CONFIG_VSYSCALL=y 232CONFIG_VSYSCALL=y
237CONFIG_ARCH_FLATMEM_ENABLE=y 233CONFIG_ARCH_FLATMEM_ENABLE=y
238CONFIG_ARCH_SPARSEMEM_ENABLE=y 234CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -242,6 +238,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
242CONFIG_ARCH_SELECT_MEMORY_MODEL=y 238CONFIG_ARCH_SELECT_MEMORY_MODEL=y
243CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 239CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
244CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 240CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
241CONFIG_UNCACHED_MAPPING=y
245CONFIG_PAGE_SIZE_4KB=y 242CONFIG_PAGE_SIZE_4KB=y
246# CONFIG_PAGE_SIZE_8KB is not set 243# CONFIG_PAGE_SIZE_8KB is not set
247# CONFIG_PAGE_SIZE_16KB is not set 244# CONFIG_PAGE_SIZE_16KB is not set
@@ -258,7 +255,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
258CONFIG_MIGRATION=y 255CONFIG_MIGRATION=y
259# CONFIG_PHYS_ADDR_T_64BIT is not set 256# CONFIG_PHYS_ADDR_T_64BIT is not set
260CONFIG_ZONE_DMA_FLAG=0 257CONFIG_ZONE_DMA_FLAG=0
261CONFIG_NR_QUICK=2 258CONFIG_NR_QUICK=1
262# CONFIG_KSM is not set 259# CONFIG_KSM is not set
263CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 260CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
264 261
@@ -347,7 +344,7 @@ CONFIG_PREEMPT_NONE=y
347# CONFIG_PREEMPT_VOLUNTARY is not set 344# CONFIG_PREEMPT_VOLUNTARY is not set
348# CONFIG_PREEMPT is not set 345# CONFIG_PREEMPT is not set
349CONFIG_GUSA=y 346CONFIG_GUSA=y
350# CONFIG_SPARSE_IRQ is not set 347# CONFIG_INTC_USERIMASK is not set
351 348
352# 349#
353# Boot options 350# Boot options
@@ -382,6 +379,7 @@ CONFIG_HIBERNATION_NVS=y
382CONFIG_HIBERNATION=y 379CONFIG_HIBERNATION=y
383CONFIG_PM_STD_PARTITION="" 380CONFIG_PM_STD_PARTITION=""
384# CONFIG_PM_RUNTIME is not set 381# CONFIG_PM_RUNTIME is not set
382CONFIG_PM_OPS=y
385CONFIG_CPU_IDLE=y 383CONFIG_CPU_IDLE=y
386CONFIG_CPU_IDLE_GOV_LADDER=y 384CONFIG_CPU_IDLE_GOV_LADDER=y
387CONFIG_CPU_IDLE_GOV_MENU=y 385CONFIG_CPU_IDLE_GOV_MENU=y
@@ -420,6 +418,7 @@ CONFIG_HAVE_IDE=y
420# 418#
421# SCSI device support 419# SCSI device support
422# 420#
421CONFIG_SCSI_MOD=y
423# CONFIG_RAID_ATTRS is not set 422# CONFIG_RAID_ATTRS is not set
424# CONFIG_SCSI is not set 423# CONFIG_SCSI is not set
425# CONFIG_SCSI_DMA is not set 424# CONFIG_SCSI_DMA is not set
@@ -459,6 +458,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
459CONFIG_SERIAL_SH_SCI_CONSOLE=y 458CONFIG_SERIAL_SH_SCI_CONSOLE=y
460CONFIG_SERIAL_CORE=y 459CONFIG_SERIAL_CORE=y
461CONFIG_SERIAL_CORE_CONSOLE=y 460CONFIG_SERIAL_CORE_CONSOLE=y
461# CONFIG_SERIAL_TIMBERDALE is not set
462# CONFIG_UNIX98_PTYS is not set 462# CONFIG_UNIX98_PTYS is not set
463# CONFIG_LEGACY_PTYS is not set 463# CONFIG_LEGACY_PTYS is not set
464# CONFIG_IPMI_HANDLER is not set 464# CONFIG_IPMI_HANDLER is not set
@@ -483,6 +483,7 @@ CONFIG_I2C_HELPER_AUTO=y
483# CONFIG_I2C_OCORES is not set 483# CONFIG_I2C_OCORES is not set
484CONFIG_I2C_SH_MOBILE=y 484CONFIG_I2C_SH_MOBILE=y
485# CONFIG_I2C_SIMTEC is not set 485# CONFIG_I2C_SIMTEC is not set
486# CONFIG_I2C_XILINX is not set
486 487
487# 488#
488# External I2C/SMBus adapter drivers 489# External I2C/SMBus adapter drivers
@@ -494,15 +495,9 @@ CONFIG_I2C_SH_MOBILE=y
494# Other I2C/SMBus bus drivers 495# Other I2C/SMBus bus drivers
495# 496#
496# CONFIG_I2C_PCA_PLATFORM is not set 497# CONFIG_I2C_PCA_PLATFORM is not set
497
498#
499# Miscellaneous I2C Chip support
500#
501# CONFIG_SENSORS_TSL2550 is not set
502# CONFIG_I2C_DEBUG_CORE is not set 498# CONFIG_I2C_DEBUG_CORE is not set
503# CONFIG_I2C_DEBUG_ALGO is not set 499# CONFIG_I2C_DEBUG_ALGO is not set
504# CONFIG_I2C_DEBUG_BUS is not set 500# CONFIG_I2C_DEBUG_BUS is not set
505# CONFIG_I2C_DEBUG_CHIP is not set
506# CONFIG_SPI is not set 501# CONFIG_SPI is not set
507 502
508# 503#
@@ -525,6 +520,7 @@ CONFIG_SSB_POSSIBLE=y
525# Multifunction device drivers 520# Multifunction device drivers
526# 521#
527# CONFIG_MFD_CORE is not set 522# CONFIG_MFD_CORE is not set
523# CONFIG_MFD_88PM860X is not set
528# CONFIG_MFD_SM501 is not set 524# CONFIG_MFD_SM501 is not set
529# CONFIG_MFD_SH_MOBILE_SDHI is not set 525# CONFIG_MFD_SH_MOBILE_SDHI is not set
530# CONFIG_HTC_PASIC3 is not set 526# CONFIG_HTC_PASIC3 is not set
@@ -532,12 +528,13 @@ CONFIG_SSB_POSSIBLE=y
532# CONFIG_MFD_TMIO is not set 528# CONFIG_MFD_TMIO is not set
533# CONFIG_PMIC_DA903X is not set 529# CONFIG_PMIC_DA903X is not set
534# CONFIG_PMIC_ADP5520 is not set 530# CONFIG_PMIC_ADP5520 is not set
531# CONFIG_MFD_MAX8925 is not set
535# CONFIG_MFD_WM8400 is not set 532# CONFIG_MFD_WM8400 is not set
536# CONFIG_MFD_WM831X is not set 533# CONFIG_MFD_WM831X is not set
537# CONFIG_MFD_WM8350_I2C is not set 534# CONFIG_MFD_WM8350_I2C is not set
535# CONFIG_MFD_WM8994 is not set
538# CONFIG_MFD_PCF50633 is not set 536# CONFIG_MFD_PCF50633 is not set
539# CONFIG_AB3100_CORE is not set 537# CONFIG_AB3100_CORE is not set
540# CONFIG_MFD_88PM8607 is not set
541# CONFIG_REGULATOR is not set 538# CONFIG_REGULATOR is not set
542# CONFIG_MEDIA_SUPPORT is not set 539# CONFIG_MEDIA_SUPPORT is not set
543 540
@@ -621,8 +618,6 @@ CONFIG_RTC_DRV_SH=y
621CONFIG_UIO=y 618CONFIG_UIO=y
622# CONFIG_UIO_PDRV is not set 619# CONFIG_UIO_PDRV is not set
623CONFIG_UIO_PDRV_GENIRQ=y 620CONFIG_UIO_PDRV_GENIRQ=y
624# CONFIG_UIO_SMX is not set
625# CONFIG_UIO_SERCOS3 is not set
626 621
627# 622#
628# TI VLYNQ 623# TI VLYNQ
@@ -635,7 +630,6 @@ CONFIG_UIO_PDRV_GENIRQ=y
635# CONFIG_EXT2_FS is not set 630# CONFIG_EXT2_FS is not set
636# CONFIG_EXT3_FS is not set 631# CONFIG_EXT3_FS is not set
637# CONFIG_EXT4_FS is not set 632# CONFIG_EXT4_FS is not set
638CONFIG_EXT4_USE_FOR_EXT23=y
639# CONFIG_REISERFS_FS is not set 633# CONFIG_REISERFS_FS is not set
640# CONFIG_JFS_FS is not set 634# CONFIG_JFS_FS is not set
641# CONFIG_FS_POSIX_ACL is not set 635# CONFIG_FS_POSIX_ACL is not set
@@ -699,15 +693,12 @@ CONFIG_FRAME_WARN=1024
699# CONFIG_MAGIC_SYSRQ is not set 693# CONFIG_MAGIC_SYSRQ is not set
700# CONFIG_STRIP_ASM_SYMS is not set 694# CONFIG_STRIP_ASM_SYMS is not set
701# CONFIG_UNUSED_SYMBOLS is not set 695# CONFIG_UNUSED_SYMBOLS is not set
702CONFIG_DEBUG_FS=y
703# CONFIG_HEADERS_CHECK is not set 696# CONFIG_HEADERS_CHECK is not set
704# CONFIG_DEBUG_KERNEL is not set 697# CONFIG_DEBUG_KERNEL is not set
705CONFIG_STACKTRACE=y
706CONFIG_DEBUG_BUGVERBOSE=y 698CONFIG_DEBUG_BUGVERBOSE=y
707# CONFIG_DEBUG_MEMORY_INIT is not set 699# CONFIG_DEBUG_MEMORY_INIT is not set
708# CONFIG_RCU_CPU_STALL_DETECTOR is not set 700# CONFIG_RCU_CPU_STALL_DETECTOR is not set
709# CONFIG_LATENCYTOP is not set 701# CONFIG_LATENCYTOP is not set
710CONFIG_NOP_TRACER=y
711CONFIG_HAVE_FUNCTION_TRACER=y 702CONFIG_HAVE_FUNCTION_TRACER=y
712CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 703CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
713CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 704CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -715,13 +706,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
715CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 706CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
716CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 707CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
717CONFIG_RING_BUFFER=y 708CONFIG_RING_BUFFER=y
718CONFIG_EVENT_TRACING=y
719CONFIG_CONTEXT_SWITCH_TRACER=y
720CONFIG_RING_BUFFER_ALLOW_SWAP=y 709CONFIG_RING_BUFFER_ALLOW_SWAP=y
721CONFIG_TRACING=y
722CONFIG_TRACING_SUPPORT=y 710CONFIG_TRACING_SUPPORT=y
723# CONFIG_FTRACE is not set 711# CONFIG_FTRACE is not set
724# CONFIG_DYNAMIC_DEBUG is not set
725# CONFIG_DMA_API_DEBUG is not set 712# CONFIG_DMA_API_DEBUG is not set
726# CONFIG_SAMPLES is not set 713# CONFIG_SAMPLES is not set
727CONFIG_HAVE_ARCH_KGDB=y 714CONFIG_HAVE_ARCH_KGDB=y
@@ -739,7 +726,8 @@ CONFIG_HAVE_ARCH_KGDB=y
739CONFIG_DEFAULT_SECURITY_DAC=y 726CONFIG_DEFAULT_SECURITY_DAC=y
740CONFIG_DEFAULT_SECURITY="" 727CONFIG_DEFAULT_SECURITY=""
741# CONFIG_CRYPTO is not set 728# CONFIG_CRYPTO is not set
742CONFIG_BINARY_PRINTF=y 729# CONFIG_VIRTUALIZATION is not set
730# CONFIG_BINARY_PRINTF is not set
743 731
744# 732#
745# Library routines 733# Library routines
diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig
index 8330813b0c1..e9af616b216 100644
--- a/arch/sh/configs/sh7785lcr_32bit_defconfig
+++ b/arch/sh/configs/sh7785lcr_32bit_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-rc5
4# Mon Jan 4 15:07:40 2010 4# Tue May 18 17:22:09 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -74,11 +77,6 @@ CONFIG_RCU_FANOUT=32
74CONFIG_IKCONFIG=y 77CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y 78CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
77CONFIG_GROUP_SCHED=y
78CONFIG_FAIR_GROUP_SCHED=y
79# CONFIG_RT_GROUP_SCHED is not set
80CONFIG_USER_SCHED=y
81# CONFIG_CGROUP_SCHED is not set
82# CONFIG_CGROUPS is not set 80# CONFIG_CGROUPS is not set
83# CONFIG_SYSFS_DEPRECATED_V2 is not set 81# CONFIG_SYSFS_DEPRECATED_V2 is not set
84# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
@@ -112,7 +110,6 @@ CONFIG_PERF_USE_VMALLOC=y
112# Kernel Performance Events And Counters 110# Kernel Performance Events And Counters
113# 111#
114CONFIG_PERF_EVENTS=y 112CONFIG_PERF_EVENTS=y
115CONFIG_EVENT_PROFILE=y
116CONFIG_PERF_COUNTERS=y 113CONFIG_PERF_COUNTERS=y
117CONFIG_VM_EVENT_COUNTERS=y 114CONFIG_VM_EVENT_COUNTERS=y
118CONFIG_PCI_QUIRKS=y 115CONFIG_PCI_QUIRKS=y
@@ -126,13 +123,13 @@ CONFIG_OPROFILE=y
126CONFIG_HAVE_OPROFILE=y 123CONFIG_HAVE_OPROFILE=y
127CONFIG_KPROBES=y 124CONFIG_KPROBES=y
128CONFIG_KRETPROBES=y 125CONFIG_KRETPROBES=y
129CONFIG_HAVE_IOREMAP_PROT=y
130CONFIG_HAVE_KPROBES=y 126CONFIG_HAVE_KPROBES=y
131CONFIG_HAVE_KRETPROBES=y 127CONFIG_HAVE_KRETPROBES=y
132CONFIG_HAVE_ARCH_TRACEHOOK=y 128CONFIG_HAVE_ARCH_TRACEHOOK=y
133CONFIG_HAVE_DMA_ATTRS=y 129CONFIG_HAVE_DMA_ATTRS=y
134CONFIG_HAVE_CLK=y 130CONFIG_HAVE_CLK=y
135CONFIG_HAVE_DMA_API_DEBUG=y 131CONFIG_HAVE_DMA_API_DEBUG=y
132CONFIG_HAVE_HW_BREAKPOINT=y
136 133
137# 134#
138# GCOV-based kernel profiling 135# GCOV-based kernel profiling
@@ -246,12 +243,9 @@ CONFIG_PAGE_OFFSET=0x80000000
246CONFIG_FORCE_MAX_ZONEORDER=11 243CONFIG_FORCE_MAX_ZONEORDER=11
247CONFIG_MEMORY_START=0x40000000 244CONFIG_MEMORY_START=0x40000000
248CONFIG_MEMORY_SIZE=0x20000000 245CONFIG_MEMORY_SIZE=0x20000000
249# CONFIG_29BIT is not set 246CONFIG_29BIT=y
250CONFIG_32BIT=y
251CONFIG_PMB_ENABLE=y
252# CONFIG_PMB is not set 247# CONFIG_PMB is not set
253CONFIG_PMB_FIXED=y 248CONFIG_X2TLB=y
254# CONFIG_X2TLB is not set
255CONFIG_VSYSCALL=y 249CONFIG_VSYSCALL=y
256# CONFIG_NUMA is not set 250# CONFIG_NUMA is not set
257CONFIG_ARCH_FLATMEM_ENABLE=y 251CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -262,6 +256,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
262CONFIG_ARCH_SELECT_MEMORY_MODEL=y 256CONFIG_ARCH_SELECT_MEMORY_MODEL=y
263CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 257CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
264CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 258CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
259CONFIG_IOREMAP_FIXED=y
260CONFIG_UNCACHED_MAPPING=y
265CONFIG_PAGE_SIZE_4KB=y 261CONFIG_PAGE_SIZE_4KB=y
266# CONFIG_PAGE_SIZE_8KB is not set 262# CONFIG_PAGE_SIZE_8KB is not set
267# CONFIG_PAGE_SIZE_16KB is not set 263# CONFIG_PAGE_SIZE_16KB is not set
@@ -284,7 +280,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
284CONFIG_MIGRATION=y 280CONFIG_MIGRATION=y
285# CONFIG_PHYS_ADDR_T_64BIT is not set 281# CONFIG_PHYS_ADDR_T_64BIT is not set
286CONFIG_ZONE_DMA_FLAG=0 282CONFIG_ZONE_DMA_FLAG=0
287CONFIG_NR_QUICK=2 283CONFIG_NR_QUICK=1
288# CONFIG_KSM is not set 284# CONFIG_KSM is not set
289CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 285CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
290 286
@@ -302,6 +298,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
302# CONFIG_CPU_BIG_ENDIAN is not set 298# CONFIG_CPU_BIG_ENDIAN is not set
303CONFIG_SH_FPU=y 299CONFIG_SH_FPU=y
304CONFIG_SH_STORE_QUEUES=y 300CONFIG_SH_STORE_QUEUES=y
301# CONFIG_SPECULATIVE_EXECUTION is not set
305CONFIG_CPU_HAS_INTEVT=y 302CONFIG_CPU_HAS_INTEVT=y
306CONFIG_CPU_HAS_SR_RB=y 303CONFIG_CPU_HAS_SR_RB=y
307CONFIG_CPU_HAS_FPU=y 304CONFIG_CPU_HAS_FPU=y
@@ -311,7 +308,7 @@ CONFIG_CPU_HAS_FPU=y
311# 308#
312# CONFIG_SH_HIGHLANDER is not set 309# CONFIG_SH_HIGHLANDER is not set
313CONFIG_SH_SH7785LCR=y 310CONFIG_SH_SH7785LCR=y
314# CONFIG_SH_SH7785LCR_PT is not set 311CONFIG_SH_SH7785LCR_29BIT_PHYSMAPS=y
315 312
316# 313#
317# Timer and clock configuration 314# Timer and clock configuration
@@ -374,7 +371,7 @@ CONFIG_SECCOMP=y
374# CONFIG_PREEMPT_VOLUNTARY is not set 371# CONFIG_PREEMPT_VOLUNTARY is not set
375CONFIG_PREEMPT=y 372CONFIG_PREEMPT=y
376CONFIG_GUSA=y 373CONFIG_GUSA=y
377CONFIG_SPARSE_IRQ=y 374# CONFIG_INTC_USERIMASK is not set
378 375
379# 376#
380# Boot options 377# Boot options
@@ -389,9 +386,9 @@ CONFIG_ENTRY_OFFSET=0x00001000
389# Bus options 386# Bus options
390# 387#
391CONFIG_PCI=y 388CONFIG_PCI=y
389CONFIG_PCI_DOMAINS=y
392# CONFIG_PCIEPORTBUS is not set 390# CONFIG_PCIEPORTBUS is not set
393# CONFIG_ARCH_SUPPORTS_MSI is not set 391# CONFIG_ARCH_SUPPORTS_MSI is not set
394# CONFIG_PCI_LEGACY is not set
395# CONFIG_PCI_STUB is not set 392# CONFIG_PCI_STUB is not set
396# CONFIG_PCI_IOV is not set 393# CONFIG_PCI_IOV is not set
397# CONFIG_PCCARD is not set 394# CONFIG_PCCARD is not set
@@ -421,7 +418,6 @@ CONFIG_NET=y
421# Networking options 418# Networking options
422# 419#
423CONFIG_PACKET=y 420CONFIG_PACKET=y
424# CONFIG_PACKET_MMAP is not set
425CONFIG_UNIX=y 421CONFIG_UNIX=y
426CONFIG_XFRM=y 422CONFIG_XFRM=y
427# CONFIG_XFRM_USER is not set 423# CONFIG_XFRM_USER is not set
@@ -633,6 +629,7 @@ CONFIG_HAVE_IDE=y
633# 629#
634# SCSI device support 630# SCSI device support
635# 631#
632CONFIG_SCSI_MOD=y
636# CONFIG_RAID_ATTRS is not set 633# CONFIG_RAID_ATTRS is not set
637CONFIG_SCSI=y 634CONFIG_SCSI=y
638CONFIG_SCSI_DMA=y 635CONFIG_SCSI_DMA=y
@@ -706,6 +703,7 @@ CONFIG_SATA_SIL=y
706# CONFIG_PATA_IT821X is not set 703# CONFIG_PATA_IT821X is not set
707# CONFIG_PATA_IT8213 is not set 704# CONFIG_PATA_IT8213 is not set
708# CONFIG_PATA_JMICRON is not set 705# CONFIG_PATA_JMICRON is not set
706# CONFIG_PATA_LEGACY is not set
709# CONFIG_PATA_TRIFLEX is not set 707# CONFIG_PATA_TRIFLEX is not set
710# CONFIG_PATA_MARVELL is not set 708# CONFIG_PATA_MARVELL is not set
711# CONFIG_PATA_MPIIX is not set 709# CONFIG_PATA_MPIIX is not set
@@ -742,7 +740,7 @@ CONFIG_SATA_SIL=y
742# 740#
743 741
744# 742#
745# See the help texts for more information. 743# The newer stack is recommended.
746# 744#
747# CONFIG_FIREWIRE is not set 745# CONFIG_FIREWIRE is not set
748# CONFIG_IEEE1394 is not set 746# CONFIG_IEEE1394 is not set
@@ -797,6 +795,7 @@ CONFIG_R8169=y
797# CONFIG_USB_PEGASUS is not set 795# CONFIG_USB_PEGASUS is not set
798# CONFIG_USB_RTL8150 is not set 796# CONFIG_USB_RTL8150 is not set
799# CONFIG_USB_USBNET is not set 797# CONFIG_USB_USBNET is not set
798# CONFIG_USB_IPHETH is not set
800# CONFIG_WAN is not set 799# CONFIG_WAN is not set
801# CONFIG_FDDI is not set 800# CONFIG_FDDI is not set
802# CONFIG_HIPPI is not set 801# CONFIG_HIPPI is not set
@@ -901,6 +900,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
901CONFIG_SERIAL_CORE=y 900CONFIG_SERIAL_CORE=y
902CONFIG_SERIAL_CORE_CONSOLE=y 901CONFIG_SERIAL_CORE_CONSOLE=y
903# CONFIG_SERIAL_JSM is not set 902# CONFIG_SERIAL_JSM is not set
903# CONFIG_SERIAL_TIMBERDALE is not set
904CONFIG_UNIX98_PTYS=y 904CONFIG_UNIX98_PTYS=y
905CONFIG_DEVPTS_MULTIPLE_INSTANCES=y 905CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
906# CONFIG_LEGACY_PTYS is not set 906# CONFIG_LEGACY_PTYS is not set
@@ -947,6 +947,7 @@ CONFIG_I2C_ALGOPCA=y
947# CONFIG_I2C_OCORES is not set 947# CONFIG_I2C_OCORES is not set
948# CONFIG_I2C_SH_MOBILE is not set 948# CONFIG_I2C_SH_MOBILE is not set
949# CONFIG_I2C_SIMTEC is not set 949# CONFIG_I2C_SIMTEC is not set
950# CONFIG_I2C_XILINX is not set
950 951
951# 952#
952# External I2C/SMBus adapter drivers 953# External I2C/SMBus adapter drivers
@@ -960,15 +961,9 @@ CONFIG_I2C_ALGOPCA=y
960# 961#
961CONFIG_I2C_PCA_PLATFORM=y 962CONFIG_I2C_PCA_PLATFORM=y
962# CONFIG_I2C_STUB is not set 963# CONFIG_I2C_STUB is not set
963
964#
965# Miscellaneous I2C Chip support
966#
967# CONFIG_SENSORS_TSL2550 is not set
968# CONFIG_I2C_DEBUG_CORE is not set 964# CONFIG_I2C_DEBUG_CORE is not set
969# CONFIG_I2C_DEBUG_ALGO is not set 965# CONFIG_I2C_DEBUG_ALGO is not set
970# CONFIG_I2C_DEBUG_BUS is not set 966# CONFIG_I2C_DEBUG_BUS is not set
971# CONFIG_I2C_DEBUG_CHIP is not set
972# CONFIG_SPI is not set 967# CONFIG_SPI is not set
973 968
974# 969#
@@ -1011,6 +1006,7 @@ CONFIG_SSB_POSSIBLE=y
1011# Multifunction device drivers 1006# Multifunction device drivers
1012# 1007#
1013# CONFIG_MFD_CORE is not set 1008# CONFIG_MFD_CORE is not set
1009# CONFIG_MFD_88PM860X is not set
1014CONFIG_MFD_SM501=y 1010CONFIG_MFD_SM501=y
1015# CONFIG_MFD_SH_MOBILE_SDHI is not set 1011# CONFIG_MFD_SH_MOBILE_SDHI is not set
1016# CONFIG_HTC_PASIC3 is not set 1012# CONFIG_HTC_PASIC3 is not set
@@ -1018,12 +1014,14 @@ CONFIG_MFD_SM501=y
1018# CONFIG_MFD_TMIO is not set 1014# CONFIG_MFD_TMIO is not set
1019# CONFIG_PMIC_DA903X is not set 1015# CONFIG_PMIC_DA903X is not set
1020# CONFIG_PMIC_ADP5520 is not set 1016# CONFIG_PMIC_ADP5520 is not set
1017# CONFIG_MFD_MAX8925 is not set
1021# CONFIG_MFD_WM8400 is not set 1018# CONFIG_MFD_WM8400 is not set
1022# CONFIG_MFD_WM831X is not set 1019# CONFIG_MFD_WM831X is not set
1023# CONFIG_MFD_WM8350_I2C is not set 1020# CONFIG_MFD_WM8350_I2C is not set
1021# CONFIG_MFD_WM8994 is not set
1024# CONFIG_MFD_PCF50633 is not set 1022# CONFIG_MFD_PCF50633 is not set
1025# CONFIG_AB3100_CORE is not set 1023# CONFIG_AB3100_CORE is not set
1026# CONFIG_MFD_88PM8607 is not set 1024# CONFIG_LPC_SCH is not set
1027# CONFIG_REGULATOR is not set 1025# CONFIG_REGULATOR is not set
1028# CONFIG_MEDIA_SUPPORT is not set 1026# CONFIG_MEDIA_SUPPORT is not set
1029 1027
@@ -1209,6 +1207,7 @@ CONFIG_SND_CMIPCI=y
1209# CONFIG_SND_SUPERH is not set 1207# CONFIG_SND_SUPERH is not set
1210CONFIG_SND_USB=y 1208CONFIG_SND_USB=y
1211# CONFIG_SND_USB_AUDIO is not set 1209# CONFIG_SND_USB_AUDIO is not set
1210# CONFIG_SND_USB_UA101 is not set
1212# CONFIG_SND_USB_CAIAQ is not set 1211# CONFIG_SND_USB_CAIAQ is not set
1213# CONFIG_SND_SOC is not set 1212# CONFIG_SND_SOC is not set
1214# CONFIG_SOUND_PRIME is not set 1213# CONFIG_SOUND_PRIME is not set
@@ -1226,6 +1225,7 @@ CONFIG_USB_HID=y
1226# 1225#
1227# Special HID drivers 1226# Special HID drivers
1228# 1227#
1228# CONFIG_HID_3M_PCT is not set
1229CONFIG_HID_A4TECH=m 1229CONFIG_HID_A4TECH=m
1230CONFIG_HID_APPLE=m 1230CONFIG_HID_APPLE=m
1231CONFIG_HID_BELKIN=m 1231CONFIG_HID_BELKIN=m
@@ -1242,14 +1242,19 @@ CONFIG_HID_KENSINGTON=m
1242CONFIG_HID_LOGITECH=m 1242CONFIG_HID_LOGITECH=m
1243# CONFIG_LOGITECH_FF is not set 1243# CONFIG_LOGITECH_FF is not set
1244# CONFIG_LOGIRUMBLEPAD2_FF is not set 1244# CONFIG_LOGIRUMBLEPAD2_FF is not set
1245# CONFIG_LOGIG940_FF is not set
1245CONFIG_HID_MICROSOFT=m 1246CONFIG_HID_MICROSOFT=m
1247# CONFIG_HID_MOSART is not set
1246CONFIG_HID_MONTEREY=m 1248CONFIG_HID_MONTEREY=m
1247CONFIG_HID_NTRIG=m 1249CONFIG_HID_NTRIG=m
1250# CONFIG_HID_ORTEK is not set
1248CONFIG_HID_PANTHERLORD=m 1251CONFIG_HID_PANTHERLORD=m
1249# CONFIG_PANTHERLORD_FF is not set 1252# CONFIG_PANTHERLORD_FF is not set
1250CONFIG_HID_PETALYNX=m 1253CONFIG_HID_PETALYNX=m
1254# CONFIG_HID_QUANTA is not set
1251CONFIG_HID_SAMSUNG=m 1255CONFIG_HID_SAMSUNG=m
1252CONFIG_HID_SONY=m 1256CONFIG_HID_SONY=m
1257# CONFIG_HID_STANTUM is not set
1253CONFIG_HID_SUNPLUS=m 1258CONFIG_HID_SUNPLUS=m
1254CONFIG_HID_GREENASIA=m 1259CONFIG_HID_GREENASIA=m
1255# CONFIG_GREENASIA_FF is not set 1260# CONFIG_GREENASIA_FF is not set
@@ -1273,7 +1278,6 @@ CONFIG_USB=y
1273# CONFIG_USB_DEVICEFS is not set 1278# CONFIG_USB_DEVICEFS is not set
1274CONFIG_USB_DEVICE_CLASS=y 1279CONFIG_USB_DEVICE_CLASS=y
1275# CONFIG_USB_DYNAMIC_MINORS is not set 1280# CONFIG_USB_DYNAMIC_MINORS is not set
1276# CONFIG_USB_SUSPEND is not set
1277# CONFIG_USB_OTG is not set 1281# CONFIG_USB_OTG is not set
1278# CONFIG_USB_OTG_WHITELIST is not set 1282# CONFIG_USB_OTG_WHITELIST is not set
1279# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1283# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -1351,7 +1355,6 @@ CONFIG_USB_STORAGE=y
1351# CONFIG_USB_RIO500 is not set 1355# CONFIG_USB_RIO500 is not set
1352# CONFIG_USB_LEGOTOWER is not set 1356# CONFIG_USB_LEGOTOWER is not set
1353# CONFIG_USB_LCD is not set 1357# CONFIG_USB_LCD is not set
1354# CONFIG_USB_BERRY_CHARGE is not set
1355# CONFIG_USB_LED is not set 1358# CONFIG_USB_LED is not set
1356# CONFIG_USB_CYPRESS_CY7C63 is not set 1359# CONFIG_USB_CYPRESS_CY7C63 is not set
1357# CONFIG_USB_CYTHERM is not set 1360# CONFIG_USB_CYTHERM is not set
@@ -1364,7 +1367,6 @@ CONFIG_USB_STORAGE=y
1364# CONFIG_USB_IOWARRIOR is not set 1367# CONFIG_USB_IOWARRIOR is not set
1365# CONFIG_USB_TEST is not set 1368# CONFIG_USB_TEST is not set
1366# CONFIG_USB_ISIGHTFW is not set 1369# CONFIG_USB_ISIGHTFW is not set
1367# CONFIG_USB_VST is not set
1368# CONFIG_USB_GADGET is not set 1370# CONFIG_USB_GADGET is not set
1369 1371
1370# 1372#
@@ -1390,10 +1392,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
1390CONFIG_MMC_SDHCI=m 1392CONFIG_MMC_SDHCI=m
1391# CONFIG_MMC_SDHCI_PCI is not set 1393# CONFIG_MMC_SDHCI_PCI is not set
1392CONFIG_MMC_SDHCI_PLTFM=m 1394CONFIG_MMC_SDHCI_PLTFM=m
1393# CONFIG_MMC_AT91 is not set
1394# CONFIG_MMC_ATMELMCI is not set
1395# CONFIG_MMC_TIFM_SD is not set 1395# CONFIG_MMC_TIFM_SD is not set
1396# CONFIG_MMC_TMIO is not set
1397# CONFIG_MMC_CB710 is not set 1396# CONFIG_MMC_CB710 is not set
1398# CONFIG_MMC_VIA_SDMMC is not set 1397# CONFIG_MMC_VIA_SDMMC is not set
1399# CONFIG_MEMSTICK is not set 1398# CONFIG_MEMSTICK is not set
@@ -1460,6 +1459,7 @@ CONFIG_RTC_DRV_RS5C372=y
1460# CONFIG_RTC_DRV_SH is not set 1459# CONFIG_RTC_DRV_SH is not set
1461# CONFIG_RTC_DRV_GENERIC is not set 1460# CONFIG_RTC_DRV_GENERIC is not set
1462CONFIG_DMADEVICES=y 1461CONFIG_DMADEVICES=y
1462# CONFIG_DMADEVICES_DEBUG is not set
1463 1463
1464# 1464#
1465# DMA Devices 1465# DMA Devices
@@ -1469,10 +1469,10 @@ CONFIG_UIO=m
1469# CONFIG_UIO_CIF is not set 1469# CONFIG_UIO_CIF is not set
1470# CONFIG_UIO_PDRV is not set 1470# CONFIG_UIO_PDRV is not set
1471# CONFIG_UIO_PDRV_GENIRQ is not set 1471# CONFIG_UIO_PDRV_GENIRQ is not set
1472# CONFIG_UIO_SMX is not set
1473# CONFIG_UIO_AEC is not set 1472# CONFIG_UIO_AEC is not set
1474# CONFIG_UIO_SERCOS3 is not set 1473# CONFIG_UIO_SERCOS3 is not set
1475# CONFIG_UIO_PCI_GENERIC is not set 1474# CONFIG_UIO_PCI_GENERIC is not set
1475# CONFIG_UIO_NETX is not set
1476 1476
1477# 1477#
1478# TI VLYNQ 1478# TI VLYNQ
@@ -1556,6 +1556,7 @@ CONFIG_MISC_FILESYSTEMS=y
1556# CONFIG_BFS_FS is not set 1556# CONFIG_BFS_FS is not set
1557# CONFIG_EFS_FS is not set 1557# CONFIG_EFS_FS is not set
1558# CONFIG_JFFS2_FS is not set 1558# CONFIG_JFFS2_FS is not set
1559# CONFIG_LOGFS is not set
1559# CONFIG_CRAMFS is not set 1560# CONFIG_CRAMFS is not set
1560# CONFIG_SQUASHFS is not set 1561# CONFIG_SQUASHFS is not set
1561# CONFIG_VXFS_FS is not set 1562# CONFIG_VXFS_FS is not set
@@ -1586,6 +1587,7 @@ CONFIG_SUNRPC_GSS=y
1586CONFIG_RPCSEC_GSS_KRB5=y 1587CONFIG_RPCSEC_GSS_KRB5=y
1587# CONFIG_RPCSEC_GSS_SPKM3 is not set 1588# CONFIG_RPCSEC_GSS_SPKM3 is not set
1588# CONFIG_SMB_FS is not set 1589# CONFIG_SMB_FS is not set
1590# CONFIG_CEPH_FS is not set
1589# CONFIG_CIFS is not set 1591# CONFIG_CIFS is not set
1590# CONFIG_NCP_FS is not set 1592# CONFIG_NCP_FS is not set
1591# CONFIG_CODA_FS is not set 1593# CONFIG_CODA_FS is not set
@@ -1660,6 +1662,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
1660# CONFIG_DEBUG_MEMORY_INIT is not set 1662# CONFIG_DEBUG_MEMORY_INIT is not set
1661CONFIG_FRAME_POINTER=y 1663CONFIG_FRAME_POINTER=y
1662# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1664# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1665# CONFIG_LKDTM is not set
1663CONFIG_LATENCYTOP=y 1666CONFIG_LATENCYTOP=y
1664CONFIG_SYSCTL_SYSCALL_CHECK=y 1667CONFIG_SYSCTL_SYSCALL_CHECK=y
1665CONFIG_NOP_TRACER=y 1668CONFIG_NOP_TRACER=y
@@ -1690,6 +1693,7 @@ CONFIG_SCHED_TRACER=y
1690CONFIG_BRANCH_PROFILE_NONE=y 1693CONFIG_BRANCH_PROFILE_NONE=y
1691# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1694# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1692# CONFIG_PROFILE_ALL_BRANCHES is not set 1695# CONFIG_PROFILE_ALL_BRANCHES is not set
1696# CONFIG_KSYM_TRACER is not set
1693CONFIG_STACK_TRACER=y 1697CONFIG_STACK_TRACER=y
1694CONFIG_KMEMTRACE=y 1698CONFIG_KMEMTRACE=y
1695CONFIG_WORKQUEUE_TRACER=y 1699CONFIG_WORKQUEUE_TRACER=y
@@ -1815,6 +1819,7 @@ CONFIG_CRYPTO_DES=y
1815# 1819#
1816# CONFIG_CRYPTO_ANSI_CPRNG is not set 1820# CONFIG_CRYPTO_ANSI_CPRNG is not set
1817# CONFIG_CRYPTO_HW is not set 1821# CONFIG_CRYPTO_HW is not set
1822# CONFIG_VIRTUALIZATION is not set
1818CONFIG_BINARY_PRINTF=y 1823CONFIG_BINARY_PRINTF=y
1819 1824
1820# 1825#
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
index f196e87c766..30f38c2767b 100644
--- a/arch/sh/configs/sh7785lcr_defconfig
+++ b/arch/sh/configs/sh7785lcr_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-rc5
4# Mon Jan 4 15:09:09 2010 4# Tue May 18 17:27:53 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -73,11 +76,6 @@ CONFIG_RCU_FANOUT=32
73CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
76CONFIG_GROUP_SCHED=y
77CONFIG_FAIR_GROUP_SCHED=y
78# CONFIG_RT_GROUP_SCHED is not set
79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set
81# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
82CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -124,13 +122,13 @@ CONFIG_PROFILING=y
124# CONFIG_OPROFILE is not set 122# CONFIG_OPROFILE is not set
125CONFIG_HAVE_OPROFILE=y 123CONFIG_HAVE_OPROFILE=y
126# CONFIG_KPROBES is not set 124# CONFIG_KPROBES is not set
127CONFIG_HAVE_IOREMAP_PROT=y
128CONFIG_HAVE_KPROBES=y 125CONFIG_HAVE_KPROBES=y
129CONFIG_HAVE_KRETPROBES=y 126CONFIG_HAVE_KRETPROBES=y
130CONFIG_HAVE_ARCH_TRACEHOOK=y 127CONFIG_HAVE_ARCH_TRACEHOOK=y
131CONFIG_HAVE_DMA_ATTRS=y 128CONFIG_HAVE_DMA_ATTRS=y
132CONFIG_HAVE_CLK=y 129CONFIG_HAVE_CLK=y
133CONFIG_HAVE_DMA_API_DEBUG=y 130CONFIG_HAVE_DMA_API_DEBUG=y
131CONFIG_HAVE_HW_BREAKPOINT=y
134 132
135# 133#
136# GCOV-based kernel profiling 134# GCOV-based kernel profiling
@@ -244,8 +242,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
244CONFIG_MEMORY_START=0x08000000 242CONFIG_MEMORY_START=0x08000000
245CONFIG_MEMORY_SIZE=0x08000000 243CONFIG_MEMORY_SIZE=0x08000000
246CONFIG_29BIT=y 244CONFIG_29BIT=y
247# CONFIG_PMB_ENABLE is not set 245# CONFIG_PMB is not set
248# CONFIG_X2TLB is not set 246CONFIG_X2TLB=y
249CONFIG_VSYSCALL=y 247CONFIG_VSYSCALL=y
250# CONFIG_NUMA is not set 248# CONFIG_NUMA is not set
251CONFIG_ARCH_FLATMEM_ENABLE=y 249CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -254,6 +252,8 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
254CONFIG_MAX_ACTIVE_REGIONS=1 252CONFIG_MAX_ACTIVE_REGIONS=1
255CONFIG_ARCH_POPULATES_NODE_MAP=y 253CONFIG_ARCH_POPULATES_NODE_MAP=y
256CONFIG_ARCH_SELECT_MEMORY_MODEL=y 254CONFIG_ARCH_SELECT_MEMORY_MODEL=y
255CONFIG_IOREMAP_FIXED=y
256CONFIG_UNCACHED_MAPPING=y
257CONFIG_PAGE_SIZE_4KB=y 257CONFIG_PAGE_SIZE_4KB=y
258# CONFIG_PAGE_SIZE_8KB is not set 258# CONFIG_PAGE_SIZE_8KB is not set
259# CONFIG_PAGE_SIZE_16KB is not set 259# CONFIG_PAGE_SIZE_16KB is not set
@@ -269,7 +269,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
269CONFIG_SPLIT_PTLOCK_CPUS=4 269CONFIG_SPLIT_PTLOCK_CPUS=4
270# CONFIG_PHYS_ADDR_T_64BIT is not set 270# CONFIG_PHYS_ADDR_T_64BIT is not set
271CONFIG_ZONE_DMA_FLAG=0 271CONFIG_ZONE_DMA_FLAG=0
272CONFIG_NR_QUICK=2 272CONFIG_NR_QUICK=1
273# CONFIG_KSM is not set 273# CONFIG_KSM is not set
274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 274CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
275 275
@@ -287,6 +287,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
287# CONFIG_CPU_BIG_ENDIAN is not set 287# CONFIG_CPU_BIG_ENDIAN is not set
288CONFIG_SH_FPU=y 288CONFIG_SH_FPU=y
289CONFIG_SH_STORE_QUEUES=y 289CONFIG_SH_STORE_QUEUES=y
290# CONFIG_SPECULATIVE_EXECUTION is not set
290CONFIG_CPU_HAS_INTEVT=y 291CONFIG_CPU_HAS_INTEVT=y
291CONFIG_CPU_HAS_SR_RB=y 292CONFIG_CPU_HAS_SR_RB=y
292CONFIG_CPU_HAS_FPU=y 293CONFIG_CPU_HAS_FPU=y
@@ -344,7 +345,7 @@ CONFIG_KEXEC=y
344# CONFIG_PREEMPT_VOLUNTARY is not set 345# CONFIG_PREEMPT_VOLUNTARY is not set
345CONFIG_PREEMPT=y 346CONFIG_PREEMPT=y
346CONFIG_GUSA=y 347CONFIG_GUSA=y
347# CONFIG_SPARSE_IRQ is not set 348# CONFIG_INTC_USERIMASK is not set
348 349
349# 350#
350# Boot options 351# Boot options
@@ -359,9 +360,9 @@ CONFIG_ENTRY_OFFSET=0x00001000
359# Bus options 360# Bus options
360# 361#
361CONFIG_PCI=y 362CONFIG_PCI=y
363CONFIG_PCI_DOMAINS=y
362# CONFIG_PCIEPORTBUS is not set 364# CONFIG_PCIEPORTBUS is not set
363# CONFIG_ARCH_SUPPORTS_MSI is not set 365# CONFIG_ARCH_SUPPORTS_MSI is not set
364CONFIG_PCI_LEGACY=y
365# CONFIG_PCI_DEBUG is not set 366# CONFIG_PCI_DEBUG is not set
366# CONFIG_PCI_STUB is not set 367# CONFIG_PCI_STUB is not set
367# CONFIG_PCI_IOV is not set 368# CONFIG_PCI_IOV is not set
@@ -387,7 +388,6 @@ CONFIG_NET=y
387# Networking options 388# Networking options
388# 389#
389CONFIG_PACKET=y 390CONFIG_PACKET=y
390# CONFIG_PACKET_MMAP is not set
391CONFIG_UNIX=y 391CONFIG_UNIX=y
392CONFIG_XFRM=y 392CONFIG_XFRM=y
393# CONFIG_XFRM_USER is not set 393# CONFIG_XFRM_USER is not set
@@ -598,6 +598,7 @@ CONFIG_HAVE_IDE=y
598# 598#
599# SCSI device support 599# SCSI device support
600# 600#
601CONFIG_SCSI_MOD=y
601# CONFIG_RAID_ATTRS is not set 602# CONFIG_RAID_ATTRS is not set
602CONFIG_SCSI=y 603CONFIG_SCSI=y
603CONFIG_SCSI_DMA=y 604CONFIG_SCSI_DMA=y
@@ -671,6 +672,7 @@ CONFIG_SATA_SIL=y
671# CONFIG_PATA_IT821X is not set 672# CONFIG_PATA_IT821X is not set
672# CONFIG_PATA_IT8213 is not set 673# CONFIG_PATA_IT8213 is not set
673# CONFIG_PATA_JMICRON is not set 674# CONFIG_PATA_JMICRON is not set
675# CONFIG_PATA_LEGACY is not set
674# CONFIG_PATA_TRIFLEX is not set 676# CONFIG_PATA_TRIFLEX is not set
675# CONFIG_PATA_MARVELL is not set 677# CONFIG_PATA_MARVELL is not set
676# CONFIG_PATA_MPIIX is not set 678# CONFIG_PATA_MPIIX is not set
@@ -707,7 +709,7 @@ CONFIG_SATA_SIL=y
707# 709#
708 710
709# 711#
710# See the help texts for more information. 712# The newer stack is recommended.
711# 713#
712# CONFIG_FIREWIRE is not set 714# CONFIG_FIREWIRE is not set
713# CONFIG_IEEE1394 is not set 715# CONFIG_IEEE1394 is not set
@@ -766,6 +768,7 @@ CONFIG_WLAN=y
766# CONFIG_USB_PEGASUS is not set 768# CONFIG_USB_PEGASUS is not set
767# CONFIG_USB_RTL8150 is not set 769# CONFIG_USB_RTL8150 is not set
768# CONFIG_USB_USBNET is not set 770# CONFIG_USB_USBNET is not set
771# CONFIG_USB_IPHETH is not set
769# CONFIG_WAN is not set 772# CONFIG_WAN is not set
770# CONFIG_FDDI is not set 773# CONFIG_FDDI is not set
771# CONFIG_HIPPI is not set 774# CONFIG_HIPPI is not set
@@ -851,6 +854,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
851CONFIG_SERIAL_CORE=y 854CONFIG_SERIAL_CORE=y
852CONFIG_SERIAL_CORE_CONSOLE=y 855CONFIG_SERIAL_CORE_CONSOLE=y
853# CONFIG_SERIAL_JSM is not set 856# CONFIG_SERIAL_JSM is not set
857# CONFIG_SERIAL_TIMBERDALE is not set
854CONFIG_UNIX98_PTYS=y 858CONFIG_UNIX98_PTYS=y
855# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 859# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
856CONFIG_LEGACY_PTYS=y 860CONFIG_LEGACY_PTYS=y
@@ -899,6 +903,7 @@ CONFIG_I2C_ALGOPCA=y
899# CONFIG_I2C_OCORES is not set 903# CONFIG_I2C_OCORES is not set
900# CONFIG_I2C_SH_MOBILE is not set 904# CONFIG_I2C_SH_MOBILE is not set
901# CONFIG_I2C_SIMTEC is not set 905# CONFIG_I2C_SIMTEC is not set
906# CONFIG_I2C_XILINX is not set
902 907
903# 908#
904# External I2C/SMBus adapter drivers 909# External I2C/SMBus adapter drivers
@@ -912,15 +917,9 @@ CONFIG_I2C_ALGOPCA=y
912# 917#
913CONFIG_I2C_PCA_PLATFORM=y 918CONFIG_I2C_PCA_PLATFORM=y
914# CONFIG_I2C_STUB is not set 919# CONFIG_I2C_STUB is not set
915
916#
917# Miscellaneous I2C Chip support
918#
919# CONFIG_SENSORS_TSL2550 is not set
920# CONFIG_I2C_DEBUG_CORE is not set 920# CONFIG_I2C_DEBUG_CORE is not set
921# CONFIG_I2C_DEBUG_ALGO is not set 921# CONFIG_I2C_DEBUG_ALGO is not set
922# CONFIG_I2C_DEBUG_BUS is not set 922# CONFIG_I2C_DEBUG_BUS is not set
923# CONFIG_I2C_DEBUG_CHIP is not set
924# CONFIG_SPI is not set 923# CONFIG_SPI is not set
925 924
926# 925#
@@ -943,6 +942,7 @@ CONFIG_SSB_POSSIBLE=y
943# Multifunction device drivers 942# Multifunction device drivers
944# 943#
945# CONFIG_MFD_CORE is not set 944# CONFIG_MFD_CORE is not set
945# CONFIG_MFD_88PM860X is not set
946CONFIG_MFD_SM501=y 946CONFIG_MFD_SM501=y
947# CONFIG_MFD_SH_MOBILE_SDHI is not set 947# CONFIG_MFD_SH_MOBILE_SDHI is not set
948# CONFIG_HTC_PASIC3 is not set 948# CONFIG_HTC_PASIC3 is not set
@@ -950,12 +950,14 @@ CONFIG_MFD_SM501=y
950# CONFIG_MFD_TMIO is not set 950# CONFIG_MFD_TMIO is not set
951# CONFIG_PMIC_DA903X is not set 951# CONFIG_PMIC_DA903X is not set
952# CONFIG_PMIC_ADP5520 is not set 952# CONFIG_PMIC_ADP5520 is not set
953# CONFIG_MFD_MAX8925 is not set
953# CONFIG_MFD_WM8400 is not set 954# CONFIG_MFD_WM8400 is not set
954# CONFIG_MFD_WM831X is not set 955# CONFIG_MFD_WM831X is not set
955# CONFIG_MFD_WM8350_I2C is not set 956# CONFIG_MFD_WM8350_I2C is not set
957# CONFIG_MFD_WM8994 is not set
956# CONFIG_MFD_PCF50633 is not set 958# CONFIG_MFD_PCF50633 is not set
957# CONFIG_AB3100_CORE is not set 959# CONFIG_AB3100_CORE is not set
958# CONFIG_MFD_88PM8607 is not set 960# CONFIG_LPC_SCH is not set
959# CONFIG_REGULATOR is not set 961# CONFIG_REGULATOR is not set
960# CONFIG_MEDIA_SUPPORT is not set 962# CONFIG_MEDIA_SUPPORT is not set
961 963
@@ -963,6 +965,7 @@ CONFIG_MFD_SM501=y
963# Graphics support 965# Graphics support
964# 966#
965CONFIG_VGA_ARB=y 967CONFIG_VGA_ARB=y
968CONFIG_VGA_ARB_MAX_GPUS=16
966# CONFIG_DRM is not set 969# CONFIG_DRM is not set
967# CONFIG_VGASTATE is not set 970# CONFIG_VGASTATE is not set
968# CONFIG_VIDEO_OUTPUT_CONTROL is not set 971# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1059,6 +1062,7 @@ CONFIG_USB_HID=y
1059# 1062#
1060# Special HID drivers 1063# Special HID drivers
1061# 1064#
1065# CONFIG_HID_3M_PCT is not set
1062CONFIG_HID_A4TECH=y 1066CONFIG_HID_A4TECH=y
1063CONFIG_HID_APPLE=y 1067CONFIG_HID_APPLE=y
1064CONFIG_HID_BELKIN=y 1068CONFIG_HID_BELKIN=y
@@ -1074,14 +1078,19 @@ CONFIG_HID_GYRATION=y
1074CONFIG_HID_LOGITECH=y 1078CONFIG_HID_LOGITECH=y
1075# CONFIG_LOGITECH_FF is not set 1079# CONFIG_LOGITECH_FF is not set
1076# CONFIG_LOGIRUMBLEPAD2_FF is not set 1080# CONFIG_LOGIRUMBLEPAD2_FF is not set
1081# CONFIG_LOGIG940_FF is not set
1077CONFIG_HID_MICROSOFT=y 1082CONFIG_HID_MICROSOFT=y
1083# CONFIG_HID_MOSART is not set
1078CONFIG_HID_MONTEREY=y 1084CONFIG_HID_MONTEREY=y
1079# CONFIG_HID_NTRIG is not set 1085# CONFIG_HID_NTRIG is not set
1086# CONFIG_HID_ORTEK is not set
1080CONFIG_HID_PANTHERLORD=y 1087CONFIG_HID_PANTHERLORD=y
1081# CONFIG_PANTHERLORD_FF is not set 1088# CONFIG_PANTHERLORD_FF is not set
1082CONFIG_HID_PETALYNX=y 1089CONFIG_HID_PETALYNX=y
1090# CONFIG_HID_QUANTA is not set
1083CONFIG_HID_SAMSUNG=y 1091CONFIG_HID_SAMSUNG=y
1084CONFIG_HID_SONY=y 1092CONFIG_HID_SONY=y
1093# CONFIG_HID_STANTUM is not set
1085CONFIG_HID_SUNPLUS=y 1094CONFIG_HID_SUNPLUS=y
1086# CONFIG_HID_GREENASIA is not set 1095# CONFIG_HID_GREENASIA is not set
1087# CONFIG_HID_SMARTJOYPLUS is not set 1096# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1182,7 +1191,6 @@ CONFIG_USB_STORAGE=y
1182# CONFIG_USB_RIO500 is not set 1191# CONFIG_USB_RIO500 is not set
1183# CONFIG_USB_LEGOTOWER is not set 1192# CONFIG_USB_LEGOTOWER is not set
1184# CONFIG_USB_LCD is not set 1193# CONFIG_USB_LCD is not set
1185# CONFIG_USB_BERRY_CHARGE is not set
1186# CONFIG_USB_LED is not set 1194# CONFIG_USB_LED is not set
1187# CONFIG_USB_CYPRESS_CY7C63 is not set 1195# CONFIG_USB_CYPRESS_CY7C63 is not set
1188# CONFIG_USB_CYTHERM is not set 1196# CONFIG_USB_CYTHERM is not set
@@ -1195,7 +1203,6 @@ CONFIG_USB_STORAGE=y
1195# CONFIG_USB_IOWARRIOR is not set 1203# CONFIG_USB_IOWARRIOR is not set
1196CONFIG_USB_TEST=m 1204CONFIG_USB_TEST=m
1197# CONFIG_USB_ISIGHTFW is not set 1205# CONFIG_USB_ISIGHTFW is not set
1198# CONFIG_USB_VST is not set
1199# CONFIG_USB_GADGET is not set 1206# CONFIG_USB_GADGET is not set
1200 1207
1201# 1208#
@@ -1353,6 +1360,7 @@ CONFIG_MISC_FILESYSTEMS=y
1353# CONFIG_BFS_FS is not set 1360# CONFIG_BFS_FS is not set
1354# CONFIG_EFS_FS is not set 1361# CONFIG_EFS_FS is not set
1355# CONFIG_JFFS2_FS is not set 1362# CONFIG_JFFS2_FS is not set
1363# CONFIG_LOGFS is not set
1356# CONFIG_CRAMFS is not set 1364# CONFIG_CRAMFS is not set
1357# CONFIG_SQUASHFS is not set 1365# CONFIG_SQUASHFS is not set
1358# CONFIG_VXFS_FS is not set 1366# CONFIG_VXFS_FS is not set
@@ -1383,6 +1391,7 @@ CONFIG_SUNRPC_GSS=y
1383CONFIG_RPCSEC_GSS_KRB5=y 1391CONFIG_RPCSEC_GSS_KRB5=y
1384# CONFIG_RPCSEC_GSS_SPKM3 is not set 1392# CONFIG_RPCSEC_GSS_SPKM3 is not set
1385# CONFIG_SMB_FS is not set 1393# CONFIG_SMB_FS is not set
1394# CONFIG_CEPH_FS is not set
1386# CONFIG_CIFS is not set 1395# CONFIG_CIFS is not set
1387# CONFIG_NCP_FS is not set 1396# CONFIG_NCP_FS is not set
1388# CONFIG_CODA_FS is not set 1397# CONFIG_CODA_FS is not set
@@ -1461,6 +1470,7 @@ CONFIG_SCHED_DEBUG=y
1461# CONFIG_TIMER_STATS is not set 1470# CONFIG_TIMER_STATS is not set
1462# CONFIG_DEBUG_OBJECTS is not set 1471# CONFIG_DEBUG_OBJECTS is not set
1463# CONFIG_DEBUG_SLAB is not set 1472# CONFIG_DEBUG_SLAB is not set
1473# CONFIG_DEBUG_KMEMLEAK is not set
1464CONFIG_DEBUG_PREEMPT=y 1474CONFIG_DEBUG_PREEMPT=y
1465# CONFIG_DEBUG_RT_MUTEXES is not set 1475# CONFIG_DEBUG_RT_MUTEXES is not set
1466# CONFIG_RT_MUTEX_TESTER is not set 1476# CONFIG_RT_MUTEX_TESTER is not set
@@ -1509,6 +1519,7 @@ CONFIG_FTRACE=y
1509CONFIG_BRANCH_PROFILE_NONE=y 1519CONFIG_BRANCH_PROFILE_NONE=y
1510# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1520# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1511# CONFIG_PROFILE_ALL_BRANCHES is not set 1521# CONFIG_PROFILE_ALL_BRANCHES is not set
1522# CONFIG_KSYM_TRACER is not set
1512# CONFIG_STACK_TRACER is not set 1523# CONFIG_STACK_TRACER is not set
1513# CONFIG_KMEMTRACE is not set 1524# CONFIG_KMEMTRACE is not set
1514# CONFIG_WORKQUEUE_TRACER is not set 1525# CONFIG_WORKQUEUE_TRACER is not set
@@ -1633,6 +1644,7 @@ CONFIG_CRYPTO_DES=y
1633# 1644#
1634# CONFIG_CRYPTO_ANSI_CPRNG is not set 1645# CONFIG_CRYPTO_ANSI_CPRNG is not set
1635# CONFIG_CRYPTO_HW is not set 1646# CONFIG_CRYPTO_HW is not set
1647# CONFIG_VIRTUALIZATION is not set
1636# CONFIG_BINARY_PRINTF is not set 1648# CONFIG_BINARY_PRINTF is not set
1637 1649
1638# 1650#
diff --git a/arch/sh/configs/shmin_defconfig b/arch/sh/configs/shmin_defconfig
index 45441c0ab30..4ba2705c7a4 100644
--- a/arch/sh/configs/shmin_defconfig
+++ b/arch/sh/configs/shmin_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-rc5
4# Mon Jan 4 15:10:09 2010 4# Tue May 18 17:32:23 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -12,8 +12,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y 12CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
15CONFIG_GENERIC_IRQ_PROBE=y
16CONFIG_IRQ_PER_CPU=y 15CONFIG_IRQ_PER_CPU=y
16CONFIG_SPARSE_IRQ=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
@@ -29,6 +29,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
29CONFIG_ARCH_HAS_DEFAULT_IDLE=y 29CONFIG_ARCH_HAS_DEFAULT_IDLE=y
30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 30CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
31CONFIG_DMA_NONCOHERENT=y 31CONFIG_DMA_NONCOHERENT=y
32CONFIG_NEED_DMA_MAP_STATE=y
32CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 33CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
33CONFIG_CONSTRUCTORS=y 34CONFIG_CONSTRUCTORS=y
34 35
@@ -43,9 +44,11 @@ CONFIG_LOCALVERSION_AUTO=y
43CONFIG_HAVE_KERNEL_GZIP=y 44CONFIG_HAVE_KERNEL_GZIP=y
44CONFIG_HAVE_KERNEL_BZIP2=y 45CONFIG_HAVE_KERNEL_BZIP2=y
45CONFIG_HAVE_KERNEL_LZMA=y 46CONFIG_HAVE_KERNEL_LZMA=y
47CONFIG_HAVE_KERNEL_LZO=y
46CONFIG_KERNEL_GZIP=y 48CONFIG_KERNEL_GZIP=y
47# CONFIG_KERNEL_BZIP2 is not set 49# CONFIG_KERNEL_BZIP2 is not set
48# CONFIG_KERNEL_LZMA is not set 50# CONFIG_KERNEL_LZMA is not set
51# CONFIG_KERNEL_LZO is not set
49# CONFIG_SWAP is not set 52# CONFIG_SWAP is not set
50# CONFIG_SYSVIPC is not set 53# CONFIG_SYSVIPC is not set
51# CONFIG_POSIX_MQUEUE is not set 54# CONFIG_POSIX_MQUEUE is not set
@@ -65,7 +68,6 @@ CONFIG_RCU_FANOUT=32
65# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
66# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
68# CONFIG_GROUP_SCHED is not set
69# CONFIG_CGROUPS is not set 71# CONFIG_CGROUPS is not set
70# CONFIG_RELAY is not set 72# CONFIG_RELAY is not set
71# CONFIG_NAMESPACES is not set 73# CONFIG_NAMESPACES is not set
@@ -95,7 +97,7 @@ CONFIG_PERF_USE_VMALLOC=y
95# 97#
96# Kernel Performance Events And Counters 98# Kernel Performance Events And Counters
97# 99#
98# CONFIG_PERF_EVENTS is not set 100CONFIG_PERF_EVENTS=y
99# CONFIG_PERF_COUNTERS is not set 101# CONFIG_PERF_COUNTERS is not set
100CONFIG_VM_EVENT_COUNTERS=y 102CONFIG_VM_EVENT_COUNTERS=y
101CONFIG_COMPAT_BRK=y 103CONFIG_COMPAT_BRK=y
@@ -111,6 +113,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
111CONFIG_HAVE_DMA_ATTRS=y 113CONFIG_HAVE_DMA_ATTRS=y
112CONFIG_HAVE_CLK=y 114CONFIG_HAVE_CLK=y
113CONFIG_HAVE_DMA_API_DEBUG=y 115CONFIG_HAVE_DMA_API_DEBUG=y
116CONFIG_HAVE_HW_BREAKPOINT=y
114 117
115# 118#
116# GCOV-based kernel profiling 119# GCOV-based kernel profiling
@@ -222,6 +225,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
222CONFIG_MAX_ACTIVE_REGIONS=1 225CONFIG_MAX_ACTIVE_REGIONS=1
223CONFIG_ARCH_POPULATES_NODE_MAP=y 226CONFIG_ARCH_POPULATES_NODE_MAP=y
224CONFIG_ARCH_SELECT_MEMORY_MODEL=y 227CONFIG_ARCH_SELECT_MEMORY_MODEL=y
228CONFIG_UNCACHED_MAPPING=y
225CONFIG_PAGE_SIZE_4KB=y 229CONFIG_PAGE_SIZE_4KB=y
226# CONFIG_PAGE_SIZE_8KB is not set 230# CONFIG_PAGE_SIZE_8KB is not set
227# CONFIG_PAGE_SIZE_16KB is not set 231# CONFIG_PAGE_SIZE_16KB is not set
@@ -237,7 +241,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
237CONFIG_SPLIT_PTLOCK_CPUS=4 241CONFIG_SPLIT_PTLOCK_CPUS=4
238# CONFIG_PHYS_ADDR_T_64BIT is not set 242# CONFIG_PHYS_ADDR_T_64BIT is not set
239CONFIG_ZONE_DMA_FLAG=0 243CONFIG_ZONE_DMA_FLAG=0
240CONFIG_NR_QUICK=2 244CONFIG_NR_QUICK=1
241# CONFIG_KSM is not set 245# CONFIG_KSM is not set
242CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 246CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
243 247
@@ -312,7 +316,6 @@ CONFIG_PREEMPT_NONE=y
312# CONFIG_PREEMPT is not set 316# CONFIG_PREEMPT is not set
313CONFIG_GUSA=y 317CONFIG_GUSA=y
314# CONFIG_GUSA_RB is not set 318# CONFIG_GUSA_RB is not set
315# CONFIG_SPARSE_IRQ is not set
316 319
317# 320#
318# Boot options 321# Boot options
@@ -544,6 +547,7 @@ CONFIG_HAVE_IDE=y
544# 547#
545# SCSI device support 548# SCSI device support
546# 549#
550CONFIG_SCSI_MOD=y
547# CONFIG_RAID_ATTRS is not set 551# CONFIG_RAID_ATTRS is not set
548# CONFIG_SCSI is not set 552# CONFIG_SCSI is not set
549# CONFIG_SCSI_DMA is not set 553# CONFIG_SCSI_DMA is not set
@@ -625,6 +629,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
625CONFIG_SERIAL_SH_SCI_CONSOLE=y 629CONFIG_SERIAL_SH_SCI_CONSOLE=y
626CONFIG_SERIAL_CORE=y 630CONFIG_SERIAL_CORE=y
627CONFIG_SERIAL_CORE_CONSOLE=y 631CONFIG_SERIAL_CORE_CONSOLE=y
632# CONFIG_SERIAL_TIMBERDALE is not set
628CONFIG_UNIX98_PTYS=y 633CONFIG_UNIX98_PTYS=y
629# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 634# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
630CONFIG_LEGACY_PTYS=y 635CONFIG_LEGACY_PTYS=y
@@ -719,7 +724,6 @@ CONFIG_RTC_LIB=y
719# CONFIG_EXT2_FS is not set 724# CONFIG_EXT2_FS is not set
720# CONFIG_EXT3_FS is not set 725# CONFIG_EXT3_FS is not set
721# CONFIG_EXT4_FS is not set 726# CONFIG_EXT4_FS is not set
722CONFIG_EXT4_USE_FOR_EXT23=y
723# CONFIG_REISERFS_FS is not set 727# CONFIG_REISERFS_FS is not set
724# CONFIG_JFS_FS is not set 728# CONFIG_JFS_FS is not set
725# CONFIG_FS_POSIX_ACL is not set 729# CONFIG_FS_POSIX_ACL is not set
@@ -773,6 +777,7 @@ CONFIG_MISC_FILESYSTEMS=y
773# CONFIG_BFS_FS is not set 777# CONFIG_BFS_FS is not set
774# CONFIG_EFS_FS is not set 778# CONFIG_EFS_FS is not set
775# CONFIG_JFFS2_FS is not set 779# CONFIG_JFFS2_FS is not set
780# CONFIG_LOGFS is not set
776CONFIG_CRAMFS=y 781CONFIG_CRAMFS=y
777# CONFIG_SQUASHFS is not set 782# CONFIG_SQUASHFS is not set
778# CONFIG_VXFS_FS is not set 783# CONFIG_VXFS_FS is not set
@@ -797,6 +802,7 @@ CONFIG_SUNRPC=y
797# CONFIG_RPCSEC_GSS_KRB5 is not set 802# CONFIG_RPCSEC_GSS_KRB5 is not set
798# CONFIG_RPCSEC_GSS_SPKM3 is not set 803# CONFIG_RPCSEC_GSS_SPKM3 is not set
799# CONFIG_SMB_FS is not set 804# CONFIG_SMB_FS is not set
805# CONFIG_CEPH_FS is not set
800# CONFIG_CIFS is not set 806# CONFIG_CIFS is not set
801# CONFIG_NCP_FS is not set 807# CONFIG_NCP_FS is not set
802# CONFIG_CODA_FS is not set 808# CONFIG_CODA_FS is not set
@@ -936,6 +942,7 @@ CONFIG_CRYPTO=y
936# 942#
937# CONFIG_CRYPTO_ANSI_CPRNG is not set 943# CONFIG_CRYPTO_ANSI_CPRNG is not set
938CONFIG_CRYPTO_HW=y 944CONFIG_CRYPTO_HW=y
945# CONFIG_VIRTUALIZATION is not set
939# CONFIG_BINARY_PRINTF is not set 946# CONFIG_BINARY_PRINTF is not set
940 947
941# 948#
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
index ecf50cda4cb..42f6bd34440 100644
--- a/arch/sh/configs/shx3_defconfig
+++ b/arch/sh/configs/shx3_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-rc5
4# Mon Jan 4 15:10:45 2010 4# Tue May 18 18:08:45 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -28,6 +28,7 @@ CONFIG_SYS_SUPPORTS_NUMA=y
28CONFIG_SYS_SUPPORTS_TMU=y 28CONFIG_SYS_SUPPORTS_TMU=y
29CONFIG_STACKTRACE_SUPPORT=y 29CONFIG_STACKTRACE_SUPPORT=y
30CONFIG_LOCKDEP_SUPPORT=y 30CONFIG_LOCKDEP_SUPPORT=y
31CONFIG_HAVE_LATENCYTOP_SUPPORT=y
31# CONFIG_ARCH_HAS_ILOG2_U32 is not set 32# CONFIG_ARCH_HAS_ILOG2_U32 is not set
32# CONFIG_ARCH_HAS_ILOG2_U64 is not set 33# CONFIG_ARCH_HAS_ILOG2_U64 is not set
33CONFIG_ARCH_NO_VIRT_TO_BUS=y 34CONFIG_ARCH_NO_VIRT_TO_BUS=y
@@ -35,6 +36,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
35CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 36CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
36CONFIG_DMA_COHERENT=y 37CONFIG_DMA_COHERENT=y
37# CONFIG_DMA_NONCOHERENT is not set 38# CONFIG_DMA_NONCOHERENT is not set
39# CONFIG_NEED_DMA_MAP_STATE is not set
38CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 40CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
39CONFIG_CONSTRUCTORS=y 41CONFIG_CONSTRUCTORS=y
40 42
@@ -49,9 +51,11 @@ CONFIG_LOCALVERSION_AUTO=y
49CONFIG_HAVE_KERNEL_GZIP=y 51CONFIG_HAVE_KERNEL_GZIP=y
50CONFIG_HAVE_KERNEL_BZIP2=y 52CONFIG_HAVE_KERNEL_BZIP2=y
51CONFIG_HAVE_KERNEL_LZMA=y 53CONFIG_HAVE_KERNEL_LZMA=y
54CONFIG_HAVE_KERNEL_LZO=y
52CONFIG_KERNEL_GZIP=y 55CONFIG_KERNEL_GZIP=y
53# CONFIG_KERNEL_BZIP2 is not set 56# CONFIG_KERNEL_BZIP2 is not set
54# CONFIG_KERNEL_LZMA is not set 57# CONFIG_KERNEL_LZMA is not set
58# CONFIG_KERNEL_LZO is not set
55CONFIG_SWAP=y 59CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 60CONFIG_SYSVIPC=y
57CONFIG_SYSVIPC_SYSCTL=y 61CONFIG_SYSVIPC_SYSCTL=y
@@ -73,15 +77,11 @@ CONFIG_TREE_RCU=y
73CONFIG_RCU_TRACE=y 77CONFIG_RCU_TRACE=y
74CONFIG_RCU_FANOUT=32 78CONFIG_RCU_FANOUT=32
75# CONFIG_RCU_FANOUT_EXACT is not set 79# CONFIG_RCU_FANOUT_EXACT is not set
80# CONFIG_RCU_FAST_NO_HZ is not set
76CONFIG_TREE_RCU_TRACE=y 81CONFIG_TREE_RCU_TRACE=y
77CONFIG_IKCONFIG=y 82CONFIG_IKCONFIG=y
78CONFIG_IKCONFIG_PROC=y 83CONFIG_IKCONFIG_PROC=y
79CONFIG_LOG_BUF_SHIFT=14 84CONFIG_LOG_BUF_SHIFT=14
80CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y
82CONFIG_RT_GROUP_SCHED=y
83CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set
85CONFIG_CGROUPS=y 85CONFIG_CGROUPS=y
86# CONFIG_CGROUP_DEBUG is not set 86# CONFIG_CGROUP_DEBUG is not set
87CONFIG_CGROUP_NS=y 87CONFIG_CGROUP_NS=y
@@ -92,6 +92,7 @@ CONFIG_CGROUP_CPUACCT=y
92CONFIG_RESOURCE_COUNTERS=y 92CONFIG_RESOURCE_COUNTERS=y
93CONFIG_CGROUP_MEM_RES_CTLR=y 93CONFIG_CGROUP_MEM_RES_CTLR=y
94# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set 94# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
95# CONFIG_CGROUP_SCHED is not set
95CONFIG_MM_OWNER=y 96CONFIG_MM_OWNER=y
96CONFIG_SYSFS_DEPRECATED=y 97CONFIG_SYSFS_DEPRECATED=y
97CONFIG_SYSFS_DEPRECATED_V2=y 98CONFIG_SYSFS_DEPRECATED_V2=y
@@ -131,7 +132,6 @@ CONFIG_PERF_USE_VMALLOC=y
131# Kernel Performance Events And Counters 132# Kernel Performance Events And Counters
132# 133#
133CONFIG_PERF_EVENTS=y 134CONFIG_PERF_EVENTS=y
134CONFIG_EVENT_PROFILE=y
135# CONFIG_PERF_COUNTERS is not set 135# CONFIG_PERF_COUNTERS is not set
136# CONFIG_DEBUG_PERF_USE_VMALLOC is not set 136# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
137CONFIG_VM_EVENT_COUNTERS=y 137CONFIG_VM_EVENT_COUNTERS=y
@@ -140,12 +140,10 @@ CONFIG_COMPAT_BRK=y
140# CONFIG_SLUB is not set 140# CONFIG_SLUB is not set
141CONFIG_SLOB=y 141CONFIG_SLOB=y
142CONFIG_PROFILING=y 142CONFIG_PROFILING=y
143CONFIG_TRACEPOINTS=y
144CONFIG_OPROFILE=y 143CONFIG_OPROFILE=y
145CONFIG_HAVE_OPROFILE=y 144CONFIG_HAVE_OPROFILE=y
146CONFIG_KPROBES=y 145CONFIG_KPROBES=y
147CONFIG_KRETPROBES=y 146CONFIG_KRETPROBES=y
148CONFIG_HAVE_IOREMAP_PROT=y
149CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
150CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
151CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
@@ -153,6 +151,7 @@ CONFIG_HAVE_DMA_ATTRS=y
153CONFIG_USE_GENERIC_SMP_HELPERS=y 151CONFIG_USE_GENERIC_SMP_HELPERS=y
154CONFIG_HAVE_CLK=y 152CONFIG_HAVE_CLK=y
155CONFIG_HAVE_DMA_API_DEBUG=y 153CONFIG_HAVE_DMA_API_DEBUG=y
154CONFIG_HAVE_HW_BREAKPOINT=y
156 155
157# 156#
158# GCOV-based kernel profiling 157# GCOV-based kernel profiling
@@ -173,7 +172,6 @@ CONFIG_BLOCK=y
173CONFIG_LBDAF=y 172CONFIG_LBDAF=y
174# CONFIG_BLK_DEV_BSG is not set 173# CONFIG_BLK_DEV_BSG is not set
175# CONFIG_BLK_DEV_INTEGRITY is not set 174# CONFIG_BLK_DEV_INTEGRITY is not set
176# CONFIG_BLK_CGROUP is not set
177 175
178# 176#
179# IO Schedulers 177# IO Schedulers
@@ -269,8 +267,8 @@ CONFIG_FORCE_MAX_ZONEORDER=7
269CONFIG_MEMORY_START=0x0c000000 267CONFIG_MEMORY_START=0x0c000000
270CONFIG_MEMORY_SIZE=0x04000000 268CONFIG_MEMORY_SIZE=0x04000000
271CONFIG_29BIT=y 269CONFIG_29BIT=y
272# CONFIG_PMB_ENABLE is not set 270# CONFIG_PMB is not set
273# CONFIG_X2TLB is not set 271CONFIG_X2TLB=y
274CONFIG_VSYSCALL=y 272CONFIG_VSYSCALL=y
275CONFIG_NUMA=y 273CONFIG_NUMA=y
276CONFIG_NODES_SHIFT=3 274CONFIG_NODES_SHIFT=3
@@ -282,6 +280,8 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
282CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
283CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 281CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
284CONFIG_ARCH_MEMORY_PROBE=y 282CONFIG_ARCH_MEMORY_PROBE=y
283CONFIG_IOREMAP_FIXED=y
284CONFIG_UNCACHED_MAPPING=y
285# CONFIG_PAGE_SIZE_4KB is not set 285# CONFIG_PAGE_SIZE_4KB is not set
286# CONFIG_PAGE_SIZE_8KB is not set 286# CONFIG_PAGE_SIZE_8KB is not set
287# CONFIG_PAGE_SIZE_16KB is not set 287# CONFIG_PAGE_SIZE_16KB is not set
@@ -307,7 +307,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
307CONFIG_MIGRATION=y 307CONFIG_MIGRATION=y
308# CONFIG_PHYS_ADDR_T_64BIT is not set 308# CONFIG_PHYS_ADDR_T_64BIT is not set
309CONFIG_ZONE_DMA_FLAG=0 309CONFIG_ZONE_DMA_FLAG=0
310CONFIG_NR_QUICK=2 310CONFIG_NR_QUICK=1
311# CONFIG_KSM is not set 311# CONFIG_KSM is not set
312CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 312CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
313CONFIG_SCHED_MC=y 313CONFIG_SCHED_MC=y
@@ -392,14 +392,14 @@ CONFIG_HZ_250=y
392CONFIG_HZ=250 392CONFIG_HZ=250
393CONFIG_SCHED_HRTICK=y 393CONFIG_SCHED_HRTICK=y
394CONFIG_KEXEC=y 394CONFIG_KEXEC=y
395# CONFIG_CRASH_DUMP is not set
396CONFIG_SECCOMP=y 395CONFIG_SECCOMP=y
397CONFIG_SMP=y 396CONFIG_SMP=y
398CONFIG_NR_CPUS=4 397CONFIG_NR_CPUS=4
398# CONFIG_HOTPLUG_CPU is not set
399# CONFIG_PREEMPT_NONE is not set 399# CONFIG_PREEMPT_NONE is not set
400# CONFIG_PREEMPT_VOLUNTARY is not set 400# CONFIG_PREEMPT_VOLUNTARY is not set
401CONFIG_PREEMPT=y 401CONFIG_PREEMPT=y
402# CONFIG_SPARSE_IRQ is not set 402# CONFIG_INTC_USERIMASK is not set
403 403
404# 404#
405# Boot options 405# Boot options
@@ -518,7 +518,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y
518# 518#
519# CONFIG_NET_PKTGEN is not set 519# CONFIG_NET_PKTGEN is not set
520# CONFIG_NET_TCPPROBE is not set 520# CONFIG_NET_TCPPROBE is not set
521# CONFIG_NET_DROP_MONITOR is not set
522# CONFIG_HAMRADIO is not set 521# CONFIG_HAMRADIO is not set
523CONFIG_CAN=m 522CONFIG_CAN=m
524CONFIG_CAN_RAW=m 523CONFIG_CAN_RAW=m
@@ -583,6 +582,7 @@ CONFIG_MISC_DEVICES=y
583# CONFIG_ICS932S401 is not set 582# CONFIG_ICS932S401 is not set
584# CONFIG_ENCLOSURE_SERVICES is not set 583# CONFIG_ENCLOSURE_SERVICES is not set
585# CONFIG_ISL29003 is not set 584# CONFIG_ISL29003 is not set
585# CONFIG_SENSORS_TSL2550 is not set
586# CONFIG_DS1682 is not set 586# CONFIG_DS1682 is not set
587# CONFIG_TI_DAC7512 is not set 587# CONFIG_TI_DAC7512 is not set
588# CONFIG_C2PORT is not set 588# CONFIG_C2PORT is not set
@@ -601,6 +601,7 @@ CONFIG_HAVE_IDE=y
601# 601#
602# SCSI device support 602# SCSI device support
603# 603#
604CONFIG_SCSI_MOD=y
604# CONFIG_RAID_ATTRS is not set 605# CONFIG_RAID_ATTRS is not set
605CONFIG_SCSI=y 606CONFIG_SCSI=y
606CONFIG_SCSI_DMA=y 607CONFIG_SCSI_DMA=y
@@ -693,6 +694,7 @@ CONFIG_WLAN=y
693# CONFIG_USB_PEGASUS is not set 694# CONFIG_USB_PEGASUS is not set
694# CONFIG_USB_RTL8150 is not set 695# CONFIG_USB_RTL8150 is not set
695# CONFIG_USB_USBNET is not set 696# CONFIG_USB_USBNET is not set
697# CONFIG_USB_IPHETH is not set
696# CONFIG_WAN is not set 698# CONFIG_WAN is not set
697# CONFIG_PPP is not set 699# CONFIG_PPP is not set
698# CONFIG_SLIP is not set 700# CONFIG_SLIP is not set
@@ -734,6 +736,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2
734CONFIG_SERIAL_SH_SCI_CONSOLE=y 736CONFIG_SERIAL_SH_SCI_CONSOLE=y
735CONFIG_SERIAL_CORE=y 737CONFIG_SERIAL_CORE=y
736CONFIG_SERIAL_CORE_CONSOLE=y 738CONFIG_SERIAL_CORE_CONSOLE=y
739# CONFIG_SERIAL_TIMBERDALE is not set
737CONFIG_UNIX98_PTYS=y 740CONFIG_UNIX98_PTYS=y
738# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 741# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
739CONFIG_LEGACY_PTYS=y 742CONFIG_LEGACY_PTYS=y
@@ -760,6 +763,7 @@ CONFIG_I2C_HELPER_AUTO=y
760# CONFIG_I2C_OCORES is not set 763# CONFIG_I2C_OCORES is not set
761# CONFIG_I2C_SH_MOBILE is not set 764# CONFIG_I2C_SH_MOBILE is not set
762# CONFIG_I2C_SIMTEC is not set 765# CONFIG_I2C_SIMTEC is not set
766# CONFIG_I2C_XILINX is not set
763 767
764# 768#
765# External I2C/SMBus adapter drivers 769# External I2C/SMBus adapter drivers
@@ -773,15 +777,9 @@ CONFIG_I2C_HELPER_AUTO=y
773# 777#
774# CONFIG_I2C_PCA_PLATFORM is not set 778# CONFIG_I2C_PCA_PLATFORM is not set
775# CONFIG_I2C_STUB is not set 779# CONFIG_I2C_STUB is not set
776
777#
778# Miscellaneous I2C Chip support
779#
780# CONFIG_SENSORS_TSL2550 is not set
781# CONFIG_I2C_DEBUG_CORE is not set 780# CONFIG_I2C_DEBUG_CORE is not set
782# CONFIG_I2C_DEBUG_ALGO is not set 781# CONFIG_I2C_DEBUG_ALGO is not set
783# CONFIG_I2C_DEBUG_BUS is not set 782# CONFIG_I2C_DEBUG_BUS is not set
784# CONFIG_I2C_DEBUG_CHIP is not set
785CONFIG_SPI=y 783CONFIG_SPI=y
786# CONFIG_SPI_DEBUG is not set 784# CONFIG_SPI_DEBUG is not set
787CONFIG_SPI_MASTER=y 785CONFIG_SPI_MASTER=y
@@ -838,10 +836,9 @@ CONFIG_SSB_POSSIBLE=y
838# CONFIG_HTC_PASIC3 is not set 836# CONFIG_HTC_PASIC3 is not set
839# CONFIG_MFD_TMIO is not set 837# CONFIG_MFD_TMIO is not set
840# CONFIG_MFD_WM8400 is not set 838# CONFIG_MFD_WM8400 is not set
841# CONFIG_MFD_WM8350_I2C is not set 839# CONFIG_MFD_WM8994 is not set
842# CONFIG_MFD_PCF50633 is not set 840# CONFIG_MFD_PCF50633 is not set
843# CONFIG_MFD_MC13783 is not set 841# CONFIG_MFD_MC13783 is not set
844# CONFIG_AB3100_CORE is not set
845# CONFIG_EZX_PCAP is not set 842# CONFIG_EZX_PCAP is not set
846# CONFIG_AB4500_CORE is not set 843# CONFIG_AB4500_CORE is not set
847# CONFIG_REGULATOR is not set 844# CONFIG_REGULATOR is not set
@@ -933,7 +930,6 @@ CONFIG_USB_R8A66597_HCD=m
933# CONFIG_USB_RIO500 is not set 930# CONFIG_USB_RIO500 is not set
934# CONFIG_USB_LEGOTOWER is not set 931# CONFIG_USB_LEGOTOWER is not set
935# CONFIG_USB_LCD is not set 932# CONFIG_USB_LCD is not set
936# CONFIG_USB_BERRY_CHARGE is not set
937# CONFIG_USB_LED is not set 933# CONFIG_USB_LED is not set
938# CONFIG_USB_CYPRESS_CY7C63 is not set 934# CONFIG_USB_CYPRESS_CY7C63 is not set
939# CONFIG_USB_CYTHERM is not set 935# CONFIG_USB_CYTHERM is not set
@@ -945,7 +941,6 @@ CONFIG_USB_R8A66597_HCD=m
945# CONFIG_USB_IOWARRIOR is not set 941# CONFIG_USB_IOWARRIOR is not set
946# CONFIG_USB_TEST is not set 942# CONFIG_USB_TEST is not set
947# CONFIG_USB_ISIGHTFW is not set 943# CONFIG_USB_ISIGHTFW is not set
948# CONFIG_USB_VST is not set
949CONFIG_USB_GADGET=y 944CONFIG_USB_GADGET=y
950# CONFIG_USB_GADGET_DEBUG is not set 945# CONFIG_USB_GADGET_DEBUG is not set
951# CONFIG_USB_GADGET_DEBUG_FILES is not set 946# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -983,6 +978,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
983# CONFIG_USB_MIDI_GADGET is not set 978# CONFIG_USB_MIDI_GADGET is not set
984# CONFIG_USB_G_PRINTER is not set 979# CONFIG_USB_G_PRINTER is not set
985# CONFIG_USB_CDC_COMPOSITE is not set 980# CONFIG_USB_CDC_COMPOSITE is not set
981# CONFIG_USB_G_NOKIA is not set
986# CONFIG_USB_G_MULTI is not set 982# CONFIG_USB_G_MULTI is not set
987 983
988# 984#
@@ -1065,8 +1061,6 @@ CONFIG_RTC_DRV_SH=y
1065CONFIG_UIO=m 1061CONFIG_UIO=m
1066# CONFIG_UIO_PDRV is not set 1062# CONFIG_UIO_PDRV is not set
1067# CONFIG_UIO_PDRV_GENIRQ is not set 1063# CONFIG_UIO_PDRV_GENIRQ is not set
1068# CONFIG_UIO_SMX is not set
1069# CONFIG_UIO_SERCOS3 is not set
1070 1064
1071# 1065#
1072# TI VLYNQ 1066# TI VLYNQ
@@ -1145,6 +1139,7 @@ CONFIG_MISC_FILESYSTEMS=y
1145# CONFIG_BEFS_FS is not set 1139# CONFIG_BEFS_FS is not set
1146# CONFIG_BFS_FS is not set 1140# CONFIG_BFS_FS is not set
1147# CONFIG_EFS_FS is not set 1141# CONFIG_EFS_FS is not set
1142# CONFIG_LOGFS is not set
1148# CONFIG_CRAMFS is not set 1143# CONFIG_CRAMFS is not set
1149# CONFIG_SQUASHFS is not set 1144# CONFIG_SQUASHFS is not set
1150# CONFIG_VXFS_FS is not set 1145# CONFIG_VXFS_FS is not set
@@ -1159,6 +1154,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
1159# CONFIG_NFS_FS is not set 1154# CONFIG_NFS_FS is not set
1160# CONFIG_NFSD is not set 1155# CONFIG_NFSD is not set
1161# CONFIG_SMB_FS is not set 1156# CONFIG_SMB_FS is not set
1157# CONFIG_CEPH_FS is not set
1162# CONFIG_CIFS is not set 1158# CONFIG_CIFS is not set
1163# CONFIG_NCP_FS is not set 1159# CONFIG_NCP_FS is not set
1164# CONFIG_CODA_FS is not set 1160# CONFIG_CODA_FS is not set
@@ -1246,7 +1242,6 @@ CONFIG_DEBUG_PREEMPT=y
1246# CONFIG_LOCK_STAT is not set 1242# CONFIG_LOCK_STAT is not set
1247# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1243# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1248# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1244# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1249CONFIG_STACKTRACE=y
1250# CONFIG_DEBUG_KOBJECT is not set 1245# CONFIG_DEBUG_KOBJECT is not set
1251CONFIG_DEBUG_BUGVERBOSE=y 1246CONFIG_DEBUG_BUGVERBOSE=y
1252# CONFIG_DEBUG_INFO is not set 1247# CONFIG_DEBUG_INFO is not set
@@ -1266,9 +1261,9 @@ CONFIG_FRAME_POINTER=y
1266# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1261# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1267# CONFIG_LKDTM is not set 1262# CONFIG_LKDTM is not set
1268# CONFIG_FAULT_INJECTION is not set 1263# CONFIG_FAULT_INJECTION is not set
1264# CONFIG_LATENCYTOP is not set
1269# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1265# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1270# CONFIG_PAGE_POISONING is not set 1266# CONFIG_PAGE_POISONING is not set
1271CONFIG_NOP_TRACER=y
1272CONFIG_HAVE_FUNCTION_TRACER=y 1267CONFIG_HAVE_FUNCTION_TRACER=y
1273CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 1268CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
1274CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 1269CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
@@ -1276,10 +1271,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
1276CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1271CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1277CONFIG_HAVE_SYSCALL_TRACEPOINTS=y 1272CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
1278CONFIG_RING_BUFFER=y 1273CONFIG_RING_BUFFER=y
1279CONFIG_EVENT_TRACING=y
1280CONFIG_CONTEXT_SWITCH_TRACER=y
1281CONFIG_RING_BUFFER_ALLOW_SWAP=y 1274CONFIG_RING_BUFFER_ALLOW_SWAP=y
1282CONFIG_TRACING=y
1283CONFIG_TRACING_SUPPORT=y 1275CONFIG_TRACING_SUPPORT=y
1284CONFIG_FTRACE=y 1276CONFIG_FTRACE=y
1285# CONFIG_FUNCTION_TRACER is not set 1277# CONFIG_FUNCTION_TRACER is not set
@@ -1292,6 +1284,7 @@ CONFIG_FTRACE=y
1292CONFIG_BRANCH_PROFILE_NONE=y 1284CONFIG_BRANCH_PROFILE_NONE=y
1293# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1285# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1294# CONFIG_PROFILE_ALL_BRANCHES is not set 1286# CONFIG_PROFILE_ALL_BRANCHES is not set
1287# CONFIG_KSYM_TRACER is not set
1295# CONFIG_STACK_TRACER is not set 1288# CONFIG_STACK_TRACER is not set
1296# CONFIG_KMEMTRACE is not set 1289# CONFIG_KMEMTRACE is not set
1297# CONFIG_WORKQUEUE_TRACER is not set 1290# CONFIG_WORKQUEUE_TRACER is not set
@@ -1329,6 +1322,7 @@ CONFIG_CRYPTO=y
1329# CONFIG_CRYPTO_MANAGER2 is not set 1322# CONFIG_CRYPTO_MANAGER2 is not set
1330# CONFIG_CRYPTO_GF128MUL is not set 1323# CONFIG_CRYPTO_GF128MUL is not set
1331# CONFIG_CRYPTO_NULL is not set 1324# CONFIG_CRYPTO_NULL is not set
1325# CONFIG_CRYPTO_PCRYPT is not set
1332# CONFIG_CRYPTO_CRYPTD is not set 1326# CONFIG_CRYPTO_CRYPTD is not set
1333# CONFIG_CRYPTO_AUTHENC is not set 1327# CONFIG_CRYPTO_AUTHENC is not set
1334# CONFIG_CRYPTO_TEST is not set 1328# CONFIG_CRYPTO_TEST is not set
@@ -1407,7 +1401,8 @@ CONFIG_CRYPTO=y
1407# 1401#
1408# CONFIG_CRYPTO_ANSI_CPRNG is not set 1402# CONFIG_CRYPTO_ANSI_CPRNG is not set
1409CONFIG_CRYPTO_HW=y 1403CONFIG_CRYPTO_HW=y
1410CONFIG_BINARY_PRINTF=y 1404# CONFIG_VIRTUALIZATION is not set
1405# CONFIG_BINARY_PRINTF is not set
1411 1406
1412# 1407#
1413# Library routines 1408# Library routines
diff --git a/arch/sh/configs/snapgear_defconfig b/arch/sh/configs/snapgear_defconfig
index 98352d75785..513834d2b8a 100644
--- a/arch/sh/configs/snapgear_defconfig
+++ b/arch/sh/configs/snapgear_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-rc5
4# Mon Jan 4 15:14:18 2010 4# Tue May 18 17:36:53 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52# CONFIG_SWAP is not set 55# CONFIG_SWAP is not set
53# CONFIG_SYSVIPC is not set 56# CONFIG_SYSVIPC is not set
54# CONFIG_POSIX_MQUEUE is not set 57# CONFIG_POSIX_MQUEUE is not set
@@ -68,7 +71,6 @@ CONFIG_RCU_FANOUT=32
68# CONFIG_TREE_RCU_TRACE is not set 71# CONFIG_TREE_RCU_TRACE is not set
69# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
70CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
71# CONFIG_GROUP_SCHED is not set
72# CONFIG_CGROUPS is not set 74# CONFIG_CGROUPS is not set
73CONFIG_SYSFS_DEPRECATED=y 75CONFIG_SYSFS_DEPRECATED=y
74CONFIG_SYSFS_DEPRECATED_V2=y 76CONFIG_SYSFS_DEPRECATED_V2=y
@@ -79,6 +81,7 @@ CONFIG_INITRAMFS_SOURCE=""
79CONFIG_RD_GZIP=y 81CONFIG_RD_GZIP=y
80# CONFIG_RD_BZIP2 is not set 82# CONFIG_RD_BZIP2 is not set
81# CONFIG_RD_LZMA is not set 83# CONFIG_RD_LZMA is not set
84# CONFIG_RD_LZO is not set
82CONFIG_CC_OPTIMIZE_FOR_SIZE=y 85CONFIG_CC_OPTIMIZE_FOR_SIZE=y
83CONFIG_SYSCTL=y 86CONFIG_SYSCTL=y
84CONFIG_ANON_INODES=y 87CONFIG_ANON_INODES=y
@@ -105,7 +108,7 @@ CONFIG_PERF_USE_VMALLOC=y
105# 108#
106# Kernel Performance Events And Counters 109# Kernel Performance Events And Counters
107# 110#
108# CONFIG_PERF_EVENTS is not set 111CONFIG_PERF_EVENTS=y
109# CONFIG_PERF_COUNTERS is not set 112# CONFIG_PERF_COUNTERS is not set
110CONFIG_VM_EVENT_COUNTERS=y 113CONFIG_VM_EVENT_COUNTERS=y
111CONFIG_PCI_QUIRKS=y 114CONFIG_PCI_QUIRKS=y
@@ -122,6 +125,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122CONFIG_HAVE_DMA_ATTRS=y 125CONFIG_HAVE_DMA_ATTRS=y
123CONFIG_HAVE_CLK=y 126CONFIG_HAVE_CLK=y
124CONFIG_HAVE_DMA_API_DEBUG=y 127CONFIG_HAVE_DMA_API_DEBUG=y
128CONFIG_HAVE_HW_BREAKPOINT=y
125 129
126# 130#
127# GCOV-based kernel profiling 131# GCOV-based kernel profiling
@@ -235,6 +239,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
235CONFIG_MAX_ACTIVE_REGIONS=1 239CONFIG_MAX_ACTIVE_REGIONS=1
236CONFIG_ARCH_POPULATES_NODE_MAP=y 240CONFIG_ARCH_POPULATES_NODE_MAP=y
237CONFIG_ARCH_SELECT_MEMORY_MODEL=y 241CONFIG_ARCH_SELECT_MEMORY_MODEL=y
242CONFIG_UNCACHED_MAPPING=y
238CONFIG_PAGE_SIZE_4KB=y 243CONFIG_PAGE_SIZE_4KB=y
239# CONFIG_PAGE_SIZE_8KB is not set 244# CONFIG_PAGE_SIZE_8KB is not set
240# CONFIG_PAGE_SIZE_16KB is not set 245# CONFIG_PAGE_SIZE_16KB is not set
@@ -250,7 +255,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
250CONFIG_SPLIT_PTLOCK_CPUS=4 255CONFIG_SPLIT_PTLOCK_CPUS=4
251# CONFIG_PHYS_ADDR_T_64BIT is not set 256# CONFIG_PHYS_ADDR_T_64BIT is not set
252CONFIG_ZONE_DMA_FLAG=0 257CONFIG_ZONE_DMA_FLAG=0
253CONFIG_NR_QUICK=2 258CONFIG_NR_QUICK=1
254# CONFIG_KSM is not set 259# CONFIG_KSM is not set
255CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 260CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
256 261
@@ -335,7 +340,6 @@ CONFIG_PREEMPT_NONE=y
335# CONFIG_PREEMPT is not set 340# CONFIG_PREEMPT is not set
336CONFIG_GUSA=y 341CONFIG_GUSA=y
337# CONFIG_GUSA_RB is not set 342# CONFIG_GUSA_RB is not set
338# CONFIG_SPARSE_IRQ is not set
339 343
340# 344#
341# Boot options 345# Boot options
@@ -350,9 +354,9 @@ CONFIG_ENTRY_OFFSET=0x00001000
350# Bus options 354# Bus options
351# 355#
352CONFIG_PCI=y 356CONFIG_PCI=y
357CONFIG_PCI_DOMAINS=y
353# CONFIG_PCIEPORTBUS is not set 358# CONFIG_PCIEPORTBUS is not set
354# CONFIG_ARCH_SUPPORTS_MSI is not set 359# CONFIG_ARCH_SUPPORTS_MSI is not set
355CONFIG_PCI_LEGACY=y
356# CONFIG_PCI_STUB is not set 360# CONFIG_PCI_STUB is not set
357# CONFIG_PCI_IOV is not set 361# CONFIG_PCI_IOV is not set
358 362
@@ -569,6 +573,7 @@ CONFIG_HAVE_IDE=y
569# 573#
570# SCSI device support 574# SCSI device support
571# 575#
576CONFIG_SCSI_MOD=y
572# CONFIG_RAID_ATTRS is not set 577# CONFIG_RAID_ATTRS is not set
573# CONFIG_SCSI is not set 578# CONFIG_SCSI is not set
574# CONFIG_SCSI_DMA is not set 579# CONFIG_SCSI_DMA is not set
@@ -586,7 +591,7 @@ CONFIG_HAVE_IDE=y
586# 591#
587 592
588# 593#
589# See the help texts for more information. 594# The newer stack is recommended.
590# 595#
591# CONFIG_FIREWIRE is not set 596# CONFIG_FIREWIRE is not set
592# CONFIG_IEEE1394 is not set 597# CONFIG_IEEE1394 is not set
@@ -626,6 +631,7 @@ CONFIG_NET_PCI=y
626# CONFIG_PCNET32 is not set 631# CONFIG_PCNET32 is not set
627# CONFIG_AMD8111_ETH is not set 632# CONFIG_AMD8111_ETH is not set
628# CONFIG_ADAPTEC_STARFIRE is not set 633# CONFIG_ADAPTEC_STARFIRE is not set
634# CONFIG_KSZ884X_PCI is not set
629# CONFIG_B44 is not set 635# CONFIG_B44 is not set
630# CONFIG_FORCEDETH is not set 636# CONFIG_FORCEDETH is not set
631# CONFIG_E100 is not set 637# CONFIG_E100 is not set
@@ -726,6 +732,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
726CONFIG_SERIAL_CORE=y 732CONFIG_SERIAL_CORE=y
727CONFIG_SERIAL_CORE_CONSOLE=y 733CONFIG_SERIAL_CORE_CONSOLE=y
728# CONFIG_SERIAL_JSM is not set 734# CONFIG_SERIAL_JSM is not set
735# CONFIG_SERIAL_TIMBERDALE is not set
729CONFIG_UNIX98_PTYS=y 736CONFIG_UNIX98_PTYS=y
730# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 737# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
731CONFIG_LEGACY_PTYS=y 738CONFIG_LEGACY_PTYS=y
@@ -764,6 +771,7 @@ CONFIG_SSB_POSSIBLE=y
764# CONFIG_MFD_SH_MOBILE_SDHI is not set 771# CONFIG_MFD_SH_MOBILE_SDHI is not set
765# CONFIG_HTC_PASIC3 is not set 772# CONFIG_HTC_PASIC3 is not set
766# CONFIG_MFD_TMIO is not set 773# CONFIG_MFD_TMIO is not set
774# CONFIG_LPC_SCH is not set
767# CONFIG_REGULATOR is not set 775# CONFIG_REGULATOR is not set
768# CONFIG_MEDIA_SUPPORT is not set 776# CONFIG_MEDIA_SUPPORT is not set
769 777
@@ -771,6 +779,7 @@ CONFIG_SSB_POSSIBLE=y
771# Graphics support 779# Graphics support
772# 780#
773CONFIG_VGA_ARB=y 781CONFIG_VGA_ARB=y
782CONFIG_VGA_ARB_MAX_GPUS=16
774# CONFIG_DRM is not set 783# CONFIG_DRM is not set
775# CONFIG_VGASTATE is not set 784# CONFIG_VGASTATE is not set
776# CONFIG_VIDEO_OUTPUT_CONTROL is not set 785# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -848,7 +857,6 @@ CONFIG_EXT2_FS=y
848# CONFIG_EXT2_FS_XIP is not set 857# CONFIG_EXT2_FS_XIP is not set
849# CONFIG_EXT3_FS is not set 858# CONFIG_EXT3_FS is not set
850# CONFIG_EXT4_FS is not set 859# CONFIG_EXT4_FS is not set
851CONFIG_EXT4_USE_FOR_EXT23=y
852# CONFIG_REISERFS_FS is not set 860# CONFIG_REISERFS_FS is not set
853# CONFIG_JFS_FS is not set 861# CONFIG_JFS_FS is not set
854# CONFIG_FS_POSIX_ACL is not set 862# CONFIG_FS_POSIX_ACL is not set
@@ -907,6 +915,7 @@ CONFIG_MISC_FILESYSTEMS=y
907# CONFIG_BFS_FS is not set 915# CONFIG_BFS_FS is not set
908# CONFIG_EFS_FS is not set 916# CONFIG_EFS_FS is not set
909# CONFIG_JFFS2_FS is not set 917# CONFIG_JFFS2_FS is not set
918# CONFIG_LOGFS is not set
910CONFIG_CRAMFS=y 919CONFIG_CRAMFS=y
911# CONFIG_SQUASHFS is not set 920# CONFIG_SQUASHFS is not set
912# CONFIG_VXFS_FS is not set 921# CONFIG_VXFS_FS is not set
@@ -925,6 +934,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
925# CONFIG_NFS_FS is not set 934# CONFIG_NFS_FS is not set
926# CONFIG_NFSD is not set 935# CONFIG_NFSD is not set
927# CONFIG_SMB_FS is not set 936# CONFIG_SMB_FS is not set
937# CONFIG_CEPH_FS is not set
928# CONFIG_CIFS is not set 938# CONFIG_CIFS is not set
929# CONFIG_NCP_FS is not set 939# CONFIG_NCP_FS is not set
930# CONFIG_CODA_FS is not set 940# CONFIG_CODA_FS is not set
@@ -983,6 +993,7 @@ CONFIG_HAVE_ARCH_KGDB=y
983CONFIG_DEFAULT_SECURITY_DAC=y 993CONFIG_DEFAULT_SECURITY_DAC=y
984CONFIG_DEFAULT_SECURITY="" 994CONFIG_DEFAULT_SECURITY=""
985# CONFIG_CRYPTO is not set 995# CONFIG_CRYPTO is not set
996# CONFIG_VIRTUALIZATION is not set
986# CONFIG_BINARY_PRINTF is not set 997# CONFIG_BINARY_PRINTF is not set
987 998
988# 999#
diff --git a/arch/sh/configs/systemh_defconfig b/arch/sh/configs/systemh_defconfig
index 72982e360e3..14e69a229c0 100644
--- a/arch/sh/configs/systemh_defconfig
+++ b/arch/sh/configs/systemh_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-rc5
4# Mon Jan 4 15:14:50 2010 4# Tue May 18 17:39:19 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -31,6 +31,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
31CONFIG_ARCH_HAS_DEFAULT_IDLE=y 31CONFIG_ARCH_HAS_DEFAULT_IDLE=y
32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 32CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
33CONFIG_DMA_NONCOHERENT=y 33CONFIG_DMA_NONCOHERENT=y
34CONFIG_NEED_DMA_MAP_STATE=y
34CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
35CONFIG_CONSTRUCTORS=y 36CONFIG_CONSTRUCTORS=y
36 37
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION_AUTO=y
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53# CONFIG_SYSVIPC is not set 56# CONFIG_SYSVIPC is not set
54# CONFIG_BSD_PROCESS_ACCT is not set 57# CONFIG_BSD_PROCESS_ACCT is not set
@@ -65,7 +68,6 @@ CONFIG_RCU_FANOUT=32
65# CONFIG_TREE_RCU_TRACE is not set 68# CONFIG_TREE_RCU_TRACE is not set
66# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
67CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
68# CONFIG_GROUP_SCHED is not set
69# CONFIG_CGROUPS is not set 71# CONFIG_CGROUPS is not set
70CONFIG_SYSFS_DEPRECATED=y 72CONFIG_SYSFS_DEPRECATED=y
71CONFIG_SYSFS_DEPRECATED_V2=y 73CONFIG_SYSFS_DEPRECATED_V2=y
@@ -76,6 +78,7 @@ CONFIG_INITRAMFS_SOURCE=""
76CONFIG_RD_GZIP=y 78CONFIG_RD_GZIP=y
77# CONFIG_RD_BZIP2 is not set 79# CONFIG_RD_BZIP2 is not set
78# CONFIG_RD_LZMA is not set 80# CONFIG_RD_LZMA is not set
81# CONFIG_RD_LZO is not set
79# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 82# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
80CONFIG_SYSCTL=y 83CONFIG_SYSCTL=y
81CONFIG_ANON_INODES=y 84CONFIG_ANON_INODES=y
@@ -102,7 +105,7 @@ CONFIG_PERF_USE_VMALLOC=y
102# 105#
103# Kernel Performance Events And Counters 106# Kernel Performance Events And Counters
104# 107#
105# CONFIG_PERF_EVENTS is not set 108CONFIG_PERF_EVENTS=y
106# CONFIG_PERF_COUNTERS is not set 109# CONFIG_PERF_COUNTERS is not set
107CONFIG_VM_EVENT_COUNTERS=y 110CONFIG_VM_EVENT_COUNTERS=y
108CONFIG_COMPAT_BRK=y 111CONFIG_COMPAT_BRK=y
@@ -119,6 +122,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
119CONFIG_HAVE_DMA_ATTRS=y 122CONFIG_HAVE_DMA_ATTRS=y
120CONFIG_HAVE_CLK=y 123CONFIG_HAVE_CLK=y
121CONFIG_HAVE_DMA_API_DEBUG=y 124CONFIG_HAVE_DMA_API_DEBUG=y
125CONFIG_HAVE_HW_BREAKPOINT=y
122 126
123# 127#
124# GCOV-based kernel profiling 128# GCOV-based kernel profiling
@@ -237,6 +241,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
237CONFIG_MAX_ACTIVE_REGIONS=1 241CONFIG_MAX_ACTIVE_REGIONS=1
238CONFIG_ARCH_POPULATES_NODE_MAP=y 242CONFIG_ARCH_POPULATES_NODE_MAP=y
239CONFIG_ARCH_SELECT_MEMORY_MODEL=y 243CONFIG_ARCH_SELECT_MEMORY_MODEL=y
244CONFIG_UNCACHED_MAPPING=y
240CONFIG_PAGE_SIZE_4KB=y 245CONFIG_PAGE_SIZE_4KB=y
241# CONFIG_PAGE_SIZE_8KB is not set 246# CONFIG_PAGE_SIZE_8KB is not set
242# CONFIG_PAGE_SIZE_16KB is not set 247# CONFIG_PAGE_SIZE_16KB is not set
@@ -252,7 +257,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
252CONFIG_SPLIT_PTLOCK_CPUS=4 257CONFIG_SPLIT_PTLOCK_CPUS=4
253# CONFIG_PHYS_ADDR_T_64BIT is not set 258# CONFIG_PHYS_ADDR_T_64BIT is not set
254CONFIG_ZONE_DMA_FLAG=0 259CONFIG_ZONE_DMA_FLAG=0
255CONFIG_NR_QUICK=2 260CONFIG_NR_QUICK=1
256# CONFIG_KSM is not set 261# CONFIG_KSM is not set
257CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 262CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
258 263
@@ -332,7 +337,6 @@ CONFIG_HZ=250
332CONFIG_PREEMPT=y 337CONFIG_PREEMPT=y
333CONFIG_GUSA=y 338CONFIG_GUSA=y
334# CONFIG_GUSA_RB is not set 339# CONFIG_GUSA_RB is not set
335# CONFIG_SPARSE_IRQ is not set
336 340
337# 341#
338# Boot options 342# Boot options
@@ -402,6 +406,7 @@ CONFIG_HAVE_IDE=y
402# 406#
403# SCSI device support 407# SCSI device support
404# 408#
409CONFIG_SCSI_MOD=y
405# CONFIG_RAID_ATTRS is not set 410# CONFIG_RAID_ATTRS is not set
406# CONFIG_SCSI is not set 411# CONFIG_SCSI is not set
407# CONFIG_SCSI_DMA is not set 412# CONFIG_SCSI_DMA is not set
@@ -442,6 +447,7 @@ CONFIG_DEVKMEM=y
442# Non-8250 serial port support 447# Non-8250 serial port support
443# 448#
444# CONFIG_SERIAL_SH_SCI is not set 449# CONFIG_SERIAL_SH_SCI is not set
450# CONFIG_SERIAL_TIMBERDALE is not set
445CONFIG_UNIX98_PTYS=y 451CONFIG_UNIX98_PTYS=y
446# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 452# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
447CONFIG_LEGACY_PTYS=y 453CONFIG_LEGACY_PTYS=y
@@ -552,7 +558,6 @@ CONFIG_RTC_LIB=y
552# CONFIG_EXT2_FS is not set 558# CONFIG_EXT2_FS is not set
553# CONFIG_EXT3_FS is not set 559# CONFIG_EXT3_FS is not set
554# CONFIG_EXT4_FS is not set 560# CONFIG_EXT4_FS is not set
555CONFIG_EXT4_USE_FOR_EXT23=y
556# CONFIG_REISERFS_FS is not set 561# CONFIG_REISERFS_FS is not set
557# CONFIG_JFS_FS is not set 562# CONFIG_JFS_FS is not set
558# CONFIG_FS_POSIX_ACL is not set 563# CONFIG_FS_POSIX_ACL is not set
@@ -609,6 +614,7 @@ CONFIG_MISC_FILESYSTEMS=y
609# CONFIG_BEFS_FS is not set 614# CONFIG_BEFS_FS is not set
610# CONFIG_BFS_FS is not set 615# CONFIG_BFS_FS is not set
611# CONFIG_EFS_FS is not set 616# CONFIG_EFS_FS is not set
617# CONFIG_LOGFS is not set
612CONFIG_CRAMFS=y 618CONFIG_CRAMFS=y
613# CONFIG_SQUASHFS is not set 619# CONFIG_SQUASHFS is not set
614# CONFIG_VXFS_FS is not set 620# CONFIG_VXFS_FS is not set
@@ -676,6 +682,7 @@ CONFIG_HAVE_ARCH_KGDB=y
676CONFIG_DEFAULT_SECURITY_DAC=y 682CONFIG_DEFAULT_SECURITY_DAC=y
677CONFIG_DEFAULT_SECURITY="" 683CONFIG_DEFAULT_SECURITY=""
678# CONFIG_CRYPTO is not set 684# CONFIG_CRYPTO is not set
685# CONFIG_VIRTUALIZATION is not set
679# CONFIG_BINARY_PRINTF is not set 686# CONFIG_BINARY_PRINTF is not set
680 687
681# 688#
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
index 78c257053c7..79196b4dfdb 100644
--- a/arch/sh/configs/titan_defconfig
+++ b/arch/sh/configs/titan_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-rc5
4# Mon Jan 4 15:17:20 2010 4# Tue May 18 17:41:12 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -32,6 +32,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
32CONFIG_ARCH_HAS_DEFAULT_IDLE=y 32CONFIG_ARCH_HAS_DEFAULT_IDLE=y
33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 33CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
34CONFIG_DMA_NONCOHERENT=y 34CONFIG_DMA_NONCOHERENT=y
35CONFIG_NEED_DMA_MAP_STATE=y
35CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
36CONFIG_CONSTRUCTORS=y 37CONFIG_CONSTRUCTORS=y
37 38
@@ -46,9 +47,11 @@ CONFIG_LOCALVERSION=""
46CONFIG_HAVE_KERNEL_GZIP=y 47CONFIG_HAVE_KERNEL_GZIP=y
47CONFIG_HAVE_KERNEL_BZIP2=y 48CONFIG_HAVE_KERNEL_BZIP2=y
48CONFIG_HAVE_KERNEL_LZMA=y 49CONFIG_HAVE_KERNEL_LZMA=y
50CONFIG_HAVE_KERNEL_LZO=y
49CONFIG_KERNEL_GZIP=y 51CONFIG_KERNEL_GZIP=y
50# CONFIG_KERNEL_BZIP2 is not set 52# CONFIG_KERNEL_BZIP2 is not set
51# CONFIG_KERNEL_LZMA is not set 53# CONFIG_KERNEL_LZMA is not set
54# CONFIG_KERNEL_LZO is not set
52CONFIG_SWAP=y 55CONFIG_SWAP=y
53CONFIG_SYSVIPC=y 56CONFIG_SYSVIPC=y
54CONFIG_SYSVIPC_SYSCTL=y 57CONFIG_SYSVIPC_SYSCTL=y
@@ -71,7 +74,6 @@ CONFIG_RCU_FANOUT=32
71CONFIG_IKCONFIG=y 74CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 75CONFIG_IKCONFIG_PROC=y
73CONFIG_LOG_BUF_SHIFT=16 76CONFIG_LOG_BUF_SHIFT=16
74# CONFIG_GROUP_SCHED is not set
75# CONFIG_CGROUPS is not set 77# CONFIG_CGROUPS is not set
76CONFIG_SYSFS_DEPRECATED=y 78CONFIG_SYSFS_DEPRECATED=y
77CONFIG_SYSFS_DEPRECATED_V2=y 79CONFIG_SYSFS_DEPRECATED_V2=y
@@ -82,6 +84,7 @@ CONFIG_INITRAMFS_SOURCE=""
82CONFIG_RD_GZIP=y 84CONFIG_RD_GZIP=y
83# CONFIG_RD_BZIP2 is not set 85# CONFIG_RD_BZIP2 is not set
84# CONFIG_RD_LZMA is not set 86# CONFIG_RD_LZMA is not set
87# CONFIG_RD_LZO is not set
85# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 88# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
86CONFIG_SYSCTL=y 89CONFIG_SYSCTL=y
87CONFIG_ANON_INODES=y 90CONFIG_ANON_INODES=y
@@ -109,8 +112,9 @@ CONFIG_PERF_USE_VMALLOC=y
109# 112#
110# Kernel Performance Events And Counters 113# Kernel Performance Events And Counters
111# 114#
112# CONFIG_PERF_EVENTS is not set 115CONFIG_PERF_EVENTS=y
113# CONFIG_PERF_COUNTERS is not set 116# CONFIG_PERF_COUNTERS is not set
117# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
114CONFIG_VM_EVENT_COUNTERS=y 118CONFIG_VM_EVENT_COUNTERS=y
115CONFIG_PCI_QUIRKS=y 119CONFIG_PCI_QUIRKS=y
116CONFIG_COMPAT_BRK=y 120CONFIG_COMPAT_BRK=y
@@ -127,6 +131,7 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
127CONFIG_HAVE_DMA_ATTRS=y 131CONFIG_HAVE_DMA_ATTRS=y
128CONFIG_HAVE_CLK=y 132CONFIG_HAVE_CLK=y
129CONFIG_HAVE_DMA_API_DEBUG=y 133CONFIG_HAVE_DMA_API_DEBUG=y
134CONFIG_HAVE_HW_BREAKPOINT=y
130 135
131# 136#
132# GCOV-based kernel profiling 137# GCOV-based kernel profiling
@@ -245,6 +250,7 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
245CONFIG_MAX_ACTIVE_REGIONS=1 250CONFIG_MAX_ACTIVE_REGIONS=1
246CONFIG_ARCH_POPULATES_NODE_MAP=y 251CONFIG_ARCH_POPULATES_NODE_MAP=y
247CONFIG_ARCH_SELECT_MEMORY_MODEL=y 252CONFIG_ARCH_SELECT_MEMORY_MODEL=y
253CONFIG_UNCACHED_MAPPING=y
248CONFIG_PAGE_SIZE_4KB=y 254CONFIG_PAGE_SIZE_4KB=y
249# CONFIG_PAGE_SIZE_8KB is not set 255# CONFIG_PAGE_SIZE_8KB is not set
250# CONFIG_PAGE_SIZE_16KB is not set 256# CONFIG_PAGE_SIZE_16KB is not set
@@ -260,7 +266,7 @@ CONFIG_PAGEFLAGS_EXTENDED=y
260CONFIG_SPLIT_PTLOCK_CPUS=4 266CONFIG_SPLIT_PTLOCK_CPUS=4
261# CONFIG_PHYS_ADDR_T_64BIT is not set 267# CONFIG_PHYS_ADDR_T_64BIT is not set
262CONFIG_ZONE_DMA_FLAG=0 268CONFIG_ZONE_DMA_FLAG=0
263CONFIG_NR_QUICK=2 269CONFIG_NR_QUICK=1
264# CONFIG_KSM is not set 270# CONFIG_KSM is not set
265CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 271CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
266 272
@@ -345,7 +351,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
345# CONFIG_PREEMPT is not set 351# CONFIG_PREEMPT is not set
346CONFIG_GUSA=y 352CONFIG_GUSA=y
347# CONFIG_GUSA_RB is not set 353# CONFIG_GUSA_RB is not set
348# CONFIG_SPARSE_IRQ is not set
349 354
350# 355#
351# Boot options 356# Boot options
@@ -361,9 +366,9 @@ CONFIG_CMDLINE="console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf rw"
361# Bus options 366# Bus options
362# 367#
363CONFIG_PCI=y 368CONFIG_PCI=y
369CONFIG_PCI_DOMAINS=y
364# CONFIG_PCIEPORTBUS is not set 370# CONFIG_PCIEPORTBUS is not set
365# CONFIG_ARCH_SUPPORTS_MSI is not set 371# CONFIG_ARCH_SUPPORTS_MSI is not set
366CONFIG_PCI_LEGACY=y
367# CONFIG_PCI_DEBUG is not set 372# CONFIG_PCI_DEBUG is not set
368# CONFIG_PCI_STUB is not set 373# CONFIG_PCI_STUB is not set
369# CONFIG_PCI_IOV is not set 374# CONFIG_PCI_IOV is not set
@@ -392,7 +397,6 @@ CONFIG_NET=y
392# Networking options 397# Networking options
393# 398#
394CONFIG_PACKET=y 399CONFIG_PACKET=y
395CONFIG_PACKET_MMAP=y
396CONFIG_UNIX=y 400CONFIG_UNIX=y
397CONFIG_XFRM=y 401CONFIG_XFRM=y
398# CONFIG_XFRM_USER is not set 402# CONFIG_XFRM_USER is not set
@@ -561,6 +565,7 @@ CONFIG_IP6_NF_RAW=m
561# CONFIG_ATM is not set 565# CONFIG_ATM is not set
562CONFIG_STP=y 566CONFIG_STP=y
563CONFIG_BRIDGE=y 567CONFIG_BRIDGE=y
568CONFIG_BRIDGE_IGMP_SNOOPING=y
564# CONFIG_NET_DSA is not set 569# CONFIG_NET_DSA is not set
565CONFIG_VLAN_8021Q=y 570CONFIG_VLAN_8021Q=y
566# CONFIG_VLAN_8021Q_GVRP is not set 571# CONFIG_VLAN_8021Q_GVRP is not set
@@ -749,6 +754,7 @@ CONFIG_MTD_NAND_IDS=m
749# CONFIG_MTD_NAND_CAFE is not set 754# CONFIG_MTD_NAND_CAFE is not set
750# CONFIG_MTD_NAND_PLATFORM is not set 755# CONFIG_MTD_NAND_PLATFORM is not set
751# CONFIG_MTD_ALAUDA is not set 756# CONFIG_MTD_ALAUDA is not set
757# CONFIG_MTD_NAND_SH_FLCTL is not set
752# CONFIG_MTD_ONENAND is not set 758# CONFIG_MTD_ONENAND is not set
753 759
754# 760#
@@ -768,10 +774,6 @@ CONFIG_BLK_DEV=y
768# CONFIG_BLK_DEV_COW_COMMON is not set 774# CONFIG_BLK_DEV_COW_COMMON is not set
769CONFIG_BLK_DEV_LOOP=m 775CONFIG_BLK_DEV_LOOP=m
770CONFIG_BLK_DEV_CRYPTOLOOP=m 776CONFIG_BLK_DEV_CRYPTOLOOP=m
771
772#
773# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
774#
775# CONFIG_BLK_DEV_DRBD is not set 777# CONFIG_BLK_DEV_DRBD is not set
776# CONFIG_BLK_DEV_NBD is not set 778# CONFIG_BLK_DEV_NBD is not set
777# CONFIG_BLK_DEV_SX8 is not set 779# CONFIG_BLK_DEV_SX8 is not set
@@ -802,6 +804,7 @@ CONFIG_HAVE_IDE=y
802# 804#
803# SCSI device support 805# SCSI device support
804# 806#
807CONFIG_SCSI_MOD=y
805# CONFIG_RAID_ATTRS is not set 808# CONFIG_RAID_ATTRS is not set
806CONFIG_SCSI=y 809CONFIG_SCSI=y
807CONFIG_SCSI_DMA=y 810CONFIG_SCSI_DMA=y
@@ -892,7 +895,7 @@ CONFIG_SCSI_LOWLEVEL=y
892# 895#
893 896
894# 897#
895# See the help texts for more information. 898# The newer stack is recommended.
896# 899#
897# CONFIG_FIREWIRE is not set 900# CONFIG_FIREWIRE is not set
898# CONFIG_IEEE1394 is not set 901# CONFIG_IEEE1394 is not set
@@ -951,6 +954,7 @@ CONFIG_NET_PCI=y
951# CONFIG_PCNET32 is not set 954# CONFIG_PCNET32 is not set
952# CONFIG_AMD8111_ETH is not set 955# CONFIG_AMD8111_ETH is not set
953# CONFIG_ADAPTEC_STARFIRE is not set 956# CONFIG_ADAPTEC_STARFIRE is not set
957# CONFIG_KSZ884X_PCI is not set
954# CONFIG_B44 is not set 958# CONFIG_B44 is not set
955# CONFIG_FORCEDETH is not set 959# CONFIG_FORCEDETH is not set
956# CONFIG_E100 is not set 960# CONFIG_E100 is not set
@@ -1002,6 +1006,8 @@ CONFIG_NETDEV_10000=y
1002# CONFIG_CHELSIO_T1 is not set 1006# CONFIG_CHELSIO_T1 is not set
1003CONFIG_CHELSIO_T3_DEPENDS=y 1007CONFIG_CHELSIO_T3_DEPENDS=y
1004# CONFIG_CHELSIO_T3 is not set 1008# CONFIG_CHELSIO_T3 is not set
1009CONFIG_CHELSIO_T4_DEPENDS=y
1010# CONFIG_CHELSIO_T4 is not set
1005# CONFIG_ENIC is not set 1011# CONFIG_ENIC is not set
1006# CONFIG_IXGBE is not set 1012# CONFIG_IXGBE is not set
1007# CONFIG_IXGB is not set 1013# CONFIG_IXGB is not set
@@ -1014,6 +1020,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y
1014# CONFIG_MLX4_CORE is not set 1020# CONFIG_MLX4_CORE is not set
1015# CONFIG_TEHUTI is not set 1021# CONFIG_TEHUTI is not set
1016# CONFIG_BNX2X is not set 1022# CONFIG_BNX2X is not set
1023# CONFIG_QLCNIC is not set
1017# CONFIG_QLGE is not set 1024# CONFIG_QLGE is not set
1018# CONFIG_SFC is not set 1025# CONFIG_SFC is not set
1019# CONFIG_BE2NET is not set 1026# CONFIG_BE2NET is not set
@@ -1040,6 +1047,7 @@ CONFIG_USB_NET_AX8817X=m
1040CONFIG_USB_NET_CDCETHER=m 1047CONFIG_USB_NET_CDCETHER=m
1041# CONFIG_USB_NET_CDC_EEM is not set 1048# CONFIG_USB_NET_CDC_EEM is not set
1042# CONFIG_USB_NET_DM9601 is not set 1049# CONFIG_USB_NET_DM9601 is not set
1050# CONFIG_USB_NET_SMSC75XX is not set
1043# CONFIG_USB_NET_SMSC95XX is not set 1051# CONFIG_USB_NET_SMSC95XX is not set
1044# CONFIG_USB_NET_GL620A is not set 1052# CONFIG_USB_NET_GL620A is not set
1045CONFIG_USB_NET_NET1080=m 1053CONFIG_USB_NET_NET1080=m
@@ -1049,6 +1057,7 @@ CONFIG_USB_NET_PLUSB=m
1049# CONFIG_USB_NET_CDC_SUBSET is not set 1057# CONFIG_USB_NET_CDC_SUBSET is not set
1050CONFIG_USB_NET_ZAURUS=m 1058CONFIG_USB_NET_ZAURUS=m
1051# CONFIG_USB_NET_INT51X1 is not set 1059# CONFIG_USB_NET_INT51X1 is not set
1060# CONFIG_USB_IPHETH is not set
1052# CONFIG_WAN is not set 1061# CONFIG_WAN is not set
1053# CONFIG_FDDI is not set 1062# CONFIG_FDDI is not set
1054# CONFIG_HIPPI is not set 1063# CONFIG_HIPPI is not set
@@ -1136,6 +1145,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
1136CONFIG_SERIAL_CORE=y 1145CONFIG_SERIAL_CORE=y
1137CONFIG_SERIAL_CORE_CONSOLE=y 1146CONFIG_SERIAL_CORE_CONSOLE=y
1138# CONFIG_SERIAL_JSM is not set 1147# CONFIG_SERIAL_JSM is not set
1148# CONFIG_SERIAL_TIMBERDALE is not set
1139CONFIG_UNIX98_PTYS=y 1149CONFIG_UNIX98_PTYS=y
1140# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1150# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
1141CONFIG_LEGACY_PTYS=y 1151CONFIG_LEGACY_PTYS=y
@@ -1215,6 +1225,7 @@ CONFIG_SSB_POSSIBLE=y
1215# CONFIG_MFD_SH_MOBILE_SDHI is not set 1225# CONFIG_MFD_SH_MOBILE_SDHI is not set
1216# CONFIG_HTC_PASIC3 is not set 1226# CONFIG_HTC_PASIC3 is not set
1217# CONFIG_MFD_TMIO is not set 1227# CONFIG_MFD_TMIO is not set
1228# CONFIG_LPC_SCH is not set
1218# CONFIG_REGULATOR is not set 1229# CONFIG_REGULATOR is not set
1219# CONFIG_MEDIA_SUPPORT is not set 1230# CONFIG_MEDIA_SUPPORT is not set
1220 1231
@@ -1222,6 +1233,7 @@ CONFIG_SSB_POSSIBLE=y
1222# Graphics support 1233# Graphics support
1223# 1234#
1224CONFIG_VGA_ARB=y 1235CONFIG_VGA_ARB=y
1236CONFIG_VGA_ARB_MAX_GPUS=16
1225# CONFIG_DRM is not set 1237# CONFIG_DRM is not set
1226# CONFIG_VGASTATE is not set 1238# CONFIG_VGASTATE is not set
1227# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1239# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1372,6 +1384,7 @@ CONFIG_USB_SERIAL_ARK3116=m
1372# CONFIG_USB_SERIAL_NAVMAN is not set 1384# CONFIG_USB_SERIAL_NAVMAN is not set
1373CONFIG_USB_SERIAL_PL2303=m 1385CONFIG_USB_SERIAL_PL2303=m
1374# CONFIG_USB_SERIAL_OTI6858 is not set 1386# CONFIG_USB_SERIAL_OTI6858 is not set
1387# CONFIG_USB_SERIAL_QCAUX is not set
1375# CONFIG_USB_SERIAL_QUALCOMM is not set 1388# CONFIG_USB_SERIAL_QUALCOMM is not set
1376# CONFIG_USB_SERIAL_SPCP8X5 is not set 1389# CONFIG_USB_SERIAL_SPCP8X5 is not set
1377# CONFIG_USB_SERIAL_HP4X is not set 1390# CONFIG_USB_SERIAL_HP4X is not set
@@ -1385,6 +1398,7 @@ CONFIG_USB_SERIAL_PL2303=m
1385# CONFIG_USB_SERIAL_OPTION is not set 1398# CONFIG_USB_SERIAL_OPTION is not set
1386# CONFIG_USB_SERIAL_OMNINET is not set 1399# CONFIG_USB_SERIAL_OMNINET is not set
1387# CONFIG_USB_SERIAL_OPTICON is not set 1400# CONFIG_USB_SERIAL_OPTICON is not set
1401# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
1388# CONFIG_USB_SERIAL_DEBUG is not set 1402# CONFIG_USB_SERIAL_DEBUG is not set
1389 1403
1390# 1404#
@@ -1397,7 +1411,6 @@ CONFIG_USB_SERIAL_PL2303=m
1397# CONFIG_USB_RIO500 is not set 1411# CONFIG_USB_RIO500 is not set
1398# CONFIG_USB_LEGOTOWER is not set 1412# CONFIG_USB_LEGOTOWER is not set
1399# CONFIG_USB_LCD is not set 1413# CONFIG_USB_LCD is not set
1400# CONFIG_USB_BERRY_CHARGE is not set
1401# CONFIG_USB_LED is not set 1414# CONFIG_USB_LED is not set
1402# CONFIG_USB_CYPRESS_CY7C63 is not set 1415# CONFIG_USB_CYPRESS_CY7C63 is not set
1403# CONFIG_USB_CYTHERM is not set 1416# CONFIG_USB_CYTHERM is not set
@@ -1410,7 +1423,6 @@ CONFIG_USB_SERIAL_PL2303=m
1410# CONFIG_USB_IOWARRIOR is not set 1423# CONFIG_USB_IOWARRIOR is not set
1411# CONFIG_USB_TEST is not set 1424# CONFIG_USB_TEST is not set
1412# CONFIG_USB_ISIGHTFW is not set 1425# CONFIG_USB_ISIGHTFW is not set
1413# CONFIG_USB_VST is not set
1414# CONFIG_USB_GADGET is not set 1426# CONFIG_USB_GADGET is not set
1415 1427
1416# 1428#
@@ -1552,6 +1564,7 @@ CONFIG_MISC_FILESYSTEMS=y
1552# CONFIG_BFS_FS is not set 1564# CONFIG_BFS_FS is not set
1553# CONFIG_EFS_FS is not set 1565# CONFIG_EFS_FS is not set
1554# CONFIG_JFFS2_FS is not set 1566# CONFIG_JFFS2_FS is not set
1567# CONFIG_LOGFS is not set
1555# CONFIG_CRAMFS is not set 1568# CONFIG_CRAMFS is not set
1556# CONFIG_SQUASHFS is not set 1569# CONFIG_SQUASHFS is not set
1557# CONFIG_VXFS_FS is not set 1570# CONFIG_VXFS_FS is not set
@@ -1585,6 +1598,7 @@ CONFIG_SUNRPC=y
1585# CONFIG_RPCSEC_GSS_SPKM3 is not set 1598# CONFIG_RPCSEC_GSS_SPKM3 is not set
1586CONFIG_SMB_FS=m 1599CONFIG_SMB_FS=m
1587# CONFIG_SMB_NLS_DEFAULT is not set 1600# CONFIG_SMB_NLS_DEFAULT is not set
1601# CONFIG_CEPH_FS is not set
1588CONFIG_CIFS=m 1602CONFIG_CIFS=m
1589# CONFIG_CIFS_STATS is not set 1603# CONFIG_CIFS_STATS is not set
1590CONFIG_CIFS_WEAK_PW_HASH=y 1604CONFIG_CIFS_WEAK_PW_HASH=y
@@ -1680,6 +1694,7 @@ CONFIG_SCHED_DEBUG=y
1680# CONFIG_TIMER_STATS is not set 1694# CONFIG_TIMER_STATS is not set
1681# CONFIG_DEBUG_OBJECTS is not set 1695# CONFIG_DEBUG_OBJECTS is not set
1682# CONFIG_DEBUG_SLAB is not set 1696# CONFIG_DEBUG_SLAB is not set
1697# CONFIG_DEBUG_KMEMLEAK is not set
1683# CONFIG_DEBUG_RT_MUTEXES is not set 1698# CONFIG_DEBUG_RT_MUTEXES is not set
1684# CONFIG_RT_MUTEX_TESTER is not set 1699# CONFIG_RT_MUTEX_TESTER is not set
1685# CONFIG_DEBUG_SPINLOCK is not set 1700# CONFIG_DEBUG_SPINLOCK is not set
@@ -1726,6 +1741,7 @@ CONFIG_FTRACE=y
1726CONFIG_BRANCH_PROFILE_NONE=y 1741CONFIG_BRANCH_PROFILE_NONE=y
1727# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1742# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1728# CONFIG_PROFILE_ALL_BRANCHES is not set 1743# CONFIG_PROFILE_ALL_BRANCHES is not set
1744# CONFIG_KSYM_TRACER is not set
1729# CONFIG_STACK_TRACER is not set 1745# CONFIG_STACK_TRACER is not set
1730# CONFIG_KMEMTRACE is not set 1746# CONFIG_KMEMTRACE is not set
1731# CONFIG_WORKQUEUE_TRACER is not set 1747# CONFIG_WORKQUEUE_TRACER is not set
@@ -1853,6 +1869,7 @@ CONFIG_CRYPTO_DEFLATE=y
1853# CONFIG_CRYPTO_ANSI_CPRNG is not set 1869# CONFIG_CRYPTO_ANSI_CPRNG is not set
1854CONFIG_CRYPTO_HW=y 1870CONFIG_CRYPTO_HW=y
1855# CONFIG_CRYPTO_DEV_HIFN_795X is not set 1871# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1872# CONFIG_VIRTUALIZATION is not set
1856# CONFIG_BINARY_PRINTF is not set 1873# CONFIG_BINARY_PRINTF is not set
1857 1874
1858# 1875#
diff --git a/arch/sh/configs/ul2_defconfig b/arch/sh/configs/ul2_defconfig
index 4fa03bf086d..17b7258dcde 100644
--- a/arch/sh/configs/ul2_defconfig
+++ b/arch/sh/configs/ul2_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-rc5
4# Mon Jan 4 15:18:53 2010 4# Tue May 18 18:10:50 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18# CONFIG_GENERIC_GPIO is not set 18# CONFIG_GENERIC_GPIO is not set
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -33,6 +33,7 @@ CONFIG_ARCH_NO_VIRT_TO_BUS=y
33CONFIG_ARCH_HAS_DEFAULT_IDLE=y 33CONFIG_ARCH_HAS_DEFAULT_IDLE=y
34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 34CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
35CONFIG_DMA_NONCOHERENT=y 35CONFIG_DMA_NONCOHERENT=y
36CONFIG_NEED_DMA_MAP_STATE=y
36CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 37CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
37CONFIG_CONSTRUCTORS=y 38CONFIG_CONSTRUCTORS=y
38 39
@@ -48,9 +49,11 @@ CONFIG_LOCALVERSION_AUTO=y
48CONFIG_HAVE_KERNEL_GZIP=y 49CONFIG_HAVE_KERNEL_GZIP=y
49CONFIG_HAVE_KERNEL_BZIP2=y 50CONFIG_HAVE_KERNEL_BZIP2=y
50CONFIG_HAVE_KERNEL_LZMA=y 51CONFIG_HAVE_KERNEL_LZMA=y
52CONFIG_HAVE_KERNEL_LZO=y
51CONFIG_KERNEL_GZIP=y 53CONFIG_KERNEL_GZIP=y
52# CONFIG_KERNEL_BZIP2 is not set 54# CONFIG_KERNEL_BZIP2 is not set
53# CONFIG_KERNEL_LZMA is not set 55# CONFIG_KERNEL_LZMA is not set
56# CONFIG_KERNEL_LZO is not set
54CONFIG_SWAP=y 57CONFIG_SWAP=y
55CONFIG_SYSVIPC=y 58CONFIG_SYSVIPC=y
56CONFIG_SYSVIPC_SYSCTL=y 59CONFIG_SYSVIPC_SYSCTL=y
@@ -73,7 +76,6 @@ CONFIG_RCU_FANOUT=32
73CONFIG_IKCONFIG=y 76CONFIG_IKCONFIG=y
74CONFIG_IKCONFIG_PROC=y 77CONFIG_IKCONFIG_PROC=y
75CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
76# CONFIG_GROUP_SCHED is not set
77# CONFIG_CGROUPS is not set 79# CONFIG_CGROUPS is not set
78CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
79CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
@@ -84,6 +86,7 @@ CONFIG_INITRAMFS_SOURCE=""
84CONFIG_RD_GZIP=y 86CONFIG_RD_GZIP=y
85# CONFIG_RD_BZIP2 is not set 87# CONFIG_RD_BZIP2 is not set
86# CONFIG_RD_LZMA is not set 88# CONFIG_RD_LZMA is not set
89# CONFIG_RD_LZO is not set
87CONFIG_CC_OPTIMIZE_FOR_SIZE=y 90CONFIG_CC_OPTIMIZE_FOR_SIZE=y
88CONFIG_SYSCTL=y 91CONFIG_SYSCTL=y
89CONFIG_ANON_INODES=y 92CONFIG_ANON_INODES=y
@@ -122,13 +125,13 @@ CONFIG_PROFILING=y
122# CONFIG_OPROFILE is not set 125# CONFIG_OPROFILE is not set
123CONFIG_HAVE_OPROFILE=y 126CONFIG_HAVE_OPROFILE=y
124# CONFIG_KPROBES is not set 127# CONFIG_KPROBES is not set
125CONFIG_HAVE_IOREMAP_PROT=y
126CONFIG_HAVE_KPROBES=y 128CONFIG_HAVE_KPROBES=y
127CONFIG_HAVE_KRETPROBES=y 129CONFIG_HAVE_KRETPROBES=y
128CONFIG_HAVE_ARCH_TRACEHOOK=y 130CONFIG_HAVE_ARCH_TRACEHOOK=y
129CONFIG_HAVE_DMA_ATTRS=y 131CONFIG_HAVE_DMA_ATTRS=y
130CONFIG_HAVE_CLK=y 132CONFIG_HAVE_CLK=y
131CONFIG_HAVE_DMA_API_DEBUG=y 133CONFIG_HAVE_DMA_API_DEBUG=y
134CONFIG_HAVE_HW_BREAKPOINT=y
132 135
133# 136#
134# GCOV-based kernel profiling 137# GCOV-based kernel profiling
@@ -244,7 +247,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
244CONFIG_MEMORY_START=0x08000000 247CONFIG_MEMORY_START=0x08000000
245CONFIG_MEMORY_SIZE=0x01f00000 248CONFIG_MEMORY_SIZE=0x01f00000
246CONFIG_29BIT=y 249CONFIG_29BIT=y
247# CONFIG_X2TLB is not set 250CONFIG_X2TLB=y
248CONFIG_VSYSCALL=y 251CONFIG_VSYSCALL=y
249CONFIG_NUMA=y 252CONFIG_NUMA=y
250CONFIG_NODES_SHIFT=1 253CONFIG_NODES_SHIFT=1
@@ -255,6 +258,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
255CONFIG_ARCH_SELECT_MEMORY_MODEL=y 258CONFIG_ARCH_SELECT_MEMORY_MODEL=y
256CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 259CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
257CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 260CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
261CONFIG_IOREMAP_FIXED=y
262CONFIG_UNCACHED_MAPPING=y
258CONFIG_PAGE_SIZE_4KB=y 263CONFIG_PAGE_SIZE_4KB=y
259# CONFIG_PAGE_SIZE_8KB is not set 264# CONFIG_PAGE_SIZE_8KB is not set
260# CONFIG_PAGE_SIZE_16KB is not set 265# CONFIG_PAGE_SIZE_16KB is not set
@@ -278,7 +283,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
278# CONFIG_MIGRATION is not set 283# CONFIG_MIGRATION is not set
279# CONFIG_PHYS_ADDR_T_64BIT is not set 284# CONFIG_PHYS_ADDR_T_64BIT is not set
280CONFIG_ZONE_DMA_FLAG=0 285CONFIG_ZONE_DMA_FLAG=0
281CONFIG_NR_QUICK=2 286CONFIG_NR_QUICK=1
282# CONFIG_KSM is not set 287# CONFIG_KSM is not set
283CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 288CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
284 289
@@ -352,7 +357,7 @@ CONFIG_KEXEC=y
352# CONFIG_PREEMPT_VOLUNTARY is not set 357# CONFIG_PREEMPT_VOLUNTARY is not set
353CONFIG_PREEMPT=y 358CONFIG_PREEMPT=y
354CONFIG_GUSA=y 359CONFIG_GUSA=y
355# CONFIG_SPARSE_IRQ is not set 360# CONFIG_INTC_USERIMASK is not set
356 361
357# 362#
358# Boot options 363# Boot options
@@ -388,6 +393,7 @@ CONFIG_SUSPEND=y
388CONFIG_SUSPEND_FREEZER=y 393CONFIG_SUSPEND_FREEZER=y
389# CONFIG_HIBERNATION is not set 394# CONFIG_HIBERNATION is not set
390CONFIG_PM_RUNTIME=y 395CONFIG_PM_RUNTIME=y
396CONFIG_PM_OPS=y
391# CONFIG_CPU_IDLE is not set 397# CONFIG_CPU_IDLE is not set
392CONFIG_NET=y 398CONFIG_NET=y
393 399
@@ -395,7 +401,6 @@ CONFIG_NET=y
395# Networking options 401# Networking options
396# 402#
397CONFIG_PACKET=y 403CONFIG_PACKET=y
398CONFIG_PACKET_MMAP=y
399CONFIG_UNIX=y 404CONFIG_UNIX=y
400CONFIG_XFRM=y 405CONFIG_XFRM=y
401# CONFIG_XFRM_USER is not set 406# CONFIG_XFRM_USER is not set
@@ -473,7 +478,7 @@ CONFIG_CFG80211=y
473# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set 478# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
474# CONFIG_CFG80211_REG_DEBUG is not set 479# CONFIG_CFG80211_REG_DEBUG is not set
475CONFIG_CFG80211_DEFAULT_PS=y 480CONFIG_CFG80211_DEFAULT_PS=y
476# CONFIG_WIRELESS_OLD_REGULATORY is not set 481# CONFIG_CFG80211_INTERNAL_REGDB is not set
477CONFIG_CFG80211_WEXT=y 482CONFIG_CFG80211_WEXT=y
478CONFIG_WIRELESS_EXT_SYSFS=y 483CONFIG_WIRELESS_EXT_SYSFS=y
479CONFIG_LIB80211=m 484CONFIG_LIB80211=m
@@ -619,6 +624,7 @@ CONFIG_HAVE_IDE=y
619# 624#
620# SCSI device support 625# SCSI device support
621# 626#
627CONFIG_SCSI_MOD=y
622# CONFIG_RAID_ATTRS is not set 628# CONFIG_RAID_ATTRS is not set
623CONFIG_SCSI=y 629CONFIG_SCSI=y
624CONFIG_SCSI_DMA=y 630CONFIG_SCSI_DMA=y
@@ -709,6 +715,7 @@ CONFIG_LIBERTAS=m
709# CONFIG_LIBERTAS_USB is not set 715# CONFIG_LIBERTAS_USB is not set
710CONFIG_LIBERTAS_SDIO=m 716CONFIG_LIBERTAS_SDIO=m
711CONFIG_LIBERTAS_DEBUG=y 717CONFIG_LIBERTAS_DEBUG=y
718# CONFIG_LIBERTAS_MESH is not set
712# CONFIG_P54_COMMON is not set 719# CONFIG_P54_COMMON is not set
713# CONFIG_RT2X00 is not set 720# CONFIG_RT2X00 is not set
714# CONFIG_WL12XX is not set 721# CONFIG_WL12XX is not set
@@ -730,6 +737,7 @@ CONFIG_USB_NET_AX8817X=y
730CONFIG_USB_NET_CDCETHER=y 737CONFIG_USB_NET_CDCETHER=y
731# CONFIG_USB_NET_CDC_EEM is not set 738# CONFIG_USB_NET_CDC_EEM is not set
732# CONFIG_USB_NET_DM9601 is not set 739# CONFIG_USB_NET_DM9601 is not set
740# CONFIG_USB_NET_SMSC75XX is not set
733# CONFIG_USB_NET_SMSC95XX is not set 741# CONFIG_USB_NET_SMSC95XX is not set
734# CONFIG_USB_NET_GL620A is not set 742# CONFIG_USB_NET_GL620A is not set
735# CONFIG_USB_NET_NET1080 is not set 743# CONFIG_USB_NET_NET1080 is not set
@@ -739,6 +747,7 @@ CONFIG_USB_NET_CDCETHER=y
739# CONFIG_USB_NET_CDC_SUBSET is not set 747# CONFIG_USB_NET_CDC_SUBSET is not set
740# CONFIG_USB_NET_ZAURUS is not set 748# CONFIG_USB_NET_ZAURUS is not set
741# CONFIG_USB_NET_INT51X1 is not set 749# CONFIG_USB_NET_INT51X1 is not set
750# CONFIG_USB_IPHETH is not set
742# CONFIG_WAN is not set 751# CONFIG_WAN is not set
743# CONFIG_PPP is not set 752# CONFIG_PPP is not set
744# CONFIG_SLIP is not set 753# CONFIG_SLIP is not set
@@ -800,6 +809,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=1
800CONFIG_SERIAL_SH_SCI_CONSOLE=y 809CONFIG_SERIAL_SH_SCI_CONSOLE=y
801CONFIG_SERIAL_CORE=y 810CONFIG_SERIAL_CORE=y
802CONFIG_SERIAL_CORE_CONSOLE=y 811CONFIG_SERIAL_CORE_CONSOLE=y
812# CONFIG_SERIAL_TIMBERDALE is not set
803# CONFIG_UNIX98_PTYS is not set 813# CONFIG_UNIX98_PTYS is not set
804# CONFIG_LEGACY_PTYS is not set 814# CONFIG_LEGACY_PTYS is not set
805# CONFIG_IPMI_HANDLER is not set 815# CONFIG_IPMI_HANDLER is not set
@@ -952,7 +962,6 @@ CONFIG_USB_STORAGE=y
952# CONFIG_USB_RIO500 is not set 962# CONFIG_USB_RIO500 is not set
953# CONFIG_USB_LEGOTOWER is not set 963# CONFIG_USB_LEGOTOWER is not set
954# CONFIG_USB_LCD is not set 964# CONFIG_USB_LCD is not set
955# CONFIG_USB_BERRY_CHARGE is not set
956# CONFIG_USB_LED is not set 965# CONFIG_USB_LED is not set
957# CONFIG_USB_CYPRESS_CY7C63 is not set 966# CONFIG_USB_CYPRESS_CY7C63 is not set
958# CONFIG_USB_CYTHERM is not set 967# CONFIG_USB_CYTHERM is not set
@@ -964,7 +973,6 @@ CONFIG_USB_STORAGE=y
964# CONFIG_USB_IOWARRIOR is not set 973# CONFIG_USB_IOWARRIOR is not set
965# CONFIG_USB_TEST is not set 974# CONFIG_USB_TEST is not set
966# CONFIG_USB_ISIGHTFW is not set 975# CONFIG_USB_ISIGHTFW is not set
967# CONFIG_USB_VST is not set
968# CONFIG_USB_GADGET is not set 976# CONFIG_USB_GADGET is not set
969 977
970# 978#
@@ -987,9 +995,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y
987# MMC/SD/SDIO Host Controller Drivers 995# MMC/SD/SDIO Host Controller Drivers
988# 996#
989# CONFIG_MMC_SDHCI is not set 997# CONFIG_MMC_SDHCI is not set
990# CONFIG_MMC_AT91 is not set
991# CONFIG_MMC_ATMELMCI is not set
992# CONFIG_MMC_TMIO is not set
993# CONFIG_MEMSTICK is not set 998# CONFIG_MEMSTICK is not set
994# CONFIG_NEW_LEDS is not set 999# CONFIG_NEW_LEDS is not set
995# CONFIG_ACCESSIBILITY is not set 1000# CONFIG_ACCESSIBILITY is not set
@@ -1079,6 +1084,7 @@ CONFIG_MISC_FILESYSTEMS=y
1079# CONFIG_BFS_FS is not set 1084# CONFIG_BFS_FS is not set
1080# CONFIG_EFS_FS is not set 1085# CONFIG_EFS_FS is not set
1081# CONFIG_JFFS2_FS is not set 1086# CONFIG_JFFS2_FS is not set
1087# CONFIG_LOGFS is not set
1082CONFIG_CRAMFS=y 1088CONFIG_CRAMFS=y
1083# CONFIG_SQUASHFS is not set 1089# CONFIG_SQUASHFS is not set
1084# CONFIG_VXFS_FS is not set 1090# CONFIG_VXFS_FS is not set
@@ -1104,6 +1110,7 @@ CONFIG_SUNRPC=y
1104# CONFIG_RPCSEC_GSS_KRB5 is not set 1110# CONFIG_RPCSEC_GSS_KRB5 is not set
1105# CONFIG_RPCSEC_GSS_SPKM3 is not set 1111# CONFIG_RPCSEC_GSS_SPKM3 is not set
1106# CONFIG_SMB_FS is not set 1112# CONFIG_SMB_FS is not set
1113# CONFIG_CEPH_FS is not set
1107# CONFIG_CIFS is not set 1114# CONFIG_CIFS is not set
1108# CONFIG_NCP_FS is not set 1115# CONFIG_NCP_FS is not set
1109# CONFIG_CODA_FS is not set 1116# CONFIG_CODA_FS is not set
@@ -1299,6 +1306,7 @@ CONFIG_CRYPTO_ARC4=y
1299# 1306#
1300# CONFIG_CRYPTO_ANSI_CPRNG is not set 1307# CONFIG_CRYPTO_ANSI_CPRNG is not set
1301CONFIG_CRYPTO_HW=y 1308CONFIG_CRYPTO_HW=y
1309# CONFIG_VIRTUALIZATION is not set
1302# CONFIG_BINARY_PRINTF is not set 1310# CONFIG_BINARY_PRINTF is not set
1303 1311
1304# 1312#
diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig
index 23bda1916f4..28bb19d2cbe 100644
--- a/arch/sh/configs/urquell_defconfig
+++ b/arch/sh/configs/urquell_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-rc5
4# Mon Jan 4 15:27:53 2010 4# Tue May 18 18:13:10 2010
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -13,8 +13,8 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_IRQ_PER_CPU=y 16CONFIG_IRQ_PER_CPU=y
17CONFIG_SPARSE_IRQ=y
18CONFIG_GENERIC_GPIO=y 18CONFIG_GENERIC_GPIO=y
19CONFIG_GENERIC_TIME=y 19CONFIG_GENERIC_TIME=y
20CONFIG_GENERIC_CLOCKEVENTS=y 20CONFIG_GENERIC_CLOCKEVENTS=y
@@ -35,6 +35,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
35CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y 35CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
36CONFIG_DMA_COHERENT=y 36CONFIG_DMA_COHERENT=y
37# CONFIG_DMA_NONCOHERENT is not set 37# CONFIG_DMA_NONCOHERENT is not set
38# CONFIG_NEED_DMA_MAP_STATE is not set
38CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 39CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
39CONFIG_CONSTRUCTORS=y 40CONFIG_CONSTRUCTORS=y
40 41
@@ -49,9 +50,11 @@ CONFIG_LOCALVERSION_AUTO=y
49CONFIG_HAVE_KERNEL_GZIP=y 50CONFIG_HAVE_KERNEL_GZIP=y
50CONFIG_HAVE_KERNEL_BZIP2=y 51CONFIG_HAVE_KERNEL_BZIP2=y
51CONFIG_HAVE_KERNEL_LZMA=y 52CONFIG_HAVE_KERNEL_LZMA=y
53CONFIG_HAVE_KERNEL_LZO=y
52CONFIG_KERNEL_GZIP=y 54CONFIG_KERNEL_GZIP=y
53# CONFIG_KERNEL_BZIP2 is not set 55# CONFIG_KERNEL_BZIP2 is not set
54# CONFIG_KERNEL_LZMA is not set 56# CONFIG_KERNEL_LZMA is not set
57# CONFIG_KERNEL_LZO is not set
55CONFIG_SWAP=y 58CONFIG_SWAP=y
56CONFIG_SYSVIPC=y 59CONFIG_SYSVIPC=y
57CONFIG_SYSVIPC_SYSCTL=y 60CONFIG_SYSVIPC_SYSCTL=y
@@ -77,11 +80,6 @@ CONFIG_RCU_FANOUT=32
77CONFIG_IKCONFIG=y 80CONFIG_IKCONFIG=y
78CONFIG_IKCONFIG_PROC=y 81CONFIG_IKCONFIG_PROC=y
79CONFIG_LOG_BUF_SHIFT=14 82CONFIG_LOG_BUF_SHIFT=14
80CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y
82CONFIG_RT_GROUP_SCHED=y
83# CONFIG_USER_SCHED is not set
84CONFIG_CGROUP_SCHED=y
85CONFIG_CGROUPS=y 83CONFIG_CGROUPS=y
86CONFIG_CGROUP_DEBUG=y 84CONFIG_CGROUP_DEBUG=y
87CONFIG_CGROUP_NS=y 85CONFIG_CGROUP_NS=y
@@ -93,6 +91,9 @@ CONFIG_CGROUP_CPUACCT=y
93CONFIG_RESOURCE_COUNTERS=y 91CONFIG_RESOURCE_COUNTERS=y
94CONFIG_CGROUP_MEM_RES_CTLR=y 92CONFIG_CGROUP_MEM_RES_CTLR=y
95CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y 93CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
94CONFIG_CGROUP_SCHED=y
95CONFIG_FAIR_GROUP_SCHED=y
96CONFIG_RT_GROUP_SCHED=y
96CONFIG_MM_OWNER=y 97CONFIG_MM_OWNER=y
97# CONFIG_SYSFS_DEPRECATED_V2 is not set 98# CONFIG_SYSFS_DEPRECATED_V2 is not set
98# CONFIG_RELAY is not set 99# CONFIG_RELAY is not set
@@ -102,6 +103,7 @@ CONFIG_INITRAMFS_SOURCE=""
102CONFIG_RD_GZIP=y 103CONFIG_RD_GZIP=y
103# CONFIG_RD_BZIP2 is not set 104# CONFIG_RD_BZIP2 is not set
104# CONFIG_RD_LZMA is not set 105# CONFIG_RD_LZMA is not set
106# CONFIG_RD_LZO is not set
105CONFIG_CC_OPTIMIZE_FOR_SIZE=y 107CONFIG_CC_OPTIMIZE_FOR_SIZE=y
106CONFIG_SYSCTL=y 108CONFIG_SYSCTL=y
107CONFIG_ANON_INODES=y 109CONFIG_ANON_INODES=y
@@ -142,13 +144,13 @@ CONFIG_PROFILING=y
142# CONFIG_OPROFILE is not set 144# CONFIG_OPROFILE is not set
143CONFIG_HAVE_OPROFILE=y 145CONFIG_HAVE_OPROFILE=y
144# CONFIG_KPROBES is not set 146# CONFIG_KPROBES is not set
145CONFIG_HAVE_IOREMAP_PROT=y
146CONFIG_HAVE_KPROBES=y 147CONFIG_HAVE_KPROBES=y
147CONFIG_HAVE_KRETPROBES=y 148CONFIG_HAVE_KRETPROBES=y
148CONFIG_HAVE_ARCH_TRACEHOOK=y 149CONFIG_HAVE_ARCH_TRACEHOOK=y
149CONFIG_HAVE_DMA_ATTRS=y 150CONFIG_HAVE_DMA_ATTRS=y
150CONFIG_HAVE_CLK=y 151CONFIG_HAVE_CLK=y
151CONFIG_HAVE_DMA_API_DEBUG=y 152CONFIG_HAVE_DMA_API_DEBUG=y
153CONFIG_HAVE_HW_BREAKPOINT=y
152 154
153# 155#
154# GCOV-based kernel profiling 156# GCOV-based kernel profiling
@@ -169,7 +171,6 @@ CONFIG_BLOCK=y
169CONFIG_LBDAF=y 171CONFIG_LBDAF=y
170# CONFIG_BLK_DEV_BSG is not set 172# CONFIG_BLK_DEV_BSG is not set
171# CONFIG_BLK_DEV_INTEGRITY is not set 173# CONFIG_BLK_DEV_INTEGRITY is not set
172# CONFIG_BLK_CGROUP is not set
173 174
174# 175#
175# IO Schedulers 176# IO Schedulers
@@ -265,8 +266,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
265CONFIG_MEMORY_START=0x08000000 266CONFIG_MEMORY_START=0x08000000
266CONFIG_MEMORY_SIZE=0x08000000 267CONFIG_MEMORY_SIZE=0x08000000
267CONFIG_29BIT=y 268CONFIG_29BIT=y
268# CONFIG_PMB_ENABLE is not set 269# CONFIG_PMB is not set
269# CONFIG_X2TLB is not set 270CONFIG_X2TLB=y
270CONFIG_VSYSCALL=y 271CONFIG_VSYSCALL=y
271# CONFIG_NUMA is not set 272# CONFIG_NUMA is not set
272CONFIG_ARCH_FLATMEM_ENABLE=y 273CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -277,6 +278,8 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
277CONFIG_ARCH_SELECT_MEMORY_MODEL=y 278CONFIG_ARCH_SELECT_MEMORY_MODEL=y
278CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 279CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
279CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 280CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
281CONFIG_IOREMAP_FIXED=y
282CONFIG_UNCACHED_MAPPING=y
280CONFIG_PAGE_SIZE_4KB=y 283CONFIG_PAGE_SIZE_4KB=y
281# CONFIG_PAGE_SIZE_8KB is not set 284# CONFIG_PAGE_SIZE_8KB is not set
282# CONFIG_PAGE_SIZE_16KB is not set 285# CONFIG_PAGE_SIZE_16KB is not set
@@ -299,7 +302,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
299CONFIG_MIGRATION=y 302CONFIG_MIGRATION=y
300# CONFIG_PHYS_ADDR_T_64BIT is not set 303# CONFIG_PHYS_ADDR_T_64BIT is not set
301CONFIG_ZONE_DMA_FLAG=0 304CONFIG_ZONE_DMA_FLAG=0
302CONFIG_NR_QUICK=2 305CONFIG_NR_QUICK=1
303# CONFIG_KSM is not set 306# CONFIG_KSM is not set
304CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 307CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
305 308
@@ -317,6 +320,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
317# CONFIG_CPU_BIG_ENDIAN is not set 320# CONFIG_CPU_BIG_ENDIAN is not set
318CONFIG_SH_FPU=y 321CONFIG_SH_FPU=y
319CONFIG_SH_STORE_QUEUES=y 322CONFIG_SH_STORE_QUEUES=y
323# CONFIG_SPECULATIVE_EXECUTION is not set
320CONFIG_CPU_HAS_INTEVT=y 324CONFIG_CPU_HAS_INTEVT=y
321CONFIG_CPU_HAS_SR_RB=y 325CONFIG_CPU_HAS_SR_RB=y
322CONFIG_CPU_HAS_PTEAEX=y 326CONFIG_CPU_HAS_PTEAEX=y
@@ -325,15 +329,14 @@ CONFIG_CPU_HAS_FPU=y
325# 329#
326# Board support 330# Board support
327# 331#
332# CONFIG_SH_SDK7786 is not set
328CONFIG_SH_URQUELL=y 333CONFIG_SH_URQUELL=y
329 334
330# 335#
331# Timer and clock configuration 336# Timer and clock configuration
332# 337#
333CONFIG_SH_TIMER_TMU=y 338CONFIG_SH_TIMER_TMU=y
334CONFIG_SH_PCLK_FREQ=33333333
335CONFIG_SH_CLK_CPG=y 339CONFIG_SH_CLK_CPG=y
336CONFIG_SH_CLK_CPG_LEGACY=y
337CONFIG_TICK_ONESHOT=y 340CONFIG_TICK_ONESHOT=y
338# CONFIG_NO_HZ is not set 341# CONFIG_NO_HZ is not set
339CONFIG_HIGH_RES_TIMERS=y 342CONFIG_HIGH_RES_TIMERS=y
@@ -376,7 +379,7 @@ CONFIG_PREEMPT_NONE=y
376# CONFIG_PREEMPT_VOLUNTARY is not set 379# CONFIG_PREEMPT_VOLUNTARY is not set
377# CONFIG_PREEMPT is not set 380# CONFIG_PREEMPT is not set
378CONFIG_GUSA=y 381CONFIG_GUSA=y
379CONFIG_SPARSE_IRQ=y 382# CONFIG_INTC_USERIMASK is not set
380 383
381# 384#
382# Boot options 385# Boot options
@@ -391,6 +394,7 @@ CONFIG_ENTRY_OFFSET=0x00001000
391# Bus options 394# Bus options
392# 395#
393CONFIG_PCI=y 396CONFIG_PCI=y
397CONFIG_PCI_DOMAINS=y
394CONFIG_PCIEPORTBUS=y 398CONFIG_PCIEPORTBUS=y
395CONFIG_PCIEAER=y 399CONFIG_PCIEAER=y
396# CONFIG_PCIE_ECRC is not set 400# CONFIG_PCIE_ECRC is not set
@@ -398,7 +402,6 @@ CONFIG_PCIEAER=y
398CONFIG_PCIEASPM=y 402CONFIG_PCIEASPM=y
399CONFIG_PCIEASPM_DEBUG=y 403CONFIG_PCIEASPM_DEBUG=y
400# CONFIG_ARCH_SUPPORTS_MSI is not set 404# CONFIG_ARCH_SUPPORTS_MSI is not set
401# CONFIG_PCI_LEGACY is not set
402CONFIG_PCI_DEBUG=y 405CONFIG_PCI_DEBUG=y
403# CONFIG_PCI_STUB is not set 406# CONFIG_PCI_STUB is not set
404# CONFIG_PCI_IOV is not set 407# CONFIG_PCI_IOV is not set
@@ -428,7 +431,6 @@ CONFIG_NET=y
428# Networking options 431# Networking options
429# 432#
430CONFIG_PACKET=y 433CONFIG_PACKET=y
431# CONFIG_PACKET_MMAP is not set
432CONFIG_UNIX=y 434CONFIG_UNIX=y
433CONFIG_XFRM=y 435CONFIG_XFRM=y
434# CONFIG_XFRM_USER is not set 436# CONFIG_XFRM_USER is not set
@@ -639,6 +641,7 @@ CONFIG_HAVE_IDE=y
639# 641#
640# SCSI device support 642# SCSI device support
641# 643#
644CONFIG_SCSI_MOD=y
642# CONFIG_RAID_ATTRS is not set 645# CONFIG_RAID_ATTRS is not set
643CONFIG_SCSI=y 646CONFIG_SCSI=y
644CONFIG_SCSI_DMA=y 647CONFIG_SCSI_DMA=y
@@ -712,6 +715,7 @@ CONFIG_ATA_SFF=y
712# CONFIG_PATA_IT821X is not set 715# CONFIG_PATA_IT821X is not set
713# CONFIG_PATA_IT8213 is not set 716# CONFIG_PATA_IT8213 is not set
714# CONFIG_PATA_JMICRON is not set 717# CONFIG_PATA_JMICRON is not set
718# CONFIG_PATA_LEGACY is not set
715# CONFIG_PATA_TRIFLEX is not set 719# CONFIG_PATA_TRIFLEX is not set
716# CONFIG_PATA_MARVELL is not set 720# CONFIG_PATA_MARVELL is not set
717# CONFIG_PATA_MPIIX is not set 721# CONFIG_PATA_MPIIX is not set
@@ -748,7 +752,7 @@ CONFIG_ATA_SFF=y
748# 752#
749 753
750# 754#
751# See the help texts for more information. 755# The newer stack is recommended.
752# 756#
753# CONFIG_FIREWIRE is not set 757# CONFIG_FIREWIRE is not set
754# CONFIG_IEEE1394 is not set 758# CONFIG_IEEE1394 is not set
@@ -807,6 +811,7 @@ CONFIG_NET_PCI=y
807# CONFIG_PCNET32 is not set 811# CONFIG_PCNET32 is not set
808# CONFIG_AMD8111_ETH is not set 812# CONFIG_AMD8111_ETH is not set
809# CONFIG_ADAPTEC_STARFIRE is not set 813# CONFIG_ADAPTEC_STARFIRE is not set
814# CONFIG_KSZ884X_PCI is not set
810# CONFIG_B44 is not set 815# CONFIG_B44 is not set
811# CONFIG_FORCEDETH is not set 816# CONFIG_FORCEDETH is not set
812# CONFIG_E100 is not set 817# CONFIG_E100 is not set
@@ -871,6 +876,7 @@ CONFIG_WLAN=y
871# CONFIG_USB_PEGASUS is not set 876# CONFIG_USB_PEGASUS is not set
872# CONFIG_USB_RTL8150 is not set 877# CONFIG_USB_RTL8150 is not set
873# CONFIG_USB_USBNET is not set 878# CONFIG_USB_USBNET is not set
879# CONFIG_USB_IPHETH is not set
874# CONFIG_WAN is not set 880# CONFIG_WAN is not set
875# CONFIG_FDDI is not set 881# CONFIG_FDDI is not set
876# CONFIG_HIPPI is not set 882# CONFIG_HIPPI is not set
@@ -958,6 +964,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
958CONFIG_SERIAL_CORE=y 964CONFIG_SERIAL_CORE=y
959CONFIG_SERIAL_CORE_CONSOLE=y 965CONFIG_SERIAL_CORE_CONSOLE=y
960# CONFIG_SERIAL_JSM is not set 966# CONFIG_SERIAL_JSM is not set
967# CONFIG_SERIAL_TIMBERDALE is not set
961CONFIG_UNIX98_PTYS=y 968CONFIG_UNIX98_PTYS=y
962# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 969# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
963CONFIG_LEGACY_PTYS=y 970CONFIG_LEGACY_PTYS=y
@@ -1007,6 +1014,7 @@ CONFIG_I2C_ALGOPCA=y
1007# CONFIG_I2C_OCORES is not set 1014# CONFIG_I2C_OCORES is not set
1008# CONFIG_I2C_SH_MOBILE is not set 1015# CONFIG_I2C_SH_MOBILE is not set
1009# CONFIG_I2C_SIMTEC is not set 1016# CONFIG_I2C_SIMTEC is not set
1017# CONFIG_I2C_XILINX is not set
1010 1018
1011# 1019#
1012# External I2C/SMBus adapter drivers 1020# External I2C/SMBus adapter drivers
@@ -1020,15 +1028,9 @@ CONFIG_I2C_ALGOPCA=y
1020# 1028#
1021CONFIG_I2C_PCA_PLATFORM=y 1029CONFIG_I2C_PCA_PLATFORM=y
1022# CONFIG_I2C_STUB is not set 1030# CONFIG_I2C_STUB is not set
1023
1024#
1025# Miscellaneous I2C Chip support
1026#
1027# CONFIG_SENSORS_TSL2550 is not set
1028# CONFIG_I2C_DEBUG_CORE is not set 1031# CONFIG_I2C_DEBUG_CORE is not set
1029# CONFIG_I2C_DEBUG_ALGO is not set 1032# CONFIG_I2C_DEBUG_ALGO is not set
1030# CONFIG_I2C_DEBUG_BUS is not set 1033# CONFIG_I2C_DEBUG_BUS is not set
1031# CONFIG_I2C_DEBUG_CHIP is not set
1032# CONFIG_SPI is not set 1034# CONFIG_SPI is not set
1033 1035
1034# 1036#
@@ -1043,13 +1045,17 @@ CONFIG_GPIOLIB=y
1043# 1045#
1044# Memory mapped GPIO expanders: 1046# Memory mapped GPIO expanders:
1045# 1047#
1048# CONFIG_GPIO_IT8761E is not set
1049# CONFIG_GPIO_SCH is not set
1046 1050
1047# 1051#
1048# I2C GPIO expanders: 1052# I2C GPIO expanders:
1049# 1053#
1054# CONFIG_GPIO_MAX7300 is not set
1050# CONFIG_GPIO_MAX732X is not set 1055# CONFIG_GPIO_MAX732X is not set
1051# CONFIG_GPIO_PCA953X is not set 1056# CONFIG_GPIO_PCA953X is not set
1052# CONFIG_GPIO_PCF857X is not set 1057# CONFIG_GPIO_PCF857X is not set
1058# CONFIG_GPIO_ADP5588 is not set
1053 1059
1054# 1060#
1055# PCI GPIO expanders: 1061# PCI GPIO expanders:
@@ -1082,10 +1088,11 @@ CONFIG_HWMON=y
1082# CONFIG_SENSORS_ADM1029 is not set 1088# CONFIG_SENSORS_ADM1029 is not set
1083# CONFIG_SENSORS_ADM1031 is not set 1089# CONFIG_SENSORS_ADM1031 is not set
1084# CONFIG_SENSORS_ADM9240 is not set 1090# CONFIG_SENSORS_ADM9240 is not set
1091# CONFIG_SENSORS_ADT7411 is not set
1085# CONFIG_SENSORS_ADT7462 is not set 1092# CONFIG_SENSORS_ADT7462 is not set
1086# CONFIG_SENSORS_ADT7470 is not set 1093# CONFIG_SENSORS_ADT7470 is not set
1087# CONFIG_SENSORS_ADT7473 is not set
1088# CONFIG_SENSORS_ADT7475 is not set 1094# CONFIG_SENSORS_ADT7475 is not set
1095# CONFIG_SENSORS_ASC7621 is not set
1089# CONFIG_SENSORS_ATXP1 is not set 1096# CONFIG_SENSORS_ATXP1 is not set
1090# CONFIG_SENSORS_DS1621 is not set 1097# CONFIG_SENSORS_DS1621 is not set
1091# CONFIG_SENSORS_I5K_AMB is not set 1098# CONFIG_SENSORS_I5K_AMB is not set
@@ -1123,6 +1130,7 @@ CONFIG_HWMON=y
1123# CONFIG_SENSORS_SMSC47M192 is not set 1130# CONFIG_SENSORS_SMSC47M192 is not set
1124# CONFIG_SENSORS_SMSC47B397 is not set 1131# CONFIG_SENSORS_SMSC47B397 is not set
1125# CONFIG_SENSORS_ADS7828 is not set 1132# CONFIG_SENSORS_ADS7828 is not set
1133# CONFIG_SENSORS_AMC6821 is not set
1126# CONFIG_SENSORS_THMC50 is not set 1134# CONFIG_SENSORS_THMC50 is not set
1127# CONFIG_SENSORS_TMP401 is not set 1135# CONFIG_SENSORS_TMP401 is not set
1128# CONFIG_SENSORS_TMP421 is not set 1136# CONFIG_SENSORS_TMP421 is not set
@@ -1151,21 +1159,26 @@ CONFIG_SSB_POSSIBLE=y
1151# Multifunction device drivers 1159# Multifunction device drivers
1152# 1160#
1153# CONFIG_MFD_CORE is not set 1161# CONFIG_MFD_CORE is not set
1162# CONFIG_MFD_88PM860X is not set
1154CONFIG_MFD_SM501=y 1163CONFIG_MFD_SM501=y
1155# CONFIG_MFD_SM501_GPIO is not set 1164# CONFIG_MFD_SM501_GPIO is not set
1156# CONFIG_MFD_SH_MOBILE_SDHI is not set 1165# CONFIG_MFD_SH_MOBILE_SDHI is not set
1157# CONFIG_HTC_PASIC3 is not set 1166# CONFIG_HTC_PASIC3 is not set
1167# CONFIG_HTC_I2CPLD is not set
1158# CONFIG_TPS65010 is not set 1168# CONFIG_TPS65010 is not set
1159# CONFIG_TWL4030_CORE is not set 1169# CONFIG_TWL4030_CORE is not set
1160# CONFIG_MFD_TMIO is not set 1170# CONFIG_MFD_TMIO is not set
1161# CONFIG_PMIC_DA903X is not set 1171# CONFIG_PMIC_DA903X is not set
1162# CONFIG_PMIC_ADP5520 is not set 1172# CONFIG_PMIC_ADP5520 is not set
1173# CONFIG_MFD_MAX8925 is not set
1163# CONFIG_MFD_WM8400 is not set 1174# CONFIG_MFD_WM8400 is not set
1164# CONFIG_MFD_WM831X is not set 1175# CONFIG_MFD_WM831X is not set
1165# CONFIG_MFD_WM8350_I2C is not set 1176# CONFIG_MFD_WM8350_I2C is not set
1177# CONFIG_MFD_WM8994 is not set
1166# CONFIG_MFD_PCF50633 is not set 1178# CONFIG_MFD_PCF50633 is not set
1167# CONFIG_AB3100_CORE is not set 1179# CONFIG_AB3100_CORE is not set
1168# CONFIG_MFD_88PM8607 is not set 1180# CONFIG_MFD_TIMBERDALE is not set
1181# CONFIG_LPC_SCH is not set
1169# CONFIG_REGULATOR is not set 1182# CONFIG_REGULATOR is not set
1170CONFIG_MEDIA_SUPPORT=y 1183CONFIG_MEDIA_SUPPORT=y
1171 1184
@@ -1187,6 +1200,7 @@ CONFIG_VIDEO_IR=y
1187# Graphics support 1200# Graphics support
1188# 1201#
1189CONFIG_VGA_ARB=y 1202CONFIG_VGA_ARB=y
1203CONFIG_VGA_ARB_MAX_GPUS=16
1190# CONFIG_DRM is not set 1204# CONFIG_DRM is not set
1191# CONFIG_VGASTATE is not set 1205# CONFIG_VGASTATE is not set
1192# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1206# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1283,6 +1297,7 @@ CONFIG_USB_HID=y
1283# 1297#
1284# Special HID drivers 1298# Special HID drivers
1285# 1299#
1300# CONFIG_HID_3M_PCT is not set
1286CONFIG_HID_A4TECH=y 1301CONFIG_HID_A4TECH=y
1287CONFIG_HID_APPLE=y 1302CONFIG_HID_APPLE=y
1288CONFIG_HID_BELKIN=y 1303CONFIG_HID_BELKIN=y
@@ -1298,14 +1313,19 @@ CONFIG_HID_GYRATION=y
1298CONFIG_HID_LOGITECH=y 1313CONFIG_HID_LOGITECH=y
1299# CONFIG_LOGITECH_FF is not set 1314# CONFIG_LOGITECH_FF is not set
1300# CONFIG_LOGIRUMBLEPAD2_FF is not set 1315# CONFIG_LOGIRUMBLEPAD2_FF is not set
1316# CONFIG_LOGIG940_FF is not set
1301CONFIG_HID_MICROSOFT=y 1317CONFIG_HID_MICROSOFT=y
1318# CONFIG_HID_MOSART is not set
1302CONFIG_HID_MONTEREY=y 1319CONFIG_HID_MONTEREY=y
1303# CONFIG_HID_NTRIG is not set 1320# CONFIG_HID_NTRIG is not set
1321# CONFIG_HID_ORTEK is not set
1304CONFIG_HID_PANTHERLORD=y 1322CONFIG_HID_PANTHERLORD=y
1305# CONFIG_PANTHERLORD_FF is not set 1323# CONFIG_PANTHERLORD_FF is not set
1306CONFIG_HID_PETALYNX=y 1324CONFIG_HID_PETALYNX=y
1325# CONFIG_HID_QUANTA is not set
1307CONFIG_HID_SAMSUNG=y 1326CONFIG_HID_SAMSUNG=y
1308CONFIG_HID_SONY=y 1327CONFIG_HID_SONY=y
1328# CONFIG_HID_STANTUM is not set
1309CONFIG_HID_SUNPLUS=y 1329CONFIG_HID_SUNPLUS=y
1310# CONFIG_HID_GREENASIA is not set 1330# CONFIG_HID_GREENASIA is not set
1311# CONFIG_HID_SMARTJOYPLUS is not set 1331# CONFIG_HID_SMARTJOYPLUS is not set
@@ -1326,7 +1346,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
1326CONFIG_USB_DEVICEFS=y 1346CONFIG_USB_DEVICEFS=y
1327CONFIG_USB_DEVICE_CLASS=y 1347CONFIG_USB_DEVICE_CLASS=y
1328# CONFIG_USB_DYNAMIC_MINORS is not set 1348# CONFIG_USB_DYNAMIC_MINORS is not set
1329# CONFIG_USB_SUSPEND is not set
1330# CONFIG_USB_OTG is not set 1349# CONFIG_USB_OTG is not set
1331# CONFIG_USB_OTG_WHITELIST is not set 1350# CONFIG_USB_OTG_WHITELIST is not set
1332# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1351# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -1405,7 +1424,6 @@ CONFIG_USB_STORAGE=y
1405# CONFIG_USB_RIO500 is not set 1424# CONFIG_USB_RIO500 is not set
1406# CONFIG_USB_LEGOTOWER is not set 1425# CONFIG_USB_LEGOTOWER is not set
1407# CONFIG_USB_LCD is not set 1426# CONFIG_USB_LCD is not set
1408# CONFIG_USB_BERRY_CHARGE is not set
1409# CONFIG_USB_LED is not set 1427# CONFIG_USB_LED is not set
1410# CONFIG_USB_CYPRESS_CY7C63 is not set 1428# CONFIG_USB_CYPRESS_CY7C63 is not set
1411# CONFIG_USB_CYTHERM is not set 1429# CONFIG_USB_CYTHERM is not set
@@ -1417,7 +1435,6 @@ CONFIG_USB_STORAGE=y
1417# CONFIG_USB_IOWARRIOR is not set 1435# CONFIG_USB_IOWARRIOR is not set
1418# CONFIG_USB_TEST is not set 1436# CONFIG_USB_TEST is not set
1419# CONFIG_USB_ISIGHTFW is not set 1437# CONFIG_USB_ISIGHTFW is not set
1420# CONFIG_USB_VST is not set
1421# CONFIG_USB_GADGET is not set 1438# CONFIG_USB_GADGET is not set
1422 1439
1423# 1440#
@@ -1584,6 +1601,7 @@ CONFIG_MISC_FILESYSTEMS=y
1584# CONFIG_BFS_FS is not set 1601# CONFIG_BFS_FS is not set
1585# CONFIG_EFS_FS is not set 1602# CONFIG_EFS_FS is not set
1586# CONFIG_JFFS2_FS is not set 1603# CONFIG_JFFS2_FS is not set
1604# CONFIG_LOGFS is not set
1587# CONFIG_CRAMFS is not set 1605# CONFIG_CRAMFS is not set
1588# CONFIG_SQUASHFS is not set 1606# CONFIG_SQUASHFS is not set
1589# CONFIG_VXFS_FS is not set 1607# CONFIG_VXFS_FS is not set
@@ -1610,6 +1628,7 @@ CONFIG_SUNRPC_GSS=y
1610CONFIG_RPCSEC_GSS_KRB5=y 1628CONFIG_RPCSEC_GSS_KRB5=y
1611# CONFIG_RPCSEC_GSS_SPKM3 is not set 1629# CONFIG_RPCSEC_GSS_SPKM3 is not set
1612# CONFIG_SMB_FS is not set 1630# CONFIG_SMB_FS is not set
1631# CONFIG_CEPH_FS is not set
1613# CONFIG_CIFS is not set 1632# CONFIG_CIFS is not set
1614# CONFIG_NCP_FS is not set 1633# CONFIG_NCP_FS is not set
1615# CONFIG_CODA_FS is not set 1634# CONFIG_CODA_FS is not set
@@ -1688,6 +1707,7 @@ CONFIG_SCHED_DEBUG=y
1688# CONFIG_TIMER_STATS is not set 1707# CONFIG_TIMER_STATS is not set
1689# CONFIG_DEBUG_OBJECTS is not set 1708# CONFIG_DEBUG_OBJECTS is not set
1690# CONFIG_DEBUG_SLAB is not set 1709# CONFIG_DEBUG_SLAB is not set
1710# CONFIG_DEBUG_KMEMLEAK is not set
1691# CONFIG_DEBUG_RT_MUTEXES is not set 1711# CONFIG_DEBUG_RT_MUTEXES is not set
1692# CONFIG_RT_MUTEX_TESTER is not set 1712# CONFIG_RT_MUTEX_TESTER is not set
1693# CONFIG_DEBUG_SPINLOCK is not set 1713# CONFIG_DEBUG_SPINLOCK is not set
@@ -1713,6 +1733,7 @@ CONFIG_FRAME_POINTER=y
1713# CONFIG_BACKTRACE_SELF_TEST is not set 1733# CONFIG_BACKTRACE_SELF_TEST is not set
1714# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1734# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1715# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 1735# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
1736# CONFIG_LKDTM is not set
1716# CONFIG_FAULT_INJECTION is not set 1737# CONFIG_FAULT_INJECTION is not set
1717# CONFIG_LATENCYTOP is not set 1738# CONFIG_LATENCYTOP is not set
1718CONFIG_SYSCTL_SYSCALL_CHECK=y 1739CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -1846,6 +1867,7 @@ CONFIG_CRYPTO_DES=y
1846# 1867#
1847# CONFIG_CRYPTO_ANSI_CPRNG is not set 1868# CONFIG_CRYPTO_ANSI_CPRNG is not set
1848# CONFIG_CRYPTO_HW is not set 1869# CONFIG_CRYPTO_HW is not set
1870# CONFIG_VIRTUALIZATION is not set
1849# CONFIG_BINARY_PRINTF is not set 1871# CONFIG_BINARY_PRINTF is not set
1850 1872
1851# 1873#
diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
index 02df18ea960..e461d67f03c 100644
--- a/arch/sh/include/asm/cache.h
+++ b/arch/sh/include/asm/cache.h
@@ -38,14 +38,10 @@ struct cache_info {
38 * 2. those in the physical page number. 38 * 2. those in the physical page number.
39 */ 39 */
40 unsigned int alias_mask; 40 unsigned int alias_mask;
41
42 unsigned int n_aliases; /* Number of aliases */ 41 unsigned int n_aliases; /* Number of aliases */
43 42
44 unsigned long flags; 43 unsigned long flags;
45}; 44};
46
47int __init detect_cpu_and_cache_system(void);
48
49#endif /* __ASSEMBLY__ */ 45#endif /* __ASSEMBLY__ */
50#endif /* __KERNEL__ */ 46#endif /* __KERNEL__ */
51#endif /* __ASM_SH_CACHE_H */ 47#endif /* __ASM_SH_CACHE_H */
diff --git a/arch/sh/include/asm/clkdev.h b/arch/sh/include/asm/clkdev.h
new file mode 100644
index 00000000000..5645f358128
--- /dev/null
+++ b/arch/sh/include/asm/clkdev.h
@@ -0,0 +1,35 @@
1/*
2 * arch/sh/include/asm/clkdev.h
3 *
4 * Cloned from arch/arm/include/asm/clkdev.h:
5 *
6 * Copyright (C) 2008 Russell King.
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 * Helper for the clk API to assist looking up a struct clk.
13 */
14#ifndef __ASM_CLKDEV_H
15#define __ASM_CLKDEV_H
16
17struct clk;
18
19struct clk_lookup {
20 struct list_head node;
21 const char *dev_id;
22 const char *con_id;
23 struct clk *clk;
24};
25
26struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,
27 const char *dev_fmt, ...);
28
29void clkdev_add(struct clk_lookup *cl);
30void clkdev_drop(struct clk_lookup *cl);
31
32void clkdev_add_table(struct clk_lookup *, size_t);
33int clk_add_alias(const char *, const char *, char *, struct device *);
34
35#endif
diff --git a/arch/sh/include/asm/clock.h b/arch/sh/include/asm/clock.h
index 11da4c5beb6..803d4c7f09d 100644
--- a/arch/sh/include/asm/clock.h
+++ b/arch/sh/include/asm/clock.h
@@ -1,171 +1,16 @@
1#ifndef __ASM_SH_CLOCK_H 1#ifndef __ASM_SH_CLOCK_H
2#define __ASM_SH_CLOCK_H 2#define __ASM_SH_CLOCK_H
3 3
4#include <linux/list.h> 4#include <linux/sh_clk.h>
5#include <linux/seq_file.h>
6#include <linux/cpufreq.h>
7#include <linux/clk.h>
8#include <linux/err.h>
9
10struct clk;
11
12struct clk_ops {
13 void (*init)(struct clk *clk);
14 int (*enable)(struct clk *clk);
15 void (*disable)(struct clk *clk);
16 unsigned long (*recalc)(struct clk *clk);
17 int (*set_rate)(struct clk *clk, unsigned long rate, int algo_id);
18 int (*set_parent)(struct clk *clk, struct clk *parent);
19 long (*round_rate)(struct clk *clk, unsigned long rate);
20};
21
22struct clk {
23 struct list_head node;
24 const char *name;
25 int id;
26 struct module *owner;
27
28 struct clk *parent;
29 struct clk_ops *ops;
30
31 struct list_head children;
32 struct list_head sibling; /* node for children */
33
34 int usecount;
35
36 unsigned long rate;
37 unsigned long flags;
38
39 void __iomem *enable_reg;
40 unsigned int enable_bit;
41
42 unsigned long arch_flags;
43 void *priv;
44 struct dentry *dentry;
45 struct cpufreq_frequency_table *freq_table;
46};
47
48struct clk_lookup {
49 struct list_head node;
50 const char *dev_id;
51 const char *con_id;
52 struct clk *clk;
53};
54
55#define CLK_ENABLE_ON_INIT (1 << 0)
56 5
57/* Should be defined by processor-specific code */ 6/* Should be defined by processor-specific code */
58void __deprecated arch_init_clk_ops(struct clk_ops **, int type); 7void __deprecated arch_init_clk_ops(struct clk_ops **, int type);
59int __init arch_clk_init(void); 8int __init arch_clk_init(void);
60 9
61/* arch/sh/kernel/cpu/clock.c */
62int clk_init(void);
63unsigned long followparent_recalc(struct clk *);
64void recalculate_root_clocks(void);
65void propagate_rate(struct clk *);
66int clk_reparent(struct clk *child, struct clk *parent);
67int clk_register(struct clk *);
68void clk_unregister(struct clk *);
69
70/* arch/sh/kernel/cpu/clock-cpg.c */ 10/* arch/sh/kernel/cpu/clock-cpg.c */
71int __init __deprecated cpg_clk_init(void); 11int __init __deprecated cpg_clk_init(void);
72 12
73/* the exported API, in addition to clk_set_rate */ 13/* arch/sh/kernel/cpu/clock.c */
74/** 14int clk_init(void);
75 * clk_set_rate_ex - set the clock rate for a clock source, with additional parameter
76 * @clk: clock source
77 * @rate: desired clock rate in Hz
78 * @algo_id: algorithm id to be passed down to ops->set_rate
79 *
80 * Returns success (0) or negative errno.
81 */
82int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id);
83
84enum clk_sh_algo_id {
85 NO_CHANGE = 0,
86
87 IUS_N1_N1,
88 IUS_322,
89 IUS_522,
90 IUS_N11,
91
92 SB_N1,
93
94 SB3_N1,
95 SB3_32,
96 SB3_43,
97 SB3_54,
98
99 BP_N1,
100
101 IP_N1,
102};
103
104struct clk_div_mult_table {
105 unsigned int *divisors;
106 unsigned int nr_divisors;
107 unsigned int *multipliers;
108 unsigned int nr_multipliers;
109};
110
111struct cpufreq_frequency_table;
112void clk_rate_table_build(struct clk *clk,
113 struct cpufreq_frequency_table *freq_table,
114 int nr_freqs,
115 struct clk_div_mult_table *src_table,
116 unsigned long *bitmap);
117
118long clk_rate_table_round(struct clk *clk,
119 struct cpufreq_frequency_table *freq_table,
120 unsigned long rate);
121
122int clk_rate_table_find(struct clk *clk,
123 struct cpufreq_frequency_table *freq_table,
124 unsigned long rate);
125
126#define SH_CLK_MSTP32(_name, _id, _parent, _enable_reg, \
127 _enable_bit, _flags) \
128{ \
129 .name = _name, \
130 .id = _id, \
131 .parent = _parent, \
132 .enable_reg = (void __iomem *)_enable_reg, \
133 .enable_bit = _enable_bit, \
134 .flags = _flags, \
135}
136
137int sh_clk_mstp32_register(struct clk *clks, int nr);
138
139#define SH_CLK_DIV4(_name, _parent, _reg, _shift, _div_bitmap, _flags) \
140{ \
141 .name = _name, \
142 .parent = _parent, \
143 .enable_reg = (void __iomem *)_reg, \
144 .enable_bit = _shift, \
145 .arch_flags = _div_bitmap, \
146 .flags = _flags, \
147}
148
149struct clk_div4_table {
150 struct clk_div_mult_table *div_mult_table;
151 void (*kick)(struct clk *clk);
152};
153
154int sh_clk_div4_register(struct clk *clks, int nr,
155 struct clk_div4_table *table);
156int sh_clk_div4_enable_register(struct clk *clks, int nr,
157 struct clk_div4_table *table);
158int sh_clk_div4_reparent_register(struct clk *clks, int nr,
159 struct clk_div4_table *table);
160
161#define SH_CLK_DIV6(_name, _parent, _reg, _flags) \
162{ \
163 .name = _name, \
164 .parent = _parent, \
165 .enable_reg = (void __iomem *)_reg, \
166 .flags = _flags, \
167}
168
169int sh_clk_div6_register(struct clk *clks, int nr);
170 15
171#endif /* __ASM_SH_CLOCK_H */ 16#endif /* __ASM_SH_CLOCK_H */
diff --git a/arch/sh/include/asm/dmaengine.h b/arch/sh/include/asm/dmaengine.h
index bf2f30cf0a2..2a02b611a9a 100644
--- a/arch/sh/include/asm/dmaengine.h
+++ b/arch/sh/include/asm/dmaengine.h
@@ -10,14 +10,9 @@
10#ifndef ASM_DMAENGINE_H 10#ifndef ASM_DMAENGINE_H
11#define ASM_DMAENGINE_H 11#define ASM_DMAENGINE_H
12 12
13#include <linux/dmaengine.h> 13#include <linux/sh_dma.h>
14#include <linux/list.h>
15 14
16#include <asm/dma-register.h> 15enum {
17
18#define SH_DMAC_MAX_CHANNELS 6
19
20enum sh_dmae_slave_chan_id {
21 SHDMA_SLAVE_SCIF0_TX, 16 SHDMA_SLAVE_SCIF0_TX,
22 SHDMA_SLAVE_SCIF0_RX, 17 SHDMA_SLAVE_SCIF0_RX,
23 SHDMA_SLAVE_SCIF1_TX, 18 SHDMA_SLAVE_SCIF1_TX,
@@ -34,60 +29,6 @@ enum sh_dmae_slave_chan_id {
34 SHDMA_SLAVE_SIUA_RX, 29 SHDMA_SLAVE_SIUA_RX,
35 SHDMA_SLAVE_SIUB_TX, 30 SHDMA_SLAVE_SIUB_TX,
36 SHDMA_SLAVE_SIUB_RX, 31 SHDMA_SLAVE_SIUB_RX,
37 SHDMA_SLAVE_NUMBER, /* Must stay last */
38};
39
40struct sh_dmae_slave_config {
41 enum sh_dmae_slave_chan_id slave_id;
42 dma_addr_t addr;
43 u32 chcr;
44 char mid_rid;
45};
46
47struct sh_dmae_channel {
48 unsigned int offset;
49 unsigned int dmars;
50 unsigned int dmars_bit;
51};
52
53struct sh_dmae_pdata {
54 struct sh_dmae_slave_config *slave;
55 int slave_num;
56 struct sh_dmae_channel *channel;
57 int channel_num;
58 unsigned int ts_low_shift;
59 unsigned int ts_low_mask;
60 unsigned int ts_high_shift;
61 unsigned int ts_high_mask;
62 unsigned int *ts_shift;
63 int ts_shift_num;
64 u16 dmaor_init;
65};
66
67struct device;
68
69/* Used by slave DMA clients to request DMA to/from a specific peripheral */
70struct sh_dmae_slave {
71 enum sh_dmae_slave_chan_id slave_id; /* Set by the platform */
72 struct device *dma_dev; /* Set by the platform */
73 struct sh_dmae_slave_config *config; /* Set by the driver */
74};
75
76struct sh_dmae_regs {
77 u32 sar; /* SAR / source address */
78 u32 dar; /* DAR / destination address */
79 u32 tcr; /* TCR / transfer count */
80};
81
82struct sh_desc {
83 struct sh_dmae_regs hw;
84 struct list_head node;
85 struct dma_async_tx_descriptor async_tx;
86 enum dma_data_direction direction;
87 dma_cookie_t cookie;
88 size_t partial;
89 int chunks;
90 int mark;
91}; 32};
92 33
93#endif 34#endif
diff --git a/arch/sh/include/asm/hw_breakpoint.h b/arch/sh/include/asm/hw_breakpoint.h
index e14cad96798..89890f61a7b 100644
--- a/arch/sh/include/asm/hw_breakpoint.h
+++ b/arch/sh/include/asm/hw_breakpoint.h
@@ -60,7 +60,6 @@ extern int hw_breakpoint_exceptions_notify(struct notifier_block *unused,
60int arch_install_hw_breakpoint(struct perf_event *bp); 60int arch_install_hw_breakpoint(struct perf_event *bp);
61void arch_uninstall_hw_breakpoint(struct perf_event *bp); 61void arch_uninstall_hw_breakpoint(struct perf_event *bp);
62void hw_breakpoint_pmu_read(struct perf_event *bp); 62void hw_breakpoint_pmu_read(struct perf_event *bp);
63void hw_breakpoint_pmu_unthrottle(struct perf_event *bp);
64 63
65extern void arch_fill_perf_breakpoint(struct perf_event *bp); 64extern void arch_fill_perf_breakpoint(struct perf_event *bp);
66extern int register_sh_ubc(struct sh_ubc *); 65extern int register_sh_ubc(struct sh_ubc *);
diff --git a/arch/sh/include/asm/hwblk.h b/arch/sh/include/asm/hwblk.h
index 5d3ccae4202..855e945c619 100644
--- a/arch/sh/include/asm/hwblk.h
+++ b/arch/sh/include/asm/hwblk.h
@@ -58,13 +58,11 @@ void hwblk_cnt_inc(struct hwblk_info *info, int hwblk, int cnt);
58void hwblk_cnt_dec(struct hwblk_info *info, int hwblk, int cnt); 58void hwblk_cnt_dec(struct hwblk_info *info, int hwblk, int cnt);
59 59
60/* allow clocks to enable and disable hardware blocks */ 60/* allow clocks to enable and disable hardware blocks */
61#define SH_HWBLK_CLK(_name, _id, _parent, _hwblk, _flags) \ 61#define SH_HWBLK_CLK(_hwblk, _parent, _flags) \
62{ \ 62[_hwblk] = { \
63 .name = _name, \ 63 .parent = _parent, \
64 .id = _id, \ 64 .arch_flags = _hwblk, \
65 .parent = _parent, \ 65 .flags = _flags, \
66 .arch_flags = _hwblk, \
67 .flags = _flags, \
68} 66}
69 67
70int sh_hwblk_clk_register(struct clk *clks, int nr); 68int sh_hwblk_clk_register(struct clk *clks, int nr);
diff --git a/arch/sh/include/asm/io_generic.h b/arch/sh/include/asm/io_generic.h
index 1e5d375f55d..491df93cbf8 100644
--- a/arch/sh/include/asm/io_generic.h
+++ b/arch/sh/include/asm/io_generic.h
@@ -38,5 +38,6 @@ void IO_CONCAT(__IO_PREFIX,iounmap)(void *addr);
38 38
39void __iomem *IO_CONCAT(__IO_PREFIX,ioport_map)(unsigned long addr, unsigned int size); 39void __iomem *IO_CONCAT(__IO_PREFIX,ioport_map)(unsigned long addr, unsigned int size);
40void IO_CONCAT(__IO_PREFIX,ioport_unmap)(void __iomem *addr); 40void IO_CONCAT(__IO_PREFIX,ioport_unmap)(void __iomem *addr);
41void IO_CONCAT(__IO_PREFIX,mem_init)(void);
41 42
42#undef __IO_PREFIX 43#undef __IO_PREFIX
diff --git a/arch/sh/include/asm/irq.h b/arch/sh/include/asm/irq.h
index df8e1500527..02c2f0102cf 100644
--- a/arch/sh/include/asm/irq.h
+++ b/arch/sh/include/asm/irq.h
@@ -1,6 +1,7 @@
1#ifndef __ASM_SH_IRQ_H 1#ifndef __ASM_SH_IRQ_H
2#define __ASM_SH_IRQ_H 2#define __ASM_SH_IRQ_H
3 3
4#include <linux/cpumask.h>
4#include <asm/machvec.h> 5#include <asm/machvec.h>
5 6
6/* 7/*
@@ -12,6 +13,14 @@
12#define NR_IRQS_LEGACY 8 /* Legacy external IRQ0-7 */ 13#define NR_IRQS_LEGACY 8 /* Legacy external IRQ0-7 */
13 14
14/* 15/*
16 * This is a special IRQ number for indicating that no IRQ has been
17 * triggered and to simply ignore the IRQ dispatch. This is a special
18 * case that can happen with IRQ auto-distribution when multiple CPUs
19 * are woken up and signalled in parallel.
20 */
21#define NO_IRQ_IGNORE ((unsigned int)-1)
22
23/*
15 * Convert back and forth between INTEVT and IRQ values. 24 * Convert back and forth between INTEVT and IRQ values.
16 */ 25 */
17#ifdef CONFIG_CPU_HAS_INTEVT 26#ifdef CONFIG_CPU_HAS_INTEVT
@@ -42,6 +51,8 @@ static inline int generic_irq_demux(int irq)
42#define irq_demux(irq) sh_mv.mv_irq_demux(irq) 51#define irq_demux(irq) sh_mv.mv_irq_demux(irq)
43 52
44void init_IRQ(void); 53void init_IRQ(void);
54void migrate_irqs(void);
55
45asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs); 56asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs);
46 57
47#ifdef CONFIG_IRQSTACKS 58#ifdef CONFIG_IRQSTACKS
@@ -53,6 +64,14 @@ extern void irq_ctx_exit(int cpu);
53# define irq_ctx_exit(cpu) do { } while (0) 64# define irq_ctx_exit(cpu) do { } while (0)
54#endif 65#endif
55 66
67#ifdef CONFIG_INTC_BALANCING
68extern unsigned int irq_lookup(unsigned int irq);
69extern void irq_finish(unsigned int irq);
70#else
71#define irq_lookup(irq) (irq)
72#define irq_finish(irq) do { } while (0)
73#endif
74
56#include <asm-generic/irq.h> 75#include <asm-generic/irq.h>
57#ifdef CONFIG_CPU_SH5 76#ifdef CONFIG_CPU_SH5
58#include <cpu/irq.h> 77#include <cpu/irq.h>
diff --git a/arch/sh/include/asm/kexec.h b/arch/sh/include/asm/kexec.h
index 765a5e1660f..ad6ef8a275e 100644
--- a/arch/sh/include/asm/kexec.h
+++ b/arch/sh/include/asm/kexec.h
@@ -26,6 +26,10 @@
26/* The native architecture */ 26/* The native architecture */
27#define KEXEC_ARCH KEXEC_ARCH_SH 27#define KEXEC_ARCH KEXEC_ARCH_SH
28 28
29#ifdef CONFIG_KEXEC
30/* arch/sh/kernel/machine_kexec.c */
31void reserve_crashkernel(void);
32
29static inline void crash_setup_regs(struct pt_regs *newregs, 33static inline void crash_setup_regs(struct pt_regs *newregs,
30 struct pt_regs *oldregs) 34 struct pt_regs *oldregs)
31{ 35{
@@ -59,4 +63,8 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
59 newregs->pc = (unsigned long)current_text_addr(); 63 newregs->pc = (unsigned long)current_text_addr();
60 } 64 }
61} 65}
66#else
67static inline void reserve_crashkernel(void) { }
68#endif /* CONFIG_KEXEC */
69
62#endif /* __ASM_SH_KEXEC_H */ 70#endif /* __ASM_SH_KEXEC_H */
diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h
index 9c30955630f..bc0218cb72e 100644
--- a/arch/sh/include/asm/machvec.h
+++ b/arch/sh/include/asm/machvec.h
@@ -49,6 +49,8 @@ struct sh_machine_vector {
49 49
50 int (*mv_clk_init)(void); 50 int (*mv_clk_init)(void);
51 int (*mv_mode_pins)(void); 51 int (*mv_mode_pins)(void);
52
53 void (*mv_mem_init)(void);
52}; 54};
53 55
54extern struct sh_machine_vector sh_mv; 56extern struct sh_machine_vector sh_mv;
diff --git a/arch/sh/include/asm/mmzone.h b/arch/sh/include/asm/mmzone.h
index 7f5363b29ba..8887baff5ef 100644
--- a/arch/sh/include/asm/mmzone.h
+++ b/arch/sh/include/asm/mmzone.h
@@ -42,9 +42,10 @@ setup_bootmem_node(int nid, unsigned long start, unsigned long end)
42void __init plat_mem_setup(void); 42void __init plat_mem_setup(void);
43 43
44/* arch/sh/kernel/setup.c */ 44/* arch/sh/kernel/setup.c */
45void __init setup_bootmem_allocator(unsigned long start_pfn);
46void __init __add_active_range(unsigned int nid, unsigned long start_pfn, 45void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
47 unsigned long end_pfn); 46 unsigned long end_pfn);
47/* arch/sh/mm/init.c */
48void __init allocate_pgdat(unsigned int nid);
48 49
49#endif /* __KERNEL__ */ 50#endif /* __KERNEL__ */
50#endif /* __ASM_SH_MMZONE_H */ 51#endif /* __ASM_SH_MMZONE_H */
diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h
index d71feb35930..fb703d120d0 100644
--- a/arch/sh/include/asm/page.h
+++ b/arch/sh/include/asm/page.h
@@ -49,7 +49,7 @@
49 49
50extern unsigned long shm_align_mask; 50extern unsigned long shm_align_mask;
51extern unsigned long max_low_pfn, min_low_pfn; 51extern unsigned long max_low_pfn, min_low_pfn;
52extern unsigned long memory_start, memory_end; 52extern unsigned long memory_start, memory_end, memory_limit;
53 53
54static inline unsigned long 54static inline unsigned long
55pages_do_alias(unsigned long addr1, unsigned long addr2) 55pages_do_alias(unsigned long addr1, unsigned long addr2)
@@ -128,13 +128,18 @@ typedef struct page *pgtable_t;
128 * added or subtracted as required. 128 * added or subtracted as required.
129 */ 129 */
130#ifdef CONFIG_PMB 130#ifdef CONFIG_PMB
131#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET+__MEMORY_START) 131#define ___pa(x) ((x)-PAGE_OFFSET+__MEMORY_START)
132#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET-__MEMORY_START)) 132#define ___va(x) ((x)+PAGE_OFFSET-__MEMORY_START)
133#else 133#else
134#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) 134#define ___pa(x) ((x)-PAGE_OFFSET)
135#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) 135#define ___va(x) ((x)+PAGE_OFFSET)
136#endif 136#endif
137 137
138#ifndef __ASSEMBLY__
139#define __pa(x) ___pa((unsigned long)x)
140#define __va(x) (void *)___va((unsigned long)x)
141#endif /* !__ASSEMBLY__ */
142
138#ifdef CONFIG_UNCACHED_MAPPING 143#ifdef CONFIG_UNCACHED_MAPPING
139#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + uncached_start) 144#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + uncached_start)
140#define CAC_ADDR(addr) ((addr) - uncached_start + PAGE_OFFSET) 145#define CAC_ADDR(addr) ((addr) - uncached_start + PAGE_OFFSET)
diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h
index 9605e062840..0a58cb25a65 100644
--- a/arch/sh/include/asm/processor.h
+++ b/arch/sh/include/asm/processor.h
@@ -85,6 +85,10 @@ struct sh_cpuinfo {
85 struct tlb_info itlb; 85 struct tlb_info itlb;
86 struct tlb_info dtlb; 86 struct tlb_info dtlb;
87 87
88#ifdef CONFIG_SMP
89 struct task_struct *idle;
90#endif
91
88 unsigned long flags; 92 unsigned long flags;
89} __attribute__ ((aligned(L1_CACHE_BYTES))); 93} __attribute__ ((aligned(L1_CACHE_BYTES)));
90 94
@@ -102,6 +106,9 @@ struct task_struct;
102 106
103extern struct pt_regs fake_swapper_regs; 107extern struct pt_regs fake_swapper_regs;
104 108
109extern void cpu_init(void);
110extern void cpu_probe(void);
111
105/* arch/sh/kernel/process.c */ 112/* arch/sh/kernel/process.c */
106extern unsigned int xstate_size; 113extern unsigned int xstate_size;
107extern void free_thread_xstate(struct task_struct *); 114extern void free_thread_xstate(struct task_struct *);
diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h
index 572b4eb0949..61a445d2d02 100644
--- a/arch/sh/include/asm/processor_32.h
+++ b/arch/sh/include/asm/processor_32.h
@@ -27,8 +27,6 @@
27#define CCN_CVR 0xff000040 27#define CCN_CVR 0xff000040
28#define CCN_PRR 0xff000044 28#define CCN_PRR 0xff000044
29 29
30asmlinkage void __init sh_cpu_init(void);
31
32/* 30/*
33 * User space process size: 2GB. 31 * User space process size: 2GB.
34 * 32 *
diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h
index 4758325bb24..01fa17a3d75 100644
--- a/arch/sh/include/asm/setup.h
+++ b/arch/sh/include/asm/setup.h
@@ -19,6 +19,7 @@
19#define COMMAND_LINE ((char *) (PARAM+0x100)) 19#define COMMAND_LINE ((char *) (PARAM+0x100))
20 20
21void sh_mv_setup(void); 21void sh_mv_setup(void);
22void check_for_initrd(void);
22 23
23#endif /* __KERNEL__ */ 24#endif /* __KERNEL__ */
24 25
diff --git a/arch/sh/include/asm/siu.h b/arch/sh/include/asm/siu.h
index f1b1e6944a5..e8d4142baf5 100644
--- a/arch/sh/include/asm/siu.h
+++ b/arch/sh/include/asm/siu.h
@@ -17,10 +17,10 @@ struct device;
17 17
18struct siu_platform { 18struct siu_platform {
19 struct device *dma_dev; 19 struct device *dma_dev;
20 enum sh_dmae_slave_chan_id dma_slave_tx_a; 20 unsigned int dma_slave_tx_a;
21 enum sh_dmae_slave_chan_id dma_slave_rx_a; 21 unsigned int dma_slave_rx_a;
22 enum sh_dmae_slave_chan_id dma_slave_tx_b; 22 unsigned int dma_slave_tx_b;
23 enum sh_dmae_slave_chan_id dma_slave_rx_b; 23 unsigned int dma_slave_rx_b;
24}; 24};
25 25
26#endif /* ASM_SIU_H */ 26#endif /* ASM_SIU_H */
diff --git a/arch/sh/include/asm/smp-ops.h b/arch/sh/include/asm/smp-ops.h
new file mode 100644
index 00000000000..c590f76856f
--- /dev/null
+++ b/arch/sh/include/asm/smp-ops.h
@@ -0,0 +1,51 @@
1#ifndef __ASM_SH_SMP_OPS_H
2#define __ASM_SH_SMP_OPS_H
3
4struct plat_smp_ops {
5 void (*smp_setup)(void);
6 unsigned int (*smp_processor_id)(void);
7 void (*prepare_cpus)(unsigned int max_cpus);
8 void (*start_cpu)(unsigned int cpu, unsigned long entry_point);
9 void (*send_ipi)(unsigned int cpu, unsigned int message);
10 int (*cpu_disable)(unsigned int cpu);
11 void (*cpu_die)(unsigned int cpu);
12 void (*play_dead)(void);
13};
14
15extern struct plat_smp_ops *mp_ops;
16extern struct plat_smp_ops shx3_smp_ops;
17
18#ifdef CONFIG_SMP
19
20static inline void plat_smp_setup(void)
21{
22 BUG_ON(!mp_ops);
23 mp_ops->smp_setup();
24}
25
26static inline void play_dead(void)
27{
28 mp_ops->play_dead();
29}
30
31extern void register_smp_ops(struct plat_smp_ops *ops);
32
33#else
34
35static inline void plat_smp_setup(void)
36{
37 /* UP, nothing to do ... */
38}
39
40static inline void register_smp_ops(struct plat_smp_ops *ops)
41{
42}
43
44static inline void play_dead(void)
45{
46 BUG();
47}
48
49#endif /* CONFIG_SMP */
50
51#endif /* __ASM_SH_SMP_OPS_H */
diff --git a/arch/sh/include/asm/smp.h b/arch/sh/include/asm/smp.h
index 53ef26ced75..9070d943ddd 100644
--- a/arch/sh/include/asm/smp.h
+++ b/arch/sh/include/asm/smp.h
@@ -3,15 +3,16 @@
3 3
4#include <linux/bitops.h> 4#include <linux/bitops.h>
5#include <linux/cpumask.h> 5#include <linux/cpumask.h>
6#include <asm/smp-ops.h>
6 7
7#ifdef CONFIG_SMP 8#ifdef CONFIG_SMP
8 9
9#include <linux/spinlock.h> 10#include <linux/spinlock.h>
10#include <asm/atomic.h> 11#include <asm/atomic.h>
11#include <asm/current.h> 12#include <asm/current.h>
13#include <asm/percpu.h>
12 14
13#define raw_smp_processor_id() (current_thread_info()->cpu) 15#define raw_smp_processor_id() (current_thread_info()->cpu)
14#define hard_smp_processor_id() plat_smp_processor_id()
15 16
16/* Map from cpu id to sequential logical cpu number. */ 17/* Map from cpu id to sequential logical cpu number. */
17extern int __cpu_number_map[NR_CPUS]; 18extern int __cpu_number_map[NR_CPUS];
@@ -30,20 +31,43 @@ enum {
30 SMP_MSG_NR, /* must be last */ 31 SMP_MSG_NR, /* must be last */
31}; 32};
32 33
34DECLARE_PER_CPU(int, cpu_state);
35
33void smp_message_recv(unsigned int msg); 36void smp_message_recv(unsigned int msg);
34void smp_timer_broadcast(const struct cpumask *mask); 37void smp_timer_broadcast(const struct cpumask *mask);
35 38
36void local_timer_interrupt(void); 39void local_timer_interrupt(void);
37void local_timer_setup(unsigned int cpu); 40void local_timer_setup(unsigned int cpu);
38 41void local_timer_stop(unsigned int cpu);
39void plat_smp_setup(void);
40void plat_prepare_cpus(unsigned int max_cpus);
41int plat_smp_processor_id(void);
42void plat_start_cpu(unsigned int cpu, unsigned long entry_point);
43void plat_send_ipi(unsigned int cpu, unsigned int message);
44 42
45void arch_send_call_function_single_ipi(int cpu); 43void arch_send_call_function_single_ipi(int cpu);
46extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); 44void arch_send_call_function_ipi_mask(const struct cpumask *mask);
45
46void native_play_dead(void);
47void native_cpu_die(unsigned int cpu);
48int native_cpu_disable(unsigned int cpu);
49
50#ifdef CONFIG_HOTPLUG_CPU
51void play_dead_common(void);
52extern int __cpu_disable(void);
53
54static inline void __cpu_die(unsigned int cpu)
55{
56 extern struct plat_smp_ops *mp_ops; /* private */
57
58 mp_ops->cpu_die(cpu);
59}
60#endif
61
62static inline int hard_smp_processor_id(void)
63{
64 extern struct plat_smp_ops *mp_ops; /* private */
65
66 if (!mp_ops)
67 return 0; /* boot CPU */
68
69 return mp_ops->smp_processor_id();
70}
47 71
48#else 72#else
49 73
diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h
index de235953399..9a6125eb007 100644
--- a/arch/sh/include/cpu-sh4/cpu/dma-register.h
+++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h
@@ -23,7 +23,8 @@
23#define CHCR_TS_HIGH_MASK 0 23#define CHCR_TS_HIGH_MASK 0
24#define CHCR_TS_HIGH_SHIFT 0 24#define CHCR_TS_HIGH_SHIFT 0
25#elif defined(CONFIG_CPU_SUBTYPE_SH7722) || \ 25#elif defined(CONFIG_CPU_SUBTYPE_SH7722) || \
26 defined(CONFIG_CPU_SUBTYPE_SH7724) 26 defined(CONFIG_CPU_SUBTYPE_SH7724) || \
27 defined(CONFIG_CPU_SUBTYPE_SH7786)
27#define CHCR_TS_LOW_MASK 0x00000018 28#define CHCR_TS_LOW_MASK 0x00000018
28#define CHCR_TS_LOW_SHIFT 3 29#define CHCR_TS_LOW_SHIFT 3
29#define CHCR_TS_HIGH_MASK 0x00300000 30#define CHCR_TS_HIGH_MASK 0x00300000
diff --git a/arch/sh/include/cpu-sh4/cpu/mmu_context.h b/arch/sh/include/cpu-sh4/cpu/mmu_context.h
index 5963124c1d4..e46ec708105 100644
--- a/arch/sh/include/cpu-sh4/cpu/mmu_context.h
+++ b/arch/sh/include/cpu-sh4/cpu/mmu_context.h
@@ -19,13 +19,26 @@
19 19
20#define MMUCR 0xFF000010 /* MMU Control Register */ 20#define MMUCR 0xFF000010 /* MMU Control Register */
21 21
22#define MMU_TLB_ENTRY_SHIFT 8
23
22#define MMU_ITLB_ADDRESS_ARRAY 0xF2000000 24#define MMU_ITLB_ADDRESS_ARRAY 0xF2000000
23#define MMU_ITLB_ADDRESS_ARRAY2 0xF2800000 25#define MMU_ITLB_ADDRESS_ARRAY2 0xF2800000
26#define MMU_ITLB_DATA_ARRAY 0xF3000000
27#define MMU_ITLB_DATA_ARRAY2 0xF3800000
28
24#define MMU_UTLB_ADDRESS_ARRAY 0xF6000000 29#define MMU_UTLB_ADDRESS_ARRAY 0xF6000000
25#define MMU_UTLB_ADDRESS_ARRAY2 0xF6800000 30#define MMU_UTLB_ADDRESS_ARRAY2 0xF6800000
31#define MMU_UTLB_DATA_ARRAY 0xF7000000
32#define MMU_UTLB_DATA_ARRAY2 0xF7800000
26#define MMU_PAGE_ASSOC_BIT 0x80 33#define MMU_PAGE_ASSOC_BIT 0x80
27 34
28#define MMUCR_TI (1<<2) 35#ifdef CONFIG_MMU
36#define MMUCR_AT (1 << 0)
37#else
38#define MMUCR_AT (0)
39#endif
40
41#define MMUCR_TI (1 << 2)
29 42
30#define MMUCR_URB 0x00FC0000 43#define MMUCR_URB 0x00FC0000
31#define MMUCR_URB_SHIFT 18 44#define MMUCR_URB_SHIFT 18
@@ -58,7 +71,8 @@
58#endif 71#endif
59 72
60#define MMU_NTLB_ENTRIES 64 73#define MMU_NTLB_ENTRIES 64
61#define MMU_CONTROL_INIT (0x05|MMUCR_SQMD|MMUCR_ME|MMUCR_SE|MMUCR_AEX) 74#define MMU_CONTROL_INIT (MMUCR_AT | MMUCR_TI | MMUCR_SQMD | \
75 MMUCR_ME | MMUCR_SE | MMUCR_AEX)
62 76
63#define TRA 0xff000020 77#define TRA 0xff000020
64#define EXPEVT 0xff000024 78#define EXPEVT 0xff000024
diff --git a/arch/sh/include/mach-sdk7786/mach/fpga.h b/arch/sh/include/mach-sdk7786/mach/fpga.h
index 2120d67dec7..416b621d94d 100644
--- a/arch/sh/include/mach-sdk7786/mach/fpga.h
+++ b/arch/sh/include/mach-sdk7786/mach/fpga.h
@@ -42,6 +42,15 @@
42#define SCBR_I2CCEN BIT(1) /* CPU I2C master enable */ 42#define SCBR_I2CCEN BIT(1) /* CPU I2C master enable */
43 43
44#define PWRCR 0x1a0 44#define PWRCR 0x1a0
45#define PWRCR_SCISEL0 BIT(0)
46#define PWRCR_SCISEL1 BIT(1)
47#define PWRCR_SCIEN BIT(2) /* Serial port enable */
48#define PWRCR_PDWNACK BIT(5) /* Power down acknowledge */
49#define PWRCR_PDWNREQ BIT(7) /* Power down request */
50#define PWRCR_INT2 BIT(11) /* INT2 connection to power manager */
51#define PWRCR_BUPINIT BIT(13) /* DDR backup initialize */
52#define PWRCR_BKPRST BIT(15) /* Backup power reset */
53
45#define SPCBR 0x1b0 54#define SPCBR 0x1b0
46#define SPICR 0x1c0 55#define SPICR 0x1c0
47#define SPIDR 0x1d0 56#define SPIDR 0x1d0
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index 02fd3ae8b0e..650b92f00ee 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -11,7 +11,7 @@ endif
11 11
12CFLAGS_REMOVE_return_address.o = -pg 12CFLAGS_REMOVE_return_address.o = -pg
13 13
14obj-y := debugtraps.o dma-nommu.o dumpstack.o \ 14obj-y := clkdev.o debugtraps.o dma-nommu.o dumpstack.o \
15 idle.o io.o io_generic.o irq.o \ 15 idle.o io.o io_generic.o irq.o \
16 irq_$(BITS).o machvec.o nmi_debug.o process.o \ 16 irq_$(BITS).o machvec.o nmi_debug.o process.o \
17 process_$(BITS).o ptrace_$(BITS).o \ 17 process_$(BITS).o ptrace_$(BITS).o \
diff --git a/arch/sh/kernel/clkdev.c b/arch/sh/kernel/clkdev.c
new file mode 100644
index 00000000000..defdd6e3090
--- /dev/null
+++ b/arch/sh/kernel/clkdev.c
@@ -0,0 +1,169 @@
1/*
2 * arch/sh/kernel/clkdev.c
3 *
4 * Cloned from arch/arm/common/clkdev.c:
5 *
6 * Copyright (C) 2008 Russell King.
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 * Helper for the clk API to assist looking up a struct clk.
13 */
14#include <linux/module.h>
15#include <linux/kernel.h>
16#include <linux/device.h>
17#include <linux/list.h>
18#include <linux/errno.h>
19#include <linux/err.h>
20#include <linux/string.h>
21#include <linux/mutex.h>
22#include <linux/clk.h>
23#include <linux/slab.h>
24#include <linux/bootmem.h>
25#include <linux/mm.h>
26#include <asm/clock.h>
27#include <asm/clkdev.h>
28
29static LIST_HEAD(clocks);
30static DEFINE_MUTEX(clocks_mutex);
31
32/*
33 * Find the correct struct clk for the device and connection ID.
34 * We do slightly fuzzy matching here:
35 * An entry with a NULL ID is assumed to be a wildcard.
36 * If an entry has a device ID, it must match
37 * If an entry has a connection ID, it must match
38 * Then we take the most specific entry - with the following
39 * order of precidence: dev+con > dev only > con only.
40 */
41static struct clk *clk_find(const char *dev_id, const char *con_id)
42{
43 struct clk_lookup *p;
44 struct clk *clk = NULL;
45 int match, best = 0;
46
47 list_for_each_entry(p, &clocks, node) {
48 match = 0;
49 if (p->dev_id) {
50 if (!dev_id || strcmp(p->dev_id, dev_id))
51 continue;
52 match += 2;
53 }
54 if (p->con_id) {
55 if (!con_id || strcmp(p->con_id, con_id))
56 continue;
57 match += 1;
58 }
59 if (match == 0)
60 continue;
61
62 if (match > best) {
63 clk = p->clk;
64 best = match;
65 }
66 }
67 return clk;
68}
69
70struct clk *clk_get_sys(const char *dev_id, const char *con_id)
71{
72 struct clk *clk;
73
74 mutex_lock(&clocks_mutex);
75 clk = clk_find(dev_id, con_id);
76 mutex_unlock(&clocks_mutex);
77
78 return clk ? clk : ERR_PTR(-ENOENT);
79}
80EXPORT_SYMBOL(clk_get_sys);
81
82void clkdev_add(struct clk_lookup *cl)
83{
84 mutex_lock(&clocks_mutex);
85 list_add_tail(&cl->node, &clocks);
86 mutex_unlock(&clocks_mutex);
87}
88EXPORT_SYMBOL(clkdev_add);
89
90void __init clkdev_add_table(struct clk_lookup *cl, size_t num)
91{
92 mutex_lock(&clocks_mutex);
93 while (num--) {
94 list_add_tail(&cl->node, &clocks);
95 cl++;
96 }
97 mutex_unlock(&clocks_mutex);
98}
99
100#define MAX_DEV_ID 20
101#define MAX_CON_ID 16
102
103struct clk_lookup_alloc {
104 struct clk_lookup cl;
105 char dev_id[MAX_DEV_ID];
106 char con_id[MAX_CON_ID];
107};
108
109struct clk_lookup * __init_refok
110clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...)
111{
112 struct clk_lookup_alloc *cla;
113
114 if (!slab_is_available())
115 cla = alloc_bootmem_low_pages(sizeof(*cla));
116 else
117 cla = kzalloc(sizeof(*cla), GFP_KERNEL);
118
119 if (!cla)
120 return NULL;
121
122 cla->cl.clk = clk;
123 if (con_id) {
124 strlcpy(cla->con_id, con_id, sizeof(cla->con_id));
125 cla->cl.con_id = cla->con_id;
126 }
127
128 if (dev_fmt) {
129 va_list ap;
130
131 va_start(ap, dev_fmt);
132 vscnprintf(cla->dev_id, sizeof(cla->dev_id), dev_fmt, ap);
133 cla->cl.dev_id = cla->dev_id;
134 va_end(ap);
135 }
136
137 return &cla->cl;
138}
139EXPORT_SYMBOL(clkdev_alloc);
140
141int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
142 struct device *dev)
143{
144 struct clk *r = clk_get(dev, id);
145 struct clk_lookup *l;
146
147 if (IS_ERR(r))
148 return PTR_ERR(r);
149
150 l = clkdev_alloc(r, alias, alias_dev_name);
151 clk_put(r);
152 if (!l)
153 return -ENODEV;
154 clkdev_add(l);
155 return 0;
156}
157EXPORT_SYMBOL(clk_add_alias);
158
159/*
160 * clkdev_drop - remove a clock dynamically allocated
161 */
162void clkdev_drop(struct clk_lookup *cl)
163{
164 mutex_lock(&clocks_mutex);
165 list_del(&cl->node);
166 mutex_unlock(&clocks_mutex);
167 kfree(cl);
168}
169EXPORT_SYMBOL(clkdev_drop);
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile
index 0e48bc61c27..4edcb60a135 100644
--- a/arch/sh/kernel/cpu/Makefile
+++ b/arch/sh/kernel/cpu/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_ARCH_SHMOBILE) += shmobile/
16# Common interfaces. 16# Common interfaces.
17 17
18obj-$(CONFIG_SH_ADC) += adc.o 18obj-$(CONFIG_SH_ADC) += adc.o
19obj-$(CONFIG_SH_CLK_CPG) += clock-cpg.o 19obj-$(CONFIG_SH_CLK_CPG_LEGACY) += clock-cpg.o
20obj-$(CONFIG_SH_FPU) += fpu.o 20obj-$(CONFIG_SH_FPU) += fpu.o
21obj-$(CONFIG_SH_FPU_EMU) += fpu.o 21obj-$(CONFIG_SH_FPU_EMU) += fpu.o
22 22
diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c
index eed5eaff96b..e2f63d68da5 100644
--- a/arch/sh/kernel/cpu/clock-cpg.c
+++ b/arch/sh/kernel/cpu/clock-cpg.c
@@ -2,317 +2,25 @@
2#include <linux/compiler.h> 2#include <linux/compiler.h>
3#include <linux/slab.h> 3#include <linux/slab.h>
4#include <linux/io.h> 4#include <linux/io.h>
5#include <asm/clkdev.h>
5#include <asm/clock.h> 6#include <asm/clock.h>
6 7
7static int sh_clk_mstp32_enable(struct clk *clk)
8{
9 __raw_writel(__raw_readl(clk->enable_reg) & ~(1 << clk->enable_bit),
10 clk->enable_reg);
11 return 0;
12}
13
14static void sh_clk_mstp32_disable(struct clk *clk)
15{
16 __raw_writel(__raw_readl(clk->enable_reg) | (1 << clk->enable_bit),
17 clk->enable_reg);
18}
19
20static struct clk_ops sh_clk_mstp32_clk_ops = {
21 .enable = sh_clk_mstp32_enable,
22 .disable = sh_clk_mstp32_disable,
23 .recalc = followparent_recalc,
24};
25
26int __init sh_clk_mstp32_register(struct clk *clks, int nr)
27{
28 struct clk *clkp;
29 int ret = 0;
30 int k;
31
32 for (k = 0; !ret && (k < nr); k++) {
33 clkp = clks + k;
34 clkp->ops = &sh_clk_mstp32_clk_ops;
35 ret |= clk_register(clkp);
36 }
37
38 return ret;
39}
40
41static long sh_clk_div_round_rate(struct clk *clk, unsigned long rate)
42{
43 return clk_rate_table_round(clk, clk->freq_table, rate);
44}
45
46static int sh_clk_div6_divisors[64] = {
47 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
48 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
49 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
50 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64
51};
52
53static struct clk_div_mult_table sh_clk_div6_table = {
54 .divisors = sh_clk_div6_divisors,
55 .nr_divisors = ARRAY_SIZE(sh_clk_div6_divisors),
56};
57
58static unsigned long sh_clk_div6_recalc(struct clk *clk)
59{
60 struct clk_div_mult_table *table = &sh_clk_div6_table;
61 unsigned int idx;
62
63 clk_rate_table_build(clk, clk->freq_table, table->nr_divisors,
64 table, NULL);
65
66 idx = __raw_readl(clk->enable_reg) & 0x003f;
67
68 return clk->freq_table[idx].frequency;
69}
70
71static int sh_clk_div6_set_rate(struct clk *clk,
72 unsigned long rate, int algo_id)
73{
74 unsigned long value;
75 int idx;
76
77 idx = clk_rate_table_find(clk, clk->freq_table, rate);
78 if (idx < 0)
79 return idx;
80
81 value = __raw_readl(clk->enable_reg);
82 value &= ~0x3f;
83 value |= idx;
84 __raw_writel(value, clk->enable_reg);
85 return 0;
86}
87
88static int sh_clk_div6_enable(struct clk *clk)
89{
90 unsigned long value;
91 int ret;
92
93 ret = sh_clk_div6_set_rate(clk, clk->rate, 0);
94 if (ret == 0) {
95 value = __raw_readl(clk->enable_reg);
96 value &= ~0x100; /* clear stop bit to enable clock */
97 __raw_writel(value, clk->enable_reg);
98 }
99 return ret;
100}
101
102static void sh_clk_div6_disable(struct clk *clk)
103{
104 unsigned long value;
105
106 value = __raw_readl(clk->enable_reg);
107 value |= 0x100; /* stop clock */
108 value |= 0x3f; /* VDIV bits must be non-zero, overwrite divider */
109 __raw_writel(value, clk->enable_reg);
110}
111
112static struct clk_ops sh_clk_div6_clk_ops = {
113 .recalc = sh_clk_div6_recalc,
114 .round_rate = sh_clk_div_round_rate,
115 .set_rate = sh_clk_div6_set_rate,
116 .enable = sh_clk_div6_enable,
117 .disable = sh_clk_div6_disable,
118};
119
120int __init sh_clk_div6_register(struct clk *clks, int nr)
121{
122 struct clk *clkp;
123 void *freq_table;
124 int nr_divs = sh_clk_div6_table.nr_divisors;
125 int freq_table_size = sizeof(struct cpufreq_frequency_table);
126 int ret = 0;
127 int k;
128
129 freq_table_size *= (nr_divs + 1);
130 freq_table = kzalloc(freq_table_size * nr, GFP_KERNEL);
131 if (!freq_table) {
132 pr_err("sh_clk_div6_register: unable to alloc memory\n");
133 return -ENOMEM;
134 }
135
136 for (k = 0; !ret && (k < nr); k++) {
137 clkp = clks + k;
138
139 clkp->ops = &sh_clk_div6_clk_ops;
140 clkp->id = -1;
141 clkp->freq_table = freq_table + (k * freq_table_size);
142 clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END;
143
144 ret = clk_register(clkp);
145 }
146
147 return ret;
148}
149
150static unsigned long sh_clk_div4_recalc(struct clk *clk)
151{
152 struct clk_div4_table *d4t = clk->priv;
153 struct clk_div_mult_table *table = d4t->div_mult_table;
154 unsigned int idx;
155
156 clk_rate_table_build(clk, clk->freq_table, table->nr_divisors,
157 table, &clk->arch_flags);
158
159 idx = (__raw_readl(clk->enable_reg) >> clk->enable_bit) & 0x000f;
160
161 return clk->freq_table[idx].frequency;
162}
163
164static int sh_clk_div4_set_parent(struct clk *clk, struct clk *parent)
165{
166 struct clk_div4_table *d4t = clk->priv;
167 struct clk_div_mult_table *table = d4t->div_mult_table;
168 u32 value;
169 int ret;
170
171 if (!strcmp("pll_clk", parent->name))
172 value = __raw_readl(clk->enable_reg) & ~(1 << 7);
173 else
174 value = __raw_readl(clk->enable_reg) | (1 << 7);
175
176 ret = clk_reparent(clk, parent);
177 if (ret < 0)
178 return ret;
179
180 __raw_writel(value, clk->enable_reg);
181
182 /* Rebiuld the frequency table */
183 clk_rate_table_build(clk, clk->freq_table, table->nr_divisors,
184 table, &clk->arch_flags);
185
186 return 0;
187}
188
189static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate, int algo_id)
190{
191 struct clk_div4_table *d4t = clk->priv;
192 unsigned long value;
193 int idx = clk_rate_table_find(clk, clk->freq_table, rate);
194 if (idx < 0)
195 return idx;
196
197 value = __raw_readl(clk->enable_reg);
198 value &= ~(0xf << clk->enable_bit);
199 value |= (idx << clk->enable_bit);
200 __raw_writel(value, clk->enable_reg);
201
202 if (d4t->kick)
203 d4t->kick(clk);
204
205 return 0;
206}
207
208static int sh_clk_div4_enable(struct clk *clk)
209{
210 __raw_writel(__raw_readl(clk->enable_reg) & ~(1 << 8), clk->enable_reg);
211 return 0;
212}
213
214static void sh_clk_div4_disable(struct clk *clk)
215{
216 __raw_writel(__raw_readl(clk->enable_reg) | (1 << 8), clk->enable_reg);
217}
218
219static struct clk_ops sh_clk_div4_clk_ops = {
220 .recalc = sh_clk_div4_recalc,
221 .set_rate = sh_clk_div4_set_rate,
222 .round_rate = sh_clk_div_round_rate,
223};
224
225static struct clk_ops sh_clk_div4_enable_clk_ops = {
226 .recalc = sh_clk_div4_recalc,
227 .set_rate = sh_clk_div4_set_rate,
228 .round_rate = sh_clk_div_round_rate,
229 .enable = sh_clk_div4_enable,
230 .disable = sh_clk_div4_disable,
231};
232
233static struct clk_ops sh_clk_div4_reparent_clk_ops = {
234 .recalc = sh_clk_div4_recalc,
235 .set_rate = sh_clk_div4_set_rate,
236 .round_rate = sh_clk_div_round_rate,
237 .enable = sh_clk_div4_enable,
238 .disable = sh_clk_div4_disable,
239 .set_parent = sh_clk_div4_set_parent,
240};
241
242static int __init sh_clk_div4_register_ops(struct clk *clks, int nr,
243 struct clk_div4_table *table, struct clk_ops *ops)
244{
245 struct clk *clkp;
246 void *freq_table;
247 int nr_divs = table->div_mult_table->nr_divisors;
248 int freq_table_size = sizeof(struct cpufreq_frequency_table);
249 int ret = 0;
250 int k;
251
252 freq_table_size *= (nr_divs + 1);
253 freq_table = kzalloc(freq_table_size * nr, GFP_KERNEL);
254 if (!freq_table) {
255 pr_err("sh_clk_div4_register: unable to alloc memory\n");
256 return -ENOMEM;
257 }
258
259 for (k = 0; !ret && (k < nr); k++) {
260 clkp = clks + k;
261
262 clkp->ops = ops;
263 clkp->id = -1;
264 clkp->priv = table;
265
266 clkp->freq_table = freq_table + (k * freq_table_size);
267 clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END;
268
269 ret = clk_register(clkp);
270 }
271
272 return ret;
273}
274
275int __init sh_clk_div4_register(struct clk *clks, int nr,
276 struct clk_div4_table *table)
277{
278 return sh_clk_div4_register_ops(clks, nr, table, &sh_clk_div4_clk_ops);
279}
280
281int __init sh_clk_div4_enable_register(struct clk *clks, int nr,
282 struct clk_div4_table *table)
283{
284 return sh_clk_div4_register_ops(clks, nr, table,
285 &sh_clk_div4_enable_clk_ops);
286}
287
288int __init sh_clk_div4_reparent_register(struct clk *clks, int nr,
289 struct clk_div4_table *table)
290{
291 return sh_clk_div4_register_ops(clks, nr, table,
292 &sh_clk_div4_reparent_clk_ops);
293}
294
295#ifdef CONFIG_SH_CLK_CPG_LEGACY
296static struct clk master_clk = { 8static struct clk master_clk = {
297 .name = "master_clk",
298 .flags = CLK_ENABLE_ON_INIT, 9 .flags = CLK_ENABLE_ON_INIT,
299 .rate = CONFIG_SH_PCLK_FREQ, 10 .rate = CONFIG_SH_PCLK_FREQ,
300}; 11};
301 12
302static struct clk peripheral_clk = { 13static struct clk peripheral_clk = {
303 .name = "peripheral_clk",
304 .parent = &master_clk, 14 .parent = &master_clk,
305 .flags = CLK_ENABLE_ON_INIT, 15 .flags = CLK_ENABLE_ON_INIT,
306}; 16};
307 17
308static struct clk bus_clk = { 18static struct clk bus_clk = {
309 .name = "bus_clk",
310 .parent = &master_clk, 19 .parent = &master_clk,
311 .flags = CLK_ENABLE_ON_INIT, 20 .flags = CLK_ENABLE_ON_INIT,
312}; 21};
313 22
314static struct clk cpu_clk = { 23static struct clk cpu_clk = {
315 .name = "cpu_clk",
316 .parent = &master_clk, 24 .parent = &master_clk,
317 .flags = CLK_ENABLE_ON_INIT, 25 .flags = CLK_ENABLE_ON_INIT,
318}; 26};
@@ -327,6 +35,16 @@ static struct clk *onchip_clocks[] = {
327 &cpu_clk, 35 &cpu_clk,
328}; 36};
329 37
38#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
39
40static struct clk_lookup lookups[] = {
41 /* main clocks */
42 CLKDEV_CON_ID("master_clk", &master_clk),
43 CLKDEV_CON_ID("peripheral_clk", &peripheral_clk),
44 CLKDEV_CON_ID("bus_clk", &bus_clk),
45 CLKDEV_CON_ID("cpu_clk", &cpu_clk),
46};
47
330int __init __deprecated cpg_clk_init(void) 48int __init __deprecated cpg_clk_init(void)
331{ 49{
332 int i, ret = 0; 50 int i, ret = 0;
@@ -338,6 +56,13 @@ int __init __deprecated cpg_clk_init(void)
338 ret |= clk_register(clk); 56 ret |= clk_register(clk);
339 } 57 }
340 58
59 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
60
61 clk_add_alias("tmu_fck", NULL, "peripheral_clk", NULL);
62 clk_add_alias("mtu2_fck", NULL, "peripheral_clk", NULL);
63 clk_add_alias("cmt_fck", NULL, "peripheral_clk", NULL);
64 clk_add_alias("sci_ick", NULL, "peripheral_clk", NULL);
65
341 return ret; 66 return ret;
342} 67}
343 68
@@ -349,4 +74,3 @@ int __init __weak arch_clk_init(void)
349{ 74{
350 return cpg_clk_init(); 75 return cpg_clk_init();
351} 76}
352#endif /* CONFIG_SH_CPG_CLK_LEGACY */
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c
index e9fa1bfed53..50f887dda56 100644
--- a/arch/sh/kernel/cpu/clock.c
+++ b/arch/sh/kernel/cpu/clock.c
@@ -10,558 +10,16 @@
10 * 10 *
11 * Modified for omap shared clock framework by Tony Lindgren <tony@atomide.com> 11 * Modified for omap shared clock framework by Tony Lindgren <tony@atomide.com>
12 * 12 *
13 * With clkdev bits:
14 *
15 * Copyright (C) 2008 Russell King.
16 *
17 * This file is subject to the terms and conditions of the GNU General Public 13 * This file is subject to the terms and conditions of the GNU General Public
18 * License. See the file "COPYING" in the main directory of this archive 14 * License. See the file "COPYING" in the main directory of this archive
19 * for more details. 15 * for more details.
20 */ 16 */
21#include <linux/kernel.h> 17#include <linux/kernel.h>
22#include <linux/init.h> 18#include <linux/init.h>
23#include <linux/module.h> 19#include <linux/clk.h>
24#include <linux/mutex.h>
25#include <linux/list.h>
26#include <linux/kobject.h>
27#include <linux/sysdev.h>
28#include <linux/seq_file.h>
29#include <linux/err.h>
30#include <linux/platform_device.h>
31#include <linux/debugfs.h>
32#include <linux/cpufreq.h>
33#include <asm/clock.h> 20#include <asm/clock.h>
34#include <asm/machvec.h> 21#include <asm/machvec.h>
35 22
36static LIST_HEAD(clock_list);
37static DEFINE_SPINLOCK(clock_lock);
38static DEFINE_MUTEX(clock_list_sem);
39
40void clk_rate_table_build(struct clk *clk,
41 struct cpufreq_frequency_table *freq_table,
42 int nr_freqs,
43 struct clk_div_mult_table *src_table,
44 unsigned long *bitmap)
45{
46 unsigned long mult, div;
47 unsigned long freq;
48 int i;
49
50 for (i = 0; i < nr_freqs; i++) {
51 div = 1;
52 mult = 1;
53
54 if (src_table->divisors && i < src_table->nr_divisors)
55 div = src_table->divisors[i];
56
57 if (src_table->multipliers && i < src_table->nr_multipliers)
58 mult = src_table->multipliers[i];
59
60 if (!div || !mult || (bitmap && !test_bit(i, bitmap)))
61 freq = CPUFREQ_ENTRY_INVALID;
62 else
63 freq = clk->parent->rate * mult / div;
64
65 freq_table[i].index = i;
66 freq_table[i].frequency = freq;
67 }
68
69 /* Termination entry */
70 freq_table[i].index = i;
71 freq_table[i].frequency = CPUFREQ_TABLE_END;
72}
73
74long clk_rate_table_round(struct clk *clk,
75 struct cpufreq_frequency_table *freq_table,
76 unsigned long rate)
77{
78 unsigned long rate_error, rate_error_prev = ~0UL;
79 unsigned long rate_best_fit = rate;
80 unsigned long highest, lowest;
81 int i;
82
83 highest = lowest = 0;
84
85 for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
86 unsigned long freq = freq_table[i].frequency;
87
88 if (freq == CPUFREQ_ENTRY_INVALID)
89 continue;
90
91 if (freq > highest)
92 highest = freq;
93 if (freq < lowest)
94 lowest = freq;
95
96 rate_error = abs(freq - rate);
97 if (rate_error < rate_error_prev) {
98 rate_best_fit = freq;
99 rate_error_prev = rate_error;
100 }
101
102 if (rate_error == 0)
103 break;
104 }
105
106 if (rate >= highest)
107 rate_best_fit = highest;
108 if (rate <= lowest)
109 rate_best_fit = lowest;
110
111 return rate_best_fit;
112}
113
114int clk_rate_table_find(struct clk *clk,
115 struct cpufreq_frequency_table *freq_table,
116 unsigned long rate)
117{
118 int i;
119
120 for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
121 unsigned long freq = freq_table[i].frequency;
122
123 if (freq == CPUFREQ_ENTRY_INVALID)
124 continue;
125
126 if (freq == rate)
127 return i;
128 }
129
130 return -ENOENT;
131}
132
133/* Used for clocks that always have same value as the parent clock */
134unsigned long followparent_recalc(struct clk *clk)
135{
136 return clk->parent ? clk->parent->rate : 0;
137}
138
139int clk_reparent(struct clk *child, struct clk *parent)
140{
141 list_del_init(&child->sibling);
142 if (parent)
143 list_add(&child->sibling, &parent->children);
144 child->parent = parent;
145
146 /* now do the debugfs renaming to reattach the child
147 to the proper parent */
148
149 return 0;
150}
151
152/* Propagate rate to children */
153void propagate_rate(struct clk *tclk)
154{
155 struct clk *clkp;
156
157 list_for_each_entry(clkp, &tclk->children, sibling) {
158 if (clkp->ops && clkp->ops->recalc)
159 clkp->rate = clkp->ops->recalc(clkp);
160
161 propagate_rate(clkp);
162 }
163}
164
165static void __clk_disable(struct clk *clk)
166{
167 if (clk->usecount == 0) {
168 printk(KERN_ERR "Trying disable clock %s with 0 usecount\n",
169 clk->name);
170 WARN_ON(1);
171 return;
172 }
173
174 if (!(--clk->usecount)) {
175 if (likely(clk->ops && clk->ops->disable))
176 clk->ops->disable(clk);
177 if (likely(clk->parent))
178 __clk_disable(clk->parent);
179 }
180}
181
182void clk_disable(struct clk *clk)
183{
184 unsigned long flags;
185
186 if (!clk)
187 return;
188
189 spin_lock_irqsave(&clock_lock, flags);
190 __clk_disable(clk);
191 spin_unlock_irqrestore(&clock_lock, flags);
192}
193EXPORT_SYMBOL_GPL(clk_disable);
194
195static int __clk_enable(struct clk *clk)
196{
197 int ret = 0;
198
199 if (clk->usecount++ == 0) {
200 if (clk->parent) {
201 ret = __clk_enable(clk->parent);
202 if (unlikely(ret))
203 goto err;
204 }
205
206 if (clk->ops && clk->ops->enable) {
207 ret = clk->ops->enable(clk);
208 if (ret) {
209 if (clk->parent)
210 __clk_disable(clk->parent);
211 goto err;
212 }
213 }
214 }
215
216 return ret;
217err:
218 clk->usecount--;
219 return ret;
220}
221
222int clk_enable(struct clk *clk)
223{
224 unsigned long flags;
225 int ret;
226
227 if (!clk)
228 return -EINVAL;
229
230 spin_lock_irqsave(&clock_lock, flags);
231 ret = __clk_enable(clk);
232 spin_unlock_irqrestore(&clock_lock, flags);
233
234 return ret;
235}
236EXPORT_SYMBOL_GPL(clk_enable);
237
238static LIST_HEAD(root_clks);
239
240/**
241 * recalculate_root_clocks - recalculate and propagate all root clocks
242 *
243 * Recalculates all root clocks (clocks with no parent), which if the
244 * clock's .recalc is set correctly, should also propagate their rates.
245 * Called at init.
246 */
247void recalculate_root_clocks(void)
248{
249 struct clk *clkp;
250
251 list_for_each_entry(clkp, &root_clks, sibling) {
252 if (clkp->ops && clkp->ops->recalc)
253 clkp->rate = clkp->ops->recalc(clkp);
254 propagate_rate(clkp);
255 }
256}
257
258int clk_register(struct clk *clk)
259{
260 if (clk == NULL || IS_ERR(clk))
261 return -EINVAL;
262
263 /*
264 * trap out already registered clocks
265 */
266 if (clk->node.next || clk->node.prev)
267 return 0;
268
269 mutex_lock(&clock_list_sem);
270
271 INIT_LIST_HEAD(&clk->children);
272 clk->usecount = 0;
273
274 if (clk->parent)
275 list_add(&clk->sibling, &clk->parent->children);
276 else
277 list_add(&clk->sibling, &root_clks);
278
279 list_add(&clk->node, &clock_list);
280 if (clk->ops && clk->ops->init)
281 clk->ops->init(clk);
282 mutex_unlock(&clock_list_sem);
283
284 return 0;
285}
286EXPORT_SYMBOL_GPL(clk_register);
287
288void clk_unregister(struct clk *clk)
289{
290 mutex_lock(&clock_list_sem);
291 list_del(&clk->sibling);
292 list_del(&clk->node);
293 mutex_unlock(&clock_list_sem);
294}
295EXPORT_SYMBOL_GPL(clk_unregister);
296
297static void clk_enable_init_clocks(void)
298{
299 struct clk *clkp;
300
301 list_for_each_entry(clkp, &clock_list, node)
302 if (clkp->flags & CLK_ENABLE_ON_INIT)
303 clk_enable(clkp);
304}
305
306unsigned long clk_get_rate(struct clk *clk)
307{
308 return clk->rate;
309}
310EXPORT_SYMBOL_GPL(clk_get_rate);
311
312int clk_set_rate(struct clk *clk, unsigned long rate)
313{
314 return clk_set_rate_ex(clk, rate, 0);
315}
316EXPORT_SYMBOL_GPL(clk_set_rate);
317
318int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id)
319{
320 int ret = -EOPNOTSUPP;
321 unsigned long flags;
322
323 spin_lock_irqsave(&clock_lock, flags);
324
325 if (likely(clk->ops && clk->ops->set_rate)) {
326 ret = clk->ops->set_rate(clk, rate, algo_id);
327 if (ret != 0)
328 goto out_unlock;
329 } else {
330 clk->rate = rate;
331 ret = 0;
332 }
333
334 if (clk->ops && clk->ops->recalc)
335 clk->rate = clk->ops->recalc(clk);
336
337 propagate_rate(clk);
338
339out_unlock:
340 spin_unlock_irqrestore(&clock_lock, flags);
341
342 return ret;
343}
344EXPORT_SYMBOL_GPL(clk_set_rate_ex);
345
346int clk_set_parent(struct clk *clk, struct clk *parent)
347{
348 unsigned long flags;
349 int ret = -EINVAL;
350
351 if (!parent || !clk)
352 return ret;
353 if (clk->parent == parent)
354 return 0;
355
356 spin_lock_irqsave(&clock_lock, flags);
357 if (clk->usecount == 0) {
358 if (clk->ops->set_parent)
359 ret = clk->ops->set_parent(clk, parent);
360 else
361 ret = clk_reparent(clk, parent);
362
363 if (ret == 0) {
364 pr_debug("clock: set parent of %s to %s (new rate %ld)\n",
365 clk->name, clk->parent->name, clk->rate);
366 if (clk->ops->recalc)
367 clk->rate = clk->ops->recalc(clk);
368 propagate_rate(clk);
369 }
370 } else
371 ret = -EBUSY;
372 spin_unlock_irqrestore(&clock_lock, flags);
373
374 return ret;
375}
376EXPORT_SYMBOL_GPL(clk_set_parent);
377
378struct clk *clk_get_parent(struct clk *clk)
379{
380 return clk->parent;
381}
382EXPORT_SYMBOL_GPL(clk_get_parent);
383
384long clk_round_rate(struct clk *clk, unsigned long rate)
385{
386 if (likely(clk->ops && clk->ops->round_rate)) {
387 unsigned long flags, rounded;
388
389 spin_lock_irqsave(&clock_lock, flags);
390 rounded = clk->ops->round_rate(clk, rate);
391 spin_unlock_irqrestore(&clock_lock, flags);
392
393 return rounded;
394 }
395
396 return clk_get_rate(clk);
397}
398EXPORT_SYMBOL_GPL(clk_round_rate);
399
400/*
401 * Find the correct struct clk for the device and connection ID.
402 * We do slightly fuzzy matching here:
403 * An entry with a NULL ID is assumed to be a wildcard.
404 * If an entry has a device ID, it must match
405 * If an entry has a connection ID, it must match
406 * Then we take the most specific entry - with the following
407 * order of precedence: dev+con > dev only > con only.
408 */
409static struct clk *clk_find(const char *dev_id, const char *con_id)
410{
411 struct clk_lookup *p;
412 struct clk *clk = NULL;
413 int match, best = 0;
414
415 list_for_each_entry(p, &clock_list, node) {
416 match = 0;
417 if (p->dev_id) {
418 if (!dev_id || strcmp(p->dev_id, dev_id))
419 continue;
420 match += 2;
421 }
422 if (p->con_id) {
423 if (!con_id || strcmp(p->con_id, con_id))
424 continue;
425 match += 1;
426 }
427 if (match == 0)
428 continue;
429
430 if (match > best) {
431 clk = p->clk;
432 best = match;
433 }
434 }
435 return clk;
436}
437
438struct clk *clk_get_sys(const char *dev_id, const char *con_id)
439{
440 struct clk *clk;
441
442 mutex_lock(&clock_list_sem);
443 clk = clk_find(dev_id, con_id);
444 mutex_unlock(&clock_list_sem);
445
446 return clk ? clk : ERR_PTR(-ENOENT);
447}
448EXPORT_SYMBOL_GPL(clk_get_sys);
449
450/*
451 * Returns a clock. Note that we first try to use device id on the bus
452 * and clock name. If this fails, we try to use clock name only.
453 */
454struct clk *clk_get(struct device *dev, const char *id)
455{
456 const char *dev_id = dev ? dev_name(dev) : NULL;
457 struct clk *p, *clk = ERR_PTR(-ENOENT);
458 int idno;
459
460 clk = clk_get_sys(dev_id, id);
461 if (clk && !IS_ERR(clk))
462 return clk;
463
464 if (dev == NULL || dev->bus != &platform_bus_type)
465 idno = -1;
466 else
467 idno = to_platform_device(dev)->id;
468
469 mutex_lock(&clock_list_sem);
470 list_for_each_entry(p, &clock_list, node) {
471 if (p->id == idno &&
472 strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
473 clk = p;
474 goto found;
475 }
476 }
477
478 list_for_each_entry(p, &clock_list, node) {
479 if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
480 clk = p;
481 break;
482 }
483 }
484
485found:
486 mutex_unlock(&clock_list_sem);
487
488 return clk;
489}
490EXPORT_SYMBOL_GPL(clk_get);
491
492void clk_put(struct clk *clk)
493{
494 if (clk && !IS_ERR(clk))
495 module_put(clk->owner);
496}
497EXPORT_SYMBOL_GPL(clk_put);
498
499#ifdef CONFIG_PM
500static int clks_sysdev_suspend(struct sys_device *dev, pm_message_t state)
501{
502 static pm_message_t prev_state;
503 struct clk *clkp;
504
505 switch (state.event) {
506 case PM_EVENT_ON:
507 /* Resumeing from hibernation */
508 if (prev_state.event != PM_EVENT_FREEZE)
509 break;
510
511 list_for_each_entry(clkp, &clock_list, node) {
512 if (likely(clkp->ops)) {
513 unsigned long rate = clkp->rate;
514
515 if (likely(clkp->ops->set_parent))
516 clkp->ops->set_parent(clkp,
517 clkp->parent);
518 if (likely(clkp->ops->set_rate))
519 clkp->ops->set_rate(clkp,
520 rate, NO_CHANGE);
521 else if (likely(clkp->ops->recalc))
522 clkp->rate = clkp->ops->recalc(clkp);
523 }
524 }
525 break;
526 case PM_EVENT_FREEZE:
527 break;
528 case PM_EVENT_SUSPEND:
529 break;
530 }
531
532 prev_state = state;
533 return 0;
534}
535
536static int clks_sysdev_resume(struct sys_device *dev)
537{
538 return clks_sysdev_suspend(dev, PMSG_ON);
539}
540
541static struct sysdev_class clks_sysdev_class = {
542 .name = "clks",
543};
544
545static struct sysdev_driver clks_sysdev_driver = {
546 .suspend = clks_sysdev_suspend,
547 .resume = clks_sysdev_resume,
548};
549
550static struct sys_device clks_sysdev_dev = {
551 .cls = &clks_sysdev_class,
552};
553
554static int __init clk_sysdev_init(void)
555{
556 sysdev_class_register(&clks_sysdev_class);
557 sysdev_driver_register(&clks_sysdev_class, &clks_sysdev_driver);
558 sysdev_register(&clks_sysdev_dev);
559
560 return 0;
561}
562subsys_initcall(clk_sysdev_init);
563#endif
564
565int __init clk_init(void) 23int __init clk_init(void)
566{ 24{
567 int ret; 25 int ret;
@@ -591,89 +49,19 @@ int __init clk_init(void)
591} 49}
592 50
593/* 51/*
594 * debugfs support to trace clock tree hierarchy and attributes 52 * Returns a clock. Note that we first try to use device id on the bus
53 * and clock name. If this fails, we try to use clock name only.
595 */ 54 */
596static struct dentry *clk_debugfs_root; 55struct clk *clk_get(struct device *dev, const char *con_id)
597
598static int clk_debugfs_register_one(struct clk *c)
599{ 56{
600 int err; 57 const char *dev_id = dev ? dev_name(dev) : NULL;
601 struct dentry *d, *child, *child_tmp;
602 struct clk *pa = c->parent;
603 char s[255];
604 char *p = s;
605
606 p += sprintf(p, "%s", c->name);
607 if (c->id >= 0)
608 sprintf(p, ":%d", c->id);
609 d = debugfs_create_dir(s, pa ? pa->dentry : clk_debugfs_root);
610 if (!d)
611 return -ENOMEM;
612 c->dentry = d;
613
614 d = debugfs_create_u8("usecount", S_IRUGO, c->dentry, (u8 *)&c->usecount);
615 if (!d) {
616 err = -ENOMEM;
617 goto err_out;
618 }
619 d = debugfs_create_u32("rate", S_IRUGO, c->dentry, (u32 *)&c->rate);
620 if (!d) {
621 err = -ENOMEM;
622 goto err_out;
623 }
624 d = debugfs_create_x32("flags", S_IRUGO, c->dentry, (u32 *)&c->flags);
625 if (!d) {
626 err = -ENOMEM;
627 goto err_out;
628 }
629 return 0;
630 58
631err_out: 59 return clk_get_sys(dev_id, con_id);
632 d = c->dentry;
633 list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child)
634 debugfs_remove(child);
635 debugfs_remove(c->dentry);
636 return err;
637} 60}
61EXPORT_SYMBOL_GPL(clk_get);
638 62
639static int clk_debugfs_register(struct clk *c) 63void clk_put(struct clk *clk)
640{ 64{
641 int err;
642 struct clk *pa = c->parent;
643
644 if (pa && !pa->dentry) {
645 err = clk_debugfs_register(pa);
646 if (err)
647 return err;
648 }
649
650 if (!c->dentry) {
651 err = clk_debugfs_register_one(c);
652 if (err)
653 return err;
654 }
655 return 0;
656} 65}
66EXPORT_SYMBOL_GPL(clk_put);
657 67
658static int __init clk_debugfs_init(void)
659{
660 struct clk *c;
661 struct dentry *d;
662 int err;
663
664 d = debugfs_create_dir("clock", NULL);
665 if (!d)
666 return -ENOMEM;
667 clk_debugfs_root = d;
668
669 list_for_each_entry(c, &clock_list, node) {
670 err = clk_debugfs_register(c);
671 if (err)
672 goto err_out;
673 }
674 return 0;
675err_out:
676 debugfs_remove(clk_debugfs_root); /* REVISIT: Cleanup correctly */
677 return err;
678}
679late_initcall(clk_debugfs_init);
diff --git a/arch/sh/kernel/cpu/hwblk.c b/arch/sh/kernel/cpu/hwblk.c
index 67a1e811cfe..3e985aae5d9 100644
--- a/arch/sh/kernel/cpu/hwblk.c
+++ b/arch/sh/kernel/cpu/hwblk.c
@@ -146,6 +146,11 @@ int __init sh_hwblk_clk_register(struct clk *clks, int nr)
146 146
147 for (k = 0; !ret && (k < nr); k++) { 147 for (k = 0; !ret && (k < nr); k++) {
148 clkp = clks + k; 148 clkp = clks + k;
149
150 /* skip over clocks using hwblk 0 (HWBLK_UNKNOWN) */
151 if (!clkp->arch_flags)
152 continue;
153
149 clkp->ops = &sh_hwblk_clk_ops; 154 clkp->ops = &sh_hwblk_clk_ops;
150 ret |= clk_register(clkp); 155 ret |= clk_register(clkp);
151 } 156 }
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index c736422344e..97661061ff2 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -43,9 +43,9 @@
43 * peripherals (nofpu, nodsp, and so forth). 43 * peripherals (nofpu, nodsp, and so forth).
44 */ 44 */
45#define onchip_setup(x) \ 45#define onchip_setup(x) \
46static int x##_disabled __initdata = !cpu_has_##x; \ 46static int x##_disabled __cpuinitdata = !cpu_has_##x; \
47 \ 47 \
48static int __init x##_setup(char *opts) \ 48static int __cpuinit x##_setup(char *opts) \
49{ \ 49{ \
50 x##_disabled = 1; \ 50 x##_disabled = 1; \
51 return 1; \ 51 return 1; \
@@ -59,7 +59,7 @@ onchip_setup(dsp);
59#define CPUOPM 0xff2f0000 59#define CPUOPM 0xff2f0000
60#define CPUOPM_RABD (1 << 5) 60#define CPUOPM_RABD (1 << 5)
61 61
62static void __init speculative_execution_init(void) 62static void __cpuinit speculative_execution_init(void)
63{ 63{
64 /* Clear RABD */ 64 /* Clear RABD */
65 __raw_writel(__raw_readl(CPUOPM) & ~CPUOPM_RABD, CPUOPM); 65 __raw_writel(__raw_readl(CPUOPM) & ~CPUOPM_RABD, CPUOPM);
@@ -78,7 +78,7 @@ static void __init speculative_execution_init(void)
78#define EXPMASK_BRDSSLP (1 << 1) 78#define EXPMASK_BRDSSLP (1 << 1)
79#define EXPMASK_MMCAW (1 << 4) 79#define EXPMASK_MMCAW (1 << 4)
80 80
81static void __init expmask_init(void) 81static void __cpuinit expmask_init(void)
82{ 82{
83 unsigned long expmask = __raw_readl(EXPMASK); 83 unsigned long expmask = __raw_readl(EXPMASK);
84 84
@@ -217,7 +217,7 @@ static void detect_cache_shape(void)
217 l2_cache_shape = -1; /* No S-cache */ 217 l2_cache_shape = -1; /* No S-cache */
218} 218}
219 219
220static void __init fpu_init(void) 220static void __cpuinit fpu_init(void)
221{ 221{
222 /* Disable the FPU */ 222 /* Disable the FPU */
223 if (fpu_disabled && (current_cpu_data.flags & CPU_HAS_FPU)) { 223 if (fpu_disabled && (current_cpu_data.flags & CPU_HAS_FPU)) {
@@ -230,7 +230,7 @@ static void __init fpu_init(void)
230} 230}
231 231
232#ifdef CONFIG_SH_DSP 232#ifdef CONFIG_SH_DSP
233static void __init release_dsp(void) 233static void __cpuinit release_dsp(void)
234{ 234{
235 unsigned long sr; 235 unsigned long sr;
236 236
@@ -244,7 +244,7 @@ static void __init release_dsp(void)
244 ); 244 );
245} 245}
246 246
247static void __init dsp_init(void) 247static void __cpuinit dsp_init(void)
248{ 248{
249 unsigned long sr; 249 unsigned long sr;
250 250
@@ -276,11 +276,11 @@ static void __init dsp_init(void)
276 release_dsp(); 276 release_dsp();
277} 277}
278#else 278#else
279static inline void __init dsp_init(void) { } 279static inline void __cpuinit dsp_init(void) { }
280#endif /* CONFIG_SH_DSP */ 280#endif /* CONFIG_SH_DSP */
281 281
282/** 282/**
283 * sh_cpu_init 283 * cpu_init
284 * 284 *
285 * This is our initial entry point for each CPU, and is invoked on the 285 * This is our initial entry point for each CPU, and is invoked on the
286 * boot CPU prior to calling start_kernel(). For SMP, a combination of 286 * boot CPU prior to calling start_kernel(). For SMP, a combination of
@@ -293,14 +293,14 @@ static inline void __init dsp_init(void) { }
293 * subtype and initial configuration will all be done. 293 * subtype and initial configuration will all be done.
294 * 294 *
295 * Each processor family is still responsible for doing its own probing 295 * Each processor family is still responsible for doing its own probing
296 * and cache configuration in detect_cpu_and_cache_system(). 296 * and cache configuration in cpu_probe().
297 */ 297 */
298asmlinkage void __init sh_cpu_init(void) 298asmlinkage void __cpuinit cpu_init(void)
299{ 299{
300 current_thread_info()->cpu = hard_smp_processor_id(); 300 current_thread_info()->cpu = hard_smp_processor_id();
301 301
302 /* First, probe the CPU */ 302 /* First, probe the CPU */
303 detect_cpu_and_cache_system(); 303 cpu_probe();
304 304
305 if (current_cpu_data.type == CPU_SH_NONE) 305 if (current_cpu_data.type == CPU_SH_NONE)
306 panic("Unknown CPU"); 306 panic("Unknown CPU");
diff --git a/arch/sh/kernel/cpu/sh2/probe.c b/arch/sh/kernel/cpu/sh2/probe.c
index 1db6d888388..bab8e75958a 100644
--- a/arch/sh/kernel/cpu/sh2/probe.c
+++ b/arch/sh/kernel/cpu/sh2/probe.c
@@ -13,7 +13,7 @@
13#include <asm/processor.h> 13#include <asm/processor.h>
14#include <asm/cache.h> 14#include <asm/cache.h>
15 15
16int __init detect_cpu_and_cache_system(void) 16void __cpuinit cpu_probe(void)
17{ 17{
18#if defined(CONFIG_CPU_SUBTYPE_SH7619) 18#if defined(CONFIG_CPU_SUBTYPE_SH7619)
19 boot_cpu_data.type = CPU_SH7619; 19 boot_cpu_data.type = CPU_SH7619;
@@ -30,7 +30,4 @@ int __init detect_cpu_and_cache_system(void)
30 boot_cpu_data.dcache.flags |= SH_CACHE_COMBINED; 30 boot_cpu_data.dcache.flags |= SH_CACHE_COMBINED;
31 boot_cpu_data.icache = boot_cpu_data.dcache; 31 boot_cpu_data.icache = boot_cpu_data.dcache;
32 boot_cpu_data.family = CPU_FAMILY_SH2; 32 boot_cpu_data.family = CPU_FAMILY_SH2;
33
34 return 0;
35} 33}
36
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index 114c7cee718..c3638516bff 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -128,17 +128,14 @@ static struct platform_device eth_device = {
128}; 128};
129 129
130static struct sh_timer_config cmt0_platform_data = { 130static struct sh_timer_config cmt0_platform_data = {
131 .name = "CMT0",
132 .channel_offset = 0x02, 131 .channel_offset = 0x02,
133 .timer_bit = 0, 132 .timer_bit = 0,
134 .clk = "peripheral_clk",
135 .clockevent_rating = 125, 133 .clockevent_rating = 125,
136 .clocksource_rating = 0, /* disabled due to code generation issues */ 134 .clocksource_rating = 0, /* disabled due to code generation issues */
137}; 135};
138 136
139static struct resource cmt0_resources[] = { 137static struct resource cmt0_resources[] = {
140 [0] = { 138 [0] = {
141 .name = "CMT0",
142 .start = 0xf84a0072, 139 .start = 0xf84a0072,
143 .end = 0xf84a0077, 140 .end = 0xf84a0077,
144 .flags = IORESOURCE_MEM, 141 .flags = IORESOURCE_MEM,
@@ -160,17 +157,14 @@ static struct platform_device cmt0_device = {
160}; 157};
161 158
162static struct sh_timer_config cmt1_platform_data = { 159static struct sh_timer_config cmt1_platform_data = {
163 .name = "CMT1",
164 .channel_offset = 0x08, 160 .channel_offset = 0x08,
165 .timer_bit = 1, 161 .timer_bit = 1,
166 .clk = "peripheral_clk",
167 .clockevent_rating = 125, 162 .clockevent_rating = 125,
168 .clocksource_rating = 0, /* disabled due to code generation issues */ 163 .clocksource_rating = 0, /* disabled due to code generation issues */
169}; 164};
170 165
171static struct resource cmt1_resources[] = { 166static struct resource cmt1_resources[] = {
172 [0] = { 167 [0] = {
173 .name = "CMT1",
174 .start = 0xf84a0078, 168 .start = 0xf84a0078,
175 .end = 0xf84a007d, 169 .end = 0xf84a007d,
176 .flags = IORESOURCE_MEM, 170 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh2a/probe.c b/arch/sh/kernel/cpu/sh2a/probe.c
index 6825d650716..48e97a2a0c8 100644
--- a/arch/sh/kernel/cpu/sh2a/probe.c
+++ b/arch/sh/kernel/cpu/sh2a/probe.c
@@ -13,7 +13,7 @@
13#include <asm/processor.h> 13#include <asm/processor.h>
14#include <asm/cache.h> 14#include <asm/cache.h>
15 15
16int __init detect_cpu_and_cache_system(void) 16void __cpuinit cpu_probe(void)
17{ 17{
18 boot_cpu_data.family = CPU_FAMILY_SH2A; 18 boot_cpu_data.family = CPU_FAMILY_SH2A;
19 19
@@ -51,6 +51,4 @@ int __init detect_cpu_and_cache_system(void)
51 * on the cache info. 51 * on the cache info.
52 */ 52 */
53 boot_cpu_data.icache = boot_cpu_data.dcache; 53 boot_cpu_data.icache = boot_cpu_data.dcache;
54
55 return 0;
56} 54}
diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
index 8f669dc9b0d..6c96ea02bf8 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c
@@ -115,16 +115,13 @@ static DECLARE_INTC_DESC(intc_desc, "mxg", vectors, groups,
115 mask_registers, prio_registers, NULL); 115 mask_registers, prio_registers, NULL);
116 116
117static struct sh_timer_config mtu2_0_platform_data = { 117static struct sh_timer_config mtu2_0_platform_data = {
118 .name = "MTU2_0",
119 .channel_offset = -0x80, 118 .channel_offset = -0x80,
120 .timer_bit = 0, 119 .timer_bit = 0,
121 .clk = "peripheral_clk",
122 .clockevent_rating = 200, 120 .clockevent_rating = 200,
123}; 121};
124 122
125static struct resource mtu2_0_resources[] = { 123static struct resource mtu2_0_resources[] = {
126 [0] = { 124 [0] = {
127 .name = "MTU2_0",
128 .start = 0xff801300, 125 .start = 0xff801300,
129 .end = 0xff801326, 126 .end = 0xff801326,
130 .flags = IORESOURCE_MEM, 127 .flags = IORESOURCE_MEM,
@@ -146,16 +143,13 @@ static struct platform_device mtu2_0_device = {
146}; 143};
147 144
148static struct sh_timer_config mtu2_1_platform_data = { 145static struct sh_timer_config mtu2_1_platform_data = {
149 .name = "MTU2_1",
150 .channel_offset = -0x100, 146 .channel_offset = -0x100,
151 .timer_bit = 1, 147 .timer_bit = 1,
152 .clk = "peripheral_clk",
153 .clockevent_rating = 200, 148 .clockevent_rating = 200,
154}; 149};
155 150
156static struct resource mtu2_1_resources[] = { 151static struct resource mtu2_1_resources[] = {
157 [0] = { 152 [0] = {
158 .name = "MTU2_1",
159 .start = 0xff801380, 153 .start = 0xff801380,
160 .end = 0xff801390, 154 .end = 0xff801390,
161 .flags = IORESOURCE_MEM, 155 .flags = IORESOURCE_MEM,
@@ -177,16 +171,13 @@ static struct platform_device mtu2_1_device = {
177}; 171};
178 172
179static struct sh_timer_config mtu2_2_platform_data = { 173static struct sh_timer_config mtu2_2_platform_data = {
180 .name = "MTU2_2",
181 .channel_offset = 0x80, 174 .channel_offset = 0x80,
182 .timer_bit = 2, 175 .timer_bit = 2,
183 .clk = "peripheral_clk",
184 .clockevent_rating = 200, 176 .clockevent_rating = 200,
185}; 177};
186 178
187static struct resource mtu2_2_resources[] = { 179static struct resource mtu2_2_resources[] = {
188 [0] = { 180 [0] = {
189 .name = "MTU2_2",
190 .start = 0xff801000, 181 .start = 0xff801000,
191 .end = 0xff80100a, 182 .end = 0xff80100a,
192 .flags = IORESOURCE_MEM, 183 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
index 4ccfeb59eb1..d08bf4c07d6 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7201.c
@@ -318,16 +318,13 @@ static struct platform_device rtc_device = {
318}; 318};
319 319
320static struct sh_timer_config mtu2_0_platform_data = { 320static struct sh_timer_config mtu2_0_platform_data = {
321 .name = "MTU2_0",
322 .channel_offset = -0x80, 321 .channel_offset = -0x80,
323 .timer_bit = 0, 322 .timer_bit = 0,
324 .clk = "peripheral_clk",
325 .clockevent_rating = 200, 323 .clockevent_rating = 200,
326}; 324};
327 325
328static struct resource mtu2_0_resources[] = { 326static struct resource mtu2_0_resources[] = {
329 [0] = { 327 [0] = {
330 .name = "MTU2_0",
331 .start = 0xfffe4300, 328 .start = 0xfffe4300,
332 .end = 0xfffe4326, 329 .end = 0xfffe4326,
333 .flags = IORESOURCE_MEM, 330 .flags = IORESOURCE_MEM,
@@ -349,16 +346,13 @@ static struct platform_device mtu2_0_device = {
349}; 346};
350 347
351static struct sh_timer_config mtu2_1_platform_data = { 348static struct sh_timer_config mtu2_1_platform_data = {
352 .name = "MTU2_1",
353 .channel_offset = -0x100, 349 .channel_offset = -0x100,
354 .timer_bit = 1, 350 .timer_bit = 1,
355 .clk = "peripheral_clk",
356 .clockevent_rating = 200, 351 .clockevent_rating = 200,
357}; 352};
358 353
359static struct resource mtu2_1_resources[] = { 354static struct resource mtu2_1_resources[] = {
360 [0] = { 355 [0] = {
361 .name = "MTU2_1",
362 .start = 0xfffe4380, 356 .start = 0xfffe4380,
363 .end = 0xfffe4390, 357 .end = 0xfffe4390,
364 .flags = IORESOURCE_MEM, 358 .flags = IORESOURCE_MEM,
@@ -380,16 +374,13 @@ static struct platform_device mtu2_1_device = {
380}; 374};
381 375
382static struct sh_timer_config mtu2_2_platform_data = { 376static struct sh_timer_config mtu2_2_platform_data = {
383 .name = "MTU2_2",
384 .channel_offset = 0x80, 377 .channel_offset = 0x80,
385 .timer_bit = 2, 378 .timer_bit = 2,
386 .clk = "peripheral_clk",
387 .clockevent_rating = 200, 379 .clockevent_rating = 200,
388}; 380};
389 381
390static struct resource mtu2_2_resources[] = { 382static struct resource mtu2_2_resources[] = {
391 [0] = { 383 [0] = {
392 .name = "MTU2_2",
393 .start = 0xfffe4000, 384 .start = 0xfffe4000,
394 .end = 0xfffe400a, 385 .end = 0xfffe400a,
395 .flags = IORESOURCE_MEM, 386 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
index 3136966cc9b..832f401b586 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7203.c
@@ -234,17 +234,14 @@ static struct platform_device scif3_device = {
234}; 234};
235 235
236static struct sh_timer_config cmt0_platform_data = { 236static struct sh_timer_config cmt0_platform_data = {
237 .name = "CMT0",
238 .channel_offset = 0x02, 237 .channel_offset = 0x02,
239 .timer_bit = 0, 238 .timer_bit = 0,
240 .clk = "peripheral_clk",
241 .clockevent_rating = 125, 239 .clockevent_rating = 125,
242 .clocksource_rating = 0, /* disabled due to code generation issues */ 240 .clocksource_rating = 0, /* disabled due to code generation issues */
243}; 241};
244 242
245static struct resource cmt0_resources[] = { 243static struct resource cmt0_resources[] = {
246 [0] = { 244 [0] = {
247 .name = "CMT0",
248 .start = 0xfffec002, 245 .start = 0xfffec002,
249 .end = 0xfffec007, 246 .end = 0xfffec007,
250 .flags = IORESOURCE_MEM, 247 .flags = IORESOURCE_MEM,
@@ -266,17 +263,14 @@ static struct platform_device cmt0_device = {
266}; 263};
267 264
268static struct sh_timer_config cmt1_platform_data = { 265static struct sh_timer_config cmt1_platform_data = {
269 .name = "CMT1",
270 .channel_offset = 0x08, 266 .channel_offset = 0x08,
271 .timer_bit = 1, 267 .timer_bit = 1,
272 .clk = "peripheral_clk",
273 .clockevent_rating = 125, 268 .clockevent_rating = 125,
274 .clocksource_rating = 0, /* disabled due to code generation issues */ 269 .clocksource_rating = 0, /* disabled due to code generation issues */
275}; 270};
276 271
277static struct resource cmt1_resources[] = { 272static struct resource cmt1_resources[] = {
278 [0] = { 273 [0] = {
279 .name = "CMT1",
280 .start = 0xfffec008, 274 .start = 0xfffec008,
281 .end = 0xfffec00d, 275 .end = 0xfffec00d,
282 .flags = IORESOURCE_MEM, 276 .flags = IORESOURCE_MEM,
@@ -298,16 +292,13 @@ static struct platform_device cmt1_device = {
298}; 292};
299 293
300static struct sh_timer_config mtu2_0_platform_data = { 294static struct sh_timer_config mtu2_0_platform_data = {
301 .name = "MTU2_0",
302 .channel_offset = -0x80, 295 .channel_offset = -0x80,
303 .timer_bit = 0, 296 .timer_bit = 0,
304 .clk = "peripheral_clk",
305 .clockevent_rating = 200, 297 .clockevent_rating = 200,
306}; 298};
307 299
308static struct resource mtu2_0_resources[] = { 300static struct resource mtu2_0_resources[] = {
309 [0] = { 301 [0] = {
310 .name = "MTU2_0",
311 .start = 0xfffe4300, 302 .start = 0xfffe4300,
312 .end = 0xfffe4326, 303 .end = 0xfffe4326,
313 .flags = IORESOURCE_MEM, 304 .flags = IORESOURCE_MEM,
@@ -329,16 +320,13 @@ static struct platform_device mtu2_0_device = {
329}; 320};
330 321
331static struct sh_timer_config mtu2_1_platform_data = { 322static struct sh_timer_config mtu2_1_platform_data = {
332 .name = "MTU2_1",
333 .channel_offset = -0x100, 323 .channel_offset = -0x100,
334 .timer_bit = 1, 324 .timer_bit = 1,
335 .clk = "peripheral_clk",
336 .clockevent_rating = 200, 325 .clockevent_rating = 200,
337}; 326};
338 327
339static struct resource mtu2_1_resources[] = { 328static struct resource mtu2_1_resources[] = {
340 [0] = { 329 [0] = {
341 .name = "MTU2_1",
342 .start = 0xfffe4380, 330 .start = 0xfffe4380,
343 .end = 0xfffe4390, 331 .end = 0xfffe4390,
344 .flags = IORESOURCE_MEM, 332 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
index 064873585a8..dc47b04e104 100644
--- a/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
+++ b/arch/sh/kernel/cpu/sh2a/setup-sh7206.c
@@ -194,17 +194,14 @@ static struct platform_device scif3_device = {
194}; 194};
195 195
196static struct sh_timer_config cmt0_platform_data = { 196static struct sh_timer_config cmt0_platform_data = {
197 .name = "CMT0",
198 .channel_offset = 0x02, 197 .channel_offset = 0x02,
199 .timer_bit = 0, 198 .timer_bit = 0,
200 .clk = "peripheral_clk",
201 .clockevent_rating = 125, 199 .clockevent_rating = 125,
202 .clocksource_rating = 0, /* disabled due to code generation issues */ 200 .clocksource_rating = 0, /* disabled due to code generation issues */
203}; 201};
204 202
205static struct resource cmt0_resources[] = { 203static struct resource cmt0_resources[] = {
206 [0] = { 204 [0] = {
207 .name = "CMT0",
208 .start = 0xfffec002, 205 .start = 0xfffec002,
209 .end = 0xfffec007, 206 .end = 0xfffec007,
210 .flags = IORESOURCE_MEM, 207 .flags = IORESOURCE_MEM,
@@ -226,17 +223,14 @@ static struct platform_device cmt0_device = {
226}; 223};
227 224
228static struct sh_timer_config cmt1_platform_data = { 225static struct sh_timer_config cmt1_platform_data = {
229 .name = "CMT1",
230 .channel_offset = 0x08, 226 .channel_offset = 0x08,
231 .timer_bit = 1, 227 .timer_bit = 1,
232 .clk = "peripheral_clk",
233 .clockevent_rating = 125, 228 .clockevent_rating = 125,
234 .clocksource_rating = 0, /* disabled due to code generation issues */ 229 .clocksource_rating = 0, /* disabled due to code generation issues */
235}; 230};
236 231
237static struct resource cmt1_resources[] = { 232static struct resource cmt1_resources[] = {
238 [0] = { 233 [0] = {
239 .name = "CMT1",
240 .start = 0xfffec008, 234 .start = 0xfffec008,
241 .end = 0xfffec00d, 235 .end = 0xfffec00d,
242 .flags = IORESOURCE_MEM, 236 .flags = IORESOURCE_MEM,
@@ -258,16 +252,13 @@ static struct platform_device cmt1_device = {
258}; 252};
259 253
260static struct sh_timer_config mtu2_0_platform_data = { 254static struct sh_timer_config mtu2_0_platform_data = {
261 .name = "MTU2_0",
262 .channel_offset = -0x80, 255 .channel_offset = -0x80,
263 .timer_bit = 0, 256 .timer_bit = 0,
264 .clk = "peripheral_clk",
265 .clockevent_rating = 200, 257 .clockevent_rating = 200,
266}; 258};
267 259
268static struct resource mtu2_0_resources[] = { 260static struct resource mtu2_0_resources[] = {
269 [0] = { 261 [0] = {
270 .name = "MTU2_0",
271 .start = 0xfffe4300, 262 .start = 0xfffe4300,
272 .end = 0xfffe4326, 263 .end = 0xfffe4326,
273 .flags = IORESOURCE_MEM, 264 .flags = IORESOURCE_MEM,
@@ -289,16 +280,13 @@ static struct platform_device mtu2_0_device = {
289}; 280};
290 281
291static struct sh_timer_config mtu2_1_platform_data = { 282static struct sh_timer_config mtu2_1_platform_data = {
292 .name = "MTU2_1",
293 .channel_offset = -0x100, 283 .channel_offset = -0x100,
294 .timer_bit = 1, 284 .timer_bit = 1,
295 .clk = "peripheral_clk",
296 .clockevent_rating = 200, 285 .clockevent_rating = 200,
297}; 286};
298 287
299static struct resource mtu2_1_resources[] = { 288static struct resource mtu2_1_resources[] = {
300 [0] = { 289 [0] = {
301 .name = "MTU2_1",
302 .start = 0xfffe4380, 290 .start = 0xfffe4380,
303 .end = 0xfffe4390, 291 .end = 0xfffe4390,
304 .flags = IORESOURCE_MEM, 292 .flags = IORESOURCE_MEM,
@@ -320,16 +308,13 @@ static struct platform_device mtu2_1_device = {
320}; 308};
321 309
322static struct sh_timer_config mtu2_2_platform_data = { 310static struct sh_timer_config mtu2_2_platform_data = {
323 .name = "MTU2_2",
324 .channel_offset = 0x80, 311 .channel_offset = 0x80,
325 .timer_bit = 2, 312 .timer_bit = 2,
326 .clk = "peripheral_clk",
327 .clockevent_rating = 200, 313 .clockevent_rating = 200,
328}; 314};
329 315
330static struct resource mtu2_2_resources[] = { 316static struct resource mtu2_2_resources[] = {
331 [0] = { 317 [0] = {
332 .name = "MTU2_2",
333 .start = 0xfffe4000, 318 .start = 0xfffe4000,
334 .end = 0xfffe400a, 319 .end = 0xfffe400a,
335 .flags = IORESOURCE_MEM, 320 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index 295ec4c99e9..bf23c322e16 100644
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -16,7 +16,7 @@
16#include <asm/cache.h> 16#include <asm/cache.h>
17#include <asm/io.h> 17#include <asm/io.h>
18 18
19int detect_cpu_and_cache_system(void) 19void __cpuinit cpu_probe(void)
20{ 20{
21 unsigned long addr0, addr1, data0, data1, data2, data3; 21 unsigned long addr0, addr1, data0, data1, data2, data3;
22 22
@@ -108,6 +108,4 @@ int detect_cpu_and_cache_system(void)
108 boot_cpu_data.icache = boot_cpu_data.dcache; 108 boot_cpu_data.icache = boot_cpu_data.dcache;
109 109
110 boot_cpu_data.family = CPU_FAMILY_SH3; 110 boot_cpu_data.family = CPU_FAMILY_SH3;
111
112 return 0;
113} 111}
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7705.c b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
index 7b892d60e3a..baadd7f54d9 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7705.c
@@ -124,16 +124,13 @@ static struct platform_device rtc_device = {
124}; 124};
125 125
126static struct sh_timer_config tmu0_platform_data = { 126static struct sh_timer_config tmu0_platform_data = {
127 .name = "TMU0",
128 .channel_offset = 0x02, 127 .channel_offset = 0x02,
129 .timer_bit = 0, 128 .timer_bit = 0,
130 .clk = "peripheral_clk",
131 .clockevent_rating = 200, 129 .clockevent_rating = 200,
132}; 130};
133 131
134static struct resource tmu0_resources[] = { 132static struct resource tmu0_resources[] = {
135 [0] = { 133 [0] = {
136 .name = "TMU0",
137 .start = 0xfffffe94, 134 .start = 0xfffffe94,
138 .end = 0xfffffe9f, 135 .end = 0xfffffe9f,
139 .flags = IORESOURCE_MEM, 136 .flags = IORESOURCE_MEM,
@@ -155,16 +152,13 @@ static struct platform_device tmu0_device = {
155}; 152};
156 153
157static struct sh_timer_config tmu1_platform_data = { 154static struct sh_timer_config tmu1_platform_data = {
158 .name = "TMU1",
159 .channel_offset = 0xe, 155 .channel_offset = 0xe,
160 .timer_bit = 1, 156 .timer_bit = 1,
161 .clk = "peripheral_clk",
162 .clocksource_rating = 200, 157 .clocksource_rating = 200,
163}; 158};
164 159
165static struct resource tmu1_resources[] = { 160static struct resource tmu1_resources[] = {
166 [0] = { 161 [0] = {
167 .name = "TMU1",
168 .start = 0xfffffea0, 162 .start = 0xfffffea0,
169 .end = 0xfffffeab, 163 .end = 0xfffffeab,
170 .flags = IORESOURCE_MEM, 164 .flags = IORESOURCE_MEM,
@@ -186,15 +180,12 @@ static struct platform_device tmu1_device = {
186}; 180};
187 181
188static struct sh_timer_config tmu2_platform_data = { 182static struct sh_timer_config tmu2_platform_data = {
189 .name = "TMU2",
190 .channel_offset = 0x1a, 183 .channel_offset = 0x1a,
191 .timer_bit = 2, 184 .timer_bit = 2,
192 .clk = "peripheral_clk",
193}; 185};
194 186
195static struct resource tmu2_resources[] = { 187static struct resource tmu2_resources[] = {
196 [0] = { 188 [0] = {
197 .name = "TMU2",
198 .start = 0xfffffeac, 189 .start = 0xfffffeac,
199 .end = 0xfffffebb, 190 .end = 0xfffffebb,
200 .flags = IORESOURCE_MEM, 191 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh770x.c b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
index bc0c4f68c7c..3cf8c8ef7b3 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh770x.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh770x.c
@@ -157,16 +157,13 @@ static struct platform_device scif2_device = {
157#endif 157#endif
158 158
159static struct sh_timer_config tmu0_platform_data = { 159static struct sh_timer_config tmu0_platform_data = {
160 .name = "TMU0",
161 .channel_offset = 0x02, 160 .channel_offset = 0x02,
162 .timer_bit = 0, 161 .timer_bit = 0,
163 .clk = "peripheral_clk",
164 .clockevent_rating = 200, 162 .clockevent_rating = 200,
165}; 163};
166 164
167static struct resource tmu0_resources[] = { 165static struct resource tmu0_resources[] = {
168 [0] = { 166 [0] = {
169 .name = "TMU0",
170 .start = 0xfffffe94, 167 .start = 0xfffffe94,
171 .end = 0xfffffe9f, 168 .end = 0xfffffe9f,
172 .flags = IORESOURCE_MEM, 169 .flags = IORESOURCE_MEM,
@@ -188,16 +185,13 @@ static struct platform_device tmu0_device = {
188}; 185};
189 186
190static struct sh_timer_config tmu1_platform_data = { 187static struct sh_timer_config tmu1_platform_data = {
191 .name = "TMU1",
192 .channel_offset = 0xe, 188 .channel_offset = 0xe,
193 .timer_bit = 1, 189 .timer_bit = 1,
194 .clk = "peripheral_clk",
195 .clocksource_rating = 200, 190 .clocksource_rating = 200,
196}; 191};
197 192
198static struct resource tmu1_resources[] = { 193static struct resource tmu1_resources[] = {
199 [0] = { 194 [0] = {
200 .name = "TMU1",
201 .start = 0xfffffea0, 195 .start = 0xfffffea0,
202 .end = 0xfffffeab, 196 .end = 0xfffffeab,
203 .flags = IORESOURCE_MEM, 197 .flags = IORESOURCE_MEM,
@@ -219,15 +213,12 @@ static struct platform_device tmu1_device = {
219}; 213};
220 214
221static struct sh_timer_config tmu2_platform_data = { 215static struct sh_timer_config tmu2_platform_data = {
222 .name = "TMU2",
223 .channel_offset = 0x1a, 216 .channel_offset = 0x1a,
224 .timer_bit = 2, 217 .timer_bit = 2,
225 .clk = "peripheral_clk",
226}; 218};
227 219
228static struct resource tmu2_resources[] = { 220static struct resource tmu2_resources[] = {
229 [0] = { 221 [0] = {
230 .name = "TMU2",
231 .start = 0xfffffeac, 222 .start = 0xfffffeac,
232 .end = 0xfffffebb, 223 .end = 0xfffffebb,
233 .flags = IORESOURCE_MEM, 224 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index 0845a3ad006..b0c2fb4ab47 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -127,16 +127,13 @@ static struct platform_device scif1_device = {
127}; 127};
128 128
129static struct sh_timer_config tmu0_platform_data = { 129static struct sh_timer_config tmu0_platform_data = {
130 .name = "TMU0",
131 .channel_offset = 0x02, 130 .channel_offset = 0x02,
132 .timer_bit = 0, 131 .timer_bit = 0,
133 .clk = "peripheral_clk",
134 .clockevent_rating = 200, 132 .clockevent_rating = 200,
135}; 133};
136 134
137static struct resource tmu0_resources[] = { 135static struct resource tmu0_resources[] = {
138 [0] = { 136 [0] = {
139 .name = "TMU0",
140 .start = 0xa412fe94, 137 .start = 0xa412fe94,
141 .end = 0xa412fe9f, 138 .end = 0xa412fe9f,
142 .flags = IORESOURCE_MEM, 139 .flags = IORESOURCE_MEM,
@@ -158,16 +155,13 @@ static struct platform_device tmu0_device = {
158}; 155};
159 156
160static struct sh_timer_config tmu1_platform_data = { 157static struct sh_timer_config tmu1_platform_data = {
161 .name = "TMU1",
162 .channel_offset = 0xe, 158 .channel_offset = 0xe,
163 .timer_bit = 1, 159 .timer_bit = 1,
164 .clk = "peripheral_clk",
165 .clocksource_rating = 200, 160 .clocksource_rating = 200,
166}; 161};
167 162
168static struct resource tmu1_resources[] = { 163static struct resource tmu1_resources[] = {
169 [0] = { 164 [0] = {
170 .name = "TMU1",
171 .start = 0xa412fea0, 165 .start = 0xa412fea0,
172 .end = 0xa412feab, 166 .end = 0xa412feab,
173 .flags = IORESOURCE_MEM, 167 .flags = IORESOURCE_MEM,
@@ -189,15 +183,12 @@ static struct platform_device tmu1_device = {
189}; 183};
190 184
191static struct sh_timer_config tmu2_platform_data = { 185static struct sh_timer_config tmu2_platform_data = {
192 .name = "TMU2",
193 .channel_offset = 0x1a, 186 .channel_offset = 0x1a,
194 .timer_bit = 2, 187 .timer_bit = 2,
195 .clk = "peripheral_clk",
196}; 188};
197 189
198static struct resource tmu2_resources[] = { 190static struct resource tmu2_resources[] = {
199 [0] = { 191 [0] = {
200 .name = "TMU2",
201 .start = 0xa412feac, 192 .start = 0xa412feac,
202 .end = 0xa412feb5, 193 .end = 0xa412feb5,
203 .flags = IORESOURCE_MEM, 194 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7720.c b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
index a718a623109..24b17135d5d 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7720.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7720.c
@@ -130,17 +130,14 @@ static struct platform_device usbf_device = {
130}; 130};
131 131
132static struct sh_timer_config cmt0_platform_data = { 132static struct sh_timer_config cmt0_platform_data = {
133 .name = "CMT0",
134 .channel_offset = 0x10, 133 .channel_offset = 0x10,
135 .timer_bit = 0, 134 .timer_bit = 0,
136 .clk = "peripheral_clk",
137 .clockevent_rating = 125, 135 .clockevent_rating = 125,
138 .clocksource_rating = 125, 136 .clocksource_rating = 125,
139}; 137};
140 138
141static struct resource cmt0_resources[] = { 139static struct resource cmt0_resources[] = {
142 [0] = { 140 [0] = {
143 .name = "CMT0",
144 .start = 0x044a0010, 141 .start = 0x044a0010,
145 .end = 0x044a001b, 142 .end = 0x044a001b,
146 .flags = IORESOURCE_MEM, 143 .flags = IORESOURCE_MEM,
@@ -162,15 +159,12 @@ static struct platform_device cmt0_device = {
162}; 159};
163 160
164static struct sh_timer_config cmt1_platform_data = { 161static struct sh_timer_config cmt1_platform_data = {
165 .name = "CMT1",
166 .channel_offset = 0x20, 162 .channel_offset = 0x20,
167 .timer_bit = 1, 163 .timer_bit = 1,
168 .clk = "peripheral_clk",
169}; 164};
170 165
171static struct resource cmt1_resources[] = { 166static struct resource cmt1_resources[] = {
172 [0] = { 167 [0] = {
173 .name = "CMT1",
174 .start = 0x044a0020, 168 .start = 0x044a0020,
175 .end = 0x044a002b, 169 .end = 0x044a002b,
176 .flags = IORESOURCE_MEM, 170 .flags = IORESOURCE_MEM,
@@ -192,15 +186,12 @@ static struct platform_device cmt1_device = {
192}; 186};
193 187
194static struct sh_timer_config cmt2_platform_data = { 188static struct sh_timer_config cmt2_platform_data = {
195 .name = "CMT2",
196 .channel_offset = 0x30, 189 .channel_offset = 0x30,
197 .timer_bit = 2, 190 .timer_bit = 2,
198 .clk = "peripheral_clk",
199}; 191};
200 192
201static struct resource cmt2_resources[] = { 193static struct resource cmt2_resources[] = {
202 [0] = { 194 [0] = {
203 .name = "CMT2",
204 .start = 0x044a0030, 195 .start = 0x044a0030,
205 .end = 0x044a003b, 196 .end = 0x044a003b,
206 .flags = IORESOURCE_MEM, 197 .flags = IORESOURCE_MEM,
@@ -222,15 +213,12 @@ static struct platform_device cmt2_device = {
222}; 213};
223 214
224static struct sh_timer_config cmt3_platform_data = { 215static struct sh_timer_config cmt3_platform_data = {
225 .name = "CMT3",
226 .channel_offset = 0x40, 216 .channel_offset = 0x40,
227 .timer_bit = 3, 217 .timer_bit = 3,
228 .clk = "peripheral_clk",
229}; 218};
230 219
231static struct resource cmt3_resources[] = { 220static struct resource cmt3_resources[] = {
232 [0] = { 221 [0] = {
233 .name = "CMT3",
234 .start = 0x044a0040, 222 .start = 0x044a0040,
235 .end = 0x044a004b, 223 .end = 0x044a004b,
236 .flags = IORESOURCE_MEM, 224 .flags = IORESOURCE_MEM,
@@ -252,15 +240,12 @@ static struct platform_device cmt3_device = {
252}; 240};
253 241
254static struct sh_timer_config cmt4_platform_data = { 242static struct sh_timer_config cmt4_platform_data = {
255 .name = "CMT4",
256 .channel_offset = 0x50, 243 .channel_offset = 0x50,
257 .timer_bit = 4, 244 .timer_bit = 4,
258 .clk = "peripheral_clk",
259}; 245};
260 246
261static struct resource cmt4_resources[] = { 247static struct resource cmt4_resources[] = {
262 [0] = { 248 [0] = {
263 .name = "CMT4",
264 .start = 0x044a0050, 249 .start = 0x044a0050,
265 .end = 0x044a005b, 250 .end = 0x044a005b,
266 .flags = IORESOURCE_MEM, 251 .flags = IORESOURCE_MEM,
@@ -282,16 +267,13 @@ static struct platform_device cmt4_device = {
282}; 267};
283 268
284static struct sh_timer_config tmu0_platform_data = { 269static struct sh_timer_config tmu0_platform_data = {
285 .name = "TMU0",
286 .channel_offset = 0x02, 270 .channel_offset = 0x02,
287 .timer_bit = 0, 271 .timer_bit = 0,
288 .clk = "peripheral_clk",
289 .clockevent_rating = 200, 272 .clockevent_rating = 200,
290}; 273};
291 274
292static struct resource tmu0_resources[] = { 275static struct resource tmu0_resources[] = {
293 [0] = { 276 [0] = {
294 .name = "TMU0",
295 .start = 0xa412fe94, 277 .start = 0xa412fe94,
296 .end = 0xa412fe9f, 278 .end = 0xa412fe9f,
297 .flags = IORESOURCE_MEM, 279 .flags = IORESOURCE_MEM,
@@ -313,16 +295,13 @@ static struct platform_device tmu0_device = {
313}; 295};
314 296
315static struct sh_timer_config tmu1_platform_data = { 297static struct sh_timer_config tmu1_platform_data = {
316 .name = "TMU1",
317 .channel_offset = 0xe, 298 .channel_offset = 0xe,
318 .timer_bit = 1, 299 .timer_bit = 1,
319 .clk = "peripheral_clk",
320 .clocksource_rating = 200, 300 .clocksource_rating = 200,
321}; 301};
322 302
323static struct resource tmu1_resources[] = { 303static struct resource tmu1_resources[] = {
324 [0] = { 304 [0] = {
325 .name = "TMU1",
326 .start = 0xa412fea0, 305 .start = 0xa412fea0,
327 .end = 0xa412feab, 306 .end = 0xa412feab,
328 .flags = IORESOURCE_MEM, 307 .flags = IORESOURCE_MEM,
@@ -344,15 +323,12 @@ static struct platform_device tmu1_device = {
344}; 323};
345 324
346static struct sh_timer_config tmu2_platform_data = { 325static struct sh_timer_config tmu2_platform_data = {
347 .name = "TMU2",
348 .channel_offset = 0x1a, 326 .channel_offset = 0x1a,
349 .timer_bit = 2, 327 .timer_bit = 2,
350 .clk = "peripheral_clk",
351}; 328};
352 329
353static struct resource tmu2_resources[] = { 330static struct resource tmu2_resources[] = {
354 [0] = { 331 [0] = {
355 .name = "TMU2",
356 .start = 0xa412feac, 332 .start = 0xa412feac,
357 .end = 0xa412feb5, 333 .end = 0xa412feb5,
358 .flags = IORESOURCE_MEM, 334 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
index 6b80850294d..4eabc68cd75 100644
--- a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c
@@ -12,9 +12,10 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/err.h> 14#include <linux/err.h>
15#include <linux/io.h>
16#include <asm/clkdev.h>
15#include <asm/clock.h> 17#include <asm/clock.h>
16#include <asm/freq.h> 18#include <asm/freq.h>
17#include <asm/io.h>
18 19
19#define CPG2_FRQCR3 0xfe0a0018 20#define CPG2_FRQCR3 0xfe0a0018
20 21
@@ -45,7 +46,6 @@ static struct clk_ops sh4202_emi_clk_ops = {
45}; 46};
46 47
47static struct clk sh4202_emi_clk = { 48static struct clk sh4202_emi_clk = {
48 .name = "emi_clk",
49 .flags = CLK_ENABLE_ON_INIT, 49 .flags = CLK_ENABLE_ON_INIT,
50 .ops = &sh4202_emi_clk_ops, 50 .ops = &sh4202_emi_clk_ops,
51}; 51};
@@ -61,7 +61,6 @@ static struct clk_ops sh4202_femi_clk_ops = {
61}; 61};
62 62
63static struct clk sh4202_femi_clk = { 63static struct clk sh4202_femi_clk = {
64 .name = "femi_clk",
65 .flags = CLK_ENABLE_ON_INIT, 64 .flags = CLK_ENABLE_ON_INIT,
66 .ops = &sh4202_femi_clk_ops, 65 .ops = &sh4202_femi_clk_ops,
67}; 66};
@@ -139,7 +138,6 @@ static struct clk_ops sh4202_shoc_clk_ops = {
139}; 138};
140 139
141static struct clk sh4202_shoc_clk = { 140static struct clk sh4202_shoc_clk = {
142 .name = "shoc_clk",
143 .flags = CLK_ENABLE_ON_INIT, 141 .flags = CLK_ENABLE_ON_INIT,
144 .ops = &sh4202_shoc_clk_ops, 142 .ops = &sh4202_shoc_clk_ops,
145}; 143};
@@ -150,6 +148,15 @@ static struct clk *sh4202_onchip_clocks[] = {
150 &sh4202_shoc_clk, 148 &sh4202_shoc_clk,
151}; 149};
152 150
151#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
152
153static struct clk_lookup lookups[] = {
154 /* main clocks */
155 CLKDEV_CON_ID("emi_clk", &sh4202_emi_clk),
156 CLKDEV_CON_ID("femi_clk", &sh4202_femi_clk),
157 CLKDEV_CON_ID("shoc_clk", &sh4202_shoc_clk),
158};
159
153int __init arch_clk_init(void) 160int __init arch_clk_init(void)
154{ 161{
155 struct clk *clk; 162 struct clk *clk;
@@ -167,5 +174,7 @@ int __init arch_clk_init(void)
167 174
168 clk_put(clk); 175 clk_put(clk);
169 176
177 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
178
170 return ret; 179 return ret;
171} 180}
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 822977a06d8..d180f16281e 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -15,7 +15,7 @@
15#include <asm/processor.h> 15#include <asm/processor.h>
16#include <asm/cache.h> 16#include <asm/cache.h>
17 17
18int __init detect_cpu_and_cache_system(void) 18void __cpuinit cpu_probe(void)
19{ 19{
20 unsigned long pvr, prr, cvr; 20 unsigned long pvr, prr, cvr;
21 unsigned long size; 21 unsigned long size;
@@ -251,6 +251,4 @@ int __init detect_cpu_and_cache_system(void)
251 boot_cpu_data.scache.linesz); 251 boot_cpu_data.scache.linesz);
252 } 252 }
253 } 253 }
254
255 return 0;
256} 254}
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
index b9b7e10ad68..e916b18e1f7 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c
@@ -31,16 +31,13 @@ static struct platform_device scif0_device = {
31}; 31};
32 32
33static struct sh_timer_config tmu0_platform_data = { 33static struct sh_timer_config tmu0_platform_data = {
34 .name = "TMU0",
35 .channel_offset = 0x04, 34 .channel_offset = 0x04,
36 .timer_bit = 0, 35 .timer_bit = 0,
37 .clk = "peripheral_clk",
38 .clockevent_rating = 200, 36 .clockevent_rating = 200,
39}; 37};
40 38
41static struct resource tmu0_resources[] = { 39static struct resource tmu0_resources[] = {
42 [0] = { 40 [0] = {
43 .name = "TMU0",
44 .start = 0xffd80008, 41 .start = 0xffd80008,
45 .end = 0xffd80013, 42 .end = 0xffd80013,
46 .flags = IORESOURCE_MEM, 43 .flags = IORESOURCE_MEM,
@@ -62,16 +59,13 @@ static struct platform_device tmu0_device = {
62}; 59};
63 60
64static struct sh_timer_config tmu1_platform_data = { 61static struct sh_timer_config tmu1_platform_data = {
65 .name = "TMU1",
66 .channel_offset = 0x10, 62 .channel_offset = 0x10,
67 .timer_bit = 1, 63 .timer_bit = 1,
68 .clk = "peripheral_clk",
69 .clocksource_rating = 200, 64 .clocksource_rating = 200,
70}; 65};
71 66
72static struct resource tmu1_resources[] = { 67static struct resource tmu1_resources[] = {
73 [0] = { 68 [0] = {
74 .name = "TMU1",
75 .start = 0xffd80014, 69 .start = 0xffd80014,
76 .end = 0xffd8001f, 70 .end = 0xffd8001f,
77 .flags = IORESOURCE_MEM, 71 .flags = IORESOURCE_MEM,
@@ -93,15 +87,12 @@ static struct platform_device tmu1_device = {
93}; 87};
94 88
95static struct sh_timer_config tmu2_platform_data = { 89static struct sh_timer_config tmu2_platform_data = {
96 .name = "TMU2",
97 .channel_offset = 0x1c, 90 .channel_offset = 0x1c,
98 .timer_bit = 2, 91 .timer_bit = 2,
99 .clk = "peripheral_clk",
100}; 92};
101 93
102static struct resource tmu2_resources[] = { 94static struct resource tmu2_resources[] = {
103 [0] = { 95 [0] = {
104 .name = "TMU2",
105 .start = 0xffd80020, 96 .start = 0xffd80020,
106 .end = 0xffd8002f, 97 .end = 0xffd8002f,
107 .flags = IORESOURCE_MEM, 98 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index ffd79e57254..911d196e86b 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -66,16 +66,13 @@ static struct platform_device scif1_device = {
66}; 66};
67 67
68static struct sh_timer_config tmu0_platform_data = { 68static struct sh_timer_config tmu0_platform_data = {
69 .name = "TMU0",
70 .channel_offset = 0x04, 69 .channel_offset = 0x04,
71 .timer_bit = 0, 70 .timer_bit = 0,
72 .clk = "peripheral_clk",
73 .clockevent_rating = 200, 71 .clockevent_rating = 200,
74}; 72};
75 73
76static struct resource tmu0_resources[] = { 74static struct resource tmu0_resources[] = {
77 [0] = { 75 [0] = {
78 .name = "TMU0",
79 .start = 0xffd80008, 76 .start = 0xffd80008,
80 .end = 0xffd80013, 77 .end = 0xffd80013,
81 .flags = IORESOURCE_MEM, 78 .flags = IORESOURCE_MEM,
@@ -97,16 +94,13 @@ static struct platform_device tmu0_device = {
97}; 94};
98 95
99static struct sh_timer_config tmu1_platform_data = { 96static struct sh_timer_config tmu1_platform_data = {
100 .name = "TMU1",
101 .channel_offset = 0x10, 97 .channel_offset = 0x10,
102 .timer_bit = 1, 98 .timer_bit = 1,
103 .clk = "peripheral_clk",
104 .clocksource_rating = 200, 99 .clocksource_rating = 200,
105}; 100};
106 101
107static struct resource tmu1_resources[] = { 102static struct resource tmu1_resources[] = {
108 [0] = { 103 [0] = {
109 .name = "TMU1",
110 .start = 0xffd80014, 104 .start = 0xffd80014,
111 .end = 0xffd8001f, 105 .end = 0xffd8001f,
112 .flags = IORESOURCE_MEM, 106 .flags = IORESOURCE_MEM,
@@ -128,15 +122,12 @@ static struct platform_device tmu1_device = {
128}; 122};
129 123
130static struct sh_timer_config tmu2_platform_data = { 124static struct sh_timer_config tmu2_platform_data = {
131 .name = "TMU2",
132 .channel_offset = 0x1c, 125 .channel_offset = 0x1c,
133 .timer_bit = 2, 126 .timer_bit = 2,
134 .clk = "peripheral_clk",
135}; 127};
136 128
137static struct resource tmu2_resources[] = { 129static struct resource tmu2_resources[] = {
138 [0] = { 130 [0] = {
139 .name = "TMU2",
140 .start = 0xffd80020, 131 .start = 0xffd80020,
141 .end = 0xffd8002f, 132 .end = 0xffd8002f,
142 .flags = IORESOURCE_MEM, 133 .flags = IORESOURCE_MEM,
@@ -163,15 +154,12 @@ static struct platform_device tmu2_device = {
163 defined(CONFIG_CPU_SUBTYPE_SH7751R) 154 defined(CONFIG_CPU_SUBTYPE_SH7751R)
164 155
165static struct sh_timer_config tmu3_platform_data = { 156static struct sh_timer_config tmu3_platform_data = {
166 .name = "TMU3",
167 .channel_offset = 0x04, 157 .channel_offset = 0x04,
168 .timer_bit = 0, 158 .timer_bit = 0,
169 .clk = "peripheral_clk",
170}; 159};
171 160
172static struct resource tmu3_resources[] = { 161static struct resource tmu3_resources[] = {
173 [0] = { 162 [0] = {
174 .name = "TMU3",
175 .start = 0xfe100008, 163 .start = 0xfe100008,
176 .end = 0xfe100013, 164 .end = 0xfe100013,
177 .flags = IORESOURCE_MEM, 165 .flags = IORESOURCE_MEM,
@@ -193,15 +181,12 @@ static struct platform_device tmu3_device = {
193}; 181};
194 182
195static struct sh_timer_config tmu4_platform_data = { 183static struct sh_timer_config tmu4_platform_data = {
196 .name = "TMU4",
197 .channel_offset = 0x10, 184 .channel_offset = 0x10,
198 .timer_bit = 1, 185 .timer_bit = 1,
199 .clk = "peripheral_clk",
200}; 186};
201 187
202static struct resource tmu4_resources[] = { 188static struct resource tmu4_resources[] = {
203 [0] = { 189 [0] = {
204 .name = "TMU4",
205 .start = 0xfe100014, 190 .start = 0xfe100014,
206 .end = 0xfe10001f, 191 .end = 0xfe10001f,
207 .flags = IORESOURCE_MEM, 192 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
index a16eb3656f4..48ea8fe85dc 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c
@@ -187,16 +187,13 @@ static struct platform_device scif3_device = {
187}; 187};
188 188
189static struct sh_timer_config tmu0_platform_data = { 189static struct sh_timer_config tmu0_platform_data = {
190 .name = "TMU0",
191 .channel_offset = 0x04, 190 .channel_offset = 0x04,
192 .timer_bit = 0, 191 .timer_bit = 0,
193 .clk = "peripheral_clk",
194 .clockevent_rating = 200, 192 .clockevent_rating = 200,
195}; 193};
196 194
197static struct resource tmu0_resources[] = { 195static struct resource tmu0_resources[] = {
198 [0] = { 196 [0] = {
199 .name = "TMU0",
200 .start = 0xffd80008, 197 .start = 0xffd80008,
201 .end = 0xffd80013, 198 .end = 0xffd80013,
202 .flags = IORESOURCE_MEM, 199 .flags = IORESOURCE_MEM,
@@ -218,16 +215,13 @@ static struct platform_device tmu0_device = {
218}; 215};
219 216
220static struct sh_timer_config tmu1_platform_data = { 217static struct sh_timer_config tmu1_platform_data = {
221 .name = "TMU1",
222 .channel_offset = 0x10, 218 .channel_offset = 0x10,
223 .timer_bit = 1, 219 .timer_bit = 1,
224 .clk = "peripheral_clk",
225 .clocksource_rating = 200, 220 .clocksource_rating = 200,
226}; 221};
227 222
228static struct resource tmu1_resources[] = { 223static struct resource tmu1_resources[] = {
229 [0] = { 224 [0] = {
230 .name = "TMU1",
231 .start = 0xffd80014, 225 .start = 0xffd80014,
232 .end = 0xffd8001f, 226 .end = 0xffd8001f,
233 .flags = IORESOURCE_MEM, 227 .flags = IORESOURCE_MEM,
@@ -249,15 +243,12 @@ static struct platform_device tmu1_device = {
249}; 243};
250 244
251static struct sh_timer_config tmu2_platform_data = { 245static struct sh_timer_config tmu2_platform_data = {
252 .name = "TMU2",
253 .channel_offset = 0x1c, 246 .channel_offset = 0x1c,
254 .timer_bit = 2, 247 .timer_bit = 2,
255 .clk = "peripheral_clk",
256}; 248};
257 249
258static struct resource tmu2_resources[] = { 250static struct resource tmu2_resources[] = {
259 [0] = { 251 [0] = {
260 .name = "TMU2",
261 .start = 0xffd80020, 252 .start = 0xffd80020,
262 .end = 0xffd8002f, 253 .end = 0xffd8002f,
263 .flags = IORESOURCE_MEM, 254 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
index 2c16df37eda..71291ae201b 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c
@@ -21,6 +21,7 @@
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/kernel.h> 22#include <linux/kernel.h>
23#include <linux/io.h> 23#include <linux/io.h>
24#include <asm/clkdev.h>
24#include <asm/clock.h> 25#include <asm/clock.h>
25 26
26/* SH7343 registers */ 27/* SH7343 registers */
@@ -36,8 +37,6 @@
36 37
37/* Fixed 32 KHz root clock for RTC and Power Management purposes */ 38/* Fixed 32 KHz root clock for RTC and Power Management purposes */
38static struct clk r_clk = { 39static struct clk r_clk = {
39 .name = "rclk",
40 .id = -1,
41 .rate = 32768, 40 .rate = 32768,
42}; 41};
43 42
@@ -46,8 +45,6 @@ static struct clk r_clk = {
46 * from the platform code. 45 * from the platform code.
47 */ 46 */
48struct clk extal_clk = { 47struct clk extal_clk = {
49 .name = "extal",
50 .id = -1,
51 .rate = 33333333, 48 .rate = 33333333,
52}; 49};
53 50
@@ -69,8 +66,6 @@ static struct clk_ops dll_clk_ops = {
69}; 66};
70 67
71static struct clk dll_clk = { 68static struct clk dll_clk = {
72 .name = "dll_clk",
73 .id = -1,
74 .ops = &dll_clk_ops, 69 .ops = &dll_clk_ops,
75 .parent = &r_clk, 70 .parent = &r_clk,
76 .flags = CLK_ENABLE_ON_INIT, 71 .flags = CLK_ENABLE_ON_INIT,
@@ -91,8 +86,6 @@ static struct clk_ops pll_clk_ops = {
91}; 86};
92 87
93static struct clk pll_clk = { 88static struct clk pll_clk = {
94 .name = "pll_clk",
95 .id = -1,
96 .ops = &pll_clk_ops, 89 .ops = &pll_clk_ops,
97 .flags = CLK_ENABLE_ON_INIT, 90 .flags = CLK_ENABLE_ON_INIT,
98}; 91};
@@ -121,72 +114,168 @@ static struct clk_div4_table div4_table = {
121enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_B3, DIV4_P, 114enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_B3, DIV4_P,
122 DIV4_SIUA, DIV4_SIUB, DIV4_NR }; 115 DIV4_SIUA, DIV4_SIUB, DIV4_NR };
123 116
124#define DIV4(_str, _reg, _bit, _mask, _flags) \ 117#define DIV4(_reg, _bit, _mask, _flags) \
125 SH_CLK_DIV4(_str, &pll_clk, _reg, _bit, _mask, _flags) 118 SH_CLK_DIV4(&pll_clk, _reg, _bit, _mask, _flags)
126 119
127struct clk div4_clks[DIV4_NR] = { 120struct clk div4_clks[DIV4_NR] = {
128 [DIV4_I] = DIV4("cpu_clk", FRQCR, 20, 0x1fff, CLK_ENABLE_ON_INIT), 121 [DIV4_I] = DIV4(FRQCR, 20, 0x1fff, CLK_ENABLE_ON_INIT),
129 [DIV4_U] = DIV4("umem_clk", FRQCR, 16, 0x1fff, CLK_ENABLE_ON_INIT), 122 [DIV4_U] = DIV4(FRQCR, 16, 0x1fff, CLK_ENABLE_ON_INIT),
130 [DIV4_SH] = DIV4("shyway_clk", FRQCR, 12, 0x1fff, CLK_ENABLE_ON_INIT), 123 [DIV4_SH] = DIV4(FRQCR, 12, 0x1fff, CLK_ENABLE_ON_INIT),
131 [DIV4_B] = DIV4("bus_clk", FRQCR, 8, 0x1fff, CLK_ENABLE_ON_INIT), 124 [DIV4_B] = DIV4(FRQCR, 8, 0x1fff, CLK_ENABLE_ON_INIT),
132 [DIV4_B3] = DIV4("b3_clk", FRQCR, 4, 0x1fff, CLK_ENABLE_ON_INIT), 125 [DIV4_B3] = DIV4(FRQCR, 4, 0x1fff, CLK_ENABLE_ON_INIT),
133 [DIV4_P] = DIV4("peripheral_clk", FRQCR, 0, 0x1fff, 0), 126 [DIV4_P] = DIV4(FRQCR, 0, 0x1fff, 0),
134 [DIV4_SIUA] = DIV4("siua_clk", SCLKACR, 0, 0x1fff, 0), 127 [DIV4_SIUA] = DIV4(SCLKACR, 0, 0x1fff, 0),
135 [DIV4_SIUB] = DIV4("siub_clk", SCLKBCR, 0, 0x1fff, 0), 128 [DIV4_SIUB] = DIV4(SCLKBCR, 0, 0x1fff, 0),
136}; 129};
137 130
138struct clk div6_clks[] = { 131enum { DIV6_V, DIV6_NR };
139 SH_CLK_DIV6("video_clk", &pll_clk, VCLKCR, 0), 132
133struct clk div6_clks[DIV6_NR] = {
134 [DIV6_V] = SH_CLK_DIV6(&pll_clk, VCLKCR, 0),
135};
136
137#define MSTP(_parent, _reg, _bit, _flags) \
138 SH_CLK_MSTP32(_parent, _reg, _bit, _flags)
139
140enum { MSTP031, MSTP030, MSTP029, MSTP028, MSTP026,
141 MSTP023, MSTP022, MSTP021, MSTP020, MSTP019, MSTP018, MSTP017, MSTP016,
142 MSTP015, MSTP014, MSTP013, MSTP012, MSTP011, MSTP010,
143 MSTP007, MSTP006, MSTP005, MSTP004, MSTP003, MSTP002, MSTP001,
144 MSTP109, MSTP108, MSTP100,
145 MSTP225, MSTP224, MSTP218, MSTP217, MSTP216,
146 MSTP214, MSTP213, MSTP212, MSTP211, MSTP208,
147 MSTP206, MSTP205, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,
148 MSTP_NR };
149
150static struct clk mstp_clks[MSTP_NR] = {
151 [MSTP031] = MSTP(&div4_clks[DIV4_I], MSTPCR0, 31, CLK_ENABLE_ON_INIT),
152 [MSTP030] = MSTP(&div4_clks[DIV4_I], MSTPCR0, 30, CLK_ENABLE_ON_INIT),
153 [MSTP029] = MSTP(&div4_clks[DIV4_I], MSTPCR0, 29, CLK_ENABLE_ON_INIT),
154 [MSTP028] = MSTP(&div4_clks[DIV4_U], MSTPCR0, 28, CLK_ENABLE_ON_INIT),
155 [MSTP026] = MSTP(&div4_clks[DIV4_B], MSTPCR0, 26, CLK_ENABLE_ON_INIT),
156 [MSTP023] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 23, 0),
157 [MSTP022] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 22, 0),
158 [MSTP021] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 21, 0),
159 [MSTP020] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 20, 0),
160 [MSTP019] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 19, 0),
161 [MSTP017] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 17, 0),
162 [MSTP015] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 15, 0),
163 [MSTP014] = MSTP(&r_clk, MSTPCR0, 14, 0),
164 [MSTP013] = MSTP(&r_clk, MSTPCR0, 13, 0),
165 [MSTP011] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 11, 0),
166 [MSTP010] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 10, 0),
167 [MSTP007] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 7, 0),
168 [MSTP006] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 6, 0),
169 [MSTP005] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 5, 0),
170 [MSTP004] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 4, 0),
171 [MSTP003] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 3, 0),
172 [MSTP002] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 2, 0),
173 [MSTP001] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 1, 0),
174
175 [MSTP109] = MSTP(&div4_clks[DIV4_P], MSTPCR1, 9, 0),
176 [MSTP108] = MSTP(&div4_clks[DIV4_P], MSTPCR1, 8, 0),
177
178 [MSTP225] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 25, 0),
179 [MSTP224] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 24, 0),
180 [MSTP218] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 18, 0),
181 [MSTP217] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 17, 0),
182 [MSTP216] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 16, 0),
183 [MSTP214] = MSTP(&r_clk, MSTPCR2, 14, 0),
184 [MSTP213] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 13, 0),
185 [MSTP212] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 12, 0),
186 [MSTP211] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 11, 0),
187 [MSTP208] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 8, 0),
188 [MSTP206] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 6, CLK_ENABLE_ON_INIT),
189 [MSTP205] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 5, 0),
190 [MSTP204] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 4, 0),
191 [MSTP203] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 3, 0),
192 [MSTP202] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 2, CLK_ENABLE_ON_INIT),
193 [MSTP201] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 1, CLK_ENABLE_ON_INIT),
194 [MSTP200] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 0, 0),
140}; 195};
141 196
142#define MSTP(_str, _parent, _reg, _bit, _flags) \ 197#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
143 SH_CLK_MSTP32(_str, -1, _parent, _reg, _bit, _flags) 198
144 199static struct clk_lookup lookups[] = {
145static struct clk mstp_clks[] = { 200 /* main clocks */
146 MSTP("tlb0", &div4_clks[DIV4_I], MSTPCR0, 31, CLK_ENABLE_ON_INIT), 201 CLKDEV_CON_ID("rclk", &r_clk),
147 MSTP("ic0", &div4_clks[DIV4_I], MSTPCR0, 30, CLK_ENABLE_ON_INIT), 202 CLKDEV_CON_ID("extal", &extal_clk),
148 MSTP("oc0", &div4_clks[DIV4_I], MSTPCR0, 29, CLK_ENABLE_ON_INIT), 203 CLKDEV_CON_ID("dll_clk", &dll_clk),
149 MSTP("uram0", &div4_clks[DIV4_U], MSTPCR0, 28, CLK_ENABLE_ON_INIT), 204 CLKDEV_CON_ID("pll_clk", &pll_clk),
150 MSTP("xymem0", &div4_clks[DIV4_B], MSTPCR0, 26, CLK_ENABLE_ON_INIT), 205
151 MSTP("intc3", &div4_clks[DIV4_P], MSTPCR0, 23, 0), 206 /* DIV4 clocks */
152 MSTP("intc0", &div4_clks[DIV4_P], MSTPCR0, 22, 0), 207 CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
153 MSTP("dmac0", &div4_clks[DIV4_P], MSTPCR0, 21, 0), 208 CLKDEV_CON_ID("umem_clk", &div4_clks[DIV4_U]),
154 MSTP("sh0", &div4_clks[DIV4_P], MSTPCR0, 20, 0), 209 CLKDEV_CON_ID("shyway_clk", &div4_clks[DIV4_SH]),
155 MSTP("hudi0", &div4_clks[DIV4_P], MSTPCR0, 19, 0), 210 CLKDEV_CON_ID("bus_clk", &div4_clks[DIV4_B]),
156 MSTP("ubc0", &div4_clks[DIV4_P], MSTPCR0, 17, 0), 211 CLKDEV_CON_ID("b3_clk", &div4_clks[DIV4_B3]),
157 MSTP("tmu0", &div4_clks[DIV4_P], MSTPCR0, 15, 0), 212 CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),
158 MSTP("cmt0", &r_clk, MSTPCR0, 14, 0), 213 CLKDEV_CON_ID("siua_clk", &div4_clks[DIV4_SIUA]),
159 MSTP("rwdt0", &r_clk, MSTPCR0, 13, 0), 214 CLKDEV_CON_ID("siub_clk", &div4_clks[DIV4_SIUB]),
160 MSTP("mfi0", &div4_clks[DIV4_P], MSTPCR0, 11, 0), 215
161 MSTP("flctl0", &div4_clks[DIV4_P], MSTPCR0, 10, 0), 216 /* DIV6 clocks */
162 MSTP("scif0", &div4_clks[DIV4_P], MSTPCR0, 7, 0), 217 CLKDEV_CON_ID("video_clk", &div6_clks[DIV6_V]),
163 MSTP("scif1", &div4_clks[DIV4_P], MSTPCR0, 6, 0), 218
164 MSTP("scif2", &div4_clks[DIV4_P], MSTPCR0, 5, 0), 219 /* MSTP32 clocks */
165 MSTP("scif3", &div4_clks[DIV4_P], MSTPCR0, 4, 0), 220 CLKDEV_CON_ID("tlb0", &mstp_clks[MSTP031]),
166 MSTP("sio0", &div4_clks[DIV4_P], MSTPCR0, 3, 0), 221 CLKDEV_CON_ID("ic0", &mstp_clks[MSTP030]),
167 MSTP("siof0", &div4_clks[DIV4_P], MSTPCR0, 2, 0), 222 CLKDEV_CON_ID("oc0", &mstp_clks[MSTP029]),
168 MSTP("siof1", &div4_clks[DIV4_P], MSTPCR0, 1, 0), 223 CLKDEV_CON_ID("uram0", &mstp_clks[MSTP028]),
169 224 CLKDEV_CON_ID("xymem0", &mstp_clks[MSTP026]),
170 MSTP("i2c0", &div4_clks[DIV4_P], MSTPCR1, 9, 0), 225 CLKDEV_CON_ID("intc3", &mstp_clks[MSTP023]),
171 MSTP("i2c1", &div4_clks[DIV4_P], MSTPCR1, 8, 0), 226 CLKDEV_CON_ID("intc0", &mstp_clks[MSTP022]),
172 227 CLKDEV_CON_ID("dmac0", &mstp_clks[MSTP021]),
173 MSTP("tpu0", &div4_clks[DIV4_P], MSTPCR2, 25, 0), 228 CLKDEV_CON_ID("sh0", &mstp_clks[MSTP020]),
174 MSTP("irda0", &div4_clks[DIV4_P], MSTPCR2, 24, 0), 229 CLKDEV_CON_ID("hudi0", &mstp_clks[MSTP019]),
175 MSTP("sdhi0", &div4_clks[DIV4_P], MSTPCR2, 18, 0), 230 CLKDEV_CON_ID("ubc0", &mstp_clks[MSTP017]),
176 MSTP("mmcif0", &div4_clks[DIV4_P], MSTPCR2, 17, 0), 231 CLKDEV_CON_ID("tmu_fck", &mstp_clks[MSTP015]),
177 MSTP("sim0", &div4_clks[DIV4_P], MSTPCR2, 16, 0), 232 CLKDEV_CON_ID("cmt_fck", &mstp_clks[MSTP014]),
178 MSTP("keysc0", &r_clk, MSTPCR2, 14, 0), 233 CLKDEV_CON_ID("rwdt0", &mstp_clks[MSTP013]),
179 MSTP("tsif0", &div4_clks[DIV4_P], MSTPCR2, 13, 0), 234 CLKDEV_CON_ID("mfi0", &mstp_clks[MSTP011]),
180 MSTP("s3d40", &div4_clks[DIV4_P], MSTPCR2, 12, 0), 235 CLKDEV_CON_ID("flctl0", &mstp_clks[MSTP010]),
181 MSTP("usbf0", &div4_clks[DIV4_P], MSTPCR2, 11, 0), 236 {
182 MSTP("siu0", &div4_clks[DIV4_B], MSTPCR2, 8, 0), 237 /* SCIF0 */
183 MSTP("jpu0", &div4_clks[DIV4_B], MSTPCR2, 6, CLK_ENABLE_ON_INIT), 238 .dev_id = "sh-sci.0",
184 MSTP("vou0", &div4_clks[DIV4_B], MSTPCR2, 5, 0), 239 .con_id = "sci_fck",
185 MSTP("beu0", &div4_clks[DIV4_B], MSTPCR2, 4, 0), 240 .clk = &mstp_clks[MSTP007],
186 MSTP("ceu0", &div4_clks[DIV4_B], MSTPCR2, 3, 0), 241 }, {
187 MSTP("veu0", &div4_clks[DIV4_B], MSTPCR2, 2, CLK_ENABLE_ON_INIT), 242 /* SCIF1 */
188 MSTP("vpu0", &div4_clks[DIV4_B], MSTPCR2, 1, CLK_ENABLE_ON_INIT), 243 .dev_id = "sh-sci.1",
189 MSTP("lcdc0", &div4_clks[DIV4_B], MSTPCR2, 0, 0), 244 .con_id = "sci_fck",
245 .clk = &mstp_clks[MSTP006],
246 }, {
247 /* SCIF2 */
248 .dev_id = "sh-sci.2",
249 .con_id = "sci_fck",
250 .clk = &mstp_clks[MSTP005],
251 }, {
252 /* SCIF3 */
253 .dev_id = "sh-sci.3",
254 .con_id = "sci_fck",
255 .clk = &mstp_clks[MSTP004],
256 },
257 CLKDEV_CON_ID("sio0", &mstp_clks[MSTP003]),
258 CLKDEV_CON_ID("siof0", &mstp_clks[MSTP002]),
259 CLKDEV_CON_ID("siof1", &mstp_clks[MSTP001]),
260 CLKDEV_CON_ID("i2c0", &mstp_clks[MSTP109]),
261 CLKDEV_CON_ID("i2c1", &mstp_clks[MSTP108]),
262 CLKDEV_CON_ID("tpu0", &mstp_clks[MSTP225]),
263 CLKDEV_CON_ID("irda0", &mstp_clks[MSTP224]),
264 CLKDEV_CON_ID("sdhi0", &mstp_clks[MSTP218]),
265 CLKDEV_CON_ID("mmcif0", &mstp_clks[MSTP217]),
266 CLKDEV_CON_ID("sim0", &mstp_clks[MSTP216]),
267 CLKDEV_CON_ID("keysc0", &mstp_clks[MSTP214]),
268 CLKDEV_CON_ID("tsif0", &mstp_clks[MSTP213]),
269 CLKDEV_CON_ID("s3d40", &mstp_clks[MSTP212]),
270 CLKDEV_CON_ID("usbf0", &mstp_clks[MSTP211]),
271 CLKDEV_CON_ID("siu0", &mstp_clks[MSTP208]),
272 CLKDEV_CON_ID("jpu0", &mstp_clks[MSTP206]),
273 CLKDEV_CON_ID("vou0", &mstp_clks[MSTP205]),
274 CLKDEV_CON_ID("beu0", &mstp_clks[MSTP204]),
275 CLKDEV_CON_ID("ceu0", &mstp_clks[MSTP203]),
276 CLKDEV_CON_ID("veu0", &mstp_clks[MSTP202]),
277 CLKDEV_CON_ID("vpu0", &mstp_clks[MSTP201]),
278 CLKDEV_CON_ID("lcdc0", &mstp_clks[MSTP200]),
190}; 279};
191 280
192int __init arch_clk_init(void) 281int __init arch_clk_init(void)
@@ -202,14 +291,16 @@ int __init arch_clk_init(void)
202 for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++) 291 for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++)
203 ret = clk_register(main_clks[k]); 292 ret = clk_register(main_clks[k]);
204 293
294 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
295
205 if (!ret) 296 if (!ret)
206 ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table); 297 ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table);
207 298
208 if (!ret) 299 if (!ret)
209 ret = sh_clk_div6_register(div6_clks, ARRAY_SIZE(div6_clks)); 300 ret = sh_clk_div6_register(div6_clks, DIV6_NR);
210 301
211 if (!ret) 302 if (!ret)
212 ret = sh_clk_mstp32_register(mstp_clks, ARRAY_SIZE(mstp_clks)); 303 ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
213 304
214 return ret; 305 return ret;
215} 306}
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7366.c b/arch/sh/kernel/cpu/sh4a/clock-sh7366.c
index 91588d280cd..7ce5bbcd408 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7366.c
@@ -21,6 +21,7 @@
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/kernel.h> 22#include <linux/kernel.h>
23#include <linux/io.h> 23#include <linux/io.h>
24#include <asm/clkdev.h>
24#include <asm/clock.h> 25#include <asm/clock.h>
25 26
26/* SH7366 registers */ 27/* SH7366 registers */
@@ -36,8 +37,6 @@
36 37
37/* Fixed 32 KHz root clock for RTC and Power Management purposes */ 38/* Fixed 32 KHz root clock for RTC and Power Management purposes */
38static struct clk r_clk = { 39static struct clk r_clk = {
39 .name = "rclk",
40 .id = -1,
41 .rate = 32768, 40 .rate = 32768,
42}; 41};
43 42
@@ -46,8 +45,6 @@ static struct clk r_clk = {
46 * from the platform code. 45 * from the platform code.
47 */ 46 */
48struct clk extal_clk = { 47struct clk extal_clk = {
49 .name = "extal",
50 .id = -1,
51 .rate = 33333333, 48 .rate = 33333333,
52}; 49};
53 50
@@ -69,8 +66,6 @@ static struct clk_ops dll_clk_ops = {
69}; 66};
70 67
71static struct clk dll_clk = { 68static struct clk dll_clk = {
72 .name = "dll_clk",
73 .id = -1,
74 .ops = &dll_clk_ops, 69 .ops = &dll_clk_ops,
75 .parent = &r_clk, 70 .parent = &r_clk,
76 .flags = CLK_ENABLE_ON_INIT, 71 .flags = CLK_ENABLE_ON_INIT,
@@ -94,8 +89,6 @@ static struct clk_ops pll_clk_ops = {
94}; 89};
95 90
96static struct clk pll_clk = { 91static struct clk pll_clk = {
97 .name = "pll_clk",
98 .id = -1,
99 .ops = &pll_clk_ops, 92 .ops = &pll_clk_ops,
100 .flags = CLK_ENABLE_ON_INIT, 93 .flags = CLK_ENABLE_ON_INIT,
101}; 94};
@@ -124,69 +117,154 @@ static struct clk_div4_table div4_table = {
124enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_B3, DIV4_P, 117enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_B3, DIV4_P,
125 DIV4_SIUA, DIV4_SIUB, DIV4_NR }; 118 DIV4_SIUA, DIV4_SIUB, DIV4_NR };
126 119
127#define DIV4(_str, _reg, _bit, _mask, _flags) \ 120#define DIV4(_reg, _bit, _mask, _flags) \
128 SH_CLK_DIV4(_str, &pll_clk, _reg, _bit, _mask, _flags) 121 SH_CLK_DIV4(&pll_clk, _reg, _bit, _mask, _flags)
129 122
130struct clk div4_clks[DIV4_NR] = { 123struct clk div4_clks[DIV4_NR] = {
131 [DIV4_I] = DIV4("cpu_clk", FRQCR, 20, 0x1fef, CLK_ENABLE_ON_INIT), 124 [DIV4_I] = DIV4(FRQCR, 20, 0x1fef, CLK_ENABLE_ON_INIT),
132 [DIV4_U] = DIV4("umem_clk", FRQCR, 16, 0x1fff, CLK_ENABLE_ON_INIT), 125 [DIV4_U] = DIV4(FRQCR, 16, 0x1fff, CLK_ENABLE_ON_INIT),
133 [DIV4_SH] = DIV4("shyway_clk", FRQCR, 12, 0x1fff, CLK_ENABLE_ON_INIT), 126 [DIV4_SH] = DIV4(FRQCR, 12, 0x1fff, CLK_ENABLE_ON_INIT),
134 [DIV4_B] = DIV4("bus_clk", FRQCR, 8, 0x1fff, CLK_ENABLE_ON_INIT), 127 [DIV4_B] = DIV4(FRQCR, 8, 0x1fff, CLK_ENABLE_ON_INIT),
135 [DIV4_B3] = DIV4("b3_clk", FRQCR, 4, 0x1fff, CLK_ENABLE_ON_INIT), 128 [DIV4_B3] = DIV4(FRQCR, 4, 0x1fff, CLK_ENABLE_ON_INIT),
136 [DIV4_P] = DIV4("peripheral_clk", FRQCR, 0, 0x1fff, 0), 129 [DIV4_P] = DIV4(FRQCR, 0, 0x1fff, 0),
137 [DIV4_SIUA] = DIV4("siua_clk", SCLKACR, 0, 0x1fff, 0), 130 [DIV4_SIUA] = DIV4(SCLKACR, 0, 0x1fff, 0),
138 [DIV4_SIUB] = DIV4("siub_clk", SCLKBCR, 0, 0x1fff, 0), 131 [DIV4_SIUB] = DIV4(SCLKBCR, 0, 0x1fff, 0),
139}; 132};
140 133
141struct clk div6_clks[] = { 134enum { DIV6_V, DIV6_NR };
142 SH_CLK_DIV6("video_clk", &pll_clk, VCLKCR, 0), 135
136struct clk div6_clks[DIV6_NR] = {
137 [DIV6_V] = SH_CLK_DIV6(&pll_clk, VCLKCR, 0),
143}; 138};
144 139
145#define MSTP(_str, _parent, _reg, _bit, _flags) \ 140#define MSTP(_parent, _reg, _bit, _flags) \
146 SH_CLK_MSTP32(_str, -1, _parent, _reg, _bit, _flags) 141 SH_CLK_MSTP32(_parent, _reg, _bit, _flags)
142
143enum { MSTP031, MSTP030, MSTP029, MSTP028, MSTP026,
144 MSTP023, MSTP022, MSTP021, MSTP020, MSTP019, MSTP018, MSTP017, MSTP016,
145 MSTP015, MSTP014, MSTP013, MSTP012, MSTP011, MSTP010,
146 MSTP007, MSTP006, MSTP005, MSTP002, MSTP001,
147 MSTP109, MSTP100,
148 MSTP227, MSTP226, MSTP224, MSTP223, MSTP222, MSTP218, MSTP217,
149 MSTP211, MSTP207, MSTP205, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,
150 MSTP_NR };
147 151
148static struct clk mstp_clks[] = { 152static struct clk mstp_clks[MSTP_NR] = {
149 /* See page 52 of Datasheet V0.40: Overview -> Block Diagram */ 153 /* See page 52 of Datasheet V0.40: Overview -> Block Diagram */
150 MSTP("tlb0", &div4_clks[DIV4_I], MSTPCR0, 31, CLK_ENABLE_ON_INIT), 154 [MSTP031] = MSTP(&div4_clks[DIV4_I], MSTPCR0, 31, CLK_ENABLE_ON_INIT),
151 MSTP("ic0", &div4_clks[DIV4_I], MSTPCR0, 30, CLK_ENABLE_ON_INIT), 155 [MSTP030] = MSTP(&div4_clks[DIV4_I], MSTPCR0, 30, CLK_ENABLE_ON_INIT),
152 MSTP("oc0", &div4_clks[DIV4_I], MSTPCR0, 29, CLK_ENABLE_ON_INIT), 156 [MSTP029] = MSTP(&div4_clks[DIV4_I], MSTPCR0, 29, CLK_ENABLE_ON_INIT),
153 MSTP("rsmem0", &div4_clks[DIV4_SH], MSTPCR0, 28, CLK_ENABLE_ON_INIT), 157 [MSTP028] = MSTP(&div4_clks[DIV4_SH], MSTPCR0, 28, CLK_ENABLE_ON_INIT),
154 MSTP("xymem0", &div4_clks[DIV4_B], MSTPCR0, 26, CLK_ENABLE_ON_INIT), 158 [MSTP026] = MSTP(&div4_clks[DIV4_B], MSTPCR0, 26, CLK_ENABLE_ON_INIT),
155 MSTP("intc3", &div4_clks[DIV4_P], MSTPCR0, 23, 0), 159 [MSTP023] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 23, 0),
156 MSTP("intc0", &div4_clks[DIV4_P], MSTPCR0, 22, 0), 160 [MSTP022] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 22, 0),
157 MSTP("dmac0", &div4_clks[DIV4_P], MSTPCR0, 21, 0), 161 [MSTP021] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 21, 0),
158 MSTP("sh0", &div4_clks[DIV4_P], MSTPCR0, 20, 0), 162 [MSTP020] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 20, 0),
159 MSTP("hudi0", &div4_clks[DIV4_P], MSTPCR0, 19, 0), 163 [MSTP019] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 19, 0),
160 MSTP("ubc0", &div4_clks[DIV4_P], MSTPCR0, 17, 0), 164 [MSTP017] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 17, 0),
161 MSTP("tmu0", &div4_clks[DIV4_P], MSTPCR0, 15, 0), 165 [MSTP015] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 15, 0),
162 MSTP("cmt0", &r_clk, MSTPCR0, 14, 0), 166 [MSTP014] = MSTP(&r_clk, MSTPCR0, 14, 0),
163 MSTP("rwdt0", &r_clk, MSTPCR0, 13, 0), 167 [MSTP013] = MSTP(&r_clk, MSTPCR0, 13, 0),
164 MSTP("mfi0", &div4_clks[DIV4_P], MSTPCR0, 11, 0), 168 [MSTP011] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 11, 0),
165 MSTP("flctl0", &div4_clks[DIV4_P], MSTPCR0, 10, 0), 169 [MSTP010] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 10, 0),
166 MSTP("scif0", &div4_clks[DIV4_P], MSTPCR0, 7, 0), 170 [MSTP007] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 7, 0),
167 MSTP("scif1", &div4_clks[DIV4_P], MSTPCR0, 6, 0), 171 [MSTP006] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 6, 0),
168 MSTP("scif2", &div4_clks[DIV4_P], MSTPCR0, 5, 0), 172 [MSTP005] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 5, 0),
169 MSTP("msiof0", &div4_clks[DIV4_P], MSTPCR0, 2, 0), 173 [MSTP002] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 2, 0),
170 MSTP("sbr0", &div4_clks[DIV4_P], MSTPCR0, 1, 0), 174 [MSTP001] = MSTP(&div4_clks[DIV4_P], MSTPCR0, 1, 0),
171 175
172 MSTP("i2c0", &div4_clks[DIV4_P], MSTPCR1, 9, 0), 176 [MSTP109] = MSTP(&div4_clks[DIV4_P], MSTPCR1, 9, 0),
173 177
174 MSTP("icb0", &div4_clks[DIV4_P], MSTPCR2, 27, 0), 178 [MSTP227] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 27, 0),
175 MSTP("meram0", &div4_clks[DIV4_P], MSTPCR2, 26, 0), 179 [MSTP226] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 26, 0),
176 MSTP("dacy1", &div4_clks[DIV4_P], MSTPCR2, 24, 0), 180 [MSTP224] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 24, 0),
177 MSTP("dacy0", &div4_clks[DIV4_P], MSTPCR2, 23, 0), 181 [MSTP223] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 23, 0),
178 MSTP("tsif0", &div4_clks[DIV4_P], MSTPCR2, 22, 0), 182 [MSTP222] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 22, 0),
179 MSTP("sdhi0", &div4_clks[DIV4_P], MSTPCR2, 18, 0), 183 [MSTP218] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 18, 0),
180 MSTP("mmcif0", &div4_clks[DIV4_P], MSTPCR2, 17, 0), 184 [MSTP217] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 17, 0),
181 MSTP("usbf0", &div4_clks[DIV4_P], MSTPCR2, 11, 0), 185 [MSTP211] = MSTP(&div4_clks[DIV4_P], MSTPCR2, 11, 0),
182 MSTP("siu0", &div4_clks[DIV4_B], MSTPCR2, 9, 0), 186 [MSTP207] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 7, CLK_ENABLE_ON_INIT),
183 MSTP("veu1", &div4_clks[DIV4_B], MSTPCR2, 7, CLK_ENABLE_ON_INIT), 187 [MSTP205] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 5, 0),
184 MSTP("vou0", &div4_clks[DIV4_B], MSTPCR2, 5, 0), 188 [MSTP204] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 4, 0),
185 MSTP("beu0", &div4_clks[DIV4_B], MSTPCR2, 4, 0), 189 [MSTP203] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 3, 0),
186 MSTP("ceu0", &div4_clks[DIV4_B], MSTPCR2, 3, 0), 190 [MSTP202] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 2, CLK_ENABLE_ON_INIT),
187 MSTP("veu0", &div4_clks[DIV4_B], MSTPCR2, 2, CLK_ENABLE_ON_INIT), 191 [MSTP201] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 1, CLK_ENABLE_ON_INIT),
188 MSTP("vpu0", &div4_clks[DIV4_B], MSTPCR2, 1, CLK_ENABLE_ON_INIT), 192 [MSTP200] = MSTP(&div4_clks[DIV4_B], MSTPCR2, 0, 0),
189 MSTP("lcdc0", &div4_clks[DIV4_B], MSTPCR2, 0, 0), 193};
194
195#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
196
197static struct clk_lookup lookups[] = {
198 /* main clocks */
199 CLKDEV_CON_ID("rclk", &r_clk),
200 CLKDEV_CON_ID("extal", &extal_clk),
201 CLKDEV_CON_ID("dll_clk", &dll_clk),
202 CLKDEV_CON_ID("pll_clk", &pll_clk),
203
204 /* DIV4 clocks */
205 CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
206 CLKDEV_CON_ID("umem_clk", &div4_clks[DIV4_U]),
207 CLKDEV_CON_ID("shyway_clk", &div4_clks[DIV4_SH]),
208 CLKDEV_CON_ID("bus_clk", &div4_clks[DIV4_B]),
209 CLKDEV_CON_ID("b3_clk", &div4_clks[DIV4_B3]),
210 CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),
211 CLKDEV_CON_ID("siua_clk", &div4_clks[DIV4_SIUA]),
212 CLKDEV_CON_ID("siub_clk", &div4_clks[DIV4_SIUB]),
213
214 /* DIV6 clocks */
215 CLKDEV_CON_ID("video_clk", &div6_clks[DIV6_V]),
216
217 /* MSTP32 clocks */
218 CLKDEV_CON_ID("tlb0", &mstp_clks[MSTP031]),
219 CLKDEV_CON_ID("ic0", &mstp_clks[MSTP030]),
220 CLKDEV_CON_ID("oc0", &mstp_clks[MSTP029]),
221 CLKDEV_CON_ID("rsmem0", &mstp_clks[MSTP028]),
222 CLKDEV_CON_ID("xymem0", &mstp_clks[MSTP026]),
223 CLKDEV_CON_ID("intc3", &mstp_clks[MSTP023]),
224 CLKDEV_CON_ID("intc0", &mstp_clks[MSTP022]),
225 CLKDEV_CON_ID("dmac0", &mstp_clks[MSTP021]),
226 CLKDEV_CON_ID("sh0", &mstp_clks[MSTP020]),
227 CLKDEV_CON_ID("hudi0", &mstp_clks[MSTP019]),
228 CLKDEV_CON_ID("ubc0", &mstp_clks[MSTP017]),
229 CLKDEV_CON_ID("tmu_fck", &mstp_clks[MSTP015]),
230 CLKDEV_CON_ID("cmt_fck", &mstp_clks[MSTP014]),
231 CLKDEV_CON_ID("rwdt0", &mstp_clks[MSTP013]),
232 CLKDEV_CON_ID("mfi0", &mstp_clks[MSTP011]),
233 CLKDEV_CON_ID("flctl0", &mstp_clks[MSTP010]),
234 {
235 /* SCIF0 */
236 .dev_id = "sh-sci.0",
237 .con_id = "sci_fck",
238 .clk = &mstp_clks[MSTP007],
239 }, {
240 /* SCIF1 */
241 .dev_id = "sh-sci.1",
242 .con_id = "sci_fck",
243 .clk = &mstp_clks[MSTP006],
244 }, {
245 /* SCIF2 */
246 .dev_id = "sh-sci.2",
247 .con_id = "sci_fck",
248 .clk = &mstp_clks[MSTP005],
249 },
250 CLKDEV_CON_ID("msiof0", &mstp_clks[MSTP002]),
251 CLKDEV_CON_ID("sbr0", &mstp_clks[MSTP001]),
252 CLKDEV_CON_ID("i2c0", &mstp_clks[MSTP109]),
253 CLKDEV_CON_ID("icb0", &mstp_clks[MSTP227]),
254 CLKDEV_CON_ID("meram0", &mstp_clks[MSTP226]),
255 CLKDEV_CON_ID("dacy1", &mstp_clks[MSTP224]),
256 CLKDEV_CON_ID("dacy0", &mstp_clks[MSTP223]),
257 CLKDEV_CON_ID("tsif0", &mstp_clks[MSTP222]),
258 CLKDEV_CON_ID("sdhi0", &mstp_clks[MSTP218]),
259 CLKDEV_CON_ID("mmcif0", &mstp_clks[MSTP217]),
260 CLKDEV_CON_ID("usbf0", &mstp_clks[MSTP211]),
261 CLKDEV_CON_ID("veu1", &mstp_clks[MSTP207]),
262 CLKDEV_CON_ID("vou0", &mstp_clks[MSTP205]),
263 CLKDEV_CON_ID("beu0", &mstp_clks[MSTP204]),
264 CLKDEV_CON_ID("ceu0", &mstp_clks[MSTP203]),
265 CLKDEV_CON_ID("veu0", &mstp_clks[MSTP202]),
266 CLKDEV_CON_ID("vpu0", &mstp_clks[MSTP201]),
267 CLKDEV_CON_ID("lcdc0", &mstp_clks[MSTP200]),
190}; 268};
191 269
192int __init arch_clk_init(void) 270int __init arch_clk_init(void)
@@ -202,14 +280,16 @@ int __init arch_clk_init(void)
202 for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++) 280 for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++)
203 ret = clk_register(main_clks[k]); 281 ret = clk_register(main_clks[k]);
204 282
283 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
284
205 if (!ret) 285 if (!ret)
206 ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table); 286 ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table);
207 287
208 if (!ret) 288 if (!ret)
209 ret = sh_clk_div6_register(div6_clks, ARRAY_SIZE(div6_clks)); 289 ret = sh_clk_div6_register(div6_clks, DIV6_NR);
210 290
211 if (!ret) 291 if (!ret)
212 ret = sh_clk_mstp32_register(mstp_clks, ARRAY_SIZE(mstp_clks)); 292 ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
213 293
214 return ret; 294 return ret;
215} 295}
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
index 15db6d521c5..2030f3d9fac 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c
@@ -21,6 +21,7 @@
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/kernel.h> 22#include <linux/kernel.h>
23#include <linux/io.h> 23#include <linux/io.h>
24#include <asm/clkdev.h>
24#include <asm/clock.h> 25#include <asm/clock.h>
25#include <asm/hwblk.h> 26#include <asm/hwblk.h>
26#include <cpu/sh7722.h> 27#include <cpu/sh7722.h>
@@ -36,8 +37,6 @@
36 37
37/* Fixed 32 KHz root clock for RTC and Power Management purposes */ 38/* Fixed 32 KHz root clock for RTC and Power Management purposes */
38static struct clk r_clk = { 39static struct clk r_clk = {
39 .name = "rclk",
40 .id = -1,
41 .rate = 32768, 40 .rate = 32768,
42}; 41};
43 42
@@ -46,8 +45,6 @@ static struct clk r_clk = {
46 * from the platform code. 45 * from the platform code.
47 */ 46 */
48struct clk extal_clk = { 47struct clk extal_clk = {
49 .name = "extal",
50 .id = -1,
51 .rate = 33333333, 48 .rate = 33333333,
52}; 49};
53 50
@@ -69,8 +66,6 @@ static struct clk_ops dll_clk_ops = {
69}; 66};
70 67
71static struct clk dll_clk = { 68static struct clk dll_clk = {
72 .name = "dll_clk",
73 .id = -1,
74 .ops = &dll_clk_ops, 69 .ops = &dll_clk_ops,
75 .parent = &r_clk, 70 .parent = &r_clk,
76 .flags = CLK_ENABLE_ON_INIT, 71 .flags = CLK_ENABLE_ON_INIT,
@@ -94,8 +89,6 @@ static struct clk_ops pll_clk_ops = {
94}; 89};
95 90
96static struct clk pll_clk = { 91static struct clk pll_clk = {
97 .name = "pll_clk",
98 .id = -1,
99 .ops = &pll_clk_ops, 92 .ops = &pll_clk_ops,
100 .flags = CLK_ENABLE_ON_INIT, 93 .flags = CLK_ENABLE_ON_INIT,
101}; 94};
@@ -121,68 +114,142 @@ static struct clk_div4_table div4_table = {
121 .div_mult_table = &div4_div_mult_table, 114 .div_mult_table = &div4_div_mult_table,
122}; 115};
123 116
124#define DIV4(_str, _reg, _bit, _mask, _flags) \ 117#define DIV4(_reg, _bit, _mask, _flags) \
125 SH_CLK_DIV4(_str, &pll_clk, _reg, _bit, _mask, _flags) 118 SH_CLK_DIV4(&pll_clk, _reg, _bit, _mask, _flags)
126 119
127enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_B3, DIV4_P, DIV4_NR }; 120enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_B3, DIV4_P, DIV4_NR };
128 121
129struct clk div4_clks[DIV4_NR] = { 122struct clk div4_clks[DIV4_NR] = {
130 [DIV4_I] = DIV4("cpu_clk", FRQCR, 20, 0x1fef, CLK_ENABLE_ON_INIT), 123 [DIV4_I] = DIV4(FRQCR, 20, 0x1fef, CLK_ENABLE_ON_INIT),
131 [DIV4_U] = DIV4("umem_clk", FRQCR, 16, 0x1fff, CLK_ENABLE_ON_INIT), 124 [DIV4_U] = DIV4(FRQCR, 16, 0x1fff, CLK_ENABLE_ON_INIT),
132 [DIV4_SH] = DIV4("shyway_clk", FRQCR, 12, 0x1fff, CLK_ENABLE_ON_INIT), 125 [DIV4_SH] = DIV4(FRQCR, 12, 0x1fff, CLK_ENABLE_ON_INIT),
133 [DIV4_B] = DIV4("bus_clk", FRQCR, 8, 0x1fff, CLK_ENABLE_ON_INIT), 126 [DIV4_B] = DIV4(FRQCR, 8, 0x1fff, CLK_ENABLE_ON_INIT),
134 [DIV4_B3] = DIV4("b3_clk", FRQCR, 4, 0x1fff, CLK_ENABLE_ON_INIT), 127 [DIV4_B3] = DIV4(FRQCR, 4, 0x1fff, CLK_ENABLE_ON_INIT),
135 [DIV4_P] = DIV4("peripheral_clk", FRQCR, 0, 0x1fff, 0), 128 [DIV4_P] = DIV4(FRQCR, 0, 0x1fff, 0),
136}; 129};
137 130
138enum { DIV4_IRDA, DIV4_ENABLE_NR }; 131enum { DIV4_IRDA, DIV4_ENABLE_NR };
139 132
140struct clk div4_enable_clks[DIV4_ENABLE_NR] = { 133struct clk div4_enable_clks[DIV4_ENABLE_NR] = {
141 [DIV4_IRDA] = DIV4("irda_clk", IRDACLKCR, 0, 0x1fff, 0), 134 [DIV4_IRDA] = DIV4(IRDACLKCR, 0, 0x1fff, 0),
142}; 135};
143 136
144enum { DIV4_SIUA, DIV4_SIUB, DIV4_REPARENT_NR }; 137enum { DIV4_SIUA, DIV4_SIUB, DIV4_REPARENT_NR };
145 138
146struct clk div4_reparent_clks[DIV4_REPARENT_NR] = { 139struct clk div4_reparent_clks[DIV4_REPARENT_NR] = {
147 [DIV4_SIUA] = DIV4("siua_clk", SCLKACR, 0, 0x1fff, 0), 140 [DIV4_SIUA] = DIV4(SCLKACR, 0, 0x1fff, 0),
148 [DIV4_SIUB] = DIV4("siub_clk", SCLKBCR, 0, 0x1fff, 0), 141 [DIV4_SIUB] = DIV4(SCLKBCR, 0, 0x1fff, 0),
149}; 142};
150 143
151struct clk div6_clks[] = { 144enum { DIV6_V, DIV6_NR };
152 SH_CLK_DIV6("video_clk", &pll_clk, VCLKCR, 0), 145
146struct clk div6_clks[DIV6_NR] = {
147 [DIV6_V] = SH_CLK_DIV6(&pll_clk, VCLKCR, 0),
148};
149
150static struct clk mstp_clks[HWBLK_NR] = {
151 SH_HWBLK_CLK(HWBLK_URAM, &div4_clks[DIV4_U], CLK_ENABLE_ON_INIT),
152 SH_HWBLK_CLK(HWBLK_XYMEM, &div4_clks[DIV4_B], CLK_ENABLE_ON_INIT),
153 SH_HWBLK_CLK(HWBLK_TMU, &div4_clks[DIV4_P], 0),
154 SH_HWBLK_CLK(HWBLK_CMT, &r_clk, 0),
155 SH_HWBLK_CLK(HWBLK_RWDT, &r_clk, 0),
156 SH_HWBLK_CLK(HWBLK_FLCTL, &div4_clks[DIV4_P], 0),
157 SH_HWBLK_CLK(HWBLK_SCIF0, &div4_clks[DIV4_P], 0),
158 SH_HWBLK_CLK(HWBLK_SCIF1, &div4_clks[DIV4_P], 0),
159 SH_HWBLK_CLK(HWBLK_SCIF2, &div4_clks[DIV4_P], 0),
160
161 SH_HWBLK_CLK(HWBLK_IIC, &div4_clks[DIV4_P], 0),
162 SH_HWBLK_CLK(HWBLK_RTC, &r_clk, 0),
163
164 SH_HWBLK_CLK(HWBLK_SDHI, &div4_clks[DIV4_P], 0),
165 SH_HWBLK_CLK(HWBLK_KEYSC, &r_clk, 0),
166 SH_HWBLK_CLK(HWBLK_USBF, &div4_clks[DIV4_P], 0),
167 SH_HWBLK_CLK(HWBLK_2DG, &div4_clks[DIV4_B], 0),
168 SH_HWBLK_CLK(HWBLK_SIU, &div4_clks[DIV4_B], 0),
169 SH_HWBLK_CLK(HWBLK_VOU, &div4_clks[DIV4_B], 0),
170 SH_HWBLK_CLK(HWBLK_JPU, &div4_clks[DIV4_B], 0),
171 SH_HWBLK_CLK(HWBLK_BEU, &div4_clks[DIV4_B], 0),
172 SH_HWBLK_CLK(HWBLK_CEU, &div4_clks[DIV4_B], 0),
173 SH_HWBLK_CLK(HWBLK_VEU, &div4_clks[DIV4_B], 0),
174 SH_HWBLK_CLK(HWBLK_VPU, &div4_clks[DIV4_B], 0),
175 SH_HWBLK_CLK(HWBLK_LCDC, &div4_clks[DIV4_P], 0),
153}; 176};
154 177
155#define R_CLK &r_clk 178#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
156#define P_CLK &div4_clks[DIV4_P] 179
157#define B_CLK &div4_clks[DIV4_B] 180static struct clk_lookup lookups[] = {
158#define U_CLK &div4_clks[DIV4_U] 181 /* main clocks */
159 182 CLKDEV_CON_ID("rclk", &r_clk),
160static struct clk mstp_clks[] = { 183 CLKDEV_CON_ID("extal", &extal_clk),
161 SH_HWBLK_CLK("uram0", -1, U_CLK, HWBLK_URAM, CLK_ENABLE_ON_INIT), 184 CLKDEV_CON_ID("dll_clk", &dll_clk),
162 SH_HWBLK_CLK("xymem0", -1, B_CLK, HWBLK_XYMEM, CLK_ENABLE_ON_INIT), 185 CLKDEV_CON_ID("pll_clk", &pll_clk),
163 SH_HWBLK_CLK("tmu0", -1, P_CLK, HWBLK_TMU, 0), 186
164 SH_HWBLK_CLK("cmt0", -1, R_CLK, HWBLK_CMT, 0), 187 /* DIV4 clocks */
165 SH_HWBLK_CLK("rwdt0", -1, R_CLK, HWBLK_RWDT, 0), 188 CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
166 SH_HWBLK_CLK("flctl0", -1, P_CLK, HWBLK_FLCTL, 0), 189 CLKDEV_CON_ID("umem_clk", &div4_clks[DIV4_U]),
167 SH_HWBLK_CLK("scif0", -1, P_CLK, HWBLK_SCIF0, 0), 190 CLKDEV_CON_ID("shyway_clk", &div4_clks[DIV4_SH]),
168 SH_HWBLK_CLK("scif1", -1, P_CLK, HWBLK_SCIF1, 0), 191 CLKDEV_CON_ID("bus_clk", &div4_clks[DIV4_B]),
169 SH_HWBLK_CLK("scif2", -1, P_CLK, HWBLK_SCIF2, 0), 192 CLKDEV_CON_ID("b3_clk", &div4_clks[DIV4_B3]),
170 193 CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),
171 SH_HWBLK_CLK("i2c0", -1, P_CLK, HWBLK_IIC, 0), 194 CLKDEV_CON_ID("irda_clk", &div4_enable_clks[DIV4_IRDA]),
172 SH_HWBLK_CLK("rtc0", -1, R_CLK, HWBLK_RTC, 0), 195 CLKDEV_CON_ID("siua_clk", &div4_reparent_clks[DIV4_SIUA]),
173 196 CLKDEV_CON_ID("siub_clk", &div4_reparent_clks[DIV4_SIUB]),
174 SH_HWBLK_CLK("sdhi0", -1, P_CLK, HWBLK_SDHI, 0), 197
175 SH_HWBLK_CLK("keysc0", -1, R_CLK, HWBLK_KEYSC, 0), 198 /* DIV6 clocks */
176 SH_HWBLK_CLK("usbf0", -1, P_CLK, HWBLK_USBF, 0), 199 CLKDEV_CON_ID("video_clk", &div6_clks[DIV6_V]),
177 SH_HWBLK_CLK("2dg0", -1, B_CLK, HWBLK_2DG, 0), 200
178 SH_HWBLK_CLK("siu0", -1, B_CLK, HWBLK_SIU, 0), 201 /* MSTP clocks */
179 SH_HWBLK_CLK("vou0", -1, B_CLK, HWBLK_VOU, 0), 202 CLKDEV_CON_ID("uram0", &mstp_clks[HWBLK_URAM]),
180 SH_HWBLK_CLK("jpu0", -1, B_CLK, HWBLK_JPU, 0), 203 CLKDEV_CON_ID("xymem0", &mstp_clks[HWBLK_XYMEM]),
181 SH_HWBLK_CLK("beu0", -1, B_CLK, HWBLK_BEU, 0), 204 {
182 SH_HWBLK_CLK("ceu0", -1, B_CLK, HWBLK_CEU, 0), 205 /* TMU0 */
183 SH_HWBLK_CLK("veu0", -1, B_CLK, HWBLK_VEU, 0), 206 .dev_id = "sh_tmu.0",
184 SH_HWBLK_CLK("vpu0", -1, B_CLK, HWBLK_VPU, 0), 207 .con_id = "tmu_fck",
185 SH_HWBLK_CLK("lcdc0", -1, P_CLK, HWBLK_LCDC, 0), 208 .clk = &mstp_clks[HWBLK_TMU],
209 }, {
210 /* TMU1 */
211 .dev_id = "sh_tmu.1",
212 .con_id = "tmu_fck",
213 .clk = &mstp_clks[HWBLK_TMU],
214 }, {
215 /* TMU2 */
216 .dev_id = "sh_tmu.2",
217 .con_id = "tmu_fck",
218 .clk = &mstp_clks[HWBLK_TMU],
219 },
220 CLKDEV_CON_ID("cmt_fck", &mstp_clks[HWBLK_CMT]),
221 CLKDEV_CON_ID("rwdt0", &mstp_clks[HWBLK_RWDT]),
222 CLKDEV_CON_ID("flctl0", &mstp_clks[HWBLK_FLCTL]),
223 {
224 /* SCIF0 */
225 .dev_id = "sh-sci.0",
226 .con_id = "sci_fck",
227 .clk = &mstp_clks[HWBLK_SCIF0],
228 }, {
229 /* SCIF1 */
230 .dev_id = "sh-sci.1",
231 .con_id = "sci_fck",
232 .clk = &mstp_clks[HWBLK_SCIF1],
233 }, {
234 /* SCIF2 */
235 .dev_id = "sh-sci.2",
236 .con_id = "sci_fck",
237 .clk = &mstp_clks[HWBLK_SCIF2],
238 },
239 CLKDEV_CON_ID("i2c0", &mstp_clks[HWBLK_IIC]),
240 CLKDEV_CON_ID("rtc0", &mstp_clks[HWBLK_RTC]),
241 CLKDEV_CON_ID("sdhi0", &mstp_clks[HWBLK_SDHI]),
242 CLKDEV_CON_ID("keysc0", &mstp_clks[HWBLK_KEYSC]),
243 CLKDEV_CON_ID("usbf0", &mstp_clks[HWBLK_USBF]),
244 CLKDEV_CON_ID("2dg0", &mstp_clks[HWBLK_2DG]),
245 CLKDEV_CON_ID("siu0", &mstp_clks[HWBLK_SIU]),
246 CLKDEV_CON_ID("vou0", &mstp_clks[HWBLK_VOU]),
247 CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]),
248 CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU]),
249 CLKDEV_CON_ID("ceu0", &mstp_clks[HWBLK_CEU]),
250 CLKDEV_CON_ID("veu0", &mstp_clks[HWBLK_VEU]),
251 CLKDEV_CON_ID("vpu0", &mstp_clks[HWBLK_VPU]),
252 CLKDEV_CON_ID("lcdc0", &mstp_clks[HWBLK_LCDC]),
186}; 253};
187 254
188int __init arch_clk_init(void) 255int __init arch_clk_init(void)
@@ -198,6 +265,8 @@ int __init arch_clk_init(void)
198 for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++) 265 for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++)
199 ret = clk_register(main_clks[k]); 266 ret = clk_register(main_clks[k]);
200 267
268 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
269
201 if (!ret) 270 if (!ret)
202 ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table); 271 ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table);
203 272
@@ -210,10 +279,10 @@ int __init arch_clk_init(void)
210 DIV4_REPARENT_NR, &div4_table); 279 DIV4_REPARENT_NR, &div4_table);
211 280
212 if (!ret) 281 if (!ret)
213 ret = sh_clk_div6_register(div6_clks, ARRAY_SIZE(div6_clks)); 282 ret = sh_clk_div6_register(div6_clks, DIV6_NR);
214 283
215 if (!ret) 284 if (!ret)
216 ret = sh_hwblk_clk_register(mstp_clks, ARRAY_SIZE(mstp_clks)); 285 ret = sh_hwblk_clk_register(mstp_clks, HWBLK_NR);
217 286
218 return ret; 287 return ret;
219} 288}
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
index 50babe01fe4..d3938f0d370 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7723.c
@@ -21,6 +21,8 @@
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/kernel.h> 22#include <linux/kernel.h>
23#include <linux/io.h> 23#include <linux/io.h>
24#include <linux/clk.h>
25#include <asm/clkdev.h>
24#include <asm/clock.h> 26#include <asm/clock.h>
25#include <asm/hwblk.h> 27#include <asm/hwblk.h>
26#include <cpu/sh7723.h> 28#include <cpu/sh7723.h>
@@ -36,8 +38,6 @@
36 38
37/* Fixed 32 KHz root clock for RTC and Power Management purposes */ 39/* Fixed 32 KHz root clock for RTC and Power Management purposes */
38static struct clk r_clk = { 40static struct clk r_clk = {
39 .name = "rclk",
40 .id = -1,
41 .rate = 32768, 41 .rate = 32768,
42}; 42};
43 43
@@ -46,8 +46,6 @@ static struct clk r_clk = {
46 * from the platform code. 46 * from the platform code.
47 */ 47 */
48struct clk extal_clk = { 48struct clk extal_clk = {
49 .name = "extal",
50 .id = -1,
51 .rate = 33333333, 49 .rate = 33333333,
52}; 50};
53 51
@@ -69,8 +67,6 @@ static struct clk_ops dll_clk_ops = {
69}; 67};
70 68
71static struct clk dll_clk = { 69static struct clk dll_clk = {
72 .name = "dll_clk",
73 .id = -1,
74 .ops = &dll_clk_ops, 70 .ops = &dll_clk_ops,
75 .parent = &r_clk, 71 .parent = &r_clk,
76 .flags = CLK_ENABLE_ON_INIT, 72 .flags = CLK_ENABLE_ON_INIT,
@@ -94,8 +90,6 @@ static struct clk_ops pll_clk_ops = {
94}; 90};
95 91
96static struct clk pll_clk = { 92static struct clk pll_clk = {
97 .name = "pll_clk",
98 .id = -1,
99 .ops = &pll_clk_ops, 93 .ops = &pll_clk_ops,
100 .flags = CLK_ENABLE_ON_INIT, 94 .flags = CLK_ENABLE_ON_INIT,
101}; 95};
@@ -123,92 +117,215 @@ static struct clk_div4_table div4_table = {
123 117
124enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_B3, DIV4_P, DIV4_NR }; 118enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_B3, DIV4_P, DIV4_NR };
125 119
126#define DIV4(_str, _reg, _bit, _mask, _flags) \ 120#define DIV4(_reg, _bit, _mask, _flags) \
127 SH_CLK_DIV4(_str, &pll_clk, _reg, _bit, _mask, _flags) 121 SH_CLK_DIV4(&pll_clk, _reg, _bit, _mask, _flags)
128 122
129struct clk div4_clks[DIV4_NR] = { 123struct clk div4_clks[DIV4_NR] = {
130 [DIV4_I] = DIV4("cpu_clk", FRQCR, 20, 0x0dbf, CLK_ENABLE_ON_INIT), 124 [DIV4_I] = DIV4(FRQCR, 20, 0x0dbf, CLK_ENABLE_ON_INIT),
131 [DIV4_U] = DIV4("umem_clk", FRQCR, 16, 0x0dbf, CLK_ENABLE_ON_INIT), 125 [DIV4_U] = DIV4(FRQCR, 16, 0x0dbf, CLK_ENABLE_ON_INIT),
132 [DIV4_SH] = DIV4("shyway_clk", FRQCR, 12, 0x0dbf, CLK_ENABLE_ON_INIT), 126 [DIV4_SH] = DIV4(FRQCR, 12, 0x0dbf, CLK_ENABLE_ON_INIT),
133 [DIV4_B] = DIV4("bus_clk", FRQCR, 8, 0x0dbf, CLK_ENABLE_ON_INIT), 127 [DIV4_B] = DIV4(FRQCR, 8, 0x0dbf, CLK_ENABLE_ON_INIT),
134 [DIV4_B3] = DIV4("b3_clk", FRQCR, 4, 0x0db4, CLK_ENABLE_ON_INIT), 128 [DIV4_B3] = DIV4(FRQCR, 4, 0x0db4, CLK_ENABLE_ON_INIT),
135 [DIV4_P] = DIV4("peripheral_clk", FRQCR, 0, 0x0dbf, 0), 129 [DIV4_P] = DIV4(FRQCR, 0, 0x0dbf, 0),
136}; 130};
137 131
138enum { DIV4_IRDA, DIV4_ENABLE_NR }; 132enum { DIV4_IRDA, DIV4_ENABLE_NR };
139 133
140struct clk div4_enable_clks[DIV4_ENABLE_NR] = { 134struct clk div4_enable_clks[DIV4_ENABLE_NR] = {
141 [DIV4_IRDA] = DIV4("irda_clk", IRDACLKCR, 0, 0x0dbf, 0), 135 [DIV4_IRDA] = DIV4(IRDACLKCR, 0, 0x0dbf, 0),
142}; 136};
143 137
144enum { DIV4_SIUA, DIV4_SIUB, DIV4_REPARENT_NR }; 138enum { DIV4_SIUA, DIV4_SIUB, DIV4_REPARENT_NR };
145 139
146struct clk div4_reparent_clks[DIV4_REPARENT_NR] = { 140struct clk div4_reparent_clks[DIV4_REPARENT_NR] = {
147 [DIV4_SIUA] = DIV4("siua_clk", SCLKACR, 0, 0x0dbf, 0), 141 [DIV4_SIUA] = DIV4(SCLKACR, 0, 0x0dbf, 0),
148 [DIV4_SIUB] = DIV4("siub_clk", SCLKBCR, 0, 0x0dbf, 0), 142 [DIV4_SIUB] = DIV4(SCLKBCR, 0, 0x0dbf, 0),
149};
150struct clk div6_clks[] = {
151 SH_CLK_DIV6("video_clk", &pll_clk, VCLKCR, 0),
152}; 143};
144enum { DIV6_V, DIV6_NR };
153 145
154#define R_CLK (&r_clk) 146struct clk div6_clks[DIV6_NR] = {
155#define P_CLK (&div4_clks[DIV4_P]) 147 [DIV6_V] = SH_CLK_DIV6(&pll_clk, VCLKCR, 0),
156#define B_CLK (&div4_clks[DIV4_B]) 148};
157#define U_CLK (&div4_clks[DIV4_U])
158#define I_CLK (&div4_clks[DIV4_I])
159#define SH_CLK (&div4_clks[DIV4_SH])
160 149
161static struct clk mstp_clks[] = { 150static struct clk mstp_clks[] = {
162 /* See page 60 of Datasheet V1.0: Overview -> Block Diagram */ 151 /* See page 60 of Datasheet V1.0: Overview -> Block Diagram */
163 SH_HWBLK_CLK("tlb0", -1, I_CLK, HWBLK_TLB, CLK_ENABLE_ON_INIT), 152 SH_HWBLK_CLK(HWBLK_TLB, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
164 SH_HWBLK_CLK("ic0", -1, I_CLK, HWBLK_IC, CLK_ENABLE_ON_INIT), 153 SH_HWBLK_CLK(HWBLK_IC, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
165 SH_HWBLK_CLK("oc0", -1, I_CLK, HWBLK_OC, CLK_ENABLE_ON_INIT), 154 SH_HWBLK_CLK(HWBLK_OC, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
166 SH_HWBLK_CLK("l2c0", -1, SH_CLK, HWBLK_L2C, CLK_ENABLE_ON_INIT), 155 SH_HWBLK_CLK(HWBLK_L2C, &div4_clks[DIV4_SH], CLK_ENABLE_ON_INIT),
167 SH_HWBLK_CLK("ilmem0", -1, I_CLK, HWBLK_ILMEM, CLK_ENABLE_ON_INIT), 156 SH_HWBLK_CLK(HWBLK_ILMEM, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
168 SH_HWBLK_CLK("fpu0", -1, I_CLK, HWBLK_FPU, CLK_ENABLE_ON_INIT), 157 SH_HWBLK_CLK(HWBLK_FPU, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
169 SH_HWBLK_CLK("intc0", -1, I_CLK, HWBLK_INTC, CLK_ENABLE_ON_INIT), 158 SH_HWBLK_CLK(HWBLK_INTC, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
170 SH_HWBLK_CLK("dmac0", -1, B_CLK, HWBLK_DMAC0, 0), 159 SH_HWBLK_CLK(HWBLK_DMAC0, &div4_clks[DIV4_B], 0),
171 SH_HWBLK_CLK("sh0", -1, SH_CLK, HWBLK_SHYWAY, CLK_ENABLE_ON_INIT), 160 SH_HWBLK_CLK(HWBLK_SHYWAY, &div4_clks[DIV4_SH], CLK_ENABLE_ON_INIT),
172 SH_HWBLK_CLK("hudi0", -1, P_CLK, HWBLK_HUDI, 0), 161 SH_HWBLK_CLK(HWBLK_HUDI, &div4_clks[DIV4_P], 0),
173 SH_HWBLK_CLK("ubc0", -1, I_CLK, HWBLK_UBC, 0), 162 SH_HWBLK_CLK(HWBLK_UBC, &div4_clks[DIV4_I], 0),
174 SH_HWBLK_CLK("tmu0", -1, P_CLK, HWBLK_TMU0, 0), 163 SH_HWBLK_CLK(HWBLK_TMU0, &div4_clks[DIV4_P], 0),
175 SH_HWBLK_CLK("cmt0", -1, R_CLK, HWBLK_CMT, 0), 164 SH_HWBLK_CLK(HWBLK_CMT, &r_clk, 0),
176 SH_HWBLK_CLK("rwdt0", -1, R_CLK, HWBLK_RWDT, 0), 165 SH_HWBLK_CLK(HWBLK_RWDT, &r_clk, 0),
177 SH_HWBLK_CLK("dmac1", -1, B_CLK, HWBLK_DMAC1, 0), 166 SH_HWBLK_CLK(HWBLK_DMAC1, &div4_clks[DIV4_B], 0),
178 SH_HWBLK_CLK("tmu1", -1, P_CLK, HWBLK_TMU1, 0), 167 SH_HWBLK_CLK(HWBLK_TMU1, &div4_clks[DIV4_P], 0),
179 SH_HWBLK_CLK("flctl0", -1, P_CLK, HWBLK_FLCTL, 0), 168 SH_HWBLK_CLK(HWBLK_FLCTL, &div4_clks[DIV4_P], 0),
180 SH_HWBLK_CLK("scif0", -1, P_CLK, HWBLK_SCIF0, 0), 169 SH_HWBLK_CLK(HWBLK_SCIF0, &div4_clks[DIV4_P], 0),
181 SH_HWBLK_CLK("scif1", -1, P_CLK, HWBLK_SCIF1, 0), 170 SH_HWBLK_CLK(HWBLK_SCIF1, &div4_clks[DIV4_P], 0),
182 SH_HWBLK_CLK("scif2", -1, P_CLK, HWBLK_SCIF2, 0), 171 SH_HWBLK_CLK(HWBLK_SCIF2, &div4_clks[DIV4_P], 0),
183 SH_HWBLK_CLK("scif3", -1, B_CLK, HWBLK_SCIF3, 0), 172 SH_HWBLK_CLK(HWBLK_SCIF3, &div4_clks[DIV4_B], 0),
184 SH_HWBLK_CLK("scif4", -1, B_CLK, HWBLK_SCIF4, 0), 173 SH_HWBLK_CLK(HWBLK_SCIF4, &div4_clks[DIV4_B], 0),
185 SH_HWBLK_CLK("scif5", -1, B_CLK, HWBLK_SCIF5, 0), 174 SH_HWBLK_CLK(HWBLK_SCIF5, &div4_clks[DIV4_B], 0),
186 SH_HWBLK_CLK("msiof0", -1, B_CLK, HWBLK_MSIOF0, 0), 175 SH_HWBLK_CLK(HWBLK_MSIOF0, &div4_clks[DIV4_B], 0),
187 SH_HWBLK_CLK("msiof1", -1, B_CLK, HWBLK_MSIOF1, 0), 176 SH_HWBLK_CLK(HWBLK_MSIOF1, &div4_clks[DIV4_B], 0),
188 SH_HWBLK_CLK("meram0", -1, SH_CLK, HWBLK_MERAM, 0), 177 SH_HWBLK_CLK(HWBLK_MERAM, &div4_clks[DIV4_SH], 0),
189 178
190 SH_HWBLK_CLK("i2c0", -1, P_CLK, HWBLK_IIC, 0), 179 SH_HWBLK_CLK(HWBLK_IIC, &div4_clks[DIV4_P], 0),
191 SH_HWBLK_CLK("rtc0", -1, R_CLK, HWBLK_RTC, 0), 180 SH_HWBLK_CLK(HWBLK_RTC, &r_clk, 0),
192 181
193 SH_HWBLK_CLK("atapi0", -1, SH_CLK, HWBLK_ATAPI, 0), 182 SH_HWBLK_CLK(HWBLK_ATAPI, &div4_clks[DIV4_SH], 0),
194 SH_HWBLK_CLK("adc0", -1, P_CLK, HWBLK_ADC, 0), 183 SH_HWBLK_CLK(HWBLK_ADC, &div4_clks[DIV4_P], 0),
195 SH_HWBLK_CLK("tpu0", -1, B_CLK, HWBLK_TPU, 0), 184 SH_HWBLK_CLK(HWBLK_TPU, &div4_clks[DIV4_B], 0),
196 SH_HWBLK_CLK("irda0", -1, P_CLK, HWBLK_IRDA, 0), 185 SH_HWBLK_CLK(HWBLK_IRDA, &div4_clks[DIV4_P], 0),
197 SH_HWBLK_CLK("tsif0", -1, B_CLK, HWBLK_TSIF, 0), 186 SH_HWBLK_CLK(HWBLK_TSIF, &div4_clks[DIV4_B], 0),
198 SH_HWBLK_CLK("icb0", -1, B_CLK, HWBLK_ICB, CLK_ENABLE_ON_INIT), 187 SH_HWBLK_CLK(HWBLK_ICB, &div4_clks[DIV4_B], CLK_ENABLE_ON_INIT),
199 SH_HWBLK_CLK("sdhi0", -1, B_CLK, HWBLK_SDHI0, 0), 188 SH_HWBLK_CLK(HWBLK_SDHI0, &div4_clks[DIV4_B], 0),
200 SH_HWBLK_CLK("sdhi1", -1, B_CLK, HWBLK_SDHI1, 0), 189 SH_HWBLK_CLK(HWBLK_SDHI1, &div4_clks[DIV4_B], 0),
201 SH_HWBLK_CLK("keysc0", -1, R_CLK, HWBLK_KEYSC, 0), 190 SH_HWBLK_CLK(HWBLK_KEYSC, &r_clk, 0),
202 SH_HWBLK_CLK("usb0", -1, B_CLK, HWBLK_USB, 0), 191 SH_HWBLK_CLK(HWBLK_USB, &div4_clks[DIV4_B], 0),
203 SH_HWBLK_CLK("2dg0", -1, B_CLK, HWBLK_2DG, 0), 192 SH_HWBLK_CLK(HWBLK_2DG, &div4_clks[DIV4_B], 0),
204 SH_HWBLK_CLK("siu0", -1, B_CLK, HWBLK_SIU, 0), 193 SH_HWBLK_CLK(HWBLK_SIU, &div4_clks[DIV4_B], 0),
205 SH_HWBLK_CLK("veu1", -1, B_CLK, HWBLK_VEU2H1, 0), 194 SH_HWBLK_CLK(HWBLK_VEU2H1, &div4_clks[DIV4_B], 0),
206 SH_HWBLK_CLK("vou0", -1, B_CLK, HWBLK_VOU, 0), 195 SH_HWBLK_CLK(HWBLK_VOU, &div4_clks[DIV4_B], 0),
207 SH_HWBLK_CLK("beu0", -1, B_CLK, HWBLK_BEU, 0), 196 SH_HWBLK_CLK(HWBLK_BEU, &div4_clks[DIV4_B], 0),
208 SH_HWBLK_CLK("ceu0", -1, B_CLK, HWBLK_CEU, 0), 197 SH_HWBLK_CLK(HWBLK_CEU, &div4_clks[DIV4_B], 0),
209 SH_HWBLK_CLK("veu0", -1, B_CLK, HWBLK_VEU2H0, 0), 198 SH_HWBLK_CLK(HWBLK_VEU2H0, &div4_clks[DIV4_B], 0),
210 SH_HWBLK_CLK("vpu0", -1, B_CLK, HWBLK_VPU, 0), 199 SH_HWBLK_CLK(HWBLK_VPU, &div4_clks[DIV4_B], 0),
211 SH_HWBLK_CLK("lcdc0", -1, B_CLK, HWBLK_LCDC, 0), 200 SH_HWBLK_CLK(HWBLK_LCDC, &div4_clks[DIV4_B], 0),
201};
202
203#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
204
205static struct clk_lookup lookups[] = {
206 /* main clocks */
207 CLKDEV_CON_ID("rclk", &r_clk),
208 CLKDEV_CON_ID("extal", &extal_clk),
209 CLKDEV_CON_ID("dll_clk", &dll_clk),
210 CLKDEV_CON_ID("pll_clk", &pll_clk),
211
212 /* DIV4 clocks */
213 CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
214 CLKDEV_CON_ID("umem_clk", &div4_clks[DIV4_U]),
215 CLKDEV_CON_ID("shyway_clk", &div4_clks[DIV4_SH]),
216 CLKDEV_CON_ID("bus_clk", &div4_clks[DIV4_B]),
217 CLKDEV_CON_ID("b3_clk", &div4_clks[DIV4_B3]),
218 CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),
219 CLKDEV_CON_ID("irda_clk", &div4_enable_clks[DIV4_IRDA]),
220 CLKDEV_CON_ID("siua_clk", &div4_reparent_clks[DIV4_SIUA]),
221 CLKDEV_CON_ID("siub_clk", &div4_reparent_clks[DIV4_SIUB]),
222
223 /* DIV6 clocks */
224 CLKDEV_CON_ID("video_clk", &div6_clks[DIV6_V]),
225
226 /* MSTP clocks */
227 CLKDEV_CON_ID("tlb0", &mstp_clks[HWBLK_TLB]),
228 CLKDEV_CON_ID("ic0", &mstp_clks[HWBLK_IC]),
229 CLKDEV_CON_ID("oc0", &mstp_clks[HWBLK_OC]),
230 CLKDEV_CON_ID("l2c0", &mstp_clks[HWBLK_L2C]),
231 CLKDEV_CON_ID("ilmem0", &mstp_clks[HWBLK_ILMEM]),
232 CLKDEV_CON_ID("fpu0", &mstp_clks[HWBLK_FPU]),
233 CLKDEV_CON_ID("intc0", &mstp_clks[HWBLK_INTC]),
234 CLKDEV_CON_ID("dmac0", &mstp_clks[HWBLK_DMAC0]),
235 CLKDEV_CON_ID("sh0", &mstp_clks[HWBLK_SHYWAY]),
236 CLKDEV_CON_ID("hudi0", &mstp_clks[HWBLK_HUDI]),
237 CLKDEV_CON_ID("ubc0", &mstp_clks[HWBLK_UBC]),
238 {
239 /* TMU0 */
240 .dev_id = "sh_tmu.0",
241 .con_id = "tmu_fck",
242 .clk = &mstp_clks[HWBLK_TMU0],
243 }, {
244 /* TMU1 */
245 .dev_id = "sh_tmu.1",
246 .con_id = "tmu_fck",
247 .clk = &mstp_clks[HWBLK_TMU0],
248 }, {
249 /* TMU2 */
250 .dev_id = "sh_tmu.2",
251 .con_id = "tmu_fck",
252 .clk = &mstp_clks[HWBLK_TMU0],
253 },
254 CLKDEV_CON_ID("cmt_fck", &mstp_clks[HWBLK_CMT]),
255 CLKDEV_CON_ID("rwdt0", &mstp_clks[HWBLK_RWDT]),
256 CLKDEV_CON_ID("dmac1", &mstp_clks[HWBLK_DMAC1]),
257 {
258 /* TMU3 */
259 .dev_id = "sh_tmu.3",
260 .con_id = "tmu_fck",
261 .clk = &mstp_clks[HWBLK_TMU1],
262 }, {
263 /* TMU4 */
264 .dev_id = "sh_tmu.4",
265 .con_id = "tmu_fck",
266 .clk = &mstp_clks[HWBLK_TMU1],
267 }, {
268 /* TMU5 */
269 .dev_id = "sh_tmu.5",
270 .con_id = "tmu_fck",
271 .clk = &mstp_clks[HWBLK_TMU1],
272 },
273 CLKDEV_CON_ID("flctl0", &mstp_clks[HWBLK_FLCTL]),
274 {
275 /* SCIF0 */
276 .dev_id = "sh-sci.0",
277 .con_id = "sci_fck",
278 .clk = &mstp_clks[HWBLK_SCIF0],
279 }, {
280 /* SCIF1 */
281 .dev_id = "sh-sci.1",
282 .con_id = "sci_fck",
283 .clk = &mstp_clks[HWBLK_SCIF1],
284 }, {
285 /* SCIF2 */
286 .dev_id = "sh-sci.2",
287 .con_id = "sci_fck",
288 .clk = &mstp_clks[HWBLK_SCIF2],
289 }, {
290 /* SCIF3 */
291 .dev_id = "sh-sci.3",
292 .con_id = "sci_fck",
293 .clk = &mstp_clks[HWBLK_SCIF3],
294 }, {
295 /* SCIF4 */
296 .dev_id = "sh-sci.4",
297 .con_id = "sci_fck",
298 .clk = &mstp_clks[HWBLK_SCIF4],
299 }, {
300 /* SCIF5 */
301 .dev_id = "sh-sci.5",
302 .con_id = "sci_fck",
303 .clk = &mstp_clks[HWBLK_SCIF5],
304 },
305 CLKDEV_CON_ID("msiof0", &mstp_clks[HWBLK_MSIOF0]),
306 CLKDEV_CON_ID("msiof1", &mstp_clks[HWBLK_MSIOF1]),
307 CLKDEV_CON_ID("meram0", &mstp_clks[HWBLK_MERAM]),
308 CLKDEV_CON_ID("i2c0", &mstp_clks[HWBLK_IIC]),
309 CLKDEV_CON_ID("rtc0", &mstp_clks[HWBLK_RTC]),
310 CLKDEV_CON_ID("atapi0", &mstp_clks[HWBLK_ATAPI]),
311 CLKDEV_CON_ID("adc0", &mstp_clks[HWBLK_ADC]),
312 CLKDEV_CON_ID("tpu0", &mstp_clks[HWBLK_TPU]),
313 CLKDEV_CON_ID("irda0", &mstp_clks[HWBLK_IRDA]),
314 CLKDEV_CON_ID("tsif0", &mstp_clks[HWBLK_TSIF]),
315 CLKDEV_CON_ID("icb0", &mstp_clks[HWBLK_ICB]),
316 CLKDEV_CON_ID("sdhi0", &mstp_clks[HWBLK_SDHI0]),
317 CLKDEV_CON_ID("sdhi1", &mstp_clks[HWBLK_SDHI1]),
318 CLKDEV_CON_ID("keysc0", &mstp_clks[HWBLK_KEYSC]),
319 CLKDEV_CON_ID("usb0", &mstp_clks[HWBLK_USB]),
320 CLKDEV_CON_ID("2dg0", &mstp_clks[HWBLK_2DG]),
321 CLKDEV_CON_ID("siu0", &mstp_clks[HWBLK_SIU]),
322 CLKDEV_CON_ID("veu1", &mstp_clks[HWBLK_VEU2H1]),
323 CLKDEV_CON_ID("vou0", &mstp_clks[HWBLK_VOU]),
324 CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU]),
325 CLKDEV_CON_ID("ceu0", &mstp_clks[HWBLK_CEU]),
326 CLKDEV_CON_ID("veu0", &mstp_clks[HWBLK_VEU2H0]),
327 CLKDEV_CON_ID("vpu0", &mstp_clks[HWBLK_VPU]),
328 CLKDEV_CON_ID("lcdc0", &mstp_clks[HWBLK_LCDC]),
212}; 329};
213 330
214int __init arch_clk_init(void) 331int __init arch_clk_init(void)
@@ -222,7 +339,9 @@ int __init arch_clk_init(void)
222 pll_clk.parent = &extal_clk; 339 pll_clk.parent = &extal_clk;
223 340
224 for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++) 341 for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++)
225 ret = clk_register(main_clks[k]); 342 ret |= clk_register(main_clks[k]);
343
344 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
226 345
227 if (!ret) 346 if (!ret)
228 ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table); 347 ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table);
@@ -236,10 +355,10 @@ int __init arch_clk_init(void)
236 DIV4_REPARENT_NR, &div4_table); 355 DIV4_REPARENT_NR, &div4_table);
237 356
238 if (!ret) 357 if (!ret)
239 ret = sh_clk_div6_register(div6_clks, ARRAY_SIZE(div6_clks)); 358 ret = sh_clk_div6_register(div6_clks, DIV6_NR);
240 359
241 if (!ret) 360 if (!ret)
242 ret = sh_hwblk_clk_register(mstp_clks, ARRAY_SIZE(mstp_clks)); 361 ret = sh_hwblk_clk_register(mstp_clks, HWBLK_NR);
243 362
244 return ret; 363 return ret;
245} 364}
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
index 6707061fbf5..2d9700c6b53 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
@@ -21,6 +21,8 @@
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/kernel.h> 22#include <linux/kernel.h>
23#include <linux/io.h> 23#include <linux/io.h>
24#include <linux/clk.h>
25#include <asm/clkdev.h>
24#include <asm/clock.h> 26#include <asm/clock.h>
25#include <asm/hwblk.h> 27#include <asm/hwblk.h>
26#include <cpu/sh7724.h> 28#include <cpu/sh7724.h>
@@ -39,8 +41,6 @@
39 41
40/* Fixed 32 KHz root clock for RTC and Power Management purposes */ 42/* Fixed 32 KHz root clock for RTC and Power Management purposes */
41static struct clk r_clk = { 43static struct clk r_clk = {
42 .name = "rclk",
43 .id = -1,
44 .rate = 32768, 44 .rate = 32768,
45}; 45};
46 46
@@ -49,8 +49,6 @@ static struct clk r_clk = {
49 * from the platform code. 49 * from the platform code.
50 */ 50 */
51struct clk extal_clk = { 51struct clk extal_clk = {
52 .name = "extal",
53 .id = -1,
54 .rate = 33333333, 52 .rate = 33333333,
55}; 53};
56 54
@@ -74,8 +72,6 @@ static struct clk_ops fll_clk_ops = {
74}; 72};
75 73
76static struct clk fll_clk = { 74static struct clk fll_clk = {
77 .name = "fll_clk",
78 .id = -1,
79 .ops = &fll_clk_ops, 75 .ops = &fll_clk_ops,
80 .parent = &r_clk, 76 .parent = &r_clk,
81 .flags = CLK_ENABLE_ON_INIT, 77 .flags = CLK_ENABLE_ON_INIT,
@@ -96,8 +92,6 @@ static struct clk_ops pll_clk_ops = {
96}; 92};
97 93
98static struct clk pll_clk = { 94static struct clk pll_clk = {
99 .name = "pll_clk",
100 .id = -1,
101 .ops = &pll_clk_ops, 95 .ops = &pll_clk_ops,
102 .flags = CLK_ENABLE_ON_INIT, 96 .flags = CLK_ENABLE_ON_INIT,
103}; 97};
@@ -113,8 +107,6 @@ static struct clk_ops div3_clk_ops = {
113}; 107};
114 108
115static struct clk div3_clk = { 109static struct clk div3_clk = {
116 .name = "div3_clk",
117 .id = -1,
118 .ops = &div3_clk_ops, 110 .ops = &div3_clk_ops,
119 .parent = &pll_clk, 111 .parent = &pll_clk,
120}; 112};
@@ -151,86 +143,215 @@ static struct clk_div4_table div4_table = {
151 143
152enum { DIV4_I, DIV4_SH, DIV4_B, DIV4_P, DIV4_M1, DIV4_NR }; 144enum { DIV4_I, DIV4_SH, DIV4_B, DIV4_P, DIV4_M1, DIV4_NR };
153 145
154#define DIV4(_str, _reg, _bit, _mask, _flags) \ 146#define DIV4(_reg, _bit, _mask, _flags) \
155 SH_CLK_DIV4(_str, &pll_clk, _reg, _bit, _mask, _flags) 147 SH_CLK_DIV4(&pll_clk, _reg, _bit, _mask, _flags)
156 148
157struct clk div4_clks[DIV4_NR] = { 149struct clk div4_clks[DIV4_NR] = {
158 [DIV4_I] = DIV4("cpu_clk", FRQCRA, 20, 0x2f7d, CLK_ENABLE_ON_INIT), 150 [DIV4_I] = DIV4(FRQCRA, 20, 0x2f7d, CLK_ENABLE_ON_INIT),
159 [DIV4_SH] = DIV4("shyway_clk", FRQCRA, 12, 0x2f7c, CLK_ENABLE_ON_INIT), 151 [DIV4_SH] = DIV4(FRQCRA, 12, 0x2f7c, CLK_ENABLE_ON_INIT),
160 [DIV4_B] = DIV4("bus_clk", FRQCRA, 8, 0x2f7c, CLK_ENABLE_ON_INIT), 152 [DIV4_B] = DIV4(FRQCRA, 8, 0x2f7c, CLK_ENABLE_ON_INIT),
161 [DIV4_P] = DIV4("peripheral_clk", FRQCRA, 0, 0x2f7c, 0), 153 [DIV4_P] = DIV4(FRQCRA, 0, 0x2f7c, 0),
162 [DIV4_M1] = DIV4("vpu_clk", FRQCRB, 4, 0x2f7c, CLK_ENABLE_ON_INIT), 154 [DIV4_M1] = DIV4(FRQCRB, 4, 0x2f7c, CLK_ENABLE_ON_INIT),
163}; 155};
164 156
165struct clk div6_clks[] = { 157enum { DIV6_V, DIV6_FA, DIV6_FB, DIV6_I, DIV6_S, DIV6_NR };
166 SH_CLK_DIV6("video_clk", &div3_clk, VCLKCR, 0), 158
167 SH_CLK_DIV6("fsia_clk", &div3_clk, FCLKACR, 0), 159struct clk div6_clks[DIV6_NR] = {
168 SH_CLK_DIV6("fsib_clk", &div3_clk, FCLKBCR, 0), 160 [DIV6_V] = SH_CLK_DIV6(&div3_clk, VCLKCR, 0),
169 SH_CLK_DIV6("irda_clk", &div3_clk, IRDACLKCR, 0), 161 [DIV6_FA] = SH_CLK_DIV6(&div3_clk, FCLKACR, 0),
170 SH_CLK_DIV6("spu_clk", &div3_clk, SPUCLKCR, CLK_ENABLE_ON_INIT), 162 [DIV6_FB] = SH_CLK_DIV6(&div3_clk, FCLKBCR, 0),
163 [DIV6_I] = SH_CLK_DIV6(&div3_clk, IRDACLKCR, 0),
164 [DIV6_S] = SH_CLK_DIV6(&div3_clk, SPUCLKCR, CLK_ENABLE_ON_INIT),
165};
166
167static struct clk mstp_clks[HWBLK_NR] = {
168 SH_HWBLK_CLK(HWBLK_TLB, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
169 SH_HWBLK_CLK(HWBLK_IC, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
170 SH_HWBLK_CLK(HWBLK_OC, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
171 SH_HWBLK_CLK(HWBLK_RSMEM, &div4_clks[DIV4_B], CLK_ENABLE_ON_INIT),
172 SH_HWBLK_CLK(HWBLK_ILMEM, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
173 SH_HWBLK_CLK(HWBLK_L2C, &div4_clks[DIV4_SH], CLK_ENABLE_ON_INIT),
174 SH_HWBLK_CLK(HWBLK_FPU, &div4_clks[DIV4_I], CLK_ENABLE_ON_INIT),
175 SH_HWBLK_CLK(HWBLK_INTC, &div4_clks[DIV4_P], CLK_ENABLE_ON_INIT),
176 SH_HWBLK_CLK(HWBLK_DMAC0, &div4_clks[DIV4_B], 0),
177 SH_HWBLK_CLK(HWBLK_SHYWAY, &div4_clks[DIV4_SH], CLK_ENABLE_ON_INIT),
178 SH_HWBLK_CLK(HWBLK_HUDI, &div4_clks[DIV4_P], 0),
179 SH_HWBLK_CLK(HWBLK_UBC, &div4_clks[DIV4_I], 0),
180 SH_HWBLK_CLK(HWBLK_TMU0, &div4_clks[DIV4_P], 0),
181 SH_HWBLK_CLK(HWBLK_CMT, &r_clk, 0),
182 SH_HWBLK_CLK(HWBLK_RWDT, &r_clk, 0),
183 SH_HWBLK_CLK(HWBLK_DMAC1, &div4_clks[DIV4_B], 0),
184 SH_HWBLK_CLK(HWBLK_TMU1, &div4_clks[DIV4_P], 0),
185 SH_HWBLK_CLK(HWBLK_SCIF0, &div4_clks[DIV4_P], 0),
186 SH_HWBLK_CLK(HWBLK_SCIF1, &div4_clks[DIV4_P], 0),
187 SH_HWBLK_CLK(HWBLK_SCIF2, &div4_clks[DIV4_P], 0),
188 SH_HWBLK_CLK(HWBLK_SCIF3, &div4_clks[DIV4_B], 0),
189 SH_HWBLK_CLK(HWBLK_SCIF4, &div4_clks[DIV4_B], 0),
190 SH_HWBLK_CLK(HWBLK_SCIF5, &div4_clks[DIV4_B], 0),
191 SH_HWBLK_CLK(HWBLK_MSIOF0, &div4_clks[DIV4_B], 0),
192 SH_HWBLK_CLK(HWBLK_MSIOF1, &div4_clks[DIV4_B], 0),
193
194 SH_HWBLK_CLK(HWBLK_KEYSC, &r_clk, 0),
195 SH_HWBLK_CLK(HWBLK_RTC, &r_clk, 0),
196 SH_HWBLK_CLK(HWBLK_IIC0, &div4_clks[DIV4_P], 0),
197 SH_HWBLK_CLK(HWBLK_IIC1, &div4_clks[DIV4_P], 0),
198
199 SH_HWBLK_CLK(HWBLK_MMC, &div4_clks[DIV4_B], 0),
200 SH_HWBLK_CLK(HWBLK_ETHER, &div4_clks[DIV4_B], 0),
201 SH_HWBLK_CLK(HWBLK_ATAPI, &div4_clks[DIV4_B], 0),
202 SH_HWBLK_CLK(HWBLK_TPU, &div4_clks[DIV4_B], 0),
203 SH_HWBLK_CLK(HWBLK_IRDA, &div4_clks[DIV4_P], 0),
204 SH_HWBLK_CLK(HWBLK_TSIF, &div4_clks[DIV4_B], 0),
205 SH_HWBLK_CLK(HWBLK_USB1, &div4_clks[DIV4_B], 0),
206 SH_HWBLK_CLK(HWBLK_USB0, &div4_clks[DIV4_B], 0),
207 SH_HWBLK_CLK(HWBLK_2DG, &div4_clks[DIV4_B], 0),
208 SH_HWBLK_CLK(HWBLK_SDHI0, &div4_clks[DIV4_B], 0),
209 SH_HWBLK_CLK(HWBLK_SDHI1, &div4_clks[DIV4_B], 0),
210 SH_HWBLK_CLK(HWBLK_VEU1, &div4_clks[DIV4_B], 0),
211 SH_HWBLK_CLK(HWBLK_CEU1, &div4_clks[DIV4_B], 0),
212 SH_HWBLK_CLK(HWBLK_BEU1, &div4_clks[DIV4_B], 0),
213 SH_HWBLK_CLK(HWBLK_2DDMAC, &div4_clks[DIV4_SH], 0),
214 SH_HWBLK_CLK(HWBLK_SPU, &div4_clks[DIV4_B], 0),
215 SH_HWBLK_CLK(HWBLK_JPU, &div4_clks[DIV4_B], 0),
216 SH_HWBLK_CLK(HWBLK_VOU, &div4_clks[DIV4_B], 0),
217 SH_HWBLK_CLK(HWBLK_BEU0, &div4_clks[DIV4_B], 0),
218 SH_HWBLK_CLK(HWBLK_CEU0, &div4_clks[DIV4_B], 0),
219 SH_HWBLK_CLK(HWBLK_VEU0, &div4_clks[DIV4_B], 0),
220 SH_HWBLK_CLK(HWBLK_VPU, &div4_clks[DIV4_B], 0),
221 SH_HWBLK_CLK(HWBLK_LCDC, &div4_clks[DIV4_B], 0),
171}; 222};
172 223
173#define R_CLK (&r_clk) 224#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
174#define P_CLK (&div4_clks[DIV4_P]) 225
175#define B_CLK (&div4_clks[DIV4_B]) 226static struct clk_lookup lookups[] = {
176#define I_CLK (&div4_clks[DIV4_I]) 227 /* main clocks */
177#define SH_CLK (&div4_clks[DIV4_SH]) 228 CLKDEV_CON_ID("rclk", &r_clk),
178 229 CLKDEV_CON_ID("extal", &extal_clk),
179static struct clk mstp_clks[] = { 230 CLKDEV_CON_ID("fll_clk", &fll_clk),
180 SH_HWBLK_CLK("tlb0", -1, I_CLK, HWBLK_TLB, CLK_ENABLE_ON_INIT), 231 CLKDEV_CON_ID("pll_clk", &pll_clk),
181 SH_HWBLK_CLK("ic0", -1, I_CLK, HWBLK_IC, CLK_ENABLE_ON_INIT), 232 CLKDEV_CON_ID("div3_clk", &div3_clk),
182 SH_HWBLK_CLK("oc0", -1, I_CLK, HWBLK_OC, CLK_ENABLE_ON_INIT), 233
183 SH_HWBLK_CLK("rs0", -1, B_CLK, HWBLK_RSMEM, CLK_ENABLE_ON_INIT), 234 /* DIV4 clocks */
184 SH_HWBLK_CLK("ilmem0", -1, I_CLK, HWBLK_ILMEM, CLK_ENABLE_ON_INIT), 235 CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
185 SH_HWBLK_CLK("l2c0", -1, SH_CLK, HWBLK_L2C, CLK_ENABLE_ON_INIT), 236 CLKDEV_CON_ID("shyway_clk", &div4_clks[DIV4_SH]),
186 SH_HWBLK_CLK("fpu0", -1, I_CLK, HWBLK_FPU, CLK_ENABLE_ON_INIT), 237 CLKDEV_CON_ID("bus_clk", &div4_clks[DIV4_B]),
187 SH_HWBLK_CLK("intc0", -1, P_CLK, HWBLK_INTC, CLK_ENABLE_ON_INIT), 238 CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),
188 SH_HWBLK_CLK("dmac0", -1, B_CLK, HWBLK_DMAC0, 0), 239 CLKDEV_CON_ID("vpu_clk", &div4_clks[DIV4_M1]),
189 SH_HWBLK_CLK("sh0", -1, SH_CLK, HWBLK_SHYWAY, CLK_ENABLE_ON_INIT), 240
190 SH_HWBLK_CLK("hudi0", -1, P_CLK, HWBLK_HUDI, 0), 241 /* DIV6 clocks */
191 SH_HWBLK_CLK("ubc0", -1, I_CLK, HWBLK_UBC, 0), 242 CLKDEV_CON_ID("video_clk", &div6_clks[DIV6_V]),
192 SH_HWBLK_CLK("tmu0", -1, P_CLK, HWBLK_TMU0, 0), 243 CLKDEV_CON_ID("fsia_clk", &div6_clks[DIV6_FA]),
193 SH_HWBLK_CLK("cmt0", -1, R_CLK, HWBLK_CMT, 0), 244 CLKDEV_CON_ID("fsib_clk", &div6_clks[DIV6_FB]),
194 SH_HWBLK_CLK("rwdt0", -1, R_CLK, HWBLK_RWDT, 0), 245 CLKDEV_CON_ID("irda_clk", &div6_clks[DIV6_I]),
195 SH_HWBLK_CLK("dmac1", -1, B_CLK, HWBLK_DMAC1, 0), 246 CLKDEV_CON_ID("spu_clk", &div6_clks[DIV6_S]),
196 SH_HWBLK_CLK("tmu1", -1, P_CLK, HWBLK_TMU1, 0), 247
197 SH_HWBLK_CLK("scif0", -1, P_CLK, HWBLK_SCIF0, 0), 248 /* MSTP clocks */
198 SH_HWBLK_CLK("scif1", -1, P_CLK, HWBLK_SCIF1, 0), 249 CLKDEV_CON_ID("tlb0", &mstp_clks[HWBLK_TLB]),
199 SH_HWBLK_CLK("scif2", -1, P_CLK, HWBLK_SCIF2, 0), 250 CLKDEV_CON_ID("ic0", &mstp_clks[HWBLK_IC]),
200 SH_HWBLK_CLK("scif3", -1, B_CLK, HWBLK_SCIF3, 0), 251 CLKDEV_CON_ID("oc0", &mstp_clks[HWBLK_OC]),
201 SH_HWBLK_CLK("scif4", -1, B_CLK, HWBLK_SCIF4, 0), 252 CLKDEV_CON_ID("rs0", &mstp_clks[HWBLK_RSMEM]),
202 SH_HWBLK_CLK("scif5", -1, B_CLK, HWBLK_SCIF5, 0), 253 CLKDEV_CON_ID("ilmem0", &mstp_clks[HWBLK_ILMEM]),
203 SH_HWBLK_CLK("msiof0", -1, B_CLK, HWBLK_MSIOF0, 0), 254 CLKDEV_CON_ID("l2c0", &mstp_clks[HWBLK_L2C]),
204 SH_HWBLK_CLK("msiof1", -1, B_CLK, HWBLK_MSIOF1, 0), 255 CLKDEV_CON_ID("fpu0", &mstp_clks[HWBLK_FPU]),
205 256 CLKDEV_CON_ID("intc0", &mstp_clks[HWBLK_INTC]),
206 SH_HWBLK_CLK("keysc0", -1, R_CLK, HWBLK_KEYSC, 0), 257 CLKDEV_CON_ID("dmac0", &mstp_clks[HWBLK_DMAC0]),
207 SH_HWBLK_CLK("rtc0", -1, R_CLK, HWBLK_RTC, 0), 258 CLKDEV_CON_ID("sh0", &mstp_clks[HWBLK_SHYWAY]),
208 SH_HWBLK_CLK("i2c0", -1, P_CLK, HWBLK_IIC0, 0), 259 CLKDEV_CON_ID("hudi0", &mstp_clks[HWBLK_HUDI]),
209 SH_HWBLK_CLK("i2c1", -1, P_CLK, HWBLK_IIC1, 0), 260 CLKDEV_CON_ID("ubc0", &mstp_clks[HWBLK_UBC]),
210 261 {
211 SH_HWBLK_CLK("mmc0", -1, B_CLK, HWBLK_MMC, 0), 262 /* TMU0 */
212 SH_HWBLK_CLK("eth0", -1, B_CLK, HWBLK_ETHER, 0), 263 .dev_id = "sh_tmu.0",
213 SH_HWBLK_CLK("atapi0", -1, B_CLK, HWBLK_ATAPI, 0), 264 .con_id = "tmu_fck",
214 SH_HWBLK_CLK("tpu0", -1, B_CLK, HWBLK_TPU, 0), 265 .clk = &mstp_clks[HWBLK_TMU0],
215 SH_HWBLK_CLK("irda0", -1, P_CLK, HWBLK_IRDA, 0), 266 }, {
216 SH_HWBLK_CLK("tsif0", -1, B_CLK, HWBLK_TSIF, 0), 267 /* TMU1 */
217 SH_HWBLK_CLK("usb1", -1, B_CLK, HWBLK_USB1, 0), 268 .dev_id = "sh_tmu.1",
218 SH_HWBLK_CLK("usb0", -1, B_CLK, HWBLK_USB0, 0), 269 .con_id = "tmu_fck",
219 SH_HWBLK_CLK("2dg0", -1, B_CLK, HWBLK_2DG, 0), 270 .clk = &mstp_clks[HWBLK_TMU0],
220 SH_HWBLK_CLK("sdhi0", -1, B_CLK, HWBLK_SDHI0, 0), 271 }, {
221 SH_HWBLK_CLK("sdhi1", -1, B_CLK, HWBLK_SDHI1, 0), 272 /* TMU2 */
222 SH_HWBLK_CLK("veu1", -1, B_CLK, HWBLK_VEU1, 0), 273 .dev_id = "sh_tmu.2",
223 SH_HWBLK_CLK("ceu1", -1, B_CLK, HWBLK_CEU1, 0), 274 .con_id = "tmu_fck",
224 SH_HWBLK_CLK("beu1", -1, B_CLK, HWBLK_BEU1, 0), 275 .clk = &mstp_clks[HWBLK_TMU0],
225 SH_HWBLK_CLK("2ddmac0", -1, SH_CLK, HWBLK_2DDMAC, 0), 276 }, {
226 SH_HWBLK_CLK("spu0", -1, B_CLK, HWBLK_SPU, 0), 277 /* TMU3 */
227 SH_HWBLK_CLK("jpu0", -1, B_CLK, HWBLK_JPU, 0), 278 .dev_id = "sh_tmu.3",
228 SH_HWBLK_CLK("vou0", -1, B_CLK, HWBLK_VOU, 0), 279 .con_id = "tmu_fck",
229 SH_HWBLK_CLK("beu0", -1, B_CLK, HWBLK_BEU0, 0), 280 .clk = &mstp_clks[HWBLK_TMU1],
230 SH_HWBLK_CLK("ceu0", -1, B_CLK, HWBLK_CEU0, 0), 281 },
231 SH_HWBLK_CLK("veu0", -1, B_CLK, HWBLK_VEU0, 0), 282 CLKDEV_CON_ID("cmt_fck", &mstp_clks[HWBLK_CMT]),
232 SH_HWBLK_CLK("vpu0", -1, B_CLK, HWBLK_VPU, 0), 283 CLKDEV_CON_ID("rwdt0", &mstp_clks[HWBLK_RWDT]),
233 SH_HWBLK_CLK("lcdc0", -1, B_CLK, HWBLK_LCDC, 0), 284 CLKDEV_CON_ID("dmac1", &mstp_clks[HWBLK_DMAC1]),
285 {
286 /* TMU4 */
287 .dev_id = "sh_tmu.4",
288 .con_id = "tmu_fck",
289 .clk = &mstp_clks[HWBLK_TMU1],
290 }, {
291 /* TMU5 */
292 .dev_id = "sh_tmu.5",
293 .con_id = "tmu_fck",
294 .clk = &mstp_clks[HWBLK_TMU1],
295 }, {
296 /* SCIF0 */
297 .dev_id = "sh-sci.0",
298 .con_id = "sci_fck",
299 .clk = &mstp_clks[HWBLK_SCIF0],
300 }, {
301 /* SCIF1 */
302 .dev_id = "sh-sci.1",
303 .con_id = "sci_fck",
304 .clk = &mstp_clks[HWBLK_SCIF1],
305 }, {
306 /* SCIF2 */
307 .dev_id = "sh-sci.2",
308 .con_id = "sci_fck",
309 .clk = &mstp_clks[HWBLK_SCIF2],
310 }, {
311 /* SCIF3 */
312 .dev_id = "sh-sci.3",
313 .con_id = "sci_fck",
314 .clk = &mstp_clks[HWBLK_SCIF3],
315 }, {
316 /* SCIF4 */
317 .dev_id = "sh-sci.4",
318 .con_id = "sci_fck",
319 .clk = &mstp_clks[HWBLK_SCIF4],
320 }, {
321 /* SCIF5 */
322 .dev_id = "sh-sci.5",
323 .con_id = "sci_fck",
324 .clk = &mstp_clks[HWBLK_SCIF5],
325 },
326 CLKDEV_CON_ID("msiof0", &mstp_clks[HWBLK_MSIOF0]),
327 CLKDEV_CON_ID("msiof1", &mstp_clks[HWBLK_MSIOF1]),
328 CLKDEV_CON_ID("keysc0", &mstp_clks[HWBLK_KEYSC]),
329 CLKDEV_CON_ID("rtc0", &mstp_clks[HWBLK_RTC]),
330 CLKDEV_CON_ID("i2c0", &mstp_clks[HWBLK_IIC0]),
331 CLKDEV_CON_ID("i2c1", &mstp_clks[HWBLK_IIC1]),
332 CLKDEV_CON_ID("mmc0", &mstp_clks[HWBLK_MMC]),
333 CLKDEV_CON_ID("eth0", &mstp_clks[HWBLK_ETHER]),
334 CLKDEV_CON_ID("atapi0", &mstp_clks[HWBLK_ATAPI]),
335 CLKDEV_CON_ID("tpu0", &mstp_clks[HWBLK_TPU]),
336 CLKDEV_CON_ID("irda0", &mstp_clks[HWBLK_IRDA]),
337 CLKDEV_CON_ID("tsif0", &mstp_clks[HWBLK_TSIF]),
338 CLKDEV_CON_ID("usb1", &mstp_clks[HWBLK_USB1]),
339 CLKDEV_CON_ID("usb0", &mstp_clks[HWBLK_USB0]),
340 CLKDEV_CON_ID("2dg0", &mstp_clks[HWBLK_2DG]),
341 CLKDEV_CON_ID("sdhi0", &mstp_clks[HWBLK_SDHI0]),
342 CLKDEV_CON_ID("sdhi1", &mstp_clks[HWBLK_SDHI1]),
343 CLKDEV_CON_ID("veu1", &mstp_clks[HWBLK_VEU1]),
344 CLKDEV_CON_ID("ceu1", &mstp_clks[HWBLK_CEU1]),
345 CLKDEV_CON_ID("beu1", &mstp_clks[HWBLK_BEU1]),
346 CLKDEV_CON_ID("2ddmac0", &mstp_clks[HWBLK_2DDMAC]),
347 CLKDEV_CON_ID("spu0", &mstp_clks[HWBLK_SPU]),
348 CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]),
349 CLKDEV_CON_ID("vou0", &mstp_clks[HWBLK_VOU]),
350 CLKDEV_CON_ID("beu0", &mstp_clks[HWBLK_BEU0]),
351 CLKDEV_CON_ID("ceu0", &mstp_clks[HWBLK_CEU0]),
352 CLKDEV_CON_ID("veu0", &mstp_clks[HWBLK_VEU0]),
353 CLKDEV_CON_ID("vpu0", &mstp_clks[HWBLK_VPU]),
354 CLKDEV_CON_ID("lcdc0", &mstp_clks[HWBLK_LCDC]),
234}; 355};
235 356
236int __init arch_clk_init(void) 357int __init arch_clk_init(void)
@@ -246,14 +367,16 @@ int __init arch_clk_init(void)
246 for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++) 367 for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++)
247 ret = clk_register(main_clks[k]); 368 ret = clk_register(main_clks[k]);
248 369
370 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
371
249 if (!ret) 372 if (!ret)
250 ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table); 373 ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table);
251 374
252 if (!ret) 375 if (!ret)
253 ret = sh_clk_div6_register(div6_clks, ARRAY_SIZE(div6_clks)); 376 ret = sh_clk_div6_register(div6_clks, DIV6_NR);
254 377
255 if (!ret) 378 if (!ret)
256 ret = sh_hwblk_clk_register(mstp_clks, ARRAY_SIZE(mstp_clks)); 379 ret = sh_hwblk_clk_register(mstp_clks, HWBLK_NR);
257 380
258 return ret; 381 return ret;
259} 382}
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
index 86aae60677d..0a752bd324a 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
@@ -12,6 +12,7 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/io.h> 14#include <linux/io.h>
15#include <asm/clkdev.h>
15#include <asm/clock.h> 16#include <asm/clock.h>
16#include <asm/freq.h> 17#include <asm/freq.h>
17 18
@@ -87,7 +88,6 @@ static struct clk_ops sh7757_shyway_clk_ops = {
87}; 88};
88 89
89static struct clk sh7757_shyway_clk = { 90static struct clk sh7757_shyway_clk = {
90 .name = "shyway_clk",
91 .flags = CLK_ENABLE_ON_INIT, 91 .flags = CLK_ENABLE_ON_INIT,
92 .ops = &sh7757_shyway_clk_ops, 92 .ops = &sh7757_shyway_clk_ops,
93}; 93};
@@ -100,6 +100,13 @@ static struct clk *sh7757_onchip_clocks[] = {
100 &sh7757_shyway_clk, 100 &sh7757_shyway_clk,
101}; 101};
102 102
103#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
104
105static struct clk_lookup lookups[] = {
106 /* main clocks */
107 CLKDEV_CON_ID("shyway_clk", &sh7757_shyway_clk),
108};
109
103static int __init sh7757_clk_init(void) 110static int __init sh7757_clk_init(void)
104{ 111{
105 struct clk *clk = clk_get(NULL, "master_clk"); 112 struct clk *clk = clk_get(NULL, "master_clk");
@@ -123,6 +130,8 @@ static int __init sh7757_clk_init(void)
123 130
124 clk_put(clk); 131 clk_put(clk);
125 132
133 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
134
126 return 0; 135 return 0;
127} 136}
128 137
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7763.c b/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
index 9f401163e71..1f1df48008c 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
@@ -12,6 +12,8 @@
12 */ 12 */
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/kernel.h> 14#include <linux/kernel.h>
15#include <linux/io.h>
16#include <asm/clkdev.h>
15#include <asm/clock.h> 17#include <asm/clock.h>
16#include <asm/freq.h> 18#include <asm/freq.h>
17#include <asm/io.h> 19#include <asm/io.h>
@@ -77,7 +79,6 @@ static struct clk_ops sh7763_shyway_clk_ops = {
77}; 79};
78 80
79static struct clk sh7763_shyway_clk = { 81static struct clk sh7763_shyway_clk = {
80 .name = "shyway_clk",
81 .flags = CLK_ENABLE_ON_INIT, 82 .flags = CLK_ENABLE_ON_INIT,
82 .ops = &sh7763_shyway_clk_ops, 83 .ops = &sh7763_shyway_clk_ops,
83}; 84};
@@ -90,6 +91,13 @@ static struct clk *sh7763_onchip_clocks[] = {
90 &sh7763_shyway_clk, 91 &sh7763_shyway_clk,
91}; 92};
92 93
94#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
95
96static struct clk_lookup lookups[] = {
97 /* main clocks */
98 CLKDEV_CON_ID("shyway_clk", &sh7763_shyway_clk),
99};
100
93int __init arch_clk_init(void) 101int __init arch_clk_init(void)
94{ 102{
95 struct clk *clk; 103 struct clk *clk;
@@ -107,5 +115,7 @@ int __init arch_clk_init(void)
107 115
108 clk_put(clk); 116 clk_put(clk);
109 117
118 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
119
110 return ret; 120 return ret;
111} 121}
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c
index 150963a6001..62d70635006 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c
@@ -11,6 +11,8 @@
11 */ 11 */
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/io.h>
15#include <asm/clkdev.h>
14#include <asm/clock.h> 16#include <asm/clock.h>
15#include <asm/freq.h> 17#include <asm/freq.h>
16#include <asm/io.h> 18#include <asm/io.h>
@@ -83,7 +85,6 @@ static struct clk_ops sh7780_shyway_clk_ops = {
83}; 85};
84 86
85static struct clk sh7780_shyway_clk = { 87static struct clk sh7780_shyway_clk = {
86 .name = "shyway_clk",
87 .flags = CLK_ENABLE_ON_INIT, 88 .flags = CLK_ENABLE_ON_INIT,
88 .ops = &sh7780_shyway_clk_ops, 89 .ops = &sh7780_shyway_clk_ops,
89}; 90};
@@ -96,6 +97,13 @@ static struct clk *sh7780_onchip_clocks[] = {
96 &sh7780_shyway_clk, 97 &sh7780_shyway_clk,
97}; 98};
98 99
100#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
101
102static struct clk_lookup lookups[] = {
103 /* main clocks */
104 CLKDEV_CON_ID("shyway_clk", &sh7780_shyway_clk),
105};
106
99int __init arch_clk_init(void) 107int __init arch_clk_init(void)
100{ 108{
101 struct clk *clk; 109 struct clk *clk;
@@ -113,5 +121,7 @@ int __init arch_clk_init(void)
113 121
114 clk_put(clk); 122 clk_put(clk);
115 123
124 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
125
116 return ret; 126 return ret;
117} 127}
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
index d997f0a25b1..c3e458aaa2b 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * SH7785 support for the clock framework 4 * SH7785 support for the clock framework
5 * 5 *
6 * Copyright (C) 2007 - 2009 Paul Mundt 6 * Copyright (C) 2007 - 2010 Paul Mundt
7 * 7 *
8 * This file is subject to the terms and conditions of the GNU General Public 8 * This file is subject to the terms and conditions of the GNU General Public
9 * License. See the file "COPYING" in the main directory of this archive 9 * License. See the file "COPYING" in the main directory of this archive
@@ -14,6 +14,7 @@
14#include <linux/clk.h> 14#include <linux/clk.h>
15#include <linux/io.h> 15#include <linux/io.h>
16#include <linux/cpufreq.h> 16#include <linux/cpufreq.h>
17#include <asm/clkdev.h>
17#include <asm/clock.h> 18#include <asm/clock.h>
18#include <asm/freq.h> 19#include <asm/freq.h>
19#include <cpu/sh7785.h> 20#include <cpu/sh7785.h>
@@ -23,8 +24,6 @@
23 * from the platform code. 24 * from the platform code.
24 */ 25 */
25static struct clk extal_clk = { 26static struct clk extal_clk = {
26 .name = "extal",
27 .id = -1,
28 .rate = 33333333, 27 .rate = 33333333,
29}; 28};
30 29
@@ -42,8 +41,6 @@ static struct clk_ops pll_clk_ops = {
42}; 41};
43 42
44static struct clk pll_clk = { 43static struct clk pll_clk = {
45 .name = "pll_clk",
46 .id = -1,
47 .ops = &pll_clk_ops, 44 .ops = &pll_clk_ops,
48 .parent = &extal_clk, 45 .parent = &extal_clk,
49 .flags = CLK_ENABLE_ON_INIT, 46 .flags = CLK_ENABLE_ON_INIT,
@@ -69,48 +66,149 @@ static struct clk_div4_table div4_table = {
69enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_DDR, DIV4_GA, 66enum { DIV4_I, DIV4_U, DIV4_SH, DIV4_B, DIV4_DDR, DIV4_GA,
70 DIV4_DU, DIV4_P, DIV4_NR }; 67 DIV4_DU, DIV4_P, DIV4_NR };
71 68
72#define DIV4(_str, _bit, _mask, _flags) \ 69#define DIV4(_bit, _mask, _flags) \
73 SH_CLK_DIV4(_str, &pll_clk, FRQMR1, _bit, _mask, _flags) 70 SH_CLK_DIV4(&pll_clk, FRQMR1, _bit, _mask, _flags)
74 71
75struct clk div4_clks[DIV4_NR] = { 72struct clk div4_clks[DIV4_NR] = {
76 [DIV4_P] = DIV4("peripheral_clk", 0, 0x0f80, 0), 73 [DIV4_P] = DIV4(0, 0x0f80, 0),
77 [DIV4_DU] = DIV4("du_clk", 4, 0x0ff0, 0), 74 [DIV4_DU] = DIV4(4, 0x0ff0, 0),
78 [DIV4_GA] = DIV4("ga_clk", 8, 0x0030, 0), 75 [DIV4_GA] = DIV4(8, 0x0030, 0),
79 [DIV4_DDR] = DIV4("ddr_clk", 12, 0x000c, CLK_ENABLE_ON_INIT), 76 [DIV4_DDR] = DIV4(12, 0x000c, CLK_ENABLE_ON_INIT),
80 [DIV4_B] = DIV4("bus_clk", 16, 0x0fe0, CLK_ENABLE_ON_INIT), 77 [DIV4_B] = DIV4(16, 0x0fe0, CLK_ENABLE_ON_INIT),
81 [DIV4_SH] = DIV4("shyway_clk", 20, 0x000c, CLK_ENABLE_ON_INIT), 78 [DIV4_SH] = DIV4(20, 0x000c, CLK_ENABLE_ON_INIT),
82 [DIV4_U] = DIV4("umem_clk", 24, 0x000c, CLK_ENABLE_ON_INIT), 79 [DIV4_U] = DIV4(24, 0x000c, CLK_ENABLE_ON_INIT),
83 [DIV4_I] = DIV4("cpu_clk", 28, 0x000e, CLK_ENABLE_ON_INIT), 80 [DIV4_I] = DIV4(28, 0x000e, CLK_ENABLE_ON_INIT),
84}; 81};
85 82
86#define MSTPCR0 0xffc80030 83#define MSTPCR0 0xffc80030
87#define MSTPCR1 0xffc80034 84#define MSTPCR1 0xffc80034
88 85
89static struct clk mstp_clks[] = { 86enum { MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024,
87 MSTP021, MSTP020, MSTP017, MSTP016,
88 MSTP013, MSTP012, MSTP009, MSTP008, MSTP003, MSTP002,
89 MSTP119, MSTP117, MSTP105, MSTP104, MSTP100,
90 MSTP_NR };
91
92static struct clk mstp_clks[MSTP_NR] = {
90 /* MSTPCR0 */ 93 /* MSTPCR0 */
91 SH_CLK_MSTP32("scif_fck", 5, &div4_clks[DIV4_P], MSTPCR0, 29, 0), 94 [MSTP029] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 29, 0),
92 SH_CLK_MSTP32("scif_fck", 4, &div4_clks[DIV4_P], MSTPCR0, 28, 0), 95 [MSTP028] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 28, 0),
93 SH_CLK_MSTP32("scif_fck", 3, &div4_clks[DIV4_P], MSTPCR0, 27, 0), 96 [MSTP027] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 27, 0),
94 SH_CLK_MSTP32("scif_fck", 2, &div4_clks[DIV4_P], MSTPCR0, 26, 0), 97 [MSTP026] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 26, 0),
95 SH_CLK_MSTP32("scif_fck", 1, &div4_clks[DIV4_P], MSTPCR0, 25, 0), 98 [MSTP025] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 25, 0),
96 SH_CLK_MSTP32("scif_fck", 0, &div4_clks[DIV4_P], MSTPCR0, 24, 0), 99 [MSTP024] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 24, 0),
97 SH_CLK_MSTP32("ssi_fck", 1, &div4_clks[DIV4_P], MSTPCR0, 21, 0), 100 [MSTP021] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 21, 0),
98 SH_CLK_MSTP32("ssi_fck", 0, &div4_clks[DIV4_P], MSTPCR0, 20, 0), 101 [MSTP020] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 20, 0),
99 SH_CLK_MSTP32("hac_fck", 1, &div4_clks[DIV4_P], MSTPCR0, 17, 0), 102 [MSTP017] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 17, 0),
100 SH_CLK_MSTP32("hac_fck", 0, &div4_clks[DIV4_P], MSTPCR0, 16, 0), 103 [MSTP016] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 16, 0),
101 SH_CLK_MSTP32("mmcif_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 13, 0), 104 [MSTP013] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 13, 0),
102 SH_CLK_MSTP32("flctl_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 12, 0), 105 [MSTP012] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 12, 0),
103 SH_CLK_MSTP32("tmu345_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 9, 0), 106 [MSTP009] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 9, 0),
104 SH_CLK_MSTP32("tmu012_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 8, 0), 107 [MSTP008] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 8, 0),
105 SH_CLK_MSTP32("siof_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 3, 0), 108 [MSTP003] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 3, 0),
106 SH_CLK_MSTP32("hspi_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 2, 0), 109 [MSTP002] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 2, 0),
107 110
108 /* MSTPCR1 */ 111 /* MSTPCR1 */
109 SH_CLK_MSTP32("hudi_fck", -1, NULL, MSTPCR1, 19, 0), 112 [MSTP119] = SH_CLK_MSTP32(NULL, MSTPCR1, 19, 0),
110 SH_CLK_MSTP32("ubc_fck", -1, NULL, MSTPCR1, 17, 0), 113 [MSTP117] = SH_CLK_MSTP32(NULL, MSTPCR1, 17, 0),
111 SH_CLK_MSTP32("dmac_11_6_fck", -1, NULL, MSTPCR1, 5, 0), 114 [MSTP105] = SH_CLK_MSTP32(NULL, MSTPCR1, 5, 0),
112 SH_CLK_MSTP32("dmac_5_0_fck", -1, NULL, MSTPCR1, 4, 0), 115 [MSTP104] = SH_CLK_MSTP32(NULL, MSTPCR1, 4, 0),
113 SH_CLK_MSTP32("gdta_fck", -1, NULL, MSTPCR1, 0, 0), 116 [MSTP100] = SH_CLK_MSTP32(NULL, MSTPCR1, 0, 0),
117};
118
119#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
120
121static struct clk_lookup lookups[] = {
122 /* main clocks */
123 CLKDEV_CON_ID("extal", &extal_clk),
124 CLKDEV_CON_ID("pll_clk", &pll_clk),
125
126 /* DIV4 clocks */
127 CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),
128 CLKDEV_CON_ID("du_clk", &div4_clks[DIV4_DU]),
129 CLKDEV_CON_ID("ga_clk", &div4_clks[DIV4_GA]),
130 CLKDEV_CON_ID("ddr_clk", &div4_clks[DIV4_DDR]),
131 CLKDEV_CON_ID("bus_clk", &div4_clks[DIV4_B]),
132 CLKDEV_CON_ID("shyway_clk", &div4_clks[DIV4_SH]),
133 CLKDEV_CON_ID("umem_clk", &div4_clks[DIV4_U]),
134 CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
135
136 /* MSTP32 clocks */
137 {
138 /* SCIF5 */
139 .dev_id = "sh-sci.5",
140 .con_id = "sci_fck",
141 .clk = &mstp_clks[MSTP029],
142 }, {
143 /* SCIF4 */
144 .dev_id = "sh-sci.4",
145 .con_id = "sci_fck",
146 .clk = &mstp_clks[MSTP028],
147 }, {
148 /* SCIF3 */
149 .dev_id = "sh-sci.3",
150 .con_id = "sci_fck",
151 .clk = &mstp_clks[MSTP027],
152 }, {
153 /* SCIF2 */
154 .dev_id = "sh-sci.2",
155 .con_id = "sci_fck",
156 .clk = &mstp_clks[MSTP026],
157 }, {
158 /* SCIF1 */
159 .dev_id = "sh-sci.1",
160 .con_id = "sci_fck",
161 .clk = &mstp_clks[MSTP025],
162 }, {
163 /* SCIF0 */
164 .dev_id = "sh-sci.0",
165 .con_id = "sci_fck",
166 .clk = &mstp_clks[MSTP024],
167 },
168 CLKDEV_CON_ID("ssi1_fck", &mstp_clks[MSTP021]),
169 CLKDEV_CON_ID("ssi0_fck", &mstp_clks[MSTP020]),
170 CLKDEV_CON_ID("hac1_fck", &mstp_clks[MSTP017]),
171 CLKDEV_CON_ID("hac0_fck", &mstp_clks[MSTP016]),
172 CLKDEV_CON_ID("mmcif_fck", &mstp_clks[MSTP013]),
173 CLKDEV_CON_ID("flctl_fck", &mstp_clks[MSTP012]),
174 {
175 /* TMU0 */
176 .dev_id = "sh_tmu.0",
177 .con_id = "tmu_fck",
178 .clk = &mstp_clks[MSTP008],
179 }, {
180 /* TMU1 */
181 .dev_id = "sh_tmu.1",
182 .con_id = "tmu_fck",
183 .clk = &mstp_clks[MSTP008],
184 }, {
185 /* TMU2 */
186 .dev_id = "sh_tmu.2",
187 .con_id = "tmu_fck",
188 .clk = &mstp_clks[MSTP008],
189 }, {
190 /* TMU3 */
191 .dev_id = "sh_tmu.3",
192 .con_id = "tmu_fck",
193 .clk = &mstp_clks[MSTP009],
194 }, {
195 /* TMU4 */
196 .dev_id = "sh_tmu.4",
197 .con_id = "tmu_fck",
198 .clk = &mstp_clks[MSTP009],
199 }, {
200 /* TMU5 */
201 .dev_id = "sh_tmu.5",
202 .con_id = "tmu_fck",
203 .clk = &mstp_clks[MSTP009],
204 },
205 CLKDEV_CON_ID("siof_fck", &mstp_clks[MSTP003]),
206 CLKDEV_CON_ID("hspi_fck", &mstp_clks[MSTP002]),
207 CLKDEV_CON_ID("hudi_fck", &mstp_clks[MSTP119]),
208 CLKDEV_CON_ID("ubc_fck", &mstp_clks[MSTP117]),
209 CLKDEV_CON_ID("dmac_11_6_fck", &mstp_clks[MSTP105]),
210 CLKDEV_CON_ID("dmac_5_0_fck", &mstp_clks[MSTP104]),
211 CLKDEV_CON_ID("gdta_fck", &mstp_clks[MSTP100]),
114}; 212};
115 213
116int __init arch_clk_init(void) 214int __init arch_clk_init(void)
@@ -119,12 +217,14 @@ int __init arch_clk_init(void)
119 217
120 for (i = 0; i < ARRAY_SIZE(clks); i++) 218 for (i = 0; i < ARRAY_SIZE(clks); i++)
121 ret |= clk_register(clks[i]); 219 ret |= clk_register(clks[i]);
220 for (i = 0; i < ARRAY_SIZE(lookups); i++)
221 clkdev_add(&lookups[i]);
122 222
123 if (!ret) 223 if (!ret)
124 ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks), 224 ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
125 &div4_table); 225 &div4_table);
126 if (!ret) 226 if (!ret)
127 ret = sh_clk_mstp32_register(mstp_clks, ARRAY_SIZE(mstp_clks)); 227 ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
128 228
129 return ret; 229 return ret;
130} 230}
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7786.c b/arch/sh/kernel/cpu/sh4a/clock-sh7786.c
index af69fd46870..105a6d41b56 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7786.c
@@ -13,6 +13,8 @@
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <linux/clk.h> 14#include <linux/clk.h>
15#include <linux/io.h> 15#include <linux/io.h>
16#include <linux/clk.h>
17#include <asm/clkdev.h>
16#include <asm/clock.h> 18#include <asm/clock.h>
17#include <asm/freq.h> 19#include <asm/freq.h>
18 20
@@ -21,8 +23,6 @@
21 * from the platform code. 23 * from the platform code.
22 */ 24 */
23static struct clk extal_clk = { 25static struct clk extal_clk = {
24 .name = "extal",
25 .id = -1,
26 .rate = 33333333, 26 .rate = 33333333,
27}; 27};
28 28
@@ -44,8 +44,6 @@ static struct clk_ops pll_clk_ops = {
44}; 44};
45 45
46static struct clk pll_clk = { 46static struct clk pll_clk = {
47 .name = "pll_clk",
48 .id = -1,
49 .ops = &pll_clk_ops, 47 .ops = &pll_clk_ops,
50 .parent = &extal_clk, 48 .parent = &extal_clk,
51 .flags = CLK_ENABLE_ON_INIT, 49 .flags = CLK_ENABLE_ON_INIT,
@@ -70,54 +68,191 @@ static struct clk_div4_table div4_table = {
70 68
71enum { DIV4_I, DIV4_SH, DIV4_B, DIV4_DDR, DIV4_DU, DIV4_P, DIV4_NR }; 69enum { DIV4_I, DIV4_SH, DIV4_B, DIV4_DDR, DIV4_DU, DIV4_P, DIV4_NR };
72 70
73#define DIV4(_str, _bit, _mask, _flags) \ 71#define DIV4(_bit, _mask, _flags) \
74 SH_CLK_DIV4(_str, &pll_clk, FRQMR1, _bit, _mask, _flags) 72 SH_CLK_DIV4(&pll_clk, FRQMR1, _bit, _mask, _flags)
75 73
76struct clk div4_clks[DIV4_NR] = { 74struct clk div4_clks[DIV4_NR] = {
77 [DIV4_P] = DIV4("peripheral_clk", 0, 0x0b40, 0), 75 [DIV4_P] = DIV4(0, 0x0b40, 0),
78 [DIV4_DU] = DIV4("du_clk", 4, 0x0010, 0), 76 [DIV4_DU] = DIV4(4, 0x0010, 0),
79 [DIV4_DDR] = DIV4("ddr_clk", 12, 0x0002, CLK_ENABLE_ON_INIT), 77 [DIV4_DDR] = DIV4(12, 0x0002, CLK_ENABLE_ON_INIT),
80 [DIV4_B] = DIV4("bus_clk", 16, 0x0360, CLK_ENABLE_ON_INIT), 78 [DIV4_B] = DIV4(16, 0x0360, CLK_ENABLE_ON_INIT),
81 [DIV4_SH] = DIV4("shyway_clk", 20, 0x0002, CLK_ENABLE_ON_INIT), 79 [DIV4_SH] = DIV4(20, 0x0002, CLK_ENABLE_ON_INIT),
82 [DIV4_I] = DIV4("cpu_clk", 28, 0x0006, CLK_ENABLE_ON_INIT), 80 [DIV4_I] = DIV4(28, 0x0006, CLK_ENABLE_ON_INIT),
83}; 81};
84 82
85#define MSTPCR0 0xffc40030 83#define MSTPCR0 0xffc40030
86#define MSTPCR1 0xffc40034 84#define MSTPCR1 0xffc40034
87 85
88static struct clk mstp_clks[] = { 86enum { MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024,
87 MSTP023, MSTP022, MSTP021, MSTP020, MSTP017, MSTP016,
88 MSTP015, MSTP014, MSTP011, MSTP010, MSTP009, MSTP008,
89 MSTP005, MSTP004, MSTP002,
90 MSTP112, MSTP110, MSTP109, MSTP108,
91 MSTP105, MSTP104, MSTP103, MSTP102,
92 MSTP_NR };
93
94static struct clk mstp_clks[MSTP_NR] = {
89 /* MSTPCR0 */ 95 /* MSTPCR0 */
90 SH_CLK_MSTP32("scif_fck", 5, &div4_clks[DIV4_P], MSTPCR0, 29, 0), 96 [MSTP029] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 29, 0),
91 SH_CLK_MSTP32("scif_fck", 4, &div4_clks[DIV4_P], MSTPCR0, 28, 0), 97 [MSTP028] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 28, 0),
92 SH_CLK_MSTP32("scif_fck", 3, &div4_clks[DIV4_P], MSTPCR0, 27, 0), 98 [MSTP027] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 27, 0),
93 SH_CLK_MSTP32("scif_fck", 2, &div4_clks[DIV4_P], MSTPCR0, 26, 0), 99 [MSTP026] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 26, 0),
94 SH_CLK_MSTP32("scif_fck", 1, &div4_clks[DIV4_P], MSTPCR0, 25, 0), 100 [MSTP025] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 25, 0),
95 SH_CLK_MSTP32("scif_fck", 0, &div4_clks[DIV4_P], MSTPCR0, 24, 0), 101 [MSTP024] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 24, 0),
96 SH_CLK_MSTP32("ssi_fck", 3, &div4_clks[DIV4_P], MSTPCR0, 23, 0), 102 [MSTP023] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 23, 0),
97 SH_CLK_MSTP32("ssi_fck", 2, &div4_clks[DIV4_P], MSTPCR0, 22, 0), 103 [MSTP022] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 22, 0),
98 SH_CLK_MSTP32("ssi_fck", 1, &div4_clks[DIV4_P], MSTPCR0, 21, 0), 104 [MSTP021] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 21, 0),
99 SH_CLK_MSTP32("ssi_fck", 0, &div4_clks[DIV4_P], MSTPCR0, 20, 0), 105 [MSTP020] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 20, 0),
100 SH_CLK_MSTP32("hac_fck", 1, &div4_clks[DIV4_P], MSTPCR0, 17, 0), 106 [MSTP017] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 17, 0),
101 SH_CLK_MSTP32("hac_fck", 0, &div4_clks[DIV4_P], MSTPCR0, 16, 0), 107 [MSTP016] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 16, 0),
102 SH_CLK_MSTP32("i2c_fck", 1, &div4_clks[DIV4_P], MSTPCR0, 15, 0), 108 [MSTP015] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 15, 0),
103 SH_CLK_MSTP32("i2c_fck", 0, &div4_clks[DIV4_P], MSTPCR0, 14, 0), 109 [MSTP014] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 14, 0),
104 SH_CLK_MSTP32("tmu9_11_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 11, 0), 110 [MSTP011] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 11, 0),
105 SH_CLK_MSTP32("tmu678_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 10, 0), 111 [MSTP010] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 10, 0),
106 SH_CLK_MSTP32("tmu345_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 9, 0), 112 [MSTP009] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 9, 0),
107 SH_CLK_MSTP32("tmu012_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 8, 0), 113 [MSTP008] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 8, 0),
108 SH_CLK_MSTP32("sdif_fck", 1, &div4_clks[DIV4_P], MSTPCR0, 5, 0), 114 [MSTP005] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 5, 0),
109 SH_CLK_MSTP32("sdif_fck", 0, &div4_clks[DIV4_P], MSTPCR0, 4, 0), 115 [MSTP004] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 4, 0),
110 SH_CLK_MSTP32("hspi_fck", -1, &div4_clks[DIV4_P], MSTPCR0, 2, 0), 116 [MSTP002] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 2, 0),
111 117
112 /* MSTPCR1 */ 118 /* MSTPCR1 */
113 SH_CLK_MSTP32("usb_fck", -1, NULL, MSTPCR1, 12, 0), 119 [MSTP112] = SH_CLK_MSTP32(NULL, MSTPCR1, 12, 0),
114 SH_CLK_MSTP32("pcie_fck", 2, NULL, MSTPCR1, 10, 0), 120 [MSTP110] = SH_CLK_MSTP32(NULL, MSTPCR1, 10, 0),
115 SH_CLK_MSTP32("pcie_fck", 1, NULL, MSTPCR1, 9, 0), 121 [MSTP109] = SH_CLK_MSTP32(NULL, MSTPCR1, 9, 0),
116 SH_CLK_MSTP32("pcie_fck", 0, NULL, MSTPCR1, 8, 0), 122 [MSTP108] = SH_CLK_MSTP32(NULL, MSTPCR1, 8, 0),
117 SH_CLK_MSTP32("dmac_11_6_fck", -1, NULL, MSTPCR1, 5, 0), 123 [MSTP105] = SH_CLK_MSTP32(NULL, MSTPCR1, 5, 0),
118 SH_CLK_MSTP32("dmac_5_0_fck", -1, NULL, MSTPCR1, 4, 0), 124 [MSTP104] = SH_CLK_MSTP32(NULL, MSTPCR1, 4, 0),
119 SH_CLK_MSTP32("du_fck", -1, NULL, MSTPCR1, 3, 0), 125 [MSTP103] = SH_CLK_MSTP32(NULL, MSTPCR1, 3, 0),
120 SH_CLK_MSTP32("ether_fck", -1, NULL, MSTPCR1, 2, 0), 126 [MSTP102] = SH_CLK_MSTP32(NULL, MSTPCR1, 2, 0),
127};
128
129#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
130
131static struct clk_lookup lookups[] = {
132 /* main clocks */
133 CLKDEV_CON_ID("extal", &extal_clk),
134 CLKDEV_CON_ID("pll_clk", &pll_clk),
135
136 /* DIV4 clocks */
137 CLKDEV_CON_ID("peripheral_clk", &div4_clks[DIV4_P]),
138 CLKDEV_CON_ID("du_clk", &div4_clks[DIV4_DU]),
139 CLKDEV_CON_ID("ddr_clk", &div4_clks[DIV4_DDR]),
140 CLKDEV_CON_ID("bus_clk", &div4_clks[DIV4_B]),
141 CLKDEV_CON_ID("shyway_clk", &div4_clks[DIV4_SH]),
142 CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
143
144 /* MSTP32 clocks */
145 {
146 /* SCIF5 */
147 .dev_id = "sh-sci.5",
148 .con_id = "sci_fck",
149 .clk = &mstp_clks[MSTP029],
150 }, {
151 /* SCIF4 */
152 .dev_id = "sh-sci.4",
153 .con_id = "sci_fck",
154 .clk = &mstp_clks[MSTP028],
155 }, {
156 /* SCIF3 */
157 .dev_id = "sh-sci.3",
158 .con_id = "sci_fck",
159 .clk = &mstp_clks[MSTP027],
160 }, {
161 /* SCIF2 */
162 .dev_id = "sh-sci.2",
163 .con_id = "sci_fck",
164 .clk = &mstp_clks[MSTP026],
165 }, {
166 /* SCIF1 */
167 .dev_id = "sh-sci.1",
168 .con_id = "sci_fck",
169 .clk = &mstp_clks[MSTP025],
170 }, {
171 /* SCIF0 */
172 .dev_id = "sh-sci.0",
173 .con_id = "sci_fck",
174 .clk = &mstp_clks[MSTP024],
175 },
176 CLKDEV_CON_ID("ssi3_fck", &mstp_clks[MSTP023]),
177 CLKDEV_CON_ID("ssi2_fck", &mstp_clks[MSTP022]),
178 CLKDEV_CON_ID("ssi1_fck", &mstp_clks[MSTP021]),
179 CLKDEV_CON_ID("ssi0_fck", &mstp_clks[MSTP020]),
180 CLKDEV_CON_ID("hac1_fck", &mstp_clks[MSTP017]),
181 CLKDEV_CON_ID("hac0_fck", &mstp_clks[MSTP016]),
182 CLKDEV_CON_ID("i2c1_fck", &mstp_clks[MSTP015]),
183 CLKDEV_CON_ID("i2c0_fck", &mstp_clks[MSTP014]),
184 {
185 /* TMU0 */
186 .dev_id = "sh_tmu.0",
187 .con_id = "tmu_fck",
188 .clk = &mstp_clks[MSTP008],
189 }, {
190 /* TMU1 */
191 .dev_id = "sh_tmu.1",
192 .con_id = "tmu_fck",
193 .clk = &mstp_clks[MSTP008],
194 }, {
195 /* TMU2 */
196 .dev_id = "sh_tmu.2",
197 .con_id = "tmu_fck",
198 .clk = &mstp_clks[MSTP008],
199 }, {
200 /* TMU3 */
201 .dev_id = "sh_tmu.3",
202 .con_id = "tmu_fck",
203 .clk = &mstp_clks[MSTP009],
204 }, {
205 /* TMU4 */
206 .dev_id = "sh_tmu.4",
207 .con_id = "tmu_fck",
208 .clk = &mstp_clks[MSTP009],
209 }, {
210 /* TMU5 */
211 .dev_id = "sh_tmu.5",
212 .con_id = "tmu_fck",
213 .clk = &mstp_clks[MSTP009],
214 }, {
215 /* TMU6 */
216 .dev_id = "sh_tmu.6",
217 .con_id = "tmu_fck",
218 .clk = &mstp_clks[MSTP010],
219 }, {
220 /* TMU7 */
221 .dev_id = "sh_tmu.7",
222 .con_id = "tmu_fck",
223 .clk = &mstp_clks[MSTP010],
224 }, {
225 /* TMU8 */
226 .dev_id = "sh_tmu.8",
227 .con_id = "tmu_fck",
228 .clk = &mstp_clks[MSTP010],
229 }, {
230 /* TMU9 */
231 .dev_id = "sh_tmu.9",
232 .con_id = "tmu_fck",
233 .clk = &mstp_clks[MSTP011],
234 }, {
235 /* TMU10 */
236 .dev_id = "sh_tmu.10",
237 .con_id = "tmu_fck",
238 .clk = &mstp_clks[MSTP011],
239 }, {
240 /* TMU11 */
241 .dev_id = "sh_tmu.11",
242 .con_id = "tmu_fck",
243 .clk = &mstp_clks[MSTP011],
244 },
245 CLKDEV_CON_ID("sdif1_fck", &mstp_clks[MSTP005]),
246 CLKDEV_CON_ID("sdif0_fck", &mstp_clks[MSTP004]),
247 CLKDEV_CON_ID("hspi_fck", &mstp_clks[MSTP002]),
248 CLKDEV_CON_ID("usb_fck", &mstp_clks[MSTP112]),
249 CLKDEV_CON_ID("pcie2_fck", &mstp_clks[MSTP110]),
250 CLKDEV_CON_ID("pcie1_fck", &mstp_clks[MSTP109]),
251 CLKDEV_CON_ID("pcie0_fck", &mstp_clks[MSTP108]),
252 CLKDEV_CON_ID("dmac_11_6_fck", &mstp_clks[MSTP105]),
253 CLKDEV_CON_ID("dmac_5_0_fck", &mstp_clks[MSTP104]),
254 CLKDEV_CON_ID("du_fck", &mstp_clks[MSTP103]),
255 CLKDEV_CON_ID("ether_fck", &mstp_clks[MSTP102]),
121}; 256};
122 257
123int __init arch_clk_init(void) 258int __init arch_clk_init(void)
@@ -126,12 +261,14 @@ int __init arch_clk_init(void)
126 261
127 for (i = 0; i < ARRAY_SIZE(clks); i++) 262 for (i = 0; i < ARRAY_SIZE(clks); i++)
128 ret |= clk_register(clks[i]); 263 ret |= clk_register(clks[i]);
264 for (i = 0; i < ARRAY_SIZE(lookups); i++)
265 clkdev_add(&lookups[i]);
129 266
130 if (!ret) 267 if (!ret)
131 ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks), 268 ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks),
132 &div4_table); 269 &div4_table);
133 if (!ret) 270 if (!ret)
134 ret = sh_clk_mstp32_register(mstp_clks, ARRAY_SIZE(mstp_clks)); 271 ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
135 272
136 return ret; 273 return ret;
137} 274}
diff --git a/arch/sh/kernel/cpu/sh4a/clock-shx3.c b/arch/sh/kernel/cpu/sh4a/clock-shx3.c
index e75c57bdfa5..236a6282d77 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-shx3.c
@@ -13,9 +13,10 @@
13 */ 13 */
14#include <linux/init.h> 14#include <linux/init.h>
15#include <linux/kernel.h> 15#include <linux/kernel.h>
16#include <linux/io.h>
17#include <asm/clkdev.h>
16#include <asm/clock.h> 18#include <asm/clock.h>
17#include <asm/freq.h> 19#include <asm/freq.h>
18#include <asm/io.h>
19 20
20static int ifc_divisors[] = { 1, 2, 4 ,6 }; 21static int ifc_divisors[] = { 1, 2, 4 ,6 };
21static int bfc_divisors[] = { 1, 1, 1, 1, 1, 12, 16, 18, 24, 32, 36, 48 }; 22static int bfc_divisors[] = { 1, 1, 1, 1, 1, 12, 16, 18, 24, 32, 36, 48 };
@@ -94,7 +95,6 @@ static struct clk_ops shx3_shyway_clk_ops = {
94}; 95};
95 96
96static struct clk shx3_shyway_clk = { 97static struct clk shx3_shyway_clk = {
97 .name = "shyway_clk",
98 .flags = CLK_ENABLE_ON_INIT, 98 .flags = CLK_ENABLE_ON_INIT,
99 .ops = &shx3_shyway_clk_ops, 99 .ops = &shx3_shyway_clk_ops,
100}; 100};
@@ -107,6 +107,13 @@ static struct clk *shx3_onchip_clocks[] = {
107 &shx3_shyway_clk, 107 &shx3_shyway_clk,
108}; 108};
109 109
110#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }
111
112static struct clk_lookup lookups[] = {
113 /* main clocks */
114 CLKDEV_CON_ID("shyway_clk", &shx3_shyway_clk),
115};
116
110int __init arch_clk_init(void) 117int __init arch_clk_init(void)
111{ 118{
112 struct clk *clk; 119 struct clk *clk;
@@ -124,5 +131,7 @@ int __init arch_clk_init(void)
124 131
125 clk_put(clk); 132 clk_put(clk);
126 133
134 clkdev_add_table(lookups, ARRAY_SIZE(lookups));
135
127 return ret; 136 return ret;
128} 137}
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
index 45eb1bfd42c..3681cafdb4a 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c
@@ -21,7 +21,6 @@ static struct plat_sci_port scif0_platform_data = {
21 .flags = UPF_BOOT_AUTOCONF, 21 .flags = UPF_BOOT_AUTOCONF,
22 .type = PORT_SCIF, 22 .type = PORT_SCIF,
23 .irqs = { 80, 80, 80, 80 }, 23 .irqs = { 80, 80, 80, 80 },
24 .clk = "scif0",
25}; 24};
26 25
27static struct platform_device scif0_device = { 26static struct platform_device scif0_device = {
@@ -37,7 +36,6 @@ static struct plat_sci_port scif1_platform_data = {
37 .flags = UPF_BOOT_AUTOCONF, 36 .flags = UPF_BOOT_AUTOCONF,
38 .type = PORT_SCIF, 37 .type = PORT_SCIF,
39 .irqs = { 81, 81, 81, 81 }, 38 .irqs = { 81, 81, 81, 81 },
40 .clk = "scif1",
41}; 39};
42 40
43static struct platform_device scif1_device = { 41static struct platform_device scif1_device = {
@@ -53,7 +51,6 @@ static struct plat_sci_port scif2_platform_data = {
53 .flags = UPF_BOOT_AUTOCONF, 51 .flags = UPF_BOOT_AUTOCONF,
54 .type = PORT_SCIF, 52 .type = PORT_SCIF,
55 .irqs = { 82, 82, 82, 82 }, 53 .irqs = { 82, 82, 82, 82 },
56 .clk = "scif2",
57}; 54};
58 55
59static struct platform_device scif2_device = { 56static struct platform_device scif2_device = {
@@ -69,7 +66,6 @@ static struct plat_sci_port scif3_platform_data = {
69 .flags = UPF_BOOT_AUTOCONF, 66 .flags = UPF_BOOT_AUTOCONF,
70 .type = PORT_SCIF, 67 .type = PORT_SCIF,
71 .irqs = { 83, 83, 83, 83 }, 68 .irqs = { 83, 83, 83, 83 },
72 .clk = "scif3",
73}; 69};
74 70
75static struct platform_device scif3_device = { 71static struct platform_device scif3_device = {
@@ -207,17 +203,14 @@ static struct platform_device jpu_device = {
207}; 203};
208 204
209static struct sh_timer_config cmt_platform_data = { 205static struct sh_timer_config cmt_platform_data = {
210 .name = "CMT",
211 .channel_offset = 0x60, 206 .channel_offset = 0x60,
212 .timer_bit = 5, 207 .timer_bit = 5,
213 .clk = "cmt0",
214 .clockevent_rating = 125, 208 .clockevent_rating = 125,
215 .clocksource_rating = 200, 209 .clocksource_rating = 200,
216}; 210};
217 211
218static struct resource cmt_resources[] = { 212static struct resource cmt_resources[] = {
219 [0] = { 213 [0] = {
220 .name = "CMT",
221 .start = 0x044a0060, 214 .start = 0x044a0060,
222 .end = 0x044a006b, 215 .end = 0x044a006b,
223 .flags = IORESOURCE_MEM, 216 .flags = IORESOURCE_MEM,
@@ -239,16 +232,13 @@ static struct platform_device cmt_device = {
239}; 232};
240 233
241static struct sh_timer_config tmu0_platform_data = { 234static struct sh_timer_config tmu0_platform_data = {
242 .name = "TMU0",
243 .channel_offset = 0x04, 235 .channel_offset = 0x04,
244 .timer_bit = 0, 236 .timer_bit = 0,
245 .clk = "tmu0",
246 .clockevent_rating = 200, 237 .clockevent_rating = 200,
247}; 238};
248 239
249static struct resource tmu0_resources[] = { 240static struct resource tmu0_resources[] = {
250 [0] = { 241 [0] = {
251 .name = "TMU0",
252 .start = 0xffd80008, 242 .start = 0xffd80008,
253 .end = 0xffd80013, 243 .end = 0xffd80013,
254 .flags = IORESOURCE_MEM, 244 .flags = IORESOURCE_MEM,
@@ -270,16 +260,13 @@ static struct platform_device tmu0_device = {
270}; 260};
271 261
272static struct sh_timer_config tmu1_platform_data = { 262static struct sh_timer_config tmu1_platform_data = {
273 .name = "TMU1",
274 .channel_offset = 0x10, 263 .channel_offset = 0x10,
275 .timer_bit = 1, 264 .timer_bit = 1,
276 .clk = "tmu0",
277 .clocksource_rating = 200, 265 .clocksource_rating = 200,
278}; 266};
279 267
280static struct resource tmu1_resources[] = { 268static struct resource tmu1_resources[] = {
281 [0] = { 269 [0] = {
282 .name = "TMU1",
283 .start = 0xffd80014, 270 .start = 0xffd80014,
284 .end = 0xffd8001f, 271 .end = 0xffd8001f,
285 .flags = IORESOURCE_MEM, 272 .flags = IORESOURCE_MEM,
@@ -301,15 +288,12 @@ static struct platform_device tmu1_device = {
301}; 288};
302 289
303static struct sh_timer_config tmu2_platform_data = { 290static struct sh_timer_config tmu2_platform_data = {
304 .name = "TMU2",
305 .channel_offset = 0x1c, 291 .channel_offset = 0x1c,
306 .timer_bit = 2, 292 .timer_bit = 2,
307 .clk = "tmu0",
308}; 293};
309 294
310static struct resource tmu2_resources[] = { 295static struct resource tmu2_resources[] = {
311 [0] = { 296 [0] = {
312 .name = "TMU2",
313 .start = 0xffd80020, 297 .start = 0xffd80020,
314 .end = 0xffd8002b, 298 .end = 0xffd8002b,
315 .flags = IORESOURCE_MEM, 299 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
index c494c193e3b..8dab9e1bbd8 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
@@ -23,7 +23,6 @@ static struct plat_sci_port scif0_platform_data = {
23 .flags = UPF_BOOT_AUTOCONF, 23 .flags = UPF_BOOT_AUTOCONF,
24 .type = PORT_SCIF, 24 .type = PORT_SCIF,
25 .irqs = { 80, 80, 80, 80 }, 25 .irqs = { 80, 80, 80, 80 },
26 .clk = "scif0",
27}; 26};
28 27
29static struct platform_device scif0_device = { 28static struct platform_device scif0_device = {
@@ -169,17 +168,14 @@ static struct platform_device veu1_device = {
169}; 168};
170 169
171static struct sh_timer_config cmt_platform_data = { 170static struct sh_timer_config cmt_platform_data = {
172 .name = "CMT",
173 .channel_offset = 0x60, 171 .channel_offset = 0x60,
174 .timer_bit = 5, 172 .timer_bit = 5,
175 .clk = "cmt0",
176 .clockevent_rating = 125, 173 .clockevent_rating = 125,
177 .clocksource_rating = 200, 174 .clocksource_rating = 200,
178}; 175};
179 176
180static struct resource cmt_resources[] = { 177static struct resource cmt_resources[] = {
181 [0] = { 178 [0] = {
182 .name = "CMT",
183 .start = 0x044a0060, 179 .start = 0x044a0060,
184 .end = 0x044a006b, 180 .end = 0x044a006b,
185 .flags = IORESOURCE_MEM, 181 .flags = IORESOURCE_MEM,
@@ -201,16 +197,13 @@ static struct platform_device cmt_device = {
201}; 197};
202 198
203static struct sh_timer_config tmu0_platform_data = { 199static struct sh_timer_config tmu0_platform_data = {
204 .name = "TMU0",
205 .channel_offset = 0x04, 200 .channel_offset = 0x04,
206 .timer_bit = 0, 201 .timer_bit = 0,
207 .clk = "tmu0",
208 .clockevent_rating = 200, 202 .clockevent_rating = 200,
209}; 203};
210 204
211static struct resource tmu0_resources[] = { 205static struct resource tmu0_resources[] = {
212 [0] = { 206 [0] = {
213 .name = "TMU0",
214 .start = 0xffd80008, 207 .start = 0xffd80008,
215 .end = 0xffd80013, 208 .end = 0xffd80013,
216 .flags = IORESOURCE_MEM, 209 .flags = IORESOURCE_MEM,
@@ -232,16 +225,13 @@ static struct platform_device tmu0_device = {
232}; 225};
233 226
234static struct sh_timer_config tmu1_platform_data = { 227static struct sh_timer_config tmu1_platform_data = {
235 .name = "TMU1",
236 .channel_offset = 0x10, 228 .channel_offset = 0x10,
237 .timer_bit = 1, 229 .timer_bit = 1,
238 .clk = "tmu0",
239 .clocksource_rating = 200, 230 .clocksource_rating = 200,
240}; 231};
241 232
242static struct resource tmu1_resources[] = { 233static struct resource tmu1_resources[] = {
243 [0] = { 234 [0] = {
244 .name = "TMU1",
245 .start = 0xffd80014, 235 .start = 0xffd80014,
246 .end = 0xffd8001f, 236 .end = 0xffd8001f,
247 .flags = IORESOURCE_MEM, 237 .flags = IORESOURCE_MEM,
@@ -263,15 +253,12 @@ static struct platform_device tmu1_device = {
263}; 253};
264 254
265static struct sh_timer_config tmu2_platform_data = { 255static struct sh_timer_config tmu2_platform_data = {
266 .name = "TMU2",
267 .channel_offset = 0x1c, 256 .channel_offset = 0x1c,
268 .timer_bit = 2, 257 .timer_bit = 2,
269 .clk = "tmu0",
270}; 258};
271 259
272static struct resource tmu2_resources[] = { 260static struct resource tmu2_resources[] = {
273 [0] = { 261 [0] = {
274 .name = "TMU2",
275 .start = 0xffd80020, 262 .start = 0xffd80020,
276 .end = 0xffd8002b, 263 .end = 0xffd8002b,
277 .flags = IORESOURCE_MEM, 264 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index fd7e3639e84..24c6167a718 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -24,7 +24,7 @@
24#include <cpu/dma-register.h> 24#include <cpu/dma-register.h>
25#include <cpu/sh7722.h> 25#include <cpu/sh7722.h>
26 26
27static struct sh_dmae_slave_config sh7722_dmae_slaves[] = { 27static const struct sh_dmae_slave_config sh7722_dmae_slaves[] = {
28 { 28 {
29 .slave_id = SHDMA_SLAVE_SCIF0_TX, 29 .slave_id = SHDMA_SLAVE_SCIF0_TX,
30 .addr = 0xffe0000c, 30 .addr = 0xffe0000c,
@@ -78,7 +78,7 @@ static struct sh_dmae_slave_config sh7722_dmae_slaves[] = {
78 }, 78 },
79}; 79};
80 80
81static struct sh_dmae_channel sh7722_dmae_channels[] = { 81static const struct sh_dmae_channel sh7722_dmae_channels[] = {
82 { 82 {
83 .offset = 0, 83 .offset = 0,
84 .dmars = 0, 84 .dmars = 0,
@@ -106,7 +106,7 @@ static struct sh_dmae_channel sh7722_dmae_channels[] = {
106 } 106 }
107}; 107};
108 108
109static unsigned int ts_shift[] = TS_SHIFT; 109static const unsigned int ts_shift[] = TS_SHIFT;
110 110
111static struct sh_dmae_pdata dma_platform_data = { 111static struct sh_dmae_pdata dma_platform_data = {
112 .slave = sh7722_dmae_slaves, 112 .slave = sh7722_dmae_slaves,
@@ -174,7 +174,6 @@ static struct plat_sci_port scif0_platform_data = {
174 .flags = UPF_BOOT_AUTOCONF, 174 .flags = UPF_BOOT_AUTOCONF,
175 .type = PORT_SCIF, 175 .type = PORT_SCIF,
176 .irqs = { 80, 80, 80, 80 }, 176 .irqs = { 80, 80, 80, 80 },
177 .clk = "scif0",
178}; 177};
179 178
180static struct platform_device scif0_device = { 179static struct platform_device scif0_device = {
@@ -190,7 +189,6 @@ static struct plat_sci_port scif1_platform_data = {
190 .flags = UPF_BOOT_AUTOCONF, 189 .flags = UPF_BOOT_AUTOCONF,
191 .type = PORT_SCIF, 190 .type = PORT_SCIF,
192 .irqs = { 81, 81, 81, 81 }, 191 .irqs = { 81, 81, 81, 81 },
193 .clk = "scif1",
194}; 192};
195 193
196static struct platform_device scif1_device = { 194static struct platform_device scif1_device = {
@@ -206,7 +204,6 @@ static struct plat_sci_port scif2_platform_data = {
206 .flags = UPF_BOOT_AUTOCONF, 204 .flags = UPF_BOOT_AUTOCONF,
207 .type = PORT_SCIF, 205 .type = PORT_SCIF,
208 .irqs = { 82, 82, 82, 82 }, 206 .irqs = { 82, 82, 82, 82 },
209 .clk = "scif2",
210}; 207};
211 208
212static struct platform_device scif2_device = { 209static struct platform_device scif2_device = {
@@ -401,17 +398,14 @@ static struct platform_device jpu_device = {
401}; 398};
402 399
403static struct sh_timer_config cmt_platform_data = { 400static struct sh_timer_config cmt_platform_data = {
404 .name = "CMT",
405 .channel_offset = 0x60, 401 .channel_offset = 0x60,
406 .timer_bit = 5, 402 .timer_bit = 5,
407 .clk = "cmt0",
408 .clockevent_rating = 125, 403 .clockevent_rating = 125,
409 .clocksource_rating = 125, 404 .clocksource_rating = 125,
410}; 405};
411 406
412static struct resource cmt_resources[] = { 407static struct resource cmt_resources[] = {
413 [0] = { 408 [0] = {
414 .name = "CMT",
415 .start = 0x044a0060, 409 .start = 0x044a0060,
416 .end = 0x044a006b, 410 .end = 0x044a006b,
417 .flags = IORESOURCE_MEM, 411 .flags = IORESOURCE_MEM,
@@ -436,16 +430,13 @@ static struct platform_device cmt_device = {
436}; 430};
437 431
438static struct sh_timer_config tmu0_platform_data = { 432static struct sh_timer_config tmu0_platform_data = {
439 .name = "TMU0",
440 .channel_offset = 0x04, 433 .channel_offset = 0x04,
441 .timer_bit = 0, 434 .timer_bit = 0,
442 .clk = "tmu0",
443 .clockevent_rating = 200, 435 .clockevent_rating = 200,
444}; 436};
445 437
446static struct resource tmu0_resources[] = { 438static struct resource tmu0_resources[] = {
447 [0] = { 439 [0] = {
448 .name = "TMU0",
449 .start = 0xffd80008, 440 .start = 0xffd80008,
450 .end = 0xffd80013, 441 .end = 0xffd80013,
451 .flags = IORESOURCE_MEM, 442 .flags = IORESOURCE_MEM,
@@ -470,16 +461,13 @@ static struct platform_device tmu0_device = {
470}; 461};
471 462
472static struct sh_timer_config tmu1_platform_data = { 463static struct sh_timer_config tmu1_platform_data = {
473 .name = "TMU1",
474 .channel_offset = 0x10, 464 .channel_offset = 0x10,
475 .timer_bit = 1, 465 .timer_bit = 1,
476 .clk = "tmu0",
477 .clocksource_rating = 200, 466 .clocksource_rating = 200,
478}; 467};
479 468
480static struct resource tmu1_resources[] = { 469static struct resource tmu1_resources[] = {
481 [0] = { 470 [0] = {
482 .name = "TMU1",
483 .start = 0xffd80014, 471 .start = 0xffd80014,
484 .end = 0xffd8001f, 472 .end = 0xffd8001f,
485 .flags = IORESOURCE_MEM, 473 .flags = IORESOURCE_MEM,
@@ -504,15 +492,12 @@ static struct platform_device tmu1_device = {
504}; 492};
505 493
506static struct sh_timer_config tmu2_platform_data = { 494static struct sh_timer_config tmu2_platform_data = {
507 .name = "TMU2",
508 .channel_offset = 0x1c, 495 .channel_offset = 0x1c,
509 .timer_bit = 2, 496 .timer_bit = 2,
510 .clk = "tmu0",
511}; 497};
512 498
513static struct resource tmu2_resources[] = { 499static struct resource tmu2_resources[] = {
514 [0] = { 500 [0] = {
515 .name = "TMU2",
516 .start = 0xffd80020, 501 .start = 0xffd80020,
517 .end = 0xffd8002b, 502 .end = 0xffd8002b,
518 .flags = IORESOURCE_MEM, 503 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index 85c61f62470..0eadefdbbba 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -26,7 +26,6 @@ static struct plat_sci_port scif0_platform_data = {
26 .flags = UPF_BOOT_AUTOCONF, 26 .flags = UPF_BOOT_AUTOCONF,
27 .type = PORT_SCIF, 27 .type = PORT_SCIF,
28 .irqs = { 80, 80, 80, 80 }, 28 .irqs = { 80, 80, 80, 80 },
29 .clk = "scif0",
30}; 29};
31 30
32static struct platform_device scif0_device = { 31static struct platform_device scif0_device = {
@@ -42,7 +41,6 @@ static struct plat_sci_port scif1_platform_data = {
42 .flags = UPF_BOOT_AUTOCONF, 41 .flags = UPF_BOOT_AUTOCONF,
43 .type = PORT_SCIF, 42 .type = PORT_SCIF,
44 .irqs = { 81, 81, 81, 81 }, 43 .irqs = { 81, 81, 81, 81 },
45 .clk = "scif1",
46}; 44};
47 45
48static struct platform_device scif1_device = { 46static struct platform_device scif1_device = {
@@ -58,7 +56,6 @@ static struct plat_sci_port scif2_platform_data = {
58 .flags = UPF_BOOT_AUTOCONF, 56 .flags = UPF_BOOT_AUTOCONF,
59 .type = PORT_SCIF, 57 .type = PORT_SCIF,
60 .irqs = { 82, 82, 82, 82 }, 58 .irqs = { 82, 82, 82, 82 },
61 .clk = "scif2",
62}; 59};
63 60
64static struct platform_device scif2_device = { 61static struct platform_device scif2_device = {
@@ -74,7 +71,6 @@ static struct plat_sci_port scif3_platform_data = {
74 .flags = UPF_BOOT_AUTOCONF, 71 .flags = UPF_BOOT_AUTOCONF,
75 .type = PORT_SCIFA, 72 .type = PORT_SCIFA,
76 .irqs = { 56, 56, 56, 56 }, 73 .irqs = { 56, 56, 56, 56 },
77 .clk = "scif3",
78}; 74};
79 75
80static struct platform_device scif3_device = { 76static struct platform_device scif3_device = {
@@ -90,7 +86,6 @@ static struct plat_sci_port scif4_platform_data = {
90 .flags = UPF_BOOT_AUTOCONF, 86 .flags = UPF_BOOT_AUTOCONF,
91 .type = PORT_SCIFA, 87 .type = PORT_SCIFA,
92 .irqs = { 88, 88, 88, 88 }, 88 .irqs = { 88, 88, 88, 88 },
93 .clk = "scif4",
94}; 89};
95 90
96static struct platform_device scif4_device = { 91static struct platform_device scif4_device = {
@@ -106,7 +101,6 @@ static struct plat_sci_port scif5_platform_data = {
106 .flags = UPF_BOOT_AUTOCONF, 101 .flags = UPF_BOOT_AUTOCONF,
107 .type = PORT_SCIFA, 102 .type = PORT_SCIFA,
108 .irqs = { 109, 109, 109, 109 }, 103 .irqs = { 109, 109, 109, 109 },
109 .clk = "scif5",
110}; 104};
111 105
112static struct platform_device scif5_device = { 106static struct platform_device scif5_device = {
@@ -211,17 +205,14 @@ static struct platform_device veu1_device = {
211}; 205};
212 206
213static struct sh_timer_config cmt_platform_data = { 207static struct sh_timer_config cmt_platform_data = {
214 .name = "CMT",
215 .channel_offset = 0x60, 208 .channel_offset = 0x60,
216 .timer_bit = 5, 209 .timer_bit = 5,
217 .clk = "cmt0",
218 .clockevent_rating = 125, 210 .clockevent_rating = 125,
219 .clocksource_rating = 125, 211 .clocksource_rating = 125,
220}; 212};
221 213
222static struct resource cmt_resources[] = { 214static struct resource cmt_resources[] = {
223 [0] = { 215 [0] = {
224 .name = "CMT",
225 .start = 0x044a0060, 216 .start = 0x044a0060,
226 .end = 0x044a006b, 217 .end = 0x044a006b,
227 .flags = IORESOURCE_MEM, 218 .flags = IORESOURCE_MEM,
@@ -246,16 +237,13 @@ static struct platform_device cmt_device = {
246}; 237};
247 238
248static struct sh_timer_config tmu0_platform_data = { 239static struct sh_timer_config tmu0_platform_data = {
249 .name = "TMU0",
250 .channel_offset = 0x04, 240 .channel_offset = 0x04,
251 .timer_bit = 0, 241 .timer_bit = 0,
252 .clk = "tmu0",
253 .clockevent_rating = 200, 242 .clockevent_rating = 200,
254}; 243};
255 244
256static struct resource tmu0_resources[] = { 245static struct resource tmu0_resources[] = {
257 [0] = { 246 [0] = {
258 .name = "TMU0",
259 .start = 0xffd80008, 247 .start = 0xffd80008,
260 .end = 0xffd80013, 248 .end = 0xffd80013,
261 .flags = IORESOURCE_MEM, 249 .flags = IORESOURCE_MEM,
@@ -280,16 +268,13 @@ static struct platform_device tmu0_device = {
280}; 268};
281 269
282static struct sh_timer_config tmu1_platform_data = { 270static struct sh_timer_config tmu1_platform_data = {
283 .name = "TMU1",
284 .channel_offset = 0x10, 271 .channel_offset = 0x10,
285 .timer_bit = 1, 272 .timer_bit = 1,
286 .clk = "tmu0",
287 .clocksource_rating = 200, 273 .clocksource_rating = 200,
288}; 274};
289 275
290static struct resource tmu1_resources[] = { 276static struct resource tmu1_resources[] = {
291 [0] = { 277 [0] = {
292 .name = "TMU1",
293 .start = 0xffd80014, 278 .start = 0xffd80014,
294 .end = 0xffd8001f, 279 .end = 0xffd8001f,
295 .flags = IORESOURCE_MEM, 280 .flags = IORESOURCE_MEM,
@@ -314,15 +299,12 @@ static struct platform_device tmu1_device = {
314}; 299};
315 300
316static struct sh_timer_config tmu2_platform_data = { 301static struct sh_timer_config tmu2_platform_data = {
317 .name = "TMU2",
318 .channel_offset = 0x1c, 302 .channel_offset = 0x1c,
319 .timer_bit = 2, 303 .timer_bit = 2,
320 .clk = "tmu0",
321}; 304};
322 305
323static struct resource tmu2_resources[] = { 306static struct resource tmu2_resources[] = {
324 [0] = { 307 [0] = {
325 .name = "TMU2",
326 .start = 0xffd80020, 308 .start = 0xffd80020,
327 .end = 0xffd8002b, 309 .end = 0xffd8002b,
328 .flags = IORESOURCE_MEM, 310 .flags = IORESOURCE_MEM,
@@ -347,15 +329,12 @@ static struct platform_device tmu2_device = {
347}; 329};
348 330
349static struct sh_timer_config tmu3_platform_data = { 331static struct sh_timer_config tmu3_platform_data = {
350 .name = "TMU3",
351 .channel_offset = 0x04, 332 .channel_offset = 0x04,
352 .timer_bit = 0, 333 .timer_bit = 0,
353 .clk = "tmu1",
354}; 334};
355 335
356static struct resource tmu3_resources[] = { 336static struct resource tmu3_resources[] = {
357 [0] = { 337 [0] = {
358 .name = "TMU3",
359 .start = 0xffd90008, 338 .start = 0xffd90008,
360 .end = 0xffd90013, 339 .end = 0xffd90013,
361 .flags = IORESOURCE_MEM, 340 .flags = IORESOURCE_MEM,
@@ -380,15 +359,12 @@ static struct platform_device tmu3_device = {
380}; 359};
381 360
382static struct sh_timer_config tmu4_platform_data = { 361static struct sh_timer_config tmu4_platform_data = {
383 .name = "TMU4",
384 .channel_offset = 0x10, 362 .channel_offset = 0x10,
385 .timer_bit = 1, 363 .timer_bit = 1,
386 .clk = "tmu1",
387}; 364};
388 365
389static struct resource tmu4_resources[] = { 366static struct resource tmu4_resources[] = {
390 [0] = { 367 [0] = {
391 .name = "TMU4",
392 .start = 0xffd90014, 368 .start = 0xffd90014,
393 .end = 0xffd9001f, 369 .end = 0xffd9001f,
394 .flags = IORESOURCE_MEM, 370 .flags = IORESOURCE_MEM,
@@ -413,15 +389,12 @@ static struct platform_device tmu4_device = {
413}; 389};
414 390
415static struct sh_timer_config tmu5_platform_data = { 391static struct sh_timer_config tmu5_platform_data = {
416 .name = "TMU5",
417 .channel_offset = 0x1c, 392 .channel_offset = 0x1c,
418 .timer_bit = 2, 393 .timer_bit = 2,
419 .clk = "tmu1",
420}; 394};
421 395
422static struct resource tmu5_resources[] = { 396static struct resource tmu5_resources[] = {
423 [0] = { 397 [0] = {
424 .name = "TMU5",
425 .start = 0xffd90020, 398 .start = 0xffd90020,
426 .end = 0xffd9002b, 399 .end = 0xffd9002b,
427 .flags = IORESOURCE_MEM, 400 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index e7fa2a92fc1..89fe16d20fd 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -31,7 +31,7 @@
31#include <cpu/sh7724.h> 31#include <cpu/sh7724.h>
32 32
33/* DMA */ 33/* DMA */
34static struct sh_dmae_channel sh7724_dmae0_channels[] = { 34static const struct sh_dmae_channel sh7724_dmae_channels[] = {
35 { 35 {
36 .offset = 0, 36 .offset = 0,
37 .dmars = 0, 37 .dmars = 0,
@@ -59,51 +59,11 @@ static struct sh_dmae_channel sh7724_dmae0_channels[] = {
59 } 59 }
60}; 60};
61 61
62static struct sh_dmae_channel sh7724_dmae1_channels[] = { 62static const unsigned int ts_shift[] = TS_SHIFT;
63 {
64 .offset = 0,
65 .dmars = 0,
66 .dmars_bit = 0,
67 }, {
68 .offset = 0x10,
69 .dmars = 0,
70 .dmars_bit = 8,
71 }, {
72 .offset = 0x20,
73 .dmars = 4,
74 .dmars_bit = 0,
75 }, {
76 .offset = 0x30,
77 .dmars = 4,
78 .dmars_bit = 8,
79 }, {
80 .offset = 0x50,
81 .dmars = 8,
82 .dmars_bit = 0,
83 }, {
84 .offset = 0x60,
85 .dmars = 8,
86 .dmars_bit = 8,
87 }
88};
89
90static unsigned int ts_shift[] = TS_SHIFT;
91
92static struct sh_dmae_pdata dma0_platform_data = {
93 .channel = sh7724_dmae0_channels,
94 .channel_num = ARRAY_SIZE(sh7724_dmae0_channels),
95 .ts_low_shift = CHCR_TS_LOW_SHIFT,
96 .ts_low_mask = CHCR_TS_LOW_MASK,
97 .ts_high_shift = CHCR_TS_HIGH_SHIFT,
98 .ts_high_mask = CHCR_TS_HIGH_MASK,
99 .ts_shift = ts_shift,
100 .ts_shift_num = ARRAY_SIZE(ts_shift),
101 .dmaor_init = DMAOR_INIT,
102};
103 63
104static struct sh_dmae_pdata dma1_platform_data = { 64static struct sh_dmae_pdata dma_platform_data = {
105 .channel = sh7724_dmae1_channels, 65 .channel = sh7724_dmae_channels,
106 .channel_num = ARRAY_SIZE(sh7724_dmae1_channels), 66 .channel_num = ARRAY_SIZE(sh7724_dmae_channels),
107 .ts_low_shift = CHCR_TS_LOW_SHIFT, 67 .ts_low_shift = CHCR_TS_LOW_SHIFT,
108 .ts_low_mask = CHCR_TS_LOW_MASK, 68 .ts_low_mask = CHCR_TS_LOW_MASK,
109 .ts_high_shift = CHCR_TS_HIGH_SHIFT, 69 .ts_high_shift = CHCR_TS_HIGH_SHIFT,
@@ -187,7 +147,7 @@ static struct platform_device dma0_device = {
187 .resource = sh7724_dmae0_resources, 147 .resource = sh7724_dmae0_resources,
188 .num_resources = ARRAY_SIZE(sh7724_dmae0_resources), 148 .num_resources = ARRAY_SIZE(sh7724_dmae0_resources),
189 .dev = { 149 .dev = {
190 .platform_data = &dma0_platform_data, 150 .platform_data = &dma_platform_data,
191 }, 151 },
192 .archdata = { 152 .archdata = {
193 .hwblk_id = HWBLK_DMAC0, 153 .hwblk_id = HWBLK_DMAC0,
@@ -200,7 +160,7 @@ static struct platform_device dma1_device = {
200 .resource = sh7724_dmae1_resources, 160 .resource = sh7724_dmae1_resources,
201 .num_resources = ARRAY_SIZE(sh7724_dmae1_resources), 161 .num_resources = ARRAY_SIZE(sh7724_dmae1_resources),
202 .dev = { 162 .dev = {
203 .platform_data = &dma1_platform_data, 163 .platform_data = &dma_platform_data,
204 }, 164 },
205 .archdata = { 165 .archdata = {
206 .hwblk_id = HWBLK_DMAC1, 166 .hwblk_id = HWBLK_DMAC1,
@@ -213,7 +173,6 @@ static struct plat_sci_port scif0_platform_data = {
213 .flags = UPF_BOOT_AUTOCONF, 173 .flags = UPF_BOOT_AUTOCONF,
214 .type = PORT_SCIF, 174 .type = PORT_SCIF,
215 .irqs = { 80, 80, 80, 80 }, 175 .irqs = { 80, 80, 80, 80 },
216 .clk = "scif0",
217}; 176};
218 177
219static struct platform_device scif0_device = { 178static struct platform_device scif0_device = {
@@ -229,7 +188,6 @@ static struct plat_sci_port scif1_platform_data = {
229 .flags = UPF_BOOT_AUTOCONF, 188 .flags = UPF_BOOT_AUTOCONF,
230 .type = PORT_SCIF, 189 .type = PORT_SCIF,
231 .irqs = { 81, 81, 81, 81 }, 190 .irqs = { 81, 81, 81, 81 },
232 .clk = "scif1",
233}; 191};
234 192
235static struct platform_device scif1_device = { 193static struct platform_device scif1_device = {
@@ -245,7 +203,6 @@ static struct plat_sci_port scif2_platform_data = {
245 .flags = UPF_BOOT_AUTOCONF, 203 .flags = UPF_BOOT_AUTOCONF,
246 .type = PORT_SCIF, 204 .type = PORT_SCIF,
247 .irqs = { 82, 82, 82, 82 }, 205 .irqs = { 82, 82, 82, 82 },
248 .clk = "scif2",
249}; 206};
250 207
251static struct platform_device scif2_device = { 208static struct platform_device scif2_device = {
@@ -261,7 +218,6 @@ static struct plat_sci_port scif3_platform_data = {
261 .flags = UPF_BOOT_AUTOCONF, 218 .flags = UPF_BOOT_AUTOCONF,
262 .type = PORT_SCIFA, 219 .type = PORT_SCIFA,
263 .irqs = { 56, 56, 56, 56 }, 220 .irqs = { 56, 56, 56, 56 },
264 .clk = "scif3",
265}; 221};
266 222
267static struct platform_device scif3_device = { 223static struct platform_device scif3_device = {
@@ -277,7 +233,6 @@ static struct plat_sci_port scif4_platform_data = {
277 .flags = UPF_BOOT_AUTOCONF, 233 .flags = UPF_BOOT_AUTOCONF,
278 .type = PORT_SCIFA, 234 .type = PORT_SCIFA,
279 .irqs = { 88, 88, 88, 88 }, 235 .irqs = { 88, 88, 88, 88 },
280 .clk = "scif4",
281}; 236};
282 237
283static struct platform_device scif4_device = { 238static struct platform_device scif4_device = {
@@ -293,7 +248,6 @@ static struct plat_sci_port scif5_platform_data = {
293 .flags = UPF_BOOT_AUTOCONF, 248 .flags = UPF_BOOT_AUTOCONF,
294 .type = PORT_SCIFA, 249 .type = PORT_SCIFA,
295 .irqs = { 109, 109, 109, 109 }, 250 .irqs = { 109, 109, 109, 109 },
296 .clk = "scif5",
297}; 251};
298 252
299static struct platform_device scif5_device = { 253static struct platform_device scif5_device = {
@@ -485,17 +439,14 @@ static struct platform_device veu1_device = {
485}; 439};
486 440
487static struct sh_timer_config cmt_platform_data = { 441static struct sh_timer_config cmt_platform_data = {
488 .name = "CMT",
489 .channel_offset = 0x60, 442 .channel_offset = 0x60,
490 .timer_bit = 5, 443 .timer_bit = 5,
491 .clk = "cmt0",
492 .clockevent_rating = 125, 444 .clockevent_rating = 125,
493 .clocksource_rating = 200, 445 .clocksource_rating = 200,
494}; 446};
495 447
496static struct resource cmt_resources[] = { 448static struct resource cmt_resources[] = {
497 [0] = { 449 [0] = {
498 .name = "CMT",
499 .start = 0x044a0060, 450 .start = 0x044a0060,
500 .end = 0x044a006b, 451 .end = 0x044a006b,
501 .flags = IORESOURCE_MEM, 452 .flags = IORESOURCE_MEM,
@@ -520,16 +471,13 @@ static struct platform_device cmt_device = {
520}; 471};
521 472
522static struct sh_timer_config tmu0_platform_data = { 473static struct sh_timer_config tmu0_platform_data = {
523 .name = "TMU0",
524 .channel_offset = 0x04, 474 .channel_offset = 0x04,
525 .timer_bit = 0, 475 .timer_bit = 0,
526 .clk = "tmu0",
527 .clockevent_rating = 200, 476 .clockevent_rating = 200,
528}; 477};
529 478
530static struct resource tmu0_resources[] = { 479static struct resource tmu0_resources[] = {
531 [0] = { 480 [0] = {
532 .name = "TMU0",
533 .start = 0xffd80008, 481 .start = 0xffd80008,
534 .end = 0xffd80013, 482 .end = 0xffd80013,
535 .flags = IORESOURCE_MEM, 483 .flags = IORESOURCE_MEM,
@@ -554,16 +502,13 @@ static struct platform_device tmu0_device = {
554}; 502};
555 503
556static struct sh_timer_config tmu1_platform_data = { 504static struct sh_timer_config tmu1_platform_data = {
557 .name = "TMU1",
558 .channel_offset = 0x10, 505 .channel_offset = 0x10,
559 .timer_bit = 1, 506 .timer_bit = 1,
560 .clk = "tmu0",
561 .clocksource_rating = 200, 507 .clocksource_rating = 200,
562}; 508};
563 509
564static struct resource tmu1_resources[] = { 510static struct resource tmu1_resources[] = {
565 [0] = { 511 [0] = {
566 .name = "TMU1",
567 .start = 0xffd80014, 512 .start = 0xffd80014,
568 .end = 0xffd8001f, 513 .end = 0xffd8001f,
569 .flags = IORESOURCE_MEM, 514 .flags = IORESOURCE_MEM,
@@ -588,15 +533,12 @@ static struct platform_device tmu1_device = {
588}; 533};
589 534
590static struct sh_timer_config tmu2_platform_data = { 535static struct sh_timer_config tmu2_platform_data = {
591 .name = "TMU2",
592 .channel_offset = 0x1c, 536 .channel_offset = 0x1c,
593 .timer_bit = 2, 537 .timer_bit = 2,
594 .clk = "tmu0",
595}; 538};
596 539
597static struct resource tmu2_resources[] = { 540static struct resource tmu2_resources[] = {
598 [0] = { 541 [0] = {
599 .name = "TMU2",
600 .start = 0xffd80020, 542 .start = 0xffd80020,
601 .end = 0xffd8002b, 543 .end = 0xffd8002b,
602 .flags = IORESOURCE_MEM, 544 .flags = IORESOURCE_MEM,
@@ -622,15 +564,12 @@ static struct platform_device tmu2_device = {
622 564
623 565
624static struct sh_timer_config tmu3_platform_data = { 566static struct sh_timer_config tmu3_platform_data = {
625 .name = "TMU3",
626 .channel_offset = 0x04, 567 .channel_offset = 0x04,
627 .timer_bit = 0, 568 .timer_bit = 0,
628 .clk = "tmu1",
629}; 569};
630 570
631static struct resource tmu3_resources[] = { 571static struct resource tmu3_resources[] = {
632 [0] = { 572 [0] = {
633 .name = "TMU3",
634 .start = 0xffd90008, 573 .start = 0xffd90008,
635 .end = 0xffd90013, 574 .end = 0xffd90013,
636 .flags = IORESOURCE_MEM, 575 .flags = IORESOURCE_MEM,
@@ -655,15 +594,12 @@ static struct platform_device tmu3_device = {
655}; 594};
656 595
657static struct sh_timer_config tmu4_platform_data = { 596static struct sh_timer_config tmu4_platform_data = {
658 .name = "TMU4",
659 .channel_offset = 0x10, 597 .channel_offset = 0x10,
660 .timer_bit = 1, 598 .timer_bit = 1,
661 .clk = "tmu1",
662}; 599};
663 600
664static struct resource tmu4_resources[] = { 601static struct resource tmu4_resources[] = {
665 [0] = { 602 [0] = {
666 .name = "TMU4",
667 .start = 0xffd90014, 603 .start = 0xffd90014,
668 .end = 0xffd9001f, 604 .end = 0xffd9001f,
669 .flags = IORESOURCE_MEM, 605 .flags = IORESOURCE_MEM,
@@ -688,15 +624,12 @@ static struct platform_device tmu4_device = {
688}; 624};
689 625
690static struct sh_timer_config tmu5_platform_data = { 626static struct sh_timer_config tmu5_platform_data = {
691 .name = "TMU5",
692 .channel_offset = 0x1c, 627 .channel_offset = 0x1c,
693 .timer_bit = 2, 628 .timer_bit = 2,
694 .clk = "tmu1",
695}; 629};
696 630
697static struct resource tmu5_resources[] = { 631static struct resource tmu5_resources[] = {
698 [0] = { 632 [0] = {
699 .name = "TMU5",
700 .start = 0xffd90020, 633 .start = 0xffd90020,
701 .end = 0xffd9002b, 634 .end = 0xffd9002b,
702 .flags = IORESOURCE_MEM, 635 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index e75edf58796..444aca95b20 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -63,16 +63,13 @@ static struct platform_device scif4_device = {
63}; 63};
64 64
65static struct sh_timer_config tmu0_platform_data = { 65static struct sh_timer_config tmu0_platform_data = {
66 .name = "TMU0",
67 .channel_offset = 0x04, 66 .channel_offset = 0x04,
68 .timer_bit = 0, 67 .timer_bit = 0,
69 .clk = "peripheral_clk",
70 .clockevent_rating = 200, 68 .clockevent_rating = 200,
71}; 69};
72 70
73static struct resource tmu0_resources[] = { 71static struct resource tmu0_resources[] = {
74 [0] = { 72 [0] = {
75 .name = "TMU0",
76 .start = 0xfe430008, 73 .start = 0xfe430008,
77 .end = 0xfe430013, 74 .end = 0xfe430013,
78 .flags = IORESOURCE_MEM, 75 .flags = IORESOURCE_MEM,
@@ -94,16 +91,13 @@ static struct platform_device tmu0_device = {
94}; 91};
95 92
96static struct sh_timer_config tmu1_platform_data = { 93static struct sh_timer_config tmu1_platform_data = {
97 .name = "TMU1",
98 .channel_offset = 0x10, 94 .channel_offset = 0x10,
99 .timer_bit = 1, 95 .timer_bit = 1,
100 .clk = "peripheral_clk",
101 .clocksource_rating = 200, 96 .clocksource_rating = 200,
102}; 97};
103 98
104static struct resource tmu1_resources[] = { 99static struct resource tmu1_resources[] = {
105 [0] = { 100 [0] = {
106 .name = "TMU1",
107 .start = 0xfe430014, 101 .start = 0xfe430014,
108 .end = 0xfe43001f, 102 .end = 0xfe43001f,
109 .flags = IORESOURCE_MEM, 103 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
index 7f6b0a5f7f8..5b5f6b005fc 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c
@@ -131,16 +131,13 @@ static struct platform_device usbf_device = {
131}; 131};
132 132
133static struct sh_timer_config tmu0_platform_data = { 133static struct sh_timer_config tmu0_platform_data = {
134 .name = "TMU0",
135 .channel_offset = 0x04, 134 .channel_offset = 0x04,
136 .timer_bit = 0, 135 .timer_bit = 0,
137 .clk = "peripheral_clk",
138 .clockevent_rating = 200, 136 .clockevent_rating = 200,
139}; 137};
140 138
141static struct resource tmu0_resources[] = { 139static struct resource tmu0_resources[] = {
142 [0] = { 140 [0] = {
143 .name = "TMU0",
144 .start = 0xffd80008, 141 .start = 0xffd80008,
145 .end = 0xffd80013, 142 .end = 0xffd80013,
146 .flags = IORESOURCE_MEM, 143 .flags = IORESOURCE_MEM,
@@ -162,16 +159,13 @@ static struct platform_device tmu0_device = {
162}; 159};
163 160
164static struct sh_timer_config tmu1_platform_data = { 161static struct sh_timer_config tmu1_platform_data = {
165 .name = "TMU1",
166 .channel_offset = 0x10, 162 .channel_offset = 0x10,
167 .timer_bit = 1, 163 .timer_bit = 1,
168 .clk = "peripheral_clk",
169 .clocksource_rating = 200, 164 .clocksource_rating = 200,
170}; 165};
171 166
172static struct resource tmu1_resources[] = { 167static struct resource tmu1_resources[] = {
173 [0] = { 168 [0] = {
174 .name = "TMU1",
175 .start = 0xffd80014, 169 .start = 0xffd80014,
176 .end = 0xffd8001f, 170 .end = 0xffd8001f,
177 .flags = IORESOURCE_MEM, 171 .flags = IORESOURCE_MEM,
@@ -193,15 +187,12 @@ static struct platform_device tmu1_device = {
193}; 187};
194 188
195static struct sh_timer_config tmu2_platform_data = { 189static struct sh_timer_config tmu2_platform_data = {
196 .name = "TMU2",
197 .channel_offset = 0x1c, 190 .channel_offset = 0x1c,
198 .timer_bit = 2, 191 .timer_bit = 2,
199 .clk = "peripheral_clk",
200}; 192};
201 193
202static struct resource tmu2_resources[] = { 194static struct resource tmu2_resources[] = {
203 [0] = { 195 [0] = {
204 .name = "TMU2",
205 .start = 0xffd80020, 196 .start = 0xffd80020,
206 .end = 0xffd8002f, 197 .end = 0xffd8002f,
207 .flags = IORESOURCE_MEM, 198 .flags = IORESOURCE_MEM,
@@ -223,15 +214,12 @@ static struct platform_device tmu2_device = {
223}; 214};
224 215
225static struct sh_timer_config tmu3_platform_data = { 216static struct sh_timer_config tmu3_platform_data = {
226 .name = "TMU3",
227 .channel_offset = 0x04, 217 .channel_offset = 0x04,
228 .timer_bit = 0, 218 .timer_bit = 0,
229 .clk = "peripheral_clk",
230}; 219};
231 220
232static struct resource tmu3_resources[] = { 221static struct resource tmu3_resources[] = {
233 [0] = { 222 [0] = {
234 .name = "TMU3",
235 .start = 0xffd88008, 223 .start = 0xffd88008,
236 .end = 0xffd88013, 224 .end = 0xffd88013,
237 .flags = IORESOURCE_MEM, 225 .flags = IORESOURCE_MEM,
@@ -253,15 +241,12 @@ static struct platform_device tmu3_device = {
253}; 241};
254 242
255static struct sh_timer_config tmu4_platform_data = { 243static struct sh_timer_config tmu4_platform_data = {
256 .name = "TMU4",
257 .channel_offset = 0x10, 244 .channel_offset = 0x10,
258 .timer_bit = 1, 245 .timer_bit = 1,
259 .clk = "peripheral_clk",
260}; 246};
261 247
262static struct resource tmu4_resources[] = { 248static struct resource tmu4_resources[] = {
263 [0] = { 249 [0] = {
264 .name = "TMU4",
265 .start = 0xffd88014, 250 .start = 0xffd88014,
266 .end = 0xffd8801f, 251 .end = 0xffd8801f,
267 .flags = IORESOURCE_MEM, 252 .flags = IORESOURCE_MEM,
@@ -283,15 +268,12 @@ static struct platform_device tmu4_device = {
283}; 268};
284 269
285static struct sh_timer_config tmu5_platform_data = { 270static struct sh_timer_config tmu5_platform_data = {
286 .name = "TMU5",
287 .channel_offset = 0x1c, 271 .channel_offset = 0x1c,
288 .timer_bit = 2, 272 .timer_bit = 2,
289 .clk = "peripheral_clk",
290}; 273};
291 274
292static struct resource tmu5_resources[] = { 275static struct resource tmu5_resources[] = {
293 [0] = { 276 [0] = {
294 .name = "TMU5",
295 .start = 0xffd88020, 277 .start = 0xffd88020,
296 .end = 0xffd8802b, 278 .end = 0xffd8802b,
297 .flags = IORESOURCE_MEM, 279 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
index 86d681ecf90..7270d7fd676 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7770.c
@@ -165,16 +165,13 @@ static struct platform_device scif9_device = {
165}; 165};
166 166
167static struct sh_timer_config tmu0_platform_data = { 167static struct sh_timer_config tmu0_platform_data = {
168 .name = "TMU0",
169 .channel_offset = 0x04, 168 .channel_offset = 0x04,
170 .timer_bit = 0, 169 .timer_bit = 0,
171 .clk = "peripheral_clk",
172 .clockevent_rating = 200, 170 .clockevent_rating = 200,
173}; 171};
174 172
175static struct resource tmu0_resources[] = { 173static struct resource tmu0_resources[] = {
176 [0] = { 174 [0] = {
177 .name = "TMU0",
178 .start = 0xffd80008, 175 .start = 0xffd80008,
179 .end = 0xffd80013, 176 .end = 0xffd80013,
180 .flags = IORESOURCE_MEM, 177 .flags = IORESOURCE_MEM,
@@ -196,16 +193,13 @@ static struct platform_device tmu0_device = {
196}; 193};
197 194
198static struct sh_timer_config tmu1_platform_data = { 195static struct sh_timer_config tmu1_platform_data = {
199 .name = "TMU1",
200 .channel_offset = 0x10, 196 .channel_offset = 0x10,
201 .timer_bit = 1, 197 .timer_bit = 1,
202 .clk = "peripheral_clk",
203 .clocksource_rating = 200, 198 .clocksource_rating = 200,
204}; 199};
205 200
206static struct resource tmu1_resources[] = { 201static struct resource tmu1_resources[] = {
207 [0] = { 202 [0] = {
208 .name = "TMU1",
209 .start = 0xffd80014, 203 .start = 0xffd80014,
210 .end = 0xffd8001f, 204 .end = 0xffd8001f,
211 .flags = IORESOURCE_MEM, 205 .flags = IORESOURCE_MEM,
@@ -227,15 +221,12 @@ static struct platform_device tmu1_device = {
227}; 221};
228 222
229static struct sh_timer_config tmu2_platform_data = { 223static struct sh_timer_config tmu2_platform_data = {
230 .name = "TMU2",
231 .channel_offset = 0x1c, 224 .channel_offset = 0x1c,
232 .timer_bit = 2, 225 .timer_bit = 2,
233 .clk = "peripheral_clk",
234}; 226};
235 227
236static struct resource tmu2_resources[] = { 228static struct resource tmu2_resources[] = {
237 [0] = { 229 [0] = {
238 .name = "TMU2",
239 .start = 0xffd80020, 230 .start = 0xffd80020,
240 .end = 0xffd8002f, 231 .end = 0xffd8002f,
241 .flags = IORESOURCE_MEM, 232 .flags = IORESOURCE_MEM,
@@ -257,15 +248,12 @@ static struct platform_device tmu2_device = {
257}; 248};
258 249
259static struct sh_timer_config tmu3_platform_data = { 250static struct sh_timer_config tmu3_platform_data = {
260 .name = "TMU3",
261 .channel_offset = 0x04, 251 .channel_offset = 0x04,
262 .timer_bit = 0, 252 .timer_bit = 0,
263 .clk = "peripheral_clk",
264}; 253};
265 254
266static struct resource tmu3_resources[] = { 255static struct resource tmu3_resources[] = {
267 [0] = { 256 [0] = {
268 .name = "TMU3",
269 .start = 0xffd81008, 257 .start = 0xffd81008,
270 .end = 0xffd81013, 258 .end = 0xffd81013,
271 .flags = IORESOURCE_MEM, 259 .flags = IORESOURCE_MEM,
@@ -287,15 +275,12 @@ static struct platform_device tmu3_device = {
287}; 275};
288 276
289static struct sh_timer_config tmu4_platform_data = { 277static struct sh_timer_config tmu4_platform_data = {
290 .name = "TMU4",
291 .channel_offset = 0x10, 278 .channel_offset = 0x10,
292 .timer_bit = 1, 279 .timer_bit = 1,
293 .clk = "peripheral_clk",
294}; 280};
295 281
296static struct resource tmu4_resources[] = { 282static struct resource tmu4_resources[] = {
297 [0] = { 283 [0] = {
298 .name = "TMU4",
299 .start = 0xffd81014, 284 .start = 0xffd81014,
300 .end = 0xffd8101f, 285 .end = 0xffd8101f,
301 .flags = IORESOURCE_MEM, 286 .flags = IORESOURCE_MEM,
@@ -317,15 +302,12 @@ static struct platform_device tmu4_device = {
317}; 302};
318 303
319static struct sh_timer_config tmu5_platform_data = { 304static struct sh_timer_config tmu5_platform_data = {
320 .name = "TMU5",
321 .channel_offset = 0x1c, 305 .channel_offset = 0x1c,
322 .timer_bit = 2, 306 .timer_bit = 2,
323 .clk = "peripheral_clk",
324}; 307};
325 308
326static struct resource tmu5_resources[] = { 309static struct resource tmu5_resources[] = {
327 [0] = { 310 [0] = {
328 .name = "TMU5",
329 .start = 0xffd81020, 311 .start = 0xffd81020,
330 .end = 0xffd8102f, 312 .end = 0xffd8102f,
331 .flags = IORESOURCE_MEM, 313 .flags = IORESOURCE_MEM,
@@ -347,15 +329,12 @@ static struct platform_device tmu5_device = {
347}; 329};
348 330
349static struct sh_timer_config tmu6_platform_data = { 331static struct sh_timer_config tmu6_platform_data = {
350 .name = "TMU6",
351 .channel_offset = 0x04, 332 .channel_offset = 0x04,
352 .timer_bit = 0, 333 .timer_bit = 0,
353 .clk = "peripheral_clk",
354}; 334};
355 335
356static struct resource tmu6_resources[] = { 336static struct resource tmu6_resources[] = {
357 [0] = { 337 [0] = {
358 .name = "TMU6",
359 .start = 0xffd82008, 338 .start = 0xffd82008,
360 .end = 0xffd82013, 339 .end = 0xffd82013,
361 .flags = IORESOURCE_MEM, 340 .flags = IORESOURCE_MEM,
@@ -377,15 +356,12 @@ static struct platform_device tmu6_device = {
377}; 356};
378 357
379static struct sh_timer_config tmu7_platform_data = { 358static struct sh_timer_config tmu7_platform_data = {
380 .name = "TMU7",
381 .channel_offset = 0x10, 359 .channel_offset = 0x10,
382 .timer_bit = 1, 360 .timer_bit = 1,
383 .clk = "peripheral_clk",
384}; 361};
385 362
386static struct resource tmu7_resources[] = { 363static struct resource tmu7_resources[] = {
387 [0] = { 364 [0] = {
388 .name = "TMU7",
389 .start = 0xffd82014, 365 .start = 0xffd82014,
390 .end = 0xffd8201f, 366 .end = 0xffd8201f,
391 .flags = IORESOURCE_MEM, 367 .flags = IORESOURCE_MEM,
@@ -407,15 +383,12 @@ static struct platform_device tmu7_device = {
407}; 383};
408 384
409static struct sh_timer_config tmu8_platform_data = { 385static struct sh_timer_config tmu8_platform_data = {
410 .name = "TMU8",
411 .channel_offset = 0x1c, 386 .channel_offset = 0x1c,
412 .timer_bit = 2, 387 .timer_bit = 2,
413 .clk = "peripheral_clk",
414}; 388};
415 389
416static struct resource tmu8_resources[] = { 390static struct resource tmu8_resources[] = {
417 [0] = { 391 [0] = {
418 .name = "TMU8",
419 .start = 0xffd82020, 392 .start = 0xffd82020,
420 .end = 0xffd8202b, 393 .end = 0xffd8202b,
421 .flags = IORESOURCE_MEM, 394 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
index 02e792c90de..b12f537e4dd 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7780.c
@@ -49,16 +49,13 @@ static struct platform_device scif1_device = {
49}; 49};
50 50
51static struct sh_timer_config tmu0_platform_data = { 51static struct sh_timer_config tmu0_platform_data = {
52 .name = "TMU0",
53 .channel_offset = 0x04, 52 .channel_offset = 0x04,
54 .timer_bit = 0, 53 .timer_bit = 0,
55 .clk = "peripheral_clk",
56 .clockevent_rating = 200, 54 .clockevent_rating = 200,
57}; 55};
58 56
59static struct resource tmu0_resources[] = { 57static struct resource tmu0_resources[] = {
60 [0] = { 58 [0] = {
61 .name = "TMU0",
62 .start = 0xffd80008, 59 .start = 0xffd80008,
63 .end = 0xffd80013, 60 .end = 0xffd80013,
64 .flags = IORESOURCE_MEM, 61 .flags = IORESOURCE_MEM,
@@ -80,16 +77,13 @@ static struct platform_device tmu0_device = {
80}; 77};
81 78
82static struct sh_timer_config tmu1_platform_data = { 79static struct sh_timer_config tmu1_platform_data = {
83 .name = "TMU1",
84 .channel_offset = 0x10, 80 .channel_offset = 0x10,
85 .timer_bit = 1, 81 .timer_bit = 1,
86 .clk = "peripheral_clk",
87 .clocksource_rating = 200, 82 .clocksource_rating = 200,
88}; 83};
89 84
90static struct resource tmu1_resources[] = { 85static struct resource tmu1_resources[] = {
91 [0] = { 86 [0] = {
92 .name = "TMU1",
93 .start = 0xffd80014, 87 .start = 0xffd80014,
94 .end = 0xffd8001f, 88 .end = 0xffd8001f,
95 .flags = IORESOURCE_MEM, 89 .flags = IORESOURCE_MEM,
@@ -111,15 +105,12 @@ static struct platform_device tmu1_device = {
111}; 105};
112 106
113static struct sh_timer_config tmu2_platform_data = { 107static struct sh_timer_config tmu2_platform_data = {
114 .name = "TMU2",
115 .channel_offset = 0x1c, 108 .channel_offset = 0x1c,
116 .timer_bit = 2, 109 .timer_bit = 2,
117 .clk = "peripheral_clk",
118}; 110};
119 111
120static struct resource tmu2_resources[] = { 112static struct resource tmu2_resources[] = {
121 [0] = { 113 [0] = {
122 .name = "TMU2",
123 .start = 0xffd80020, 114 .start = 0xffd80020,
124 .end = 0xffd8002f, 115 .end = 0xffd8002f,
125 .flags = IORESOURCE_MEM, 116 .flags = IORESOURCE_MEM,
@@ -141,15 +132,12 @@ static struct platform_device tmu2_device = {
141}; 132};
142 133
143static struct sh_timer_config tmu3_platform_data = { 134static struct sh_timer_config tmu3_platform_data = {
144 .name = "TMU3",
145 .channel_offset = 0x04, 135 .channel_offset = 0x04,
146 .timer_bit = 0, 136 .timer_bit = 0,
147 .clk = "peripheral_clk",
148}; 137};
149 138
150static struct resource tmu3_resources[] = { 139static struct resource tmu3_resources[] = {
151 [0] = { 140 [0] = {
152 .name = "TMU3",
153 .start = 0xffdc0008, 141 .start = 0xffdc0008,
154 .end = 0xffdc0013, 142 .end = 0xffdc0013,
155 .flags = IORESOURCE_MEM, 143 .flags = IORESOURCE_MEM,
@@ -171,15 +159,12 @@ static struct platform_device tmu3_device = {
171}; 159};
172 160
173static struct sh_timer_config tmu4_platform_data = { 161static struct sh_timer_config tmu4_platform_data = {
174 .name = "TMU4",
175 .channel_offset = 0x10, 162 .channel_offset = 0x10,
176 .timer_bit = 1, 163 .timer_bit = 1,
177 .clk = "peripheral_clk",
178}; 164};
179 165
180static struct resource tmu4_resources[] = { 166static struct resource tmu4_resources[] = {
181 [0] = { 167 [0] = {
182 .name = "TMU4",
183 .start = 0xffdc0014, 168 .start = 0xffdc0014,
184 .end = 0xffdc001f, 169 .end = 0xffdc001f,
185 .flags = IORESOURCE_MEM, 170 .flags = IORESOURCE_MEM,
@@ -201,15 +186,12 @@ static struct platform_device tmu4_device = {
201}; 186};
202 187
203static struct sh_timer_config tmu5_platform_data = { 188static struct sh_timer_config tmu5_platform_data = {
204 .name = "TMU5",
205 .channel_offset = 0x1c, 189 .channel_offset = 0x1c,
206 .timer_bit = 2, 190 .timer_bit = 2,
207 .clk = "peripheral_clk",
208}; 191};
209 192
210static struct resource tmu5_resources[] = { 193static struct resource tmu5_resources[] = {
211 [0] = { 194 [0] = {
212 .name = "TMU5",
213 .start = 0xffdc0020, 195 .start = 0xffdc0020,
214 .end = 0xffdc002b, 196 .end = 0xffdc002b,
215 .flags = IORESOURCE_MEM, 197 .flags = IORESOURCE_MEM,
@@ -251,7 +233,7 @@ static struct platform_device rtc_device = {
251}; 233};
252 234
253/* DMA */ 235/* DMA */
254static struct sh_dmae_channel sh7780_dmae0_channels[] = { 236static const struct sh_dmae_channel sh7780_dmae0_channels[] = {
255 { 237 {
256 .offset = 0, 238 .offset = 0,
257 .dmars = 0, 239 .dmars = 0,
@@ -279,7 +261,7 @@ static struct sh_dmae_channel sh7780_dmae0_channels[] = {
279 } 261 }
280}; 262};
281 263
282static struct sh_dmae_channel sh7780_dmae1_channels[] = { 264static const struct sh_dmae_channel sh7780_dmae1_channels[] = {
283 { 265 {
284 .offset = 0, 266 .offset = 0,
285 }, { 267 }, {
@@ -295,7 +277,7 @@ static struct sh_dmae_channel sh7780_dmae1_channels[] = {
295 } 277 }
296}; 278};
297 279
298static unsigned int ts_shift[] = TS_SHIFT; 280static const unsigned int ts_shift[] = TS_SHIFT;
299 281
300static struct sh_dmae_pdata dma0_platform_data = { 282static struct sh_dmae_pdata dma0_platform_data = {
301 .channel = sh7780_dmae0_channels, 283 .channel = sh7780_dmae0_channels,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
index 1fcd88b1671..f3e3ea0ce05 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c
@@ -25,7 +25,6 @@ static struct plat_sci_port scif0_platform_data = {
25 .flags = UPF_BOOT_AUTOCONF, 25 .flags = UPF_BOOT_AUTOCONF,
26 .type = PORT_SCIF, 26 .type = PORT_SCIF,
27 .irqs = { 40, 40, 40, 40 }, 27 .irqs = { 40, 40, 40, 40 },
28 .clk = "scif_fck",
29}; 28};
30 29
31static struct platform_device scif0_device = { 30static struct platform_device scif0_device = {
@@ -41,7 +40,6 @@ static struct plat_sci_port scif1_platform_data = {
41 .flags = UPF_BOOT_AUTOCONF, 40 .flags = UPF_BOOT_AUTOCONF,
42 .type = PORT_SCIF, 41 .type = PORT_SCIF,
43 .irqs = { 44, 44, 44, 44 }, 42 .irqs = { 44, 44, 44, 44 },
44 .clk = "scif_fck",
45}; 43};
46 44
47static struct platform_device scif1_device = { 45static struct platform_device scif1_device = {
@@ -57,7 +55,6 @@ static struct plat_sci_port scif2_platform_data = {
57 .flags = UPF_BOOT_AUTOCONF, 55 .flags = UPF_BOOT_AUTOCONF,
58 .type = PORT_SCIF, 56 .type = PORT_SCIF,
59 .irqs = { 60, 60, 60, 60 }, 57 .irqs = { 60, 60, 60, 60 },
60 .clk = "scif_fck",
61}; 58};
62 59
63static struct platform_device scif2_device = { 60static struct platform_device scif2_device = {
@@ -73,7 +70,6 @@ static struct plat_sci_port scif3_platform_data = {
73 .flags = UPF_BOOT_AUTOCONF, 70 .flags = UPF_BOOT_AUTOCONF,
74 .type = PORT_SCIF, 71 .type = PORT_SCIF,
75 .irqs = { 61, 61, 61, 61 }, 72 .irqs = { 61, 61, 61, 61 },
76 .clk = "scif_fck",
77}; 73};
78 74
79static struct platform_device scif3_device = { 75static struct platform_device scif3_device = {
@@ -89,7 +85,6 @@ static struct plat_sci_port scif4_platform_data = {
89 .flags = UPF_BOOT_AUTOCONF, 85 .flags = UPF_BOOT_AUTOCONF,
90 .type = PORT_SCIF, 86 .type = PORT_SCIF,
91 .irqs = { 62, 62, 62, 62 }, 87 .irqs = { 62, 62, 62, 62 },
92 .clk = "scif_fck",
93}; 88};
94 89
95static struct platform_device scif4_device = { 90static struct platform_device scif4_device = {
@@ -105,7 +100,6 @@ static struct plat_sci_port scif5_platform_data = {
105 .flags = UPF_BOOT_AUTOCONF, 100 .flags = UPF_BOOT_AUTOCONF,
106 .type = PORT_SCIF, 101 .type = PORT_SCIF,
107 .irqs = { 63, 63, 63, 63 }, 102 .irqs = { 63, 63, 63, 63 },
108 .clk = "scif_fck",
109}; 103};
110 104
111static struct platform_device scif5_device = { 105static struct platform_device scif5_device = {
@@ -117,16 +111,13 @@ static struct platform_device scif5_device = {
117}; 111};
118 112
119static struct sh_timer_config tmu0_platform_data = { 113static struct sh_timer_config tmu0_platform_data = {
120 .name = "TMU0",
121 .channel_offset = 0x04, 114 .channel_offset = 0x04,
122 .timer_bit = 0, 115 .timer_bit = 0,
123 .clk = "tmu012_fck",
124 .clockevent_rating = 200, 116 .clockevent_rating = 200,
125}; 117};
126 118
127static struct resource tmu0_resources[] = { 119static struct resource tmu0_resources[] = {
128 [0] = { 120 [0] = {
129 .name = "TMU0",
130 .start = 0xffd80008, 121 .start = 0xffd80008,
131 .end = 0xffd80013, 122 .end = 0xffd80013,
132 .flags = IORESOURCE_MEM, 123 .flags = IORESOURCE_MEM,
@@ -148,16 +139,13 @@ static struct platform_device tmu0_device = {
148}; 139};
149 140
150static struct sh_timer_config tmu1_platform_data = { 141static struct sh_timer_config tmu1_platform_data = {
151 .name = "TMU1",
152 .channel_offset = 0x10, 142 .channel_offset = 0x10,
153 .timer_bit = 1, 143 .timer_bit = 1,
154 .clk = "tmu012_fck",
155 .clocksource_rating = 200, 144 .clocksource_rating = 200,
156}; 145};
157 146
158static struct resource tmu1_resources[] = { 147static struct resource tmu1_resources[] = {
159 [0] = { 148 [0] = {
160 .name = "TMU1",
161 .start = 0xffd80014, 149 .start = 0xffd80014,
162 .end = 0xffd8001f, 150 .end = 0xffd8001f,
163 .flags = IORESOURCE_MEM, 151 .flags = IORESOURCE_MEM,
@@ -179,15 +167,12 @@ static struct platform_device tmu1_device = {
179}; 167};
180 168
181static struct sh_timer_config tmu2_platform_data = { 169static struct sh_timer_config tmu2_platform_data = {
182 .name = "TMU2",
183 .channel_offset = 0x1c, 170 .channel_offset = 0x1c,
184 .timer_bit = 2, 171 .timer_bit = 2,
185 .clk = "tmu012_fck",
186}; 172};
187 173
188static struct resource tmu2_resources[] = { 174static struct resource tmu2_resources[] = {
189 [0] = { 175 [0] = {
190 .name = "TMU2",
191 .start = 0xffd80020, 176 .start = 0xffd80020,
192 .end = 0xffd8002f, 177 .end = 0xffd8002f,
193 .flags = IORESOURCE_MEM, 178 .flags = IORESOURCE_MEM,
@@ -209,15 +194,12 @@ static struct platform_device tmu2_device = {
209}; 194};
210 195
211static struct sh_timer_config tmu3_platform_data = { 196static struct sh_timer_config tmu3_platform_data = {
212 .name = "TMU3",
213 .channel_offset = 0x04, 197 .channel_offset = 0x04,
214 .timer_bit = 0, 198 .timer_bit = 0,
215 .clk = "tmu345_fck",
216}; 199};
217 200
218static struct resource tmu3_resources[] = { 201static struct resource tmu3_resources[] = {
219 [0] = { 202 [0] = {
220 .name = "TMU3",
221 .start = 0xffdc0008, 203 .start = 0xffdc0008,
222 .end = 0xffdc0013, 204 .end = 0xffdc0013,
223 .flags = IORESOURCE_MEM, 205 .flags = IORESOURCE_MEM,
@@ -239,15 +221,12 @@ static struct platform_device tmu3_device = {
239}; 221};
240 222
241static struct sh_timer_config tmu4_platform_data = { 223static struct sh_timer_config tmu4_platform_data = {
242 .name = "TMU4",
243 .channel_offset = 0x10, 224 .channel_offset = 0x10,
244 .timer_bit = 1, 225 .timer_bit = 1,
245 .clk = "tmu345_fck",
246}; 226};
247 227
248static struct resource tmu4_resources[] = { 228static struct resource tmu4_resources[] = {
249 [0] = { 229 [0] = {
250 .name = "TMU4",
251 .start = 0xffdc0014, 230 .start = 0xffdc0014,
252 .end = 0xffdc001f, 231 .end = 0xffdc001f,
253 .flags = IORESOURCE_MEM, 232 .flags = IORESOURCE_MEM,
@@ -269,15 +248,12 @@ static struct platform_device tmu4_device = {
269}; 248};
270 249
271static struct sh_timer_config tmu5_platform_data = { 250static struct sh_timer_config tmu5_platform_data = {
272 .name = "TMU5",
273 .channel_offset = 0x1c, 251 .channel_offset = 0x1c,
274 .timer_bit = 2, 252 .timer_bit = 2,
275 .clk = "tmu345_fck",
276}; 253};
277 254
278static struct resource tmu5_resources[] = { 255static struct resource tmu5_resources[] = {
279 [0] = { 256 [0] = {
280 .name = "TMU5",
281 .start = 0xffdc0020, 257 .start = 0xffdc0020,
282 .end = 0xffdc002b, 258 .end = 0xffdc002b,
283 .flags = IORESOURCE_MEM, 259 .flags = IORESOURCE_MEM,
@@ -299,7 +275,7 @@ static struct platform_device tmu5_device = {
299}; 275};
300 276
301/* DMA */ 277/* DMA */
302static struct sh_dmae_channel sh7785_dmae0_channels[] = { 278static const struct sh_dmae_channel sh7785_dmae0_channels[] = {
303 { 279 {
304 .offset = 0, 280 .offset = 0,
305 .dmars = 0, 281 .dmars = 0,
@@ -327,7 +303,7 @@ static struct sh_dmae_channel sh7785_dmae0_channels[] = {
327 } 303 }
328}; 304};
329 305
330static struct sh_dmae_channel sh7785_dmae1_channels[] = { 306static const struct sh_dmae_channel sh7785_dmae1_channels[] = {
331 { 307 {
332 .offset = 0, 308 .offset = 0,
333 }, { 309 }, {
@@ -343,7 +319,7 @@ static struct sh_dmae_channel sh7785_dmae1_channels[] = {
343 } 319 }
344}; 320};
345 321
346static unsigned int ts_shift[] = TS_SHIFT; 322static const unsigned int ts_shift[] = TS_SHIFT;
347 323
348static struct sh_dmae_pdata dma0_platform_data = { 324static struct sh_dmae_pdata dma0_platform_data = {
349 .channel = sh7785_dmae0_channels, 325 .channel = sh7785_dmae0_channels,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
index 7e585320710..81657091da4 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * SH7786 Setup 2 * SH7786 Setup
3 * 3 *
4 * Copyright (C) 2009 Renesas Solutions Corp. 4 * Copyright (C) 2009 - 2010 Renesas Solutions Corp.
5 * Kuninori Morimoto <morimoto.kuninori@renesas.com> 5 * Kuninori Morimoto <morimoto.kuninori@renesas.com>
6 * Paul Mundt <paul.mundt@renesas.com> 6 * Paul Mundt <paul.mundt@renesas.com>
7 * 7 *
@@ -21,7 +21,10 @@
21#include <linux/mm.h> 21#include <linux/mm.h>
22#include <linux/dma-mapping.h> 22#include <linux/dma-mapping.h>
23#include <linux/sh_timer.h> 23#include <linux/sh_timer.h>
24#include <linux/sh_intc.h>
25#include <cpu/dma-register.h>
24#include <asm/mmzone.h> 26#include <asm/mmzone.h>
27#include <asm/dmaengine.h>
25 28
26static struct plat_sci_port scif0_platform_data = { 29static struct plat_sci_port scif0_platform_data = {
27 .mapbase = 0xffea0000, 30 .mapbase = 0xffea0000,
@@ -117,16 +120,13 @@ static struct platform_device scif5_device = {
117}; 120};
118 121
119static struct sh_timer_config tmu0_platform_data = { 122static struct sh_timer_config tmu0_platform_data = {
120 .name = "TMU0",
121 .channel_offset = 0x04, 123 .channel_offset = 0x04,
122 .timer_bit = 0, 124 .timer_bit = 0,
123 .clk = "peripheral_clk",
124 .clockevent_rating = 200, 125 .clockevent_rating = 200,
125}; 126};
126 127
127static struct resource tmu0_resources[] = { 128static struct resource tmu0_resources[] = {
128 [0] = { 129 [0] = {
129 .name = "TMU0",
130 .start = 0xffd80008, 130 .start = 0xffd80008,
131 .end = 0xffd80013, 131 .end = 0xffd80013,
132 .flags = IORESOURCE_MEM, 132 .flags = IORESOURCE_MEM,
@@ -148,16 +148,13 @@ static struct platform_device tmu0_device = {
148}; 148};
149 149
150static struct sh_timer_config tmu1_platform_data = { 150static struct sh_timer_config tmu1_platform_data = {
151 .name = "TMU1",
152 .channel_offset = 0x10, 151 .channel_offset = 0x10,
153 .timer_bit = 1, 152 .timer_bit = 1,
154 .clk = "peripheral_clk",
155 .clocksource_rating = 200, 153 .clocksource_rating = 200,
156}; 154};
157 155
158static struct resource tmu1_resources[] = { 156static struct resource tmu1_resources[] = {
159 [0] = { 157 [0] = {
160 .name = "TMU1",
161 .start = 0xffd80014, 158 .start = 0xffd80014,
162 .end = 0xffd8001f, 159 .end = 0xffd8001f,
163 .flags = IORESOURCE_MEM, 160 .flags = IORESOURCE_MEM,
@@ -179,15 +176,12 @@ static struct platform_device tmu1_device = {
179}; 176};
180 177
181static struct sh_timer_config tmu2_platform_data = { 178static struct sh_timer_config tmu2_platform_data = {
182 .name = "TMU2",
183 .channel_offset = 0x1c, 179 .channel_offset = 0x1c,
184 .timer_bit = 2, 180 .timer_bit = 2,
185 .clk = "peripheral_clk",
186}; 181};
187 182
188static struct resource tmu2_resources[] = { 183static struct resource tmu2_resources[] = {
189 [0] = { 184 [0] = {
190 .name = "TMU2",
191 .start = 0xffd80020, 185 .start = 0xffd80020,
192 .end = 0xffd8002f, 186 .end = 0xffd8002f,
193 .flags = IORESOURCE_MEM, 187 .flags = IORESOURCE_MEM,
@@ -209,15 +203,12 @@ static struct platform_device tmu2_device = {
209}; 203};
210 204
211static struct sh_timer_config tmu3_platform_data = { 205static struct sh_timer_config tmu3_platform_data = {
212 .name = "TMU3",
213 .channel_offset = 0x04, 206 .channel_offset = 0x04,
214 .timer_bit = 0, 207 .timer_bit = 0,
215 .clk = "peripheral_clk",
216}; 208};
217 209
218static struct resource tmu3_resources[] = { 210static struct resource tmu3_resources[] = {
219 [0] = { 211 [0] = {
220 .name = "TMU3",
221 .start = 0xffda0008, 212 .start = 0xffda0008,
222 .end = 0xffda0013, 213 .end = 0xffda0013,
223 .flags = IORESOURCE_MEM, 214 .flags = IORESOURCE_MEM,
@@ -239,15 +230,12 @@ static struct platform_device tmu3_device = {
239}; 230};
240 231
241static struct sh_timer_config tmu4_platform_data = { 232static struct sh_timer_config tmu4_platform_data = {
242 .name = "TMU4",
243 .channel_offset = 0x10, 233 .channel_offset = 0x10,
244 .timer_bit = 1, 234 .timer_bit = 1,
245 .clk = "peripheral_clk",
246}; 235};
247 236
248static struct resource tmu4_resources[] = { 237static struct resource tmu4_resources[] = {
249 [0] = { 238 [0] = {
250 .name = "TMU4",
251 .start = 0xffda0014, 239 .start = 0xffda0014,
252 .end = 0xffda001f, 240 .end = 0xffda001f,
253 .flags = IORESOURCE_MEM, 241 .flags = IORESOURCE_MEM,
@@ -269,15 +257,12 @@ static struct platform_device tmu4_device = {
269}; 257};
270 258
271static struct sh_timer_config tmu5_platform_data = { 259static struct sh_timer_config tmu5_platform_data = {
272 .name = "TMU5",
273 .channel_offset = 0x1c, 260 .channel_offset = 0x1c,
274 .timer_bit = 2, 261 .timer_bit = 2,
275 .clk = "peripheral_clk",
276}; 262};
277 263
278static struct resource tmu5_resources[] = { 264static struct resource tmu5_resources[] = {
279 [0] = { 265 [0] = {
280 .name = "TMU5",
281 .start = 0xffda0020, 266 .start = 0xffda0020,
282 .end = 0xffda002b, 267 .end = 0xffda002b,
283 .flags = IORESOURCE_MEM, 268 .flags = IORESOURCE_MEM,
@@ -299,15 +284,12 @@ static struct platform_device tmu5_device = {
299}; 284};
300 285
301static struct sh_timer_config tmu6_platform_data = { 286static struct sh_timer_config tmu6_platform_data = {
302 .name = "TMU6",
303 .channel_offset = 0x04, 287 .channel_offset = 0x04,
304 .timer_bit = 0, 288 .timer_bit = 0,
305 .clk = "peripheral_clk",
306}; 289};
307 290
308static struct resource tmu6_resources[] = { 291static struct resource tmu6_resources[] = {
309 [0] = { 292 [0] = {
310 .name = "TMU6",
311 .start = 0xffdc0008, 293 .start = 0xffdc0008,
312 .end = 0xffdc0013, 294 .end = 0xffdc0013,
313 .flags = IORESOURCE_MEM, 295 .flags = IORESOURCE_MEM,
@@ -329,15 +311,12 @@ static struct platform_device tmu6_device = {
329}; 311};
330 312
331static struct sh_timer_config tmu7_platform_data = { 313static struct sh_timer_config tmu7_platform_data = {
332 .name = "TMU7",
333 .channel_offset = 0x10, 314 .channel_offset = 0x10,
334 .timer_bit = 1, 315 .timer_bit = 1,
335 .clk = "peripheral_clk",
336}; 316};
337 317
338static struct resource tmu7_resources[] = { 318static struct resource tmu7_resources[] = {
339 [0] = { 319 [0] = {
340 .name = "TMU7",
341 .start = 0xffdc0014, 320 .start = 0xffdc0014,
342 .end = 0xffdc001f, 321 .end = 0xffdc001f,
343 .flags = IORESOURCE_MEM, 322 .flags = IORESOURCE_MEM,
@@ -359,15 +338,12 @@ static struct platform_device tmu7_device = {
359}; 338};
360 339
361static struct sh_timer_config tmu8_platform_data = { 340static struct sh_timer_config tmu8_platform_data = {
362 .name = "TMU8",
363 .channel_offset = 0x1c, 341 .channel_offset = 0x1c,
364 .timer_bit = 2, 342 .timer_bit = 2,
365 .clk = "peripheral_clk",
366}; 343};
367 344
368static struct resource tmu8_resources[] = { 345static struct resource tmu8_resources[] = {
369 [0] = { 346 [0] = {
370 .name = "TMU8",
371 .start = 0xffdc0020, 347 .start = 0xffdc0020,
372 .end = 0xffdc002b, 348 .end = 0xffdc002b,
373 .flags = IORESOURCE_MEM, 349 .flags = IORESOURCE_MEM,
@@ -389,15 +365,12 @@ static struct platform_device tmu8_device = {
389}; 365};
390 366
391static struct sh_timer_config tmu9_platform_data = { 367static struct sh_timer_config tmu9_platform_data = {
392 .name = "TMU9",
393 .channel_offset = 0x04, 368 .channel_offset = 0x04,
394 .timer_bit = 0, 369 .timer_bit = 0,
395 .clk = "peripheral_clk",
396}; 370};
397 371
398static struct resource tmu9_resources[] = { 372static struct resource tmu9_resources[] = {
399 [0] = { 373 [0] = {
400 .name = "TMU9",
401 .start = 0xffde0008, 374 .start = 0xffde0008,
402 .end = 0xffde0013, 375 .end = 0xffde0013,
403 .flags = IORESOURCE_MEM, 376 .flags = IORESOURCE_MEM,
@@ -419,15 +392,12 @@ static struct platform_device tmu9_device = {
419}; 392};
420 393
421static struct sh_timer_config tmu10_platform_data = { 394static struct sh_timer_config tmu10_platform_data = {
422 .name = "TMU10",
423 .channel_offset = 0x10, 395 .channel_offset = 0x10,
424 .timer_bit = 1, 396 .timer_bit = 1,
425 .clk = "peripheral_clk",
426}; 397};
427 398
428static struct resource tmu10_resources[] = { 399static struct resource tmu10_resources[] = {
429 [0] = { 400 [0] = {
430 .name = "TMU10",
431 .start = 0xffde0014, 401 .start = 0xffde0014,
432 .end = 0xffde001f, 402 .end = 0xffde001f,
433 .flags = IORESOURCE_MEM, 403 .flags = IORESOURCE_MEM,
@@ -449,15 +419,12 @@ static struct platform_device tmu10_device = {
449}; 419};
450 420
451static struct sh_timer_config tmu11_platform_data = { 421static struct sh_timer_config tmu11_platform_data = {
452 .name = "TMU11",
453 .channel_offset = 0x1c, 422 .channel_offset = 0x1c,
454 .timer_bit = 2, 423 .timer_bit = 2,
455 .clk = "peripheral_clk",
456}; 424};
457 425
458static struct resource tmu11_resources[] = { 426static struct resource tmu11_resources[] = {
459 [0] = { 427 [0] = {
460 .name = "TMU11",
461 .start = 0xffde0020, 428 .start = 0xffde0020,
462 .end = 0xffde002b, 429 .end = 0xffde002b,
463 .flags = IORESOURCE_MEM, 430 .flags = IORESOURCE_MEM,
@@ -478,6 +445,83 @@ static struct platform_device tmu11_device = {
478 .num_resources = ARRAY_SIZE(tmu11_resources), 445 .num_resources = ARRAY_SIZE(tmu11_resources),
479}; 446};
480 447
448static const struct sh_dmae_channel dmac0_channels[] = {
449 {
450 .offset = 0,
451 .dmars = 0,
452 .dmars_bit = 0,
453 }, {
454 .offset = 0x10,
455 .dmars = 0,
456 .dmars_bit = 8,
457 }, {
458 .offset = 0x20,
459 .dmars = 4,
460 .dmars_bit = 0,
461 }, {
462 .offset = 0x30,
463 .dmars = 4,
464 .dmars_bit = 8,
465 }, {
466 .offset = 0x50,
467 .dmars = 8,
468 .dmars_bit = 0,
469 }, {
470 .offset = 0x60,
471 .dmars = 8,
472 .dmars_bit = 8,
473 }
474};
475
476static const unsigned int ts_shift[] = TS_SHIFT;
477
478static struct sh_dmae_pdata dma0_platform_data = {
479 .channel = dmac0_channels,
480 .channel_num = ARRAY_SIZE(dmac0_channels),
481 .ts_low_shift = CHCR_TS_LOW_SHIFT,
482 .ts_low_mask = CHCR_TS_LOW_MASK,
483 .ts_high_shift = CHCR_TS_HIGH_SHIFT,
484 .ts_high_mask = CHCR_TS_HIGH_MASK,
485 .ts_shift = ts_shift,
486 .ts_shift_num = ARRAY_SIZE(ts_shift),
487 .dmaor_init = DMAOR_INIT,
488};
489
490/* Resource order important! */
491static struct resource dmac0_resources[] = {
492 {
493 /* Channel registers and DMAOR */
494 .start = 0xfe008020,
495 .end = 0xfe00808f,
496 .flags = IORESOURCE_MEM,
497 }, {
498 /* DMARSx */
499 .start = 0xfe009000,
500 .end = 0xfe00900b,
501 .flags = IORESOURCE_MEM,
502 }, {
503 /* DMA error IRQ */
504 .start = evt2irq(0x5c0),
505 .end = evt2irq(0x5c0),
506 .flags = IORESOURCE_IRQ,
507 }, {
508 /* IRQ for channels 0-5 */
509 .start = evt2irq(0x500),
510 .end = evt2irq(0x5a0),
511 .flags = IORESOURCE_IRQ,
512 },
513};
514
515static struct platform_device dma0_device = {
516 .name = "sh-dma-engine",
517 .id = 0,
518 .resource = dmac0_resources,
519 .num_resources = ARRAY_SIZE(dmac0_resources),
520 .dev = {
521 .platform_data = &dma0_platform_data,
522 },
523};
524
481static struct resource usb_ohci_resources[] = { 525static struct resource usb_ohci_resources[] = {
482 [0] = { 526 [0] = {
483 .start = 0xffe70400, 527 .start = 0xffe70400,
@@ -525,10 +569,10 @@ static struct platform_device *sh7786_early_devices[] __initdata = {
525}; 569};
526 570
527static struct platform_device *sh7786_devices[] __initdata = { 571static struct platform_device *sh7786_devices[] __initdata = {
572 &dma0_device,
528 &usb_ohci_device, 573 &usb_ohci_device,
529}; 574};
530 575
531
532/* 576/*
533 * Please call this function if your platform board 577 * Please call this function if your platform board
534 * use external clock for USB 578 * use external clock for USB
@@ -536,6 +580,7 @@ static struct platform_device *sh7786_devices[] __initdata = {
536#define USBCTL0 0xffe70858 580#define USBCTL0 0xffe70858
537#define CLOCK_MODE_MASK 0xffffff7f 581#define CLOCK_MODE_MASK 0xffffff7f
538#define EXT_CLOCK_MODE 0x00000080 582#define EXT_CLOCK_MODE 0x00000080
583
539void __init sh7786_usb_use_exclock(void) 584void __init sh7786_usb_use_exclock(void)
540{ 585{
541 u32 val = __raw_readl(USBCTL0) & CLOCK_MODE_MASK; 586 u32 val = __raw_readl(USBCTL0) & CLOCK_MODE_MASK;
@@ -553,6 +598,7 @@ void __init sh7786_usb_use_exclock(void)
553#define PLL_ENB 0x00000002 598#define PLL_ENB 0x00000002
554#define PHY_RST 0x00000004 599#define PHY_RST 0x00000004
555#define ACT_PLL_STATUS 0xc0000000 600#define ACT_PLL_STATUS 0xc0000000
601
556static void __init sh7786_usb_setup(void) 602static void __init sh7786_usb_setup(void)
557{ 603{
558 int i = 1000000; 604 int i = 1000000;
@@ -708,9 +754,19 @@ static struct intc_vect vectors[] __initdata = {
708#define INTMSK2 0xfe410068 754#define INTMSK2 0xfe410068
709#define INTMSKCLR2 0xfe41006c 755#define INTMSKCLR2 0xfe41006c
710 756
757#define INTDISTCR0 0xfe4100b0
758#define INTDISTCR1 0xfe4100b4
759#define INTACK 0xfe4100b8
760#define INTACKCLR 0xfe4100bc
761#define INT2DISTCR0 0xfe410900
762#define INT2DISTCR1 0xfe410904
763#define INT2DISTCR2 0xfe410908
764#define INT2DISTCR3 0xfe41090c
765
711static struct intc_mask_reg mask_registers[] __initdata = { 766static struct intc_mask_reg mask_registers[] __initdata = {
712 { CnINTMSK0, CnINTMSKCLR0, 32, 767 { CnINTMSK0, CnINTMSKCLR0, 32,
713 { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } }, 768 { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 },
769 INTC_SMP_BALANCING(INTDISTCR0) },
714 { INTMSK2, INTMSKCLR2, 32, 770 { INTMSK2, INTMSKCLR2, 32,
715 { IRL0_LLLL, IRL0_LLLH, IRL0_LLHL, IRL0_LLHH, 771 { IRL0_LLLL, IRL0_LLLH, IRL0_LLHL, IRL0_LLHH,
716 IRL0_LHLL, IRL0_LHLH, IRL0_LHHL, IRL0_LHHH, 772 IRL0_LHLL, IRL0_LHLH, IRL0_LHHL, IRL0_LHHH,
@@ -722,7 +778,8 @@ static struct intc_mask_reg mask_registers[] __initdata = {
722 IRL4_HHLL, IRL4_HHLH, IRL4_HHHL, 0, } }, 778 IRL4_HHLL, IRL4_HHLH, IRL4_HHHL, 0, } },
723 { CnINT2MSKR0, CnINT2MSKCR0 , 32, 779 { CnINT2MSKR0, CnINT2MSKCR0 , 32,
724 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 780 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
725 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, WDT } }, 781 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, WDT },
782 INTC_SMP_BALANCING(INT2DISTCR0) },
726 { CnINT2MSKR1, CnINT2MSKCR1, 32, 783 { CnINT2MSKR1, CnINT2MSKCR1, 32,
727 { TMU0_0, TMU0_1, TMU0_2, TMU0_3, TMU1_0, TMU1_1, TMU1_2, 0, 784 { TMU0_0, TMU0_1, TMU0_2, TMU0_3, TMU1_0, TMU1_1, TMU1_2, 0,
728 DMAC0_0, DMAC0_1, DMAC0_2, DMAC0_3, DMAC0_4, DMAC0_5, DMAC0_6, 785 DMAC0_0, DMAC0_1, DMAC0_2, DMAC0_3, DMAC0_4, DMAC0_5, DMAC0_6,
@@ -731,14 +788,14 @@ static struct intc_mask_reg mask_registers[] __initdata = {
731 HPB_0, HPB_1, HPB_2, 788 HPB_0, HPB_1, HPB_2,
732 SCIF0_0, SCIF0_1, SCIF0_2, SCIF0_3, 789 SCIF0_0, SCIF0_1, SCIF0_2, SCIF0_3,
733 SCIF1, 790 SCIF1,
734 TMU2, TMU3, 0, } }, 791 TMU2, TMU3, 0, }, INTC_SMP_BALANCING(INT2DISTCR1) },
735 { CnINT2MSKR2, CnINT2MSKCR2, 32, 792 { CnINT2MSKR2, CnINT2MSKCR2, 32,
736 { 0, 0, SCIF2, SCIF3, SCIF4, SCIF5, 793 { 0, 0, SCIF2, SCIF3, SCIF4, SCIF5,
737 Eth_0, Eth_1, 794 Eth_0, Eth_1,
738 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 795 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
739 PCIeC0_0, PCIeC0_1, PCIeC0_2, 796 PCIeC0_0, PCIeC0_1, PCIeC0_2,
740 PCIeC1_0, PCIeC1_1, PCIeC1_2, 797 PCIeC1_0, PCIeC1_1, PCIeC1_2,
741 USB, 0, 0 } }, 798 USB, 0, 0 }, INTC_SMP_BALANCING(INT2DISTCR2) },
742 { CnINT2MSKR3, CnINT2MSKCR3, 32, 799 { CnINT2MSKR3, CnINT2MSKCR3, 32,
743 { 0, 0, 0, 0, 0, 0, 800 { 0, 0, 0, 0, 0, 0,
744 I2C0, I2C1, 801 I2C0, I2C1,
@@ -747,7 +804,7 @@ static struct intc_mask_reg mask_registers[] __initdata = {
747 HAC0, HAC1, 804 HAC0, HAC1,
748 FLCTL, 0, 805 FLCTL, 0,
749 HSPI, GPIO0, GPIO1, Thermal, 806 HSPI, GPIO0, GPIO1, Thermal,
750 0, 0, 0, 0, 0, 0, 0, 0 } }, 807 0, 0, 0, 0, 0, 0, 0, 0 }, INTC_SMP_BALANCING(INT2DISTCR3) },
751}; 808};
752 809
753static struct intc_prio_reg prio_registers[] __initdata = { 810static struct intc_prio_reg prio_registers[] __initdata = {
@@ -863,6 +920,19 @@ static DECLARE_INTC_DESC(intc_desc_irl4567, "sh7786-irl4567", vectors_irl4567,
863#define INTC_INTMSK2 INTMSK2 920#define INTC_INTMSK2 INTMSK2
864#define INTC_INTMSKCLR1 CnINTMSKCLR1 921#define INTC_INTMSKCLR1 CnINTMSKCLR1
865#define INTC_INTMSKCLR2 INTMSKCLR2 922#define INTC_INTMSKCLR2 INTMSKCLR2
923#define INTC_USERIMASK 0xfe411000
924
925#ifdef CONFIG_INTC_BALANCING
926unsigned int irq_lookup(unsigned int irq)
927{
928 return __raw_readl(INTACK) & 1 ? irq : NO_IRQ_IGNORE;
929}
930
931void irq_finish(unsigned int irq)
932{
933 __raw_writel(irq2evt(irq), INTACKCLR);
934}
935#endif
866 936
867void __init plat_irq_setup(void) 937void __init plat_irq_setup(void)
868{ 938{
@@ -877,6 +947,7 @@ void __init plat_irq_setup(void)
877 __raw_writel(__raw_readl(INTC_ICR0) & ~0x00c00000, INTC_ICR0); 947 __raw_writel(__raw_readl(INTC_ICR0) & ~0x00c00000, INTC_ICR0);
878 948
879 register_intc_controller(&intc_desc); 949 register_intc_controller(&intc_desc);
950 register_intc_userimask(INTC_USERIMASK);
880} 951}
881 952
882void __init plat_irq_setup_pins(int mode) 953void __init plat_irq_setup_pins(int mode)
diff --git a/arch/sh/kernel/cpu/sh4a/setup-shx3.c b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
index 780ba17a559..9158bc5ea38 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-shx3.c
@@ -70,16 +70,13 @@ static struct platform_device scif2_device = {
70}; 70};
71 71
72static struct sh_timer_config tmu0_platform_data = { 72static struct sh_timer_config tmu0_platform_data = {
73 .name = "TMU0",
74 .channel_offset = 0x04, 73 .channel_offset = 0x04,
75 .timer_bit = 0, 74 .timer_bit = 0,
76 .clk = "peripheral_clk",
77 .clockevent_rating = 200, 75 .clockevent_rating = 200,
78}; 76};
79 77
80static struct resource tmu0_resources[] = { 78static struct resource tmu0_resources[] = {
81 [0] = { 79 [0] = {
82 .name = "TMU0",
83 .start = 0xffc10008, 80 .start = 0xffc10008,
84 .end = 0xffc10013, 81 .end = 0xffc10013,
85 .flags = IORESOURCE_MEM, 82 .flags = IORESOURCE_MEM,
@@ -101,16 +98,13 @@ static struct platform_device tmu0_device = {
101}; 98};
102 99
103static struct sh_timer_config tmu1_platform_data = { 100static struct sh_timer_config tmu1_platform_data = {
104 .name = "TMU1",
105 .channel_offset = 0x10, 101 .channel_offset = 0x10,
106 .timer_bit = 1, 102 .timer_bit = 1,
107 .clk = "peripheral_clk",
108 .clocksource_rating = 200, 103 .clocksource_rating = 200,
109}; 104};
110 105
111static struct resource tmu1_resources[] = { 106static struct resource tmu1_resources[] = {
112 [0] = { 107 [0] = {
113 .name = "TMU1",
114 .start = 0xffc10014, 108 .start = 0xffc10014,
115 .end = 0xffc1001f, 109 .end = 0xffc1001f,
116 .flags = IORESOURCE_MEM, 110 .flags = IORESOURCE_MEM,
@@ -132,15 +126,12 @@ static struct platform_device tmu1_device = {
132}; 126};
133 127
134static struct sh_timer_config tmu2_platform_data = { 128static struct sh_timer_config tmu2_platform_data = {
135 .name = "TMU2",
136 .channel_offset = 0x1c, 129 .channel_offset = 0x1c,
137 .timer_bit = 2, 130 .timer_bit = 2,
138 .clk = "peripheral_clk",
139}; 131};
140 132
141static struct resource tmu2_resources[] = { 133static struct resource tmu2_resources[] = {
142 [0] = { 134 [0] = {
143 .name = "TMU2",
144 .start = 0xffc10020, 135 .start = 0xffc10020,
145 .end = 0xffc1002f, 136 .end = 0xffc1002f,
146 .flags = IORESOURCE_MEM, 137 .flags = IORESOURCE_MEM,
@@ -162,15 +153,12 @@ static struct platform_device tmu2_device = {
162}; 153};
163 154
164static struct sh_timer_config tmu3_platform_data = { 155static struct sh_timer_config tmu3_platform_data = {
165 .name = "TMU3",
166 .channel_offset = 0x04, 156 .channel_offset = 0x04,
167 .timer_bit = 0, 157 .timer_bit = 0,
168 .clk = "peripheral_clk",
169}; 158};
170 159
171static struct resource tmu3_resources[] = { 160static struct resource tmu3_resources[] = {
172 [0] = { 161 [0] = {
173 .name = "TMU3",
174 .start = 0xffc20008, 162 .start = 0xffc20008,
175 .end = 0xffc20013, 163 .end = 0xffc20013,
176 .flags = IORESOURCE_MEM, 164 .flags = IORESOURCE_MEM,
@@ -192,15 +180,12 @@ static struct platform_device tmu3_device = {
192}; 180};
193 181
194static struct sh_timer_config tmu4_platform_data = { 182static struct sh_timer_config tmu4_platform_data = {
195 .name = "TMU4",
196 .channel_offset = 0x10, 183 .channel_offset = 0x10,
197 .timer_bit = 1, 184 .timer_bit = 1,
198 .clk = "peripheral_clk",
199}; 185};
200 186
201static struct resource tmu4_resources[] = { 187static struct resource tmu4_resources[] = {
202 [0] = { 188 [0] = {
203 .name = "TMU4",
204 .start = 0xffc20014, 189 .start = 0xffc20014,
205 .end = 0xffc2001f, 190 .end = 0xffc2001f,
206 .flags = IORESOURCE_MEM, 191 .flags = IORESOURCE_MEM,
@@ -222,15 +207,12 @@ static struct platform_device tmu4_device = {
222}; 207};
223 208
224static struct sh_timer_config tmu5_platform_data = { 209static struct sh_timer_config tmu5_platform_data = {
225 .name = "TMU5",
226 .channel_offset = 0x1c, 210 .channel_offset = 0x1c,
227 .timer_bit = 2, 211 .timer_bit = 2,
228 .clk = "peripheral_clk",
229}; 212};
230 213
231static struct resource tmu5_resources[] = { 214static struct resource tmu5_resources[] = {
232 [0] = { 215 [0] = {
233 .name = "TMU5",
234 .start = 0xffc20020, 216 .start = 0xffc20020,
235 .end = 0xffc2002b, 217 .end = 0xffc2002b,
236 .flags = IORESOURCE_MEM, 218 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
index 11bf4c1e25c..de865cac02e 100644
--- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * SH-X3 SMP 2 * SH-X3 SMP
3 * 3 *
4 * Copyright (C) 2007 - 2008 Paul Mundt 4 * Copyright (C) 2007 - 2010 Paul Mundt
5 * Copyright (C) 2007 Magnus Damm 5 * Copyright (C) 2007 Magnus Damm
6 * 6 *
7 * This file is subject to the terms and conditions of the GNU General Public 7 * This file is subject to the terms and conditions of the GNU General Public
@@ -9,16 +9,22 @@
9 * for more details. 9 * for more details.
10 */ 10 */
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/kernel.h>
12#include <linux/cpumask.h> 13#include <linux/cpumask.h>
13#include <linux/smp.h> 14#include <linux/smp.h>
14#include <linux/interrupt.h> 15#include <linux/interrupt.h>
15#include <linux/io.h> 16#include <linux/io.h>
17#include <linux/sched.h>
18#include <linux/delay.h>
19#include <linux/cpu.h>
20#include <asm/sections.h>
16 21
17#define STBCR_REG(phys_id) (0xfe400004 | (phys_id << 12)) 22#define STBCR_REG(phys_id) (0xfe400004 | (phys_id << 12))
18#define RESET_REG(phys_id) (0xfe400008 | (phys_id << 12)) 23#define RESET_REG(phys_id) (0xfe400008 | (phys_id << 12))
19 24
20#define STBCR_MSTP 0x00000001 25#define STBCR_MSTP 0x00000001
21#define STBCR_RESET 0x00000002 26#define STBCR_RESET 0x00000002
27#define STBCR_SLEEP 0x00000004
22#define STBCR_LTSLP 0x80000000 28#define STBCR_LTSLP 0x80000000
23 29
24static irqreturn_t ipi_interrupt_handler(int irq, void *arg) 30static irqreturn_t ipi_interrupt_handler(int irq, void *arg)
@@ -37,7 +43,7 @@ static irqreturn_t ipi_interrupt_handler(int irq, void *arg)
37 return IRQ_HANDLED; 43 return IRQ_HANDLED;
38} 44}
39 45
40void __init plat_smp_setup(void) 46static void shx3_smp_setup(void)
41{ 47{
42 unsigned int cpu = 0; 48 unsigned int cpu = 0;
43 int i, num; 49 int i, num;
@@ -63,7 +69,7 @@ void __init plat_smp_setup(void)
63 printk(KERN_INFO "Detected %i available secondary CPU(s)\n", num); 69 printk(KERN_INFO "Detected %i available secondary CPU(s)\n", num);
64} 70}
65 71
66void __init plat_prepare_cpus(unsigned int max_cpus) 72static void shx3_prepare_cpus(unsigned int max_cpus)
67{ 73{
68 int i; 74 int i;
69 75
@@ -72,11 +78,14 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
72 BUILD_BUG_ON(SMP_MSG_NR >= 8); 78 BUILD_BUG_ON(SMP_MSG_NR >= 8);
73 79
74 for (i = 0; i < SMP_MSG_NR; i++) 80 for (i = 0; i < SMP_MSG_NR; i++)
75 request_irq(104 + i, ipi_interrupt_handler, IRQF_DISABLED, 81 request_irq(104 + i, ipi_interrupt_handler,
76 "IPI", (void *)(long)i); 82 IRQF_DISABLED | IRQF_PERCPU, "IPI", (void *)(long)i);
83
84 for (i = 0; i < max_cpus; i++)
85 set_cpu_present(i, true);
77} 86}
78 87
79void plat_start_cpu(unsigned int cpu, unsigned long entry_point) 88static void shx3_start_cpu(unsigned int cpu, unsigned long entry_point)
80{ 89{
81 if (__in_29bit_mode()) 90 if (__in_29bit_mode())
82 __raw_writel(entry_point, RESET_REG(cpu)); 91 __raw_writel(entry_point, RESET_REG(cpu));
@@ -93,12 +102,12 @@ void plat_start_cpu(unsigned int cpu, unsigned long entry_point)
93 __raw_writel(STBCR_RESET | STBCR_LTSLP, STBCR_REG(cpu)); 102 __raw_writel(STBCR_RESET | STBCR_LTSLP, STBCR_REG(cpu));
94} 103}
95 104
96int plat_smp_processor_id(void) 105static unsigned int shx3_smp_processor_id(void)
97{ 106{
98 return __raw_readl(0xff000048); /* CPIDR */ 107 return __raw_readl(0xff000048); /* CPIDR */
99} 108}
100 109
101void plat_send_ipi(unsigned int cpu, unsigned int message) 110static void shx3_send_ipi(unsigned int cpu, unsigned int message)
102{ 111{
103 unsigned long addr = 0xfe410070 + (cpu * 4); 112 unsigned long addr = 0xfe410070 + (cpu * 4);
104 113
@@ -106,3 +115,52 @@ void plat_send_ipi(unsigned int cpu, unsigned int message)
106 115
107 __raw_writel(1 << (message << 2), addr); /* C0INTICI..CnINTICI */ 116 __raw_writel(1 << (message << 2), addr); /* C0INTICI..CnINTICI */
108} 117}
118
119static void shx3_update_boot_vector(unsigned int cpu)
120{
121 __raw_writel(STBCR_MSTP, STBCR_REG(cpu));
122 while (!(__raw_readl(STBCR_REG(cpu)) & STBCR_MSTP))
123 cpu_relax();
124 __raw_writel(STBCR_RESET, STBCR_REG(cpu));
125}
126
127static int __cpuinit
128shx3_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
129{
130 unsigned int cpu = (unsigned int)hcpu;
131
132 switch (action) {
133 case CPU_UP_PREPARE:
134 shx3_update_boot_vector(cpu);
135 break;
136 case CPU_ONLINE:
137 pr_info("CPU %u is now online\n", cpu);
138 break;
139 case CPU_DEAD:
140 break;
141 }
142
143 return NOTIFY_OK;
144}
145
146static struct notifier_block __cpuinitdata shx3_cpu_notifier = {
147 .notifier_call = shx3_cpu_callback,
148};
149
150static int __cpuinit register_shx3_cpu_notifier(void)
151{
152 register_hotcpu_notifier(&shx3_cpu_notifier);
153 return 0;
154}
155late_initcall(register_shx3_cpu_notifier);
156
157struct plat_smp_ops shx3_smp_ops = {
158 .smp_setup = shx3_smp_setup,
159 .prepare_cpus = shx3_prepare_cpus,
160 .start_cpu = shx3_start_cpu,
161 .smp_processor_id = shx3_smp_processor_id,
162 .send_ipi = shx3_send_ipi,
163 .cpu_die = native_cpu_die,
164 .cpu_disable = native_cpu_disable,
165 .play_dead = native_play_dead,
166};
diff --git a/arch/sh/kernel/cpu/sh5/probe.c b/arch/sh/kernel/cpu/sh5/probe.c
index 521d05b3f7b..9e882409e4e 100644
--- a/arch/sh/kernel/cpu/sh5/probe.c
+++ b/arch/sh/kernel/cpu/sh5/probe.c
@@ -17,7 +17,7 @@
17#include <asm/cache.h> 17#include <asm/cache.h>
18#include <asm/tlb.h> 18#include <asm/tlb.h>
19 19
20int __init detect_cpu_and_cache_system(void) 20void __cpuinit cpu_probe(void)
21{ 21{
22 unsigned long long cir; 22 unsigned long long cir;
23 23
@@ -72,6 +72,4 @@ int __init detect_cpu_and_cache_system(void)
72 72
73 /* Setup some I/D TLB defaults */ 73 /* Setup some I/D TLB defaults */
74 sh64_tlb_init(); 74 sh64_tlb_init();
75
76 return 0;
77} 75}
diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c
index e7a3c1e4b60..d910666142b 100644
--- a/arch/sh/kernel/cpu/sh5/setup-sh5.c
+++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c
@@ -68,16 +68,13 @@ static struct platform_device rtc_device = {
68#define TMU2_BASE (TMU_BASE + 0x8 + (0xc * 0x2)) 68#define TMU2_BASE (TMU_BASE + 0x8 + (0xc * 0x2))
69 69
70static struct sh_timer_config tmu0_platform_data = { 70static struct sh_timer_config tmu0_platform_data = {
71 .name = "TMU0",
72 .channel_offset = 0x04, 71 .channel_offset = 0x04,
73 .timer_bit = 0, 72 .timer_bit = 0,
74 .clk = "peripheral_clk",
75 .clockevent_rating = 200, 73 .clockevent_rating = 200,
76}; 74};
77 75
78static struct resource tmu0_resources[] = { 76static struct resource tmu0_resources[] = {
79 [0] = { 77 [0] = {
80 .name = "TMU0",
81 .start = TMU0_BASE, 78 .start = TMU0_BASE,
82 .end = TMU0_BASE + 0xc - 1, 79 .end = TMU0_BASE + 0xc - 1,
83 .flags = IORESOURCE_MEM, 80 .flags = IORESOURCE_MEM,
@@ -99,16 +96,13 @@ static struct platform_device tmu0_device = {
99}; 96};
100 97
101static struct sh_timer_config tmu1_platform_data = { 98static struct sh_timer_config tmu1_platform_data = {
102 .name = "TMU1",
103 .channel_offset = 0x10, 99 .channel_offset = 0x10,
104 .timer_bit = 1, 100 .timer_bit = 1,
105 .clk = "peripheral_clk",
106 .clocksource_rating = 200, 101 .clocksource_rating = 200,
107}; 102};
108 103
109static struct resource tmu1_resources[] = { 104static struct resource tmu1_resources[] = {
110 [0] = { 105 [0] = {
111 .name = "TMU1",
112 .start = TMU1_BASE, 106 .start = TMU1_BASE,
113 .end = TMU1_BASE + 0xc - 1, 107 .end = TMU1_BASE + 0xc - 1,
114 .flags = IORESOURCE_MEM, 108 .flags = IORESOURCE_MEM,
@@ -130,15 +124,12 @@ static struct platform_device tmu1_device = {
130}; 124};
131 125
132static struct sh_timer_config tmu2_platform_data = { 126static struct sh_timer_config tmu2_platform_data = {
133 .name = "TMU2",
134 .channel_offset = 0x1c, 127 .channel_offset = 0x1c,
135 .timer_bit = 2, 128 .timer_bit = 2,
136 .clk = "peripheral_clk",
137}; 129};
138 130
139static struct resource tmu2_resources[] = { 131static struct resource tmu2_resources[] = {
140 [0] = { 132 [0] = {
141 .name = "TMU2",
142 .start = TMU2_BASE, 133 .start = TMU2_BASE,
143 .end = TMU2_BASE + 0xc - 1, 134 .end = TMU2_BASE + 0xc - 1,
144 .flags = IORESOURCE_MEM, 135 .flags = IORESOURCE_MEM,
diff --git a/arch/sh/kernel/crash_dump.c b/arch/sh/kernel/crash_dump.c
index 95d21625556..37c97d44457 100644
--- a/arch/sh/kernel/crash_dump.c
+++ b/arch/sh/kernel/crash_dump.c
@@ -4,7 +4,6 @@
4 * Created by: Hariprasad Nellitheertha (hari@in.ibm.com) 4 * Created by: Hariprasad Nellitheertha (hari@in.ibm.com)
5 * Copyright (C) IBM Corporation, 2004. All rights reserved 5 * Copyright (C) IBM Corporation, 2004. All rights reserved
6 */ 6 */
7
8#include <linux/errno.h> 7#include <linux/errno.h>
9#include <linux/crash_dump.h> 8#include <linux/crash_dump.h>
10#include <linux/io.h> 9#include <linux/io.h>
@@ -13,6 +12,25 @@
13/* Stores the physical address of elf header of crash image. */ 12/* Stores the physical address of elf header of crash image. */
14unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX; 13unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
15 14
15/*
16 * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by
17 * is_kdump_kernel() to determine if we are booting after a panic. Hence
18 * ifdef it under CONFIG_CRASH_DUMP and not CONFIG_PROC_VMCORE.
19 *
20 * elfcorehdr= specifies the location of elf core header
21 * stored by the crashed kernel.
22 */
23static int __init parse_elfcorehdr(char *arg)
24{
25 if (!arg)
26 return -EINVAL;
27
28 elfcorehdr_addr = memparse(arg, &arg);
29
30 return 0;
31}
32early_param("elfcorehdr", parse_elfcorehdr);
33
16/** 34/**
17 * copy_oldmem_page - copy one page from "oldmem" 35 * copy_oldmem_page - copy one page from "oldmem"
18 * @pfn: page frame number to be copied 36 * @pfn: page frame number to be copied
diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c
index a8234b2010d..5ec1d181869 100644
--- a/arch/sh/kernel/dwarf.c
+++ b/arch/sh/kernel/dwarf.c
@@ -22,6 +22,7 @@
22#include <linux/mm.h> 22#include <linux/mm.h>
23#include <linux/elf.h> 23#include <linux/elf.h>
24#include <linux/ftrace.h> 24#include <linux/ftrace.h>
25#include <linux/module.h>
25#include <linux/slab.h> 26#include <linux/slab.h>
26#include <asm/dwarf.h> 27#include <asm/dwarf.h>
27#include <asm/unwinder.h> 28#include <asm/unwinder.h>
diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S
index fe0b743881b..6e35f012cc0 100644
--- a/arch/sh/kernel/head_32.S
+++ b/arch/sh/kernel/head_32.S
@@ -131,6 +131,7 @@ ENTRY(_stext)
131 * r8 = scratch register 131 * r8 = scratch register
132 * r9 = scratch register 132 * r9 = scratch register
133 * r10 = number of PMB entries we've setup 133 * r10 = number of PMB entries we've setup
134 * r11 = scratch register
134 */ 135 */
135 136
136 mov.l .LMMUCR, r1 /* Flush the TLB */ 137 mov.l .LMMUCR, r1 /* Flush the TLB */
@@ -167,8 +168,9 @@ ENTRY(_stext)
167 168
168.Lvalidate_existing_mappings: 169.Lvalidate_existing_mappings:
169 170
171 mov.l .LPMB_DATA_MASK, r11
170 mov.l @r7, r8 172 mov.l @r7, r8
171 and r0, r8 173 and r11, r8
172 cmp/eq r0, r8 /* Check for valid __MEMORY_START mappings */ 174 cmp/eq r0, r8 /* Check for valid __MEMORY_START mappings */
173 bt .Lpmb_done 175 bt .Lpmb_done
174 176
@@ -335,12 +337,13 @@ ENTRY(stack_start)
3353: .long __bss_start 3373: .long __bss_start
3364: .long _end 3384: .long _end
3375: .long start_kernel 3395: .long start_kernel
3386: .long sh_cpu_init 3406: .long cpu_init
3397: .long init_thread_union 3417: .long init_thread_union
340 342
341#ifdef CONFIG_PMB 343#ifdef CONFIG_PMB
342.LPMB_ADDR: .long PMB_ADDR 344.LPMB_ADDR: .long PMB_ADDR
343.LPMB_DATA: .long PMB_DATA 345.LPMB_DATA: .long PMB_DATA
346.LPMB_DATA_MASK: .long PMB_PFN_MASK | PMB_V
344.LFIRST_ADDR_ENTRY: .long PAGE_OFFSET | PMB_V 347.LFIRST_ADDR_ENTRY: .long PAGE_OFFSET | PMB_V
345.LFIRST_DATA_ENTRY: .long __MEMORY_START | PMB_V 348.LFIRST_DATA_ENTRY: .long __MEMORY_START | PMB_V
346.LMMUCR: .long MMUCR 349.LMMUCR: .long MMUCR
diff --git a/arch/sh/kernel/hw_breakpoint.c b/arch/sh/kernel/hw_breakpoint.c
index 1f2cf622986..efae6ab3d54 100644
--- a/arch/sh/kernel/hw_breakpoint.c
+++ b/arch/sh/kernel/hw_breakpoint.c
@@ -405,11 +405,6 @@ void hw_breakpoint_pmu_read(struct perf_event *bp)
405 /* TODO */ 405 /* TODO */
406} 406}
407 407
408void hw_breakpoint_pmu_unthrottle(struct perf_event *bp)
409{
410 /* TODO */
411}
412
413int register_sh_ubc(struct sh_ubc *ubc) 408int register_sh_ubc(struct sh_ubc *ubc)
414{ 409{
415 /* Bail if it's already assigned */ 410 /* Bail if it's already assigned */
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c
index 273f890b17a..425d604e3a2 100644
--- a/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
@@ -19,6 +19,7 @@
19#include <asm/pgalloc.h> 19#include <asm/pgalloc.h>
20#include <asm/system.h> 20#include <asm/system.h>
21#include <asm/atomic.h> 21#include <asm/atomic.h>
22#include <asm/smp.h>
22 23
23void (*pm_idle)(void) = NULL; 24void (*pm_idle)(void) = NULL;
24 25
@@ -89,10 +90,13 @@ void cpu_idle(void)
89 while (1) { 90 while (1) {
90 tick_nohz_stop_sched_tick(1); 91 tick_nohz_stop_sched_tick(1);
91 92
92 while (!need_resched() && cpu_online(cpu)) { 93 while (!need_resched()) {
93 check_pgt_cache(); 94 check_pgt_cache();
94 rmb(); 95 rmb();
95 96
97 if (cpu_is_offline(cpu))
98 play_dead();
99
96 local_irq_disable(); 100 local_irq_disable();
97 /* Don't trace irqs off for idle */ 101 /* Don't trace irqs off for idle */
98 stop_critical_timings(); 102 stop_critical_timings();
@@ -133,7 +137,7 @@ static void do_nothing(void *unused)
133void stop_this_cpu(void *unused) 137void stop_this_cpu(void *unused)
134{ 138{
135 local_irq_disable(); 139 local_irq_disable();
136 cpu_clear(smp_processor_id(), cpu_online_map); 140 set_cpu_online(smp_processor_id(), false);
137 141
138 for (;;) 142 for (;;)
139 cpu_sleep(); 143 cpu_sleep();
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index d2d41d04665..257de1f0692 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -12,6 +12,7 @@
12#include <linux/kernel_stat.h> 12#include <linux/kernel_stat.h>
13#include <linux/seq_file.h> 13#include <linux/seq_file.h>
14#include <linux/ftrace.h> 14#include <linux/ftrace.h>
15#include <linux/delay.h>
15#include <asm/processor.h> 16#include <asm/processor.h>
16#include <asm/machvec.h> 17#include <asm/machvec.h>
17#include <asm/uaccess.h> 18#include <asm/uaccess.h>
@@ -113,19 +114,14 @@ union irq_ctx {
113 114
114static union irq_ctx *hardirq_ctx[NR_CPUS] __read_mostly; 115static union irq_ctx *hardirq_ctx[NR_CPUS] __read_mostly;
115static union irq_ctx *softirq_ctx[NR_CPUS] __read_mostly; 116static union irq_ctx *softirq_ctx[NR_CPUS] __read_mostly;
116#endif
117 117
118asmlinkage __irq_entry int do_IRQ(unsigned int irq, struct pt_regs *regs) 118static char softirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss;
119static char hardirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss;
120
121static inline void handle_one_irq(unsigned int irq)
119{ 122{
120 struct pt_regs *old_regs = set_irq_regs(regs);
121#ifdef CONFIG_IRQSTACKS
122 union irq_ctx *curctx, *irqctx; 123 union irq_ctx *curctx, *irqctx;
123#endif
124
125 irq_enter();
126 irq = irq_demux(irq);
127 124
128#ifdef CONFIG_IRQSTACKS
129 curctx = (union irq_ctx *)current_thread_info(); 125 curctx = (union irq_ctx *)current_thread_info();
130 irqctx = hardirq_ctx[smp_processor_id()]; 126 irqctx = hardirq_ctx[smp_processor_id()];
131 127
@@ -164,20 +160,9 @@ asmlinkage __irq_entry int do_IRQ(unsigned int irq, struct pt_regs *regs)
164 "r5", "r6", "r7", "r8", "t", "pr" 160 "r5", "r6", "r7", "r8", "t", "pr"
165 ); 161 );
166 } else 162 } else
167#endif
168 generic_handle_irq(irq); 163 generic_handle_irq(irq);
169
170 irq_exit();
171
172 set_irq_regs(old_regs);
173 return 1;
174} 164}
175 165
176#ifdef CONFIG_IRQSTACKS
177static char softirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss;
178
179static char hardirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss;
180
181/* 166/*
182 * allocate per-cpu stacks for hardirq and for softirq processing 167 * allocate per-cpu stacks for hardirq and for softirq processing
183 */ 168 */
@@ -257,8 +242,33 @@ asmlinkage void do_softirq(void)
257 242
258 local_irq_restore(flags); 243 local_irq_restore(flags);
259} 244}
245#else
246static inline void handle_one_irq(unsigned int irq)
247{
248 generic_handle_irq(irq);
249}
260#endif 250#endif
261 251
252asmlinkage __irq_entry int do_IRQ(unsigned int irq, struct pt_regs *regs)
253{
254 struct pt_regs *old_regs = set_irq_regs(regs);
255
256 irq_enter();
257
258 irq = irq_demux(irq_lookup(irq));
259
260 if (irq != NO_IRQ_IGNORE) {
261 handle_one_irq(irq);
262 irq_finish(irq);
263 }
264
265 irq_exit();
266
267 set_irq_regs(old_regs);
268
269 return IRQ_HANDLED;
270}
271
262void __init init_IRQ(void) 272void __init init_IRQ(void)
263{ 273{
264 plat_irq_setup(); 274 plat_irq_setup();
@@ -283,3 +293,44 @@ int __init arch_probe_nr_irqs(void)
283 return 0; 293 return 0;
284} 294}
285#endif 295#endif
296
297#ifdef CONFIG_HOTPLUG_CPU
298static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu)
299{
300 printk(KERN_INFO "IRQ%u: moving from cpu%u to cpu%u\n",
301 irq, desc->node, cpu);
302
303 raw_spin_lock_irq(&desc->lock);
304 desc->chip->set_affinity(irq, cpumask_of(cpu));
305 raw_spin_unlock_irq(&desc->lock);
306}
307
308/*
309 * The CPU has been marked offline. Migrate IRQs off this CPU. If
310 * the affinity settings do not allow other CPUs, force them onto any
311 * available CPU.
312 */
313void migrate_irqs(void)
314{
315 struct irq_desc *desc;
316 unsigned int irq, cpu = smp_processor_id();
317
318 for_each_irq_desc(irq, desc) {
319 if (desc->node == cpu) {
320 unsigned int newcpu = cpumask_any_and(desc->affinity,
321 cpu_online_mask);
322 if (newcpu >= nr_cpu_ids) {
323 if (printk_ratelimit())
324 printk(KERN_INFO "IRQ%u no longer affine to CPU%u\n",
325 irq, cpu);
326
327 cpumask_setall(desc->affinity);
328 newcpu = cpumask_any_and(desc->affinity,
329 cpu_online_mask);
330 }
331
332 route_irq(desc, irq, newcpu);
333 }
334 }
335}
336#endif
diff --git a/arch/sh/kernel/localtimer.c b/arch/sh/kernel/localtimer.c
index 0b04e7d4a9b..8bfc6dfa8b9 100644
--- a/arch/sh/kernel/localtimer.c
+++ b/arch/sh/kernel/localtimer.c
@@ -44,7 +44,7 @@ static void dummy_timer_set_mode(enum clock_event_mode mode,
44{ 44{
45} 45}
46 46
47void __cpuinit local_timer_setup(unsigned int cpu) 47void local_timer_setup(unsigned int cpu)
48{ 48{
49 struct clock_event_device *clk = &per_cpu(local_clockevent, cpu); 49 struct clock_event_device *clk = &per_cpu(local_clockevent, cpu);
50 50
@@ -60,3 +60,7 @@ void __cpuinit local_timer_setup(unsigned int cpu)
60 60
61 clockevents_register_device(clk); 61 clockevents_register_device(clk);
62} 62}
63
64void local_timer_stop(unsigned int cpu)
65{
66}
diff --git a/arch/sh/kernel/machine_kexec.c b/arch/sh/kernel/machine_kexec.c
index 7672141c841..5a559e666eb 100644
--- a/arch/sh/kernel/machine_kexec.c
+++ b/arch/sh/kernel/machine_kexec.c
@@ -8,7 +8,6 @@
8 * This source code is licensed under the GNU General Public License, 8 * This source code is licensed under the GNU General Public License,
9 * Version 2. See the file COPYING for more details. 9 * Version 2. See the file COPYING for more details.
10 */ 10 */
11
12#include <linux/mm.h> 11#include <linux/mm.h>
13#include <linux/kexec.h> 12#include <linux/kexec.h>
14#include <linux/delay.h> 13#include <linux/delay.h>
@@ -16,6 +15,7 @@
16#include <linux/numa.h> 15#include <linux/numa.h>
17#include <linux/ftrace.h> 16#include <linux/ftrace.h>
18#include <linux/suspend.h> 17#include <linux/suspend.h>
18#include <linux/lmb.h>
19#include <asm/pgtable.h> 19#include <asm/pgtable.h>
20#include <asm/pgalloc.h> 20#include <asm/pgalloc.h>
21#include <asm/mmu_context.h> 21#include <asm/mmu_context.h>
@@ -147,4 +147,64 @@ void arch_crash_save_vmcoreinfo(void)
147 VMCOREINFO_SYMBOL(node_data); 147 VMCOREINFO_SYMBOL(node_data);
148 VMCOREINFO_LENGTH(node_data, MAX_NUMNODES); 148 VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);
149#endif 149#endif
150#ifdef CONFIG_X2TLB
151 VMCOREINFO_CONFIG(X2TLB);
152#endif
153}
154
155void __init reserve_crashkernel(void)
156{
157 unsigned long long crash_size, crash_base;
158 int ret;
159
160 /* this is necessary because of lmb_phys_mem_size() */
161 lmb_analyze();
162
163 ret = parse_crashkernel(boot_command_line, lmb_phys_mem_size(),
164 &crash_size, &crash_base);
165 if (ret == 0 && crash_size > 0) {
166 crashk_res.start = crash_base;
167 crashk_res.end = crash_base + crash_size - 1;
168 }
169
170 if (crashk_res.end == crashk_res.start)
171 goto disable;
172
173 crash_size = PAGE_ALIGN(crashk_res.end - crashk_res.start + 1);
174 if (!crashk_res.start) {
175 unsigned long max = lmb_end_of_DRAM() - memory_limit;
176 crashk_res.start = __lmb_alloc_base(crash_size, PAGE_SIZE, max);
177 if (!crashk_res.start) {
178 pr_err("crashkernel allocation failed\n");
179 goto disable;
180 }
181 } else {
182 ret = lmb_reserve(crashk_res.start, crash_size);
183 if (unlikely(ret < 0)) {
184 pr_err("crashkernel reservation failed - "
185 "memory is in use\n");
186 goto disable;
187 }
188 }
189
190 crashk_res.end = crashk_res.start + crash_size - 1;
191
192 /*
193 * Crash kernel trumps memory limit
194 */
195 if ((lmb_end_of_DRAM() - memory_limit) <= crashk_res.end) {
196 memory_limit = 0;
197 pr_info("Disabled memory limit for crashkernel\n");
198 }
199
200 pr_info("Reserving %ldMB of memory at 0x%08lx "
201 "for crashkernel (System RAM: %ldMB)\n",
202 (unsigned long)(crash_size >> 20),
203 (unsigned long)(crashk_res.start),
204 (unsigned long)(lmb_phys_mem_size() >> 20));
205
206 return;
207
208disable:
209 crashk_res.start = crashk_res.end = 0;
150} 210}
diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c
index 1652340ba3f..85cfaf916fd 100644
--- a/arch/sh/kernel/machvec.c
+++ b/arch/sh/kernel/machvec.c
@@ -131,6 +131,7 @@ void __init sh_mv_setup(void)
131 mv_set(ioport_unmap); 131 mv_set(ioport_unmap);
132 mv_set(irq_demux); 132 mv_set(irq_demux);
133 mv_set(mode_pins); 133 mv_set(mode_pins);
134 mv_set(mem_init);
134 135
135 if (!sh_mv.mv_nr_irqs) 136 if (!sh_mv.mv_nr_irqs)
136 sh_mv.mv_nr_irqs = NR_IRQS; 137 sh_mv.mv_nr_irqs = NR_IRQS;
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 17f89aa4e1b..dcb126dc76f 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -90,7 +90,7 @@ void arch_task_cache_init(void)
90# define HAVE_SOFTFP 0 90# define HAVE_SOFTFP 0
91#endif 91#endif
92 92
93void init_thread_xstate(void) 93void __cpuinit init_thread_xstate(void)
94{ 94{
95 if (boot_cpu_data.flags & CPU_HAS_FPU) 95 if (boot_cpu_data.flags & CPU_HAS_FPU)
96 xstate_size = sizeof(struct sh_fpu_hard_struct); 96 xstate_size = sizeof(struct sh_fpu_hard_struct);
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 8870d6ba64b..272734681d2 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -4,7 +4,7 @@
4 * This file handles the architecture-dependent parts of initialization 4 * This file handles the architecture-dependent parts of initialization
5 * 5 *
6 * Copyright (C) 1999 Niibe Yutaka 6 * Copyright (C) 1999 Niibe Yutaka
7 * Copyright (C) 2002 - 2007 Paul Mundt 7 * Copyright (C) 2002 - 2010 Paul Mundt
8 */ 8 */
9#include <linux/screen_info.h> 9#include <linux/screen_info.h>
10#include <linux/ioport.h> 10#include <linux/ioport.h>
@@ -39,7 +39,9 @@
39#include <asm/irq.h> 39#include <asm/irq.h>
40#include <asm/setup.h> 40#include <asm/setup.h>
41#include <asm/clock.h> 41#include <asm/clock.h>
42#include <asm/smp.h>
42#include <asm/mmu_context.h> 43#include <asm/mmu_context.h>
44#include <asm/mmzone.h>
43 45
44/* 46/*
45 * Initialize loops_per_jiffy as 10000000 (1000MIPS). 47 * Initialize loops_per_jiffy as 10000000 (1000MIPS).
@@ -93,6 +95,7 @@ unsigned long memory_start;
93EXPORT_SYMBOL(memory_start); 95EXPORT_SYMBOL(memory_start);
94unsigned long memory_end = 0; 96unsigned long memory_end = 0;
95EXPORT_SYMBOL(memory_end); 97EXPORT_SYMBOL(memory_end);
98unsigned long memory_limit = 0;
96 99
97static struct resource mem_resources[MAX_NUMNODES]; 100static struct resource mem_resources[MAX_NUMNODES];
98 101
@@ -100,92 +103,73 @@ int l1i_cache_shape, l1d_cache_shape, l2_cache_shape;
100 103
101static int __init early_parse_mem(char *p) 104static int __init early_parse_mem(char *p)
102{ 105{
103 unsigned long size; 106 if (!p)
107 return 1;
104 108
105 memory_start = (unsigned long)__va(__MEMORY_START); 109 memory_limit = PAGE_ALIGN(memparse(p, &p));
106 size = memparse(p, &p);
107 110
108 if (size > __MEMORY_SIZE) { 111 pr_notice("Memory limited to %ldMB\n", memory_limit >> 20);
109 printk(KERN_ERR
110 "Using mem= to increase the size of kernel memory "
111 "is not allowed.\n"
112 " Recompile the kernel with the correct value for "
113 "CONFIG_MEMORY_SIZE.\n");
114 return 0;
115 }
116
117 memory_end = memory_start + size;
118 112
119 return 0; 113 return 0;
120} 114}
121early_param("mem", early_parse_mem); 115early_param("mem", early_parse_mem);
122 116
123/* 117void __init check_for_initrd(void)
124 * Register fully available low RAM pages with the bootmem allocator.
125 */
126static void __init register_bootmem_low_pages(void)
127{ 118{
128 unsigned long curr_pfn, last_pfn, pages; 119#ifdef CONFIG_BLK_DEV_INITRD
120 unsigned long start, end;
121
122 /*
123 * Check for the rare cases where boot loaders adhere to the boot
124 * ABI.
125 */
126 if (!LOADER_TYPE || !INITRD_START || !INITRD_SIZE)
127 goto disable;
128
129 start = INITRD_START + __MEMORY_START;
130 end = start + INITRD_SIZE;
131
132 if (unlikely(end <= start))
133 goto disable;
134 if (unlikely(start & ~PAGE_MASK)) {
135 pr_err("initrd must be page aligned\n");
136 goto disable;
137 }
138
139 if (unlikely(start < PAGE_OFFSET)) {
140 pr_err("initrd start < PAGE_OFFSET\n");
141 goto disable;
142 }
143
144 if (unlikely(end > lmb_end_of_DRAM())) {
145 pr_err("initrd extends beyond end of memory "
146 "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
147 end, (unsigned long)lmb_end_of_DRAM());
148 goto disable;
149 }
129 150
130 /* 151 /*
131 * We are rounding up the start address of usable memory: 152 * If we got this far inspite of the boot loader's best efforts
153 * to the contrary, assume we actually have a valid initrd and
154 * fix up the root dev.
132 */ 155 */
133 curr_pfn = PFN_UP(__MEMORY_START); 156 ROOT_DEV = Root_RAM0;
134 157
135 /* 158 /*
136 * ... and at the end of the usable range downwards: 159 * Address sanitization
137 */ 160 */
138 last_pfn = PFN_DOWN(__pa(memory_end)); 161 initrd_start = (unsigned long)__va(__pa(start));
162 initrd_end = initrd_start + INITRD_SIZE;
139 163
140 if (last_pfn > max_low_pfn) 164 lmb_reserve(__pa(initrd_start), INITRD_SIZE);
141 last_pfn = max_low_pfn;
142 165
143 pages = last_pfn - curr_pfn; 166 return;
144 free_bootmem(PFN_PHYS(curr_pfn), PFN_PHYS(pages));
145}
146 167
147#ifdef CONFIG_KEXEC 168disable:
148static void __init reserve_crashkernel(void) 169 pr_info("initrd disabled\n");
149{ 170 initrd_start = initrd_end = 0;
150 unsigned long long free_mem;
151 unsigned long long crash_size, crash_base;
152 void *vp;
153 int ret;
154
155 free_mem = ((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT;
156
157 ret = parse_crashkernel(boot_command_line, free_mem,
158 &crash_size, &crash_base);
159 if (ret == 0 && crash_size) {
160 if (crash_base <= 0) {
161 vp = alloc_bootmem_nopanic(crash_size);
162 if (!vp) {
163 printk(KERN_INFO "crashkernel allocation "
164 "failed\n");
165 return;
166 }
167 crash_base = __pa(vp);
168 } else if (reserve_bootmem(crash_base, crash_size,
169 BOOTMEM_EXCLUSIVE) < 0) {
170 printk(KERN_INFO "crashkernel reservation failed - "
171 "memory is in use\n");
172 return;
173 }
174
175 printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
176 "for crashkernel (System RAM: %ldMB)\n",
177 (unsigned long)(crash_size >> 20),
178 (unsigned long)(crash_base >> 20),
179 (unsigned long)(free_mem >> 20));
180 crashk_res.start = crash_base;
181 crashk_res.end = crash_base + crash_size - 1;
182 insert_resource(&iomem_resource, &crashk_res);
183 }
184}
185#else
186static inline void __init reserve_crashkernel(void)
187{}
188#endif 171#endif
172}
189 173
190void __cpuinit calibrate_delay(void) 174void __cpuinit calibrate_delay(void)
191{ 175{
@@ -207,13 +191,18 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
207 unsigned long end_pfn) 191 unsigned long end_pfn)
208{ 192{
209 struct resource *res = &mem_resources[nid]; 193 struct resource *res = &mem_resources[nid];
194 unsigned long start, end;
210 195
211 WARN_ON(res->name); /* max one active range per node for now */ 196 WARN_ON(res->name); /* max one active range per node for now */
212 197
198 start = start_pfn << PAGE_SHIFT;
199 end = end_pfn << PAGE_SHIFT;
200
213 res->name = "System RAM"; 201 res->name = "System RAM";
214 res->start = start_pfn << PAGE_SHIFT; 202 res->start = start;
215 res->end = (end_pfn << PAGE_SHIFT) - 1; 203 res->end = end - 1;
216 res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; 204 res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
205
217 if (request_resource(&iomem_resource, res)) { 206 if (request_resource(&iomem_resource, res)) {
218 pr_err("unable to request memory_resource 0x%lx 0x%lx\n", 207 pr_err("unable to request memory_resource 0x%lx 0x%lx\n",
219 start_pfn, end_pfn); 208 start_pfn, end_pfn);
@@ -229,138 +218,18 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
229 request_resource(res, &data_resource); 218 request_resource(res, &data_resource);
230 request_resource(res, &bss_resource); 219 request_resource(res, &bss_resource);
231 220
232 add_active_range(nid, start_pfn, end_pfn);
233}
234
235void __init setup_bootmem_allocator(unsigned long free_pfn)
236{
237 unsigned long bootmap_size;
238 unsigned long bootmap_pages, bootmem_paddr;
239 u64 total_pages = (lmb_end_of_DRAM() - __MEMORY_START) >> PAGE_SHIFT;
240 int i;
241
242 bootmap_pages = bootmem_bootmap_pages(total_pages);
243
244 bootmem_paddr = lmb_alloc(bootmap_pages << PAGE_SHIFT, PAGE_SIZE);
245
246 /*
247 * Find a proper area for the bootmem bitmap. After this
248 * bootstrap step all allocations (until the page allocator
249 * is intact) must be done via bootmem_alloc().
250 */
251 bootmap_size = init_bootmem_node(NODE_DATA(0),
252 bootmem_paddr >> PAGE_SHIFT,
253 min_low_pfn, max_low_pfn);
254
255 /* Add active regions with valid PFNs. */
256 for (i = 0; i < lmb.memory.cnt; i++) {
257 unsigned long start_pfn, end_pfn;
258 start_pfn = lmb.memory.region[i].base >> PAGE_SHIFT;
259 end_pfn = start_pfn + lmb_size_pages(&lmb.memory, i);
260 __add_active_range(0, start_pfn, end_pfn);
261 }
262
263 /*
264 * Add all physical memory to the bootmem map and mark each
265 * area as present.
266 */
267 register_bootmem_low_pages();
268
269 /* Reserve the sections we're already using. */
270 for (i = 0; i < lmb.reserved.cnt; i++)
271 reserve_bootmem(lmb.reserved.region[i].base,
272 lmb_size_bytes(&lmb.reserved, i),
273 BOOTMEM_DEFAULT);
274
275 node_set_online(0);
276
277 sparse_memory_present_with_active_regions(0);
278
279#ifdef CONFIG_BLK_DEV_INITRD
280 ROOT_DEV = Root_RAM0;
281
282 if (LOADER_TYPE && INITRD_START) {
283 unsigned long initrd_start_phys = INITRD_START + __MEMORY_START;
284
285 if (initrd_start_phys + INITRD_SIZE <= PFN_PHYS(max_low_pfn)) {
286 reserve_bootmem(initrd_start_phys, INITRD_SIZE,
287 BOOTMEM_DEFAULT);
288 initrd_start = (unsigned long)__va(initrd_start_phys);
289 initrd_end = initrd_start + INITRD_SIZE;
290 } else {
291 printk("initrd extends beyond end of memory "
292 "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
293 initrd_start_phys + INITRD_SIZE,
294 (unsigned long)PFN_PHYS(max_low_pfn));
295 initrd_start = 0;
296 }
297 }
298#endif
299
300 reserve_crashkernel();
301}
302
303#ifndef CONFIG_NEED_MULTIPLE_NODES
304static void __init setup_memory(void)
305{
306 unsigned long start_pfn;
307 u64 base = min_low_pfn << PAGE_SHIFT;
308 u64 size = (max_low_pfn << PAGE_SHIFT) - base;
309
310 /*
311 * Partially used pages are not usable - thus
312 * we are rounding upwards:
313 */
314 start_pfn = PFN_UP(__pa(_end));
315
316 lmb_add(base, size);
317
318 /*
319 * Reserve the kernel text and
320 * Reserve the bootmem bitmap. We do this in two steps (first step
321 * was init_bootmem()), because this catches the (definitely buggy)
322 * case of us accidentally initializing the bootmem allocator with
323 * an invalid RAM area.
324 */
325 lmb_reserve(__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET,
326 (PFN_PHYS(start_pfn) + PAGE_SIZE - 1) -
327 (__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET));
328
329 /* 221 /*
330 * Reserve physical pages below CONFIG_ZERO_PAGE_OFFSET. 222 * Also make sure that there is a PMB mapping that covers this
223 * range before we attempt to activate it, to avoid reset by MMU.
224 * We can hit this path with NUMA or memory hot-add.
331 */ 225 */
332 if (CONFIG_ZERO_PAGE_OFFSET != 0) 226 pmb_bolt_mapping((unsigned long)__va(start), start, end - start,
333 lmb_reserve(__MEMORY_START, CONFIG_ZERO_PAGE_OFFSET); 227 PAGE_KERNEL);
334
335 lmb_analyze();
336 lmb_dump_all();
337 228
338 setup_bootmem_allocator(start_pfn); 229 add_active_range(nid, start_pfn, end_pfn);
339}
340#else
341extern void __init setup_memory(void);
342#endif
343
344/*
345 * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by
346 * is_kdump_kernel() to determine if we are booting after a panic. Hence
347 * ifdef it under CONFIG_CRASH_DUMP and not CONFIG_PROC_VMCORE.
348 */
349#ifdef CONFIG_CRASH_DUMP
350/* elfcorehdr= specifies the location of elf core header
351 * stored by the crashed kernel.
352 */
353static int __init parse_elfcorehdr(char *arg)
354{
355 if (!arg)
356 return -EINVAL;
357 elfcorehdr_addr = memparse(arg, &arg);
358 return 0;
359} 230}
360early_param("elfcorehdr", parse_elfcorehdr);
361#endif
362 231
363void __init __attribute__ ((weak)) plat_early_device_setup(void) 232void __init __weak plat_early_device_setup(void)
364{ 233{
365} 234}
366 235
@@ -401,10 +270,6 @@ void __init setup_arch(char **cmdline_p)
401 bss_resource.start = virt_to_phys(__bss_start); 270 bss_resource.start = virt_to_phys(__bss_start);
402 bss_resource.end = virt_to_phys(_ebss)-1; 271 bss_resource.end = virt_to_phys(_ebss)-1;
403 272
404 memory_start = (unsigned long)__va(__MEMORY_START);
405 if (!memory_end)
406 memory_end = memory_start + __MEMORY_SIZE;
407
408#ifdef CONFIG_CMDLINE_OVERWRITE 273#ifdef CONFIG_CMDLINE_OVERWRITE
409 strlcpy(command_line, CONFIG_CMDLINE, sizeof(command_line)); 274 strlcpy(command_line, CONFIG_CMDLINE, sizeof(command_line));
410#else 275#else
@@ -421,47 +286,24 @@ void __init setup_arch(char **cmdline_p)
421 286
422 parse_early_param(); 287 parse_early_param();
423 288
424 uncached_init();
425
426 plat_early_device_setup(); 289 plat_early_device_setup();
427 290
428 /* Let earlyprintk output early console messages */
429 early_platform_driver_probe("earlyprintk", 1, 1);
430
431 sh_mv_setup(); 291 sh_mv_setup();
432 292
433 /* 293 /* Let earlyprintk output early console messages */
434 * Find the highest page frame number we have available 294 early_platform_driver_probe("earlyprintk", 1, 1);
435 */
436 max_pfn = PFN_DOWN(__pa(memory_end));
437
438 /*
439 * Determine low and high memory ranges:
440 */
441 max_low_pfn = max_pfn;
442 min_low_pfn = __MEMORY_START >> PAGE_SHIFT;
443
444 nodes_clear(node_online_map);
445 295
446 pmb_init(); 296 paging_init();
447 lmb_init();
448 setup_memory();
449 sparse_init();
450 297
451#ifdef CONFIG_DUMMY_CONSOLE 298#ifdef CONFIG_DUMMY_CONSOLE
452 conswitchp = &dummy_con; 299 conswitchp = &dummy_con;
453#endif 300#endif
454 paging_init();
455
456 ioremap_fixed_init();
457 301
458 /* Perform the machine specific initialisation */ 302 /* Perform the machine specific initialisation */
459 if (likely(sh_mv.mv_setup)) 303 if (likely(sh_mv.mv_setup))
460 sh_mv.mv_setup(cmdline_p); 304 sh_mv.mv_setup(cmdline_p);
461 305
462#ifdef CONFIG_SMP
463 plat_smp_setup(); 306 plat_smp_setup();
464#endif
465} 307}
466 308
467/* processor boot mode configuration */ 309/* processor boot mode configuration */
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 002cc612dee..509b36b4511 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * SMP support for the SuperH processors. 4 * SMP support for the SuperH processors.
5 * 5 *
6 * Copyright (C) 2002 - 2008 Paul Mundt 6 * Copyright (C) 2002 - 2010 Paul Mundt
7 * Copyright (C) 2006 - 2007 Akio Idehara 7 * Copyright (C) 2006 - 2007 Akio Idehara
8 * 8 *
9 * This file is subject to the terms and conditions of the GNU General Public 9 * This file is subject to the terms and conditions of the GNU General Public
@@ -31,7 +31,20 @@
31int __cpu_number_map[NR_CPUS]; /* Map physical to logical */ 31int __cpu_number_map[NR_CPUS]; /* Map physical to logical */
32int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */ 32int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */
33 33
34static inline void __init smp_store_cpu_info(unsigned int cpu) 34struct plat_smp_ops *mp_ops = NULL;
35
36/* State of each CPU */
37DEFINE_PER_CPU(int, cpu_state) = { 0 };
38
39void __cpuinit register_smp_ops(struct plat_smp_ops *ops)
40{
41 if (mp_ops)
42 printk(KERN_WARNING "Overriding previously set SMP ops\n");
43
44 mp_ops = ops;
45}
46
47static inline void __cpuinit smp_store_cpu_info(unsigned int cpu)
35{ 48{
36 struct sh_cpuinfo *c = cpu_data + cpu; 49 struct sh_cpuinfo *c = cpu_data + cpu;
37 50
@@ -46,14 +59,14 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
46 59
47 init_new_context(current, &init_mm); 60 init_new_context(current, &init_mm);
48 current_thread_info()->cpu = cpu; 61 current_thread_info()->cpu = cpu;
49 plat_prepare_cpus(max_cpus); 62 mp_ops->prepare_cpus(max_cpus);
50 63
51#ifndef CONFIG_HOTPLUG_CPU 64#ifndef CONFIG_HOTPLUG_CPU
52 init_cpu_present(&cpu_possible_map); 65 init_cpu_present(&cpu_possible_map);
53#endif 66#endif
54} 67}
55 68
56void __devinit smp_prepare_boot_cpu(void) 69void __init smp_prepare_boot_cpu(void)
57{ 70{
58 unsigned int cpu = smp_processor_id(); 71 unsigned int cpu = smp_processor_id();
59 72
@@ -62,37 +75,137 @@ void __devinit smp_prepare_boot_cpu(void)
62 75
63 set_cpu_online(cpu, true); 76 set_cpu_online(cpu, true);
64 set_cpu_possible(cpu, true); 77 set_cpu_possible(cpu, true);
78
79 per_cpu(cpu_state, cpu) = CPU_ONLINE;
80}
81
82#ifdef CONFIG_HOTPLUG_CPU
83void native_cpu_die(unsigned int cpu)
84{
85 unsigned int i;
86
87 for (i = 0; i < 10; i++) {
88 smp_rmb();
89 if (per_cpu(cpu_state, cpu) == CPU_DEAD) {
90 if (system_state == SYSTEM_RUNNING)
91 pr_info("CPU %u is now offline\n", cpu);
92
93 return;
94 }
95
96 msleep(100);
97 }
98
99 pr_err("CPU %u didn't die...\n", cpu);
100}
101
102int native_cpu_disable(unsigned int cpu)
103{
104 return cpu == 0 ? -EPERM : 0;
105}
106
107void play_dead_common(void)
108{
109 idle_task_exit();
110 irq_ctx_exit(raw_smp_processor_id());
111 mb();
112
113 __get_cpu_var(cpu_state) = CPU_DEAD;
114 local_irq_disable();
115}
116
117void native_play_dead(void)
118{
119 play_dead_common();
65} 120}
66 121
122int __cpu_disable(void)
123{
124 unsigned int cpu = smp_processor_id();
125 struct task_struct *p;
126 int ret;
127
128 ret = mp_ops->cpu_disable(cpu);
129 if (ret)
130 return ret;
131
132 /*
133 * Take this CPU offline. Once we clear this, we can't return,
134 * and we must not schedule until we're ready to give up the cpu.
135 */
136 set_cpu_online(cpu, false);
137
138 /*
139 * OK - migrate IRQs away from this CPU
140 */
141 migrate_irqs();
142
143 /*
144 * Stop the local timer for this CPU.
145 */
146 local_timer_stop(cpu);
147
148 /*
149 * Flush user cache and TLB mappings, and then remove this CPU
150 * from the vm mask set of all processes.
151 */
152 flush_cache_all();
153 local_flush_tlb_all();
154
155 read_lock(&tasklist_lock);
156 for_each_process(p)
157 if (p->mm)
158 cpumask_clear_cpu(cpu, mm_cpumask(p->mm));
159 read_unlock(&tasklist_lock);
160
161 return 0;
162}
163#else /* ... !CONFIG_HOTPLUG_CPU */
164int native_cpu_disable(unsigned int cpu)
165{
166 return -ENOSYS;
167}
168
169void native_cpu_die(unsigned int cpu)
170{
171 /* We said "no" in __cpu_disable */
172 BUG();
173}
174
175void native_play_dead(void)
176{
177 BUG();
178}
179#endif
180
67asmlinkage void __cpuinit start_secondary(void) 181asmlinkage void __cpuinit start_secondary(void)
68{ 182{
69 unsigned int cpu; 183 unsigned int cpu = smp_processor_id();
70 struct mm_struct *mm = &init_mm; 184 struct mm_struct *mm = &init_mm;
71 185
72 enable_mmu(); 186 enable_mmu();
73 atomic_inc(&mm->mm_count); 187 atomic_inc(&mm->mm_count);
74 atomic_inc(&mm->mm_users); 188 atomic_inc(&mm->mm_users);
75 current->active_mm = mm; 189 current->active_mm = mm;
76 BUG_ON(current->mm);
77 enter_lazy_tlb(mm, current); 190 enter_lazy_tlb(mm, current);
191 local_flush_tlb_all();
78 192
79 per_cpu_trap_init(); 193 per_cpu_trap_init();
80 194
81 preempt_disable(); 195 preempt_disable();
82 196
83 notify_cpu_starting(smp_processor_id()); 197 notify_cpu_starting(cpu);
84 198
85 local_irq_enable(); 199 local_irq_enable();
86 200
87 cpu = smp_processor_id();
88
89 /* Enable local timers */ 201 /* Enable local timers */
90 local_timer_setup(cpu); 202 local_timer_setup(cpu);
91 calibrate_delay(); 203 calibrate_delay();
92 204
93 smp_store_cpu_info(cpu); 205 smp_store_cpu_info(cpu);
94 206
95 cpu_set(cpu, cpu_online_map); 207 set_cpu_online(cpu, true);
208 per_cpu(cpu_state, cpu) = CPU_ONLINE;
96 209
97 cpu_idle(); 210 cpu_idle();
98} 211}
@@ -111,12 +224,19 @@ int __cpuinit __cpu_up(unsigned int cpu)
111 struct task_struct *tsk; 224 struct task_struct *tsk;
112 unsigned long timeout; 225 unsigned long timeout;
113 226
114 tsk = fork_idle(cpu); 227 tsk = cpu_data[cpu].idle;
115 if (IS_ERR(tsk)) { 228 if (!tsk) {
116 printk(KERN_ERR "Failed forking idle task for cpu %d\n", cpu); 229 tsk = fork_idle(cpu);
117 return PTR_ERR(tsk); 230 if (IS_ERR(tsk)) {
231 pr_err("Failed forking idle task for cpu %d\n", cpu);
232 return PTR_ERR(tsk);
233 }
234
235 cpu_data[cpu].idle = tsk;
118 } 236 }
119 237
238 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
239
120 /* Fill in data in head.S for secondary cpus */ 240 /* Fill in data in head.S for secondary cpus */
121 stack_start.sp = tsk->thread.sp; 241 stack_start.sp = tsk->thread.sp;
122 stack_start.thread_info = tsk->stack; 242 stack_start.thread_info = tsk->stack;
@@ -127,7 +247,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
127 (unsigned long)&stack_start + sizeof(stack_start)); 247 (unsigned long)&stack_start + sizeof(stack_start));
128 wmb(); 248 wmb();
129 249
130 plat_start_cpu(cpu, (unsigned long)_stext); 250 mp_ops->start_cpu(cpu, (unsigned long)_stext);
131 251
132 timeout = jiffies + HZ; 252 timeout = jiffies + HZ;
133 while (time_before(jiffies, timeout)) { 253 while (time_before(jiffies, timeout)) {
@@ -135,6 +255,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
135 break; 255 break;
136 256
137 udelay(10); 257 udelay(10);
258 barrier();
138 } 259 }
139 260
140 if (cpu_online(cpu)) 261 if (cpu_online(cpu))
@@ -159,7 +280,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
159 280
160void smp_send_reschedule(int cpu) 281void smp_send_reschedule(int cpu)
161{ 282{
162 plat_send_ipi(cpu, SMP_MSG_RESCHEDULE); 283 mp_ops->send_ipi(cpu, SMP_MSG_RESCHEDULE);
163} 284}
164 285
165void smp_send_stop(void) 286void smp_send_stop(void)
@@ -172,12 +293,12 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask)
172 int cpu; 293 int cpu;
173 294
174 for_each_cpu(cpu, mask) 295 for_each_cpu(cpu, mask)
175 plat_send_ipi(cpu, SMP_MSG_FUNCTION); 296 mp_ops->send_ipi(cpu, SMP_MSG_FUNCTION);
176} 297}
177 298
178void arch_send_call_function_single_ipi(int cpu) 299void arch_send_call_function_single_ipi(int cpu)
179{ 300{
180 plat_send_ipi(cpu, SMP_MSG_FUNCTION_SINGLE); 301 mp_ops->send_ipi(cpu, SMP_MSG_FUNCTION_SINGLE);
181} 302}
182 303
183void smp_timer_broadcast(const struct cpumask *mask) 304void smp_timer_broadcast(const struct cpumask *mask)
@@ -185,7 +306,7 @@ void smp_timer_broadcast(const struct cpumask *mask)
185 int cpu; 306 int cpu;
186 307
187 for_each_cpu(cpu, mask) 308 for_each_cpu(cpu, mask)
188 plat_send_ipi(cpu, SMP_MSG_TIMER); 309 mp_ops->send_ipi(cpu, SMP_MSG_TIMER);
189} 310}
190 311
191static void ipi_timer(void) 312static void ipi_timer(void)
@@ -249,7 +370,6 @@ static void flush_tlb_mm_ipi(void *mm)
249 * behalf of debugees, kswapd stealing pages from another process etc). 370 * behalf of debugees, kswapd stealing pages from another process etc).
250 * Kanoj 07/00. 371 * Kanoj 07/00.
251 */ 372 */
252
253void flush_tlb_mm(struct mm_struct *mm) 373void flush_tlb_mm(struct mm_struct *mm)
254{ 374{
255 preempt_disable(); 375 preempt_disable();
diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c
index 9b0b633b6c9..948fdb65693 100644
--- a/arch/sh/kernel/topology.c
+++ b/arch/sh/kernel/topology.c
@@ -52,7 +52,11 @@ static int __init topology_init(void)
52#endif 52#endif
53 53
54 for_each_present_cpu(i) { 54 for_each_present_cpu(i) {
55 ret = register_cpu(&per_cpu(cpu_devices, i), i); 55 struct cpu *c = &per_cpu(cpu_devices, i);
56
57 c->hotpluggable = 1;
58
59 ret = register_cpu(c, i);
56 if (unlikely(ret)) 60 if (unlikely(ret))
57 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n", 61 printk(KERN_WARNING "%s: register_cpu %d failed (%d)\n",
58 __func__, i, ret); 62 __func__, i, ret);
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
index e3f92eb05ff..e67e140bf1f 100644
--- a/arch/sh/kernel/traps_64.c
+++ b/arch/sh/kernel/traps_64.c
@@ -944,3 +944,8 @@ asmlinkage void do_debug_interrupt(unsigned long code, struct pt_regs *regs)
944 /* Clear all DEBUGINT causes */ 944 /* Clear all DEBUGINT causes */
945 poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0); 945 poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0);
946} 946}
947
948void __cpuinit per_cpu_trap_init(void)
949{
950 /* Nothing to do for now, VBR initialization later. */
951}
diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile
index 3dc8a8a6382..53f7c684afb 100644
--- a/arch/sh/mm/Makefile
+++ b/arch/sh/mm/Makefile
@@ -10,6 +10,7 @@ cacheops-$(CONFIG_CPU_SH3) := cache-sh3.o
10cacheops-$(CONFIG_CPU_SH4) := cache-sh4.o flush-sh4.o 10cacheops-$(CONFIG_CPU_SH4) := cache-sh4.o flush-sh4.o
11cacheops-$(CONFIG_CPU_SH5) := cache-sh5.o flush-sh4.o 11cacheops-$(CONFIG_CPU_SH5) := cache-sh5.o flush-sh4.o
12cacheops-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o 12cacheops-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o
13cacheops-$(CONFIG_CPU_SHX3) += cache-shx3.o
13 14
14obj-y += $(cacheops-y) 15obj-y += $(cacheops-y)
15 16
@@ -18,13 +19,14 @@ mmu-$(CONFIG_MMU) := extable_$(BITS).o fault_$(BITS).o \
18 ioremap.o kmap.o pgtable.o tlbflush_$(BITS).o 19 ioremap.o kmap.o pgtable.o tlbflush_$(BITS).o
19 20
20obj-y += $(mmu-y) 21obj-y += $(mmu-y)
21obj-$(CONFIG_DEBUG_FS) += asids-debugfs.o
22 22
23ifdef CONFIG_DEBUG_FS 23debugfs-y := asids-debugfs.o
24obj-$(CONFIG_CPU_SH4) += cache-debugfs.o 24ifndef CONFIG_CACHE_OFF
25debugfs-$(CONFIG_CPU_SH4) += cache-debugfs.o
25endif 26endif
26 27
27ifdef CONFIG_MMU 28ifdef CONFIG_MMU
29debugfs-$(CONFIG_CPU_SH4) += tlb-debugfs.o
28tlb-$(CONFIG_CPU_SH3) := tlb-sh3.o 30tlb-$(CONFIG_CPU_SH3) := tlb-sh3.o
29tlb-$(CONFIG_CPU_SH4) := tlb-sh4.o tlb-urb.o 31tlb-$(CONFIG_CPU_SH4) := tlb-sh4.o tlb-urb.o
30tlb-$(CONFIG_CPU_SH5) := tlb-sh5.o 32tlb-$(CONFIG_CPU_SH5) := tlb-sh5.o
@@ -32,6 +34,7 @@ tlb-$(CONFIG_CPU_HAS_PTEAEX) := tlb-pteaex.o tlb-urb.o
32obj-y += $(tlb-y) 34obj-y += $(tlb-y)
33endif 35endif
34 36
37obj-$(CONFIG_DEBUG_FS) += $(debugfs-y)
35obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o 38obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
36obj-$(CONFIG_PMB) += pmb.o 39obj-$(CONFIG_PMB) += pmb.o
37obj-$(CONFIG_NUMA) += numa.o 40obj-$(CONFIG_NUMA) += numa.o
diff --git a/arch/sh/mm/cache-shx3.c b/arch/sh/mm/cache-shx3.c
new file mode 100644
index 00000000000..c0adbee97b5
--- /dev/null
+++ b/arch/sh/mm/cache-shx3.c
@@ -0,0 +1,44 @@
1/*
2 * arch/sh/mm/cache-shx3.c - SH-X3 optimized cache ops
3 *
4 * Copyright (C) 2010 Paul Mundt
5 *
6 * This file is subject to the terms and conditions of the GNU General Public
7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details.
9 */
10#include <linux/init.h>
11#include <linux/kernel.h>
12#include <linux/io.h>
13#include <asm/cache.h>
14
15#define CCR_CACHE_SNM 0x40000 /* Hardware-assisted synonym avoidance */
16#define CCR_CACHE_IBE 0x1000000 /* ICBI broadcast */
17
18void __init shx3_cache_init(void)
19{
20 unsigned int ccr;
21
22 ccr = __raw_readl(CCR);
23
24 /*
25 * If we've got cache aliases, resolve them in hardware.
26 */
27 if (boot_cpu_data.dcache.n_aliases || boot_cpu_data.icache.n_aliases) {
28 ccr |= CCR_CACHE_SNM;
29
30 boot_cpu_data.icache.n_aliases = 0;
31 boot_cpu_data.dcache.n_aliases = 0;
32
33 pr_info("Enabling hardware synonym avoidance\n");
34 }
35
36#ifdef CONFIG_SMP
37 /*
38 * Broadcast I-cache block invalidations by default.
39 */
40 ccr |= CCR_CACHE_IBE;
41#endif
42
43 writel_uncached(ccr, CCR);
44}
diff --git a/arch/sh/mm/cache.c b/arch/sh/mm/cache.c
index 0f4095d7ac8..ba401d137bb 100644
--- a/arch/sh/mm/cache.c
+++ b/arch/sh/mm/cache.c
@@ -334,6 +334,13 @@ void __init cpu_cache_init(void)
334 extern void __weak sh4_cache_init(void); 334 extern void __weak sh4_cache_init(void);
335 335
336 sh4_cache_init(); 336 sh4_cache_init();
337
338 if ((boot_cpu_data.type == CPU_SH7786) ||
339 (boot_cpu_data.type == CPU_SHX3)) {
340 extern void __weak shx3_cache_init(void);
341
342 shx3_cache_init();
343 }
337 } 344 }
338 345
339 if (boot_cpu_data.family == CPU_FAMILY_SH5) { 346 if (boot_cpu_data.family == CPU_FAMILY_SH5) {
diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index 8bf79e3b7bd..d4c34d757f0 100644
--- a/arch/sh/mm/fault_32.c
+++ b/arch/sh/mm/fault_32.c
@@ -200,7 +200,6 @@ good_area:
200 * make sure we exit gracefully rather than endlessly redo 200 * make sure we exit gracefully rather than endlessly redo
201 * the fault. 201 * the fault.
202 */ 202 */
203survive:
204 fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0); 203 fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0);
205 if (unlikely(fault & VM_FAULT_ERROR)) { 204 if (unlikely(fault & VM_FAULT_ERROR)) {
206 if (fault & VM_FAULT_OOM) 205 if (fault & VM_FAULT_OOM)
@@ -290,15 +289,10 @@ no_context:
290 */ 289 */
291out_of_memory: 290out_of_memory:
292 up_read(&mm->mmap_sem); 291 up_read(&mm->mmap_sem);
293 if (is_global_init(current)) { 292 if (!user_mode(regs))
294 yield(); 293 goto no_context;
295 down_read(&mm->mmap_sem); 294 pagefault_out_of_memory();
296 goto survive; 295 return;
297 }
298 printk("VM: killing process %s\n", tsk->comm);
299 if (user_mode(regs))
300 do_group_exit(SIGKILL);
301 goto no_context;
302 296
303do_sigbus: 297do_sigbus:
304 up_read(&mm->mmap_sem); 298 up_read(&mm->mmap_sem);
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index c505de61a5c..46f84de6246 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -2,7 +2,7 @@
2 * linux/arch/sh/mm/init.c 2 * linux/arch/sh/mm/init.c
3 * 3 *
4 * Copyright (C) 1999 Niibe Yutaka 4 * Copyright (C) 1999 Niibe Yutaka
5 * Copyright (C) 2002 - 2007 Paul Mundt 5 * Copyright (C) 2002 - 2010 Paul Mundt
6 * 6 *
7 * Based on linux/arch/i386/mm/init.c: 7 * Based on linux/arch/i386/mm/init.c:
8 * Copyright (C) 1995 Linus Torvalds 8 * Copyright (C) 1995 Linus Torvalds
@@ -16,17 +16,31 @@
16#include <linux/pagemap.h> 16#include <linux/pagemap.h>
17#include <linux/percpu.h> 17#include <linux/percpu.h>
18#include <linux/io.h> 18#include <linux/io.h>
19#include <linux/lmb.h>
19#include <linux/dma-mapping.h> 20#include <linux/dma-mapping.h>
20#include <asm/mmu_context.h> 21#include <asm/mmu_context.h>
22#include <asm/mmzone.h>
23#include <asm/kexec.h>
21#include <asm/tlb.h> 24#include <asm/tlb.h>
22#include <asm/cacheflush.h> 25#include <asm/cacheflush.h>
23#include <asm/sections.h> 26#include <asm/sections.h>
27#include <asm/setup.h>
24#include <asm/cache.h> 28#include <asm/cache.h>
25#include <asm/sizes.h> 29#include <asm/sizes.h>
26 30
27DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); 31DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
28pgd_t swapper_pg_dir[PTRS_PER_PGD]; 32pgd_t swapper_pg_dir[PTRS_PER_PGD];
29 33
34void __init generic_mem_init(void)
35{
36 lmb_add(__MEMORY_START, __MEMORY_SIZE);
37}
38
39void __init __weak plat_mem_setup(void)
40{
41 /* Nothing to see here, move along. */
42}
43
30#ifdef CONFIG_MMU 44#ifdef CONFIG_MMU
31static pte_t *__get_pte_phys(unsigned long addr) 45static pte_t *__get_pte_phys(unsigned long addr)
32{ 46{
@@ -152,15 +166,166 @@ void __init page_table_range_init(unsigned long start, unsigned long end,
152} 166}
153#endif /* CONFIG_MMU */ 167#endif /* CONFIG_MMU */
154 168
155/* 169void __init allocate_pgdat(unsigned int nid)
156 * paging_init() sets up the page tables 170{
157 */ 171 unsigned long start_pfn, end_pfn;
172#ifdef CONFIG_NEED_MULTIPLE_NODES
173 unsigned long phys;
174#endif
175
176 get_pfn_range_for_nid(nid, &start_pfn, &end_pfn);
177
178#ifdef CONFIG_NEED_MULTIPLE_NODES
179 phys = __lmb_alloc_base(sizeof(struct pglist_data),
180 SMP_CACHE_BYTES, end_pfn << PAGE_SHIFT);
181 /* Retry with all of system memory */
182 if (!phys)
183 phys = __lmb_alloc_base(sizeof(struct pglist_data),
184 SMP_CACHE_BYTES, lmb_end_of_DRAM());
185 if (!phys)
186 panic("Can't allocate pgdat for node %d\n", nid);
187
188 NODE_DATA(nid) = __va(phys);
189 memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
190
191 NODE_DATA(nid)->bdata = &bootmem_node_data[nid];
192#endif
193
194 NODE_DATA(nid)->node_start_pfn = start_pfn;
195 NODE_DATA(nid)->node_spanned_pages = end_pfn - start_pfn;
196}
197
198static void __init bootmem_init_one_node(unsigned int nid)
199{
200 unsigned long total_pages, paddr;
201 unsigned long end_pfn;
202 struct pglist_data *p;
203 int i;
204
205 p = NODE_DATA(nid);
206
207 /* Nothing to do.. */
208 if (!p->node_spanned_pages)
209 return;
210
211 end_pfn = p->node_start_pfn + p->node_spanned_pages;
212
213 total_pages = bootmem_bootmap_pages(p->node_spanned_pages);
214
215 paddr = lmb_alloc(total_pages << PAGE_SHIFT, PAGE_SIZE);
216 if (!paddr)
217 panic("Can't allocate bootmap for nid[%d]\n", nid);
218
219 init_bootmem_node(p, paddr >> PAGE_SHIFT, p->node_start_pfn, end_pfn);
220
221 free_bootmem_with_active_regions(nid, end_pfn);
222
223 /*
224 * XXX Handle initial reservations for the system memory node
225 * only for the moment, we'll refactor this later for handling
226 * reservations in other nodes.
227 */
228 if (nid == 0) {
229 /* Reserve the sections we're already using. */
230 for (i = 0; i < lmb.reserved.cnt; i++)
231 reserve_bootmem(lmb.reserved.region[i].base,
232 lmb_size_bytes(&lmb.reserved, i),
233 BOOTMEM_DEFAULT);
234 }
235
236 sparse_memory_present_with_active_regions(nid);
237}
238
239static void __init do_init_bootmem(void)
240{
241 int i;
242
243 /* Add active regions with valid PFNs. */
244 for (i = 0; i < lmb.memory.cnt; i++) {
245 unsigned long start_pfn, end_pfn;
246 start_pfn = lmb.memory.region[i].base >> PAGE_SHIFT;
247 end_pfn = start_pfn + lmb_size_pages(&lmb.memory, i);
248 __add_active_range(0, start_pfn, end_pfn);
249 }
250
251 /* All of system RAM sits in node 0 for the non-NUMA case */
252 allocate_pgdat(0);
253 node_set_online(0);
254
255 plat_mem_setup();
256
257 for_each_online_node(i)
258 bootmem_init_one_node(i);
259
260 sparse_init();
261}
262
263static void __init early_reserve_mem(void)
264{
265 unsigned long start_pfn;
266
267 /*
268 * Partially used pages are not usable - thus
269 * we are rounding upwards:
270 */
271 start_pfn = PFN_UP(__pa(_end));
272
273 /*
274 * Reserve the kernel text and Reserve the bootmem bitmap. We do
275 * this in two steps (first step was init_bootmem()), because
276 * this catches the (definitely buggy) case of us accidentally
277 * initializing the bootmem allocator with an invalid RAM area.
278 */
279 lmb_reserve(__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET,
280 (PFN_PHYS(start_pfn) + PAGE_SIZE - 1) -
281 (__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET));
282
283 /*
284 * Reserve physical pages below CONFIG_ZERO_PAGE_OFFSET.
285 */
286 if (CONFIG_ZERO_PAGE_OFFSET != 0)
287 lmb_reserve(__MEMORY_START, CONFIG_ZERO_PAGE_OFFSET);
288
289 /*
290 * Handle additional early reservations
291 */
292 check_for_initrd();
293 reserve_crashkernel();
294}
295
158void __init paging_init(void) 296void __init paging_init(void)
159{ 297{
160 unsigned long max_zone_pfns[MAX_NR_ZONES]; 298 unsigned long max_zone_pfns[MAX_NR_ZONES];
161 unsigned long vaddr, end; 299 unsigned long vaddr, end;
162 int nid; 300 int nid;
163 301
302 lmb_init();
303
304 sh_mv.mv_mem_init();
305
306 early_reserve_mem();
307
308 lmb_enforce_memory_limit(memory_limit);
309 lmb_analyze();
310
311 lmb_dump_all();
312
313 /*
314 * Determine low and high memory ranges:
315 */
316 max_low_pfn = max_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT;
317 min_low_pfn = __MEMORY_START >> PAGE_SHIFT;
318
319 nodes_clear(node_online_map);
320
321 memory_start = (unsigned long)__va(__MEMORY_START);
322 memory_end = memory_start + (memory_limit ?: lmb_phys_mem_size());
323
324 uncached_init();
325 pmb_init();
326 do_init_bootmem();
327 ioremap_fixed_init();
328
164 /* We don't need to map the kernel through the TLB, as 329 /* We don't need to map the kernel through the TLB, as
165 * it is permanatly mapped using P1. So clear the 330 * it is permanatly mapped using P1. So clear the
166 * entire pgd. */ 331 * entire pgd. */
diff --git a/arch/sh/mm/numa.c b/arch/sh/mm/numa.c
index 961b34085e3..a2e645f64a3 100644
--- a/arch/sh/mm/numa.c
+++ b/arch/sh/mm/numa.c
@@ -24,44 +24,6 @@ EXPORT_SYMBOL_GPL(node_data);
24 * latency. Each node's pgdat is node-local at the beginning of the node, 24 * latency. Each node's pgdat is node-local at the beginning of the node,
25 * immediately followed by the node mem map. 25 * immediately followed by the node mem map.
26 */ 26 */
27void __init setup_memory(void)
28{
29 unsigned long free_pfn = PFN_UP(__pa(_end));
30 u64 base = min_low_pfn << PAGE_SHIFT;
31 u64 size = (max_low_pfn << PAGE_SHIFT) - base;
32
33 lmb_add(base, size);
34
35 /* Reserve the LMB regions used by the kernel, initrd, etc.. */
36 lmb_reserve(__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET,
37 (PFN_PHYS(free_pfn) + PAGE_SIZE - 1) -
38 (__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET));
39
40 /*
41 * Reserve physical pages below CONFIG_ZERO_PAGE_OFFSET.
42 */
43 if (CONFIG_ZERO_PAGE_OFFSET != 0)
44 lmb_reserve(__MEMORY_START, CONFIG_ZERO_PAGE_OFFSET);
45
46 lmb_analyze();
47 lmb_dump_all();
48
49 /*
50 * Node 0 sets up its pgdat at the first available pfn,
51 * and bumps it up before setting up the bootmem allocator.
52 */
53 NODE_DATA(0) = pfn_to_kaddr(free_pfn);
54 memset(NODE_DATA(0), 0, sizeof(struct pglist_data));
55 free_pfn += PFN_UP(sizeof(struct pglist_data));
56 NODE_DATA(0)->bdata = &bootmem_node_data[0];
57
58 /* Set up node 0 */
59 setup_bootmem_allocator(free_pfn);
60
61 /* Give the platforms a chance to hook up their nodes */
62 plat_mem_setup();
63}
64
65void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) 27void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end)
66{ 28{
67 unsigned long bootmap_pages; 29 unsigned long bootmap_pages;
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index e43ec600afc..18623ba751b 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -341,6 +341,8 @@ int pmb_bolt_mapping(unsigned long vaddr, phys_addr_t phys,
341 unsigned long flags, pmb_flags; 341 unsigned long flags, pmb_flags;
342 int i, mapped; 342 int i, mapped;
343 343
344 if (size < SZ_16M)
345 return -EINVAL;
344 if (!pmb_addr_valid(vaddr, size)) 346 if (!pmb_addr_valid(vaddr, size))
345 return -EFAULT; 347 return -EFAULT;
346 if (pmb_mapping_exists(vaddr, phys, size)) 348 if (pmb_mapping_exists(vaddr, phys, size))
@@ -680,7 +682,7 @@ static void __init pmb_merge(struct pmb_entry *head)
680 /* 682 /*
681 * The merged page size must be valid. 683 * The merged page size must be valid.
682 */ 684 */
683 if (!pmb_size_valid(newsize)) 685 if (!depth || !pmb_size_valid(newsize))
684 return; 686 return;
685 687
686 head->flags &= ~PMB_SZ_MASK; 688 head->flags &= ~PMB_SZ_MASK;
diff --git a/arch/sh/mm/tlb-debugfs.c b/arch/sh/mm/tlb-debugfs.c
new file mode 100644
index 00000000000..229bf75f28d
--- /dev/null
+++ b/arch/sh/mm/tlb-debugfs.c
@@ -0,0 +1,179 @@
1/*
2 * arch/sh/mm/tlb-debugfs.c
3 *
4 * debugfs ops for SH-4 ITLB/UTLBs.
5 *
6 * Copyright (C) 2010 Matt Fleming
7 *
8 * This file is subject to the terms and conditions of the GNU General Public
9 * License. See the file "COPYING" in the main directory of this archive
10 * for more details.
11 */
12#include <linux/init.h>
13#include <linux/module.h>
14#include <linux/debugfs.h>
15#include <linux/seq_file.h>
16#include <asm/processor.h>
17#include <asm/mmu_context.h>
18#include <asm/tlbflush.h>
19
20enum tlb_type {
21 TLB_TYPE_ITLB,
22 TLB_TYPE_UTLB,
23};
24
25static struct {
26 int bits;
27 const char *size;
28} tlb_sizes[] = {
29 { 0x0, " 1KB" },
30 { 0x1, " 4KB" },
31 { 0x2, " 8KB" },
32 { 0x4, " 64KB" },
33 { 0x5, "256KB" },
34 { 0x7, " 1MB" },
35 { 0x8, " 4MB" },
36 { 0xc, " 64MB" },
37};
38
39static int tlb_seq_show(struct seq_file *file, void *iter)
40{
41 unsigned int tlb_type = (unsigned int)file->private;
42 unsigned long addr1, addr2, data1, data2;
43 unsigned long flags;
44 unsigned long mmucr;
45 unsigned int nentries, entry;
46 unsigned int urb;
47
48 mmucr = __raw_readl(MMUCR);
49 if ((mmucr & 0x1) == 0) {
50 seq_printf(file, "address translation disabled\n");
51 return 0;
52 }
53
54 if (tlb_type == TLB_TYPE_ITLB) {
55 addr1 = MMU_ITLB_ADDRESS_ARRAY;
56 addr2 = MMU_ITLB_ADDRESS_ARRAY2;
57 data1 = MMU_ITLB_DATA_ARRAY;
58 data2 = MMU_ITLB_DATA_ARRAY2;
59 nentries = 4;
60 } else {
61 addr1 = MMU_UTLB_ADDRESS_ARRAY;
62 addr2 = MMU_UTLB_ADDRESS_ARRAY2;
63 data1 = MMU_UTLB_DATA_ARRAY;
64 data2 = MMU_UTLB_DATA_ARRAY2;
65 nentries = 64;
66 }
67
68 local_irq_save(flags);
69 jump_to_uncached();
70
71 urb = (mmucr & MMUCR_URB) >> MMUCR_URB_SHIFT;
72
73 /* Make the "entry >= urb" test fail. */
74 if (urb == 0)
75 urb = MMUCR_URB_NENTRIES + 1;
76
77 if (tlb_type == TLB_TYPE_ITLB) {
78 addr1 = MMU_ITLB_ADDRESS_ARRAY;
79 addr2 = MMU_ITLB_ADDRESS_ARRAY2;
80 data1 = MMU_ITLB_DATA_ARRAY;
81 data2 = MMU_ITLB_DATA_ARRAY2;
82 nentries = 4;
83 } else {
84 addr1 = MMU_UTLB_ADDRESS_ARRAY;
85 addr2 = MMU_UTLB_ADDRESS_ARRAY2;
86 data1 = MMU_UTLB_DATA_ARRAY;
87 data2 = MMU_UTLB_DATA_ARRAY2;
88 nentries = 64;
89 }
90
91 seq_printf(file, "entry: vpn ppn asid size valid wired\n");
92
93 for (entry = 0; entry < nentries; entry++) {
94 unsigned long vpn, ppn, asid, size;
95 unsigned long valid;
96 unsigned long val;
97 const char *sz = " ?";
98 int i;
99
100 val = __raw_readl(addr1 | (entry << MMU_TLB_ENTRY_SHIFT));
101 ctrl_barrier();
102 vpn = val & 0xfffffc00;
103 valid = val & 0x100;
104
105 val = __raw_readl(addr2 | (entry << MMU_TLB_ENTRY_SHIFT));
106 ctrl_barrier();
107 asid = val & MMU_CONTEXT_ASID_MASK;
108
109 val = __raw_readl(data1 | (entry << MMU_TLB_ENTRY_SHIFT));
110 ctrl_barrier();
111 ppn = (val & 0x0ffffc00) << 4;
112
113 val = __raw_readl(data2 | (entry << MMU_TLB_ENTRY_SHIFT));
114 ctrl_barrier();
115 size = (val & 0xf0) >> 4;
116
117 for (i = 0; i < ARRAY_SIZE(tlb_sizes); i++) {
118 if (tlb_sizes[i].bits == size)
119 break;
120 }
121
122 if (i != ARRAY_SIZE(tlb_sizes))
123 sz = tlb_sizes[i].size;
124
125 seq_printf(file, "%2d: 0x%08lx 0x%08lx %5lu %s %s %s\n",
126 entry, vpn, ppn, asid,
127 sz, valid ? "V" : "-",
128 (urb <= entry) ? "W" : "-");
129 }
130
131 back_to_cached();
132 local_irq_restore(flags);
133
134 return 0;
135}
136
137static int tlb_debugfs_open(struct inode *inode, struct file *file)
138{
139 return single_open(file, tlb_seq_show, inode->i_private);
140}
141
142static const struct file_operations tlb_debugfs_fops = {
143 .owner = THIS_MODULE,
144 .open = tlb_debugfs_open,
145 .read = seq_read,
146 .llseek = seq_lseek,
147 .release = single_release,
148};
149
150static int __init tlb_debugfs_init(void)
151{
152 struct dentry *itlb, *utlb;
153
154 itlb = debugfs_create_file("itlb", S_IRUSR, sh_debugfs_root,
155 (unsigned int *)TLB_TYPE_ITLB,
156 &tlb_debugfs_fops);
157 if (unlikely(!itlb))
158 return -ENOMEM;
159 if (IS_ERR(itlb))
160 return PTR_ERR(itlb);
161
162 utlb = debugfs_create_file("utlb", S_IRUSR, sh_debugfs_root,
163 (unsigned int *)TLB_TYPE_UTLB,
164 &tlb_debugfs_fops);
165 if (unlikely(!utlb)) {
166 debugfs_remove(itlb);
167 return -ENOMEM;
168 }
169
170 if (IS_ERR(utlb)) {
171 debugfs_remove(itlb);
172 return PTR_ERR(utlb);
173 }
174
175 return 0;
176}
177module_init(tlb_debugfs_init);
178
179MODULE_LICENSE("GPL v2");
diff --git a/arch/sh/mm/tlbflush_64.c b/arch/sh/mm/tlbflush_64.c
index 706da1d3a67..03db41cc126 100644
--- a/arch/sh/mm/tlbflush_64.c
+++ b/arch/sh/mm/tlbflush_64.c
@@ -189,7 +189,6 @@ good_area:
189 * make sure we exit gracefully rather than endlessly redo 189 * make sure we exit gracefully rather than endlessly redo
190 * the fault. 190 * the fault.
191 */ 191 */
192survive:
193 fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0); 192 fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0);
194 if (unlikely(fault & VM_FAULT_ERROR)) { 193 if (unlikely(fault & VM_FAULT_ERROR)) {
195 if (fault & VM_FAULT_OOM) 194 if (fault & VM_FAULT_OOM)
@@ -294,22 +293,11 @@ no_context:
294 * us unable to handle the page fault gracefully. 293 * us unable to handle the page fault gracefully.
295 */ 294 */
296out_of_memory: 295out_of_memory:
297 if (is_global_init(current)) {
298 panic("INIT out of memory\n");
299 yield();
300 goto survive;
301 }
302 printk("fault:Out of memory\n");
303 up_read(&mm->mmap_sem); 296 up_read(&mm->mmap_sem);
304 if (is_global_init(current)) { 297 if (!user_mode(regs))
305 yield(); 298 goto no_context;
306 down_read(&mm->mmap_sem); 299 pagefault_out_of_memory();
307 goto survive; 300 return;
308 }
309 printk("VM: killing process %s\n", tsk->comm);
310 if (user_mode(regs))
311 do_group_exit(SIGKILL);
312 goto no_context;
313 301
314do_sigbus: 302do_sigbus:
315 printk("fault:Do sigbus\n"); 303 printk("fault:Do sigbus\n");
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index c5fbe198fbd..765bcf0df3b 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1254,6 +1254,26 @@ static int __init early_platform_driver_probe_id(char *class_str,
1254 } 1254 }
1255 1255
1256 if (match) { 1256 if (match) {
1257 /*
1258 * Set up a sensible init_name to enable
1259 * dev_name() and others to be used before the
1260 * rest of the driver core is initialized.
1261 */
1262 if (!match->dev.init_name && slab_is_available()) {
1263 if (match->id != -1)
1264 match->dev.init_name =
1265 kasprintf(GFP_KERNEL, "%s.%d",
1266 match->name,
1267 match->id);
1268 else
1269 match->dev.init_name =
1270 kasprintf(GFP_KERNEL, "%s",
1271 match->name);
1272
1273 if (!match->dev.init_name)
1274 return -ENOMEM;
1275 }
1276
1257 if (epdrv->pdrv->probe(match)) 1277 if (epdrv->pdrv->probe(match))
1258 pr_warning("%s: unable to probe %s early.\n", 1278 pr_warning("%s: unable to probe %s early.\n",
1259 class_str, match->name); 1279 class_str, match->name);
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 744f748cc84..f6677cb1978 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -150,13 +150,12 @@ static void sh_cmt_start_stop_ch(struct sh_cmt_priv *p, int start)
150 150
151static int sh_cmt_enable(struct sh_cmt_priv *p, unsigned long *rate) 151static int sh_cmt_enable(struct sh_cmt_priv *p, unsigned long *rate)
152{ 152{
153 struct sh_timer_config *cfg = p->pdev->dev.platform_data;
154 int ret; 153 int ret;
155 154
156 /* enable clock */ 155 /* enable clock */
157 ret = clk_enable(p->clk); 156 ret = clk_enable(p->clk);
158 if (ret) { 157 if (ret) {
159 pr_err("sh_cmt: cannot enable clock \"%s\"\n", cfg->clk); 158 dev_err(&p->pdev->dev, "cannot enable clock\n");
160 return ret; 159 return ret;
161 } 160 }
162 161
@@ -279,7 +278,7 @@ static void sh_cmt_clock_event_program_verify(struct sh_cmt_priv *p,
279 delay = 1; 278 delay = 1;
280 279
281 if (!delay) 280 if (!delay)
282 pr_warning("sh_cmt: too long delay\n"); 281 dev_warn(&p->pdev->dev, "too long delay\n");
283 282
284 } while (delay); 283 } while (delay);
285} 284}
@@ -289,7 +288,7 @@ static void sh_cmt_set_next(struct sh_cmt_priv *p, unsigned long delta)
289 unsigned long flags; 288 unsigned long flags;
290 289
291 if (delta > p->max_match_value) 290 if (delta > p->max_match_value)
292 pr_warning("sh_cmt: delta out of range\n"); 291 dev_warn(&p->pdev->dev, "delta out of range\n");
293 292
294 spin_lock_irqsave(&p->lock, flags); 293 spin_lock_irqsave(&p->lock, flags);
295 p->next_match_value = delta; 294 p->next_match_value = delta;
@@ -451,7 +450,7 @@ static int sh_cmt_register_clocksource(struct sh_cmt_priv *p,
451 cs->resume = sh_cmt_clocksource_resume; 450 cs->resume = sh_cmt_clocksource_resume;
452 cs->mask = CLOCKSOURCE_MASK(sizeof(unsigned long) * 8); 451 cs->mask = CLOCKSOURCE_MASK(sizeof(unsigned long) * 8);
453 cs->flags = CLOCK_SOURCE_IS_CONTINUOUS; 452 cs->flags = CLOCK_SOURCE_IS_CONTINUOUS;
454 pr_info("sh_cmt: %s used as clock source\n", cs->name); 453 dev_info(&p->pdev->dev, "used as clock source\n");
455 clocksource_register(cs); 454 clocksource_register(cs);
456 return 0; 455 return 0;
457} 456}
@@ -497,13 +496,11 @@ static void sh_cmt_clock_event_mode(enum clock_event_mode mode,
497 496
498 switch (mode) { 497 switch (mode) {
499 case CLOCK_EVT_MODE_PERIODIC: 498 case CLOCK_EVT_MODE_PERIODIC:
500 pr_info("sh_cmt: %s used for periodic clock events\n", 499 dev_info(&p->pdev->dev, "used for periodic clock events\n");
501 ced->name);
502 sh_cmt_clock_event_start(p, 1); 500 sh_cmt_clock_event_start(p, 1);
503 break; 501 break;
504 case CLOCK_EVT_MODE_ONESHOT: 502 case CLOCK_EVT_MODE_ONESHOT:
505 pr_info("sh_cmt: %s used for oneshot clock events\n", 503 dev_info(&p->pdev->dev, "used for oneshot clock events\n");
506 ced->name);
507 sh_cmt_clock_event_start(p, 0); 504 sh_cmt_clock_event_start(p, 0);
508 break; 505 break;
509 case CLOCK_EVT_MODE_SHUTDOWN: 506 case CLOCK_EVT_MODE_SHUTDOWN:
@@ -544,7 +541,7 @@ static void sh_cmt_register_clockevent(struct sh_cmt_priv *p,
544 ced->set_next_event = sh_cmt_clock_event_next; 541 ced->set_next_event = sh_cmt_clock_event_next;
545 ced->set_mode = sh_cmt_clock_event_mode; 542 ced->set_mode = sh_cmt_clock_event_mode;
546 543
547 pr_info("sh_cmt: %s used for clock events\n", ced->name); 544 dev_info(&p->pdev->dev, "used for clock events\n");
548 clockevents_register_device(ced); 545 clockevents_register_device(ced);
549} 546}
550 547
@@ -601,22 +598,27 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
601 /* map memory, let mapbase point to our channel */ 598 /* map memory, let mapbase point to our channel */
602 p->mapbase = ioremap_nocache(res->start, resource_size(res)); 599 p->mapbase = ioremap_nocache(res->start, resource_size(res));
603 if (p->mapbase == NULL) { 600 if (p->mapbase == NULL) {
604 pr_err("sh_cmt: failed to remap I/O memory\n"); 601 dev_err(&p->pdev->dev, "failed to remap I/O memory\n");
605 goto err0; 602 goto err0;
606 } 603 }
607 604
608 /* request irq using setup_irq() (too early for request_irq()) */ 605 /* request irq using setup_irq() (too early for request_irq()) */
609 p->irqaction.name = cfg->name; 606 p->irqaction.name = dev_name(&p->pdev->dev);
610 p->irqaction.handler = sh_cmt_interrupt; 607 p->irqaction.handler = sh_cmt_interrupt;
611 p->irqaction.dev_id = p; 608 p->irqaction.dev_id = p;
612 p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL; 609 p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | \
610 IRQF_IRQPOLL | IRQF_NOBALANCING;
613 611
614 /* get hold of clock */ 612 /* get hold of clock */
615 p->clk = clk_get(&p->pdev->dev, cfg->clk); 613 p->clk = clk_get(&p->pdev->dev, "cmt_fck");
616 if (IS_ERR(p->clk)) { 614 if (IS_ERR(p->clk)) {
617 pr_err("sh_cmt: cannot get clock \"%s\"\n", cfg->clk); 615 dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
618 ret = PTR_ERR(p->clk); 616 p->clk = clk_get(&p->pdev->dev, cfg->clk);
619 goto err1; 617 if (IS_ERR(p->clk)) {
618 dev_err(&p->pdev->dev, "cannot get clock\n");
619 ret = PTR_ERR(p->clk);
620 goto err1;
621 }
620 } 622 }
621 623
622 if (resource_size(res) == 6) { 624 if (resource_size(res) == 6) {
@@ -629,17 +631,17 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
629 p->clear_bits = ~0xc000; 631 p->clear_bits = ~0xc000;
630 } 632 }
631 633
632 ret = sh_cmt_register(p, cfg->name, 634 ret = sh_cmt_register(p, (char *)dev_name(&p->pdev->dev),
633 cfg->clockevent_rating, 635 cfg->clockevent_rating,
634 cfg->clocksource_rating); 636 cfg->clocksource_rating);
635 if (ret) { 637 if (ret) {
636 pr_err("sh_cmt: registration failed\n"); 638 dev_err(&p->pdev->dev, "registration failed\n");
637 goto err1; 639 goto err1;
638 } 640 }
639 641
640 ret = setup_irq(irq, &p->irqaction); 642 ret = setup_irq(irq, &p->irqaction);
641 if (ret) { 643 if (ret) {
642 pr_err("sh_cmt: failed to request irq %d\n", irq); 644 dev_err(&p->pdev->dev, "failed to request irq %d\n", irq);
643 goto err1; 645 goto err1;
644 } 646 }
645 647
@@ -654,11 +656,10 @@ err0:
654static int __devinit sh_cmt_probe(struct platform_device *pdev) 656static int __devinit sh_cmt_probe(struct platform_device *pdev)
655{ 657{
656 struct sh_cmt_priv *p = platform_get_drvdata(pdev); 658 struct sh_cmt_priv *p = platform_get_drvdata(pdev);
657 struct sh_timer_config *cfg = pdev->dev.platform_data;
658 int ret; 659 int ret;
659 660
660 if (p) { 661 if (p) {
661 pr_info("sh_cmt: %s kept as earlytimer\n", cfg->name); 662 dev_info(&pdev->dev, "kept as earlytimer\n");
662 return 0; 663 return 0;
663 } 664 }
664 665
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index 5fb78bfd73b..ef7a5be8a09 100644
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
@@ -119,13 +119,12 @@ static void sh_mtu2_start_stop_ch(struct sh_mtu2_priv *p, int start)
119 119
120static int sh_mtu2_enable(struct sh_mtu2_priv *p) 120static int sh_mtu2_enable(struct sh_mtu2_priv *p)
121{ 121{
122 struct sh_timer_config *cfg = p->pdev->dev.platform_data;
123 int ret; 122 int ret;
124 123
125 /* enable clock */ 124 /* enable clock */
126 ret = clk_enable(p->clk); 125 ret = clk_enable(p->clk);
127 if (ret) { 126 if (ret) {
128 pr_err("sh_mtu2: cannot enable clock \"%s\"\n", cfg->clk); 127 dev_err(&p->pdev->dev, "cannot enable clock\n");
129 return ret; 128 return ret;
130 } 129 }
131 130
@@ -194,8 +193,7 @@ static void sh_mtu2_clock_event_mode(enum clock_event_mode mode,
194 193
195 switch (mode) { 194 switch (mode) {
196 case CLOCK_EVT_MODE_PERIODIC: 195 case CLOCK_EVT_MODE_PERIODIC:
197 pr_info("sh_mtu2: %s used for periodic clock events\n", 196 dev_info(&p->pdev->dev, "used for periodic clock events\n");
198 ced->name);
199 sh_mtu2_enable(p); 197 sh_mtu2_enable(p);
200 break; 198 break;
201 case CLOCK_EVT_MODE_UNUSED: 199 case CLOCK_EVT_MODE_UNUSED:
@@ -222,13 +220,13 @@ static void sh_mtu2_register_clockevent(struct sh_mtu2_priv *p,
222 ced->cpumask = cpumask_of(0); 220 ced->cpumask = cpumask_of(0);
223 ced->set_mode = sh_mtu2_clock_event_mode; 221 ced->set_mode = sh_mtu2_clock_event_mode;
224 222
225 pr_info("sh_mtu2: %s used for clock events\n", ced->name); 223 dev_info(&p->pdev->dev, "used for clock events\n");
226 clockevents_register_device(ced); 224 clockevents_register_device(ced);
227 225
228 ret = setup_irq(p->irqaction.irq, &p->irqaction); 226 ret = setup_irq(p->irqaction.irq, &p->irqaction);
229 if (ret) { 227 if (ret) {
230 pr_err("sh_mtu2: failed to request irq %d\n", 228 dev_err(&p->pdev->dev, "failed to request irq %d\n",
231 p->irqaction.irq); 229 p->irqaction.irq);
232 return; 230 return;
233 } 231 }
234} 232}
@@ -274,26 +272,32 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev)
274 /* map memory, let mapbase point to our channel */ 272 /* map memory, let mapbase point to our channel */
275 p->mapbase = ioremap_nocache(res->start, resource_size(res)); 273 p->mapbase = ioremap_nocache(res->start, resource_size(res));
276 if (p->mapbase == NULL) { 274 if (p->mapbase == NULL) {
277 pr_err("sh_mtu2: failed to remap I/O memory\n"); 275 dev_err(&p->pdev->dev, "failed to remap I/O memory\n");
278 goto err0; 276 goto err0;
279 } 277 }
280 278
281 /* setup data for setup_irq() (too early for request_irq()) */ 279 /* setup data for setup_irq() (too early for request_irq()) */
282 p->irqaction.name = cfg->name; 280 p->irqaction.name = dev_name(&p->pdev->dev);
283 p->irqaction.handler = sh_mtu2_interrupt; 281 p->irqaction.handler = sh_mtu2_interrupt;
284 p->irqaction.dev_id = p; 282 p->irqaction.dev_id = p;
285 p->irqaction.irq = irq; 283 p->irqaction.irq = irq;
286 p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL; 284 p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | \
285 IRQF_IRQPOLL | IRQF_NOBALANCING;
287 286
288 /* get hold of clock */ 287 /* get hold of clock */
289 p->clk = clk_get(&p->pdev->dev, cfg->clk); 288 p->clk = clk_get(&p->pdev->dev, "mtu2_fck");
290 if (IS_ERR(p->clk)) { 289 if (IS_ERR(p->clk)) {
291 pr_err("sh_mtu2: cannot get clock \"%s\"\n", cfg->clk); 290 dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
292 ret = PTR_ERR(p->clk); 291 p->clk = clk_get(&p->pdev->dev, cfg->clk);
293 goto err1; 292 if (IS_ERR(p->clk)) {
293 dev_err(&p->pdev->dev, "cannot get clock\n");
294 ret = PTR_ERR(p->clk);
295 goto err1;
296 }
294 } 297 }
295 298
296 return sh_mtu2_register(p, cfg->name, cfg->clockevent_rating); 299 return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),
300 cfg->clockevent_rating);
297 err1: 301 err1:
298 iounmap(p->mapbase); 302 iounmap(p->mapbase);
299 err0: 303 err0:
@@ -303,11 +307,10 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev)
303static int __devinit sh_mtu2_probe(struct platform_device *pdev) 307static int __devinit sh_mtu2_probe(struct platform_device *pdev)
304{ 308{
305 struct sh_mtu2_priv *p = platform_get_drvdata(pdev); 309 struct sh_mtu2_priv *p = platform_get_drvdata(pdev);
306 struct sh_timer_config *cfg = pdev->dev.platform_data;
307 int ret; 310 int ret;
308 311
309 if (p) { 312 if (p) {
310 pr_info("sh_mtu2: %s kept as earlytimer\n", cfg->name); 313 dev_info(&pdev->dev, "kept as earlytimer\n");
311 return 0; 314 return 0;
312 } 315 }
313 316
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index fc9ff1e5b77..8e44e14ec4c 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -107,13 +107,12 @@ static void sh_tmu_start_stop_ch(struct sh_tmu_priv *p, int start)
107 107
108static int sh_tmu_enable(struct sh_tmu_priv *p) 108static int sh_tmu_enable(struct sh_tmu_priv *p)
109{ 109{
110 struct sh_timer_config *cfg = p->pdev->dev.platform_data;
111 int ret; 110 int ret;
112 111
113 /* enable clock */ 112 /* enable clock */
114 ret = clk_enable(p->clk); 113 ret = clk_enable(p->clk);
115 if (ret) { 114 if (ret) {
116 pr_err("sh_tmu: cannot enable clock \"%s\"\n", cfg->clk); 115 dev_err(&p->pdev->dev, "cannot enable clock\n");
117 return ret; 116 return ret;
118 } 117 }
119 118
@@ -229,7 +228,7 @@ static int sh_tmu_register_clocksource(struct sh_tmu_priv *p,
229 cs->disable = sh_tmu_clocksource_disable; 228 cs->disable = sh_tmu_clocksource_disable;
230 cs->mask = CLOCKSOURCE_MASK(32); 229 cs->mask = CLOCKSOURCE_MASK(32);
231 cs->flags = CLOCK_SOURCE_IS_CONTINUOUS; 230 cs->flags = CLOCK_SOURCE_IS_CONTINUOUS;
232 pr_info("sh_tmu: %s used as clock source\n", cs->name); 231 dev_info(&p->pdev->dev, "used as clock source\n");
233 clocksource_register(cs); 232 clocksource_register(cs);
234 return 0; 233 return 0;
235} 234}
@@ -277,13 +276,11 @@ static void sh_tmu_clock_event_mode(enum clock_event_mode mode,
277 276
278 switch (mode) { 277 switch (mode) {
279 case CLOCK_EVT_MODE_PERIODIC: 278 case CLOCK_EVT_MODE_PERIODIC:
280 pr_info("sh_tmu: %s used for periodic clock events\n", 279 dev_info(&p->pdev->dev, "used for periodic clock events\n");
281 ced->name);
282 sh_tmu_clock_event_start(p, 1); 280 sh_tmu_clock_event_start(p, 1);
283 break; 281 break;
284 case CLOCK_EVT_MODE_ONESHOT: 282 case CLOCK_EVT_MODE_ONESHOT:
285 pr_info("sh_tmu: %s used for oneshot clock events\n", 283 dev_info(&p->pdev->dev, "used for oneshot clock events\n");
286 ced->name);
287 sh_tmu_clock_event_start(p, 0); 284 sh_tmu_clock_event_start(p, 0);
288 break; 285 break;
289 case CLOCK_EVT_MODE_UNUSED: 286 case CLOCK_EVT_MODE_UNUSED:
@@ -324,13 +321,13 @@ static void sh_tmu_register_clockevent(struct sh_tmu_priv *p,
324 ced->set_next_event = sh_tmu_clock_event_next; 321 ced->set_next_event = sh_tmu_clock_event_next;
325 ced->set_mode = sh_tmu_clock_event_mode; 322 ced->set_mode = sh_tmu_clock_event_mode;
326 323
327 pr_info("sh_tmu: %s used for clock events\n", ced->name); 324 dev_info(&p->pdev->dev, "used for clock events\n");
328 clockevents_register_device(ced); 325 clockevents_register_device(ced);
329 326
330 ret = setup_irq(p->irqaction.irq, &p->irqaction); 327 ret = setup_irq(p->irqaction.irq, &p->irqaction);
331 if (ret) { 328 if (ret) {
332 pr_err("sh_tmu: failed to request irq %d\n", 329 dev_err(&p->pdev->dev, "failed to request irq %d\n",
333 p->irqaction.irq); 330 p->irqaction.irq);
334 return; 331 return;
335 } 332 }
336} 333}
@@ -379,26 +376,31 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
379 /* map memory, let mapbase point to our channel */ 376 /* map memory, let mapbase point to our channel */
380 p->mapbase = ioremap_nocache(res->start, resource_size(res)); 377 p->mapbase = ioremap_nocache(res->start, resource_size(res));
381 if (p->mapbase == NULL) { 378 if (p->mapbase == NULL) {
382 pr_err("sh_tmu: failed to remap I/O memory\n"); 379 dev_err(&p->pdev->dev, "failed to remap I/O memory\n");
383 goto err0; 380 goto err0;
384 } 381 }
385 382
386 /* setup data for setup_irq() (too early for request_irq()) */ 383 /* setup data for setup_irq() (too early for request_irq()) */
387 p->irqaction.name = cfg->name; 384 p->irqaction.name = dev_name(&p->pdev->dev);
388 p->irqaction.handler = sh_tmu_interrupt; 385 p->irqaction.handler = sh_tmu_interrupt;
389 p->irqaction.dev_id = p; 386 p->irqaction.dev_id = p;
390 p->irqaction.irq = irq; 387 p->irqaction.irq = irq;
391 p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL; 388 p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | \
389 IRQF_IRQPOLL | IRQF_NOBALANCING;
392 390
393 /* get hold of clock */ 391 /* get hold of clock */
394 p->clk = clk_get(&p->pdev->dev, cfg->clk); 392 p->clk = clk_get(&p->pdev->dev, "tmu_fck");
395 if (IS_ERR(p->clk)) { 393 if (IS_ERR(p->clk)) {
396 pr_err("sh_tmu: cannot get clock \"%s\"\n", cfg->clk); 394 dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
397 ret = PTR_ERR(p->clk); 395 p->clk = clk_get(&p->pdev->dev, cfg->clk);
398 goto err1; 396 if (IS_ERR(p->clk)) {
397 dev_err(&p->pdev->dev, "cannot get clock\n");
398 ret = PTR_ERR(p->clk);
399 goto err1;
400 }
399 } 401 }
400 402
401 return sh_tmu_register(p, cfg->name, 403 return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
402 cfg->clockevent_rating, 404 cfg->clockevent_rating,
403 cfg->clocksource_rating); 405 cfg->clocksource_rating);
404 err1: 406 err1:
@@ -410,11 +412,10 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
410static int __devinit sh_tmu_probe(struct platform_device *pdev) 412static int __devinit sh_tmu_probe(struct platform_device *pdev)
411{ 413{
412 struct sh_tmu_priv *p = platform_get_drvdata(pdev); 414 struct sh_tmu_priv *p = platform_get_drvdata(pdev);
413 struct sh_timer_config *cfg = pdev->dev.platform_data;
414 int ret; 415 int ret;
415 416
416 if (p) { 417 if (p) {
417 pr_info("sh_tmu: %s kept as earlytimer\n", cfg->name); 418 dev_info(&pdev->dev, "kept as earlytimer\n");
418 return 0; 419 return 0;
419 } 420 }
420 421
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index 6f25a20de99..323afef7780 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -26,8 +26,7 @@
26#include <linux/dma-mapping.h> 26#include <linux/dma-mapping.h>
27#include <linux/platform_device.h> 27#include <linux/platform_device.h>
28#include <linux/pm_runtime.h> 28#include <linux/pm_runtime.h>
29 29#include <linux/sh_dma.h>
30#include <asm/dmaengine.h>
31 30
32#include "shdma.h" 31#include "shdma.h"
33 32
@@ -45,7 +44,7 @@ enum sh_dmae_desc_status {
45#define LOG2_DEFAULT_XFER_SIZE 2 44#define LOG2_DEFAULT_XFER_SIZE 2
46 45
47/* A bitmask with bits enough for enum sh_dmae_slave_chan_id */ 46/* A bitmask with bits enough for enum sh_dmae_slave_chan_id */
48static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SHDMA_SLAVE_NUMBER)]; 47static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SH_DMA_SLAVE_NUMBER)];
49 48
50static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all); 49static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all);
51 50
@@ -190,7 +189,7 @@ static int dmae_set_dmars(struct sh_dmae_chan *sh_chan, u16 val)
190 struct sh_dmae_device *shdev = container_of(sh_chan->common.device, 189 struct sh_dmae_device *shdev = container_of(sh_chan->common.device,
191 struct sh_dmae_device, common); 190 struct sh_dmae_device, common);
192 struct sh_dmae_pdata *pdata = shdev->pdata; 191 struct sh_dmae_pdata *pdata = shdev->pdata;
193 struct sh_dmae_channel *chan_pdata = &pdata->channel[sh_chan->id]; 192 const struct sh_dmae_channel *chan_pdata = &pdata->channel[sh_chan->id];
194 u16 __iomem *addr = shdev->dmars + chan_pdata->dmars / sizeof(u16); 193 u16 __iomem *addr = shdev->dmars + chan_pdata->dmars / sizeof(u16);
195 int shift = chan_pdata->dmars_bit; 194 int shift = chan_pdata->dmars_bit;
196 195
@@ -266,8 +265,8 @@ static struct sh_desc *sh_dmae_get_desc(struct sh_dmae_chan *sh_chan)
266 return NULL; 265 return NULL;
267} 266}
268 267
269static struct sh_dmae_slave_config *sh_dmae_find_slave( 268static const struct sh_dmae_slave_config *sh_dmae_find_slave(
270 struct sh_dmae_chan *sh_chan, enum sh_dmae_slave_chan_id slave_id) 269 struct sh_dmae_chan *sh_chan, struct sh_dmae_slave *param)
271{ 270{
272 struct dma_device *dma_dev = sh_chan->common.device; 271 struct dma_device *dma_dev = sh_chan->common.device;
273 struct sh_dmae_device *shdev = container_of(dma_dev, 272 struct sh_dmae_device *shdev = container_of(dma_dev,
@@ -275,11 +274,11 @@ static struct sh_dmae_slave_config *sh_dmae_find_slave(
275 struct sh_dmae_pdata *pdata = shdev->pdata; 274 struct sh_dmae_pdata *pdata = shdev->pdata;
276 int i; 275 int i;
277 276
278 if ((unsigned)slave_id >= SHDMA_SLAVE_NUMBER) 277 if (param->slave_id >= SH_DMA_SLAVE_NUMBER)
279 return NULL; 278 return NULL;
280 279
281 for (i = 0; i < pdata->slave_num; i++) 280 for (i = 0; i < pdata->slave_num; i++)
282 if (pdata->slave[i].slave_id == slave_id) 281 if (pdata->slave[i].slave_id == param->slave_id)
283 return pdata->slave + i; 282 return pdata->slave + i;
284 283
285 return NULL; 284 return NULL;
@@ -299,9 +298,9 @@ static int sh_dmae_alloc_chan_resources(struct dma_chan *chan)
299 * never runs concurrently with itself or free_chan_resources. 298 * never runs concurrently with itself or free_chan_resources.
300 */ 299 */
301 if (param) { 300 if (param) {
302 struct sh_dmae_slave_config *cfg; 301 const struct sh_dmae_slave_config *cfg;
303 302
304 cfg = sh_dmae_find_slave(sh_chan, param->slave_id); 303 cfg = sh_dmae_find_slave(sh_chan, param);
305 if (!cfg) { 304 if (!cfg) {
306 ret = -EINVAL; 305 ret = -EINVAL;
307 goto efindslave; 306 goto efindslave;
@@ -574,12 +573,14 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_slave_sg(
574{ 573{
575 struct sh_dmae_slave *param; 574 struct sh_dmae_slave *param;
576 struct sh_dmae_chan *sh_chan; 575 struct sh_dmae_chan *sh_chan;
576 dma_addr_t slave_addr;
577 577
578 if (!chan) 578 if (!chan)
579 return NULL; 579 return NULL;
580 580
581 sh_chan = to_sh_chan(chan); 581 sh_chan = to_sh_chan(chan);
582 param = chan->private; 582 param = chan->private;
583 slave_addr = param->config->addr;
583 584
584 /* Someone calling slave DMA on a public channel? */ 585 /* Someone calling slave DMA on a public channel? */
585 if (!param || !sg_len) { 586 if (!param || !sg_len) {
@@ -592,7 +593,7 @@ static struct dma_async_tx_descriptor *sh_dmae_prep_slave_sg(
592 * if (param != NULL), this is a successfully requested slave channel, 593 * if (param != NULL), this is a successfully requested slave channel,
593 * therefore param->config != NULL too. 594 * therefore param->config != NULL too.
594 */ 595 */
595 return sh_dmae_prep_sg(sh_chan, sgl, sg_len, &param->config->addr, 596 return sh_dmae_prep_sg(sh_chan, sgl, sg_len, &slave_addr,
596 direction, flags); 597 direction, flags);
597} 598}
598 599
@@ -873,7 +874,7 @@ static int __devinit sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id,
873 int irq, unsigned long flags) 874 int irq, unsigned long flags)
874{ 875{
875 int err; 876 int err;
876 struct sh_dmae_channel *chan_pdata = &shdev->pdata->channel[id]; 877 const struct sh_dmae_channel *chan_pdata = &shdev->pdata->channel[id];
877 struct platform_device *pdev = to_platform_device(shdev->common.dev); 878 struct platform_device *pdev = to_platform_device(shdev->common.dev);
878 struct sh_dmae_chan *new_sh_chan; 879 struct sh_dmae_chan *new_sh_chan;
879 880
diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h
index 153609a1e96..4021275a0a4 100644
--- a/drivers/dma/shdma.h
+++ b/drivers/dma/shdma.h
@@ -17,8 +17,8 @@
17#include <linux/interrupt.h> 17#include <linux/interrupt.h>
18#include <linux/list.h> 18#include <linux/list.h>
19 19
20#include <asm/dmaengine.h> 20#define SH_DMAC_MAX_CHANNELS 6
21 21#define SH_DMA_SLAVE_NUMBER 256
22#define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */ 22#define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */
23 23
24struct device; 24struct device;
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 8eb094c1f61..8d993c4ccea 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -83,16 +83,16 @@ struct sci_port {
83 83
84 /* Interface clock */ 84 /* Interface clock */
85 struct clk *iclk; 85 struct clk *iclk;
86 /* Data clock */ 86 /* Function clock */
87 struct clk *dclk; 87 struct clk *fclk;
88 88
89 struct list_head node; 89 struct list_head node;
90 struct dma_chan *chan_tx; 90 struct dma_chan *chan_tx;
91 struct dma_chan *chan_rx; 91 struct dma_chan *chan_rx;
92#ifdef CONFIG_SERIAL_SH_SCI_DMA 92#ifdef CONFIG_SERIAL_SH_SCI_DMA
93 struct device *dma_dev; 93 struct device *dma_dev;
94 enum sh_dmae_slave_chan_id slave_tx; 94 unsigned int slave_tx;
95 enum sh_dmae_slave_chan_id slave_rx; 95 unsigned int slave_rx;
96 struct dma_async_tx_descriptor *desc_tx; 96 struct dma_async_tx_descriptor *desc_tx;
97 struct dma_async_tx_descriptor *desc_rx[2]; 97 struct dma_async_tx_descriptor *desc_rx[2];
98 dma_cookie_t cookie_tx; 98 dma_cookie_t cookie_tx;
@@ -107,6 +107,7 @@ struct sci_port {
107 struct work_struct work_tx; 107 struct work_struct work_tx;
108 struct work_struct work_rx; 108 struct work_struct work_rx;
109 struct timer_list rx_timer; 109 struct timer_list rx_timer;
110 unsigned int rx_timeout;
110#endif 111#endif
111}; 112};
112 113
@@ -674,22 +675,22 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
674 struct sci_port *s = to_sci_port(port); 675 struct sci_port *s = to_sci_port(port);
675 676
676 if (s->chan_rx) { 677 if (s->chan_rx) {
677 unsigned long tout;
678 u16 scr = sci_in(port, SCSCR); 678 u16 scr = sci_in(port, SCSCR);
679 u16 ssr = sci_in(port, SCxSR); 679 u16 ssr = sci_in(port, SCxSR);
680 680
681 /* Disable future Rx interrupts */ 681 /* Disable future Rx interrupts */
682 sci_out(port, SCSCR, scr & ~SCI_CTRL_FLAGS_RIE); 682 if (port->type == PORT_SCIFA) {
683 disable_irq_nosync(irq);
684 scr |= 0x4000;
685 } else {
686 scr &= ~SCI_CTRL_FLAGS_RIE;
687 }
688 sci_out(port, SCSCR, scr);
683 /* Clear current interrupt */ 689 /* Clear current interrupt */
684 sci_out(port, SCxSR, ssr & ~(1 | SCxSR_RDxF(port))); 690 sci_out(port, SCxSR, ssr & ~(1 | SCxSR_RDxF(port)));
685 /* Calculate delay for 1.5 DMA buffers */ 691 dev_dbg(port->dev, "Rx IRQ %lu: setup t-out in %u jiffies\n",
686 tout = (port->timeout - HZ / 50) * s->buf_len_rx * 3 / 692 jiffies, s->rx_timeout);
687 port->fifosize / 2; 693 mod_timer(&s->rx_timer, jiffies + s->rx_timeout);
688 dev_dbg(port->dev, "Rx IRQ: setup timeout in %lu ms\n",
689 tout * 1000 / HZ);
690 if (tout < 2)
691 tout = 2;
692 mod_timer(&s->rx_timer, jiffies + tout);
693 694
694 return IRQ_HANDLED; 695 return IRQ_HANDLED;
695 } 696 }
@@ -799,7 +800,7 @@ static int sci_notifier(struct notifier_block *self,
799 (phase == CPUFREQ_RESUMECHANGE)) { 800 (phase == CPUFREQ_RESUMECHANGE)) {
800 spin_lock_irqsave(&priv->lock, flags); 801 spin_lock_irqsave(&priv->lock, flags);
801 list_for_each_entry(sci_port, &priv->ports, node) 802 list_for_each_entry(sci_port, &priv->ports, node)
802 sci_port->port.uartclk = clk_get_rate(sci_port->dclk); 803 sci_port->port.uartclk = clk_get_rate(sci_port->iclk);
803 spin_unlock_irqrestore(&priv->lock, flags); 804 spin_unlock_irqrestore(&priv->lock, flags);
804 } 805 }
805 806
@@ -810,21 +811,17 @@ static void sci_clk_enable(struct uart_port *port)
810{ 811{
811 struct sci_port *sci_port = to_sci_port(port); 812 struct sci_port *sci_port = to_sci_port(port);
812 813
813 clk_enable(sci_port->dclk); 814 clk_enable(sci_port->iclk);
814 sci_port->port.uartclk = clk_get_rate(sci_port->dclk); 815 sci_port->port.uartclk = clk_get_rate(sci_port->iclk);
815 816 clk_enable(sci_port->fclk);
816 if (sci_port->iclk)
817 clk_enable(sci_port->iclk);
818} 817}
819 818
820static void sci_clk_disable(struct uart_port *port) 819static void sci_clk_disable(struct uart_port *port)
821{ 820{
822 struct sci_port *sci_port = to_sci_port(port); 821 struct sci_port *sci_port = to_sci_port(port);
823 822
824 if (sci_port->iclk) 823 clk_disable(sci_port->fclk);
825 clk_disable(sci_port->iclk); 824 clk_disable(sci_port->iclk);
826
827 clk_disable(sci_port->dclk);
828} 825}
829 826
830static int sci_request_irq(struct sci_port *port) 827static int sci_request_irq(struct sci_port *port)
@@ -913,22 +910,26 @@ static void sci_dma_tx_complete(void *arg)
913 910
914 spin_lock_irqsave(&port->lock, flags); 911 spin_lock_irqsave(&port->lock, flags);
915 912
916 xmit->tail += s->sg_tx.length; 913 xmit->tail += sg_dma_len(&s->sg_tx);
917 xmit->tail &= UART_XMIT_SIZE - 1; 914 xmit->tail &= UART_XMIT_SIZE - 1;
918 915
919 port->icount.tx += s->sg_tx.length; 916 port->icount.tx += sg_dma_len(&s->sg_tx);
920 917
921 async_tx_ack(s->desc_tx); 918 async_tx_ack(s->desc_tx);
922 s->cookie_tx = -EINVAL; 919 s->cookie_tx = -EINVAL;
923 s->desc_tx = NULL; 920 s->desc_tx = NULL;
924 921
925 spin_unlock_irqrestore(&port->lock, flags);
926
927 if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) 922 if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
928 uart_write_wakeup(port); 923 uart_write_wakeup(port);
929 924
930 if (uart_circ_chars_pending(xmit)) 925 if (!uart_circ_empty(xmit)) {
931 schedule_work(&s->work_tx); 926 schedule_work(&s->work_tx);
927 } else if (port->type == PORT_SCIFA) {
928 u16 ctrl = sci_in(port, SCSCR);
929 sci_out(port, SCSCR, ctrl & ~SCI_CTRL_FLAGS_TIE);
930 }
931
932 spin_unlock_irqrestore(&port->lock, flags);
932} 933}
933 934
934/* Locking: called with port lock held */ 935/* Locking: called with port lock held */
@@ -972,13 +973,13 @@ static void sci_dma_rx_complete(void *arg)
972 unsigned long flags; 973 unsigned long flags;
973 int count; 974 int count;
974 975
975 dev_dbg(port->dev, "%s(%d)\n", __func__, port->line); 976 dev_dbg(port->dev, "%s(%d) active #%d\n", __func__, port->line, s->active_rx);
976 977
977 spin_lock_irqsave(&port->lock, flags); 978 spin_lock_irqsave(&port->lock, flags);
978 979
979 count = sci_dma_rx_push(s, tty, s->buf_len_rx); 980 count = sci_dma_rx_push(s, tty, s->buf_len_rx);
980 981
981 mod_timer(&s->rx_timer, jiffies + msecs_to_jiffies(5)); 982 mod_timer(&s->rx_timer, jiffies + s->rx_timeout);
982 983
983 spin_unlock_irqrestore(&port->lock, flags); 984 spin_unlock_irqrestore(&port->lock, flags);
984 985
@@ -1050,6 +1051,8 @@ static void sci_submit_rx(struct sci_port *s)
1050 sci_rx_dma_release(s, true); 1051 sci_rx_dma_release(s, true);
1051 return; 1052 return;
1052 } 1053 }
1054 dev_dbg(s->port.dev, "%s(): cookie %d to #%d\n", __func__,
1055 s->cookie_rx[i], i);
1053 } 1056 }
1054 1057
1055 s->active_rx = s->cookie_rx[0]; 1058 s->active_rx = s->cookie_rx[0];
@@ -1107,10 +1110,10 @@ static void work_fn_rx(struct work_struct *work)
1107 return; 1110 return;
1108 } 1111 }
1109 1112
1110 dev_dbg(port->dev, "%s: cookie %d #%d\n", __func__,
1111 s->cookie_rx[new], new);
1112
1113 s->active_rx = s->cookie_rx[!new]; 1113 s->active_rx = s->cookie_rx[!new];
1114
1115 dev_dbg(port->dev, "%s: cookie %d #%d, new active #%d\n", __func__,
1116 s->cookie_rx[new], new, s->active_rx);
1114} 1117}
1115 1118
1116static void work_fn_tx(struct work_struct *work) 1119static void work_fn_tx(struct work_struct *work)
@@ -1131,14 +1134,13 @@ static void work_fn_tx(struct work_struct *work)
1131 */ 1134 */
1132 spin_lock_irq(&port->lock); 1135 spin_lock_irq(&port->lock);
1133 sg->offset = xmit->tail & (UART_XMIT_SIZE - 1); 1136 sg->offset = xmit->tail & (UART_XMIT_SIZE - 1);
1134 sg->dma_address = (sg_dma_address(sg) & ~(UART_XMIT_SIZE - 1)) + 1137 sg_dma_address(sg) = (sg_dma_address(sg) & ~(UART_XMIT_SIZE - 1)) +
1135 sg->offset; 1138 sg->offset;
1136 sg->length = min((int)CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE), 1139 sg_dma_len(sg) = min((int)CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE),
1137 CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE)); 1140 CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE));
1138 sg->dma_length = sg->length;
1139 spin_unlock_irq(&port->lock); 1141 spin_unlock_irq(&port->lock);
1140 1142
1141 BUG_ON(!sg->length); 1143 BUG_ON(!sg_dma_len(sg));
1142 1144
1143 desc = chan->device->device_prep_slave_sg(chan, 1145 desc = chan->device->device_prep_slave_sg(chan,
1144 sg, s->sg_len_tx, DMA_TO_DEVICE, 1146 sg, s->sg_len_tx, DMA_TO_DEVICE,
@@ -1173,23 +1175,28 @@ static void work_fn_tx(struct work_struct *work)
1173 1175
1174static void sci_start_tx(struct uart_port *port) 1176static void sci_start_tx(struct uart_port *port)
1175{ 1177{
1178 struct sci_port *s = to_sci_port(port);
1176 unsigned short ctrl; 1179 unsigned short ctrl;
1177 1180
1178#ifdef CONFIG_SERIAL_SH_SCI_DMA 1181#ifdef CONFIG_SERIAL_SH_SCI_DMA
1179 struct sci_port *s = to_sci_port(port); 1182 if (port->type == PORT_SCIFA) {
1180 1183 u16 new, scr = sci_in(port, SCSCR);
1181 if (s->chan_tx) { 1184 if (s->chan_tx)
1182 if (!uart_circ_empty(&s->port.state->xmit) && s->cookie_tx < 0) 1185 new = scr | 0x8000;
1183 schedule_work(&s->work_tx); 1186 else
1184 1187 new = scr & ~0x8000;
1185 return; 1188 if (new != scr)
1189 sci_out(port, SCSCR, new);
1186 } 1190 }
1191 if (s->chan_tx && !uart_circ_empty(&s->port.state->xmit) &&
1192 s->cookie_tx < 0)
1193 schedule_work(&s->work_tx);
1187#endif 1194#endif
1188 1195 if (!s->chan_tx || port->type == PORT_SCIFA) {
1189 /* Set TIE (Transmit Interrupt Enable) bit in SCSCR */ 1196 /* Set TIE (Transmit Interrupt Enable) bit in SCSCR */
1190 ctrl = sci_in(port, SCSCR); 1197 ctrl = sci_in(port, SCSCR);
1191 ctrl |= SCI_CTRL_FLAGS_TIE; 1198 sci_out(port, SCSCR, ctrl | SCI_CTRL_FLAGS_TIE);
1192 sci_out(port, SCSCR, ctrl); 1199 }
1193} 1200}
1194 1201
1195static void sci_stop_tx(struct uart_port *port) 1202static void sci_stop_tx(struct uart_port *port)
@@ -1198,6 +1205,8 @@ static void sci_stop_tx(struct uart_port *port)
1198 1205
1199 /* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */ 1206 /* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */
1200 ctrl = sci_in(port, SCSCR); 1207 ctrl = sci_in(port, SCSCR);
1208 if (port->type == PORT_SCIFA)
1209 ctrl &= ~0x8000;
1201 ctrl &= ~SCI_CTRL_FLAGS_TIE; 1210 ctrl &= ~SCI_CTRL_FLAGS_TIE;
1202 sci_out(port, SCSCR, ctrl); 1211 sci_out(port, SCSCR, ctrl);
1203} 1212}
@@ -1208,6 +1217,8 @@ static void sci_start_rx(struct uart_port *port)
1208 1217
1209 /* Set RIE (Receive Interrupt Enable) bit in SCSCR */ 1218 /* Set RIE (Receive Interrupt Enable) bit in SCSCR */
1210 ctrl |= sci_in(port, SCSCR); 1219 ctrl |= sci_in(port, SCSCR);
1220 if (port->type == PORT_SCIFA)
1221 ctrl &= ~0x4000;
1211 sci_out(port, SCSCR, ctrl); 1222 sci_out(port, SCSCR, ctrl);
1212} 1223}
1213 1224
@@ -1217,6 +1228,8 @@ static void sci_stop_rx(struct uart_port *port)
1217 1228
1218 /* Clear RIE (Receive Interrupt Enable) bit in SCSCR */ 1229 /* Clear RIE (Receive Interrupt Enable) bit in SCSCR */
1219 ctrl = sci_in(port, SCSCR); 1230 ctrl = sci_in(port, SCSCR);
1231 if (port->type == PORT_SCIFA)
1232 ctrl &= ~0x4000;
1220 ctrl &= ~(SCI_CTRL_FLAGS_RIE | SCI_CTRL_FLAGS_REIE); 1233 ctrl &= ~(SCI_CTRL_FLAGS_RIE | SCI_CTRL_FLAGS_REIE);
1221 sci_out(port, SCSCR, ctrl); 1234 sci_out(port, SCSCR, ctrl);
1222} 1235}
@@ -1251,8 +1264,12 @@ static void rx_timer_fn(unsigned long arg)
1251{ 1264{
1252 struct sci_port *s = (struct sci_port *)arg; 1265 struct sci_port *s = (struct sci_port *)arg;
1253 struct uart_port *port = &s->port; 1266 struct uart_port *port = &s->port;
1254
1255 u16 scr = sci_in(port, SCSCR); 1267 u16 scr = sci_in(port, SCSCR);
1268
1269 if (port->type == PORT_SCIFA) {
1270 scr &= ~0x4000;
1271 enable_irq(s->irqs[1]);
1272 }
1256 sci_out(port, SCSCR, scr | SCI_CTRL_FLAGS_RIE); 1273 sci_out(port, SCSCR, scr | SCI_CTRL_FLAGS_RIE);
1257 dev_dbg(port->dev, "DMA Rx timed out\n"); 1274 dev_dbg(port->dev, "DMA Rx timed out\n");
1258 schedule_work(&s->work_rx); 1275 schedule_work(&s->work_rx);
@@ -1339,8 +1356,7 @@ static void sci_request_dma(struct uart_port *port)
1339 sg_init_table(sg, 1); 1356 sg_init_table(sg, 1);
1340 sg_set_page(sg, virt_to_page(buf[i]), s->buf_len_rx, 1357 sg_set_page(sg, virt_to_page(buf[i]), s->buf_len_rx,
1341 (int)buf[i] & ~PAGE_MASK); 1358 (int)buf[i] & ~PAGE_MASK);
1342 sg->dma_address = dma[i]; 1359 sg_dma_address(sg) = dma[i];
1343 sg->dma_length = sg->length;
1344 } 1360 }
1345 1361
1346 INIT_WORK(&s->work_rx, work_fn_rx); 1362 INIT_WORK(&s->work_rx, work_fn_rx);
@@ -1403,8 +1419,12 @@ static void sci_shutdown(struct uart_port *port)
1403static void sci_set_termios(struct uart_port *port, struct ktermios *termios, 1419static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
1404 struct ktermios *old) 1420 struct ktermios *old)
1405{ 1421{
1422#ifdef CONFIG_SERIAL_SH_SCI_DMA
1423 struct sci_port *s = to_sci_port(port);
1424#endif
1406 unsigned int status, baud, smr_val, max_baud; 1425 unsigned int status, baud, smr_val, max_baud;
1407 int t = -1; 1426 int t = -1;
1427 u16 scfcr = 0;
1408 1428
1409 /* 1429 /*
1410 * earlyprintk comes here early on with port->uartclk set to zero. 1430 * earlyprintk comes here early on with port->uartclk set to zero.
@@ -1427,7 +1447,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
1427 sci_out(port, SCSCR, 0x00); /* TE=0, RE=0, CKE1=0 */ 1447 sci_out(port, SCSCR, 0x00); /* TE=0, RE=0, CKE1=0 */
1428 1448
1429 if (port->type != PORT_SCI) 1449 if (port->type != PORT_SCI)
1430 sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST); 1450 sci_out(port, SCFCR, scfcr | SCFCR_RFRST | SCFCR_TFRST);
1431 1451
1432 smr_val = sci_in(port, SCSMR) & 3; 1452 smr_val = sci_in(port, SCSMR) & 3;
1433 if ((termios->c_cflag & CSIZE) == CS7) 1453 if ((termios->c_cflag & CSIZE) == CS7)
@@ -1458,10 +1478,32 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
1458 } 1478 }
1459 1479
1460 sci_init_pins(port, termios->c_cflag); 1480 sci_init_pins(port, termios->c_cflag);
1461 sci_out(port, SCFCR, (termios->c_cflag & CRTSCTS) ? SCFCR_MCE : 0); 1481 sci_out(port, SCFCR, scfcr | ((termios->c_cflag & CRTSCTS) ? SCFCR_MCE : 0));
1462 1482
1463 sci_out(port, SCSCR, SCSCR_INIT(port)); 1483 sci_out(port, SCSCR, SCSCR_INIT(port));
1464 1484
1485#ifdef CONFIG_SERIAL_SH_SCI_DMA
1486 /*
1487 * Calculate delay for 1.5 DMA buffers: see
1488 * drivers/serial/serial_core.c::uart_update_timeout(). With 10 bits
1489 * (CS8), 250Hz, 115200 baud and 64 bytes FIFO, the above function
1490 * calculates 1 jiffie for the data plus 5 jiffies for the "slop(e)."
1491 * Then below we calculate 3 jiffies (12ms) for 1.5 DMA buffers (3 FIFO
1492 * sizes), but it has been found out experimentally, that this is not
1493 * enough: the driver too often needlessly runs on a DMA timeout. 20ms
1494 * as a minimum seem to work perfectly.
1495 */
1496 if (s->chan_rx) {
1497 s->rx_timeout = (port->timeout - HZ / 50) * s->buf_len_rx * 3 /
1498 port->fifosize / 2;
1499 dev_dbg(port->dev,
1500 "DMA Rx t-out %ums, tty t-out %u jiffies\n",
1501 s->rx_timeout * 1000 / HZ, port->timeout);
1502 if (s->rx_timeout < msecs_to_jiffies(20))
1503 s->rx_timeout = msecs_to_jiffies(20);
1504 }
1505#endif
1506
1465 if ((termios->c_cflag & CREAD) != 0) 1507 if ((termios->c_cflag & CREAD) != 0)
1466 sci_start_rx(port); 1508 sci_start_rx(port);
1467} 1509}
@@ -1553,10 +1595,10 @@ static struct uart_ops sci_uart_ops = {
1553#endif 1595#endif
1554}; 1596};
1555 1597
1556static void __devinit sci_init_single(struct platform_device *dev, 1598static int __devinit sci_init_single(struct platform_device *dev,
1557 struct sci_port *sci_port, 1599 struct sci_port *sci_port,
1558 unsigned int index, 1600 unsigned int index,
1559 struct plat_sci_port *p) 1601 struct plat_sci_port *p)
1560{ 1602{
1561 struct uart_port *port = &sci_port->port; 1603 struct uart_port *port = &sci_port->port;
1562 1604
@@ -1577,8 +1619,23 @@ static void __devinit sci_init_single(struct platform_device *dev,
1577 } 1619 }
1578 1620
1579 if (dev) { 1621 if (dev) {
1580 sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL; 1622 sci_port->iclk = clk_get(&dev->dev, "sci_ick");
1581 sci_port->dclk = clk_get(&dev->dev, "peripheral_clk"); 1623 if (IS_ERR(sci_port->iclk)) {
1624 sci_port->iclk = clk_get(&dev->dev, "peripheral_clk");
1625 if (IS_ERR(sci_port->iclk)) {
1626 dev_err(&dev->dev, "can't get iclk\n");
1627 return PTR_ERR(sci_port->iclk);
1628 }
1629 }
1630
1631 /*
1632 * The function clock is optional, ignore it if we can't
1633 * find it.
1634 */
1635 sci_port->fclk = clk_get(&dev->dev, "sci_fck");
1636 if (IS_ERR(sci_port->fclk))
1637 sci_port->fclk = NULL;
1638
1582 sci_port->enable = sci_clk_enable; 1639 sci_port->enable = sci_clk_enable;
1583 sci_port->disable = sci_clk_disable; 1640 sci_port->disable = sci_clk_disable;
1584 port->dev = &dev->dev; 1641 port->dev = &dev->dev;
@@ -1605,6 +1662,7 @@ static void __devinit sci_init_single(struct platform_device *dev,
1605#endif 1662#endif
1606 1663
1607 memcpy(&sci_port->irqs, &p->irqs, sizeof(p->irqs)); 1664 memcpy(&sci_port->irqs, &p->irqs, sizeof(p->irqs));
1665 return 0;
1608} 1666}
1609 1667
1610#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE 1668#ifdef CONFIG_SERIAL_SH_SCI_CONSOLE
@@ -1754,8 +1812,11 @@ static int sci_remove(struct platform_device *dev)
1754 cpufreq_unregister_notifier(&priv->clk_nb, CPUFREQ_TRANSITION_NOTIFIER); 1812 cpufreq_unregister_notifier(&priv->clk_nb, CPUFREQ_TRANSITION_NOTIFIER);
1755 1813
1756 spin_lock_irqsave(&priv->lock, flags); 1814 spin_lock_irqsave(&priv->lock, flags);
1757 list_for_each_entry(p, &priv->ports, node) 1815 list_for_each_entry(p, &priv->ports, node) {
1758 uart_remove_one_port(&sci_uart_driver, &p->port); 1816 uart_remove_one_port(&sci_uart_driver, &p->port);
1817 clk_put(p->iclk);
1818 clk_put(p->fclk);
1819 }
1759 spin_unlock_irqrestore(&priv->lock, flags); 1820 spin_unlock_irqrestore(&priv->lock, flags);
1760 1821
1761 kfree(priv); 1822 kfree(priv);
@@ -1781,7 +1842,9 @@ static int __devinit sci_probe_single(struct platform_device *dev,
1781 return 0; 1842 return 0;
1782 } 1843 }
1783 1844
1784 sci_init_single(dev, sciport, index, p); 1845 ret = sci_init_single(dev, sciport, index, p);
1846 if (ret)
1847 return ret;
1785 1848
1786 ret = uart_add_one_port(&sci_uart_driver, &sciport->port); 1849 ret = uart_add_one_port(&sci_uart_driver, &sciport->port);
1787 if (ret) 1850 if (ret)
diff --git a/drivers/sh/Kconfig b/drivers/sh/Kconfig
new file mode 100644
index 00000000000..a54de0b9b3d
--- /dev/null
+++ b/drivers/sh/Kconfig
@@ -0,0 +1,24 @@
1config INTC_USERIMASK
2 bool "Userspace interrupt masking support"
3 depends on ARCH_SHMOBILE || (SUPERH && CPU_SH4A)
4 help
5 This enables support for hardware-assisted userspace hardirq
6 masking.
7
8 SH-4A and newer interrupt blocks all support a special shadowed
9 page with all non-masking registers obscured when mapped in to
10 userspace. This is primarily for use by userspace device
11 drivers that are using special priority levels.
12
13 If in doubt, say N.
14
15config INTC_BALANCING
16 bool "Hardware IRQ balancing support"
17 depends on SMP && SUPERH && CPU_SUBTYPE_SH7786
18 help
19 This enables support for IRQ auto-distribution mode on SH-X3
20 SMP parts. All of the balancing and CPU wakeup decisions are
21 taken care of automatically by hardware for distributed
22 vectors.
23
24 If in doubt, say N.
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile
index 4956bf1f213..78bb5127abd 100644
--- a/drivers/sh/Makefile
+++ b/drivers/sh/Makefile
@@ -4,4 +4,6 @@
4obj-$(CONFIG_SUPERHYWAY) += superhyway/ 4obj-$(CONFIG_SUPERHYWAY) += superhyway/
5obj-$(CONFIG_MAPLE) += maple/ 5obj-$(CONFIG_MAPLE) += maple/
6obj-$(CONFIG_GENERIC_GPIO) += pfc.o 6obj-$(CONFIG_GENERIC_GPIO) += pfc.o
7obj-$(CONFIG_SUPERH) += clk.o
8obj-$(CONFIG_SH_CLK_CPG) += clk-cpg.o
7obj-y += intc.o 9obj-y += intc.o
diff --git a/drivers/sh/clk-cpg.c b/drivers/sh/clk-cpg.c
new file mode 100644
index 00000000000..f5c80ba9ab1
--- /dev/null
+++ b/drivers/sh/clk-cpg.c
@@ -0,0 +1,298 @@
1#include <linux/clk.h>
2#include <linux/compiler.h>
3#include <linux/slab.h>
4#include <linux/io.h>
5#include <linux/sh_clk.h>
6
7static int sh_clk_mstp32_enable(struct clk *clk)
8{
9 __raw_writel(__raw_readl(clk->enable_reg) & ~(1 << clk->enable_bit),
10 clk->enable_reg);
11 return 0;
12}
13
14static void sh_clk_mstp32_disable(struct clk *clk)
15{
16 __raw_writel(__raw_readl(clk->enable_reg) | (1 << clk->enable_bit),
17 clk->enable_reg);
18}
19
20static struct clk_ops sh_clk_mstp32_clk_ops = {
21 .enable = sh_clk_mstp32_enable,
22 .disable = sh_clk_mstp32_disable,
23 .recalc = followparent_recalc,
24};
25
26int __init sh_clk_mstp32_register(struct clk *clks, int nr)
27{
28 struct clk *clkp;
29 int ret = 0;
30 int k;
31
32 for (k = 0; !ret && (k < nr); k++) {
33 clkp = clks + k;
34 clkp->ops = &sh_clk_mstp32_clk_ops;
35 ret |= clk_register(clkp);
36 }
37
38 return ret;
39}
40
41static long sh_clk_div_round_rate(struct clk *clk, unsigned long rate)
42{
43 return clk_rate_table_round(clk, clk->freq_table, rate);
44}
45
46static int sh_clk_div6_divisors[64] = {
47 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
48 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
49 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
50 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64
51};
52
53static struct clk_div_mult_table sh_clk_div6_table = {
54 .divisors = sh_clk_div6_divisors,
55 .nr_divisors = ARRAY_SIZE(sh_clk_div6_divisors),
56};
57
58static unsigned long sh_clk_div6_recalc(struct clk *clk)
59{
60 struct clk_div_mult_table *table = &sh_clk_div6_table;
61 unsigned int idx;
62
63 clk_rate_table_build(clk, clk->freq_table, table->nr_divisors,
64 table, NULL);
65
66 idx = __raw_readl(clk->enable_reg) & 0x003f;
67
68 return clk->freq_table[idx].frequency;
69}
70
71static int sh_clk_div6_set_rate(struct clk *clk,
72 unsigned long rate, int algo_id)
73{
74 unsigned long value;
75 int idx;
76
77 idx = clk_rate_table_find(clk, clk->freq_table, rate);
78 if (idx < 0)
79 return idx;
80
81 value = __raw_readl(clk->enable_reg);
82 value &= ~0x3f;
83 value |= idx;
84 __raw_writel(value, clk->enable_reg);
85 return 0;
86}
87
88static int sh_clk_div6_enable(struct clk *clk)
89{
90 unsigned long value;
91 int ret;
92
93 ret = sh_clk_div6_set_rate(clk, clk->rate, 0);
94 if (ret == 0) {
95 value = __raw_readl(clk->enable_reg);
96 value &= ~0x100; /* clear stop bit to enable clock */
97 __raw_writel(value, clk->enable_reg);
98 }
99 return ret;
100}
101
102static void sh_clk_div6_disable(struct clk *clk)
103{
104 unsigned long value;
105
106 value = __raw_readl(clk->enable_reg);
107 value |= 0x100; /* stop clock */
108 value |= 0x3f; /* VDIV bits must be non-zero, overwrite divider */
109 __raw_writel(value, clk->enable_reg);
110}
111
112static struct clk_ops sh_clk_div6_clk_ops = {
113 .recalc = sh_clk_div6_recalc,
114 .round_rate = sh_clk_div_round_rate,
115 .set_rate = sh_clk_div6_set_rate,
116 .enable = sh_clk_div6_enable,
117 .disable = sh_clk_div6_disable,
118};
119
120int __init sh_clk_div6_register(struct clk *clks, int nr)
121{
122 struct clk *clkp;
123 void *freq_table;
124 int nr_divs = sh_clk_div6_table.nr_divisors;
125 int freq_table_size = sizeof(struct cpufreq_frequency_table);
126 int ret = 0;
127 int k;
128
129 freq_table_size *= (nr_divs + 1);
130 freq_table = kzalloc(freq_table_size * nr, GFP_KERNEL);
131 if (!freq_table) {
132 pr_err("sh_clk_div6_register: unable to alloc memory\n");
133 return -ENOMEM;
134 }
135
136 for (k = 0; !ret && (k < nr); k++) {
137 clkp = clks + k;
138
139 clkp->ops = &sh_clk_div6_clk_ops;
140 clkp->id = -1;
141 clkp->freq_table = freq_table + (k * freq_table_size);
142 clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END;
143
144 ret = clk_register(clkp);
145 }
146
147 return ret;
148}
149
150static unsigned long sh_clk_div4_recalc(struct clk *clk)
151{
152 struct clk_div4_table *d4t = clk->priv;
153 struct clk_div_mult_table *table = d4t->div_mult_table;
154 unsigned int idx;
155
156 clk_rate_table_build(clk, clk->freq_table, table->nr_divisors,
157 table, &clk->arch_flags);
158
159 idx = (__raw_readl(clk->enable_reg) >> clk->enable_bit) & 0x000f;
160
161 return clk->freq_table[idx].frequency;
162}
163
164static int sh_clk_div4_set_parent(struct clk *clk, struct clk *parent)
165{
166 struct clk_div4_table *d4t = clk->priv;
167 struct clk_div_mult_table *table = d4t->div_mult_table;
168 u32 value;
169 int ret;
170
171 /* we really need a better way to determine parent index, but for
172 * now assume internal parent comes with CLK_ENABLE_ON_INIT set,
173 * no CLK_ENABLE_ON_INIT means external clock...
174 */
175
176 if (parent->flags & CLK_ENABLE_ON_INIT)
177 value = __raw_readl(clk->enable_reg) & ~(1 << 7);
178 else
179 value = __raw_readl(clk->enable_reg) | (1 << 7);
180
181 ret = clk_reparent(clk, parent);
182 if (ret < 0)
183 return ret;
184
185 __raw_writel(value, clk->enable_reg);
186
187 /* Rebiuld the frequency table */
188 clk_rate_table_build(clk, clk->freq_table, table->nr_divisors,
189 table, &clk->arch_flags);
190
191 return 0;
192}
193
194static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate, int algo_id)
195{
196 struct clk_div4_table *d4t = clk->priv;
197 unsigned long value;
198 int idx = clk_rate_table_find(clk, clk->freq_table, rate);
199 if (idx < 0)
200 return idx;
201
202 value = __raw_readl(clk->enable_reg);
203 value &= ~(0xf << clk->enable_bit);
204 value |= (idx << clk->enable_bit);
205 __raw_writel(value, clk->enable_reg);
206
207 if (d4t->kick)
208 d4t->kick(clk);
209
210 return 0;
211}
212
213static int sh_clk_div4_enable(struct clk *clk)
214{
215 __raw_writel(__raw_readl(clk->enable_reg) & ~(1 << 8), clk->enable_reg);
216 return 0;
217}
218
219static void sh_clk_div4_disable(struct clk *clk)
220{
221 __raw_writel(__raw_readl(clk->enable_reg) | (1 << 8), clk->enable_reg);
222}
223
224static struct clk_ops sh_clk_div4_clk_ops = {
225 .recalc = sh_clk_div4_recalc,
226 .set_rate = sh_clk_div4_set_rate,
227 .round_rate = sh_clk_div_round_rate,
228};
229
230static struct clk_ops sh_clk_div4_enable_clk_ops = {
231 .recalc = sh_clk_div4_recalc,
232 .set_rate = sh_clk_div4_set_rate,
233 .round_rate = sh_clk_div_round_rate,
234 .enable = sh_clk_div4_enable,
235 .disable = sh_clk_div4_disable,
236};
237
238static struct clk_ops sh_clk_div4_reparent_clk_ops = {
239 .recalc = sh_clk_div4_recalc,
240 .set_rate = sh_clk_div4_set_rate,
241 .round_rate = sh_clk_div_round_rate,
242 .enable = sh_clk_div4_enable,
243 .disable = sh_clk_div4_disable,
244 .set_parent = sh_clk_div4_set_parent,
245};
246
247static int __init sh_clk_div4_register_ops(struct clk *clks, int nr,
248 struct clk_div4_table *table, struct clk_ops *ops)
249{
250 struct clk *clkp;
251 void *freq_table;
252 int nr_divs = table->div_mult_table->nr_divisors;
253 int freq_table_size = sizeof(struct cpufreq_frequency_table);
254 int ret = 0;
255 int k;
256
257 freq_table_size *= (nr_divs + 1);
258 freq_table = kzalloc(freq_table_size * nr, GFP_KERNEL);
259 if (!freq_table) {
260 pr_err("sh_clk_div4_register: unable to alloc memory\n");
261 return -ENOMEM;
262 }
263
264 for (k = 0; !ret && (k < nr); k++) {
265 clkp = clks + k;
266
267 clkp->ops = ops;
268 clkp->id = -1;
269 clkp->priv = table;
270
271 clkp->freq_table = freq_table + (k * freq_table_size);
272 clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END;
273
274 ret = clk_register(clkp);
275 }
276
277 return ret;
278}
279
280int __init sh_clk_div4_register(struct clk *clks, int nr,
281 struct clk_div4_table *table)
282{
283 return sh_clk_div4_register_ops(clks, nr, table, &sh_clk_div4_clk_ops);
284}
285
286int __init sh_clk_div4_enable_register(struct clk *clks, int nr,
287 struct clk_div4_table *table)
288{
289 return sh_clk_div4_register_ops(clks, nr, table,
290 &sh_clk_div4_enable_clk_ops);
291}
292
293int __init sh_clk_div4_reparent_register(struct clk *clks, int nr,
294 struct clk_div4_table *table)
295{
296 return sh_clk_div4_register_ops(clks, nr, table,
297 &sh_clk_div4_reparent_clk_ops);
298}
diff --git a/drivers/sh/clk.c b/drivers/sh/clk.c
new file mode 100644
index 00000000000..5d84adac9ec
--- /dev/null
+++ b/drivers/sh/clk.c
@@ -0,0 +1,545 @@
1/*
2 * drivers/sh/clk.c - SuperH clock framework
3 *
4 * Copyright (C) 2005 - 2009 Paul Mundt
5 *
6 * This clock framework is derived from the OMAP version by:
7 *
8 * Copyright (C) 2004 - 2008 Nokia Corporation
9 * Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>
10 *
11 * Modified for omap shared clock framework by Tony Lindgren <tony@atomide.com>
12 *
13 * This file is subject to the terms and conditions of the GNU General Public
14 * License. See the file "COPYING" in the main directory of this archive
15 * for more details.
16 */
17#include <linux/kernel.h>
18#include <linux/init.h>
19#include <linux/module.h>
20#include <linux/mutex.h>
21#include <linux/list.h>
22#include <linux/kobject.h>
23#include <linux/sysdev.h>
24#include <linux/seq_file.h>
25#include <linux/err.h>
26#include <linux/platform_device.h>
27#include <linux/debugfs.h>
28#include <linux/cpufreq.h>
29#include <linux/clk.h>
30#include <linux/sh_clk.h>
31
32static LIST_HEAD(clock_list);
33static DEFINE_SPINLOCK(clock_lock);
34static DEFINE_MUTEX(clock_list_sem);
35
36void clk_rate_table_build(struct clk *clk,
37 struct cpufreq_frequency_table *freq_table,
38 int nr_freqs,
39 struct clk_div_mult_table *src_table,
40 unsigned long *bitmap)
41{
42 unsigned long mult, div;
43 unsigned long freq;
44 int i;
45
46 for (i = 0; i < nr_freqs; i++) {
47 div = 1;
48 mult = 1;
49
50 if (src_table->divisors && i < src_table->nr_divisors)
51 div = src_table->divisors[i];
52
53 if (src_table->multipliers && i < src_table->nr_multipliers)
54 mult = src_table->multipliers[i];
55
56 if (!div || !mult || (bitmap && !test_bit(i, bitmap)))
57 freq = CPUFREQ_ENTRY_INVALID;
58 else
59 freq = clk->parent->rate * mult / div;
60
61 freq_table[i].index = i;
62 freq_table[i].frequency = freq;
63 }
64
65 /* Termination entry */
66 freq_table[i].index = i;
67 freq_table[i].frequency = CPUFREQ_TABLE_END;
68}
69
70long clk_rate_table_round(struct clk *clk,
71 struct cpufreq_frequency_table *freq_table,
72 unsigned long rate)
73{
74 unsigned long rate_error, rate_error_prev = ~0UL;
75 unsigned long rate_best_fit = rate;
76 unsigned long highest, lowest;
77 int i;
78
79 highest = lowest = 0;
80
81 for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
82 unsigned long freq = freq_table[i].frequency;
83
84 if (freq == CPUFREQ_ENTRY_INVALID)
85 continue;
86
87 if (freq > highest)
88 highest = freq;
89 if (freq < lowest)
90 lowest = freq;
91
92 rate_error = abs(freq - rate);
93 if (rate_error < rate_error_prev) {
94 rate_best_fit = freq;
95 rate_error_prev = rate_error;
96 }
97
98 if (rate_error == 0)
99 break;
100 }
101
102 if (rate >= highest)
103 rate_best_fit = highest;
104 if (rate <= lowest)
105 rate_best_fit = lowest;
106
107 return rate_best_fit;
108}
109
110int clk_rate_table_find(struct clk *clk,
111 struct cpufreq_frequency_table *freq_table,
112 unsigned long rate)
113{
114 int i;
115
116 for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
117 unsigned long freq = freq_table[i].frequency;
118
119 if (freq == CPUFREQ_ENTRY_INVALID)
120 continue;
121
122 if (freq == rate)
123 return i;
124 }
125
126 return -ENOENT;
127}
128
129/* Used for clocks that always have same value as the parent clock */
130unsigned long followparent_recalc(struct clk *clk)
131{
132 return clk->parent ? clk->parent->rate : 0;
133}
134
135int clk_reparent(struct clk *child, struct clk *parent)
136{
137 list_del_init(&child->sibling);
138 if (parent)
139 list_add(&child->sibling, &parent->children);
140 child->parent = parent;
141
142 /* now do the debugfs renaming to reattach the child
143 to the proper parent */
144
145 return 0;
146}
147
148/* Propagate rate to children */
149void propagate_rate(struct clk *tclk)
150{
151 struct clk *clkp;
152
153 list_for_each_entry(clkp, &tclk->children, sibling) {
154 if (clkp->ops && clkp->ops->recalc)
155 clkp->rate = clkp->ops->recalc(clkp);
156
157 propagate_rate(clkp);
158 }
159}
160
161static void __clk_disable(struct clk *clk)
162{
163 if (WARN(!clk->usecount, "Trying to disable clock %s with 0 usecount\n",
164 clk->name))
165 return;
166
167 if (!(--clk->usecount)) {
168 if (likely(clk->ops && clk->ops->disable))
169 clk->ops->disable(clk);
170 if (likely(clk->parent))
171 __clk_disable(clk->parent);
172 }
173}
174
175void clk_disable(struct clk *clk)
176{
177 unsigned long flags;
178
179 if (!clk)
180 return;
181
182 spin_lock_irqsave(&clock_lock, flags);
183 __clk_disable(clk);
184 spin_unlock_irqrestore(&clock_lock, flags);
185}
186EXPORT_SYMBOL_GPL(clk_disable);
187
188static int __clk_enable(struct clk *clk)
189{
190 int ret = 0;
191
192 if (clk->usecount++ == 0) {
193 if (clk->parent) {
194 ret = __clk_enable(clk->parent);
195 if (unlikely(ret))
196 goto err;
197 }
198
199 if (clk->ops && clk->ops->enable) {
200 ret = clk->ops->enable(clk);
201 if (ret) {
202 if (clk->parent)
203 __clk_disable(clk->parent);
204 goto err;
205 }
206 }
207 }
208
209 return ret;
210err:
211 clk->usecount--;
212 return ret;
213}
214
215int clk_enable(struct clk *clk)
216{
217 unsigned long flags;
218 int ret;
219
220 if (!clk)
221 return -EINVAL;
222
223 spin_lock_irqsave(&clock_lock, flags);
224 ret = __clk_enable(clk);
225 spin_unlock_irqrestore(&clock_lock, flags);
226
227 return ret;
228}
229EXPORT_SYMBOL_GPL(clk_enable);
230
231static LIST_HEAD(root_clks);
232
233/**
234 * recalculate_root_clocks - recalculate and propagate all root clocks
235 *
236 * Recalculates all root clocks (clocks with no parent), which if the
237 * clock's .recalc is set correctly, should also propagate their rates.
238 * Called at init.
239 */
240void recalculate_root_clocks(void)
241{
242 struct clk *clkp;
243
244 list_for_each_entry(clkp, &root_clks, sibling) {
245 if (clkp->ops && clkp->ops->recalc)
246 clkp->rate = clkp->ops->recalc(clkp);
247 propagate_rate(clkp);
248 }
249}
250
251int clk_register(struct clk *clk)
252{
253 if (clk == NULL || IS_ERR(clk))
254 return -EINVAL;
255
256 /*
257 * trap out already registered clocks
258 */
259 if (clk->node.next || clk->node.prev)
260 return 0;
261
262 mutex_lock(&clock_list_sem);
263
264 INIT_LIST_HEAD(&clk->children);
265 clk->usecount = 0;
266
267 if (clk->parent)
268 list_add(&clk->sibling, &clk->parent->children);
269 else
270 list_add(&clk->sibling, &root_clks);
271
272 list_add(&clk->node, &clock_list);
273 if (clk->ops && clk->ops->init)
274 clk->ops->init(clk);
275 mutex_unlock(&clock_list_sem);
276
277 return 0;
278}
279EXPORT_SYMBOL_GPL(clk_register);
280
281void clk_unregister(struct clk *clk)
282{
283 mutex_lock(&clock_list_sem);
284 list_del(&clk->sibling);
285 list_del(&clk->node);
286 mutex_unlock(&clock_list_sem);
287}
288EXPORT_SYMBOL_GPL(clk_unregister);
289
290void clk_enable_init_clocks(void)
291{
292 struct clk *clkp;
293
294 list_for_each_entry(clkp, &clock_list, node)
295 if (clkp->flags & CLK_ENABLE_ON_INIT)
296 clk_enable(clkp);
297}
298
299unsigned long clk_get_rate(struct clk *clk)
300{
301 return clk->rate;
302}
303EXPORT_SYMBOL_GPL(clk_get_rate);
304
305int clk_set_rate(struct clk *clk, unsigned long rate)
306{
307 return clk_set_rate_ex(clk, rate, 0);
308}
309EXPORT_SYMBOL_GPL(clk_set_rate);
310
311int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id)
312{
313 int ret = -EOPNOTSUPP;
314 unsigned long flags;
315
316 spin_lock_irqsave(&clock_lock, flags);
317
318 if (likely(clk->ops && clk->ops->set_rate)) {
319 ret = clk->ops->set_rate(clk, rate, algo_id);
320 if (ret != 0)
321 goto out_unlock;
322 } else {
323 clk->rate = rate;
324 ret = 0;
325 }
326
327 if (clk->ops && clk->ops->recalc)
328 clk->rate = clk->ops->recalc(clk);
329
330 propagate_rate(clk);
331
332out_unlock:
333 spin_unlock_irqrestore(&clock_lock, flags);
334
335 return ret;
336}
337EXPORT_SYMBOL_GPL(clk_set_rate_ex);
338
339int clk_set_parent(struct clk *clk, struct clk *parent)
340{
341 unsigned long flags;
342 int ret = -EINVAL;
343
344 if (!parent || !clk)
345 return ret;
346 if (clk->parent == parent)
347 return 0;
348
349 spin_lock_irqsave(&clock_lock, flags);
350 if (clk->usecount == 0) {
351 if (clk->ops->set_parent)
352 ret = clk->ops->set_parent(clk, parent);
353 else
354 ret = clk_reparent(clk, parent);
355
356 if (ret == 0) {
357 pr_debug("clock: set parent of %s to %s (new rate %ld)\n",
358 clk->name, clk->parent->name, clk->rate);
359 if (clk->ops->recalc)
360 clk->rate = clk->ops->recalc(clk);
361 propagate_rate(clk);
362 }
363 } else
364 ret = -EBUSY;
365 spin_unlock_irqrestore(&clock_lock, flags);
366
367 return ret;
368}
369EXPORT_SYMBOL_GPL(clk_set_parent);
370
371struct clk *clk_get_parent(struct clk *clk)
372{
373 return clk->parent;
374}
375EXPORT_SYMBOL_GPL(clk_get_parent);
376
377long clk_round_rate(struct clk *clk, unsigned long rate)
378{
379 if (likely(clk->ops && clk->ops->round_rate)) {
380 unsigned long flags, rounded;
381
382 spin_lock_irqsave(&clock_lock, flags);
383 rounded = clk->ops->round_rate(clk, rate);
384 spin_unlock_irqrestore(&clock_lock, flags);
385
386 return rounded;
387 }
388
389 return clk_get_rate(clk);
390}
391EXPORT_SYMBOL_GPL(clk_round_rate);
392
393#ifdef CONFIG_PM
394static int clks_sysdev_suspend(struct sys_device *dev, pm_message_t state)
395{
396 static pm_message_t prev_state;
397 struct clk *clkp;
398
399 switch (state.event) {
400 case PM_EVENT_ON:
401 /* Resumeing from hibernation */
402 if (prev_state.event != PM_EVENT_FREEZE)
403 break;
404
405 list_for_each_entry(clkp, &clock_list, node) {
406 if (likely(clkp->ops)) {
407 unsigned long rate = clkp->rate;
408
409 if (likely(clkp->ops->set_parent))
410 clkp->ops->set_parent(clkp,
411 clkp->parent);
412 if (likely(clkp->ops->set_rate))
413 clkp->ops->set_rate(clkp,
414 rate, NO_CHANGE);
415 else if (likely(clkp->ops->recalc))
416 clkp->rate = clkp->ops->recalc(clkp);
417 }
418 }
419 break;
420 case PM_EVENT_FREEZE:
421 break;
422 case PM_EVENT_SUSPEND:
423 break;
424 }
425
426 prev_state = state;
427 return 0;
428}
429
430static int clks_sysdev_resume(struct sys_device *dev)
431{
432 return clks_sysdev_suspend(dev, PMSG_ON);
433}
434
435static struct sysdev_class clks_sysdev_class = {
436 .name = "clks",
437};
438
439static struct sysdev_driver clks_sysdev_driver = {
440 .suspend = clks_sysdev_suspend,
441 .resume = clks_sysdev_resume,
442};
443
444static struct sys_device clks_sysdev_dev = {
445 .cls = &clks_sysdev_class,
446};
447
448static int __init clk_sysdev_init(void)
449{
450 sysdev_class_register(&clks_sysdev_class);
451 sysdev_driver_register(&clks_sysdev_class, &clks_sysdev_driver);
452 sysdev_register(&clks_sysdev_dev);
453
454 return 0;
455}
456subsys_initcall(clk_sysdev_init);
457#endif
458
459/*
460 * debugfs support to trace clock tree hierarchy and attributes
461 */
462static struct dentry *clk_debugfs_root;
463
464static int clk_debugfs_register_one(struct clk *c)
465{
466 int err;
467 struct dentry *d, *child, *child_tmp;
468 struct clk *pa = c->parent;
469 char s[255];
470 char *p = s;
471
472 p += sprintf(p, "%s", c->name);
473 if (c->id >= 0)
474 sprintf(p, ":%d", c->id);
475 d = debugfs_create_dir(s, pa ? pa->dentry : clk_debugfs_root);
476 if (!d)
477 return -ENOMEM;
478 c->dentry = d;
479
480 d = debugfs_create_u8("usecount", S_IRUGO, c->dentry, (u8 *)&c->usecount);
481 if (!d) {
482 err = -ENOMEM;
483 goto err_out;
484 }
485 d = debugfs_create_u32("rate", S_IRUGO, c->dentry, (u32 *)&c->rate);
486 if (!d) {
487 err = -ENOMEM;
488 goto err_out;
489 }
490 d = debugfs_create_x32("flags", S_IRUGO, c->dentry, (u32 *)&c->flags);
491 if (!d) {
492 err = -ENOMEM;
493 goto err_out;
494 }
495 return 0;
496
497err_out:
498 d = c->dentry;
499 list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child)
500 debugfs_remove(child);
501 debugfs_remove(c->dentry);
502 return err;
503}
504
505static int clk_debugfs_register(struct clk *c)
506{
507 int err;
508 struct clk *pa = c->parent;
509
510 if (pa && !pa->dentry) {
511 err = clk_debugfs_register(pa);
512 if (err)
513 return err;
514 }
515
516 if (!c->dentry && c->name) {
517 err = clk_debugfs_register_one(c);
518 if (err)
519 return err;
520 }
521 return 0;
522}
523
524static int __init clk_debugfs_init(void)
525{
526 struct clk *c;
527 struct dentry *d;
528 int err;
529
530 d = debugfs_create_dir("clock", NULL);
531 if (!d)
532 return -ENOMEM;
533 clk_debugfs_root = d;
534
535 list_for_each_entry(c, &clock_list, node) {
536 err = clk_debugfs_register(c);
537 if (err)
538 goto err_out;
539 }
540 return 0;
541err_out:
542 debugfs_remove_recursive(clk_debugfs_root);
543 return err;
544}
545late_initcall(clk_debugfs_init);
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index 94ad6bd86a0..c585574b9ae 100644
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -28,6 +28,7 @@
28#include <linux/topology.h> 28#include <linux/topology.h>
29#include <linux/bitmap.h> 29#include <linux/bitmap.h>
30#include <linux/cpumask.h> 30#include <linux/cpumask.h>
31#include <asm/sizes.h>
31 32
32#define _INTC_MK(fn, mode, addr_e, addr_d, width, shift) \ 33#define _INTC_MK(fn, mode, addr_e, addr_d, width, shift) \
33 ((shift) | ((width) << 5) | ((fn) << 9) | ((mode) << 13) | \ 34 ((shift) | ((width) << 5) | ((fn) << 9) | ((mode) << 13) | \
@@ -45,6 +46,12 @@ struct intc_handle_int {
45 unsigned long handle; 46 unsigned long handle;
46}; 47};
47 48
49struct intc_window {
50 phys_addr_t phys;
51 void __iomem *virt;
52 unsigned long size;
53};
54
48struct intc_desc_int { 55struct intc_desc_int {
49 struct list_head list; 56 struct list_head list;
50 struct sys_device sysdev; 57 struct sys_device sysdev;
@@ -58,6 +65,8 @@ struct intc_desc_int {
58 unsigned int nr_prio; 65 unsigned int nr_prio;
59 struct intc_handle_int *sense; 66 struct intc_handle_int *sense;
60 unsigned int nr_sense; 67 unsigned int nr_sense;
68 struct intc_window *window;
69 unsigned int nr_windows;
61 struct irq_chip chip; 70 struct irq_chip chip;
62}; 71};
63 72
@@ -87,8 +96,12 @@ static DEFINE_SPINLOCK(vector_lock);
87#define SMP_NR(d, x) 1 96#define SMP_NR(d, x) 1
88#endif 97#endif
89 98
90static unsigned int intc_prio_level[NR_IRQS]; /* for now */ 99static unsigned int intc_prio_level[NR_IRQS]; /* for now */
100static unsigned int default_prio_level = 2; /* 2 - 16 */
91static unsigned long ack_handle[NR_IRQS]; 101static unsigned long ack_handle[NR_IRQS];
102#ifdef CONFIG_INTC_BALANCING
103static unsigned long dist_handle[NR_IRQS];
104#endif
92 105
93static inline struct intc_desc_int *get_intc_desc(unsigned int irq) 106static inline struct intc_desc_int *get_intc_desc(unsigned int irq)
94{ 107{
@@ -96,6 +109,47 @@ static inline struct intc_desc_int *get_intc_desc(unsigned int irq)
96 return container_of(chip, struct intc_desc_int, chip); 109 return container_of(chip, struct intc_desc_int, chip);
97} 110}
98 111
112static unsigned long intc_phys_to_virt(struct intc_desc_int *d,
113 unsigned long address)
114{
115 struct intc_window *window;
116 int k;
117
118 /* scan through physical windows and convert address */
119 for (k = 0; k < d->nr_windows; k++) {
120 window = d->window + k;
121
122 if (address < window->phys)
123 continue;
124
125 if (address >= (window->phys + window->size))
126 continue;
127
128 address -= window->phys;
129 address += (unsigned long)window->virt;
130
131 return address;
132 }
133
134 /* no windows defined, register must be 1:1 mapped virt:phys */
135 return address;
136}
137
138static unsigned int intc_get_reg(struct intc_desc_int *d, unsigned long address)
139{
140 unsigned int k;
141
142 address = intc_phys_to_virt(d, address);
143
144 for (k = 0; k < d->nr_reg; k++) {
145 if (d->reg[k] == address)
146 return k;
147 }
148
149 BUG();
150 return 0;
151}
152
99static inline unsigned int set_field(unsigned int value, 153static inline unsigned int set_field(unsigned int value,
100 unsigned int field_value, 154 unsigned int field_value,
101 unsigned int handle) 155 unsigned int handle)
@@ -229,6 +283,85 @@ static void (*intc_disable_fns[])(unsigned long addr,
229 [MODE_PCLR_REG] = intc_mode_field, 283 [MODE_PCLR_REG] = intc_mode_field,
230}; 284};
231 285
286#ifdef CONFIG_INTC_BALANCING
287static inline void intc_balancing_enable(unsigned int irq)
288{
289 struct intc_desc_int *d = get_intc_desc(irq);
290 unsigned long handle = dist_handle[irq];
291 unsigned long addr;
292
293 if (irq_balancing_disabled(irq) || !handle)
294 return;
295
296 addr = INTC_REG(d, _INTC_ADDR_D(handle), 0);
297 intc_reg_fns[_INTC_FN(handle)](addr, handle, 1);
298}
299
300static inline void intc_balancing_disable(unsigned int irq)
301{
302 struct intc_desc_int *d = get_intc_desc(irq);
303 unsigned long handle = dist_handle[irq];
304 unsigned long addr;
305
306 if (irq_balancing_disabled(irq) || !handle)
307 return;
308
309 addr = INTC_REG(d, _INTC_ADDR_D(handle), 0);
310 intc_reg_fns[_INTC_FN(handle)](addr, handle, 0);
311}
312
313static unsigned int intc_dist_data(struct intc_desc *desc,
314 struct intc_desc_int *d,
315 intc_enum enum_id)
316{
317 struct intc_mask_reg *mr = desc->hw.mask_regs;
318 unsigned int i, j, fn, mode;
319 unsigned long reg_e, reg_d;
320
321 for (i = 0; mr && enum_id && i < desc->hw.nr_mask_regs; i++) {
322 mr = desc->hw.mask_regs + i;
323
324 /*
325 * Skip this entry if there's no auto-distribution
326 * register associated with it.
327 */
328 if (!mr->dist_reg)
329 continue;
330
331 for (j = 0; j < ARRAY_SIZE(mr->enum_ids); j++) {
332 if (mr->enum_ids[j] != enum_id)
333 continue;
334
335 fn = REG_FN_MODIFY_BASE;
336 mode = MODE_ENABLE_REG;
337 reg_e = mr->dist_reg;
338 reg_d = mr->dist_reg;
339
340 fn += (mr->reg_width >> 3) - 1;
341 return _INTC_MK(fn, mode,
342 intc_get_reg(d, reg_e),
343 intc_get_reg(d, reg_d),
344 1,
345 (mr->reg_width - 1) - j);
346 }
347 }
348
349 /*
350 * It's possible we've gotten here with no distribution options
351 * available for the IRQ in question, so we just skip over those.
352 */
353 return 0;
354}
355#else
356static inline void intc_balancing_enable(unsigned int irq)
357{
358}
359
360static inline void intc_balancing_disable(unsigned int irq)
361{
362}
363#endif
364
232static inline void _intc_enable(unsigned int irq, unsigned long handle) 365static inline void _intc_enable(unsigned int irq, unsigned long handle)
233{ 366{
234 struct intc_desc_int *d = get_intc_desc(irq); 367 struct intc_desc_int *d = get_intc_desc(irq);
@@ -244,6 +377,8 @@ static inline void _intc_enable(unsigned int irq, unsigned long handle)
244 intc_enable_fns[_INTC_MODE(handle)](addr, handle, intc_reg_fns\ 377 intc_enable_fns[_INTC_MODE(handle)](addr, handle, intc_reg_fns\
245 [_INTC_FN(handle)], irq); 378 [_INTC_FN(handle)], irq);
246 } 379 }
380
381 intc_balancing_enable(irq);
247} 382}
248 383
249static void intc_enable(unsigned int irq) 384static void intc_enable(unsigned int irq)
@@ -254,10 +389,12 @@ static void intc_enable(unsigned int irq)
254static void intc_disable(unsigned int irq) 389static void intc_disable(unsigned int irq)
255{ 390{
256 struct intc_desc_int *d = get_intc_desc(irq); 391 struct intc_desc_int *d = get_intc_desc(irq);
257 unsigned long handle = (unsigned long) get_irq_chip_data(irq); 392 unsigned long handle = (unsigned long)get_irq_chip_data(irq);
258 unsigned long addr; 393 unsigned long addr;
259 unsigned int cpu; 394 unsigned int cpu;
260 395
396 intc_balancing_disable(irq);
397
261 for (cpu = 0; cpu < SMP_NR(d, _INTC_ADDR_D(handle)); cpu++) { 398 for (cpu = 0; cpu < SMP_NR(d, _INTC_ADDR_D(handle)); cpu++) {
262#ifdef CONFIG_SMP 399#ifdef CONFIG_SMP
263 if (!cpumask_test_cpu(cpu, irq_to_desc(irq)->affinity)) 400 if (!cpumask_test_cpu(cpu, irq_to_desc(irq)->affinity))
@@ -336,8 +473,7 @@ static void intc_mask_ack(unsigned int irq)
336 473
337 intc_disable(irq); 474 intc_disable(irq);
338 475
339 /* read register and write zero only to the assocaited bit */ 476 /* read register and write zero only to the associated bit */
340
341 if (handle) { 477 if (handle) {
342 addr = INTC_REG(d, _INTC_ADDR_D(handle), 0); 478 addr = INTC_REG(d, _INTC_ADDR_D(handle), 0);
343 switch (_INTC_FN(handle)) { 479 switch (_INTC_FN(handle)) {
@@ -366,7 +502,8 @@ static struct intc_handle_int *intc_find_irq(struct intc_handle_int *hp,
366{ 502{
367 int i; 503 int i;
368 504
369 /* this doesn't scale well, but... 505 /*
506 * this doesn't scale well, but...
370 * 507 *
371 * this function should only be used for cerain uncommon 508 * this function should only be used for cerain uncommon
372 * operations such as intc_set_priority() and intc_set_sense() 509 * operations such as intc_set_priority() and intc_set_sense()
@@ -377,7 +514,6 @@ static struct intc_handle_int *intc_find_irq(struct intc_handle_int *hp,
377 * memory footprint down is to make sure the array is sorted 514 * memory footprint down is to make sure the array is sorted
378 * and then perform a bisect to lookup the irq. 515 * and then perform a bisect to lookup the irq.
379 */ 516 */
380
381 for (i = 0; i < nr_hp; i++) { 517 for (i = 0; i < nr_hp; i++) {
382 if ((hp + i)->irq != irq) 518 if ((hp + i)->irq != irq)
383 continue; 519 continue;
@@ -408,7 +544,6 @@ int intc_set_priority(unsigned int irq, unsigned int prio)
408 * primary masking method is using intc_prio_level[irq] 544 * primary masking method is using intc_prio_level[irq]
409 * priority level will be set during next enable() 545 * priority level will be set during next enable()
410 */ 546 */
411
412 if (_INTC_FN(ihp->handle) != REG_FN_ERR) 547 if (_INTC_FN(ihp->handle) != REG_FN_ERR)
413 _intc_enable(irq, ihp->handle); 548 _intc_enable(irq, ihp->handle);
414 } 549 }
@@ -447,20 +582,6 @@ static int intc_set_sense(unsigned int irq, unsigned int type)
447 return 0; 582 return 0;
448} 583}
449 584
450static unsigned int __init intc_get_reg(struct intc_desc_int *d,
451 unsigned long address)
452{
453 unsigned int k;
454
455 for (k = 0; k < d->nr_reg; k++) {
456 if (d->reg[k] == address)
457 return k;
458 }
459
460 BUG();
461 return 0;
462}
463
464static intc_enum __init intc_grp_id(struct intc_desc *desc, 585static intc_enum __init intc_grp_id(struct intc_desc *desc,
465 intc_enum enum_id) 586 intc_enum enum_id)
466{ 587{
@@ -718,13 +839,14 @@ static void __init intc_register_irq(struct intc_desc *desc,
718 */ 839 */
719 set_bit(irq, intc_irq_map); 840 set_bit(irq, intc_irq_map);
720 841
721 /* Prefer single interrupt source bitmap over other combinations: 842 /*
843 * Prefer single interrupt source bitmap over other combinations:
844 *
722 * 1. bitmap, single interrupt source 845 * 1. bitmap, single interrupt source
723 * 2. priority, single interrupt source 846 * 2. priority, single interrupt source
724 * 3. bitmap, multiple interrupt sources (groups) 847 * 3. bitmap, multiple interrupt sources (groups)
725 * 4. priority, multiple interrupt sources (groups) 848 * 4. priority, multiple interrupt sources (groups)
726 */ 849 */
727
728 data[0] = intc_mask_data(desc, d, enum_id, 0); 850 data[0] = intc_mask_data(desc, d, enum_id, 0);
729 data[1] = intc_prio_data(desc, d, enum_id, 0); 851 data[1] = intc_prio_data(desc, d, enum_id, 0);
730 852
@@ -749,10 +871,11 @@ static void __init intc_register_irq(struct intc_desc *desc,
749 handle_level_irq, "level"); 871 handle_level_irq, "level");
750 set_irq_chip_data(irq, (void *)data[primary]); 872 set_irq_chip_data(irq, (void *)data[primary]);
751 873
752 /* set priority level 874 /*
875 * set priority level
753 * - this needs to be at least 2 for 5-bit priorities on 7780 876 * - this needs to be at least 2 for 5-bit priorities on 7780
754 */ 877 */
755 intc_prio_level[irq] = 2; 878 intc_prio_level[irq] = default_prio_level;
756 879
757 /* enable secondary masking method if present */ 880 /* enable secondary masking method if present */
758 if (data[!primary]) 881 if (data[!primary])
@@ -769,7 +892,6 @@ static void __init intc_register_irq(struct intc_desc *desc,
769 * only secondary priority should access registers, so 892 * only secondary priority should access registers, so
770 * set _INTC_FN(h) = REG_FN_ERR for intc_set_priority() 893 * set _INTC_FN(h) = REG_FN_ERR for intc_set_priority()
771 */ 894 */
772
773 hp->handle &= ~_INTC_MK(0x0f, 0, 0, 0, 0, 0); 895 hp->handle &= ~_INTC_MK(0x0f, 0, 0, 0, 0, 0);
774 hp->handle |= _INTC_MK(REG_FN_ERR, 0, 0, 0, 0, 0); 896 hp->handle |= _INTC_MK(REG_FN_ERR, 0, 0, 0, 0, 0);
775 } 897 }
@@ -790,6 +912,11 @@ static void __init intc_register_irq(struct intc_desc *desc,
790 if (desc->hw.ack_regs) 912 if (desc->hw.ack_regs)
791 ack_handle[irq] = intc_ack_data(desc, d, enum_id); 913 ack_handle[irq] = intc_ack_data(desc, d, enum_id);
792 914
915#ifdef CONFIG_INTC_BALANCING
916 if (desc->hw.mask_regs)
917 dist_handle[irq] = intc_dist_data(desc, d, enum_id);
918#endif
919
793#ifdef CONFIG_ARM 920#ifdef CONFIG_ARM
794 set_irq_flags(irq, IRQF_VALID); /* Enable IRQ on ARM systems */ 921 set_irq_flags(irq, IRQF_VALID); /* Enable IRQ on ARM systems */
795#endif 922#endif
@@ -801,6 +928,8 @@ static unsigned int __init save_reg(struct intc_desc_int *d,
801 unsigned int smp) 928 unsigned int smp)
802{ 929{
803 if (value) { 930 if (value) {
931 value = intc_phys_to_virt(d, value);
932
804 d->reg[cnt] = value; 933 d->reg[cnt] = value;
805#ifdef CONFIG_SMP 934#ifdef CONFIG_SMP
806 d->smp[cnt] = smp; 935 d->smp[cnt] = smp;
@@ -816,25 +945,59 @@ static void intc_redirect_irq(unsigned int irq, struct irq_desc *desc)
816 generic_handle_irq((unsigned int)get_irq_data(irq)); 945 generic_handle_irq((unsigned int)get_irq_data(irq));
817} 946}
818 947
819void __init register_intc_controller(struct intc_desc *desc) 948int __init register_intc_controller(struct intc_desc *desc)
820{ 949{
821 unsigned int i, k, smp; 950 unsigned int i, k, smp;
822 struct intc_hw_desc *hw = &desc->hw; 951 struct intc_hw_desc *hw = &desc->hw;
823 struct intc_desc_int *d; 952 struct intc_desc_int *d;
953 struct resource *res;
954
955 pr_info("intc: Registered controller '%s' with %u IRQs\n",
956 desc->name, hw->nr_vectors);
824 957
825 d = kzalloc(sizeof(*d), GFP_NOWAIT); 958 d = kzalloc(sizeof(*d), GFP_NOWAIT);
959 if (!d)
960 goto err0;
826 961
827 INIT_LIST_HEAD(&d->list); 962 INIT_LIST_HEAD(&d->list);
828 list_add(&d->list, &intc_list); 963 list_add(&d->list, &intc_list);
829 964
965 if (desc->num_resources) {
966 d->nr_windows = desc->num_resources;
967 d->window = kzalloc(d->nr_windows * sizeof(*d->window),
968 GFP_NOWAIT);
969 if (!d->window)
970 goto err1;
971
972 for (k = 0; k < d->nr_windows; k++) {
973 res = desc->resource + k;
974 WARN_ON(resource_type(res) != IORESOURCE_MEM);
975 d->window[k].phys = res->start;
976 d->window[k].size = resource_size(res);
977 d->window[k].virt = ioremap_nocache(res->start,
978 resource_size(res));
979 if (!d->window[k].virt)
980 goto err2;
981 }
982 }
983
830 d->nr_reg = hw->mask_regs ? hw->nr_mask_regs * 2 : 0; 984 d->nr_reg = hw->mask_regs ? hw->nr_mask_regs * 2 : 0;
985#ifdef CONFIG_INTC_BALANCING
986 if (d->nr_reg)
987 d->nr_reg += hw->nr_mask_regs;
988#endif
831 d->nr_reg += hw->prio_regs ? hw->nr_prio_regs * 2 : 0; 989 d->nr_reg += hw->prio_regs ? hw->nr_prio_regs * 2 : 0;
832 d->nr_reg += hw->sense_regs ? hw->nr_sense_regs : 0; 990 d->nr_reg += hw->sense_regs ? hw->nr_sense_regs : 0;
833 d->nr_reg += hw->ack_regs ? hw->nr_ack_regs : 0; 991 d->nr_reg += hw->ack_regs ? hw->nr_ack_regs : 0;
834 992
835 d->reg = kzalloc(d->nr_reg * sizeof(*d->reg), GFP_NOWAIT); 993 d->reg = kzalloc(d->nr_reg * sizeof(*d->reg), GFP_NOWAIT);
994 if (!d->reg)
995 goto err2;
996
836#ifdef CONFIG_SMP 997#ifdef CONFIG_SMP
837 d->smp = kzalloc(d->nr_reg * sizeof(*d->smp), GFP_NOWAIT); 998 d->smp = kzalloc(d->nr_reg * sizeof(*d->smp), GFP_NOWAIT);
999 if (!d->smp)
1000 goto err3;
838#endif 1001#endif
839 k = 0; 1002 k = 0;
840 1003
@@ -843,12 +1006,17 @@ void __init register_intc_controller(struct intc_desc *desc)
843 smp = IS_SMP(hw->mask_regs[i]); 1006 smp = IS_SMP(hw->mask_regs[i]);
844 k += save_reg(d, k, hw->mask_regs[i].set_reg, smp); 1007 k += save_reg(d, k, hw->mask_regs[i].set_reg, smp);
845 k += save_reg(d, k, hw->mask_regs[i].clr_reg, smp); 1008 k += save_reg(d, k, hw->mask_regs[i].clr_reg, smp);
1009#ifdef CONFIG_INTC_BALANCING
1010 k += save_reg(d, k, hw->mask_regs[i].dist_reg, 0);
1011#endif
846 } 1012 }
847 } 1013 }
848 1014
849 if (hw->prio_regs) { 1015 if (hw->prio_regs) {
850 d->prio = kzalloc(hw->nr_vectors * sizeof(*d->prio), 1016 d->prio = kzalloc(hw->nr_vectors * sizeof(*d->prio),
851 GFP_NOWAIT); 1017 GFP_NOWAIT);
1018 if (!d->prio)
1019 goto err4;
852 1020
853 for (i = 0; i < hw->nr_prio_regs; i++) { 1021 for (i = 0; i < hw->nr_prio_regs; i++) {
854 smp = IS_SMP(hw->prio_regs[i]); 1022 smp = IS_SMP(hw->prio_regs[i]);
@@ -860,6 +1028,8 @@ void __init register_intc_controller(struct intc_desc *desc)
860 if (hw->sense_regs) { 1028 if (hw->sense_regs) {
861 d->sense = kzalloc(hw->nr_vectors * sizeof(*d->sense), 1029 d->sense = kzalloc(hw->nr_vectors * sizeof(*d->sense),
862 GFP_NOWAIT); 1030 GFP_NOWAIT);
1031 if (!d->sense)
1032 goto err5;
863 1033
864 for (i = 0; i < hw->nr_sense_regs; i++) 1034 for (i = 0; i < hw->nr_sense_regs; i++)
865 k += save_reg(d, k, hw->sense_regs[i].reg, 0); 1035 k += save_reg(d, k, hw->sense_regs[i].reg, 0);
@@ -906,7 +1076,7 @@ void __init register_intc_controller(struct intc_desc *desc)
906 1076
907 irq_desc = irq_to_desc_alloc_node(irq, numa_node_id()); 1077 irq_desc = irq_to_desc_alloc_node(irq, numa_node_id());
908 if (unlikely(!irq_desc)) { 1078 if (unlikely(!irq_desc)) {
909 pr_info("can't get irq_desc for %d\n", irq); 1079 pr_err("can't get irq_desc for %d\n", irq);
910 continue; 1080 continue;
911 } 1081 }
912 1082
@@ -926,7 +1096,7 @@ void __init register_intc_controller(struct intc_desc *desc)
926 */ 1096 */
927 irq_desc = irq_to_desc_alloc_node(irq2, numa_node_id()); 1097 irq_desc = irq_to_desc_alloc_node(irq2, numa_node_id());
928 if (unlikely(!irq_desc)) { 1098 if (unlikely(!irq_desc)) {
929 pr_info("can't get irq_desc for %d\n", irq2); 1099 pr_err("can't get irq_desc for %d\n", irq2);
930 continue; 1100 continue;
931 } 1101 }
932 1102
@@ -942,8 +1112,100 @@ void __init register_intc_controller(struct intc_desc *desc)
942 /* enable bits matching force_enable after registering irqs */ 1112 /* enable bits matching force_enable after registering irqs */
943 if (desc->force_enable) 1113 if (desc->force_enable)
944 intc_enable_disable_enum(desc, d, desc->force_enable, 1); 1114 intc_enable_disable_enum(desc, d, desc->force_enable, 1);
1115
1116 return 0;
1117err5:
1118 kfree(d->prio);
1119err4:
1120#ifdef CONFIG_SMP
1121 kfree(d->smp);
1122err3:
1123#endif
1124 kfree(d->reg);
1125err2:
1126 for (k = 0; k < d->nr_windows; k++)
1127 if (d->window[k].virt)
1128 iounmap(d->window[k].virt);
1129
1130 kfree(d->window);
1131err1:
1132 kfree(d);
1133err0:
1134 pr_err("unable to allocate INTC memory\n");
1135
1136 return -ENOMEM;
1137}
1138
1139#ifdef CONFIG_INTC_USERIMASK
1140static void __iomem *uimask;
1141
1142int register_intc_userimask(unsigned long addr)
1143{
1144 if (unlikely(uimask))
1145 return -EBUSY;
1146
1147 uimask = ioremap_nocache(addr, SZ_4K);
1148 if (unlikely(!uimask))
1149 return -ENOMEM;
1150
1151 pr_info("intc: userimask support registered for levels 0 -> %d\n",
1152 default_prio_level - 1);
1153
1154 return 0;
1155}
1156
1157static ssize_t
1158show_intc_userimask(struct sysdev_class *cls,
1159 struct sysdev_class_attribute *attr, char *buf)
1160{
1161 return sprintf(buf, "%d\n", (__raw_readl(uimask) >> 4) & 0xf);
1162}
1163
1164static ssize_t
1165store_intc_userimask(struct sysdev_class *cls,
1166 struct sysdev_class_attribute *attr,
1167 const char *buf, size_t count)
1168{
1169 unsigned long level;
1170
1171 level = simple_strtoul(buf, NULL, 10);
1172
1173 /*
1174 * Minimal acceptable IRQ levels are in the 2 - 16 range, but
1175 * these are chomped so as to not interfere with normal IRQs.
1176 *
1177 * Level 1 is a special case on some CPUs in that it's not
1178 * directly settable, but given that USERIMASK cuts off below a
1179 * certain level, we don't care about this limitation here.
1180 * Level 0 on the other hand equates to user masking disabled.
1181 *
1182 * We use default_prio_level as a cut off so that only special
1183 * case opt-in IRQs can be mangled.
1184 */
1185 if (level >= default_prio_level)
1186 return -EINVAL;
1187
1188 __raw_writel(0xa5 << 24 | level << 4, uimask);
1189
1190 return count;
945} 1191}
946 1192
1193static SYSDEV_CLASS_ATTR(userimask, S_IRUSR | S_IWUSR,
1194 show_intc_userimask, store_intc_userimask);
1195#endif
1196
1197static ssize_t
1198show_intc_name(struct sys_device *dev, struct sysdev_attribute *attr, char *buf)
1199{
1200 struct intc_desc_int *d;
1201
1202 d = container_of(dev, struct intc_desc_int, sysdev);
1203
1204 return sprintf(buf, "%s\n", d->chip.name);
1205}
1206
1207static SYSDEV_ATTR(name, S_IRUGO, show_intc_name, NULL);
1208
947static int intc_suspend(struct sys_device *dev, pm_message_t state) 1209static int intc_suspend(struct sys_device *dev, pm_message_t state)
948{ 1210{
949 struct intc_desc_int *d; 1211 struct intc_desc_int *d;
@@ -1003,19 +1265,28 @@ static int __init register_intc_sysdevs(void)
1003 int id = 0; 1265 int id = 0;
1004 1266
1005 error = sysdev_class_register(&intc_sysdev_class); 1267 error = sysdev_class_register(&intc_sysdev_class);
1268#ifdef CONFIG_INTC_USERIMASK
1269 if (!error && uimask)
1270 error = sysdev_class_create_file(&intc_sysdev_class,
1271 &attr_userimask);
1272#endif
1006 if (!error) { 1273 if (!error) {
1007 list_for_each_entry(d, &intc_list, list) { 1274 list_for_each_entry(d, &intc_list, list) {
1008 d->sysdev.id = id; 1275 d->sysdev.id = id;
1009 d->sysdev.cls = &intc_sysdev_class; 1276 d->sysdev.cls = &intc_sysdev_class;
1010 error = sysdev_register(&d->sysdev); 1277 error = sysdev_register(&d->sysdev);
1278 if (error == 0)
1279 error = sysdev_create_file(&d->sysdev,
1280 &attr_name);
1011 if (error) 1281 if (error)
1012 break; 1282 break;
1283
1013 id++; 1284 id++;
1014 } 1285 }
1015 } 1286 }
1016 1287
1017 if (error) 1288 if (error)
1018 pr_warning("intc: sysdev registration error\n"); 1289 pr_err("intc: sysdev registration error\n");
1019 1290
1020 return error; 1291 return error;
1021} 1292}
@@ -1048,7 +1319,7 @@ unsigned int create_irq_nr(unsigned int irq_want, int node)
1048 1319
1049 desc = irq_to_desc_alloc_node(new, node); 1320 desc = irq_to_desc_alloc_node(new, node);
1050 if (unlikely(!desc)) { 1321 if (unlikely(!desc)) {
1051 pr_info("can't get irq_desc for %d\n", new); 1322 pr_err("can't get irq_desc for %d\n", new);
1052 goto out_unlock; 1323 goto out_unlock;
1053 } 1324 }
1054 1325
diff --git a/include/linux/device.h b/include/linux/device.h
index 182192892d4..241b96bcd7a 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -451,6 +451,10 @@ struct device {
451 451
452static inline const char *dev_name(const struct device *dev) 452static inline const char *dev_name(const struct device *dev)
453{ 453{
454 /* Use the init name until the kobject becomes available */
455 if (dev->init_name)
456 return dev->init_name;
457
454 return kobject_name(&dev->kobj); 458 return kobject_name(&dev->kobj);
455} 459}
456 460
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index 193d4bfe42f..f5364a1de68 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -33,8 +33,8 @@ struct plat_sci_port {
33 char *clk; /* clock string */ 33 char *clk; /* clock string */
34 struct device *dma_dev; 34 struct device *dma_dev;
35#ifdef CONFIG_SERIAL_SH_SCI_DMA 35#ifdef CONFIG_SERIAL_SH_SCI_DMA
36 enum sh_dmae_slave_chan_id dma_slave_tx; 36 unsigned int dma_slave_tx;
37 enum sh_dmae_slave_chan_id dma_slave_rx; 37 unsigned int dma_slave_rx;
38#endif 38#endif
39}; 39};
40 40
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h
new file mode 100644
index 00000000000..1636d1e2a5f
--- /dev/null
+++ b/include/linux/sh_clk.h
@@ -0,0 +1,150 @@
1#ifndef __SH_CLOCK_H
2#define __SH_CLOCK_H
3
4#include <linux/list.h>
5#include <linux/seq_file.h>
6#include <linux/cpufreq.h>
7#include <linux/clk.h>
8#include <linux/err.h>
9
10struct clk;
11
12struct clk_ops {
13 void (*init)(struct clk *clk);
14 int (*enable)(struct clk *clk);
15 void (*disable)(struct clk *clk);
16 unsigned long (*recalc)(struct clk *clk);
17 int (*set_rate)(struct clk *clk, unsigned long rate, int algo_id);
18 int (*set_parent)(struct clk *clk, struct clk *parent);
19 long (*round_rate)(struct clk *clk, unsigned long rate);
20};
21
22struct clk {
23 struct list_head node;
24 const char *name;
25 int id;
26
27 struct clk *parent;
28 struct clk_ops *ops;
29
30 struct list_head children;
31 struct list_head sibling; /* node for children */
32
33 int usecount;
34
35 unsigned long rate;
36 unsigned long flags;
37
38 void __iomem *enable_reg;
39 unsigned int enable_bit;
40
41 unsigned long arch_flags;
42 void *priv;
43 struct dentry *dentry;
44 struct cpufreq_frequency_table *freq_table;
45};
46
47#define CLK_ENABLE_ON_INIT (1 << 0)
48
49/* drivers/sh/clk.c */
50unsigned long followparent_recalc(struct clk *);
51void recalculate_root_clocks(void);
52void propagate_rate(struct clk *);
53int clk_reparent(struct clk *child, struct clk *parent);
54int clk_register(struct clk *);
55void clk_unregister(struct clk *);
56void clk_enable_init_clocks(void);
57
58/**
59 * clk_set_rate_ex - set the clock rate for a clock source, with additional parameter
60 * @clk: clock source
61 * @rate: desired clock rate in Hz
62 * @algo_id: algorithm id to be passed down to ops->set_rate
63 *
64 * Returns success (0) or negative errno.
65 */
66int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id);
67
68enum clk_sh_algo_id {
69 NO_CHANGE = 0,
70
71 IUS_N1_N1,
72 IUS_322,
73 IUS_522,
74 IUS_N11,
75
76 SB_N1,
77
78 SB3_N1,
79 SB3_32,
80 SB3_43,
81 SB3_54,
82
83 BP_N1,
84
85 IP_N1,
86};
87
88struct clk_div_mult_table {
89 unsigned int *divisors;
90 unsigned int nr_divisors;
91 unsigned int *multipliers;
92 unsigned int nr_multipliers;
93};
94
95struct cpufreq_frequency_table;
96void clk_rate_table_build(struct clk *clk,
97 struct cpufreq_frequency_table *freq_table,
98 int nr_freqs,
99 struct clk_div_mult_table *src_table,
100 unsigned long *bitmap);
101
102long clk_rate_table_round(struct clk *clk,
103 struct cpufreq_frequency_table *freq_table,
104 unsigned long rate);
105
106int clk_rate_table_find(struct clk *clk,
107 struct cpufreq_frequency_table *freq_table,
108 unsigned long rate);
109
110#define SH_CLK_MSTP32(_parent, _enable_reg, _enable_bit, _flags) \
111{ \
112 .parent = _parent, \
113 .enable_reg = (void __iomem *)_enable_reg, \
114 .enable_bit = _enable_bit, \
115 .flags = _flags, \
116}
117
118int sh_clk_mstp32_register(struct clk *clks, int nr);
119
120#define SH_CLK_DIV4(_parent, _reg, _shift, _div_bitmap, _flags) \
121{ \
122 .parent = _parent, \
123 .enable_reg = (void __iomem *)_reg, \
124 .enable_bit = _shift, \
125 .arch_flags = _div_bitmap, \
126 .flags = _flags, \
127}
128
129struct clk_div4_table {
130 struct clk_div_mult_table *div_mult_table;
131 void (*kick)(struct clk *clk);
132};
133
134int sh_clk_div4_register(struct clk *clks, int nr,
135 struct clk_div4_table *table);
136int sh_clk_div4_enable_register(struct clk *clks, int nr,
137 struct clk_div4_table *table);
138int sh_clk_div4_reparent_register(struct clk *clks, int nr,
139 struct clk_div4_table *table);
140
141#define SH_CLK_DIV6(_parent, _reg, _flags) \
142{ \
143 .parent = _parent, \
144 .enable_reg = (void __iomem *)_reg, \
145 .flags = _flags, \
146}
147
148int sh_clk_div6_register(struct clk *clks, int nr);
149
150#endif /* __SH_CLOCK_H */
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h
new file mode 100644
index 00000000000..b08cd4efa15
--- /dev/null
+++ b/include/linux/sh_dma.h
@@ -0,0 +1,102 @@
1/*
2 * Header for the new SH dmaengine driver
3 *
4 * Copyright (C) 2010 Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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#ifndef SH_DMA_H
11#define SH_DMA_H
12
13#include <linux/list.h>
14#include <linux/dmaengine.h>
15
16/* Used by slave DMA clients to request DMA to/from a specific peripheral */
17struct sh_dmae_slave {
18 unsigned int slave_id; /* Set by the platform */
19 struct device *dma_dev; /* Set by the platform */
20 const struct sh_dmae_slave_config *config; /* Set by the driver */
21};
22
23struct sh_dmae_regs {
24 u32 sar; /* SAR / source address */
25 u32 dar; /* DAR / destination address */
26 u32 tcr; /* TCR / transfer count */
27};
28
29struct sh_desc {
30 struct sh_dmae_regs hw;
31 struct list_head node;
32 struct dma_async_tx_descriptor async_tx;
33 enum dma_data_direction direction;
34 dma_cookie_t cookie;
35 size_t partial;
36 int chunks;
37 int mark;
38};
39
40struct sh_dmae_slave_config {
41 unsigned int slave_id;
42 dma_addr_t addr;
43 u32 chcr;
44 char mid_rid;
45};
46
47struct sh_dmae_channel {
48 unsigned int offset;
49 unsigned int dmars;
50 unsigned int dmars_bit;
51};
52
53struct sh_dmae_pdata {
54 const struct sh_dmae_slave_config *slave;
55 int slave_num;
56 const struct sh_dmae_channel *channel;
57 int channel_num;
58 unsigned int ts_low_shift;
59 unsigned int ts_low_mask;
60 unsigned int ts_high_shift;
61 unsigned int ts_high_mask;
62 const unsigned int *ts_shift;
63 int ts_shift_num;
64 u16 dmaor_init;
65};
66
67/* DMA register */
68#define SAR 0x00
69#define DAR 0x04
70#define TCR 0x08
71#define CHCR 0x0C
72#define DMAOR 0x40
73
74/* DMAOR definitions */
75#define DMAOR_AE 0x00000004
76#define DMAOR_NMIF 0x00000002
77#define DMAOR_DME 0x00000001
78
79/* Definitions for the SuperH DMAC */
80#define REQ_L 0x00000000
81#define REQ_E 0x00080000
82#define RACK_H 0x00000000
83#define RACK_L 0x00040000
84#define ACK_R 0x00000000
85#define ACK_W 0x00020000
86#define ACK_H 0x00000000
87#define ACK_L 0x00010000
88#define DM_INC 0x00004000
89#define DM_DEC 0x00008000
90#define DM_FIX 0x0000c000
91#define SM_INC 0x00001000
92#define SM_DEC 0x00002000
93#define SM_FIX 0x00003000
94#define RS_IN 0x00000200
95#define RS_OUT 0x00000300
96#define TS_BLK 0x00000040
97#define TM_BUR 0x00000020
98#define CHCR_DE 0x00000001
99#define CHCR_TE 0x00000002
100#define CHCR_IE 0x00000004
101
102#endif
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index 51d288d8ac8..0d6cd38e673 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -1,6 +1,8 @@
1#ifndef __SH_INTC_H 1#ifndef __SH_INTC_H
2#define __SH_INTC_H 2#define __SH_INTC_H
3 3
4#include <linux/ioport.h>
5
4typedef unsigned char intc_enum; 6typedef unsigned char intc_enum;
5 7
6struct intc_vect { 8struct intc_vect {
@@ -21,6 +23,9 @@ struct intc_group {
21struct intc_mask_reg { 23struct intc_mask_reg {
22 unsigned long set_reg, clr_reg, reg_width; 24 unsigned long set_reg, clr_reg, reg_width;
23 intc_enum enum_ids[32]; 25 intc_enum enum_ids[32];
26#ifdef CONFIG_INTC_BALANCING
27 unsigned long dist_reg;
28#endif
24#ifdef CONFIG_SMP 29#ifdef CONFIG_SMP
25 unsigned long smp; 30 unsigned long smp;
26#endif 31#endif
@@ -39,8 +44,14 @@ struct intc_sense_reg {
39 intc_enum enum_ids[16]; 44 intc_enum enum_ids[16];
40}; 45};
41 46
47#ifdef CONFIG_INTC_BALANCING
48#define INTC_SMP_BALANCING(reg) .dist_reg = (reg)
49#else
50#define INTC_SMP_BALANCING(reg)
51#endif
52
42#ifdef CONFIG_SMP 53#ifdef CONFIG_SMP
43#define INTC_SMP(stride, nr) .smp = (stride) | ((nr) << 8) 54#define INTC_SMP(stride, nr) .smp = (stride) | ((nr) << 8)
44#else 55#else
45#define INTC_SMP(stride, nr) 56#define INTC_SMP(stride, nr)
46#endif 57#endif
@@ -71,6 +82,8 @@ struct intc_hw_desc {
71 82
72struct intc_desc { 83struct intc_desc {
73 char *name; 84 char *name;
85 struct resource *resource;
86 unsigned int num_resources;
74 intc_enum force_enable; 87 intc_enum force_enable;
75 intc_enum force_disable; 88 intc_enum force_disable;
76 struct intc_hw_desc hw; 89 struct intc_hw_desc hw;
@@ -92,9 +105,18 @@ struct intc_desc symbol __initdata = { \
92 prio_regs, sense_regs, ack_regs), \ 105 prio_regs, sense_regs, ack_regs), \
93} 106}
94 107
95void __init register_intc_controller(struct intc_desc *desc); 108int __init register_intc_controller(struct intc_desc *desc);
96int intc_set_priority(unsigned int irq, unsigned int prio); 109int intc_set_priority(unsigned int irq, unsigned int prio);
97 110
111#ifdef CONFIG_INTC_USERIMASK
112int register_intc_userimask(unsigned long addr);
113#else
114static inline int register_intc_userimask(unsigned long addr)
115{
116 return 0;
117}
118#endif
119
98int reserve_irq_vector(unsigned int irq); 120int reserve_irq_vector(unsigned int irq);
99void reserve_irq_legacy(void); 121void reserve_irq_legacy(void);
100 122
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-21 04:59:36 -0500