Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge tag 'samsung-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/late

Samsung SoC updates for v4.3

- add compatible string to exynos_cpufreq_matchs to switch for
  supporting generic cpufreq driver for exynos3250, 4210, 4212
  and 5250 SoCs in mach-exynos/

* tag 'samsung-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: switch to using generic cpufreq driver for exynos4x12
  ARM: EXYNOS: Add exynos3250 compatible to use generic cpufreq driver
  ARM: EXYNOS: switch to using generic cpufreq driver for exynos5250

Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson 10 years ago
parent
819167e7a0 bdd2648e50
commit
418012fbe5
2 changed files with 6 additions and 0 deletions
Split View Show Diff Stats
  1. 2 0
      arch/arm/mach-exynos/Kconfig
  2. 4 0
      arch/arm/mach-exynos/exynos.c

+ 2 - 0
arch/arm/mach-exynos/Kconfig
View File 

@@ -15,6 +15,7 @@ menuconfig ARCH_EXYNOS
 
 	select ARM_AMBA
 
 	select ARM_GIC
 
 	select COMMON_CLK_SAMSUNG
 
+	select EXYNOS_THERMAL
 
 	select HAVE_ARM_SCU if SMP
 
 	select HAVE_S3C2410_I2C if I2C
 
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 
@@ -24,6 +25,7 @@ menuconfig ARCH_EXYNOS
 
 	select PM_GENERIC_DOMAINS if PM
 
 	select S5P_DEV_MFC
 
 	select SRAM
 
+	select THERMAL
 
 	select MFD_SYSCON
 
 	help
 
 	  Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)

+ 4 - 0
arch/arm/mach-exynos/exynos.c
View File 

@@ -225,7 +225,11 @@ static void __init exynos_init_irq(void)
 
 }
 
 
 static const struct of_device_id exynos_cpufreq_matches[] = {
 
+	{ .compatible = "samsung,exynos3250", .data = "cpufreq-dt" },
 
 	{ .compatible = "samsung,exynos4210", .data = "cpufreq-dt" },
 
+	{ .compatible = "samsung,exynos4212", .data = "cpufreq-dt" },
 
+	{ .compatible = "samsung,exynos4412", .data = "cpufreq-dt" },
 
+	{ .compatible = "samsung,exynos5250", .data = "cpufreq-dt" },
 
 	{ /* sentinel */ }
 
 };