Merge tag 'mxs-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

From Shawn Guo:
mxs device tree changes for 3.9

 - Mostly cfa100xx related device tree source updates

* tag 'mxs-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: dts: Add rotary encoder to the CFA-10049
  ARM: mxs: dts: Add gpio-keys for the rotary to the CFA-10049
  ARM: dts: mxs: Add the LCD to the 10049 board
  ARM: dts: mxs: Add muxing options for the third PWM
  ARM: dts: cfa10049: Change the SPI3 bus to spi-gpio
  ARM: mxs: dt: Add Crystalfontz CFA-10037 device tree support
  ARM: mxs: Enable touchscreen on m28evk
  ARM: dts: cfa10049: Add PCA9555 GPIO expander to the device tree

diff --combined arch/arm/boot/dts/Makefile
index b1f2ab9cda6e224d67969fe2deff462198e485da,f9912f67cb4ba3fe25913054d4f9ebb0447be93d..43c044b86e13dd573830fac65f8debad5582a812
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -73,7 -73,6 +73,7 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
        kirkwood-ts219-6281.dtb \
        kirkwood-ts219-6282.dtb \
        kirkwood-openblocks_a6.dtb
 +dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
        msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
@@@ -96,12 -95,12 +96,13 @@@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dt
        imx28-apf28dev.dtb \
        imx28-apx4devkit.dtb \
        imx28-cfa10036.dtb \
+       imx28-cfa10037.dtb \
        imx28-cfa10049.dtb \
        imx28-evk.dtb \
        imx28-m28evk.dtb \
        imx28-sps1.dtb \
        imx28-tx28.dtb
 +dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb
  dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
        omap3-beagle.dtb \
        omap3-beagle-xm.dtb \
@@@ -136,7 -135,6 +137,7 @@@ dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-
  dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \
        sun5i-a13-olinuxino.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 +      tegra20-iris-512.dtb \
        tegra20-medcom-wide.dtb \
        tegra20-paz00.dtb \
        tegra20-plutux.dtb \
@@@ -145,11 -143,8 +146,11 @@@
        tegra20-trimslice.dtb \
        tegra20-ventana.dtb \
        tegra20-whistler.dtb \
 +      tegra30-beaver.dtb \
        tegra30-cardhu-a02.dtb \
 -      tegra30-cardhu-a04.dtb
 +      tegra30-cardhu-a04.dtb \
 +      tegra114-dalmore.dtb \
 +      tegra114-pluto.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
        vexpress-v2p-ca9.dtb \
        vexpress-v2p-ca15-tc1.dtb \
@@@ -157,12 -152,10 +158,12 @@@
        xenvm-4.2.dtb
  dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
        wm8505-ref.dtb \
 -      wm8650-mid.dtb
 +      wm8650-mid.dtb \
 +      wm8850-w70v2.dtb
  dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
  
  targets += dtbs
 +targets += $(dtb-y)
  endif
  
  # *.dtb used to be generated in the directory above. Clean out the

diff --combined arch/arm/mach-mxs/mach-mxs.c
index 5fad7cefe8aac3ac11e84d8d82ff3a7a910beba9,7147dfc9ab712a9a0dabfd30213e46ebf26e9bae..052186713347c5b4ed1a17c503825f4b9894f316
--- 1/arch/arm/mach-mxs/mach-mxs.c
--- 2/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@@ -119,6 -119,23 +119,23 @@@ static struct fb_videomode apf28dev_vid
        },
  };
  
+ static struct fb_videomode cfa10049_video_modes[] = {
+       {
+               .name           = "Himax HX8357-B",
+               .refresh        = 60,
+               .xres           = 320,
+               .yres           = 480,
+               .pixclock       = 108506, /* picosecond (9.216 MHz) */
+               .left_margin    = 2,
+               .right_margin   = 2,
+               .upper_margin   = 2,
+               .lower_margin   = 2,
+               .hsync_len      = 15,
+               .vsync_len      = 15,
+               .sync           = FB_SYNC_DATA_ENABLE_HIGH_ACT
+       },
+ };
+ 
  static struct mxsfb_platform_data mxsfb_pdata __initdata;
  
  /*
@@@ -163,11 -180,19 +180,11 @@@ static void __init imx23_timer_init(voi
        mx23_clocks_init();
  }
  
 -static struct sys_timer imx23_timer = {
 -      .init = imx23_timer_init,
 -};
 -
  static void __init imx28_timer_init(void)
  {
        mx28_clocks_init();
  }
  
 -static struct sys_timer imx28_timer = {
 -      .init = imx28_timer_init,
 -};
 -
  enum mac_oui {
        OUI_FSL,
        OUI_DENX,
@@@ -387,6 -412,17 +404,17 @@@ static void __init cfa10049_init(void
        update_fec_mac_prop(OUI_CRYSTALFONTZ);
  }
  
+ static void __init cfa10037_init(void)
+ {
+       enable_clk_enet_out();
+       update_fec_mac_prop(OUI_CRYSTALFONTZ);
+ 
+       mxsfb_pdata.mode_list = cfa10049_video_modes;
+       mxsfb_pdata.mode_count = ARRAY_SIZE(cfa10049_video_modes);
+       mxsfb_pdata.default_bpp = 32;
+       mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT;
+ }
+ 
  static void __init apf28_init(void)
  {
        enable_clk_enet_out();
@@@ -407,6 -443,8 +435,8 @@@ static void __init mxs_machine_init(voi
                m28evk_init();
        else if (of_machine_is_compatible("bluegiga,apx4devkit"))
                apx4devkit_init();
+       else if (of_machine_is_compatible("crystalfontz,cfa10037"))
+               cfa10037_init();
        else if (of_machine_is_compatible("crystalfontz,cfa10049"))
                cfa10049_init();
        else if (of_machine_is_compatible("armadeus,imx28-apf28"))
@@@ -438,7 -476,7 +468,7 @@@ DT_MACHINE_START(IMX23, "Freescale i.MX
        .map_io         = mx23_map_io,
        .init_irq       = icoll_init_irq,
        .handle_irq     = icoll_handle_irq,
 -      .timer          = &imx23_timer,
 +      .init_time      = imx23_timer_init,
        .init_machine   = mxs_machine_init,
        .dt_compat      = imx23_dt_compat,
        .restart        = mxs_restart,
@@@ -448,7 -486,7 +478,7 @@@ DT_MACHINE_START(IMX28, "Freescale i.MX
        .map_io         = mx28_map_io,
        .init_irq       = icoll_init_irq,
        .handle_irq     = icoll_handle_irq,
 -      .timer          = &imx28_timer,
 +      .init_time      = imx28_timer_init,
        .init_machine   = mxs_machine_init,
        .dt_compat      = imx28_dt_compat,
        .restart        = mxs_restart,