1. 26 May, 2014 4 commits
    • Olof Johansson's avatar
      Merge tag 'davinci-for-v3.16/edma' of... · 3a5e23cf
      Olof Johansson authored
      Merge tag 'davinci-for-v3.16/edma' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
      
      Merge "DaVinci EDMA clean-up for v3.16" from Sekhar Nori:
      
      This series makes edma use configuration information available within
      the IP instead of reading it from platform data or DT. Some other useful
      clean-ups are included too.
      
      * tag 'davinci-for-v3.16/edma' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: (34 commits)
        ARM: edma: Remove redundant/unused parameters from edma_soc_info
        ARM: davinci: Remove redundant/unused parameters for edma
        ARM: dts: am4372: Remove obsolete properties from edma node
        ARM: dts: am33xx: Remove obsolete properties from edma node
        dt/bindings: ti,edma: Remove redundant properties from documentation
        ARM: edma: Get IP configuration from HW (number of channels, tc, etc)
        ARM: edma: Save number of regions from pdata to struct edma
        ARM: edma: Remove num_cc member from struct edma
        ARM: edma: Remove queue_tc_mapping data from edma_soc_info
        ARM: davinci: Remove eDMA3 queue_tc_mapping data from edma_soc_info
        ARM: edma: Do not change TC -> Queue mapping, leave it to default.
        ARM: edma: Take the number of tc from edma_soc_info (pdata)
        ARM: edma: No need to clean the pdata in edma_of_parse_dt()
        ARM: edma: Clean up and simplify the code around irq request
        dmaengine: edma: update DMA memcpy to use new param element
        dmaengine: edma: Document variables used for residue accounting
        dmaengine: edma: Provide granular accounting
        dmaengine: edma: Make reading the position of active channels work
        dmaengine: edma: Store transfer data in edma_desc and edma_pset
        dmaengine: edma: Create private pset struct
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      3a5e23cf
    • Olof Johansson's avatar
      Merge tag 'davinci-fixes-for-v3.15-rc4' of... · 7741fa19
      Olof Johansson authored
      Merge tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
      
      The patch fixes EDMA crossbar mapping to actually
      make it work. The patch has been tagged for stable.
      
      * tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
        ARM: common: edma: Fix xbar mapping
      7741fa19
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.16/l3-noc-signed' of... · 75d6bc5f
      Olof Johansson authored
      Merge tag 'omap-for-v3.16/l3-noc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers
      
      Merge "ARM: omap l3-noc bus driver changes for v3.16 merge window, resend" from
      Tony Lindgren:
      
      Improvments to omap l3-noc bus driver for v3.16 merge window
      to add support for am347x and dra7.
      
      * tag 'omap-for-v3.16/l3-noc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (25 commits)
        bus: omap_l3_noc: Add AM4372 interconnect error data
        bus: omap_l3_noc: Add DRA7 interconnect error data
        bus: omap_l3_noc: introduce concept of submodule
        bus: omap_l3_noc: Add information about the context of operation
        bus: omap_l3_noc: add information about the type of operation
        bus: omap_l3_noc: ignore masked out unclearable targets
        bus: omap_l3_noc: improve readability by using helper for slave event parsing
        bus: omap_l3_noc: make error reporting and handling common
        bus: omap_l3_noc: fix masterid detection
        bus: omap_l3_noc: convert flagmux information into a structure
        bus: omap_l3_noc: use of_match_data to pick up SoC information
        bus: omap_l3_noc: Add support for discountinous flag mux input numbers
        bus: omap_l3_noc: convert target information into a structure
        bus: omap_l3_noc: move L3 master data structure out
        bus: omap_l3_noc: un-obfuscate l3_targ address computation
        bus: omap_l3_noc: switch over to relaxed variants of readl/writel
        bus: omap_l3_noc: populate l3->dev and use it
        bus: omap_l3_noc: remove iclk from omap_l3 struct
        bus: omap_l3_noc: rename functions and data to omap_l3
        bus: omap_l3_noc: Fix copyright information
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      75d6bc5f
    • Arnd Bergmann's avatar
      soc: qcom: fix of_device_id table · 1b7f0c7b
      Arnd Bergmann authored
      The match tables must be zero-terminated, and Kbuild now helpfully
      fails to link the kernel if that isn't the case.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      1b7f0c7b
  2. 23 May, 2014 8 commits
  3. 22 May, 2014 15 commits
  4. 21 May, 2014 1 commit
  5. 20 May, 2014 1 commit
  6. 15 May, 2014 2 commits
  7. 05 May, 2014 9 commits