)]}' { "log": [ { "commit": "13ae246db4a02971ef4f557af1f6d3e21d64b710", "tree": "e40e4a686a57f987b1a3c682656de174e6b980b0", "parents": [ "6b21d18ed50c7d145220b0724ea7f2613abf0f95" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jan 29 15:44:45 2012 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Feb 28 19:31:56 2012 -0500" }, "message": "includecheck: delete any duplicate instances of module.h\n\nDifferent tree maintainers picked up independently generated\ntrivial compile fixes based on linux-next testing, resulting\nin some cases where a file would have got more than one addition\nof module.h once everything was all merged together.\n\nDelete any duplicates so includecheck isn\u0027t complaining about\nanything related to module.h/export.h changes.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "94ac27a54be6a14948f0a9b3f542b4ff1faac232", "tree": "3aff7c8ba640843965ef4a7223dd4ce7ae3501a5", "parents": [ "c8ddf036d99e7fab943b7587c75a905e789ea7e7" ], "author": { "name": "Philippe Rétornaz", "email": "philippe.retornaz@epfl.ch", "time": "Tue Jan 24 14:22:01 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Feb 02 14:00:43 2012 +0530" }, "message": "i.MX SDMA: Fix burstsize settings\n\nCommit 6584cb88 (ARM i.MX dma: Fix burstsize settings) fixed\nthe mxcmmc driver but forgot to fix the SDMA driver to handle the\ncorrect burtsize.\nThis make the SD card access works again with DMA on i.MX31 boards.\n\nSigned-off-by: Philippe Rétornaz \u003cphilippe.retornaz@epfl.ch\u003e\nTested-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "e9c8d7a03e69093e4c33c5056a45c1233a42e8a4", "tree": "b9a37c891db8e273bf9ff177d4be00ec5050393a", "parents": [ "a5044cddad2fba36c725a019a6cd0e3f286b13d0" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed Jan 18 10:14:25 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 01 22:23:53 2012 +0530" }, "message": "dma: sh_dma: not all SH DMAC implementations support MEMCPY\n\nAdd a flag to allow platforms to specify, whether a DMAC instance supports\nthe MEMCPY operation. To avoid regressions, preserve the current default.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "a5044cddad2fba36c725a019a6cd0e3f286b13d0", "tree": "04b679b6147437cc52f0cbfc08de999807e568a8", "parents": [ "bda3a47c886664e86ee14eb79e9072b9e341f575", "d07a74a546981a09ba490936645fbf0d1340b96c" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 13:34:15 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 13:36:14 2012 +0530" }, "message": "Merge branch fixes of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git\n" }, { "commit": "bda3a47c886664e86ee14eb79e9072b9e341f575", "tree": "57f220d3f7cf54d05273582aac2da4d4e4be6aa9", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Nikolaus Voss", "email": "n.voss@weinmann.de", "time": "Tue Jan 17 10:28:33 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 09:09:04 2012 +0530" }, "message": "at_hdmac: bugfix for enabling channel irq\n\ncommit 463894705e4089d0ff69e7d877312d496ac70e5b deleted redundant\nchan_id and chancnt initialization in dma drivers as this is done\nin dma_async_device_register().\n\nHowever, atc_enable_irq() relied on chan_id set before registering\nthe device, what left only channel 0 functional for this driver.\n\nThis patch introduces atc_enable/disable_chan_irq() as a variant\nof atc_enable/disable_irq() with the channel as explicit argument.\n\nSigned-off-by: Nikolaus Voss \u003cn.voss@weinmann.de\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "d07a74a546981a09ba490936645fbf0d1340b96c", "tree": "eda5193a28b09fd0f7af994b6762d33b5e8e5b53", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Dr. David Alan Gilbert", "email": "linux@treblig.org", "time": "Thu Aug 25 16:13:55 2011 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon Jan 23 11:43:18 2012 -0800" }, "message": "dmaengine: fix missing \u0027cnt\u0027 in ?: in dmatest\n\nHi,\n On the latest tree my compiler has started giving the warning:\n\ndrivers/dma/dmatest.c:575:28: warning: the omitted middle operand in ?: will always be ?true?, suggest explicit middle operand [-Wparentheses]\n\nThe following patch fixes the missing middle clause with the same\nfix that Nicolas Ferre used in the similar clauses.\n(There seems to have been a race between him fixing that and\nthe extra clause going in a little later).\n\nI don\u0027t actually know the dmatest code/structures, nor do I own\nany hardware to test it on (assuming it needs a DMA engine);\n but this patch builds, the existing code is almost certainly\nwrong and the fix is the same as the corresponding lines above it.\n\n(WTH is x\u003dy?:z legal C anyway?)\n\nSigned-off-by: Dr. David Alan Gilbert \u003clinux@treblig.org\u003e\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nReported-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "57f2685c16fa8e0cb86e4bc7c8ac33bfed943819", "tree": "96a42fe632687c8486c250c4805bf1d4c9c34d19", "parents": [ "488a9d018256dc9f29e041c0360445b6d25eea9a", "e08b881a69d638175bfa99b5af4d72b731633ea7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)\n ARM: mach-shmobile: specify CHCLR registers on SH7372\n dma: shdma: fix runtime PM: clear channel buffers on reset\n dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit\n dmaengine/ste_dma40: clear LNK on channel startup\n dmaengine: intel_mid_dma: remove legacy pm interface\n ASoC: mxs: correct \u0027direction\u0027 of device_prep_dma_cyclic\n dmaengine: intel_mid_dma: error path fix\n dmaengine: intel_mid_dma: locking and freeing fixes\n mtd: gpmi-nand: move to dma_transfer_direction\n mtd: fix compile error for gpmi-nand\n mmc: mxs-mmc: fix the dma_transfer_direction migration\n dmaengine: add DMA_TRANS_NONE to dma_transfer_direction\n dma: mxs-dma: Don\u0027t use CLKGATE bits in CTRL0 to disable DMA channels\n dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe\n dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.\n dma: mxs-dma: fix a typo in comment\n DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove\n video i.MX IPU: Fix display connections\n i.MX IPU DMA: Fix wrong burstsize settings\n dmaengine/ste_dma40: allow fixed physical channel\n ...\n\nFix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}\n\nThe conflicts looked pretty trivial, but I\u0027ll ask people to verify them.\n" }, { "commit": "979ecef5b89a8003902299566d9cdc08de34a3ee", "tree": "2a695d557adab1dec5263f014789f5b59238bac8", "parents": [ "e8cbce976050a9f874a8b07012ddeb9b9eb59603", "8c3b2296f1aa13d7504d2c09bc819cef3759562a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:44:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:44:15 2012 -0800" }, "message": "Merge tag \u0027clk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nclock management changes for i.MX\n\nAnother simple series related to clock management, this time only for\nimx.\n\n* tag \u0027clk\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: mxs: select HAVE_CLK_PREPARE for clock\n clk: add config option HAVE_CLK_PREPARE into Kconfig\n ASoC: mxs-saif: convert to clk_prepare/clk_unprepare\n video: mxsfb: convert to clk_prepare/clk_unprepare\n serial: mxs-auart: convert to clk_prepare/clk_unprepare\n net: flexcan: convert to clk_prepare/clk_unprepare\n mtd: gpmi-lib: convert to clk_prepare/clk_unprepare\n mmc: mxs-mmc: convert to clk_prepare/clk_unprepare\n dma: mxs-dma: convert to clk_prepare/clk_unprepare\n net: fec: add clk_prepare/clk_unprepare\n ARM: mxs: convert platform code to clk_prepare/clk_unprepare\n clk: add helper functions clk_prepare_enable and clk_disable_unprepare\n\nFix up trivial conflicts in drivers/net/ethernet/freescale/fec.c due to\ncommit 0ebafefcaa7a (\"net: fec: add clk_prepare/clk_unprepare\") clashing\ntrivially with commit e163cc97f9ac (\"net/fec: fix the .remove code\").\n" }, { "commit": "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "tree": "4cfa82b619f7d39b671e4a2a213f4d040b09c486", "parents": [ "6d889d03ab1417645e76e129834f76204bae37c0", "3e2762c8f1141ae8dc708034ea41d6827818c328" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:38:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:38:51 2012 -0800" }, "message": "Merge tag \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nNew feature development\n\nThis adds support for new features, and contains stuff from most\nplatforms. A number of these patches could have fit into other\nbranches, too, but were small enough not to cause too much\nconfusion here.\n\n* tag \u0027devel\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)\n mfd/db8500-prcmu: remove support for early silicon revisions\n ARM: ux500: fix the smp_twd clock calculation\n ARM: ux500: remove support for early silicon revisions\n ARM: ux500: update register files\n ARM: ux500: register DB5500 PMU dynamically\n ARM: ux500: update ASIC detection for U5500\n ARM: ux500: support DB8520\n ARM: picoxcell: implement watchdog restart\n ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C\n ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx \u003c\u003d ES2.1\n ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4\n ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3\n ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3\n ARM: Orion: Remove address map info from all platform data structures\n ARM: Orion: Get address map from plat-orion instead of via platform_data\n ARM: Orion: mbus_dram_info consolidation\n ARM: Orion: Consolidate the address map setup\n ARM: Kirkwood: Add configuration for MPP12 as GPIO\n ARM: Kirkwood: Recognize A1 revision of 6282 chip\n ARM: ux500: update the MOP500 GPIO assignments\n ...\n" }, { "commit": "dfc1ebe76663d582a01c9dc572395cf8086d01de", "tree": "54a5ac91214a90f82c27b6e38099a4470837729e", "parents": [ "acc952c1f373bf3f66cc7a10680eee1762bed40b", "b001befe58691ef3627458cd814e8cee7f845c5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDevice tree conversions for samsung and tegra\n\nBoth platforms had some initial device tree support, but this adds\nmuch more to actually make it usable.\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)\n ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN\n ARM: EXYNOS: Add Exynos4 device tree enabled board file\n rtc: rtc-s3c: Add device tree support\n input: samsung-keypad: Add device tree support\n ARM: S5PV210: Modify platform data for pl330 driver\n ARM: S5PC100: Modify platform data for pl330 driver\n ARM: S5P64x0: Modify platform data for pl330 driver\n ARM: EXYNOS: Add a alias for pdma clocks\n ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build\n ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers\n DMA: PL330: Add device tree support\n ARM: EXYNOS: Modify platform data for pl330 driver\n DMA: PL330: Infer transfer direction from transfer request instead of platform data\n DMA: PL330: move filter function into driver\n serial: samsung: Fix build for non-Exynos4210 devices\n serial: samsung: add device tree support\n serial: samsung: merge probe() function from all SoC specific extensions\n serial: samsung: merge all SoC specific port reset functions\n ARM: SAMSUNG: register uart clocks to clock lookup list\n serial: samsung: remove all uses of get_clksrc and set_clksrc\n ...\n\nFix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and\ndrivers/tty/serial/Kconfig both due to just adding code close to\nchanges.\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "237c78beb8a988453bac1993d21f025d070a0d8d", "tree": "9864f0924650770881141359a2d5bac623949789", "parents": [ "4eb821999086417ab42a15174b51497122fc406e", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:30:20 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:42:17 2012 +0000" }, "message": "Merge branch \u0027depends/rmk/for-linus\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-exynos/Makefile\n\tarch/arm/mach-exynos/cpu.c -\u003e common.c\n\tarch/arm/mach-exynos/include/mach/entry-macro.S\n\tarch/arm/mach-exynos/init.c -\u003e common.c\n\tarch/arm/mach-s5p64x0/init.c -\u003e common.c\n\tarch/arm/mach-s5pv210/init.c -\u003e common.c\n\nMultiple files were moved into common.c files in the rmk/for-linus\nbranch, so this moves over the samsung/dt changes to the new\nfiles.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "d3d0b024348c040f0d6851e2e59fc961677d5169", "tree": "ab018edaa027ad069c54beb9cb3d0c5b5efc2198", "parents": [ "6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd", "9d5c627323dcf0983d699d26dd486272fc98bef2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:03:30 2012 -0800" }, "message": "Merge branch \u0027amba-modalias\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027amba-modalias\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:\n sound: aaci: Enable module alias autogeneration for AMBA drivers\n watchdog: sp805: Enable module alias autogeneration for AMBA drivers\n fbdev: amba: Enable module alias autogeneration for AMBA drivers\n serial: pl011: Enable module alias autogeneration for AMBA drivers\n serial: pl010: Enable module alias autogeneration for AMBA drivers\n spi: pl022: Enable module alias autogeneration for AMBA drivers\n rtc: pl031: Enable module alias autogeneration for AMBA drivers\n rtc: pl030: Enable module alias autogeneration for AMBA drivers\n mmc: mmci: Enable module alias autogeneration for AMBA drivers\n input: ambakmi: Enable module alias autogeneration for AMBA drivers\n gpio: pl061: Enable module alias autogeneration for AMBA drivers\n dmaengine: pl330: Enable module alias autogeneration for AMBA drivers\n dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers\n hwrng: nomadik: Enable module alias autogeneration for AMBA drivers\n ARM: amba: Auto-generate AMBA driver module aliases during modpost\n ARM: amba: Move definition of struct amba_id to mod_devicetable.h\n" }, { "commit": "c11b46c32c8a9bf05fdb76d70d8dc74fcbfd02d1", "tree": "970a85e6a577d878c5ee57f31a1ee3df0fb8ad00", "parents": [ "f69f2e264f6388df6d3cae45dd67ddfd52aaa14b" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed Jan 04 15:34:17 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Jan 06 11:40:11 2012 +0530" }, "message": "dma: shdma: fix runtime PM: clear channel buffers on reset\n\nOn platforms, supporting power domains, if the domain, containing a DMAC\ninstance is powered down, the driver fails to resume correctly. On those\nplatforms DMAC channels have an additional CHCLR register for clearing\nchannel buffers. Using this register during runtime resume fixes the\nproblem.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "f69f2e264f6388df6d3cae45dd67ddfd52aaa14b", "tree": "27c736df90bf30d31d69ec6e8263f3e26b869291", "parents": [ "e9f3a49c9698da6f6b606d5e048ddce308438763" ], "author": { "name": "Haitao Zhang", "email": "minipanda@linuxrobot.org", "time": "Sun Jan 01 11:30:06 2012 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Jan 06 11:31:56 2012 +0530" }, "message": "dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit\n\nmx53_loco: fix deadlock report from sdma_tx_submit() during boot\n\nBugLink: http://bugs.launchpad.net/bugs/878701\n\nAdjust to use spin_lock_irqsave()/spin_unlock_irqresotre(), so to\nmake it safe when called from interrupt context.\n\nSigned-off-by: Haitao Zhang \u003chaitao.zhang@linaro.org\u003e\nSigned-off-by: Eric Miao \u003ceric.miao@linaro.org\u003e\nSigned-off-by: Richard Zhao \u003crichard.zhao@linaro.org\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "e9f3a49c9698da6f6b606d5e048ddce308438763", "tree": "37e3e7ce0501054fa1669709c6e941c9cd115cad", "parents": [ "8730790b971d747dd4508d22fbc1a4f9422c2803" ], "author": { "name": "Rabin Vincent", "email": "rabin.vincent@stericsson.com", "time": "Wed Dec 28 11:27:40 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Jan 02 16:42:44 2012 +0530" }, "message": "dmaengine/ste_dma40: clear LNK on channel startup\n\nOtherwise if a previously physical channel is used as a logical channel, the\nLNK may have old values which affect the operation of the logical channel since\nthe LNK register has different semantics between physical and logical channels.\n\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nReviewed-by: Jonas ABERG \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Narayanan G \u003cnarayanan.gopalakrishnan@stericsson.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "8730790b971d747dd4508d22fbc1a4f9422c2803", "tree": "1298c05c62b6cbf35f0e2bde569bfdc7277bc21a", "parents": [ "d6077c92b6c51299eac7c2673631d6394ee2191a" ], "author": { "name": "Kristen Carlson Accardi", "email": "kristen@linux.intel.com", "time": "Fri Dec 16 11:01:40 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Jan 02 16:34:42 2012 +0530" }, "message": "dmaengine: intel_mid_dma: remove legacy pm interface\n\nDrivers should not support both legacy pm and new framework.\n\nSigned-off-by: Kristen Carlson Accardi \u003ckristen@linux.intel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "759a2e30d288032130f1f77092e72d4ec87ad4d0", "tree": "fa6e62b3823eddd4251a830a8d79c31ef305e0a2", "parents": [ "0ebafefcaa7a383b728d977a718e23e69ce84050" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Dec 20 13:54:00 2011 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed Dec 28 21:29:30 2011 +0800" }, "message": "dma: mxs-dma: convert to clk_prepare/clk_unprepare\n\nThe patch converts mxs-dma driver to clk_prepare/clk_unprepare by\nusing helper functions clk_prepare_enable/clk_disable_unprepare.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Marek Vasut \u003cmarek.vasut@gmail.com\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "2a0ff7a602714990b10a8749e908dad48401138e", "tree": "df445b369f9404496e763fa3507110cfcb47371a", "parents": [ "1fded07513ea57b5ee128958ff119e05588b7227" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@intel.com", "time": "Fri Dec 16 11:01:39 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Dec 23 21:50:57 2011 +0530" }, "message": "dmaengine: intel_mid_dma: error path fix\n\nAdd missing iounmap in error path.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@intel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "1fded07513ea57b5ee128958ff119e05588b7227", "tree": "b25d48ee587c5c3a4e8703de89204d51dd459c5b", "parents": [ "0ef7e206d6a5a5de0cd84ed4925a4f688c62e732" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@intel.com", "time": "Fri Dec 16 11:01:38 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Dec 23 21:50:57 2011 +0530" }, "message": "dmaengine: intel_mid_dma: locking and freeing fixes\n\nTwo issues are fixed:\n\n1. DMA descriptors are reused so when freeing lli structures\nthat are linked to them, the pointer must be nulled.\n\n2. midc_scan_descriptors() must be called with the\nchannel lock held.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@intel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "62268ce9170c5466332c046ff6ddafcb67751502", "tree": "1771a5aedb72e2f85ae829d1e15045c619ba1899", "parents": [ "7ad7a345a4f17c08a1bb9bfdbb62f7793d84aa36" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Dec 13 23:48:03 2011 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Dec 23 21:33:15 2011 +0530" }, "message": "dmaengine: add DMA_TRANS_NONE to dma_transfer_direction\n\nBefore dma_transfer_direction was introduced to replace\ndma_data_direction, some dmaengine device uses DMA_NONE of\ndma_data_direction for some talk with its client drivers.\nThe mxs-dma and its clients mxs-mmc and gpmi-nand are such case.\n\nThis patch adds DMA_TRANS_NONE to dma_transfer_direction and\nmigrate the DMA_NONE use in mxs-dma to it.\n\nIt also fixes the compile warning below.\n\nCC drivers/dma/mxs-dma.o\ndrivers/dma/mxs-dma.c: In function ‘mxs_dma_prep_slave_sg’:\ndrivers/dma/mxs-dma.c:420:16: warning: comparison between ‘enum dma_transfer_direction’ and ‘enum dma_data_direction’\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "7ad7a345a4f17c08a1bb9bfdbb62f7793d84aa36", "tree": "83839c0af2da4529d5fdec1b9c961b541d572c66", "parents": [ "6d23ea4b1906f28f5d99ad6aeef7207c48be6bfd" ], "author": { "name": "Lothar Waßmann", "email": "LW@KARO-electronics.de", "time": "Thu Dec 08 09:15:44 2011 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Dec 23 20:54:55 2011 +0530" }, "message": "dma: mxs-dma: Don\u0027t use CLKGATE bits in CTRL0 to disable DMA channels\n\nThis is how the original Freescale code (unintentionally) worked,\nbecause the code path which would have asserted the CLKGATE bit was\nnever actually reached in their code.\nThis fixes the nefarious \"DMA timout\" bug when multiple DMA channels\n(e.g. GPMI NAND and MMC) are used at the same time.\nIf a better fix for this problem should be found, the clkgate handling\ncould be reinstated.\nSee http://lists.infradead.org/pipermail/linux-arm-kernel/2011-September/065228.html\n\nAlso reverse the order of mxs_dma_disable_chan() and\nmxs_dma_reset_chan() in mxs_dma_control() because mxs_dma_reset_chan()\ncan only work when the DMA channel is enabled.\n\nSigned-off-by: Lothar Waßmann \u003cLW@KARO-electronics.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "6d23ea4b1906f28f5d99ad6aeef7207c48be6bfd", "tree": "d448c976c70aa3bf028fb9cf8c91a7b7f046129d", "parents": [ "feb397de65c3f76e40ef70e264f2cdf688c850c1" ], "author": { "name": "Lothar Waßmann", "email": "LW@KARO-electronics.de", "time": "Thu Dec 08 09:15:43 2011 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Dec 23 20:54:55 2011 +0530" }, "message": "dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe\n\nUsing a static variable for counting the number of CCWs attached to\na DMA channel when appending a new descriptor is not multi user safe.\n\nSigned-off-by: Lothar Waßmann \u003cLW@KARO-electronics.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "feb397de65c3f76e40ef70e264f2cdf688c850c1", "tree": "c4f47467c4c05782b40d5cf47550220b19ecae72", "parents": [ "400312201b0cf4e4deaf75842f5e95212b382e81" ], "author": { "name": "Lothar Waßmann", "email": "LW@KARO-electronics.de", "time": "Thu Dec 08 09:15:42 2011 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Dec 23 20:54:54 2011 +0530" }, "message": "dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.\n\nThere is no need to have the clock enabled all the time the driver is\nloaded.\nIt will be enabled anyway in mxs_dma_alloc_chan_resources() when a\nchannel is actually going to be used.\n\nSigned-off-by: Lothar Waßmann \u003cLW@KARO-electronics.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "400312201b0cf4e4deaf75842f5e95212b382e81", "tree": "518dd53f73ee5a366b05f1389cfc83c83578e7e2", "parents": [ "3506c0d507144d9b0f19efd5a56d289f70611179" ], "author": { "name": "Lothar Waßmann", "email": "LW@KARO-electronics.de", "time": "Thu Dec 08 09:15:41 2011 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Dec 23 20:54:54 2011 +0530" }, "message": "dma: mxs-dma: fix a typo in comment\n\nSigned-off-by: Lothar Waßmann \u003cLW@KARO-electronics.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "93ed55441245a39e3935f5cf1af3e22febcce905", "tree": "5e238c5e269274fd47c1d03cb0a1c6172feef8fc", "parents": [ "e1cd8454dac99473c2349efce1346264c494f28d" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Mon Oct 24 11:43:31 2011 +0200" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:04 2011 +0900" }, "message": "DMA: PL330: Add device tree support\n\nFor PL330 dma controllers instantiated from device tree, the channel\nlookup is based on phandle of the dma controller and dma request id\nspecified by the client node. During probe, the private data of each\nchannel of the controller is set to point to the device node of the\ndma controller. The \u0027chan_id\u0027 of the each channel is used as the\ndma request id.\n\nClient driver requesting dma channels specify the phandle of the\ndma controller and the request id. The pl330 filter function\nconverts the phandle to the device node pointer and matches that\nwith channel\u0027s private data. If a match is found, the request id\nfrom the client node and the \u0027chan_id\u0027 of the channel is matched.\nA channel is found if both the values match.\n\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nAcked-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nReviewed-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "cd072515215ccc37051cadc516ce28545257be41", "tree": "f67c1ed0a2a988181c20f545f0ad1732b2444a90", "parents": [ "3e2ec13a8185183cd7ff237dadc948a0f9f7398f" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Mon Oct 24 11:43:11 2011 +0200" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:03 2011 +0900" }, "message": "DMA: PL330: Infer transfer direction from transfer request instead of platform data\n\nThe transfer direction for a channel can be inferred from the transfer\nrequest and the need for specifying transfer direction in platfrom data\ncan be eliminated. So the structure definition \u0027struct dma_pl330_peri\u0027\nis no longer required.\n\nThe channel\u0027s private data is set to point to a channel id specified in\nthe platform data (instead of an instance of type \u0027struct dma_pl330_peri\u0027).\nThe filter function is correspondingly modified to match the channel id.\n\nWith the \u0027struct dma_pl330_peri\u0027 removed from platform data, the dma\ncontroller transfer capabilities cannot be inferred any more. Hence,\nthe dma controller capabilities is specified using platform data.\n\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nAcked-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "3e2ec13a8185183cd7ff237dadc948a0f9f7398f", "tree": "fa5efc91ccbb6fe013c2614ac9b676c4192b6f60", "parents": [ "a169a888bf8c5490ae0377fcd0ad22c6af9fd8e7" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Mon Oct 24 11:43:02 2011 +0200" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:02 2011 +0900" }, "message": "DMA: PL330: move filter function into driver\n\nThe dma channel selection filter function is moved from plat-samsung\ninto the pl330 driver. In additon to that, a check is added in the\nfilter function to ensure that the channel on which the filter has\nbeen invoked is pl330 channel instance (and avoid any incorrect\naccess of chan-\u003eprivate in a system with multiple types of DMA\ndrivers).\n\nSuggested-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "eb444fee92895cd793911b002b7e56795caf9914", "tree": "7adb134f641a6ba45b4c314d995a6099e6821561", "parents": [ "83f250625b44dead19d8479b315815698f348c05" ], "author": { "name": "Eric Bénard", "email": "eric@eukrea.com", "time": "Tue Dec 13 15:12:55 2011 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Dec 19 12:26:07 2011 +0100" }, "message": "dma: MX3_IPU fix depends\n\nARCH_MX3 was removed in commit a89cf59 :\n\"arm/imx: merge i.MX3 and i.MX6\"\nthus preventing to select MX3_IPU, thus preventing IPU and display\nto work on i.MX3x SOC.\ni.MX SDMA support is also affected.\n\nSigned-off-by: Eric Bénard \u003ceric@eukrea.com\u003e\nCc: Sascha Hauer \u003ckernel@pengutronix.de\u003e\nCc: Vinod Koul \u003cvinod.koul@intel.com\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "63a9332b232bdab0df6ef18a9f39e8d58a82bda4", "tree": "52906e5888de9e634824d6005d9dbd3eb109bd2d", "parents": [ "45173d5ed4c9a397db31623bf6469efbd3a239cd" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Wed Dec 07 21:48:07 2011 +0100" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Tue Dec 13 18:46:55 2011 -0500" }, "message": "ARM: Orion: Get address map from plat-orion instead of via platform_data\n\nUse an getter function in plat-orion/addr-map.c to get the address map\nstructure, rather than pass it to drivers in the platform_data\nstructures. When the drivers are built for none orion platforms, a\ndummy function is provided instead which returns NULL.\n\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nTested-by: Michael Walle \u003cmichael@walle.cc\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nSigned-off-by: Nicolas Pitre \u003cnico@fluxnic.net\u003e\n" }, { "commit": "3506c0d507144d9b0f19efd5a56d289f70611179", "tree": "a647255761f9f29eeef237f32dd09b46509db073", "parents": [ "f910fb8fcd1c97788f2291c8646597bcd87ee061" ], "author": { "name": "Tushar Behera", "email": "tushar.behera@linaro.org", "time": "Tue Dec 06 16:15:54 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Dec 08 13:44:35 2011 +0530" }, "message": "DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove\n\namba_probe() now calls pm_runtime_get_noresume() and pm_runtime_enable()\nfor the devices before the device probe is called. Hence we don\u0027t need\nto call pm_runtime_get_xxx and pm_runtime_enable() in device probe again.\nIn the same way, since amba_remove() calls the respective pm_runtime\nfunctions, those functions need not be called from device remove.\n\nThis patch fixes following run time error with pl330 driver.\n\ndma-pl330 dma-pl330.0: Unbalanced pm_runtime_enable!\ndma-pl330 dma-pl330.0: failed to get runtime pm\n\nSigned-off-by: Giridhar Maruthy \u003cgiridhar.maruthy@linaro.org\u003e\nSigned-off-by: Tushar Behera \u003ctushar.behera@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "c99e78435342a65a6a0bf9b86f87fd05831858d2", "tree": "b9aa68bc64326a819e0550c85bb4483a90b81b43", "parents": [ "5cd326fd27da347925019fcc041b79bad8dd55ed" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Thu Dec 01 14:58:51 2011 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Dec 08 12:59:03 2011 +0530" }, "message": "i.MX IPU DMA: Fix wrong burstsize settings\n\nThe burstsize (npb in struct chan_param_mem) is set in\nipu_ch_param_set_size() once. The number of allowed\npixels in a burst depend on the pixel format and the\nrotation mode. For 16bit formats 16 pixels are allowed\nwhereas for 32bit formats only 8 pixels are allowed.\nSet these values correctly in ipu_ch_param_set_size()\nand do not overwrite them afterwards.\nWe do not support rotation right now, so ignore this\ncase.\nThis patch fixes the wrong burstsize setting of 16 pixels\nfor 32bpp.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "5cd326fd27da347925019fcc041b79bad8dd55ed", "tree": "31a5a60de3c58367d5f5e538a6d7aa4b56055fa3", "parents": [ "8f0d30f9ee333f4fb3458a9a33f7ead5269ea8f3" ], "author": { "name": "Narayanan G", "email": "narayanan.gopalakrishnan@stericsson.com", "time": "Wed Nov 30 19:20:42 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Dec 05 09:16:59 2011 +0530" }, "message": "dmaengine/ste_dma40: allow fixed physical channel\n\nAllow logical channels to specify the physical channel they want to use.\nThis is needed to avoid two peripherals operating on the same physical\nchannel during some special use-cases. (like mmc and usb during a\nusb mass storage case).\n\nSigned-off-by: Rabin Vincent \u003crabin.vincent@stericsson.com\u003e\nSigned-off-by: Narayanan G \u003cnarayanan.gopalakrishnan@stericsson.com\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "8f0d30f9ee333f4fb3458a9a33f7ead5269ea8f3", "tree": "5c9b1212de19598d7e2653491cc5decc4df596d6", "parents": [ "c94e910535be72f0c6ac0c69e6acd8d44414e80d" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Tue Nov 29 12:56:50 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Dec 05 08:36:01 2011 +0530" }, "message": "dmaengine/amba-pl08x: Config ccfg and increment phychan_hold if phychan is true\n\nCurrently, if plchan-\u003ephychan is true, we return immediately from\nprep_phy_chan(). We must configure txd-\u003eccfg and increment phychan_hold before\nreturning. Otherwise, request line number wouldn\u0027t be configured in this txd.\n\nReported-by: Rajeev Kumar \u003crajeev-dlh.kumar@st.com\u003e\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "c94e910535be72f0c6ac0c69e6acd8d44414e80d", "tree": "31cf8423282b9c20ee13a8a701f636d3697ed5e4", "parents": [ "ab59a510c6ad6b3add5125df64843be754782de6" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Sat Nov 26 15:11:12 2011 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Dec 05 08:25:54 2011 +0530" }, "message": "dmaengine: convert drivers/dma/* to use module_platform_driver()\n\nThis patch converts the drivers in drivers/dma/* to use the\nmodule_platform_driver() macro which makes the code smaller and a bit\nsimpler.\n\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nCc: Piotr Ziecik \u003ckosmo@semihalf.com\u003e\nCc: Rongjun Ying \u003crongjun.ying@csr.com\u003e\nCc: Barry Song \u003c21cnbao@gmail.com\u003e\nCc: Pelagicore AB \u003cinfo@pelagicore.com\u003e\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "ab59a510c6ad6b3add5125df64843be754782de6", "tree": "d0f0bcb04c633885e26daba009a55a7b32c35106", "parents": [ "6d0709d2000ae7dbead759715f57ba381b7057bb" ], "author": { "name": "Huang Shijie", "email": "b32955@freescale.com", "time": "Fri Dec 02 10:16:25 2011 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Dec 05 08:22:26 2011 +0530" }, "message": "IMX/SDMA : save the real count for one DMA transaction.\n\nWhen we use the SDMA in the UART driver(such as imx6q), we will\nmeet one situation:\n Assume we set 64 bytes for the RX DMA buffer.\n The RX DMA buffer has received some data, but not full.\n An Aging DMA request will be received by the SDMA controller if we enable the\n IDDMAEN(UCR4[6]) in this case.\n\nSo the UART driver needs to know the count of the real received bytes,\nand push them to upper layer.\n\nAdd two new fields to sdmac, and update the `residue` in sdma_tx_status().\n\nSigned-off-by: Huang Shijie \u003cb32955@freescale.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "6d0709d2000ae7dbead759715f57ba381b7057bb", "tree": "29a7dabceb6e8132f8979da33cade6d090c8affc", "parents": [ "b62cfc5e0e59d1e0192105144b724b0c332720a0" ], "author": { "name": "Mika Westerberg", "email": "mika.westerberg@iki.fi", "time": "Sat Nov 26 12:54:08 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Dec 05 08:16:26 2011 +0530" }, "message": "dma/ep93xx_dma: prevent ep93xx_dma_tasklet() to reference an empty list\n\nIf dma_terminate_all() is called before the ep93xx_dma_tasklet() gets to run,\nit tries to access an empty -\u003eactive list which results following OOPS:\n\n Internal error: Oops - undefined instruction: 0 [#1]\n CPU: 0 Not tainted (3.2.0-rc1EP-1+ #1008)\n PC is at 0xc184c868\n LR is at ep93xx_dma_tasklet+0xec/0x164\n pc : [\u003cc184c868\u003e] lr : [\u003cc012b528\u003e] psr: 00000013\n sp : c02b7e70 ip : ffffffff fp : c02b7ea4\n r10: 00000100 r9 : 80000013 r8 : c02b7e50\n r7 : c02b7e70 r6 : c02b7ea4 r5 : 000000a4 r4 : c02b7e70\n r3 : c02b751d r2 : 8ae34598 r1 : c184c6e0 r0 : c02b7ea4\n Flags: nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel\n Control: c000717f Table: c0004000 DAC: 00000017\n Process swapper (pid: 0, stack limit \u003d 0xc02b6270)\n Stack: (0xc02b7e70 to 0xc02b8000)\n 7e60: c02b7ea4 c02b7e70 c0008b64 c02bd5c4\n 7e80: c02d60e0 00000000 00000000 c02bd44c c02d60e0 00000100 c02b7ec4 c02b7ea8\n 7ea0: c001c49c c012b44c 00000018 00000001 c02d60e0 c02b6000 c02b7f04 c02b7ec8\n 7ec0: c001cbc0 c001c3e4 c02b7eec c02b7ed8 00000006 0000000a c02bf674 c02c458c\n 7ee0: 00000011 00000000 c02b7f7c c0004000 41129200 c02b0c80 c02b7f14 c02b7f08\n 7f00: c001cdd0 c001cb38 c02b7f34 c02b7f18 c000983c c001cd98 c0009a60 60000013\n 7f20: fefb0001 c02b7f7c c02b7f44 c02b7f38 c0008190 c0009810 c02b7f9c c02b7f48\n 7f40: c0008b64 c0008190 c02c2bf8 00000002 c02b7f90 60000013 c02b6000 c02d1504\n 7f60: c02baa88 c02baa80 c0004000 41129200 c02b0c80 c02b7f9c c02b7fa0 c02b7f90\n 7f80: c0009a54 c0009a60 60000013 ffffffff c02b7fbc c02b7fa0 c000a03c c0009a40\n 7fa0: c02b80b0 c02b19dc c02b19d8 c02baa80 c02b7fcc c02b7fc0 c02384e4 c0009fd4\n 7fc0: c02b7ff4 c02b7fd0 c029d924 c0238494 c029d49c 00000000 00000000 c02b19dc\n 7fe0: c0007175 c02b803c 00000000 c02b7ff8 c000803c c029d700 00000000 00000000\n Backtrace:\n [\u003cc012b43c\u003e] (ep93xx_dma_tasklet+0x0/0x164) from [\u003cc001c49c\u003e] (tasklet_action+0xc8/0xdc)\n [\u003cc001c3d4\u003e] (tasklet_action+0x0/0xdc) from [\u003cc001cbc0\u003e] (__do_softirq+0x98/0x154)\n r7:c02b6000 r6:c02d60e0 r5:00000001 r4:00000018\n [\u003cc001cb28\u003e] (__do_softirq+0x0/0x154) from [\u003cc001cdd0\u003e] (irq_exit+0x48/0x50)\n [\u003cc001cd88\u003e] (irq_exit+0x0/0x50) from [\u003cc000983c\u003e] (handle_IRQ+0x3c/0x8c)\n [\u003cc0009800\u003e] (handle_IRQ+0x0/0x8c) from [\u003cc0008190\u003e] (asm_do_IRQ+0x10/0x14)\n r7:c02b7f7c r6:fefb0001 r5:60000013 r4:c0009a60\n [\u003cc0008180\u003e] (asm_do_IRQ+0x0/0x14) from [\u003cc0008b64\u003e] (__irq_svc+0x24/0xc0)\n Exception stack(0xc02b7f48 to 0xc02b7f90)\n 7f40: c02c2bf8 00000002 c02b7f90 60000013 c02b6000 c02d1504\n 7f60: c02baa88 c02baa80 c0004000 41129200 c02b0c80 c02b7f9c c02b7fa0 c02b7f90\n 7f80: c0009a54 c0009a60 60000013 ffffffff\n [\u003cc0009a30\u003e] (default_idle+0x0/0x34) from [\u003cc000a03c\u003e] (cpu_idle+0x78/0xb0)\n [\u003cc0009fc4\u003e] (cpu_idle+0x0/0xb0) from [\u003cc02384e4\u003e] (rest_init+0x60/0x78)\n r7:c02baa80 r6:c02b19d8 r5:c02b19dc r4:c02b80b0\n [\u003cc0238484\u003e] (rest_init+0x0/0x78) from [\u003cc029d924\u003e] (start_kernel+0x234/0x278)\n [\u003cc029d6f0\u003e] (start_kernel+0x0/0x278) from [\u003cc000803c\u003e] (0xc000803c)\n r5:c02b803c r4:c0007175\n Code: 42555300 54535953 643d4d45 65766972 (53007372)\n\nTo make the code a bit more robust against things like these, we modify\nep93xx_dma_get_active() to return NULL in case of empty -\u003eactive list and make\nsure that callers handle this correctly.\n\nReported-by: Rafal Prylowski \u003cprylowski@metasoft.pl\u003e\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@iki.fi\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "b62cfc5e0e59d1e0192105144b724b0c332720a0", "tree": "b66c73f97de0b6ad0f5331960486d59e7cfbb1ca", "parents": [ "02f88be9488a3d831f073c1161b1e5feacb9d3ec" ], "author": { "name": "Rafal Prylowski", "email": "prylowski@metasoft.pl", "time": "Sat Nov 26 12:54:07 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Dec 05 08:14:57 2011 +0530" }, "message": "dma/ep93xx_dma: fix initialization of M2M control register\n\nSetting the flags in case of IDE didn\u0027t have any effect since the control\nregister is overwritten few lines below. So move these to be after the control\nregister is initialized.\n\nSigned-off-by: Rafal Prylowski \u003cprylowski@metasoft.pl\u003e\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@iki.fi\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "02f88be9488a3d831f073c1161b1e5feacb9d3ec", "tree": "f4d9a53a2185a6e118ad64e2e27901a0ccb6e43a", "parents": [ "dcc817346d311bbd9dac6fc9d6bddb552134851c" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Tue Nov 22 11:55:54 2011 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Nov 28 15:55:36 2011 +0530" }, "message": "dmaengine: at_hdmac: simplify device selection from platform data or DT\n\nUsing a configuration structure simplify the finding of SoC\ndependent parameters. Both platform data and device tree ids are\nusing these structures.\nThis will separate data from code and remove the need for an enum.\n\nIdea from Grant Likely.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "dcc817346d311bbd9dac6fc9d6bddb552134851c", "tree": "537dc12263ee149d4c1f6522b59529c63a017fb6", "parents": [ "0ab88a01832d529c48e2a51f3d24662c143df39a" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Tue Nov 22 11:55:53 2011 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Nov 28 15:55:36 2011 +0530" }, "message": "dmaengine: at_hdmac: empty entry shape modification\n\nTrivial form modification to unify structure look.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "0ab88a01832d529c48e2a51f3d24662c143df39a", "tree": "bc2d25082e4b0c8cddd847ee5795beb5d7abaa00", "parents": [ "28c7a19d230228ab9ae61c300c5003a2400fadd3" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Tue Nov 22 11:55:52 2011 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Nov 28 15:55:36 2011 +0530" }, "message": "dmaengine: at_hdmac: add const to struct platform_device_id definition\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "28c7a19d230228ab9ae61c300c5003a2400fadd3", "tree": "d66f1e8a74528afc4226df129dcaf5f3abb97f1d", "parents": [ "d5613947addb1e1096a3be29dfe817905e385469" ], "author": { "name": "Narayanan G", "email": "narayanan.gopalakrishnan@stericsson.com", "time": "Tue Nov 22 13:56:55 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Nov 28 09:00:08 2011 +0530" }, "message": "dmaengine/ste_dma40: Add support to use lcla area from esram\n\nThis patch provides an option of having the lcla (link address)\nin ESRAM instead of allocating it. The bool value (use_esram_lcla)\nin the stedma40_platform_data if set to true, then the lcla\naddress would be taken from platform resources. Also, the\ncorresponding esram regulator is managed in the\nsuspend/resume functions.\n\nSigned-off-by: Narayanan G \u003cnarayanan.gopalakrishnan@stericsson.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "d5613947addb1e1096a3be29dfe817905e385469", "tree": "c88b712d6a8ae896ae1bfcbbd9e7f40400ae749f", "parents": [ "61e183f8306934a9f66557f69f1f0f56f18dca06" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Nov 28 08:51:16 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Nov 28 08:51:16 2011 +0530" }, "message": "dmaengine: timb_dma: fix the spare warinings\n\nSparse warns:\n\ndrivers/dma/timb_dma.c:168:17: warning: mixing different enum types\ndrivers/dma/timb_dma.c:168:17: int enum dma_transfer_direction versus\ndrivers/dma/timb_dma.c:168:17: int enum dma_data_direction\ndrivers/dma/timb_dma.c:172:32: warning: mixing different enum types\ndrivers/dma/timb_dma.c:172:32: int enum dma_transfer_direction versus\ndrivers/dma/timb_dma.c:172:32: int enum dma_data_direction\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "61e183f8306934a9f66557f69f1f0f56f18dca06", "tree": "07f205fe60f4d5fe5a69a5406789e7510effd20f", "parents": [ "e69664336d6400cc1685716ee5f04ef74e85703e" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Thu Nov 17 16:01:29 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Nov 28 08:48:02 2011 +0530" }, "message": "dmaengine/dw_dmac: Reconfigure interrupt and chan_cfg register on resume\n\nIn S2R all DMA registers are reset by hardware and thus they are required to be\nreprogrammed. The channels which aren\u0027t reprogrammed are channel configuration\nand interrupt enable registers, which are currently programmed at chan_alloc\ntime.\n\nThis patch creates another routine to initialize a channel. It will try to\ninitialize channel on every dwc_dostart() call. If channel is already\ninitialised then it simply returns, otherwise it configures registers.\n\nThis routine will also initialize registers on wakeup from S2R, as we mark\nchannels as uninitialized on suspend.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "adfa543e7314b36ac55a40019977de6e47946dd7", "tree": "ff307bc785d28f77783676b117ae89559668bd4e", "parents": [ "ec012476af73a1a8a82565a915e9b48c2e337878" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Nov 23 09:28:16 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Nov 23 09:28:16 2011 -0800" }, "message": "dmatest: don\u0027t use set_freezable_with_signal()\n\nCommit 981ed70d8e (dmatest: make dmatest threads freezable) made\ndmatest kthread use set_freezable_with_signal(); however, the\ninterface is scheduled to be removed in the next merge window.\n\nThe problem is that unlike userland tasks there\u0027s no default place\nwhich handles signal pending state and it isn\u0027t clear who owns and/or\nis responsible for clearing TIF_SIGPENDING. For example, in the\ncurrent code, try_to_freeze() clears TIF_SIGPENDING but it isn\u0027t sure\nwhether it actually owns the TIF_SIGPENDING nor is it race-free -\nie. the task may continue to run with TIF_SIGPENDING set after the\nfreezable section.\n\nUnfortunately, we don\u0027t have wait_for_completion_freezable_timeout().\nThis patch open codes it and uses wait_event_freezable_timeout()\ninstead and removes timeout reloading - wait_event_freezable_timeout()\nwon\u0027t return across freezing events (currently racy but fix scheduled)\nand timer doesn\u0027t decrement while the task is in freezer. Although\nthis does lose timer-reset-over-freezing, given that timeout is\nsupposed to be long enough and failure to finish inside is considered\nirrecoverable, I don\u0027t think this is worth the complexity.\n\nWhile at it, move completion to outer scope and explain that we\u0027re\nignoring dangling pointer problem after timeout. This should give\nslightly better chance at avoiding oops after timeout.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nCc: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "e8fa516a4231682204d646df01c7bf3f0cfe4893", "tree": "557be3f546dd8d250084a516a1564bd29818d443", "parents": [ "037566df2a9274cec49cab131059e1bac538be08" ], "author": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Wed Oct 05 15:15:20 2011 +0100" }, "committer": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Tue Nov 22 10:58:31 2011 +0000" }, "message": "dmaengine: pl330: Enable module alias autogeneration for AMBA drivers\n\nSigned-off-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "037566df2a9274cec49cab131059e1bac538be08", "tree": "29de8aadef95b6d3c8a94c5db8284645a0cdbda1", "parents": [ "4e3f3d53b8b5d597e36c075e01014e9019a44d55" ], "author": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Wed Oct 05 15:15:20 2011 +0100" }, "committer": { "name": "Dave Martin", "email": "dave.martin@linaro.org", "time": "Tue Nov 22 10:58:30 2011 +0000" }, "message": "dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers\n\nSigned-off-by: Dave Martin \u003cdave.martin@linaro.org\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "e69664336d6400cc1685716ee5f04ef74e85703e", "tree": "afd600c789944c78546e773ae5a23ec3b0cf3f49", "parents": [ "7fb3e75e1833743d5faf3adbae46b63f503c6fdf" ], "author": { "name": "Huang Shijie", "email": "b32955@freescale.com", "time": "Fri Nov 18 16:38:02 2011 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Nov 22 09:51:45 2011 +0530" }, "message": "IMX/DMA : set the DMA direction in the sdma_control()\n\nSet the right DMA direction in the sdma_control(), else\nwe will get the wrong log when enable the DYNAMIC_DEBUG.\n\nSigned-off-by: Huang Shijie \u003cb32955@freescale.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "7fb3e75e1833743d5faf3adbae46b63f503c6fdf", "tree": "32ae4d6b39e5a552e9727ff15a891e4ba2b980fb", "parents": [ "ca21a146a45a179a2a7bc86d938a2fbf571a7510" ], "author": { "name": "Narayanan G", "email": "narayanan.gopalakrishnan@stericsson.com", "time": "Thu Nov 17 17:26:41 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Nov 22 09:46:06 2011 +0530" }, "message": "dmaengine/ste_dma40: support pm in dma40\n\nThis patch adds power management support to the dma40\ndriver. The DMA registers are backed up and restored,\nduring suspend/resume. Also flags to track the dma usage\nhave been introduced to facilitate this. Patch also includes\nfew other minor changes, related to formatting, comments.\n\nSigned-off-by: Narayanan G \u003cnarayanan.gopalakrishnan@stericsson.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "ca21a146a45a179a2a7bc86d938a2fbf571a7510", "tree": "cd0e029a9b29a083e8245ae6cf7aa01f6e1fd99f", "parents": [ "b14dab792dee3245b628e046d80a7fad5573fea6" ], "author": { "name": "Rongjun Ying", "email": "Rongjun.Ying@csr.com", "time": "Thu Oct 27 19:22:39 2011 -0700" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Nov 18 12:25:22 2011 +0530" }, "message": "dmaengine: add CSR SiRFprimaII DMAC driver\n\nCc: Jassi Brar \u003cjaswinder.singh@linaro.org\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Rongjun Ying \u003crongjun.ying@csr.com\u003e\nSigned-off-by: Barry Song \u003cBaohua.Song@csr.com\u003e\n[fixed direction enums and cyclic api based on changes\n already merged]\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "b14dab792dee3245b628e046d80a7fad5573fea6", "tree": "c77574d19be7c150b57bd9a9b0184580c733621b", "parents": [ "e0d23ef29ed637dc6bd739f590985746d9ad9caa" ], "author": { "name": "Jassi Brar", "email": "jaswinder.singh@linaro.org", "time": "Thu Oct 13 12:33:30 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Nov 18 12:16:24 2011 +0530" }, "message": "DMAEngine: Define interleaved transfer request api\n\nDefine a new api that could be used for doing fancy data transfers\nlike interleaved to contiguous copy and vice-versa.\nTraditional SG_list based transfers tend to be very inefficient in\nsuch cases as where the interleave and chunk are only a few bytes,\nwhich call for a very condensed api to convey pattern of the transfer.\nThis api supports all 4 variants of scatter-gather and contiguous transfer.\n\nOf course, neither can this api help transfers that don\u0027t lend to DMA by\nnature, i.e, scattered tiny read/writes with no periodic pattern.\n\nAlso since now we support SLAVE channels that might not provide\ndevice_prep_slave_sg callback but device_prep_interleaved_dma,\nremove the BUG_ON check.\n\nSigned-off-by: Jassi Brar \u003cjaswinder.singh@linaro.org\u003e\nAcked-by: Barry Song \u003cBaohua.Song@csr.com\u003e\n[renamed dmaxfer_template to dma_interleaved_template\n did fixup after the enum dma_transfer_merge]\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "e0d23ef29ed637dc6bd739f590985746d9ad9caa", "tree": "c5b5856dc88582697997bb10ccacad6fc2535465", "parents": [ "ca7fe2db892dcf91b2c72ee352eda4ff867903a7", "55ba4e5ed4ac57b60fe56acfd324f6a87123cc34" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Nov 17 14:54:38 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Nov 17 14:54:57 2011 +0530" }, "message": "Merge branch \u0027dma_slave_direction\u0027 into next_test_dirn\n\nresolved conflicts:\n\tdrivers/media/video/mx3_camera.c\n" }, { "commit": "ca7fe2db892dcf91b2c72ee352eda4ff867903a7", "tree": "3e549eb73405d9168a8c93a0a3670ff5688b549a", "parents": [ "e79e72be298dc4726a641686032b8296c2fb473e" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Thu Nov 17 16:14:23 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Nov 17 14:27:41 2011 +0530" }, "message": "pch_dma: Support new device LAPIS Semiconductor ML7831 IOH\n\nML7831 is companion chip for Intel Atom E6xx series.\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "e79e72be298dc4726a641686032b8296c2fb473e", "tree": "0d12afe85913df834fc57d0ffd87f569774a48f2", "parents": [ "8e2d41f8c85613a3739e8b2600ac2c66c08422f3" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya.rohm@gmail.com", "time": "Thu Nov 17 16:14:22 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Nov 17 14:27:41 2011 +0530" }, "message": "pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor\n\nOn October 1 in 2011,\nOKI SEMICONDUCTOR Co., Ltd. changed the company name in to LAPIS Semiconductor\nCo., Ltd.\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya.rohm@gmail.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "8e2d41f8c85613a3739e8b2600ac2c66c08422f3", "tree": "ea75c81772247d94c8b9fe9d223d4f14e4511f7c", "parents": [ "dbb004294a934d030a9d716692a1dd6f677fc90e" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Aug 24 08:41:09 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Nov 17 14:26:16 2011 +0530" }, "message": "dma i.MX: remove individual SOC dependency\n\nThe individual SoC dependency in Kconfig hardly scales anymore.\nInstead of having such a fine grained dependency just depend\non ARCH_MXC and risk that the uninformed user has to look in\nthe help text to figure out which driver is the correct one.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "dbb004294a934d030a9d716692a1dd6f677fc90e", "tree": "b39922402bcbae62bd21b5d6b5aa04ee5d3a4319", "parents": [ "dab6538e29e68af6206ec1889c847b428f290989" ], "author": { "name": "Ciaran McCormick", "email": "ciaranmccormick@gmail.com", "time": "Mon Oct 31 19:29:26 2011 +0000" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Nov 17 14:25:25 2011 +0530" }, "message": "dma: fix spacing for method declaration, coding style issue in iop-adma.c\n\nSigned-off-by: Ciaran McCormick \u003cciaranmccormick@gmail.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "dab6538e29e68af6206ec1889c847b428f290989", "tree": "58ce623459ea3b1dd25795ed83ee29e65ee25556", "parents": [ "c511595390a373e19a774246c659b4f563a4c3f3" ], "author": { "name": "Boojin Kim", "email": "boojin.kim@samsung.com", "time": "Thu Nov 03 15:48:49 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Nov 10 15:14:19 2011 +0530" }, "message": "DMA: PL330: Fix build warning\n\nThis patch adds to fix the build warning as following.\n\ndrivers/dma/pl330.c: In function \u0027pl330_probe\u0027:\ndrivers/dma/pl330.c:859: warning: comparison of distinct pointer types lacks a cast\n\nSigned-off-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "c511595390a373e19a774246c659b4f563a4c3f3", "tree": "79df5e99ecbff0c8d309e603266698448f998d28", "parents": [ "67348450b86cb1b42aa4dd55cf7cde19c2e53461" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Oct 17 14:56:41 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Nov 10 14:13:33 2011 +0530" }, "message": "dmaengine: at_hdmac: add device tree support\n\nAdd device tree probe support for atmel at_hdmac DMA driver.\nBindings are added to specify DMA controller configuration.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "67348450b86cb1b42aa4dd55cf7cde19c2e53461", "tree": "85bae4e8095d9cf41f539f401d179dcc9fde35b8", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Oct 17 14:56:40 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Nov 10 14:13:33 2011 +0530" }, "message": "dmaengine: at_hdmac: platform data move to use .id_table\n\nWe remove the use of platform data from DMA controller driver.\nWe now use of .id_table to distinguish between compatible\ntypes. The two implementations allow to determine the\nnumber of channels and the capabilities of the controller.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "fba9569924e06da076cb2ad12474bbd82d69f54d", "tree": "f0b7d9c82f8dd90f0dc757a4c00afc0872fc1484", "parents": [ "3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa", "4598fc2c94b68740e0269db03c98a1e7ad5af773" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 18:02:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 04 18:02:25 2011 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)\n dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle\n dmaengine/ep93xx_dma: add module.h include\n pch_dma: Reduce wasting memory\n pch_dma: Fix suspend issue\n dma/timberdale: free_irq() on an error path\n dma: shdma: transfer based runtime PM\n dmaengine: shdma: protect against the IRQ handler\n dmaengine i.MX DMA/SDMA: add missing include of linux/module.h\n dmaengine: delete redundant chan_id and chancnt initialization in dma drivers\n dmaengine/amba-pl08x: Check txd-\u003ellis_va before freeing dma_pool\n dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers\n serial: sh-sci: don\u0027t filter on DMA device, use only channel ID\n ARM: SAMSUNG: Remove Samsung specific enum type for dma direction\n ASoC: Samsung: Update DMA interface\n spi/s3c64xx: Merge dma control code\n spi/s3c64xx: Add support DMA engine API\n ARM: SAMSUNG: Remove S3C-PL330-DMA driver\n ARM: S5P64X0: Use generic DMA PL330 driver\n ARM: S5PC100: Use generic DMA PL330 driver\n ARM: S5PV210: Use generic DMA PL330 driver\n ...\n\nFix up fairly trivial conflicts in\n - arch/arm/mach-exynos4/{Kconfig,clock.c}\n - arch/arm/mach-s5p64x0/dma.c\n" }, { "commit": "1d3564d91f94d0b598304eb6ebe3b83a83176f7a", "tree": "585a122d4ca32f02d65cb24267c5570842567e95", "parents": [ "2d86401c2cbfce9f99b08ba168bdb60b2eb7796e" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Thu Aug 25 13:26:53 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Nov 03 18:28:33 2011 -0200" }, "message": "[media] dmaengine: ipu-idmac: add support for the DMA_PAUSE control\n\nTo support multi-size buffers in the mx3_camera V4L2 driver we have to be\nable to stop DMA on a channel without releasing descriptors and completely\nhalting the hardware. Use the DMA_PAUSE control to implement this mode.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "f492b21027272369953f68ee341df38dffa962fb", "tree": "1cfaad766ac1d7f98ee5468ce609532d72b91b5f", "parents": [ "5c45ad77ffd0108596627816a37de71a04d5cb6d" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 31 16:17:36 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:44 2011 -0400" }, "message": "drivers/dma: Add export.h to ste_dma40.c\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "5c45ad77ffd0108596627816a37de71a04d5cb6d", "tree": "c25ddf76be050899e646df8ea99b10482d2e47be", "parents": [ "3382416d867d1c70709dfb03e4a81d5731d96787" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 31 16:14:17 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:44 2011 -0400" }, "message": "drivers/dma: Add module.h to files implicitly using it.\n\nFix files that were implicitly using module.h but not\ncalling it out for inclusion directly. We\u0027ll break those\nonce we remove the implicit presence otherwise\n\n[With input from Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e]\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "7c52d55170ce84ddf9c0ad4e020ef1d7a97975a7", "tree": "6788d2f806d44a7cd437f38dc44169395112081e", "parents": [ "69c60c88eeb364ebf58432f9bc38033522d58767" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri May 27 12:33:10 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:36 2011 -0400" }, "message": "x86: fix up files really needing to include module.h\n\nThese files aren\u0027t just exporting symbols -- they are also defining\na MODULE_LICENSE etc. so give them the full module.h file.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "db8196df4bb6f117caa163aa73b0f16fd62290bd", "tree": "b86531031482037d9b31ad57479f2f7091020957", "parents": [ "49920bc66984a512f4bcc7735a61642cd0e4d6f2" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Oct 13 22:34:23 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Oct 27 20:53:43 2011 +0530" }, "message": "dmaengine: move drivers to dma_transfer_direction\n\nfixup usage of dma direction by introducing dma_transfer_direction,\nthis patch moves dma/drivers/* to use new enum\n\nCc: Jassi Brar \u003cjaswinder.singh@linaro.org\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nCc: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Mika Westerberg \u003cmika.westerberg@iki.fi\u003e\nCc: H Hartley Sweeten \u003chartleys@visionengravers.com\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Zhang Wei \u003czw@zh-kernel.org\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nCc: Shawn Guo \u003cshawn.guo@freescale.com\u003e\nCc: Yong Wang \u003cyong.y.wang@intel.com\u003e\nCc: Tomoya MORINAGA \u003ctomoya-linux@dsn.lapis-semi.com\u003e\nCc: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nCc: Barry Song \u003cBaohua.Song@csr.com\u003e\nAcked-by: Mika Westerberg \u003cmika.westerberg@iki.fi\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "4598fc2c94b68740e0269db03c98a1e7ad5af773", "tree": "c70d3208052b636ab299f2f0b18af3d52bffda9f", "parents": [ "2389d674bfd42aa26cbbf6064ed48ee9a87a5c7e" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Oct 10 12:33:59 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Sun Oct 16 17:16:45 2011 +0530" }, "message": "dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle\n\nThe mask_peripheral_interrupt is called when channel wants to mask the\ninterrupt. Move this to suspend as this masking affects other channels\nas well. Not touching unmask here and unmask would still be done of\nfirst channel use\n\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "2389d674bfd42aa26cbbf6064ed48ee9a87a5c7e", "tree": "5b36f23f7da480fd31aea30b5062bc5ba0b1c399", "parents": [ "01631243d712d41681d61c0556341a3329860c47" ], "author": { "name": "Mika Westerberg", "email": "mika.westerberg@iki.fi", "time": "Sun Oct 16 11:19:30 2011 +0300" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Sun Oct 16 13:52:44 2011 +0530" }, "message": "dmaengine/ep93xx_dma: add module.h include\n\nDue to module.h cleanup it is not anymore included implicitly. Drivers who\nwant to use it need to include it explicitly.\n\nSigned-off-by: Mika Westerberg \u003cmika.westerberg@iki.fi\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "01631243d712d41681d61c0556341a3329860c47", "tree": "fcaa0e40b761b5cdd0dee64c658c6c69fa53ebc6", "parents": [ "c43f1508686e8e4746012bf87995085eeb0f5307" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya-linux@dsn.lapis-semi.com", "time": "Wed Oct 12 09:38:35 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Oct 12 10:51:24 2011 +0530" }, "message": "pch_dma: Reduce wasting memory\n\nnr_channels is defined in \"struct pch_dma\".\nand struct pch_dma_chan is defined in \"struct pch_dma\".\nSo, \"sizeof(struct pch_dma_chan) * nr_channels\" is unnecessary.\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya-linux@dsn.lapis-semi.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "c43f1508686e8e4746012bf87995085eeb0f5307", "tree": "22b243bb93d07b2107c72671dbd60ee3bdf59886", "parents": [ "f80befe081576219379debf6611f02c9f3b01c41" ], "author": { "name": "Tomoya MORINAGA", "email": "tomoya-linux@dsn.lapis-semi.com", "time": "Tue Oct 11 21:43:21 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Oct 11 22:24:36 2011 +0530" }, "message": "pch_dma: Fix suspend issue\n\nCurrently, executing suspend/hibernation,\nmemory access violation occurs.\n\nIn pch_dma_save_regs() called by suspend(),\nyou can see the following code.\n\nstatic void pch_dma_save_regs(struct pch_dma *pd)\n{\nsnip...\n list_for_each_entry_safe(chan, _c, \u0026pd-\u003edma.channels, device_node) {\n pd_chan \u003d to_pd_chan(chan);\n\n pd-\u003ech_regs[i].dev_addr \u003d channel_readl(pd_chan, DEV_ADDR);\n pd-\u003ech_regs[i].mem_addr \u003d channel_readl(pd_chan, MEM_ADDR);\n pd-\u003ech_regs[i].size \u003d channel_readl(pd_chan, SIZE);\n pd-\u003ech_regs[i].next \u003d channel_readl(pd_chan, NEXT);\n\n i++;\n }\n}\n\nMax loop count is 12 defined at pci_table.\nSo, this caused memory access violation.\n\nThis patch fixes the issue\n - Modify array size (MAX_CHAN_NR)\n\nSigned-off-by: Tomoya MORINAGA \u003ctomoya-linux@dsn.lapis-semi.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "f80befe081576219379debf6611f02c9f3b01c41", "tree": "ee6425bc5a4a206874ec44916c14af86d49fa5bf", "parents": [ "7a1cd9ad87979744e1510782b25c38feb9602739" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Sep 23 09:16:01 2011 +0300" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Fri Oct 07 10:23:11 2011 +0530" }, "message": "dma/timberdale: free_irq() on an error path\n\nThere was an error path that skipped the free_irq() step by mistake.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "7a1cd9ad87979744e1510782b25c38feb9602739", "tree": "93dd2e114d474096fd654707d61a9e0f96a52a6b", "parents": [ "b4dae6e1adaedc9c343b5f00332312d649600bdc" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Thu Aug 18 16:55:27 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Sep 28 10:07:40 2011 +0530" }, "message": "dma: shdma: transfer based runtime PM\n\nCurrently the shdma dmaengine driver uses runtime PM to save power, when\nno channel on the specific controller is requested by a user. This patch\nswitches the driver to count individual DMA transfers. That way the\ncontroller can be powered down between transfers, even if some of its\nchannels are in use.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "b4dae6e1adaedc9c343b5f00332312d649600bdc", "tree": "a872c8264821ea355520661d40e74893cfebc0ca", "parents": [ "0745c9a5e3b64ee03784bc58ba5b127418d78b4e" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Sun Sep 25 16:12:18 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Sep 28 10:07:25 2011 +0530" }, "message": "dmaengine: shdma: protect against the IRQ handler\n\nThe IRQ handler of the shdma driver accesses common hardware registers,\nthat are also accessed from other contexts. Therefore access to them\nhas to be performed with interrupts disabled, not only with disabled\nbottom halves.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "0745c9a5e3b64ee03784bc58ba5b127418d78b4e", "tree": "479961da88a62ad5e7a2cf8292be271b89fcd50d", "parents": [ "f8de8f4ce2a83ccf7571ee13d41d02a9040797f9", "51ddf31da16b1ab9da861eafedad6d263faf4388" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Sep 21 11:53:30 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Wed Sep 21 11:53:30 2011 +0530" }, "message": "Merge branch \u0027samsung_dma\u0027 into next\n" }, { "commit": "f8de8f4ce2a83ccf7571ee13d41d02a9040797f9", "tree": "910ea9854850210fb53f0e4e9f5b6b579dbf6638", "parents": [ "463894705e4089d0ff69e7d877312d496ac70e5b" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Tue Aug 30 15:08:24 2011 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Wed Sep 21 11:29:19 2011 +0530" }, "message": "dmaengine i.MX DMA/SDMA: add missing include of linux/module.h\n\nAdd missing include of linux/module.h to fix build error.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "463894705e4089d0ff69e7d877312d496ac70e5b", "tree": "5690c961fa4b989861fc7632ce872300338aedc3", "parents": [ "c12056466d76cdff884402d15f077dd0586e5215" ], "author": { "name": "Barry Song", "email": "Baohua.Song@csr.com", "time": "Thu Sep 15 03:06:30 2011 -0700" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Tue Sep 20 11:51:33 2011 +0530" }, "message": "dmaengine: delete redundant chan_id and chancnt initialization in dma drivers\n\ndma_async_device_register will re-init chan_id and chancnt,\nso whatever chan_id and chancnt are set in drivers, they will\nbe re-written by dma_async_device_register.\n\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nCc: Vinod Koul \u003cvinod.koul@intel.com\u003e\nCc: Piotr Ziecik \u003ckosmo@semihalf.com\u003e\nCc: Yong Wang \u003cyong.y.wang@intel.com\u003e\nCc: Jaswinder Singh \u003cjassi.brar@samsung.com\u003e\nCc: Pelagicore AB \u003cinfo@pelagicore.com\u003e\nSigned-off-by: Barry Song \u003cBaohua.Song@csr.com\u003e\nAcked-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "c12056466d76cdff884402d15f077dd0586e5215", "tree": "b166b5a86426519859d20978445b4e3390317d8a", "parents": [ "b7f69d9d4283cfbbf7458962cf9bdba6463b831d" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Fri Aug 05 15:32:44 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 19 15:13:16 2011 +0530" }, "message": "dmaengine/amba-pl08x: Check txd-\u003ellis_va before freeing dma_pool\n\nIn pl08x_free_txd(), check if pool is allocated successfully before freeing it.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "b7f69d9d4283cfbbf7458962cf9bdba6463b831d", "tree": "76e29e885d467486922f3b2fbd2c480a7b5a1b8f", "parents": [ "937bb6e4c676fecbfbc1939b942241c3f27bf5d8" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Fri Aug 05 15:32:43 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 19 15:13:06 2011 +0530" }, "message": "dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers\n\nUntill now, sg_len greater than one is not supported. This patch adds support to\ndo that.\n\nNote: Still, if peripheral is flow controller, sg_len can\u0027t be greater that one.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "42bc9cf45939c26a5c5eb946d4fd35f1a7b0f9f8", "tree": "2cc6df2b089a13ddcf04107ef4d7c3b5e8ca2ebb", "parents": [ "ae43b886f174297366d4e09a008ad8e6592d95df" ], "author": { "name": "Boojin Kim", "email": "boojin.kim@samsung.com", "time": "Fri Sep 02 09:44:33 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Wed Sep 14 11:10:01 2011 +0530" }, "message": "DMA: PL330: Add DMA_CYCLIC capability\n\nThis patch adds DMA_CYCLIC capability that is used for audio driver.\nDMA driver activated with it reuses the dma requests that were submitted\nthrough tx_submit().\n\nSigned-off-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "ae43b886f174297366d4e09a008ad8e6592d95df", "tree": "ff52b7da54a8a9f2e4126413d7a38c5f8f8c8d7b", "parents": [ "1d0c1d606d787e833ee3bd9e1cda640e75c4681a" ], "author": { "name": "Boojin Kim", "email": "boojin.kim@samsung.com", "time": "Fri Sep 02 09:44:32 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Wed Sep 14 11:10:01 2011 +0530" }, "message": "DMA: PL330: Remove the start operation for handling DMA_TERMINATE_ALL command\n\nOriginal code carries out the start operation after flush operation.\nBut start operation is not required for DMA_TERMINATE_ALL command.\nSo, this patch removes the unnecessary start operation and only carries out\nthe flush operation for handling DMA_TERMINATE_ALL command.\n\nSigned-off-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n[Fixed typos in changelog]\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "1d0c1d606d787e833ee3bd9e1cda640e75c4681a", "tree": "024e06dd09b6b3bb4fdb2a5cf5af1868ba9caba0", "parents": [ "1b9bb715e7c4c189c4215a11a09e2ccb16598d86" ], "author": { "name": "Boojin Kim", "email": "boojin.kim@samsung.com", "time": "Fri Sep 02 09:44:31 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Wed Sep 14 11:10:01 2011 +0530" }, "message": "DMA: PL330: Support DMA_SLAVE_CONFIG command\n\nSigned-off-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "1b9bb715e7c4c189c4215a11a09e2ccb16598d86", "tree": "e274c2a58ec31185e0871255a5fd64c177ee4898", "parents": [ "a2f5203fec3c06d68a6bb45ad41f2adebf9ac5e0" ], "author": { "name": "Boojin Kim", "email": "boojin.kim@samsung.com", "time": "Fri Sep 02 09:44:30 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Wed Sep 14 11:10:01 2011 +0530" }, "message": "DMA: PL330: Update PL330 DMA API driver\n\nThis patch updates following 3 items.\n1. Removes unneccessary code.\n2. Add AMBA, PL330 configuration\n3. Change the meaning of \u0027peri_id\u0027 variable\n from PL330 event number to specific dma id by user.\n\nSigned-off-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "a2f5203fec3c06d68a6bb45ad41f2adebf9ac5e0", "tree": "86ae77b928884c0c10c9c0076dca3886ab6538f7", "parents": [ "7703eac96abd119dcfbb04f287a5127462d18269" ], "author": { "name": "Boojin Kim", "email": "boojin.kim@samsung.com", "time": "Fri Sep 02 09:44:29 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Wed Sep 14 11:10:00 2011 +0530" }, "message": "DMA: PL330: Add support runtime PM for PL330 DMAC\n\nSigned-off-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "289b4e7a48d91fbef7af819020d826ad9f49f568", "tree": "c3155c141dc976c5c2d404e4cc4c99c278cce58f", "parents": [ "bd31b85960a7fcb2d7ede216460b8da71a88411c" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Jul 29 16:27:07 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Sep 13 11:12:15 2011 +0200" }, "message": "locking, dma, ipu: Annotate bank_lock as raw\n\nThe bank_lock can be taken in atomic context (irq handling)\nand therefore cannot be preempted on -rt - annotate it.\n\nIn mainline this change documents the low level nature of\nthe lock - otherwise there\u0027s no functional difference. Lockdep\nand Sparse checking will work as usual.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: kernel@pengutronix.de\nCc: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nLink: http://lkml.kernel.org/r/1311949627-13260-1-git-send-email-u.kleine-koenig@pengutronix.de\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7703eac96abd119dcfbb04f287a5127462d18269", "tree": "75de31e4ddfe8f1899b7547d40e84be6d5b4face", "parents": [ "503473ac2a3952e6af254b0769fe788a67d797e5" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Wed Aug 31 09:34:35 2011 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 05 18:57:38 2011 +0530" }, "message": "dmaengine: amba-pl08x: make filter check that the channel is owned by pl08x\n\nBefore converting the dma channel to our private data structure, first\ncheck that the channel is indeed one which our driver registered. We\ndo this by ensuring that the underlying device is bound to our driver.\n\nThis avoids potential oopses if we try to reference \u0027plchan-\u003ename\u0027\nagainst a foreign drivers dma channel.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "503473ac2a3952e6af254b0769fe788a67d797e5", "tree": "9b089ea8636b3a8b26a9534b7e1ccf1790c093aa", "parents": [ "70a207ad4db2f0c60308b3f32086263c438c67a3" ], "author": { "name": "Per Forlin", "email": "per.forlin@linaro.org", "time": "Mon Aug 29 13:33:35 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 05 17:11:38 2011 +0530" }, "message": "dmaengine/ste_dma40: fix memory leak due to prepared descriptors\n\nPrepared descriptors that are not submitted will not be freed. Add\nprepared descriptor to a list to be able to release them upon\ndmaengine_terminate_all().\n\nSigned-off-by: Per Forlin \u003cper.forlin@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "70a207ad4db2f0c60308b3f32086263c438c67a3", "tree": "875fbbdfe57a044516f722766e4185d9fcc05938", "parents": [ "270e779036ff144d6c6904ce9480f0d70ff93e86" ], "author": { "name": "Per Forlin", "email": "per.forlin@linaro.org", "time": "Mon Aug 29 13:33:34 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 05 17:11:21 2011 +0530" }, "message": "dmaengine/ste_dma40: fix Oops due to double free of client descriptor\n\nThe client list may exist in two lists at the same time. This makes free\nfail since the same desc is freed multiple times. Remove desc from\nclient list when adding it to the pending queue. Move free of client owned\ndescriptors from free_dma() to terminate_all().\n\nUnable to handle kernel paging request at virtual address 00100104\npgd \u003d dea8c000\n[00100104] *pgd\u003d1ea62831, *pte\u003d00000000, *ppte\u003d00000000\nInternal error: Oops: 817 [#1] PREEMPT SMP\nModules linked in:\nCPU: 0 Not tainted (3.1.0-rc3+ #58)\nPC is at d40_free_chan_resources+0x64/0x330\n\nSigned-off-by: Per Forlin \u003cper.forlin@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "270e779036ff144d6c6904ce9480f0d70ff93e86", "tree": "52c5803b872e88ae28a671e42253cdca2b88e455", "parents": [ "89de9f65429a97ab627310e2e85426dcbe423f39" ], "author": { "name": "Per Forlin", "email": "per.forlin@linaro.org", "time": "Mon Aug 29 13:33:33 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 05 17:11:05 2011 +0530" }, "message": "dmaengine/ste_dma40: remove duplicate call to d40_pool_lli_free().\n\nd40_desc_free() already calls d40_pool_lli_free().\n\nSigned-off-by: Per Forlin \u003cper.forlin@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "89de9f65429a97ab627310e2e85426dcbe423f39", "tree": "39a97ad3036622b9db2b79d32d2c62fa83a48eca", "parents": [ "8516f52fa497b37eb3d5e58d34e61a41ae0a553a" ], "author": { "name": "Per Forlin", "email": "per.forlin@linaro.org", "time": "Mon Aug 29 13:33:32 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 05 17:10:39 2011 +0530" }, "message": "dmaengine/ste_dma40: add missing kernel doc for pending_queue\n\nSigned-off-by: Per Forlin \u003cper.forlin@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "82babbb361f207a80cffa8ac34c2b6a0b62acc88", "tree": "70bc26dbf87c8d3c82d427903e9dfa6bbcb19c47", "parents": [ "7404368c22b4910ab839238e48d96be45180f6fc" ], "author": { "name": "Per Forlin", "email": "per.forlin@linaro.org", "time": "Mon Aug 29 13:33:35 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 05 17:08:26 2011 +0530" }, "message": "dmaengine/ste_dma40: fix memory leak due to prepared descriptors\n\nPrepared descriptors that are not submitted will not be freed. Add\nprepared descriptor to a list to be able to release them upon\ndmaengine_terminate_all().\n\nSigned-off-by: Per Forlin \u003cper.forlin@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "7404368c22b4910ab839238e48d96be45180f6fc", "tree": "3e641c685e8d97376c36b9b90c6717fbce405cf6", "parents": [ "3b3d5b0f855b3eec45a02832e97c3c1890ff8823" ], "author": { "name": "Per Forlin", "email": "per.forlin@linaro.org", "time": "Mon Aug 29 13:33:34 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 05 17:07:58 2011 +0530" }, "message": "dmaengine/ste_dma40: fix Oops due to double free of client descriptor\n\nThe client list may exist in two lists at the same time. This makes free\nfail since the same desc is freed multiple times. Remove desc from\nclient list when adding it to the pending queue. Move free of client owned\ndescriptors from free_dma() to terminate_all().\n\nUnable to handle kernel paging request at virtual address 00100104\npgd \u003d dea8c000\n[00100104] *pgd\u003d1ea62831, *pte\u003d00000000, *ppte\u003d00000000\nInternal error: Oops: 817 [#1] PREEMPT SMP\nModules linked in:\nCPU: 0 Not tainted (3.1.0-rc3+ #58)\nPC is at d40_free_chan_resources+0x64/0x330\n\nSigned-off-by: Per Forlin \u003cper.forlin@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "3b3d5b0f855b3eec45a02832e97c3c1890ff8823", "tree": "34a189e79c057c73faec8ebfb326524a612cb11b", "parents": [ "da063d260969c4e5e5f91d911ba87f7f6b48ead0" ], "author": { "name": "Per Forlin", "email": "per.forlin@linaro.org", "time": "Mon Aug 29 13:33:33 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 05 17:07:28 2011 +0530" }, "message": "dmaengine/ste_dma40: remove duplicate call to d40_pool_lli_free().\n\nd40_desc_free() already calls d40_pool_lli_free().\n\nSigned-off-by: Per Forlin \u003cper.forlin@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "da063d260969c4e5e5f91d911ba87f7f6b48ead0", "tree": "9d39ca85593d4ebd212a7a49137cbf83da2c869e", "parents": [ "c6a389f123b9f68d605bb7e0f9b32ec1e3e14132" ], "author": { "name": "Per Forlin", "email": "per.forlin@linaro.org", "time": "Mon Aug 29 13:33:32 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Sep 05 17:07:03 2011 +0530" }, "message": "dmaengine/ste_dma40: add missing kernel doc for pending_queue\n\nSigned-off-by: Per Forlin \u003cper.forlin@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "8516f52fa497b37eb3d5e58d34e61a41ae0a553a", "tree": "b73175b134d36bea303d2f181ae89a448c2add81", "parents": [ "c6a389f123b9f68d605bb7e0f9b32ec1e3e14132", "7b4b88e067d37cbbafd856121767f7e154294eb2" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Sep 02 16:43:44 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Fri Sep 02 16:43:44 2011 +0530" }, "message": "Merge branch \u0027next\u0027 into v3.1-rc4\n\nFixed trivial conflicts in drivers/dma/amba-pl08x.c\n\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "7b4b88e067d37cbbafd856121767f7e154294eb2", "tree": "9c94c61f0a903ea8a08f6ca085ccca5b83a190b6", "parents": [ "36e2f21ab481b3d6bd31b99e1de669fbbac4bd0e" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Thu Aug 25 11:03:37 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Aug 29 20:08:53 2011 +0530" }, "message": "dmaengine i.MX SDMA: use request_firmware_nowait\n\nThe firmware blob may not be available when the driver\nprobes. Instead of blocking the whole kernel use\nrequest_firmware_nowait() and continue without firmware.\nThe ROM scripts can already be used then if available.\nFor the devicetree case the ROM scripts are not available,\nstill the probe function should not block. The driver\nwill be unusable in this case, but we have no way of\ndetecting this properly. The configuration of the dma\nchannels will fail, so nothing bad should happen.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "36e2f21ab481b3d6bd31b99e1de669fbbac4bd0e", "tree": "4e6c67bfa2a9dbb81e3a70760898c02f9d6e8cbe", "parents": [ "73eab978ad6934499b83ecc920d470fe99c5e54d" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Thu Aug 25 11:03:36 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Aug 29 20:08:37 2011 +0530" }, "message": "dmaengine i.MX SDMA: set firmware scripts addresses to negative value initially\n\nIf we do not have a firmare script for a given transfer,\nthe setup of this channel must fail. For this the script\naddresses have to be \u003c 0 initially, not 0.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "73eab978ad6934499b83ecc920d470fe99c5e54d", "tree": "1f622269c883e767832a365557c2c504a3fd2fc3", "parents": [ "981ed70d8e4faf3689dbf3c48868a31d5b004d7a" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Thu Aug 25 11:03:35 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Aug 29 20:08:26 2011 +0530" }, "message": "dmaengine i.MX SDMA: lock channel 0\n\nchannel0 of the sdma engine is the configuration channel. It\nis a shared resource and thus must be protected by a mutex.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "981ed70d8e4faf3689dbf3c48868a31d5b004d7a", "tree": "f2fbc7a92971eb6684e39d376f04606fe54697ab", "parents": [ "57001a606f845ce2eda21a0f23e6aab20ee0cb04" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Thu Aug 18 16:50:51 2011 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Mon Aug 29 18:01:27 2011 +0530" }, "message": "dmatest: make dmatest threads freezable\n\nMaking dmatest threads freezable allows its use for system PM testing.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "57001a606f845ce2eda21a0f23e6aab20ee0cb04", "tree": "e66120a192e0a98b0c2d0ca0255331edeb6db0d2", "parents": [ "0a2356572b1910cc977f4ccf3c9ee1ecab08327a" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Fri Aug 05 15:32:45 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Thu Aug 25 19:35:07 2011 +0530" }, "message": "dmaengine/amba-pl08x: Call pl08x_free_txd() instead of calling kfree() directly\n\npl08x_prep_channel_resources() is calling kfree() directly for txd(). To\nmaintain consistency in code call pl08x_free_txd() instead.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "0a2356572b1910cc977f4ccf3c9ee1ecab08327a", "tree": "a2e5c45222c72d2f9d5b89e8e25e9e463fafb319", "parents": [ "036f05fd6dcdb6a6b9e55703cb663112fa4c4e42" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Fri Aug 05 15:32:42 2011 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Thu Aug 25 19:33:39 2011 +0530" }, "message": "dmaengine/amba-pl08x: Pass flow controller information with slave channel data\n\nAt least, on SPEAr platforms there is one peripheral, JPEG, which can be flow\ncontroller for DMA transfer. Currently DMA controller driver didn\u0027t support\nperipheral flow controller configurations.\n\nThis patch adds device_fc field in struct pl08x_channel_data, which will be used\nonly for slave transfers and is not used in case of mem2mem transfers.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" } ], "next": "036f05fd6dcdb6a6b9e55703cb663112fa4c4e42" }