aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sh: update defconfigs.Paul Mundt2010-05-1850-892/+1237
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Fix up the NUMA build for recent LMB changes.Paul Mundt2010-05-181-38/+0
| | | | | | | Now that the node 0 initialization code has been overhauled, kill off the now obsolete setup_memory() bits. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* 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>
* sh: fix up CONFIG_KEXEC=n build.Paul Mundt2010-05-181-1/+1
| | | | | | | | The reserve_crashkernel() definition is in asm/kexec.h which is only dragged in via linux/kexec.h if CONFIG_KEXEC is set. Just switch over to asm/kexec.h unconditionally to fix up the build. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: fixup the docbook paths for clock framework shuffling.Paul Mundt2010-05-132-5/+8
| | | | | | | Now that the definitions have been consolidated in an alternate header, update the template accordingly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* Merge branch 'sh/driver-core'Paul Mundt2010-05-131-1/+1
|\
| * driver core: Early dev_name() depends on slab_is_available().Paul Mundt2010-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The early dev_name() setup needs to do an allocation which can only be satisfied under slab_is_available() conditions. Some of the early platform drivers may be initialized before this point, and those still need to contend themselves with an empty dev_name. This fixes up a regression with the SH earlyprintk which was bailing out prior to hitting the early probe path due to not being able to satisfy the early allocation. Other early platform drivers (such as the early timers) that need to match the dev name are sufficiently late that allocations are already possible. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* | Merge branch 'sh/highmem'Paul Mundt2010-05-131-6/+2
|\ \
| * | sh: All SH-X3 cores support NUMA and SMP, update Kconfig.Paul Mundt2010-05-111-6/+2
| | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* | | Merge branch 'sh/lmb'Paul Mundt2010-05-1311-209/+271
|\ \ \ | |/ / | | | | | | | | | 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: Reject small mappings for PMB bolting.Paul Mundt2010-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The minimum section size for the PMB is 16M, so just always error out early if the specified size is too small. This permits us to unconditionally call in to pmb_bolt_mapping() with variable sizes without wasting a TLB and cache flush for the range. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | sh: bootmem refactoring.Paul Mundt2010-05-114-142/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-45/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-106-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-073-44/+58
| | | | | | | | | | | | | | | | | | 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-1323-1326/+1698
|\ \ \
| * | | sh: simplify WARN usage in SH clock driverGuennadi Liakhovetski2010-05-131-5/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: Check return value of clk_get on ms7724Kuninori Morimoto2010-05-131-7/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: Check return value of clk_get on ecovec24Kuninori Morimoto2010-05-131-9/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.cMagnus Damm2010-05-134-296/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-135-536/+561
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: move sh asm/clock.h contents to linux/sh_clk.h V2Magnus Damm2010-05-132-146/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is V2 of the clock framework move from arch/sh/include/asm/clock.h to include/linux/sh_clk.h and updates the include paths for files that will be shared between SH and SH-Mobile ARM. The file asm/clock.h is still kept in this version, this to depend on as few files as possible at this point. We keep SH specific stuff in there. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * | | sh: remove unused clock lookupMagnus Damm2010-05-132-36/+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 boards to clkdevMagnus Damm2010-05-133-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the remaining board clocks to use clkdev for lookup if needed. The 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 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-138-75/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-135-147/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>