Commit 45984f0c authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: samsung: Rename Samsung and Exynos to lowercase 

Fix up inconsistent usage of upper and lowercase letters in "Samsung"
and "Exynos" names.

"SAMSUNG" and "EXYNOS" are not abbreviations but regular trademarked
names.  Therefore they should be written with lowercase letters starting
with capital letter.

The lowercase "Exynos" name is promoted by its manufacturer Samsung
Electronics Co., Ltd., in advertisement materials and on website.

Although advertisement materials usually use uppercase "SAMSUNG", the
lowercase version is used in all legal aspects (e.g. on Wikipedia and in
privacy/legal statements on
https://www.samsung.com/semiconductor/privacy-global/

).

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent ad097ab0

arch/arm/mach-exynos/Kconfig

+18 −18
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

#		http://www.samsung.com/



# Configuration options for the EXYNOS

# Configuration options for the Samsung Exynos



menuconfig ARCH_EXYNOS

	bool "Samsung EXYNOS"

	bool "Samsung Exynos"

	depends on ARCH_MULTI_V7

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_SUPPORTS_BIG_ENDIAN
@@ -41,7 +41,7 @@ menuconfig ARCH_EXYNOS 
	select POWER_RESET_SYSCON

	select POWER_RESET_SYSCON_POWEROFF

	help

	  Support for SAMSUNG EXYNOS SoCs

	  Support for Samsung Exynos SoCs



if ARCH_EXYNOS
@@ -51,14 +51,14 @@ config S5P_DEV_MFC 
	  Compile in setup memory (init) code for MFC



config ARCH_EXYNOS3

	bool "SAMSUNG EXYNOS3"

	bool "Samsung Exynos3"

	default y

	select ARM_CPU_SUSPEND if PM

	help

	  Samsung EXYNOS3 (Cortex-A7) SoC based systems

	  Samsung Exynos3 (Cortex-A7) SoC based systems



config ARCH_EXYNOS4

	bool "SAMSUNG EXYNOS4"

	bool "Samsung Exynos4"

	default y

	select ARM_CPU_SUSPEND if PM_SLEEP

	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
@@ -66,48 +66,48 @@ config ARCH_EXYNOS4 
	select GIC_NON_BANKED

	select MIGHT_HAVE_CACHE_L2X0

	help

	  Samsung EXYNOS4 (Cortex-A9) SoC based systems

	  Samsung Exynos4 (Cortex-A9) SoC based systems



config ARCH_EXYNOS5

	bool "SAMSUNG EXYNOS5"

	bool "Samsung Exynos5"

	default y

	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

	bool "SAMSUNG EXYNOS3250"

	bool "Samsung Exynos3250"

	default y

	depends on ARCH_EXYNOS3



config CPU_EXYNOS4210

	bool "SAMSUNG EXYNOS4210"

	bool "Samsung Exynos4210"

	default y

	depends on ARCH_EXYNOS4



config SOC_EXYNOS4412

	bool "SAMSUNG EXYNOS4412"

	bool "Samsung Exynos4412"

	default y

	depends on ARCH_EXYNOS4



config SOC_EXYNOS5250

	bool "SAMSUNG EXYNOS5250"

	bool "Samsung Exynos5250"

	default y

	depends on ARCH_EXYNOS5



config SOC_EXYNOS5260

	bool "SAMSUNG EXYNOS5260"

	bool "Samsung Exynos5260"

	default y

	depends on ARCH_EXYNOS5



config SOC_EXYNOS5410

	bool "SAMSUNG EXYNOS5410"

	bool "Samsung Exynos5410"

	default y

	depends on ARCH_EXYNOS5



config SOC_EXYNOS5420

	bool "SAMSUNG EXYNOS5420"

	bool "Samsung Exynos5420"

	default y

	depends on ARCH_EXYNOS5

	select EXYNOS_MCPM if SMP
@@ -115,7 +115,7 @@ config SOC_EXYNOS5420 
	select ARM_CPU_SUSPEND



config SOC_EXYNOS5800

	bool "SAMSUNG EXYNOS5800"

	bool "Samsung EXYNOS5800"

	default y

	depends on SOC_EXYNOS5420

arch/arm/mach-exynos/common.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Common Header for EXYNOS machines

 * Common Header for Exynos machines

 */



#ifndef __ARCH_ARM_MACH_EXYNOS_COMMON_H

arch/arm/mach-exynos/exynos.c

+2 −2
Original line number Diff line number Diff line 
// 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.

//		http://www.samsung.com
@@ -192,7 +192,7 @@ static void __init exynos_dt_fixup(void) 
	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_mask	= 0xc20fffff,

	.smp		= smp_ops(exynos_smp_ops),

arch/arm/mach-exynos/include/mach/map.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *

 * EXYNOS - Memory map definitions

 * Exynos - Memory map definitions

 */



#ifndef __ASM_ARCH_MAP_H

arch/arm/mach-exynos/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
// Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.

//		http://www.samsung.com

//

// EXYNOS - Power Management support

// Exynos - Power Management support

//

// Based on arch/arm/mach-s3c2410/pm.c

// Copyright (c) 2006 Simtec Electronics

CRA Git | Maintained and supported by SUSTech CRA and CCSE