Skip to content

L
linux
Commit e4b072cc authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

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

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

Samsung mach/soc changes for v5.6

Cleanups (Samsung and Exynos names, Kconfig help text correction).

* tag 'samsung-soc-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: samsung: Rename Samsung and Exynos to lowercase
  ARM: exynos: Correct the help text for platform Kconfig option

Link: https://lore.kernel.org/r/20200110172334.4767-4-krzk@kernel.orgSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3a4252da 45984f0c
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
arch/arm/mach-exynos/Kconfig
View file @ e4b072cc
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. # Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
# http://www.samsung.com/ # http://www.samsung.com/
# Configuration options for the EXYNOS # Configuration options for the Samsung Exynos
menuconfig ARCH_EXYNOS menuconfig ARCH_EXYNOS
bool "Samsung EXYNOS" bool "Samsung Exynos"
depends on ARCH_MULTI_V7 depends on ARCH_MULTI_V7
select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_HAS_HOLES_MEMORYMODEL
select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_SUPPORTS_BIG_ENDIAN
...@@ -41,7 +41,7 @@ menuconfig ARCH_EXYNOS ...@@ -41,7 +41,7 @@ menuconfig ARCH_EXYNOS
select POWER_RESET_SYSCON select POWER_RESET_SYSCON
select POWER_RESET_SYSCON_POWEROFF select POWER_RESET_SYSCON_POWEROFF
help help
Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5) Support for Samsung Exynos SoCs
if ARCH_EXYNOS if ARCH_EXYNOS
...@@ -51,14 +51,14 @@ config S5P_DEV_MFC ...@@ -51,14 +51,14 @@ config S5P_DEV_MFC
Compile in setup memory (init) code for MFC Compile in setup memory (init) code for MFC
config ARCH_EXYNOS3 config ARCH_EXYNOS3
bool "SAMSUNG EXYNOS3" bool "Samsung Exynos3"
default y default y
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
help help
Samsung EXYNOS3 (Cortex-A7) SoC based systems Samsung Exynos3 (Cortex-A7) SoC based systems
config ARCH_EXYNOS4 config ARCH_EXYNOS4
bool "SAMSUNG EXYNOS4" bool "Samsung Exynos4"
default y default y
select ARM_CPU_SUSPEND if PM_SLEEP select ARM_CPU_SUSPEND if PM_SLEEP
select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
...@@ -66,48 +66,48 @@ config ARCH_EXYNOS4 ...@@ -66,48 +66,48 @@ config ARCH_EXYNOS4
select GIC_NON_BANKED select GIC_NON_BANKED
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
help help
Samsung EXYNOS4 (Cortex-A9) SoC based systems Samsung Exynos4 (Cortex-A9) SoC based systems
config ARCH_EXYNOS5 config ARCH_EXYNOS5
bool "SAMSUNG EXYNOS5" bool "Samsung Exynos5"
default y default y
help help
Samsung EXYNOS5 (Cortex-A15/A7) SoC based systems Samsung Exynos5 (Cortex-A15/A7) SoC based systems
comment "EXYNOS SoCs" comment "Exynos SoCs"
config SOC_EXYNOS3250 config SOC_EXYNOS3250
bool "SAMSUNG EXYNOS3250" bool "Samsung Exynos3250"
default y default y
depends on ARCH_EXYNOS3 depends on ARCH_EXYNOS3
config CPU_EXYNOS4210 config CPU_EXYNOS4210
bool "SAMSUNG EXYNOS4210" bool "Samsung Exynos4210"
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
config SOC_EXYNOS4412 config SOC_EXYNOS4412
bool "SAMSUNG EXYNOS4412" bool "Samsung Exynos4412"
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
config SOC_EXYNOS5250 config SOC_EXYNOS5250
bool "SAMSUNG EXYNOS5250" bool "Samsung Exynos5250"
default y default y
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
config SOC_EXYNOS5260 config SOC_EXYNOS5260
bool "SAMSUNG EXYNOS5260" bool "Samsung Exynos5260"
default y default y
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
config SOC_EXYNOS5410 config SOC_EXYNOS5410
bool "SAMSUNG EXYNOS5410" bool "Samsung Exynos5410"
default y default y
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
config SOC_EXYNOS5420 config SOC_EXYNOS5420
bool "SAMSUNG EXYNOS5420" bool "Samsung Exynos5420"
default y default y
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
select EXYNOS_MCPM if SMP select EXYNOS_MCPM if SMP
...@@ -115,7 +115,7 @@ config SOC_EXYNOS5420 ...@@ -115,7 +115,7 @@ config SOC_EXYNOS5420
select ARM_CPU_SUSPEND 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
......
arch/arm/mach-exynos/common.h
View file @ e4b072cc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Copyright (c) 2011 Samsung Electronics Co., Ltd. * Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com * http://www.samsung.com
* *
* Common Header for EXYNOS machines * Common Header for Exynos machines
*/ */
#ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H #ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H
......
arch/arm/mach-exynos/exynos.c
View file @ e4b072cc
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
// //
// SAMSUNG EXYNOS Flattened Device Tree enabled machine // Samsung Exynos Flattened Device Tree enabled machine
// //
// Copyright (c) 2010-2014 Samsung Electronics Co., Ltd. // Copyright (c) 2010-2014 Samsung Electronics Co., Ltd.
// http://www.samsung.com // http://www.samsung.com
...@@ -192,7 +192,7 @@ static void __init exynos_dt_fixup(void) ...@@ -192,7 +192,7 @@ static void __init exynos_dt_fixup(void)
of_fdt_limit_memory(8); of_fdt_limit_memory(8);
} }
DT_MACHINE_START(EXYNOS_DT, "SAMSUNG EXYNOS (Flattened Device Tree)") DT_MACHINE_START(EXYNOS_DT, "Samsung Exynos (Flattened Device Tree)")
.l2c_aux_val = 0x3c400001, .l2c_aux_val = 0x3c400001,
.l2c_aux_mask = 0xc20fffff, .l2c_aux_mask = 0xc20fffff,
.smp = smp_ops(exynos_smp_ops), .smp = smp_ops(exynos_smp_ops),
......
arch/arm/mach-exynos/include/mach/map.h
View file @ e4b072cc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/ * http://www.samsung.com/
* *
* EXYNOS - Memory map definitions * Exynos - Memory map definitions
*/ */
#ifndef __ASM_ARCH_MAP_H #ifndef __ASM_ARCH_MAP_H
......
arch/arm/mach-exynos/pm.c
View file @ e4b072cc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Copyright (c) 2011-2014 Samsung Electronics Co., Ltd. // Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
// http://www.samsung.com // http://www.samsung.com
// //
// EXYNOS - Power Management support // Exynos - Power Management support
// //
// Based on arch/arm/mach-s3c2410/pm.c // Based on arch/arm/mach-s3c2410/pm.c
// Copyright (c) 2006 Simtec Electronics // Copyright (c) 2006 Simtec Electronics
......
arch/arm/mach-exynos/smc.h
View file @ e4b072cc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
* Copyright (c) 2012 Samsung Electronics. * Copyright (c) 2012 Samsung Electronics.
* *
* EXYNOS - SMC Call * Exynos - SMC Call
*/ */
#ifndef __ASM_ARCH_EXYNOS_SMC_H #ifndef __ASM_ARCH_EXYNOS_SMC_H
......
arch/arm/mach-exynos/suspend.c
View file @ e4b072cc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Copyright (c) 2011-2014 Samsung Electronics Co., Ltd. // Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
// http://www.samsung.com // http://www.samsung.com
// //
// EXYNOS - Suspend support // Exynos - Suspend support
// //
// Based on arch/arm/mach-s3c2410/pm.c // Based on arch/arm/mach-s3c2410/pm.c
// Copyright (c) 2006 Simtec Electronics // Copyright (c) 2006 Simtec Electronics
......
arch/arm/mach-s3c24xx/Kconfig
View file @ e4b072cc
...@@ -19,12 +19,12 @@ config PLAT_S3C24XX ...@@ -19,12 +19,12 @@ config PLAT_S3C24XX
menu "SAMSUNG S3C24XX SoCs Support" menu "Samsung S3C24XX SoCs Support"
comment "S3C24XX SoCs" comment "S3C24XX SoCs"
config CPU_S3C2410 config CPU_S3C2410
bool "SAMSUNG S3C2410" bool "Samsung S3C2410"
default y default y
select CPU_ARM920T select CPU_ARM920T
select S3C2410_COMMON_CLK select S3C2410_COMMON_CLK
...@@ -35,7 +35,7 @@ config CPU_S3C2410 ...@@ -35,7 +35,7 @@ config CPU_S3C2410
of Samsung Mobile CPUs. of Samsung Mobile CPUs.
config CPU_S3C2412 config CPU_S3C2412
bool "SAMSUNG S3C2412" bool "Samsung S3C2412"
select CPU_ARM926T select CPU_ARM926T
select S3C2412_COMMON_CLK select S3C2412_COMMON_CLK
select S3C2412_PM if PM_SLEEP select S3C2412_PM if PM_SLEEP
...@@ -43,7 +43,7 @@ config CPU_S3C2412 ...@@ -43,7 +43,7 @@ config CPU_S3C2412
Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
config CPU_S3C2416 config CPU_S3C2416
bool "SAMSUNG S3C2416/S3C2450" bool "Samsung S3C2416/S3C2450"
select CPU_ARM926T select CPU_ARM926T
select S3C2416_PM if PM_SLEEP select S3C2416_PM if PM_SLEEP
select S3C2443_COMMON_CLK select S3C2443_COMMON_CLK
...@@ -51,7 +51,7 @@ config CPU_S3C2416 ...@@ -51,7 +51,7 @@ config CPU_S3C2416
Support for the S3C2416 SoC from the S3C24XX line Support for the S3C2416 SoC from the S3C24XX line
config CPU_S3C2440 config CPU_S3C2440
bool "SAMSUNG S3C2440" bool "Samsung S3C2440"
select CPU_ARM920T select CPU_ARM920T
select S3C2410_COMMON_CLK select S3C2410_COMMON_CLK
select S3C2410_PM if PM_SLEEP select S3C2410_PM if PM_SLEEP
...@@ -59,7 +59,7 @@ config CPU_S3C2440 ...@@ -59,7 +59,7 @@ config CPU_S3C2440
Support for S3C2440 Samsung Mobile CPU based systems. Support for S3C2440 Samsung Mobile CPU based systems.
config CPU_S3C2442 config CPU_S3C2442
bool "SAMSUNG S3C2442" bool "Samsung S3C2442"
select CPU_ARM920T select CPU_ARM920T
select S3C2410_COMMON_CLK select S3C2410_COMMON_CLK
select S3C2410_PM if PM_SLEEP select S3C2410_PM if PM_SLEEP
...@@ -71,7 +71,7 @@ config CPU_S3C244X ...@@ -71,7 +71,7 @@ config CPU_S3C244X
depends on CPU_S3C2440 || CPU_S3C2442 depends on CPU_S3C2440 || CPU_S3C2442
config CPU_S3C2443 config CPU_S3C2443
bool "SAMSUNG S3C2443" bool "Samsung S3C2443"
select CPU_ARM920T select CPU_ARM920T
select S3C2443_COMMON_CLK select S3C2443_COMMON_CLK
help help
...@@ -591,6 +591,6 @@ config PM_H1940 ...@@ -591,6 +591,6 @@ config PM_H1940
help help
Internal node for H1940 and related PM Internal node for H1940 and related PM
endmenu # SAMSUNG S3C24XX SoCs Support endmenu # Samsung S3C24XX SoCs Support
endif # ARCH_S3C24XX endif # ARCH_S3C24XX
arch/arm/plat-samsung/adc.c
View file @ e4b072cc
...@@ -40,7 +40,7 @@ enum s3c_cpu_type { ...@@ -40,7 +40,7 @@ enum s3c_cpu_type {
TYPE_ADCV11, /* S3C2443 */ TYPE_ADCV11, /* S3C2443 */
TYPE_ADCV12, /* S3C2416, S3C2450 */ TYPE_ADCV12, /* S3C2416, S3C2450 */
TYPE_ADCV2, /* S3C64XX */ TYPE_ADCV2, /* S3C64XX */
TYPE_ADCV3, /* S5PV210, S5PC110, EXYNOS4210 */ TYPE_ADCV3, /* S5PV210, S5PC110, Exynos4210 */
}; };
struct s3c_adc_client { struct s3c_adc_client {
......
arch/arm/plat-samsung/devs.c
View file @ e4b072cc
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// Copyright (c) 2011 Samsung Electronics Co., Ltd. // Copyright (c) 2011 Samsung Electronics Co., Ltd.
// http://www.samsung.com // http://www.samsung.com
// //
// Base SAMSUNG platform device definitions // Base Samsung platform device definitions
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
......
arch/arm/plat-samsung/gpio-samsung.c
View file @ e4b072cc
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// Ben Dooks <ben@simtec.co.uk> // Ben Dooks <ben@simtec.co.uk>
// http://armlinux.simtec.co.uk/ // http://armlinux.simtec.co.uk/
// //
// SAMSUNG - GPIOlib support // Samsung - GPIOlib support
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/irq.h> #include <linux/irq.h>
......
arch/arm/plat-samsung/include/plat/samsung-time.h
View file @ e4b072cc
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef __ASM_PLAT_SAMSUNG_TIME_H #ifndef __ASM_PLAT_SAMSUNG_TIME_H
#define __ASM_PLAT_SAMSUNG_TIME_H __FILE__ #define __ASM_PLAT_SAMSUNG_TIME_H __FILE__
/* SAMSUNG HR-Timer Clock mode */ /* Samsung HR-Timer Clock mode */
enum samsung_timer_mode { enum samsung_timer_mode {
SAMSUNG_PWM0, SAMSUNG_PWM0,
SAMSUNG_PWM1, SAMSUNG_PWM1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7