- 20 Mar, 2012 1 commit
-
-
Arnd Bergmann authored
Conflicts: arch/arm/mach-exynos/clock-exynos4.c arch/arm/mach-exynos/clock.c The cleanup moves the exynos4 clock implementation away, while the other branch modifies the file with the old name. Signed-off-by:Arnd Bergmann <arnd@arndb.de>
-
- 15 Mar, 2012 2 commits
-
-
Arnd Bergmann authored
* renesas/soc: ARM: mach-shmobile: ap4evb: fixup fsi2_ak4643_info typo ARM: mach-shmobile: mackerel: Reserve DMA memory for the frame buffer ARM: mach-shmobile: Fix ag5evm compilation by including linux/videodev2.h ARM: mach-shmobile: Fix bonito compile breakage
-
Arnd Bergmann authored
The fixes branch was merged into mainline just after v3.3-rc7, I'm merging it into this branch to fix up a nontrivial merge conflict. Unfortunately this means that we are now based on a commit between -rc releases, which we normally try to avoid. Conflicts: arch/arm/mach-shmobile/board-mackerel.c Resolution suggested by Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by:
-
- 14 Mar, 2012 2 commits
-
-
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesasOlof Johansson authored
* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (234 commits) ARM: shmobile: remove additional __io() macro use ARM: mach-shmobile: default to no earlytimer ARM: mach-shmobile: r8a7779 and Marzen timer rework ARM: mach-shmobile: r8a7740 and Bonito timer rework ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework ARM: mach-shmobile: sh7377 and G4EVM timer rework ARM: mach-shmobile: sh7367 and G3EVM timer rework ARM: mach-shmobile: add shmobile_earlytimer_init() ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup ARM: mach-shmobile: Move sh7372 Mackerel external clk setup ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() ARM: mach-shmobile: r8a7779 L2 cache support ARM: mach-shmobile: r8a7779 map_io and init_early update ARM: mach-shmobile: r8a7740 map_io and init_early update ARM: mach-shmobile: sh73a0 map_io and init_early update ARM: mach-shmobile: sh7372 map_io and init_early update ARM: mach-shmobile: sh7377 map_io and init_early update ARM: mach-shmobile: sh7367 map_io and init_early update sh: remove clk_ops ... (includes an update to v3.3-rc7) Conflicts: arch/arm/mach-omap2/id.c
-
Arnd Bergmann authored
setup-r8a7779.c has grown a new user of the __io() macro. Rob Herring's PIO cleanup series already gets rid of all other uses in shmobile, so we should ensure that this one gets removed as well. Signed-off-by:
Rafael J. Wysocki <rjw@sisk.pl>
-
- 12 Mar, 2012 35 commits
-
-
Magnus Damm authored
Now when all SoCs and boards are converted to use shmobile_earlytimer_init(), change the default behavior of shmobile_timer.init() from using early timer to do nothing which is suitable for upcoming DT support. Signed-off-by:
Magnus Damm <damm@opensource.se> Signed-off-by:
-
Magnus Damm authored
Move the SoC specific timer code from Marzen board code to r8a7779 setup code. This makes is possible to share the SoC specific timer code across boards and it also removes the need for a board specific timer structure. Signed-off-by:
-
Magnus Damm authored
Copy the SoC specific timer code from Bonito board code to r8a7740 setup code. This makes is possible to share the SoC specific timer code across boards. The Bonito specific timer setup code tied to the FPGA is kept as-is. Signed-off-by:
-
Magnus Damm authored
Move the SoC specific timer code from AG5EVM and Kota2 to sh73a0 setup code. This makes is possible to share the SoC specific timer code across boards and it also removes the need for a board specific timer structure. Signed-off-by:
-
Magnus Damm authored
Move the SoC specific timer code from AP4EVB and Mackerel to sh7372 setup code. This makes is possible to share the SoC specific timer code across boards and it also removes the need for a board specific timer structure. Signed-off-by:
-
Magnus Damm authored
Move the SoC specific timer code from G4EVM board code to sh7377 setup code. This makes is possible to share the SoC specific timer code across boards and it also removes the need for a board specific timer structure. Signed-off-by:
-
Magnus Damm authored
Move the SoC specific timer code from G3EVM board code to sh7367 setup code. This makes is possible to share the SoC specific timer code across boards and it also removes the need for a board specific timer structure. Signed-off-by:
-
Magnus Damm authored
Add shmobile_earlytimer_init() that can be used to enable the earlytimer probing from the SoC code. Signed-off-by:
-
Magnus Damm authored
Move the board specific external clock setting for sh7372 AP4EVB from machine_desc->sys_timer->init() to machine_desc->init_machine(). This is ground work for shmobile timer code consolidation. Signed-off-by:
-
Magnus Damm authored
Move the board specific external clock setting for sh7372 Mackerel from machine_desc->sys_timer->init() to machine_desc->init_machine(). This is ground work for shmobile timer code consolidation. Signed-off-by:
-
Magnus Damm authored
Rename clk_init() to shmobile_clk_init() to avoid a potential future name space collision with the common clock framework. Signed-off-by:
-
Magnus Damm authored
L2 Cache support for r8a7779. Settings taken from out-of-tree kernel patches by Kouei Abe. Signed-off-by:
-
Magnus Damm authored
Update the r8a7779 SoC and the Marzen board to make use of the functions r8a7779_map_io() and r8a7779_add_early_devices(). Signed-off-by:
-
Magnus Damm authored
Update the r8a7740 SoC and the Bonito board to make use of the functions r8a7740_map_io() and r8a7740_add_early_devices(). Signed-off-by:
-
Magnus Damm authored
Update the sh73a0 SoC and the AG5EVM and Kota2 boards to make use of the functions sh73a0_map_io() and sh73a0_add_early_devices(). Signed-off-by:
-
Magnus Damm authored
Update the sh7372 SoC and the AP4EVB and Mackerel boards to make use of the functions sh7372_map_io() and sh7372_add_early_devices(). Signed-off-by:
-
Magnus Damm authored
Update the sh7377 SoC and the G4EVM board to make use of the functions sh7377_map_io() and sh7377_add_early_devices(). Signed-off-by:
-
Magnus Damm authored
Update the sh7367 SoC and the G3EVM board to make use of the functions sh7367_map_io() and sh7367_add_early_devices(). Signed-off-by:
-
Magnus Damm authored
Now when all clk_ops have been renamed it is safe to rename clk_ops to sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert remaining sh board code to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert sh5 to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert sh4a SoCs to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert sh4 SoCs to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert sh3 SoCs to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert sh2a SoCs to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert sh2 to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert the sh include asm/clock.h to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert r8a7779 to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert r8a7740 to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert sh73a0 to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert sh7372 to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert sh7377 to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert sh7367 to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Convert the CPG code to use sh_clk_ops. Signed-off-by:
-
Magnus Damm authored
Introduce sh_clk_ops in parallel with clk_ops. Signed-off-by:
-
