Today's linux-next merge of the imx-mxs tree got conflicts in
arch/arm/mach-imx/mach-imx6q.c
caused by commits 4d9d18a (ARM: imx: remove custom .init_time hook),
e709f38 (ARM: imx6: report soc info via soc device) and 3087d32 (ARM:
imx6q: use common soc revision helpers).
I fixed it up (see below). Please verify that the resolution looks
correct.
Thanks,
Thierry
---
diff --cc arch/arm/mach-imx/mach-imx6q.c
index 3be0fa0,398858b..049e36e
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -190,8 -164,11 +162,14 @@@ static void __init imx6q_1588_init(void
static void __init imx6q_init_machine(void)
{
+ struct device *parent;
+
+ imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
- imx6q_revision());
++ imx_get_soc_revision());
++
+ parent = imx_soc_device_init();
+ if (parent == NULL)
+ pr_warn("failed to initialize soc device\n");
imx6q_enet_phy_init();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
