• Linus Torvalds's avatar
    Merge branch 'davinci-for-linus' of... · 024a6b95
    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: (48 commits)
      Revert "rtc: omap: let device wakeup capability be configured from chip init logic"
      DM365: Added more PINMUX configurations for AEMIF
      DM365: Make CLKOUTx available
      DM365: Added PINMUX definitions for GPIO30..32
      Davinci: iotable based ioremap() interception
      Davinci: pinmux - use ioremap()
      Davinci: aintc/cpintc - use ioremap()
      Davinci: psc - use ioremap()
      Davinci: timer - use ioremap()
      Davinci: jtag_id - use ioremap()
      Davinci: da8xx: rtc - use ioremap
      Davinci: gpio - use ioremap()
      davinci: edma: fix coding style issue related to breaking lines
      davinci: edma: use BIT() wherever possible
      davinci: edma: fix coding style issue related to usage of braces
      davinci: edma: use a more intuitive name for edma_info
      Davinci: serial - conditional reset via pwremu
      Davinci: serial - use ioremap()
      Davinci: serial - remove unnecessary define
      Davinci: watchdog reset separation across socs
      ...
    
    Fix up trivial conflict in arch/arm/Kconfig due to removal of "select
    GENERIC_TIME"
    024a6b95
da830.c 39 KB