diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-11-22 04:48:20 +0300 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-11-22 04:48:20 +0300 |
| commit | 93a93d19c7267439364e7c52a643127ac5c2d4f1 (patch) | |
| tree | 10ae503656eff7e197732ae65aadd97bf7932292 /arch/arm/mach-mvebu | |
| parent | 172ed82cef421a205e1f557372a4a1338dc46edc (diff) | |
| parent | 2eb04ae010a8fb165ba7aa56e9aa8e7980887dee (diff) | |
| download | linux-93a93d19c7267439364e7c52a643127ac5c2d4f1.tar.xz | |
Merge branch 'mvebu/fixes' into mvebu/soc
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/board-v7.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/coherency.c | 2 |
2 files changed, 3 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(); diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c index 2bdc3233abe2..044b51185fcc 100644 --- a/arch/arm/mach-mvebu/coherency.c +++ b/arch/arm/mach-mvebu/coherency.c @@ -400,6 +400,8 @@ int __init coherency_init(void) type == COHERENCY_FABRIC_TYPE_ARMADA_380) armada_375_380_coherency_init(np); + of_node_put(np); + return 0; } |