Skip to content
Commits on Jun 21, 2012
  1. @torvalds

    Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

    torvalds committed Jun 20, 2012
    Pull slave-dmaengine fixes from Vinod Koul:
     "A few fixes in pl330 and imx-sdma drivers."
    
    * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
      DMA: PL330: Fix racy mutex unlock
      DMA: PL330: Add missing static storage class specifier
      dma: imx-sdma: buf_tail should be initialize in prepare function
      dmaengine: pl330: dont complete descriptor for cyclic dma
Commits on Jun 20, 2012
  1. @vireshk @torvalds

    Viresh has moved

    vireshk committed with torvalds Jun 20, 2012
    viresh.kumar@st.com email-id doesn't exist anymore as I have left the
    company.  Replace ST's id with viresh.linux@gmail.com.
    
    It also updates .mailmap file to fix address for 'git shortlog'
    
    Signed-off-by: Viresh Kumar <viresh.linux@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jun 14, 2012
  1. @JaviMerino

    DMA: PL330: Fix racy mutex unlock

    JaviMerino committed with Vinod Koul Jun 13, 2012
    pl330_update() stores a pointer to the thrd->req that finished, which
    contains a pointer to the corresponding pl330_req.  This is done with
    the pl330_lock held.  Then, it iterates through the req_done list,
    calling the callback for each of the requests that are done.  The
    problem is that the driver releases the lock before calling the
    callback for each of the callbacks.  pl330_submit_req() running in
    another processor can then acquire the lock and insert another request
    in one of the thrd->req that hasn't been processed yet, replacing the
    pointer to pl330_req there.  When the callback returns in
    pl330_update() and the next rqdone is popped from the list, it
    dereferences the pl330_req pointer to the just scheduled pl330_req,
    instead of the one that has finished, calling pl330 with the wrong r.
    
    This patch fixes this by storing the pointer to pl330_req directly in
    the list.
    
    Signed-off-by: Javi Merino <javi.merino@arm.com>
    Cc: Jassi Brar <jaswinder.singh@linaro.org>
    Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Commits on Jun 7, 2012
  1. DMA: PL330: Add missing static storage class specifier

    Sachin Kamat committed with Vinod Koul Jun 4, 2012
    Fixes the following sparse warning:
    drivers/dma/pl330.c:2542:5: warning: symbol 'add_desc' was not declared. Should it be static?
    
    Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  2. dma: imx-sdma: buf_tail should be initialize in prepare function

    Richard Zhao committed with Vinod Koul Jun 4, 2012
    This fix audio underrun issue. When SNDRV_PCM_TRIGGER_STOP
    and SNDRV_PCM_TRIGGER_START, it calls prepare again. buf_tail
    should be reset to zero.
    So move buf_tail initialization into prepare function.
    
    Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
    Acked-by: Shawn Guo <shawn.guo@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  3. dmaengine: pl330: dont complete descriptor for cyclic dma

    Tushar Behera committed with Vinod Koul May 23, 2012
    Commit eab2158 ("dmaengine: pl330: dont complete descriptor for
    cyclic dma") wrongly completes descriptor for cyclic dma, hence following
    BUG_ON is still hit with cyclic DMA operations.
    
    kernel BUG at drivers/dma/dmaengine.h:53!
    
    Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
    Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
    Cc: stable <stable@vger.kernel.org>
Commits on May 26, 2012
  1. @torvalds

    Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/…

    torvalds committed May 26, 2012
    …arm-soc
    
    Pull arm-soc device tree conversions (part 2) from Olof Johansson:
     "These continue the device tree work from part 1, this set is for the
      tegra, mxs and imx platforms, all of which have dependencies on clock
      or pinctrl changes submitted earlier."
    
    Fix up trivial conflicts due to nearby changes in
    drivers/{gpio/gpio,i2c/busses/i2c}-mxs.c
    
    * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
      ARM: dt: tegra: invert status=disable vs status=okay
      ARM: dt: tegra: consistent basic property ordering
      ARM: dt: tegra: sort nodes based on bus order
      ARM: dt: tegra: remove duplicate device_type property
      ARM: dt: tegra: consistenly use lower-case for hex constants
      ARM: dt: tegra: format regs properties consistently
      ARM: dt: tegra: gpio comment cleanup
      ARM: dt: tegra: remove unnecessary unit addresses
      ARM: dt: tegra: whitespace cleanup
      ARM: dt: tegra cardhu: fix typo in SDHCI node name
      ARM: dt: tegra: cardhu: register core regulator tps62361
      ARM: dt: tegra30.dtsi: Add SMMU node
      ARM: dt: tegra20.dtsi: Add GART node
      ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes
      ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes
      ARM: dt: tegra: Add device tree support for AHB
      ARM: dts: enable audio support for imx28-evk
      ARM: dts: enable i2c device for imx28-evk
      i2c: mxs: add device tree probe support
      ARM: dts: enable mmc for imx28-evk
      ...
  2. @torvalds

    Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/ar…

    torvalds committed May 26, 2012
    …m/arm-soc
    
    Pull arm-soc clock driver changes from Olof Johansson:
     "The new clock subsystem was merged in linux-3.4 without any users,
      this now moves the first three platforms over to it: imx, mxs and
      spear.
    
      The series also contains the changes for the clock subsystem itself,
      since Mike preferred to have it together with the platforms that
      require these changes, in order to avoid interdependencies and
      conflicts."
    
    Fix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code
    removed in one branch, added OF support in another) and
    drivers/dma/imx-sdma.c (independent changes next to each other).
    
    * tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)
      clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
      clk: Provide dummy clk_unregister()
      SPEAr: Update defconfigs
      SPEAr: Add SMI NOR partition info in dts files
      SPEAr: Switch to common clock framework
      SPEAr: Call clk_prepare() before calling clk_enable
      SPEAr: clk: Add General Purpose Timer Synthesizer clock
      SPEAr: clk: Add Fractional Synthesizer clock
      SPEAr: clk: Add Auxiliary Synthesizer clock
      SPEAr: clk: Add VCO-PLL Synthesizer clock
      SPEAr: Add DT bindings for SPEAr's timer
      ARM i.MX: remove now unused clock files
      ARM: i.MX6: implement clocks using common clock framework
      ARM i.MX35: implement clocks using common clock framework
      ARM i.MX5: implement clocks using common clock framework
      ARM: Kirkwood: Replace clock gating
      ARM: Orion: Audio: Add clk/clkdev support
      ARM: Orion: PCIE: Add support for clk
      ARM: Orion: XOR: Add support for clk
      ARM: Orion: CESA: Add support for clk
      ...
  3. @torvalds

    Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/…

    torvalds committed May 26, 2012
    …arm/arm-soc
    
    Pull arm-soc driver specific updates from Olof Johansson:
     "These changes are specific to some driver that may be used by multiple
      boards or socs.  The most significant change in here is the move of
      the samsung iommu code from a platform specific in-kernel interface to
      the generic iommu subsystem."
    
    Fix up trivial conflicts in arch/arm/mach-exynos/Kconfig
    
    * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
      mmc: dt: Consolidate DT bindings
      iommu/exynos: Add iommu driver for EXYNOS Platforms
      ARM: davinci: optimize the DMA ISR
      ARM: davinci: implement DEBUG_LL port choice
      ARM: tegra: Add SMMU enabler in AHB
      ARM: tegra: Add Tegra AHB driver
      Input: pxa27x_keypad add choice to set direct_key_mask
      Input: pxa27x_keypad direct key may be low active
      Input: pxa27x_keypad bug fix for direct_key_mask
      Input: pxa27x_keypad keep clock on as wakeup source
      ARM: dt: tegra: pinmux changes for USB ULPI
      ARM: tegra: add USB ULPI PHY reset GPIO to device tree
      ARM: tegra: don't hard-code USB ULPI PHY reset_gpio
      ARM: tegra: change pll_p_out4's rate to 24MHz
      ARM: tegra: fix pclk rate
      ARM: tegra: reparent sclk to pll_c_out1
      ARM: tegra: Add pllc clock init table
      ARM: dt: tegra cardhu: basic audio support
      ARM: dt: tegra30.dtsi: Add audio-related nodes
      ARM: tegra: add AUXDATA required for audio
      ...
