)]}' { "log": [ { "commit": "f898fed0c27b2d46c3d8331e7825c25b6432b9f4", "tree": "e48cca6fd4f47face77af88af4f2c6f2e21b0612", "parents": [ "70756027b0a01cb0bebf2e20d8d28e8103025734" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Thu Mar 15 11:31:58 2012 +0100" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Tue Apr 17 16:29:41 2012 +0200" }, "message": "dmaengine: Kconfig: fix Atmel at_hdmac entry\n\nRemove SoC dependency and make it generic for every Atmel ARM AT91. That will\nallow to select this driver for newer chips. Keep dependency on AT91 because of\nthe use of an header file located in include/mach directory.\nModify the comment to reflect this.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "94fb175c0414902ad9dbd956addf3a5feafbc85b", "tree": "5d3c37abe78f072e92072f2079a98303c92cf16e", "parents": [ "a9e1e53bcfb29b3b503a5e75ce498d9a64f32c1e", "a2bd1140a264b561e38d99e656cd843c2d840e86" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 15:30:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 15:30:16 2012 -0700" }, "message": "Merge tag \u0027dmaengine-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine\n\nPull dmaengine fixes from Dan Williams:\n\n1/ regression fix for Xen as it now trips over a broken assumption\n about the dma address size on 32-bit builds\n\n2/ new quirk for netdma to ignore dma channels that cannot meet\n netdma alignment requirements\n\n3/ fixes for two long standing issues in ioatdma (ring size overflow)\n and iop-adma (potential stack corruption)\n\n* tag \u0027dmaengine-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:\n netdma: adding alignment check for NETDMA ops\n ioatdma: DMA copy alignment needed to address IOAT DMA silicon errata\n ioat: ring size variables need to be 32bit to avoid overflow\n iop-adma: Corrected array overflow in RAID6 Xscale(R) test.\n ioat: fix size of \u0027completion\u0027 for Xen\n" }, { "commit": "5d32c88f0b94061b3af2e3ade92422407282eb12", "tree": "2e1f81aa47b2cf59625c8fba17199617e33802e6", "parents": [ "43f63c8711ce02226b7bbdafeba7b8031faf3fb4", "dac23b0d0513916498d40412818bd2c581b365f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:30:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:30:34 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge batch of fixes from Andrew Morton:\n \"The simple_open() cleanup was held back while I wanted for laggards to\n merge things.\n\n I still need to send a few checkpoint/restore patches. I\u0027ve been\n wobbly about merging them because I\u0027m wobbly about the overall\n prospects for success of the project. But after speaking with Pavel\n at the LSF conference, it sounds like they\u0027re further toward\n completion than I feared - apparently davem is at the \"has stopped\n complaining\" stage regarding the net changes. So I need to go back\n and re-review those patchs and their (lengthy) discussion.\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (16 patches)\n memcg swap: use mem_cgroup_uncharge_swap fix\n backlight: add driver for DA9052/53 PMIC v1\n C6X: use set_current_blocked() and block_sigmask()\n MAINTAINERS: add entry for sparse checker\n MAINTAINERS: fix REMOTEPROC F: typo\n alpha: use set_current_blocked() and block_sigmask()\n simple_open: automatically convert to simple_open()\n scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_open()\n libfs: add simple_open()\n hugetlbfs: remove unregister_filesystem() when initializing module\n drivers/rtc/rtc-88pm860x.c: fix rtc irq enable callback\n fs/xattr.c:setxattr(): improve handling of allocation failures\n fs/xattr.c:listxattr(): fall back to vmalloc() if kmalloc() failed\n fs/xattr.c: suppress page allocation failure warnings from sys_listxattr()\n sysrq: use SEND_SIG_FORCED instead of force_sig()\n proc: fix mount -t proc -o AAA\n" }, { "commit": "a2bd1140a264b561e38d99e656cd843c2d840e86", "tree": "9c9f19dde5c0213a52de0e77c16059062cc6c8a1", "parents": [ "f26df1a1a9452573af7b6cea9a4723593e838568" ], "author": { "name": "Dave Jiang", "email": "dave.jiang@intel.com", "time": "Wed Apr 04 16:10:46 2012 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Thu Apr 05 15:27:12 2012 -0700" }, "message": "netdma: adding alignment check for NETDMA ops\n\nThis is the fallout from adding memcpy alignment workaround for certain\nIOATDMA hardware. NetDMA will only use DMA engine that can handle byte align\nops.\n\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Dave Jiang \u003cdave.jiang@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "234e340582901211f40d8c732afc49f0630ecf05", "tree": "753076500dfd883b3db56d4f5410af31d8945623", "parents": [ "9b3ae64be658a573b33d05a8dc73b08d3345fa44" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Thu Apr 05 14:25:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 05 15:25:50 2012 -0700" }, "message": "simple_open: automatically convert to simple_open()\n\nMany users of debugfs copy the implementation of default_open() when\nthey want to support a custom read/write function op. This leads to a\nproliferation of the default_open() implementation across the entire\ntree.\n\nNow that the common implementation has been consolidated into libfs we\ncan replace all the users of this function with simple_open().\n\nThis replacement was done with the following semantic patch:\n\n\u003csmpl\u003e\n@ open @\nidentifier open_f !\u003d simple_open;\nidentifier i, f;\n@@\n-int open_f(struct inode *i, struct file *f)\n-{\n(\n-if (i-\u003ei_private)\n-f-\u003eprivate_data \u003d i-\u003ei_private;\n|\n-f-\u003eprivate_data \u003d i-\u003ei_private;\n)\n-return 0;\n-}\n\n@ has_open depends on open @\nidentifier fops;\nidentifier open.open_f;\n@@\nstruct file_operations fops \u003d {\n...\n-.open \u003d open_f,\n+.open \u003d simple_open,\n...\n};\n\u003c/smpl\u003e\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f26df1a1a9452573af7b6cea9a4723593e838568", "tree": "5f45acfa1010edb9a1a481a9ad40e82322a75837", "parents": [ "21b764e075e74f8af90da9f623aa3e2167484687" ], "author": { "name": "Dave Jiang", "email": "dave.jiang@intel.com", "time": "Wed Apr 04 16:10:41 2012 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Thu Apr 05 15:24:35 2012 -0700" }, "message": "ioatdma: DMA copy alignment needed to address IOAT DMA silicon errata\n\nSilicon errata where when RAID and legacy descriptors are mixed, the legacy\n(memcpy and friends) operation must have alignment of 64 bytes to avoid\nhanging. This effects Intel Xeon C55xx, C35xx, E5-2600.\n\nSigned-off-by: Dave Jiang \u003cdave.jiang@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "21b764e075e74f8af90da9f623aa3e2167484687", "tree": "4ecbcdb82fdc3790d646bcd64b4cb5b481d1ad44", "parents": [ "3d9ea9e3af048ab6b8dced15248384e548ba05ea" ], "author": { "name": "Dave Jiang", "email": "dave.jiang@intel.com", "time": "Wed Apr 04 16:10:35 2012 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Thu Apr 05 15:22:58 2012 -0700" }, "message": "ioat: ring size variables need to be 32bit to avoid overflow\n\nThe alloc order can be up to 16 and 1 \u003c\u003c 16 will over flow the 16bit\ninteger. Change the appropriate variables to 16bit to avoid overflow.\n\nReported-by: Jim Harris \u003cjames.r.harris@intel.com\u003e\nSigned-off-by: Dave Jiang \u003cdave.jiang@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "20a2a811602b16c42ce88bada3d52712cdfb988b", "tree": "f2a30a383c47336b0352ed473abafc0cdca4ca2c", "parents": [ "a92bc5a65ce966ccc49bc8e37c6714c0b4042818", "6d008893e45ad5957a9a31afa00c4c6582504fe5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:25:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 04 08:25:23 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM fixes from Russell King:\n \"Nothing too big here, just small fixes.\"\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM)\n ARM: fix bios32.c build warning\n ARM: 7337/1: ptrace: fix ptrace_read_user for !CONFIG_MMU platforms\n ARM: fix missing bug.h include in arch/arm/kernel/insn.c\n ARM: sa11x0: fix build errors from DMA engine API updates\n" }, { "commit": "623ff7739e7c00fa3d55dbfd42a492a68298fd7a", "tree": "0b7461753a1b13b27ea2958a7d48c6efb47bba54", "parents": [ "c39e8ede284f469971589f2e04af78216e1a771d", "7b0e67f604e1829e5292e1ad7743eb18dc42ea7c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 17:31:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 17:31:56 2012 -0700" }, "message": "Merge tag \u0027for-linus-3.4\u0027 of git://git.infradead.org/mtd-2.6\n\nPull MTD changes from David Woodhouse:\n - Artem\u0027s cleanup of the MTD API continues apace.\n - Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst\n others.\n - More work on DiskOnChip G3, new driver for DiskOnChip G4.\n - Clean up debug/warning printks in JFFS2 to use pr_\u003clevel\u003e.\n\nFix up various trivial conflicts, largely due to changes in calling\nconventions for things like dmaengine_prep_slave_sg() (new inline\nwrapper to hide new parameter, clashing with rewrite of previously last\nparameter that used to be an \u0027append\u0027 flag, and is now a bitmap of\n\u0027unsigned long flags\u0027).\n\n(Also some header file fallout - like so many merges this merge window -\nand silly conflicts with sparse fixes)\n\n* tag \u0027for-linus-3.4\u0027 of git://git.infradead.org/mtd-2.6: (120 commits)\n mtd: docg3 add protection against concurrency\n mtd: docg3 refactor cascade floors structure\n mtd: docg3 increase write/erase timeout\n mtd: docg3 fix inbound calculations\n mtd: nand: gpmi: fix function annotations\n mtd: phram: fix section mismatch for phram_setup\n mtd: unify initialization of erase_info-\u003efail_addr\n mtd: support ONFI multi lun NAND\n mtd: sm_ftl: fix typo in major number.\n mtd: add device-tree support to spear_smi\n mtd: spear_smi: Remove default partition information from driver\n mtd: Add device-tree support to fsmc_nand\n mtd: fix section mismatch for doc_probe_device\n mtd: nand/fsmc: Remove sparse warnings and errors\n mtd: nand/fsmc: Add DMA support\n mtd: nand/fsmc: Access the NAND device word by word whenever possible\n mtd: nand/fsmc: Use dev_err to report error scenario\n mtd: nand/fsmc: Use devm routines\n mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform\n mtd: fsmc_nand: add pm callbacks to support hibernation\n ...\n" }, { "commit": "d9d54540147336c75f81c36c342b3bfec0d4d60d", "tree": "5541ffccba0c1053d94ed58e035f47a9c7d8aefe", "parents": [ "1338631433d8de7cf85b7e8fcf1a389ad89e7a8f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Mar 30 11:44:15 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Mar 30 11:46:20 2012 +0100" }, "message": "ARM: sa11x0: fix build errors from DMA engine API updates\n\nThe recent merge of the sa11x0 code into mainline had silent conflicts\nwith further development of the DMA engine API, leading to build errors\nand warnings:\n\ndrivers/net/irda/sa1100_ir.c: In function \u0027sa1100_irda_dma_start\u0027:\ndrivers/net/irda/sa1100_ir.c:151: error: too few arguments to function \u0027chan-\u003edevice-\u003edevice_prep_slave_sg\u0027\ndrivers/dma/sa11x0-dma.c: In function \u0027sa11x0_dma_probe\u0027:\ndrivers/dma/sa11x0-dma.c:950: warning: assignment from incompatible pointer type\n\nFix these.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ef08e78268423fc4d7fbc3e54bd9a67fc8da7cc5", "tree": "d0561d3ef89c9cd277a38168e33850666cbd33c4", "parents": [ "71db34fc4330f7c784397acb9f1e6ee7f7b32eb2", "5b2e02e401deb44e7f5befe19404d8b2688efea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 15:34:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 15:34:57 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dmaengine update from Vinod Koul:\n \"This includes the cookie cleanup by Russell, the addition of context\n parameter for dmaengine APIs, more arm dmaengine driver cleanup by\n moving code to dmaengine, this time for imx by Javier and pl330 by\n Boojin along with the usual driver fixes.\"\n\nFix up some fairly trivial conflicts with various other cleanups.\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)\n dmaengine: imx: fix the build failure on x86_64\n dmaengine: i.MX: Fix merge of cookie branch.\n dmaengine: i.MX: Add support for interleaved transfers.\n dmaengine: imx-dma: use \u0027dev_dbg\u0027 and \u0027dev_warn\u0027 for messages.\n dmaengine: imx-dma: remove \u0027imx_dmav1_baseaddr\u0027 and \u0027dma_clk\u0027.\n dmaengine: imx-dma: remove unused arg of imxdma_sg_next.\n dmaengine: imx-dma: remove internal structure.\n dmaengine: imx-dma: remove \u0027resbytes\u0027 field of \u0027internal\u0027 structure.\n dmaengine: imx-dma: remove \u0027in_use\u0027 field of \u0027internal\u0027 structure.\n dmaengine: imx-dma: remove sg member from internal structure.\n dmaengine: imx-dma: remove \u0027imxdma_setup_sg_hw\u0027 function.\n dmaengine: imx-dma: remove \u0027imxdma_config_channel_hw\u0027 function.\n dmaengine: imx-dma: remove \u0027imxdma_setup_mem2mem_hw\u0027 function.\n dmaengine: imx-dma: remove dma_mode member of internal structure.\n dmaengine: imx-dma: remove data member from internal structure.\n dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c\n dmaengine: at_hdmac: add slave config operation\n dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic\n dmaengine/dma_slave: introduce inline wrappers\n dma: imx-sdma: Treat firmware messages as warnings instead of erros\n ...\n" }, { "commit": "3d9ea9e3af048ab6b8dced15248384e548ba05ea", "tree": "3c2d2de74755dc9d2b4d2955f88a0a3cb96ea02b", "parents": [ "275029353953c2117941ade84f02a2303912fad1" ], "author": { "name": "Don Morris", "email": "don.morris@hp.com", "time": "Thu Mar 15 11:07:30 2012 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 28 01:47:49 2012 -0700" }, "message": "iop-adma: Corrected array overflow in RAID6 Xscale(R) test.\n\nBug: cppcheck reported overflow in array assignment (for loop walks\n0 to IOP_ADMA_NUM_SRC_TEST+2, array size is IOP_ADMA_NUM_SRC_TEST).\n\nReported as: https://bugzilla.kernel.org/show_bug.cgi?id\u003d42677\n\nTest code pq_src array was grown by two elements to correspond with actual\nusage (IOP_ADMA_NUM_SRC_TEST+2), stack consumption was kept constant by\nmodifying the pq_dest two element array which is only used when pq_src\nis referenced up to IOP_ADMA_NUM_SRC_TEST elements into the address\nof the new last two elements of the pq_src array. This is presumed to\nbe the original intent but would be reliant on compilers always having\npq_dest contiguous with the final element of pq_src.\n\nNote: This is a re-send of a request for review from two weeks ago.\nLooking for review (or shootdown), adding LKML to list for a wider\naudience. Thanks.\n\nUpdated per review comments of Sergei Shtylyov \u003csshtylyov@mvista.com\u003e\n\nSigned-off-by: Don Morris \u003cdon.morris@hp.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "9e4db1c3eed55c22328d8022c2c80adb3093833f", "tree": "9643545e6bd182f1d3e19942f590a6a1e3198320", "parents": [ "de8856d2c11f562c60ed9340a83db4a4f829a6e6", "aae528d9a8ad79d4b21b1b723abc9447fdb0d200" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 18:17:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 27 18:17:02 2012 -0700" }, "message": "Merge branch \u0027platforms\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM platform updates from Russell King:\n \"This covers platform stuff for platforms I have a direct interest in\n (iow, I have the hardware). Essentially:\n - as we no longer support any other Acorn platforms other than RiscPC\n anymore, we can collect all that code into mach-rpc.\n - convert Acorn expansion card stuff to use IRQ allocation functions,\n and get rid of NO_IRQ from there.\n - cleanups to the ebsa110 platform to move some private stuff out of\n its header files.\n - large amount of SA11x0 updates:\n - conversion of private DMA implementation to DMA engine support\n (this actually gives us greater flexibility in drivers over the old\n API.)\n - re-worked ucb1x00 updates - convert to genirq, remove sa11x0\n dependencies, fix various minor issues\n - move platform specific sa11x0 framebuffer data into platform files\n in arch/arm instead of keeping this in the driver itself\n - update sa11x0 IrDA driver for DMA engine, and allow it to use DMA\n for SIR transmissions as well as FIR\n - rework sa1111 support for genirq, and irq allocation\n - fix sa1111 IRQ support so it works again\n - use sparse IRQ support\n\n After this, I have one more pull request remaining from my current\n set, which I think is going to be the most problematical as it\n generates 8 conflicts.\"\n\nFixed up the trivial conflict in arch/arm/mach-rpc/Makefile as per\nRussell.\n\n* \u0027platforms\u0027 of git://git.linaro.org/people/rmk/linux-arm: (125 commits)\n ARM: 7343/1: sa11x0: convert to sparse IRQ\n ARM: 7342/2: sa1100: prepare for sparse irq conversion\n ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq\n ARM: 7340/1: rtc: sa1100: include mach/irqs.h instead of asm/irq.h\n ARM: sa11x0: remove unused DMA controller definitions\n ARM: sa11x0: remove old SoC private DMA driver\n USB: sa1111: add hcd .reset method\n USB: sa1111: add OHCI shutdown methods\n USB: sa1111: reorganize ohci-sa1111.c\n USB: sa1111: get rid of nasty printk(KERN_DEBUG \"%s: ...\", __FILE__)\n USB: sa1111: sparse and checkpatch cleanups\n ARM: sa11x0: don\u0027t static map sa1111\n ARM: sa1111: use dev_err() rather than printk()\n ARM: sa1111: cleanup sub-device registration and unregistration\n ARM: sa1111: only setup DMA for DMA capable devices\n ARM: sa1111: register sa1111 devices with dmabounce in bus notifier\n ARM: sa1111: move USB interface register definitions to ohci-sa1111.c\n ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c\n ARM: sa1111: move PS/2 interface register definitions to sa1111p2.c\n ARM: sa1111: delete unused physical GPIO register definitions\n ...\n" }, { "commit": "5b2e02e401deb44e7f5befe19404d8b2688efea4", "tree": "2249cad0b117b8b70081d50c0764cf8758327db5", "parents": [ "660cd0dd94eba5201c69cd10f2d2fefb52807fa8" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 27 13:53:00 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 27 21:46:21 2012 +0530" }, "message": "dmaengine: imx: fix the build failure on x86_64\n\ncommit 6bd081277ea0 \"dmaengine: imx-dma: merge old dma-v1.c with\nimx-dma.c\" removed the dependency in config for the imx dma driver,\nwhereas it should depend on ARCH_MXS\n\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "921de864b7c6413f15224d8f5e677541e8e1ac6d", "tree": "325815e4a65a26b961796314fdb0b2cd6e0b9975", "parents": [ "3946860409130038ef6e0e5c50f2203053eae2b7" ], "author": { "name": "Huang Shijie", "email": "b32955@freescale.com", "time": "Thu Feb 16 14:17:33 2012 +0800" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue Mar 27 00:37:28 2012 +0100" }, "message": "mxs-dma : rewrite the last parameter of mxs_dma_prep_slave_sg()\n\n[1] Background :\n The GPMI does ECC read page operation with a DMA chain consist of three DMA\n Command Structures. The middle one of the chain is used to enable the BCH,\n and read out the NAND page.\n\n The WAIT4END(wait for command end) is a comunication signal between\n the GPMI and MXS-DMA.\n\n[2] The current DMA code sets the WAIT4END bit at the last one, such as:\n\n +-----+ +-----+ +-----+\n | cmd | ------------\u003e | cmd | ------------------\u003e | cmd |\n +-----+ +-----+ +-----+\n ^\n |\n |\n set WAIT4END here\n\n This chain works fine in the mx23/mx28.\n\n[3] But in the new GPMI version (used in MX50/MX60), the WAIT4END bit should\n be set not only at the last DMA Command Structure,\n but also at the middle one, such as:\n\n +-----+ +-----+ +-----+\n | cmd | ------------\u003e | cmd | ------------------\u003e | cmd |\n +-----+ +-----+ +-----+\n ^ ^\n | |\n | |\n set WAIT4END here too set WAIT4END here\n\n If we do not set WAIT4END, the BCH maybe stalls in \"ECC reading page\" state.\n In the next ECC write page operation, a DMA-timeout occurs.\n This has been catched in the MX6Q board.\n\n[4] In order to fix the bug, rewrite the last parameter of mxs_dma_prep_slave_sg(),\n and use the dma_ctrl_flags:\n ---------------------------------------------------------\n DMA_PREP_INTERRUPT : append a new DMA Command Structrue.\n DMA_CTRL_ACK : set the WAIT4END bit for this DMA Command Structure.\n ---------------------------------------------------------\n\n[5] changes to the relative drivers:\n \u003c1\u003e For mxs-mmc driver, just use the new flags, do not change any logic.\n \u003c2\u003e For gpmi-nand driver, and use the new flags to set the DMA\n chain, especially for ecc read page.\n\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Huang Shijie \u003cb32955@freescale.com\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "3946860409130038ef6e0e5c50f2203053eae2b7", "tree": "826247e754823ddb1b3d18cabd13a34c3ff2f102", "parents": [ "273a65ad3256a829bdeb073a2e9b359433de2fe5" ], "author": { "name": "Huang Shijie", "email": "b32955@freescale.com", "time": "Thu Feb 16 14:17:32 2012 +0800" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue Mar 27 00:37:23 2012 +0100" }, "message": "mxs-dma : move the mxs dma.h to a more common place\n\nMove the header to a more common place.\nThe mxs dma engine is not only used in mx23/mx28, but also used\nin mx50/mx6q. It will also be used in the future chips.\n\nRename it to mxs-dma.h, and create a new folder include/linux/fsl/ to\nstore the Freescale\u0027s header files.\n\nchange mxs-dma driver, mxs-mmc driver, gpmi-nand driver, mxs-saif driver\nto the new header file.\n\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Huang Shijie \u003cb32955@freescale.com\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\nAcked-by: Chris Ball \u003ccjb@laptop.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "660cd0dd94eba5201c69cd10f2d2fefb52807fa8", "tree": "227318217703120f49de136c659cba84109a22d9", "parents": [ "f606ab897b6d7f35b57c7474424676e30457520b" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:15 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:32 2012 +0530" }, "message": "dmaengine: i.MX: Fix merge of cookie branch.\n\nWhen merging DMA cookie changes a small chunk\nof code was dropped. This broke imx-dma driver.\n\nThis patch adds this chunk again and fixes the problem.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "f606ab897b6d7f35b57c7474424676e30457520b", "tree": "2a52df10191cbe331160230894be3542df08e416", "parents": [ "f9b283a6e41be584f4b1f4c6634625f41ff0c728" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:14 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:32 2012 +0530" }, "message": "dmaengine: i.MX: Add support for interleaved transfers.\n\ni.MX2 and i.MX1 chips have the possibility to do\ninterleaved transfers with two constraints:\n- Only one chunk can be used (i.e. only 2D transfers are allowed).\n- Only 2 interleaved configurations can be applied at the same time\nfor all channels.\n\nSince this patch adds a new resource \u0027slots_2d\u0027 which is shared\nby all the DMA channels and to avoid disgustin locking BUGs, the\n\u0027lock\u0027 member has been moved to the global \u0027imxdma_engine\u0027 structure.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "f9b283a6e41be584f4b1f4c6634625f41ff0c728", "tree": "1b51fcad35c28e4bcfceedd0fa15dae7ca92bea8", "parents": [ "cd5cf9da020293118800864641e09b71e23ba41c" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:13 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:32 2012 +0530" }, "message": "dmaengine: imx-dma: use \u0027dev_dbg\u0027 and \u0027dev_warn\u0027 for messages.\n\nThere were some \u0027pr_crit\u0027 and \u0027pr_debug\u0027 messages due to the\ninitial merge. Replace them by \u0027dev_dbg\u0027 and \u0027dev_warn\u0027 to be\nconsistent.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "cd5cf9da020293118800864641e09b71e23ba41c", "tree": "c26fe39e278a0df1b7ac74476be85f34596dceb1", "parents": [ "a6cbb2d87d20817e555a6ffa3131bfa1cdd9ab73" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:12 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:32 2012 +0530" }, "message": "dmaengine: imx-dma: remove \u0027imx_dmav1_baseaddr\u0027 and \u0027dma_clk\u0027.\n\nThese global variables are integrated into the dmaengine structure.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "a6cbb2d87d20817e555a6ffa3131bfa1cdd9ab73", "tree": "43e60effdc603c6f70512289b7c420ae92b417b9", "parents": [ "2d9c2fc59a74e625eff795a788cacc65648290d6" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:11 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:32 2012 +0530" }, "message": "dmaengine: imx-dma: remove unused arg of imxdma_sg_next.\n\nSince this function is always used with \u0027desc\u0027 as first argument\nand \u0027desc-\u003esg\u0027 as second argument, the latter is clearly redundant\nand can be removed.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "2d9c2fc59a74e625eff795a788cacc65648290d6", "tree": "51f7965a7b1c5d30eccd7a09ca050c964f89c966", "parents": [ "6b0e2f55e3ebc7089abf5e4770f03fb264b6d2ea" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:10 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:31 2012 +0530" }, "message": "dmaengine: imx-dma: remove internal structure.\n\nThis structure was created to allow an smoothless\nmerge but was meant to be removed. Remaining members\n\u0027hw_chaining\u0027 and \u0027watchdog\u0027 are moved to the channel\nstructure.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "6b0e2f55e3ebc7089abf5e4770f03fb264b6d2ea", "tree": "689c8a182a49d11f5f86fef9e2914e789692bbdf", "parents": [ "e4756b5e068d866239b6880a7030c9d31400b254" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:09 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:31 2012 +0530" }, "message": "dmaengine: imx-dma: remove \u0027resbytes\u0027 field of \u0027internal\u0027 structure.\n\nUse per-descriptor \u0027len\u0027 field to keep track of the remaining bytes\ninstead. This goes on the direction of eventually removing the\n\u0027internal\u0027 structure.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "e4756b5e068d866239b6880a7030c9d31400b254", "tree": "fd9d157f437252aed259712a6a6e9f4ab3d40b31", "parents": [ "833bc03bf14ef6d3f82d86845c29aa1f7e2037e3" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:08 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:31 2012 +0530" }, "message": "dmaengine: imx-dma: remove \u0027in_use\u0027 field of \u0027internal\u0027 structure.\n\nIt makes no sense keeping an \u0027in_use\u0027 flag when the multiple descriptor\nmechanism already prevents a new DMA transfer to be issued when another\none is in course.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "833bc03bf14ef6d3f82d86845c29aa1f7e2037e3", "tree": "9c0a95fcf08ff597457a150a49143f21b5ea9545", "parents": [ "359291a1a095a8a402405cd9c4bab46684e7bcfe" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:07 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:31 2012 +0530" }, "message": "dmaengine: imx-dma: remove sg member from internal structure.\n\nThis member is redundant, because it is already present in\ndescriptor structure. Removing it will make further removing\nof \u0027internal\u0027 structure easier.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "359291a1a095a8a402405cd9c4bab46684e7bcfe", "tree": "f938d19d4228f68575b56c762deb44f328c0fe91", "parents": [ "bdc0c7534c80c479b2336aed3e4016f4743f4853" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:06 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:31 2012 +0530" }, "message": "dmaengine: imx-dma: remove \u0027imxdma_setup_sg_hw\u0027 function.\n\nRemoving this function allows moving \u0027ccr_to_device\u0027 and\n\u0027ccr_from_device\u0027 from internal struct to channel struct.\nThis repesents a step forward towards removing auxiliary\n\u0027internal\u0027 structure.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "bdc0c7534c80c479b2336aed3e4016f4743f4853", "tree": "cb613f4b4c69b29dbbd95444ce13ee1f25278ef0", "parents": [ "3b4b6dfc202dc5bedb03f2fae4ccc3f5b95dd563" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:05 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:30 2012 +0530" }, "message": "dmaengine: imx-dma: remove \u0027imxdma_config_channel_hw\u0027 function.\n\nThis function is only used once in the driver and uses some\nintermediary variables that are not needed anymore. For this\nreason it\u0027s been merged with \u0027imxdma_control\u0027.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "3b4b6dfc202dc5bedb03f2fae4ccc3f5b95dd563", "tree": "df376a0f96d4257ab55db8aaae733dcf259e9ff3", "parents": [ "2efc3449d7b11f36f532180cb738364fd2c28e03" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:04 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:30 2012 +0530" }, "message": "dmaengine: imx-dma: remove \u0027imxdma_setup_mem2mem_hw\u0027 function.\n\nThis function is only used once in the driver and has a lot of checks\nthat are not needed anymore. For this reason it\u0027s been merged\nwith \u0027imxdma_enable_hw\u0027.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "2efc3449d7b11f36f532180cb738364fd2c28e03", "tree": "db7c65ad6146db4d08e850a3939c99bba722de4d", "parents": [ "232e3c2c7961fb3312a80df3747f1c29f0ed512e" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:03 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:30 2012 +0530" }, "message": "dmaengine: imx-dma: remove dma_mode member of internal structure.\n\ndmaengine now provides \u0027enum dma_transfer_direction\u0027 to properly\nspecify DMA transfer direction. For this reason, DMA_MODE_* defines\nare replaced by this new type and therefore dma_mode member becomes\nredundant.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "232e3c2c7961fb3312a80df3747f1c29f0ed512e", "tree": "1c59e22c6e1e575144174d9d439944403d8d72f6", "parents": [ "6bd081277ea03e2b165fc68534b61bc64db93990" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:02 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:30 2012 +0530" }, "message": "dmaengine: imx-dma: remove data member from internal structure.\n\nInternal structure is just an auxiliary structure used for the initial\nmerge which is meant to be gone. As data member is not use anywhere\nwe can simply remove it.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "6bd081277ea03e2b165fc68534b61bc64db93990", "tree": "288ba74063dcc002a347cefcfb65e70bc5b63d22", "parents": [ "beeaa103eecc7a132682c40867f0ef70655383a5" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Thu Mar 22 14:54:01 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Mar 26 11:31:29 2012 +0530" }, "message": "dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c\n\nIt is mainly a simple merge changing the prefix of some\nfunctions to fit the imx-dma namings.\n\nAs there are no users of the old dma-v1.c api we can safely\nremove this file.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "11bcb32848ddb5ab28f09f142b625e2ba4d55c4c", "tree": "9a2c085e1fce41012bb0f2a340f6ceaaf616b7a0", "parents": [ "ed2d265d1266736bd294332d7f649003943ae36e", "8bc3bcc93a2b4e47d5d410146f6546bca6171663" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:24:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:24:31 2012 -0700" }, "message": "Merge tag \u0027module-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull cleanup of fs/ and lib/ users of module.h from Paul Gortmaker:\n \"Fix up files in fs/ and lib/ dirs to only use module.h if they really\n need it.\n\n These are trivial in scope vs the work done previously. We now have\n things where any few remaining cleanups can be farmed out to arch or\n subsystem maintainers, and I have done so when possible. What is\n remaining here represents the bits that don\u0027t clearly lie within a\n single arch/subsystem boundary, like the fs dir and the lib dir.\n\n Some duplicate includes arising from overlapping fixes from\n independent subsystem maintainer submissions are also quashed.\"\n\nFix up trivial conflicts due to clashes with other include file cleanups\n(including some due to the previous bug.h cleanup pull).\n\n* tag \u0027module-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n lib: reduce the use of module.h wherever possible\n fs: reduce the use of module.h wherever possible\n includecheck: delete any duplicate instances of module.h\n" }, { "commit": "0d19eac12031680dc5f5402921fb0c388e42f619", "tree": "57302fb8778b6527c35175cc1edf228dd9f7abb9", "parents": [ "56c10bf82c10588b743e75a13a7949e11b9fc942", "bba1594d348b59d6172e02bf74fba837c8273989" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:36:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 17:36:29 2012 -0700" }, "message": "Merge branch \u0027amba\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull #2 ARM updates from Russell King:\n \"Further ARM AMBA primecell updates which aren\u0027t included directly in\n the previous commit. I wanted to keep these separate as they\u0027re\n touching stuff outside arch/arm/.\"\n\n* \u0027amba\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver\n ARM: 7335/1: mach-u300: do away with MMC config files\n ARM: 7280/1: mmc: mmci: Cache MMCICLOCK and MMCIPOWER register\n ARM: 7309/1: realview: fix unconnected interrupts on EB11MP\n ARM: 7230/1: mmc: mmci: Fix PIO read for small SDIO packets\n ARM: 7227/1: mmc: mmci: Prepare for SDIO before setting up DMA job\n ARM: 7223/1: mmc: mmci: Fixup use of runtime PM and use autosuspend\n ARM: 7221/1: mmc: mmci: Change from using legacy suspend\n ARM: 7219/1: mmc: mmci: Change vdd_handler to a generic ios_handler\n ARM: 7218/1: mmc: mmci: Provide option to configure bus signal direction\n ARM: 7217/1: mmc: mmci: Put power register deviations in variant data\n ARM: 7216/1: mmc: mmci: Do not release spinlock in request_end\n ARM: 7215/1: mmc: mmci: Increase max_segs from 16 to 128\n" }, { "commit": "275029353953c2117941ade84f02a2303912fad1", "tree": "35e49f7b6d288f5ff74c5c95533e4353c587cd7d", "parents": [ "c16fa4f2ad19908a47c63d8fa436a1178438c7e7" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Mar 23 13:36:42 2012 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Mar 23 13:36:42 2012 -0700" }, "message": "ioat: fix size of \u0027completion\u0027 for Xen\n\nStarting with v3.2 Jonathan reports that Xen crashes loading the ioatdma\ndriver. A debug run shows:\n\n ioatdma 0000:00:16.4: desc[0]: (0x300cc7000-\u003e0x300cc7040) cookie: 0 flags: 0x2 ctl: 0x29 (op: 0 int_en: 1 compl: 1)\n ...\n ioatdma 0000:00:16.4: ioat_get_current_completion: phys_complete: 0xcc7000\n\n...which shows that in this environment GFP_KERNEL memory may be backed\nby a 64-bit dma address. This breaks the driver\u0027s assumption that an\nunsigned long should be able to contain the physical address for\ndescriptor memory. Switch to dma_addr_t which beyond being the right\nsize, is the true type for the data i.e. an io-virtual address\ninidicating the engine\u0027s last processed descriptor.\n\n[stable: 3.2+]\nCc: \u003cstable@vger.kernel.org\u003e\nReported-by: Jonathan Nieder \u003cjrnieder@gmail.com\u003e\nReported-by: William Dauchy \u003cwdauchy@gmail.com\u003e\nTested-by: William Dauchy \u003cwdauchy@gmail.com\u003e\nTested-by: Dave Jiang \u003cdave.jiang@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "beeaa103eecc7a132682c40867f0ef70655383a5", "tree": "c1cc34c65347a04d859eae78076322668d2f636d", "parents": [ "185ecb5f4fd43911c35956d4cc7d94a1da30417f" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Wed Mar 14 12:41:43 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Mar 21 21:12:29 2012 +0530" }, "message": "dmaengine: at_hdmac: add slave config operation\n\nThis patch introduces DMA_SLAVE_CONFIG to at_hdmac Atmel DMA driver.\n\nIt is needed to fix a regression in the use of atmel-mci.c driver on Atmel\nAT91 platforms brouth by e2b35f3:\n\"dmaengine/dw_dmac: Fix dw_dmac user drivers to adapt to slave_config changes\"\n\nWe remove some parts of the private structure \"at_dma_slave\" and use the\ninformation provided by \"struct dma_slave_config\": source/destination\nperipheral registers and access width.\n\nAT_DMA_SLAVE_WIDTH_* values used previously are not needed anymore as we\nnow use the standard ones. Although some conversion functions are needed to\nmatch register expected values.\n\nSome AT91 sub-architecture specific files are slightly touched by this patch\nbut it cannot be split because it can break compilation.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "185ecb5f4fd43911c35956d4cc7d94a1da30417f", "tree": "ebbdb7f15157d19d8af892cd7948d93947d09ec2", "parents": [ "16052827d98fbc13c31ebad560af4bd53e2b4dd5" ], "author": { "name": "Alexandre Bounine", "email": "alexandre.bounine@idt.com", "time": "Thu Mar 08 15:35:13 2012 -0500" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Mar 21 19:20:23 2012 +0530" }, "message": "dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic\n\nAdd context parameter to device_prep_slave_sg() and device_prep_dma_cyclic()\ninterfaces to allow passing client/target specific information associated\nwith the data transfer.\nModify all affected DMA engine drivers.\n\nSigned-off-by: Alexandre Bounine \u003calexandre.bounine@idt.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "ad1122e545b55013089e6cc18ac37b47b46f2a7d", "tree": "a24364b32b73c8d79dd8352a093ac98ebed4c73a", "parents": [ "1f3d6dc0be92f0caca937926cca16ec4fdd585a3" ], "author": { "name": "Fabio Estevam", "email": "fabio.estevam@freescale.com", "time": "Thu Mar 08 09:26:39 2012 -0300" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Mar 21 15:38:51 2012 +0530" }, "message": "dma: imx-sdma: Treat firmware messages as warnings instead of erros\n\nAs the SDMA controller can operate without an external firmware being loaded,\ntreat the firmware related messages as warnings rather than errors.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "69a7aebcf019ab3ff5764525ad6858fbe23bb86d", "tree": "7211df5704b743a7667159748c670a9744164482", "parents": [ "d464c92b5234227c1698862a1906827e2e398ae0", "f1f996b66cc3908a8f5ffccc2ff41840e92f3b10" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial tree from Jiri Kosina:\n \"It\u0027s indeed trivial -- mostly documentation updates and a bunch of\n typo fixes from Masanari.\n\n There are also several linux/version.h include removals from Jesper.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)\n kcore: fix spelling in read_kcore() comment\n constify struct pci_dev * in obvious cases\n Revert \"char: Fix typo in viotape.c\"\n init: fix wording error in mm_init comment\n usb: gadget: Kconfig: fix typo for \u0027different\u0027\n Revert \"power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c\"\n writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header\n writeback: fix typo in the writeback_control comment\n Documentation: Fix multiple typo in Documentation\n tpm_tis: fix tis_lock with respect to RCU\n Revert \"media: Fix typo in mixer_drv.c and hdmi_drv.c\"\n Doc: Update numastat.txt\n qla4xxx: Add missing spaces to error messages\n compiler.h: Fix typo\n security: struct security_operations kerneldoc fix\n Documentation: broken URL in libata.tmpl\n Documentation: broken URL in filesystems.tmpl\n mtd: simplify return logic in do_map_probe()\n mm: fix comment typo of truncate_inode_pages_range\n power: bq27x00: Fix typos in comment\n ...\n" }, { "commit": "9e5ed094c89e55fbf11d2e81d60be98eb12346c0", "tree": "b77c63a452580643cdede36c3038d52995e54d8e", "parents": [ "a64ae394eb7de5e39cf462c18edb202196c678fa" ], "author": { "name": "viresh kumar", "email": "viresh.kumar@st.com", "time": "Thu Mar 15 10:40:38 2012 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Mar 16 23:32:35 2012 +0000" }, "message": "ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driver\n\nFor simple modules that contain a single amba_driver without any\nadditional setup code then ends up being a block of duplicated\nboilerplate. This patch adds a new macro, module_amba_driver(),\nwhich replaces the module_init()/module_exit() registrations with\ntemplate functions.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "1f3d6dc0be92f0caca937926cca16ec4fdd585a3", "tree": "a12562009ae984dd16ed080af13d0036b88a93a7", "parents": [ "5170c051a56244816d948c43592c1b2805ed4f3a", "949ff5b8d46b5e3435d21b2651ce3a2599208d44" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 12:39:49 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 12:39:49 2012 +0530" }, "message": "Merge branch \u0027rmk_cookie_fixes2\u0027 into next\n\nConflicts:\n\tdrivers/dma/imx-dma.c\n\tdrivers/dma/pl330.c\n\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "949ff5b8d46b5e3435d21b2651ce3a2599208d44", "tree": "c8fac55a7ae33271acb1fc12f5399e5494b97b47", "parents": [ "8867bd508f88eae8b9c54394f17422f49e387b26" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:58:12 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:58:12 2012 +0530" }, "message": "dmaengine: fix for cookie changes and merge\n\nFixed trivial issues in drivers:\n\tdrivers/dma/imx-sdma.c\n\tdrivers/dma/intel_mid_dma.c\n\tdrivers/dma/ioat/dma_v3.c\n\tdrivers/dma/iop-adma.c\n\tdrivers/dma/sirf-dma.c\n\tdrivers/dma/timb_dma.c\n\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "8867bd508f88eae8b9c54394f17422f49e387b26", "tree": "cd284c19966cfe7184c3fe3ea53125e43afae5f5", "parents": [ "8ac695463f37af902e953d575d3f782e32e170da" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:56:44 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:56:44 2012 +0530" }, "message": "dmaengine: pl330: fix the pl330 build after cookie cleanup\n\ndrivers/dma/pl330.c: In function \u0027pl330_control\u0027:\ndrivers/dma/pl330.c:342: error: \u0027struct dma_pl330_chan\u0027 has no member named\n\u0027completed\u0027\n\nReported by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nSuggested by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "8ac695463f37af902e953d575d3f782e32e170da", "tree": "787119e3e1cc3a32e4be22cbff7c03de098eed58", "parents": [ "2a926e46022ad7a03e0ac167d8c2b0d88c12c5a8" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Tue Mar 06 22:36:27 2012 +0000" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:37:42 2012 +0530" }, "message": "dmaengine: ensure all DMA engine drivers initialize their cookies\n\nEnsure all DMA engine drivers initialize their cookies in the same way,\nso that they all behave in a similar fashion. This means their first\nissued cookie will be 2 rather than 1, and will increment to INT_MAX\nbefore returning 1 and starting over.\n\nIn connection with this, Dan Williams said:\n\u003e Russell King wrote:\n\u003e \u003e Secondly, some DMA engine drivers initialize the dma_chan cookie to 0,\n\u003e \u003e others to 1.  Is there a reason for this, or are these all buggy?\n\u003e\n\u003e I know that ioat and iop-adma expect 0 to mean \"I have cleaned up this\n\u003e descriptor and it is idle\", and would break if zero was an in-flight\n\u003e cookie value. The reserved usage of zero is an driver internal\n\u003e concern, but I have no problem formalizing it as a reserved value.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nTested-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\n[imx-sdma.c \u0026 mxs-dma.c]\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "2a926e46022ad7a03e0ac167d8c2b0d88c12c5a8", "tree": "7e31a02d6e6d90571d6dd88ebf31db2e5ca8d5c0", "parents": [ "d3ee98cdcd6198ea1cf75c603178acc8a805b69b" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Tue Mar 06 22:36:07 2012 +0000" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:37:33 2012 +0530" }, "message": "dmaengine: fix cookie handling in iop-adma.c and ppc4xx/adma.c\n\nDan Williams said:\n\u003e \u003e Russell King wrote:\n\u003e \u003e Firstly, we have DMA_MIN_COOKIE which has value 1 - so any cookies below\n\u003e \u003e that aren\u0027t valid.  That seems sane.\n\u003e \u003e\n\u003e \u003e We seem to have different behaviours:\n\u003e \u003e\n\u003e \u003e -       cookie \u003d c-\u003ecookie;\n\u003e \u003e -       cookie++;\n\u003e \u003e -       if (cookie \u003c 0)\n\u003e \u003e -               cookie \u003d 1;\n\u003e \u003e -       c-\u003ecookie \u003d cookie;\n\u003e \u003e -       tx-\u003ecookie \u003d cookie;\n\u003e \u003e\n\u003e \u003e c-\u003ecookie here is initialized to zero, so the first cookie given out will\n\u003e \u003e be 1.  This is how most DMA engine drivers implement this.\n\u003e \u003e\n\u003e \u003e Then we have this:\n\u003e \u003e\n\u003e \u003e                cookie \u003d chan-\u003ecommon.cookie;\n\u003e \u003e                cookie++;\n\u003e \u003e                if (cookie \u003c\u003d 1)\n\u003e \u003e                        cookie \u003d 2;\n\u003e \u003e\n\u003e \u003e                /* initialize the completed cookie to be less than\n\u003e \u003e                 * the most recently used cookie\n\u003e \u003e                 */\n\u003e \u003e                chan-\u003ecommon.completed_cookie \u003d cookie - 1;\n\u003e \u003e                chan-\u003ecommon.cookie \u003d sw_desc-\u003easync_tx.cookie \u003d cookie;\n\u003e \u003e\n\u003e \u003e Again, chan-\u003ecommon.cookie starts off at 0.  The first cookie given out\n\u003e \u003e will be 2, and 1 will never be used.  There are three drivers which\n\u003e \u003e implement it this way.\n\u003e \u003e\n\u003e \u003e Why is there this difference, and can these three be corrected to behave\n\u003e \u003e the same way as the first (and therefore the assignment of cookies\n\u003e \u003e consolidated?)\n\u003e\n\u003e Yes, they should be consolidated, and I believe they have drifted only\n\u003e because there were no good common helpers and murphy\u0027s law took over.\n\nSo lets fix this up to use the common dma_cookie_assign() helper.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nTested-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\n[imx-sdma.c \u0026 mxs-dma.c]\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "d3ee98cdcd6198ea1cf75c603178acc8a805b69b", "tree": "721f252d07d5e0596fa9b58a7c876dfd75823d0a", "parents": [ "96a2af41c78b1fbb1f567a3486bdc63f7b31c5fd" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Tue Mar 06 22:35:47 2012 +0000" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:37:22 2012 +0530" }, "message": "dmaengine: consolidate initialization of cookies\n\nProvide a common function to initialize a channels cookie values.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nTested-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\n[imx-sdma.c \u0026 mxs-dma.c]\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "96a2af41c78b1fbb1f567a3486bdc63f7b31c5fd", "tree": "d977c6b2ff1a23dfd523e70315ebe976a3f3f079", "parents": [ "f7fbce07c6ce26a25b4e0cb5f241c361fde87901" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Tue Mar 06 22:35:27 2012 +0000" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:37:14 2012 +0530" }, "message": "dmaengine: consolidate tx_status functions\n\nNow that we have the completed cookie in the dma_chan structure, we\ncan consolidate the tx_status functions by providing a function to set\nthe txstate structure and returning the DMA status. We also provide\na separate helper to set the residue for cookies which are still in\nprogress.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nTested-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\n[imx-sdma.c \u0026 mxs-dma.c]\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "f7fbce07c6ce26a25b4e0cb5f241c361fde87901", "tree": "66e6321b5ef49e18479ffeb1ed4fd5169e120f97", "parents": [ "884485e1f12dcd39390f042e772cdbefc9ebb750" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Tue Mar 06 22:35:07 2012 +0000" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:37:01 2012 +0530" }, "message": "dmaengine: provide a common function for completing a dma descriptor\n\nProvide a common function to do the cookie mechanics for completing\na DMA descriptor.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nTested-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\n[imx-sdma.c \u0026 mxs-dma.c]\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "884485e1f12dcd39390f042e772cdbefc9ebb750", "tree": "a35fccb601c48ae1ea839aa6d62e4f102f7b66c3", "parents": [ "d2ebfb335b0426deb1a4fb14e4e926d81ecd8235" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Tue Mar 06 22:34:46 2012 +0000" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:36:52 2012 +0530" }, "message": "dmaengine: consolidate assignment of DMA cookies\n\nEveryone deals with assigning DMA cookies in the same way (it\u0027s part of\nthe API so they should be), so lets consolidate the common code into a\nhelper function to avoid this duplication.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nTested-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\n[imx-sdma.c \u0026 mxs-dma.c]\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "d2ebfb335b0426deb1a4fb14e4e926d81ecd8235", "tree": "222c90df3fe29a08de668d862ed25d203404c315", "parents": [ "4d4e58de32a192fea65ab84509d17d199bd291c8" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Tue Mar 06 22:34:26 2012 +0000" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:36:44 2012 +0530" }, "message": "dmaengine: add private header file\n\nAdd a local private header file to contain definitions and declarations\nwhich should only be used by DMA engine drivers.\n\nWe also fix linux/dmaengine.h to use LINUX_DMAENGINE_H to guard against\nmultiple inclusion.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nTested-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\n[imx-sdma.c \u0026 mxs-dma.c]\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "4d4e58de32a192fea65ab84509d17d199bd291c8", "tree": "be35531778c9cc6bee73beb94d07e176a6f3599d", "parents": [ "08714f60b0fc6ea3a060b69b32e77139f14e6045" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Tue Mar 06 22:34:06 2012 +0000" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:36:06 2012 +0530" }, "message": "dmaengine: move last completed cookie into generic dma_chan structure\n\nEvery DMA engine implementation declares a last completed dma cookie\nin their private dma channel structures. This is pointless, and\nforces driver specific code. Move this out into the common dma_chan\nstructure.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nTested-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\n[imx-sdma.c \u0026 mxs-dma.c]\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "08714f60b0fc6ea3a060b69b32e77139f14e6045", "tree": "3f885be81cf2a71b294901514419fd075ccff603", "parents": [ "a1c46016794fdd83b7993303915ec7f4a06682b7" ], "author": { "name": "Russell King - ARM Linux", "email": "linux@arm.linux.org.uk", "time": "Mon Mar 05 20:15:11 2012 +0000" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 13 11:35:40 2012 +0530" }, "message": "dmaengine: mv_xor: remove write-only is_complete_cookie\n\nmv_xor\u0027s is_complete_cookie is only ever written to, but never read.\nThis is silly, remove the write-only structure member.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nTested-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\n[imx-sdma.c \u0026 mxs-dma.c]\nTested-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "5170c051a56244816d948c43592c1b2805ed4f3a", "tree": "9283dcb2d706947835941599ddf3be7b2901b499", "parents": [ "3ecf51a45c0e218d70df2cc905b668fa0c115f73" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Mar 09 14:55:25 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Mar 09 14:55:25 2012 +0530" }, "message": "Revert \"drivers/dma: linux/module.h included twice\"\n\nThis reverts commit 865d9438eb1f7670d2e88849f059db551b320887.\n\nThe module.h incsuion twice has been updated tree wide hence this is not\nrequired to be merged.\n\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "3ecf51a45c0e218d70df2cc905b668fa0c115f73", "tree": "f6a3b508cf0686d0b3c2700721a6e8fcd46c3f70", "parents": [ "b06db6e56c0850617291b8921582d04255022425" ], "author": { "name": "Boojin Kim", "email": "boojin.kim@samsung.com", "time": "Mon Dec 26 18:55:47 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Mar 08 17:59:29 2012 +0530" }, "message": "DMA: PL330: Support MEMTOMEM transmit w/o RMB, WMB\n\nThe DMAC PL330 r1p0 version fixed the lockup error being on r0p0.\nThis patch supports the DMA transmission without memory barrier\noperation when the revision of DMAC PL330 is the next of r0p0.\n\nCc: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "b06db6e56c0850617291b8921582d04255022425", "tree": "38b83479591eddd1bdb874cfc714267184fe6e61", "parents": [ "b7d861d9394534db94f0fb8f4b9d984f996d0528" ], "author": { "name": "Boojin Kim", "email": "boojin.kim@samsung.com", "time": "Mon Dec 26 18:51:41 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Mar 08 17:59:29 2012 +0530" }, "message": "DMA: PL330: Removes useless function\n\nCc: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nCc: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "b7d861d9394534db94f0fb8f4b9d984f996d0528", "tree": "e15cc41a70ae01dcedeef7391708252aa55bd07d", "parents": [ "6d0d7e2d554a2d1a39ee9397c3136df7a53ff348" ], "author": { "name": "Boojin Kim", "email": "boojin.kim@samsung.com", "time": "Mon Dec 26 18:49:52 2011 +0900" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Thu Mar 08 17:59:28 2012 +0530" }, "message": "DMA: PL330: Merge PL330 driver into drivers/dma/\n\nCurrently there were two part of DMAC PL330 driver for\nsupport old styled s3c-pl330 which has been merged into\ndrivers/dma/pl330.c driver. Actually, there is no reason\nto separate them now.\n\nBasically this patch merges arch/arm/common/pl330.c into\ndrivers/dma/pl330.c driver and removes useless exported\nsymbol, externed function and so on.\n\nThe newer pl330 driver tested on SMDKV310 and SMDK4212 boards\n\nCc: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "6365bead25efc84a4cf4aa9b0a7638f8a970cdff", "tree": "3dc5a72a6f25a48dfea6842b9e11af1b209ccec2", "parents": [ "d65b4e98d7ea3038b767b70fe8be959b2913f16d" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jan 09 21:44:07 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Mar 07 11:32:21 2012 +0000" }, "message": "DMA: sa11x0: add SA-11x0 DMA driver\n\nAdd support for the SA-11x0 DMA driver, which replaces the private\nAPI version in arch/arm/mach-sa1100/dma.c.\n\nWe model this as a set of virtual DMA channels, one for each request\nsignal, and assign the virtual DMA channel to a physical DMA channel\nwhen there is work to be done. This allows DMA users to claim their\nchannels, and hold them while not in use, without affecting the\navailability of the physical channels.\n\nAnother advantage over this approach, compared to the private version,\nis that a channel can be reconfigured on the fly without having to\nrelease and re-request it - which for the IrDA driver, allows us to\nuse DMA for SIR mode transmit without eating up three physical\nchannels. As IrDA is half-duplex, we actually only need one physical\nchannel, and this architecture allows us to achieve that.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "6d0d7e2d554a2d1a39ee9397c3136df7a53ff348", "tree": "f2dfa4de5aca3744903ef6c33eaefe81deaecb36", "parents": [ "6602b0ddf399d4438fdea17b4b4a65df5ec97bb8" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Wed Feb 29 11:20:38 2012 -0300" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 06 17:34:05 2012 +0530" }, "message": "dma: imx-sdma: Print a message when firmare fails to be requested\n\nPrint a message when firmare fails to be requested in the case of platform data being used.\n\nWhile at it, distinguish between the error messages of the device tree and platform data cases.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "6602b0ddf399d4438fdea17b4b4a65df5ec97bb8", "tree": "acd8d62825ffe090a854cc6ba6443c55f2ce3fe7", "parents": [ "9e15db7ce949e9f2d8bb6ce32a74212a4f662370" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Wed Feb 29 11:20:37 2012 -0300" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 06 17:34:05 2012 +0530" }, "message": "dma: imx-sdma: Let the driver be probed even if no firware is found\n\nOn the device tree case the code bails out when the firmware name cannot be found\nor if the firmware fails to be requested.\n\nFix this behaviour as the SDMA engine can still operate with the built-in\nROM scripts.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "9e15db7ce949e9f2d8bb6ce32a74212a4f662370", "tree": "be3b1acb24a55f9b3b88381ef1078fae0b00b3ba", "parents": [ "6c05f09155f40368c51ce00b8291401858e49bcb" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Fri Mar 02 09:28:47 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 06 17:19:21 2012 +0530" }, "message": "dmaengine: Add support for multiple descriptors for imx-dma.\n\ndmaengine specifies the possibility that several descriptors\ncan be queued for transfer. It also indicates that tasklets\nmust be used for DMA callbacks.\n\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "6c05f09155f40368c51ce00b8291401858e49bcb", "tree": "885eb543385ccf960a44ae5eff02db5eaa9ae9c6", "parents": [ "d8b53489d4c80490a70327fce6657816e33fafb3" ], "author": { "name": "Javier Martin", "email": "javier.martin@vista-silicon.com", "time": "Tue Feb 28 17:08:17 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 06 17:19:21 2012 +0530" }, "message": "dmaengine: Add support for MEMCPY for imx-dma.\n\nMEMCPY transfers allow DMA copies from memory to\nmemory. This patch has been tested with dmatest\ndevice driver.\n\nSigned-off-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nAcked-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "d8b53489d4c80490a70327fce6657816e33fafb3", "tree": "4aae62840a59c10d1bc6c275394de2898b41e103", "parents": [ "865d9438eb1f7670d2e88849f059db551b320887" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Tue Feb 21 12:51:59 2012 -0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 06 17:01:07 2012 +0530" }, "message": "dma: dmaengine: Distinguish between \u0027dmaengine: failed to get\u0027 messages\n\nThe message \"dmaengine: failed to get\" can come from two possible locations within dmaengine.c.\n\nIn order to distinguish between them, replace \"dmaengine\" with __func__ string so that the\nsource function of the error message can be easily identified.\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "865d9438eb1f7670d2e88849f059db551b320887", "tree": "8796ff83c0452b0d55e5741aeaeb15dc5ce9a764", "parents": [ "a1c46016794fdd83b7993303915ec7f4a06682b7" ], "author": { "name": "Danny Kukawka", "email": "danny.kukawka@bisect.de", "time": "Wed Feb 15 20:20:26 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Mar 06 16:55:34 2012 +0530" }, "message": "drivers/dma: linux/module.h included twice\n\ndrivers/dma/imx-dma.c and drivers/dma/imx-sdma.c included\n\u0027linux/module.h\u0027 twice, remove the duplicates.\n\nSigned-off-by: Danny Kukawka \u003cdanny.kukawka@bisect.de\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "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": "a1c46016794fdd83b7993303915ec7f4a06682b7", "tree": "92b11c6c5e156025eacdc11110e4d8f15f3c8b13", "parents": [ "e2b35f3dbfc080f15b72834d08f04f0269dbe9be" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Wed Feb 01 16:12:28 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:15:39 2012 +0530" }, "message": "dmaengine/dw_dmac: Remove unused fields in struct dw_dma_slave\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "327e6970258618da810f72e86cf2a8b803927e14", "tree": "ce5d4ac48b3b21a3d70d0acceebaa8b9e212daa1", "parents": [ "6bc711f6bd9dd393e1f9bbae354906affcd02aa5" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Wed Feb 01 16:12:26 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:15:38 2012 +0530" }, "message": "dmaengine/dw_dmac: Add support for DMA_SLAVE_CONFIG\n\nThis patch adds support for DMA_SLAVE_CONFIG in dwc DMAC controller. Fields in\nstruct dw_dma_slave for passing similar data are preserved in this patch untill\nall existing users are fixed.\n\nThat will be handled later in this patchset.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "6bc711f6bd9dd393e1f9bbae354906affcd02aa5", "tree": "e639502051771cf75899b42ce411581b1e1c0a33", "parents": [ "ff7b05f29fd4db810021d905e2dad95ab4fe2984" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Wed Feb 01 16:12:25 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:15:38 2012 +0530" }, "message": "dmaengine/dw_dmac: Add 64 bit access width support for slave xfers on mem side\n\n64 bit transfers are possible on both sides in slave transfers (memory as well\nas peripherals). This patch adds support for it memory side 64 bit transfers.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "ff7b05f29fd4db810021d905e2dad95ab4fe2984", "tree": "db633023e17d42a9e352ca77cbe16cdd04f69567", "parents": [ "6c618c9de5f2b4b43c30c6203869620bec6ed929" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Wed Feb 01 16:12:23 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:15:38 2012 +0530" }, "message": "dmaengine/dw_dmac: Don\u0027t handle block interrupts\n\nBlock interrupts give interrupt on completion of every LLI, which is actually\ntoo much interrupts. This is just not required for current functioning of\ndw_dmac.\n\nSo, just don\u0027t handle them at all.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "6c618c9de5f2b4b43c30c6203869620bec6ed929", "tree": "53c0ae0808ee6d32e8a9d1fe256db4df66fb48c6", "parents": [ "e8d9f875c9b02bb56ba3bb44834ae81ba0e8efbc" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Wed Feb 01 16:12:22 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:15:38 2012 +0530" }, "message": "dmaengine/dw_dmac: Use dev_get_platdata() instead of accessing dev directly\n\nUse already defined function dev_get_platdata() instead of accessing\npdev-\u003edev.data.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "e8d9f875c9b02bb56ba3bb44834ae81ba0e8efbc", "tree": "60aee6edfd2bd1b4c460039c54106560d014ff4f", "parents": [ "8c9f7aa316f547f70d270a08d1212f958721c071" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Wed Feb 01 16:12:21 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:15:38 2012 +0530" }, "message": "dmaengine/dw_dmac: Don\u0027t use magic number for total number of channels\n\nTotal number of channels is passed in pdata-\u003enr_channels variable, thus we must\nnot use magic number \u00277\u0027 for total number of channels.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "8c9f7aa316f547f70d270a08d1212f958721c071", "tree": "84ca56d95dc87195042dcd6e6d3b255536d6edd0", "parents": [ "258aea76f552cc755da92e7e823abbb85e021514" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Wed Feb 01 16:12:20 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:15:37 2012 +0530" }, "message": "dmaengine/amba-pl08x: Take flow controller info from DMA_SLAVE_CONFIG\n\nFlow controller information is passed now from DMA_SLAVE_CONFIG option. This\npatch makes changes in pl08x driver to use device_fc from it instead of platform\ndata.\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@linux.intel.com\u003e\n" }, { "commit": "7414a1b8b2b99093d6a271a1220557e87dc1ae94", "tree": "b90b71cc10027e731a3ee2be091f6c62e3a8294f", "parents": [ "91c1c9e36d9450974c9f04cf961d0b45aafca507" ], "author": { "name": "Rajeev KUMAR", "email": "rajeev-dlh.kumar@st.com", "time": "Wed Feb 01 16:12:17 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:15:36 2012 +0530" }, "message": "dmaengine/dw_dmac: Hibernation support in dw_dmac\n\nThe suspend and resume implementation is through dev_pm_ops in dmac. So\nin order to support hibernation, freeze, thaw, restore and poweroff\nfeatures are required.\n\nSigned-off-by: Rajeev Kumar \u003crajeev-dlh.kumar@st.com\u003e\nAcked-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "91c1c9e36d9450974c9f04cf961d0b45aafca507", "tree": "9834e5a9c0b2096766cd31440333c8678b254b0d", "parents": [ "7f99a4216d68f6d75d5d544aa265d72f193bad7f" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@intel.com", "time": "Tue Jan 31 12:49:00 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:11:48 2012 +0530" }, "message": "dmaengine: intel_mid_dma: move pm_runtime_put\n\nMove pm_runtime_put() to the end of intel_mid_dma_free_chan_resources()\nbecause there is no sense in allowing runtime suspend while the driver\nis still accessing the device.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@intel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "7f99a4216d68f6d75d5d544aa265d72f193bad7f", "tree": "b8c40c704c886138e52c531d158773bb5d89b881", "parents": [ "b63fd6ce71226e5e048e2035ba202b53f89a1825" ], "author": { "name": "Adrian Hunter", "email": "adrian.hunter@intel.com", "time": "Tue Jan 31 12:48:59 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 22 18:11:48 2012 +0530" }, "message": "dmaengine: intel_mid_dma: fix error status mask\n\nThe error status mask (MASK_ERR) has the same format as the other\nmasks (MASK_TFR, MASK_BLOCK etc) and must be cleared the same way.\n\nSigned-off-by: Adrian Hunter \u003cadrian.hunter@intel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "b6695e411f46036bcaab29908e8aa46fbbe101ed", "tree": "7d5367c51c714a8ae61104eae4bbdefe6bd33ac8", "parents": [ "b6d60fde1c9bbaa9fc9068eff4657f52b309cdea" ], "author": { "name": "Masanari Iida", "email": "standby24x7@gmail.com", "time": "Fri Jan 27 23:00:53 2012 +0900" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sun Feb 05 17:14:46 2012 +0100" }, "message": "dma: Fix typo in iop-adma.c\n\nCorrect spelling \"allocted\" to \"allocated\" in\ndrivers/dma/iop-adma.c\n\nSigned-off-by: Masanari Iida \u003cstandby24x7@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "b63fd6ce71226e5e048e2035ba202b53f89a1825", "tree": "73f9f23574e079091f557144d0464b4b2c4bbf95", "parents": [ "e7211718b3aa0365a723d9b8192e6f50236a1c67" ], "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:12:47 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": "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": "e7211718b3aa0365a723d9b8192e6f50236a1c67", "tree": "35564f1a9a9fbc5eaaad2ce9e924c99afb98dcce", "parents": [ "ba7932334fbede4bb6a4ff4e635391ca7833203f", "c8ddf036d99e7fab943b7587c75a905e789ea7e7" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 01 22:31:14 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Feb 01 22:31:28 2012 +0530" }, "message": "Merge branch \u0027fixes\u0027 into next\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": "ba7932334fbede4bb6a4ff4e635391ca7833203f", "tree": "d1a9b6401d7b2c5f371add1716e955fe399f1526", "parents": [ "0bbc1413028e93629a2ecd5588cc427fa834404b", "a5044cddad2fba36c725a019a6cd0e3f286b13d0" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 13:48:53 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 13:49:35 2012 +0530" }, "message": "Merge branch \u0027fixes\u0027 into next\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": "0bbc1413028e93629a2ecd5588cc427fa834404b", "tree": "dd9744524a814b549cd207dd9a10e02f04d2ee32", "parents": [ "b78bd91f47b28ba1290a7eb95d8cf48a357e1b90" ], "author": { "name": "Richard Zhao", "email": "richard.zhao@linaro.org", "time": "Fri Jan 13 11:10:01 2012 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 09:03:16 2012 +0530" }, "message": "dma/imx-sdma: convernt to use bit ops\n\nWe don\u0027t need extra lock, so we use non-atomic bit ops to set/clear bits,\n\nmerge event_mask0 and event_mask1 into an array, it helps use bit ops.\n\nIt also fixs the issue:\n\nsdmac-\u003eevent_mask0 \u003d 1 \u003c\u003c sdmac-\u003eevent_id0;\nsdmac-\u003eevent_mask1 \u003d 1 \u003c\u003c (sdmac-\u003eevent_id0 - 32);\n\nIt event_id0 \u003c 32, it shifts negative number. If event_id0 \u003e\u003d 32, it\nshifts number \u003e\u003d sizeof(int). Both the cases behavior is undefined.\n\nSigned-off-by: Richard Zhao \u003crichard.zhao@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "b78bd91f47b28ba1290a7eb95d8cf48a357e1b90", "tree": "d333a3afcb395e8855ed9ddd8265ff07feabf51a", "parents": [ "c2c744d3aa48f845626131176772bae2a3c9d5bc" ], "author": { "name": "Richard Zhao", "email": "richard.zhao@linaro.org", "time": "Fri Jan 13 11:10:00 2012 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 09:03:16 2012 +0530" }, "message": "dma/imx-sdma: use num_events to validate event_id0\n\nevent number is not always 32. use num_events for checking instead.\n\nSigned-off-by: Richard Zhao \u003crichard.zhao@linaro.org\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "c2c744d3aa48f845626131176772bae2a3c9d5bc", "tree": "91d026175e01deac9c1fda8e311835ecf2048075", "parents": [ "3bb5e7caf9641b6a532a55cf3a3621ef814f57ee" ], "author": { "name": "Richard Zhao", "email": "richard.zhao@linaro.org", "time": "Fri Jan 13 11:09:59 2012 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 09:03:16 2012 +0530" }, "message": "dma/imx-sdma: move clk_enable out of sdma_request_channel\n\nIt makes clk_enable/disable pair more readable, and fix one bug:\nsdma_init calls sdma_request_channel, but seems don\u0027t know\nsdma_request_channel enabled the clock.\n\nSigned-off-by: Richard Zhao \u003crichard.zhao@linaro.org\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n[fixed typo in commit log]\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "3bb5e7caf9641b6a532a55cf3a3621ef814f57ee", "tree": "ab9738fc92b7ea230252f08c331e1255cb132b32", "parents": [ "c4b56857d17540e8085a04ea479b0239f4ee764c" ], "author": { "name": "Richard Zhao", "email": "richard.zhao@linaro.org", "time": "Fri Jan 13 11:09:58 2012 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 09:03:16 2012 +0530" }, "message": "dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel\n\nsdma_request_channel sets the default priority. sdma_alloc_chan_resources\nshould call sdma_set_channel_priority thereafter to over write it.\n\nSigned-off-by: Richard Zhao \u003crichard.zhao@linaro.org\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "c4b56857d17540e8085a04ea479b0239f4ee764c", "tree": "9a0a5388f4c22be7beaf7e5096ab8c91b9ce9f18", "parents": [ "b9a591664a21a3d342b9e3b09b0aa2223ae7c469" ], "author": { "name": "Richard Zhao", "email": "richard.zhao@linaro.org", "time": "Fri Jan 13 11:09:57 2012 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 09:03:16 2012 +0530" }, "message": "dma/imx-sdma: use readl_relaxed/writel_relaxed and use writel when necessary\n\nuse readl_relaxed/writel_relaxed in most places, and use writel when\nenable channel, because it needs memory barrier.\n\nSigned-off-by: Richard Zhao \u003crichard.zhao@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "b9a591664a21a3d342b9e3b09b0aa2223ae7c469", "tree": "2aa6cffe829676f188aba806c2662648a5968646", "parents": [ "880db3ff17a973bc0e9847299d1fd9cdf4568ee1" ], "author": { "name": "Richard Zhao", "email": "richard.zhao@linaro.org", "time": "Fri Jan 13 11:09:56 2012 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 09:03:16 2012 +0530" }, "message": "dma/imx-sdma: let sdma_run_channel call sdma_enable_channel\n\nLet all enable channel code call sdma_enable_channel.\n\nSigned-off-by: Richard Zhao \u003crichard.zhao@linaro.org\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@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": "880db3ff17a973bc0e9847299d1fd9cdf4568ee1", "tree": "c27541db3d18b22877d4c7427f6abb23f7a811df", "parents": [ "7bec78e0a82418021dc2e63dea4d2b749953086d" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Thu Jan 12 22:49:29 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 08:55:08 2012 +0530" }, "message": "drivers/dma/amba-pl08x.c: adjust double test\n\nRewrite a duplicated test to test the correct value\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression E;\n@@\n\n(\n* E\n || ... || E\n|\n* E\n \u0026\u0026 ... \u0026\u0026 E\n)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "7bec78e0a82418021dc2e63dea4d2b749953086d", "tree": "6fe78c7efc79dc4265d01bc9d57a06ad7674ffff", "parents": [ "2b4f130e05cb28a9794921aad5139615e94a7b02" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Thu Jan 12 10:55:06 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue Jan 31 08:54:02 2012 +0530" }, "message": "drivers/dma/pl330.c: add missing iounmap\n\nAdd missing iounmap in error handling code, in a case where the function\nalready preforms iounmap on some other execution path.\n\nThis patch additionally adds calls to clk_disable and clk_put.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression e;\nstatement S,S1;\nint ret;\n@@\ne \u003d \\(ioremap\\|ioremap_nocache\\)(...)\n... when !\u003d iounmap(e)\nif (\u003c+...e...+\u003e) S\n... when any\n when !\u003d iounmap(e)\n*if (...)\n { ... when !\u003d iounmap(e)\n return ...; }\n... when any\niounmap(e);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "2b4f130e05cb28a9794921aad5139615e94a7b02", "tree": "0ebfcff3491cf5fc389692ef6179024a947c6657", "parents": [ "5b3168763f507fd46285b7310fc2d18dafe7f1c7" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 09 10:32:50 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Jan 30 14:50:55 2012 +0530" }, "message": "dma: imx-sdma: start transfer in issue_pending\n\nThe DMA engine API requires that transfers are started in issue_pending\ninstead of tx_submit. Fix this.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n[corrected change log to DMA engine API insteadof DMA API]\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "5b3168763f507fd46285b7310fc2d18dafe7f1c7", "tree": "886a9334514b223892b9a6c236e24840e6cbdab8", "parents": [ "c0fa6c8af7ab4f5d69d512a0d5fc3de512f337ae" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Mon Jan 09 10:32:49 2012 +0100" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Jan 30 14:50:39 2012 +0530" }, "message": "dma: imx-dma: start transfer in issue_pending\n\nThe DMA engine API requires that transfers are started in issue_pending\ninstead of tx_submit. Fix this.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n[corrected change log to DMA engine API insteadof DMA API]\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" } ], "next": "f69f2e264f6388df6d3cae45dd67ddfd52aaa14b" }