mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 15:41:58 +00:00
85e618a1be
The first variants of Armada XP SoCs (A0 stepping) have issues related to the i2c controller which prevent to use the offload mechanism and lead to a kernel hang during boot. This commit add quirk in the mvebu platform code to check the SoC version and then update the compatible string for the i2c controller according to the revision of the SoC. Currently only some OpenBlocks AX3-4 boards are known to use an A0 revision so the check is done only for these boards. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Cc: stable@vger.kernel.org # v3.12+:af8d1c63af: ARM: mvebu: Add support to get the ID and the revision of a SoC Cc: stable@vger.kernel.org # v3.12+ Fixes:930ab3d403(i2c: mv64xxx: Add I2C Transaction Generator support) Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
98 lines
2.5 KiB
C
98 lines
2.5 KiB
C
/*
|
|
* Device Tree support for Armada 370 and XP platforms.
|
|
*
|
|
* Copyright (C) 2012 Marvell
|
|
*
|
|
* Lior Amsalem <alior@marvell.com>
|
|
* Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/io.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/mbus.h>
|
|
#include <linux/slab.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/time.h>
|
|
#include "armada-370-xp.h"
|
|
#include "common.h"
|
|
#include "coherency.h"
|
|
#include "mvebu-soc-id.h"
|
|
|
|
static void __init armada_370_xp_map_io(void)
|
|
{
|
|
debug_ll_io_init();
|
|
}
|
|
|
|
static void __init armada_370_xp_timer_and_clk_init(void)
|
|
{
|
|
of_clk_init(NULL);
|
|
clocksource_of_init();
|
|
coherency_init();
|
|
BUG_ON(mvebu_mbus_dt_init());
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
l2x0_of_init(0, ~0UL);
|
|
#endif
|
|
}
|
|
|
|
static void __init i2c_quirk(void)
|
|
{
|
|
struct device_node *np;
|
|
u32 dev, rev;
|
|
|
|
/*
|
|
* Only revisons more recent than A0 support the offload
|
|
* mechanism. We can exit only if we are sure that we can
|
|
* get the SoC revision and it is more recent than A0.
|
|
*/
|
|
if (mvebu_get_soc_id(&rev, &dev) == 0 && dev > MV78XX0_A0_REV)
|
|
return;
|
|
|
|
for_each_compatible_node(np, NULL, "marvell,mv78230-i2c") {
|
|
struct property *new_compat;
|
|
|
|
new_compat = kzalloc(sizeof(*new_compat), GFP_KERNEL);
|
|
|
|
new_compat->name = kstrdup("compatible", GFP_KERNEL);
|
|
new_compat->length = sizeof("marvell,mv78230-a0-i2c");
|
|
new_compat->value = kstrdup("marvell,mv78230-a0-i2c",
|
|
GFP_KERNEL);
|
|
|
|
of_update_property(np, new_compat);
|
|
}
|
|
return;
|
|
}
|
|
|
|
static void __init armada_370_xp_dt_init(void)
|
|
{
|
|
if (of_machine_is_compatible("plathome,openblocks-ax3-4"))
|
|
i2c_quirk();
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
}
|
|
|
|
static const char * const armada_370_xp_dt_compat[] = {
|
|
"marvell,armada-370-xp",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
|
|
.smp = smp_ops(armada_xp_smp_ops),
|
|
.init_machine = armada_370_xp_dt_init,
|
|
.map_io = armada_370_xp_map_io,
|
|
.init_time = armada_370_xp_timer_and_clk_init,
|
|
.restart = mvebu_restart,
|
|
.dt_compat = armada_370_xp_dt_compat,
|
|
MACHINE_END
|