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

Commit 7a4c66d0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-drivers-4.9-2' of... 

Merge tag 'samsung-drivers-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers

Pull "Samsung drivers/soc update for v4.9" from Krzysztof Kozlowski:

1. Allow compile testing of exynos-mct clocksource driver on ARM64.
2. Document Exynos5433 PMU compatible (already used by clkout driver and more
   will be coming soon).

* tag 'samsung-drivers-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  dt-bindings: EXYNOS: Add Exynos5433 PMU compatible
  clocksource: exynos_mct: Add the support for ARM64
parents 70e05883 8bc6bf17

Documentation/devicetree/bindings/arm/samsung/pmu.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Properties: 
		   - "samsung,exynos5260-pmu" - for Exynos5260 SoC.

		   - "samsung,exynos5410-pmu" - for Exynos5410 SoC,

		   - "samsung,exynos5420-pmu" - for Exynos5420 SoC.

		   - "samsung,exynos5433-pmu" - for Exynos5433 SoC.

		   - "samsung,exynos7-pmu" - for Exynos7 SoC.

		second value must be always "syscon".

drivers/clocksource/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ config CLKSRC_METAG_GENERIC 


config CLKSRC_EXYNOS_MCT

	bool "Exynos multi core timer driver" if COMPILE_TEST

	depends on ARM

	depends on ARM || ARM64

	help

	  Support for Multi Core Timer controller on Exynos SoCs.

drivers/clocksource/exynos_mct.c

+4 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ static u64 notrace exynos4_read_sched_clock(void) 
	return exynos4_read_count_32();

}



#if defined(CONFIG_ARM)

static struct delay_timer exynos4_delay_timer;



static cycles_t exynos4_read_current_timer(void)
@@ -231,14 +232,17 @@ static cycles_t exynos4_read_current_timer(void) 
			 "cycles_t needs to move to 32-bit for ARM64 usage");

	return exynos4_read_count_32();

}

#endif



static int __init exynos4_clocksource_init(void)

{

	exynos4_mct_frc_start();



#if defined(CONFIG_ARM)

	exynos4_delay_timer.read_current_timer = &exynos4_read_current_timer;

	exynos4_delay_timer.freq = clk_rate;

	register_current_timer_delay(&exynos4_delay_timer);

#endif



	if (clocksource_register_hz(&mct_frc, clk_rate))

		panic("%s: can't register clocksource\n", mct_frc.name);