[GIT PULL] Marvell cleanup changes for the v3.8 merge window

The following changes since commit 77b67063bb6bce6d475e910d3b886a606d0d91f7:

  Linux 3.7-rc5 (2012-11-11 13:44:33 +0100)

are available in the git repository at:

  git at github.com:MISL-EBU-System-SW/mainline-public.git tags/marvell-cleanups-for-3.8

for you to fetch changes up to 8c4340fcfb3e40372101a608ccd906e456ed3fcd:

  arm: mvebu: fix typo in machine name for Armada 370/XP (2012-11-14 16:35:10 +0100)

----------------------------------------------------------------
Marvell cleanups for 3.8

----------------------------------------------------------------
Thomas Petazzoni (3):
      arm: mvebu: fix compatible string in armada-370-xp.dtsi
      arm: mvebu: don't list all boards in dt compat field for Armada 370/XP
      arm: mvebu: fix typo in machine name for Armada 370/XP

 arch/arm/boot/dts/armada-370-xp.dtsi |    2 +-
 arch/arm/mach-mvebu/armada-370-xp.c  |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

All the Device Tree files for Armada 370 and XP SoCs and boards use
the "armada-370-xp" common compatible string, except
armada-370-xp.dtsi which was specifying "armada_370_xp".

Fix this inconsistency by making armada-370-xp.dtsi declare a
compatible string of "armada-370-xp" like everyone else.

Signed-off-by: Thomas Petazzoni <redacted>
Acked-by: Gregory CLEMENT <redacted>
Tested-by: Gregory CLEMENT <redacted>
---
 arch/arm/boot/dts/armada-370-xp.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 16cc82c..b113e0b 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi

@@ -20,7 +20,7 @@
 
 / {
 	model = "Marvell Armada 370 and XP SoC";
-	compatible = "marvell,armada_370_xp";
+	compatible = "marvell,armada-370-xp";
 
 	cpus {
 		cpu at 0 {

-- 
1.7.9.5

Instead of listing explicitly all boards in the .dt_compat field of
the DT_MACHINE_START structure for Armada 370/XP, use instead a
compatible string that is common to all boards using the Armada
370/XP.

This allows to add new boards by just using a different Device Tree,
without having to modify the source code of the kernel.

Note that the name of the array containing the compatible string is
also renamed, to reflect the fact that it no longer contains the list
of all boards.

Signed-off-by: Thomas Petazzoni <redacted>
Acked-by: Gregory CLEMENT <redacted>
Tested-by: Gregory CLEMENT <redacted>
---
 arch/arm/mach-mvebu/armada-370-xp.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 49d7915..29c27cd 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c

@@ -46,9 +46,8 @@ static void __init armada_370_xp_dt_init(void)
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-static const char * const armada_370_xp_dt_board_dt_compat[] = {
-	"marvell,a370-db",
-	"marvell,axp-db",
+static const char * const armada_370_xp_dt_compat[] = {
+	"marvell,armada-370-xp",
 	NULL,
 };
 

@@ -59,5 +58,5 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)")
 	.handle_irq     = armada_370_xp_handle_irq,
 	.timer		= &armada_370_xp_timer,
 	.restart	= mvebu_restart,
-	.dt_compat	= armada_370_xp_dt_board_dt_compat,
+	.dt_compat	= armada_370_xp_dt_compat,
 MACHINE_END

-- 
1.7.9.5

Signed-off-by: Thomas Petazzoni <redacted>
Acked-by: Gregory CLEMENT <redacted>
Tested-by: Gregory CLEMENT <redacted>
---
 arch/arm/mach-mvebu/armada-370-xp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 29c27cd..a2f5bbc 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c

@@ -51,7 +51,7 @@ static const char * const armada_370_xp_dt_compat[] = {
 	NULL,
 };
 
-DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)")
+DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
 	.init_machine	= armada_370_xp_dt_init,
 	.map_io		= armada_370_xp_map_io,
 	.init_irq	= armada_370_xp_init_irq,

-- 
1.7.9.5