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: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 9fb045ab80e4df8dd3a18d19680a3e27cd498066..73ce92a0cdb256ddcd484afd41a66e0f952bb65e 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -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
 

diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index 56411bb63d45796d68049325904d3ecb35dbfae0..afd988a92836d248abcb1f016f1d1f76669ce8e9 100644 (file)
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -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

diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 9aa483366ebcbcde3597fe5e2a9911d2840508a4..7a8d1555db40409c5c0b0c186b8a3ac320628247 100644 (file)
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -1,6 +1,6 @@
 // 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),

diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 22ebe36546330c25a85112ce867e047ad28595cc..8d58faa54ff7da9ddcc1ce6cb12376f9bb0ee770 100644 (file)
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -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

diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index 48e7fb38613ebcd079bfdea7d45e27bc2501b812..78af34cc89cc940e2cc0ae3fbba512236722884a 100644 (file)
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -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

diff --git a/arch/arm/mach-exynos/smc.h b/arch/arm/mach-exynos/smc.h
index 98832e50852ddb2faa4e35c350ce5f5e368e4ca4..5c30feb8f07d9e34093e3f01ada566137ccf16e2 100644 (file)
--- a/arch/arm/mach-exynos/smc.h
+++ b/arch/arm/mach-exynos/smc.h
@@ -2,7 +2,7 @@
 /*
  *  Copyright (c) 2012 Samsung Electronics.
  *
- * EXYNOS - SMC Call
+ * Exynos - SMC Call
  */
 
 #ifndef __ASM_ARCH_EXYNOS_SMC_H

diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index 6a0d3448ea00862192682c8538f246570355a589..3bf14ca78b62b830b4321af0d3e5543ef7823a56 100644 (file)
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -3,7 +3,7 @@
 // Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
 //             http://www.samsung.com
 //
-// EXYNOS - Suspend support
+// Exynos - Suspend support
 //
 // Based on arch/arm/mach-s3c2410/pm.c
 // Copyright (c) 2006 Simtec Electronics

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 686f0bbde99886a651ee4ce3bc730e3112726af1..c5c06d98b147697ed45c5b73b3f3e9ef774cd08a 100644 (file)
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -19,12 +19,12 @@ config PLAT_S3C24XX
 
 
 
-menu "SAMSUNG S3C24XX SoCs Support"
+menu "Samsung S3C24XX SoCs Support"
 
 comment "S3C24XX SoCs"
 
 config CPU_S3C2410
-       bool "SAMSUNG S3C2410"
+       bool "Samsung S3C2410"
        default y
        select CPU_ARM920T
        select S3C2410_COMMON_CLK
@@ -35,7 +35,7 @@ config CPU_S3C2410
          of Samsung Mobile CPUs.
 
 config CPU_S3C2412
-       bool "SAMSUNG S3C2412"
+       bool "Samsung S3C2412"
        select CPU_ARM926T
        select S3C2412_COMMON_CLK
        select S3C2412_PM if PM_SLEEP
@@ -43,7 +43,7 @@ config CPU_S3C2412
          Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
 
 config CPU_S3C2416
-       bool "SAMSUNG S3C2416/S3C2450"
+       bool "Samsung S3C2416/S3C2450"
        select CPU_ARM926T
        select S3C2416_PM if PM_SLEEP
        select S3C2443_COMMON_CLK
@@ -51,7 +51,7 @@ config CPU_S3C2416
          Support for the S3C2416 SoC from the S3C24XX line
 
 config CPU_S3C2440
-       bool "SAMSUNG S3C2440"
+       bool "Samsung S3C2440"
        select CPU_ARM920T
        select S3C2410_COMMON_CLK
        select S3C2410_PM if PM_SLEEP
@@ -59,7 +59,7 @@ config CPU_S3C2440
          Support for S3C2440 Samsung Mobile CPU based systems.
 
 config CPU_S3C2442
-       bool "SAMSUNG S3C2442"
+       bool "Samsung S3C2442"
        select CPU_ARM920T
        select S3C2410_COMMON_CLK
        select S3C2410_PM if PM_SLEEP
@@ -71,7 +71,7 @@ config CPU_S3C244X
        depends on CPU_S3C2440 || CPU_S3C2442
 
 config CPU_S3C2443
-       bool "SAMSUNG S3C2443"
+       bool "Samsung S3C2443"
        select CPU_ARM920T
        select S3C2443_COMMON_CLK
        help
@@ -591,6 +591,6 @@ config PM_H1940
        help
          Internal node for H1940 and related PM
 
-endmenu        # SAMSUNG S3C24XX SoCs Support
+endmenu        # Samsung S3C24XX SoCs Support
 
 endif  # ARCH_S3C24XX

diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index ee3d5c989a76f79047caee8dad50c3abcea5f437..4f7b27239bd4e80697e473ffcb614faac0f47ab9 100644 (file)
--- a/arch/arm/plat-samsung/adc.c
+++ b/arch/arm/plat-samsung/adc.c
@@ -40,7 +40,7 @@ enum s3c_cpu_type {
        TYPE_ADCV11, /* S3C2443 */
        TYPE_ADCV12, /* S3C2416, S3C2450 */
        TYPE_ADCV2, /* S3C64XX */
-       TYPE_ADCV3, /* S5PV210, S5PC110, EXYNOS4210 */
+       TYPE_ADCV3, /* S5PV210, S5PC110, Exynos4210 */
 };
 
 struct s3c_adc_client {

diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 1602f6dc900b191926a4372895561edd84639a7f..089a17687104279c01f051b3a0b15c0da198dc8b 100644 (file)
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -3,7 +3,7 @@
 // Copyright (c) 2011 Samsung Electronics Co., Ltd.
 //             http://www.samsung.com
 //
-// Base SAMSUNG platform device definitions
+// Base Samsung platform device definitions
 
 #include <linux/kernel.h>
 #include <linux/types.h>

diff --git a/arch/arm/plat-samsung/gpio-samsung.c b/arch/arm/plat-samsung/gpio-samsung.c
index f66c820cd82bc506ba17aa98a3b845489535262c..8955fd6752650c2ffedaacf40ec38cd9cf44783f 100644 (file)
--- a/arch/arm/plat-samsung/gpio-samsung.c
+++ b/arch/arm/plat-samsung/gpio-samsung.c
@@ -8,7 +8,7 @@
 //      Ben Dooks <ben@simtec.co.uk>
 //      http://armlinux.simtec.co.uk/
 //
-// SAMSUNG - GPIOlib support
+// Samsung - GPIOlib support
 
 #include <linux/kernel.h>
 #include <linux/irq.h>

diff --git a/arch/arm/plat-samsung/include/plat/samsung-time.h b/arch/arm/plat-samsung/include/plat/samsung-time.h
index d16eefe9ae78ff2c05f72df8be9955d4336076fa..32ab0860f6312f852d7281eb0814ed1cdf6431fb 100644 (file)
--- a/arch/arm/plat-samsung/include/plat/samsung-time.h
+++ b/arch/arm/plat-samsung/include/plat/samsung-time.h
@@ -9,7 +9,7 @@
 #ifndef __ASM_PLAT_SAMSUNG_TIME_H
 #define __ASM_PLAT_SAMSUNG_TIME_H __FILE__
 
-/* SAMSUNG HR-Timer Clock mode */
+/* Samsung HR-Timer Clock mode */
 enum samsung_timer_mode {
        SAMSUNG_PWM0,
        SAMSUNG_PWM1,