Skip to content
  • Olof Johansson's avatar
    Merge tag 'omap-for-v3.10/fixes-for-merge-window-part2' of... · 474dbaa7
    Olof Johansson authored
    Merge tag 'omap-for-v3.10/fixes-for-merge-window-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
    
    From Tony Lindgren:
    Omap fixes for things that were discovered during the merge window:
    
    - Few GPMC fixes and binding doc updates noted after sending
      pull requests for the GPMC branch.
    - Board fixes for beagle usb host and rx51 spi probe order
    - SoC fixes dt earlyprintk, omap1 dma and omap2+ id.c error
      handling fixes
    
    Then few minor things that are not strictly fixes but are good
    to get out of the way:
    
    - Add missing legacy mux registers for am/dm73x gpio
    - Add detection for am33xx pg2.1 silicon
    - Enable twl4030 audio modules in defconfig
    
    * tag 'omap-for-v3.10/fixes-for-merge-window-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap
    
    :
      ARM: OMAP2+: Remove bogus IS_ERR_OR_NULL checking from id.c
      ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module
      ARM: OMAP2: AM33XX: id: Add support for new AM335x PG2.1 Si
      omap: mux: add AM/DM37x gpios
      ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()
      ARM: OMAP2+: omap_device: use late_initcall_sync
      ARM: OMAP: RX-51: change probe order of touchscreen and panel SPI devices
      ARM: OMAP3: Beagle: Fix USB Host on beagle xM Ax/Bx
      ARM: OMAP2+: only WARN if a GPMC child probe function fail
      ARM: OMAP2+: only search for GPMC DT child nodes on probe
      Documentation: dt: update properties in TI GPMC NAND example
      Documentation: dt: update TI GPMC ethernet binding properties
    
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    474dbaa7