Commits on May 25, 2012
  1. @torvalds

    Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

    torvalds committed May 25, 2012
    Pull slave-dmaengine updates from Vinod Koul:
     "Nothing exciting this time, odd fixes in a bunch of drivers"
    
    * 'next' of git://git.infradead.org/users/vkoul/slave-dma:
      dmaengine: at_hdmac: take maxburst from slave configuration
      dmaengine: at_hdmac: remove ATC_DEFAULT_CTRLA constant
      dmaengine: at_hdmac: remove some at_dma_slave comments
      dma: imx-sdma: make channel0 operations atomic
      dmaengine: Fixup dmaengine_prep_slave_single() to be actually useful
      dmaengine: Use dma_sg_len(sg) instead of sg->length
      dmaengine: Use sg_dma_address instead of sg_phys
      DMA: PL330: Remove duplicate header file inclusion
      dma: imx-sdma: keep the callbacks invoked in the tasklet
      dmaengine: dw_dma: add Device Tree probing capability
      dmaengine: dw_dmac: Add clk_{un}prepare() support
      dma/amba-pl08x: add support for the Nomadik variant
      dma/amba-pl08x: check for terminal count status only
Commits on May 17, 2012
  1. @torvalds

    Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

    torvalds committed May 17, 2012
    Pull slave-dmaengine fixes fromVinod Koul:
     "fixes of cylic dma usages in slave dma drivers"
    
    * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
      dmaengine: fix cyclic dma usage
      dmaengine: pl330: dont complete descriptor for cyclic dma
