diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-29 08:04:41 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-29 08:04:41 +0200 |
| commit | e5a0be94ee8bc56e5594bae19512fb6e431f7c13 (patch) | |
| tree | 4d2ebeda71f6d26b1999b794b1f2b52fde500f02 /arch/arm/configs | |
| parent | Merge tag 'omap-for-v5.2/ti-sysc-signed' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | ARM: s3c64xx: Tidy up handling of regulator GPIO lookups (diff) | |
| download | linux-e5a0be94ee8bc56e5594bae19512fb6e431f7c13.tar.xz linux-e5a0be94ee8bc56e5594bae19512fb6e431f7c13.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/exynos_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index d635edfb6ff2..c95c54284da2 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -9,7 +9,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS3=y -CONFIG_EXYNOS5420_MCPM=y CONFIG_SMP=y CONFIG_BIG_LITTLE=y CONFIG_NR_CPUS=8 diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index c75051b9392c..e4b5fd46fdef 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -33,7 +33,6 @@ CONFIG_MACH_BERLIN_BG2CD=y CONFIG_MACH_BERLIN_BG2Q=y CONFIG_ARCH_DIGICOLOR=y CONFIG_ARCH_EXYNOS=y -CONFIG_EXYNOS5420_MCPM=y CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_HISI=y CONFIG_ARCH_HI3xxx=y |