leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
These are new SoCs from Socionext Inc.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2015-12-17 17:47:45 +09:00
parent 6994700712
commit 6f45a9755e
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-uniphier/cpu_info.c
View File

@ -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;

12
arch/arm/mach-uniphier/include/mach/soc_info.h
View File

@ -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;
}

10
arch/arm/mach-uniphier/soc_info.c
View File

@ -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;