Commits on May 16, 2012
  1. @arndb

    Merge branch 'clk-next' of git://git.linaro.org/people/mturquette/lin…

    arndb committed May 16, 2012
    …ux into next/clock
    
    * 'clk-next' of git://git.linaro.org/people/mturquette/linux:
      clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
      clk: Provide dummy clk_unregister()
      ARM: Kirkwood: Replace clock gating
      ARM: Orion: Audio: Add clk/clkdev support
      ARM: Orion: PCIE: Add support for clk
      ARM: Orion: XOR: Add support for clk
      ARM: Orion: CESA: Add support for clk
      ARM: Orion: SDIO: Add support for clk.
      ARM: Orion: NAND: Add support for clk, if there is one.
      ARM: Orion: EHCI: Add support for enabling clocks
      ARM: Orion: SATA: Add per channel clk/clkdev support.
      ARM: Orion: UART: Get the clock rate via clk_get_rate().
      ARM: Orion: WDT: Add clk/clkdev support
      ARM: Orion: Eth: Add clk/clkdev support.
      ARM: Orion: SPI: Add clk/clkdev support.
      ARM: Orion: Add clocks using the generic clk infrastructure.
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Commits on May 15, 2012
  1. @noglitch

    dmaengine: at_hdmac: take maxburst from slave configuration

    noglitch committed with Vinod Koul May 10, 2012
    The maxburst/chunk size was taken from the private slave DMA data structure.
    Use the common API provided by DMA_SLAVE_CONFIG to setup src/dst maxburst
    values.
    The ctrla field is not needed anymore in the slave private structure nor the
    header constants that were located in an architecture specific directory.
    The at91sam9g45_devices.c file that was using this platform data is also
    modified to remove this now useless data.
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  2. @noglitch

    dmaengine: at_hdmac: remove ATC_DEFAULT_CTRLA constant

    noglitch committed with Vinod Koul May 10, 2012
    Not needed constant that was set to 0.
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  3. Merge branch 'fixes' into next

    Vinod Koul committed May 15, 2012
  4. dmaengine: fix cyclic dma usage

    Vinod Koul committed May 11, 2012
    for cyclic dma, dont makr the descriptor as complte. Fix the remaining users of
    cyclic dma which do so
    
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
    Tested-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Tested-by: Mika Westerberg <mika.westerberg@iki.fi>
