)]}' { "log": [ { "commit": "84a442b9a16ee69243ce7fce5d6f6f9c3fbdee68", "tree": "332a0c901d8ab2ffb19b8ce14b4b094bf5b08657", "parents": [ "39b6cc668c5ecc66f6f9c9293ffab681cb6f7065", "deb88cc3c69975cbd9875ed9fac259b351f6b64d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:57:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:57:47 2012 -0700" }, "message": "Merge tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc device tree conversions (part 2) from Olof Johansson:\n \"These continue the device tree work from part 1, this set is for the\n tegra, mxs and imx platforms, all of which have dependencies on clock\n or pinctrl changes submitted earlier.\"\n\nFix up trivial conflicts due to nearby changes in\ndrivers/{gpio/gpio,i2c/busses/i2c}-mxs.c\n\n* tag \u0027dt2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)\n ARM: dt: tegra: invert status\u003ddisable vs status\u003dokay\n ARM: dt: tegra: consistent basic property ordering\n ARM: dt: tegra: sort nodes based on bus order\n ARM: dt: tegra: remove duplicate device_type property\n ARM: dt: tegra: consistenly use lower-case for hex constants\n ARM: dt: tegra: format regs properties consistently\n ARM: dt: tegra: gpio comment cleanup\n ARM: dt: tegra: remove unnecessary unit addresses\n ARM: dt: tegra: whitespace cleanup\n ARM: dt: tegra cardhu: fix typo in SDHCI node name\n ARM: dt: tegra: cardhu: register core regulator tps62361\n ARM: dt: tegra30.dtsi: Add SMMU node\n ARM: dt: tegra20.dtsi: Add GART node\n ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes\n ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes\n ARM: dt: tegra: Add device tree support for AHB\n ARM: dts: enable audio support for imx28-evk\n ARM: dts: enable i2c device for imx28-evk\n i2c: mxs: add device tree probe support\n ARM: dts: enable mmc for imx28-evk\n ...\n" }, { "commit": "27953437059c64d14086196eb96f43c78caa9db3", "tree": "0cfd5fb21262a6db3de0c64462847b4c0c43e9df", "parents": [ "2c757fd5d1a92086f225a75a8fac7cab242d11b0", "3c0dec5f58b3c7b3627715126d1bf9b030a076f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:42:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:42:29 2012 -0700" }, "message": "Merge tag \u0027clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc clock driver changes from Olof Johansson:\n \"The new clock subsystem was merged in linux-3.4 without any users,\n this now moves the first three platforms over to it: imx, mxs and\n spear.\n\n The series also contains the changes for the clock subsystem itself,\n since Mike preferred to have it together with the platforms that\n require these changes, in order to avoid interdependencies and\n conflicts.\"\n\nFix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code\nremoved in one branch, added OF support in another) and\ndrivers/dma/imx-sdma.c (independent changes next to each other).\n\n* tag \u0027clock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)\n clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().\n clk: Provide dummy clk_unregister()\n SPEAr: Update defconfigs\n SPEAr: Add SMI NOR partition info in dts files\n SPEAr: Switch to common clock framework\n SPEAr: Call clk_prepare() before calling clk_enable\n SPEAr: clk: Add General Purpose Timer Synthesizer clock\n SPEAr: clk: Add Fractional Synthesizer clock\n SPEAr: clk: Add Auxiliary Synthesizer clock\n SPEAr: clk: Add VCO-PLL Synthesizer clock\n SPEAr: Add DT bindings for SPEAr\u0027s timer\n ARM i.MX: remove now unused clock files\n ARM: i.MX6: implement clocks using common clock framework\n ARM i.MX35: implement clocks using common clock framework\n ARM i.MX5: implement clocks using common clock framework\n ARM: Kirkwood: Replace clock gating\n ARM: Orion: Audio: Add clk/clkdev support\n ARM: Orion: PCIE: Add support for clk\n ARM: Orion: XOR: Add support for clk\n ARM: Orion: CESA: Add support for clk\n ...\n" }, { "commit": "ce53044c68cf4fb6c50a2a0d88786be65fae7235", "tree": "19c21da7d261412192e189ef3fd1a9ff4e7ba5c2", "parents": [ "0877aa3908aaeeae8fc2850691668c4315d3db56", "046fae440d32cc6dec8148c7e06a8b4b987f8a2f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:22:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 26 12:22:27 2012 -0700" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull arm-soc driver specific updates from Olof Johansson:\n \"These changes are specific to some driver that may be used by multiple\n boards or socs. The most significant change in here is the move of\n the samsung iommu code from a platform specific in-kernel interface to\n the generic iommu subsystem.\"\n\nFix up trivial conflicts in arch/arm/mach-exynos/Kconfig\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)\n mmc: dt: Consolidate DT bindings\n iommu/exynos: Add iommu driver for EXYNOS Platforms\n ARM: davinci: optimize the DMA ISR\n ARM: davinci: implement DEBUG_LL port choice\n ARM: tegra: Add SMMU enabler in AHB\n ARM: tegra: Add Tegra AHB driver\n Input: pxa27x_keypad add choice to set direct_key_mask\n Input: pxa27x_keypad direct key may be low active\n Input: pxa27x_keypad bug fix for direct_key_mask\n Input: pxa27x_keypad keep clock on as wakeup source\n ARM: dt: tegra: pinmux changes for USB ULPI\n ARM: tegra: add USB ULPI PHY reset GPIO to device tree\n ARM: tegra: don\u0027t hard-code USB ULPI PHY reset_gpio\n ARM: tegra: change pll_p_out4\u0027s rate to 24MHz\n ARM: tegra: fix pclk rate\n ARM: tegra: reparent sclk to pll_c_out1\n ARM: tegra: Add pllc clock init table\n ARM: dt: tegra cardhu: basic audio support\n ARM: dt: tegra30.dtsi: Add audio-related nodes\n ARM: tegra: add AUXDATA required for audio\n ...\n" }, { "commit": "d5adf235adc8d8d67c10afd43922c92753f6be3c", "tree": "18c3cdcbc9a50a8cd00b03d83ec76bad7c7594f8", "parents": [ "d484864dd96e1830e7689510597707c1df8cd681", "1dd1ea8eb46a71201943148cc0ed3182cd04e288" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:31:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 25 09:31:59 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dmaengine updates from Vinod Koul:\n \"Nothing exciting this time, odd fixes in a bunch of drivers\"\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n dmaengine: at_hdmac: take maxburst from slave configuration\n dmaengine: at_hdmac: remove ATC_DEFAULT_CTRLA constant\n dmaengine: at_hdmac: remove some at_dma_slave comments\n dma: imx-sdma: make channel0 operations atomic\n dmaengine: Fixup dmaengine_prep_slave_single() to be actually useful\n dmaengine: Use dma_sg_len(sg) instead of sg-\u003elength\n dmaengine: Use sg_dma_address instead of sg_phys\n DMA: PL330: Remove duplicate header file inclusion\n dma: imx-sdma: keep the callbacks invoked in the tasklet\n dmaengine: dw_dma: add Device Tree probing capability\n dmaengine: dw_dmac: Add clk_{un}prepare() support\n dma/amba-pl08x: add support for the Nomadik variant\n dma/amba-pl08x: check for terminal count status only\n" }, { "commit": "1be5f0b7575e090fd100a98b303860879b5800de", "tree": "039e46bc92b93e68dbb9645413d5fd5007a411d6", "parents": [ "42e8b9c00176dd3a2f11d05f195131bac851558b", "d41160524d8d8ee721296e5c7e15f1ed727df7eb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 17 09:57:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 17 09:57:13 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dmaengine fixes fromVinod Koul:\n \"fixes of cylic dma usages in slave dma drivers\"\n\n* \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n dmaengine: fix cyclic dma usage\n dmaengine: pl330: dont complete descriptor for cyclic dma\n" }, { "commit": "3c0dec5f58b3c7b3627715126d1bf9b030a076f0", "tree": "4bf8f56fca3bf6be109209b116fc8e32cb2e0f9e", "parents": [ "fcd8d84a585f3578a9ebdd27e757495a27415322", "7e0fa1b5fa91d9aa456d102c273b2cf0f2e95d39" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 16 16:35:25 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 16 16:35:25 2012 +0200" }, "message": "Merge branch \u0027clk-next\u0027 of git://git.linaro.org/people/mturquette/linux into next/clock\n\n* \u0027clk-next\u0027 of git://git.linaro.org/people/mturquette/linux:\n clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().\n clk: Provide dummy clk_unregister()\n ARM: Kirkwood: Replace clock gating\n ARM: Orion: Audio: Add clk/clkdev support\n ARM: Orion: PCIE: Add support for clk\n ARM: Orion: XOR: Add support for clk\n ARM: Orion: CESA: Add support for clk\n ARM: Orion: SDIO: Add support for clk.\n ARM: Orion: NAND: Add support for clk, if there is one.\n ARM: Orion: EHCI: Add support for enabling clocks\n ARM: Orion: SATA: Add per channel clk/clkdev support.\n ARM: Orion: UART: Get the clock rate via clk_get_rate().\n ARM: Orion: WDT: Add clk/clkdev support\n ARM: Orion: Eth: Add clk/clkdev support.\n ARM: Orion: SPI: Add clk/clkdev support.\n ARM: Orion: Add clocks using the generic clk infrastructure.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "1dd1ea8eb46a71201943148cc0ed3182cd04e288", "tree": "0d4c7f05f751d906aea6b0270956453bcd6520e5", "parents": [ "b409ebfb14a71b64e11b156dc82ede698480397e" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Thu May 10 12:17:41 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue May 15 08:47:18 2012 +0530" }, "message": "dmaengine: at_hdmac: take maxburst from slave configuration\n\nThe maxburst/chunk size was taken from the private slave DMA data structure.\nUse the common API provided by DMA_SLAVE_CONFIG to setup src/dst maxburst\nvalues.\nThe ctrla field is not needed anymore in the slave private structure nor the\nheader constants that were located in an architecture specific directory.\nThe at91sam9g45_devices.c file that was using this platform data is also\nmodified to remove this now useless data.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "b409ebfb14a71b64e11b156dc82ede698480397e", "tree": "9b0b5fbd10a99a5d589903403967d5fbcfb81139", "parents": [ "b89a9cb4027a498de7dad12a68b06ae1b254042c" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Thu May 10 12:17:40 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue May 15 08:47:18 2012 +0530" }, "message": "dmaengine: at_hdmac: remove ATC_DEFAULT_CTRLA constant\n\nNot needed constant that was set to 0.\n\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "454caf1bef18698d62f3b6d99df0344cb10de841", "tree": "b2dacda4144a0b27914a62eb169fd0fb5425c698", "parents": [ "2ccaef0520d18d0072153f090d4110b4075c332c", "d41160524d8d8ee721296e5c7e15f1ed727df7eb" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue May 15 08:44:54 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue May 15 08:44:54 2012 +0530" }, "message": "Merge branch \u0027fixes\u0027 into next\n" }, { "commit": "d41160524d8d8ee721296e5c7e15f1ed727df7eb", "tree": "49328b29bbcd95acbfd94556ea748315c2851053", "parents": [ "eab21585580344c8533d5e7bc4edea27ad1e268f" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 11:48:21 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Tue May 15 08:43:40 2012 +0530" }, "message": "dmaengine: fix cyclic dma usage\n\nfor cyclic dma, dont makr the descriptor as complte. Fix the remaining users of\ncyclic dma which do so\n\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\nTested-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nTested-by: Mika Westerberg \u003cmika.westerberg@iki.fi\u003e\n" }, { "commit": "304ea74770c892cf115e128b0e0dc6636148b010", "tree": "ccf06fa8a8fa9321beaab730ac19160966033d52", "parents": [ "e29402edf848359d619ce06af86d61e62c292c87", "6b204283f2802a92cf91fc14c2c1b04e7295761b" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 15:24:45 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 15:28:19 2012 +0200" }, "message": "Merge branch \u0027imx/dt/for-3.5\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6.git into next/dt2\n\nShawn Guo \u003cshawn.guo@linaro.org\u003e writes:\n\n I chose to base it on Sascha\u0027s imx-common-clk series than -rc, because\n otherwise it will keep patching clock file that has been removed by\n imx-common-clk series. It also depends on imx-pinctrl pull-request\n I just sent to be functional.\n\n Note: when imx-common-clk and imx-pinctrl get merged together, the\n following files will have conflicts. But the conflicts should not be\n so hard to resolve.\n\n[arnd: resolved those merge conflicts by pulling pinctrl branch]\n\n* imx/dt: (24 commits)\n ARM: dts: imx53-qsb: enable audio support\n ARM: dts: imx51-babbage: enable audio support\n ARM: imx: add audio codec clk lookup for imx53-qsb\n ARM: imx: add audmux pad setting for imx51-babbage\n ARM: imx: add more imx5 ssi clocks\n ARM: dts: imx53-qsb: Add Dialog DA9053 PMIC support\n ARM: dts: imx6q-sabrelite: add serial2 pinctrl support\n ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000\n ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000\n ARM: imx6q: add ssi1_ipg clk_lookup\n ARM: dts: imx6q-sabrelite: add audmux pinctrl support\n ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support\n ARM: dts: imx6q-sabrelite: add audmux device\n ARM: dts: imx6q-sabrelite: add ssi device\n ARM: dts: imx6q-arm2: add pinctrl state for usdhc\n ARM: imx6: Add UART2 for low-level debug\n ARM: imx6q: register phy fixup only when CONFIG_PHYLIB is enabled\n ARM: imx6q: move imx6q_sabrelite specific code to a dedicated function\n ARM: dts: imx6q-sabrelite: Add SPI NOR support\n ARM: dts: Add basic support for imx6q-sabresd\n ...\n\nPulls in imx/pinctrl and imx/clock as dependencies.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "6b204283f2802a92cf91fc14c2c1b04e7295761b", "tree": "e323818ac7f159c13f646fdf75bf0f016d7ae368", "parents": [ "ffc505c0b99d6caf5b10d813f9a0ce3576f68996", "a0f5e3631b07cabf624e7d818df76d47d9d21017" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 15:23:13 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon May 14 15:23:13 2012 +0200" }, "message": "Merge branch \u0027imx/pinctrl\u0027 into imx/dt\n\nConflicts:\n\tdrivers/mmc/host/sdhci-esdhc-imx.c\n\tdrivers/net/ethernet/freescale/fec.c\n\tdrivers/spi/spi-imx.c\n\tdrivers/tty/serial/imx.c\n\nThis resolves some simply but annoying conflicts.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "7e6ecebd2cafd2106f134f55b9d37e7fe5f4f572", "tree": "8f33e4fb2d87fd4197e8b0bf69d42fa70fbc0618", "parents": [ "caafc71b1a25096ef74904adb19d37e5c6a282dc", "2b3c83efc9a653af6a24799eeb1a2900ba0439e6" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri May 11 23:58:39 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat May 12 00:00:57 2012 -0700" }, "message": "Merge tag \u0027ep93xx-fixes-for-3.5\u0027 of git://github.com/RyanMallon/linux-ep93xx into next/drivers\n\nBranch has one driver feature and one board bug fix. Merging it as a driver branch.\n\nDMA driver change was later:\nAcked-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n\n* tag \u0027ep93xx-fixes-for-3.5\u0027 of git://github.com/RyanMallon/linux-ep93xx:\n dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels\n arm: ep93xx: Don\u0027t try to release not acquired GPIO lines\n" }, { "commit": "90c9abc5b74d7f7d8226b5dd0d8b6da3a03fe860", "tree": "8576ca33550eb9c03021876b99c9d653d4d34beb", "parents": [ "8c92013643f5c40633d61ae331cef49c1069af10" ], "author": { "name": "Dong Aisheng", "email": "dong.aisheng@linaro.org", "time": "Fri May 04 20:12:17 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 13:32:18 2012 +0800" }, "message": "dma: mxs-dma: add device tree probe support\n\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Rob Landley \u003crob@landley.net\u003e\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: Huang Shijie \u003cb32955@freescale.com\u003e\nSigned-off-by: Dong Aisheng \u003cdong.aisheng@linaro.org\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Marek Vasut \u003cmarex@denx.de\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "8c92013643f5c40633d61ae331cef49c1069af10", "tree": "7c385fabafab5ded73621c42639b61e06fa94f6e", "parents": [ "bb11fb63fc2e5d1092f17d91790bb4aede6d3ef2" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Thu May 10 06:23:26 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 13:32:17 2012 +0800" }, "message": "dma: mxs-dma: make platform_device_id more generic\n\nRewrite mxs_dma_is_apbh and mxs_dma_is_apbx in order to support\nother SoCs like imx6q and reform the platform_device_id for the\nbetter further dt support.\n\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: Huang Shijie \u003cb32955@freescale.com\u003e\nSigned-off-by: Dong Aisheng \u003cdong.aisheng@linaro.org\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Marek Vasut \u003cmarex@denx.de\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "bb11fb63fc2e5d1092f17d91790bb4aede6d3ef2", "tree": "8b06d7e8e71588aaeed45f13b0be1352bf0d4286", "parents": [ "f5b7efccdb057a2cc8ee32c83d2f034e494a1f4a" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Mon May 07 14:14:08 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 13:32:17 2012 +0800" }, "message": "dma: mxs-dma: let dma_is_apbh and apbh_is_old take parameter\n\nLet macros dma_is_apbh and apbh_is_old take mxs_dma as parameter\nto make the code easy to read.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "f5b7efccdb057a2cc8ee32c83d2f034e494a1f4a", "tree": "72674434b2219f27dbf8101dce7b8adadc3339f9", "parents": [ "6c4d4efb9d19017f0eef3893912f3dec513ef8e9" ], "author": { "name": "Dong Aisheng", "email": "dong.aisheng@linaro.org", "time": "Fri May 04 20:12:15 2012 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Sat May 12 13:32:17 2012 +0800" }, "message": "dma: mxs-dma: use global stmp_device functionality\n\nThis can get rid of the mach-dependency.\n\nCc: Dan Williams \u003cdan.j.williams@intel.com\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: Huang Shijie \u003cb32955@freescale.com\u003e\nSigned-off-by: Dong Aisheng \u003cdong.aisheng@linaro.org\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: Marek Vasut \u003cmarex@denx.de\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\n" }, { "commit": "93c6d8927fa692faef3d7d945bd4fe84b0185ad4", "tree": "0a971c86114656ec4e39f7789d9faeb70432c36a", "parents": [ "ea01d31a07ae182028d2398380948f5a4ee09953", "50260924afd4b745bfb6e5f1caee381a1875fc31" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri May 11 17:15:31 2012 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri May 11 17:15:31 2012 +0200" }, "message": "Merge branch \u0027clk/mxs\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into next/clock\n\nShawn Guo \u003cshawn.guo@linaro.org\u003e writes:\n\n mxs common clk porting for v3.5. It depends on the following two branches.\n\n [1] git://git.linaro.org/people/mturquette/linux.git clk-next\n [2] http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git clkdev\n\n As the mxs device tree conversion will constantly touch clock files,\n to save the conflicts, the updated mxs/dt branch coming later will\n based on this pull-request.\n\n* \u0027clk/mxs\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6:\n ARM: mxs: remove now unused timer_clk argument from mxs_timer_init\n ARM: mxs: remove old clock support\n ARM: mxs: switch to common clk framework\n ARM: mxs: change the lookup name for fec phy clock\n ARM: mxs: request clock for timer\n clk: mxs: add clock support for imx28\n clk: mxs: add clock support for imx23\n clk: mxs: add mxs specific clocks\n\nIncludes an update to Linux 3.4-rc6\n\nConflicts:\n\tdrivers/clk/Makefile\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "2ccaef0520d18d0072153f090d4110b4075c332c", "tree": "c4fcc9cbac1f7448263701ae5c5926f28351935c", "parents": [ "922ee08baad2052d0759f100e026d49798c51fef" ], "author": { "name": "Richard Zhao", "email": "richard.zhao@freescale.com", "time": "Fri May 11 15:14:27 2012 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 14:00:38 2012 +0530" }, "message": "dma: imx-sdma: make channel0 operations atomic\n\ndevice_prep_dma_cyclic may be call in audio trigger function which is\natomic context, so we make it atomic too.\n\n - change channel0 lock to spinlock.\n - Use polling to wait for channel0 finish running.\n\nSigned-off-by: Richard Zhao \u003crichard.zhao@freescale.com\u003e\nAcked-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "fdaf9c4b22247a6cc6cda9459be3e52764c14d95", "tree": "c567736f1f47f91003a658b11075e974cee4321b", "parents": [ "cbb796ccd8c33c50249b876d9773dfa8e67d39cb" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Wed Apr 25 20:50:52 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 12:04:38 2012 +0530" }, "message": "dmaengine: Use dma_sg_len(sg) instead of sg-\u003elength\n\nsg-\u003elength may or may not contain the length of the dma region to transfer,\ndepending on the architecture - dma_sg_len(sg) always will though. For the\narchitectures which use the drivers modified by this patch it probably is the\ncase that sg-\u003elength contains the dma transfer length. But to be consistent and\nfuture proof change them to use dma_sg_len.\n\nTo quote Russel King:\n\tsg-\u003elength is meaningless to something performing DMA.\n\n\tIn cases where sg_dma_len(sg) and sg-\u003elength are the same storage, then\n\tthere\u0027s no problem. But scatterlists _can_ (and one some architectures) do\n\tsplit them - especially when you have an IOMMU which can allow you to\n\tcombine a scatterlist into fewer entries.\n\n\tSo, anything using sg-\u003elength for the size of a scatterlist\u0027s DMA transfer\n\t_after_ a call to dma_map_sg() is almost certainly buggy.\n\nThe patch has been generated using the following coccinelle patch:\n\u003csmpl\u003e\n@@\nstruct scatterlist *sg;\nexpression X;\n@@\n-sg[X].length\n+sg_dma_len(\u0026sg[X])\n@@\nstruct scatterlist *sg;\n@@\n-sg-\u003elength\n+sg_dma_len(sg)\n\u003c/smpl\u003e\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "cbb796ccd8c33c50249b876d9773dfa8e67d39cb", "tree": "e1384d10cf0cf86328a69c4f9bf6931dbe9250fe", "parents": [ "12366ad91adb41a193f93b3b0f2829ea06df1773" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Wed Apr 25 20:50:51 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 12:04:38 2012 +0530" }, "message": "dmaengine: Use sg_dma_address instead of sg_phys\n\ndmaengine drivers should always use sg_dma_address instead of sg_phys to get the\naddresses for the transfer from a sg element.\n\nTo quote Russel King:\n\tsg_phys(sg) of course has nothing to do with DMA addresses. It\u0027s the\n\tphysical address _to the CPU_ of the memory associated with the scatterlist\n\tentry. That may, or may not have the same value for the DMA engine,\n\tparticularly if IOMMUs are involved.\n\n\tAnd if these drivers are used on ARM, they must be fixed, sooner rather\n\tthan later. There\u0027s patches in the works which will mean we will end up\n\twith IOMMU support in the DMA mapping later, which means everything I\u0027ve\n\tsaid above will become reality.\n\nThe patch has been generated using the following coccinelle patch:\n\u003csmpl\u003e\n@@\nstruct scatterlist *sg;\n@@\n-sg_phys(sg)\n+sg_dma_address(sg)\n\u003c/smpl\u003e\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "12366ad91adb41a193f93b3b0f2829ea06df1773", "tree": "99808ae3cb5f0f925f8c976b1ce94bbbe228b011", "parents": [ "0d68ad197b1a4c93b9991faafa23df6d496f7c67" ], "author": { "name": "Sachin Kamat", "email": "sachin.kamat@linaro.org", "time": "Thu May 03 15:02:28 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 11:58:15 2012 +0530" }, "message": "DMA: PL330: Remove duplicate header file inclusion\n\nRemoves \u003clinux/interrupt.h\u003e file which was included twice.\n\nSigned-off-by: Sachin Kamat \u003csachin.kamat@linaro.org\u003e\nAcked-by: Jassi Brar \u003cjaswinder.singh@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "0d68ad197b1a4c93b9991faafa23df6d496f7c67", "tree": "cc77a1efbacd9fb6ecdaeebc5b464de9e84cebb4", "parents": [ "abd9ccc84c35cf1e296335a7b655bba40c92386c", "eab21585580344c8533d5e7bc4edea27ad1e268f" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 11:54:34 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 11:54:34 2012 +0530" }, "message": "Merge branch \u0027fixes\u0027 into next\n" }, { "commit": "eab21585580344c8533d5e7bc4edea27ad1e268f", "tree": "2000d5cd6f0ba08c7b6868cff3ac5ab23007524f", "parents": [ "88c08a3fba9954ce0ec3e1eab07c498a419ad7e3" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 11:24:41 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 11:24:41 2012 +0530" }, "message": "dmaengine: pl330: dont complete descriptor for cyclic dma\n\nthe cookie updates completed the cyclic dma descriptor wrongly. This caused the\nBUG_ON to be hit as submit is called for completed descriptor\n\nFix this by not marking the cyclic descriptor as complete\n\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\nTested-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\n" }, { "commit": "abd9ccc84c35cf1e296335a7b655bba40c92386c", "tree": "22c39af6cc57d6371cf4d74e76c04c60f979e9b5", "parents": [ "d3f797d93e593aa891f5b04a404b4ab45fd0e66a" ], "author": { "name": "Huang Shijie", "email": "b32955@freescale.com", "time": "Sat Apr 28 18:15:42 2012 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 11:08:10 2012 +0530" }, "message": "dma: imx-sdma: keep the callbacks invoked in the tasklet\n\nThe current code keeps the callbacks invoked from interrupt context, this\ndoes not conform to the Documentation/dmaengine.txt.\n\nSo add tasklet support to fix this issue.\n\nSigned-off-by: Huang Shijie \u003cb32955@freescale.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "d3f797d93e593aa891f5b04a404b4ab45fd0e66a", "tree": "cc1c68e6b61074a6e7094309213657758c6fbbe4", "parents": [ "3075528d3dd1ac8b729fccf2cbc3119057088223" ], "author": { "name": "Viresh Kumar", "email": "viresh.linux@gmail.com", "time": "Fri Apr 20 20:15:34 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 10:43:40 2012 +0530" }, "message": "dmaengine: dw_dma: add Device Tree probing capability\n\nSPEAr platforms now support DT and so must convert all drivers to support DT.\nThis patch adds DT probing support for Synopsys DMA controller and updates its\ndocumentation too.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "3075528d3dd1ac8b729fccf2cbc3119057088223", "tree": "2552203b1278a768ec9a75dc6eb5266dfdda08aa", "parents": [ "56cbb3dd48623c01e7c589d29da743d486c95a58" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Tue Apr 17 17:10:07 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri May 11 10:43:39 2012 +0530" }, "message": "dmaengine: dw_dmac: Add clk_{un}prepare() support\n\nclk_{un}prepare is mandatory for platforms using common clock framework. Since\nthis driver is used by SPEAr platform, which supports common clock framework,\nadd clk_{un}prepare() support for it.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "c510182b1c68e2f2bf61e69f6c65bcf61a188809", "tree": "3617d1484e75974409f2b00d5d0a2f3836943cc3", "parents": [ "1f80b126d06cf5c88b7f03a80c79ffd85053688a" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Sun Feb 19 13:30:26 2012 +0100" }, "committer": { "name": "Mike Turquette", "email": "mturquette@linaro.org", "time": "Tue May 08 16:34:02 2012 -0700" }, "message": "ARM: Orion: XOR: Add support for clk\n\nSome orion platforms can gate the XOR driver clock. If the clock\nexisits, unable/disable it as appropriate.\n\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nTested-by: Jamie Lentin \u003cjm@lentin.co.uk\u003e\nSigned-off-by: Mike Turquette \u003cmturquette@linaro.org\u003e\n" }, { "commit": "acdf2fc860f785781bb304a7f178141541f85283", "tree": "29eda8d4437983a99a601de56b30137dc79f30a1", "parents": [ "2390c0fca6d31af0c1194a491d9629fbe27703b8", "88c08a3fba9954ce0ec3e1eab07c498a419ad7e3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:33:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:33:36 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull [GIT PULL] slave-dmaengine fixes from Vinod Koul.\n\n* \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n dmaengine/amba-pl08x : reset phychan_hold on terminate all\n dma: pl330: fix a couple of compilation warnings\n dma/ste_dma40: fix erroneous comparison\n dma/ste_dma40: explicitly include regulator consumer header\n dma40: Improve the logic of stopping logical chan\n dmaengine: at_hdmac: remove clear-on-read in atc_dostart()\n dma: mxs-dma: enable channel in device_issue_pending call\n dmaengine: imx-dma: dont complete descriptor for cyclic dma\n" }, { "commit": "4fa030a43ddb0d8fe3f2530d6162c11a3b3d31de", "tree": "3eb3dfd8d1fead497fb228ad46e6162908d6b912", "parents": [ "fdf7748b9f8d392a086560616bf112f0ba0c1f71" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Sun Mar 18 23:48:13 2012 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Apr 25 17:03:43 2012 +0200" }, "message": "dmaengine i.MX ipu: clk_prepare/unprepare clock\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "7560e3f3581ed415828d3f431b8622fa38c2d133", "tree": "30f51bce9a355a2fb3af7605bcd5ae48edc14903", "parents": [ "66f75a5d028beaf67c931435fdc3e7823125730c" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Mar 07 09:30:06 2012 +0100" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Wed Apr 25 17:03:35 2012 +0200" }, "message": "dmaengine i.MX SDMA: do not depend on grouped clocks\n\nthe current i.MX clock support groups together unrelated clocks\nto a single clock which is then used by the driver. This can\u0027t\nbe accomplished with the generic clock framework so we instead\nrequest the individual clocks in the driver. For i.MX there are\ngenerally three different clocks:\n\nipg: bus clock (needed to access registers)\nahb: dma relevant clock, sometimes referred to as hclk in the datasheet\nper: bit clock, pixel clock\n\nThis patch changes the driver to request the individual clocks.\nCurrently all clk_get will get the same clock until the SoCs\nare converted to the generic clock framework\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "56cbb3dd48623c01e7c589d29da743d486c95a58", "tree": "66626f63f4effa03d8d5b14f0ea40b834e4195ae", "parents": [ "affa115ed365d646ad1a8cc7d2d063b8181cce37", "88c08a3fba9954ce0ec3e1eab07c498a419ad7e3" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Apr 25 15:28:54 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Apr 25 15:28:54 2012 +0530" }, "message": "Merge branch \u0027fixes\u0027 into next\n" }, { "commit": "affa115ed365d646ad1a8cc7d2d063b8181cce37", "tree": "df3d7caa7a0e42228312d6974977e1903306f891", "parents": [ "d29bf01941795891828bf671f74c3a4f6fc3517f" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Apr 12 09:01:49 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Apr 25 15:21:47 2012 +0530" }, "message": "dma/amba-pl08x: add support for the Nomadik variant\n\nThe Nomadik PL080 variant has some extra protection bits that\nmay be set, so we need to check these bits to see if the\nchannels are actually available for the DMAengine to use.\n\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Alim Akhtar \u003calim.akhtar@gmail.com\u003e\nCc: Alessandro Rubini \u003crubini@gnudd.com\u003e\nReviewed-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "88c08a3fba9954ce0ec3e1eab07c498a419ad7e3", "tree": "3e70ef723455e67c700c22abd8de40079e51093b", "parents": [ "c847382838ca503b6c55fb599160146221a2c141" ], "author": { "name": "Davide Ciminaghi", "email": "ciminaghi@gnudd.com", "time": "Thu Apr 19 12:20:24 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Apr 25 15:10:57 2012 +0530" }, "message": "dmaengine/amba-pl08x : reset phychan_hold on terminate all\n\nWhen a client calls pl08x_control with DMA_TERMINATE_ALL, it is correct\nto terminate and release the phy channel currently in use (if one is in use),\nbut the phychan_hold counter must also be reset (otherwise it could get\ntrapped in an unbalanced state).\n\nSigned-off-by: Davide Ciminaghi \u003cciminaghi@gnudd.com\u003e\nReviewed-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": "c847382838ca503b6c55fb599160146221a2c141", "tree": "fda89297dbcfb8d5319832cef4d665ba953f1d6a", "parents": [ "7e426da823fc7cd428b82ff2cf3615da24c73352" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sun Apr 08 16:26:19 2012 -0700" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Wed Apr 25 15:05:25 2012 +0530" }, "message": "dma: pl330: fix a couple of compilation warnings\n\nMove a couple of tests and do a minor refactor to avoid:\n\ndrivers/dma/pl330.c: In function \u0027pl330_probe\u0027:\ndrivers/dma/pl330.c:2929:215: warning: comparison of distinct pointer types lacks a cast [enabled by default]\ndrivers/dma/pl330.c: In function \u0027pl330_tasklet\u0027:\ndrivers/dma/pl330.c:2250:8: warning: \u0027pch\u0027 may be used uninitialized in this function [-Wuninitialized]\ndrivers/dma/pl330.c:2228:25: note: \u0027pch\u0027 was declared here\ndrivers/dma/pl330.c:2277:130: warning: \u0027pch\u0027 may be used uninitialized in this function [-Wuninitialized]\ndrivers/dma/pl330.c:2260:25: note: \u0027pch\u0027 was declared here\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "d29bf01941795891828bf671f74c3a4f6fc3517f", "tree": "88a39de4092bd68ae648a8d585261376af31a9f0", "parents": [ "7e426da823fc7cd428b82ff2cf3615da24c73352" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Mon Apr 09 22:53:21 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Apr 23 18:23:55 2012 +0530" }, "message": "dma/amba-pl08x: check for terminal count status only\n\nFor some reason I can\u0027t figure out we\u0027re reading the PL080_INT_STATUS\nregister instead of PL080_TC_STATUS when checking for the terminal\ncount. The PL080_INT_STATUS is a logical OR between the error and\nterminal count status register and may not report what we want it\nto, especially if there is an error and a terminal count at the same\ntime and the former is not lowered in time for the check in the TC\nregister. Make sure we read what we\u0027re actually interested in.\n\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nCc: Alim Akhtar \u003calim.akhtar@gmail.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nAcked-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "7e426da823fc7cd428b82ff2cf3615da24c73352", "tree": "6b8d215c99e76afd59cace3ae2ceb18d9f1affdd", "parents": [ "15e4b78d7338a41b020d29dab7ac13a234ebe833" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Apr 12 18:12:52 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Apr 23 18:07:05 2012 +0530" }, "message": "dma/ste_dma40: fix erroneous comparison\n\nA small fallout from Vinod\u0027s conversions to dma_transfer_direction,\nthis small comparison was done with a dma_data_direction instead.\nFix it by comparing against the correct enum.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "15e4b78d7338a41b020d29dab7ac13a234ebe833", "tree": "3e96bd4014a8a4de7296529ad42a82cb244445fa", "parents": [ "1bdae6f49c52af3a58998cdb051dbd5b942f9273" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@linaro.org", "time": "Thu Apr 12 18:12:43 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Apr 23 18:07:05 2012 +0530" }, "message": "dma/ste_dma40: explicitly include regulator consumer header\n\nThe patch \"ARM: amba: Remove AMBA level regulator support\" breaks\nthe DMA40 driver since the \u003clinux/amba/bus.h\u003e header implicitly\nincluded the regulator consumer header. So include it explicitly\nand fix the build error.\n\nCc: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "1bdae6f49c52af3a58998cdb051dbd5b942f9273", "tree": "4b3ad9b496be8755fb3571593286b3144d364c7b", "parents": [ "ed8b0d67f33518a16c6b2450fe5ebebf180c2d04" ], "author": { "name": "Narayanan G", "email": "narayanan.gopalakrishnan@stericsson.com", "time": "Thu Feb 09 12:41:37 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Mon Apr 23 17:56:17 2012 +0530" }, "message": "dma40: Improve the logic of stopping logical chan\n\ncan be directly stopped by issuing a SUSPEND_REQ on the EE\nbits. There is no need to suspend the physical channel and\nrestart it.\n\nAlso, the support for pre-V2 hw is discontinued.\n\nEE bits for writing:\n\n00: disable only if AS\u003d11 or AS\u003d00\n01: enable\n10: suspend_req only if AS\u003d01 \u0026 EE\u003d01 or EE\u003d11\n11: round / no change for writing\n\nSigned-off-by: Narayanan G \u003cnarayanan.gopalakrishnan@stericsson.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "ed8b0d67f33518a16c6b2450fe5ebebf180c2d04", "tree": "2e512cc9d9a21fb5d0d991dd9865a9b8b38b5ab1", "parents": [ "d04525ed0323709711277563a2c76e446a017423" ], "author": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Mon Apr 16 14:46:30 2012 +0200" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Apr 20 15:38:05 2012 +0530" }, "message": "dmaengine: at_hdmac: remove clear-on-read in atc_dostart()\n\nThis loop on EBCISR register was designed to clear IRQ sources before enabling\na DMA channel. This register is clear-on-read so a race condition can appear if\nanother channel is already active and has just finished its transfer.\nRemoving this read on EBCISR is fixing the issue as there is no case where an IRQ\ncould be pending: we already make sure that this register is drained at probe()\ntime and during resume.\n\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": "d04525ed0323709711277563a2c76e446a017423", "tree": "76766ed95d698f3ec98762301e42f703e774381c", "parents": [ "60f2951e3ad9b833bc12e2ea7652be2611771792" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed Apr 11 13:29:31 2012 +0800" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Apr 20 15:35:58 2012 +0530" }, "message": "dma: mxs-dma: enable channel in device_issue_pending call\n\nEnable channel in device_issue_pending call, so that the order between\ncookie assignment and channel enabling can be ensured naturally.\n\nIt fixes the mxs gpmi-nand breakage which is caused by the incorrect\norder of cookie assigning and channel enabling.\n\nSuggested-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nTested-by: Huang Shijie \u003cb32955@freescale.com\u003e\nTested-by \u003csamgandhi9@gmail.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "60f2951e3ad9b833bc12e2ea7652be2611771792", "tree": "b7ac7796aca149e09e8b39b5ddc9ce208c17c118", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Apr 20 15:28:07 2012 +0530" }, "committer": { "name": "Vinod Koul", "email": "vinod.koul@linux.intel.com", "time": "Fri Apr 20 15:28:07 2012 +0530" }, "message": "dmaengine: imx-dma: dont complete descriptor for cyclic dma\n\nthe cookie updates completed the cyclic dma descriptor wrongly. This caused the\nBUG_ON to be hit as submit is called for completed descriptor\n\nFix this by not marking the cyclic descriptor as complete\n\nTested-by: Javier Martin \u003cjavier.martin@vista-silicon.com\u003e\nSigned-off-by: Vinod Koul \u003cvinod.koul@linux.intel.com\u003e\n" }, { "commit": "2b3c83efc9a653af6a24799eeb1a2900ba0439e6", "tree": "27e96e2942b8d2c7ae04655796f20d83bfe20735", "parents": [ "5528a8469fbc01db218fbc00ebec1e3fc088e759" ], "author": { "name": "Rafal Prylowski", "email": "prylowski@metasoft.pl", "time": "Thu Apr 19 11:19:00 2012 +0200" }, "committer": { "name": "Ryan Mallon", "email": "rmallon@gmail.com", "time": "Fri Apr 20 08:37:19 2012 +1000" }, "message": "dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels\n\nAdd double buffering support for M2M DMA channels. Implement this by using EP93xx\nM2M DMA Buffer and Control Finite State Machines to be sure that we are not\ndisabling the channel when it\u0027s actually operating.\n\nSigned-off-by: Rafal Prylowski \u003cprylowski@metasoft.pl\u003e\nTested-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Mika Westerberg \u003cmika.westerberg@iki.fi\u003e\nSigned-off-by: Ryan Mallon \u003crmallon@gmail.com\u003e\n" }, { "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" } ], "next": "6602b0ddf399d4438fdea17b4b4a65df5ec97bb8" }