projects
/
project
/
bcm63xx
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: uniphier: simplify SoC ID get function
[project/bcm63xx/u-boot.git]
/
arch
/
arm
/
mach-uniphier
/
arm32
/
psci.c
diff --git
a/arch/arm/mach-uniphier/arm32/psci.c
b/arch/arm/mach-uniphier/arm32/psci.c
index e6682657beaf0e5d008371f518d3edc0c9a9776c..65a468dec9f5e4f2a4b795341ba8d9b675777598 100644
(file)
--- a/
arch/arm/mach-uniphier/arm32/psci.c
+++ b/
arch/arm/mach-uniphier/arm32/psci.c
@@
-28,13
+28,13
@@
u32 uniphier_smp_booted[CONFIG_ARMV7_PSCI_NR_CPUS];
static int uniphier_get_nr_cpus(void)
{
static int uniphier_get_nr_cpus(void)
{
- switch (uniphier_get_soc_
type
()) {
- case
SOC_UNIPHIER_SLD3
:
- case
SOC_UNIPHIER_PRO4
:
- case
SOC_UNIPHIER_PRO5
:
+ switch (uniphier_get_soc_
id
()) {
+ case
UNIPHIER_SLD3_ID
:
+ case
UNIPHIER_PRO4_ID
:
+ case
UNIPHIER_PRO5_ID
:
return 2;
return 2;
- case
SOC_UNIPHIER_PXS2
:
- case
SOC_UNIPHIER_LD6B
:
+ case
UNIPHIER_PXS2_ID
:
+ case
UNIPHIER_LD6B_ID
:
return 4;
default:
return 1;
return 4;
default:
return 1;