[linux-yocto] [PATCH 02/35] arch/arm/mach-axxia: Clean Up Compatible Names
Daniel Dragomir
daniel.dragomir at windriver.com
Thu Nov 13 09:19:29 PST 2014
From: John Jacques <john.jacques at lsi.com>
Signed-off-by: John Jacques <john.jacques at lsi.com>
---
arch/arm/boot/dts/axm5504-emu.dts | 4 ++--
arch/arm/boot/dts/axm5504-sim.dts | 6 +++---
arch/arm/boot/dts/axm5507-emu.dts | 6 +++---
arch/arm/boot/dts/axm5508-amarillo.dts | 6 +++---
arch/arm/boot/dts/axm5512-amarillo.dts | 6 +++---
arch/arm/boot/dts/axm5516-amarillo.dts | 4 ++--
arch/arm/boot/dts/axm5516-sim.dts | 6 +++---
arch/arm/mach-axxia/axxia.c | 8 +++-----
arch/arm/mach-axxia/ddr_retention.c | 2 +-
arch/arm/mach-axxia/platsmp.c | 4 ++--
10 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/arch/arm/boot/dts/axm5504-emu.dts b/arch/arm/boot/dts/axm5504-emu.dts
index 2b13386..0e37f8e 100644
--- a/arch/arm/boot/dts/axm5504-emu.dts
+++ b/arch/arm/boot/dts/axm5504-emu.dts
@@ -17,8 +17,8 @@
/include/ "axm5504-cpus.dtsi"
/ {
- model = "Emulation Platform AXM55xx";
- compatible = "lsi,axm5516-emu", "lsi,axm5516";
+ model = "Emulation Platform AXM5500";
+ compatible = "lsi,axm5500-emu", "lsi,axm5500";
memory {
device_type = "memory";
diff --git a/arch/arm/boot/dts/axm5504-sim.dts b/arch/arm/boot/dts/axm5504-sim.dts
index bbb922a..543c908 100644
--- a/arch/arm/boot/dts/axm5504-sim.dts
+++ b/arch/arm/boot/dts/axm5504-sim.dts
@@ -1,5 +1,5 @@
/*
- * arch/arm/boot/dts/axm5516-amarillo.dts
+ * arch/arm/boot/dts/axm5504-amarillo.dts
*
* Copyright (C) 2013 LSI
*
@@ -17,8 +17,8 @@
/include/ "axm5504-cpus.dtsi"
/ {
- model = "Simulation Platform AXM55xx";
- compatible = "lsi,axm5516-sim", "lsi,axm5516";
+ model = "Simulation Platform AXM5500";
+ compatible = "lsi,axm5500-sim", "lsi,axm5500";
memory {
device_type = "memory";
diff --git a/arch/arm/boot/dts/axm5507-emu.dts b/arch/arm/boot/dts/axm5507-emu.dts
index ed0bf10..2fc938b 100644
--- a/arch/arm/boot/dts/axm5507-emu.dts
+++ b/arch/arm/boot/dts/axm5507-emu.dts
@@ -1,5 +1,5 @@
/*
- * arch/arm/boot/dts/axm5504-emulation.dts
+ * arch/arm/boot/dts/axm5507-emu.dts
*
* Copyright (C) 2013 LSI
*
@@ -17,8 +17,8 @@
/include/ "axm5507-cpus.dtsi"
/ {
- model = "Emulation Platform AXM55xx";
- compatible = "lsi,axm5516-emu", "lsi,axm5516";
+ model = "Emulation Platform AXM5500";
+ compatible = "lsi,axm5500-emu", "lsi,axm5500";
memory {
device_type = "memory";
diff --git a/arch/arm/boot/dts/axm5508-amarillo.dts b/arch/arm/boot/dts/axm5508-amarillo.dts
index 6edb2e8..7a8b8a8 100644
--- a/arch/arm/boot/dts/axm5508-amarillo.dts
+++ b/arch/arm/boot/dts/axm5508-amarillo.dts
@@ -1,5 +1,5 @@
/*
- * arch/arm/boot/dts/axm5516-amarillo.dts
+ * arch/arm/boot/dts/axm5508-amarillo.dts
*
* Copyright (C) 2013 LSI
*
@@ -17,8 +17,8 @@
/include/ "axm5508-cpus.dtsi"
/ {
- model = "Amarillo AXM5516";
- compatible = "lsi,axm5516-amarillo", "lsi,axm5516";
+ model = "Amarillo AXM5500";
+ compatible = "lsi,axm5500-amarillo", "lsi,axm5500";
memory {
device_type = "memory";
diff --git a/arch/arm/boot/dts/axm5512-amarillo.dts b/arch/arm/boot/dts/axm5512-amarillo.dts
index 96d8750..7d1c637 100644
--- a/arch/arm/boot/dts/axm5512-amarillo.dts
+++ b/arch/arm/boot/dts/axm5512-amarillo.dts
@@ -1,5 +1,5 @@
/*
- * arch/arm/boot/dts/axm5516-amarillo.dts
+ * arch/arm/boot/dts/axm5512-amarillo.dts
*
* Copyright (C) 2013 LSI
*
@@ -17,8 +17,8 @@
/include/ "axm5512-cpus.dtsi"
/ {
- model = "Amarillo AXM5516";
- compatible = "lsi,axm5516-amarillo", "lsi,axm5516";
+ model = "Amarillo AXM5500";
+ compatible = "lsi,axm5500-amarillo", "lsi,axm5500";
memory {
device_type = "memory";
diff --git a/arch/arm/boot/dts/axm5516-amarillo.dts b/arch/arm/boot/dts/axm5516-amarillo.dts
index c60d00f..ac49364 100644
--- a/arch/arm/boot/dts/axm5516-amarillo.dts
+++ b/arch/arm/boot/dts/axm5516-amarillo.dts
@@ -17,8 +17,8 @@
/include/ "axm5516-cpus.dtsi"
/ {
- model = "Amarillo AXM5516";
- compatible = "lsi,axm5516-amarillo", "lsi,axm5516";
+ model = "Amarillo AXM5500";
+ compatible = "lsi,axm5500-amarillo", "lsi,axm5500";
memory {
device_type = "memory";
diff --git a/arch/arm/boot/dts/axm5516-sim.dts b/arch/arm/boot/dts/axm5516-sim.dts
index 3ea5f05..33aa9d6 100644
--- a/arch/arm/boot/dts/axm5516-sim.dts
+++ b/arch/arm/boot/dts/axm5516-sim.dts
@@ -1,5 +1,5 @@
/*
- * arch/arm/boot/dts/axm5516-amarillo.dts
+ * arch/arm/boot/dts/axm5516-sim.dts
*
* Copyright (C) 2013 LSI
*
@@ -17,8 +17,8 @@
/include/ "axm5516-cpus.dtsi"
/ {
- model = "Simulation Platform AXM55xx";
- compatible = "lsi,axm5516-sim", "lsi,axm5516";
+ model = "Simulation Platform AXM5500";
+ compatible = "lsi,axm5500-sim", "lsi,axm5500";
memory {
device_type = "memory";
diff --git a/arch/arm/mach-axxia/axxia.c b/arch/arm/mach-axxia/axxia.c
index d79f629..7777579 100644
--- a/arch/arm/mach-axxia/axxia.c
+++ b/arch/arm/mach-axxia/axxia.c
@@ -59,9 +59,7 @@
#endif
static const char *axxia_dt_match[] __initconst = {
- "lsi,axm5516",
- "lsi,axm5516-sim",
- "lsi,axm5516-emu",
+ "lsi,axm5500",
NULL
};
@@ -141,7 +139,7 @@ void __init axxia_dt_timer_init(void)
{
int is_sim;
- is_sim = of_find_compatible_node(NULL, NULL, "lsi,axm5516-sim") != NULL;
+ is_sim = of_find_compatible_node(NULL, NULL, "lsi,axm5500-sim") != NULL;
axxia_init_clocks(is_sim);
@@ -222,7 +220,7 @@ static struct notifier_block axxia_amba_nb = {
void __init axxia_dt_init(void)
{
#ifdef CONFIG_KEXEC
- if (!of_find_compatible_node(NULL, NULL, "lsi,axm5516-sim")) {
+ if (!of_find_compatible_node(NULL, NULL, "lsi,axm5500-sim")) {
dickens = ioremap(0x2000000000, SZ_4M);
kexec_reinit = flush_l3;
}
diff --git a/arch/arm/mach-axxia/ddr_retention.c b/arch/arm/mach-axxia/ddr_retention.c
index 7dab78f..58a4845 100644
--- a/arch/arm/mach-axxia/ddr_retention.c
+++ b/arch/arm/mach-axxia/ddr_retention.c
@@ -338,7 +338,7 @@ axxia_ddr_retention_init(void)
* Only available on ASIC systems.
*/
- if (of_find_compatible_node(NULL, NULL, "lsi,axm5516")) {
+ if (of_find_compatible_node(NULL, NULL, "lsi,axm5500-amarillo")) {
/* Create /proc entry. */
if (!proc_create("driver/axxia_ddr_retention_reset",
S_IWUSR, NULL, &axxia_ddr_retention_proc_ops)) {
diff --git a/arch/arm/mach-axxia/platsmp.c b/arch/arm/mach-axxia/platsmp.c
index 54fdcbf..44cde07 100644
--- a/arch/arm/mach-axxia/platsmp.c
+++ b/arch/arm/mach-axxia/platsmp.c
@@ -193,9 +193,9 @@ static void __init axxia_smp_prepare_cpus(unsigned int max_cpus)
do_fixup_sev();
if (of_find_compatible_node(NULL, NULL,
- "lsi,axm5516-sim") != NULL ||
+ "lsi,axm5500-sim") != NULL ||
of_find_compatible_node(NULL, NULL,
- "lsi,axm5516-emu") != NULL)
+ "lsi,axm5500-emu") != NULL)
wfe_available = 0;
else
wfe_available = 1;
--
1.8.1.4
More information about the linux-yocto
mailing list