[linux-yocto] [PATCH 06/39] arch/arm/mach-axxia: Accept the new lsi, axm5516-emu Machine

Charlie Paul cpaul.windriver at gmail.com
Fri Apr 11 14:13:07 PDT 2014


From: John Jacques <john.jacques at lsi.com>

Add lsi,axm5516-emu to the list of matching machines.

Signed-off-by: John Jacques <john.jacques at lsi.com>
---
 arch/arm/mach-axxia/axxia.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-axxia/axxia.c b/arch/arm/mach-axxia/axxia.c
index b227ca9..dcb6305 100644
--- a/arch/arm/mach-axxia/axxia.c
+++ b/arch/arm/mach-axxia/axxia.c
@@ -58,6 +58,7 @@
 static const char *axxia_dt_match[] __initconst = {
 	"lsi,axm5516",
 	"lsi,axm5516-sim",
+	"lsi,axm5516-emu",
 	NULL
 };
 
@@ -296,6 +297,7 @@ void __init axxia_dt_init(void)
 	pm_power_off = NULL; /* TBD */
 
 	ncr_init();
+	axxia_ddr_retention_init();
 
 	spi_register_board_info(spi_devs, ARRAY_SIZE(spi_devs));
 
@@ -307,8 +309,6 @@ void __init axxia_dt_init(void)
 
 	axxia_pcie_init();
 
-	axxia_ddr_retention_init();
-
 	platform_device_register(&pmu_device);
 }
 
-- 
1.7.9.5



More information about the linux-yocto mailing list