• Linus Torvalds's avatar
    Merge branch 'davinci-for-linus' of... · 6f128fa3
    Linus Torvalds authored
    Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
    
    * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (62 commits)
      DaVinci: DM646x - platform changes for vpif capture and display drivers
      davinci: DM355 - platform changes for vpfe capture
      davinci: DM644x platform changes for vpfe capture
      davinci: audio: move tlv320aic33 i2c setup into board files
      DaVinci: EDMA: Adding 2 new APIs for allocating/freeing PARAMs
      DaVinci: DM365: Adding entries for DM365 IRQ's
      DaVinci: DM355: Adding PINMUX entries for DM355 Display
      davinci: Handle pinmux conflict between mmc/sd and nor flash
      davinci: Add NOR flash support for da850/omap-l138
      davinci: Add NAND flash support for DA850/OMAP-L138
      davinci: Add MMC/SD support for da850/omap-l138
      davinci: Add platform support for da850/omap-l138 GLCD
      davinci: Macro to convert GPIO signal to GPIO pin number
      davinci: Audio support for DA850/OMAP-L138 EVM
      davinci: Audio support for DA830 EVM
      davinci: Correct the number of GPIO pins for da850/omap-l138
      davinci: Configure MDIO pins for EMAC
      DaVinci: DM365: Add Support for new Revision of silicon
      DaVinci: DM365: Fix Compilation issue due to PINMUX entry
      DaVinci: EDMA: Updating default queue handling
      ...
    6f128fa3
davinci-pcm.c 10.6 KB