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>
This commit is contained in:
parent
295f0b23b5
commit
163bfa46ae
|
@ -57,6 +57,9 @@ static int armada_370_xp_init_soc(struct device_node *root, void *context)
|
||||||
unsigned long phys_base, phys_size;
|
unsigned long phys_base, phys_size;
|
||||||
u32 reg;
|
u32 reg;
|
||||||
|
|
||||||
|
if (!of_machine_is_compatible("marvell,armada-370-xp"))
|
||||||
|
return 0;
|
||||||
|
|
||||||
mvebu_set_reset(armada_370_xp_reset_cpu);
|
mvebu_set_reset(armada_370_xp_reset_cpu);
|
||||||
|
|
||||||
barebox_set_model("Marvell Armada 370/XP");
|
barebox_set_model("Marvell Armada 370/XP");
|
||||||
|
|
|
@ -81,6 +81,9 @@ static int dove_init_soc(struct device_node *root, void *context)
|
||||||
{
|
{
|
||||||
unsigned long phys_base, phys_size;
|
unsigned long phys_base, phys_size;
|
||||||
|
|
||||||
|
if (!of_machine_is_compatible("marvell,dove"))
|
||||||
|
return 0;
|
||||||
|
|
||||||
mvebu_set_reset(dove_reset_cpu);
|
mvebu_set_reset(dove_reset_cpu);
|
||||||
|
|
||||||
barebox_set_model("Marvell Dove");
|
barebox_set_model("Marvell Dove");
|
||||||
|
|
|
@ -55,6 +55,9 @@ static int kirkwood_init_soc(struct device_node *root, void *context)
|
||||||
{
|
{
|
||||||
unsigned long phys_base, phys_size;
|
unsigned long phys_base, phys_size;
|
||||||
|
|
||||||
|
if (!of_machine_is_compatible("marvell,kirkwood"))
|
||||||
|
return 0;
|
||||||
|
|
||||||
mvebu_set_reset(kirkwood_reset_cpu);
|
mvebu_set_reset(kirkwood_reset_cpu);
|
||||||
|
|
||||||
barebox_set_model("Marvell Kirkwood");
|
barebox_set_model("Marvell Kirkwood");
|
||||||
|
|
Loading…
Reference in New Issue