summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu/board-v7.c
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2014-11-22 01:48:20 +0000
committerJason Cooper <jason@lakedaemon.net>2014-11-22 01:48:20 +0000
commit93a93d19c7267439364e7c52a643127ac5c2d4f1 (patch)
tree10ae503656eff7e197732ae65aadd97bf7932292 /arch/arm/mach-mvebu/board-v7.c
parent172ed82cef421a205e1f557372a4a1338dc46edc (diff)
parent2eb04ae010a8fb165ba7aa56e9aa8e7980887dee (diff)
downloadtalos-op-linux-93a93d19c7267439364e7c52a643127ac5c2d4f1.tar.gz
talos-op-linux-93a93d19c7267439364e7c52a643127ac5c2d4f1.zip
Merge branch 'mvebu/fixes' into mvebu/soc
Diffstat (limited to 'arch/arm/mach-mvebu/board-v7.c')
-rw-r--r--arch/arm/mach-mvebu/board-v7.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c
index 461e726a7012..d965d0c0ef2d 100644
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@ -126,7 +126,7 @@ static void __init i2c_quirk(void)
static void __init mvebu_dt_init(void)
{
- if (of_machine_is_compatible("plathome,openblocks-ax3-4"))
+ if (of_machine_is_compatible("marvell,armadaxp"))
i2c_quirk();
if (of_machine_is_compatible("marvell,a375-db"))
external_abort_quirk();
OpenPOWER on IntegriCloud