Commits on May 14, 2012
  1. @arndb

    Merge branch 'imx/dt/for-3.5' of git://git.linaro.org/people/shawnguo…

    arndb committed May 14, 2012
    …/linux-2.6.git into next/dt2
    
    Shawn Guo <shawn.guo@linaro.org> writes:
    
      I chose to base it on Sascha's imx-common-clk series than -rc, because
      otherwise it will keep patching clock file that has been removed by
      imx-common-clk series.  It also depends on imx-pinctrl pull-request
      I just sent to be functional.
    
      Note: when imx-common-clk and imx-pinctrl get merged together, the
      following files will have conflicts.  But the conflicts should not be
      so hard to resolve.
    
    [arnd: resolved those merge conflicts by pulling pinctrl branch]
    
    * imx/dt: (24 commits)
      ARM: dts: imx53-qsb: enable audio support
      ARM: dts: imx51-babbage: enable audio support
      ARM: imx: add audio codec clk lookup for imx53-qsb
      ARM: imx: add audmux pad setting for imx51-babbage
      ARM: imx: add more imx5 ssi clocks
      ARM: dts: imx53-qsb: Add Dialog DA9053 PMIC support
      ARM: dts: imx6q-sabrelite: add serial2 pinctrl support
      ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000
      ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000
      ARM: imx6q: add ssi1_ipg clk_lookup
      ARM: dts: imx6q-sabrelite: add audmux pinctrl support
      ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support
      ARM: dts: imx6q-sabrelite: add audmux device
      ARM: dts: imx6q-sabrelite: add ssi device
      ARM: dts: imx6q-arm2: add pinctrl state for usdhc
      ARM: imx6: Add UART2 for low-level debug
      ARM: imx6q: register phy fixup only when CONFIG_PHYLIB is enabled
      ARM: imx6q: move imx6q_sabrelite specific code to a dedicated function
      ARM: dts: imx6q-sabrelite: Add SPI NOR support
      ARM: dts: Add basic support for imx6q-sabresd
      ...
    
    Pulls in imx/pinctrl and imx/clock as dependencies.
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  2. @arndb

    Merge branch 'imx/pinctrl' into imx/dt

    arndb committed May 14, 2012
    Conflicts:
    	drivers/mmc/host/sdhci-esdhc-imx.c
    	drivers/net/ethernet/freescale/fec.c
    	drivers/spi/spi-imx.c
    	drivers/tty/serial/imx.c
    
    This resolves some simply but annoying conflicts.
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Commits on May 12, 2012
  1. @olofj

    Merge tag 'ep93xx-fixes-for-3.5' of git://github.com/RyanMallon/linux…

    olofj committed May 11, 2012
    …-ep93xx into next/drivers
    
    Branch has one driver feature and one board bug fix. Merging it as a driver branch.
    
    DMA driver change was later:
    Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
    
    * tag 'ep93xx-fixes-for-3.5' of git://github.com/RyanMallon/linux-ep93xx:
      dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels
      arm: ep93xx: Don't try to release not acquired GPIO lines
  2. dma: mxs-dma: add device tree probe support

    Dong Aisheng committed with Shawn Guo May 4, 2012
    Cc: Grant Likely <grant.likely@secretlab.ca>
    Cc: Rob Herring <rob.herring@calxeda.com>
    Cc: Rob Landley <rob@landley.net>
    Cc: Dan Williams <dan.j.williams@intel.com>
    Cc: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: Huang Shijie <b32955@freescale.com>
    Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
    Acked-by: Marek Vasut <marex@denx.de>
    Acked-by: Vinod Koul <vinod.koul@intel.com>
  3. dma: mxs-dma: make platform_device_id more generic

    Shawn Guo committed May 10, 2012
    Rewrite mxs_dma_is_apbh and mxs_dma_is_apbx in order to support
    other SoCs like imx6q and reform the platform_device_id for the
    better further dt support.
    
    Cc: Dan Williams <dan.j.williams@intel.com>
    Cc: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: Huang Shijie <b32955@freescale.com>
    Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
    Acked-by: Marek Vasut <marex@denx.de>
    Acked-by: Vinod Koul <vinod.koul@intel.com>
  4. dma: mxs-dma: let dma_is_apbh and apbh_is_old take parameter

    Shawn Guo committed May 7, 2012
    Let macros dma_is_apbh and apbh_is_old take mxs_dma as parameter
    to make the code easy to read.
    
    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
  5. dma: mxs-dma: use global stmp_device functionality

    Dong Aisheng committed with Shawn Guo May 4, 2012
    This can get rid of the mach-dependency.
    
    Cc: Dan Williams <dan.j.williams@intel.com>
    Cc: Sascha Hauer <s.hauer@pengutronix.de>
    Cc: Huang Shijie <b32955@freescale.com>
    Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
    Acked-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Marek Vasut <marex@denx.de>
    Acked-by: Vinod Koul <vinod.koul@intel.com>
