From 163bfa46aeec9d2f78d0155f36758e1b5a01c9dd Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 17 Sep 2014 22:22:42 +0200 Subject: [PATCH] ARM: mvebu: Check for correct SoC in of_fixup callback Only run the fixup when we are actually on the corresponding SoC. Signed-off-by: Sascha Hauer Acked-by: Sebastian Hesselbarth --- arch/arm/mach-mvebu/armada-370-xp.c | 3 +++ arch/arm/mach-mvebu/dove.c | 3 +++ arch/arm/mach-mvebu/kirkwood.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 1dedcfc55..57f6a5fe0 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c @@ -57,6 +57,9 @@ static int armada_370_xp_init_soc(struct device_node *root, void *context) unsigned long phys_base, phys_size; u32 reg; + if (!of_machine_is_compatible("marvell,armada-370-xp")) + return 0; + mvebu_set_reset(armada_370_xp_reset_cpu); barebox_set_model("Marvell Armada 370/XP"); diff --git a/arch/arm/mach-mvebu/dove.c b/arch/arm/mach-mvebu/dove.c index 31d2bb57f..c2852f898 100644 --- a/arch/arm/mach-mvebu/dove.c +++ b/arch/arm/mach-mvebu/dove.c @@ -81,6 +81,9 @@ static int dove_init_soc(struct device_node *root, void *context) { unsigned long phys_base, phys_size; + if (!of_machine_is_compatible("marvell,dove")) + return 0; + mvebu_set_reset(dove_reset_cpu); barebox_set_model("Marvell Dove"); diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index 8ab2849ba..d7903f732 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c @@ -55,6 +55,9 @@ static int kirkwood_init_soc(struct device_node *root, void *context) { unsigned long phys_base, phys_size; + if (!of_machine_is_compatible("marvell,kirkwood")) + return 0; + mvebu_set_reset(kirkwood_reset_cpu); barebox_set_model("Marvell Kirkwood");