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

Commit e5a0be94 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-soc-5.2' of... 

Merge tag 'samsung-soc-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc

Samsung mach/soc changes for v5.2

1. Cleanup in mach code.
2. Add necessary fixes for Suspend to RAM on Exynos5422 boards (tested
   with Odroid XU3/XU4/HC1 family).  Finally this brings a working S2R
   on these Odroid boards (still other drivers might have some issues
   but mach code seems to be finished).
3. Require MCPM for Exynos542x boards because otherwise not all of cores
   will come online.
4. GPIO regulator cleanup on S3C6410 Craig.

* tag 'samsung-soc-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: s3c64xx: Tidy up handling of regulator GPIO lookups
  ARM: exynos: Set MCPM as mandatory for Exynos542x/5800 SoCs
  ARM: exynos: Fix infinite loops on CPU powerup failure
  ARM: exynos: Fix a leaked reference by adding missing of_node_put
  ARM: exynos: Fix undefined instruction during Exynos5422 resume
  ARM: exynos: Add CPU state management for Exynos542x under secure firmware
  ARM: exynos: Add Exynos SMC values for secure memory write
  ARM: exynos: Move Exynos542x CPU state reset to pm_prepare()

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e6398613 7676e667

arch/arm/configs/exynos_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_EXYNOS=y

CONFIG_ARCH_EXYNOS=y

CONFIG_ARCH_EXYNOS3=y

CONFIG_ARCH_EXYNOS3=y

CONFIG_EXYNOS5420_MCPM=y

CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_BIG_LITTLE=y

CONFIG_BIG_LITTLE=y

CONFIG_NR_CPUS=8

CONFIG_NR_CPUS=8

arch/arm/configs/multi_v7_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ CONFIG_MACH_BERLIN_BG2CD=y 
CONFIG_MACH_BERLIN_BG2Q=y

CONFIG_MACH_BERLIN_BG2Q=y

CONFIG_ARCH_DIGICOLOR=y

CONFIG_ARCH_DIGICOLOR=y

CONFIG_ARCH_EXYNOS=y

CONFIG_ARCH_EXYNOS=y

CONFIG_EXYNOS5420_MCPM=y

CONFIG_ARCH_HIGHBANK=y

CONFIG_ARCH_HIGHBANK=y

CONFIG_ARCH_HISI=y

CONFIG_ARCH_HISI=y

CONFIG_ARCH_HI3xxx=y

CONFIG_ARCH_HI3xxx=y

arch/arm/mach-exynos/Kconfig

+3 −9
Original line number Original line Diff line number Diff line
@@ -106,21 +106,15 @@ config SOC_EXYNOS5420 
	bool "SAMSUNG EXYNOS5420"

	bool "SAMSUNG EXYNOS5420"

	default y

	default y

	depends on ARCH_EXYNOS5

	depends on ARCH_EXYNOS5

	select MCPM if SMP

	select ARM_CCI400_PORT_CTRL

	select ARM_CPU_SUSPEND





config SOC_EXYNOS5800

config SOC_EXYNOS5800

	bool "SAMSUNG EXYNOS5800"

	bool "SAMSUNG EXYNOS5800"

	default y

	default y

	depends on SOC_EXYNOS5420

	depends on SOC_EXYNOS5420





config EXYNOS5420_MCPM

	bool "Exynos5420 Multi-Cluster PM support"

	depends on MCPM && SOC_EXYNOS5420

	select ARM_CCI400_PORT_CTRL

	select ARM_CPU_SUSPEND

	help

	  This is needed to provide CPU and cluster power management

	  on Exynos5420 implementing big.LITTLE.



config EXYNOS_CPU_SUSPEND

config EXYNOS_CPU_SUSPEND

	bool

	bool

	select ARM_CPU_SUSPEND

	select ARM_CPU_SUSPEND

arch/arm/mach-exynos/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,5 +18,5 @@ plus_sec := $(call as-instr,.arch_extension sec,+sec) 
AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)

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

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

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





obj-$(CONFIG_EXYNOS5420_MCPM)	+= mcpm-exynos.o

obj-$(CONFIG_MCPM)		+= mcpm-exynos.o

CFLAGS_mcpm-exynos.o		+= -march=armv7-a
 
CFLAGS_mcpm-exynos.o		+= -march=armv7-a

arch/arm/mach-exynos/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -91,6 +91,7 @@ extern u32 cp15_save_power; 




extern void __iomem *sysram_ns_base_addr;

extern void __iomem *sysram_ns_base_addr;

extern void __iomem *sysram_base_addr;

extern void __iomem *sysram_base_addr;

extern phys_addr_t sysram_base_phys;

extern void __iomem *pmu_base_addr;

extern void __iomem *pmu_base_addr;

void exynos_sysram_init(void);

void exynos_sysram_init(void);