ARM: uniphier: add macros and revision IDs for sLD11 and LD10

These are new SoCs from Socionext Inc.

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 5d9ed84be4ece3e24c7601467f7485eb2f4dc43a..acfb06d6aabd8858e14177ab1c4ef5fc8de88778 100644 (file)
--- a/arch/arm/mach-uniphier/cpu_info.c
+++ b/arch/arm/mach-uniphier/cpu_info.c
@@ -43,6 +43,12 @@ int print_cpuinfo(void)
        case 0x2F:
                puts("PH1-LD6b (MN2WS0320)");
                break;
+       case 0x31:
+               puts("PH1-sLD11 ()");
+               break;
+       case 0x32:
+               puts("PH1-LD10 ()");
+               break;
        default:
                printf("Unknown Processor ID (0x%x)\n", revision);
                return -1;

diff --git a/arch/arm/mach-uniphier/include/mach/soc_info.h b/arch/arm/mach-uniphier/include/mach/soc_info.h
index 6e25baad3d86e8bea5fbf195aeaa6eeaf94c0d91..3cfd1e9d6e0a5330c415cdd30078f1e831f86aa9 100644 (file)
--- a/arch/arm/mach-uniphier/include/mach/soc_info.h
+++ b/arch/arm/mach-uniphier/include/mach/soc_info.h
@@ -15,6 +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_UNKNOWN,
 };
 
@@ -25,7 +27,9 @@ enum uniphier_soc_id {
        IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_SLD8) +     \
        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_LD6B) + \
+       IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_SLD11) + \
+       IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD10)
 
 #define UNIPHIER_MULTI_SOC     ((UNIPHIER_NR_ENABLED_SOCS) > 1)
 
@@ -55,6 +59,12 @@ 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;
+#endif
+#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD10)
+       return SOC_UNIPHIER_PH1_LD10;
+#endif
 
        return SOC_UNIPHIER_UNKNOWN;
 }

diff --git a/arch/arm/mach-uniphier/soc_info.c b/arch/arm/mach-uniphier/soc_info.c
index a4010eb3f72d7e9270983e934ee65012bd07f224..6cdeae65784754f60a2e693624820096e3a3b8d4 100644 (file)
--- a/arch/arm/mach-uniphier/soc_info.c
+++ b/arch/arm/mach-uniphier/soc_info.c
@@ -50,6 +50,16 @@ enum uniphier_soc_id uniphier_get_soc_type(void)
        case 0x2F:
                ret = SOC_UNIPHIER_PH1_LD6B;
                break;
+#endif
+#ifdef CONFIG_ARCH_UNIPHIER_PH1_SLD11
+       case 0x31:
+               ret = SOC_UNIPHIER_PH1_SLD11;
+               break;
+#endif
+#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD10
+       case 0x32:
+               ret = SOC_UNIPHIER_PH1_LD10;
+               break;
 #endif
        default:
                ret = SOC_UNIPHIER_UNKNOWN;