summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-05-1964-2132/+2017
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (127 commits) sh: update defconfigs. sh: Fix up the NUMA build for recent LMB changes. sh64: provide a stub per_cpu_trap_init() definition. sh: fix up CONFIG_KEXEC=n build. sh: fixup the docbook paths for clock framework shuffling. driver core: Early dev_name() depends on slab_is_available(). sh: simplify WARN usage in SH clock driver sh: Check return value of clk_get on ms7724 sh: Check return value of clk_get on ecovec24 sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.c sh: move sh clock.c contents to drivers/sh/clk. sh: move sh asm/clock.h contents to linux/sh_clk.h V2 sh: remove unused clock lookup sh: switch boards to clkdev sh: switch sh4-202 to clkdev sh: switch shx3 to clkdev sh: switch sh7757 to clkdev sh: switch sh7763 to clkdev sh: switch sh7780 to clkdev sh: switch sh7786 to clkdev ...
| * sh64: provide a stub per_cpu_trap_init() definition.Paul Mundt2010-05-181-0/+5
| | | | | | | | | | | | | | | | This is needed to fix up the build at the moment. Gradually this will be reworked to follow the 32-bit initialization path and deal with delayed VBR initialization. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * Merge branch 'sh/lmb'Paul Mundt2010-05-133-203/+85
| |\ | | | | | | | | | | | | Conflicts: arch/sh/kernel/setup.c
| | * sh: Ensure active regions have a backing PMB entry.Paul Mundt2010-05-111-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the NUMA or memory hot-add case where system memory has been partitioned up, we immediately run in to a situation where the existing PMB entry doesn't cover the new range (primarily as a result of the entry size being shrunk to match the node size early in the initialization). In order to fix this up it's necessary to preload a PMB mapping for the new range prior to activation in order to circumvent reset by MMU. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * sh: bootmem refactoring.Paul Mundt2010-05-111-139/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reworks much of the bootmem setup and initialization code allowing us to get rid of duplicate work between the NUMA and non-NUMA cases. The end result is that we end up with a much more flexible interface for supporting more complex topologies (fake NUMA, highmem, etc, etc.) which is entirely LMB backed. This is an incremental step for more NUMA work as well as gradually enabling migration off of bootmem entirely. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * sh: rework memory limits to work with LMB.Paul Mundt2010-05-102-44/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reworks the memory limit handling to tie in through the available LMB infrastructure. This requires a bit of reordering as we need to have all of the LMB reservations taken care of prior to establishing the limits. While we're at it, the crash kernel reservation semantics are reworked so that we allocate from the bottom up and reduce the risk of having to disable the memory limit due to a clash with the crash kernel reservation. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * sh: enable LMB region setup via machvec.Paul Mundt2010-05-102-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | This plugs in a memory init callback in the machvec to permit boards to wire up various bits of memory directly in to LMB. A generic machvec implementation is provided that simply wraps around the normal Kconfig-derived memory start/size. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * sh: bump up extra LMB reservations in bootmem init.Paul Mundt2010-05-071-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | This bumps up the extra LMB reservations in ordering so that they're accounted for prior to iterating over the region list. This ensures that reservations are visible both within the LMB and bootmem context. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * sh: convert initrd reservation to LMB.Paul Mundt2010-05-071-1/+1
| | | | | | | | | | | | | | | | | | This switches over from bootmem -> LMB for the initrd area reservation. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * sh: convert kexec crash kernel management to LMB.Paul Mundt2010-05-072-44/+50
| | | | | | | | | | | | | | | | | | This migrates the crash kernel handling off of bootmem and over to LMB. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | Merge branch 'sh/clkfwk'Paul Mundt2010-05-1315-1155/+662
| |\ \
| | * | sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.cMagnus Damm2010-05-132-296/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the CPG helpers to drivers/sh/clk-cpg.c V2. This to allow SH-Mobile ARM to share the code with SH. All functions except the legacy CPG stuff is moved. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: move sh clock.c contents to drivers/sh/clk.Magnus Damm2010-05-131-535/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is V2 of the SH clock framework move from arch/sh/kernel/cpu/clock.c to drivers/sh/clk.c. All code except the following functions are moved: clk_init(), clk_get() and clk_put(). The init function is still kept in clock.c since it depends on the SH-specific machvec implementation. The symbols clk_get() and clk_put() already exist in the common ARM clkdev code, those symbols are left in the SH tree to avoid duplicating them for SH-Mobile ARM. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: remove unused clock lookupMagnus Damm2010-05-131-35/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now when all clocks are registered using clkdev, get rid of the special SH-specific clock lookup. Also ditch the unused module ref counting code. This patch syncs the SH behaviour with ARM. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh4-202 to clkdevMagnus Damm2010-05-131-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh4-202 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch shx3 to clkdevMagnus Damm2010-05-131-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining shx3 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh7757 to clkdevMagnus Damm2010-05-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh7757 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh7763 to clkdevMagnus Damm2010-05-131-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh7763 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh7780 to clkdevMagnus Damm2010-05-131-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh7780 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh7786 to clkdevMagnus Damm2010-05-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh7786 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh7785 to clkdevMagnus Damm2010-05-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh7785 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh7366 to clkdevMagnus Damm2010-05-131-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh7366 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh7343 to clkdevMagnus Damm2010-05-131-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh7343 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh7722 to clkdevMagnus Damm2010-05-131-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh7722 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh7723 to clkdevMagnus Damm2010-05-131-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh7723 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch sh7724 to clkdevMagnus Damm2010-05-131-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining sh7724 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: switch legacy clocks to clkdevMagnus Damm2010-05-131-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the legacy clocks to register using clkdev. Also the clock name is removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: get rid of div4 clock nameMagnus Damm2010-05-137-67/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the name parameter from SH_CLK_DIV4() and adjust the processor specific code. The lookup happens using clkdev so the name is unused. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7786 div4 clkdev lookupMagnus Damm2010-05-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7786 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7785 div4 clkdev lookupMagnus Damm2010-05-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7785 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7366 div4 clkdev lookupMagnus Damm2010-05-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7366 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7343 div4 clkdev lookupMagnus Damm2010-05-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7343 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7724 div4 clkdev lookupMagnus Damm2010-05-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7724 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7723 div4 clkdev lookupMagnus Damm2010-05-131-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7723 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7722 div4 clkdev lookupMagnus Damm2010-05-131-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7722 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: div4 reparent workaroundMagnus Damm2010-05-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the div4 set_parent() callback to use the flags instead of name to determine parent index. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: get rid of mstp32 clock name and idMagnus Damm2010-05-134-138/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the name and the id from SH_CLK_MSTP32(). Now when lookups are handled by clkdev they are not needed anymore. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7786 mstp32 clkdev lookupMagnus Damm2010-05-131-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7786 MSTP clocks to the clkdev lookup table. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7786 mstp32 index reworkMagnus Damm2010-05-131-43/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds sh7786 MSTP enums for mstp_clks[] index. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7785 mstp32 clkdev lookupMagnus Damm2010-05-131-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7785 MSTP clocks to the clkdev lookup table. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7785 mstp32 index reworkMagnus Damm2010-05-131-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds sh7785 MSTP enums for mstp_clks[] index. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7366 mstp32 clkdev lookupMagnus Damm2010-05-131-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7366 MSTP clocks to the clkdev lookup table. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7366 mstp32 index reworkMagnus Damm2010-05-131-42/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds sh7366 MSTP enums for mstp_clks[] index. The MSTP bit for the SIU is removed as well since it is not included in the documentation. Most likely an old copy paste error from sh7722. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7343 mstp32 clkdev lookupMagnus Damm2010-05-131-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sh7343 MSTP clocks to the clkdev lookup table. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: sh7343 mstp32 index reworkMagnus Damm2010-05-131-46/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds sh7343 MSTP enums for mstp_clks[] index. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | Merge branches 'sh/clkfwk' and 'sh/kexec'Paul Mundt2010-05-113-20/+22
| |\ \ \ | | |/ / | |/| |
| | * | sh: shuffle the elfcorehdr handling over to the crash dump code.Paul Mundt2010-05-072-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The elfcorehdr parsing was just tossed in setup.c, but nothing outside of the crash dump code/vmcore bits require it, so we just move it out of the way, as per ppc. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| | * | sh: Ensure that X2 TLB settings are reflected in vmcore.Paul Mundt2010-05-071-0/+3
| | |/ | | | | | | | | | | | | | | | This rolls in the X2TLB config settings for vmcore. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: clkfwk: Use debugfs_remove_recursive() for rewindingHiroshi DOYU2010-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rewinding each debugfs entries to unregister if an error happens. Based on the commit ca4caa4e1d45f9542fa54263974d0ef637157b4a Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: get rid of div6 clock namesMagnus Damm2010-05-115-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | Get rid of div6 clock names on sh7343/sh7366/sh7722/sh7723/sh7724 Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
OpenPOWER on IntegriCloud