ARM: uniphier: rename PH1-LD10/PH1-sLD11 to PH1-LD20/PH1-LD11

Due to the company's awful projecting, PH1-LD10 and PH1-sLD11 have
been renamed to PH1-LD20 and PH1-LD11, respectively.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/cpu_info.c b/arch/arm/mach-uniphier/cpu_info.c
index 4e9d01bafdcc53a4e0beb2cca3054b840151d998..aae8d1fabd8c33efbce4592b292ef9b07729e4c9 100644 (file)
--- a/arch/arm/mach-uniphier/cpu_info.c
+++ b/arch/arm/mach-uniphier/cpu_info.c
@@ -45,10 +45,10 @@ int print_cpuinfo(void)
                puts("PH1-LD6b (MN2WS0320)");
                break;
        case 0x31:
-               puts("PH1-sLD11 ()");
+               puts("PH1-LD11 ()");
                break;
        case 0x32:
-               puts("PH1-LD10 ()");
+               puts("PH1-LD20 ()");
                break;
        default:
                printf("Unknown Processor ID (0x%x)\n", revision);

diff --git a/arch/arm/mach-uniphier/soc-info.h b/arch/arm/mach-uniphier/soc-info.h
index 3cfd1e9d6e0a5330c415cdd30078f1e831f86aa9..606094c80f463e224ad4aaec16aad0ed5e1d43a9 100644 (file)
--- a/arch/arm/mach-uniphier/soc-info.h
+++ b/arch/arm/mach-uniphier/soc-info.h
@@ -15,8 +15,8 @@ enum uniphier_soc_id {
        SOC_UNIPHIER_PH1_PRO5,
        SOC_UNIPHIER_PROXSTREAM2,
        SOC_UNIPHIER_PH1_LD6B,
-       SOC_UNIPHIER_PH1_SLD11,
-       SOC_UNIPHIER_PH1_LD10,
+       SOC_UNIPHIER_PH1_LD11,
+       SOC_UNIPHIER_PH1_LD20,
        SOC_UNIPHIER_UNKNOWN,
 };
 
@@ -28,8 +28,8 @@ enum uniphier_soc_id {
        IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_PRO5) +     \
        IS_ENABLED(CONFIG_ARCH_UNIPHIER_PROXSTREAM2) +  \
        IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD6B) + \
-       IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_SLD11) + \
-       IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD10)
+       IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD11) + \
+       IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD20)
 
 #define UNIPHIER_MULTI_SOC     ((UNIPHIER_NR_ENABLED_SOCS) > 1)
 
@@ -59,11 +59,11 @@ static inline enum uniphier_soc_id uniphier_get_soc_type(void)
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
        return SOC_UNIPHIER_PH1_LD6B;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD11)
-       return SOC_UNIPHIER_PH1_SLD11;
+#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD11)
+       return SOC_UNIPHIER_PH1_LD11;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD10)
-       return SOC_UNIPHIER_PH1_LD10;
+#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD20)
+       return SOC_UNIPHIER_PH1_LD20;
 #endif
 
        return SOC_UNIPHIER_UNKNOWN;

diff --git a/arch/arm/mach-uniphier/soc_info.c b/arch/arm/mach-uniphier/soc_info.c
index fd799ca39a40d9c05a2c76189ea7d6f8adbea208..3cfc183723b041e9ec9fb55267ca7468492833b8 100644 (file)
--- a/arch/arm/mach-uniphier/soc_info.c
+++ b/arch/arm/mach-uniphier/soc_info.c
@@ -52,14 +52,14 @@ enum uniphier_soc_id uniphier_get_soc_type(void)
                ret = SOC_UNIPHIER_PH1_LD6B;
                break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_SLD11
+#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD11
        case 0x31:
-               ret = SOC_UNIPHIER_PH1_SLD11;
+               ret = SOC_UNIPHIER_PH1_LD11;
                break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD10
+#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD20
        case 0x32:
-               ret = SOC_UNIPHIER_PH1_LD10;
+               ret = SOC_UNIPHIER_PH1_LD20;
                break;
 #endif
        default: