From: Olof Johansson <olof@lixom.net>
Date: Mon, 28 Jan 2013 07:42:02 +0000 (-0800)
Subject: Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
X-Git-Tag: v3.9-rc1~118^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2806683c313e5f70092cf2a7aabd26d1f9b423ca;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc

From Sascha Hauer:
ARM i.MX SoC updates for next

Mostly clock related updates, most notably the conversion of
i.MX31 to a DT based lookup.

* tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: clk-imx35: Fix build warnings with W=1
  ARM: imx27: add a clock gate to activate SPLL clock
  ARM: mx31: Replace clk_register_clkdev with clock DT lookup
  ARM: clk-imx31: Add dummy clock
  ARM: Let CONFIG_MACH_IMX31_DT be built by default

Signed-off-by: Olof Johansson <olof@lixom.net>
---

2806683c313e5f70092cf2a7aabd26d1f9b423ca
diff --cc arch/arm/mach-imx/imx31-dt.c
index f9a6909,dc083d3..00737eb
--- a/arch/arm/mach-imx/imx31-dt.c
+++ b/arch/arm/mach-imx/imx31-dt.c
@@@ -18,26 -18,20 +18,11 @@@
  #include "common.h"
  #include "mx31.h"
  
- static const struct of_dev_auxdata imx31_auxdata_lookup[] __initconst = {
- 	OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART1_BASE_ADDR,
- 			"imx21-uart.0", NULL),
- 	OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART2_BASE_ADDR,
- 			"imx21-uart.1", NULL),
- 	OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART3_BASE_ADDR,
- 			"imx21-uart.2", NULL),
- 	OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART4_BASE_ADDR,
- 			"imx21-uart.3", NULL),
- 	OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART5_BASE_ADDR,
- 			"imx21-uart.4", NULL),
- 	{ /* sentinel */ }
- };
- 
  static void __init imx31_dt_init(void)
  {
- 	of_platform_populate(NULL, of_default_bus_match_table,
- 			     imx31_auxdata_lookup, NULL);
+ 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  }
  
 -static void __init imx31_timer_init(void)
 -{
 -	mx31_clocks_init_dt();
 -}
 -
 -static struct sys_timer imx31_timer = {
 -	.init = imx31_timer_init,
 -};
 -
  static const char *imx31_dt_board_compat[] __initdata = {
  	"fsl,imx31",
  	NULL