Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
authorOlof Johansson <olof@lixom.net>
Mon, 28 Jan 2013 07:42:02 +0000 (23:42 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 28 Jan 2013 07:42:02 +0000 (23:42 -0800)
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>
1  2 
arch/arm/mach-imx/imx31-dt.c

index f9a6909600972a0e0b474f0b068d9fdd3d0cd9fb,dc083d33a7589b98c2c40b2f3cf18190b8efa8aa..00737eb4e00d7439da839c0d5bd834f53e43584e
  #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