• Olof Johansson's avatar
    Merge tag 'mxs-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt · dd8b5c8d
    Olof Johansson authored
    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
    dd8b5c8d
mach-mxs.c 11.8 KB