From: Thierry Reding <thierry.reding@gmail•com>
To: Shawn Guo <shawn.guo@linaro•org>,
Fabio Estevam <fabio.estevam@freescale•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of th imx-mxs tree
Date: Mon, 14 Oct 2013 16:48:05 +0200 [thread overview]
Message-ID: <1381762088-18880-5-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1381762088-18880-1-git-send-email-treding@nvidia.com>
Today's linux-next merge of the imx-mxs tree got conflicts in:
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-imx/mach-imx6q.c
caused by commits 0efe995 (ARM: mach-imx: clk-imx51-imx53: Retrieve base
address and irq from dt) and 4d9d18a (ARM: imx: remove custom .init_time
hook).
This looks like the same conflict as last week, only this time I think I
actually fixed it up properly. Please verify that the resolution looks
good.
Thanks,
Thierry
---
diff --cc arch/arm/mach-imx/clk-imx51-imx53.c
index ceaac9c,03ca2e3..ce37af2
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@@ -11,9 -11,11 +11,12 @@@
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/clkdev.h>
+#include <linux/clk-provider.h>
#include <linux/of.h>
#include <linux/err.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
+ #include <linux/of_irq.h>
#include "crm-regs-imx5.h"
#include "clk.h"
@@@ -464,16 -468,13 +467,17 @@@ int __init mx51_clocks_init(unsigned lo
return 0;
}
-int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
- unsigned long rate_ckih1, unsigned long rate_ckih2)
+static void __init mx51_clocks_init_dt(struct device_node *np)
+{
+ mx51_clocks_init(0, 0, 0, 0);
+}
+CLK_OF_DECLARE(imx51_ccm, "fsl,imx51-ccm", mx51_clocks_init_dt);
+
+static void __init mx53_clocks_init(struct device_node *np)
{
- int i;
+ int i, irq;
unsigned long r;
- struct device_node *np;
+ void __iomem *base;
clk[pll1_sw] = imx_clk_pllv2("pll1_sw", "osc", MX53_DPLL1_BASE);
clk[pll2_sw] = imx_clk_pllv2("pll2_sw", "osc", MX53_DPLL2_BASE);
@@@ -568,5 -567,22 +569,11 @@@
r = clk_round_rate(clk[usboh3_per_gate], 54000000);
clk_set_rate(clk[usboh3_per_gate], r);
+
+ np = of_find_compatible_node(NULL, NULL, "fsl,imx53-gpt");
+ base = of_iomap(np, 0);
+ WARN_ON(!base);
+ irq = irq_of_parse_and_map(np, 0);
+ mxc_timer_init(base, irq);
-
- return 0;
-}
-
-int __init mx51_clocks_init_dt(void)
-{
- return mx51_clocks_init(0, 0, 0, 0);
-}
-
-int __init mx53_clocks_init_dt(void)
-{
- return mx53_clocks_init(0, 0, 0, 0);
}
+CLK_OF_DECLARE(imx53_ccm, "fsl,imx53-ccm", mx53_clocks_init);
diff --cc arch/arm/mach-imx/mach-imx6q.c
index 3be0fa0,53e70f4..0f9f241
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -11,9 -11,10 +11,8 @@@
*/
#include <linux/clk.h>
-#include <linux/clk-provider.h>
#include <linux/clkdev.h>
-#include <linux/clocksource.h>
#include <linux/cpu.h>
- #include <linux/delay.h>
#include <linux/export.h>
#include <linux/init.h>
#include <linux/io.h>
@@@ -190,8 -133,13 +131,16 @@@ 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());
++
+ mxc_arch_reset_init_dt();
+
+ parent = imx_soc_device_init();
+ if (parent == NULL)
+ pr_warn("failed to initialize soc device\n");
imx6q_enet_phy_init();
next prev parent reply other threads:[~2013-10-14 14:50 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-14 14:48 linux-next: Tree for Oct 14 Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the block tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the drm-intel tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the drm tree Thierry Reding
2013-10-14 14:48 ` Thierry Reding [this message]
2013-10-14 14:48 ` linux-next: manual merge of the omap_dss2 tree Thierry Reding
2013-10-15 6:47 ` Tomi Valkeinen
2013-10-14 14:48 ` linux-next: manual merge of the pm tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the spi tree Thierry Reding
2013-10-14 16:44 ` Mika Westerberg
2013-10-14 18:58 ` linux-next: Tree for Oct 14 (bcache) Randy Dunlap
2013-10-14 20:27 ` Mark Brown
[not found] ` <20131014202723.GQ2443-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2013-10-15 8:46 ` Thierry Reding
[not found] ` <20131015084631.GK7856-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2013-10-15 9:36 ` Mark Brown
[not found] ` <525C3EC2.20404-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2013-10-15 8:44 ` Thierry Reding
2013-10-14 19:36 ` [PATCH -next] netdev: inet_timewait_sock.h missing semi-colon when KMEMCHECK is enabled Randy Dunlap
2013-10-14 19:53 ` Joe Perches
2013-10-14 20:47 ` Randy Dunlap
2013-10-14 21:24 ` Joe Perches
2013-10-14 21:25 ` Joe Perches
2013-10-17 19:57 ` David Miller
2013-10-14 19:38 ` [PATCH -next] misc: fix various misc/mic/host/ build errors Randy Dunlap
2013-10-16 19:26 ` Greg Kroah-Hartman
2013-10-16 19:41 ` Randy Dunlap
2013-10-16 19:44 ` Greg Kroah-Hartman
2013-10-16 20:30 ` Thierry Reding
2013-10-16 20:37 ` Greg Kroah-Hartman
2013-10-17 14:02 ` Thierry Reding
2013-10-17 14:15 ` Greg Kroah-Hartman
2013-10-17 14:16 ` Mark Brown
2013-10-17 14:21 ` Thierry Reding
2013-10-17 14:49 ` Greg Kroah-Hartman
2013-10-16 20:47 ` Mark Brown
2013-10-14 19:39 ` [PATCH -next] staging/mt29f_spinand: fix build error when ONDIEECC not enabled Randy Dunlap
2013-10-14 20:51 ` linux-next: Tree for Oct 14 (ceph) Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381762088-18880-5-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail$(echo .)com \
--cc=fabio.estevam@freescale$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shawn.guo@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox