diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-17 22:22:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-19 09:47:36 +0200 |
| commit | 163bfa46aeec9d2f78d0155f36758e1b5a01c9dd (patch) | |
| tree | 4bd80b673394bafd2ceee943a254fe96762eeb2e /arch/arm/mach-mvebu | |
| parent | 295f0b23b505812768cbc2ff38bffa505fbda8d2 (diff) | |
| download | barebox-163bfa46aeec9d2f78d0155f36758e1b5a01c9dd.tar.gz barebox-163bfa46aeec9d2f78d0155f36758e1b5a01c9dd.tar.xz | |
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 <s.hauer@pengutronix.de>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/dove.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/kirkwood.c | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 1dedcfc554..57f6a5fe0d 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 31d2bb57f8..c2852f8986 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 8ab2849ba2..d7903f732e 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"); |