Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
	arch/arm/mach-imx/clk-imx51-imx53.c
	arch/arm/mach-imx/mach-imx6q.c

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/imx23.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx28-evk.dts
index aa33393903a87cec3bcef3bb7f5138a779230d96,1f63845b8ce08c3cc23aaeff334d9ee02b56e45e..4267c2b05d600ac8bfb9cf2612a3b72977d7dc0e
--- 1/arch/arm/boot/dts/imx28-evk.dts
--- 2/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@@ -182,11 -182,8 +182,12 @@@
                        };
  
                        lradc@80050000 {
+                               fsl,lradc-touchscreen-wires = <4>;
                                status = "okay";
 +                              fsl,lradc-touchscreen-wires = <4>;
 +                              fsl,ave-ctrl = <4>;
 +                              fsl,ave-delay = <2>;
 +                              fsl,settling = <10>;
                        };
  
                        i2c0: i2c@80058000 {

diff --cc arch/arm/boot/dts/imx28.dtsi
Simple merge

diff --cc arch/arm/mach-imx/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/clk-imx51-imx53.c
index ceaac9cd7b4230859143d951af389908744b7cc2,03ca2e32a839871776335fa8b3f40a9b95a17fd8..ce37af26ff8c6931b62e9459d7ffb7df1daf81ab
--- 1/arch/arm/mach-imx/clk-imx51-imx53.c
--- 2/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);
 -
 -      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);
+ 
+       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);
  }
 +CLK_OF_DECLARE(imx53_ccm, "fsl,imx53-ccm", mx53_clocks_init);

diff --cc arch/arm/mach-imx/common.h
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6q.c
index 3be0fa0e979602580f5cf7639520a61c187cfceb,53e70f4ad1f5c08ed6483eec4351df945ded5fae..0f9f24116daaf21aed4041da8ff82fed4d331b53
--- 1/arch/arm/mach-imx/mach-imx6q.c
--- 2/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)
  {
-                             imx6q_revision());
+       struct device *parent;
+ 
 +      imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
++                            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();
  

diff --cc arch/arm/mach-imx/mach-imx6sl.c
Simple merge

diff --cc arch/arm/mach-imx/mach-pcm037.c
Simple merge

diff --cc arch/arm/mach-mxs/mach-mxs.c
Simple merge

diff --cc include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
Simple merge