Commit 5c5ee5e7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-exynos-v3.19' of... 

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

Pull "Samsung exynos updates in arch/arm/mach-exynos/ for v3.19" from Kukjin Kim:

- add SOC_EXYNOS4415 config to be used in audio driver
- add support platform driver for exynos PMU
- move PMU specific definitions from common.h to exynos-pmu.h
- for exynos5420, add support PMU and Suspend-to-RAM
  use MCPM call backs and call regulator core suspend prepare
  and finish functions

NOTE:
including v3.19-next/non-critical-fixes, v3.19-next/cleanup-samsung
and v3.19-next/pm-samsung-2 branches

* tag 'samsung-exynos-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: Call regulator core suspend prepare and finish functions
  ARM: EXYNOS: Use MCPM call-backs to support S2R on exynos5420
  ARM: EXYNOS: Add Suspend-to-RAM support for exynos5420
  ARM: EXYNOS: Add PMU support for exynos5420
  ARM: EXYNOS: Move PMU specific definitions from common.h
  ARM: EXYNOS: Add platform driver support for Exynos PMU
  ARM: EXYNOS: Add support for exynos4415 SoC
  ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"
  ARM: EXYNOS: Fix CPU idle clock down after CPU off
  ARM: EXYNOS: Remove unneeded __ref annotation for cpu_die function
  ARM: EXYNOS: Move code from hotplug.c to platsmp.c

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6febbf47 c645a598

arch/arm/mach-exynos/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ menuconfig ARCH_EXYNOS 
	select PM_GENERIC_DOMAINS if PM_RUNTIME

	select S5P_DEV_MFC

	select SRAM

	select MFD_SYSCON

	help

	  Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)
@@ -75,6 +76,11 @@ config SOC_EXYNOS4412 
	default y

	depends on ARCH_EXYNOS4



config SOC_EXYNOS4415

	bool "SAMSUNG EXYNOS4415"

	default y

	depends on ARCH_EXYNOS4



config SOC_EXYNOS5250

	bool "SAMSUNG EXYNOS5250"

	default y

arch/arm/mach-exynos/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o 


obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o



obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

CFLAGS_hotplug.o		+= -march=armv7-a



plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)

AFLAGS_sleep.o			:=-Wa,-march=armv7-a$(plus_sec)

arch/arm/mach-exynos/common.h

+0 −19
Original line number Diff line number Diff line
@@ -139,25 +139,6 @@ extern void exynos_cpu_resume_ns(void); 


extern struct smp_operations exynos_smp_ops;



extern void exynos_cpu_die(unsigned int cpu);



/* PMU(Power Management Unit) support */



#define PMU_TABLE_END	(-1U)



enum sys_powerdown {

	SYS_AFTR,

	SYS_LPA,

	SYS_SLEEP,

	NUM_SYS_POWERDOWN,

};



struct exynos_pmu_conf {

	unsigned int offset;

	unsigned int val[NUM_SYS_POWERDOWN];

};



extern void exynos_sys_powerdown_conf(enum sys_powerdown mode);

extern void exynos_cpu_power_down(int cpu);

extern void exynos_cpu_power_up(int cpu);

extern int  exynos_cpu_power_state(int cpu);

arch/arm/mach-exynos/exynos-pmu.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Header for EXYNOS PMU Driver support

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __EXYNOS_PMU_H

#define __EXYNOS_PMU_H



enum sys_powerdown {

	SYS_AFTR,

	SYS_LPA,

	SYS_SLEEP,

	NUM_SYS_POWERDOWN,

};



extern void exynos_sys_powerdown_conf(enum sys_powerdown mode);



#endif /* __EXYNOS_PMU_H */

arch/arm/mach-exynos/exynos.c

+2 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ static const struct of_device_id exynos_dt_pmu_match[] = { 
	{ .compatible = "samsung,exynos4210-pmu" },

	{ .compatible = "samsung,exynos4212-pmu" },

	{ .compatible = "samsung,exynos4412-pmu" },

	{ .compatible = "samsung,exynos4415-pmu" },

	{ .compatible = "samsung,exynos5250-pmu" },

	{ .compatible = "samsung,exynos5260-pmu" },

	{ .compatible = "samsung,exynos5410-pmu" },
@@ -336,6 +337,7 @@ static char const *exynos_dt_compat[] __initconst = { 
	"samsung,exynos4210",

	"samsung,exynos4212",

	"samsung,exynos4412",

	"samsung,exynos4415",

	"samsung,exynos5",

	"samsung,exynos5250",

	"samsung,exynos5260",

CRA Git | Maintained and supported by SUSTech CRA and CCSE