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

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

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2016-02-26 18:59:43 +09:00
parent 5fb87a1632
commit 2247c332db
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

16
arch/arm/mach-uniphier/soc-info.h
View File

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

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

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