Commits on May 11, 2012
  1. @arndb

    Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-…

    arndb committed May 11, 2012
    …2.6 into next/clock
    
    Shawn Guo <shawn.guo@linaro.org> writes:
    
      mxs common clk porting for v3.5.  It depends on the following two branches.
    
      [1] git://git.linaro.org/people/mturquette/linux.git clk-next
      [2] http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git clkdev
    
      As the mxs device tree conversion will constantly touch clock files,
      to save the conflicts, the updated mxs/dt branch coming later will
      based on this pull-request.
    
    * 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6:
      ARM: mxs: remove now unused timer_clk argument from mxs_timer_init
      ARM: mxs: remove old clock support
      ARM: mxs: switch to common clk framework
      ARM: mxs: change the lookup name for fec phy clock
      ARM: mxs: request clock for timer
      clk: mxs: add clock support for imx28
      clk: mxs: add clock support for imx23
      clk: mxs: add mxs specific clocks
    
    Includes an update to Linux 3.4-rc6
    
    Conflicts:
    	drivers/clk/Makefile
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  2. dma: imx-sdma: make channel0 operations atomic

    Richard Zhao committed with Vinod Koul May 11, 2012
    device_prep_dma_cyclic may be call in audio trigger function which is
    atomic context, so we make it atomic too.
    
     - change channel0 lock to spinlock.
     - Use polling to wait for channel0 finish running.
    
    Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
    Acked-by: Shawn Guo <shawn.guo@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  3. @larsclausen

    dmaengine: Use dma_sg_len(sg) instead of sg->length

    larsclausen committed with Vinod Koul Apr 25, 2012
    sg->length may or may not contain the length of the dma region to transfer,
    depending on the architecture - dma_sg_len(sg) always will though. For the
    architectures which use the drivers modified by this patch it probably is the
    case that sg->length contains the dma transfer length. But to be consistent and
    future proof change them to use dma_sg_len.
    
    To quote Russel King:
    	sg->length is meaningless to something performing DMA.
    
    	In cases where sg_dma_len(sg) and sg->length are the same storage, then
    	there's no problem. But scatterlists _can_ (and one some architectures) do
    	split them - especially when you have an IOMMU which can allow you to
    	combine a scatterlist into fewer entries.
    
    	So, anything using sg->length for the size of a scatterlist's DMA transfer
    	_after_ a call to dma_map_sg() is almost certainly buggy.
    
    The patch has been generated using the following coccinelle patch:
    <smpl>
    @@
    struct scatterlist *sg;
    expression X;
    @@
    -sg[X].length
    +sg_dma_len(&sg[X])
    @@
    struct scatterlist *sg;
    @@
    -sg->length
    +sg_dma_len(sg)
    </smpl>
    
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  4. @larsclausen

    dmaengine: Use sg_dma_address instead of sg_phys

    larsclausen committed with Vinod Koul Apr 25, 2012
    dmaengine drivers should always use sg_dma_address instead of sg_phys to get the
    addresses for the transfer from a sg element.
    
    To quote Russel King:
    	sg_phys(sg) of course has nothing to do with DMA addresses. It's the
    	physical address _to the CPU_ of the memory associated with the scatterlist
    	entry. That may, or may not have the same value for the DMA engine,
    	particularly if IOMMUs are involved.
    
    	And if these drivers are used on ARM, they must be fixed, sooner rather
    	than later.  There's patches in the works which will mean we will end up
    	with IOMMU support in the DMA mapping later, which means everything I've
    	said above will become reality.
    
    The patch has been generated using the following coccinelle patch:
    <smpl>
    @@
    struct scatterlist *sg;
    @@
    -sg_phys(sg)
    +sg_dma_address(sg)
    </smpl>
    
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Acked-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  5. DMA: PL330: Remove duplicate header file inclusion

    Sachin Kamat committed with Vinod Koul May 3, 2012
    Removes <linux/interrupt.h> file which was included twice.
    
    Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
    Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  6. Merge branch 'fixes' into next

    Vinod Koul committed May 11, 2012
  7. dmaengine: pl330: dont complete descriptor for cyclic dma

    Vinod Koul committed May 11, 2012
    the cookie updates completed the cyclic dma descriptor wrongly. This caused the
    BUG_ON to be hit as submit is called for completed descriptor
    
    Fix this by not marking the cyclic descriptor as complete
    
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
    Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
  8. dma: imx-sdma: keep the callbacks invoked in the tasklet

    Huang Shijie committed with Vinod Koul Apr 28, 2012
    The current code keeps the callbacks invoked from interrupt context, this
    does not conform to the Documentation/dmaengine.txt.
    
    So add tasklet support to fix this issue.
    
    Signed-off-by: Huang Shijie <b32955@freescale.com>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  9. @vireshk

    dmaengine: dw_dma: add Device Tree probing capability

    vireshk committed with Vinod Koul Apr 20, 2012
    SPEAr platforms now support DT and so must convert all drivers to support DT.
    This patch adds DT probing support for Synopsys DMA controller and updates its
    documentation too.
    
    Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  10. dmaengine: dw_dmac: Add clk_{un}prepare() support

    Viresh Kumar committed with Vinod Koul Apr 17, 2012
    clk_{un}prepare is mandatory for platforms using common clock framework. Since
    this driver is used by SPEAr platform, which supports common clock framework,
    add clk_{un}prepare() support for it.
    
    Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
    Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Commits on May 8, 2012
  1. @lunn

    ARM: Orion: XOR: Add support for clk

    lunn committed with Mike Turquette Feb 19, 2012
    Some orion platforms can gate the XOR driver clock. If the clock
    exisits, unable/disable it as appropriate.
    
    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Tested-by: Jamie Lentin <jm@lentin.co.uk>
    Signed-off-by: Mike Turquette <mturquette@linaro.org>
Commits on Apr 26, 2012
  1. @torvalds

    Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

    torvalds committed Apr 26, 2012
    Pull [GIT PULL] slave-dmaengine fixes from Vinod Koul.
    
    * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
      dmaengine/amba-pl08x : reset phychan_hold on terminate all
      dma: pl330: fix a couple of compilation warnings
      dma/ste_dma40: fix erroneous comparison
      dma/ste_dma40: explicitly include regulator consumer header
      dma40: Improve the logic of stopping logical chan
      dmaengine: at_hdmac: remove clear-on-read in atc_dostart()
      dma: mxs-dma: enable channel in device_issue_pending call
      dmaengine: imx-dma: dont complete descriptor for cyclic dma
Something went wrong with that request. Please try again.