summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-koelsch-reference.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-11-06 19:40:01 +0900
committerSimon Horman <horms+renesas@verge.net.au>2013-12-10 17:24:23 +0900
commit6d75bc6439ec3f4ae45db1e501177382d0582591 (patch)
tree1e8bcfe9d684187a6caf737245185b86847d4e96 /arch/arm/mach-shmobile/board-koelsch-reference.c
parent478e2f9ca5ac9862a5cac0798814ba7d6a5de002 (diff)
downloadlinux-6d75bc6439ec3f4ae45db1e501177382d0582591.tar.bz2
ARM: shmobile: Initial r8a7791 and Koelsch multiplatform support
Add Koelsch and r8a7791 to CONFIG_SHMOBILE_MULTI. At this point CCF is not yet supported so you cannot run this code yet. For CCF support to happen several different components are needed, and this is one simple portion that moves us forward. Other patches need to build on top of this one. Koelsch board support exists in 3 flavors: 1) SHMOBILE_MULTI, MACH_KOELSCH - board-koelsch-reference.c (CCF + DT) 2) SHMOBILE, MACH_KOELSCH_REFERENCE - board-koelsch-reference.c (DT) 3) SHMOBILE, MACH_KOELSCH - board-koelsch.c (legacy C code) When CCF is done then 2) will be removed. When 1) includes same features as 3) then 3) will be removed. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/board-koelsch-reference.c')
-rw-r--r--arch/arm/mach-shmobile/board-koelsch-reference.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index beecc8bb510f..25b558f462a3 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <linux/clk-provider.h>
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <mach/rcar-gen2.h>
@@ -27,7 +28,11 @@
static void __init koelsch_add_standard_devices(void)
{
+#ifdef CONFIG_COMMON_CLK
+ of_clk_init(NULL);
+#else
r8a7791_clock_init();
+#endif
r8a7791_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}