Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fbf0c85 authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

ARM: EXYNOS: allow dt based discovery of mct controller using clocksource_of_init 



Add entries to __clksrc_of_table so that Exynos MCT controller is
discoverable using call to clocksource_of_init. With this change,
it would be appropriate to rename the function 'exynos4_timer_init'
as 'mct_init' since it aptly describes this function. Additionally,
the 'init_time' callback of all machine descriptors for exynos
platforms that were previously set to 'exynos4_timer_init' are now
set to either 'mct_init' or 'clocksource_of_init'.

Cc: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 36ba5d52

arch/arm/mach-exynos/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ config MACH_EXYNOS4_DT 
	bool "Samsung Exynos4 Machine using device tree"

	depends on ARCH_EXYNOS4

	select ARM_AMBA

	select CLKSRC_OF

	select CPU_EXYNOS4210

	select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD

	select PINCTRL
@@ -422,6 +423,7 @@ config MACH_EXYNOS5_DT 
	default y

	depends on ARCH_EXYNOS5

	select ARM_AMBA

	select CLKSRC_OF

	select USE_OF

	help

	  Machine support for Samsung EXYNOS5 machine with device tree enabled.

arch/arm/mach-exynos/common.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H

#define __ARCH_ARM_MACH_EXYNOS_COMMON_H



extern void exynos4_timer_init(void);

extern void mct_init(void);



struct map_desc;

void exynos_init_io(struct map_desc *mach_desc, int size);

arch/arm/mach-exynos/mach-armlex4210.c

+1 −1
Original line number Diff line number Diff line
@@ -202,6 +202,6 @@ MACHINE_START(ARMLEX4210, "ARMLEX4210") 
	.map_io		= armlex4210_map_io,

	.init_machine	= armlex4210_machine_init,

	.init_late	= exynos_init_late,

	.init_time	= exynos4_timer_init,

	.init_time	= mct_init,

	.restart	= exynos4_restart,

MACHINE_END

arch/arm/mach-exynos/mach-exynos4-dt.c

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <linux/of_platform.h>

#include <linux/serial_core.h>

#include <linux/clocksource.h>



#include <asm/mach/arch.h>

#include <mach/map.h>
@@ -142,7 +143,7 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") 
	.map_io		= exynos4_dt_map_io,

	.init_machine	= exynos4_dt_machine_init,

	.init_late	= exynos_init_late,

	.init_time	= exynos4_timer_init,

	.init_time	= clocksource_of_init,

	.dt_compat	= exynos4_dt_compat,

	.restart        = exynos4_restart,

MACHINE_END

arch/arm/mach-exynos/mach-exynos5-dt.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/serial_core.h>

#include <linux/memblock.h>

#include <linux/io.h>

#include <linux/clocksource.h>



#include <asm/mach/arch.h>

#include <mach/map.h>
@@ -216,7 +217,7 @@ DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") 
	.map_io		= exynos5_dt_map_io,

	.init_machine	= exynos5_dt_machine_init,

	.init_late	= exynos_init_late,

	.init_time	= exynos4_timer_init,

	.init_time	= clocksource_of_init,

	.dt_compat	= exynos5_dt_compat,

	.restart        = exynos5_restart,

	.reserve	= exynos5_reserve,